Browse Source

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

# Conflicts:
#	UserSettings/Layouts/default-2022.dwlt   resolved by origin/master(远端) version
李桃 3 ngày trước cách đây
mục cha
commit
057a0b4cb7
68 tập tin đã thay đổi với 9606 bổ sung1602 xóa
  1. 120 0
      Assets/Res/Config/BuffConfig.json
  2. 24 0
      Assets/Res/Config/DropConfig.json
  3. 17 483
      Assets/Res/Config/DropGroupConfig.json
  4. 42 572
      Assets/Res/Config/DropItemConfig.json
  5. 235 98
      Assets/Res/Config/EventConfig.json
  6. 25 9
      Assets/Res/Config/EventLinkConfig.json
  7. 14 14
      Assets/Res/Config/HeroPowerUpConfig.json
  8. 11 11
      Assets/Res/Config/ItemConfig.json
  9. 37 5
      Assets/Res/Config/LanguageChineseConfig.json
  10. 2469 181
      Assets/Res/Config/SentimentEffectConfig.json
  11. 72 0
      Assets/Res/Config/ShopConfig.json
  12. 63 3
      Assets/Res/Config/ShopItemConfig.json
  13. 188 0
      Assets/Res/UI/CombatPanel.prefab
  14. 2017 0
      Assets/Res/UI/ItemDetailsPanel/FaBaoDetailsPanel.prefab
  15. 7 0
      Assets/Res/UI/ItemDetailsPanel/FaBaoDetailsPanel.prefab.meta
  16. 2411 0
      Assets/Res/UI/ItemDetailsPanel/GongFaDetailsPanel.prefab
  17. 7 0
      Assets/Res/UI/ItemDetailsPanel/GongFaDetailsPanel.prefab.meta
  18. 2 0
      Assets/Scripts/GameLogic/Combat/Buff/b_1001.cs
  19. 2 0
      Assets/Scripts/GameLogic/Combat/Buff/b_1003.cs
  20. 5 4
      Assets/Scripts/GameLogic/Combat/Buff/b_1005.cs
  21. 2 0
      Assets/Scripts/GameLogic/Combat/Buff/b_1011.cs
  22. 18 2
      Assets/Scripts/GameLogic/Combat/Buff/b_1024.cs
  23. 4 0
      Assets/Scripts/GameLogic/Combat/CombatTool/AttType.cs
  24. 37 0
      Assets/Scripts/GameLogic/Combat/CombatTool/CombatCalculateTool.cs
  25. 8 3
      Assets/Scripts/GameLogic/Combat/Hero/CombatHeroInfo.cs
  26. 50 4
      Assets/Scripts/GameLogic/Combat/Hero/Turntable/SkillSlots.cs
  27. 10 5
      Assets/Scripts/GameLogic/Combat/Hero/Turntable/SkillTurntable.cs
  28. 25 7
      Assets/Scripts/GameLogic/Combat/Skill/DS60101.cs
  29. 6 1
      Assets/Scripts/GameLogic/Combat/Skill/S60102.cs
  30. 49 0
      Assets/Scripts/GameLogic/Combat/Skill/S60103.cs
  31. 3 0
      Assets/Scripts/GameLogic/Combat/Skill/S60103.cs.meta
  32. 52 0
      Assets/Scripts/GameLogic/Combat/Skill/S60104.cs
  33. 3 0
      Assets/Scripts/GameLogic/Combat/Skill/S60104.cs.meta
  34. 71 0
      Assets/Scripts/GameLogic/Combat/Skill/S60105.cs
  35. 3 0
      Assets/Scripts/GameLogic/Combat/Skill/S60105.cs.meta
  36. 58 0
      Assets/Scripts/GameLogic/Combat/Skill/S60106.cs
  37. 3 0
      Assets/Scripts/GameLogic/Combat/Skill/S60106.cs.meta
  38. 38 0
      Assets/Scripts/GameLogic/Combat/Skill/S60107.cs
  39. 3 0
      Assets/Scripts/GameLogic/Combat/Skill/S60107.cs.meta
  40. 7 0
      Assets/Scripts/GameUI/EventManager/DialogueManager.cs
  41. 35 2
      Assets/Scripts/GameUI/UI/CombatPanel/MagicWeaponWidget.cs
  42. 11 0
      Assets/Scripts/GameUI/UI/CombatPanel/MagicWeaponWidgetData.cs
  43. 3 3
      Assets/Scripts/GameUI/UI/CombatPanel/WuXingGongFaWidget.cs
  44. 2 2
      Assets/Scripts/GameUI/UI/CombatPanel/ZhuanPanPanel.cs
  45. 4 24
      Assets/Scripts/GameUI/UI/DialoguePanel/DialogueBubblePanel.cs
  46. 2 2
      Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs
  47. 12 7
      Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs
  48. 198 0
      Assets/Scripts/GameUI/UI/ItemDetailsPanel/FaBaoDetailsPanel.cs
  49. 11 0
      Assets/Scripts/GameUI/UI/ItemDetailsPanel/FaBaoDetailsPanel.cs.meta
  50. 128 0
      Assets/Scripts/GameUI/UI/ItemDetailsPanel/FaBaoDetailsPanelData.cs
  51. 11 0
      Assets/Scripts/GameUI/UI/ItemDetailsPanel/FaBaoDetailsPanelData.cs.meta
  52. 184 0
      Assets/Scripts/GameUI/UI/ItemDetailsPanel/GongFaDetailsPanel.cs
  53. 11 0
      Assets/Scripts/GameUI/UI/ItemDetailsPanel/GongFaDetailsPanel.cs.meta
  54. 117 0
      Assets/Scripts/GameUI/UI/ItemDetailsPanel/GongFaDetailsPanelData.cs
  55. 11 0
      Assets/Scripts/GameUI/UI/ItemDetailsPanel/GongFaDetailsPanelData.cs.meta
  56. 18 3
      Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItem.cs
  57. 0 0
      Assets/StreamingAssets/assetConfig.txt
  58. BIN
      Excel2Json/Excel/Buff.xlsx
  59. BIN
      Excel2Json/Excel/ChouKa.xlsx
  60. BIN
      Excel2Json/Excel/EventConfig.xlsx
  61. BIN
      Excel2Json/Excel/FabaoConfig.xlsx
  62. BIN
      Excel2Json/Excel/HeroPowerUp.xlsx
  63. BIN
      Excel2Json/Excel/Item.xlsx
  64. BIN
      Excel2Json/Excel/Language.xlsx
  65. BIN
      Excel2Json/Excel/Sentiment.xlsx
  66. BIN
      Excel2Json/Excel/Shop.xlsx
  67. BIN
      Excel2Json/Excel/修仙游戏数据规划表.xlsx
  68. 630 157
      UserSettings/Layouts/default-2022.dwlt

+ 120 - 0
Assets/Res/Config/BuffConfig.json

@@ -363,6 +363,126 @@
       "IsControlBuff": 0,
       "IsHideIcon": 0,
       "scriptsName": "b_1018"
+    },
+    {
+      "ID": 10191,
+      "nameTest": "筋脉封锁金",
+      "decTest": "封锁筋脉",
+      "icon": "icon_b1019",
+      "buffName": 500003,
+      "buffEffectDes": 500044,
+      "buffGroup": 1019,
+      "overlayCount": 1,
+      "effectValue": [
+        3.0
+      ],
+      "timeType": 2,
+      "buffTime": 9.0,
+      "buffType": 2,
+      "dispelType": 1,
+      "IsControlBuff": 0,
+      "IsHideIcon": 0,
+      "scriptsName": "b_1019"
+    },
+    {
+      "ID": 10201,
+      "nameTest": "筋脉封锁木",
+      "decTest": "封锁筋脉",
+      "icon": "icon_b1020",
+      "buffName": 500003,
+      "buffEffectDes": 500044,
+      "buffGroup": 1020,
+      "overlayCount": 1,
+      "effectValue": [
+        3.0
+      ],
+      "timeType": 2,
+      "buffTime": 9.0,
+      "buffType": 2,
+      "dispelType": 1,
+      "IsControlBuff": 0,
+      "IsHideIcon": 0,
+      "scriptsName": "b_1020"
+    },
+    {
+      "ID": 10211,
+      "nameTest": "筋脉封锁水",
+      "decTest": "封锁筋脉",
+      "icon": "icon_b1021",
+      "buffName": 500003,
+      "buffEffectDes": 500044,
+      "buffGroup": 1021,
+      "overlayCount": 1,
+      "effectValue": [
+        3.0
+      ],
+      "timeType": 2,
+      "buffTime": 9.0,
+      "buffType": 2,
+      "dispelType": 1,
+      "IsControlBuff": 0,
+      "IsHideIcon": 0,
+      "scriptsName": "b_1021"
+    },
+    {
+      "ID": 10221,
+      "nameTest": "筋脉封锁火",
+      "decTest": "封锁筋脉",
+      "icon": "icon_b1022",
+      "buffName": 500003,
+      "buffEffectDes": 500044,
+      "buffGroup": 1022,
+      "overlayCount": 1,
+      "effectValue": [
+        3.0
+      ],
+      "timeType": 2,
+      "buffTime": 9.0,
+      "buffType": 2,
+      "dispelType": 1,
+      "IsControlBuff": 0,
+      "IsHideIcon": 0,
+      "scriptsName": "b_1022"
+    },
+    {
+      "ID": 10231,
+      "nameTest": "筋脉封锁土",
+      "decTest": "封锁筋脉",
+      "icon": "icon_b1023",
+      "buffName": 500003,
+      "buffEffectDes": 500044,
+      "buffGroup": 1023,
+      "overlayCount": 1,
+      "effectValue": [
+        3.0
+      ],
+      "timeType": 2,
+      "buffTime": 9.0,
+      "buffType": 2,
+      "dispelType": 1,
+      "IsControlBuff": 0,
+      "IsHideIcon": 0,
+      "scriptsName": "b_1023"
+    },
+    {
+      "ID": 10241,
+      "nameTest": "星辰印记",
+      "decTest": "星辰道升级获得的效果,在结算时收到层数对应的伤害",
+      "icon": "icon_b1024",
+      "buffName": 500003,
+      "buffEffectDes": 500044,
+      "buffGroup": 1024,
+      "overlayCount": 99,
+      "effectValue": [
+        3.0
+      ],
+      "timeType": 2,
+      "buffTime": 9.0,
+      "buffType": 2,
+      "dispelType": 1,
+      "IsControlBuff": 0,
+      "IsHideIcon": 0,
+      "scriptsName": "b_1024"
     }
   ]
 }

+ 24 - 0
Assets/Res/Config/DropConfig.json

@@ -1209,6 +1209,30 @@
       "showItemId": [
         20003
       ]
+    },
+    {
+      "ID": 999001,
+      "dropGroupID": [
+        1,
+        2,
+        3
+      ],
+      "dropType": 2,
+      "showItemId": [
+        1001
+      ]
+    },
+    {
+      "ID": 999002,
+      "dropGroupID": [
+        4,
+        5,
+        6
+      ],
+      "dropType": 2,
+      "showItemId": [
+        1002
+      ]
     }
   ]
 }

+ 17 - 483
Assets/Res/Config/DropGroupConfig.json

