lzx 3 днів тому
батько
коміт
b5d0559c2e

+ 4 - 11
Assets/Res/Config/InitialPlayerConfig.json

@@ -4,25 +4,18 @@
       "ID": 1,
       "ID": 1,
       "itemId": [
       "itemId": [
         1001,
         1001,
-        1002,
-        1003,
-        1004,
         1005,
         1005,
-        1007
+        1006
       ],
       ],
       "itemAmount": [
       "itemAmount": [
-        10,
-        10,
-        10,
-        10,
-        10,
-        100000
+        10000,
+        1000,
+        1000
       ],
       ],
       "fabaoId": [
       "fabaoId": [
         10002
         10002
       ],
       ],
       "gongfaId": [
       "gongfaId": [
-        1405,
         1501
         1501
       ],
       ],
       "shenshiPoint": 200
       "shenshiPoint": 200

+ 35 - 31
Assets/Res/Config/LanguageChineseConfig.json

@@ -13342,111 +13342,111 @@
     },
     },
     {
     {
       "ID": 4076,
       "ID": 4076,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4077,
       "ID": 4077,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4078,
       "ID": 4078,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4079,
       "ID": 4079,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4080,
       "ID": 4080,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4081,
       "ID": 4081,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4082,
       "ID": 4082,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4083,
       "ID": 4083,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4084,
       "ID": 4084,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4085,
       "ID": 4085,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4086,
       "ID": 4086,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4087,
       "ID": 4087,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4088,
       "ID": 4088,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4089,
       "ID": 4089,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4090,
       "ID": 4090,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4091,
       "ID": 4091,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4092,
       "ID": 4092,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4093,
       "ID": 4093,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4094,
       "ID": 4094,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4095,
       "ID": 4095,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4096,
       "ID": 4096,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4097,
       "ID": 4097,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4098,
       "ID": 4098,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4099,
       "ID": 4099,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4100,
       "ID": 4100,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4101,
       "ID": 4101,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4102,
       "ID": 4102,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4103,
       "ID": 4103,
@@ -13494,7 +13494,7 @@
     },
     },
     {
     {
       "ID": 4114,
       "ID": 4114,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4115,
       "ID": 4115,
@@ -13558,11 +13558,11 @@
     },
     },
     {
     {
       "ID": 4130,
       "ID": 4130,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4131,
       "ID": 4131,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4132,
       "ID": 4132,
@@ -13806,7 +13806,7 @@
     },
     },
     {
     {
       "ID": 4192,
       "ID": 4192,
-      "txt": ""
+      "txt": "0"
     },
     },
     {
     {
       "ID": 4193,
       "ID": 4193,
@@ -38531,6 +38531,10 @@
     {
     {
       "ID": 10373,
       "ID": 10373,
       "txt": "十次十连必出一个紫色功法或法宝"
       "txt": "十次十连必出一个紫色功法或法宝"
+    },
+    {
+      "ID": 10374,
+      "txt": "装备"
     }
     }
   ]
   ]
 }
 }

+ 19 - 19
Assets/Res/UI/AppBarPanel/AppBarPanel.prefab

@@ -1158,13 +1158,15 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 1298634274934091846}
+  - {fileID: 523067891320849755}
   m_Father: {fileID: 909808399738442487}
   m_Father: {fileID: 909808399738442487}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -538.057}
-  m_SizeDelta: {x: 0, y: -1076.114}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 294.79385}
+  m_SizeDelta: {x: 750, y: 589.5877}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7344172054180224780
 --- !u!222 &7344172054180224780
 CanvasRenderer:
 CanvasRenderer:
@@ -2916,7 +2918,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3779985811257230296
 --- !u!222 &3779985811257230296
 CanvasRenderer:
 CanvasRenderer:
@@ -3167,12 +3169,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Children: []
-  m_Father: {fileID: 909808399738442487}
+  m_Father: {fileID: 7366721648260446241}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -543.25}
-  m_SizeDelta: {x: 0, y: -1086.5}
+  m_AnchoredPosition: {x: 0, y: -5.192993}
+  m_SizeDelta: {x: 0, y: -10.385986}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6828851503284679853
 --- !u!222 &6828851503284679853
 CanvasRenderer:
 CanvasRenderer:
