Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Res/Config/ItemConfig.json

@@ -2003,8 +2003,8 @@
       "stack_1": 0,
       "associateID": 3,
       "associateVlaue": [
-        13001,
-        1101
+        13501,
+        2001
       ],
       "sort": null,
       "itemDesc_1": null
@@ -2032,8 +2032,8 @@
       "stack_1": 0,
       "associateID": 3,
       "associateVlaue": [
-        13002,
-        1102
+        13502,
+        2002
       ],
       "sort": null,
       "itemDesc_1": null
@@ -2061,8 +2061,8 @@
       "stack_1": 0,
       "associateID": 3,
       "associateVlaue": [
-        13003,
-        1103
+        13503,
+        2003
       ],
       "sort": null,
       "itemDesc_1": null
@@ -2090,8 +2090,8 @@
       "stack_1": 0,
       "associateID": 3,
       "associateVlaue": [
-        13004,
-        1104
+        13504,
+        2004
       ],
       "sort": null,
       "itemDesc_1": null
@@ -2119,8 +2119,8 @@
       "stack_1": 0,
       "associateID": 3,
       "associateVlaue": [
-        13005,
-        1105
+        13505,
+        2005
       ],
       "sort": null,
       "itemDesc_1": null
@@ -2148,8 +2148,8 @@
       "stack_1": 0,
       "associateID": 3,
       "associateVlaue": [
-        13006,
-        1201
+        13506,
+        2006
       ],
       "sort": null,
       "itemDesc_1": null
@@ -2177,8 +2177,8 @@
       "stack_1": 0,
       "associateID": 3,
       "associateVlaue": [
-        13007,
-        1202
+        13507,
+        2007
       ],
       "sort": null,
       "itemDesc_1": null
@@ -2206,8 +2206,8 @@
       "stack_1": 0,
       "associateID": 3,
       "associateVlaue": [
-        13008,
-        1203
+        13508,
+        2008
       ],
       "sort": null,
       "itemDesc_1": null
@@ -2836,6 +2836,206 @@
       "associateID": null,
       "sort": null,
       "itemDesc_1": null
+    },
+    {
+      "ID": 13501,
+      "itemName": 1625,
+      "itemDesc": 1725,
+      "icon": "icon_item_13501",
+      "itemTag": 14,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 13502,
+      "itemName": 1626,
+      "itemDesc": 1726,
+      "icon": "icon_item_13502",
+      "itemTag": 14,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 13503,
+      "itemName": 1627,
+      "itemDesc": 1727,
+      "icon": "icon_item_13503",
+      "itemTag": 14,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 13504,
+      "itemName": 1628,
+      "itemDesc": 1728,
+      "icon": "icon_item_13504",
+      "itemTag": 14,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 13505,
+      "itemName": 1629,
+      "itemDesc": 1729,
+      "icon": "icon_item_13505",
+      "itemTag": 14,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 13506,
+      "itemName": 1630,
+      "itemDesc": 1730,
+      "icon": "icon_item_13506",
+      "itemTag": 14,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 13507,
+      "itemName": 1631,
+      "itemDesc": 1731,
+      "icon": "icon_item_13507",
+      "itemTag": 14,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 13508,
+      "itemName": 1632,
+      "itemDesc": 1732,
+      "icon": "icon_item_13508",
+      "itemTag": 14,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": null,
+      "sort": null,
+      "itemDesc_1": null
     }
   ]
 }

Assets/Res/Config/LanguageChineseConfig.json

