BlueCabinetGames/GeoSusGame
8
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

conflict resolved

Browse Source
This commit is contained in:
trubkokrtek
2026-06-04 21:48:23 +02:00
parent c6a328194c c78bdc2b2a
commit 5664097fb2
1368 changed files with 332599 additions and 9614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Assets/TextMesh Pro/Resources/Fonts & Materials.meta
View File

@@ -1,9 +1,22 @@
fileFormatVersion: 2
<<<<<<< HEAD
=======
<<<<<<< HEAD
guid: d99e32a5bc9dc064fb20a56ce6f208e6
folderAsset: yes
DefaultImporter:
externalObjects: {}
=======
>>>>>>> origin/main
guid: 731f1baa9d144a9897cb1d341c2092b8
folderAsset: yes
timeCreated: 1442040525
licenseType: Pro
DefaultImporter:
<<<<<<< HEAD
=======
>>>>>>> a0a675676d59d3c1e8b18f9ccca83d8e4713519c
>>>>>>> origin/main
userData:
assetBundleName:
assetBundleVariant:

347
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
View File

@@ -2,24 +2,77 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2180264
Material:
<<<<<<< HEAD
serializedVersion: 8
=======
<<<<<<< HEAD
serializedVersion: 8
=======
<<<<<<< HEAD
serializedVersion: 8
=======
<<<<<<< HEAD
serializedVersion: 6
=======
serializedVersion: 8
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: LiberationSans SDF Material
m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3}
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
m_ShaderKeywords:
=======
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
<<<<<<< HEAD
m_LockedProperties:
=======
<<<<<<< HEAD
m_LockedProperties:
=======
<<<<<<< HEAD
m_LockedProperties:
=======
<<<<<<< HEAD
=======
m_LockedProperties:
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
@@ -71,7 +124,22 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
<<<<<<< HEAD
m_Ints: []
=======
<<<<<<< HEAD
m_Ints: []
=======
<<<<<<< HEAD
m_Ints: []
=======
<<<<<<< HEAD
=======
m_Ints: []
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
m_Floats:
- _Ambient: 0.5
- _Bevel: 0.5
@@ -153,8 +221,27 @@ Material:
- _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
- _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5}
<<<<<<< HEAD
m_BuildTextureStacks: []
m_AllowLocking: 1
=======
<<<<<<< HEAD
m_BuildTextureStacks: []
m_AllowLocking: 1
=======
<<<<<<< HEAD
m_BuildTextureStacks: []
m_AllowLocking: 1
=======
<<<<<<< HEAD
=======
m_BuildTextureStacks: []
m_AllowLocking: 1
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -166,8 +253,25 @@ MonoBehaviour:
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3}
m_Name: LiberationSans SDF - Fallback
m_EditorClassIdentifier:
m_EditorClassIdentifier:
m_Version: 1.1.0
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
m_Material: {fileID: 2180264}
m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
m_AtlasPopulationMode: 1
InternalDynamicOS: 0
=======
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
m_FaceInfo:
m_FaceIndex: 0
m_FamilyName: Liberation Sans
@@ -190,10 +294,85 @@ MonoBehaviour:
m_StrikethroughOffset: 18
m_StrikethroughThickness: 6.298828
m_TabWidth: 24
<<<<<<< HEAD
m_Material: {fileID: 2180264}
m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
=======
<<<<<<< HEAD
m_Material: {fileID: 2180264}
m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
m_SourceFontFilePath:
m_AtlasPopulationMode: 1
InternalDynamicOS: 0
=======
<<<<<<< HEAD
m_Material: {fileID: 2180264}
m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
=======
<<<<<<< HEAD
m_GlyphTable: []
m_CharacterTable: []
m_AtlasTextures:
- {fileID: 28268798066460806}
m_AtlasTextureIndex: 0
m_IsMultiAtlasTexturesEnabled: 1
m_ClearDynamicDataOnBuild: 1
m_UsedGlyphRects: []
m_FreeGlyphRects:
- m_X: 0
m_Y: 0
m_Width: 511
m_Height: 511
m_fontInfo:
Name: Liberation Sans
PointSize: 86
Scale: 1
CharacterCount: 250
LineHeight: 98.90625
Baseline: 0
Ascender: 77.84375
CapHeight: 59.1875
Descender: -18.21875
CenterLine: 0
SuperscriptOffset: 77.84375
SubscriptOffset: -12.261719
SubSize: 0.5
Underline: -12.261719
UnderlineThickness: 6.298828
strikethrough: 23.675
strikethroughThickness: 0
TabWidth: 239.0625
Padding: 9
AtlasWidth: 1024
AtlasHeight: 1024
atlas: {fileID: 0}
m_AtlasWidth: 512
m_AtlasHeight: 512
m_AtlasPadding: 9
m_AtlasRenderMode: 4169
m_glyphInfoList: []
m_KerningTable:
kerningPairs: []
m_FontFeatureTable:
m_MultipleSubstitutionRecords: []
m_LigatureSubstitutionRecords: []
m_GlyphPairAdjustmentRecords: []
m_MarkToBaseAdjustmentRecords: []
m_MarkToMarkAdjustmentRecords: []
fallbackFontAssets: []
m_FallbackFontAssetTable: []
=======
m_Material: {fileID: 2180264}
m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
m_CreationSettings:
sourceFontFileName:
sourceFontFileName:
sourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
faceIndex: 0
pointSizeSamplingMode: 0
@@ -206,15 +385,30 @@ MonoBehaviour:
characterSetSelectionMode: 1
characterSequence: 32 - 126, 160 - 255, 8192 - 8303, 8364, 8482, 9633
referencedFontAssetGUID: 8f586378b4e144a9851e7b34d9b748ee
referencedTextAssetGUID:
referencedTextAssetGUID:
fontStyle: 0
fontStyleModifier: 0
renderMode: 4169
includeFontFeatures: 1
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> origin/main
>>>>>>> origin/main
m_SourceFontFile: {fileID: 12800000, guid: e3265ab4bf004d28a9537516768c1c75, type: 3}
m_SourceFontFilePath:
m_AtlasPopulationMode: 1
InternalDynamicOS: 0
<<<<<<< HEAD
=======
>>>>>>> origin/main
>>>>>>> origin/main
m_GlyphTable: []
m_CharacterTable: []
m_AtlasTextures:
@@ -223,16 +417,25 @@ MonoBehaviour:
m_IsMultiAtlasTexturesEnabled: 1
m_GetFontFeatures: 1
m_ClearDynamicDataOnBuild: 1
<<<<<<< HEAD
=======
>>>>>>> origin/main
m_AtlasWidth: 512
m_AtlasHeight: 512
m_AtlasPadding: 9
m_AtlasRenderMode: 4169
<<<<<<< HEAD
=======
>>>>>>> origin/main
m_UsedGlyphRects: []
m_FreeGlyphRects:
- m_X: 0
m_Y: 0
m_Width: 511
m_Height: 511
<<<<<<< HEAD
m_FontFeatureTable:
m_MultipleSubstitutionRecords: []
m_LigatureSubstitutionRecords: []
@@ -481,6 +684,26 @@ MonoBehaviour:
m_MarkToMarkAdjustmentRecords: []
m_ShouldReimportFontFeatures: 0
m_FallbackFontAssetTable: []
=======
m_FontFeatureTable:
m_MultipleSubstitutionRecords: []
m_LigatureSubstitutionRecords: []
m_GlyphPairAdjustmentRecords: []
m_MarkToBaseAdjustmentRecords: []
m_MarkToMarkAdjustmentRecords: []
m_ShouldReimportFontFeatures: 0
m_FallbackFontAssetTable: []
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
m_FontWeightTable:
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
@@ -502,6 +725,7 @@ MonoBehaviour:
italicTypeface: {fileID: 0}
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
fontWeights:
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
@@ -523,12 +747,25 @@ MonoBehaviour:
italicTypeface: {fileID: 0}
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
normalStyle: 0
normalSpacingOffset: 0
boldStyle: 0.75
boldSpacing: 7
italicStyle: 35
tabSize: 10
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
m_fontInfo:
Name: Liberation Sans
PointSize: 86
@@ -551,11 +788,30 @@ MonoBehaviour:
Padding: 9
AtlasWidth: 1024
AtlasHeight: 1024
<<<<<<< HEAD
m_glyphInfoList: []
m_KerningTable:
kerningPairs: []
fallbackFontAssets: []
atlas: {fileID: 0}
=======
m_glyphInfoList: []
m_KerningTable:
kerningPairs: []
fallbackFontAssets: []
atlas: {fileID: 0}
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
--- !u!28 &28268798066460806
Texture2D:
m_ObjectHideFlags: 0
@@ -563,9 +819,51 @@ Texture2D:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: LiberationSans SDF Atlas
m_ImageContentsHash:
serializedVersion: 2
Hash: 00000000000000000000000000000000
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> origin/main
m_IsAlphaChannelOptional: 0
serializedVersion: 4
m_Width: 1
m_Height: 1
m_CompleteImageSize: 1
m_MipsStripped: 0
<<<<<<< HEAD
=======
=======
<<<<<<< HEAD
m_ForcedFallbackFormat: 4
m_DownscaleFallback: 0
serializedVersion: 2
m_Width: 0
m_Height: 0
m_CompleteImageSize: 0
>>>>>>> origin/main
>>>>>>> origin/main
m_TextureFormat: 1
m_MipCount: 1
m_IsReadable: 1
m_IsPreProcessed: 0
m_IgnoreMipmapLimit: 0
m_MipmapLimitGroupName:
m_StreamingMipmaps: 0
m_StreamingMipmapsPriority: 0
<<<<<<< HEAD
m_VTOnly: 0
=======
<<<<<<< HEAD
m_VTOnly: 0
=======
=======
>>>>>>> origin/main
m_IsAlphaChannelOptional: 0
serializedVersion: 4
m_Width: 1
@@ -577,13 +875,21 @@ Texture2D:
m_IsReadable: 1
m_IsPreProcessed: 0
m_IgnoreMipmapLimit: 0
m_MipmapLimitGroupName:
m_MipmapLimitGroupName:
m_StreamingMipmaps: 0
m_StreamingMipmapsPriority: 0
m_VTOnly: 0
<<<<<<< HEAD
=======
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
m_AlphaIsTransparency: 0
m_ImageCount: 1
m_TextureDimension: 2
m_TextureSettings:
serializedVersion: 2
m_FilterMode: 1
@@ -592,13 +898,44 @@ Texture2D:
m_WrapU: 0
m_WrapV: 0
m_WrapW: 0
m_LightmapFormat: 0
m_ColorSpace: 0
<<<<<<< HEAD
m_PlatformBlob:
image data: 1
_typelessdata: 00
m_StreamData:
serializedVersion: 2
=======
<<<<<<< HEAD
m_PlatformBlob:
=======
<<<<<<< HEAD
m_PlatformBlob:
image data: 1
_typelessdata: 00
m_StreamData:
serializedVersion: 2
=======
<<<<<<< HEAD
image data: 0
_typelessdata:
m_StreamData:
=======
m_PlatformBlob:
>>>>>>> origin/main
image data: 1
_typelessdata: 00
m_StreamData:
serializedVersion: 2
<<<<<<< HEAD
=======
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
offset: 0
size: 0
path:
path:

