Added boots and helmets

qq317423892 · Mar 10, 2021 · 2330a99 · 2330a99
1 parent 8f51879
commit 2330a99
Show file tree

Hide file tree

Showing 172 changed files with 7,851 additions and 31 deletions.
diff --git a/Emerald/Assets/Scenes/GameScene.unity b/Emerald/Assets/Scenes/GameScene.unity
@@ -2409,8 +2409,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1728818045}
   m_HandleRect: {fileID: 1728818044}
   m_Direction: 2
-  m_Value: 1
-  m_Size: 0.8
+  m_Value: 1.0000005
+  m_Size: 0.7999999
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -13897,7 +13897,7 @@ PrefabInstance:
     - target: {fileID: 8217915514658752808, guid: 9a181a73ec07aec409264cb8a15c6534,
         type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8217915514658752808, guid: 9a181a73ec07aec409264cb8a15c6534,
         type: 3}
@@ -50150,12 +50150,12 @@ PrefabInstance:
     - target: {fileID: 1961678130873758005, guid: 9a181a73ec07aec409264cb8a15c6534,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 80
+      value: 56
       objectReference: {fileID: 0}
     - target: {fileID: 1961678130873758005, guid: 9a181a73ec07aec409264cb8a15c6534,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 36
+      value: 56
       objectReference: {fileID: 0}
     - target: {fileID: 2203195090453534471, guid: 9a181a73ec07aec409264cb8a15c6534,
         type: 3}
@@ -50191,7 +50191,7 @@ PrefabInstance:
     - target: {fileID: 8217915514658752808, guid: 9a181a73ec07aec409264cb8a15c6534,
         type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8217915514658752808, guid: 9a181a73ec07aec409264cb8a15c6534,
         type: 3}
@@ -50216,12 +50216,12 @@ PrefabInstance:
     - target: {fileID: 8217915514658752808, guid: 9a181a73ec07aec409264cb8a15c6534,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 80
+      value: 56
       objectReference: {fileID: 0}
     - target: {fileID: 8217915514658752808, guid: 9a181a73ec07aec409264cb8a15c6534,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 36
+      value: 56
       objectReference: {fileID: 0}
     - target: {fileID: 8217915514658752808, guid: 9a181a73ec07aec409264cb8a15c6534,
         type: 3}
@@ -58965,7 +58965,7 @@ PrefabInstance:
     - target: {fileID: 1961678130873758005, guid: 9a181a73ec07aec409264cb8a15c6534,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 72
+      value: 70
       objectReference: {fileID: 0}
     - target: {fileID: 1961678130873758005, guid: 9a181a73ec07aec409264cb8a15c6534,
         type: 3}
@@ -59006,7 +59006,7 @@ PrefabInstance:
     - target: {fileID: 8217915514658752808, guid: 9a181a73ec07aec409264cb8a15c6534,
         type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8217915514658752808, guid: 9a181a73ec07aec409264cb8a15c6534,
         type: 3}
@@ -81094,7 +81094,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 1.1900101, y: 169.71999}
-  m_SizeDelta: {x: 73, y: 70}
+  m_SizeDelta: {x: 70, y: 70}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1529741904
 MonoBehaviour:
@@ -89536,7 +89536,7 @@ RectTransform:
   m_Father: {fileID: 1213669648}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.19999999}
+  m_AnchorMin: {x: 0, y: 0.2000001}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 1.4, y: 0}
   m_SizeDelta: {x: 20, y: 20}
@@ -109242,7 +109242,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 1.4100113, y: -89.39002}
-  m_SizeDelta: {x: 81, y: 40}
+  m_SizeDelta: {x: 56, y: 56}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2094020586
 MonoBehaviour:

diff --git a/Emerald/Assets/Scenes/Login/LoginNew.unity b/Emerald/Assets/Scenes/Login/LoginNew.unity
@@ -159117,6 +159117,10 @@ MonoBehaviour:
   - {fileID: 3394433195558784323, guid: 87be8bbf2a84ddf4288bd98307dc3310, type: 3}
   WarriorHairs:
   - {fileID: 3141002763869974969, guid: 3d5843e99adbe0c4497cd12beb7153d8, type: 3}
+  - {fileID: 9093488289874897142, guid: 42cfa8383c1530a42b76d5a1a6649c9d, type: 3}
+  - {fileID: 0}
+  - {fileID: 2455892183046464986, guid: b27174bed9cd19348aea7db4a409f61f, type: 3}
+  - {fileID: 0}
   - {fileID: 2452916884171782707, guid: 48e7e0f0680438e429c8a3b1dd0ef79b, type: 3}
   WeaponModels:
   - {fileID: 5700830874757476417, guid: 7375500a0409e0840985f9304dd368dc, type: 3}

diff --git a/Emerald/Assets/UI/Resources/Items/100.png b/Emerald/Assets/UI/Resources/Items/100.png
diff --git a/Emerald/Assets/UI/Resources/Items/100.png.meta b/Emerald/Assets/UI/Resources/Items/100.png.meta
diff --git a/Emerald/Assets/UI/Resources/Items/101.png b/Emerald/Assets/UI/Resources/Items/101.png
diff --git a/Emerald/Assets/UI/Resources/Items/101.png.meta b/Emerald/Assets/UI/Resources/Items/101.png.meta
diff --git a/Emerald/Assets/UI/Resources/Items/102.png b/Emerald/Assets/UI/Resources/Items/102.png