resolved conflicts

2026-05-17 20:09:05 +02:00
parent 023bddc91b 82c120f362
commit c5703fc92a
321 changed files with 31200 additions and 1951 deletions
--- a/Assets/TextMesh
+++ b/Assets/TextMesh
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 84df15300b500ca4d9bfd349136086e3
+guid: 08c27cfa5996b8a4a9aaadbcf635516d
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Extras/Fonts.meta
+++ b/Extras/Fonts.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a02f1d9a228cbe24f9a08123375b5a99
+guid: ddffe253b88f7574dbd350120ae2dc43
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Extras/Materials.meta
+++ b/Extras/Materials.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a250ed4cf17fd584295081fd17346064
+guid: 55addf00129d787419ffc6d3ba1ce3b1
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Extras/Prefabs.meta
+++ b/Extras/Prefabs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ef3d5d7654864e947b41240c046caf2c
+guid: c6d130fc5313a5b4496a3e0600aca9b4
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Extras/Resources.meta
+++ b/Extras/Resources.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5871330726d2c9d4495df47658c99b70
+guid: affa9342a626e32489e383c18b538c21
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Extras/Resources/Color
+++ b/Extras/Resources/Color
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a411efc51d3eb1242879bbcae543e7a8
+guid: a48045cdb3bc11a4589c818573dde0af
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d6885de4a42d5d34191cf4fb1753c1fe
+guid: 06c0bc86d8829a443a66d6e78e6c0470
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Extras/Resources/Sprite
+++ b/Extras/Resources/Sprite
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 75230aae57758cd4c87a8f49d67162d1
+guid: 1183d1bd7b9316f428fa44d625fc5d81
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Extras/Scenes.meta
+++ b/Extras/Scenes.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 99956038eee542e4586ed3abcfe47b52
+guid: 3ad3e44eb42732f40a9bbdd548326440
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Extras/Scenes/28
+++ b/Extras/Scenes/28
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e1f668d9b705a104cb68598b4507317e
+guid: ed93afb5cf7dc854a92fae30f16331cd
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Extras/Scripts.meta
+++ b/Extras/Scripts.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f966755ac03175f4599d94bb9a742cb6
+guid: ccd0fd31a63984d46b31bf364f5bf0ce
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Extras/Sprites.meta
+++ b/Extras/Sprites.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a51cfbe238142fd44ad0f9d388f79d99
+guid: 7332aceab6a846f4b91714bb62278b3a
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Extras/Textures.meta
+++ b/Extras/Textures.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a5d54a43f75567a4dbf2441a20158e2b
+guid: 4d6a7ccfa008f3143a55bb782ba75e2b
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/TextMesh
+++ b/Assets/TextMesh
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
-guid: 1012bbaeba3772f46890e81232a8641b
+<<<<<<< HEAD
+guid: 36f8e3e10c6bd3f45b71a277d2b54ea5
+=======
+guid: 6ab70aee4d56447429c680537fbf93ed
+>>>>>>> a0a675676d59d3c1e8b18f9ccca83d8e4713519c
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Pro/Fonts/LiberationSans
+++ b/Pro/Fonts/LiberationSans
--- a/Pro/Fonts/LiberationSans
+++ b/Pro/Fonts/LiberationSans
--- a/Pro/Fonts/LiberationSans.ttf
+++ b/Pro/Fonts/LiberationSans.ttf
--- a/Pro/Fonts/LiberationSans.ttf.meta
+++ b/Pro/Fonts/LiberationSans.ttf.meta
--- a/Pro/Resources.meta
+++ b/Pro/Resources.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
-guid: e0243e7182d701446b666f49640fb397
+<<<<<<< HEAD
+guid: 60241e4e453157b4c928f3503a41f642
+=======
+guid: 243e06394e614e5d99fab26083b707fa
+>>>>>>> a0a675676d59d3c1e8b18f9ccca83d8e4713519c
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Pro/Resources/Fonts
+++ b/Pro/Resources/Fonts
@@ -1,8 +1,16 @@
 fileFormatVersion: 2