@@ -3672,10 +3674,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children:
   m_Children:
   - {fileID: 249986433923533433}
   - {fileID: 249986433923533433}
-  - {fileID: 7366721648260446241}
-  - {fileID: 1298634274934091846}
   - {fileID: 8155081321350717393}
   - {fileID: 8155081321350717393}
-  - {fileID: 523067891320849755}
+  - {fileID: 7366721648260446241}
   m_Father: {fileID: 6230762972544331517}
   m_Father: {fileID: 6230762972544331517}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -3951,7 +3951,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -463.1741, y: 158}
+  m_SizeDelta: {x: -430.97397, y: 158}
   m_Pivot: {x: 0, y: 1}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &8458182348485034973
 --- !u!114 &8458182348485034973
 MonoBehaviour:
 MonoBehaviour:
@@ -4934,18 +4934,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9080464388727916189}
   m_GameObject: {fileID: 9080464388727916189}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children:
   m_Children:
   - {fileID: 5083944578448688889}
   - {fileID: 5083944578448688889}
-  m_Father: {fileID: 909808399738442487}
+  m_Father: {fileID: 7366721648260446241}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 17.4, y: 182.5379}
-  m_SizeDelta: {x: 732.3441, y: 314.4607}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 1.2999878, y: 182.5379}
+  m_SizeDelta: {x: -49.856018, y: -233.5393}
   m_Pivot: {x: 0.5, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &1377398502579023603
 --- !u!222 &1377398502579023603
 CanvasRenderer:
 CanvasRenderer:

+ 11 - 11
Assets/Res/UI/DaoYouPanel/DaoYouPanel.prefab

@@ -302,10 +302,10 @@ RectTransform:
   m_Children: []
   m_Children: []
   m_Father: {fileID: 9037135992368401232}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 645.1}
-  m_SizeDelta: {x: -341, y: -1498.5868}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -166.90002}
+  m_SizeDelta: {x: 409, y: 125.41321}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8532944055590825543
 --- !u!222 &8532944055590825543
 CanvasRenderer:
 CanvasRenderer:
@@ -412,10 +412,10 @@ RectTransform:
   - {fileID: 3941402820647323319}
   - {fileID: 3941402820647323319}
   m_Father: {fileID: 9037135992368401232}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.75006, y: -92.64496}
-  m_SizeDelta: {x: 751.5, y: 1179.7822}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0.75006104, y: -92.64496}
+  m_SizeDelta: {x: 1.5, y: -444.21777}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8171623730946413461
 --- !u!222 &8171623730946413461
 CanvasRenderer:
 CanvasRenderer:
@@ -518,10 +518,10 @@ RectTransform:
   m_Children: []
   m_Children: []
   m_Father: {fileID: 9037135992368401232}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 753, y: 1635}
+  m_SizeDelta: {x: 3, y: 11}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4297049821177640649
 --- !u!222 &4297049821177640649
 CanvasRenderer:
 CanvasRenderer:

+ 13 - 13
Assets/Res/UI/MainHeroPanel/MainHeroPanel.prefab

@@ -301,9 +301,9 @@ RectTransform:
   - {fileID: 6149294999606717487}
   - {fileID: 6149294999606717487}
   m_Father: {fileID: 9037135992368401232}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -220, y: -183.9}
+  m_AnchorMin: {x: 0.5, y: 0.3672504}
+  m_AnchorMax: {x: 0.5, y: 0.3672504}
+  m_AnchoredPosition: {x: -220, y: 22}
   m_SizeDelta: {x: 194, y: 191}
   m_SizeDelta: {x: 194, y: 191}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1929128560441779914
 --- !u!222 &1929128560441779914
@@ -437,7 +437,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 158.0227, y: 271.91528}
+  m_AnchoredPosition: {x: 158.0227, y: 253.5}
   m_SizeDelta: {x: 367.1273, y: 650.2457}
   m_SizeDelta: {x: 367.1273, y: 650.2457}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8643150439074238954
 --- !u!222 &8643150439074238954
@@ -703,10 +703,10 @@ RectTransform:
   - {fileID: 5059099144490991677}
   - {fileID: 5059099144490991677}
   m_Father: {fileID: 9037135992368401232}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -334.41916}
