Преглед на файлове

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

# Conflicts:
#	Assets/Scripts/GameUI/GameApplction.cs   resolved by master version
DESKTOP-FB72PO8\Administrator преди 2 дни
родител
ревизия
67bb65a003
променени са 50 файла, в които са добавени 7697 реда и са изтрити 678 реда
  1. 17 17
      Assets/Res/Config/HeroModelConfig.json
  2. 283 283
      Assets/Res/Config/HeroPowerUpConfig.json
  3. 675 24
      Assets/Res/Config/ItemConfig.json
  4. 17 17
      Assets/Res/Config/LanguageChineseConfig.json
  5. 316 0
      Assets/Res/Config/SkillConfig.json
  6. 31 0
      Assets/Res/Config/SkillConstant.json
  7. 413 59
      Assets/Res/Config/SkillPowerupConfig.json
  8. 52 2
      Assets/Res/UI/MainPanel/MainPanel.prefab
  9. 761 0
      Assets/Res/UI/SkillSelectPanel/GongFaUpgradeInfoWidget.prefab
  10. 7 0
      Assets/Res/UI/SkillSelectPanel/GongFaUpgradeInfoWidget.prefab.meta
  11. 2972 0
      Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab
  12. 7 0
      Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab.meta
  13. BIN
      Assets/Res/UI/SkillSelectPanel/QQ20250506-134521.png
  14. 203 0
      Assets/Res/UI/SkillSelectPanel/QQ20250506-134521.png.meta
  15. 795 76
      Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab
  16. 324 127
      Assets/Res/UI/SkillSelectPanel/SkillWidget.prefab
  17. 26 6
      Assets/Scripts/Core/Editor/FortRectTransformInspector.cs
  18. 19 20
      Assets/Scripts/Core/Editor/PackgTool/UGUIPackgToolWindow.cs
  19. 51 0
      Assets/Scripts/Core/UI/UTool/UtilTools.cs
  20. 4 4
      Assets/Scripts/GameData/ExcelConfig/HeroModelConfig.cs
  21. 19 1
      Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs
  22. 38 0
      Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs
  23. 12 0
      Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs
  24. 32 6
      Assets/Scripts/GameLogic/Hero/SkillInfo.cs
  25. 30 25
      Assets/Scripts/GameLogic/Player/AccountFileInfo.cs
  26. 39 6
      Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs
  27. 44 0
      Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanelData.cs
  28. 44 4
      Assets/Scripts/GameUI/UI/CombatPanel/SkillWidget.cs
  29. 44 0
      Assets/Scripts/GameUI/UI/CombatPanel/SkillWidgetData.cs
  30. 8 0
      Assets/Scripts/GameUI/UI/GongFaUpgradePanel.meta
  31. 76 0
      Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradeInfoWidget.cs
  32. 11 0
      Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradeInfoWidget.cs.meta
  33. 40 0
      Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradeInfoWidgetData.cs
  34. 11 0
      Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradeInfoWidgetData.cs.meta
  35. 100 0
      Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs
  36. 11 0
      Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs.meta
  37. 139 0
      Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanelData.cs
  38. 11 0
      Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanelData.cs.meta
  39. 3 1
      Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs
  40. 11 0
      Assets/Scripts/GameUI/UI/MainPanel/MainPanelData.cs
  41. 0 0
      Assets/StreamingAssets/assetConfig.txt
  42. BIN
      Excel2Json/Excel/GameConstant.xlsx
  43. BIN
      Excel2Json/Excel/HeroModel.xlsx
  44. BIN
      Excel2Json/Excel/HeroPowerUp.xlsx
  45. BIN
      Excel2Json/Excel/Item.xlsx
  46. BIN
      Excel2Json/Excel/Language.xlsx
  47. BIN
      Excel2Json/Excel/MonsterPowerUp.xlsx
  48. BIN
      Excel2Json/Excel/skill.xlsx
  49. BIN
      Excel2Json/Excel/修仙游戏数据规划表.xlsx
  50. 1 0
      XiuXianGame.sln.DotSettings.user

+ 17 - 17
Assets/Res/Config/HeroModelConfig.json

@@ -12,10 +12,10 @@
       "heroType": 1,
       "profession": 1,
       "itemID": 1004,
-      "hp": 1000,
-      "def": 20,
-      "attack": 45,
-      "shield": 8,
+      "hp": 2000,
+      "attack": 100,
+      "def": 50,
+      "shield": 2000,
       "speed_atk": 1.0,
       "skillID": [
         1001,
@@ -40,9 +40,9 @@
       "profession": 1,
       "itemID": 1004,
       "hp": 1000,
-      "def": 20,
-      "attack": 45,
-      "shield": 8,
+      "attack": 60,
+      "def": 50,
+      "shield": 500,
       "speed_atk": 1.0,
       "skillID": [
         81001,
@@ -69,9 +69,9 @@
       "profession": 1,
       "itemID": 1004,
       "hp": 1000,
-      "def": 20,
-      "attack": 45,
-      "shield": 8,
+      "attack": 60,
+      "def": 50,
+      "shield": 500,
       "speed_atk": 1.0,
       "skillID": [
         81001,
@@ -96,9 +96,9 @@
       "profession": 1,
       "itemID": 1004,
       "hp": 1000,
-      "def": 20,
-      "attack": 45,
-      "shield": 8,
+      "attack": 60,
+      "def": 50,
+      "shield": 500,
       "speed_atk": 1.0,
       "skillID": [
         81001,
@@ -121,10 +121,10 @@
       "heroType": 4,
       "profession": 1,
       "itemID": 1004,
-      "hp": 1000,
-      "def": 20,
-      "attack": 45,
-      "shield": 8,
+      "hp": 4000,
+      "attack": 100,
+      "def": 50,
+      "shield": 3000,
       "speed_atk": 1.0,
       "skillID": [
         89011,

Файловите разлики са ограничени, защото са твърде много
+ 283 - 283
Assets/Res/Config/HeroPowerUpConfig.json


+ 675 - 24
Assets/Res/Config/ItemConfig.json

@@ -100,6 +100,31 @@
       "sort": null,
       "itemDesc_1": null
     },
+    {
+      "ID": 1005,
+      "itemName": 725,
+      "itemDesc": 726,
+      "icon": "icon_item_1005",
+      "itemTag": 1,
+      "quality": 3,
+      "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": 1201,
       "itemName": 250,
@@ -615,7 +640,7 @@
       "ID": 10001,
       "itemName": 284,
       "itemDesc": 292,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 11,
       "quality": 4,
       "stack": 0,
@@ -632,7 +657,11 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 4,
+      "associateVlaue": [
+        11001,
+        901001
+      ],
       "sort": null,
       "itemDesc_1": null
     },
@@ -640,7 +669,7 @@
       "ID": 10002,
       "itemName": 285,
       "itemDesc": 293,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 11,
       "quality": 4,
       "stack": 0,
@@ -657,7 +686,11 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 4,
+      "associateVlaue": [
+        11002,
+        901002
+      ],
       "sort": null,
       "itemDesc_1": null
     },
@@ -665,7 +698,7 @@
       "ID": 10003,
       "itemName": 286,
       "itemDesc": 294,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 11,
       "quality": 4,
       "stack": 0,
@@ -682,7 +715,11 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 4,
+      "associateVlaue": [
+        11003,
+        901003
+      ],
       "sort": null,
       "itemDesc_1": null
     },
@@ -690,7 +727,7 @@
       "ID": 10004,
       "itemName": 287,
       "itemDesc": 295,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 11,
       "quality": 5,
       "stack": 0,
@@ -707,7 +744,11 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 4,
+      "associateVlaue": [
+        11004,
+        901004
+      ],
       "sort": null,
       "itemDesc_1": null
     },
@@ -715,7 +756,7 @@
       "ID": 10005,
       "itemName": 288,
       "itemDesc": 296,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 11,
       "quality": 5,
       "stack": 0,
@@ -732,7 +773,11 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 4,
+      "associateVlaue": [
+        11005,
+        901005
+      ],
       "sort": null,
       "itemDesc_1": null
     },
@@ -740,7 +785,7 @@
       "ID": 10006,
       "itemName": 289,
       "itemDesc": 297,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 11,
       "quality": 5,
       "stack": 0,
@@ -757,7 +802,11 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 4,
+      "associateVlaue": [
+        11006,
+        901006
+      ],
       "sort": null,
       "itemDesc_1": null
     },
@@ -765,7 +814,7 @@
       "ID": 10007,
       "itemName": 290,
       "itemDesc": 298,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 11,
       "quality": 6,
       "stack": 0,
@@ -782,7 +831,11 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 4,
+      "associateVlaue": [
+        11007,
+        901007
+      ],
       "sort": null,
       "itemDesc_1": null
     },
@@ -790,7 +843,7 @@
       "ID": 10008,
       "itemName": 291,
       "itemDesc": 299,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 11,
       "quality": 6,
       "stack": 0,
@@ -807,7 +860,11 @@
         0
       ],
       "stack_1": 0,
-      "associateID": null,
+      "associateID": 4,
+      "associateVlaue": [
+        11008,
+        901008
+      ],
       "sort": null,
       "itemDesc_1": null
     },
@@ -815,7 +872,7 @@
       "ID": 11001,
       "itemName": 300,
       "itemDesc": 308,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 12,
       "quality": 4,
       "stack": 0,
@@ -840,7 +897,7 @@
       "ID": 11002,
       "itemName": 301,
       "itemDesc": 309,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 12,
       "quality": 4,
       "stack": 0,
@@ -865,7 +922,7 @@
       "ID": 11003,
       "itemName": 302,
       "itemDesc": 310,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 12,
       "quality": 4,
       "stack": 0,
@@ -890,7 +947,7 @@
       "ID": 11004,
       "itemName": 303,
       "itemDesc": 311,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 12,
       "quality": 5,
       "stack": 0,
@@ -915,7 +972,7 @@
       "ID": 11005,
       "itemName": 304,
       "itemDesc": 312,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 12,
       "quality": 5,
       "stack": 0,
@@ -940,7 +997,7 @@
       "ID": 11006,
       "itemName": 305,
       "itemDesc": 313,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 12,
       "quality": 5,
       "stack": 0,
@@ -965,7 +1022,7 @@
       "ID": 11007,
       "itemName": 306,
       "itemDesc": 314,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 12,
       "quality": 6,
       "stack": 0,
@@ -990,7 +1047,7 @@
       "ID": 11008,
       "itemName": 307,
       "itemDesc": 315,
-      "icon": "",
+      "icon": "icon_skill_10003",
       "itemTag": 12,
       "quality": 6,
       "stack": 0,
@@ -1010,6 +1067,600 @@
       "associateID": null,
       "sort": null,
       "itemDesc_1": null
+    },
+    {
+      "ID": 12001,
+      "itemName": 316,
+      "itemDesc": 326,
+      "icon": "icon_skill_1001",
+      "itemTag": 13,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 3,
+      "associateVlaue": [
+        13001,
+        1001
+      ],
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 12002,
+      "itemName": 336,
+      "itemDesc": 346,
+      "icon": "icon_skill_10001",
+      "itemTag": 13,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 3,
+      "associateVlaue": [
+        13002,
+        2001
+      ],
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 12003,
+      "itemName": 356,
+      "itemDesc": 366,
+      "icon": "icon_skill_40001",
+      "itemTag": 13,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 3,
+      "associateVlaue": [
+        13003,
+        1101
+      ],
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 12004,
+      "itemName": 376,
+      "itemDesc": 386,
+      "icon": "icon_skill_40005",
+      "itemTag": 13,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 3,
+      "associateVlaue": [
+        13004,
+        1201
+      ],
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 12005,
+      "itemName": 396,
+      "itemDesc": 406,
+      "icon": "icon_skill_40002",
+      "itemTag": 13,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 3,
+      "associateVlaue": [
+        13005,
+        1301
+      ],
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 12006,
+      "itemName": 416,
+      "itemDesc": 426,
+      "icon": "icon_skill_30005",
+      "itemTag": 13,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 3,
+      "associateVlaue": [
+        13006,
+        501001
+      ],
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 12007,
+      "itemName": 436,
+      "itemDesc": 446,
+      "icon": "icon_skill_20004",
+      "itemTag": 13,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 3,
+      "associateVlaue": [
+        13007,
+        501101
+      ],
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 12008,
+      "itemName": 456,
+      "itemDesc": 466,
+      "icon": "icon_skill_10002",
+      "itemTag": 13,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 3,
+      "associateVlaue": [
+        13008,
+        501201
+      ],
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 12009,
+      "itemName": 476,
+      "itemDesc": 486,
+      "icon": "icon_skill_20002",
+      "itemTag": 13,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 3,
+      "associateVlaue": [
+        13009,
+        501301
+      ],
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 12010,
+      "itemName": 496,
+      "itemDesc": 506,
+      "icon": "icon_skill_10004",
+      "itemTag": 13,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 3,
+      "associateVlaue": [
+        13010,
+        501401
+      ],
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 12011,
+      "itemName": 516,
+      "itemDesc": 526,
+      "icon": "icon_skill_20001",
+      "itemTag": 13,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": null,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 3,
+      "associateVlaue": [
+        13011,
+        501501
+      ],
+      "sort": null,
+      "itemDesc_1": null
+    },
+    {
+      "ID": 13001,
+      "itemName": 727,
+      "itemDesc": 738,
+      "icon": "icon_skill_1001",
+      "itemTag": 14,
+      "quality": 3,
+      "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": 13002,
+      "itemName": 728,
+      "itemDesc": 738,
+      "icon": "icon_skill_10001",
+      "itemTag": 14,
+      "quality": 3,
+      "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": 13003,
+      "itemName": 729,
+      "itemDesc": 738,
+      "icon": "icon_skill_40001",
+      "itemTag": 14,
+      "quality": 3,
+      "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": 13004,
+      "itemName": 730,
+      "itemDesc": 738,
+      "icon": "icon_skill_40005",
+      "itemTag": 14,
+      "quality": 3,
+      "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": 13005,
+      "itemName": 731,
+      "itemDesc": 738,
+      "icon": "icon_skill_40002",
+      "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": 13006,
+      "itemName": 732,
+      "itemDesc": 738,
+      "icon": "icon_skill_30005",
+      "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": 13007,
+      "itemName": 733,
+      "itemDesc": 738,
+      "icon": "icon_skill_20004",
+      "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": 13008,
+      "itemName": 734,
+      "itemDesc": 738,
+      "icon": "icon_skill_10002",
+      "itemTag": 14,
+      "quality": 5,
+      "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": 13009,
+      "itemName": 735,
+      "itemDesc": 738,
+      "icon": "icon_skill_20002",
+      "itemTag": 14,
+      "quality": 5,
+      "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": 13010,
+      "itemName": 736,
+      "itemDesc": 738,
+      "icon": "icon_skill_10004",
+      "itemTag": 14,
+      "quality": 5,
+      "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": 13011,
+      "itemName": 737,
+      "itemDesc": 738,
+      "icon": "icon_skill_20001",
+      "itemTag": 14,
+      "quality": 6,
+      "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
     }
   ]
 }