@@ -1,511 +1,45 @@
 {
   "configList": [
     {
-      "ID": 10001,
-      "dropRate": 1000,
+      "ID": 1,
+      "dropRate": 650,
       "dropItemID": [
-        10001
+        1
       ]
     },
     {
-      "ID": 10002,
-      "dropRate": 1000,
+      "ID": 2,
+      "dropRate": 250,
       "dropItemID": [
-        10002
+        2
       ]
     },
     {
-      "ID": 10003,
-      "dropRate": 1000,
-      "dropItemID": [
-        10003
-      ]
-    },
-    {
-      "ID": 40001,
-      "dropRate": 70,
-      "dropItemID": [
-        40001,
-        40002,
-        40003,
-        40004,
-        40005,
-        40006,
-        40007,
-        40008,
-        40009,
-        40010,
-        40011,
-        40012,
-        40013,
-        40014,
-        40015,
-        40016,
-        40017,
-        40018,
-        40019,
-        40020
-      ]
-    },
-    {
-      "ID": 40002,
-      "dropRate": 300,
-      "dropItemID": [
-        40001,
-        40002,
-        40003,
-        40004,
-        40005,
-        40006,
-        40007,
-        40008,
-        40009,
-        40010,
-        40011,
-        40012,
-        40013,
-        40014,
-        40015,
-        40016,
-        40017,
-        40018,
-        40019,
-        40020
-      ]
-    },
-    {
-      "ID": 40003,
-      "dropRate": 1000,
-      "dropItemID": [
-        40001,
-        40002,
-        40003,
-        40004,
-        40005,
-        40006,
-        40007,
-        40008,
-        40009,
-        40010,
-        40011,
-        40012,
-        40013,
-        40014,
-        40015,
-        40016,
-        40017,
-        40018,
-        40019,
-        40020
-      ]
-    },
-    {
-      "ID": 40004,
-      "dropRate": 10,
-      "dropItemID": [
-        40001,
-        40002,
-        40003,
-        40004,
-        40005,
-        40006,
-        40007,
-        40008,
-        40009,
-        40010,
-        40011,
-        40012,
-        40013,
-        40014,
-        40015,
-        40016,
-        40017,
-        40018,
-        40019,
-        40020
-      ]
-    },
-    {
-      "ID": 40005,
-      "dropRate": 1000,
-      "dropItemID": [
-        40001,
-        40002,
-        40003,
-        40004,
-        40005,
-        40006,
-        40007,
-        40008,
-        40009,
-        40010,
-        40011,
-        40012,
-        40013,
-        40014,
-        40015,
-        40016,
-        40017,
-        40018,
-        40019,
-        40020
-      ]
-    },
-    {
-      "ID": 41001,
-      "dropRate": 700,
-      "dropItemID": [
-        41001
-      ]
-    },
-    {
-      "ID": 41002,
-      "dropRate": 200,
-      "dropItemID": [
-        41002
-      ]
-    },
-    {
-      "ID": 41003,
-      "dropRate": 50,
-      "dropItemID": [
-        41003
-      ]
-    },
-    {
-      "ID": 41004,
-      "dropRate": 47,
-      "dropItemID": [
-        41004
-      ]
-    },
-    {
-      "ID": 41005,
-      "dropRate": 2,
-      "dropItemID": [
-        41005
-      ]
-    },
-    {
-      "ID": 41006,
-      "dropRate": 1,
-      "dropItemID": [
-        41006
-      ]
-    },
-    {
-      "ID": 41007,
-      "dropRate": 500,
-      "dropItemID": [
-        41001
-      ]
-    },
-    {
-      "ID": 41008,
-      "dropRate": 350,
-      "dropItemID": [
-        41002
-      ]
-    },
-    {
-      "ID": 41009,
-      "dropRate": 100,
-      "dropItemID": [
-        41003
-      ]
-    },
-    {
-      "ID": 41010,
-      "dropRate": 44,
-      "dropItemID": [
-        41004
-      ]
-    },
-    {
-      "ID": 41011,
-      "dropRate": 4,
-      "dropItemID": [
-        41005
-      ]
-    },
-    {
-      "ID": 41012,
-      "dropRate": 2,
-      "dropItemID": [
-        41006
-      ]
-    },
-    {
-      "ID": 41013,
-      "dropRate": 237,
-      "dropItemID": [
-        41001
-      ]
-    },
-    {
-      "ID": 41014,
-      "dropRate": 450,
-      "dropItemID": [
-        41002
-      ]
-    },
-    {
-      "ID": 41015,
-      "dropRate": 200,
-      "dropItemID": [
-        41003
-      ]
-    },
-    {
-      "ID": 41016,
+      "ID": 3,
       "dropRate": 100,
       "dropItemID": [
-        41004
-      ]
-    },
-    {
-      "ID": 41017,
-      "dropRate": 10,
-      "dropItemID": [
-        41005
-      ]
-    },
-    {
-      "ID": 41018,
-      "dropRate": 3,
-      "dropItemID": [
-        41006
-      ]
-    },
-    {
-      "ID": 41019,
-      "dropRate": 800,
-      "dropItemID": [
-        41002
-      ]
-    },
-    {
-      "ID": 41020,
-      "dropRate": 200,
-      "dropItemID": [
-        41003
-      ]
-    },
-    {
-      "ID": 41021,
-      "dropRate": 800,
-      "dropItemID": [
-        41003
-      ]
-    },
-    {
-      "ID": 41022,
-      "dropRate": 200,
-      "dropItemID": [
-        41004
-      ]
-    },
-    {
-      "ID": 42001,
-      "dropRate": 200,
-      "dropItemID": [
-        42007
-      ]
-    },
-    {
-      "ID": 42002,
-      "dropRate": 200,
-      "dropItemID": [
-        42008
-      ]
-    },
-    {
-      "ID": 42003,
-      "dropRate": 350,
-      "dropItemID": [
-        42009
-      ]
-    },
-    {
-      "ID": 42004,
-      "dropRate": 200,
-      "dropItemID": [
-        42010
-      ]
-    },
-    {
-      "ID": 42005,
-      "dropRate": 50,
-      "dropItemID": [
-        42011
-      ]
-    },
-    {
-      "ID": 501004,
-      "dropRate": 10,
-      "dropItemID": [
-        501004
-      ]
-    },
-    {
-      "ID": 501005,
-      "dropRate": 10,
-      "dropItemID": [
-        501005
-      ]
-    },
-    {
-      "ID": 501006,
-      "dropRate": 10,
-      "dropItemID": [
-        501006
-      ]
-    },
-    {
-      "ID": 501007,
-      "dropRate": 10,
-      "dropItemID": [
-        501007
-      ]
-    },
-    {
-      "ID": 141008,
-      "dropRate": 10,
-      "dropItemID": [
-        141008
-      ]
-    },
-    {
-      "ID": 141009,
-      "dropRate": 10,
-      "dropItemID": [
-        141009
-      ]
-    },
-    {
-      "ID": 141010,
-      "dropRate": 10,
-      "dropItemID": [
-        141010
-      ]
-    },
-    {
-      "ID": 141011,
-      "dropRate": 10,
-      "dropItemID": [
-        141011
+        3
       ]
     },
     {
-      "ID": 141012,
-      "dropRate": 10,
+      "ID": 4,
+      "dropRate": 400,
       "dropItemID": [
-        141012
+        4
       ]
     },
     {
-      "ID": 141013,
-      "dropRate": 10,
-      "dropItemID": [
-        141013
-      ]
-    },
-    {
-      "ID": 141014,
-      "dropRate": 10,
-      "dropItemID": [
-        141014
-      ]
-    },
-    {
-      "ID": 141015,
-      "dropRate": 10,
-      "dropItemID": [
-        141015
-      ]
-    },
-    {
-      "ID": 141016,
-      "dropRate": 10,
-      "dropItemID": [
-        141016
-      ]
-    },
-    {
-      "ID": 141017,
-      "dropRate": 10,
-      "dropItemID": [
-        141017
-      ]
-    },
-    {
-      "ID": 141018,
-      "dropRate": 10,
-      "dropItemID": [
-        141018
-      ]
-    },
-    {
-      "ID": 141019,
-      "dropRate": 10,
-      "dropItemID": [
-        141019
-      ]
-    },
-    {
-      "ID": 141020,
-      "dropRate": 10,
-      "dropItemID": [
-        141020
-      ]
-    },
-    {
-      "ID": 141021,
-      "dropRate": 10,
-      "dropItemID": [
-        141021
-      ]
-    },
-    {
-      "ID": 141022,
-      "dropRate": 10,
-      "dropItemID": [
-        141022
-      ]
-    },
-    {
-      "ID": 141023,
-      "dropRate": 10,
-      "dropItemID": [
-        141023
-      ]
-    },
-    {
-      "ID": 141024,
-      "dropRate": 10,
-      "dropItemID": [
-        141024
-      ]
-    },
-    {
-      "ID": 141025,
-      "dropRate": 10,
-      "dropItemID": [
-        141025
-      ]
-    },
-    {
-      "ID": 141026,
-      "dropRate": 10,
+      "ID": 5,
+      "dropRate": 300,
       "dropItemID": [
-        141026
+        5
       ]
     },
     {
-      "ID": 141027,
-      "dropRate": 10,
+      "ID": 6,
+      "dropRate": 300,
       "dropItemID": [
-        141027
+        6
       ]
     }
   ]

+ 42 - 572
Assets/Res/Config/DropItemConfig.json

@@ -1,620 +1,90 @@
 {
   "configList": [
     {
-      "ID": 10001,
+      "ID": 1,
       "dropItemType": 1,
       "itemID": [
-        20001
+        10001,
+        10003,
+        10006,
+        10008,
+        10010
       ],
       "dropMinV": 1,
       "dropMaxV": 1,
       "dropCountGoupID": -1
     },
     {
-      "ID": 10002,
+      "ID": 2,
       "dropItemType": 1,
       "itemID": [
-        20002
+        10002,
+        10004,
+        10007,
+        10009,
+        10011
       ],
       "dropMinV": 1,
       "dropMaxV": 1,
       "dropCountGoupID": -1
     },
     {
-      "ID": 10003,
+      "ID": 3,
       "dropItemType": 1,
       "itemID": [
-        20003
+        10005
       ],
       "dropMinV": 1,
       "dropMaxV": 1,
       "dropCountGoupID": -1
     },
     {
-      "ID": 40001,
+      "ID": 4,
       "dropItemType": 1,
       "itemID": [
-        1008
+        12005,
+        12010,
+        12015,
+        12020,
+        12025
       ],
       "dropMinV": 1,
       "dropMaxV": 1,
       "dropCountGoupID": -1
     },
     {
-      "ID": 40002,
+      "ID": 5,
       "dropItemType": 1,
       "itemID": [
-        1009
+        12004,
+        12009,
+        12014,
+        12019,
+        12024
       ],
       "dropMinV": 1,
       "dropMaxV": 1,
       "dropCountGoupID": -1
     },
     {
-      "ID": 40003,
+      "ID": 6,
       "dropItemType": 1,
       "itemID": [
-        1010
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 40004,
-      "dropItemType": 1,
-      "itemID": [
-        1011
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 40005,
-      "dropItemType": 1,
-      "itemID": [
-        1012
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 40006,
-      "dropItemType": 1,
-      "itemID": [
-        1013
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 40007,
-      "dropItemType": 1,
-      "itemID": [
-        1014
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 40008,
-      "dropItemType": 1,
-      "itemID": [
-        1015
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 40009,
-      "dropItemType": 1,
-      "itemID": [
-        1016
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 40010,
-      "dropItemType": 1,
-      "itemID": [
-        1017
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 40011,
-      "dropItemType": 1,
-      "itemID": [
-        1018
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 40012,
-      "dropItemType": 1,
-      "itemID": [
-        1019
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 40013,
-      "dropItemType": 1,
-      "itemID": [
-        1020
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 40014,
-      "dropItemType": 1,
-      "itemID": [
-        1021
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 40015,
-      "dropItemType": 1,
-      "itemID": [
-        1022
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 40016,
-      "dropItemType": 1,
-      "itemID": [
-        1023
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 40017,
-      "dropItemType": 1,
-      "itemID": [
-        1024
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 40018,
-      "dropItemType": 1,
-      "itemID": [
-        1025
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 40019,
-      "dropItemType": 1,
-      "itemID": [
-        1026
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 40020,
-      "dropItemType": 1,
-      "itemID": [
-        1027
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 41001,
-      "dropItemType": 2,
-      "itemID": [
-        1
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 41002,
-      "dropItemType": 2,
-      "itemID": [
-        2
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 41003,
-      "dropItemType": 2,
-      "itemID": [
-        3
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 41004,
-      "dropItemType": 2,
-      "itemID": [
-        4
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 41005,
-      "dropItemType": 2,
-      "itemID": [
-        5
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 41006,
-      "dropItemType": 2,
-      "itemID": [
-        6
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 42007,
-      "dropItemType": 3,
-      "itemID": [
-        -10
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 42008,
-      "dropItemType": 3,
-      "itemID": [
-        -5
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 42009,
-      "dropItemType": 3,
-      "itemID": [
-        0
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 42010,
-      "dropItemType": 3,
-      "itemID": [
-        5
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 42011,
-      "dropItemType": 3,
-      "itemID": [
-        10
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 501004,
-      "dropItemType": 1,
-      "itemID": [
-        1004
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 501005,
-      "dropItemType": 1,
-      "itemID": [
-        1005
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 501006,
-      "dropItemType": 1,
-      "itemID": [
-        1006
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 501007,
-      "dropItemType": 1,
-      "itemID": [
-        1007
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 141008,
-      "dropItemType": 4,
-      "itemID": [
-        1008,
-        10011,
-        10014
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 141009,
-      "dropItemType": 4,
-      "itemID": [
-        1009,
-        10011,
-        10014
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 141010,
-      "dropItemType": 4,
-      "itemID": [
-        1010,
-        10011,
-        10014
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 141011,
-      "dropItemType": 4,
-      "itemID": [
-        1011,
-        10011,
-        10014
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 141012,
-      "dropItemType": 4,
-      "itemID": [
-        1012,
-        10011,
-        10014
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 141013,
-      "dropItemType": 4,
-      "itemID": [
-        1013,
-        10011,
-        10014
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 141014,
-      "dropItemType": 4,
-      "itemID": [
-        1014,
-        10011,
-        10014
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 141015,
-      "dropItemType": 4,
-      "itemID": [
-        1015,
-        10011,
-        10014
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 141016,
-      "dropItemType": 4,
-      "itemID": [
-        1016,
-        10011,
-        10014
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 141017,
-      "dropItemType": 4,
-      "itemID": [
-        1017,
-        10011,
-        10014
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 141018,
-      "dropItemType": 4,
-      "itemID": [
-        1018,
-        10011,
-        10014
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 141019,
-      "dropItemType": 4,
-      "itemID": [
-        1019,
-        10011,
-        10014
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 141020,
-      "dropItemType": 4,
-      "itemID": [
-        1020,
-        10011,
-        10014
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 141021,
-      "dropItemType": 4,
-      "itemID": [
-        1021,
-        10011,
-        10014
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 141022,
-      "dropItemType": 4,
-      "itemID": [
-        1022,
-        10011,
-        10014
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 141023,
-      "dropItemType": 4,
-      "itemID": [
-        1023,
-        10011,
-        10014
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 141024,
-      "dropItemType": 4,
-      "itemID": [
-        1024,
-        10011,
-        10014
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 141025,
-      "dropItemType": 4,
-      "itemID": [
-        1025,
-        10011,
-        10014
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 141026,
-      "dropItemType": 4,
-      "itemID": [
-        1026,
-        10011,
-        10014
-      ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
-      "dropCountGoupID": -1
-    },
-    {
-      "ID": 141027,
-      "dropItemType": 4,
-      "itemID": [
-        1027,
-        10011,
-        10014
+        12001,
+        12002,
+        12003,
+        12006,
+        12007,
+        12008,
+        12011,
+        12012,
+        12013,
+        12016,
+        12017,
+        12018,
+        12021,
+        12022,
+        12023
       ],
       "dropMinV": 1,
       "dropMaxV": 1,

+ 235 - 98
Assets/Res/Config/EventConfig.json

@@ -7,7 +7,9 @@
         1002,
         1003,
         1004,
-        1005
+        1005,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 3,
@@ -15,10 +17,10 @@
       "Score": 0,
       "EventQuality": 1,
       "PrizeIDs": [
-        1001
+        999001
       ],
       "PrizeNums": [
-        10
+        1
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
@@ -41,7 +43,9 @@
         1013,
         1014,
         1015,
-        1016
+        1016,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 3,
@@ -49,10 +53,10 @@
       "Score": 0,
       "EventQuality": 1,
       "PrizeIDs": [
-        1001
+        999002
       ],
       "PrizeNums": [
-        10
+        1
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
@@ -72,7 +76,8 @@
         1023,
         1024,
         1025,
-        1026
+        1026,
+        102
       ],
       "EventTriggerType": 99,
       "EventTag": 2,
@@ -100,10 +105,12 @@
     {
       "ID": 4,
       "EventLinksId": [
-        1030
+        1030,
+        100,
+        102
       ],
       "EventTriggerType": 1,
-      "EventTag": 1,
+      "EventTag": 3,
       "EventType": 2,
       "Score": 0,
       "EventQuality": 1,
@@ -128,10 +135,12 @@
     {
       "ID": 5,
       "EventLinksId": [
-        1040
+        1040,
+        100,
+        102
       ],
       "EventTriggerType": 1,
-      "EventTag": 1,
+      "EventTag": 3,
       "EventType": 2,
       "Score": 0,
       "EventQuality": 1,
@@ -153,10 +162,12 @@
     {
       "ID": 6,
       "EventLinksId": [
-        1050
+        1050,
+        100,
+        102
       ],
       "EventTriggerType": 1,
-      "EventTag": 1,
+      "EventTag": 3,
       "EventType": 2,
       "Score": 0,
       "EventQuality": 1,
@@ -178,10 +189,12 @@
     {
       "ID": 7,
       "EventLinksId": [
-        1060
+        1060,
+        100,
+        102
       ],
       "EventTriggerType": 1,
-      "EventTag": 1,
+      "EventTag": 3,
       "EventType": 2,
       "Score": 0,
       "EventQuality": 1,
@@ -204,10 +217,12 @@
       "ID": 11,
       "EventLinksId": [
         1101,
-        1102
+        1102,
+        100,
+        102
       ],
       "EventTriggerType": 2,
-      "EventTag": null,
+      "EventTag": 3,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
@@ -231,10 +246,12 @@
       "EventLinksId": [
         1201,
         1202,
-        1203
+        1203,
+        100,
+        102
       ],
       "EventTriggerType": 2,
-      "EventTag": null,
+      "EventTag": 3,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
@@ -259,10 +276,12 @@
         1301,
         1302,
         1303,
-        1304
+        1304,
+        100,
+        102
       ],
       "EventTriggerType": 2,
-      "EventTag": null,
+      "EventTag": 3,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
@@ -285,10 +304,12 @@
       "ID": 14,
       "EventLinksId": [
         1401,
-        1402
+        1402,
+        100,
+        102
       ],
       "EventTriggerType": 2,
-      "EventTag": null,
+      "EventTag": 3,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
@@ -311,10 +332,12 @@
       "ID": 15,
       "EventLinksId": [
         1501,
-        1502
+        1502,
+        100,
+        102
       ],
       "EventTriggerType": 2,
-      "EventTag": null,
+      "EventTag": 3,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
@@ -339,7 +362,8 @@
         1000101,
         1000102,
         1000103,
-        1000104
+        1000104,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -366,7 +390,8 @@
       "EventLinksId": [
         1000201,
         1000202,
-        1000203
+        1000203,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -399,7 +424,8 @@
         1000306,
         1000307,
         1000308,
-        1000309
+        1000309,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -427,7 +453,8 @@
         1000401,
         1000402,
         1000403,
-        1000404
+        1000404,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -465,7 +492,8 @@
         1000511,
         1000512,
         1000513,
-        1000514
+        1000514,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -495,7 +523,8 @@
         1000603,
         1000604,
         1000605,
-        1000606
+        1000606,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -524,7 +553,8 @@
         1000702,
         1000703,
         1000704,
-        1000705
+        1000705,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -562,7 +592,8 @@
         1000811,
         1000812,
         1000813,
-        1000814
+        1000814,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -589,7 +620,8 @@
       "EventLinksId": [
         1000901,
         1000902,
-        1000903
+        1000903,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -614,7 +646,8 @@
     {
       "ID": 10010,
       "EventLinksId": [
-        1001001
+        1001001,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -639,7 +672,8 @@
     {
       "ID": 10011,
       "EventLinksId": [
-        1001101
+        1001101,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -675,7 +709,8 @@
         1001209,
         1001210,
         1001211,
-        1001212
+        1001212,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -715,7 +750,8 @@
         1001313,
         1001314,
         1001315,
-        1001316
+        1001316,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -747,7 +783,8 @@
         1001405,
         1001406,
         1001407,
-        1001408
+        1001408,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -779,7 +816,8 @@
         1001505,
         1001506,
         1001507,
-        1001508
+        1001508,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -816,7 +854,8 @@
         1001610,
         1001611,
         1001612,
-        1001613
+        1001613,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -850,7 +889,8 @@
         1001707,
         1001708,
         1001709,
-        1001710
+        1001710,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -890,7 +930,12 @@
         1001813,
         1001814,
         1001815,
-        1001816
+        1001816,
+        1001817,
+        1001818,
+        1001819,
+        1001820,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -916,7 +961,8 @@
       "ID": 10019,
       "EventLinksId": [
         1001901,
-        1001902
+        1001902,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -944,7 +990,8 @@
         1002001,
         1002002,
         1002003,
-        1002004
+        1002004,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -980,7 +1027,8 @@
         1002109,
         1002110,
         1002111,
-        1002112
+        1002112,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -1007,7 +1055,8 @@
       "EventLinksId": [
         1002201,
         1002202,
-        1002203
+        1002203,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -1043,7 +1092,9 @@
         1002309,
         1002310,
         1002311,
-        1002312
+        1002312,
+        1002313,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -1074,7 +1125,8 @@
         1002404,
         1002405,
         1002406,
-        1002407
+        1002407,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -1107,7 +1159,8 @@
         1002506,
         1002507,
         1002508,
-        1002509
+        1002509,
+        102
       ],
       "EventTriggerType": 4,
       "EventTag": 1,
@@ -1131,6 +1184,9 @@
     },
     {
       "ID": 10026,
+      "EventLinksId": [
+        102
+      ],
       "EventTriggerType": 4,
       "EventTag": 1,
       "EventType": 1,
@@ -1153,6 +1209,9 @@
     },
     {
       "ID": 10027,
+      "EventLinksId": [
+        102
+      ],
       "EventTriggerType": 4,
       "EventTag": 1,
       "EventType": 1,
@@ -1180,7 +1239,9 @@
         1002,
         1003,
         1004,
-        1005
+        1005,
+        100,
+        102
       ],
       "EventTriggerType": 99,
       "EventTag": 4,
@@ -1205,7 +1266,9 @@
     {
       "ID": 1011,
       "EventLinksId": [
-        101101
+        101101,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1230,7 +1293,9 @@
     {
       "ID": 1012,
       "EventLinksId": [
-        101201
+        101201,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1255,7 +1320,9 @@
     {
       "ID": 1013,
       "EventLinksId": [
-        101301
+        101301,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1280,7 +1347,9 @@
     {
       "ID": 1014,
       "EventLinksId": [
-        101401
+        101401,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1306,7 +1375,9 @@
       "ID": 1015,
       "EventLinksId": [
         101501,
-        101502
+        101502,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1332,7 +1403,9 @@
       "ID": 1016,
       "EventLinksId": [
         101601,
-        101602
+        101602,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1357,7 +1430,9 @@
     {
       "ID": 1017,
       "EventLinksId": [
-        101701
+        101701,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1388,7 +1463,9 @@
         101801,
         101802,
         101803,
-        101804
+        101804,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1415,7 +1492,9 @@
       "EventLinksId": [
         101901,
         101902,
-        101903
+        101903,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1441,7 +1520,9 @@
       "ID": 1020,
       "EventLinksId": [
         102001,
-        102002
+        102002,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1468,16 +1549,15 @@
       "EventLinksId": [
         102101,
         102102,
-        102103
+        102103,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "PrizeNums": [
-        1
-      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "placeID": null,
@@ -1496,16 +1576,15 @@
         102204,
         102205,
         102206,
-        102207
+        102207,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "PrizeNums": [
-        1
-      ],
       "RefreshProbability": null,
       "RefreshCount": null,
       "placeID": null,
@@ -1520,7 +1599,9 @@
       "EventLinksId": [
         102301,
         102302,
-        102303
+        102303,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1541,7 +1622,9 @@
       "EventLinksId": [
         102401,
         102402,
-        102403
+        102403,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1562,7 +1645,9 @@
       "EventLinksId": [
         102501,
         102502,
-        102503
+        102503,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1582,7 +1667,9 @@
       "ID": 1026,
       "EventLinksId": [
         102601,
-        102602
+        102602,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1608,7 +1695,9 @@
       "ID": 1027,
       "EventLinksId": [
         102701,
-        102702
+        102702,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1637,7 +1726,9 @@
         102802,
         102803,
         102804,
-        102805
+        102805,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1669,7 +1760,9 @@
         102905,
         102906,
         102907,
-        102908
+        102908,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1700,7 +1793,9 @@
         103004,
         103005,
         103006,
-        103007
+        103007,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1729,7 +1824,9 @@
         103102,
         103103,
         103104,
-        103105
+        103105,
+        100,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 7,
@@ -1758,7 +1855,8 @@
         1002,
         1003,
         1004,
-        1005
+        1005,
+        102
       ],
       "EventTriggerType": 5,
       "EventTag": null,
@@ -1789,7 +1887,8 @@
         1013,
         1014,
         1015,
-        1016
+        1016,
+        102
       ],
       "EventTriggerType": 5,
       "EventTag": null,
@@ -1818,7 +1917,8 @@
         1002,
         1003,
         1004,
-        1005
+        1005,
+        102
       ],
       "EventTriggerType": 5,
       "EventTag": null,
@@ -1847,7 +1947,8 @@
         1002,
         1003,
         1004,
-        1005
+        1005,
+        102
       ],
       "EventTriggerType": 6,
       "EventTag": 3,
@@ -1878,7 +1979,8 @@
         1013,
         1014,
         1015,
-        1016
+        1016,
+        102
       ],
       "EventTriggerType": 6,
       "EventTag": 3,
@@ -1908,7 +2010,8 @@
         9005,
         9006,
         9007,
-        9008
+        9008,
+        102
       ],
       "EventTriggerType": 6,
       "EventTag": 5,
@@ -1932,6 +2035,9 @@
     },
     {
       "ID": 9025,
+      "EventLinksId": [
+        102
+      ],
       "EventTriggerType": 6,
       "EventTag": 3,
       "EventType": 1,
@@ -1955,7 +2061,8 @@
     {
       "ID": 9014,
       "EventLinksId": [
-        9014
+        9014,
+        102
       ],
       "EventTriggerType": 6,
       "EventTag": 3,
@@ -1980,7 +2087,8 @@
     {
       "ID": 9031,
       "EventLinksId": [
-        9031
+        9031,
+        102
       ],
       "EventTriggerType": 6,
       "EventTag": 3,
@@ -2004,6 +2112,10 @@
     },
     {
       "ID": 30001,
+      "EventLinksId": [
+        100,
+        102
+      ],
       "EventTriggerType": 99,
       "EventTag": 6,
       "EventType": 1,
@@ -2020,6 +2132,10 @@
     },
     {
       "ID": 30002,
+      "EventLinksId": [
+        100,
+        102
+      ],
       "EventTriggerType": 99,
       "EventTag": 6,
       "EventType": 1,
@@ -2037,7 +2153,9 @@
     {
       "ID": 30003,
       "EventLinksId": [
-        3000301
+        3000301,
+        100,
+        102
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2056,7 +2174,9 @@
     {
       "ID": 30004,
       "EventLinksId": [
-        3000401
+        3000401,
+        100,
+        102
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2075,7 +2195,9 @@
     {
       "ID": 30005,
       "EventLinksId": [
-        3000501
+        3000501,
+        100,
+        102
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2094,7 +2216,9 @@
     {
       "ID": 30006,
       "EventLinksId": [
-        3000601
+        3000601,
+        100,
+        102
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2113,7 +2237,9 @@
     {
       "ID": 30007,
       "EventLinksId": [
-        3000701
+        3000701,
+        100,
+        102
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2132,7 +2258,9 @@
     {
       "ID": 30008,
       "EventLinksId": [
-        3000801
+        3000801,
+        100,
+        102
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2152,7 +2280,9 @@
       "ID": 30009,
       "EventLinksId": [
         3000901,
-        3000902
+        3000902,
+        100,
+        102
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2177,7 +2307,9 @@
     {
       "ID": 30010,
       "EventLinksId": [
-        3001001
+        3001001,
+        100,
+        102
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2206,7 +2338,9 @@
       "ID": 30011,
       "EventLinksId": [
         3001101,
-        3001102
+        3001102,
+        100,
+        102
       ],
       "EventTriggerType": 99,
       "EventTag": 6,
@@ -2249,7 +2383,8 @@
         500116,
         500117,
         500118,
-        500119
+        500119,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 5,
@@ -2289,7 +2424,8 @@
         500213,
         500214,
         500215,
-        500216
+        500216,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 5,
@@ -2336,7 +2472,8 @@
         500317,
         500318,
         500319,
-        500320
+        500320,
+        102
       ],
       "EventTriggerType": 1,
       "EventTag": 2,

+ 25 - 9
Assets/Res/Config/EventLinkConfig.json

@@ -2255,6 +2255,7 @@
       "EventID": 10012,
       "optionType": 1,
       "optionPara1": [
+        1001206,
         1001206
       ],
       "optionPara2": [
@@ -2863,7 +2864,7 @@
       "PreShowPar": null,
       "NPCID": 106,
       "LanID": [
-        2238
+        3190
       ],
       "DialogueType": null,
       "EventID": 10015,
@@ -2881,7 +2882,7 @@
       "PreShowPar": null,
       "NPCID": 106,
       "LanID": [
-        2239
+        3191
       ],
       "DialogueType": null,
       "EventID": 10015,
@@ -2899,7 +2900,7 @@
       "PreShowPar": null,
       "NPCID": 106,
       "LanID": [
-        2240
+        3192
       ],
       "DialogueType": null,
       "EventID": 10015,
@@ -2908,7 +2909,7 @@
         1001504
       ],
       "optionPara2": [
-        2241
+        3193
       ],
       "ResultType": null
     },
@@ -3088,7 +3089,7 @@
       "PreShowPar": null,
       "NPCID": null,
       "LanID": [
-        2244
+        3186
       ],
       "DialogueType": null,
       "EventID": 10016,
@@ -3106,7 +3107,7 @@
       "PreShowPar": null,
       "NPCID": 106,
       "LanID": [
-        2245
+        3187
       ],
       "DialogueType": null,
       "EventID": 10016,
@@ -3124,7 +3125,7 @@
       "PreShowPar": null,
       "NPCID": 100,
       "LanID": [
-        2246
+        3188
       ],
       "DialogueType": null,
       "EventID": 10016,
@@ -3142,7 +3143,7 @@
       "PreShowPar": null,
       "NPCID": 106,
       "LanID": [
-        2247
+        3189
       ],
       "DialogueType": null,
       "EventID": 10016,
@@ -4416,13 +4417,28 @@
       "EventID": 10023,
       "optionType": 1,
       "optionPara1": [
-        0
+        1002313
       ],
       "optionPara2": [
         2336
       ],
       "ResultType": null
     },
+    {
+      "ID": 1002313,
+      "conciseEventMessage": 2318,
+      "EventConditionMessage": null,
+      "PreShow": null,
+      "PreShowPar": null,
+      "NPCID": null,
+      "DialogueType": null,
+      "EventID": 10023,
+      "optionType": null,
+      "ResultType": 1,
+      "ResultOptions": [
+        1002401
+      ]
+    },
     {
       "ID": 1002401,
       "conciseEventMessage": 2337,

+ 14 - 14
Assets/Res/Config/HeroPowerUpConfig.json

@@ -956,8 +956,8 @@
         1
       ],
       "LeijieDamages": [
-        4080,
-        6120
+        1,
+        1
       ],
       "HPFactor": 46.06,
       "ATKFactor": 1.96,
@@ -1929,8 +1929,8 @@
         1
       ],
       "LeijieDamages": [
-        10720,
-        16080
+        1,
+        1
       ],
       "HPFactor": 105.84,
       "ATKFactor": 3.92,
@@ -2902,8 +2902,8 @@
         1
       ],
       "LeijieDamages": [
-        31600,
-        47400
+        1,
+        1
       ],
       "HPFactor": 239.73,
       "ATKFactor": 7.86,
@@ -3875,8 +3875,8 @@
         1
       ],
       "LeijieDamages": [
-        85680,
-        128520
+        1,
+        1
       ],
       "HPFactor": 533.8,
       "ATKFactor": 15.7,
@@ -4848,8 +4848,8 @@
         1
       ],
       "LeijieDamages": [
-        206240,
-        309360
+        1,
+        1
       ],
       "HPFactor": 1176.0,
       "ATKFactor": 31.36,
@@ -5821,8 +5821,8 @@
         1
       ],
       "LeijieDamages": [
-        486640,
-        729960
+        1,
+        1
       ],
       "HPFactor": 2569.88,
       "ATKFactor": 62.68,
@@ -6794,8 +6794,8 @@
         1
       ],
       "LeijieDamages": [
-        1183600,
-        1775400
+        1,
+        1
       ],
       "HPFactor": 5574.96,
       "ATKFactor": 125.28,

+ 11 - 11
Assets/Res/Config/ItemConfig.json

@@ -769,7 +769,7 @@
       "associateID": 4,
       "associateVlaue": [
         11001,
-        3101
+        10001
       ],
       "sort": null,
       "itemDesc2": null
@@ -798,7 +798,7 @@
       "associateID": 4,
       "associateVlaue": [
         11002,
-        3102
+        10002
       ],
       "sort": null,
       "itemDesc2": null
@@ -827,7 +827,7 @@
       "associateID": 4,
       "associateVlaue": [
         11003,
-        3201
+        10003
       ],
       "sort": null,
       "itemDesc2": null
@@ -856,7 +856,7 @@
       "associateID": 4,
       "associateVlaue": [
         11004,
-        3202
+        10004
       ],
       "sort": null,
       "itemDesc2": null
@@ -885,7 +885,7 @@
       "associateID": 4,
       "associateVlaue": [
         11005,
-        3203
+        10005
       ],
       "sort": null,
       "itemDesc2": null
@@ -914,7 +914,7 @@
       "associateID": 4,
       "associateVlaue": [
         11006,
-        3301
+        10006
       ],
       "sort": null,
       "itemDesc2": null
@@ -943,7 +943,7 @@
       "associateID": 4,
       "associateVlaue": [
         11007,
-        3302
+        10007
       ],
       "sort": null,
       "itemDesc2": null
@@ -972,7 +972,7 @@
       "associateID": 4,
       "associateVlaue": [
         11008,
-        3401
+        10008
       ],
       "sort": null,
       "itemDesc2": null
@@ -1001,7 +1001,7 @@
       "associateID": 4,
       "associateVlaue": [
         11009,
-        3402
+        10009
       ],
       "sort": null,
       "itemDesc2": null
@@ -1030,7 +1030,7 @@
       "associateID": 4,
       "associateVlaue": [
         11010,
-        3501
+        10010
       ],
       "sort": null,
       "itemDesc2": null
@@ -1059,7 +1059,7 @@
       "associateID": 4,
       "associateVlaue": [
         11011,
-        3502
+        10011
       ],
       "sort": null,
       "itemDesc2": null

+ 37 - 5
Assets/Res/Config/LanguageChineseConfig.json

@@ -8950,19 +8950,19 @@
     },
     {
       "ID": 2238,
-      "txt": "今天的风有点不对,开来昨日你在后山的动静不小呀,山那头怕是要来些不速之客。"
+      "txt": "(回到屋前,看到许由又在烧水,煮茶,和上次一样)"
     },
     {
       "ID": 2239,
-      "txt": "你才帮我弄好灵草种子和灵田,别让妖兽给毁了。"
+      "txt": "来,喝茶。"
     },
     {
       "ID": 2240,
-      "txt": "你去走一趟。"
+      "txt": "(心中默念...这个精英妖兽,可费我一些功夫,怎么又是茶?)"
     },
     {
       "ID": 2241,
-      "txt": "好的......"
+      "txt": "(你没说话,默默喝下)"
     },
     {
       "ID": 2242,
@@ -8982,7 +8982,7 @@
     },
     {
       "ID": 2246,
-      "txt": "(低声)……前辈,我做了怎么多事,一次比一次难。为何每次都让我喝茶?前辈可是希望我去处理?"
+      "txt": "前辈可是希望我去处理?"
     },
     {
       "ID": 2247,
@@ -12739,6 +12739,38 @@
     {
       "ID": 3185,
       "txt": "击败结界兽"
+    },
+    {
+      "ID": 3186,
+      "txt": "(你回到屋前,略显疲惫,许由依然在烧水,煮茶)"
+    },
+    {
+      "ID": 3187,
+      "txt": "(不动声色,递茶)喝吧。"
+    },
+    {
+      "ID": 3188,
+      "txt": "(低声)……前辈,我做了怎么多事,一次比一次难。为何每次都让我喝茶?"
+    },
+    {
+      "ID": 3189,
+      "txt": "哈哈哈,小友.你赢得越来越多,喝得却越来越不甘心。"
+    },
+    {
+      "ID": 3190,
+      "txt": "今天的风有点不对,开来昨日你在后山的动静不小呀,山那头怕是要来些不速之客。"
+    },
+    {
+      "ID": 3191,
+      "txt": "你才帮我弄好灵草种子和灵田,别让妖兽给毁了。"
+    },
+    {
+      "ID": 3192,
+      "txt": "你去走一趟。"
+    },
+    {
+      "ID": 3193,
+      "txt": "好的......"
     }
   ]
 }

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 2469 - 181
Assets/Res/Config/SentimentEffectConfig.json


+ 72 - 0
Assets/Res/Config/ShopConfig.json

@@ -108,6 +108,78 @@
       "pageSortNum": 6,
       "continueTime": -1
     },
+    {
+      "ID": 7,
+      "shopName": 268,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ],
+      "shopGroup": 1,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 7,
+      "pageSortNum": 7,
+      "continueTime": -1
+    },
+    {
+      "ID": 8,
+      "shopName": 269,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Demo_Gem04"
+      ],
+      "shopGroup": 1,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 8,
+      "pageSortNum": 8,
+      "continueTime": -1
+    },
+    {
+      "ID": 9,
+      "shopName": 270,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_GradeBadge_Master"
+      ],
+      "shopGroup": 1,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 9,
+      "pageSortNum": 9,
+      "continueTime": -1
+    },
+    {
+      "ID": 10,
+      "shopName": 271,
+      "shopDesc": null,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_GradeBadge_Challenger"
+      ],
+      "shopGroup": 1,
+      "unlockType": 0,
+      "unlockValue": [
+        0
+      ],
+      "unlockMessage": 0,
+      "shopItemID": 10,
+      "pageSortNum": 10,
+      "continueTime": -1
+    },
     {
       "ID": 101,
       "shopName": 300,

+ 63 - 3
Assets/Res/Config/ShopItemConfig.json

@@ -7,7 +7,7 @@
         1001
       ],
       "itemCount": [
-        9999
+        999999
       ],
       "costItemId": 1001,
       "price": 0,
@@ -67,7 +67,7 @@
         1005
       ],
       "itemCount": [
-        9999
+        99999
       ],
       "costItemId": 1001,
       "price": 1,
@@ -82,7 +82,67 @@
         1006
       ],
       "itemCount": [
-        9999
+        99999
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 7,
+      "giftID": "",
+      "itemId": [
+        1301
+      ],
+      "itemCount": [
+        999
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 8,
+      "giftID": "",
+      "itemId": [
+        1302
+      ],
+      "itemCount": [
+        999
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 9,
+      "giftID": "",
+      "itemId": [
+        1303
+      ],
+      "itemCount": [
+        999
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1
+    },
+    {
+      "ID": 10,
+      "giftID": "",
+      "itemId": [
+        1304
+      ],
+      "itemCount": [
+        999
       ],
       "costItemId": 1001,
       "price": 1,

+ 188 - 0
Assets/Res/UI/CombatPanel.prefab

@@ -430,6 +430,7 @@ RectTransform:
   - {fileID: 7561374860469839472}
   - {fileID: 271634867267467130}
   - {fileID: 6966436685152839904}
+  - {fileID: 345731962149340685}
   m_Father: {fileID: 1811249814091911294}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -465,6 +466,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: feng
+    gameObject: {fileID: 4209073936425644878}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &6539911976127367467
 MonoBehaviour:
@@ -3317,6 +3323,94 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &3590735151673375621
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7255814566391051554}
+  - component: {fileID: 3368965865282280724}
+  - component: {fileID: 3958097333011706263}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: feng
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &7255814566391051554
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3590735151673375621}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 2.4990404, y: 2.4990404, z: 0.9996162}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4925541673947957992}
+  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: 70, y: 63}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3368965865282280724
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3590735151673375621}
+  m_CullTransparentMesh: 1
+--- !u!114 &3958097333011706263
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3590735151673375621}
+  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: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 1
+  m_FillAmount: 1
+  m_FillClockwise: 0
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_xx
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 08bcd577b76e3c94cacfc8e9783bd09a, type: 3}
+  packInfo:
+    packName: battle
+    packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
+    packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
+    lasetJsonGUID: d6f50d2b7b6e4b0b7542e03171e0215b
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &3739599620287345921
 GameObject:
   m_ObjectHideFlags: 0
@@ -3907,6 +4001,94 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &4209073936425644878
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 345731962149340685}
+  - component: {fileID: 3523044967737643242}
+  - component: {fileID: 1430746582081154423}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: feng
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &345731962149340685
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4209073936425644878}
+  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: 4197360294442415998}
+  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: 70, y: 63}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3523044967737643242
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4209073936425644878}
+  m_CullTransparentMesh: 1
+--- !u!114 &1430746582081154423
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4209073936425644878}
+  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: 3
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 1
+  m_FillAmount: 1
+  m_FillClockwise: 0
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_xx
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 08bcd577b76e3c94cacfc8e9783bd09a, type: 3}
+  packInfo:
+    packName: battle
+    packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
+    packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
+    lasetJsonGUID: d6f50d2b7b6e4b0b7542e03171e0215b
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &4295364262558550610
 GameObject:
   m_ObjectHideFlags: 0
@@ -5484,6 +5666,7 @@ RectTransform:
   - {fileID: 7479615743388508295}
   - {fileID: 7833523249163798776}
   - {fileID: 2146270928697371138}
+  - {fileID: 7255814566391051554}
   m_Father: {fileID: 866017355225982164}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -5519,6 +5702,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: feng
+    gameObject: {fileID: 3590735151673375621}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &2400465450944708116
 MonoBehaviour:

+ 2017 - 0
Assets/Res/UI/ItemDetailsPanel/FaBaoDetailsPanel.prefab

@@ -0,0 +1,2017 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &367650205906546576
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8301126943394830486}
+  - component: {fileID: 2019938118635731770}
+  - component: {fileID: 2514970381247048030}
+  - component: {fileID: 8977237987496668833}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Close
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8301126943394830486
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 367650205906546576}
+  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: 9037135992368401232}
+  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 &2019938118635731770
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 367650205906546576}
+  m_CullTransparentMesh: 1
+--- !u!114 &2514970381247048030
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 367650205906546576}
+  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.21960786, g: 0.21960786, b: 0.21960786, 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: 
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &8977237987496668833
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 367650205906546576}
+  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: 2514970381247048030}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &1691432800552670504
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6136655831423186836}
+  - component: {fileID: 4755960994092275630}
+  - component: {fileID: 7635484185468045460}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_FaBaoIcon (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6136655831423186836
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1691432800552670504}
+  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: 7897417943919571100}
+  m_Father: {fileID: 4961536466157608292}
+  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: -209.39221, y: 1.168457}
+  m_SizeDelta: {x: 164.0966, y: 204.2354}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4755960994092275630
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1691432800552670504}
+  m_CullTransparentMesh: 1
+--- !u!114 &7635484185468045460
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1691432800552670504}
+  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: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_fbDiban
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 9ca71fa8b53209e4fbac2f9d8f60ce30, type: 3}
+  packInfo:
+    packName: fabao
+    packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
+    packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
+    lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &1872742310362579434
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2848902610725447080}
+  - component: {fileID: 9006840382129535295}
+  - component: {fileID: 1779948461095978858}
+  m_Layer: 0
+  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 &2848902610725447080
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1872742310362579434}
+  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: 3478042439320372479}
+  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: -55, y: -234}
+  m_SizeDelta: {x: 488.9567, y: 51.4679}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9006840382129535295
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1872742310362579434}
+  m_CullTransparentMesh: 1
+--- !u!114 &1779948461095978858
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1872742310362579434}
+  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.30980393, g: 0.19607845, b: 0.08627451, 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: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 42
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 42
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u6CD5\u5B9D\u6548\u679C"
+--- !u!1 &2553166258935284350
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4599103558216846144}
+  - component: {fileID: 7359437752171597100}
+  - component: {fileID: 7052039023098297680}
+  - component: {fileID: 1848812718108334540}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_FaBaoName
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4599103558216846144
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2553166258935284350}
+  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: 4961536466157608292}
+  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: 264.43878, y: 41.90338}
+  m_SizeDelta: {x: 0, y: 75.668}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &7359437752171597100
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2553166258935284350}
+  m_CullTransparentMesh: 1
+--- !u!114 &7052039023098297680
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2553166258935284350}
+  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.7254902, g: 0.8078432, b: 0.7411765, 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: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 46
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 51
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u6CD5\u5B9D\u540D\u79F0 Lv.1"
+--- !u!114 &1848812718108334540
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2553166258935284350}
+  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 &2812846925853449671
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7154777211442295581}
+  - component: {fileID: 4116051065367933219}
+  - component: {fileID: 7574905177654490373}
+  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 &7154777211442295581
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2812846925853449671}
+  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: 3478042439320372479}
+  m_Father: {fileID: 9037135992368401232}
+  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: 671.4882, y: 1164.7156}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4116051065367933219
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2812846925853449671}
+  m_CullTransparentMesh: 1
+--- !u!114 &7574905177654490373
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2812846925853449671}
+  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: dec_xiadiban
+  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: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &3398005791740917807
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1151327531843311621}
+  - component: {fileID: 5987552141134713068}
+  - component: {fileID: 6197663564937976482}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: SkillContent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1151327531843311621
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3398005791740917807}
+  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: 2940586768892950692}
+  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 &5987552141134713068
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3398005791740917807}
+  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: 23.37
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &6197663564937976482
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3398005791740917807}
+  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 &3533306812577061928
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8806507328366746912}
+  - component: {fileID: 7803985942085729440}
+  - component: {fileID: 4263885561566462603}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy) (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8806507328366746912
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3533306812577061928}
+  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: 3478042439320372479}
+  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: -55, y: -64}
+  m_SizeDelta: {x: 488.9567, y: 51.4679}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7803985942085729440
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3533306812577061928}
+  m_CullTransparentMesh: 1
+--- !u!114 &4263885561566462603
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3533306812577061928}
+  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.30980393, g: 0.19607845, b: 0.08627451, 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: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 42
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 42
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u57FA\u7840\u5C5E\u6027"
+--- !u!1 &4135189185558242575
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3478042439320372479}
+  - component: {fileID: 7857312306567959386}
+  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 &3478042439320372479
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4135189185558242575}
+  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: 6738649132051544318}
+  - {fileID: 4672021808672808400}
+  - {fileID: 2848902610725447080}
+  - {fileID: 7822711560404703771}
+  - {fileID: 8806507328366746912}
+  - {fileID: 1567392667895820747}
+  - {fileID: 6108060668469187376}
+  m_Father: {fileID: 7154777211442295581}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -1.7441101, y: 117.22717}
+  m_SizeDelta: {x: 750, y: 970.2579}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7857312306567959386
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4135189185558242575}
+  m_CullTransparentMesh: 1
+--- !u!1 &4463020634893161108
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2940586768892950692}
+  - component: {fileID: 6670840350690517952}
+  - component: {fileID: 4638670775036528649}
+  - component: {fileID: 33154439845688356}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Viewport
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2940586768892950692
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4463020634893161108}
+  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: 1151327531843311621}
+  m_Father: {fileID: 8073423848255295774}
+  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 &6670840350690517952
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4463020634893161108}
+  m_CullTransparentMesh: 1
+--- !u!114 &4638670775036528649
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4463020634893161108}
+  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 &33154439845688356
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4463020634893161108}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
+--- !u!1 &4664262130686330670
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4961536466157608292}
+  - component: {fileID: 8870171658625692314}
+  - component: {fileID: 724878819604129514}
+  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 &4961536466157608292
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4664262130686330670}
+  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: 4656301576404878008}
+  - {fileID: 4599103558216846144}
+  - {fileID: 6411118506608553955}
+  - {fileID: 6136655831423186836}
+  m_Father: {fileID: 6108060668469187376}
+  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: -4, y: 198.83145}
+  m_SizeDelta: {x: 605.6605, y: 230.6788}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8870171658625692314
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4664262130686330670}
+  m_CullTransparentMesh: 1
+--- !u!114 &724878819604129514
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4664262130686330670}
+  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_fbBiaotiDIban
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 9ca71fa8b53209e4fbac2f9d8f60ce30, type: 3}
+  packInfo:
+    packName: fabao
+    packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
+    packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
+    lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &5066664650193207248
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6108060668469187376}
+  - component: {fileID: 3419441115482588242}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: FaBaoInfoRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6108060668469187376
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5066664650193207248}
+  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: 4961536466157608292}
+  - {fileID: 3562230635030506916}
+  m_Father: {fileID: 3478042439320372479}
+  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: 32.857}
+  m_SizeDelta: {x: 750, y: 904.54}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3419441115482588242
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5066664650193207248}
+  m_CullTransparentMesh: 1
+--- !u!1 &5305674097407371432
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3562230635030506916}
+  - component: {fileID: 6680631196129598971}
+  - component: {fileID: 2684107460662622285}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: TeShuXiaoGuoRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3562230635030506916
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5305674097407371432}
+  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: 8809334176112050903}
+  - {fileID: 8073423848255295774}
+  m_Father: {fileID: 6108060668469187376}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -7.9971, y: -566}
+  m_SizeDelta: {x: 589.4222, y: 215.3082}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6680631196129598971
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5305674097407371432}
+  m_CullTransparentMesh: 1
+--- !u!114 &2684107460662622285
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5305674097407371432}
+  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.9294118, g: 0.9568628, b: 0.9960785, 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: dec_fbzhongDiban
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 9ca71fa8b53209e4fbac2f9d8f60ce30, type: 3}
+  packInfo:
+    packName: fabao
+    packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
+    packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
+    lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &5319747427857537892
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7244450252509174665}
+  - component: {fileID: 6925019361160875831}
+  - component: {fileID: 233314390999037390}
+  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 &7244450252509174665
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5319747427857537892}
+  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: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 0, y: 93}
+  m_SizeDelta: {x: 0, y: 60.1647}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &6925019361160875831
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5319747427857537892}
+  m_CullTransparentMesh: 1
+--- !u!114 &233314390999037390
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5319747427857537892}
+  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.8980393, g: 0.8980393, b: 0.8980393, 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: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 34
+    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: "\u70B9\u51FB\u7A7A\u767D\u5904\u5173\u95ED"
+--- !u!1 &5343214398070174603
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7897417943919571100}
+  - component: {fileID: 7714047007213359072}
+  - component: {fileID: 8808734034735316196}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_FaBaoIcon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7897417943919571100
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5343214398070174603}
+  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: 6136655831423186836}
+  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: 9.779953}
+  m_SizeDelta: {x: 110, y: 120}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7714047007213359072
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5343214398070174603}
+  m_CullTransparentMesh: 1
+--- !u!114 &8808734034735316196
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5343214398070174603}
+  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: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_fb3301
+  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: 7fb091d8ea8692b1350a9fd8f408874a
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &6114928648539321970
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8073423848255295774}
+  - component: {fileID: 2646367918689829722}
+  - component: {fileID: 9138079666689827247}
+  - component: {fileID: 7267548657742671533}
+  m_Layer: 0
+  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 &8073423848255295774
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6114928648539321970}
+  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: 2940586768892950692}
+  m_Father: {fileID: 3562230635030506916}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 1.6362, y: -27.4281}
+  m_SizeDelta: {x: 556.4907, y: 126.178}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2646367918689829722
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6114928648539321970}
+  m_CullTransparentMesh: 1
+--- !u!114 &9138079666689827247
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6114928648539321970}
+  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 &7267548657742671533
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6114928648539321970}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 1151327531843311621}
+  m_Horizontal: 0
+  m_Vertical: 1
+  m_MovementType: 1
+  m_Elasticity: 0.1
+  m_Inertia: 1
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 1
+  m_Viewport: {fileID: 2940586768892950692}
+  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 &6276416254652998665
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7822711560404703771}
+  - component: {fileID: 4550327670937226537}
+  - component: {fileID: 7462529761930503916}
+  m_Layer: 0
+  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 &7822711560404703771
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6276416254652998665}
+  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: 3478042439320372479}
+  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.3905, y: -340.7968}
+  m_SizeDelta: {x: 538.0532, y: 129.5162}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4550327670937226537
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6276416254652998665}
+  m_CullTransparentMesh: 1
+--- !u!114 &7462529761930503916
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6276416254652998665}
+  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.5058824, g: 0.43137258, b: 0.34509805, 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: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 28
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5BF9\u654C\u4EBA\u9020\u6210200%\u4F24\u5BB3\uFF0C\u670930%\u7684\u6982\u7387\u4F7F\u5176\u4E94\u884C\u6DF7\u4E71\uFF0C\u6301\u7EED1\u79D2\u3002"
+--- !u!1 &6766688874820868269
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8809334176112050903}
+  - component: {fileID: 9184616767057802106}
+  - component: {fileID: 7239163052211098259}
+  m_Layer: 0
+  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 &8809334176112050903
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6766688874820868269}
+  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: 3562230635030506916}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 18.1, y: -15.4}
+  m_SizeDelta: {x: 488.9567, y: 43.492905}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &9184616767057802106
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6766688874820868269}
+  m_CullTransparentMesh: 1
+--- !u!114 &7239163052211098259
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6766688874820868269}
+  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.7254902, g: 0.8078432, b: 0.7411765, 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: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 42
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 44
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7279\u6B8A\u6548\u679C"
+--- !u!1 &6787469561699184805
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1567392667895820747}
+  - component: {fileID: 7559032770676416480}
+  - component: {fileID: 8293535817558608995}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_ShuXingJiaCheng
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1567392667895820747
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6787469561699184805}
+  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: 3478042439320372479}
+  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: -37, y: -148.92084}
+  m_SizeDelta: {x: 464.8343, y: 82.1643}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7559032770676416480
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6787469561699184805}
+  m_CullTransparentMesh: 1
+--- !u!114 &8293535817558608995
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6787469561699184805}
+  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.5058824, g: 0.43137258, b: 0.34509805, 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: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 28
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u653B\u51FB\u529B:10\n\u8840\u91CF\uFF1A100"
+--- !u!1 &6808286672743403775
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6411118506608553955}
+  - component: {fileID: 7965205304804970307}
+  - component: {fileID: 7881656911132333451}
+  - component: {fileID: 3424139586426770297}
+  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 &6411118506608553955
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6808286672743403775}
+  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: 4961536466157608292}
+  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: -346.22174, y: 41.90338}
+  m_SizeDelta: {x: 65, y: 66}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &7965205304804970307
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6808286672743403775}
+  m_CullTransparentMesh: 1
+--- !u!114 &7881656911132333451
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6808286672743403775}
+  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_huo
+  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: 8de890b954c861b7d182629dcafc0d3a
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &3424139586426770297
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6808286672743403775}
+  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 &7153603480180354184
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4672021808672808400}
+  - component: {fileID: 3918660232300141392}
+  - component: {fileID: 6291504531637490093}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_ItemDesc
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4672021808672808400
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7153603480180354184}
+  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: 3478042439320372479}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 7.819, y: 42}
+  m_SizeDelta: {x: 580.4724, y: 110.7614}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3918660232300141392
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7153603480180354184}
+  m_CullTransparentMesh: 1
+--- !u!114 &6291504531637490093
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7153603480180354184}
+  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.7137255, g: 0.67058825, b: 0.62352943, 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: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 28
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u9053\u5177\u63CF\u8FF0"
+--- !u!1 &7820694973404673461
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6738649132051544318}
+  - component: {fileID: 7839004945915717382}
+  - component: {fileID: 6323413004734410321}
+  - component: {fileID: 6540517810981987330}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Title
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6738649132051544318
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7820694973404673461}
+  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: 3478042439320372479}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 1.4193115, y: -44}
+  m_SizeDelta: {x: 0, y: 82.1818}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &7839004945915717382
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7820694973404673461}
+  m_CullTransparentMesh: 1
+--- !u!114 &6323413004734410321
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7820694973404673461}
+  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: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 50
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 5
+    m_MaxSize: 72
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u529F\u6CD5\u8BE6\u60C5"
+--- !u!114 &6540517810981987330
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7820694973404673461}
+  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 &8994874510214016950
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9037135992368401232}
+  - component: {fileID: 4159330424245520485}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: FaBaoDetailsPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9037135992368401232
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8994874510214016950}
+  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: 8301126943394830486}
+  - {fileID: 7244450252509174665}
+  - {fileID: 7154777211442295581}
+  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: 0}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &4159330424245520485
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8994874510214016950}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Icon_Attribute
+    gameObject: {fileID: 7881656911132333451}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_FaBaoName
+    gameObject: {fileID: 7052039023098297680}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Power
+    gameObject: {fileID: 567363716052983178}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Icon_FaBaoIcon
+    gameObject: {fileID: 8808734034735316196}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: FaBaoInfoRoot
+    gameObject: {fileID: 5066664650193207248}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: SkillContent
+    gameObject: {fileID: 1151327531843311621}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_ItemDesc
+    gameObject: {fileID: 6291504531637490093}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_ShuXingJiaCheng
+    gameObject: {fileID: 8293535817558608995}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Desc
+    gameObject: {fileID: 7462529761930503916}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Close
+    gameObject: {fileID: 8977237987496668833}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 0
+--- !u!1 &9111287373956877969
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4656301576404878008}
+  - component: {fileID: 7271376927170581440}
+  - component: {fileID: 567363716052983178}
+  - component: {fileID: 1066915909127941340}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Power
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4656301576404878008
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9111287373956877969}
+  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: 4961536466157608292}
+  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: 201, y: -45.09662}
+  m_SizeDelta: {x: 0, y: 75.668}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &7271376927170581440
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9111287373956877969}
+  m_CullTransparentMesh: 1
+--- !u!114 &567363716052983178
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9111287373956877969}
+  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.7254902, g: 0.8078432, b: 0.7411765, 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: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 34
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5F3A\u5EA61.1\u4E07"
+--- !u!114 &1066915909127941340
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9111287373956877969}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0