-  m_SizeDelta: {x: 593.5897, y: 39.3954}
+  m_AnchorMin: {x: 0.5053333, y: 0.19325039}
+  m_AnchorMax: {x: 0.5053333, y: 0.19325039}
+  m_AnchoredPosition: {x: -4, y: 109}
+  m_SizeDelta: {x: 593.5897, y: 39.395386}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2213859869968322266
 --- !u!222 &2213859869968322266
 CanvasRenderer:
 CanvasRenderer:
@@ -795,7 +795,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -6.6, y: 7.1}
+  m_AnchoredPosition: {x: -6.6, y: 7.100006}
   m_SizeDelta: {x: 201.0818, y: 44.582}
   m_SizeDelta: {x: 201.0818, y: 44.582}
   m_Pivot: {x: 0.5, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &5679273784600044542
 --- !u!222 &5679273784600044542
@@ -1951,9 +1951,9 @@ RectTransform:
   m_Children: []
   m_Children: []
   m_Father: {fileID: 9037135992368401232}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 46.3, y: -440}
+  m_AnchorMin: {x: 0.5053333, y: 0.19325039}
+  m_AnchorMax: {x: 0.5053333, y: 0.19325039}
+  m_AnchoredPosition: {x: -332.7, y: 10}
   m_SizeDelta: {x: 0, y: 100}
   m_SizeDelta: {x: 0, y: 100}
   m_Pivot: {x: 0, y: 0.5}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &658240713667546595
 --- !u!222 &658240713667546595
@@ -2139,7 +2139,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 --- !u!114 &4159330424245520485
 MonoBehaviour:
 MonoBehaviour:

+ 81 - 60
Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab

@@ -36,7 +36,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 193.31482, y: -21.61725}
+  m_AnchoredPosition: {x: 193.3148, y: -21.61725}
   m_SizeDelta: {x: 100, y: 43.2345}
   m_SizeDelta: {x: 100, y: 43.2345}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2840349042557368767
 --- !u!222 &2840349042557368767
@@ -130,10 +130,10 @@ RectTransform:
   m_Children: []
   m_Children: []
   m_Father: {fileID: 3562230635030506916}
   m_Father: {fileID: 3562230635030506916}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 138.9}
-  m_SizeDelta: {x: -51.2629, y: -308.8229}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 342.5, y: -41.100006}
+  m_SizeDelta: {x: 633.7371, y: 51.177094}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4120117667128276633
 --- !u!222 &4120117667128276633
 CanvasRenderer:
 CanvasRenderer:
@@ -358,9 +358,9 @@ RectTransform:
   m_Children: []
   m_Children: []
   m_Father: {fileID: 9037135992368401232}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -292, y: -756.42}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 83, y: 55.580017}
   m_SizeDelta: {x: 94, y: 94}
   m_SizeDelta: {x: 94, y: 94}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2730823204024787406
 --- !u!222 &2730823204024787406
@@ -696,19 +696,19 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1597840459203571142}
   m_GameObject: {fileID: 1597840459203571142}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children:
   m_Children:
   - {fileID: 4734313281934727207}
   - {fileID: 4734313281934727207}
   - {fileID: 4451777815596004657}
   - {fileID: 4451777815596004657}
-  m_Father: {fileID: 3478042439320372479}
+  m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 99.7, y: -566.1}
-  m_SizeDelta: {x: 0, y: 100}
+  m_AnchorMin: {x: 0.63600004, y: 0.3511527}
+  m_AnchorMax: {x: 0.63600004, y: 0.3511527}
+  m_AnchoredPosition: {x: -2.300003, y: -8.700012}
+  m_SizeDelta: {x: 0, y: 99}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6326345466183093196
 --- !u!222 &6326345466183093196
 CanvasRenderer:
 CanvasRenderer:
@@ -1351,7 +1351,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -2.6725006, y: 3.1658}
+  m_AnchoredPosition: {x: -2.6725006, y: 3.1657715}
   m_SizeDelta: {x: 744.65, y: 93.3149}
   m_SizeDelta: {x: 744.65, y: 93.3149}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7716397206816543063
 --- !u!222 &7716397206816543063