+ 17 - 17
Assets/Res/Config/LanguageChineseConfig.json

@@ -2886,71 +2886,71 @@
     },
     {
       "ID": 722,
-      "txt": "0"
+      "txt": "最终生命+{0}%"
     },
     {
       "ID": 723,
-      "txt": "0"
+      "txt": "最终攻击+{0}%"
     },
     {
       "ID": 724,
-      "txt": "0"
+      "txt": "最终防御+{0}%"
     },
     {
       "ID": 725,
-      "txt": "0"
+      "txt": "灵气"
     },
     {
       "ID": 726,
-      "txt": "0"
+      "txt": "[临]灵气的描述"
     },
     {
       "ID": 727,
-      "txt": "0"
+      "txt": "剑诀碎片"
     },
     {
       "ID": 728,
-      "txt": "0"
+      "txt": "烈焰斩碎片"
     },
     {
       "ID": 729,
-      "txt": "0"
+      "txt": "瘴影千丝术碎片"
     },
     {
       "ID": 730,
-      "txt": "0"
+      "txt": "雾隐千流法碎片"
     },
     {
       "ID": 731,
-      "txt": "0"
+      "txt": "碧落幽冥劲碎片"
     },
     {
       "ID": 732,
-      "txt": "0"
+      "txt": "法宝秘籍碎片"
     },
     {
       "ID": 733,
-      "txt": "0"
+      "txt": "双生面具碎片"
     },
     {
       "ID": 734,
-      "txt": "0"
+      "txt": "火灵丹碎片"
     },
     {
       "ID": 735,
-      "txt": "0"
+      "txt": "巨大化碎片"
     },
     {
       "ID": 736,
-      "txt": "0"
+      "txt": "极速齿轮碎片"
     },
     {
       "ID": 737,
-      "txt": "0"
+      "txt": "崩脉决碎片"
     },
     {
       "ID": 738,
-      "txt": "0"
+      "txt": "用于对应功法的升星"
     },
     {
       "ID": 739,

Файловите разлики са ограничени, защото са твърде много
+ 316 - 0
Assets/Res/Config/SkillConfig.json


+ 31 - 0
Assets/Res/Config/SkillConstant.json

@@ -0,0 +1,31 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "SkilltoPieceNum": [
+        1,
+        5,
+        20,
+        100,
+        200,
+        300,
+        500,
+        700,
+        1000,
+        1300
+      ],
+      "SkillPromoteNeedPieceNum": [
+        1,
+        4,
+        15,
+        80,
+        100,
+        100,
+        200,
+        200,
+        300,
+        300
+      ]
+    }
+  ]
+}

+ 413 - 59
Assets/Res/Config/SkillPowerupConfig.json

@@ -3,297 +3,651 @@
     {
       "ID": 1,
       "MainPower": 100,
-      "SkillPower1": 100.0
+      "SkillPower1": 100.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        200
+      ]
     },
     {
       "ID": 2,
       "MainPower": 120,
-      "SkillPower1": 110.0
+      "SkillPower1": 110.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        300
+      ]
     },
     {
       "ID": 3,
       "MainPower": 140,
-      "SkillPower1": 120.0
+      "SkillPower1": 120.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        400
+      ]
     },
     {
       "ID": 4,
       "MainPower": 160,
-      "SkillPower1": 130.0
+      "SkillPower1": 130.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        500
+      ]
     },
     {
       "ID": 5,
       "MainPower": 180,
-      "SkillPower1": 140.0
+      "SkillPower1": 140.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        600
+      ]
     },
     {
       "ID": 6,
       "MainPower": 200,
-      "SkillPower1": 150.0
+      "SkillPower1": 150.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        700
+      ]
     },
     {
       "ID": 7,
       "MainPower": 220,
-      "SkillPower1": 160.0
+      "SkillPower1": 160.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        800
+      ]
     },
     {
       "ID": 8,
       "MainPower": 240,
-      "SkillPower1": 170.0
+      "SkillPower1": 170.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        900
+      ]
     },
     {
       "ID": 9,
       "MainPower": 260,
-      "SkillPower1": 180.0
+      "SkillPower1": 180.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        1000
+      ]
     },
     {
       "ID": 10,
       "MainPower": 280,
-      "SkillPower1": 190.0
+      "SkillPower1": 190.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        1100
+      ]
     },
     {
       "ID": 11,
       "MainPower": 300,
-      "SkillPower1": 200.0
+      "SkillPower1": 200.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        1200
+      ]
     },
     {
       "ID": 12,
       "MainPower": 320,
-      "SkillPower1": 210.0
+      "SkillPower1": 210.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        1300
+      ]
     },
     {
       "ID": 13,
       "MainPower": 340,
-      "SkillPower1": 220.0
+      "SkillPower1": 220.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        1400
+      ]
     },
     {
       "ID": 14,
       "MainPower": 360,
-      "SkillPower1": 230.0
+      "SkillPower1": 230.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        1500
+      ]
     },
     {
       "ID": 15,
       "MainPower": 380,
-      "SkillPower1": 240.0
+      "SkillPower1": 240.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        1600
+      ]
     },
     {
       "ID": 16,
       "MainPower": 400,
-      "SkillPower1": 250.0
+      "SkillPower1": 250.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        1700
+      ]
     },
     {
       "ID": 17,
       "MainPower": 420,
-      "SkillPower1": 260.0
+      "SkillPower1": 260.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        1800
+      ]
     },
     {
       "ID": 18,
       "MainPower": 440,
-      "SkillPower1": 270.0
+      "SkillPower1": 270.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        1900
+      ]
     },
     {
       "ID": 19,
       "MainPower": 460,
-      "SkillPower1": 280.0
+      "SkillPower1": 280.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        2000
+      ]
     },
     {
       "ID": 20,
       "MainPower": 480,
-      "SkillPower1": 290.0
+      "SkillPower1": 290.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        2100
+      ]
     },
     {
       "ID": 21,
       "MainPower": 500,
-      "SkillPower1": 300.0
+      "SkillPower1": 300.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        2200
+      ]
     },
     {
       "ID": 22,
       "MainPower": 520,
-      "SkillPower1": 310.0
+      "SkillPower1": 310.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        2300
+      ]
     },
     {
       "ID": 23,
       "MainPower": 540,
-      "SkillPower1": 320.0
+      "SkillPower1": 320.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        2400
+      ]
     },
     {
       "ID": 24,
       "MainPower": 560,
-      "SkillPower1": 330.0
+      "SkillPower1": 330.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        2500
+      ]
     },
     {
       "ID": 25,
       "MainPower": 580,
-      "SkillPower1": 340.0
+      "SkillPower1": 340.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        2600
+      ]
     },
     {
       "ID": 26,
       "MainPower": 600,
-      "SkillPower1": 350.0
+      "SkillPower1": 350.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        2700
+      ]
     },
     {
       "ID": 27,
       "MainPower": 620,
-      "SkillPower1": 360.0
+      "SkillPower1": 360.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        2800
+      ]
     },
     {
       "ID": 28,
       "MainPower": 640,
-      "SkillPower1": 370.0
+      "SkillPower1": 370.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        2900
+      ]
     },
     {
       "ID": 29,
       "MainPower": 660,
-      "SkillPower1": 380.0
+      "SkillPower1": 380.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        3000
+      ]
     },
     {
       "ID": 30,
       "MainPower": 680,
-      "SkillPower1": 390.0
+      "SkillPower1": 390.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        3100
+      ]
     },
     {
       "ID": 31,
       "MainPower": 700,
-      "SkillPower1": 400.0
+      "SkillPower1": 400.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        3200
+      ]
     },
     {
       "ID": 32,
       "MainPower": 720,
-      "SkillPower1": 410.0
+      "SkillPower1": 410.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        3300
+      ]
     },
     {
       "ID": 33,
       "MainPower": 740,
-      "SkillPower1": 420.0
+      "SkillPower1": 420.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        3400
+      ]
     },
     {
       "ID": 34,
       "MainPower": 760,
-      "SkillPower1": 430.0
+      "SkillPower1": 430.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        3500
+      ]
     },
     {
       "ID": 35,
       "MainPower": 780,
-      "SkillPower1": 440.0
+      "SkillPower1": 440.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        3600
+      ]
     },
     {
       "ID": 36,
       "MainPower": 800,
-      "SkillPower1": 450.0
+      "SkillPower1": 450.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        3700
+      ]
     },
     {
       "ID": 37,
       "MainPower": 820,
-      "SkillPower1": 460.0
+      "SkillPower1": 460.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        3800
+      ]
     },
     {
       "ID": 38,
       "MainPower": 840,
-      "SkillPower1": 470.0
+      "SkillPower1": 470.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        3900
+      ]
     },
     {
       "ID": 39,
       "MainPower": 860,
-      "SkillPower1": 480.0
+      "SkillPower1": 480.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        4000
+      ]
     },
     {
       "ID": 40,
       "MainPower": 880,
-      "SkillPower1": 490.0
+      "SkillPower1": 490.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        4100
+      ]
     },
     {
       "ID": 41,
       "MainPower": 900,
-      "SkillPower1": 500.0
+      "SkillPower1": 500.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        4200
+      ]
     },
     {
       "ID": 42,
       "MainPower": 920,
-      "SkillPower1": 510.0
+      "SkillPower1": 510.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        4300
+      ]
     },
     {
       "ID": 43,
       "MainPower": 940,
-      "SkillPower1": 520.0
+      "SkillPower1": 520.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        4400
+      ]
     },
     {
       "ID": 44,
       "MainPower": 960,
-      "SkillPower1": 530.0
+      "SkillPower1": 530.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        4500
+      ]
     },
     {
       "ID": 45,
       "MainPower": 980,
-      "SkillPower1": 540.0
+      "SkillPower1": 540.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        4600
+      ]
     },
     {
       "ID": 46,
       "MainPower": 1000,
-      "SkillPower1": 550.0
+      "SkillPower1": 550.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        4700
+      ]
     },
     {
       "ID": 47,
       "MainPower": 1020,
-      "SkillPower1": 560.0
+      "SkillPower1": 560.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        4800
+      ]
     },
     {
       "ID": 48,
       "MainPower": 1040,
-      "SkillPower1": 570.0
+      "SkillPower1": 570.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        4900
+      ]
     },
     {
       "ID": 49,
       "MainPower": 1060,
-      "SkillPower1": 580.0
+      "SkillPower1": 580.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        5000
+      ]
     },
     {
       "ID": 50,
       "MainPower": 1080,
-      "SkillPower1": 590.0
+      "SkillPower1": 590.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        5100
+      ]
     },
     {
       "ID": 51,
       "MainPower": 1100,
-      "SkillPower1": 600.0
+      "SkillPower1": 600.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        5200
+      ]
     },
     {
       "ID": 52,
       "MainPower": 1120,
-      "SkillPower1": 610.0
+      "SkillPower1": 610.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        5300
+      ]
     },
     {
       "ID": 53,
       "MainPower": 1140,
-      "SkillPower1": 620.0
+      "SkillPower1": 620.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        5400
+      ]
     },
     {
       "ID": 54,
       "MainPower": 1160,
-      "SkillPower1": 630.0
+      "SkillPower1": 630.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        5500
+      ]
     },
     {
       "ID": 55,
       "MainPower": 1180,
-      "SkillPower1": 640.0
+      "SkillPower1": 640.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        5600
+      ]
     },
     {
       "ID": 56,
       "MainPower": 1200,
-      "SkillPower1": 650.0
+      "SkillPower1": 650.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        5700
+      ]
     },
     {
       "ID": 57,
       "MainPower": 1220,
-      "SkillPower1": 660.0
+      "SkillPower1": 660.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        5800
+      ]
     },
     {
       "ID": 58,
       "MainPower": 1240,
-      "SkillPower1": 670.0
+      "SkillPower1": 670.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        5900
+      ]
     },
     {
       "ID": 59,
       "MainPower": 1260,
-      "SkillPower1": 680.0
+      "SkillPower1": 680.0,
+      "LevelupItem": [
+        1005
+      ],
+      "LevelupItemNum": [
+        6000
+      ]
     },
     {
       "ID": 60,

+ 52 - 2
Assets/Res/UI/MainPanel/MainPanel.prefab

@@ -337,7 +337,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u4EFB\u52A1"
+  m_Text: "\u529F\u6CD5"
 --- !u!114 &1641037144959688269
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1418,9 +1418,10 @@ GameObject:
   - component: {fileID: 4859847706322354517}
   - component: {fileID: 4245159864033671587}
   - component: {fileID: 4641796818656089389}
+  - component: {fileID: 8928375369205348022}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Btn1 (5)
+  m_Name: Btn_GongFa
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1492,6 +1493,50 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 73747c90ef6f3497ab9cd07d8ff19dd0
+--- !u!114 &8928375369205348022
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3508856126186568964}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 4641796818656089389}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &3838446993191253101
 GameObject:
   m_ObjectHideFlags: 0
@@ -2516,6 +2561,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_GongFa
+    gameObject: {fileID: 8928375369205348022}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!1 &9153091249090986804
 GameObject:

+ 761 - 0
Assets/Res/UI/SkillSelectPanel/GongFaUpgradeInfoWidget.prefab