@@ -4458,7 +4458,7 @@
     },
     {
       "ID": 1115,
-      "txt": "生命、攻击、防御+2%"
+      "txt": "生命、攻击、防御+2;2;2%"
     },
     {
       "ID": 1116,
@@ -4466,7 +4466,7 @@
     },
     {
       "ID": 1117,
-      "txt": "生命、攻击、防御+3.5%"
+      "txt": "生命、攻击、防御+4;4;4%"
     },
     {
       "ID": 1118,
@@ -4474,11 +4474,11 @@
     },
     {
       "ID": 1119,
-      "txt": "生命、攻击、防御+5%"
+      "txt": "生命、攻击、防御+6;6;6%"
     },
     {
       "ID": 1120,
-      "txt": "生命、攻击、防御+2%"
+      "txt": "生命、攻击、防御+2;2;2%"
     },
     {
       "ID": 1121,
@@ -4486,7 +4486,7 @@
     },
     {
       "ID": 1122,
-      "txt": "生命、攻击、防御+3.5%"
+      "txt": "生命、攻击、防御+4;4;4%"
     },
     {
       "ID": 1123,
@@ -4494,7 +4494,7 @@
     },
     {
       "ID": 1124,
-      "txt": "生命、攻击、防御+5%"
+      "txt": "生命、攻击、防御+6;6;6%"
     },
     {
       "ID": 1125,
@@ -4558,7 +4558,7 @@
     },
     {
       "ID": 1140,
-      "txt": "生命、攻击、防御+2%"
+      "txt": "生命、攻击、防御+2;2;2%"
     },
     {
       "ID": 1141,
@@ -4566,7 +4566,7 @@
     },
     {
       "ID": 1142,
-      "txt": "生命、攻击、防御+3.5%"
+      "txt": "生命、攻击、防御+4;4;4%"
     },
     {
       "ID": 1143,
@@ -4574,11 +4574,11 @@
     },
     {
       "ID": 1144,
-      "txt": "生命、攻击、防御+5%"
+      "txt": "生命、攻击、防御+6;6;6%"
     },
     {
       "ID": 1145,
-      "txt": "生命、攻击、防御+2%"
+      "txt": "生命、攻击、防御+2;2;2%"
     },
     {
       "ID": 1146,
@@ -4586,7 +4586,7 @@
     },
     {
       "ID": 1147,
-      "txt": "生命、攻击、防御+3.5%"
+      "txt": "生命、攻击、防御+4;4;4%"
     },
     {
       "ID": 1148,
@@ -4594,7 +4594,7 @@
     },
     {
       "ID": 1149,
-      "txt": "生命、攻击、防御+5%"
+      "txt": "生命、攻击、防御+6;6;6%"
     },
     {
       "ID": 1150,
@@ -4658,7 +4658,7 @@
     },
     {
       "ID": 1165,
-      "txt": "生命、攻击、防御+2%"
+      "txt": "生命、攻击、防御+2;2;2%"
     },
     {
       "ID": 1166,
@@ -4666,7 +4666,7 @@
     },
     {
       "ID": 1167,
-      "txt": "生命、攻击、防御+3.5%"
+      "txt": "生命、攻击、防御+4;4;4%"
     },
     {
       "ID": 1168,
@@ -4674,11 +4674,11 @@
     },
     {
       "ID": 1169,
-      "txt": "生命、攻击、防御+5%"
+      "txt": "生命、攻击、防御+6;6;6%"
     },
     {
       "ID": 1170,
-      "txt": "生命、攻击、防御+2%"
+      "txt": "生命、攻击、防御+2;2;2%"
     },
     {
       "ID": 1171,
@@ -4686,7 +4686,7 @@
     },
     {
       "ID": 1172,
-      "txt": "生命、攻击、防御+3.5%"
+      "txt": "生命、攻击、防御+4;4;4%"
     },
     {
       "ID": 1173,
@@ -4694,7 +4694,7 @@
     },
     {
       "ID": 1174,
-      "txt": "生命、攻击、防御+5%"
+      "txt": "生命、攻击、防御+6;6;6%"
     },
     {
       "ID": 1175,
@@ -4758,7 +4758,7 @@
     },
     {
       "ID": 1190,
-      "txt": "生命、攻击、防御+2%"
+      "txt": "生命、攻击、防御+2;2;2%"
     },
     {
       "ID": 1191,
@@ -4766,7 +4766,7 @@
     },
     {
       "ID": 1192,
-      "txt": "生命、攻击、防御+3.5%"
+      "txt": "生命、攻击、防御+4;4;4%"
     },
     {
       "ID": 1193,
@@ -4774,11 +4774,11 @@
     },
     {
       "ID": 1194,
-      "txt": "生命、攻击、防御+5%"
+      "txt": "生命、攻击、防御+6;6;6%"
     },
     {
       "ID": 1195,
-      "txt": "生命、攻击、防御+2%"
+      "txt": "生命、攻击、防御+2;2;2%"
     },
     {
       "ID": 1196,
@@ -4786,7 +4786,7 @@
     },
     {
       "ID": 1197,
-      "txt": "生命、攻击、防御+3.5%"
+      "txt": "生命、攻击、防御+4;4;4%"
     },
     {
       "ID": 1198,
@@ -4794,7 +4794,7 @@
     },
     {
       "ID": 1199,
-      "txt": "生命、攻击、防御+5%"
+      "txt": "生命、攻击、防御+6;6;6%"
     },
     {
       "ID": 1200,
@@ -4858,7 +4858,7 @@
     },
     {
       "ID": 1215,
-      "txt": "生命、攻击、防御+2%"
+      "txt": "生命、攻击、防御+2;2;2%"
     },
     {
       "ID": 1216,
@@ -4866,7 +4866,7 @@
     },
     {
       "ID": 1217,
-      "txt": "生命、攻击、防御+3.5%"
+      "txt": "生命、攻击、防御+4;4;4%"
     },
     {
       "ID": 1218,
@@ -4874,11 +4874,11 @@
     },
     {
       "ID": 1219,
-      "txt": "生命、攻击、防御+5%"
+      "txt": "生命、攻击、防御+6;6;6%"
     },
     {
       "ID": 1220,
-      "txt": "生命、攻击、防御+2%"
+      "txt": "生命、攻击、防御+2;2;2%"
     },
     {
       "ID": 1221,
@@ -4886,7 +4886,7 @@
     },
     {
       "ID": 1222,
-      "txt": "生命、攻击、防御+3.5%"
+      "txt": "生命、攻击、防御+4;4;4%"
     },
     {
       "ID": 1223,
@@ -4894,23 +4894,23 @@
     },
     {
       "ID": 1224,
-      "txt": "生命、攻击、防御+5%"
+      "txt": "生命、攻击、防御+6;6;6%"
     },
     {
       "ID": 1225,
-      "txt": "生命、攻击、防御+2%"
+      "txt": "生命、攻击、防御+2;2;2%"
     },
     {
       "ID": 1226,
-      "txt": "生命、攻击、防御+4%"
+      "txt": "生命、攻击、防御+4;4;4%"
     },
     {
       "ID": 1227,
-      "txt": "生命、攻击、防御+6%"
+      "txt": "生命、攻击、防御+6;6;6%"
     },
     {
       "ID": 1228,
-      "txt": "生命、攻击、防御+8%"
+      "txt": "生命、攻击、防御+8;8;8%"
     },
     {
       "ID": 1229,
@@ -4918,19 +4918,19 @@
     },
     {
       "ID": 1230,
-      "txt": "生命、攻击、防御+2%"
+      "txt": "生命、攻击、防御+2;2;2%"
     },
     {
       "ID": 1231,
-      "txt": "生命、攻击、防御+4%"
+      "txt": "生命、攻击、防御+4;4;4%"
     },
     {
       "ID": 1232,
-      "txt": "生命、攻击、防御+6%"
+      "txt": "生命、攻击、防御+6;6;6%"
     },
     {
       "ID": 1233,
-      "txt": "生命、攻击、防御+8%"
+      "txt": "生命、攻击、防御+8;8;8%"
     },
     {
       "ID": 1234,
@@ -4938,19 +4938,19 @@
     },
     {
       "ID": 1235,
-      "txt": "生命、攻击、防御+2%"
+      "txt": "生命、攻击、防御+2;2;2%"
     },
     {
       "ID": 1236,
-      "txt": "生命、攻击、防御+4%"
+      "txt": "生命、攻击、防御+4;4;4%"
     },
     {
       "ID": 1237,
-      "txt": "生命、攻击、防御+6%"
+      "txt": "生命、攻击、防御+6;6;6%"
     },
     {
       "ID": 1238,
-      "txt": "生命、攻击、防御+8%"
+      "txt": "生命、攻击、防御+8;8;8%"
     },
     {
       "ID": 1239,
@@ -4958,19 +4958,19 @@
     },
     {
       "ID": 1240,
-      "txt": "生命、攻击、防御+2%"
+      "txt": "生命、攻击、防御+2;2;2%"
     },
     {
       "ID": 1241,
-      "txt": "生命、攻击、防御+4%"
+      "txt": "生命、攻击、防御+4;4;4%"
     },
     {
       "ID": 1242,
-      "txt": "生命、攻击、防御+6%"
+      "txt": "生命、攻击、防御+6;6;6%"
     },
     {
       "ID": 1243,
-      "txt": "生命、攻击、防御+8%"
+      "txt": "生命、攻击、防御+8;8;8%"
     },
     {
       "ID": 1244,
@@ -4978,19 +4978,19 @@
     },
     {
       "ID": 1245,
-      "txt": "生命、攻击、防御+2%"
+      "txt": "生命、攻击、防御+2;2;2%"
     },
     {
       "ID": 1246,
-      "txt": "生命、攻击、防御+4%"
+      "txt": "生命、攻击、防御+4;4;4%"
     },
     {
       "ID": 1247,
-      "txt": "生命、攻击、防御+6%"
+      "txt": "生命、攻击、防御+6;6;6%"
     },
     {
       "ID": 1248,
-      "txt": "生命、攻击、防御+8%"
+      "txt": "生命、攻击、防御+8;8;8%"
     },
     {
       "ID": 1249,
@@ -4998,19 +4998,19 @@
     },
     {
       "ID": 1250,
-      "txt": "生命、攻击、防御+2%"
+      "txt": "生命、攻击、防御+2;2;2%"
     },
     {
       "ID": 1251,
-      "txt": "生命、攻击、防御+4%"
+      "txt": "生命、攻击、防御+4;4;4%"
     },
     {
       "ID": 1252,
-      "txt": "生命、攻击、防御+6%"
+      "txt": "生命、攻击、防御+6;6;6%"
     },
     {
       "ID": 1253,
-      "txt": "生命、攻击、防御+8%"
+      "txt": "生命、攻击、防御+8;8;8%"
     },
     {
       "ID": 1254,
@@ -5018,19 +5018,19 @@
     },
     {
       "ID": 1255,
-      "txt": "生命、攻击、防御+2%"
+      "txt": "生命、攻击、防御+2;2;2%"
     },
     {
       "ID": 1256,
-      "txt": "生命、攻击、防御+4%"
+      "txt": "生命、攻击、防御+4;4;4%"
     },
     {
       "ID": 1257,
-      "txt": "生命、攻击、防御+6%"
+      "txt": "生命、攻击、防御+6;6;6%"
     },
     {
       "ID": 1258,
-      "txt": "生命、攻击、防御+8%"
+      "txt": "生命、攻击、防御+8;8;8%"
     },
     {
       "ID": 1259,
@@ -5038,19 +5038,19 @@
     },
     {
       "ID": 1260,
-      "txt": "生命、攻击、防御+2%"
+      "txt": "生命、攻击、防御+2;2;2%"
     },
     {
       "ID": 1261,
-      "txt": "生命、攻击、防御+4%"
+      "txt": "生命、攻击、防御+4;4;4%"
     },
     {
       "ID": 1262,
-      "txt": "生命、攻击、防御+6%"
+      "txt": "生命、攻击、防御+6;6;6%"
     },
     {
       "ID": 1263,
-      "txt": "生命、攻击、防御+8%"
+      "txt": "生命、攻击、防御+8;8;8%"
     },
     {
       "ID": 1264,
@@ -6498,35 +6498,35 @@
     },
     {
       "ID": 1625,
-      "txt": "功法碎片名称占位----------------"
+      "txt": "天衍星辰诀碎片"
     },
     {
       "ID": 1626,
-      "txt": "功法碎片名称占位----------------"
+      "txt": "法宝秘籍碎片"
     },
     {
       "ID": 1627,
-      "txt": "功法碎片名称占位----------------"
+      "txt": "崩脉决碎片"
     },
     {
       "ID": 1628,
-      "txt": "功法碎片名称占位----------------"
+      "txt": "两仪决碎片"
     },
     {
       "ID": 1629,
-      "txt": "功法碎片名称占位----------------"
+      "txt": "火焰决碎片"
     },
     {
       "ID": 1630,
-      "txt": "功法碎片名称占位----------------"
+      "txt": "乾坤巨灵诀碎片"
     },
     {
       "ID": 1631,
-      "txt": "功法碎片名称占位----------------"
+      "txt": "极速齿轮碎片"
     },
     {
       "ID": 1632,
-      "txt": "功法碎片名称占位----------------"
+      "txt": "太虚剑意碎片"
     },
     {
       "ID": 1633,
@@ -6898,35 +6898,35 @@
     },
     {
       "ID": 1725,
-      "txt": "用于功法--的升星"
+      "txt": "用于功法-天衍星辰诀-的升星"
     },
     {
       "ID": 1726,
-      "txt": "用于功法--的升星"
+      "txt": "用于功法-法宝秘籍-的升星"
     },
     {
       "ID": 1727,
-      "txt": "用于功法--的升星"
+      "txt": "用于功法-崩脉决-的升星"
     },
     {
       "ID": 1728,
-      "txt": "用于功法--的升星"
+      "txt": "用于功法-两仪决-的升星"
     },
     {
       "ID": 1729,
-      "txt": "用于功法--的升星"
+      "txt": "用于功法-火焰决-的升星"
     },
     {
       "ID": 1730,
-      "txt": "用于功法--的升星"
+      "txt": "用于功法-乾坤巨灵诀-的升星"
     },
     {
       "ID": 1731,
-      "txt": "用于功法--的升星"
+      "txt": "用于功法-极速齿轮-的升星"
     },
     {
       "ID": 1732,
-      "txt": "用于功法--的升星"
+      "txt": "用于功法-太虚剑意-的升星"
     },
     {
       "ID": 1733,
@@ -7614,11 +7614,11 @@
     },
     {
       "ID": 1904,
-      "txt": "0"
+      "txt": "法宝商店"
     },
     {
       "ID": 1905,
-      "txt": "0"
+      "txt": "功法商店"
     },
     {
       "ID": 1906,

Assets/Res/Config/ShopConfig.json

@@ -107,6 +107,798 @@
       "shopItemID": 6,
       "pageSortNum": 6,
       "continueTime": -1
+    },
+    {
+      "ID": 101,
+      "shopName": 300,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_eq_3_4_3"
+      ],
+      "shopGroup": 2,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 101,
+      "pageSortNum": 1,
+      "continueTime": -1
+    },
+    {
+      "ID": 102,
+      "shopName": 301,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_eq_3_4_3"
+      ],
+      "shopGroup": 2,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 102,
+      "pageSortNum": 2,
+      "continueTime": -1
+    },
+    {
+      "ID": 103,
+      "shopName": 302,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_eq_3_4_3"
+      ],
+      "shopGroup": 2,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 103,
+      "pageSortNum": 3,
+      "continueTime": -1
+    },
+    {
+      "ID": 104,
+      "shopName": 303,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_eq_3_4_3"
+      ],
+      "shopGroup": 2,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 104,
+      "pageSortNum": 4,
+      "continueTime": -1
+    },
+    {
+      "ID": 105,
+      "shopName": 304,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_eq_3_4_3"
+      ],
+      "shopGroup": 2,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 105,
+      "pageSortNum": 5,
+      "continueTime": -1
+    },
+    {
+      "ID": 106,
+      "shopName": 305,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_eq_3_4_3"
+      ],
+      "shopGroup": 2,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 106,
+      "pageSortNum": 6,
+      "continueTime": -1
+    },
+    {
+      "ID": 107,
+      "shopName": 306,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_eq_3_4_3"
+      ],
+      "shopGroup": 2,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 107,
+      "pageSortNum": 7,
+      "continueTime": -1
+    },
+    {
+      "ID": 108,
+      "shopName": 307,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_eq_3_4_3"
+      ],
+      "shopGroup": 2,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 108,
+      "pageSortNum": 8,
+      "continueTime": -1
+    },
+    {
+      "ID": 109,
+      "shopName": 1408,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_eq_3_4_3"
+      ],
+      "shopGroup": 2,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 109,
+      "pageSortNum": 9,
+      "continueTime": -1
+    },
+    {
+      "ID": 110,
+      "shopName": 1409,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_eq_3_4_3"
+      ],
+      "shopGroup": 2,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 110,
+      "pageSortNum": 10,
+      "continueTime": -1
+    },
+    {
+      "ID": 111,
+      "shopName": 1410,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_eq_3_4_3"
+      ],
+      "shopGroup": 2,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 111,
+      "pageSortNum": 11,
+      "continueTime": -1
+    },
+    {
+      "ID": 201,
+      "shopName": 1600,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 201,
+      "pageSortNum": 1,
+      "continueTime": -1
+    },
+    {
+      "ID": 202,
+      "shopName": 1601,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 202,
+      "pageSortNum": 2,
+      "continueTime": -1
+    },
+    {
+      "ID": 203,
+      "shopName": 1602,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 203,
+      "pageSortNum": 3,
+      "continueTime": -1
+    },
+    {
+      "ID": 204,
+      "shopName": 1603,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 204,
+      "pageSortNum": 4,
+      "continueTime": -1
+    },
+    {
+      "ID": 205,
+      "shopName": 1604,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 205,
+      "pageSortNum": 5,
+      "continueTime": -1
+    },
+    {
+      "ID": 206,
+      "shopName": 1605,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 206,
+      "pageSortNum": 6,
+      "continueTime": -1
+    },
+    {
+      "ID": 207,
+      "shopName": 1606,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 207,
+      "pageSortNum": 7,
+      "continueTime": -1
+    },
+    {
+      "ID": 208,
+      "shopName": 1607,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 208,
+      "pageSortNum": 8,
+      "continueTime": -1
+    },
+    {
+      "ID": 209,
+      "shopName": 1608,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 209,
+      "pageSortNum": 9,
+      "continueTime": -1
+    },
+    {
+      "ID": 210,
+      "shopName": 1609,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 210,
+      "pageSortNum": 10,
+      "continueTime": -1
+    },
+    {
+      "ID": 211,
+      "shopName": 1610,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 211,
+      "pageSortNum": 11,
+      "continueTime": -1
+    },
+    {
+      "ID": 212,
+      "shopName": 1611,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 212,
+      "pageSortNum": 12,
+      "continueTime": -1
+    },
+    {
+      "ID": 213,
+      "shopName": 1612,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 213,
+      "pageSortNum": 13,
+      "continueTime": -1
+    },
+    {
+      "ID": 214,
+      "shopName": 1613,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 214,
+      "pageSortNum": 14,
+      "continueTime": -1
+    },
+    {
+      "ID": 215,
+      "shopName": 1614,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 215,
+      "pageSortNum": 15,
+      "continueTime": -1
+    },
+    {
+      "ID": 216,
+      "shopName": 1615,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 216,
+      "pageSortNum": 16,
+      "continueTime": -1
+    },
+    {
+      "ID": 217,
+      "shopName": 1616,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 217,
+      "pageSortNum": 17,
+      "continueTime": -1
+    },
+    {
+      "ID": 218,
+      "shopName": 1617,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 218,
+      "pageSortNum": 18,
+      "continueTime": -1
+    },
+    {
+      "ID": 219,
+      "shopName": 1618,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 219,
+      "pageSortNum": 19,
+      "continueTime": -1
+    },
+    {
+      "ID": 220,
+      "shopName": 1619,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 220,
+      "pageSortNum": 20,
+      "continueTime": -1
+    },
+    {
+      "ID": 221,
+      "shopName": 1620,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 221,
+      "pageSortNum": 21,
+      "continueTime": -1
+    },
+    {
+      "ID": 222,
+      "shopName": 1621,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 222,
+      "pageSortNum": 22,
+      "continueTime": -1
+    },
+    {
+      "ID": 223,
+      "shopName": 1622,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 223,
+      "pageSortNum": 23,
+      "continueTime": -1
+    },
+    {
+      "ID": 224,
+      "shopName": 1623,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 224,
+      "pageSortNum": 24,
+      "continueTime": -1
+    },
+    {
+      "ID": 225,
+      "shopName": 1624,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 225,
+      "pageSortNum": 25,
+      "continueTime": -1
+    },
+    {
+      "ID": 226,
+      "shopName": 1625,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 226,
+      "pageSortNum": 26,
+      "continueTime": -1
+    },
+    {
+      "ID": 227,
+      "shopName": 1626,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 227,
+      "pageSortNum": 27,
+      "continueTime": -1
+    },
+    {
+      "ID": 228,
+      "shopName": 1627,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 228,
+      "pageSortNum": 28,
+      "continueTime": -1
+    },
+    {
+      "ID": 229,
+      "shopName": 1628,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 229,
+      "pageSortNum": 29,
+      "continueTime": -1
+    },
+    {
+      "ID": 230,
+      "shopName": 1629,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 230,
+      "pageSortNum": 30,
+      "continueTime": -1
+    },
+    {
+      "ID": 231,
+      "shopName": 1630,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 231,
+      "pageSortNum": 31,
+      "continueTime": -1
+    },
+    {
+      "ID": 232,
+      "shopName": 1631,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 232,
+      "pageSortNum": 32,
+      "continueTime": -1
+    },
+    {
+      "ID": 233,
+      "shopName": 1632,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_item_Gear_Boots"
+      ],
+      "shopGroup": 3,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 233,
+      "pageSortNum": 33,
+      "continueTime": -1
     }
   ]
 }

