visual fixes

omegaleo · Jun 26, 2022 · a838ba9 · a838ba9
1 parent 2e76ced
commit a838ba9
Show file tree

Hide file tree

Showing 10 changed files with 1,000 additions and 254 deletions.
diff --git a/Assets/Fonts/ChessWar font SDF.asset b/Assets/Fonts/ChessWar font SDF.asset
diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity
@@ -158,8 +158,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 215, y: -243.27249}
-  m_SizeDelta: {x: 410, y: 466.54498}
+  m_AnchoredPosition: {x: 175, y: -229.4975}
+  m_SizeDelta: {x: 330, y: 438.99496}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &116309075
 MonoBehaviour:
@@ -1214,8 +1214,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -175, y: 0}
-  m_SizeDelta: {x: 350, y: 0}
+  m_AnchoredPosition: {x: -182.5, y: 0}
+  m_SizeDelta: {x: 350, y: -25}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &293840714
 MonoBehaviour:
@@ -1706,8 +1706,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 215, y: -688.27246}
-  m_SizeDelta: {x: 410, y: 403.455}
+  m_AnchoredPosition: {x: 175, y: -674.49744}
+  m_SizeDelta: {x: 330, y: 431.00497}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &437442058
 MonoBehaviour:
@@ -1729,10 +1729,12 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Pawn
+  m_text: 'Pawn
+
+    <align=left>Test'
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: e9a8c761b358bf44f9cda50569a268e0, type: 2}
-  m_sharedMaterial: {fileID: 5981815099051842037, guid: ed0b8a226ded53441a85d522f9cdc6e1, type: 2}
+  m_sharedMaterial: {fileID: 246143435287901796, guid: e9a8c761b358bf44f9cda50569a268e0, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -1792,10 +1794,10 @@ MonoBehaviour:
   m_VertexBufferAutoSizeReduction: 0
   m_useMaxVisibleDescender: 1
   m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_margin: {x: 20, y: 0, z: 20, w: 20}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
-  m_hasFontAssetChanged: 1
+  m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!222 &437442059
@@ -2499,8 +2501,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 215, y: -243.27249}
-  m_SizeDelta: {x: 410, y: 466.54498}
+  m_AnchoredPosition: {x: 175, y: -229.4975}
+  m_SizeDelta: {x: 330, y: 438.99496}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &812267272
 MonoBehaviour:
@@ -2886,8 +2888,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 175, y: 0}
-  m_SizeDelta: {x: 350, y: 0}
+  m_AnchoredPosition: {x: 182.5, y: 0}
+  m_SizeDelta: {x: 350, y: -25}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1352824873
 MonoBehaviour:
@@ -3851,8 +3853,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 215, y: -688.27246}
-  m_SizeDelta: {x: 410, y: 403.455}
+  m_AnchoredPosition: {x: 175, y: -674.49744}
+  m_SizeDelta: {x: 330, y: 431.00497}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1918973068
 MonoBehaviour:
@@ -3874,10 +3876,12 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Pawn
+  m_text: 'Pawn
+
+    <align=left>Test'
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: e9a8c761b358bf44f9cda50569a268e0, type: 2}
-  m_sharedMaterial: {fileID: 5981815099051842037, guid: ed0b8a226ded53441a85d522f9cdc6e1, type: 2}
+  m_sharedMaterial: {fileID: 246143435287901796, guid: e9a8c761b358bf44f9cda50569a268e0, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
@@ -3937,10 +3941,10 @@ MonoBehaviour:
   m_VertexBufferAutoSizeReduction: 0
   m_useMaxVisibleDescender: 1
   m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_margin: {x: 20, y: 0, z: 20, w: 20}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
-  m_hasFontAssetChanged: 1
+  m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!222 &1918973069

diff --git a/Assets/Scenes/TitleScreen.unity b/Assets/Scenes/TitleScreen.unity
@@ -999,7 +999,7 @@ MonoBehaviour:
       m_Calls: []
   m_text: <sprite=1>
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: ed0b8a226ded53441a85d522f9cdc6e1, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: e9a8c761b358bf44f9cda50569a268e0, type: 2}
   m_sharedMaterial: {fileID: 5981815099051842037, guid: ed0b8a226ded53441a85d522f9cdc6e1, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
@@ -1063,7 +1063,7 @@ MonoBehaviour:
   m_margin: {x: 0, y: 0, z: 0, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
+  m_hasFontAssetChanged: 1
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!222 &197811905
@@ -2826,7 +2826,7 @@ MonoBehaviour:
       m_Calls: []
   m_text: <sprite=2>
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: ed0b8a226ded53441a85d522f9cdc6e1, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: e9a8c761b358bf44f9cda50569a268e0, type: 2}
   m_sharedMaterial: {fileID: 5981815099051842037, guid: ed0b8a226ded53441a85d522f9cdc6e1, type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
@@ -2890,7 +2890,7 @@ MonoBehaviour:
   m_margin: {x: 0, y: 0, z: 0, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
+  m_hasFontAssetChanged: 1
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!222 &599665466

diff --git a/Assets/Shaders/DissolveMaterial.mat b/Assets/Shaders/DissolveMaterial.mat
@@ -38,7 +38,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _DissolveAmount: 0.99971825
+    - _DissolveAmount: 0.99992716
     - _DissolveScale: 300
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}

diff --git a/Assets/Textures/Icons.asset b/Assets/Textures/Icons.asset
@@ -13,7 +13,7 @@ MonoBehaviour:
   m_Name: Icons
   m_EditorClassIdentifier: 
   hashCode: 83117176
-  material: {fileID: 9095146845602255721}
+  material: {fileID: 5085627736720636731}
   materialHashCode: 0
   m_Version: 1.1.0
   m_FaceInfo:
@@ -51,6 +51,12 @@ MonoBehaviour:
     m_Scale: 1
     m_Name: Icons_1
     m_HashCode: 320288822
+  - m_ElementType: 2
+    m_Unicode: 65534
+    m_GlyphIndex: 2
+    m_Scale: 1
+    m_Name: Icons_2
+    m_HashCode: 320288821
   m_SpriteGlyphTable:
   - m_Index: 0
     m_Metrics:
@@ -82,9 +88,24 @@ MonoBehaviour:
     m_Scale: 1
     m_AtlasIndex: 0
     sprite: {fileID: -1926928525, guid: da10414876ada2e47b9c5bf200a54dcc, type: 3}
+  - m_Index: 2
+    m_Metrics:
+      m_Width: 48
+      m_Height: 48
+      m_HorizontalBearingX: -24
+      m_HorizontalBearingY: 24
+      m_HorizontalAdvance: 48
+    m_GlyphRect:
+      m_X: 96
+      m_Y: 0
+      m_Width: 48
+      m_Height: 48
+    m_Scale: 1
+    m_AtlasIndex: 0
+    sprite: {fileID: 271848359, guid: da10414876ada2e47b9c5bf200a54dcc, type: 3}
   spriteInfoList: []
   fallbackSpriteAssets: []
---- !u!21 &9095146845602255721
+--- !u!21 &5085627736720636731
 Material:
   serializedVersion: 8
   m_ObjectHideFlags: 1