@@ -1375,7 +1375,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -1383,9 +1383,9 @@ MonoBehaviour:
     m_PersistentCalls:
     m_PersistentCalls:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 28
     m_FontSize: 28
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 10
     m_MinSize: 10
     m_MaxSize: 40
     m_MaxSize: 40
@@ -1581,18 +1581,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2864272361358652452}
   m_GameObject: {fileID: 2864272361358652452}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children:
   m_Children:
   - {fileID: 2758136446838127516}
   - {fileID: 2758136446838127516}
   - {fileID: 1723988732018600186}
   - {fileID: 1723988732018600186}
-  m_Father: {fileID: 3478042439320372479}
+  m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0.0019042, y: -551.3}
+  m_AnchorMin: {x: 0.63600004, y: 0.3511527}
+  m_AnchorMax: {x: 0.63600004, y: 0.3511527}
+  m_AnchoredPosition: {x: -101.99812, y: 3}
   m_SizeDelta: {x: 750, y: 100}
   m_SizeDelta: {x: 750, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6922482407468544096
 --- !u!222 &6922482407468544096
@@ -1746,10 +1746,10 @@ RectTransform:
   m_Children: []
   m_Children: []
   m_Father: {fileID: 3562230635030506916}
   m_Father: {fileID: 3562230635030506916}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 10.872, y: -0.8459}
-  m_SizeDelta: {x: 699.1672, y: 348.6952}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 10.871948, y: -0.84588623}
+  m_SizeDelta: {x: 15.167175, y: -11.30481}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6526978654290202973
 --- !u!222 &6526978654290202973
 CanvasRenderer:
 CanvasRenderer:
@@ -2135,10 +2135,10 @@ RectTransform:
   - {fileID: 7549329767833865597}
   - {fileID: 7549329767833865597}
   m_Father: {fileID: 4776823611480169892}
   m_Father: {fileID: 4776823611480169892}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 81.87085, y: -2.1757}
-  m_SizeDelta: {x: 527.9659, y: 363.6543}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 81.87085, y: -0.9934082}
+  m_SizeDelta: {x: -182.03412, y: -21.601288}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8915730683377899395
 --- !u!222 &8915730683377899395
 CanvasRenderer:
 CanvasRenderer:
@@ -2242,11 +2242,11 @@ RectTransform:
   - {fileID: 4323141330538414364}
   - {fileID: 4323141330538414364}
   m_Father: {fileID: 4776823611480169892}
   m_Father: {fileID: 4776823611480169892}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -266.9, y: 52.896}
-  m_SizeDelta: {x: 142.1363, y: 241.02}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 18.600006, y: -11.700012}
+  m_SizeDelta: {x: 142.1363, y: 241.02002}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &6714714804991343926
 --- !u!222 &6714714804991343926
 CanvasRenderer:
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -2558,6 +2558,7 @@ GameObject:
   - component: {fileID: 4776823611480169892}
   - component: {fileID: 4776823611480169892}
   - component: {fileID: 6151773998871783578}
   - component: {fileID: 6151773998871783578}
   - component: {fileID: 5917461037037484268}
   - component: {fileID: 5917461037037484268}
+  - component: {fileID: 38014592068248328}
   m_Layer: 0
   m_Layer: 0
   m_HasEditorInfo: 1
   m_HasEditorInfo: 1
   m_Name: FabaoBagRoot
   m_Name: FabaoBagRoot
@@ -2583,10 +2584,10 @@ RectTransform:
   - {fileID: 3817589179843688023}
   - {fileID: 3817589179843688023}
   m_Father: {fileID: 9037135992368401232}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 1.2874, y: -508.81052}
-  m_SizeDelta: {x: 710.9213, y: 384.2869}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0.31550077}
+  m_AnchoredPosition: {x: 1.2873993, y: 54.5}
+  m_SizeDelta: {x: 710.9213, y: -113.18982}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6151773998871783578
 --- !u!222 &6151773998871783578
 CanvasRenderer:
 CanvasRenderer:
@@ -2639,6 +2640,26 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
   direction: 0
+--- !u!114 &38014592068248328
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3931340268851502278}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: 575.8102
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
 --- !u!1 &4135189185558242575
 --- !u!1 &4135189185558242575
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -2671,15 +2692,13 @@ RectTransform:
   m_Children:
   m_Children:
   - {fileID: 6108060668469187376}
   - {fileID: 6108060668469187376}
   - {fileID: 4516305854009966259}
   - {fileID: 4516305854009966259}