@@ -0,0 +1,761 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &544340637007268772
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2626495479702332815}
+  - component: {fileID: 604480498201615927}
+  - component: {fileID: 3606880106787355147}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: GongFaUpgradeInfoWidget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2626495479702332815
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 544340637007268772}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8441639509481527171}
+  - {fileID: 1997086601353049712}
+  - {fileID: 436368807920140684}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 281.365, y: -36.37025}
+  m_SizeDelta: {x: 562.73, y: 72.7405}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &604480498201615927
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 544340637007268772}
+  m_CullTransparentMesh: 1
+--- !u!114 &3606880106787355147
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 544340637007268772}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: StarRoot
+    gameObject: {fileID: 5475763993520793499}
+    isAssetBundle: 0
+    isList: 1
+    ListCollectorDatas:
+    - gameObject: {fileID: 1589540111446213810}
+    - gameObject: {fileID: 6321609247404304824}
+    - gameObject: {fileID: 2001195971316176758}
+    - gameObject: {fileID: 2252680199180135381}
+    - gameObject: {fileID: 6118155954852721740}
+  - key: Text_Desc
+    gameObject: {fileID: 4892693544837635802}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1589540111446213810}
+    - gameObject: {fileID: 6321609247404304824}
+    - gameObject: {fileID: 2001195971316176758}
+    - gameObject: {fileID: 2252680199180135381}
+    - gameObject: {fileID: 6118155954852721740}
+  isAssetBundle: 1
+--- !u!1 &655531457772110114
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2867061352453296888}
+  - component: {fileID: 3421994071673068509}
+  - component: {fileID: 6321609247404304824}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2867061352453296888
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 655531457772110114}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 436368807920140684}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 22, y: 22}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &3421994071673068509
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 655531457772110114}
+  m_CullTransparentMesh: 1
+--- !u!114 &6321609247404304824
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 655531457772110114}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_star_1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!1 &1129627276819182953
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1997086601353049712}
+  - component: {fileID: 4804870061492611367}
+  - component: {fileID: 4892693544837635802}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Desc
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1997086601353049712
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1129627276819182953}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2626495479702332815}
+  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: 93.6, y: -4.1}
+  m_SizeDelta: {x: 262.3878, y: 50.1749}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4804870061492611367
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1129627276819182953}
+  m_CullTransparentMesh: 1
+--- !u!114 &4892693544837635802
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1129627276819182953}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 30
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u57FA\u7840\u4F24\u5BB3+200"
+--- !u!1 &3007912453806522775
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 391061909760223855}
+  - component: {fileID: 8293329037066986781}
+  - component: {fileID: 6118155954852721740}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (5)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &391061909760223855
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3007912453806522775}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 436368807920140684}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 22, y: 22}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &8293329037066986781
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3007912453806522775}
+  m_CullTransparentMesh: 1
+--- !u!114 &6118155954852721740
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3007912453806522775}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_star_1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!1 &3623856807136931724
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2075704369294728403}
+  - component: {fileID: 5139621201629885650}
+  - component: {fileID: 2001195971316176758}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2075704369294728403
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3623856807136931724}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 436368807920140684}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 22, y: 22}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &5139621201629885650
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3623856807136931724}
+  m_CullTransparentMesh: 1
+--- !u!114 &2001195971316176758
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3623856807136931724}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_star_1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!1 &4294681738390832373
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1398198344503143719}
+  - component: {fileID: 268575509521219861}
+  - component: {fileID: 2252680199180135381}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1398198344503143719
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4294681738390832373}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 436368807920140684}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 22, y: 22}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &268575509521219861
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4294681738390832373}
+  m_CullTransparentMesh: 1
+--- !u!114 &2252680199180135381
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4294681738390832373}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_star_1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!1 &5236118077573103856
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8441639509481527171}
+  - component: {fileID: 1158047690897084148}
+  - component: {fileID: 8617353862802743019}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8441639509481527171
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5236118077573103856}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2626495479702332815}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.000030517578, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1158047690897084148
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5236118077573103856}
+  m_CullTransparentMesh: 1
+--- !u!114 &8617353862802743019
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5236118077573103856}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9137255, g: 0.89411765, b: 0.96862745, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+--- !u!1 &5475763993520793499
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 436368807920140684}
+  - component: {fileID: 4119734836969264571}
+  - component: {fileID: 8573973607419217053}
+  - component: {fileID: 1345860127269203176}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: StarRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &436368807920140684
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5475763993520793499}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 338933279804513873}
+  - {fileID: 2867061352453296888}
+  - {fileID: 2075704369294728403}
+  - {fileID: 1398198344503143719}
+  - {fileID: 391061909760223855}
+  m_Father: {fileID: 2626495479702332815}
+  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: 40.6, y: -7.2}
+  m_SizeDelta: {x: 0, y: 30.6108}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &4119734836969264571
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5475763993520793499}
+  m_CullTransparentMesh: 1
+--- !u!114 &8573973607419217053
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5475763993520793499}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &1345860127269203176
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5475763993520793499}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!1 &7100450794522030199
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 338933279804513873}
+  - component: {fileID: 7699704085918563341}
+  - component: {fileID: 1589540111446213810}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &338933279804513873
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7100450794522030199}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 436368807920140684}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 22, y: 22}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &7699704085918563341
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7100450794522030199}
+  m_CullTransparentMesh: 1
+--- !u!114 &1589540111446213810
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7100450794522030199}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_star_1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc

+ 7 - 0
Assets/Res/UI/SkillSelectPanel/GongFaUpgradeInfoWidget.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DnwasC+pBn9VTEnFHfADoWx0B50ttLxYEz8y2fI1VrqdptJ8GvZ+r4wfgB4z
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2972 - 0
Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -0,0 +1,2972 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &746323676014235
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2225020066323674626}
+  - component: {fileID: 4248893023504292874}
+  - component: {fileID: 7114710791395265335}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy) (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2225020066323674626
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 746323676014235}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4804840102154087274}
+  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: 12.5}
+  m_SizeDelta: {x: 0, y: -39.5084}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4248893023504292874
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 746323676014235}
+  m_CullTransparentMesh: 1
+--- !u!114 &7114710791395265335
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 746323676014235}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 25
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u9886\u609F"
+--- !u!1 &68386584913938325
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1450357347166671142}
+  - component: {fileID: 4355836709569313884}
+  - component: {fileID: 6452597082771321709}
+  - component: {fileID: 949511919877554581}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Btn_Back
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1450357347166671142
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 68386584913938325}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6694772361877173011}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 25.7, y: 60}
+  m_SizeDelta: {x: 68, y: 59}
+  m_Pivot: {x: 0, y: 0}
+--- !u!222 &4355836709569313884
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 68386584913938325}
+  m_CullTransparentMesh: 1
+--- !u!114 &6452597082771321709
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 68386584913938325}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 949511919877554581}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &949511919877554581
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 68386584913938325}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_close_02
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!1 &247502849354470462
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5526066809282652817}
+  - component: {fileID: 7871172757924505110}
+  - component: {fileID: 4749587010086505590}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy) (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5526066809282652817
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 247502849354470462}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 9108663775320659104}
+  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: 12.5}
+  m_SizeDelta: {x: 0, y: -39.5084}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7871172757924505110
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 247502849354470462}
+  m_CullTransparentMesh: 1
+--- !u!114 &4749587010086505590
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 247502849354470462}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 25
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5347\u7EA7"
+--- !u!1 &271181744216703212
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2968118661804333137}
+  - component: {fileID: 6928551091372705930}
+  - component: {fileID: 2266735464070336714}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2968118661804333137
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 271181744216703212}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7325077240780456121}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 22, y: 22}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &6928551091372705930
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 271181744216703212}
+  m_CullTransparentMesh: 1
+--- !u!114 &2266735464070336714
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 271181744216703212}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_star_1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!1 &975683146836102746
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7455674247020882449}
+  - component: {fileID: 1257988679810492640}
+  - component: {fileID: 6899362910355405383}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7455674247020882449
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 975683146836102746}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7325077240780456121}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 22, y: 22}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &1257988679810492640
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 975683146836102746}
+  m_CullTransparentMesh: 1
+--- !u!114 &6899362910355405383
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 975683146836102746}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_star_1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!1 &1087223624327040953
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 868834413672771607}
+  - component: {fileID: 8716127586724495292}
+  - component: {fileID: 6234977368374517038}
+  - component: {fileID: 6964772665368183260}
+  - component: {fileID: 4822715704095626536}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Attribute
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &868834413672771607
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1087223624327040953}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7393945541704192930}
+  m_Father: {fileID: 8468219431132250151}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 71, y: 0}
+  m_SizeDelta: {x: 65.240295, y: 62.0832}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &8716127586724495292
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1087223624327040953}
+  m_CullTransparentMesh: 1
+--- !u!114 &6234977368374517038
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1087223624327040953}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0.7294118, b: 0.6784314, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_24
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 99b40747f72180f8bdc5e972731dc65f
+--- !u!114 &6964772665368183260
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1087223624327040953}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ef7878ea2dacc454894d556c1d97bca0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - StateInfos:
+    - Target: {fileID: 1087223624327040953}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 1, y: 0.9215687, z: 0.23137257, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  - StateInfos:
+    - Target: {fileID: 1087223624327040953}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.2627451, y: 0.8117648, z: 0.48627454, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  - StateInfos:
+    - Target: {fileID: 1087223624327040953}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.16470589, y: 0.50980395, z: 0.8941177, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  - StateInfos:
+    - Target: {fileID: 1087223624327040953}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 1, y: 0.34117648, z: 0.20000002, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  - StateInfos:
+    - Target: {fileID: 1087223624327040953}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0, y: 0.7294118, z: 0.6784314, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  AllComs:
+  - {fileID: 1087223624327040953}
+  AllComsStateTypes: 40000000
+  CurrIndex: 4
+--- !u!114 &4822715704095626536
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1087223624327040953}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!1 &1386820613220505880
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1977479323307174205}
+  - component: {fileID: 5543201938969055767}
+  - component: {fileID: 5347792982958054296}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy) (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1977479323307174205
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1386820613220505880}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6694772361877173011}
+  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: -233.7, y: -330}
+  m_SizeDelta: {x: 129.4875, y: 34.3315}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5543201938969055767
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1386820613220505880}
+  m_CullTransparentMesh: 1
+--- !u!114 &5347792982958054296
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1386820613220505880}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 27
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u529F\u6CD5\u6548\u679C"
+--- !u!1 &1427355544849779280
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6949080144761567334}
+  - component: {fileID: 897066948721621111}
+  - component: {fileID: 8243822813260717961}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6949080144761567334
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1427355544849779280}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7325077240780456121}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 22, y: 22}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &897066948721621111
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1427355544849779280}
+  m_CullTransparentMesh: 1
+--- !u!114 &8243822813260717961
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1427355544849779280}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_star_1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!1 &2400402588042094855
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6131283213059370231}
+  - component: {fileID: 3864788211057708676}
+  - component: {fileID: 2651703100015501841}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6131283213059370231
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2400402588042094855}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6694772361877173011}
+  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: -233.7, y: 328.1}
+  m_SizeDelta: {x: 129.4875, y: 34.3315}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3864788211057708676
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2400402588042094855}
+  m_CullTransparentMesh: 1
+--- !u!114 &2651703100015501841
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2400402588042094855}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 27
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u529F\u6CD5\u5883\u754C"
+--- !u!1 &2681495094568075615
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2462338167574332830}
+  - component: {fileID: 7074069089130161528}
+  - component: {fileID: 4262236909115467885}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2462338167574332830
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2681495094568075615}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5473342035507285947}
+  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.000030518, y: 394.62}
+  m_SizeDelta: {x: 750, y: 13.393}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7074069089130161528
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2681495094568075615}
+  m_CullTransparentMesh: 1
+--- !u!114 &4262236909115467885
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2681495094568075615}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9607844, g: 0.8078432, b: 0.8078432, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2841900498943777658
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5154046706560764311}
+  - component: {fileID: 4083837466962931630}
+  - component: {fileID: 8351717018150920890}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Level
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5154046706560764311
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2841900498943777658}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5964692562241983256}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.0000076293945, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4083837466962931630
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2841900498943777658}
+  m_CullTransparentMesh: 1
+--- !u!114 &8351717018150920890
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2841900498943777658}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 25
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "1\u7EA7"
+--- !u!1 &2852344175065108756
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6694772361877173011}
+  - component: {fileID: 3038665444609316863}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: GongFaUpgradePanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6694772361877173011
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2852344175065108756}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4962336735051820175}
+  - {fileID: 5473342035507285947}
+  - {fileID: 8468219431132250151}
+  - {fileID: 7374263567999719867}
+  - {fileID: 5964692562241983256}
+  - {fileID: 8487569396974391897}
+  - {fileID: 4804840102154087274}
+  - {fileID: 9108663775320659104}
+  - {fileID: 1450357347166671142}
+  - {fileID: 6131283213059370231}
+  - {fileID: 1977479323307174205}
+  - {fileID: 3289851963449376272}
+  m_Father: {fileID: 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: 177.5}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &3038665444609316863
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2852344175065108756}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: guanbi
+    gameObject: {fileID: 6452597082771321709}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+  - key: Icon_Attribute
+    gameObject: {fileID: 6234977368374517038}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+  - key: Text_Attribute
+    gameObject: {fileID: 2287570130555094335}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+  - key: Icon_GongFaIcon
+    gameObject: {fileID: 953441516732301498}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+  - key: StarRoot
+    gameObject: {fileID: 8194073867146024209}
+    isAssetBundle: 0
+    isList: 1
+    ListCollectorDatas:
+    - gameObject: {fileID: 8243822813260717961}
+    - gameObject: {fileID: 4649527201698735611}
+    - gameObject: {fileID: 6899362910355405383}
+    - gameObject: {fileID: 2266735464070336714}
+  - key: Text_Level1
+    gameObject: {fileID: 8363264617899274196}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8243822813260717961}
+    - gameObject: {fileID: 4649527201698735611}
+    - gameObject: {fileID: 6899362910355405383}
+    - gameObject: {fileID: 2266735464070336714}
+  - key: Text_Level
+    gameObject: {fileID: 8351717018150920890}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8243822813260717961}
+    - gameObject: {fileID: 4649527201698735611}
+    - gameObject: {fileID: 6899362910355405383}
+    - gameObject: {fileID: 2266735464070336714}
+  - key: Content
+    gameObject: {fileID: 8554840836415711052}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8243822813260717961}
+    - gameObject: {fileID: 4649527201698735611}
+    - gameObject: {fileID: 6899362910355405383}
+    - gameObject: {fileID: 2266735464070336714}
+  - key: Text_GongFaDesc
+    gameObject: {fileID: 4031219864197847051}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8243822813260717961}
+    - gameObject: {fileID: 4649527201698735611}
+    - gameObject: {fileID: 6899362910355405383}
+    - gameObject: {fileID: 2266735464070336714}
+  - key: Text_GongFaName
+    gameObject: {fileID: 9222665554078742869}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8243822813260717961}
+    - gameObject: {fileID: 4649527201698735611}
+    - gameObject: {fileID: 6899362910355405383}
+    - gameObject: {fileID: 2266735464070336714}
+  - key: Btn_Back
+    gameObject: {fileID: 6452597082771321709}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8243822813260717961}
+    - gameObject: {fileID: 4649527201698735611}
+    - gameObject: {fileID: 6899362910355405383}
+    - gameObject: {fileID: 2266735464070336714}
+  isAssetBundle: 1
+--- !u!1 &2864693667708896535
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4804840102154087274}
+  - component: {fileID: 1108550082667041195}
+  - component: {fileID: 8557089180798922636}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4804840102154087274
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2864693667708896535}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2225020066323674626}
+  - {fileID: 7960832951739429178}
+  m_Father: {fileID: 6694772361877173011}
+  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: -137.9, y: -704.8}
+  m_SizeDelta: {x: 197.97, y: 76.141}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1108550082667041195
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2864693667708896535}
+  m_CullTransparentMesh: 1
+--- !u!114 &8557089180798922636
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2864693667708896535}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_02
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 99b40747f72180f8bdc5e972731dc65f
+--- !u!1 &3141918248872863667
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4604021922974734781}
+  - component: {fileID: 4672047881302825629}
+  - component: {fileID: 8897569007258023421}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy) (5)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4604021922974734781
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3141918248872863667}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 9108663775320659104}
+  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: -17.4}
+  m_SizeDelta: {x: 0, y: -39.5084}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4672047881302825629
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3141918248872863667}
+  m_CullTransparentMesh: 1
+--- !u!114 &8897569007258023421
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3141918248872863667}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 1/2
+--- !u!1 &3256041832133504665
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1028954343504435061}
+  - component: {fileID: 5014666907463259958}
+  - component: {fileID: 8363264617899274196}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Level1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1028954343504435061
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3256041832133504665}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6754618905932910559}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.0000076293945, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5014666907463259958
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3256041832133504665}
+  m_CullTransparentMesh: 1
+--- !u!114 &8363264617899274196
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3256041832133504665}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 25
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "1\u7EA7"
+--- !u!1 &3978450814364350242
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1804435891179900880}
+  - component: {fileID: 8958233860565030772}
+  - component: {fileID: 953441516732301498}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_GongFaIcon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1804435891179900880
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3978450814364350242}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7374263567999719867}
+  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.0000076293945, y: -5.2}
+  m_SizeDelta: {x: 128, y: 128}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8958233860565030772
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3978450814364350242}
+  m_CullTransparentMesh: 1
+--- !u!114 &953441516732301498
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3978450814364350242}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_skill_10004
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
+  packInfo:
+    packName: skillIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
+    lasetJsonGUID: 151dde130cdc5228de9614f608886409
+--- !u!1 &4309486822035036728
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7960832951739429178}
+  - component: {fileID: 7339511625826535862}
+  - component: {fileID: 5225927340453658609}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy) (5)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7960832951739429178
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4309486822035036728}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4804840102154087274}
+  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: -17.4}
+  m_SizeDelta: {x: 0, y: -39.5084}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7339511625826535862
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4309486822035036728}
+  m_CullTransparentMesh: 1
+--- !u!114 &5225927340453658609
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4309486822035036728}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 1/2
+--- !u!1 &4731082921620160257
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8468219431132250151}
+  - component: {fileID: 4678360464258838821}
+  - component: {fileID: 9222665554078742869}
+  - component: {fileID: 6389940800036646202}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_GongFaName
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8468219431132250151
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4731082921620160257}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 868834413672771607}
+  m_Father: {fileID: 6694772361877173011}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 24.4, y: -60.7}
+  m_SizeDelta: {x: 0, y: 57.2}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &4678360464258838821
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4731082921620160257}
+  m_CullTransparentMesh: 1
+--- !u!114 &9222665554078742869
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4731082921620160257}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 50
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 5
+    m_MaxSize: 58
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u70C8\u7130\u5251"
+--- !u!114 &6389940800036646202
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4731082921620160257}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!1 &4996509214541409011
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8554840836415711052}
+  - component: {fileID: 716656530073874191}
+  - component: {fileID: 6915886676485339511}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Content
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8554840836415711052
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4996509214541409011}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7772631278292454634}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 1}
+--- !u!114 &716656530073874191
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4996509214541409011}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 21.47
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &6915886676485339511
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4996509214541409011}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
+--- !u!1 &5101211702717730642
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7374263567999719867}
+  - component: {fileID: 2109584501304235976}
+  - component: {fileID: 1495310652857097663}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_GongFaIcon (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7374263567999719867
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5101211702717730642}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1804435891179900880}
+  - {fileID: 7325077240780456121}
+  - {fileID: 6754618905932910559}
+  m_Father: {fileID: 6694772361877173011}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 258.7403, y: -164.29999}
+  m_SizeDelta: {x: 217.6208, y: 184.8691}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &2109584501304235976
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5101211702717730642}
+  m_CullTransparentMesh: 1
+--- !u!114 &1495310652857097663
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5101211702717730642}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.003921569}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 99b40747f72180f8bdc5e972731dc65f
+--- !u!1 &5134635627656750439
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3289851963449376272}
+  - component: {fileID: 7319464873274103757}
+  - component: {fileID: 4031219864197847051}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_GongFaDesc
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3289851963449376272
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5134635627656750439}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6694772361877173011}
+  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.000012517, y: -487.6}
+  m_SizeDelta: {x: 585.6058, y: 238.1717}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7319464873274103757
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5134635627656750439}
+  m_CullTransparentMesh: 1
+--- !u!114 &4031219864197847051
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5134635627656750439}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 27
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5411\u524D\u65B9\u53D1\u51FA\u4E00\u67C4\u5251\uFF0C\u5BF9\u654C\u4EBA\u9020\u621030%\u706B\u7CFB\u4F24\u5BB3\u3002"
+--- !u!1 &5304678840201142599
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5473342035507285947}
+  - component: {fileID: 2958293768953992893}
+  - component: {fileID: 3885140069835064990}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Bg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5473342035507285947
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5304678840201142599}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7195347698958489950}
+  - {fileID: 2462338167574332830}
+  - {fileID: 5091259688397450850}
+  m_Father: {fileID: 6694772361877173011}
+  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: 0}
+  m_SizeDelta: {x: 1000, y: 2000}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2958293768953992893
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5304678840201142599}
+  m_CullTransparentMesh: 1
+--- !u!114 &3885140069835064990
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5304678840201142599}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.5377358, g: 0.5377358, b: 0.5377358, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5338714318978733749
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8487569396974391897}
+  - component: {fileID: 4335290694010786724}
+  - component: {fileID: 926044825830822724}
+  - component: {fileID: 3829509673033260849}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Scroll View
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8487569396974391897
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5338714318978733749}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7772631278292454634}
+  m_Father: {fileID: 6694772361877173011}
+  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: 11.709, y: 37.9}
+  m_SizeDelta: {x: 586.017, y: 513.311}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4335290694010786724
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5338714318978733749}
+  m_CullTransparentMesh: 1
+--- !u!114 &926044825830822724
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5338714318978733749}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3829509673033260849
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5338714318978733749}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 8554840836415711052}
+  m_Horizontal: 1
+  m_Vertical: 1
+  m_MovementType: 1
+  m_Elasticity: 0.1
+  m_Inertia: 1
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 1
+  m_Viewport: {fileID: 7772631278292454634}
+  m_HorizontalScrollbar: {fileID: 0}
+  m_VerticalScrollbar: {fileID: 0}
+  m_HorizontalScrollbarVisibility: 2
+  m_VerticalScrollbarVisibility: 2
+  m_HorizontalScrollbarSpacing: -3
+  m_VerticalScrollbarSpacing: -3
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &5678433677027235321
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7772631278292454634}
+  - component: {fileID: 5192975596707995180}
+  - component: {fileID: 3288674104280379374}
+  - component: {fileID: 3946905512690974060}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Viewport
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7772631278292454634
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5678433677027235321}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8554840836415711052}
+  m_Father: {fileID: 8487569396974391897}
+  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: 0}
+  m_SizeDelta: {x: 0, y: -17}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &5192975596707995180
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5678433677027235321}
+  m_CullTransparentMesh: 1
+--- !u!114 &3288674104280379374
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5678433677027235321}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3946905512690974060
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5678433677027235321}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
+--- !u!1 &5952158511686725727
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4962336735051820175}
+  - component: {fileID: 918148156888368738}
+  - component: {fileID: 8962730917411756447}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &4962336735051820175
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5952158511686725727}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6694772361877173011}
+  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: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &918148156888368738
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5952158511686725727}
+  m_CullTransparentMesh: 1
+--- !u!114 &8962730917411756447
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5952158511686725727}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 8f327dab33407e14e9849893f74c8336, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6044047040053728969
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5837794108327954865}
+  - component: {fileID: 1716579542206058194}
+  - component: {fileID: 4649527201698735611}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5837794108327954865
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6044047040053728969}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7325077240780456121}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 22, y: 22}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &1716579542206058194
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6044047040053728969}
+  m_CullTransparentMesh: 1
+--- !u!114 &4649527201698735611
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6044047040053728969}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_star_1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!1 &6394406755354776696
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6754618905932910559}
+  - component: {fileID: 3653093404403356514}
+  - component: {fileID: 1734247607666755560}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6754618905932910559
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6394406755354776696}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1028954343504435061}
+  m_Father: {fileID: 7374263567999719867}
+  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: 0, y: -13.742462}
+  m_SizeDelta: {x: 153.0383, y: 52.0298}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &3653093404403356514
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6394406755354776696}
+  m_CullTransparentMesh: 1
+--- !u!114 &1734247607666755560
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6394406755354776696}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.09019608, g: 0.72156864, b: 0.6745098, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_23
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!1 &6425963736245954467
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5091259688397450850}
+  - component: {fileID: 8607944076566112437}
+  - component: {fileID: 1924206089262746420}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5091259688397450850
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6425963736245954467}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5473342035507285947}
+  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.000030518, y: -212.03}
+  m_SizeDelta: {x: 750, y: 1199.9}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8607944076566112437
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6425963736245954467}
+  m_CullTransparentMesh: 1
+--- !u!114 &1924206089262746420
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6425963736245954467}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6477496209602739719
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9108663775320659104}
+  - component: {fileID: 6804886247951314289}
+  - component: {fileID: 2813198028236614950}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9108663775320659104
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6477496209602739719}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 5526066809282652817}
+  - {fileID: 4604021922974734781}
+  m_Father: {fileID: 6694772361877173011}
+  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: 138, y: -704.8}
+  m_SizeDelta: {x: 197.97, y: 76.141}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6804886247951314289
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6477496209602739719}
+  m_CullTransparentMesh: 1
+--- !u!114 &2813198028236614950
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6477496209602739719}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_03
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 99b40747f72180f8bdc5e972731dc65f
+--- !u!1 &6544729830279763965
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7195347698958489950}
+  - component: {fileID: 5270828818777378180}
+  - component: {fileID: 5542292978509651059}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7195347698958489950
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6544729830279763965}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5473342035507285947}
+  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.000030518, y: 607.1576}
+  m_SizeDelta: {x: 750, y: 411.6848}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5270828818777378180
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6544729830279763965}
+  m_CullTransparentMesh: 1
+--- !u!114 &5542292978509651059
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6544729830279763965}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.627451, g: 0.7372549, b: 0.87843144, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6868302808854268087
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7393945541704192930}
+  - component: {fileID: 5382430608992752590}
+  - component: {fileID: 2287570130555094335}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Attribute
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7393945541704192930
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6868302808854268087}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 868834413672771607}
+  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: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5382430608992752590
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6868302808854268087}
+  m_CullTransparentMesh: 1
+--- !u!114 &2287570130555094335
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6868302808854268087}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 23
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u706B"
+--- !u!1 &7757314094562214086
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5964692562241983256}
+  - component: {fileID: 2416628555568723737}
+  - component: {fileID: 8385044853433705886}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5964692562241983256
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7757314094562214086}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 5154046706560764311}
+  m_Father: {fileID: 6694772361877173011}
+  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: -127.13551, y: 460.8}
+  m_SizeDelta: {x: 128.7673, y: 52.0298}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &2416628555568723737
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7757314094562214086}
+  m_CullTransparentMesh: 1
+--- !u!114 &8385044853433705886
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7757314094562214086}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.6509804, g: 0.6509804, b: 0.6509804, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_23
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!1 &8194073867146024209
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7325077240780456121}
+  - component: {fileID: 102925623945446190}
+  - component: {fileID: 2289866046320633600}
+  - component: {fileID: 2231679681651257498}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: StarRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7325077240780456121
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8194073867146024209}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6949080144761567334}
+  - {fileID: 5837794108327954865}
+  - {fileID: 7455674247020882449}
+  - {fileID: 2968118661804333137}
+  m_Father: {fileID: 7374263567999719867}
+  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: 0, y: -39.4}
+  m_SizeDelta: {x: 0, y: 30.610802}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &102925623945446190
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8194073867146024209}
+  m_CullTransparentMesh: 1
+--- !u!114 &2289866046320633600
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8194073867146024209}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &2231679681651257498
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8194073867146024209}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0

+ 7 - 0
Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CH4YtH78Uy/HxI7ugjdX/ll9gvJI8BeIpw+cptzva1RermNtripl49KhxbVd
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Res/UI/SkillSelectPanel/QQ20250506-134521.png


