Hra kabely

2026-03-28 19:28:59 +01:00
parent f7926a218e
commit 1de91b0d57
80 changed files with 22549 additions and 653 deletions
--- a/Assets/TextMesh
+++ b/Assets/TextMesh
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 36f8e3e10c6bd3f45b71a277d2b54ea5
+=======
+guid: 6ab70aee4d56447429c680537fbf93ed
+>>>>>>> a0a675676d59d3c1e8b18f9ccca83d8e4713519c
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Pro/Resources.meta
+++ b/Pro/Resources.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 60241e4e453157b4c928f3503a41f642
+=======
+guid: 243e06394e614e5d99fab26083b707fa
+>>>>>>> a0a675676d59d3c1e8b18f9ccca83d8e4713519c
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Pro/Resources/Fonts
+++ b/Pro/Resources/Fonts
@@ -1,8 +1,16 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: d99e32a5bc9dc064fb20a56ce6f208e6
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
+=======
+guid: 731f1baa9d144a9897cb1d341c2092b8
+folderAsset: yes
+timeCreated: 1442040525
+licenseType: Pro
+DefaultImporter:
+>>>>>>> a0a675676d59d3c1e8b18f9ccca83d8e4713519c
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Pro/Resources/Sprite
+++ b/Pro/Resources/Sprite
@@ -1,8 +1,16 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 09b550510ac4d8646b2dfa81b0bfb581
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
+=======
+guid: 512a49d95c0c4332bdd98131869c23c9
+folderAsset: yes
+timeCreated: 1441876896
+licenseType: Pro
+DefaultImporter:
+>>>>>>> a0a675676d59d3c1e8b18f9ccca83d8e4713519c
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Pro/Resources/Style
+++ b/Pro/Resources/Style
@@ -1,8 +1,16 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 8804c70a74c3d9141be28f4881fc1ce2
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
+=======
+guid: 4aecb92fff08436c8303b10eab8da368
+folderAsset: yes
+timeCreated: 1441876950
+licenseType: Pro
+DefaultImporter:
+>>>>>>> a0a675676d59d3c1e8b18f9ccca83d8e4713519c
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Pro/Shaders.meta
+++ b/Pro/Shaders.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 65ff3a6e3e518c94ea3f1fa4fc16f6ae
+=======
+guid: e9f693669af91aa45ad615fc681ed29f
+>>>>>>> a0a675676d59d3c1e8b18f9ccca83d8e4713519c
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Pro/Sprites.meta
+++ b/Pro/Sprites.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
 guid: 292eabadcc36f5c4eac49db1766dd42c
+=======
+guid: d0603b6d5186471b96c778c3949c7ce2
+>>>>>>> a0a675676d59d3c1e8b18f9ccca83d8e4713519c
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}