-  - {fileID: 3878043637437832509}
-  - {fileID: 7973274776071248274}
   m_Father: {fileID: 9037135992368401232}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 294.95605}
-  m_SizeDelta: {x: 750, y: 978.17}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -25}
+  m_SizeDelta: {x: 750, y: 978.1699}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &7857312306567959386
 --- !u!222 &7857312306567959386
 CanvasRenderer:
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -3218,7 +3237,6 @@ RectTransform:
   - {fileID: 4961536466157608292}
   - {fileID: 4961536466157608292}
   - {fileID: 8695863786727674304}
   - {fileID: 8695863786727674304}
   - {fileID: 7222205424052035792}
   - {fileID: 7222205424052035792}
-  - {fileID: 3562230635030506916}
   - {fileID: 6136655831423186836}
   - {fileID: 6136655831423186836}
   m_Father: {fileID: 3478042439320372479}
   m_Father: {fileID: 3478042439320372479}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3268,12 +3286,12 @@ RectTransform:
   - {fileID: 8655916088170144736}
   - {fileID: 8655916088170144736}
   - {fileID: 5462186991158084938}
   - {fileID: 5462186991158084938}
   - {fileID: 8073423848255295774}
   - {fileID: 8073423848255295774}
-  m_Father: {fileID: 6108060668469187376}
+  m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -14.875, y: -345.9}
-  m_SizeDelta: {x: 684.93, y: 359.5283}
+  m_AnchorMin: {x: 0.5, y: 0.38300002}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: -14.875, y: -302.86188}
+  m_SizeDelta: {x: 684.9299, y: -607.1437}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6680631196129598971
 --- !u!222 &6680631196129598971
 CanvasRenderer:
 CanvasRenderer:
@@ -3733,7 +3751,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6114928648539321970}
   m_GameObject: {fileID: 6114928648539321970}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
@@ -3741,10 +3759,10 @@ RectTransform:
   - {fileID: 2940586768892950692}
   - {fileID: 2940586768892950692}
   m_Father: {fileID: 3562230635030506916}
   m_Father: {fileID: 3562230635030506916}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 7.9889, y: -34.1106}
-  m_SizeDelta: {x: 668.95, y: 274.3037}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 16.1624, y: -30.87207}
+  m_SizeDelta: {x: -15.049988, y: -85.69629}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2646367918689829722
 --- !u!222 &2646367918689829722
 CanvasRenderer:
 CanvasRenderer:
@@ -4513,7 +4531,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
   m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
-  id: 10202
+  id: 10374
 --- !u!1 &7897947665373750767
 --- !u!1 &7897947665373750767
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -4789,6 +4807,9 @@ RectTransform:
   - {fileID: 317265118546245604}
   - {fileID: 317265118546245604}
   - {fileID: 8626833803530248980}
   - {fileID: 8626833803530248980}
   - {fileID: 3478042439320372479}
   - {fileID: 3478042439320372479}
+  - {fileID: 3562230635030506916}
+  - {fileID: 3878043637437832509}
+  - {fileID: 7973274776071248274}
   - {fileID: 4776823611480169892}
   - {fileID: 4776823611480169892}
   - {fileID: 696920691199857773}
   - {fileID: 696920691199857773}
   - {fileID: 197690018790557001}
   - {fileID: 197690018790557001}
@@ -4797,7 +4818,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 --- !u!114 &4159330424245520485
 MonoBehaviour:
 MonoBehaviour:

+ 20 - 20
Assets/Res/UI/SentimentPanel/SentimentInfoPanel.prefab

@@ -595,10 +595,10 @@ RectTransform:
   - {fileID: 4796745246236082143}
   - {fileID: 4796745246236082143}
   m_Father: {fileID: 2042784205301195018}
   m_Father: {fileID: 2042784205301195018}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 1.1899, y: 198.15137}
   m_AnchoredPosition: {x: 1.1899, y: 198.15137}