Assets/Res/Config/ShopGroupConfig.json

@@ -7,6 +7,22 @@
       "RefreshType": 1,
       "refreshCostItemId": -1,
       "refreshLimit": -1
+    },
+    {
+      "ID": 2,
+      "sortNum": 2,
+      "shopName": 1904,
+      "RefreshType": 1,
+      "refreshCostItemId": -1,
+      "refreshLimit": -1
+    },
+    {
+      "ID": 3,
+      "sortNum": 3,
+      "shopName": 1905,
+      "RefreshType": 1,
+      "refreshCostItemId": -1,
+      "refreshLimit": -1
     }
   ]
 }

Assets/Res/Config/ShopItemConfig.json

@@ -89,6 +89,666 @@
       "oldPrice": 1,
       "buyCount": -1,
       "maxBuyCount": -1
+    },
+    {
+      "ID": 101,
+      "giftID": "",
+      "itemId": [
+        11001
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 102,
+      "giftID": "",
+      "itemId": [
+        11002
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 103,
+      "giftID": "",
+      "itemId": [
+        11003
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 104,
+      "giftID": "",
+      "itemId": [
+        11004
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 105,
+      "giftID": "",
+      "itemId": [
+        11005
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 106,
+      "giftID": "",
+      "itemId": [
+        11006
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 107,
+      "giftID": "",
+      "itemId": [
+        11007
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 108,
+      "giftID": "",
+      "itemId": [
+        11008
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 109,
+      "giftID": "",
+      "itemId": [
+        11009
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 110,
+      "giftID": "",
+      "itemId": [
+        11010
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 111,
+      "giftID": "",
+      "itemId": [
+        11011
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 201,
+      "giftID": "",
+      "itemId": [
+        13001
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 202,
+      "giftID": "",
+      "itemId": [
+        13002
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 203,
+      "giftID": "",
+      "itemId": [
+        13003
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 204,
+      "giftID": "",
+      "itemId": [
+        13004
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 205,
+      "giftID": "",
+      "itemId": [
+        13005
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 206,
+      "giftID": "",
+      "itemId": [
+        13006
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 207,
+      "giftID": "",
+      "itemId": [
+        13007
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 208,
+      "giftID": "",
+      "itemId": [
+        13008
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 209,
+      "giftID": "",
+      "itemId": [
+        13009
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 210,
+      "giftID": "",
+      "itemId": [
+        13010
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 211,
+      "giftID": "",
+      "itemId": [
+        13011
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 212,
+      "giftID": "",
+      "itemId": [
+        13012
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 213,
+      "giftID": "",
+      "itemId": [
+        13013
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 214,
+      "giftID": "",
+      "itemId": [
+        13014
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 215,
+      "giftID": "",
+      "itemId": [
+        13015
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 216,
+      "giftID": "",
+      "itemId": [
+        13016
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 217,
+      "giftID": "",
+      "itemId": [
+        13017
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 218,
+      "giftID": "",
+      "itemId": [
+        13018
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 219,
+      "giftID": "",
+      "itemId": [
+        13019
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 220,
+      "giftID": "",
+      "itemId": [
+        13020
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 221,
+      "giftID": "",
+      "itemId": [
+        13021
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 222,
+      "giftID": "",
+      "itemId": [
+        13022
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 223,
+      "giftID": "",
+      "itemId": [
+        13023
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 224,
+      "giftID": "",
+      "itemId": [
+        13024
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 225,
+      "giftID": "",
+      "itemId": [
+        13025
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 226,
+      "giftID": "",
+      "itemId": [
+        13501
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 227,
+      "giftID": "",
+      "itemId": [
+        13502
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 228,
+      "giftID": "",
+      "itemId": [
+        13503
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 229,
+      "giftID": "",
+      "itemId": [
+        13504
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 230,
+      "giftID": "",
+      "itemId": [
+        13505
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 231,
+      "giftID": "",
+      "itemId": [
+        13506
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 232,
+      "giftID": "",
+      "itemId": [
+        13507
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 233,
+      "giftID": "",
+      "itemId": [
+        13508
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
     }
   ]
 }

Assets/Res/UI/ShopPanel/ShopPanel.prefab

@@ -2367,7 +2367,7 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 3
-  m_Spacing: 17
+  m_Spacing: 67.34
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0

Assets/Scripts/GameUI/Combat/CombatDrive.cs

@@ -104,8 +104,9 @@ namespace GameLogic.Combat
 
         private async CTask LoadCombatFinishUI(bool isWin)
         {
-            UIManager.Instance.HideUIUIPanel<CombatPanel>();
+            UIManager.Instance.GetComponent<CombatPanel>().Hide();
             await combatMonoBaisc.GameOver(isWin);
+            
         }
 
         /// <summary>

Assets/Scripts/GameUI/Combat/LevelBattleCombatMono.cs

@@ -7,15 +7,15 @@ namespace GameUI.Combat
 {
     public class LevelBattleCombatMono : CombatMonoBaisc
     {
-       
         protected override async CTask ProGameOver(bool isWin)
         {
-            await BattleSettlementPanel.OpenPanel(isWin,UICallBack);
+            await BattleSettlementPanel.OpenPanel(isWin, UICallBack);
         }
 
         private void UICallBack()
         {
             CombatDrive.Instance.CombatToStage(CombatController.currActiveCombat.isWin);
+            UIManager.Instance.HideUIUIPanel<CombatPanel>();
         }
     }
 }

Assets/Scripts/GameUI/UI/BattleSettlementPanel/BattleSettlementPanel.cs

@@ -9,7 +9,7 @@ namespace Fort23.Mono
 		private System.Action callBack;
 		private void Init()
 		{
-
+			isAddStack = false;
 		}
 		protected override void AddEvent()
 		{

Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs

@@ -66,6 +66,7 @@ namespace Fort23.Mono
         private void Init()
         {
             isAddStack = true;
+            IsShowAppBar = true;
         }
 
         protected override void AddEvent()

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -165,7 +165,7 @@ namespace Fort23.Mono
 
             skillConstant = ConfigComponent.Instance.Get<SkillConstant>(1);
 
-            
+
             UpdateStarBtn();
 
 
@@ -190,14 +190,13 @@ namespace Fort23.Mono
                     Icon_Attribute.icon_name = "dec_tu";
                     break;
             }
-            
+
             for (var i = 0; i < StarRoot.Count; i++)
             {
                 MyImage icon = StarRoot[i] as MyImage;
-                if ( i < skillInfo.skillConfig.level-1)
+                if (i < skillInfo.skillConfig.level - 1)
                 {
                     icon.gameObject.SetActive(true);
-                
                 }
                 else
                 {
@@ -244,7 +243,7 @@ namespace Fort23.Mono
 
             for (var i = 0; i < configs.Count; i++)
             {
-                if(configs[i].level == 1)
+                if (configs[i].level == 1)
                     continue;
                 SkillInfo skillInfo1 = new SkillInfo(configs[i].ID, _skillInfo.SkillPowerupConfig.ID);
                 GongFaUpgradeInfoWidget gongFaUpgradeInfoWidget = await UIManager.Instance.CreateGComponent<GongFaUpgradeInfoWidget>(null, Content);
@@ -340,6 +339,12 @@ namespace Fort23.Mono
                 UpStarItemRoot.SetActive(false);
                 UpGradeItemRoot.SetActive(false);
             }
+
+            LayoutRebuilder.ForceRebuildLayoutImmediate(UpStarItemRoot.GetComponent<RectTransform>());
+            LayoutRebuilder.ForceRebuildLayoutImmediate(UpGradeItemRoot.GetComponent<RectTransform>());
+            LayoutRebuilder.ForceRebuildLayoutImmediate(UpGradeItemRoot.transform.parent.GetComponent<RectTransform>());
+            LayoutRebuilder.ForceRebuildLayoutImmediate(UpStarItemRoot.transform.parent.GetComponent<RectTransform>());
+            LayoutRebuilder.ForceRebuildLayoutImmediate(Btn_UpGrade.GetComponent<RectTransform>());
         }
 
         public async static CTask<GongFaUpgradePanel> Open(SkillInfo skillInfo)

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -25,6 +25,7 @@ namespace Fort23.Mono
         private void Init()
         {
             isAddStack = true;
+            IsShowAppBar = true;
         }
 
         protected override void AddEvent()

Assets/Scripts/GameUI/UI/MainHeroPnael/MainHeroPanel.cs

@@ -13,6 +13,7 @@ namespace Fort23.Mono
         private void Init()
         {
             isAddStack = true;
+            IsShowAppBar = true;
         }
 
         protected override void AddEvent()

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -18,7 +18,10 @@ namespace Fort23.Mono
         private void Init()
         {
             isAddStack = true;
+            IsShowAppBar = true;
         }
+        
+        
 
         protected override void AddEvent()
         {

Assets/Scripts/GameUI/UI/ShopPanel/ShopPanel.cs

@@ -18,6 +18,7 @@ namespace Fort23.Mono
         private void Init()
         {
             isAddStack = true;
+            IsShowAppBar = true;
         }
 
         protected override void AddEvent()

UserSettings/Layouts/default-2022.dwlt

@@ -1,6 +1,30 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &1
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  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: 12004, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_PixelRect:
+    serializedVersion: 2
+    x: -2553
+    y: 47
+    width: 2560
+    height: 1345
+  m_ShowMode: 0
+  m_Title: Console
+  m_RootView: {fileID: 4}
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_Maximized: 0
+--- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -14,17 +38,17 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 159
-    y: 69
-    width: 1177
-    height: 1149
+    x: 0
+    y: 43
+    width: 2560
+    height: 1349
   m_ShowMode: 4
-  m_Title: Game
-  m_RootView: {fileID: 4}
+  m_Title: Inspector
+  m_RootView: {fileID: 5}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
-  m_Maximized: 0
---- !u!114 &2
+  m_Maximized: 1
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -40,20 +64,17 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 238
-    width: 685
-    height: 861
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_ActualView: {fileID: 12}
+    y: 0
+    width: 2560
+    height: 1345
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  m_ActualView: {fileID: 13}
   m_Panes:
-  - {fileID: 12}
-  - {fileID: 14}
-  - {fileID: 11}
-  - {fileID: 10}
+  - {fileID: 13}
   m_Selected: 0
-  m_LastSelected: 3
---- !u!114 &3
+  m_LastSelected: 0
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -66,20 +87,19 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 8}
-  - {fileID: 2}
+  - {fileID: 3}
   m_Position:
     serializedVersion: 2
-    x: 492
+    x: 0
     y: 0
-    width: 685
-    height: 1099
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 8096, y: 16192}
-  vertical: 1
-  controlID: 2174
+    width: 2560
+    height: 1345
+  m_MinSize: {x: 100, y: 121}
+  m_MaxSize: {x: 4000, y: 4021}
+  vertical: 0
+  controlID: 199606
   draggingID: 0
---- !u!114 &4
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -92,22 +112,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 5}
   - {fileID: 6}
   - {fileID: 7}
+  - {fileID: 8}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1177
-    height: 1149
+    width: 2560
+    height: 1349
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &5
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -124,12 +144,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1177
+    width: 2560
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
-  m_LastLoadedLayoutName: zouge
---- !u!114 &6
+  m_LastLoadedLayoutName: 1
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -142,20 +162,22 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
+  - {fileID: 12}
   - {fileID: 9}
-  - {fileID: 3}
+  - {fileID: 10}
+  - {fileID: 11}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 1177
-    height: 1099
-  m_MinSize: {x: 200, y: 100}
-  m_MaxSize: {x: 16192, y: 16192}
+    width: 2560
+    height: 1299
+  m_MinSize: {x: 400, y: 50}
+  m_MaxSize: {x: 32384, y: 8096}
   vertical: 0
-  controlID: 2147
+  controlID: 12538
   draggingID: 0
---- !u!114 &7
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -171,12 +193,12 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 1129
-    width: 1177
+    y: 1329
+    width: 2560
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &8
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -186,24 +208,23 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectSettingsWindow
+  m_Name: 
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 0
+    x: 1209
     y: 0
-    width: 685
-    height: 238
-  m_MinSize: {x: 311, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 13}
+    width: 411
+    height: 1299
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 14}
   m_Panes:
-  - {fileID: 15}
-  - {fileID: 13}
-  m_Selected: 1
+  - {fileID: 14}
+  m_Selected: 0
   m_LastSelected: 0
---- !u!114 &9
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -213,23 +234,23 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
+  m_Name: 
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 0
+    x: 1620
     y: 0
-    width: 492
-    height: 1099
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
+    width: 397
+    height: 1299
+  m_MinSize: {x: 232, y: 271}
+  m_MaxSize: {x: 10002, y: 10021}
   m_ActualView: {fileID: 16}
   m_Panes:
   - {fileID: 16}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &10
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -237,34 +258,25 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fc7fd1c285e08c643a0d8b05b94e9449, type: 3}
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: CombatR
-    m_Image: {fileID: 0}
-    m_Tooltip: 
-  m_Pos:
+  m_Children: []
+  m_Position:
     serializedVersion: 2
-    x: 651
-    y: 337
-    width: 684
-    height: 840
-  m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
-    isAutomatic: 1
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
-  visualTreeAsset: {fileID: 9197481963319205126, guid: 2a82c8ee6f9fbf94ea67777b3002caf7, type: 3}
---- !u!114 &11
+    x: 2017
+    y: 0
+    width: 543
+    height: 1299
+  m_MinSize: {x: 276, y: 71}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 15}
+  m_Panes:
+  - {fileID: 15}
+  m_Selected: 0
+  m_LastSelected: 0
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -272,46 +284,26 @@ MonoBehaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: SceneView
   m_EditorClassIdentifier: 
-  m_MinSize: {x: 275, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Inspector
-    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
+  m_Children: []
+  m_Position:
     serializedVersion: 2
-    x: 651
-    y: 337
-    width: 684
-    height: 840
-  m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
-    isAutomatic: 1
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
-  m_ObjectsLockedBeforeSerialization: []
-  m_InstanceIDsLockedBeforeSerialization: 
-  m_PreviewResizer:
-    m_CachedPref: 1
-    m_ControlHash: 1412526313
-    m_PrefName: Preview_InspectorPreview
-  m_LastInspectedObjectInstanceID: -68466
-  m_LastVerticalScrollValue: 0
-  m_GlobalObjectId: 
-  m_InspectorMode: 0
-  m_LockTracker:
-    m_IsLocked: 0
-  m_PreviewWindow: {fileID: 0}
---- !u!114 &12
+    x: 0
+    y: 0
+    width: 1209
+    height: 1299
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 18}
+  m_Panes:
+  - {fileID: 18}
+  - {fileID: 17}
+  m_Selected: 0
+  m_LastSelected: 1
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -331,44 +323,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 651
-    y: 337
-    width: 684
-    height: 840
-  m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
-    isAutomatic: 1
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
---- !u!114 &13
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  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: 13854, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 310, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Project Settings
-    m_Image: {fileID: -5712115415447495865, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 651
-    y: 99
-    width: 684
-    height: 217
+    x: -2553
+    y: 47
+    width: 2560
+    height: 1324
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -379,33 +337,6 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
-  m_PosLeft: {x: 0, y: 0}
-  m_PosRight: {x: 0, y: 0}
-  m_Scope: 1
-  m_SplitterFlex: 0.2857143
-  m_SearchText: 
-  m_TreeViewState:
-    scrollPos: {x: 0, y: 399}
-    m_SelectedIDs: 23e57dba
-    m_LastClickedID: -1166154461
-    m_ExpandedIDs: a01a5fa653336be20000000007f2324dc53aba5a
-    m_RenameOverlay:
-      m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
-      m_EditFieldRect:
-        serializedVersion: 2
-        x: 0
-        y: 0
-        width: 0
-        height: 0
-      m_UserData: 0
-      m_IsWaitingForDelay: 0
-      m_IsRenaming: 0
-      m_OriginalEventType: 11
-      m_IsRenamingFilename: 0
-      m_ClientGUIView: {fileID: 0}
-    m_SearchString: 
 --- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -426,10 +357,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 651
-    y: 337
-    width: 684
-    height: 840
+    x: 1209
+    y: 73
+    width: 409
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -443,9 +374,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
-      m_LastClickedID: 0
-      m_ExpandedIDs: 4efcfeff4225ffff
+      m_SelectedIDs: 64ba0000
+      m_LastClickedID: 47716
+      m_ExpandedIDs: dcb9baffe4b9bafff4b9baffdababaffe2babaff14d5baff1ad5baff06d6baff0ad6baff18d6baff60d8bbff7ed8bbffc8d8bbff6ce9bbff7ae9bbff80e9bbff42fbbbff48fbbbff34fcbbff38fcbbff46fcbbff2c33bfff0c36bfff2036bfff3036bfff3a36bfff4e36bfff5e36bfff6836bfff9636bfff7437bfff1848bfff5e4ebfff6c4ebfff107ce1ff3e7fe1ff0881e1ff1e81e1ff3481e1ffbc88e1ffc288e1ffae89e1ffb289e1ffc089e1ffe0a4e1ff26a7e1ff2ca7e1ffc0a7e1ff22a8e1ffeebde1fff4bde1ffe4bee1fff2bee1ffdee8e1fffce8e1ff02e9e1ffa4ebe1ffaeebe1ffb8ebe1ffbeebe1ffb4ece1ffdcf3e1ffe2f3e1ffcef4e1ffd2f4e1ffe0f4e1ffc08be2ffc68be2ff3695e2ff169ae2ff2e9be2ff389be2ff429be2ff489be2ff0c9ce2ff129ce2ff289ce2ff3e9ce2ff18a3e2ff1ea3e2ff0aa4e2ff0ea4e2ff1ca4e2ff843fe3ff8c3fe3ffaa45e3ffc645e3ffdc45e3ffc04ce3ffc64ce3ffb24de3ffb64de3ffc44de3ff2afaffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -461,7 +392,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 0}
+        m_ClientGUIView: {fileID: 12}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -470,6 +401,53 @@ MonoBehaviour:
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 468457e0d3add1041b6fec0b00b6a014
 --- !u!114 &15
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Inspector
+    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 2017
+    y: 73
+    width: 542
+    height: 1278
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData: []
+    m_OverlaysVisible: 1
+  m_ObjectsLockedBeforeSerialization: []
+  m_InstanceIDsLockedBeforeSerialization: 
+  m_PreviewResizer:
+    m_CachedPref: 369
+    m_ControlHash: -371814159
+    m_PrefName: Preview_InspectorPreview
+  m_LastInspectedObjectInstanceID: -1
+  m_LastVerticalScrollValue: 0
+  m_GlobalObjectId: 
+  m_InspectorMode: 0
+  m_LockTracker:
+    m_IsLocked: 0
+  m_PreviewWindow: {fileID: 0}
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -489,10 +467,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 651
-    y: 99
-    width: 684
-    height: 217
+    x: 1620
+    y: 73
+    width: 395
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -514,7 +492,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets
+    - Assets/Scripts/GameUI/UI/ShopPanel
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -522,16 +500,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets
+  - Assets/Scripts/GameUI/UI/ShopPanel
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: D:\UGit\XiuXianGame
+  m_LastProjectPath: D:\FB\XiuXianGame
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: b2ad0100
-    m_LastClickedID: 110002
-    m_ExpandedIDs: 00000000b2ad010000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 694}
+    m_SelectedIDs: 9ce10000
+    m_LastClickedID: 57756
+    m_ExpandedIDs: 0000000014e0000016e0000018e000001ae000001ce000001ee0000020e0000022e000006ae000008ae0000092e000009ae00000a8e00000d6e000007ce10000b22d0400e031040000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -559,7 +537,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000b2ad010000ca9a3bffffff7f
+    m_ExpandedIDs: 0000000014e0000016e0000018e000001ae000001ce000001ee0000020e0000022e0000092e000009ae00000a8e000007ce1000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -584,26 +562,26 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 8ef4feff
-    m_LastClickedInstanceID: -68466
-    m_HadKeyboardFocusLastEvent: 0
+    m_SelectedInstanceIDs: 
+    m_LastClickedInstanceID: 0
+    m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: 
     m_RenameOverlay:
       m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
+      m_Name: AppBarPanel
+      m_OriginalName: AppBarPanel
       m_EditFieldRect:
         serializedVersion: 2
         x: 0
         y: 0
         width: 0
         height: 0
-      m_UserData: 0
+      m_UserData: 61250
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 11
+      m_OriginalEventType: 0
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 0}
+      m_ClientGUIView: {fileID: 10}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -614,8 +592,8 @@ MonoBehaviour:
     m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
   m_SkipHiddenPackages: 0
-  m_DirectoriesAreaWidth: 258
---- !u!114 &16
+  m_DirectoriesAreaWidth: 115
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -635,10 +613,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 159
-    y: 99
-    width: 491
-    height: 1078
+    x: 0
+    y: 73
+    width: 1208
+    height: 1278
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -664,7 +642,7 @@ MonoBehaviour:
   m_VSyncEnabled: 0
   m_Gizmos: 0
   m_Stats: 0
-  m_SelectedSizes: 07000000000000000000000011000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 08000000000000000000000012000000000000000000000000000000000000000000000000000000
   m_ZoomArea:
     m_HRangeLocked: 0
     m_VRangeLocked: 0
@@ -691,25 +669,501 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 491
-      height: 1057
-    m_Scale: {x: 0.6508621, y: 0.6508621}
-    m_Translation: {x: 245.5, y: 528.49994}
+      width: 1208
+      height: 1257
+    m_Scale: {x: 0.7740148, y: 0.7740148}
+    m_Translation: {x: 604, y: 628.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -377.19205
-      y: -811.9999
-      width: 754.3841
-      height: 1623.9999
+      x: -780.34686
+      y: -812
+      width: 1560.6937
+      height: 1624
     m_MinimalGUI: 1
-  m_defaultScale: 0.6508621
-  m_LastWindowPixelSize: {x: 491, y: 1078}
+  m_defaultScale: 0.7740148
+  m_LastWindowPixelSize: {x: 1208, y: 1278}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
+--- !u!114 &18
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_TitleContent:
+    m_Text: Scene
+    m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
+    m_Tooltip: 
+  m_Pos:
+    serializedVersion: 2
+    x: 0
+    y: 73
+    width: 1208
+    height: 1278
+  m_SerializedDataModeController:
+    m_DataMode: 0
+    m_PreferredDataMode: 0
+    m_SupportedDataModes: 
+    isAutomatic: 1
+  m_ViewDataDictionary: {fileID: 0}
+  m_OverlayCanvas:
+    m_LastAppliedPresetName: Default
+    m_SaveData:
+    - dockPosition: 0
+      containerId: overlay-toolbar__top
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: -174, y: -26}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 3
+      id: Tool Settings
+      index: 0
+      layout: 1
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 0
+      containerId: overlay-toolbar__top
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: -141, y: 149}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 1
+      id: unity-grid-and-snap-toolbar
+      index: 1
+      layout: 1
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-toolbar__top
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: unity-scene-view-toolbar
+      index: 0
+      layout: 1
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-toolbar__top
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 1
+      id: unity-search-toolbar
+      index: 1
+      layout: 1
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 0
+      containerId: overlay-container--left
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 0, y: 25}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: unity-transform-toolbar
+      index: 0
+      layout: 2
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 0
+      containerId: overlay-container--left
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 0, y: 197}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: unity-component-tools
+      index: 1
+      layout: 2
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 0
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 67.5, y: 86}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Orientation
+      index: 0
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Light Settings
+      index: 2
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Camera
+      index: 1
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Cloth Constraints
+      index: 3
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Cloth Collisions
+      index: 4
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Navmesh Display
+      index: 4
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Agent Display
+      index: 5
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Obstacle Display
+      index: 6
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Occlusion Culling
+      index: 5
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Physics Debugger
+      index: 6
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Scene Visibility
+      index: 7
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Particles
+      index: 8
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Tilemap
+      index: 11
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Tilemap Palette Helper
+      index: 12
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Open Tile Palette
+      index: 0
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Tilemap Focus
+      index: 1
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: AINavigationOverlay
+      index: 9
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/Path
+      index: 9
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: APV Overlay
+      index: 10
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 0
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Scene View/TrailRenderer
+      index: 11
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    - dockPosition: 1
+      containerId: overlay-container--right
+      floating: 0
+      collapsed: 0
+      displayed: 1
+      snapOffset: {x: 48, y: 48}
+      snapOffsetDelta: {x: 0, y: 0}
+      snapCorner: 0
+      id: Hot Reload
+      index: 12
+      layout: 4
+      size: {x: 0, y: 0}
+      sizeOverriden: 0
+    m_OverlaysVisible: 1
+  m_WindowGUID: 3de2bc164a2229345aaffb3c6f51b287
+  m_Gizmos: 1
+  m_OverrideSceneCullingMask: 6917529027641081856
+  m_SceneIsLit: 1
+  m_SceneLighting: 1
+  m_2DMode: 1
+  m_isRotationLocked: 0
+  m_PlayAudio: 0
+  m_AudioPlay: 0
+  m_Position:
+    m_Target: {x: -0.47671816, y: 2.3888803, z: -0.01828024}
+    speed: 2
+    m_Value: {x: -0.47671816, y: 2.3888803, z: -0.01828024}
+  m_RenderMode: 0
+  m_CameraMode:
+    drawMode: 0
+    name: Shaded
+    section: Shading Mode
+  m_ValidateTrueMetals: 0
+  m_DoValidateTrueMetals: 0
+  m_SceneViewState:
+    m_AlwaysRefresh: 0
+    showFog: 1
+    showSkybox: 1
+    showFlares: 1
+    showImageEffects: 1
+    showParticleSystems: 1
+    showVisualEffectGraphs: 1
+    m_FxEnabled: 1
+  m_Grid:
+    xGrid:
+      m_Fade:
+        m_Target: 0
+        speed: 2
+        m_Value: 0
+      m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
+      m_Pivot: {x: 0, y: 0, z: 0}
+      m_Size: {x: 0, y: 0}
+    yGrid:
+      m_Fade:
+        m_Target: 0
+        speed: 2
+        m_Value: 0
+      m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
+      m_Pivot: {x: 0, y: 0, z: 0}
+      m_Size: {x: 1, y: 1}
+    zGrid:
+      m_Fade:
+        m_Target: 1
+        speed: 2
+        m_Value: 1
+      m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
+      m_Pivot: {x: 0, y: 0, z: 0}
+      m_Size: {x: 1, y: 1}
+    m_ShowGrid: 1
+    m_GridAxis: 1
+    m_gridOpacity: 0.5
+  m_Rotation:
+    m_Target: {x: 0, y: 0, z: 0, w: 1}
+    speed: 2
+    m_Value: {x: 0, y: 0, z: 0, w: 1}
+  m_Size:
+    m_Target: 2.8734667
+    speed: 2
+    m_Value: 2.8734667
+  m_Ortho:
+    m_Target: 1
+    speed: 2
+    m_Value: 1
+  m_CameraSettings:
+    m_Speed: 1
+    m_SpeedNormalized: 0.5
+    m_SpeedMin: 0.01
+    m_SpeedMax: 2
+    m_EasingEnabled: 1
+    m_EasingDuration: 0.4
+    m_AccelerationEnabled: 1
+    m_FieldOfViewHorizontalOrVertical: 60
+    m_NearClip: 0.03
+    m_FarClip: 10000
+    m_DynamicClip: 1
+    m_OcclusionCulling: 0
+    m_EnableGDRP: 1
+    m_BackfaceCulling: 0
+  m_LastSceneViewRotation: {x: 0.004411138, y: 0.98648864, z: -0.16153778, w: 0.026939217}
+  m_LastSceneViewOrtho: 0
+  m_ReplacementShader: {fileID: 0}
+  m_ReplacementString: 
+  m_SceneVisActive: 1
+  m_LastLockedObject: {fileID: 0}
+  m_ViewIsLockedToObject: 0