Skip to content

Commit

Permalink
Merge branch 'dev' for v0.10.6
Browse files Browse the repository at this point in the history
  • Loading branch information
EliteAsian123 committed Jun 7, 2023
2 parents 9ba6dc2 + bd8adbd commit e122e93
Show file tree
Hide file tree
Showing 36 changed files with 846 additions and 498 deletions.
171 changes: 171 additions & 0 deletions Assets/Art/Fonts/CreditSprites.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 84a92b25f83d49b9bc132d206b370281, type: 3}
m_Name: CreditSprites
m_EditorClassIdentifier:
hashCode: 1227223863
material: {fileID: 6669119319299450675}
materialHashCode: 0
m_Version: 1.1.0
m_FaceInfo:
m_FaceIndex: 0
m_FamilyName:
m_StyleName:
m_PointSize: 0
m_Scale: 0
m_UnitsPerEM: 0
m_LineHeight: 0
m_AscentLine: 0
m_CapLine: 0
m_MeanLine: 0
m_Baseline: 0
m_DescentLine: 0
m_SuperscriptOffset: 0
m_SuperscriptSize: 0
m_SubscriptOffset: 0
m_SubscriptSize: 0
m_UnderlineOffset: 0
m_UnderlineThickness: 0
m_StrikethroughOffset: 0
m_StrikethroughThickness: 0
m_TabWidth: 0
spriteSheet: {fileID: 2800000, guid: 9a7443e591e54de4cb9bc5796a8ab687, type: 3}
m_SpriteCharacterTable:
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 0
m_Scale: 0.9
m_Name: developer
m_HashCode: -1500130122
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 1
m_Scale: 0.9
m_Name: artist
m_HashCode: -365106807
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 2
m_Scale: 0.9
m_Name: charter
m_HashCode: -1818670821
- m_ElementType: 2
m_Unicode: 65534
m_GlyphIndex: 3
m_Scale: 0.9
m_Name: supporter
m_HashCode: 1202887288
m_SpriteGlyphTable:
- m_Index: 0
m_Metrics:
m_Width: 128
m_Height: 128
m_HorizontalBearingX: 25
m_HorizontalBearingY: 114
m_HorizontalAdvance: 150
m_GlyphRect:
m_X: 0
m_Y: 128
m_Width: 128
m_Height: 128
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 248047085, guid: 9a7443e591e54de4cb9bc5796a8ab687, type: 3}
- m_Index: 1
m_Metrics:
m_Width: 128
m_Height: 128
m_HorizontalBearingX: 25
m_HorizontalBearingY: 114
m_HorizontalAdvance: 150
m_GlyphRect:
m_X: 128
m_Y: 128
m_Width: 128
m_Height: 128
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 73802287, guid: 9a7443e591e54de4cb9bc5796a8ab687, type: 3}
- m_Index: 2
m_Metrics:
m_Width: 128
m_Height: 128
m_HorizontalBearingX: 25
m_HorizontalBearingY: 114
m_HorizontalAdvance: 150
m_GlyphRect:
m_X: 0
m_Y: 0
m_Width: 128
m_Height: 128
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 761286160, guid: 9a7443e591e54de4cb9bc5796a8ab687, type: 3}
- m_Index: 3
m_Metrics:
m_Width: 128
m_Height: 128
m_HorizontalBearingX: 25
m_HorizontalBearingY: 114
m_HorizontalAdvance: 150
m_GlyphRect:
m_X: 128
m_Y: 0
m_Width: 128
m_Height: 128
m_Scale: 1
m_AtlasIndex: 0
m_ClassDefinitionType: 0
sprite: {fileID: 676381074, guid: 9a7443e591e54de4cb9bc5796a8ab687, type: 3}
spriteInfoList: []
fallbackSpriteAssets: []
--- !u!21 &6669119319299450675
Material:
serializedVersion: 8
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: TextMeshPro/Sprite
m_Shader: {fileID: 4800000, guid: cf81c85f95fe47e1a27f6ae460cf182c, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 9a7443e591e54de4cb9bc5796a8ab687, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ColorMask: 15
- _CullMode: 0
- _Stencil: 0
- _StencilComp: 8
- _StencilOp: 0
- _StencilReadMask: 255
- _StencilWriteMask: 255
- _UseUIAlphaClip: 0
m_Colors:
- _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
8 changes: 8 additions & 0 deletions Assets/Art/Fonts/CreditSprites.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Assets/Art/UI/CreditSprites.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
211 changes: 211 additions & 0 deletions Assets/Art/UI/CreditSprites.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit e122e93

Please sign in to comment.