+ 7 - 0
Assets/Res/UI/ItemDetailsPanel/FaBaoDetailsPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DywXsyj7AHOg4+Mf81aSmt7Oa0JqyPpWm/xeRqCgFNRr9PKYxFqSUQm18YUJ
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2411 - 0
Assets/Res/UI/ItemDetailsPanel/GongFaDetailsPanel.prefab

@@ -0,0 +1,2411 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &71686367632503874
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6586270893627312966}
+  - component: {fileID: 315075413461184646}
+  - component: {fileID: 3658809785945388472}
+  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 &6586270893627312966
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 71686367632503874}
+  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: 38, y: 36}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &315075413461184646
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 71686367632503874}
+  m_CullTransparentMesh: 1
+--- !u!114 &3658809785945388472
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 71686367632503874}
+  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_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &211297441723314480
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2153909580538796158}
+  - component: {fileID: 8477265740368799667}
+  - component: {fileID: 9067918860528619332}
+  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 &2153909580538796158
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 211297441723314480}
+  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: 0}
+  m_AnchoredPosition: {x: 0, y: 53}
+  m_SizeDelta: {x: 0, y: 60.1647}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &8477265740368799667
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 211297441723314480}
+  m_CullTransparentMesh: 1
+--- !u!114 &9067918860528619332
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 211297441723314480}
+  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.8980393, g: 0.8980393, b: 0.8980393, 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: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 34
+    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: "\u70B9\u51FB\u7A7A\u767D\u5904\u5173\u95ED"
+--- !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: 38, y: 36}
+  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_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !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: 38, y: 36}
+  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_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !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: 4822715704095626536}
+  - component: {fileID: 494562200636583715}
+  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: []
+  m_Father: {fileID: 8468219431132250151}
+  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: -69, y: 4.9}
+  m_SizeDelta: {x: 65, y: 66}
+  m_Pivot: {x: 0, 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 &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!114 &494562200636583715
+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: 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_huo
+  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: 8de890b954c861b7d182629dcafc0d3a
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !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: 1896441137542441893}
+  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: -177.4202, y: 42.873688}
+  m_SizeDelta: {x: 257.0179, y: 56.6005}
+  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.7254902, g: 0.8078432, b: 0.7411765, 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: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 50
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 5
+    m_MaxSize: 54
+    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: 38, y: 36}
+  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_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !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: 1219834969852229682}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 11.200012, y: 68.5}
+  m_SizeDelta: {x: 176.9993, y: 59.13031}
+  m_Pivot: {x: 0, y: 1}
+--- !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.7254902, g: 0.8078432, b: 0.7411765, 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: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 38
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 54
+    m_Alignment: 6
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u529F\u6CD5\u5883\u754C"
+--- !u!1 &2643577657068640080
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1896441137542441893}
+  - component: {fileID: 7974973106416060315}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Buttom
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1896441137542441893
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2643577657068640080}
+  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: 1977479323307174205}
+  - {fileID: 3289851963449376272}
+  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: -5.7698, y: -530.5123}
+  m_SizeDelta: {x: 662.46, y: 201.3347}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7974973106416060315
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2643577657068640080}
+  m_CullTransparentMesh: 1
+--- !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: GongFaDetailsPanel
+  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: 974955702589908185}
+  - {fileID: 5473342035507285947}
+  - {fileID: 2153909580538796158}
+  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: 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}
+    - gameObject: {fileID: 3658809785945388472}
+  - 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: Text_SkillCd
+    gameObject: {fileID: 8135164377214459410}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8243822813260717961}
+    - gameObject: {fileID: 4649527201698735611}
+    - gameObject: {fileID: 6899362910355405383}
+    - gameObject: {fileID: 2266735464070336714}
+  - key: Icon_Attribute
+    gameObject: {fileID: 494562200636583715}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8243822813260717961}
+    - gameObject: {fileID: 4649527201698735611}
+    - gameObject: {fileID: 6899362910355405383}
+    - gameObject: {fileID: 2266735464070336714}
+  - key: Btn_Close
+    gameObject: {fileID: 1402063853834289886}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8243822813260717961}
+    - gameObject: {fileID: 4649527201698735611}
+    - gameObject: {fileID: 6899362910355405383}
+    - gameObject: {fileID: 2266735464070336714}
+  - key: Text_Desc
+    gameObject: {fileID: 6428946276891239405}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8243822813260717961}
+    - gameObject: {fileID: 4649527201698735611}
+    - gameObject: {fileID: 6899362910355405383}
+    - gameObject: {fileID: 2266735464070336714}
+  isAssetBundle: 1
+--- !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: 8835694497297248325}
+  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.000015258789, y: 0}
+  m_SizeDelta: {x: 150.4743, y: 150.4743}
+  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_s1404
+  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
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !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: 1062516556747891371}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0.000011563301, y: -107}
+  m_SizeDelta: {x: 0, y: 82.1818}
+  m_Pivot: {x: 0.5, 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.8117648, g: 0.5176471, b: 0.07450981, 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: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 40
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 4
+    m_MaxSize: 72
+    m_Alignment: 3
+    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 &4882534291422396107
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1219834969852229682}
+  - component: {fileID: 8956727549716453988}
+  - component: {fileID: 1411527726572769045}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Middle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1219834969852229682
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4882534291422396107}
+  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: 8487569396974391897}
+  - {fileID: 6131283213059370231}
+  - {fileID: 5812057225866309631}
+  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: -41.9487, y: -182.4065}
+  m_SizeDelta: {x: 576.8621, y: 437.793}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8956727549716453988
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4882534291422396107}
+  m_CullTransparentMesh: 1
+--- !u!114 &1411527726572769045
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4882534291422396107}
+  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: dec_zhongdiban
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 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.00053941837}
+  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: 15
+    m_Right: 0
+    m_Top: 12
+    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}
+  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 &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: 8835694497297248325}
+  - {fileID: 7325077240780456121}
+  m_Father: {fileID: 1062516556747891371}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 207.52069, y: -211}
+  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!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: 1896441137542441893}
+  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: 6.64682, y: -62}
+  m_SizeDelta: {x: 612.3877, y: 125.5805}
+  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.4901961, g: 0.4666667, b: 0.40000004, 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: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 26
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 2
+    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: 1241945714467361818}
+  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: 1062516556747891371}
+  - {fileID: 1219834969852229682}
+  - {fileID: 1896441137542441893}
+  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: 719.7283, y: 1309.6}
+  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 &1241945714467361818
+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: 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: dec_xiadiban
+  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: 009d01eadc79b5b12c19322b6a4cd057
+  useGradient: 0
+  topOrLeftColor: {r: 0.09411766, g: 0.16862746, b: 0.18431373, a: 1}
+  bottomOrRightColor: {r: 0.6117647, g: 0.80392164, b: 0.7843138, a: 1}
+  direction: 0
+--- !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: 0.8, y: 0.8, z: 0.8}
+  m_ConstrainProportionsScale: 1
+  m_Children:
+  - {fileID: 7772631278292454634}
+  m_Father: {fileID: 1219834969852229682}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -14, y: -0.47021222}
+  m_SizeDelta: {x: 639.5158, y: 530.0513}
+  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: 0
+  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 &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: 38, y: 36}
+  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_gfxingji
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &6233593762380004246
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5812057225866309631}
+  - component: {fileID: 2100578571696428461}
+  - component: {fileID: 8135164377214459410}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_SkillCd
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5812057225866309631
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6233593762380004246}
+  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: 1219834969852229682}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 194.4, y: 49.9}
+  m_SizeDelta: {x: 317.0255, y: 36.152008}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &2100578571696428461
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6233593762380004246}
+  m_CullTransparentMesh: 1
+--- !u!114 &8135164377214459410
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6233593762380004246}
+  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.8431373, g: 0.9058824, b: 0.854902, 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: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 27
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 6
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u529F\u6CD5\u8FD0\u4F5C\u5468\u671F\uFF1A1\u8F6C"
+--- !u!1 &7297095596675777317
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3506692094758419250}
+  - component: {fileID: 4779018838628891476}
+  - component: {fileID: 6428946276891239405}
+  m_Layer: 0
+  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 &3506692094758419250
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7297095596675777317}
+  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: 1062516556747891371}
+  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: 3.2798, y: -304}
+  m_SizeDelta: {x: 564.8265, y: 123.7665}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4779018838628891476
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7297095596675777317}
+  m_CullTransparentMesh: 1
+--- !u!114 &6428946276891239405
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7297095596675777317}
+  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.6117647, g: 0.5647059, b: 0.50980395, 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: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 29
+    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: "\u548C\u89C4\u8303\u5316\u98CE\u683C\u8C6A\u653E\u7684\u6D3B\u52A8\u98CE\u683C\u5316\u6CD5\u56FD\u7684\u8BDD\u53D1\u65F6\u611F\u5230\u9644\u5C5E\u56FD\u5927\u5E08\u5085\u6562\u6B7B\u961F\u98CE\u683C"
+--- !u!1 &7313999456231797816
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8835694497297248325}
+  - component: {fileID: 1079158496623144060}
+  - component: {fileID: 5767460528244155415}
+  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 &8835694497297248325
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7313999456231797816}
+  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}
+  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: 6.954, y: 24.074}
+  m_SizeDelta: {x: 166.9464, y: 166.9464}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1079158496623144060
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7313999456231797816}
+  m_CullTransparentMesh: 1
+--- !u!114 &5767460528244155415
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7313999456231797816}
+  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.5803922, g: 0.68235296, b: 0.64705884, 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_yuanhuan_quse
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 08bcd577b76e3c94cacfc8e9783bd09a, type: 3}
+  packInfo:
+    packName: battle
+    packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
+    packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
+    lasetJsonGUID: b30151c7ca91f3adc1fcb725072e1a9f
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &7453280115962929466
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3614911344362164345}
+  - component: {fileID: 1312911676552920954}
+  - component: {fileID: 5899416475739491613}
+  - component: {fileID: 7769507245851191875}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Title
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3614911344362164345
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7453280115962929466}
+  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: 1062516556747891371}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -26}
+  m_SizeDelta: {x: 0, y: 82.1818}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &1312911676552920954
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7453280115962929466}
+  m_CullTransparentMesh: 1
+--- !u!114 &5899416475739491613
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7453280115962929466}
+  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: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 50
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 5
+    m_MaxSize: 72
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u529F\u6CD5\u8BE6\u60C5"
+--- !u!114 &7769507245851191875
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7453280115962929466}
+  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 &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}
+  - {fileID: 6586270893627312966}
+  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: 6.7, y: -3}
+  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
+--- !u!1 &8642564743332153640
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 974955702589908185}
+  - component: {fileID: 4028809462012990080}
+  - component: {fileID: 278059956413028480}
+  - component: {fileID: 1402063853834289886}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Close
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &974955702589908185
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8642564743332153640}
+  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 &4028809462012990080
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8642564743332153640}
+  m_CullTransparentMesh: 1
+--- !u!114 &278059956413028480
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8642564743332153640}
+  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.21960786, g: 0.21960786, b: 0.21960786, 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: 
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &1402063853834289886
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8642564743332153640}
+  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: 278059956413028480}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &8663191832714904281
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1062516556747891371}
+  - component: {fileID: 8852455515981834155}
+  - component: {fileID: 5495798638672061479}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Top
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1062516556747891371
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8663191832714904281}
+  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: 3614911344362164345}
+  - {fileID: 8468219431132250151}
+  - {fileID: 7374263567999719867}
+  - {fileID: 3506692094758419250}
+  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: 1.4193, y: 465.29004}
+  m_SizeDelta: {x: 648.08, y: 379}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8852455515981834155
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8663191832714904281}
+  m_CullTransparentMesh: 1
+--- !u!114 &5495798638672061479
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8663191832714904281}
+  m_Enabled: 0
+  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: dec_shangdiban
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: d888d6e73899265a3799225e04fd014b
+  useGradient: 0
+  topOrLeftColor: {r: 0.14901961, g: 0.26666668, b: 0.27058825, a: 1}
+  bottomOrRightColor: {r: 0.14509805, g: 0.25490198, b: 0.28235295, a: 1}
+  direction: 0