-guid: 2df41ff9c3c31394691b43b8ff392de6
+<<<<<<< HEAD
+guid: d99e32a5bc9dc064fb20a56ce6f208e6
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
+=======
+guid: 731f1baa9d144a9897cb1d341c2092b8
+folderAsset: yes
+timeCreated: 1442040525
+licenseType: Pro
+DefaultImporter:
+>>>>>>> a0a675676d59d3c1e8b18f9ccca83d8e4713519c
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans
--- a/Pro/Resources/LineBreaking
+++ b/Pro/Resources/LineBreaking
--- a/Pro/Resources/LineBreaking
+++ b/Pro/Resources/LineBreaking
--- a/Pro/Resources/LineBreaking
+++ b/Pro/Resources/LineBreaking
--- a/Pro/Resources/LineBreaking
+++ b/Pro/Resources/LineBreaking
--- a/Pro/Resources/Sprite
+++ b/Pro/Resources/Sprite
@@ -1,8 +1,16 @@
 fileFormatVersion: 2
-guid: 1658caa1d007c2748b4dfee2755c3495
+<<<<<<< HEAD
+guid: 09b550510ac4d8646b2dfa81b0bfb581
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
+=======
+guid: 512a49d95c0c4332bdd98131869c23c9
+folderAsset: yes
+timeCreated: 1441876896
+licenseType: Pro
+DefaultImporter:
+>>>>>>> a0a675676d59d3c1e8b18f9ccca83d8e4713519c
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Assets/EmojiOne.asset
+++ b/Assets/EmojiOne.asset
--- a/Assets/EmojiOne.asset.meta
+++ b/Assets/EmojiOne.asset.meta
--- a/Pro/Resources/Style
+++ b/Pro/Resources/Style
@@ -1,8 +1,16 @@
 fileFormatVersion: 2
-guid: 192d62febb552ff4f9685368fd1aebf9
+<<<<<<< HEAD
+guid: 8804c70a74c3d9141be28f4881fc1ce2
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
+=======
+guid: 4aecb92fff08436c8303b10eab8da368
+folderAsset: yes
+timeCreated: 1441876950
+licenseType: Pro
+DefaultImporter:
+>>>>>>> a0a675676d59d3c1e8b18f9ccca83d8e4713519c
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Pro/Resources/Style
+++ b/Pro/Resources/Style
--- a/Pro/Resources/Style
+++ b/Pro/Resources/Style
--- a/Pro/Resources/TMP
+++ b/Pro/Resources/TMP
@@ -15,7 +15,7 @@ MonoBehaviour:
  assetVersion: 2
  m_TextWrappingMode: 1
  m_enableKerning: 1
-  m_ActiveFontFeatures: 6e72656b
+  m_ActiveFontFeatures: 00000000
  m_enableExtraPadding: 0
  m_enableTintAllSprites: 0
  m_enableParseEscapeCharacters: 1
@@ -36,14 +36,17 @@ MonoBehaviour:
  m_fallbackFontAssets: []
  m_matchMaterialPreset: 1
  m_HideSubTextObjects: 0
-  m_defaultSpriteAsset: {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45, type: 2}
+  m_defaultSpriteAsset: {fileID: 11400000, guid: c41005c129ba4d66911b75229fd70b45,
+    type: 2}
  m_defaultSpriteAssetPath: Sprite Assets/
  m_enableEmojiSupport: 1
  m_MissingCharacterSpriteUnicode: 0
  m_EmojiFallbackTextAssets: []
  m_defaultColorGradientPresetsPath: Color Gradient Presets/
-  m_defaultStyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e, type: 2}
+  m_defaultStyleSheet: {fileID: 11400000, guid: f952c082cb03451daed3ee968ac6c63e,
+    type: 2}
  m_StyleSheetsResourcePath: 
  m_leadingCharacters: {fileID: 4900000, guid: d82c1b31c7e74239bff1220585707d2b, type: 3}