-  m_SizeDelta: {x: 689.3018, y: 803.8899}
+  m_SizeDelta: {x: 689.3018, y: -286.1101}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1879486292270132546
 --- !u!222 &1879486292270132546
 CanvasRenderer:
 CanvasRenderer:
@@ -781,10 +781,10 @@ RectTransform:
   m_Children: []
   m_Children: []
   m_Father: {fileID: 9037135992368401232}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 1.4931946, y: 649.22736}
-  m_SizeDelta: {x: 438.1111, y: 82.1458}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 1.4931946, y: -162.77264}
+  m_SizeDelta: {x: 438.1111, y: 82.14581}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8209220855313739607
 --- !u!222 &8209220855313739607
 CanvasRenderer:
 CanvasRenderer:
@@ -953,13 +953,12 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children:
   m_Children:
   - {fileID: 2748343673413609305}
   - {fileID: 2748343673413609305}
-  - {fileID: 2094779113935113657}
   m_Father: {fileID: 9037135992368401232}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 1.4932, y: -5.9728}
-  m_SizeDelta: {x: 644.8906, y: 1089.9884}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 1.4932, y: -5.9727783}
+  m_SizeDelta: {x: 644.8906, y: -534.0116}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5823954938169497082
 --- !u!222 &5823954938169497082
 CanvasRenderer:
 CanvasRenderer:
@@ -1313,12 +1312,12 @@ RectTransform:
   - {fileID: 4895568140128780391}
   - {fileID: 4895568140128780391}
   - {fileID: 1555521516844959039}
   - {fileID: 1555521516844959039}
   - {fileID: 8702795168959758065}
   - {fileID: 8702795168959758065}
-  m_Father: {fileID: 2042784205301195018}
+  m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 1.1897888, y: -125.134094}
-  m_SizeDelta: {x: 44.411, y: 448.8441}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 2.6829834, y: 135.89893}
+  m_SizeDelta: {x: 689.30164, y: 448.8441}
   m_Pivot: {x: 0.5, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8643199852993090924
 --- !u!222 &8643199852993090924
 CanvasRenderer:
 CanvasRenderer:
@@ -2304,14 +2303,15 @@ RectTransform:
   - {fileID: 7692224466086610}
   - {fileID: 7692224466086610}
   - {fileID: 870851736323112643}
   - {fileID: 870851736323112643}
   - {fileID: 502004080859018007}
   - {fileID: 502004080859018007}
-  - {fileID: 2042784205301195018}
   - {fileID: 2834830722424334932}
   - {fileID: 2834830722424334932}
+  - {fileID: 2042784205301195018}
+  - {fileID: 2094779113935113657}
   m_Father: {fileID: 0}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 --- !u!114 &4159330424245520485
 MonoBehaviour:
 MonoBehaviour:
@@ -2708,7 +2708,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
     - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_AnchoredPosition.x
       propertyPath: m_AnchoredPosition.x
-      value: 64.9249
+      value: 76.2841
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
     - target: {fileID: 8879216144060700877, guid: 9d4f51c4bf9f70844814409f339d6203, type: 3}
       propertyPath: m_AnchoredPosition.y
       propertyPath: m_AnchoredPosition.y

+ 15 - 15
Assets/Res/UI/SentimentPanel/SentimentPanel.prefab

@@ -167,11 +167,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children:
   m_Children:
   - {fileID: 1221245534683144636}
   - {fileID: 1221245534683144636}
-  m_Father: {fileID: 9037135992368401232}
+  m_Father: {fileID: 8433458334176511681}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -103.8, y: 616.1}
+  m_AnchoredPosition: {x: 118.30003, y: -20.449951}
   m_SizeDelta: {x: 41.0994, y: 41.0994}
   m_SizeDelta: {x: 41.0994, y: 41.0994}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5598588778828645707
 --- !u!222 &5598588778828645707
@@ -375,12 +375,13 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 1875949677358207680}
   m_Father: {fileID: 9037135992368401232}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -222.1, y: 636.55}
+  m_AnchorMin: {x: 0.20533334, y: 0.9342489}
+  m_AnchorMax: {x: 0.20533334, y: 0.9342489}
+  m_AnchoredPosition: {x: -1.1000061, y: -30}
   m_SizeDelta: {x: 182, y: 82}
   m_SizeDelta: {x: 182, y: 82}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4170656597210444513
 --- !u!222 &4170656597210444513