4
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset
View File

@@ -7970,8 +7970,12 @@ MonoBehaviour:
m_MarkToBaseAdjustmentRecords: []
m_MarkToMarkAdjustmentRecords: []
m_ShouldReimportFontFeatures: 0
<<<<<<< HEAD
m_FallbackFontAssetTable:
- {fileID: 11400000, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2}
=======
m_FallbackFontAssetTable: []
>>>>>>> origin/main
m_FontWeightTable:
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}

13
Assets/TextMesh Pro/Resources/Sprite Assets.meta
View File

@@ -1,9 +1,22 @@
fileFormatVersion: 2
<<<<<<< HEAD
=======
<<<<<<< HEAD
guid: 09b550510ac4d8646b2dfa81b0bfb581
folderAsset: yes
DefaultImporter:
externalObjects: {}
=======
>>>>>>> origin/main
guid: 512a49d95c0c4332bdd98131869c23c9
folderAsset: yes
timeCreated: 1441876896
licenseType: Pro
DefaultImporter:
<<<<<<< HEAD
=======
>>>>>>> a0a675676d59d3c1e8b18f9ccca83d8e4713519c
>>>>>>> origin/main
userData:
assetBundleName:
assetBundleVariant:

13
Assets/TextMesh Pro/Resources/Style Sheets.meta
View File