+ 203 - 0
Assets/Res/UI/SkillSelectPanel/QQ20250506-134521.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: Bywcty35AimRR6uAmFJtTWZxD1uQutdIHVC2MhB7wg+JcEzCHkNJfOD4p1v9
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 795 - 76
Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -250,6 +250,86 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
     packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
     lasetJsonGUID: ba8dbdc12cfea95132d75e229eac99b8
+--- !u!1 &538526419754884830
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7820611370538219087}
+  - component: {fileID: 7327153805545042965}
+  - component: {fileID: 2101758770303582803}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_GongFaCount
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7820611370538219087
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 538526419754884830}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4487645842108660236}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0.000015258789, y: -3.9500008}
+  m_SizeDelta: {x: 0, y: -7.8999}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7327153805545042965
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 538526419754884830}
+  m_CullTransparentMesh: 1
+--- !u!114 &2101758770303582803
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 538526419754884830}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 28
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u529F\u6CD5\u6570\u91CF1/4"
 --- !u!1 &857437492319237345
 GameObject:
   m_ObjectHideFlags: 0
@@ -555,6 +635,197 @@ MonoBehaviour:
   - {fileID: 4886873273644485354}
   - {fileID: 4807656811939580993}
   _allChildObj: []
+--- !u!1 &1274528990848997714
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4487645842108660236}
+  - component: {fileID: 8777019402569436550}
+  - component: {fileID: 6345496807958351853}
+  - component: {fileID: 1267969325408646186}
+  - component: {fileID: 1037315112410839647}
+  - component: {fileID: 2302355333164343178}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_FuZu (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4487645842108660236
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1274528990848997714}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7820611370538219087}
+  m_Father: {fileID: 6694772361877173011}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 472.32703, y: -716}
+  m_SizeDelta: {x: 272.4219, y: 77.7761}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &8777019402569436550
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1274528990848997714}
+  m_CullTransparentMesh: 1
+--- !u!114 &6345496807958351853
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1274528990848997714}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.2509804, g: 0.45098042, b: 0.57254905, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_23
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!114 &1267969325408646186
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1274528990848997714}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ef7878ea2dacc454894d556c1d97bca0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - StateInfos:
+    - Target: {fileID: 1274528990848997714}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.31764707, y: 0.5529412, z: 0.27058825, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 538526419754884830}
+      UIStateV4Types: 80000000
+      UIStateV4Datas:
+      - {x: 1, y: 1, z: 1, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  - StateInfos:
+    - Target: {fileID: 1274528990848997714}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.9921569, y: 0.9803922, z: 0.9607844, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 538526419754884830}
+      UIStateV4Types: 80000000
+      UIStateV4Datas:
+      - {x: 0.6313726, y: 0.5529412, z: 0.57254905, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  AllComs:
+  - {fileID: 1274528990848997714}
+  - {fileID: 538526419754884830}
+  AllComsStateTypes: 4000000080000000
+  CurrIndex: 0
+--- !u!114 &1037315112410839647
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1274528990848997714}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 09a9a136688f46fbb2a843418fc53144, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isScriptControl: 1
+  uiToggleList: {fileID: 0}
+  CustomStateController: {fileID: 0}
+--- !u!114 &2302355333164343178
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1274528990848997714}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 6345496807958351853}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &1393957414792207961
 GameObject:
   m_ObjectHideFlags: 0
@@ -776,6 +1047,53 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &1724651191095121306
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3727605509090450065}
+  - component: {fileID: 1633015880774362368}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: GongFaSettingRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &3727605509090450065
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1724651191095121306}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 5985873034990668332}
+  - {fileID: 4047916813180227560}
+  m_Father: {fileID: 6694772361877173011}
+  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: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1633015880774362368
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1724651191095121306}
+  m_CullTransparentMesh: 1
 --- !u!1 &1806416249775275151
 GameObject:
   m_ObjectHideFlags: 0
@@ -1063,8 +1381,11 @@ RectTransform:
   - {fileID: 6870355629153732168}
   - {fileID: 6565763541845300463}
   - {fileID: 1450357347166671142}
+  - {fileID: 4487645842108660236}
   - {fileID: 1650125586740709049}
   - {fileID: 6224527261346386714}
+  - {fileID: 626305634221636739}
+  - {fileID: 3727605509090450065}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1331,6 +1652,66 @@ MonoBehaviour:
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
+  - key: Btn_Setting
+    gameObject: {fileID: 3642748124106631649}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 953277807175961835}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+  - key: Text_GongFaCount
+    gameObject: {fileID: 2101758770303582803}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 953277807175961835}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+  - key: GongFaSettingRoot
+    gameObject: {fileID: 1724651191095121306}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 953277807175961835}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+  - key: Btn_ChangeOk
+    gameObject: {fileID: 6360930775916485433}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 953277807175961835}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
   isAssetBundle: 1
 --- !u!1 &3415559647474066940
 GameObject:
@@ -1362,7 +1743,6 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 5985873034990668332}
   - {fileID: 38430995020534155}
   - {fileID: 4244019806394961563}
   m_Father: {fileID: 6694772361877173011}
@@ -1414,36 +1794,225 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 5338914837865379973}
-  m_Father: {fileID: 3504138147426559481}
+  - {fileID: 5338914837865379973}
+  m_Father: {fileID: 3504138147426559481}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 176.3507, y: 77.7761}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &543289716699196598
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3512407963766755592}
+  m_CullTransparentMesh: 1
+--- !u!114 &6899212884099179695
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3512407963766755592}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.31764707, g: 0.5529412, b: 0.27058825, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_23
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!114 &6080933953521486032
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3512407963766755592}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ef7878ea2dacc454894d556c1d97bca0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - StateInfos:
+    - Target: {fileID: 3512407963766755592}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.31764707, y: 0.5529412, z: 0.27058825, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 4000842035526357642}
+      UIStateV4Types: 80000000
+      UIStateV4Datas:
+      - {x: 1, y: 1, z: 1, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  - StateInfos:
+    - Target: {fileID: 3512407963766755592}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.9921569, y: 0.9803922, z: 0.9607844, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+    - Target: {fileID: 4000842035526357642}
+      UIStateV4Types: 80000000
+      UIStateV4Datas:
+      - {x: 0.6313726, y: 0.5529412, z: 0.57254905, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  AllComs:
+  - {fileID: 3512407963766755592}
+  - {fileID: 4000842035526357642}
+  AllComsStateTypes: 4000000080000000
+  CurrIndex: 0
+--- !u!114 &4807656811939580993
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3512407963766755592}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 09a9a136688f46fbb2a843418fc53144, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isScriptControl: 1
+  uiToggleList: {fileID: 0}
+  CustomStateController: {fileID: 0}
+--- !u!114 &848083367848765488
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3512407963766755592}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 6899212884099179695}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &3581938487787395720
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 626305634221636739}
+  - component: {fileID: 7918248993400424687}
+  - component: {fileID: 4514347021073670849}
+  - component: {fileID: 3642748124106631649}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Setting
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &626305634221636739
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3581938487787395720}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4070278992186964066}
+  m_Father: {fileID: 6694772361877173011}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 176.3507, y: 77.7761}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 316.0891, y: -716}
+  m_SizeDelta: {x: 152.3328, y: 77.7761}
   m_Pivot: {x: 0, y: 0.5}
---- !u!222 &543289716699196598
+--- !u!222 &7918248993400424687
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3512407963766755592}
+  m_GameObject: {fileID: 3581938487787395720}
   m_CullTransparentMesh: 1
---- !u!114 &6899212884099179695
+--- !u!114 &4514347021073670849
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3512407963766755592}
+  m_GameObject: {fileID: 3581938487787395720}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.31764707, g: 0.5529412, b: 0.27058825, a: 1}
+  m_Color: {r: 0.2627451, g: 0.8117648, b: 0.48627454, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1468,72 +2037,13 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
---- !u!114 &6080933953521486032
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3512407963766755592}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ef7878ea2dacc454894d556c1d97bca0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  data:
-  - StateInfos:
-    - Target: {fileID: 3512407963766755592}
-      UIStateV4Types: 40000000
-      UIStateV4Datas:
-      - {x: 0.31764707, y: 0.5529412, z: 0.27058825, w: 1}
-      UIStateStrTypes: 
-      UIStateStrDatas: []
-    - Target: {fileID: 4000842035526357642}
-      UIStateV4Types: 80000000
-      UIStateV4Datas:
-      - {x: 1, y: 1, z: 1, w: 1}
-      UIStateStrTypes: 
-      UIStateStrDatas: []
-  - StateInfos:
-    - Target: {fileID: 3512407963766755592}
-      UIStateV4Types: 40000000
-      UIStateV4Datas:
-      - {x: 0.9921569, y: 0.9803922, z: 0.9607844, w: 1}
-      UIStateStrTypes: 
-      UIStateStrDatas: []
-    - Target: {fileID: 4000842035526357642}
-      UIStateV4Types: 80000000
-      UIStateV4Datas:
-      - {x: 0.6313726, y: 0.5529412, z: 0.57254905, w: 1}
-      UIStateStrTypes: 
-      UIStateStrDatas: []
-  AllComs:
-  - {fileID: 3512407963766755592}
-  - {fileID: 4000842035526357642}
-  AllComsStateTypes: 4000000080000000
-  CurrIndex: 0
---- !u!114 &4807656811939580993
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3512407963766755592}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 09a9a136688f46fbb2a843418fc53144, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  isScriptControl: 1
-  uiToggleList: {fileID: 0}
-  CustomStateController: {fileID: 0}
---- !u!114 &848083367848765488
+--- !u!114 &3642748124106631649
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3512407963766755592}
+  m_GameObject: {fileID: 3581938487787395720}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
@@ -1567,7 +2077,7 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 6899212884099179695}
+  m_TargetGraphic: {fileID: 4514347021073670849}
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
@@ -3323,6 +3833,86 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &6835285763623382150
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4070278992186964066}
+  - component: {fileID: 1896888060464675892}
+  - component: {fileID: 5928119389132673519}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4070278992186964066
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6835285763623382150}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 626305634221636739}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0.000015258789, y: -3.9500008}
+  m_SizeDelta: {x: 0, y: -7.8999}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1896888060464675892
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6835285763623382150}
+  m_CullTransparentMesh: 1
+--- !u!114 &5928119389132673519
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6835285763623382150}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 28
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u8C03\u6574"
 --- !u!1 &7181239539594388838
 GameObject:
   m_ObjectHideFlags: 0
@@ -3790,11 +4380,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 6224527261346386714}
+  m_Father: {fileID: 3727605509090450065}
   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: -164.08, y: 303.88}
+  m_AnchoredPosition: {x: -164.08, y: -53.102417}
   m_SizeDelta: {x: 302.8486, y: 45.0141}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3339769281478272295
@@ -4160,3 +4750,132 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &8903738403727791632
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4047916813180227560}
+  - component: {fileID: 7633597412871517468}
+  - component: {fileID: 6360930775916485433}
+  - component: {fileID: 6755622578373341312}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Btn_ChangeOk
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4047916813180227560
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8903738403727791632}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3727605509090450065}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 234, y: -752}
+  m_SizeDelta: {x: 68, y: 59}
+  m_Pivot: {x: 0, y: 0}
+--- !u!222 &7633597412871517468
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8903738403727791632}
+  m_CullTransparentMesh: 1
+--- !u!114 &6360930775916485433
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8903738403727791632}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 6755622578373341312}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &6755622578373341312
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8903738403727791632}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_close_02
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc

+ 324 - 127
Assets/Res/UI/SkillSelectPanel/SkillWidget.prefab

@@ -13,7 +13,7 @@ GameObject:
   - component: {fileID: 4513486182597197423}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Text (Legacy)
+  m_Name: Text_Level
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -35,7 +35,7 @@ RectTransform:
   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: 0}
+  m_AnchoredPosition: {x: 0, y: -2.3}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4973722897884048289
@@ -80,90 +80,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "1\u7EA7"
---- !u!1 &805222276901676032
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5614831832456575891}
-  - component: {fileID: 6489293058704014141}
-  - component: {fileID: 2212488636560441896}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: myImage (2)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5614831832456575891
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 805222276901676032}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8817738242950991828}
-  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: 26.9, y: -45.7}
-  m_SizeDelta: {x: 22, y: 22}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6489293058704014141
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 805222276901676032}
-  m_CullTransparentMesh: 1
---- !u!114 &2212488636560441896
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 805222276901676032}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_star_1
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
-  packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
 --- !u!1 &1157110654555507881
 GameObject:
   m_ObjectHideFlags: 0
@@ -198,10 +114,8 @@ RectTransform:
   - {fileID: 7896131592767513033}
   - {fileID: 1608102705727293640}
   - {fileID: 142305117687377865}
-  - {fileID: 8429437205222156808}
-  - {fileID: 2435727960284862901}
-  - {fileID: 5614831832456575891}
   - {fileID: 2140549312652121987}
+  - {fileID: 4933297852123740916}
   - {fileID: 7716599432344587041}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -233,6 +147,30 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Text_SkillName
+    gameObject: {fileID: 7193651091691759865}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Level
+    gameObject: {fileID: 4513486182597197423}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_SkillType
+    gameObject: {fileID: 7365213337883119231}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: StarRoot
+    gameObject: {fileID: 2275450100977324630}
+    isAssetBundle: 0
+    isList: 1
+    ListCollectorDatas:
+    - gameObject: {fileID: 7739541666801086000}
+    - gameObject: {fileID: 1541203404502475801}
+    - gameObject: {fileID: 7344344513877532038}
+    - gameObject: {fileID: 3002968146783622268}
   isAssetBundle: 1
 --- !u!1 &1269921678863901166
 GameObject:
@@ -331,7 +269,7 @@ GameObject:
   - component: {fileID: 7365213337883119231}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Text (Legacy)