-  m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b, type: 3}
+  m_followingCharacters: {fileID: 4900000, guid: fade42e8bc714b018fac513c043d323b,
+    type: 3}
  m_UseModernHangulLineBreakingRules: 0
--- a/Settings.asset.meta
+++ b/Settings.asset.meta
--- a/Pro/Shaders.meta
+++ b/Pro/Shaders.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
-guid: f627056f3f5121d4cbec08a5d867c784
+<<<<<<< HEAD
+guid: 65ff3a6e3e518c94ea3f1fa4fc16f6ae
+=======
+guid: e9f693669af91aa45ad615fc681ed29f
+>>>>>>> a0a675676d59d3c1e8b18f9ccca83d8e4713519c
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Pro/Shaders/SDFFunctions.hlsl
+++ b/Pro/Shaders/SDFFunctions.hlsl
--- a/Pro/Shaders/SDFFunctions.hlsl.meta
+++ b/Pro/Shaders/SDFFunctions.hlsl.meta
--- a/Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader
+++ b/Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader
--- a/Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader.meta
+++ b/Pro/Shaders/TMP_Bitmap-Custom-Atlas.shader.meta
--- a/Pro/Shaders/TMP_Bitmap-Mobile.shader
+++ b/Pro/Shaders/TMP_Bitmap-Mobile.shader
--- a/Pro/Shaders/TMP_Bitmap-Mobile.shader.meta
+++ b/Pro/Shaders/TMP_Bitmap-Mobile.shader.meta
--- a/Pro/Shaders/TMP_Bitmap.shader
+++ b/Pro/Shaders/TMP_Bitmap.shader
--- a/Pro/Shaders/TMP_Bitmap.shader.meta
+++ b/Pro/Shaders/TMP_Bitmap.shader.meta
--- a/Pro/Shaders/TMP_SDF
+++ b/Pro/Shaders/TMP_SDF
--- a/Overlay.shader.meta
+++ b/Overlay.shader.meta
--- a/Pro/Shaders/TMP_SDF
+++ b/Pro/Shaders/TMP_SDF
--- a/Pro/Shaders/TMP_SDF
+++ b/Pro/Shaders/TMP_SDF
--- a/Pro/Shaders/TMP_SDF-HDRP
+++ b/Pro/Shaders/TMP_SDF-HDRP
--- a/Pro/Shaders/TMP_SDF-HDRP
+++ b/Pro/Shaders/TMP_SDF-HDRP
--- a/Pro/Shaders/TMP_SDF-HDRP
+++ b/Pro/Shaders/TMP_SDF-HDRP
--- a/Pro/Shaders/TMP_SDF-HDRP
+++ b/Pro/Shaders/TMP_SDF-HDRP
--- a/Pro/Shaders/TMP_SDF-Mobile
+++ b/Pro/Shaders/TMP_SDF-Mobile
--- a/Pro/Shaders/TMP_SDF-Mobile
+++ b/Pro/Shaders/TMP_SDF-Mobile
--- a/Pro/Shaders/TMP_SDF-Mobile
+++ b/Pro/Shaders/TMP_SDF-Mobile
--- a/Pro/Shaders/TMP_SDF-Mobile
+++ b/Pro/Shaders/TMP_SDF-Mobile
--- a/Pro/Shaders/TMP_SDF-Mobile
+++ b/Pro/Shaders/TMP_SDF-Mobile
--- a/Pro/Shaders/TMP_SDF-Mobile
+++ b/Pro/Shaders/TMP_SDF-Mobile
--- a/Pro/Shaders/TMP_SDF-Mobile-2-Pass.shader
+++ b/Pro/Shaders/TMP_SDF-Mobile-2-Pass.shader
--- a/Pro/Shaders/TMP_SDF-Mobile-2-Pass.shader.meta
+++ b/Pro/Shaders/TMP_SDF-Mobile-2-Pass.shader.meta
--- a/Pro/Shaders/TMP_SDF-Mobile.shader
+++ b/Pro/Shaders/TMP_SDF-Mobile.shader
--- a/Pro/Shaders/TMP_SDF-Mobile.shader.meta
+++ b/Pro/Shaders/TMP_SDF-Mobile.shader.meta
--- a/Pro/Shaders/TMP_SDF-Surface-Mobile.shader
+++ b/Pro/Shaders/TMP_SDF-Surface-Mobile.shader
--- a/Pro/Shaders/TMP_SDF-Surface-Mobile.shader.meta
+++ b/Pro/Shaders/TMP_SDF-Surface-Mobile.shader.meta
--- a/Pro/Shaders/TMP_SDF-Surface.shader
+++ b/Pro/Shaders/TMP_SDF-Surface.shader
--- a/Pro/Shaders/TMP_SDF-Surface.shader.meta
+++ b/Pro/Shaders/TMP_SDF-Surface.shader.meta
--- a/Pro/Shaders/TMP_SDF-URP
+++ b/Pro/Shaders/TMP_SDF-URP
--- a/Pro/Shaders/TMP_SDF-URP
+++ b/Pro/Shaders/TMP_SDF-URP
--- a/Pro/Shaders/TMP_SDF-URP
+++ b/Pro/Shaders/TMP_SDF-URP
--- a/Pro/Shaders/TMP_SDF-URP
+++ b/Pro/Shaders/TMP_SDF-URP
--- a/Pro/Shaders/TMP_SDF.shader
+++ b/Pro/Shaders/TMP_SDF.shader
--- a/Pro/Shaders/TMP_SDF.shader.meta
+++ b/Pro/Shaders/TMP_SDF.shader.meta
--- a/Pro/Shaders/TMP_Sprite.shader
+++ b/Pro/Shaders/TMP_Sprite.shader
--- a/Pro/Shaders/TMP_Sprite.shader.meta
+++ b/Pro/Shaders/TMP_Sprite.shader.meta
--- a/Pro/Shaders/TMPro.cginc
+++ b/Pro/Shaders/TMPro.cginc
--- a/Pro/Shaders/TMPro.cginc.meta
+++ b/Pro/Shaders/TMPro.cginc.meta
--- a/Pro/Shaders/TMPro_Mobile.cginc
+++ b/Pro/Shaders/TMPro_Mobile.cginc
--- a/Pro/Shaders/TMPro_Mobile.cginc.meta
+++ b/Pro/Shaders/TMPro_Mobile.cginc.meta
--- a/Pro/Shaders/TMPro_Properties.cginc
+++ b/Pro/Shaders/TMPro_Properties.cginc
--- a/Pro/Shaders/TMPro_Properties.cginc.meta
+++ b/Pro/Shaders/TMPro_Properties.cginc.meta
--- a/Pro/Shaders/TMPro_Surface.cginc
+++ b/Pro/Shaders/TMPro_Surface.cginc
--- a/Pro/Shaders/TMPro_Surface.cginc.meta
+++ b/Pro/Shaders/TMPro_Surface.cginc.meta
--- a/Pro/Sprites.meta
+++ b/Pro/Sprites.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
-guid: 044d829397fd23944ab54790924f5b11
+<<<<<<< HEAD
+guid: 292eabadcc36f5c4eac49db1766dd42c
+=======
+guid: d0603b6d5186471b96c778c3949c7ce2
+>>>>>>> a0a675676d59d3c1e8b18f9ccca83d8e4713519c
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Pro/Sprites/EmojiOne
+++ b/Pro/Sprites/EmojiOne
--- a/Attribution.txt.meta
+++ b/Attribution.txt.meta
--- a/Pro/Sprites/EmojiOne.json
+++ b/Pro/Sprites/EmojiOne.json
--- a/Pro/Sprites/EmojiOne.json.meta
+++ b/Pro/Sprites/EmojiOne.json.meta
--- a/Pro/Sprites/EmojiOne.png
+++ b/Pro/Sprites/EmojiOne.png
--- a/Pro/Sprites/EmojiOne.png.meta
+++ b/Pro/Sprites/EmojiOne.png.meta