Game Prototype V0.29.2 New Look UI

- Fix Random Skill UI To New Assets UI
Gongpai · Mar 25, 2024 · 5a0e333 · 5a0e333
1 parent b1d708c
commit 5a0e333
Show file tree

Hide file tree

Showing 20 changed files with 1,499 additions and 359 deletions.
diff --git a/Assets/Font/Moonjelly/Moonjelly-Bold SDF.asset b/Assets/Font/Moonjelly/Moonjelly-Bold SDF.asset
diff --git a/Assets/Prefabs/UI/Character/CharacterStatus.prefab b/Assets/Prefabs/UI/Character/CharacterStatus.prefab
@@ -109,7 +109,7 @@ RectTransform:
   - {fileID: 301807408975977943}
   - {fileID: 999084661830914078}
   m_Father: {fileID: 5825938031545823789}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -660,8 +660,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5825938031353813384}
-  - {fileID: 4668550884836017206}
   - {fileID: 5566330760905885544}
+  - {fileID: 4668550884836017206}
   - {fileID: 2503240075238392214}
   - {fileID: 5825938032015083460}
   m_Father: {fileID: 5825938031019873917}
@@ -1192,7 +1192,7 @@ PrefabInstance:
     - target: {fileID: 2154540932155788080, guid: b7eda50153684e748a39e78834513ec2,
         type: 3}
       propertyPath: m_RootOrder
-      value: 2
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2154540932155788080, guid: b7eda50153684e748a39e78834513ec2,
         type: 3}

diff --git a/Assets/Prefabs/UI/Character/RandomCharacterStatusSpinWheelUI.prefab b/Assets/Prefabs/UI/Character/RandomCharacterStatusSpinWheelUI.prefab
@@ -236,7 +236,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8246e2eed41248b49315c0e87ab8f01d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_fontAsset: {fileID: 11400000, guid: ee45a45177e768646b7f6a49ac8181ea, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: fda662a0403edea4ebd227e51b1d9be1, type: 2}
   m_fontStyles: 0
   m_fontWeight: 500
   m_fontSize: 22

diff --git a/Assets/Prefabs/UI/Character/RevivePlayerUI.prefab b/Assets/Prefabs/UI/Character/RevivePlayerUI.prefab
@@ -483,8 +483,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: Revive
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: ee45a45177e768646b7f6a49ac8181ea, type: 2}
-  m_sharedMaterial: {fileID: -5355595278949040358, guid: ee45a45177e768646b7f6a49ac8181ea,
+  m_fontAsset: {fileID: 11400000, guid: fda662a0403edea4ebd227e51b1d9be1, type: 2}
+  m_sharedMaterial: {fileID: -3168128083850113274, guid: fda662a0403edea4ebd227e51b1d9be1,
     type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}

diff --git a/Assets/Prefabs/UI/MainMenu/WarningBarUI.prefab b/Assets/Prefabs/UI/MainMenu/WarningBarUI.prefab
@@ -483,8 +483,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: Entering to level 1
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: ee45a45177e768646b7f6a49ac8181ea, type: 2}
-  m_sharedMaterial: {fileID: -5355595278949040358, guid: ee45a45177e768646b7f6a49ac8181ea,
+  m_fontAsset: {fileID: 11400000, guid: fda662a0403edea4ebd227e51b1d9be1, type: 2}
+  m_sharedMaterial: {fileID: -3168128083850113274, guid: fda662a0403edea4ebd227e51b1d9be1,
     type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
@@ -515,7 +515,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 16
   m_HorizontalAlignment: 1
   m_VerticalAlignment: 512
   m_textAlignment: 65535
@@ -626,7 +626,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.49019608}
+  m_Color: {r: 1, g: 0.83593726, b: 0.5424528, a: 0.49019608}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -703,7 +703,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 0.70325905, b: 0.18396229, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -756,8 +756,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: 0, y: 0}
-  m_SizeDelta: {x: 75, y: 0}
+  m_AnchoredPosition: {x: 0, y: -2}
+  m_SizeDelta: {x: 75, y: -4}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &5452987832973414070
 CanvasRenderer:
@@ -789,8 +789,8 @@ MonoBehaviour:
       m_Calls: []
   m_text: 5
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 91e049a481fbfad46866ece3aaf6a261, type: 2}
-  m_sharedMaterial: {fileID: 7134523503152810022, guid: 91e049a481fbfad46866ece3aaf6a261,
+  m_fontAsset: {fileID: 11400000, guid: fda662a0403edea4ebd227e51b1d9be1, type: 2}
+  m_sharedMaterial: {fileID: -3168128083850113274, guid: fda662a0403edea4ebd227e51b1d9be1,
     type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
@@ -821,7 +821,7 @@ MonoBehaviour:
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
   m_fontSizeMax: 72
-  m_fontStyle: 0
+  m_fontStyle: 16
   m_HorizontalAlignment: 2
   m_VerticalAlignment: 512
   m_textAlignment: 65535

diff --git a/Assets/Prefabs/UI/Skill/Skill_Description_Element.prefab b/Assets/Prefabs/UI/Skill/Skill_Description_Element.prefab
@@ -69,16 +69,16 @@ MonoBehaviour:
       m_Calls: []
   m_text: gsgsmgsjoijojoi
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 91e049a481fbfad46866ece3aaf6a261, type: 2}
-  m_sharedMaterial: {fileID: 7134523503152810022, guid: 91e049a481fbfad46866ece3aaf6a261,
+  m_fontAsset: {fileID: 11400000, guid: fda662a0403edea4ebd227e51b1d9be1, type: 2}
+  m_sharedMaterial: {fileID: -3168128083850113274, guid: fda662a0403edea4ebd227e51b1d9be1,
     type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4278190080
-  m_fontColor: {r: 0, g: 0, b: 0, a: 1}
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -95,8 +95,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 18
-  m_fontSizeBase: 18
+  m_fontSize: 16
+  m_fontSizeBase: 16
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -227,16 +227,16 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Sprite: {fileID: -1060611895, guid: 813633580c1a0c74b967dcadd78a81a2, type: 3}
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
+  m_PixelsPerUnitMultiplier: 2.5
 --- !u!114 &4325755889555492414
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -250,10 +250,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 2
-    m_Right: 2
-    m_Top: 2
-    m_Bottom: 2
+    m_Left: 10
+    m_Right: 10
+    m_Top: 5
+    m_Bottom: 5
   m_ChildAlignment: 0
   m_Spacing: 5
   m_ChildForceExpandWidth: 1
@@ -352,16 +352,16 @@ MonoBehaviour:
       m_Calls: []
   m_text: rtrttrjrtjrjtrjrtjrjrtjrtjtrjrtjrtjtrj
   m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 91e049a481fbfad46866ece3aaf6a261, type: 2}
-  m_sharedMaterial: {fileID: 7134523503152810022, guid: 91e049a481fbfad46866ece3aaf6a261,
+  m_fontAsset: {fileID: 11400000, guid: fda662a0403edea4ebd227e51b1d9be1, type: 2}
+  m_sharedMaterial: {fileID: -3168128083850113274, guid: fda662a0403edea4ebd227e51b1d9be1,
     type: 2}
   m_fontSharedMaterials: []
   m_fontMaterial: {fileID: 0}
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4278190080
-  m_fontColor: {r: 0, g: 0, b: 0, a: 1}
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
   m_fontColorGradient:
@@ -378,8 +378,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 18
-  m_fontSizeBase: 18
+  m_fontSize: 16
+  m_fontSizeBase: 16
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18