+  m_Name: Text_SkillType
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -475,6 +413,97 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2275450100977324630
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4933297852123740916}
+  - component: {fileID: 39893200661916418}
+  - component: {fileID: 7362265010322476270}
+  - component: {fileID: 8627442896273789012}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: StarRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4933297852123740916
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2275450100977324630}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7305513881155388835}
+  - {fileID: 295106506078024080}
+  - {fileID: 8224044986558415334}
+  - {fileID: 488998708127733385}
+  m_Father: {fileID: 8817738242950991828}
+  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: 0, y: 17.7}
+  m_SizeDelta: {x: 0, y: 30.610802}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &39893200661916418
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2275450100977324630}
+  m_CullTransparentMesh: 1
+--- !u!114 &7362265010322476270
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2275450100977324630}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &8627442896273789012
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2275450100977324630}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
 --- !u!1 &2751874343717437709
 GameObject:
   m_ObjectHideFlags: 0
@@ -488,7 +517,7 @@ GameObject:
   - component: {fileID: 7193651091691759865}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Text (Legacy)
+  m_Name: Text_SkillName
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -555,6 +584,90 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u70C8\u7130\u5251"
+--- !u!1 &2765189794887986478
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7305513881155388835}
+  - component: {fileID: 8259216883724390047}
+  - component: {fileID: 7739541666801086000}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7305513881155388835
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2765189794887986478}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4933297852123740916}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 22, y: 22}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &8259216883724390047
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2765189794887986478}
+  m_CullTransparentMesh: 1
+--- !u!114 &7739541666801086000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2765189794887986478}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_star_1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
 --- !u!1 &3266992687204387941
 GameObject:
   m_ObjectHideFlags: 0
@@ -592,7 +705,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -0.40001, y: -26.9}
-  m_SizeDelta: {x: 64.7099, y: 22}
+  m_SizeDelta: {x: 91.01, y: 30.9416}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &438287497116520212
 CanvasRenderer:
@@ -615,7 +728,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0.7294118, b: 0.6784314, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -632,7 +745,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_di_08
+  _icon_name: btn_23
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -739,7 +852,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
---- !u!1 &4334215363042879576
+--- !u!1 &4508280746534676298
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -747,51 +860,51 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 2435727960284862901}
-  - component: {fileID: 8396491226596822807}
-  - component: {fileID: 5318835347200832720}
+  - component: {fileID: 8224044986558415334}
+  - component: {fileID: 1370561825948043109}
+  - component: {fileID: 7344344513877532038}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage (1)
+  m_Name: myImage (3)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &2435727960284862901
+--- !u!224 &8224044986558415334
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4334215363042879576}
+  m_GameObject: {fileID: 4508280746534676298}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8817738242950991828}
+  m_Father: {fileID: 4933297852123740916}
   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.8, y: -45.7}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 22, y: 22}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8396491226596822807
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &1370561825948043109
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4334215363042879576}
+  m_GameObject: {fileID: 4508280746534676298}
   m_CullTransparentMesh: 1
---- !u!114 &5318835347200832720
+--- !u!114 &7344344513877532038
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4334215363042879576}
+  m_GameObject: {fileID: 4508280746534676298}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
@@ -841,7 +954,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7716599432344587041
 RectTransform:
   m_ObjectHideFlags: 0
@@ -985,7 +1098,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
---- !u!1 &6617402169654368210
+--- !u!1 &6419245021695408413
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -993,51 +1106,135 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 8429437205222156808}
-  - component: {fileID: 7808840577937066816}
-  - component: {fileID: 7487754302920330621}
+  - component: {fileID: 295106506078024080}
+  - component: {fileID: 3865245161463356870}
+  - component: {fileID: 1541203404502475801}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: myImage (2)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &8429437205222156808
+--- !u!224 &295106506078024080
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6617402169654368210}
+  m_GameObject: {fileID: 6419245021695408413}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8817738242950991828}
+  m_Father: {fileID: 4933297852123740916}
   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: -21.755, y: -45.7}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 22, y: 22}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &7808840577937066816
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &3865245161463356870
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6419245021695408413}
+  m_CullTransparentMesh: 1
+--- !u!114 &1541203404502475801
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6419245021695408413}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_star_1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+--- !u!1 &6613562372377362627
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 488998708127733385}
+  - component: {fileID: 7960367827062671880}
+  - component: {fileID: 3002968146783622268}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &488998708127733385
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6613562372377362627}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4933297852123740916}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 22, y: 22}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &7960367827062671880
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6617402169654368210}
+  m_GameObject: {fileID: 6613562372377362627}
   m_CullTransparentMesh: 1
---- !u!114 &7487754302920330621
+--- !u!114 &3002968146783622268
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6617402169654368210}
+  m_GameObject: {fileID: 6613562372377362627}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}

+ 26 - 6
Assets/Scripts/Core/Editor/FortRectTransformInspector.cs

@@ -8,7 +8,6 @@ using Fort23.Mono;
 using Fort23.UTool;
 using UnityEditor;
 using UnityEngine;
-
 using Object = UnityEngine.Object;
 
 // namespace UnityEditor
@@ -17,7 +16,6 @@ using Object = UnityEngine.Object;
 public class FortRectTransformInspector : UnityEditor.Editor
 {
     private UnityEditor.Editor editor;
-
     private UnityEngine.Object openObject;
     private ReferenceCollector ReferenceCollector;
     private Dictionary<string, string> AllTypeDictionary = new Dictionary<string, string>();
@@ -108,7 +106,7 @@ public class FortRectTransformInspector : UnityEditor.Editor
     public static ArrayList GetFile(string dir, string extension)
     {
         ArrayList alst = new ArrayList();
-        
+
         string[] files = Directory.GetFiles(dir, ".", SearchOption.AllDirectories);
         foreach (string file in files)
         {
@@ -180,7 +178,7 @@ public class FortRectTransformInspector : UnityEditor.Editor
 
             if (GUILayout.Button("生成UI脚本"))
             {
-                string path = UnityEditor.EditorUtility.OpenFolderPanel("选择一个生成的路径", Application.dataPath + "/Scripts/Mono/UI", "");
+                string path = UnityEditor.EditorUtility.OpenFolderPanel("选择一个生成的路径", Application.dataPath + "/Scripts/GameUI/UI", "");
                 RectTransform rectTransform = serializedObject.targetObject as RectTransform;
 
                 GenerateUIPanelCode(ClassName, rectTransform.name, path);
@@ -226,46 +224,68 @@ public class FortRectTransformInspector : UnityEditor.Editor
 
         code.Append("namespace Fort23.Mono\n{");
         code.Append("\n");
-        code.Append($"[UIBinding(prefab = \"" + prefabName + "\"  )]");
+        code.Append($"\t[UIBinding(prefab = \"" + prefabName + "\"  )]");
         code.Append("\n");
         code.Append($"\tpublic partial class {className} : {extenstionClass}\n");
         code.Append("\t{\n");
 
+        code.Append("\t");
         code.Append("\tprivate void Init()\n");
+        code.Append("\t");
         code.Append("\t{\n");
-
+        code.Append("\n");
+        code.Append("\t");
         code.Append("\t}\n");
 
 
         if (!extenstionClass.Contains("UIComponent"))
         {
+            code.Append("\t");
             code.Append("\tprotected override void AddEvent()\n");
+            code.Append("\t");
             code.Append("\t{\n");
+            code.Append("\n");
+            code.Append("\t");
             code.Append("\t}\n");
 
+            code.Append("\t");
             code.Append("\tprotected override void DelEvent()\n");
+            code.Append("\t");
             code.Append("\t{\n");
+            code.Append("\n");
+            code.Append("\t");
             code.Append("\t}\n");
         }
         else
         {
+            code.Append("\t");
             code.Append("\tpublic override void AddEvent()\n");
+            code.Append("\t");
             code.Append("\t{\n");
+            code.Append("\n");
+            code.Append("\t");
             code.Append("\t}\n");
 
+            code.Append("\t");
             code.Append("\tpublic override void DelEvent()\n");
             code.Append("\t{\n");
+            code.Append("\n");
             code.Append("\t}\n");
         }
 
 
+        code.Append("\t");
         code.Append("\tpublic override void AddButtonEvent()\n");
+        code.Append("\t");
         code.Append("\t{\n");
+        code.Append("\n");
+        code.Append("\t");
         code.Append("\t}\n");
 
 
         code.Append("\n");
 
+
         code.Append("\t}\n");
         code.Append("}\n");
 

+ 19 - 20
Assets/Scripts/Core/Editor/PackgTool/UGUIPackgToolWindow.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Reflection;
 using System.Security.Cryptography;
@@ -623,26 +624,24 @@ namespace UnityEditor.UI
             // rect.y += 50;
 
 
-            // if (packInfo.spriteAtlas != null)
-            // {
-            //     Rect scrolViewRect = new Rect(0, rect.y, EditorGUIUtility.currentViewWidth - 200, 256);
-            //     MethodInfo getPreviewTextures = packInfo.spriteAtlas.GetType()
-            //         .GetMethod("GetPreviewTextures");
-            //     Texture2D[] allTack = (Texture2D[])getPreviewTextures.Invoke(packInfo.spriteAtlas, null);
-            //     // Texture2D[] allTack = packInfo.spriteAtlas.GetPreviewTextures();
-            //     packInfo.movePos = GUI.BeginScrollView(scrolViewRect, packInfo.movePos,
-            //         new Rect(0, 0, allTack.Length * 356, 250), false, false);
-            //
-            //
-            //     Rect textrueRect = new Rect(30, 0, 256, 256);
-            //     for (int i = 0; i < allTack.Length; i++)
-            //     {
-            //         GUI.DrawTexture(textrueRect, allTack[i], ScaleMode.ScaleToFit);
-            //         textrueRect.x += 256 + 100;
-            //     }
-            //
-            //     GUI.EndScrollView();
-            // }
+            if (packInfo.spriteAtlas != null)
+            {
+                Rect scrolViewRect = new Rect(0, rect.y, EditorGUIUtility.currentViewWidth - 200, 256);
+                Sprite[] sprites = new Sprite[packInfo.spriteAtlas.spriteCount];
+                packInfo.spriteAtlas.GetSprites(sprites);
+                List<Texture2D> allTack = sprites.Select(s => s.texture).Distinct().ToList();
+                packInfo.movePos = GUI.BeginScrollView(scrolViewRect, packInfo.movePos,
+                    new Rect(0, 0, allTack.Count * 356, 250), false, false);
+
+                Rect textrueRect = new Rect(30, 0, 256, 256);
+                for (int i = 0; i < allTack.Count; i++)
+                {
+                    GUI.DrawTexture(textrueRect, allTack[i], ScaleMode.ScaleToFit);
+                    textrueRect.x += 256 + 100;
+                }
+
+                GUI.EndScrollView();
+            }
         }
 
         private void UpdateArt()

+ 51 - 0
Assets/Scripts/Core/UI/UTool/UtilTools.cs

@@ -903,6 +903,57 @@ namespace Utility
             // 理论上不会到达这里,但为了安全返回最后一个元素
             return items[items.Count - 1];
         }
+        
+        
+        public static string GetString(string a, float[] b)
+        {
+            if (a == null || a == "" || b == null)
+                return a;
+            for (int i = 0; i < b.Length; i++)
+            {
+                string d = b[i].ToString();
+                string c = "{" + i + "}";
+
+                if (a.Contains(c))
+                    a = a.Replace(c, d);
+            }
+
+            return a;
+        }
+
+        public static string GetString(string a, string[] b)
+        {
+            if (a == null || a == "" || b == null)
+                return a;
+            for (int i = 0; i < b.Length; i++)
+            {
+                string d = b[i].ToString();
+                string c = "{" + i + "}";
+
+                if (a.Contains(c))
+                    a = a.Replace(c, d);
+            }
+
+            return a;
+        }
+
+
+        public static string GetString(string a, int[] b)
+        {
+            if (a == null || a == "")
+                return "null";
+            for (int i = 0; i < b.Length; i++)
+            {
+                string d = b[i].ToString();
+                string c = "{" + i + "}";
+
+                if (a.Contains(c))
+                    a = a.Replace(c, d);
+            }
+
+            return a;
+        }
+        
     }
 
 

+ 4 - 4
Assets/Scripts/GameData/ExcelConfig/HeroModelConfig.cs

@@ -87,15 +87,15 @@ public int hp;
 
 
 		/// <summary>
-		///防御
+		///攻击
 		/// </summary>
-public int def;
+public int attack;
 
 
 		/// <summary>
-		///攻击
+		///防御
 		/// </summary>
-public int attack;
+public int def;
 
 
 		/// <summary>

+ 19 - 1
Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -20,6 +20,12 @@ namespace Excel2Json
 public int ID;
 
 
+		/// <summary>
+		///对应的碎片ID
+		/// </summary>
+public int PieceID;
+
+
 		/// <summary>
 		///功法强度 基于标准强度的百分比 50=50%
 		/// </summary>
@@ -75,7 +81,7 @@ public int cd;
 
 
 		/// <summary>
-		///技能类型: 1= 基础 2=增强型技能 3=法宝技能 4=大道 
+		///技能类型: 1=主动功法 2=辅助功法 3=法宝技能 4=大道 5=被动功法 
 		/// </summary>
 public int SkillType;
 
@@ -110,6 +116,18 @@ public int[] addPropertyType;
 public float[] addPropertyValue;
 
 
+		/// <summary>
+		///升星简短描述
+		/// </summary>
+public int PromoteLan;
+
+
+		/// <summary>
+		///升星简短描述参数
+		/// </summary>
+public float[] PromoteLanPara;
+
+
 	}
 
 }

+ 38 - 0
Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs

@@ -0,0 +1,38 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\skill.xlsx. SheetName: SkillConstant
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "SkillConstant.json")]
+	public partial class SkillConstantHolder : ConfigHolder<SkillConstant>
	{
+	}
+
+
+	[Serializable]
+	public struct SkillConstant : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///重复功法自动转碎片的数量
+		/// </summary>
+public int[] SkilltoPieceNum;
+
+
+		/// <summary>
+		///功法升到对应星级所需碎片数量
+		/// </summary>
+public int[] SkillPromoteNeedPieceNum;
+
+
+	}
+
+}
+// End of Auto Generated Code

+ 12 - 0
Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

@@ -32,6 +32,18 @@ public int MainPower;
 public float SkillPower1;
 
 
+		/// <summary>
+		///功法升级所需道具
+		/// </summary>
+public int[] LevelupItem;
+
+
+		/// <summary>
+		///攻击升级所需道具数量
+		/// </summary>
+public int[] LevelupItemNum;
+
+
 	}
 
 }