+ 7 - 0
Assets/Res/UI/ItemDetailsPanel/GongFaDetailsPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CHwZ4y75Wi5EOij+rbn45W5KhZpVcYpQgrRn9Phm3EHRxPo4u7gMhwdzLeJ+
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
Assets/Scripts/GameLogic/Combat/Buff/b_1001.cs

@@ -21,6 +21,8 @@ namespace GameLogic.Combat.Buff
             combatHeroEntity.CurrCombatHeroInfo.addAttSpeed_bl += lasetAddValue;
             lasetAddValue = 0;
             lasetAddValue = buffCount * buffInf.BuffConfig.effectValue[0];
+            lasetAddValue += CombatCalculateTool.Instance.GetVlaueRatioForFloat(
+                lasetAddValue, source.CurrCombatHeroInfo.Water_Proficient);
             combatHeroEntity.CurrCombatHeroInfo.addAttSpeed_bl -= lasetAddValue;
         }
 

+ 2 - 0
Assets/Scripts/GameLogic/Combat/Buff/b_1003.cs

@@ -20,6 +20,8 @@ namespace GameLogic.Combat.Buff
                 float harmbl = buffCount * buffInf.BuffConfig.effectValue[0];
                 long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(
                     source.CurrCombatHeroInfo.attack.Value, harmbl);