@@ -735,7 +736,6 @@ RectTransform:
   - {fileID: 4014844787387584513}
   - {fileID: 4014844787387584513}
   - {fileID: 554324853660007873}
   - {fileID: 554324853660007873}
   - {fileID: 8433458334176511681}
   - {fileID: 8433458334176511681}
-  - {fileID: 1875949677358207680}
   - {fileID: 3651673096014695874}
   - {fileID: 3651673096014695874}
   - {fileID: 5288387091934357928}
   - {fileID: 5288387091934357928}
   - {fileID: 4487682254935894402}
   - {fileID: 4487682254935894402}
@@ -749,7 +749,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 --- !u!114 &4159330424245520485
 MonoBehaviour:
 MonoBehaviour:
@@ -868,7 +868,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
       propertyPath: m_AnchoredPosition.y
       propertyPath: m_AnchoredPosition.y
-      value: -233
+      value: -223
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       propertyPath: m_LocalEulerAnglesHint.x
@@ -983,7 +983,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
       propertyPath: m_AnchoredPosition.y
       propertyPath: m_AnchoredPosition.y
-      value: -84
+      value: -74
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1098,7 +1098,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
       propertyPath: m_AnchoredPosition.y
       propertyPath: m_AnchoredPosition.y
-      value: 275
+      value: 285
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1213,7 +1213,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
       propertyPath: m_AnchoredPosition.y
       propertyPath: m_AnchoredPosition.y
-      value: -381
+      value: -371
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1328,7 +1328,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
       propertyPath: m_AnchoredPosition.y
       propertyPath: m_AnchoredPosition.y
-      value: -541
+      value: -531
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1443,7 +1443,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
       propertyPath: m_AnchoredPosition.y
       propertyPath: m_AnchoredPosition.y
-      value: 59
+      value: 69
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1558,7 +1558,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
       propertyPath: m_AnchoredPosition.y
       propertyPath: m_AnchoredPosition.y
-      value: 360
+      value: 370
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
     - target: {fileID: 8869132852931889746, guid: d9c0ce7907495ad48bab9dd8a38b311a, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       propertyPath: m_LocalEulerAnglesHint.x

+ 12 - 12
Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -947,7 +947,6 @@ RectTransform:
   - {fileID: 1062516556747891371}
   - {fileID: 1062516556747891371}
   - {fileID: 5964692562241983256}
   - {fileID: 5964692562241983256}
   - {fileID: 1219834969852229682}
   - {fileID: 1219834969852229682}
-  - {fileID: 3549792637730888341}
   - {fileID: 918016307754855288}
   - {fileID: 918016307754855288}
   - {fileID: 2507585154746067127}
   - {fileID: 2507585154746067127}
   - {fileID: 1896441137542441893}
   - {fileID: 1896441137542441893}
@@ -1814,11 +1813,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Children: []
-  m_Father: {fileID: 6694772361877173011}
+  m_Father: {fileID: 2507585154746067127}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 3.0999756, y: 403}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 331.09998, y: 52}
   m_SizeDelta: {x: 660.9051, y: 65.62244}
   m_SizeDelta: {x: 660.9051, y: 65.62244}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4186974081922981718
 --- !u!222 &4186974081922981718
@@ -1912,10 +1911,10 @@ RectTransform:
   - {fileID: 5812057225866309631}
   - {fileID: 5812057225866309631}
   m_Father: {fileID: 6694772361877173011}
   m_Father: {fileID: 6694772361877173011}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -1.0498962, y: -28.362976}
-  m_SizeDelta: {x: -94.49573, y: -968.6104}
+  m_AnchorMin: {x: 0.5, y: 0.3372504}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: -1.0499268, y: -253.36304}
+  m_SizeDelta: {x: 655.5043, y: -518.6104}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8956727549716453988
 --- !u!222 &8956727549716453988
 CanvasRenderer:
 CanvasRenderer:
@@ -2300,7 +2299,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.48260498, y: -7.3995056}
+  m_AnchoredPosition: {x: 0.48260498, y: -7.399536}
   m_SizeDelta: {x: -16.4842, y: -14.799}
   m_SizeDelta: {x: -16.4842, y: -14.799}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4335290694010786724
 --- !u!222 &4335290694010786724