@@ -1,9 +1,22 @@
fileFormatVersion: 2
<<<<<<< HEAD
=======
<<<<<<< HEAD
guid: 8804c70a74c3d9141be28f4881fc1ce2
folderAsset: yes
DefaultImporter:
externalObjects: {}
=======
>>>>>>> origin/main
guid: 4aecb92fff08436c8303b10eab8da368
folderAsset: yes
timeCreated: 1441876950
licenseType: Pro
DefaultImporter:
<<<<<<< HEAD
=======
>>>>>>> a0a675676d59d3c1e8b18f9ccca83d8e4713519c
>>>>>>> origin/main
userData:
assetBundleName:
assetBundleVariant:

14
Assets/TextMesh Pro/Resources/TMP Settings.asset
View File

@@ -15,7 +15,7 @@ MonoBehaviour:
assetVersion: 2
m_TextWrappingMode: 1
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
m_enableTintAllSprites: 0
m_enableParseEscapeCharacters: 1
@@ -33,20 +33,18 @@ MonoBehaviour:
m_defaultTextMeshProUITextContainerSize: {x: 200, y: 50}
m_autoSizeTextContainer: 0
m_IsTextObjectScaleStatic: 0
m_fallbackFontAssets: []
m_fallbackFontAssets:
- {fileID: 11400000, guid: 2e498d1c8094910479dc3e1b768306a4, type: 2}
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