+ 32 - 6
Assets/Scripts/GameLogic/Hero/SkillInfo.cs

@@ -13,21 +13,46 @@ namespace GameLogic.Hero
 
         public int index;
         public float[] effectValue;
+        
+        
+        public SkillInfo(int skill ,int skillPowerup)
+        {
+            skillConfig = ConfigComponent.Instance.Get<SkillConfig>(skill);
+            SkillPowerupConfig = ConfigComponent.Instance.Get<SkillPowerupConfig>(skillPowerup);
+            effectValue = new float[skillConfig.effectValue.Length];
+            Array.Copy(skillConfig.effectValue, effectValue, skillConfig.effectValue.Length);
+            if (skillConfig.intensifierIndex != null)
+            {
+                for (int i = 0; i < skillConfig.intensifierIndex.Length; i++)
+                {
+                    int index = skillConfig.intensifierIndex[i] - 1;
+                    if (index >= 0 && index < effectValue.Length)
+                    {
+                        effectValue[index] = effectValue[index] * SkillPowerupConfig.SkillPower1 * 0.01f;
+                    }
+                }
+            }
+
+
+            qiangDu = (long)(SkillPowerupConfig.MainPower * skillConfig.power);
+            index = 0;
+        }
+        
 
-        public SkillInfo(int skillId, int powerId)
+        public SkillInfo(AccountFileInfo.SkillData skillId)
         {
-            skillConfig = ConfigComponent.Instance.Get<SkillConfig>(skillId);
-            SkillPowerupConfig = ConfigComponent.Instance.Get<SkillPowerupConfig>(powerId);
+            skillConfig = ConfigComponent.Instance.Get<SkillConfig>(skillId.id * 10 + skillId.star - 1);
+            SkillPowerupConfig = ConfigComponent.Instance.Get<SkillPowerupConfig>(skillId.level);
             effectValue = new float[skillConfig.effectValue.Length];
             Array.Copy(skillConfig.effectValue, effectValue, skillConfig.effectValue.Length);
             if (skillConfig.intensifierIndex != null)
             {
                 for (int i = 0; i < skillConfig.intensifierIndex.Length; i++)
                 {
-                    int index = skillConfig.intensifierIndex[i]-1;
-                    if(index>=0&&index< effectValue.Length)
+                    int index = skillConfig.intensifierIndex[i] - 1;
+                    if (index >= 0 && index < effectValue.Length)
                     {
-                        effectValue[index] = effectValue[index] * SkillPowerupConfig.SkillPower1*0.01f;
+                        effectValue[index] = effectValue[index] * SkillPowerupConfig.SkillPower1 * 0.01f;
                     }
                 }
             }
@@ -36,5 +61,6 @@ namespace GameLogic.Hero
             qiangDu = (long)(SkillPowerupConfig.MainPower * skillConfig.power);
             index = 0;
         }
+        
     }
 }

+ 30 - 25
Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -31,12 +31,12 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         public SkillData[] usrSkill = new SkillData[10];
 
         public List<SkillData> AllSkillDatas = new List<SkillData>();
-        
+
         //每天刷新时间
         public long nextRefence;
-        
+
         public int todayUseExpElixrPanelCount = 0;
-        
+
         //地图探索进度
         public int senceExplorationProgress;
 
@@ -52,7 +52,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
 
 
         public List<ItemData> ItemListData = new List<ItemData>();
-        
+
         public HeroData heroData;
 
 
@@ -80,16 +80,20 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         // /// </summary>
         // public List<HeroData> HeroListInBackDatas = new List<HeroData>();
     }
-    
-    
+
+
     [System.Serializable]
     public class SkillData
     {
         public int id;
 
+        public int level;
+
+        public int star;
+
         public int useIndex;
     }
-    
+
 
     [System.Serializable]
     public class EventData
@@ -330,32 +334,33 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         playerData.ItemListData.Add(coin);
         playerData.ItemListData.Add(diamond);
         playerData.ItemListData.Add(heroExp);
-        
-        
+
+
         //测试道具
-        playerData.ItemListData.Add(new ItemData(1201,10));
-        playerData.ItemListData.Add(new ItemData(1202,10));
-        
-        playerData.ItemListData.Add(new ItemData(1301,10));
-        playerData.ItemListData.Add(new ItemData(1302,10));
-        playerData.ItemListData.Add(new ItemData(1303,10));
-        playerData.ItemListData.Add(new ItemData(1304,10));
-        
-        playerData.ItemListData.Add(new ItemData(1401,10));
-        playerData.ItemListData.Add(new ItemData(1402,10));
-        playerData.ItemListData.Add(new ItemData(1403,10));
-        playerData.ItemListData.Add(new ItemData(1404,10));
-        
-        var allSkill = new[] { 10011, 20011, 11011, 12011, 13011, 5010011, 5011011, 5012011, 5013011, 5014011, 5015011 };
+        playerData.ItemListData.Add(new ItemData(1201, 10));
+        playerData.ItemListData.Add(new ItemData(1202, 10));
+
+        playerData.ItemListData.Add(new ItemData(1301, 10));
+        playerData.ItemListData.Add(new ItemData(1302, 10));
+        playerData.ItemListData.Add(new ItemData(1303, 10));
+        playerData.ItemListData.Add(new ItemData(1304, 10));
+
+        playerData.ItemListData.Add(new ItemData(1401, 10));
+        playerData.ItemListData.Add(new ItemData(1402, 10));
+        playerData.ItemListData.Add(new ItemData(1403, 10));
+        playerData.ItemListData.Add(new ItemData(1404, 10));
+
+        var allSkill = new[] { 1001, 2001, 1101, 1201, 1301, 501001, 501101, 501201, 501301, 501401, 501501 };
         foreach (var i in allSkill)
         {
             SkillData skillData = new SkillData();
             skillData.id = i;
+            skillData.star = 1;
+            skillData.level = 1;
             skillData.useIndex = -1;
             playerData.AllSkillDatas.Add(skillData);
         }
-      
-        
+
 
         HeroData heroData = new HeroData();
         playerData.heroData = heroData;

+ 39 - 6
Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs

@@ -21,6 +21,11 @@ namespace Fort23.Mono
         private int type1 = 0;
         private int type2 = 0;
 
+        /// <summary>
+        /// 1.执行升级逻辑 2.执行更换逻辑
+        /// </summary>
+        private int infoType = 1;
+
         public static async CTask OpenSkillSelectPanel()
         {
             CombatDrive.Instance.CombatController.isUpdate = false;
@@ -41,6 +46,12 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
+            Btn_Setting.onClick.AddListener(() =>
+            {
+                GongFaSettingRoot.SetActive(true);
+                infoType = 2;
+            });
+
             Btn_Jin.onClick.AddListener(() =>
             {
                 if (type2 == 1)
@@ -129,7 +140,19 @@ namespace Fort23.Mono
                 Sort(type1, type2);
             });
 
-            guanbi.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+            guanbi.onClick.AddListener(() =>
+            {
+                if (infoType == 2)
+                {
+                    GongFaSettingRoot.SetActive(false);
+                    infoType = 1;
+                    CloseSelect();
+                }
+                else
+                {
+                    UIManager.Instance.HideUIUIPanel(this);
+                }
+            });
             Btn_RemoveGongFa.onClick.AddListener(() =>
             {
                 PlayerManager.Instance.GongFaControl.RemoveSkillInfo(dianjiSkillKongWidget.index);
@@ -223,7 +246,7 @@ namespace Fort23.Mono
                 double y = c * 0 + d * 172;
 
                 int index = i;
-                WuXingGongFaWidget widget = await UIManager.Instance.CreateGComponent<WuXingGongFaWidget>(null, root: WuXingGongFaRoot,poolName:"132");
+                WuXingGongFaWidget widget = await UIManager.Instance.CreateGComponent<WuXingGongFaWidget>(null, root: WuXingGongFaRoot, poolName: "132");
                 widget.transform.anchoredPosition = new Vector2((float)x, (float)y);
                 widget.ShowWidget(index);
                 _wuXingGongFaWidgets.Add(widget);
@@ -258,6 +281,8 @@ namespace Fort23.Mono
 
         private void OnClickSkillKongWidget(ItemWidgetBasic obj)
         {
+            if (infoType == 1)
+                return;
             SkillKongWidget skillKongWidget = obj as SkillKongWidget;
 
             if (skillKongWidget.SkillInfo == null && dianjiSkillKongWidget == null)
@@ -395,12 +420,20 @@ namespace Fort23.Mono
         private void OnClick(ItemWidgetBasic obj)
         {
             SkillWidget skillWidget = obj as SkillWidget;
-            if (PlayerManager.Instance.GongFaControl.allUseSkill.Contains(skillWidget.skillConfigId))
+            if (infoType == 1)
             {
-              return;
+                GongFaUpgradePanel.Open(skillWidget.skillConfigId);
+            }
+            else if (infoType == 2)
+            {
+                if (PlayerManager.Instance.GongFaControl.allUseSkill.Contains(skillWidget.skillConfigId))
+                {
+                    return;
+                }
+
+                Btn_RemoveGongFa.gameObject.SetActive(false);
+                SelectSkill(skillWidget.skillConfigId);
             }
-            Btn_RemoveGongFa.gameObject.SetActive(false);
-            SelectSkill(skillWidget.skillConfigId);
         }
 
         public void HindIScorllListWidget(IScorllListWidget widget)

+ 44 - 0
Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanelData.cs

@@ -195,6 +195,50 @@ namespace Fort23.Mono
 	      return _Btn_Tu;
 	     }
 	   }
+	  private Button _Btn_Setting;
+	  public Button Btn_Setting
+	   {
+	   get{
+	      if (_Btn_Setting == null)
+	       {
+	         _Btn_Setting  = GetUIUnit<Button>("Btn_Setting"); 
+	       }
+	      return _Btn_Setting;
+	     }
+	   }
+	  private Text _Text_GongFaCount;
+	  public Text Text_GongFaCount
+	   {
+	   get{
+	      if (_Text_GongFaCount == null)
+	       {
+	         _Text_GongFaCount  = GetUIUnit<Text>("Text_GongFaCount"); 
+	       }
+	      return _Text_GongFaCount;
+	     }
+	   }
+	  private GameObject _GongFaSettingRoot;
+	  public GameObject GongFaSettingRoot
+	   {
+	   get{
+	      if (_GongFaSettingRoot == null)
+	       {
+	         _GongFaSettingRoot  = GetUIUnit<GameObject>("GongFaSettingRoot"); 
+	       }
+	      return _GongFaSettingRoot;
+	     }
+	   }
+	  private Button _Btn_ChangeOk;
+	  public Button Btn_ChangeOk
+	   {
+	   get{
+	      if (_Btn_ChangeOk == null)
+	       {
+	         _Btn_ChangeOk  = GetUIUnit<Button>("Btn_ChangeOk"); 
+	       }
+	      return _Btn_ChangeOk;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

+ 44 - 4
Assets/Scripts/GameUI/UI/CombatPanel/SkillWidget.cs

@@ -2,6 +2,7 @@ using Core.Language;
 using Excel2Json;
 using Fort23.UTool;
 using GameLogic.Hero;
+using UnityEngine.UI;
 
 namespace Fort23.Mono
 {
@@ -10,6 +11,7 @@ namespace Fort23.Mono
     {
         public SkillInfo skillConfigId;
         private SkillSelectPanel skillSelectPanel;
+
         private void Init()
         {
         }
@@ -35,12 +37,50 @@ namespace Fort23.Mono
             // };
         }
 
-        public void InitSkillWidget(SkillInfo skillId,SkillSelectPanel skillSelectPanel)
+        public void InitSkillWidget(SkillInfo skillId, SkillSelectPanel skillSelectPanel)
         {
             this.skillSelectPanel = skillSelectPanel;
-            skillConfigId=skillId;
-            SkillConfig skillConfig=  skillId.skillConfig;
-            icon.icon_name= skillConfig.icon;
+            skillConfigId = skillId;
+            SkillConfig skillConfig = skillId.skillConfig;
+            icon.icon_name = skillConfig.icon;
+
+            Text_Level.text = skillConfig.level.ToString() + "级";
+            Text_SkillName.text = LanguageManager.Instance.Text(skillConfig.name);
+
+
+            for (var i = 0; i < StarRoot.Count; i++)
+            {
+                MyImage myImage = StarRoot[i] as MyImage;
+                if (i < skillId.skillConfig.level)
+                {
+                    myImage.gameObject.SetActive(true);
+                    if (skillId.skillConfig.level >= 5 && i == skillId.skillConfig.level - 5)
+                    {
+                        myImage.icon_name = "dec_star_2";
+                    }
+                    else
+                    {
+                        myImage.icon_name = "dec_star_1";
+                    }
+                }
+                else
+                {
+                    myImage.gameObject.SetActive(false);
+                }
+            }
+
+            switch (skillConfig.SkillType)
+            {
+                case 1:
+                    Text_SkillType.text = "主动";
+                    break;
+                case 2:
+                    Text_SkillType.text = "被动";
+                    break;
+                case 5:
+                    Text_SkillType.text = "辅助";
+                    break;
+            }
         }
     }
 }

+ 44 - 0
Assets/Scripts/GameUI/UI/CombatPanel/SkillWidgetData.cs

@@ -30,6 +30,50 @@ namespace Fort23.Mono
 	      return _Icon_Marsk;
 	     }
 	   }
+	  private Text _Text_SkillName;
+	  public Text Text_SkillName
+	   {
+	   get{
+	      if (_Text_SkillName == null)
+	       {
+	         _Text_SkillName  = GetUIUnit<Text>("Text_SkillName"); 
+	       }
+	      return _Text_SkillName;
+	     }
+	   }
+	  private Text _Text_Level;
+	  public Text Text_Level
+	   {
+	   get{
+	      if (_Text_Level == null)
+	       {
+	         _Text_Level  = GetUIUnit<Text>("Text_Level"); 
+	       }
+	      return _Text_Level;
+	     }
+	   }
+	  private Text _Text_SkillType;
+	  public Text Text_SkillType
+	   {
+	   get{
+	      if (_Text_SkillType == null)
+	       {
+	         _Text_SkillType  = GetUIUnit<Text>("Text_SkillType"); 
+	       }
+	      return _Text_SkillType;
+	     }
+	   }
+	  private List<object> _StarRoot;
+	  public List<object> StarRoot
+	   {
+	   get{
+	      if (_StarRoot == null)
+	       {
+	         _StarRoot  = GetUIUnit<List<object>>("StarRoot"); 
+	       }
+	      return _StarRoot;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

+ 8 - 0
Assets/Scripts/GameUI/UI/GongFaUpgradePanel.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: CHhLtSKsB37AClDqwYnyvXnwpnLDMkbae2MW/CPc2EdW5KGJxcLcEVBB9+ND
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 76 - 0
Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradeInfoWidget.cs

@@ -0,0 +1,76 @@
+using GameLogic.Hero;
+using UnityEngine.UI;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "GongFaUpgradeInfoWidget")]
+    public partial class GongFaUpgradeInfoWidget : UIComponent
+    {
+        private SkillInfo _skillInfo;
+        private void Init()
+        {
+        }
+
+        public override void AddEvent()
+        {
+        }
+
+        public override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+        }
+
+        public void CustomInit(SkillInfo currentSkillInfo,SkillInfo skillInfo)
+        {
+            _skillInfo = skillInfo;
+
+            if ( _skillInfo.skillConfig.level <= currentSkillInfo.skillConfig.level )
+            {
+                own.transform.RecoverColor();
+            }
+            else
+            {
+                own.transform.Gray();
+            }
+
+            
+            for (var i = 0; i < StarRoot.Count; i++)
+            {
+                MyImage myImage = StarRoot[i] as MyImage;
+                if(skillInfo.skillConfig.level >= 5)
+                {
+                    int yinstar = skillInfo.skillConfig.level - 5;
+                    if (i >= yinstar)
+                    {
+                        myImage.icon_name = "dec_star_2";
+                        myImage.gameObject.SetActive(true);
+                    }
+                    else
+                    {
+                        myImage.icon_name = "dec_star_1";
+                        myImage.gameObject.SetActive(true);
+                    }
+                }
+                else
+                {
+                    if (i <  skillInfo.skillConfig.level)
+                    {
+                        myImage.icon_name = "dec_star_1";
+                        myImage.gameObject.SetActive(true);
+                    }
+                }
+              
+            }
+            
+        }
+
+        public override void DormancyObj()
+        {
+            _skillInfo = null;
+            base.DormancyObj();
+        }
+    }
+}