@@ -3965,12 +3964,13 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children:
   m_Children:
   - {fileID: 3289851963449376272}
   - {fileID: 3289851963449376272}
+  - {fileID: 3549792637730888341}
   m_Father: {fileID: 6694772361877173011}
   m_Father: {fileID: 6694772361877173011}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0.2675008}
   m_AnchoredPosition: {x: 0, y: 127}
   m_AnchoredPosition: {x: 0, y: 127}
-  m_SizeDelta: {x: 655.5, y: 225.89893}
+  m_SizeDelta: {x: 655.5, y: -131.10107}
   m_Pivot: {x: 0.5, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &4415456503076877641
 --- !u!222 &4415456503076877641
 CanvasRenderer:
 CanvasRenderer:

+ 6 - 6
Assets/Res/UI/TowerPanel/TowerPanel.prefab

@@ -33,10 +33,10 @@ RectTransform:
   m_Children: []
   m_Children: []
   m_Father: {fileID: 2320419141840824405}
   m_Father: {fileID: 2320419141840824405}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -139.04}
-  m_SizeDelta: {x: 688.6959, y: 98.923}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -327.03998}
+  m_SizeDelta: {x: 688.6959, y: 98.923004}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &706898029654445840
 --- !u!222 &706898029654445840
 CanvasRenderer:
 CanvasRenderer:
@@ -879,10 +879,10 @@ RectTransform:
   - {fileID: 7061507061399606031}
   - {fileID: 7061507061399606031}
   m_Father: {fileID: 2697149107937856371}
   m_Father: {fileID: 2697149107937856371}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: -375, y: -434.80444}
   m_AnchoredPosition: {x: -375, y: -434.80444}
-  m_SizeDelta: {x: 750, y: 921.1238}
+  m_SizeDelta: {x: 750, y: -702.8762}
   m_Pivot: {x: 0, y: 1}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &7624448035972685143
 --- !u!114 &7624448035972685143
 MonoBehaviour:
 MonoBehaviour:

+ 11 - 11
Assets/Scenes/testCombat.scene

@@ -571,14 +571,14 @@ Sprite:
     m_Bindpose: []
     m_Bindpose: []
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
-      x: 531
-      y: 780
+      x: 445
+      y: 1468
       width: 28
       width: 28
       height: 29
       height: 29
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 531, y: 780}
+    atlasRectOffset: {x: 445, y: 1468}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 545, z: 100, w: 794.5}
+    uvTransform: {x: 100, y: 459, z: 100, w: 1482.5}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape:
   m_PhysicsShape:
   - - {x: -0.14, y: 0.145}
   - - {x: -0.14, y: 0.145}
@@ -1164,12 +1164,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
   m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
+  m_UiScaleMode: 1
   m_ReferencePixelsPerUnit: 100
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1
   m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
+  m_ReferenceResolution: {x: 750, y: 1624}
   m_ScreenMatchMode: 0
   m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
+  m_MatchWidthOrHeight: 1
   m_PhysicalUnit: 3
   m_PhysicalUnit: 3
   m_FallbackScreenDPI: 96
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DefaultSpriteDPI: 96
@@ -1569,14 +1569,14 @@ Sprite:
     m_Bindpose: []
     m_Bindpose: []
     textureRect:
     textureRect:
       serializedVersion: 2
       serializedVersion: 2
-      x: 67
-      y: 1598
+      x: 1877
+      y: 399
       width: 59
       width: 59
       height: 53
       height: 53
     textureRectOffset: {x: 0, y: 0}
     textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 67, y: 1598}
+    atlasRectOffset: {x: 1877, y: 399}
     settingsRaw: 67
     settingsRaw: 67
-    uvTransform: {x: 100, y: 96.5, z: 100, w: 1624.5}
+    uvTransform: {x: 100, y: 1906.5, z: 100, w: 425.5}
     downscaleMultiplier: 1
     downscaleMultiplier: 1
   m_PhysicsShape:
   m_PhysicsShape:
   - - {x: 0.155, y: -0.195}
   - - {x: 0.155, y: -0.195}

BIN
Excel2Json/Excel/Language.xlsx