+                harm += CombatCalculateTool.Instance.GetVlaueRatioForLong(
+                    harm, source.CurrCombatHeroInfo.Wood_Proficient);
                 CombatCalculateTool.Instance.Harm(source, combatHeroEntity, harm, AttType.Buff, _triggerData,
                     WuXingType.Null,null,HarmType.Buff);
             }

+ 5 - 4
Assets/Scripts/GameLogic/Combat/Buff/b_1005.cs

@@ -14,7 +14,6 @@ namespace GameLogic.Combat.Buff
 
         protected override void ProInit()
         {
-           
         }
 
 
@@ -27,10 +26,13 @@ namespace GameLogic.Combat.Buff
                 float harmbl = buffCount * buffInf.BuffConfig.effectValue[0];
                 long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(
                     source.CurrCombatHeroInfo.attack.Value, harmbl);
+                harm += CombatCalculateTool.Instance.GetVlaueRatioForLong(
+                    harm, source.CurrCombatHeroInfo.Fire_Proficient);
                 CombatCalculateTool.Instance.Harm(source, combatHeroEntity, harm, AttType.Buff, _triggerData,
-                    WuXingType.Fire,null,HarmType.Buff);
+                    WuXingType.Fire, null, HarmType.Buff);
             }
         }
+
         protected override void ProUpdateEffect()
         {
             if (buffCount >= buffInf.BuffConfig.overlayCount) //最大叠加数量
@@ -46,11 +48,10 @@ namespace GameLogic.Combat.Buff
                 // combatHeroEntity.BuffControl.RemoveBuff(this);
             }
         }
-     
+
 
         protected override void ProDormancyObj()
         {
-           
         }
     }
 }

+ 2 - 0
Assets/Scripts/GameLogic/Combat/Buff/b_1011.cs

@@ -26,6 +26,8 @@ namespace GameLogic.Combat.Buff
 
             long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(source.CurrCombatHeroInfo.attack.Value,
                 addHarm);
+            harm += CombatCalculateTool.Instance.GetVlaueRatioForLong(
+                harm, source.CurrCombatHeroInfo.Metal_Proficient);
             CombatCalculateTool.Instance.Harm(source, combatHeroEntity, harm, AttType.Buff, _triggerData,
                 WuXingType.Gold,null);
         }

+ 18 - 2
Assets/Scripts/GameLogic/Combat/Buff/b_1024.cs