+ 11 - 0
Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradeInfoWidget.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: DC5L4XyvUnPV7oyrWDFrDrZwP9wPEU5Vdy8u23DdMUDss6V1Sd/Hox5px7Gi
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 40 - 0
Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradeInfoWidgetData.cs

@@ -0,0 +1,40 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class GongFaUpgradeInfoWidget 
+	{
+	  #region 自定义数据 
+	  private List<object> _StarRoot;
+	  public List<object> StarRoot
+	   {
+	   get{
+	      if (_StarRoot == null)
+	       {
+	         _StarRoot  = GetUIUnit<List<object>>("StarRoot"); 
+	       }
+	      return _StarRoot;
+	     }
+	   }
+	  private Text _Text_Desc;
+	  public Text Text_Desc
+	   {
+	   get{
+	      if (_Text_Desc == null)
+	       {
+	         _Text_Desc  = GetUIUnit<Text>("Text_Desc"); 
+	       }
+	      return _Text_Desc;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

+ 11 - 0
Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradeInfoWidgetData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: Di4fvCKrW3+6LllZbe/KgciIUCxGNp6ZJdtKxNncsnRu0bIe1Sevq/olVSnZ
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 100 - 0
Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -0,0 +1,100 @@
+using System.Collections.Generic;
+using System.Linq;
+using Core.Language;
+using Excel2Json;
+using Fort23.UTool;
+using GameLogic.Hero;
+using Utility;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "GongFaUpgradePanel")]
+    public partial class GongFaUpgradePanel : UIPanel
+    {
+        private SkillInfo _skillInfo;
+        
+        List<GongFaUpgradeInfoWidget> _gongFaUpgradeInfoWidgets = new List<GongFaUpgradeInfoWidget>();
+
+        private void Init()
+        {
+        }
+
+        protected override void AddEvent()
+        {
+        }
+
+        protected override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+            Btn_Back.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel<GongFaUpgradePanel>(); });
+        }
+
+        public async void CustomInit(SkillInfo skillInfo)
+        {
+            _skillInfo = skillInfo;
+            SkillConfig skillConfig = _skillInfo.skillConfig;
+            Icon_GongFaIcon.icon_name = skillConfig.icon;
+            Text_Level1.text = skillConfig.level.ToString();
+            Text_Level.text = skillConfig.level.ToString();
+
+            Text_GongFaDesc.text = UtilTools.GetString(LanguageManager.Instance.Text(skillConfig.dec), _skillInfo.effectValue);
+            Text_GongFaName.text = LanguageManager.Instance.Text(skillConfig.name);
+
+            switch (skillConfig.attribute)
+            {
+                case 1:
+                    Icon_Attribute.GetComponent<CustomStateController>().ChangeState(0);
+                    Text_Attribute.text = "金";
+                    break;
+                case 2:
+                    Icon_Attribute.GetComponent<CustomStateController>().ChangeState(1);
+                    Text_Attribute.text = "木";
+                    break;
+                case 4:
+                    Icon_Attribute.GetComponent<CustomStateController>().ChangeState(2);
+                    Text_Attribute.text = "水";
+                    break;
+                case 8:
+                    Icon_Attribute.GetComponent<CustomStateController>().ChangeState(3);
+                    Text_Attribute.text = "火";
+                    break;
+                case 16:
+                    Icon_Attribute.GetComponent<CustomStateController>().ChangeState(4);
+                    Text_Attribute.text = "土";
+                    break;
+            }
+
+            List<SkillConfig> allSkillConfigs = ConfigComponent.Instance.GetAll<SkillConfig>().ToList();
+            List<SkillConfig> configs = allSkillConfigs.Where(s => s.IDGroup == skillConfig.IDGroup).ToList();
+            
+            for (var i = 0; i < configs.Count; i++)
+            {
+                SkillInfo skillInfo1 = new SkillInfo(configs[i].ID, _skillInfo.SkillPowerupConfig.ID);
+                GongFaUpgradeInfoWidget gongFaUpgradeInfoWidget = await UIManager.Instance.CreateGComponent<GongFaUpgradeInfoWidget>(null, Content);
+                gongFaUpgradeInfoWidget.CustomInit(_skillInfo,skillInfo1);
+                _gongFaUpgradeInfoWidgets.Add(gongFaUpgradeInfoWidget);
+            }
+            
+        }
+
+        public async static void Open(SkillInfo skillInfo)
+        {
+            GongFaUpgradePanel gongFaUpgradePanel = await UIManager.Instance.LoadAndOpenPanel<GongFaUpgradePanel>(null);
+            gongFaUpgradePanel.CustomInit(skillInfo);
+        }
+
+        public override void Close()
+        {
+            foreach (var gongFaUpgradeInfoWidget in _gongFaUpgradeInfoWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(gongFaUpgradeInfoWidget);
+            }
+            _gongFaUpgradeInfoWidgets.Clear();
+            
+            base.Close();
+        }
+    }
+}

+ 11 - 0
Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: WX0WtSOvWyjiKnzvAk2IxZFb92SMhx6XOx4Llb7Ia02Gwm8ms+nNb87GQ59g
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 139 - 0
Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanelData.cs

@@ -0,0 +1,139 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class GongFaUpgradePanel 
+	{
+	  #region 自定义数据 
+	  private Button _guanbi;
+	  public Button guanbi
+	   {
+	   get{
+	      if (_guanbi == null)
+	       {
+	         _guanbi  = GetUIUnit<Button>("guanbi"); 
+	       }
+	      return _guanbi;
+	     }
+	   }
+	  private MyImage _Icon_Attribute;
+	  public MyImage Icon_Attribute
+	   {
+	   get{
+	      if (_Icon_Attribute == null)
+	       {
+	         _Icon_Attribute  = GetUIUnit<MyImage>("Icon_Attribute"); 
+	       }
+	      return _Icon_Attribute;
+	     }
+	   }
+	  private Text _Text_Attribute;
+	  public Text Text_Attribute
+	   {
+	   get{
+	      if (_Text_Attribute == null)
+	       {
+	         _Text_Attribute  = GetUIUnit<Text>("Text_Attribute"); 
+	       }
+	      return _Text_Attribute;
+	     }
+	   }
+	  private MyImage _Icon_GongFaIcon;
+	  public MyImage Icon_GongFaIcon
+	   {
+	   get{
+	      if (_Icon_GongFaIcon == null)
+	       {
+	         _Icon_GongFaIcon  = GetUIUnit<MyImage>("Icon_GongFaIcon"); 
+	       }
+	      return _Icon_GongFaIcon;
+	     }
+	   }
+	  private List<object> _StarRoot;
+	  public List<object> StarRoot
+	   {
+	   get{
+	      if (_StarRoot == null)
+	       {
+	         _StarRoot  = GetUIUnit<List<object>>("StarRoot"); 
+	       }
+	      return _StarRoot;
+	     }
+	   }
+	  private Text _Text_Level1;
+	  public Text Text_Level1
+	   {
+	   get{
+	      if (_Text_Level1 == null)
+	       {
+	         _Text_Level1  = GetUIUnit<Text>("Text_Level1"); 
+	       }
+	      return _Text_Level1;
+	     }
+	   }
+	  private Text _Text_Level;
+	  public Text Text_Level
+	   {
+	   get{
+	      if (_Text_Level == null)
+	       {
+	         _Text_Level  = GetUIUnit<Text>("Text_Level"); 
+	       }
+	      return _Text_Level;
+	     }
+	   }
+	  private RectTransform _Content;
+	  public RectTransform Content
+	   {
+	   get{
+	      if (_Content == null)
+	       {
+	         _Content  = GetUIUnit<RectTransform>("Content"); 
+	       }
+	      return _Content;
+	     }
+	   }
+	  private Text _Text_GongFaDesc;
+	  public Text Text_GongFaDesc
+	   {
+	   get{
+	      if (_Text_GongFaDesc == null)
+	       {
+	         _Text_GongFaDesc  = GetUIUnit<Text>("Text_GongFaDesc"); 
+	       }
+	      return _Text_GongFaDesc;
+	     }
+	   }
+	  private Text _Text_GongFaName;
+	  public Text Text_GongFaName
+	   {
+	   get{
+	      if (_Text_GongFaName == null)
+	       {
+	         _Text_GongFaName  = GetUIUnit<Text>("Text_GongFaName"); 
+	       }
+	      return _Text_GongFaName;
+	     }
+	   }
+	  private Button _Btn_Back;
+	  public Button Btn_Back
+	   {
+	   get{
+	      if (_Btn_Back == null)
+	       {
+	         _Btn_Back  = GetUIUnit<Button>("Btn_Back"); 
+	       }
+	      return _Btn_Back;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

+ 11 - 0
Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanelData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: B3kf5y+tBSpFU+bt/1zCoULwpuxYqdbtsglFBXFugpCPrchTwj5Iu5s1CLzg
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 1
Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -60,6 +60,8 @@ namespace Fort23.Mono
             bnt_shengShi.onClick.AddListener(Bnt_shengShi_onClick);
             CameraSelect.onValueChanged.AddListener(CameraSelect_onValueChanged);
 
+            Btn_GongFa.onClick.AddListener(() => { SkillSelectPanel.OpenSkillSelectPanel(); });
+
             Btn_Event.onClick.AddListener(() =>
             {
                 EventSystemManager.Instance.isOpenUi = true;
@@ -99,7 +101,7 @@ namespace Fort23.Mono
                     break;
                 }
             }
-                
+
             if (!isHIde)
             {
                 SkillSelectPanel.OpenSkillSelectPanel();

+ 11 - 0
Assets/Scripts/GameUI/UI/MainPanel/MainPanelData.cs

@@ -96,6 +96,17 @@ namespace Fort23.Mono
 	      return _Btn_HeroInfomation;
 	     }
 	   }
+	  private Button _Btn_GongFa;
+	  public Button Btn_GongFa
+	   {
+	   get{
+	      if (_Btn_GongFa == null)
+	       {
+	         _Btn_GongFa  = GetUIUnit<Button>("Btn_GongFa"); 
+	       }
+	      return _Btn_GongFa;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


BIN
Excel2Json/Excel/GameConstant.xlsx


BIN
Excel2Json/Excel/HeroModel.xlsx


BIN
Excel2Json/Excel/HeroPowerUp.xlsx


BIN
Excel2Json/Excel/Item.xlsx


BIN
Excel2Json/Excel/Language.xlsx


BIN
Excel2Json/Excel/MonsterPowerUp.xlsx


BIN
Excel2Json/Excel/skill.xlsx


BIN
Excel2Json/Excel/修仙游戏数据规划表.xlsx


+ 1 - 0
XiuXianGame.sln.DotSettings.user

@@ -4,6 +4,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACollider_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F2193ba18cb0546b2832917f7674384cf20000_003F3a_003Fa0da6a1e_003FCollider_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACompareFunction_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5c4a01f363eb46748231fc41bd9bdd8517e000_003F84_003Ff4158f3a_003FCompareFunction_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F9c2967a135e648bdb993c5397a44991b573620_003Fad_003Fcb4b4f1f_003FDictionary_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEditor_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F1f63769030ae497a94b35af8517071579d5a00_003F3c_003F2c949974_003FEditor_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEnumerable_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F5004a53079e04c2991f89460a5186cf010fc00_003Fd5_003F42d076c8_003FEnumerable_002Ecs_002Fz_003A2_002D1/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEnumerable_002Ecs_002Fl_003AC_0021_003FUsers_003FAdministrator_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Ff2b6204eed6b41348236173e8a2f539817a880_003F16_003Ff8f742c5_003FEnumerable_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AExceptionDispatchInfo_002Ecs_002Fl_003AC_0021_003FUsers_003Fadmin_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe4df6db7850b4c40b72002ff5da8188846ac00_003Fd3_003F4533b7c3_003FExceptionDispatchInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>

Някои файлове не бяха показани, защото твърде много файлове са промени