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

resolved issues and added minigames to list

Browse Source
This commit is contained in:
trubkokrtek
2026-06-05 18:48:01 +02:00
parent 8319301381
commit 67f5c09021
27 changed files with 87 additions and 1756 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,77 +2,25 @@
%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:
@@ -124,22 +72,7 @@ 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
@@ -221,27 +154,8 @@ 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
@@ -255,23 +169,11 @@ MonoBehaviour:
m_Name: LiberationSans SDF - Fallback
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
@@ -294,25 +196,12 @@ 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:
@@ -364,16 +253,10 @@ MonoBehaviour:
m_MarkToMarkAdjustmentRecords: []
fallbackFontAssets: []
m_FallbackFontAssetTable: []
=======
m_Material: {fileID: 2180264}
m_SourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
m_CreationSettings:
sourceFontFileName:
sourceFontFileGUID: e3265ab4bf004d28a9537516768c1c75
faceIndex: 0
pointSizeSamplingMode: 0
pointSize: 86
@@ -390,25 +273,10 @@ MonoBehaviour:
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:
@@ -417,25 +285,17 @@ 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: []
@@ -684,7 +544,7 @@ MonoBehaviour:
m_MarkToMarkAdjustmentRecords: []
m_ShouldReimportFontFeatures: 0
m_FallbackFontAssetTable: []
=======
m_FontFeatureTable:
m_MultipleSubstitutionRecords: []
@@ -695,15 +555,6 @@ MonoBehaviour:
m_ShouldReimportFontFeatures: 0
m_FallbackFontAssetTable: []
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
m_FontWeightTable:
- regularTypeface: {fileID: 0}
italicTypeface: {fileID: 0}
@@ -754,18 +605,6 @@ MonoBehaviour:
boldSpacing: 7
italicStyle: 35
tabSize: 10
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
m_fontInfo:
Name: Liberation Sans
PointSize: 86
@@ -788,13 +627,11 @@ MonoBehaviour:
Padding: 9
AtlasWidth: 1024
AtlasHeight: 1024
<<<<<<< HEAD
m_glyphInfoList: []
m_KerningTable:
kerningPairs: []
fallbackFontAssets: []
atlas: {fileID: 0}
=======
m_glyphInfoList: []
@@ -803,15 +640,6 @@ MonoBehaviour:
fallbackFontAssets: []
atlas: {fileID: 0}
<<<<<<< HEAD
=======
<<<<<<< HEAD
=======
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
>>>>>>> origin/main
--- !u!28 &28268798066460806
Texture2D:
m_ObjectHideFlags: 0
@@ -823,31 +651,18 @@ Texture2D:
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
@@ -856,14 +671,7 @@ Texture2D:
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
@@ -879,13 +687,6 @@ Texture2D:
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
@@ -901,41 +702,16 @@ Texture2D:
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:

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

@@ -7970,12 +7970,8 @@ 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}