@@ -1,7 +1,23 @@
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+using GameLogic.Player;
+
 namespace GameLogic.Combat.Buff
 {
-    public class b_1024
+    /// <summary>
+    /// 星辰印记
+    /// 星辰道升级获得的效果,在结算时收到层数对应的伤害
+    /// </summary>
+    public class b_1024 : BuffBasic
     {
-        
+        public void Trigger(CombatHeroEntity heroEntity)
+        {
+            long att = heroEntity.CurrCombatHeroInfo.attack.Value;
+            float harmBl = buffCount * buffInf.BuffConfig.effectValue[0];
+            long harm = CombatCalculateTool.Instance.GetVlaueRatioForLong(att, harmBl);
+            CombatCalculateTool.Instance.Harm(heroEntity, combatHeroEntity, harm, AttType.Buff, _triggerData,
+                WuXingType.Null, null);
+            
+        }
     }
 }

+ 4 - 0
Assets/Scripts/GameLogic/Combat/CombatTool/AttType.cs

@@ -13,5 +13,9 @@ namespace GameLogic.Combat.CombatTool
         /// 反击伤害
         /// </summary>
         FanJi=8,
+        /// <summary>
+        /// 间接伤害
+        /// </summary>
+        JianJie=16,
     }
 }

+ 37 - 0
Assets/Scripts/GameLogic/Combat/CombatTool/CombatCalculateTool.cs

@@ -155,6 +155,43 @@ namespace GameLogic.Combat.CombatTool
                 return harmReturnInfo;
             }
 
+            switch (WuXingType)
+            {
+                case WuXingType.Gold:
+                    att += GetVlaueRatioForLong(att,
+                        source.CurrCombatHeroInfo.Metal_HarmAdd);
+                    break;
+                case WuXingType.Water:
+                    att += GetVlaueRatioForLong(att,
+                        source.CurrCombatHeroInfo.Water_HarmAdd);
+                    break;
+                case WuXingType.Fire:
+                    att += GetVlaueRatioForLong(att,
+                        source.CurrCombatHeroInfo.Fire_HarmAdd);
+                    break;
+                case WuXingType.Earth:
+                    att += GetVlaueRatioForLong(att,
+                        source.CurrCombatHeroInfo.Earth_HarmAdd);
+                    break;
+                case WuXingType.Wood:
+                    att += GetVlaueRatioForLong(att,
+                        source.CurrCombatHeroInfo.Wood_HarmAdd);
+                    break;
+            }
+
+            if (!harmReturnInfo.attType.HasFlag(AttType.Buff))
+            {
+                att += GetVlaueRatioForLong(att,
+                    source.CurrCombatHeroInfo.finallyHarmAdd -
+                    target.combatHeroEntity.CurrCombatHeroInfo.finallyHarmReduce);
+            }
+            else
+            {
+                att += GetVlaueRatioForLong(att,
+                    source.CurrCombatHeroInfo.abnormalHarmAdd);
+            }
+
+            harmReturnInfo.att = att;
             target.combatHeroEntity.This<CombatHeroEntity>().HeroHurt(harmReturnInfo);
 
 

+ 8 - 3
Assets/Scripts/GameLogic/Combat/Hero/CombatHeroInfo.cs

@@ -128,12 +128,12 @@ public class CombatHeroInfo
     public float Water_Proficient;
 
     /// <summary>
-    /// 精通
+    /// 精通
     /// </summary>
     public float Wood_Proficient;
 
     /// <summary>
-    /// 精通
+    /// 流行精通
     /// </summary>
     public float Metal_Proficient;
 
@@ -171,7 +171,10 @@ public class CombatHeroInfo
     /// 最后伤害减少
     /// </summary>
     public float finallyHarmReduce;
-
+    /// <summary>
+    /// 最终伤害增加 buff伤害除外
+    /// </summary>
+    public float finallyHarmAdd;
     /// <summary>
     /// 1=英雄 2=小怪 3=精英怪 4=boss
     /// </summary>
@@ -201,6 +204,8 @@ public class CombatHeroInfo
     /// </summary>
     public int TaoismSkillId;
 
+   
+
     public float GetAttSpeed
     {
         get

+ 50 - 4
Assets/Scripts/GameLogic/Combat/Hero/Turntable/SkillSlots.cs

@@ -1,4 +1,5 @@
 using Common.Utility.CombatEvent;
+using GameLogic.Combat.Buff;
 using GameLogic.Combat.Skill;
 using GameLogic.Player;
 
@@ -116,13 +117,14 @@ namespace GameLogic.Combat.Hero.Turntable
             {
                 finishAngle = (jd - targetAngle);
             }
+
             float allT = SkillBasic.SelfSkillConfig.cd * 360;
-            return (finishAngle+triggerCount*360) / allT;
+            return (finishAngle + triggerCount * 360) / allT;
         }
 
         public float GetFinishAngle()
         {
-            if (SkillBasic == null||!SkillBasic.isActive)
+            if (SkillBasic == null || !SkillBasic.isActive)
             {
                 return int.MaxValue;
             }
@@ -146,7 +148,7 @@ namespace GameLogic.Combat.Hero.Turntable
             }
 
             float allT = SkillBasic.SelfSkillConfig.cd * 360;
-            return allT - (finishAngle+triggerCount*360);
+            return allT - (finishAngle + triggerCount * 360);
         }
 
         private void Angle(float addAngle)
@@ -180,7 +182,51 @@ namespace GameLogic.Combat.Hero.Turntable
 
         private void Trigger(int triggerType)
         {
-            if (SkillBasic != null&&SkillBasic.isActive)
+            switch (triggerType)
+            {
+                case 0:
+                    b_1019 b1019 = skillTurntable.CombatHeroEntity.BuffControl.GetBuffBasicForType<b_1019>();
+                    if (b1019 != null)
+                    {
+                        return;
+                    }
+
+                    break;
+                case 1:
+                    b_1021 b_1021 = skillTurntable.CombatHeroEntity.BuffControl.GetBuffBasicForType<b_1021>();
+                    if (b_1021 != null)
+                    {
+                        return;
+                    }
+
+                    break;
+                case 2:
+                    b_1020 b1020 = skillTurntable.CombatHeroEntity.BuffControl.GetBuffBasicForType<b_1020>();
+                    if (b1020 != null)
+                    {
+                        return;
+                    }
+
+                    break;
+                case 3:
+                    b_1022 b_1022 = skillTurntable.CombatHeroEntity.BuffControl.GetBuffBasicForType<b_1022>();
+                    if (b_1022 != null)
+                    {
+                        return;
+                    }
+
+                    break;
+                case 4:
+                    b_1023 b_1023 = skillTurntable.CombatHeroEntity.BuffControl.GetBuffBasicForType<b_1023>();
+                    if (b_1023 != null)
+                    {
+                        return;
+                    }
+
+                    break;
+            }
+
+            if (SkillBasic != null && SkillBasic.isActive)
             {
                 TriggerSkillSlotsEventData triggerSkillSlotsEventData = TriggerSkillSlotsEventData.Create();
                 triggerSkillSlotsEventData.SkillBasic = SkillBasic;

+ 10 - 5
Assets/Scripts/GameLogic/Combat/Hero/Turntable/SkillTurntable.cs

@@ -13,6 +13,12 @@ namespace GameLogic.Combat.Hero.Turntable
         public BetterList<SkillSlots> allSkillSlots = new BetterList<SkillSlots>();
 
         protected CombatHeroSkillControl combatHeroSkillControl;
+
+        public CombatHeroEntity CombatHeroEntity
+        {
+            get { return _combatHeroEntity; }
+        }
+
         protected CombatHeroEntity _combatHeroEntity;
 
         public BetterList<SkillBasic> _removeSkillBasic = new BetterList<SkillBasic>();
@@ -22,6 +28,7 @@ namespace GameLogic.Combat.Hero.Turntable
 
         public float skillAddSkillCd;
         public int skillCount;
+
         public void Init(int count, CombatHeroSkillControl combatHeroSkillControl, CombatHeroEntity combatHeroEntity)
         {
             this.combatHeroSkillControl = combatHeroSkillControl;
@@ -80,7 +87,7 @@ namespace GameLogic.Combat.Hero.Turntable
 
             _removeTime = 0;
             skillAddSkillCd = 0;
-            skillCount=0;
+            skillCount = 0;
             if (allSkill != null)
             {
                 for (int i = 0; i < allSkill.Length; i++)
@@ -103,12 +110,11 @@ namespace GameLogic.Combat.Hero.Turntable
                         skillCount++;
                     }
 
-                    skillAddSkillCd+=skillConfig.addcd;
+                    skillAddSkillCd += skillConfig.addcd;
                     SetSkill(skillInfo.index, skillBasic);
 
                     if (!string.IsNullOrEmpty(skillConfig.scriptName))
                     {
-                     
                         cTaskAwaitBuffer.AddTask(AssetBundleLoadManager.Instance.LoadAssetAsyncTask<TextAsset>(
                             skillConfig.timelineName + ".txt",
                             delegate(AssetHandle handle)
@@ -291,9 +297,8 @@ namespace GameLogic.Combat.Hero.Turntable
             AddUseGongFaEventData addUseGongFaEventData = AddUseGongFaEventData.Create();
             addUseGongFaEventData.SkillBasic = skillBasic;
             addUseGongFaEventData.SkillSlots = skillSlots;
-           
+
             CombatEventManager.Instance.Dispatch(CombatEventType.AddUseGongFa, addUseGongFaEventData);
-           
         }
 
 

+ 25 - 7
Assets/Scripts/GameLogic/Combat/Skill/DS60101.cs

@@ -11,7 +11,18 @@ namespace GameLogic.Combat.Skill
         public float currEnergy = 0;
 
         private float _currTime;
-        public bool _updateTime;
+        public bool isSkillActive;
+        public event System.Action OnSkillActivefinish;
+        public bool isStop;
+
+        public void Stop()
+        {
+            isStop = true;
+            if (isSkillActive)
+            {
+                Finish();
+            }
+        }
 
         protected override void ProUseSkill()
         {
@@ -24,10 +35,16 @@ namespace GameLogic.Combat.Skill
 
         private void UseSkill(IEventData iEventData)
         {
+            if (isStop)
+            {
+                return;
+            }
+
             CombatUseSkillEventData combatUseSkillEventData = iEventData as CombatUseSkillEventData;
-            if (combatUseSkillEventData.useSkill.CombatHeroEntity == CombatHeroEntity&& combatUseSkillEventData.useSkill.SelfSkillConfig.SkillType == 1)
+            if (combatUseSkillEventData.useSkill.CombatHeroEntity == CombatHeroEntity &&
+                combatUseSkillEventData.useSkill.SelfSkillConfig.SkillType == 1)
             {
-                if (_updateTime)
+                if (isSkillActive)
                 {
                     return;
                 }
@@ -35,7 +52,7 @@ namespace GameLogic.Combat.Skill
                 currEnergy += SelfSkillConfig.effectValue[0];
                 if (currEnergy >= SelfSkillConfig.effectValue[1])
                 {
-                    _updateTime = true;
+                    isSkillActive = true;
                     _currTime = 0;
                     currEnergy = 0;
                     CombatHeroEntity.CurrCombatHeroInfo.addAttSpeed_bl += SelfSkillConfig.effectValue[2];
@@ -45,17 +62,18 @@ namespace GameLogic.Combat.Skill
 
         private void Finish()
         {
-            if (_updateTime)
+            if (isSkillActive)
             {
                 CombatHeroEntity.CurrCombatHeroInfo.addAttSpeed_bl -= SelfSkillConfig.effectValue[2];
-                _updateTime = false;
+                isSkillActive = false;
+                OnSkillActivefinish?.Invoke();
             }
         }
 
 
         protected override void ProCombatUpdate(float time)
         {
-            if (_updateTime)
+            if (isSkillActive)
             {
                 _currTime += time;
                 if (_currTime >= SelfSkillConfig.effectValue[4])

+ 6 - 1
Assets/Scripts/GameLogic/Combat/Skill/S60102.cs

@@ -18,7 +18,7 @@ namespace GameLogic.Combat.Skill
 
         private void GongFaPengZhuangStart(IEventData iEventData)
         {
-            if (ds60101 == null || !ds60101._updateTime)
+            if (ds60101 == null || !ds60101.isSkillActive)
             {
                 return;
             }
@@ -39,6 +39,11 @@ namespace GameLogic.Combat.Skill
             }
         }
 
+        protected override void ProDispose()
+        {
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.GongFaPengZhuangStart, GongFaPengZhuangStart);
+        }
+
         protected override void ProUseSkill()
         {
         }

+ 49 - 0
Assets/Scripts/GameLogic/Combat/Skill/S60103.cs

@@ -0,0 +1,49 @@
+using Common.Utility.CombatEvent;
+using Fort23.Core;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+
+namespace GameLogic.Combat.Skill
+{
+    /// <summary>
+    /// 启动期间每使用一个功法生命恢复2%
+    /// </summary>
+    public class S60103 : SkillBasic
+    {
+        private DS60101 ds60101;
+
+        protected override void ProActiveSkill()
+        {
+            ds60101 = CombatHeroEntity.CombatHeroSkillControl.GetSkillBasic<DS60101>();
+            CombatEventManager.Instance.AddEventListener(CombatEventType.UseSkill, UseSkill);
+        }
+
+        private void UseSkill(IEventData iEventData)
+        {
+            if (ds60101 == null || !ds60101.isSkillActive)
+            {
+                return;
+            }
+
+            // SkillFeaturesData mySkillFeaturesData = null;
+            CombatUseSkillEventData combatUseSkillEventData = iEventData as CombatUseSkillEventData;
+            if (combatUseSkillEventData.useSkill.CombatHeroEntity == CombatHeroEntity)
+            {
+                long hp = CombatHeroEntity.MaxCombatHeroInfo.hp.Value;
+                long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(hp, effectValue[0]);
+                CombatCalculateTool.Instance.Recover(CombatHeroEntity,
+                    CombatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(), v, AttType.Skill, HarmType.Default,
+                    triggerData);
+            }
+        }
+
+        protected override void ProDispose()
+        {
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.UseSkill, UseSkill);
+        }
+
+        protected override void ProUseSkill()
+        {
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/GameLogic/Combat/Skill/S60103.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: e59ae68d348f4f228f31b5f48a7594d3
+timeCreated: 1751349673

+ 52 - 0
Assets/Scripts/GameLogic/Combat/Skill/S60104.cs

@@ -0,0 +1,52 @@
+using Common.Utility.CombatEvent;
+using Fort23.Core;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+
+namespace GameLogic.Combat.Skill
+{
+    /// <summary>
+    /// 星辰道启动期间释放的功法带有星辰之力,对敌人额外照成30%当前伤害
+    /// </summary>
+    public class S60104 : SkillBasic
+    {
+        private DS60101 ds60101;
+
+        protected override void ProActiveSkill()
+        {
+            ds60101 = CombatHeroEntity.CombatHeroSkillControl.GetSkillBasic<DS60101>();
+            CombatEventManager.Instance.AddEventListener(CombatEventType.HeroInjured, HeroInjured);
+        }
+
+        private void HeroInjured(IEventData iEventData)
+        {
+            if (ds60101 == null || !ds60101.isSkillActive)
+            {
+                return;
+            }
+
+            // SkillFeaturesData mySkillFeaturesData = null;
+            HeroInjuredEventData heroInjuredEventData = iEventData as HeroInjuredEventData;
+            if (heroInjuredEventData.HarmReturnInfo.source == CombatHeroEntity &&
+                heroInjuredEventData.HarmReturnInfo.isHitHero)
+            {
+                long att = heroInjuredEventData.HarmReturnInfo.att;
+                long v = CombatCalculateTool.Instance.GetVlaueRatioForLong(att, effectValue[0]);
+                CombatCalculateTool.Instance.Harm(CombatHeroEntity, heroInjuredEventData.HarmReturnInfo.target, v,
+                    AttType.Skill | AttType.JianJie, triggerData, heroInjuredEventData.HarmReturnInfo.WuXingType, null);
+                // CombatCalculateTool.Instance.Recover(CombatHeroEntity,
+                //     CombatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(), v, AttType.Skill, HarmType.Default,
+                //     triggerData);
+            }
+        }
+
+        protected override void ProDispose()
+        {
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.HeroInjured, HeroInjured);
+        }
+
+        protected override void ProUseSkill()
+        {
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/GameLogic/Combat/Skill/S60104.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 2f63aaa80e614788854bce7ffe5ed4bc
+timeCreated: 1751350008

+ 71 - 0
Assets/Scripts/GameLogic/Combat/Skill/S60105.cs

@@ -0,0 +1,71 @@
+using Common.Utility.CombatEvent;
+using Fort23.Core;
+using GameLogic.Combat.Buff;
+using GameLogic.Combat.CombatTool;
+
+namespace GameLogic.Combat.Skill
+{
+    /// <summary>
+    /// 星辰之力打中敌人后,为期注入星辰印记,在星辰道结束时结算,没3层印记受到20%伤害
+    /// </summary>
+    public class S60105 : SkillBasic
+    {
+        private DS60101 ds60101;
+
+        protected override void ProActiveSkill()
+        {
+            ds60101 = CombatHeroEntity.CombatHeroSkillControl.GetSkillBasic<DS60101>();
+            ds60101.OnSkillActivefinish += OnSkillActivefinish;
+            CombatEventManager.Instance.AddEventListener(CombatEventType.HeroInjured, HeroInjured);
+        }
+
+        private void OnSkillActivefinish()
+        {
+            CombatHeroEntity[] allHero =
+                CombatController.currActiveCombat.CombatHeroController.GetHero(!CombatHeroEntity.IsEnemy);
+
+            for (int i = 0; i < allHero.Length; i++)
+            {
+                CombatHeroEntity combatHeroEntity = allHero[i];
+                b_1024 b1024 = combatHeroEntity.BuffControl.GetBuffBasicForType<b_1024>();
+                if (b1024 != null)
+                {
+                    b1024.Trigger(CombatHeroEntity);
+                    combatHeroEntity.BuffControl.RemoveBuff(b1024);
+                }
+            }
+        }
+
+        private void HeroInjured(IEventData iEventData)
+        {
+            if (ds60101 == null || !ds60101.isSkillActive)
+            {
+                return;
+            }
+
+            // SkillFeaturesData mySkillFeaturesData = null;
+            HeroInjuredEventData heroInjuredEventData = iEventData as HeroInjuredEventData;
+            if (heroInjuredEventData.HarmReturnInfo.source == CombatHeroEntity &&
+                heroInjuredEventData.HarmReturnInfo.isHitHero)
+            {
+                S60104 s60104 = heroInjuredEventData.HarmReturnInfo.triggerData.Source as S60104;
+                if (s60104 != null)
+                {
+                    BuffInfo buffInfo = BuffInfo.GetBuffInfo(10241, -1, 1);
+                    heroInjuredEventData.HarmReturnInfo.target.combatHeroEntity.BuffControl.AddBuff(CombatHeroEntity,
+                        buffInfo);
+                }
+            }
+        }
+
+        protected override void ProDispose()
+        {
+            ds60101.OnSkillActivefinish -= OnSkillActivefinish;
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.HeroInjured, HeroInjured);
+        }
+
+        protected override void ProUseSkill()
+        {
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/GameLogic/Combat/Skill/S60105.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 3a99466a9fdf43728c90c08b0c5a6eb2
+timeCreated: 1751350578

+ 58 - 0
Assets/Scripts/GameLogic/Combat/Skill/S60106.cs

@@ -0,0 +1,58 @@
+using Common.Utility.CombatEvent;
+using Fort23.Core;
+using GameLogic.Combat.Buff;
+using GameLogic.Combat.CombatTool;
+using GameLogic.Combat.Hero;
+
+namespace GameLogic.Combat.Skill
+{
+    /// <summary>
+    /// 死亡时恢复30%最大生命
+    /// </summary>
+    public class S60106 : SkillBasic
+    {
+        private int count;
+
+        public event System.Action OnResurrected;
+        protected override void ProActiveSkill()
+        {
+            count = 0;
+            CombatEventManager.Instance.AddEventListener(CombatEventType.HeroInjured, HeroInjured);
+        }
+
+
+        private void HeroInjured(IEventData iEventData)
+        {
+            if (count > 0)
+            {
+                return;
+            }
+
+
+            HeroInjuredEventData heroInjuredEventData = iEventData as HeroInjuredEventData;
+            if (heroInjuredEventData.HarmReturnInfo.target.combatHeroEntity == CombatHeroEntity)
+            {
+                if (CombatHeroEntity.CurrCombatHeroInfo.hp <= 0)
+                {
+                    count++;
+                    long hp= CombatHeroEntity.MaxCombatHeroInfo.hp.Value;
+                    long addHp = CombatCalculateTool.Instance.GetVlaueRatioForLong(hp, effectValue[0]);
+                    CombatCalculateTool.Instance.Recover(CombatHeroEntity,
+                        CombatHeroEntity.GetMainHotPoin<CombatHeroHitPoint>(), addHp, AttType.Skill, HarmType.Default,
+                        triggerData);
+                    OnResurrected?.Invoke();
+                }
+            }
+        }
+
+        protected override void ProDispose()
+        {
+            OnResurrected = null;
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.HeroInjured, HeroInjured);
+        }
+
+        protected override void ProUseSkill()
+        {
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/GameLogic/Combat/Skill/S60106.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: b1dec21d3cde4a5fbad3ccad3d60117f
+timeCreated: 1751352581

+ 38 - 0
Assets/Scripts/GameLogic/Combat/Skill/S60107.cs

@@ -0,0 +1,38 @@
+using Common.Utility.CombatEvent;
+using Fort23.Core;
+using GameLogic.Combat.Buff;
+using GameLogic.Combat.CombatTool;
+
+namespace GameLogic.Combat.Skill
+{
+    /// <summary>
+    /// 死亡后星辰道不在运转,转而获得200%伤害加成
+    /// </summary>
+    public class S60107 : SkillBasic
+    {
+        private S60106 s60106;
+
+        protected override void ProActiveSkill()
+        {
+            s60106 = CombatHeroEntity.CombatHeroSkillControl.GetSkillBasic<S60106>();
+            s60106.OnResurrected += OnResurrected;
+        }
+
+        private void OnResurrected()
+        {
+            DS60101 ds60101 = CombatHeroEntity.CombatHeroSkillControl.GetSkillBasic<DS60101>();
+            ds60101.Stop();
+            CombatHeroEntity.CurrCombatHeroInfo.finallyHarmAdd+=effectValue[0];
+        }
+
+
+        protected override void ProDispose()
+        {
+            s60106.OnResurrected -= OnResurrected;
+        }
+
+        protected override void ProUseSkill()
+        {
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/GameLogic/Combat/Skill/S60107.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9f9c20d4bfcb4888be596c9f9d673b9e
+timeCreated: 1751353878

+ 7 - 0
Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -274,6 +274,13 @@ public class DialogueManager : Singleton<DialogueManager>
             }
         }
 
+        //如果当前链条没有在事件链条里,不走结束逻辑
+        if (!eventConfig.EventLinksId.Contains(currentDialogueID))
+        {
+            onCancel?.Invoke();
+            return;
+        }
+
 
         switch (dialogueConfig.ResultType)
         {

+ 35 - 2
Assets/Scripts/GameUI/UI/CombatPanel/MagicWeaponWidget.cs

@@ -1,5 +1,7 @@
+using Common.Utility.CombatEvent;
 using Core.Language;
 using Excel2Json;
+using Fort23.Core;
 using GameLogic.Combat.Buff;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
@@ -18,11 +20,40 @@ namespace Fort23.Mono
         public override void AddEvent()
         {
             StaticUpdater.Instance.AddLateUpdateCallBack(Update);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.AddBuff, AddBuff);
+            CombatEventManager.Instance.AddEventListener(CombatEventType.RemoveBuff, RemoveBuff);
         }
 
+
         public override void DelEvent()
         {
             StaticUpdater.Instance.RemoveLateUpdateCallBack(Update);
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.AddBuff, AddBuff);
+            CombatEventManager.Instance.RemoveEventListener(CombatEventType.RemoveBuff, RemoveBuff);
+        }
+
+        private void AddBuff(IEventData iEventData)
+        {
+            BuffEventData buffEventData = iEventData as BuffEventData;
+            if (buffEventData.target == combatMagicWeaponEntity)
+            {
+                if (buffEventData.BuffBasic is b_1008)
+                {
+                    feng.SetActive(true);
+                }
+            }
+        }
+
+        private void RemoveBuff(IEventData iEventData)
+        {
+            BuffEventData buffEventData = iEventData as BuffEventData;
+            if (buffEventData.target == combatMagicWeaponEntity)
+            {
+                if (buffEventData.BuffBasic is b_1008)
+                {
+                    feng.SetActive(false);
+                }
+            }
         }
 
         public override void AddButtonEvent()
@@ -57,8 +88,8 @@ namespace Fort23.Mono
 
         public void InitWidget(CombatMagicWeaponEntity combatMagicWeaponEntity)
         {
+            feng.SetActive(false);
             this.combatMagicWeaponEntity = combatMagicWeaponEntity;
-            
         }
 
         private void Update()
@@ -68,7 +99,9 @@ namespace Fort23.Mono
                 return;
             }
 
-            float d = (combatMagicWeaponEntity.cd+combatMagicWeaponEntity.RootMagicWeaponControl.globalMagicWeaponCd) / (combatMagicWeaponEntity.MaxCd);
+            float d =
+                (combatMagicWeaponEntity.cd + combatMagicWeaponEntity.RootMagicWeaponControl.globalMagicWeaponCd) /
+                (combatMagicWeaponEntity.MaxCd);
             cd.fillAmount = 1 - d;
         }
     }

+ 11 - 0
Assets/Scripts/GameUI/UI/CombatPanel/MagicWeaponWidgetData.cs

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

+ 3 - 3
Assets/Scripts/GameUI/UI/CombatPanel/WuXingGongFaWidget.cs

@@ -95,7 +95,7 @@ namespace Fort23.Mono
 
                 if (isFengShuo)
                 {
-                    fengjingXX.SetActive(true);
+                    fengjingXX?.SetActive(true);
                 }
             }
         }
@@ -149,7 +149,7 @@ namespace Fort23.Mono
 
                 if (isFengShuo)
                 {
-                    fengjingXX.SetActive(false);
+                    fengjingXX?.SetActive(false);
                 }
             }
         }
@@ -160,7 +160,7 @@ namespace Fort23.Mono
 
         public void ShowWidget(int index)
         {
-            fengjingXX.SetActive(false);
+            fengjingXX?.SetActive(false);
             this.index = index;
             switch (index)
             {

+ 2 - 2
Assets/Scripts/GameUI/UI/CombatPanel/ZhuanPanPanel.cs

@@ -366,10 +366,10 @@ namespace Fort23.Mono
                 {
                     if (fx_ui_zhuangPan != null)
                     {
-                        fx_ui_zhuangPan.gameObject.SetActive(ds60101._updateTime);
+                        fx_ui_zhuangPan.gameObject.SetActive(ds60101.isSkillActive);
                     }
 
-                    zhuanpan_chongneng.gameObject.SetActive(!ds60101._updateTime);
+                    zhuanpan_chongneng.gameObject.SetActive(!ds60101.isSkillActive);
                     zhuanpan_chongneng.fillAmount = ds60101.currEnergy / ds60101.SelfSkillConfig.effectValue[1];
                     // lanLiang.color = !ds60101._updateTime
                     //     ? new Color(1f, 0.96f, 0f)

+ 4 - 24
Assets/Scripts/GameUI/UI/DialoguePanel/DialogueBubblePanel.cs

@@ -44,10 +44,12 @@ namespace Fort23.Mono
 
         protected override void AddEvent()
         {
+            StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
         }
 
         protected override void DelEvent()
         {
+            StaticUpdater.Instance.RemoveRenderUpdateCallBack(Update);
         }
 
         public override void AddButtonEvent()
@@ -92,7 +94,7 @@ namespace Fort23.Mono
             this.dialogueMessaga = eventConditionConfig.LanID;
             this.finish = finish;
             index = 0;
-            StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
+
             StartShowMassge();
         }
 
@@ -123,7 +125,7 @@ namespace Fort23.Mono
                 case ShowDialogueEventData.MessageShowType.Verbatim:
                     _sb.Clear();
                     _currShowMessage = m.ToCharArray();
-                    if(_currShowMessage.Length > 0)
+                    if (_currShowMessage.Length > 0)
                         _sb.Append(_currShowMessage[0]);
                     message.text = _sb.ToString();
                     _isUpdate = true;
@@ -137,34 +139,12 @@ namespace Fort23.Mono
         public override void Hide()
         {
             base.Hide();
-            StaticUpdater.Instance.RemoveRenderUpdateCallBack(Update);
         }
 
         private TimerEntity _timerEntity;
 
         public void Update()
         {
-            // Vector3 p = CombatDrive.Instance.CombatController.CombatHeroController.playerHeroEntity.GameObject.transform.Find("hitpos").position;
-            // p.x -= 0.2f;
-            // p.y += 0.7f;
-            // p = CombatDrive.Instance.CombatController.CombatCameraControllder.Camera.WorldToScreenPoint(p);
-            // p = UIManager.Instance.UICamera.ScreenToWorldPoint(p);
-            //
-            //
-            // p = transform.worldToLocalMatrix * p;
-            //
-            // dotPoint.anchoredPosition = p;
-
-            // if (EventSystemManager.Instance.isOpenUi)
-            //     return;
-
-            //不是组界面不进行挂机事件对话
-            // MainPanel mainPanel = UIManager.Instance.GetComponent<MainPanel>();
-            // if (mainPanel == null || mainPanel.IsClose || !mainPanel.transform.gameObject.activeInHierarchy)
-            // {
-            //     return;
-            // }
-
             if (UIManager.Instance.currOpenPanel == null || UIManager.Instance.currOpenPanel.GetType() != typeof(MainPanel) || UIManager.Instance.popUIPanels.Count > 0)
             {
                 return;

+ 2 - 2
Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -341,8 +341,8 @@ namespace Fort23.Mono
 
         public void Update()
         {
-            if (EventSystemManager.Instance.isOpenUi && eventConditionConfig.ID != 0)
-                return;
+            // if (EventSystemManager.Instance.isOpenUi && eventConditionConfig.ID != 0)
+            //     return;
 
             if (!_isUpdate) return;
 

+ 12 - 7
Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs

@@ -169,16 +169,21 @@ namespace Fort23.Mono
                 for (var i = 0; i < randomEventConfig.PrizeIDs.Length; i++)
                 {
                     DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(randomEventConfig.PrizeIDs[i]);
-                    if (dropConfig.dropType == 3)
+                    foreach (var i1 in dropConfig.showItemId)
                     {
-                        ItemInfo itemInfo = new ItemInfo(dropConfig.dropGroupID[0], randomEventConfig.PrizeNums[i]);
+                        ItemInfo itemInfo = new ItemInfo( i1, randomEventConfig.PrizeNums[i]);
                         itemInfos.Add(itemInfo);
                     }
-                    else
-                    {
-                        List<ItemInfo> items = DropManager.Instance.DropItem(randomEventConfig.PrizeIDs[i]);
-                        itemInfos.AddRange(items);
-                    }
+                    //
+                    // if (dropConfig.dropType == 3)
+                    // {
+                    //     
+                    // }
+                    // else
+                    // {
+                    //     List<ItemInfo> items = DropManager.Instance.DropItem(randomEventConfig.PrizeIDs[i]);
+                    //     itemInfos.AddRange(items);
+                    // }
                 }
 
                 for (var i = 0; i < itemInfos.Count; i++)

+ 198 - 0
Assets/Scripts/GameUI/UI/ItemDetailsPanel/FaBaoDetailsPanel.cs

@@ -0,0 +1,198 @@
+using System.Collections.Generic;
+using System.Linq;
+using Core.Language;
+using Excel2Json;
+using Fort23.Core;
+using Fort23.UTool;
+using GameLogic.Bag;
+using GameLogic.Hero;
+using UnityEngine;
+using Utility;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "FaBaoDetailsPanel")]
+    public partial class FaBaoDetailsPanel : UIPanel
+    {
+        List<FaBaoSkillWidget> faBaoSkillWidgets = new List<FaBaoSkillWidget>();
+
+        List<ItemWidgetType1> itemWidgetType1s = new List<ItemWidgetType1>();
+
+        List<FaBaoWidget> faBaoWidgets = new List<FaBaoWidget>();
+
+        FaBaoWidget currentFaBaoWidget = null;
+        FaBaoInfo currentFaBaoInfo;
+
+        private ItemInfo _itemInfo;
+
+
+        private bool isUpGrade = false;
+
+        private List<FaBaoInfo> shownFaBaoInfos;
+
+
+        private void Init()
+        {
+            IsShowAppBar = false;
+            isAddStack = false;
+            isPopUi = true;
+        }
+
+        protected override void AddEvent()
+        {
+        }
+
+        protected override void DelEvent()
+        {
+        }
+
+        public override CTask GetFocus()
+        {
+            // AppBarPanel.ClosePanel();
+            return base.GetFocus();
+        }
+
+        public override void AddButtonEvent()
+        {
+            Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+        }
+
+
+        public async void CustomInit(ItemInfo itemInfo)
+        {
+            _itemInfo = itemInfo;
+            AccountFileInfo.FaBaoData faaData = new AccountFileInfo.FaBaoData();
+            faaData.id = itemInfo.config.associateVlaue[1];
+            faaData.level = 1;
+            faaData.useIndex = -1;
+            FaBaoInfo faBaoInfo = new FaBaoInfo(faaData);
+            currentFaBaoInfo = faBaoInfo;
+
+            UpdateFaBaoUI(faBaoInfo);
+        }
+
+
+        private async CTask UpdateFaBaoUI(FaBaoInfo faBaoInfo)
+        {
+            using (CTaskAwaitBuffer cts = new CTaskAwaitBuffer())
+            {
+                Text_FaBaoName.text = LanguageManager.Instance.Text(faBaoInfo.FabaoConfig.name) + " Lv." + faBaoInfo.FabaoPowerupConfig.ID;
+                Text_Power.text = $"强度:{faBaoInfo.qiangDu}";
+                Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(faBaoInfo.SkillConfig.dec), faBaoInfo.effectValue);
+                
+                Text_ItemDesc.text = LanguageManager.Instance.Text(_itemInfo.config.itemDesc);
+
+
+                Icon_FaBaoIcon.icon_name = faBaoInfo.SkillConfig.icon;
+
+                switch (faBaoInfo.FabaoConfig.magicAttribute)
+                {
+                    case 1:
+                        Icon_Attribute.icon_name = "dec_jin";
+                        break;
+                    case 2:
+                        Icon_Attribute.icon_name = "dec_mu";
+                        break;
+                    case 4:
+                        Icon_Attribute.icon_name = "dec_shui";
+                        break;
+                    case 8:
+                        Icon_Attribute.icon_name = "dec_huo";
+                        break;
+                    case 16:
+                        Icon_Attribute.icon_name = "dec_tu";
+                        break;
+                }
+
+                cts.AddTask(CreatFaBaoSkillWidget(faBaoInfo));
+                cts.AddTask(CreatFaBaoAttributeWidget(faBaoInfo));
+                await cts.WaitAll();
+            }
+        }
+
+
+        private async CTask CreatFaBaoSkillWidget(FaBaoInfo faBaoInfo)
+        {
+            foreach (var faBaoSkillWidget in faBaoSkillWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(faBaoSkillWidget);
+            }
+
+            faBaoSkillWidgets.Clear();
+
+            List<FabaoPowerupConfig> fabaoPowerupConfigs = ConfigComponent.Instance.GetAll<FabaoPowerupConfig>().ToList();
+
+            var fanappower = fabaoPowerupConfigs.GroupBy(f => f.SkillLevel).Select(g => new { config = g.OrderBy(f => f.ID).FirstOrDefault() }).ToList();
+
+            foreach (var powerupConfigse in fanappower)
+            {
+                AccountFileInfo.FaBaoData faBaoData = new AccountFileInfo.FaBaoData();
+                faBaoData.id = currentFaBaoInfo.FaBaoData.id;
+                faBaoData.level = powerupConfigse.config.ID;
+                FaBaoInfo _faBaoInfo = new FaBaoInfo(faBaoData);
+                FaBaoSkillWidget faBaoSkillWidget = await UIManager.Instance.CreateGComponent<FaBaoSkillWidget>(null, SkillContent);
+                faBaoSkillWidget.CustomInit(currentFaBaoInfo, _faBaoInfo);
+                faBaoSkillWidgets.Add(faBaoSkillWidget);
+            }
+        }
+
+        private async CTask CreatFaBaoAttributeWidget(FaBaoInfo faBaoInfo)
+        {
+            string t = "";
+            foreach (var keyValuePair in faBaoInfo.attriButedIC)
+            {
+                t = $"{GetAttributeName(keyValuePair.Key)} : {currentFaBaoInfo.attriButedIC[keyValuePair.Key].ToString()}\n";
+            }
+
+            Text_ShuXingJiaCheng.text = t;
+        }
+
+        private string GetAttributeName(int type)
+        {
+            switch (type)
+            {
+                case 1:
+                    return "生命";
+
+                case 2:
+                    return "防御";
+                case 3:
+                    return "攻击";
+            }
+
+            return "";
+        }
+
+        public async static CTask<FaBaoDetailsPanel> OpenPanel(ItemInfo faBaoInfo)
+        {
+            FaBaoDetailsPanel selectFaBaoPanel = await UIManager.Instance.LoadAndOpenPanel<FaBaoDetailsPanel>(null,UILayer.Top);
+            selectFaBaoPanel.CustomInit(faBaoInfo);
+            return selectFaBaoPanel;
+        }
+
+
+        public override void Close()
+        {
+            foreach (var faBaoAttributeWidget in faBaoWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(faBaoAttributeWidget);
+            }
+
+            faBaoWidgets.Clear();
+
+            foreach (var faBaoSkillWidget in faBaoSkillWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(faBaoSkillWidget);
+            }
+
+            faBaoSkillWidgets.Clear();
+
+            UIManager.Instance.DormancyGComponent(currentFaBaoWidget);
+
+            currentFaBaoWidget = null;
+            currentFaBaoInfo = null;
+
+            base.Close();
+        }
+    }
+}

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

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: DXsYtCmlWijGicXoRKVB9CUILxY+82ZW/n6SM792oOqDXenq+kEsS7ln56nj
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 128 - 0
Assets/Scripts/GameUI/UI/ItemDetailsPanel/FaBaoDetailsPanelData.cs

@@ -0,0 +1,128 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class FaBaoDetailsPanel 
+	{
+	  #region 自定义数据 
+	  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_FaBaoName;
+	  public Text Text_FaBaoName
+	   {
+	   get{
+	      if (_Text_FaBaoName == null)
+	       {
+	         _Text_FaBaoName  = GetUIUnit<Text>("Text_FaBaoName"); 
+	       }
+	      return _Text_FaBaoName;
+	     }
+	   }
+	  private Text _Text_Power;
+	  public Text Text_Power
+	   {
+	   get{
+	      if (_Text_Power == null)
+	       {
+	         _Text_Power  = GetUIUnit<Text>("Text_Power"); 
+	       }
+	      return _Text_Power;
+	     }
+	   }
+	  private MyImage _Icon_FaBaoIcon;
+	  public MyImage Icon_FaBaoIcon
+	   {
+	   get{
+	      if (_Icon_FaBaoIcon == null)
+	       {
+	         _Icon_FaBaoIcon  = GetUIUnit<MyImage>("Icon_FaBaoIcon"); 
+	       }
+	      return _Icon_FaBaoIcon;
+	     }
+	   }
+	  private GameObject _FaBaoInfoRoot;
+	  public GameObject FaBaoInfoRoot
+	   {
+	   get{
+	      if (_FaBaoInfoRoot == null)
+	       {
+	         _FaBaoInfoRoot  = GetUIUnit<GameObject>("FaBaoInfoRoot"); 
+	       }
+	      return _FaBaoInfoRoot;
+	     }
+	   }
+	  private RectTransform _SkillContent;
+	  public RectTransform SkillContent
+	   {
+	   get{
+	      if (_SkillContent == null)
+	       {
+	         _SkillContent  = GetUIUnit<RectTransform>("SkillContent"); 
+	       }
+	      return _SkillContent;
+	     }
+	   }
+	  private Text _Text_ItemDesc;
+	  public Text Text_ItemDesc
+	   {
+	   get{
+	      if (_Text_ItemDesc == null)
+	       {
+	         _Text_ItemDesc  = GetUIUnit<Text>("Text_ItemDesc"); 
+	       }
+	      return _Text_ItemDesc;
+	     }
+	   }
+	  private Text _Text_ShuXingJiaCheng;
+	  public Text Text_ShuXingJiaCheng
+	   {
+	   get{
+	      if (_Text_ShuXingJiaCheng == null)
+	       {
+	         _Text_ShuXingJiaCheng  = GetUIUnit<Text>("Text_ShuXingJiaCheng"); 
+	       }
+	      return _Text_ShuXingJiaCheng;
+	     }
+	   }
+	  private Text _Text_Desc;
+	  public Text Text_Desc
+	   {
+	   get{
+	      if (_Text_Desc == null)
+	       {
+	         _Text_Desc  = GetUIUnit<Text>("Text_Desc"); 
+	       }
+	      return _Text_Desc;
+	     }
+	   }
+	  private Button _Btn_Close;
+	  public Button Btn_Close
+	   {
+	   get{
+	      if (_Btn_Close == null)
+	       {
+	         _Btn_Close  = GetUIUnit<Button>("Btn_Close"); 
+	       }
+	      return _Btn_Close;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

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

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

+ 184 - 0
Assets/Scripts/GameUI/UI/ItemDetailsPanel/GongFaDetailsPanel.cs

@@ -0,0 +1,184 @@
+using System.Collections.Generic;
+using System.Linq;
+using Core.Language;
+using Excel2Json;
+using Fort23.Core;
+using Fort23.UTool;
+using GameLogic.Bag;
+using GameLogic.Hero;
+using UnityEngine;
+using UnityEngine.UI;
+using Utility;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "GongFaDetailsPanel")]
+    public partial class GongFaDetailsPanel : UIPanel
+    {
+        private SkillInfo _skillInfo;
+        private List<SkillConfig> configs;
+        List<GongFaUpgradeInfoWidget> _gongFaUpgradeInfoWidgets = new List<GongFaUpgradeInfoWidget>();
+
+        private List<SkillPowerupConfig> _skillPowerupConfigs;
+        private SkillConstant skillConstant;
+
+        List<ItemWidgetType1> _itemWidgetType1 = new List<ItemWidgetType1>();
+
+        List<EnergyWidget> _energyWidgets = new List<EnergyWidget>();
+
+        bool isUpStar = false;
+
+        bool isUpGrad = false;
+
+        private void Init()
+        {
+            isAddStack = false;
+            IsShowAppBar = false;
+            isPopUi = true;
+        }
+
+        protected override void AddEvent()
+        {
+        }
+
+        protected override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+            Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+        }
+
+        public async void CustomInit(ItemInfo itemInfo)
+        {
+            AccountFileInfo.SkillData skillData = new AccountFileInfo.SkillData();
+            skillData.id = itemInfo.config.associateVlaue[1];
+            skillData.star = 1;
+            skillData.level = 1;
+            skillData.useIndex = -1;
+            SkillInfo skillInfo = new SkillInfo(skillData);
+
+
+            Text_Desc.text = LanguageManager.Instance.Text(itemInfo.config.itemDesc);
+
+            foreach (var gongFaUpgradeInfoWidget in _gongFaUpgradeInfoWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(gongFaUpgradeInfoWidget);
+            }
+
+            _gongFaUpgradeInfoWidgets.Clear();
+            _skillInfo = skillInfo;
+            _skillPowerupConfigs = ConfigComponent.Instance.GetAll<SkillPowerupConfig>().ToList();
+            SkillConfig skillConfig = _skillInfo.skillConfig;
+            Icon_GongFaIcon.icon_name = skillConfig.icon;
+
+            Text_SkillCd.text = $"功法运作周期:{skillConfig.cd}转";
+
+            skillConstant = ConfigComponent.Instance.Get<SkillConstant>(1);
+
+
+            UpdateStarBtn();
+
+
+            Text_GongFaDesc.text = UtilTools.GetString(LanguageManager.Instance.Text(skillConfig.dec), _skillInfo.effectValue);
+            Text_GongFaName.text = LanguageManager.Instance.Text(skillConfig.name) + " Lv." + _skillInfo.SkillPowerupConfig.ID.ToString();
+
+            switch (skillConfig.attribute)
+            {
+                case 1:
+                    Icon_Attribute.icon_name = "dec_jin";
+                    break;
+                case 2:
+                    Icon_Attribute.icon_name = "dec_mu";
+                    break;
+                case 4:
+                    Icon_Attribute.icon_name = "dec_shui";
+                    break;
+                case 8:
+                    Icon_Attribute.icon_name = "dec_huo";
+                    break;
+                case 16:
+                    Icon_Attribute.icon_name = "dec_tu";
+                    break;
+            }
+
+            for (var i = 0; i < StarRoot.Count; i++)
+            {
+                MyImage icon = StarRoot[i] as MyImage;
+                if (i < skillInfo.skillConfig.level - 1)
+                {
+                    icon.gameObject.SetActive(true);
+                }
+                else
+                {
+                    icon.gameObject.SetActive(false);
+                }
+            }
+
+
+            List<SkillConfig> allSkillConfigs = ConfigComponent.Instance.GetAll<SkillConfig>().ToList();
+            configs = allSkillConfigs.Where(s => s.IDGroup == skillConfig.IDGroup).ToList();
+
+            for (var i = 0; i < configs.Count; i++)
+            {
+                if (configs[i].level == 1)
+                    continue;
+                SkillInfo skillInfo1 = new SkillInfo(configs[i].IDGroup, _skillInfo.SkillPowerupConfig.ID, configs[i].level);
+                GongFaUpgradeInfoWidget gongFaUpgradeInfoWidget = await UIManager.Instance.CreateGComponent<GongFaUpgradeInfoWidget>(null, Content);
+                gongFaUpgradeInfoWidget.CustomInit(_skillInfo, skillInfo1);
+                _gongFaUpgradeInfoWidgets.Add(gongFaUpgradeInfoWidget);
+            }
+        }
+
+        private async CTask UpdateStarBtn()
+        {
+            foreach (var itemWidgetType1 in _itemWidgetType1)
+            {
+                UIManager.Instance.DormancyGComponent(itemWidgetType1);
+            }
+
+            _itemWidgetType1.Clear();
+
+            foreach (var energyWidget in _energyWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(energyWidget);
+            }
+
+            _energyWidgets.Clear();
+        }
+
+        public async static CTask<GongFaDetailsPanel> Open(ItemInfo skillInfo)
+        {
+            GongFaDetailsPanel gongFaUpgradePanel = await UIManager.Instance.LoadAndOpenPanel<GongFaDetailsPanel>(null, UILayer.Top);
+            gongFaUpgradePanel.CustomInit(skillInfo);
+            return gongFaUpgradePanel;
+        }
+
+        public override void Close()
+        {
+            foreach (var gongFaUpgradeInfoWidget in _gongFaUpgradeInfoWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(gongFaUpgradeInfoWidget);
+            }
+
+            foreach (var itemWidgetType1 in _itemWidgetType1)
+            {
+                UIManager.Instance.DormancyGComponent(itemWidgetType1);
+            }
+
+            foreach (var energyWidget in _energyWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(energyWidget);
+            }
+
+            _energyWidgets.Clear();
+            _itemWidgetType1.Clear();
+            _gongFaUpgradeInfoWidgets.Clear();
+            isUpStar = false;
+            isUpGrad = false;
+            _skillInfo = null;
+            base.Close();
+        }
+    }
+}

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

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

+ 117 - 0
Assets/Scripts/GameUI/UI/ItemDetailsPanel/GongFaDetailsPanelData.cs

@@ -0,0 +1,117 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class GongFaDetailsPanel 
+	{
+	  #region 自定义数据 
+	  private MyImage _Icon_GongFaIcon;
+	  public MyImage Icon_GongFaIcon
+	   {
+	   get{
+	      if (_Icon_GongFaIcon == null)
+	       {
+	         _Icon_GongFaIcon  = GetUIUnit<MyImage>("Icon_GongFaIcon"); 
+	       }
+	      return _Icon_GongFaIcon;
+	     }
+	   }
+	  private List<MyImage> _StarRoot;
+	  public List<MyImage> StarRoot
+	   {
+	   get{
+	      if (_StarRoot == null)
+	       {
+	         _StarRoot  = GetUIUnit<List<MyImage>>("StarRoot"); 
+	       }
+	      return _StarRoot;
+	     }
+	   }
+	  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 Text _Text_SkillCd;
+	  public Text Text_SkillCd
+	   {
+	   get{
+	      if (_Text_SkillCd == null)
+	       {
+	         _Text_SkillCd  = GetUIUnit<Text>("Text_SkillCd"); 
+	       }
+	      return _Text_SkillCd;
+	     }
+	   }
+	  private MyImage _Icon_Attribute;
+	  public MyImage Icon_Attribute
+	   {
+	   get{
+	      if (_Icon_Attribute == null)
+	       {
+	         _Icon_Attribute  = GetUIUnit<MyImage>("Icon_Attribute"); 
+	       }
+	      return _Icon_Attribute;
+	     }
+	   }
+	  private Button _Btn_Close;
+	  public Button Btn_Close
+	   {
+	   get{
+	      if (_Btn_Close == null)
+	       {
+	         _Btn_Close  = GetUIUnit<Button>("Btn_Close"); 
+	       }
+	      return _Btn_Close;
+	     }
+	   }
+	  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/ItemDetailsPanel/GongFaDetailsPanelData.cs.meta

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

+ 18 - 3
Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItem.cs

@@ -3,6 +3,7 @@ using Core.Language;
 using Fort23.UTool;
 using GameLogic.Bag;
 using GameLogic.Equipment;
+using GameLogic.Hero;
 using UnityEngine;
 using Utility;
 
@@ -28,7 +29,23 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
-            Btn_WidgetItem.onClick.AddListener(() => { ItemDetailsPanel.OpenPanel(itemInfo); });
+            Btn_WidgetItem.onClick.AddListener(() =>
+            {
+                if (itemInfo.config.associateID == 3)
+                {
+       
+                    GongFaDetailsPanel.Open(itemInfo);
+                }
+                else if (itemInfo.config.associateID == 4)
+                {
+         
+                    FaBaoDetailsPanel.OpenPanel(itemInfo);
+                }
+                else
+                {
+                    ItemDetailsPanel.OpenPanel(itemInfo);
+                }
+            });
             base.AddButtonEvent();
         }
 
@@ -62,8 +79,6 @@ namespace Fort23.Mono
         public override void DormancyObj()
         {
             transform.RecoverColor();
-
-
             base.DormancyObj();
         }
     }

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


BIN
Excel2Json/Excel/Buff.xlsx


BIN
Excel2Json/Excel/ChouKa.xlsx


BIN
Excel2Json/Excel/EventConfig.xlsx


BIN
Excel2Json/Excel/FabaoConfig.xlsx


BIN
Excel2Json/Excel/HeroPowerUp.xlsx


BIN
Excel2Json/Excel/Item.xlsx


BIN
Excel2Json/Excel/Language.xlsx


BIN
Excel2Json/Excel/Sentiment.xlsx


BIN
Excel2Json/Excel/Shop.xlsx


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


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 630 - 157
UserSettings/Layouts/default-2022.dwlt


Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác