瀏覽代碼

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

# Conflicts:
#	Assets/Scripts/GameData/ExcelConfig/OpenBoxProgressReward.cs.meta   resolved by origin/master(远端) version
#	Assets/Scripts/GameData/ExcelConfig/OpenBoxScoreRule.cs.meta   resolved by origin/master(远端) version
#	Assets/StreamingAssets/assetConfig.txt   resolved by origin/master(远端) version
#	UserSettings/Layouts/default-2022.dwlt   resolved by origin/master(远端) version
李桃 4 天之前
父節點
當前提交
235860a036
共有 100 個文件被更改,包括 8553 次插入1861 次删除
  1. 10 0
      Assets/Res/Config/DaoyouModelConfig.json
  2. 42 3
      Assets/Res/Config/DropConfig.json
  3. 211 8
      Assets/Res/Config/DropGroupConfig.json
  4. 96 16
      Assets/Res/Config/DropItemConfig.json
  5. 123 1
      Assets/Res/Config/EventConfig.json
  6. 20 5
      Assets/Res/Config/EventLinkConfig.json
  7. 31 0
      Assets/Res/Config/InitialPlayerConfig.json
  8. 7 0
      Assets/Res/Config/InitialPlayerConfig.json.meta
  9. 22 14
      Assets/Res/Config/ItemConfig.json
  10. 238 2
      Assets/Res/Config/LanguageChineseConfig.json
  11. 31 11
      Assets/Res/Config/OpenBoxConfig.json
  12. 15 15
      Assets/Res/Config/OpenBoxProgressReward.json
  13. 10 10
      Assets/Res/Config/OpenBoxScoreRule.json
  14. 25 2
      Assets/Res/Config/ShopConfig.json
  15. 11 3
      Assets/Res/Config/ShopGroupConfig.json
  16. 184 0
      Assets/Res/Config/ShopItemConfig.json
  17. 30 30
      Assets/Res/Config/SkillConfig.json
  18. 16 16
      Assets/Res/Config/SmallPlacesConfig.json
  19. 437 96
      Assets/Res/UI/BoxPanel/BoxPanel.prefab
  20. 1 883
      Assets/Res/UI/BoxPanel/GachaPanel.prefab
  21. 2047 0
      Assets/Res/UI/BoxPanel/OpenBoxScorePanel.prefab
  22. 7 0
      Assets/Res/UI/BoxPanel/OpenBoxScorePanel.prefab.meta
  23. 691 0
      Assets/Res/UI/BoxPanel/SummonScoreAwardWidget.prefab
  24. 7 0
      Assets/Res/UI/BoxPanel/SummonScoreAwardWidget.prefab.meta
  25. 450 0
      Assets/Res/UI/BoxPanel/SummonScoreRuleWidget.prefab
  26. 7 0
      Assets/Res/UI/BoxPanel/SummonScoreRuleWidget.prefab.meta
  27. 2010 0
      Assets/Res/UI/ShopPanel/ShopBoxWidget.prefab
  28. 7 0
      Assets/Res/UI/ShopPanel/ShopBoxWidget.prefab.meta
  29. 94 4
      Assets/Res/UI/ShopPanel/ShopPanel.prefab
  30. 4 0
      Assets/Scenes/testCombat.scene
  31. 10 0
      Assets/Scripts/GameData/ExcelConfig/DaoyouModelConfig.cs
  32. 80 0
      Assets/Scripts/GameData/ExcelConfig/InitialPlayerConfig.cs
  33. 11 0
      Assets/Scripts/GameData/ExcelConfig/InitialPlayerConfig.cs.meta
  34. 2 2
      Assets/Scripts/GameData/ExcelConfig/OpenBoxConfig.cs
  35. 1 1
      Assets/Scripts/GameData/ExcelConfig/OpenBoxProgressReward.cs.meta
  36. 1 1
      Assets/Scripts/GameData/ExcelConfig/OpenBoxScoreRule.cs.meta
  37. 10 0
      Assets/Scripts/GameData/ExcelConfig/ShopConfig.cs
  38. 10 0
      Assets/Scripts/GameData/ExcelConfig/ShopGroupConfig.cs
  39. 1 1
      Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs
  40. 1 1
      Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs
  41. 1 1
      Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs
  42. 2 2
      Assets/Scripts/GameData/ExcelConfig/SmallPlacesConfig.cs
  43. 52 2
      Assets/Scripts/GameLogic/Bag/BagController.cs
  44. 5 21
      Assets/Scripts/GameLogic/Bag/ItemInfo.cs
  45. 3 1
      Assets/Scripts/GameLogic/Combat/CombatType/StartCombatInfo.cs
  46. 0 3
      Assets/Scripts/GameLogic/Equipment.meta
  47. 0 385
      Assets/Scripts/GameLogic/Equipment/EquipmentController.cs
  48. 0 3
      Assets/Scripts/GameLogic/Equipment/EquipmentController.cs.meta
  49. 0 89
      Assets/Scripts/GameLogic/Equipment/EquipmentInfo.cs
  50. 0 3
      Assets/Scripts/GameLogic/Equipment/EquipmentInfo.cs.meta
  51. 66 77
      Assets/Scripts/GameLogic/Player/AccountFileInfo.cs
  52. 50 36
      Assets/Scripts/GameLogic/Player/DropManager.cs
  53. 20 7
      Assets/Scripts/GameLogic/Player/PlayerManager.cs
  54. 162 11
      Assets/Scripts/GameLogic/Player/SummonManager.cs
  55. 2 1
      Assets/Scripts/GameUI/Combat/CombatDrive.cs
  56. 2 2
      Assets/Scripts/GameUI/EventManager/DialogueManager.cs
  57. 44 2
      Assets/Scripts/GameUI/EventManager/EventSystemManager.cs
  58. 9 8
      Assets/Scripts/GameUI/GameApplction.cs
  59. 106 12
      Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs
  60. 55 0
      Assets/Scripts/GameUI/UI/BoxPanel/BoxPanelData.cs
  61. 34 5
      Assets/Scripts/GameUI/UI/BoxPanel/GachaPanel.cs
  62. 0 34
      Assets/Scripts/GameUI/UI/BoxPanel/GachaPanelData.cs
  63. 158 0
      Assets/Scripts/GameUI/UI/BoxPanel/OpenBoxScorePanel.cs
  64. 11 0
      Assets/Scripts/GameUI/UI/BoxPanel/OpenBoxScorePanel.cs.meta
  65. 84 0
      Assets/Scripts/GameUI/UI/BoxPanel/OpenBoxScorePanelData.cs
  66. 11 0
      Assets/Scripts/GameUI/UI/BoxPanel/OpenBoxScorePanelData.cs.meta
  67. 62 0
      Assets/Scripts/GameUI/UI/BoxPanel/SummonScoreAwardWidget.cs
  68. 11 0
      Assets/Scripts/GameUI/UI/BoxPanel/SummonScoreAwardWidget.cs.meta
  69. 62 0
      Assets/Scripts/GameUI/UI/BoxPanel/SummonScoreAwardWidgetData.cs
  70. 11 0
      Assets/Scripts/GameUI/UI/BoxPanel/SummonScoreAwardWidgetData.cs.meta
  71. 38 0
      Assets/Scripts/GameUI/UI/BoxPanel/SummonScoreRuleWidget.cs
  72. 11 0
      Assets/Scripts/GameUI/UI/BoxPanel/SummonScoreRuleWidget.cs.meta
  73. 62 0
      Assets/Scripts/GameUI/UI/BoxPanel/SummonScoreRuleWidgetData.cs
  74. 11 0
      Assets/Scripts/GameUI/UI/BoxPanel/SummonScoreRuleWidgetData.cs.meta
  75. 1 0
      Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanel.cs
  76. 1 0
      Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouWidget.cs
  77. 2 2
      Assets/Scripts/GameUI/UI/DivineSence/BossInfoPanel.cs
  78. 4 4
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs
  79. 2 2
      Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesInfoPanel.cs
  80. 5 5
      Assets/Scripts/GameUI/UI/MainHeroPnael/MainHeroPanel.cs
  81. 3 2
      Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs
  82. 0 6
      Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItem.cs
  83. 215 0
      Assets/Scripts/GameUI/UI/ShopPanel/ShopBoxWidget.cs
  84. 11 0
      Assets/Scripts/GameUI/UI/ShopPanel/ShopBoxWidget.cs.meta
  85. 117 0
      Assets/Scripts/GameUI/UI/ShopPanel/ShopBoxWidgetData.cs
  86. 11 0
      Assets/Scripts/GameUI/UI/ShopPanel/ShopBoxWidgetData.cs.meta
  87. 3 3
      Assets/Scripts/GameUI/UI/ShopPanel/ShopGroupWidgetType1.cs
  88. 21 6
      Assets/Scripts/GameUI/UI/ShopPanel/ShopPanel.cs
  89. 1 1
      Assets/Scripts/GameUI/UI/TowerPanel/TowerPanel.cs
  90. 0 0
      Assets/StreamingAssets/assetConfig.txt
  91. 二進制
      Excel2Json/Excel/ChouKa.xlsx
  92. 二進制
      Excel2Json/Excel/DaoyouConfig.xlsx
  93. 二進制
      Excel2Json/Excel/EventConfig.xlsx
  94. 二進制
      Excel2Json/Excel/InitialPlayer.xlsx
  95. 二進制
      Excel2Json/Excel/Item.xlsx
  96. 二進制
      Excel2Json/Excel/Language.xlsx
  97. 二進制
      Excel2Json/Excel/Maps.xlsx
  98. 二進制
      Excel2Json/Excel/OpenBox.xlsx
  99. 二進制
      Excel2Json/Excel/Shop.xlsx
  100. 二進制
      Excel2Json/Excel/skill.xlsx

+ 10 - 0
Assets/Res/Config/DaoyouModelConfig.json

@@ -34,6 +34,7 @@
         1
       ],
       "EmotionLvforQuest": 2,
+      "EventCompleteforQuest": 1,
       "QuestID": 9003,
       "EmotionLvforspecialGift": [
         3
@@ -79,6 +80,7 @@
         2
       ],
       "EmotionLvforQuest": 2,
+      "EventCompleteforQuest": 1,
       "QuestID": 9002,
       "EmotionLvforspecialGift": [
         4
@@ -124,6 +126,7 @@
         3
       ],
       "EmotionLvforQuest": 2,
+      "EventCompleteforQuest": 1,
       "QuestID": 9001,
       "EmotionLvforspecialGift": [
         5
@@ -169,6 +172,7 @@
         4
       ],
       "EmotionLvforQuest": 3,
+      "EventCompleteforQuest": 1,
       "QuestID": 9002,
       "EmotionLvforspecialGift": [
         4
@@ -214,6 +218,7 @@
         5
       ],
       "EmotionLvforQuest": 3,
+      "EventCompleteforQuest": 1,
       "QuestID": 9001,
       "EmotionLvforspecialGift": [
         5
@@ -259,6 +264,7 @@
         6
       ],
       "EmotionLvforQuest": 3,
+      "EventCompleteforQuest": 1,
       "QuestID": 9002,
       "EmotionLvforspecialGift": [
         6
@@ -304,6 +310,7 @@
         7
       ],
       "EmotionLvforQuest": 4,
+      "EventCompleteforQuest": 1,
       "QuestID": 9001,
       "EmotionLvforspecialGift": [
         5
@@ -349,6 +356,7 @@
         8
       ],
       "EmotionLvforQuest": 4,
+      "EventCompleteforQuest": 1,
       "QuestID": 9002,
       "EmotionLvforspecialGift": [
         6
@@ -394,6 +402,7 @@
         1
       ],
       "EmotionLvforQuest": 5,
+      "EventCompleteforQuest": 1,
       "QuestID": 9001,
       "EmotionLvforspecialGift": [
         7
@@ -439,6 +448,7 @@
         2
       ],
       "EmotionLvforQuest": 6,
+      "EventCompleteforQuest": 1,
       "QuestID": 9002,
       "EmotionLvforspecialGift": [
         8

+ 42 - 3
Assets/Res/Config/DropConfig.json

@@ -1450,9 +1450,7 @@
         8,
         9,
         10,
-        11,
-        12,
-        13
+        11
       ],
       "dropType": 2,
       "showItemId": [
@@ -1485,14 +1483,55 @@
     },
     {
       "ID": 999007,
+      "dropGroupID": [
+        20,
+        21,
+        22,
+        23,
+        24,
+        25,
+        26,
+        27,
+        28
+      ],
       "dropType": 2
     },
     {
       "ID": 999008,
+      "dropGroupID": [
+        29,
+        30,
+        31,
+        32,
+        33,
+        34,
+        35,
+        36,
+        37,
+        38,
+        39
+      ],
       "dropType": 2
     },
     {
       "ID": 999009,
+      "dropGroupID": [
+        40,
+        41,
+        42,
+        43,
+        44
+      ],
+      "dropType": 2
+    },
+    {
+      "ID": 999010,
+      "dropGroupID": [
+        45,
+        46,
+        47,
+        48
+      ],
       "dropType": 2
     }
   ]

+ 211 - 8
Assets/Res/Config/DropGroupConfig.json

@@ -51,42 +51,42 @@
     },
     {
       "ID": 8,
-      "dropRate": 907,
+      "dropRate": 946,
       "dropItemID": [
         8
       ]
     },
     {
       "ID": 9,
-      "dropRate": 60,
+      "dropRate": 36,
       "dropItemID": [
         9
       ]
     },
     {
       "ID": 10,
-      "dropRate": 20,
+      "dropRate": 12,
       "dropItemID": [
         10
       ]
     },
     {
       "ID": 11,
-      "dropRate": 10,
+      "dropRate": 6,
       "dropItemID": [
         11
       ]
     },
     {
       "ID": 12,
-      "dropRate": 2,
+      "dropRate": 0,
       "dropItemID": [
         12
       ]
     },
     {
       "ID": 13,
-      "dropRate": 1,
+      "dropRate": 0,
       "dropItemID": [
         13
       ]
@@ -121,17 +121,220 @@
     },
     {
       "ID": 18,
-      "dropRate": 920,
+      "dropRate": 900,
       "dropItemID": [
         12
       ]
     },
     {
       "ID": 19,
-      "dropRate": 80,
+      "dropRate": 100,
       "dropItemID": [
         13
       ]
+    },
+    {
+      "ID": 20,
+      "dropRate": 1110,
+      "dropItemID": [
+        19
+      ]
+    },
+    {
+      "ID": 21,
+      "dropRate": 370,
+      "dropItemID": [
+        20
+      ]
+    },
+    {
+      "ID": 22,
+      "dropRate": 111,
+      "dropItemID": [
+        21
+      ]
+    },
+    {
+      "ID": 23,
+      "dropRate": 1110,
+      "dropItemID": [
+        22
+      ]
+    },
+    {
+      "ID": 24,
+      "dropRate": 370,
+      "dropItemID": [
+        23
+      ]
+    },
+    {
+      "ID": 25,
+      "dropRate": 111,
+      "dropItemID": [
+        24
+      ]
+    },
+    {
+      "ID": 26,
+      "dropRate": 618,
+      "dropItemID": [
+        14
+      ]
+    },
+    {
+      "ID": 27,
+      "dropRate": 100,
+      "dropItemID": [
+        15
+      ]
+    },
+    {
+      "ID": 28,
+      "dropRate": 100,
+      "dropItemID": [
+        17
+      ]
+    },
+    {
+      "ID": 29,
+      "dropRate": 1110,
+      "dropItemID": [
+        19
+      ]
+    },
+    {
+      "ID": 30,
+      "dropRate": 370,
+      "dropItemID": [
+        20
+      ]
+    },
+    {
+      "ID": 31,
+      "dropRate": 111,
+      "dropItemID": [
+        21
+      ]
+    },
+    {
+      "ID": 32,
+      "dropRate": 1110,
+      "dropItemID": [
+        22
+      ]
+    },
+    {
+      "ID": 33,
+      "dropRate": 370,
+      "dropItemID": [
+        23
+      ]
+    },
+    {
+      "ID": 34,
+      "dropRate": 111,
+      "dropItemID": [
+        24
+      ]
+    },
+    {
+      "ID": 35,
+      "dropRate": 30,
+      "dropItemID": [
+        14
+      ]
+    },
+    {
+      "ID": 36,
+      "dropRate": 184,
+      "dropItemID": [
+        15
+      ]
+    },
+    {
+      "ID": 37,
+      "dropRate": 210,
+      "dropItemID": [
+        16
+      ]
+    },
+    {
+      "ID": 38,
+      "dropRate": 184,
+      "dropItemID": [
+        17
+      ]
+    },
+    {
+      "ID": 39,
+      "dropRate": 210,
+      "dropItemID": [
+        18
+      ]
+    },
+    {
+      "ID": 40,
+      "dropRate": 3212,
+      "dropItemID": [
+        14
+      ]
+    },
+    {
+      "ID": 41,
+      "dropRate": 184,
+      "dropItemID": [
+        15
+      ]
+    },
+    {
+      "ID": 42,
+      "dropRate": 210,
+      "dropItemID": [
+        16
+      ]
+    },
+    {
+      "ID": 43,
+      "dropRate": 184,
+      "dropItemID": [
+        17
+      ]
+    },
+    {
+      "ID": 44,
+      "dropRate": 210,
+      "dropItemID": [
+        18
+      ]
+    },
+    {
+      "ID": 45,
+      "dropRate": 1000,
+      "dropItemID": [
+        15
+      ]
+    },
+    {
+      "ID": 46,
+      "dropRate": 1000,
+      "dropItemID": [
+        16
+      ]
+    },
+    {
+      "ID": 47,
+      "dropRate": 1000,
+      "dropItemID": [
+        17
+      ]
+    },
+    {
+      "ID": 48,
+      "dropRate": 1000,
+      "dropItemID": [
+        18
+      ]
     }
   ]
 }

+ 96 - 16
Assets/Res/Config/DropItemConfig.json

@@ -105,6 +105,66 @@
     {
       "ID": 8,
       "dropItemType": 1,
+      "itemID": [
+        1101
+      ],
+      "dropMinV": 1,
+      "dropMaxV": 1,
+      "dropCountGoupID": -1
+    },
+    {
+      "ID": 9,
+      "dropItemType": 1,
+      "itemID": [
+        1102
+      ],
+      "dropMinV": 1,
+      "dropMaxV": 1,
+      "dropCountGoupID": -1
+    },
+    {
+      "ID": 10,
+      "dropItemType": 1,
+      "itemID": [
+        1103
+      ],
+      "dropMinV": 1,
+      "dropMaxV": 1,
+      "dropCountGoupID": -1
+    },
+    {
+      "ID": 11,
+      "dropItemType": 1,
+      "itemID": [
+        1104
+      ],
+      "dropMinV": 1,
+      "dropMaxV": 1,
+      "dropCountGoupID": -1
+    },
+    {
+      "ID": 12,
+      "dropItemType": 1,
+      "itemID": [
+        1105
+      ],
+      "dropMinV": 1,
+      "dropMaxV": 1,
+      "dropCountGoupID": -1
+    },
+    {
+      "ID": 13,
+      "dropItemType": 1,
+      "itemID": [
+        1106
+      ],
+      "dropMinV": 1,
+      "dropMaxV": 1,
+      "dropCountGoupID": -1
+    },
+    {
+      "ID": 14,
+      "dropItemType": 1,
       "itemID": [
         12005,
         12010,
@@ -122,7 +182,7 @@
       "dropCountGoupID": -1
     },
     {
-      "ID": 9,
+      "ID": 15,
       "dropItemType": 1,
       "itemID": [
         12004,
@@ -141,7 +201,7 @@
       "dropCountGoupID": -1
     },
     {
-      "ID": 10,
+      "ID": 16,
       "dropItemType": 1,
       "itemID": [
         12001,
@@ -174,7 +234,7 @@
       "dropCountGoupID": -1
     },
     {
-      "ID": 11,
+      "ID": 17,
       "dropItemType": 1,
       "itemID": [
         10001,
@@ -188,7 +248,7 @@
       "dropCountGoupID": -1
     },
     {
-      "ID": 12,
+      "ID": 18,
       "dropItemType": 1,
       "itemID": [
         10002,
@@ -203,43 +263,63 @@
       "dropCountGoupID": -1
     },
     {
-      "ID": 13,
+      "ID": 19,
       "dropItemType": 1,
       "itemID": [
         1005
       ],
-      "dropMinV": -1000,
-      "dropMaxV": -1000,
+      "dropMinV": 100,
+      "dropMaxV": 100,
       "dropCountGoupID": -1
     },
     {
-      "ID": 14,
+      "ID": 20,
       "dropItemType": 1,
       "itemID": [
         1005
       ],
-      "dropMinV": -2000,
-      "dropMaxV": -2000,
+      "dropMinV": 300,
+      "dropMaxV": 300,
       "dropCountGoupID": -1
     },
     {
-      "ID": 15,
+      "ID": 21,
+      "dropItemType": 1,
+      "itemID": [
+        1005
+      ],
+      "dropMinV": 1000,
+      "dropMaxV": 1000,
+      "dropCountGoupID": -1
+    },
+    {
+      "ID": 22,
       "dropItemType": 1,
       "itemID": [
         1006
       ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
+      "dropMinV": 100,
+      "dropMaxV": 100,
       "dropCountGoupID": -1
     },
     {
-      "ID": 16,
+      "ID": 23,
       "dropItemType": 1,
       "itemID": [
         1006
       ],
-      "dropMinV": 1,
-      "dropMaxV": 1,
+      "dropMinV": 300,
+      "dropMaxV": 300,
+      "dropCountGoupID": -1
+    },
+    {
+      "ID": 24,
+      "dropItemType": 1,
+      "itemID": [
+        1006
+      ],
+      "dropMinV": 1000,
+      "dropMaxV": 1000,
       "dropCountGoupID": -1
     }
   ]

+ 123 - 1
Assets/Res/Config/EventConfig.json

@@ -11,7 +11,7 @@
         100,
         102
       ],
-      "EventTriggerType": 1,
+      "EventTriggerType": 99,
       "EventTag": 7,
       "EventType": 1,
       "Score": 0,
@@ -949,6 +949,127 @@
       "EventName": 4027,
       "Description": 4102
     },
+    {
+      "ID": 11,
+      "EventLinksId": [
+        1101,
+        1102,
+        1103,
+        100,
+        102
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 3,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1003
+      ],
+      "PrizeNums": [
+        -5
+      ],
+      "RefreshProbability": 500,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 0,
+      "Description": 0
+    },
+    {
+      "ID": 12,
+      "EventLinksId": [
+        1201,
+        1202,
+        1203,
+        100,
+        102
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 3,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1005
+      ],
+      "PrizeNums": [
+        -5
+      ],
+      "RefreshProbability": 500,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 0,
+      "Description": 0
+    },
+    {
+      "ID": 13,
+      "EventLinksId": [
+        1301,
+        1302,
+        1303,
+        1304,
+        100,
+        102
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 3,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1006
+      ],
+      "PrizeNums": [
+        -5
+      ],
+      "RefreshProbability": 500,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 0,
+      "Description": 0
+    },
+    {
+      "ID": 14,
+      "EventLinksId": [
+        1401,
+        1402,
+        1403,
+        100,
+        102
+      ],
+      "EventTriggerType": 1,
+      "EventTag": 3,
+      "EventType": 1,
+      "Score": 0,
+      "EventQuality": 1,
+      "PrizeIDs": [
+        1001
+      ],
+      "PrizeNums": [
+        -5
+      ],
+      "RefreshProbability": 500,
+      "RefreshCount": 0,
+      "placeID": 0,
+      "SmallPlacesId": 0,
+      "XiantuID": 0,
+      "EventConditionId": 0,
+      "EventCount": 0,
+      "EventName": 0,
+      "Description": 0
+    },
     {
       "ID": 10001,
       "EventLinksId": [
@@ -4285,6 +4406,7 @@
         605503,
         605504,
         605505,
+        605506,
         102
       ],
       "EventTriggerType": 7,

+ 20 - 5
Assets/Res/Config/EventLinkConfig.json

@@ -55,7 +55,7 @@
       "LanID": [
         5004
       ],
-      "DialogueType": 0,
+      "DialogueType": 2,
       "EventID": 1,
       "optionType": 1,
       "optionPara1": [
@@ -78,7 +78,7 @@
       "LanID": [
         5007
       ],
-      "DialogueType": 0,
+      "DialogueType": 2,
       "EventID": 1,
       "optionType": 2,
       "optionPara1": [
@@ -100,7 +100,7 @@
       "LanID": [
         5008
       ],
-      "DialogueType": 0,
+      "DialogueType": 2,
       "EventID": 1,
       "optionType": 1,
       "optionPara1": [
@@ -121,7 +121,7 @@
       "LanID": [
         5009
       ],
-      "DialogueType": 0,
+      "DialogueType": 2,
       "EventID": 1,
       "optionType": 3,
       "PrizeIDs": [
@@ -142,7 +142,7 @@
       "LanID": [
         5010
       ],
-      "DialogueType": 0,
+      "DialogueType": 2,
       "EventID": 1,
       "optionType": 3,
       "PrizeIDs": [
@@ -14143,6 +14143,21 @@
         605506,
         101
       ]
+    },
+    {
+      "ID": 605506,
+      "conciseEventMessage": 6020,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "LanID": [
+        6021
+      ],
+      "DialogueType": 0,
+      "EventID": 6055,
+      "optionType": 0,
+      "ResultType": 0
     }
   ]
 }

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

@@ -0,0 +1,31 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "itemId": [
+        1001,
+        1002,
+        1003,
+        1004,
+        1005,
+        1007
+      ],
+      "itemAmount": [
+        10,
+        10,
+        10,
+        10,
+        10,
+        100000
+      ],
+      "fabaoId": [
+        10002
+      ],
+      "gongfaId": [
+        1405,
+        1501
+      ],
+      "shenshiPoint": 100
+    }
+  ]
+}

+ 7 - 0
Assets/Res/Config/InitialPlayerConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: C3Ie4yv7ASnRd3uMbvxeZuDKvRXyLLnXTyFeDIqMWAs7BOEsqsS3Y1qnGIBo
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 22 - 14
Assets/Res/Config/ItemConfig.json

@@ -4841,8 +4841,8 @@
     },
     {
       "ID": 23001,
-      "itemName": 0,
-      "itemDesc": 0,
+      "itemName": 10098,
+      "itemDesc": 10102,
       "icon": "icon_item_23001",
       "itemTag": 24,
       "quality": 4,
@@ -4866,8 +4866,8 @@
     },
     {
       "ID": 23002,
-      "itemName": 0,
-      "itemDesc": 0,
+      "itemName": 10099,
+      "itemDesc": 10103,
       "icon": "icon_item_23002",
       "itemTag": 24,
       "quality": 5,
@@ -4890,10 +4890,10 @@
       "itemDesc2": 0
     },
     {
-      "ID": 23003,
-      "itemName": 0,
-      "itemDesc": 0,
-      "icon": "icon_item_23003",
+      "ID": 23101,
+      "itemName": 10100,
+      "itemDesc": 10104,
+      "icon": "icon_item_23101",
       "itemTag": 24,
       "quality": 4,
       "stack": 0,
@@ -4910,15 +4910,19 @@
         0
       ],
       "stack_1": 0,
-      "associateID": 0,
+      "associateID": 10,
+      "associateVlaue": [
+        18,
+        23001
+      ],
       "sort": 0,
       "itemDesc2": 0
     },
     {
-      "ID": 23004,
-      "itemName": 0,
-      "itemDesc": 0,
-      "icon": "icon_item_23004",
+      "ID": 23102,
+      "itemName": 10101,
+      "itemDesc": 10105,
+      "icon": "icon_item_23102",
       "itemTag": 24,
       "quality": 5,
       "stack": 0,
@@ -4935,7 +4939,11 @@
         0
       ],
       "stack_1": 0,
-      "associateID": 0,
+      "associateID": 10,
+      "associateVlaue": [
+        30,
+        23002
+      ],
       "sort": 0,
       "itemDesc2": 0
     }

+ 238 - 2
Assets/Res/Config/LanguageChineseConfig.json

@@ -2790,7 +2790,7 @@
     },
     {
       "ID": 698,
-      "txt": "玄黄道 "
+      "txt": "玄黄道"
     },
     {
       "ID": 699,
@@ -2802,7 +2802,7 @@
     },
     {
       "ID": 701,
-      "txt": "每次使用功法时在当前位置留下一道属性印记,下一个放上来的功法如果和以前功法相生则功法效果提升{0}%,每次使用功法时都会治疗对应相生属性的{1}伤势。(均衡性功法搭配,转盘改变,变为金、水、木、火、土)\n"
+      "txt": "每次使用功法时在当前位置留下一道属性印记,下一个放上来的功法如果和以前功法相生则功法效果提升{0}%,每次使用功法时都会治疗对应相生属性的{1}伤势。(均衡性功法搭配,转盘改变,变为金、水、木、火、土)"
     },
     {
       "ID": 702,
@@ -37227,6 +37227,242 @@
     {
       "ID": 10047,
       "txt": "使用神识"
+    },
+    {
+      "ID": 10048,
+      "txt": "100次招募必定获得紫色功法和法宝"
+    },
+    {
+      "ID": 10049,
+      "txt": "看广告=氪金!\n免费畅玩所有氪金内容!"
+    },
+    {
+      "ID": 10050,
+      "txt": "妖王丹十连"
+    },
+    {
+      "ID": 10051,
+      "txt": "单抽"
+    },
+    {
+      "ID": 10052,
+      "txt": "十连"
+    },
+    {
+      "ID": 10053,
+      "txt": "免费"
+    },
+    {
+      "ID": 10054,
+      "txt": "{0}后免费"
+    },
+    {
+      "ID": 10055,
+      "txt": "每10次保底出紫色档妖王丹"
+    },
+    {
+      "ID": 10056,
+      "txt": "每100次保底出橙色档妖王丹"
+    },
+    {
+      "ID": 10057,
+      "txt": "领取"
+    },
+    {
+      "ID": 10058,
+      "txt": "多倍领取"
+    },
+    {
+      "ID": 10059,
+      "txt": "恭喜获得"
+    },
+    {
+      "ID": 10060,
+      "txt": "总计:"
+    },
+    {
+      "ID": 10061,
+      "txt": "领取2~4倍翻倍奖励"
+    },
+    {
+      "ID": 10062,
+      "txt": "已获得{0}倍奖励"
+    },
+    {
+      "ID": 10063,
+      "txt": "{0}后免费"
+    },
+    {
+      "ID": 10064,
+      "txt": "免费充值"
+    },
+    {
+      "ID": 10065,
+      "txt": "还未到免费时间!请稍后再试"
+    },
+    {
+      "ID": 10066,
+      "txt": "挑战200抽领免广告卡"
+    },
+    {
+      "ID": 10067,
+      "txt": "妖丹不足,为你跳转到兑换界面,确定么?"
+    },
+    {
+      "ID": 10068,
+      "txt": "已垫{0}抽"
+    },
+    {
+      "ID": 10069,
+      "txt": "领取2~4倍翻倍奖励"
+    },
+    {
+      "ID": 10070,
+      "txt": "多倍领取"
+    },
+    {
+      "ID": 10071,
+      "txt": "十连出蓝"
+    },
+    {
+      "ID": 10072,
+      "txt": "十连出紫"
+    },
+    {
+      "ID": 10073,
+      "txt": "连续出紫"
+    },
+    {
+      "ID": 10074,
+      "txt": "十连双紫"
+    },
+    {
+      "ID": 10075,
+      "txt": "十连三紫"
+    },
+    {
+      "ID": 10076,
+      "txt": "十连四紫"
+    },
+    {
+      "ID": 10077,
+      "txt": "十连出橙"
+    },
+    {
+      "ID": 10078,
+      "txt": "连续出橙"
+    },
+    {
+      "ID": 10079,
+      "txt": "十连双橙"
+    },
+    {
+      "ID": 10080,
+      "txt": "连续双橙"
+    },
+    {
+      "ID": 10081,
+      "txt": "200抽挑战!"
+    },
+    {
+      "ID": 10082,
+      "txt": "积分规则:"
+    },
+    {
+      "ID": 10083,
+      "txt": "积分奖励"
+    },
+    {
+      "ID": 10084,
+      "txt": "完成次数"
+    },
+    {
+      "ID": 10085,
+      "txt": "积分小计"
+    },
+    {
+      "ID": 10086,
+      "txt": "总积分奖励"
+    },
+    {
+      "ID": 10087,
+      "txt": "积分达到{0}分"
+    },
+    {
+      "ID": 10088,
+      "txt": "开启挑战!"
+    },
+    {
+      "ID": 10089,
+      "txt": "历史最高分:"
+    },
+    {
+      "ID": 10090,
+      "txt": "200抽挑战进行中…"
+    },
+    {
+      "ID": 10091,
+      "txt": "目前进度:"
+    },
+    {
+      "ID": 10092,
+      "txt": "目前得分:"
+    },
+    {
+      "ID": 10093,
+      "txt": "当前奖励"
+    },
+    {
+      "ID": 10094,
+      "txt": "当前处于200抽挑战中,单抽无法使用"
+    },
+    {
+      "ID": 10095,
+      "txt": "200抽挑战已完成"
+    },
+    {
+      "ID": 10096,
+      "txt": "点击领取"
+    },
+    {
+      "ID": 10097,
+      "txt": "概率规则一览\n橙色功法法宝----------5%\n紫色功法法宝----------20%\n蓝色功法法宝----------75%\n30个功法法宝经验丹---5%\n5个功法法宝经验丹----15%\n1个功法法宝经验丹----50%\n十连必出一个功法或法宝\n10次十连必出一个紫色功法或法宝"
+    },
+    {
+      "ID": 10098,
+      "txt": "免双倍广告卡"
+    },
+    {
+      "ID": 10099,
+      "txt": "免所有广告卡"
+    },
+    {
+      "ID": 10100,
+      "txt": "免双倍广告卡碎片"
+    },
+    {
+      "ID": 10101,
+      "txt": "免所有广告卡碎片"
+    },
+    {
+      "ID": 10102,
+      "txt": "永久免去资源翻倍类广告!"
+    },
+    {
+      "ID": 10103,
+      "txt": "永久免去所有广告!"
+    },
+    {
+      "ID": 10104,
+      "txt": "集齐18枚碎片可兑换免双倍广告卡"
+    },
+    {
+      "ID": 10105,
+      "txt": "集齐30枚碎片可兑换免所有广告卡"
+    },
+    {
+      "ID": 10106,
+      "txt": "礼包"
     }
   ]
 }

+ 31 - 11
Assets/Res/Config/OpenBoxConfig.json

@@ -5,23 +5,33 @@
       "CostItemID": 1007,
       "oneConsume": 1,
       "oneConsumeFreePara": [
-        300,
-        10
+        60,
+        5000
       ],
       "oneConsumeChargePara": [
         0,
-        5000
+        0
       ],
       "tenConsume": 1,
       "oneConsumeFreePara_1": [
-        0,
-        1
+        28800,
+        4
       ],
       "oneConsumeChargePara_1": [
         0,
         5000
       ],
-      "reward": 999004,
+      "reward": [
+        999004,
+        999004,
+        999004,
+        999004,
+        999004,
+        999004,
+        999004,
+        999004,
+        999004
+      ],
       "reward1": 999005,
       "reward2": 999006,
       "reward2para1": 100,
@@ -43,7 +53,7 @@
       "oneConsume": 300,
       "oneConsumeFreePara": [
         0,
-        1
+        0
       ],
       "oneConsumeChargePara": [
         0,
@@ -58,11 +68,21 @@
         0,
         5000
       ],
-      "reward": 999007,
-      "reward1": 999008,
-      "reward2": 999009,
+      "reward": [
+        999007,
+        999007,
+        999007,
+        999007,
+        999007,
+        999007,
+        999007,
+        999007,
+        999008
+      ],
+      "reward1": 999009,
+      "reward2": 999010,
       "reward2para1": 100,
-      "ProgressRewardChoukaCount": 300,
+      "ProgressRewardChoukaCount": 200,
       "betPara1": [
         2.0,
         3.0,

+ 15 - 15
Assets/Res/Config/OpenBoxProgressReward.json

@@ -3,9 +3,9 @@
     {
       "ID": 1,
       "OpenboxID": 2,
-      "TotalScore": 30,
+      "TotalScore": 20,
       "PrizeID": [
-        23001,
+        23101,
         1701
       ],
       "PrizeCount": [
@@ -16,9 +16,9 @@
     {
       "ID": 2,
       "OpenboxID": 2,
-      "TotalScore": 40,
+      "TotalScore": 30,
       "PrizeID": [
-        23003,
+        23001,
         1701
       ],
       "PrizeCount": [
@@ -29,9 +29,9 @@
     {
       "ID": 3,
       "OpenboxID": 2,
-      "TotalScore": 50,
+      "TotalScore": 40,
       "PrizeID": [
-        23003,
+        23101,
         1702
       ],
       "PrizeCount": [
@@ -42,9 +42,9 @@
     {
       "ID": 4,
       "OpenboxID": 2,
-      "TotalScore": 60,
+      "TotalScore": 50,
       "PrizeID": [
-        23003,
+        23101,
         1702
       ],
       "PrizeCount": [
@@ -55,9 +55,9 @@
     {
       "ID": 5,
       "OpenboxID": 2,
-      "TotalScore": 70,
+      "TotalScore": 60,
       "PrizeID": [
-        23004,
+        23102,
         1702
       ],
       "PrizeCount": [
@@ -68,9 +68,9 @@
     {
       "ID": 6,
       "OpenboxID": 2,
-      "TotalScore": 80,
+      "TotalScore": 70,
       "PrizeID": [
-        23004,
+        23102,
         1702
       ],
       "PrizeCount": [
@@ -81,9 +81,9 @@
     {
       "ID": 7,
       "OpenboxID": 2,
-      "TotalScore": 90,
+      "TotalScore": 80,
       "PrizeID": [
-        23004,
+        23102,
         1702
       ],
       "PrizeCount": [
@@ -94,7 +94,7 @@
     {
       "ID": 8,
       "OpenboxID": 2,
-      "TotalScore": 100,
+      "TotalScore": 90,
       "PrizeID": [
         23001,
         1703

+ 10 - 10
Assets/Res/Config/OpenBoxScoreRule.json

@@ -13,7 +13,7 @@
         13,
         14
       ],
-      "lanID": 0,
+      "lanID": 10071,
       "score": 1
     },
     {
@@ -29,7 +29,7 @@
         13,
         14
       ],
-      "lanID": 0,
+      "lanID": 10072,
       "score": 2
     },
     {
@@ -45,7 +45,7 @@
         13,
         14
       ],
-      "lanID": 0,
+      "lanID": 10073,
       "score": 5
     },
     {
@@ -61,7 +61,7 @@
         13,
         14
       ],
-      "lanID": 0,
+      "lanID": 10074,
       "score": 10
     },
     {
@@ -77,7 +77,7 @@
         13,
         14
       ],
-      "lanID": 0,
+      "lanID": 10075,
       "score": 25
     },
     {
@@ -93,7 +93,7 @@
         13,
         14
       ],
-      "lanID": 0,
+      "lanID": 10076,
       "score": 50
     },
     {
@@ -109,7 +109,7 @@
         13,
         14
       ],
-      "lanID": 0,
+      "lanID": 10077,
       "score": 4
     },
     {
@@ -125,7 +125,7 @@
         13,
         14
       ],
-      "lanID": 0,
+      "lanID": 10078,
       "score": 12
     },
     {
@@ -141,7 +141,7 @@
         13,
         14
       ],
-      "lanID": 0,
+      "lanID": 10079,
       "score": 20
     },
     {
@@ -157,7 +157,7 @@
         13,
         14
       ],
-      "lanID": 0,
+      "lanID": 10080,
       "score": 40
     }
   ]

+ 25 - 2
Assets/Res/Config/ShopConfig.json

@@ -2,6 +2,7 @@
   "configList": [
     {
       "ID": 1,
+      "shopName": 1900,
       "shopGroup": 1,
       "shopItemGroup": 1,
       "pageSortNum": 1,
@@ -11,21 +12,43 @@
     },
     {
       "ID": 2,
+      "shopName": 1904,
       "shopGroup": 2,
       "shopItemGroup": 2,
-      "pageSortNum": 2,
+      "pageSortNum": 1,
       "RefreshType": 1,
       "refreshCostItemId": -1,
       "refreshLimit": -1
     },
     {
       "ID": 3,
+      "shopName": 1905,
       "shopGroup": 3,
       "shopItemGroup": 3,
-      "pageSortNum": 3,
+      "pageSortNum": 1,
       "RefreshType": 1,
       "refreshCostItemId": -1,
       "refreshLimit": -1
+    },
+    {
+      "ID": 4,
+      "shopName": -1,
+      "shopGroup": 4,
+      "shopItemGroup": 4,
+      "pageSortNum": 1,
+      "RefreshType": 0,
+      "refreshCostItemId": -1,
+      "refreshLimit": -1
+    },
+    {
+      "ID": 5,
+      "shopName": 10106,
+      "shopGroup": 4,
+      "shopItemGroup": 5,
+      "pageSortNum": 2,
+      "RefreshType": 2,
+      "refreshCostItemId": -1,
+      "refreshLimit": -1
     }
   ]
 }

+ 11 - 3
Assets/Res/Config/ShopGroupConfig.json

@@ -2,15 +2,23 @@
   "configList": [
     {
       "ID": 1,
-      "shopName": 1900
+      "shopName": 1900,
+      "pageSortNum": 2
     },
     {
       "ID": 2,
-      "shopName": 1904
+      "shopName": 1904,
+      "pageSortNum": 3
     },
     {
       "ID": 3,
-      "shopName": 1905
+      "shopName": 1905,
+      "pageSortNum": 4
+    },
+    {
+      "ID": 4,
+      "shopName": 10106,
+      "pageSortNum": 1
     }
   ]
 }

+ 184 - 0
Assets/Res/Config/ShopItemConfig.json

@@ -1540,6 +1540,190 @@
       "shopShowTemplateParm": [
         "icon_Gem_Star_Blue"
       ]
+    },
+    {
+      "ID": 301,
+      "giftID": "",
+      "itemId": [
+        13001
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 5,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ]
+    },
+    {
+      "ID": 302,
+      "giftID": "",
+      "itemId": [
+        13002
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 5,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ]
+    },
+    {
+      "ID": 303,
+      "giftID": "",
+      "itemId": [
+        13003
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 5,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ]
+    },
+    {
+      "ID": 304,
+      "giftID": "",
+      "itemId": [
+        13004
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 5,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ]
+    },
+    {
+      "ID": 305,
+      "giftID": "",
+      "itemId": [
+        13005
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 5,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ]
+    },
+    {
+      "ID": 306,
+      "giftID": "",
+      "itemId": [
+        13006
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 5,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ]
+    },
+    {
+      "ID": 307,
+      "giftID": "",
+      "itemId": [
+        13007
+      ],
+      "itemCount": [
+        100
+      ],
+      "costItemId": 1001,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 5,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ]
+    },
+    {
+      "ID": 401,
+      "giftID": "",
+      "itemId": [
+        0
+      ],
+      "itemCount": [
+        0
+      ],
+      "costItemId": 0,
+      "price": 1,
+      "oldPrice": 1,
+      "buyCount": -1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 4,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ]
     }
   ]
 }

+ 30 - 30
Assets/Res/Config/SkillConfig.json

@@ -206,7 +206,7 @@
       "level": 1,
       "effectValue": [
         1.0,
-        150.0
+        170.0
       ],
       "intensifierIndex": [
         2
@@ -230,7 +230,7 @@
       "level": 2,
       "effectValue": [
         1.0,
-        128.0,
+        150.0,
         25.0
       ],
       "intensifierIndex": [
@@ -258,7 +258,7 @@
       "level": 3,
       "effectValue": [
         1.0,
-        150.0,
+        173.0,
         25.0
       ],
       "intensifierIndex": [
@@ -292,7 +292,7 @@
       "level": 4,
       "effectValue": [
         1.0,
-        150.0,
+        169.0,
         25.0
       ],
       "intensifierIndex": [
@@ -326,7 +326,7 @@
       "level": 5,
       "effectValue": [
         1.0,
-        169.0,
+        195.0,
         25.0
       ],
       "intensifierIndex": [
@@ -360,7 +360,7 @@
       "level": 6,
       "effectValue": [
         1.0,
-        195.0,
+        234.0,
         25.0,
         100.0
       ],
@@ -392,7 +392,7 @@
       "level": 1,
       "effectValue": [
         3.0,
-        47.0,
+        53.0,
         100.0
       ],
       "intensifierIndex": [
@@ -417,7 +417,7 @@
       "level": 2,
       "effectValue": [
         3.0,
-        48.0,
+        56.0,
         100.0,
         30.0
       ],
@@ -443,7 +443,7 @@
       "level": 3,
       "effectValue": [
         3.0,
-        56.0,
+        64.0,
         100.0,
         40.0
       ],
@@ -478,7 +478,7 @@
       "level": 4,
       "effectValue": [
         3.0,
-        64.0,
+        73.0,
         100.0,
         50.0
       ],
@@ -513,7 +513,7 @@
       "level": 5,
       "effectValue": [
         3.0,
-        73.0,
+        84.0,
         100.0,
         60.0
       ],
@@ -548,7 +548,7 @@
       "level": 6,
       "effectValue": [
         3.0,
-        64.0,
+        77.0,
         100.0,
         70.0,
         20.0
@@ -1910,7 +1910,7 @@
       "level": 1,
       "effectValue": [
         2.0,
-        68.0,
+        77.0,
         5.0
       ],
       "intensifierIndex": [
@@ -1935,7 +1935,7 @@
       "level": 2,
       "effectValue": [
         2.0,
-        77.0,
+        90.0,
         6.0
       ],
       "intensifierIndex": [
@@ -1963,7 +1963,7 @@
       "level": 3,
       "effectValue": [
         2.0,
-        89.0,
+        102.0,
         7.0
       ],
       "intensifierIndex": [
@@ -1997,7 +1997,7 @@
       "level": 4,
       "effectValue": [
         2.0,
-        101.0,
+        114.0,
         8.0
       ],
       "intensifierIndex": [
@@ -2031,7 +2031,7 @@
       "level": 5,
       "effectValue": [
         2.0,
-        113.0,
+        131.0,
         9.0
       ],
       "intensifierIndex": [
@@ -2065,7 +2065,7 @@
       "level": 6,
       "effectValue": [
         2.0,
-        129.0,
+        155.0,
         10.0
       ],
       "intensifierIndex": [
@@ -2477,7 +2477,7 @@
       "level": 1,
       "effectValue": [
         4.0,
-        35.0,
+        39.0,
         100.0
       ],
       "intensifierIndex": [
@@ -2502,7 +2502,7 @@
       "level": 2,
       "effectValue": [
         4.0,
-        39.0,
+        46.0,
         100.0
       ],
       "intensifierIndex": [
@@ -2530,7 +2530,7 @@
       "level": 3,
       "effectValue": [
         4.0,
-        46.0,
+        53.0,
         100.0
       ],
       "intensifierIndex": [
@@ -2564,7 +2564,7 @@
       "level": 4,
       "effectValue": [
         4.0,
-        53.0,
+        60.0,
         100.0
       ],
       "intensifierIndex": [
@@ -2598,7 +2598,7 @@
       "level": 5,
       "effectValue": [
         4.0,
-        60.0,
+        69.0,
         100.0
       ],
       "intensifierIndex": [
@@ -2632,7 +2632,7 @@
       "level": 6,
       "effectValue": [
         4.0,
-        58.0,
+        83.0,
         100.0,
         20.0
       ],
@@ -2664,7 +2664,7 @@
       "level": 1,
       "effectValue": [
         2.0,
-        75.0
+        85.0
       ],
       "intensifierIndex": [
         2
@@ -2688,7 +2688,7 @@
       "level": 2,
       "effectValue": [
         2.0,
-        77.0,
+        90.0,
         5.0,
         3.0
       ],
@@ -2714,7 +2714,7 @@
       "level": 3,
       "effectValue": [
         2.0,
-        90.0,
+        104.0,
         5.0,
         3.0
       ],
@@ -2749,7 +2749,7 @@
       "level": 4,
       "effectValue": [
         2.0,
-        99.0,
+        112.0,
         5.0,
         3.0
       ],
@@ -2784,7 +2784,7 @@
       "level": 5,
       "effectValue": [
         2.0,
-        112.0,
+        129.0,
         5.0,
         3.0
       ],
@@ -2819,7 +2819,7 @@
       "level": 6,
       "effectValue": [
         2.0,
-        129.0,
+        155.0,
         5.0,
         3.0,
         25.0

+ 16 - 16
Assets/Res/Config/SmallPlacesConfig.json

@@ -4,71 +4,71 @@
       "ID": 1,
       "placeName": 10037,
       "PlacesId": 1,
-      "CompletionEventCount": 0,
-      "UnlockEnvetid": 0
+      "CompletionEventCount": 10,
+      "UnlockEnvetid": 10001
     },
     {
       "ID": 2,
       "placeName": 10038,
       "PlacesId": 1,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10001
+      "UnlockEnvetid": 10004
     },
     {
       "ID": 3,
       "placeName": 10039,
       "PlacesId": 1,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10004
+      "UnlockEnvetid": 10009
     },
     {
       "ID": 4,
       "placeName": 10040,
       "PlacesId": 1,
-      "CompletionEventCount": 10,
-      "UnlockEnvetid": 10009
+      "CompletionEventCount": 5,
+      "UnlockEnvetid": 10012
     },
     {
       "ID": 5,
       "placeName": 10041,
       "PlacesId": 2,
-      "CompletionEventCount": 5,
-      "UnlockEnvetid": 10012
+      "CompletionEventCount": 10,
+      "UnlockEnvetid": 10013
     },
     {
       "ID": 6,
       "placeName": 10042,
       "PlacesId": 2,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10013
+      "UnlockEnvetid": 10018
     },
     {
       "ID": 7,
       "placeName": 10043,
       "PlacesId": 2,
-      "CompletionEventCount": 10,
-      "UnlockEnvetid": 10018
+      "CompletionEventCount": 5,
+      "UnlockEnvetid": 10022
     },
     {
       "ID": 8,
       "placeName": 10044,
       "PlacesId": 3,
-      "CompletionEventCount": 5,
-      "UnlockEnvetid": 10022
+      "CompletionEventCount": 10,
+      "UnlockEnvetid": 10025
     },
     {
       "ID": 9,
       "placeName": 10045,
       "PlacesId": 3,
       "CompletionEventCount": 10,
-      "UnlockEnvetid": 10025
+      "UnlockEnvetid": 10028
     },
     {
       "ID": 10,
       "placeName": 10046,
       "PlacesId": 3,
-      "CompletionEventCount": 10,
-      "UnlockEnvetid": 10028
+      "CompletionEventCount": -1,
+      "UnlockEnvetid": -1
     }
   ]
 }

+ 437 - 96
Assets/Res/UI/BoxPanel/BoxPanel.prefab

@@ -1,5 +1,101 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &322111420540150677
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7837645566193001603}
+  - component: {fileID: 3355923342222034163}
+  - component: {fileID: 1860430562021314936}
+  - component: {fileID: 87060483414581317}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_OneFree
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7837645566193001603
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 322111420540150677}
+  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: 9075403788194047161}
+  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: -52.103638}
+  m_SizeDelta: {x: 0, y: -37.7928}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3355923342222034163
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 322111420540150677}
+  m_CullTransparentMesh: 1
+--- !u!114 &1860430562021314936
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 322111420540150677}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 24
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 9
+    m_MaxSize: 43
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "1\u5C0F\u65F620\u5206\u949F"
+--- !u!114 &87060483414581317
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 322111420540150677}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &1240759691706307126
 GameObject:
   m_ObjectHideFlags: 0
@@ -11,7 +107,6 @@ GameObject:
   - component: {fileID: 7858018693182147813}
   - component: {fileID: 8965272612517638377}
   - component: {fileID: 8976664237382821618}
-  - component: {fileID: 6908911704055347136}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: BoxPanel
@@ -89,6 +184,31 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: icon_Oneitem
+    gameObject: {fileID: 448323682004864090}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Icon_TenItem
+    gameObject: {fileID: 6831614674596714349}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_TenFree
+    gameObject: {fileID: 7564254636685150276}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_OneFree
+    gameObject: {fileID: 1860430562021314936}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Score
+    gameObject: {fileID: 410208381731937681}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!225 &8976664237382821618
 CanvasGroup:
@@ -102,99 +222,6 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
---- !u!114 &6908911704055347136
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1240759691706307126}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  maxDuration: 0
-  isUpdate: 0
-  currTime: 0.30024773
-  GrpupInfos:
-  - Foldout: 1
-    isActive: 1
-    animName: show
-    isLoop: 0
-    allTargets:
-    - {fileID: 3194501373201481477}
-    - {fileID: 3194501373201481477}
-    TweenAssetInfo: {fileID: 11400000, guid: 3b43306cabdd06a48a5e1cba65050d09, type: 2}
-    TargetFoldout: 1
-    maxDuration: 0
-    isUpdate: 1
-    currTime: 0
-  MinMaxGradient:
-    m_Mode: 0
-    m_GradientMin:
-      serializedVersion: 2
-      key0: {r: 1, g: 1, b: 1, a: 1}
-      key1: {r: 1, g: 1, b: 1, a: 1}
-      key2: {r: 0, g: 0, b: 0, a: 0}
-      key3: {r: 0, g: 0, b: 0, a: 0}
-      key4: {r: 0, g: 0, b: 0, a: 0}
-      key5: {r: 0, g: 0, b: 0, a: 0}
-      key6: {r: 0, g: 0, b: 0, a: 0}
-      key7: {r: 0, g: 0, b: 0, a: 0}
-      ctime0: 0
-      ctime1: 65535
-      ctime2: 0
-      ctime3: 0
-      ctime4: 0
-      ctime5: 0
-      ctime6: 0
-      ctime7: 0
-      atime0: 0
-      atime1: 65535
-      atime2: 0
-      atime3: 0
-      atime4: 0
-      atime5: 0
-      atime6: 0
-      atime7: 0
-      m_Mode: 0
-      m_ColorSpace: -1
-      m_NumColorKeys: 2
-      m_NumAlphaKeys: 2
-    m_GradientMax:
-      serializedVersion: 2
-      key0: {r: 1, g: 1, b: 1, a: 1}
-      key1: {r: 1, g: 1, b: 1, a: 1}
-      key2: {r: 0, g: 0, b: 0, a: 0}
-      key3: {r: 0, g: 0, b: 0, a: 0}
-      key4: {r: 0, g: 0, b: 0, a: 0}
-      key5: {r: 0, g: 0, b: 0, a: 0}
-      key6: {r: 0, g: 0, b: 0, a: 0}
-      key7: {r: 0, g: 0, b: 0, a: 0}
-      ctime0: 0
-      ctime1: 65535
-      ctime2: 0
-      ctime3: 0
-      ctime4: 0
-      ctime5: 0
-      ctime6: 0
-      ctime7: 0
-      atime0: 0
-      atime1: 65535
-      atime2: 0
-      atime3: 0
-      atime4: 0
-      atime5: 0
-      atime6: 0
-      atime7: 0
-      m_Mode: 0
-      m_ColorSpace: -1
-      m_NumColorKeys: 2
-      m_NumAlphaKeys: 2
-    m_ColorMin: {r: 0, g: 0, b: 0, a: 0}
-    m_ColorMax: {r: 0, g: 0, b: 0, a: 0}
-  isLoop: 0
 --- !u!1 &1283798833564440464
 GameObject:
   m_ObjectHideFlags: 0
@@ -703,7 +730,7 @@ GameObject:
   - component: {fileID: 6831614674596714349}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: Icon_TenItem
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1123,6 +1150,7 @@ RectTransform:
   - {fileID: 9075403788194047161}
   - {fileID: 3111674043955101840}
   - {fileID: 8273459722014086988}
+  - {fileID: 7744834589657720586}
   m_Father: {fileID: 7858018693182147813}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1142,6 +1170,102 @@ CanvasGroup:
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
+--- !u!1 &4417562118974159078
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2188105687983302471}
+  - component: {fileID: 8676950035031905782}
+  - component: {fileID: 7564254636685150276}
+  - component: {fileID: 9205331277890641506}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_TenFree
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2188105687983302471
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4417562118974159078}
+  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: 3111674043955101840}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -2, y: -52.103638}
+  m_SizeDelta: {x: 0, y: -37.7928}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8676950035031905782
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4417562118974159078}
+  m_CullTransparentMesh: 1
+--- !u!114 &7564254636685150276
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4417562118974159078}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 24
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 9
+    m_MaxSize: 43
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "1\u5C0F\u65F620\u5206\u949F"
+--- !u!114 &9205331277890641506
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4417562118974159078}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &4923044900321880700
 GameObject:
   m_ObjectHideFlags: 0
@@ -1503,6 +1627,141 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &6228470735666232042
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7744834589657720586}
+  - component: {fileID: 2971171615382265200}
+  - component: {fileID: 3399192810761971074}
+  - component: {fileID: 410208381731937681}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Score
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7744834589657720586
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6228470735666232042}
+  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: 925533245352772245}
+  m_Father: {fileID: 6698958863649085951}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 269, y: -25}
+  m_SizeDelta: {x: 54, y: 54}
+  m_Pivot: {x: 1, y: 0}
+--- !u!222 &2971171615382265200
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6228470735666232042}
+  m_CullTransparentMesh: 1
+--- !u!114 &3399192810761971074
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6228470735666232042}
+  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_daojishi
+  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: de4a477140878ce911aa37d161cbf014
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &410208381731937681
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6228470735666232042}
+  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: 3399192810761971074}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &6747014845120676815
 GameObject:
   m_ObjectHideFlags: 0
@@ -1758,6 +2017,86 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &7127849299946910399
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 925533245352772245}
+  - component: {fileID: 497667885178128358}
+  - component: {fileID: 5008264443368327798}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &925533245352772245
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7127849299946910399}
+  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: 7744834589657720586}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: -20.9}
+  m_SizeDelta: {x: 160, y: 30}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &497667885178128358
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7127849299946910399}
+  m_CullTransparentMesh: 1
+--- !u!114 &5008264443368327798
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7127849299946910399}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 24
+    m_FontStyle: 1
+    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: "200\u62BD\u6311\u6218"
 --- !u!1 &7228162602162805773
 GameObject:
   m_ObjectHideFlags: 0
@@ -1793,6 +2132,7 @@ RectTransform:
   - {fileID: 2211120389198192458}
   - {fileID: 2934320302541883345}
   - {fileID: 2561986655586709565}
+  - {fileID: 7837645566193001603}
   m_Father: {fileID: 6698958863649085951}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -1930,6 +2270,7 @@ RectTransform:
   - {fileID: 5786166097279901156}
   - {fileID: 7985587118668684843}
   - {fileID: 6481753042138001888}
+  - {fileID: 2188105687983302471}
   m_Father: {fileID: 6698958863649085951}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -2121,7 +2462,7 @@ GameObject:
   - component: {fileID: 448323682004864090}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: icon_Oneitem
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

File diff suppressed because it is too large
+ 1 - 883
Assets/Res/UI/BoxPanel/GachaPanel.prefab


+ 2047 - 0
Assets/Res/UI/BoxPanel/OpenBoxScorePanel.prefab

@@ -0,0 +1,2047 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &234957669227303198
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8133080571240593798}
+  - component: {fileID: 6692103573454507738}
+  - component: {fileID: 7185229974443762798}
+  - component: {fileID: 6140576095126467001}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Ok
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8133080571240593798
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 234957669227303198}
+  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: 5965050604016229723}
+  m_Father: {fileID: 7858018693182147813}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 286.8}
+  m_SizeDelta: {x: 238.2908, y: 85.6114}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &6692103573454507738
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 234957669227303198}
+  m_CullTransparentMesh: 1
+--- !u!114 &7185229974443762798
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 234957669227303198}
+  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.26666668, g: 0.44705886, b: 0.7686275, 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_juxing_fang_hujiao
+  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: de4a477140878ce911aa37d161cbf014
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &6140576095126467001
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 234957669227303198}
+  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: 7185229974443762798}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &1240759691706307126
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7858018693182147813}
+  - component: {fileID: 8965272612517638377}
+  - component: {fileID: 8976664237382821618}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: OpenBoxScorePanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7858018693182147813
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1240759691706307126}
+  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: 1
+  m_Children:
+  - {fileID: 7720912462477243599}
+  - {fileID: 3787544951613840147}
+  - {fileID: 3231331790385762162}
+  - {fileID: 5366739683216167502}
+  - {fileID: 8133080571240593798}
+  - {fileID: 1938819614485242620}
+  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: -3563, y: -182}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &8965272612517638377
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1240759691706307126}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Content1
+    gameObject: {fileID: 8629665273563328967}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Content2
+    gameObject: {fileID: 1240912884187550995}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Ok
+    gameObject: {fileID: 6140576095126467001}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: StartRoot
+    gameObject: {fileID: 1938819614485242620}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_JingDu
+    gameObject: {fileID: 7741796115162894234}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Score
+    gameObject: {fileID: 6366080194197253241}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!225 &8976664237382821618
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1240759691706307126}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
+--- !u!1 &1673520390365364380
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3834812936624691349}
+  - component: {fileID: 593285393034570064}
+  - component: {fileID: 7209608839195132910}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy) (3)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3834812936624691349
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1673520390365364380}
+  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: 3787544951613840147}
+  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: 54.5, y: -82.79996}
+  m_SizeDelta: {x: 141.0059, y: 26.4587}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &593285393034570064
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1673520390365364380}
+  m_CullTransparentMesh: 1
+--- !u!114 &7209608839195132910
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1673520390365364380}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 26
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 59
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5B8C\u6210\u6B21\u6570"
+--- !u!1 &1811260603699865972
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4072586467740199263}
+  - component: {fileID: 1190081588400317579}
+  - component: {fileID: 2851343895710448342}
+  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 &4072586467740199263
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1811260603699865972}
+  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: 1938819614485242620}
+  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.0792, y: 0}
+  m_SizeDelta: {x: 632.5702, y: 66.6835}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &1190081588400317579
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1811260603699865972}
+  m_CullTransparentMesh: 1
+--- !u!114 &2851343895710448342
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1811260603699865972}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 28
+    m_FontStyle: 1
+    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: "200\u62BD\u6311\u6218\u5DF2\u5B8C\u6210"
+--- !u!1 &2111982974372829638
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5366739683216167502}
+  - component: {fileID: 2564010822953909151}
+  - component: {fileID: 2838711500776428113}
+  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 &5366739683216167502
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2111982974372829638}
+  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: 5428019602683763515}
+  m_Father: {fileID: 7858018693182147813}
+  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.2075, y: -130}
+  m_SizeDelta: {x: 727.1341, y: 527.1417}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2564010822953909151
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2111982974372829638}
+  m_CullTransparentMesh: 1
+--- !u!114 &2838711500776428113
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2111982974372829638}
+  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.30588236, g: 0.19215688, b: 0.52156866, 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_juxing_fang
+  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: de4a477140878ce911aa37d161cbf014
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &2370995919336198406
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8025284597209496932}
+  - component: {fileID: 6748753096610578173}
+  - component: {fileID: 5460752258308196351}
+  - component: {fileID: 4391266444445668709}
+  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 &8025284597209496932
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2370995919336198406}
+  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: 6652087719461453211}
+  m_Father: {fileID: 3787544951613840147}
+  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.4723, y: -52.197052}
+  m_SizeDelta: {x: 704.8802, y: 394.7942}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6748753096610578173
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2370995919336198406}
+  m_CullTransparentMesh: 1
+--- !u!114 &5460752258308196351
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2370995919336198406}
+  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.392}
+  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 &4391266444445668709
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2370995919336198406}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 8629665273563328967}
+  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: 6652087719461453211}
+  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 &2436109539439368465
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3231331790385762162}
+  - component: {fileID: 5341967818580382441}
+  - component: {fileID: 554138000913517384}
+  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 &3231331790385762162
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2436109539439368465}
+  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: 7237139809221645204}
+  m_Father: {fileID: 7858018693182147813}
+  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: 160.83838}
+  m_SizeDelta: {x: 750, y: 56.1252}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5341967818580382441
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2436109539439368465}
+  m_CullTransparentMesh: 1
+--- !u!114 &554138000913517384
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2436109539439368465}
+  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.27450982, g: 0.3254902, b: 0.5176471, 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: 
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &2726946618110334721
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3758813775204660129}
+  - component: {fileID: 4803806791851739352}
+  - component: {fileID: 3374620118655784798}
+  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 &3758813775204660129
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2726946618110334721}
+  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: 3787544951613840147}
+  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: -107.4, y: -82.8}
+  m_SizeDelta: {x: 141.0059, y: 26.4587}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &4803806791851739352
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2726946618110334721}
+  m_CullTransparentMesh: 1
+--- !u!114 &3374620118655784798
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2726946618110334721}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 26
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 59
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u79EF\u5206\u5956\u52B1"
+--- !u!1 &2751109958425029971
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5428019602683763515}
+  - component: {fileID: 1299575708875599391}
+  - component: {fileID: 3199738804548373641}
+  - component: {fileID: 4132445256553792882}
+  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 &5428019602683763515
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2751109958425029971}
+  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: 7883065359111312998}
+  m_Father: {fileID: 5366739683216167502}
+  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.4723, y: -9.7545}
+  m_SizeDelta: {x: 704.8802, y: 479.6794}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1299575708875599391
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2751109958425029971}
+  m_CullTransparentMesh: 1
+--- !u!114 &3199738804548373641
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2751109958425029971}
+  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.392}
+  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 &4132445256553792882
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2751109958425029971}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 1240912884187550995}
+  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: 7883065359111312998}
+  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 &3975357975653186185
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3592541921510184848}
+  - component: {fileID: 2120762153354318439}
+  - component: {fileID: 6366080194197253241}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Score
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3592541921510184848
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3975357975653186185}
+  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: 1938819614485242620}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 423, y: 4.4}
+  m_SizeDelta: {x: 281.7974, y: 50.4996}
+  m_Pivot: {x: 0, y: 0}
+--- !u!222 &2120762153354318439
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3975357975653186185}
+  m_CullTransparentMesh: 1
+--- !u!114 &6366080194197253241
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3975357975653186185}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 28
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u76EE\u524D\u5F97\u5206\uFF1A28"
+--- !u!1 &4550440237619649473
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7237139809221645204}
+  - component: {fileID: 8259251194257241138}
+  - component: {fileID: 3998889105098686268}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7237139809221645204
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4550440237619649473}
+  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: 3231331790385762162}
+  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 &8259251194257241138
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4550440237619649473}
+  m_CullTransparentMesh: 1
+--- !u!114 &3998889105098686268
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4550440237619649473}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 31
+    m_FontStyle: 1
+    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: "\u603B\u79EF\u5206\u5956\u52B1"
+--- !u!1 &4607014433633812362
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6652087719461453211}
+  - component: {fileID: 1850697784099584004}
+  - component: {fileID: 2046018278233349370}
+  - component: {fileID: 5201666023495933226}
+  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 &6652087719461453211
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4607014433633812362}
+  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: 8629665273563328967}
+  m_Father: {fileID: 8025284597209496932}
+  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 &1850697784099584004
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4607014433633812362}
+  m_CullTransparentMesh: 1
+--- !u!114 &2046018278233349370
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4607014433633812362}
+  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 &5201666023495933226
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4607014433633812362}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
+--- !u!1 &4831955803733054146
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1938819614485242620}
+  - component: {fileID: 8303392274268662944}
+  - component: {fileID: 6927240568172800610}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: StartRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1938819614485242620
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4831955803733054146}
+  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: 4072586467740199263}
+  - {fileID: 3649894383076168908}
+  - {fileID: 3592541921510184848}
+  m_Father: {fileID: 7858018693182147813}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: -0.00007534, y: 256}
+  m_SizeDelta: {x: 727.13, y: 128.4454}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &8303392274268662944
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4831955803733054146}
+  m_CullTransparentMesh: 1
+--- !u!114 &6927240568172800610
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4831955803733054146}
+  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.26666668, g: 0.44705886, b: 0.7686275, 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_juxing_fang_hujiao
+  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: de4a477140878ce911aa37d161cbf014
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &4966631957733541155
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3787544951613840147}
+  - component: {fileID: 6858452839668547294}
+  - component: {fileID: 1518551420983256842}
+  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 &3787544951613840147
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4966631957733541155}
+  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: 7031325493743756807}
+  - {fileID: 5424655315515069699}
+  - {fileID: 3758813775204660129}
+  - {fileID: 3834812936624691349}
+  - {fileID: 3050252600027618270}
+  - {fileID: 8025284597209496932}
+  m_Father: {fileID: 7858018693182147813}
+  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.2075, y: 452.47266}
+  m_SizeDelta: {x: 727.1341, y: 527.1417}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6858452839668547294
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4966631957733541155}
+  m_CullTransparentMesh: 1
+--- !u!114 &1518551420983256842
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4966631957733541155}
+  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.30588236, g: 0.19215688, b: 0.52156866, 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_juxing_fang
+  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: de4a477140878ce911aa37d161cbf014
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &5721303365524040708
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3050252600027618270}
+  - component: {fileID: 6195597745949149028}
+  - component: {fileID: 990153844699681966}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy) (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3050252600027618270
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5721303365524040708}
+  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: 3787544951613840147}
+  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: 229, y: -82.8}
+  m_SizeDelta: {x: 141.0059, y: 26.4587}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &6195597745949149028
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5721303365524040708}
+  m_CullTransparentMesh: 1
+--- !u!114 &990153844699681966
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5721303365524040708}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 26
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 59
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u79EF\u5206\u6C47\u603B"
+--- !u!1 &5917341253074874287
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1240912884187550995}
+  - component: {fileID: 3276386664002663896}
+  - component: {fileID: 253426075016693762}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Content2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1240912884187550995
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5917341253074874287}
+  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: 7883065359111312998}
+  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 &3276386664002663896
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5917341253074874287}
+  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!114 &253426075016693762
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5917341253074874287}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 13
+    m_Right: 0
+    m_Top: 10
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 7.14
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!1 &5954846971050357279
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5424655315515069699}
+  - component: {fileID: 8805799467788941862}
+  - component: {fileID: 8240048422361482980}
+  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 &5424655315515069699
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5954846971050357279}
+  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: 3787544951613840147}
+  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: -272.09772, y: -60.600006}
+  m_SizeDelta: {x: 141.0059, y: 26.4587}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &8805799467788941862
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5954846971050357279}
+  m_CullTransparentMesh: 1
+--- !u!114 &8240048422361482980
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5954846971050357279}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 26
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 59
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u79EF\u5206\u89C4\u5219"
+--- !u!1 &6027121454098449183
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3649894383076168908}
+  - component: {fileID: 916759662871782141}
+  - component: {fileID: 7741796115162894234}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_JingDu
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3649894383076168908
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6027121454098449183}
+  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: 1938819614485242620}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 57.2, y: 4.4}
+  m_SizeDelta: {x: 281.7974, y: 50.4996}
+  m_Pivot: {x: 0, y: 0}
+--- !u!222 &916759662871782141
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6027121454098449183}
+  m_CullTransparentMesh: 1
+--- !u!114 &7741796115162894234
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6027121454098449183}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 28
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u76EE\u524D\u8FDB\u5EA6\uFF1A200/200"
+--- !u!1 &6300837540891832858
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5965050604016229723}
+  - component: {fileID: 5810168012277639274}
+  - component: {fileID: 1986100496574081740}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5965050604016229723
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6300837540891832858}
+  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: 8133080571240593798}
+  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 &5810168012277639274
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6300837540891832858}
+  m_CullTransparentMesh: 1
+--- !u!114 &1986100496574081740
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6300837540891832858}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 29
+    m_FontStyle: 1
+    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: "\u5F00\u542F\u6311\u6218"
+--- !u!1 &6979838843896054052
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7883065359111312998}
+  - component: {fileID: 945938690800990811}
+  - component: {fileID: 7166850813055670713}
+  - component: {fileID: 5692099376718062303}
+  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 &7883065359111312998
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6979838843896054052}
+  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: 1240912884187550995}
+  m_Father: {fileID: 5428019602683763515}
+  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 &945938690800990811
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6979838843896054052}
+  m_CullTransparentMesh: 1
+--- !u!114 &7166850813055670713
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6979838843896054052}
+  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 &5692099376718062303
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6979838843896054052}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
+--- !u!1 &6989034640253556327
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7720912462477243599}
+  - component: {fileID: 3131905602591714602}
+  - component: {fileID: 8982781406452196630}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: bg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &7720912462477243599
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6989034640253556327}
+  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: 7858018693182147813}
+  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 &3131905602591714602
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6989034640253556327}
+  m_CullTransparentMesh: 1
+--- !u!114 &8982781406452196630
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6989034640253556327}
+  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_juxing_fang
+  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: de4a477140878ce911aa37d161cbf014
+  imageH: 1624
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &7506350864910962600
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7031325493743756807}
+  - component: {fileID: 5039672387026751436}
+  - component: {fileID: 7966530394382647399}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7031325493743756807
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7506350864910962600}
+  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: 3787544951613840147}
+  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: 44.5}
+  m_SizeDelta: {x: 508.8013, y: 95.4002}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &5039672387026751436
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7506350864910962600}
+  m_CullTransparentMesh: 1
+--- !u!114 &7966530394382647399
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7506350864910962600}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 0.627451, b: 0.1254902, 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: 59
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 59
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "200\u62BD\u6311\u6218\uFF01"
+--- !u!1 &7617855394433935135
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8629665273563328967}
+  - component: {fileID: 3106995536560640452}
+  - component: {fileID: 4613934596384738922}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Content1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8629665273563328967
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7617855394433935135}
+  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: 6652087719461453211}
+  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 &3106995536560640452
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7617855394433935135}
+  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!114 &4613934596384738922
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7617855394433935135}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 13
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0

+ 7 - 0
Assets/Res/UI/BoxPanel/OpenBoxScorePanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DywW5y2kVHxib8Gsa0SsnaotYrG/6B7DYFa73ixtVUouDpe3Qalv0k5vK5Ga
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 691 - 0
Assets/Res/UI/BoxPanel/SummonScoreAwardWidget.prefab

@@ -0,0 +1,691 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &3104106384049443820
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5052309288351803443}
+  - component: {fileID: 36265705508397560}
+  - component: {fileID: 2571407933570388370}
+  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 &5052309288351803443
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3104106384049443820}
+  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: 612780405416088808}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.059906006, y: -0.1147995}
+  m_SizeDelta: {x: -7.2346, y: -7.0046}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &36265705508397560
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3104106384049443820}
+  m_CullTransparentMesh: 1
+--- !u!114 &2571407933570388370
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3104106384049443820}
+  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.20392157, g: 0.14509805, b: 0.36078432, 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_juxing_fang_hujiao
+  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: de4a477140878ce911aa37d161cbf014
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &4182076321820206894
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7560179697145513368}
+  - component: {fileID: 4903079184172838809}
+  - component: {fileID: 5915434388064214536}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Name
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7560179697145513368
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4182076321820206894}
+  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: 612780405416088808}
+  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: 16, y: 0.000049114}
+  m_SizeDelta: {x: 314.2701, y: 47.271}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &4903079184172838809
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4182076321820206894}
+  m_CullTransparentMesh: 1
+--- !u!114 &5915434388064214536
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4182076321820206894}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 30
+    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: "\u79EF\u5206\u8FBE\u5230 20\u5206"
+--- !u!1 &4416841733717985046
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3523379304572982676}
+  - component: {fileID: 3571524982393725727}
+  - component: {fileID: 7389713636848211350}
+  - component: {fileID: 5996297548919620600}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_LingQu
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &3523379304572982676
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4416841733717985046}
+  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: 2841766045215576449}
+  m_Father: {fileID: 612780405416088808}
+  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: -28.1, y: -3.3}
+  m_SizeDelta: {x: 92.4325, y: 29.2277}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3571524982393725727
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4416841733717985046}
+  m_CullTransparentMesh: 1
+--- !u!114 &7389713636848211350
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4416841733717985046}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_quxiao
+  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: de4a477140878ce911aa37d161cbf014
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &5996297548919620600
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4416841733717985046}
+  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: 7389713636848211350}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &5188700826369268152
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6136234074020137077}
+  - component: {fileID: 7073616920024668819}
+  - component: {fileID: 5868962131418596838}
+  - component: {fileID: 4248197977669859342}
+  - component: {fileID: 3932644553530963875}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: ItemRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6136234074020137077
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5188700826369268152}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 612780405416088808}
+  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: -9.299988, y: 0}
+  m_SizeDelta: {x: 0, y: 100}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &7073616920024668819
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5188700826369268152}
+  m_CullTransparentMesh: 1
+--- !u!114 &5868962131418596838
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5188700826369268152}
+  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: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &4248197977669859342
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5188700826369268152}
+  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 &3932644553530963875
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5188700826369268152}
+  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: 10.35
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!1 &6521240700457994570
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 612780405416088808}
+  - component: {fileID: 6448080632761198331}
+  - component: {fileID: 38449813028098259}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: SummonScoreAwardWidget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &612780405416088808
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6521240700457994570}
+  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: 4017822524635749390}
+  - {fileID: 5052309288351803443}
+  - {fileID: 7560179697145513368}
+  - {fileID: 6136234074020137077}
+  - {fileID: 3523379304572982676}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 352.66028, y: -45.83695}
+  m_SizeDelta: {x: 679.3206, y: 71.6739}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6448080632761198331
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6521240700457994570}
+  m_CullTransparentMesh: 1
+--- !u!114 &38449813028098259
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6521240700457994570}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Text_Name
+    gameObject: {fileID: 5915434388064214536}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: ItemRoot
+    gameObject: {fileID: 6136234074020137077}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Icon_Select
+    gameObject: {fileID: 2232359856236333771}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_LingQu
+    gameObject: {fileID: 5996297548919620600}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &7532528011211120148
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4017822524635749390}
+  - component: {fileID: 5769018569211516025}
+  - component: {fileID: 2232359856236333771}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Select
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &4017822524635749390
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7532528011211120148}
+  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: 612780405416088808}
+  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 &5769018569211516025
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7532528011211120148}
+  m_CullTransparentMesh: 1
+--- !u!114 &2232359856236333771
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7532528011211120148}
+  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.2607205, g: 1, 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_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_juxing_fang_hujiao
+  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: de4a477140878ce911aa37d161cbf014
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &8569280850973587507
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2841766045215576449}
+  - component: {fileID: 8948756914829440853}
+  - component: {fileID: 4167165529336752922}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2841766045215576449
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8569280850973587507}
+  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: 3523379304572982676}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.0000076293945, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8948756914829440853
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8569280850973587507}
+  m_CullTransparentMesh: 1
+--- !u!114 &4167165529336752922
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8569280850973587507}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 21
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u9886\u53D6"

+ 7 - 0
Assets/Res/UI/BoxPanel/SummonScoreAwardWidget.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XngatSirAn3BI/vodOb8QNwvzDu+GDg4+rN9a98ohNFlVQ3EBdpZIdukNYla
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 450 - 0
Assets/Res/UI/BoxPanel/SummonScoreRuleWidget.prefab

@@ -0,0 +1,450 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &1002494222609385235
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5585334762211831468}
+  - component: {fileID: 5383380234847045349}
+  - component: {fileID: 8627943380273946477}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Score
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5585334762211831468
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1002494222609385235}
+  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: 2513701189896696577}
+  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: 149.4, y: 0.000049114}
+  m_SizeDelta: {x: 160, y: 47.271}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &5383380234847045349
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1002494222609385235}
+  m_CullTransparentMesh: 1
+--- !u!114 &8627943380273946477
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1002494222609385235}
+  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: 30
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 1
+--- !u!1 &4655747889446476019
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4709731685698981603}
+  - component: {fileID: 5465014839042635569}
+  - component: {fileID: 1171691097904611351}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Name
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4709731685698981603
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4655747889446476019}
+  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: 2513701189896696577}
+  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: -0.000030517578, y: 0.000049114}
+  m_SizeDelta: {x: 160, y: 47.271}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &5465014839042635569
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4655747889446476019}
+  m_CullTransparentMesh: 1
+--- !u!114 &1171691097904611351
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4655747889446476019}
+  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: 30
+    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: "\u5341\u5E74\u51FA\u91D1"
+--- !u!1 &6217024041097960288
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1880613761067236836}
+  - component: {fileID: 2775722744707172600}
+  - component: {fileID: 3456420193715790639}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_CompleteCount
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1880613761067236836
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6217024041097960288}
+  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: 2513701189896696577}
+  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: 315.4, y: -0.000072956}
+  m_SizeDelta: {x: 160, y: 47.271}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &2775722744707172600
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6217024041097960288}
+  m_CullTransparentMesh: 1
+--- !u!114 &3456420193715790639
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6217024041097960288}
+  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: 30
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 14
+--- !u!1 &8053076530969729128
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2513701189896696577}
+  - component: {fileID: 4326309229572584401}
+  - component: {fileID: 2167472962942545255}
+  - component: {fileID: 1166828380842570347}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: SummonScoreRuleWidget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2513701189896696577
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8053076530969729128}
+  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: 4709731685698981603}
+  - {fileID: 5585334762211831468}
+  - {fileID: 1880613761067236836}
+  - {fileID: 1931183890266412572}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 352.66028, y: -23.63545}
+  m_SizeDelta: {x: 679.3206, y: 47.2709}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4326309229572584401
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8053076530969729128}
+  m_CullTransparentMesh: 1
+--- !u!114 &2167472962942545255
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8053076530969729128}
+  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: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &1166828380842570347
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8053076530969729128}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Text_Name
+    gameObject: {fileID: 1171691097904611351}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Score
+    gameObject: {fileID: 8627943380273946477}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_CompleteCount
+    gameObject: {fileID: 3456420193715790639}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_AllScore
+    gameObject: {fileID: 6009227603894678814}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &8496602880083732549
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1931183890266412572}
+  - component: {fileID: 3108098518332107761}
+  - component: {fileID: 6009227603894678814}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_AllScore
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1931183890266412572
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8496602880083732549}
+  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: 2513701189896696577}
+  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: 486.7, y: 0.000049114}
+  m_SizeDelta: {x: 160, y: 47.271}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &3108098518332107761
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8496602880083732549}
+  m_CullTransparentMesh: 1
+--- !u!114 &6009227603894678814
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8496602880083732549}
+  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: 30
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 14

+ 7 - 0
Assets/Res/UI/BoxPanel/SummonScoreRuleWidget.prefab.meta

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

+ 2010 - 0
Assets/Res/UI/ShopPanel/ShopBoxWidget.prefab

@@ -0,0 +1,2010 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &276280393870148480
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7739783617243776150}
+  - component: {fileID: 2972225479114450150}
+  - component: {fileID: 2196708309164290413}
+  - component: {fileID: 475297027443064912}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_OneFree
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7739783617243776150
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 276280393870148480}
+  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: 8817936495142175916}
+  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: -52.103638}
+  m_SizeDelta: {x: 0, y: -37.7928}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2972225479114450150
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 276280393870148480}
+  m_CullTransparentMesh: 1
+--- !u!114 &2196708309164290413
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 276280393870148480}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 24
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 9
+    m_MaxSize: 43
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "1\u5C0F\u65F620\u5206\u949F"
+--- !u!114 &475297027443064912
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 276280393870148480}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!1 &1368957499788445249
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8465904066366256985}
+  - component: {fileID: 5938947259451668546}
+  - component: {fileID: 5139080693169076340}
+  - component: {fileID: 4877031898550855138}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Btn_AdsFree
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &8465904066366256985
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1368957499788445249}
+  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: 1
+  m_Children:
+  - {fileID: 4809136204241921588}
+  m_Father: {fileID: 7683316278918720752}
+  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: 79.2, y: -87.8}
+  m_SizeDelta: {x: 50, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5938947259451668546
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1368957499788445249}
+  m_CullTransparentMesh: 1
+--- !u!114 &5139080693169076340
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1368957499788445249}
+  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: 4877031898550855138}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &4877031898550855138
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1368957499788445249}
+  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_AdVideo '
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: fdc09952e21a713f23682168cce500b3
+  imageH: 50
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &1604847036802696322
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6332415411013533169}
+  - component: {fileID: 7171448895155585201}
+  - component: {fileID: 3683457587723248287}
+  - component: {fileID: 637341193158040451}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: tenCion
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6332415411013533169
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1604847036802696322}
+  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: 3207466882744590469}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 16.33, y: 75}
+  m_SizeDelta: {x: -102.45, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7171448895155585201
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1604847036802696322}
+  m_CullTransparentMesh: 1
+--- !u!114 &3683457587723248287
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1604847036802696322}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
+    m_FontSize: 35
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 9
+    m_MaxSize: 43
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: x4500
+--- !u!114 &637341193158040451
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1604847036802696322}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!1 &1620500987897067397
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3867513225614504927}
+  - component: {fileID: 659509972305410172}
+  - component: {fileID: 6022712760506373807}
+  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 &3867513225614504927
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1620500987897067397}
+  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: 6461324003801111255}
+  - {fileID: 4414665055379570422}
+  m_Father: {fileID: 7683316278918720752}
+  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: 273}
+  m_SizeDelta: {x: 750, y: 130}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &659509972305410172
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1620500987897067397}
+  m_CullTransparentMesh: 1
+--- !u!114 &6022712760506373807
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1620500987897067397}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.176, g: 0.584386, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 620879c9ab62c447b82f0c54e1e88fee, type: 3}
+  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!1 &1627423929816216099
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7683316278918720752}
+  - component: {fileID: 8919061150000976124}
+  - component: {fileID: 6238506829446500568}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: ShopBoxWidget
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7683316278918720752
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1627423929816216099}
+  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: 1
+  m_Children:
+  - {fileID: 3867513225614504927}
+  - {fileID: 7055425102998907742}
+  - {fileID: 2490494365342263418}
+  - {fileID: 4352261052017720437}
+  - {fileID: 8969851006313811870}
+  - {fileID: 8817936495142175916}
+  - {fileID: 3207466882744590469}
+  - {fileID: 8465904066366256985}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 430.39462, y: -821.6802}
+  m_SizeDelta: {x: 780.8893, y: 714}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &8919061150000976124
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1627423929816216099}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: oneButton
+    gameObject: {fileID: 7967887453677892711}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: tenButton
+    gameObject: {fileID: 191353844122783110}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: tenCion
+    gameObject: {fileID: 3683457587723248287}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: onCion
+    gameObject: {fileID: 7005207063398492762}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_AdsFree
+    gameObject: {fileID: 5139080693169076340}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: icon_Oneitem
+    gameObject: {fileID: 114016262386281551}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Icon_TenItem
+    gameObject: {fileID: 6441009988138940280}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_TenFree
+    gameObject: {fileID: 8022165132871542865}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_OneFree
+    gameObject: {fileID: 2196708309164290413}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!114 &6238506829446500568
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1627423929816216099}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: -1
+  m_MinHeight: 714
+  m_PreferredWidth: -1
+  m_PreferredHeight: 714
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!1 &1953635262636332405
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4809136204241921588}
+  - component: {fileID: 8838095293298883802}
+  - component: {fileID: 2830377973774694862}
+  - component: {fileID: 8638404817389974066}
+  - component: {fileID: 5382093378267033303}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: tenCion
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4809136204241921588
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1953635262636332405}
+  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: 8465904066366256985}
+  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: 79.9, y: -1.1}
+  m_SizeDelta: {x: 100, y: 37.56}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8838095293298883802
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1953635262636332405}
+  m_CullTransparentMesh: 1
+--- !u!114 &2830377973774694862
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1953635262636332405}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 43
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u514D\u8D39\u5341\u8FDE\u62BD"
+--- !u!114 &8638404817389974066
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1953635262636332405}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!114 &5382093378267033303
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1953635262636332405}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 940
+--- !u!1 &2282772885020574061
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4414665055379570422}
+  - component: {fileID: 7897218959845423851}
+  - component: {fileID: 4338982966304046699}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: LIne
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4414665055379570422
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2282772885020574061}
+  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: 3867513225614504927}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 0.072509766, y: -546.1}
+  m_SizeDelta: {x: -0.1, y: 551.6}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &7897218959845423851
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2282772885020574061}
+  m_CullTransparentMesh: 1
+--- !u!114 &4338982966304046699
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2282772885020574061}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.05490196, g: 0.4117647, b: 0.9490196, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2716713290235582645
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7601887057069473342}
+  - component: {fileID: 2109934913938688796}
+  - component: {fileID: 6441009988138940280}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_TenItem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7601887057069473342
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2716713290235582645}
+  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: 3207466882744590469}
+  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: -63, y: 75}
+  m_SizeDelta: {x: 42, y: 45}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2109934913938688796
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2716713290235582645}
+  m_CullTransparentMesh: 1
+--- !u!114 &6441009988138940280
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2716713290235582645}
+  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_Coin
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
+  packInfo:
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 6e42cc1f96a3da679f0602631c62812a
+  imageH: 45
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &2720669039826339307
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8969851006313811870}
+  - component: {fileID: 3662656345577876215}
+  - component: {fileID: 1508713389770196219}
+  - component: {fileID: 8051852252537719733}
+  - component: {fileID: 4598138812620446870}
+  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 &8969851006313811870
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2720669039826339307}
+  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: 7683316278918720752}
+  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: 267.5}
+  m_SizeDelta: {x: 595.7, y: 84.5}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3662656345577876215
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2720669039826339307}
+  m_CullTransparentMesh: 1
+--- !u!114 &1508713389770196219
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2720669039826339307}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: a61334e31cf014203a72ff5de1c54c27, type: 3}
+    m_FontSize: 46
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 46
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u62BD\u4EE3\u91D1\u5377"
+--- !u!114 &8051852252537719733
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2720669039826339307}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.131, g: 0.11031579, b: 0.075842105, a: 0.67058825}
+  m_EffectDistance: {x: 1.5, y: -1.5}
+  m_UseGraphicAlpha: 1
+--- !u!114 &4598138812620446870
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2720669039826339307}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_EffectDistance: {x: 3.03, y: -2.77}
+  m_UseGraphicAlpha: 1
+--- !u!1 &3314336736973313898
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6799878124488888821}
+  - component: {fileID: 8793441359962076526}
+  - component: {fileID: 3868606778493837749}
+  - component: {fileID: 2842507757105308458}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: tt (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6799878124488888821
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3314336736973313898}
+  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: 3207466882744590469}
+  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: 1}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8793441359962076526
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3314336736973313898}
+  m_CullTransparentMesh: 1
+--- !u!114 &3868606778493837749
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3314336736973313898}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
+    m_FontSize: 35
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 9
+    m_MaxSize: 43
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "10\u6B21"
+--- !u!114 &2842507757105308458
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3314336736973313898}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!1 &3382203102095908680
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7055425102998907742}
+  - component: {fileID: 8426833975969230274}
+  - component: {fileID: 7386297104449463505}
+  - component: {fileID: 3965687550754287711}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: message
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7055425102998907742
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3382203102095908680}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.000384, y: 1.000384, z: 1.000384}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7683316278918720752}
+  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: -13, y: -86}
+  m_SizeDelta: {x: 558.9, y: 178.5}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8426833975969230274
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3382203102095908680}
+  m_CullTransparentMesh: 1
+--- !u!114 &7386297104449463505
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3382203102095908680}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
+    m_FontSize: 22
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 43
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u6D88\u8017\u5BF9\u5E94\u7684\u91D1\u5E01\u5F00\u542F\u5B9D\u7BB1\uFF0C\u83B7\u5F97\u5927\u81EA\u7136\u7684\u6069\u60E0\uFF0C\u6709\u6982\u7387\u80FD\u83B7\u5F97\u4EE5\u4E0B\u7269\u54C1\uFF08\u82F1\u96C4\u8FDB\u9636\u6750\u6599\u3001
+    \u5404\u79CD\u54C1\u8D28\u7684\u6B66\u5668\uFF09"
+--- !u!114 &3965687550754287711
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3382203102095908680}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!1 &4243376540668156147
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1869103431569688402}
+  - component: {fileID: 9207448055493604835}
+  - component: {fileID: 8022165132871542865}
+  - component: {fileID: 8652045088120880759}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_TenFree
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1869103431569688402
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4243376540668156147}
+  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: 3207466882744590469}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -2, y: -52.103638}
+  m_SizeDelta: {x: 0, y: -37.7928}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9207448055493604835
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4243376540668156147}
+  m_CullTransparentMesh: 1
+--- !u!114 &8022165132871542865
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4243376540668156147}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 24
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 9
+    m_MaxSize: 43
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "1\u5C0F\u65F620\u5206\u949F"
+--- !u!114 &8652045088120880759
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4243376540668156147}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!1 &4899914660764355177
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1802195678649483103}
+  - component: {fileID: 4303440356813300985}
+  - component: {fileID: 7005207063398492762}
+  - component: {fileID: 6747635218176705802}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: onCion
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1802195678649483103
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4899914660764355177}
+  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: 8817936495142175916}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 16.330002, y: 75}
+  m_SizeDelta: {x: -102.45, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4303440356813300985
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4899914660764355177}
+  m_CullTransparentMesh: 1
+--- !u!114 &7005207063398492762
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4899914660764355177}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
+    m_FontSize: 35
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 9
+    m_MaxSize: 43
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: x500
+--- !u!114 &6747635218176705802
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4899914660764355177}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!1 &5405990635821578730
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2604158547287871528}
+  - component: {fileID: 528673476842239041}
+  - component: {fileID: 93835371485559685}
+  - component: {fileID: 1748273484820765212}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: tt
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2604158547287871528
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5405990635821578730}
+  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: 8817936495142175916}
+  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: 1}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &528673476842239041
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5405990635821578730}
+  m_CullTransparentMesh: 1
+--- !u!114 &93835371485559685
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5405990635821578730}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
+    m_FontSize: 35
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 9
+    m_MaxSize: 43
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "1\u6B21"
+--- !u!114 &1748273484820765212
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5405990635821578730}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
+--- !u!1 &5446121015897482731
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2490494365342263418}
+  - component: {fileID: 2923353899689577143}
+  - component: {fileID: 7765581243093959252}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: message (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2490494365342263418
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5446121015897482731}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.000384, y: 1.000384, z: 1.000384}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7683316278918720752}
+  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: -39, y: -288}
+  m_SizeDelta: {x: 558.9, y: 61.5}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2923353899689577143
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5446121015897482731}
+  m_CullTransparentMesh: 1
+--- !u!114 &7765581243093959252
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5446121015897482731}
+  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.745283, g: 0.745283, b: 0.745283, 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: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
+    m_FontSize: 18
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 43
+    m_Alignment: 8
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u53CB\u60C5\u63D0\u793A10\u8FDE\u62BD\u66F4\u5212\u7B97"
+--- !u!1 &6134102237444868300
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4352261052017720437}
+  - component: {fileID: 1819016749044992778}
+  - component: {fileID: 3397795174869949985}
+  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 &4352261052017720437
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6134102237444868300}
+  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: 7683316278918720752}
+  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: -8, y: 108}
+  m_SizeDelta: {x: 457.4, y: 119.82}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1819016749044992778
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6134102237444868300}
+  m_CullTransparentMesh: 1
+--- !u!114 &3397795174869949985
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6134102237444868300}
+  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: 21300000, guid: c85542455e1321046b72902ca82984b4, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: bg_Chest05
+  isNotLoadDeftIcon: 1
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: box
+    packgJsonPath: /Art/UIAssets/TextrueJson\box.txt
+    packgSpritePath: Assets/Res/UIAtlas/box.spriteatlasv2
+    lasetJsonGUID: 400626ea8d256573f3183ae708817184
+  imageH: 119.82
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &7197388528248962072
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8817936495142175916}
+  - component: {fileID: 8308121774079586848}
+  - component: {fileID: 7967887453677892711}
+  - component: {fileID: 2934063472977667771}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: oneButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8817936495142175916
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7197388528248962072}
+  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: 1
+  m_Children:
+  - {fileID: 1802195678649483103}
+  - {fileID: 3392646378689963972}
+  - {fileID: 2604158547287871528}
+  - {fileID: 7739783617243776150}
+  m_Father: {fileID: 7683316278918720752}
+  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: -157, y: -224.3}
+  m_SizeDelta: {x: 253, y: 80}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8308121774079586848
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7197388528248962072}
+  m_CullTransparentMesh: 1
+--- !u!114 &7967887453677892711
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7197388528248962072}
+  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: 2934063472977667771}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &2934063472977667771
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7197388528248962072}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_lingwu
+  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: de4a477140878ce911aa37d161cbf014
+  imageH: 87.3
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &8467925213815132010
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3207466882744590469}
+  - component: {fileID: 4991873065644050646}
+  - component: {fileID: 191353844122783110}
+  - component: {fileID: 2257356165437005101}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: tenButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3207466882744590469
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8467925213815132010}
+  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: 1
+  m_Children:
+  - {fileID: 6332415411013533169}
+  - {fileID: 7601887057069473342}
+  - {fileID: 6799878124488888821}
+  - {fileID: 1869103431569688402}
+  m_Father: {fileID: 7683316278918720752}
+  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: 139, y: -224.3}
+  m_SizeDelta: {x: 253, y: 80}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4991873065644050646
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8467925213815132010}
+  m_CullTransparentMesh: 1
+--- !u!114 &191353844122783110
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8467925213815132010}
+  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: 2257356165437005101}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &2257356165437005101
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8467925213815132010}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: btn_shengji
+  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: de4a477140878ce911aa37d161cbf014
+  imageH: 87.3
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &8747006897807247219
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3392646378689963972}
+  - component: {fileID: 3538941594690751295}
+  - component: {fileID: 114016262386281551}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: icon_Oneitem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3392646378689963972
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8747006897807247219}
+  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: 8817936495142175916}
+  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: -63, y: 75}
+  m_SizeDelta: {x: 42, y: 45}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3538941594690751295
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8747006897807247219}
+  m_CullTransparentMesh: 1
+--- !u!114 &114016262386281551
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8747006897807247219}
+  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_Coin
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 77f77eea85838ad4b8734050364b4892, type: 3}
+  packInfo:
+    packName: daoju
+    packgJsonPath: /Art/UIAssets/TextrueJson\daoju.txt
+    packgSpritePath: Assets/Res/UIAtlas/daoju.spriteatlasv2
+    lasetJsonGUID: 6e42cc1f96a3da679f0602631c62812a
+  imageH: 45
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &9073630664752648267
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6461324003801111255}
+  - component: {fileID: 7638652845185091928}
+  - component: {fileID: 5301042791339863555}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: LIght
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6461324003801111255
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9073630664752648267}
+  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: 3867513225614504927}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -0.08996582, y: -24.000015}
+  m_SizeDelta: {x: -0.18009682, y: 48}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7638652845185091928
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9073630664752648267}
+  m_CullTransparentMesh: 1
+--- !u!114 &5301042791339863555
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9073630664752648267}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19215685, g: 0.75975686, b: 0.9647059, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: ab01a2531c35a4aafb31413b44dd1bcb, type: 3}
+  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

+ 7 - 0
Assets/Res/UI/ShopPanel/ShopBoxWidget.prefab.meta

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

+ 94 - 4
Assets/Res/UI/ShopPanel/ShopPanel.prefab

@@ -642,6 +642,7 @@ RectTransform:
   m_Children:
   - {fileID: 7767981419119361919}
   - {fileID: 9063020841855479781}
+  - {fileID: 4894214820524114754}
   m_Father: {fileID: 2905680765638405999}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -779,6 +780,95 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &1613859667386395745
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4894214820524114754}
+  - component: {fileID: 7868640081471470037}
+  - component: {fileID: 5118293395891478472}
+  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 &4894214820524114754
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1613859667386395745}
+  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: 7462940578605420036}
+  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: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7868640081471470037
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1613859667386395745}
+  m_CullTransparentMesh: 1
+--- !u!114 &5118293395891478472
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1613859667386395745}
+  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: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &1721668562061412658
 GameObject:
   m_ObjectHideFlags: 0
@@ -2033,7 +2123,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 255.475, y: -68.5}
+  m_AnchoredPosition: {x: 335.05, y: -120.742004}
   m_SizeDelta: {x: 510.95, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &7842813008078385302
@@ -2546,7 +2636,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 335.05, y: -50.5644}
+  m_AnchoredPosition: {x: 335.05, y: -0}
   m_SizeDelta: {x: 670.1, y: 54.5037}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &6999563240909971827
@@ -2640,7 +2730,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 0, y: -15}
-  m_SizeDelta: {x: 510.95, y: 68.5}
+  m_SizeDelta: {x: 670.1, y: 120.742004}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &2400125063579921427
 MonoBehaviour:
@@ -2751,7 +2841,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 335.05, y: -100.924614}
+  m_AnchoredPosition: {x: 335.05, y: -60.5037}
   m_SizeDelta: {x: 126.62, y: 54.2383}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &9170186593047094640

+ 4 - 0
Assets/Scenes/testCombat.scene

@@ -2852,6 +2852,10 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 354955946429195138, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3729367683394581911, guid: 77e0e1e49e343a4488ae529b0fecc739, type: 3}
       propertyPath: m_Name
       value: fukong dao2 (1)

+ 10 - 0
Assets/Scripts/GameData/ExcelConfig/DaoyouModelConfig.cs

@@ -144,6 +144,16 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///触发道侣任务必须完成的事件id
+		/// </summary>
+#if !COMBAT_SERVER
+		public int EventCompleteforQuest;
+#else
+		public int EventCompleteforQuest{ set; get; }
+#endif
+		
+
 		/// <summary>
 		///道侣任务ID
 		/// </summary>

+ 80 - 0
Assets/Scripts/GameData/ExcelConfig/InitialPlayerConfig.cs

@@ -0,0 +1,80 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\InitialPlayer.xlsx. SheetName: InitialPlayerConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "InitialPlayerConfig.json")]
+	public partial class InitialPlayerConfigHolder : ConfigHolder<InitialPlayerConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct InitialPlayerConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID
+		/// </summary>
+#if !COMBAT_SERVER
+		public int ID;
+#else
+		public int ID{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///道具id
+		/// </summary>
+#if !COMBAT_SERVER
+		public int[] itemId;
+#else
+		public int[] itemId{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///道具数量
+		/// </summary>
+#if !COMBAT_SERVER
+		public int[] itemAmount;
+#else
+		public int[] itemAmount{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///法宝id
+		/// </summary>
+#if !COMBAT_SERVER
+		public int[] fabaoId;
+#else
+		public int[] fabaoId{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///功法id
+		/// </summary>
+#if !COMBAT_SERVER
+		public int[] gongfaId;
+#else
+		public int[] gongfaId{ set; get; }
+#endif
+		
+
+		/// <summary>
+		///初始神识点数
+		/// </summary>
+#if !COMBAT_SERVER
+		public int shenshiPoint;
+#else
+		public int shenshiPoint{ set; get; }
+#endif
+		
+
+	}
+
+}
+// End of Auto Generated Code

+ 11 - 0
Assets/Scripts/GameData/ExcelConfig/InitialPlayerConfig.cs.meta

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

+ 2 - 2
Assets/Scripts/GameData/ExcelConfig/OpenBoxConfig.cs

@@ -98,9 +98,9 @@ namespace Excel2Json
 		///基础池子
 		/// </summary>
 #if !COMBAT_SERVER
-		public int reward;
+		public int[] reward;
 #else
-		public int reward{ set; get; }
+		public int[] reward{ set; get; }
 #endif
 		
 

+ 1 - 1
Assets/Scripts/GameData/ExcelConfig/OpenBoxProgressReward.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: WX1LtXisUC0H/uyQl3SHBCP4ZVCHMbGjkvlPNVIL9+/rBEN16iqQQ+RYyZQ/
+guid: C38XtS37VnItJ6uq2Hf6GrbR9ARCn2wmEe8NUgQDqtQz8Yyb4y023ZHCymBC
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 1
Assets/Scripts/GameData/ExcelConfig/OpenBoxScoreRule.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: Di9L5HivVnnSe0dMMlLURDvJFEvcdge8qUUoYVuT0ssA+hCYW3ZSjGQTzI3H
+guid: Wi4d4S+uVHMRFi/8dOTskVh7f1XLN0VBhLXTVkVia5/viIf8eaLpYYKZkLnw
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 10 - 0
Assets/Scripts/GameData/ExcelConfig/ShopConfig.cs

@@ -24,6 +24,16 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///商店名字
+		/// </summary>
+#if !COMBAT_SERVER
+		public int shopName;
+#else
+		public int shopName{ set; get; }
+#endif
+		
+
 		/// <summary>
 		///页签所属商店
 		/// </summary>

+ 10 - 0
Assets/Scripts/GameData/ExcelConfig/ShopGroupConfig.cs

@@ -34,6 +34,16 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///页签排序 (小的在前面)
+		/// </summary>
+#if !COMBAT_SERVER
+		public int pageSortNum;
+#else
+		public int pageSortNum{ set; get; }
+#endif
+		
+
 	}
 
 }

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

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillConfig
+// Generate From Excel\skill.xlsx. SheetName: SkillConfig
 
 using System;
 using Fort23.GameData;

+ 1 - 1
Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillConstant
+// Generate From Excel\skill.xlsx. SheetName: SkillConstant
 
 using System;
 using Fort23.GameData;

+ 1 - 1
Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillPowerupConfig
+// Generate From Excel\skill.xlsx. SheetName: SkillPowerupConfig
 
 using System;
 using Fort23.GameData;

+ 2 - 2
Assets/Scripts/GameData/ExcelConfig/SmallPlacesConfig.cs

@@ -45,7 +45,7 @@ namespace Excel2Json
 		
 
 		/// <summary>
-		///完成事件数量
+		///完成多少事件解锁下一个地点
 		/// </summary>
 #if !COMBAT_SERVER
 		public int CompletionEventCount;
@@ -55,7 +55,7 @@ namespace Excel2Json
 		
 
 		/// <summary>
-		///解锁当前地点事件Id
+		///完成某个事件接下下一个地点
 		/// </summary>
 #if !COMBAT_SERVER
 		public int UnlockEnvetid;

+ 52 - 2
Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -1,11 +1,10 @@
 using System.Collections.Generic;
+using System.Linq;
 using Common.Utility.CombatEvent;
 using Core.Utility;
 using Fort23.Core;
 using Fort23.UTool;
-using GameLogic.Equipment;
 using UnityEngine;
-using Utility;
 
 namespace GameLogic.Bag
 {
@@ -180,6 +179,57 @@ namespace GameLogic.Bag
 
             if( count <= 0 )
                 return false;
+
+
+            //法宝
+            if (item.config.itemTag == 11)
+            {
+                AccountFileInfo.FaBaoData faaData =  AccountFileInfo.Instance.playerData.AllFaBaoDatas.FirstOrDefault(f =>
+                    f.id == item.config.associateVlaue[1]);
+                if (faaData != null)
+                {
+                    return AddItem(item.config.associateVlaue[0], 1);
+                }
+                else
+                {
+                    faaData = new AccountFileInfo.FaBaoData();
+                    faaData.id =item.config.associateVlaue[1];
+                    faaData.level = 1;
+                    faaData.useIndex = -1;
+                    AccountFileInfo.Instance.playerData.AllFaBaoDatas.Add(faaData);
+                    return true;
+
+                }
+              
+            }
+            //功法
+            else if  (item.config.itemTag == 13)
+            {
+                AccountFileInfo.SkillData skillData =  AccountFileInfo.Instance.playerData.AllSkillDatas.FirstOrDefault(s =>
+                    s.id == item.config.associateVlaue[1]);
+                if (skillData != null)
+                {
+                     return AddItem(item.config.associateVlaue[0], 1);
+                }
+                else
+                {
+                    skillData = new AccountFileInfo.SkillData();
+                    skillData.id =item.config.associateVlaue[1];
+                    skillData.star = 1;
+                    skillData.level = 1;
+                    skillData.useIndex = -1;
+                    AccountFileInfo.Instance.playerData.AllSkillDatas.Add(skillData);
+                    return true;
+                }
+
+              
+
+            }
+            else if  (item.config.itemTag == 9)
+            {
+                return AddItem(item.config.associateVlaue[0], item.config.associateVlaue[1]);
+            }
+            
             item.count += count;
 
             EventManager.Instance.Dispatch(CustomEventType.ItemUpdate, new ItemUpdateData() { ItemInfo = item, Count = (int)count });

+ 5 - 21
Assets/Scripts/GameLogic/Bag/ItemInfo.cs

@@ -1,26 +1,21 @@
 using Core.Utility;
 using Excel2Json;
 using Fort23.UTool;
-using GameLogic.Equipment;
 
 namespace GameLogic.Bag
 {
     public class ItemInfo
     {
         public readonly int itemID;
-
-        // public int itemID;
+        
         public string guid;
         public EncryptionLong count;
 
         public ItemConfig config;
 
-        /// <summary>
-        /// 非道具时会被初始话,比如掉落的的装备等级,稀有度等等
-        /// </summary>
-        public DropItemConfig dropItemConfig;
+ 
 
-        public EquipmentInfo eqInfo;
+      
 
         public ItemInfo(int itemID, long count = 0)
         {
@@ -31,10 +26,7 @@ namespace GameLogic.Bag
             config = ConfigComponent.Instance.Get<ItemConfig>(itemID);
         }
 
-        public ItemInfo(DropItemConfig dropItemConfig)
-        {
-            this.dropItemConfig = dropItemConfig;
-        }
+      
 
         public ItemInfo(AccountFileInfo.ItemData itemData)
         {
@@ -43,15 +35,7 @@ namespace GameLogic.Bag
             config = ConfigComponent.Instance.Get<ItemConfig>(itemID);
             guid = itemData.guid;
 
-            if (itemData.eqData != null && itemData.eqData.zyEqId != 0)
-            {
-                eqInfo = new EquipmentInfo(itemData.eqData, this);
-                //TODO 如果数量=0,且是穿了的装备,设置数量=1(仅初始化生效),感觉不是很好,看后面有新思路没
-                if (count.Value == 0 && eqInfo.isWear)
-                {
-                    count.Value = 1;
-                }
-            }
+          
         }
 
         public AccountFileInfo.ItemData ToItemData()

+ 3 - 1
Assets/Scripts/GameLogic/Combat/CombatType/StartCombatInfo.cs

@@ -8,6 +8,8 @@
         /// 是否显示战斗结算ui 挂机事件不显示
         /// </summary>
         public bool isCombatOverUi;
-  
+
+        public int monsterLevel;
+
     }
 }

+ 0 - 3
Assets/Scripts/GameLogic/Equipment.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 793e86d25ede49a6a72af09dfbd3709a
-timeCreated: 1733972933

+ 0 - 385
Assets/Scripts/GameLogic/Equipment/EquipmentController.cs

@@ -1,385 +0,0 @@
-using System.Collections.Generic;
-using Excel2Json;
-using Fort23.Mono;
-using Fort23.UTool;
-using GameLogic.Bag;
-using GameLogic.Player;
-using UnityEditor;
-using UnityEngine;
-
-namespace GameLogic.Equipment
-{
-
-    public class EqAddAttribute
-    {
-        public long atk;
-        public long def;
-        public long hp;
-
-        // public void AddAtk(long atk)
-        // {
-        //     this.atk += atk;
-        // }
-        //
-        // public void AddDef(long def)
-        // {
-        //     this.def += def;
-        // }
-        //
-        // public void AddHp(long hp)
-        // {
-        //     this.hp += hp;
-        // }
-    } 
-    
-    public class EquipmentController
-    {
-        /// <summary>
-        /// 所有的装备 按 这个逻辑存储 {职业, {部位, 装备列表}}
-        /// 存在意义:一键换装的时候,可以快速找到目标装备
-        /// 
-        /// </summary>
-        public Dictionary<int, Dictionary<int ,List<ItemInfo>>> allZyEqDic = new Dictionary<int, Dictionary<int ,List<ItemInfo>>>();
-
-        /// <summary>
-        /// 已穿戴的装备
-        /// </summary>
-        public Dictionary<int, List<ItemInfo>> equipZyEqDic = new Dictionary<int, List<ItemInfo>>();
-        
-        /// <summary>
-        /// 职业装备提供的属性
-        /// </summary>
-        public Dictionary<int, EqAddAttribute> zyEqAddAttributeDic = new Dictionary<int, EqAddAttribute>();
-        
-        // private long curGUID;
-
-
-        public EquipmentController()
-        {
-            zyEqAddAttributeDic.Add(1, new EqAddAttribute());
-            zyEqAddAttributeDic.Add(2, new EqAddAttribute());
-            zyEqAddAttributeDic.Add(3, new EqAddAttribute());
-            zyEqAddAttributeDic.Add(4, new EqAddAttribute());
-            
-            equipZyEqDic.Add(1, new List<ItemInfo>());
-            equipZyEqDic.Add(2, new List<ItemInfo>());
-            equipZyEqDic.Add(3, new List<ItemInfo>());
-            equipZyEqDic.Add(4, new List<ItemInfo>());
-        }
-        
-
-    
-
-        private void CalZyEqAddAttribute()
-        {
-            foreach (KeyValuePair<int,List<ItemInfo>> keyValuePair in equipZyEqDic)
-            {
-                int zy = keyValuePair.Key;
-                ResetZyEqAddAttribute(zy);
-                foreach (ItemInfo eqItem in keyValuePair.Value)
-                {
-                    zyEqAddAttributeDic[zy].atk += eqItem.eqInfo.Attack;
-                    zyEqAddAttributeDic[zy].def += eqItem.eqInfo.Defense;
-                    zyEqAddAttributeDic[zy].hp += eqItem.eqInfo.Hp;
-                }
-            }
-        }
-
-        private void ResetZyEqAddAttribute(int zy)
-        {
-            zyEqAddAttributeDic[zy].atk = 0;
-            zyEqAddAttributeDic[zy].def = 0;
-            zyEqAddAttributeDic[zy].hp = 0;
-        }
-
-        /// <summary>
-        /// 通过品质获取装备的额外参数,装备属性会叠加这个值
-        /// </summary>
-        /// <param name="quality"></param>
-        /// <returns></returns>
-        public float GetEquipmentRarityAttributeFactor(int quality)
-        {
-            int[] factors = PlayerManager.Instance.gameConstantConfig.equipmentRarityAttributeFactor;
-            // LogTool.Log(quality);
-            return factors[quality - 1] / (float)100;
-        }
-
-        
-        public ItemInfo BuildEquipment(int equipModelDropID, int qualityDropID, int lvDropID)
-        {
-            ItemInfo info = null;
-            List<ItemInfo> equipModelDropItems = DropManager.Instance.DropItem(equipModelDropID);
-            if (equipModelDropItems == null || equipModelDropItems.Count == 0)
-            {
-                return info;
-            }
-            
-            ItemInfo equipModelInfo = equipModelDropItems[0];
-            
-            List<ItemInfo> qualityDropItems = DropManager.Instance.DropItem(qualityDropID);
-            List<ItemInfo> lvDropItems = DropManager.Instance.DropItem(lvDropID);
-
-            info = equipModelInfo;
-
-            info.eqInfo = new EquipmentInfo();
-            // info.eqInfo.InitEquipment(info.config,
-            //     lvDropItems[0].dropItemConfig.itemID[0], 
-            //     qualityDropItems[0].dropItemConfig.itemID[0]);
-            info.eqInfo.InitEquipment(equipModelInfo, lvDropItems[0], qualityDropItems[0]);
-            
-            return info;
-        }
-        public ItemInfo BuildEquipmentForItemId(int itemId, int qualityDropID, int lvDropID)
-        {
-            ItemInfo info = null;
-
-
-
-            ItemInfo equipModelInfo = new ItemInfo(itemId, 1);
-            
-            List<ItemInfo> qualityDropItems = DropManager.Instance.DropItem(qualityDropID);
-            List<ItemInfo> lvDropItems = DropManager.Instance.DropItem(lvDropID);
-
-            info = equipModelInfo;
-
-            info.eqInfo = new EquipmentInfo();
-            // info.eqInfo.InitEquipment(info.config,
-            //     lvDropItems[0].dropItemConfig.itemID[0], 
-            //     qualityDropItems[0].dropItemConfig.itemID[0]);
-            info.eqInfo.InitEquipment(equipModelInfo, lvDropItems[0], qualityDropItems[0]);
-            
-            return info;
-        }
-
-
-        public bool atLeastOneBetterEq = false;
-        /// <summary>
-        /// 是否有更好的装备
-        /// </summary>
-        /// <param name="isReCal">是否重新计算最好的装备</param>
-        /// <returns></returns>
-        public bool IsBetterEqs(bool isReCal = true)
-        {
-            if (isReCal)
-            {
-                UpdateAllBestEqs();
-            }
-
-            atLeastOneBetterEq = false;
-
-            int count = 0;
-            
-            foreach (KeyValuePair<int,Dictionary<int,ItemInfo>> keyValuePair in allBestEqDic)
-            {
-                int zy = keyValuePair.Key;
-                Dictionary<int, ItemInfo> bwDic = keyValuePair.Value;
-                count += bwDic.Count;
-                // if (bwDic.Count > 0)
-                // {
-                //     // return true;
-                //     count++;
-                // }
-            }
-
-            if (count >= 1)
-            {
-                atLeastOneBetterEq = true;
-            }
-            
-            //有2个以上的职业,有更好准备是再显示最外层的小红点.
-            if (count > 3)
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// 具体职业是否有更好装备
-        /// </summary>
-        /// <param name="zy"></param>
-        /// <returns></returns>
-        public bool IsBetterEqs4OneZy(int zy, bool isReCal = false)
-        {
-            if (isReCal)
-            {
-                UpdateAllBestEqs();
-            }
-            if (allBestEqDic != null)
-            {
-                if (allBestEqDic.TryGetValue(zy, out var bwDic))
-                {
-                    if (bwDic.Count > 0)
-                    {
-                        return true;
-                    }
-                } 
-                
-            }
-
-            return false;
-        }
-
-
-        public Dictionary<int, Dictionary<int, ItemInfo>> allBestEqDic;
-        /// <summary>
-        /// 计算所有职业最好的装备,用于小红点
-        /// allBestEqDic里面存的,就是所有职业,最好的装备
-        /// </summary>
-        /// <returns></returns>
-        public Dictionary<int, Dictionary<int, ItemInfo>> UpdateAllBestEqs()
-        {
-            allBestEqDic = new Dictionary<int, Dictionary<int, ItemInfo>>();
-
-            allBestEqDic.Add(1, GetZyBestEqs(1));
-            allBestEqDic.Add(2, GetZyBestEqs(2));
-            allBestEqDic.Add(3, GetZyBestEqs(3));
-            allBestEqDic.Add(4, GetZyBestEqs(4));
-            return allBestEqDic;
-        }
-
-        public Dictionary<int, ItemInfo> GetZyBestEqs(int zy)
-        {
-            Dictionary<int, ItemInfo> bestEqDic = new Dictionary<int, ItemInfo>();
-            bool changed = false;
-            //拿到这个职业的所有部位的装备,bwDic就是一个按部位划分的字典key=部位,value=这个部位下的所有装备
-            if (allZyEqDic.TryGetValue(zy, out var bwDic))
-            {
-                foreach (KeyValuePair<int, List<ItemInfo>> keyValuePair in bwDic)
-                {
-                    ItemInfo bestBwEq = null;
-                    foreach (ItemInfo bwItem in keyValuePair.Value)
-                    {
-                        // if (bwItem.eqInfo.isWear)
-                        // {
-                        //     continue;
-                        // }
-                        // bwItem.eqInfo.isEquip = false;
-                        if (bestBwEq == null)
-                        {
-                            bestBwEq = bwItem;
-                            continue;
-                        }
-
-                        if (bwItem.eqInfo.Attack > bestBwEq.eqInfo.Attack ||
-                            bwItem.eqInfo.Defense > bestBwEq.eqInfo.Defense ||
-                            bwItem.eqInfo.Hp > bestBwEq.eqInfo.Hp)
-                        {
-                            bestBwEq = bwItem;
-                        }
-                    }
-
-                    if (bestBwEq != null)
-                    {
-                        if(!bestBwEq.eqInfo.isWear)
-                            bestEqDic.Add(keyValuePair.Key, bestBwEq);
-                    }
-                }
-            }
-            
-            return bestEqDic;
-        }
-
-        /// <summary>
-        /// 一键穿职业装备
-        /// 把对应职业,对应部位的,最好的装备找出来
-        /// </summary>
-        /// <param name="zy"></param>
-        /// <returns>true = 有装备变动 </returns>
-        public bool QuickEquip(int zy)
-        {
-            bool changed = false;
-            //拿到这个职业的所有部位的装备,bwDic就是一个按部位划分的字典key=部位,value=这个部位下的所有装备
-            if (allZyEqDic.TryGetValue(zy, out var bwDic))
-            {
-                foreach (KeyValuePair<int, List<ItemInfo>> keyValuePair in bwDic)
-                {
-                    ItemInfo bestBwEq = null;
-                    foreach (ItemInfo bwItem in keyValuePair.Value)
-                    {
-                        // if (bwItem.eqInfo.isWear)
-                        // {
-                        //     continue;
-                        // }
-                        // bwItem.eqInfo.isEquip = false;
-                        if (bestBwEq == null)
-                        {
-                            bestBwEq = bwItem;
-                            continue;
-                        }
-
-                        if (bwItem.eqInfo.Attack > bestBwEq.eqInfo.Attack ||
-                            bwItem.eqInfo.Defense > bestBwEq.eqInfo.Defense ||
-                            bwItem.eqInfo.Hp > bestBwEq.eqInfo.Hp)
-                        {
-                            bestBwEq = bwItem;
-                        }
-                    }
-
-                
-                }
-            }
-            
-            return changed;
-        }
-
-
-      
-        /// <summary>
-        /// 穿/脱 装备的逻辑
-        /// </summary>
-        /// <param name="equip">穿or脱</param>
-        /// <param name="eqItemInfo">装备item</param>
-        public void EquipLogic(bool equip, ItemInfo eqItemInfo)
-        {
-            eqItemInfo.eqInfo.isWear = equip;
-            if (equip)
-            {
-                eqItemInfo.count.Value--;
-            }
-            else
-            {
-                eqItemInfo.count.Value++;
-            }
-        }
-        
-     
-
-        // public void RemoveEquipment(ItemInfo eqItemInfo)
-        // {
-        //     if (eqItemInfo.eqInfo == null)
-        //     {
-        //         return;
-        //     }
-        //
-        //     int zy = eqItemInfo.eqInfo.basicEquipConfig.profession;
-        //     int bw = eqItemInfo.eqInfo.basicEquipConfig.Type;
-        //
-        //     if (allZyEqDic.TryGetValue(zy, out var bwDic))
-        //     {
-        //         if (bwDic.TryGetValue(bw, out var eqList))
-        //         {
-        //             eqList.Remove(eqItemInfo);
-        //         }
-        //         else
-        //         {
-        //             LogTool.Error("移除一个在背包不存在的(bw),装备: guid=" + eqItemInfo.guid + "   职业=" + zy);
-        //         }
-        //     }
-        //     else
-        //     {
-        //         LogTool.Error("移除一个在背包不存在的(zy),装备: guid=" + eqItemInfo.guid + "   职业=" + zy);
-        //     }
-        //     
-        //     // if (zyEqDic.ContainsKey(pro) && zyEqDic[pro].Contains(eqItemInfo))
-        //     // {
-        //     //     zyEqDic[pro].Remove(eqItemInfo);
-        //     // }
-        //     // else
-        //     // {
-        //     //     LogTool.Error("移除一个在背包不存在的,装备: guid=" + eqItemInfo.guid + "   职业=" + pro);
-        //     // }
-        // }
-    }
-}

+ 0 - 3
Assets/Scripts/GameLogic/Equipment/EquipmentController.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: e500f6fe8ab6455fa93b387c4448457b
-timeCreated: 1734007348

+ 0 - 89
Assets/Scripts/GameLogic/Equipment/EquipmentInfo.cs

@@ -1,89 +0,0 @@
-
-using Core.Utility;
-using Excel2Json;
-using Fort23.UTool;
-using UnityEngine;
-using ItemInfo = GameLogic.Bag.ItemInfo;
-
-namespace GameLogic.Equipment
-{
-    public class EquipmentInfo
-    {
-     
-        // public ItemConfig itemConfig;
-        // public ItemInfo itemInfo;
-        // public int count;
-        public int quality;
-
-        public int zy;
-        public int level;
-
-        public int dropLv;
-        
-        public bool isWear;
-        
-        public int Attack => m_Attack;
-        public int Defense => m_Defense;
-        public int Hp => m_HP;
-    
-
-        private int m_Attack;
-        private int m_Defense;
-        private int m_HP;
-
-        private ItemInfo myItemInfo;
-
-        public EquipmentInfo(AccountFileInfo.EqData eqData, ItemInfo itemInfo)
-        {
-            myItemInfo = itemInfo;
-            isWear = eqData.isEquip;
-            
-        
-            quality = eqData.quality;
-
-            // CalAtt();
-        }
-
-        public EquipmentInfo()
-        {
-            
-        }
-
-
-        public void InitEquipment(ItemInfo modelInfo, ItemInfo lvInfo, ItemInfo qualityInfo)
-        {
-            //有效性检查
-            if (//modelInfo.dropItemConfig.dropItemType != 1 && 
-                lvInfo.dropItemConfig.dropItemType != 3 &&
-                qualityInfo.dropItemConfig.dropItemType != 2)
-            {
-                // string errorTip = "modelInfo.dropItemConfig.dropItemType=" +
-                //                   modelInfo.dropItemConfig.dropItemType +
-                //                   " |lvInfo.dropItemConfig.dropItemType" +
-                //                   lvInfo.dropItemConfig.dropItemType +
-                //                   " |qualityInfo.dropItemConfig.dropItemType" +
-                //                   qualityInfo.dropItemConfig.dropItemType;
-                // LogTool.Error(errorTip);
-            }
-
-            myItemInfo = modelInfo;
-            InitEquipment(modelInfo.config.ID, 
-                lvInfo.dropItemConfig.itemID[0], 
-                qualityInfo.dropItemConfig.itemID[0]);
-        }
-        
-        public void InitEquipment(int itemID, int dropLv, int quality)
-        {
-            // itemInfo = new ItemInfo(itemID);
-
-            
-        
-        }
-        
-
-
-     
-        
-    }
-    
-}

+ 0 - 3
Assets/Scripts/GameLogic/Equipment/EquipmentInfo.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 61d2b3a5903c4ae2b79e084ede48c8d1
-timeCreated: 1733972948

+ 66 - 77
Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -65,6 +65,8 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         /// </summary>
         public HeroData heroData;
 
+        public HeroData yindaoHeroData;
+
         public int CurrentZuiZhongEventListId;
 
         public List<DaoYouData> daoYouDatas = new List<DaoYouData>();
@@ -140,7 +142,6 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         public bool boxFree;
 
         public bool isTiggerPlot;
-
     }
 
 
@@ -293,7 +294,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
     /// <summary>
     /// 小地图数据
     /// </summary>
-   [System.Serializable]
+    [System.Serializable]
     public class SmallPlacesData
     {
         public int id;
@@ -404,6 +405,8 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
 
         public int eventID;
 
+        public int heroLevel;
+
         public List<ItemData> itemInfos = new List<ItemData>();
 
         public List<EventLinkData> eventLinks = new List<EventLinkData>();
@@ -415,26 +418,52 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         public bool isCompleted;
     }
 
+    [System.Serializable]
     public class SummonData
     {
         // 招募ID
         public int id;
 
         //免费招募次数
-        public int freeCount;
+        public int oneFreeCount;
 
         //下一次免费招募时间
-        public long nextFreeTime;
+        public long nextOneFreeTime;
+
+        //十连招募次数
+        public int tenFreeCount;
 
-        //付费招募次数
-        public int payCount;
+        //下一次十连招募时间
+        public long nextTenFreeTime;
 
-        //下一次付费招募时间
-        public long nextPayTime;
+        public int onePayCount;
+        public int tenPayCount;
 
         //保底次数
         public int baodiCount1;
         public int baodiCount2;
+
+        // 存储最近几次十连抽的结果
+        public List<IntList> drawHistory = new List<IntList>();
+
+        public int score;
+
+        public List<SummonSocreData> summonSocreData = new List<SummonSocreData>();
+        
+        public bool isSummonSocre;
+    }
+    
+    [System.Serializable]
+    public class IntList
+    {
+        public List<int> list;
+    }
+
+    [System.Serializable]
+    public class SummonSocreData
+    {
+        public int id;
+        public int count;
     }
 
 
@@ -623,92 +652,52 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
     /// </summary>
     public void ClearInitPlayerData()
     {
-        ItemData coin = new ItemData(GlobalParam.Item_Coin_ID, 0);
-
-        ItemData diamond = new ItemData(GlobalParam.Item_Diamond_ID);
-
-        ItemData heroExp = new ItemData(GlobalParam.Item_HeroExp_ID, 0);
-
-        playerData.ItemListData.Add(coin);
-        playerData.ItemListData.Add(diamond);
-        playerData.ItemListData.Add(heroExp);
-
-        // DaoYouData daoYouData = new DaoYouData();
-        // daoYouData.id = 1;
-        // daoYouData.favorabilityLv = 1;
-        // playerData.daoYouDatas.Add(daoYouData);
-
-
-        //测试道具
-        playerData.ItemListData.Add(new ItemData(1201, 10));
-        playerData.ItemListData.Add(new ItemData(1202, 10));
-
-        playerData.ItemListData.Add(new ItemData(1301, 10));
-        playerData.ItemListData.Add(new ItemData(1302, 10));
-        playerData.ItemListData.Add(new ItemData(1303, 10));
-        playerData.ItemListData.Add(new ItemData(1304, 10));
-        //
-        playerData.ItemListData.Add(new ItemData(1401, 10));
-        playerData.ItemListData.Add(new ItemData(1402, 10));
-        playerData.ItemListData.Add(new ItemData(1403, 10));
-        playerData.ItemListData.Add(new ItemData(1404, 10));
-        playerData.ItemListData.Add(new ItemData(1601, 10));
-
-        playerData.ItemListData.Add(new ItemData(21012, 10));
-        playerData.ItemListData.Add(new ItemData(21013, 10));
-
-
-        playerData.ItemListData.Add(new ItemData(21001, 10));
-        playerData.ItemListData.Add(new ItemData(21002, 10));
-        playerData.ItemListData.Add(new ItemData(21003, 10));
-
-        // var allSkill = new[] { 1101};
-        // foreach (var i in allSkill)
-        // {
-        //     SkillData skillData = new SkillData();
-        //     skillData.id = i;
-        //     skillData.star = 1;
-        //     skillData.level = 1;
-        //     skillData.useIndex = -1;
-        //     playerData.AllSkillDatas.Add(skillData);
-        // }
-
-
-        //添加所有测试法宝和功法
-
-        List<SkillConfig> fabaoPowerupConfigs = ConfigComponent.Instance.GetAll<SkillConfig>().ToList();
-        List<SkillConfig> gongfa = fabaoPowerupConfigs.Where(s => s.SkillType == 1 || s.SkillType == 2).ToList();
-
-        var fanappower = gongfa.GroupBy(f => f.IDGroup).Select(g => new { config = g.OrderBy(f => f.ID).FirstOrDefault() }).ToList();
-        foreach (var x1 in fanappower)
+        //初始化道具
+        InitialPlayerConfig initialPlayerConfig = ConfigComponent.Instance.Get<InitialPlayerConfig>(1);
+        for (var i = 0; i < initialPlayerConfig.itemId.Length; i++)
         {
-            SkillData skillData = new SkillData();
-            skillData.id = x1.config.IDGroup;
-            skillData.star = 1;
-            skillData.level = 1;
-            skillData.useIndex = -1;
-            playerData.AllSkillDatas.Add(skillData);
+            ItemData coin = new ItemData(initialPlayerConfig.itemId[i], initialPlayerConfig.itemAmount[i]);
+            playerData.ItemListData.Add(coin);
         }
 
-        FabaoConfig[] fabaoConfig = ConfigComponent.Instance.GetAll<FabaoConfig>();
 
-        foreach (var i in fabaoConfig)
+        //初始化法宝
+        for (var i = 0; i < initialPlayerConfig.fabaoId.Length; i++)
         {
             FaBaoData faaData = new FaBaoData();
-            faaData.id = i.ID;
+            faaData.id = initialPlayerConfig.fabaoId[i];
             faaData.level = 1;
-            faaData.useIndex = -1;
+            faaData.useIndex = i;
             playerData.AllFaBaoDatas.Add(faaData);
         }
 
+        //初始化功法
+        for (var i = 0; i < initialPlayerConfig.gongfaId.Length; i++)
+        {
+            SkillData skillData = new SkillData();
+            skillData.id = initialPlayerConfig.gongfaId[i];
+            skillData.star = 1;
+            skillData.level = 1;
+            skillData.useIndex = i;
+            playerData.AllSkillDatas.Add(skillData);
+        }
 
+        playerData.divineSensePoint = initialPlayerConfig.shenshiPoint;
+
+        //添加英雄数据
         HeroData heroData = new HeroData();
         playerData.heroData = heroData;
         heroData.heroModelId = 101;
         heroData.heroPowerId = 1;
         heroData.upTime = TimeHelper.ClientNow();
 
-        //添加第一关
+        HeroData yindaoHeroData = new HeroData();
+        playerData.yindaoHeroData = yindaoHeroData;
+        yindaoHeroData.heroModelId = 101;
+        yindaoHeroData.heroPowerId = 200;
+        yindaoHeroData.upTime = TimeHelper.ClientNow();
+
+        //添加第一关地图数据
         PlacesData placesData = new PlacesData();
         placesData.id = 1;
         playerData.placesDatas.Add(placesData);

+ 50 - 36
Assets/Scripts/GameLogic/Player/DropManager.cs

@@ -142,48 +142,62 @@ namespace GameLogic.Player
         {
             int rIdx = Random.Next(0, dropItemID.Length);
 
-            // DropItemConfig rDropItemConfig = ConfigComponent.Instance.Get<DropItemConfig>(dropItemID[rIdx]);
-
-            // for (int i = 0; i < dropItemID.Length; i++)
-            // {
-            //DropItemConfig dropItemConfig = ConfigComponent.Instance.Get<DropItemConfig>(dropItemID[i]);
             DropItemConfig dropItemConfig = ConfigComponent.Instance.Get<DropItemConfig>(dropItemID[rIdx]);
-            for (int j = 0; j < dropItemConfig.itemID.Length; j++)
-            {
-                int c = 0;
-                if (dropItemConfig.dropCountGoupID > 0)
-                {
-                    DropCountConfig dropCountConfig = GetCountBl(dropItemConfig.dropCountGoupID);
-                    c = (dropItemConfig.dropMaxV * dropCountConfig.proportion) / 100;
-                }
-                else
-                {
-                    c = Random.Next(dropItemConfig.dropMinV, dropItemConfig.dropMaxV + 1);
-                }
 
+            int itemIndex = Random.Next(0, dropItemConfig.itemID.Length);
 
-                ItemInfo itemInfo = null;
-
-
-                if (dropItemConfig.dropItemType == 1)
-                {
-                    if (c < 0)
-                    {
-                        itemInfo = DropResourceLevel(dropItemConfig.itemID[j], c);
-                    }
-                    else
-                    {
-                        itemInfo = new ItemInfo(dropItemConfig.itemID[j], c);
-                    }
-                }
-                else
-                {
-                    itemInfo = new ItemInfo(dropItemConfig);
-                }
 
+            int c = 0;
+            if (dropItemConfig.dropCountGoupID > 0)
+            {
+                DropCountConfig dropCountConfig = GetCountBl(dropItemConfig.dropCountGoupID);
+                c = (dropItemConfig.dropMaxV * dropCountConfig.proportion) / 100;
+            }
+            else
+            {
+                c = Random.Next(dropItemConfig.dropMinV, dropItemConfig.dropMaxV + 1);
+            }
 
-                itemInfos.Add(itemInfo);
+            ItemInfo itemInfo = null;
+            if (c < 0)
+            {
+                itemInfo = DropResourceLevel(dropItemConfig.itemID[itemIndex], c);
             }
+            else
+            {
+                itemInfo = new ItemInfo(dropItemConfig.itemID[itemIndex], c);
+            }
+
+            itemInfos.Add(itemInfo);
+            // for (int j = 0; j < dropItemConfig.itemID.Length; j++)
+            // {
+            //     int c = 0;
+            //     if (dropItemConfig.dropCountGoupID > 0)
+            //     {
+            //         DropCountConfig dropCountConfig = GetCountBl(dropItemConfig.dropCountGoupID);
+            //         c = (dropItemConfig.dropMaxV * dropCountConfig.proportion) / 100;
+            //     }
+            //     else
+            //     {
+            //         c = Random.Next(dropItemConfig.dropMinV, dropItemConfig.dropMaxV + 1);
+            //     }
+            //
+            //
+            //     ItemInfo itemInfo = null;
+            //
+            //
+            //     if (c < 0)
+            //     {
+            //         itemInfo = DropResourceLevel(dropItemConfig.itemID[j], c);
+            //     }
+            //     else
+            //     {
+            //         itemInfo = new ItemInfo(dropItemConfig.itemID[j], c);
+            //     }
+            //
+            //
+            //     itemInfos.Add(itemInfo);
+            // }
         }
 
         private DropCountConfig GetCountBl(int dropCountGroupID)

+ 20 - 7
Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -1,16 +1,12 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using Core.Language;
 using Core.Utility;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Bag;
-using GameLogic.Combat.CombatTool;
 using GameLogic.CombatScenesTool;
-using GameLogic.Equipment;
 using GameLogic.Hero;
 using GameLogic.Player;
 using UnityEngine;
@@ -36,6 +32,9 @@ public class PlayerManager : Singleton<PlayerManager>
     /// </summary>
     public HeroInfo myHero;
 
+    public HeroInfo yindaoHeroData;
+
+
     public long serverTime => TimeHelper.ServerNow();
     private AccountFileInfo.SmallPlacesData currentPlaces;
 
@@ -283,6 +282,12 @@ public class PlayerManager : Singleton<PlayerManager>
         myHero = heroInfo;
         myHero.TaoismSkillId = 601011;
 
+
+        HeroInfo yindaoHeroData = new HeroInfo();
+        yindaoHeroData.InitHero(AccountFileInfo.Instance.playerData.yindaoHeroData);
+        yindaoHeroData = heroInfo;
+        yindaoHeroData.TaoismSkillId = 601011;
+
         BagController.Init();
 
         //初始化关卡
@@ -354,6 +359,17 @@ public class PlayerManager : Singleton<PlayerManager>
                 TimeHelper.GetBaseRefreshTime(TimeHelper.ClientNow());
             AccountFileInfo.Instance.playerData.todayUseExpElixrPanelCount = 0;
             AccountFileInfo.Instance.playerData.todayDivineSensePoint = 0;
+
+            foreach (var playerDataSummonData in AccountFileInfo.Instance.playerData.SummonDatas)
+            {
+                playerDataSummonData.onePayCount = 0;
+                playerDataSummonData.tenPayCount = 0;
+                playerDataSummonData.oneFreeCount = 0;
+                playerDataSummonData.nextOneFreeTime = 0;
+                playerDataSummonData.tenFreeCount = 0;
+                playerDataSummonData.nextTenFreeTime = 0;
+            }
+
             AccountFileInfo.Instance.SavePlayerData();
         }
 
@@ -643,19 +659,16 @@ public class PlayerManager : Singleton<PlayerManager>
         if (tian > 0)
         {
             return $"{tian}天{xiaoShi}小時";
-            // return string.Format(LanguageManager.Instance.Text(818), tian, xiaoShi);
         }
         else
         {
             if (xiaoShi <= 0 && fen <= 59)
             {
                 return $"{fen}分{miao}秒";
-                // return string.Format(LanguageManager.Instance.Text(819), fen, miao);
             }
             else
             {
                 return $"{xiaoShi}小時{fen}分";
-                // return string.Format(LanguageManager.Instance.Text(820), xiaoShi, fen);
             }
         }
     }

+ 162 - 11
Assets/Scripts/GameLogic/Player/SummonManager.cs

@@ -4,6 +4,7 @@ using Excel2Json;
 using Fort23.UTool;
 using GameLogic.Bag;
 using UnityEngine;
+using UnityEngine.UIElements;
 using Utility;
 
 namespace GameLogic.Player
@@ -12,6 +13,9 @@ namespace GameLogic.Player
     {
         public Map<int, AccountFileInfo.SummonData> summonDataMap = new Map<int, AccountFileInfo.SummonData>();
 
+        //积分规则
+        public Map<int, List<OpenBoxScoreRule>> openBoxScoreRuleMap = new Map<int, List<OpenBoxScoreRule>>();
+
         public void CustomInit()
         {
             OpenBoxConfig[] openBoxConfigs = ConfigComponent.Instance.GetAll<OpenBoxConfig>();
@@ -27,6 +31,21 @@ namespace GameLogic.Player
                 }
             }
 
+            OpenBoxScoreRule[] openBoxScoreRules = ConfigComponent.Instance.GetAll<OpenBoxScoreRule>();
+            foreach (var openBoxScoreRule in openBoxScoreRules)
+            {
+                List<OpenBoxScoreRule> openBoxScoreRuleList;
+                if (!openBoxScoreRuleMap.ContainsKey(openBoxScoreRule.openBoxID))
+                {
+                    openBoxScoreRuleList = new List<OpenBoxScoreRule>();
+                    openBoxScoreRuleMap[openBoxScoreRule.openBoxID] = openBoxScoreRuleList;
+                }
+
+                openBoxScoreRuleList = openBoxScoreRuleMap[openBoxScoreRule.openBoxID];
+                openBoxScoreRuleList.Add(openBoxScoreRule);
+            }
+
+
             foreach (var playerDataSummonData in AccountFileInfo.Instance.playerData.SummonDatas)
             {
                 if (!summonDataMap.ContainsKey(playerDataSummonData.id))
@@ -47,11 +66,12 @@ namespace GameLogic.Player
             if (count == 1)
             {
                 //有免费次数,并且让到时间了就免费抽
-                if (summonData.freeCount < openBoxConfig.oneConsumeFreePara[1] && PlayerManager.Instance.serverTime >= summonData.nextFreeTime)
+                if (summonData.oneFreeCount < openBoxConfig.oneConsumeFreePara[1] && PlayerManager.Instance.serverTime >= summonData.nextOneFreeTime)
                 {
                     allIitem = Summon(summonData, 1);
 
-                    summonData.nextFreeTime = PlayerManager.Instance.serverTime + openBoxConfig.oneConsumeFreePara[0] * 1000;
+                    summonData.oneFreeCount++;
+                    summonData.nextOneFreeTime = PlayerManager.Instance.serverTime + openBoxConfig.oneConsumeFreePara[0] * 1000;
                 }
                 else
                 {
@@ -61,7 +81,8 @@ namespace GameLogic.Player
                         PlayerManager.Instance.BagController.DeductCoin(openBoxConfig.oneConsume);
                         allIitem = Summon(summonData, 1);
 
-                        summonData.nextFreeTime = PlayerManager.Instance.serverTime + openBoxConfig.oneConsumeFreePara[0] * 1000;
+                        summonData.onePayCount++;
+                        //summonData.nextOneFreeTime = PlayerManager.Instance.serverTime + openBoxConfig.oneConsumeFreePara[0] * 1000;
                     }
                     else
                     {
@@ -73,11 +94,28 @@ namespace GameLogic.Player
             else if (count == 10)
             {
                 //有免费次数,并且让到时间了就免费抽
-                if (summonData.payCount < openBoxConfig.oneConsumeFreePara_1[1] && PlayerManager.Instance.serverTime >= summonData.nextPayTime)
+                if (summonData.tenFreeCount < openBoxConfig.oneConsumeFreePara_1[1] && PlayerManager.Instance.serverTime >= summonData.nextTenFreeTime)
                 {
                     allIitem = Summon(summonData, 10);
+                    if (summonData.isSummonSocre)
+                    {
+                        //记录抽卡道具 用于成就检测
+                        List<int> drawHistory = new List<int>();
+                        foreach (var itemInfo in allIitem)
+                        {
+                            drawHistory.Add(itemInfo.itemID);
+                        }
+
+                        AccountFileInfo.IntList  intList = new AccountFileInfo.IntList();
+                        intList.list = drawHistory;
+                        summonData.drawHistory.Add(intList);
+                        CheckAchievements(summonData);
+                    }
+                    
+                   
 
-                    summonData.nextPayTime = PlayerManager.Instance.serverTime + openBoxConfig.oneConsumeChargePara[0] * 1000;
+                    summonData.tenFreeCount++;
+                    summonData.nextTenFreeTime = PlayerManager.Instance.serverTime + openBoxConfig.oneConsumeFreePara_1[0] * 1000;
                 }
                 else
                 {
@@ -86,7 +124,24 @@ namespace GameLogic.Player
                     {
                         PlayerManager.Instance.BagController.DeductCoin(openBoxConfig.tenConsume);
                         allIitem = Summon(summonData, 10);
-                        summonData.nextPayTime = PlayerManager.Instance.serverTime + openBoxConfig.oneConsumeChargePara[0] * 1000;
+                        if (summonData.isSummonSocre)
+                        {
+                            //记录抽卡道具 用于成就检测
+                            List<int> drawHistory = new List<int>();
+                            foreach (var itemInfo in allIitem)
+                            {
+                                drawHistory.Add(itemInfo.itemID);
+                            }
+                            AccountFileInfo.IntList  intList = new AccountFileInfo.IntList();
+                            intList.list = drawHistory;
+                            summonData.drawHistory.Add(intList);
+
+
+                            CheckAchievements(summonData);
+                        }
+
+                        summonData.tenPayCount++;
+                        //summonData.nextTenFreeTime = PlayerManager.Instance.serverTime + openBoxConfig.oneConsumeChargePara[0] * 1000;
                     }
                     else
                     {
@@ -95,6 +150,7 @@ namespace GameLogic.Player
                 }
             }
 
+            AccountFileInfo.Instance.SavePlayerData();
             return allIitem;
         }
 
@@ -120,13 +176,14 @@ namespace GameLogic.Player
                 }
             }
 
+            int index = 0;
 
             for (int i = 0; i < count; i++)
             {
                 isBoadi2 = false;
 
                 //十连保底1 每10次十连必出这个池子
-                if (summonData.baodiCount1 >= 10)
+                if (summonData.baodiCount1 >= 9)
                 {
                     List<ItemInfo> addItem = DropManager.Instance.DropItem(openBoxConfig.reward1);
                     PlayerManager.Instance.BagController.AddItem(addItem);
@@ -156,10 +213,22 @@ namespace GameLogic.Player
                     continue;
                 }
 
-                List<ItemInfo> addItem2 = DropManager.Instance.DropItem(openBoxConfig.reward);
-                PlayerManager.Instance.BagController.AddItem(addItem2);
-                allIitem.AddRange(addItem2);
-                summonData.baodiCount1++;
+                List<ItemInfo> addItem2;
+                if (count == 1)
+                {
+                    addItem2 = DropManager.Instance.DropItem(openBoxConfig.reward[Random.Range(0, openBoxConfig.reward.Length)]);
+                    PlayerManager.Instance.BagController.AddItem(addItem2);
+                    allIitem.AddRange(addItem2);
+                    summonData.baodiCount1++;
+                }
+                else
+                {
+                    addItem2 = DropManager.Instance.DropItem(openBoxConfig.reward[index]);
+                    PlayerManager.Instance.BagController.AddItem(addItem2);
+                    allIitem.AddRange(addItem2);
+                    summonData.baodiCount1++;
+                    index++;
+                }
 
 
                 foreach (var baodiItem in baodiItems)
@@ -182,5 +251,87 @@ namespace GameLogic.Player
             AccountFileInfo.Instance.SavePlayerData();
             return allIitem;
         }
+
+
+        // 检查成就匹配
+        private void CheckAchievements(AccountFileInfo.SummonData summonData)
+        {
+            List<OpenBoxScoreRule> openBoxScoreRuleList = openBoxScoreRuleMap[summonData.id];
+
+            List<OpenBoxScoreRule> daChengOpenBoxScoreRuleList = new List<OpenBoxScoreRule>();
+            foreach (var openBoxScoreRule in openBoxScoreRuleList)
+            {
+                // 检查连续 Para0 次十连
+                if (summonData.drawHistory.Count < openBoxScoreRule.para0) continue;
+
+                bool allDrawsSatisfy = true;
+                // 检查最近 Para0 次十连是否都满足条件
+                for (int i = summonData.drawHistory.Count - openBoxScoreRule.para0; i < summonData.drawHistory.Count; i++)
+                {
+                    if (!CheckSingleDraw(openBoxScoreRule, summonData.drawHistory[i].list))
+                    {
+                        allDrawsSatisfy = false;
+                        break;
+                    }
+                }
+
+                if (allDrawsSatisfy)
+                {
+                    daChengOpenBoxScoreRuleList.Add(openBoxScoreRule);
+                }
+            }
+
+            if (daChengOpenBoxScoreRuleList.Count > 0)
+            {
+                int id = daChengOpenBoxScoreRuleList.Max(obsr => obsr.ID);
+                OpenBoxScoreRule openBoxScoreRule = ConfigComponent.Instance.Get<OpenBoxScoreRule>(id);
+                summonData.score += openBoxScoreRule.score;
+
+                AccountFileInfo.SummonSocreData summonSocreData = summonData.summonSocreData.FirstOrDefault(ss => ss.id == openBoxScoreRule.ID);
+                if (summonSocreData == null)
+                {
+                    summonSocreData = new AccountFileInfo.SummonSocreData();
+                    summonSocreData.id = id;
+                    summonData.summonSocreData.Add(summonSocreData);
+                }
+
+                summonSocreData.count++;
+                LogTool.Log($"达成成就 ID: {openBoxScoreRule.ID}, 分数: {openBoxScoreRule.score}, 描述: 连续{openBoxScoreRule.para0}次十连获得{openBoxScoreRule.para1}个品质{openBoxScoreRule.para3}的道具");
+            }
+        }
+
+
+        // 检查单次十连是否满足成就条件
+        private bool CheckSingleDraw(OpenBoxScoreRule openBoxScoreRule, List<int> drawResult)
+        {
+            // 统计符合条件的道具数量
+            int validItemCount = 0;
+            foreach (var item in drawResult)
+            {
+                ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(item);
+                // 检查道具标签
+                if (!openBoxScoreRule.para4.Contains(itemConfig.itemTag)) continue;
+
+                // 检查品质是否符合
+                bool qualityMatch = false;
+                switch (openBoxScoreRule.para2)
+                {
+                    case 1: // 等于
+                        qualityMatch = itemConfig.quality == openBoxScoreRule.para3;
+                        break;
+                    case 2: // 大于等于
+                        qualityMatch = itemConfig.quality >= openBoxScoreRule.para3;
+                        break;
+                    case 3: // 小于等于
+                        qualityMatch = itemConfig.quality <= openBoxScoreRule.para3;
+                        break;
+                }
+
+                if (qualityMatch) validItemCount++;
+            }
+
+            // 根据 Para1 判断是否满足数量要求
+            return validItemCount >= openBoxScoreRule.para1;
+        }
     }
 }

+ 2 - 1
Assets/Scripts/GameUI/Combat/CombatDrive.cs

@@ -57,7 +57,7 @@ namespace GameLogic.Combat
             StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
         }
 
-        public async CTask LoadLevelBattleCombat(int levelBattleId, bool isCombatOverUi, System.Action<bool> caombatFinish)
+        public async CTask LoadLevelBattleCombat(int levelBattleId, bool isCombatOverUi,int level, System.Action<bool> caombatFinish = null)
         {
             await MarskPanel.OpenPanel();
             UIManager.Instance.HindCurrAllShowPanel();
@@ -65,6 +65,7 @@ namespace GameLogic.Combat
             StartCombatInfo startCombatInfo = new StartCombatInfo();
             startCombatInfo.CombatType = CombatType.CombatType.LevelBattle;
             startCombatInfo.isCombatOverUi = isCombatOverUi;
+            startCombatInfo.monsterLevel = level;
             await StartCombat(startCombatInfo);
 
             LevelBattleCombatType levelBattleCombatType = CombatController.CombatTypeBasic as LevelBattleCombatType;

+ 2 - 2
Assets/Scripts/GameUI/EventManager/DialogueManager.cs

@@ -202,7 +202,7 @@ public class DialogueManager : Singleton<DialogueManager>
                     if (relust)
                     {
                         CTask cTask = CTask.Create();
-                        CombatDrive.Instance.LoadLevelBattleCombat(dialogueConfig.optionPara1[0], true,
+                        CombatDrive.Instance.LoadLevelBattleCombat(dialogueConfig.optionPara1[0], true,CurrentEventList.heroLevel,
                             delegate(bool isWin)
                             {
                                 LogTool.Log("战斗完成" + isWin);
@@ -221,7 +221,7 @@ public class DialogueManager : Singleton<DialogueManager>
                 else
                 {
                     CTask cTask = CTask.Create();
-                    CombatDrive.Instance.LoadLevelBattleCombat(dialogueConfig.optionPara1[0], false,
+                    CombatDrive.Instance.LoadLevelBattleCombat(dialogueConfig.optionPara1[0], false,CurrentEventList.heroLevel,
                         delegate(bool isWin)
                         {
                             LogTool.Log("战斗完成" + isWin);

+ 44 - 2
Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -283,8 +283,6 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
     private List<AccountFileInfo.EventList> DetectEvents(int eventCount, List<ItemInfo> useItems)
     {
-        
-        
         SmallPlacesConfig smallPlacesConfig = ConfigComponent.Instance.Get<SmallPlacesConfig>(PlayerManager.Instance.CurrentsmallPlaces.id);
         PlacesConfig bigMap = ConfigComponent.Instance.Get<PlacesConfig>(smallPlacesConfig.PlacesId);
         DivineSenseConfig divineSenseConfig = ConfigComponent.Instance.Get<DivineSenseConfig>(AccountFileInfo.Instance.playerData.divineSenseLevel);
@@ -510,6 +508,9 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 eventList.guid = IdGenerater.GenerateIdInt();
                 eventList.curStep = eventConfig.EventLinksId[0];
                 eventList.selectEventLinkIds.Add(eventConfig.EventLinksId[0]);
+                //记录英雄等级 神识刷出来的战斗等级不变
+                if( PlayerManager.Instance.myHero != null)
+                    eventList.heroLevel = PlayerManager.Instance.myHero.level.Value;
             }
         }
         else
@@ -520,9 +521,14 @@ public class EventSystemManager : Singleton<EventSystemManager>
             eventList.guid = IdGenerater.GenerateIdInt();
             eventList.curStep = eventConfig.EventLinksId[0];
             eventList.selectEventLinkIds.Add(eventConfig.EventLinksId[0]);
+            //记录英雄等级 神识刷出来的战斗等级不变
+            if( PlayerManager.Instance.myHero != null)
+                eventList.heroLevel = PlayerManager.Instance.myHero.level.Value;
         }
 
 
+     
+
         //初始化神识链条,用于监听条件是否完成
         if (eventList != null && eventConfig.EventType != 2)
         {
@@ -629,6 +635,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         this.onCompleteCallback = oncompleteCallBack;
         isTriggerEvent = true;
 
+
         LogTool.Log($"触发事件: {LanguageManager.Instance.Text(eventConfig.EventName)} (ID: {eventConfig.ID}, 品质: {eventConfig.EventQuality})");
 
         int dialogueID = 0;
@@ -653,7 +660,41 @@ public class EventSystemManager : Singleton<EventSystemManager>
             CancelEvent(CurrentEventList);
             cTask.SetResult();
         });
+
+        DivineSenceEventPreviewPanel divineSenceEventPreviewPanel = UIManager.Instance.GetComponent<DivineSenceEventPreviewPanel>();
+        AppBarPanel appBarPanel = UIManager.Instance.GetComponent<AppBarPanel>();
+        // DivineSenceInfoPanel divineSenceInfoPanel = UIManager.Instance.GetComponent<DivineSenceInfoPanel>();
+        if (divineSenceEventPreviewPanel != null && !divineSenceEventPreviewPanel.IsClose)
+        {
+            divineSenceEventPreviewPanel.GObjectPoolInterface.SetActive(false);
+        }
+
+        if (appBarPanel != null && !appBarPanel.IsClose)
+        {
+            appBarPanel.GObjectPoolInterface.SetActive(false);
+        }
+
+        // if (divineSenceInfoPanel != null)
+        // {
+        //     divineSenceInfoPanel.GObjectPoolInterface.SetActive(false);
+        // }
+
         await cTask;
+
+        if (divineSenceEventPreviewPanel != null && !divineSenceEventPreviewPanel.IsClose)
+        {
+            divineSenceEventPreviewPanel.GObjectPoolInterface.SetActive(true);
+        }
+
+        if (appBarPanel != null && !appBarPanel.IsClose)
+        {
+            appBarPanel.GObjectPoolInterface.SetActive(true);
+        }
+
+        // if (divineSenceInfoPanel != null)
+        // {
+        //     divineSenceInfoPanel.GObjectPoolInterface.SetActive(true);
+        // }
     }
 
 
@@ -967,6 +1008,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
 
         if (eventConfig.EventTriggerType == 4)
         {
+            eventList.isCompleted = true;
             AccountFileInfo.Instance.playerData.completeEvents.Add(eventList);
             AccountFileInfo.Instance.playerData.eventList.Remove(eventList);
             TaskInfoPanel taskInfoPanel = await TaskInfoPanel.OpenPanel(eventList, 2);

+ 9 - 8
Assets/Scripts/GameUI/GameApplction.cs

@@ -171,25 +171,26 @@ public class GameApplction : IGameStart
             .TaoismSkillId);
         if (startCombatInfo.CombatType != CombatType.TestCombat)
         {
-            // if (AccountFileInfo.Instance.playerData.isTiggerPlot)
+            MainPanel mainPanel = await MainPanel.OpenPanel();
+            /*if (!AccountFileInfo.Instance.playerData.isTiggerPlot)
             {
-                await MainPanel.OpenPanel();
-            }
+                mainPanel.GObjectPoolInterface.SetActive(false);
+            }*/
         }
 
 
         gameStartUIPanel.ShowMassge("loadFinish");
         gameStartUIPanel.SetSlider(1f);
 
-        // XinShouYinDao();
+        //XinShouCombat();
     }
 
-    public async void XinShouYinDao()
+    public async void XinShouCombat()
     {
         if (!AccountFileInfo.Instance.playerData.isTiggerPlot)
         {
             CTask cTask = CTask.Create();
-            CombatDrive.Instance.LoadLevelBattleCombat(1002, false,
+            CombatDrive.Instance.LoadLevelBattleCombat(1002, false, -1,
                 delegate(bool isWin)
                 {
                     LogTool.Log("战斗完成" + isWin);
@@ -203,8 +204,8 @@ public class GameApplction : IGameStart
             AccountFileInfo.Instance.playerData.isTiggerPlot = true;
 
             AccountFileInfo.Instance.SavePlayerData();
-
-            // await MainPanel.OpenPanel();
+            MainPanel mainPanel = UIManager.Instance.GetComponent<MainPanel>();
+            mainPanel.GObjectPoolInterface.SetActive(true);
         }
     }
 }

+ 106 - 12
Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs

@@ -18,7 +18,7 @@ namespace Fort23.Mono
             AccountFileInfo.SummonData summonData = PlayerManager.Instance.SummonManager.summonDataMap[configId];
             OpenBoxConfig openBoxConfig = ConfigComponent.Instance.Get<OpenBoxConfig>(configId);
             //有免费次数,并且让到时间了就免费抽
-            if (summonData.payCount < openBoxConfig.oneConsumeFreePara_1[1] && PlayerManager.Instance.serverTime >= summonData.nextPayTime)
+            if (summonData.tenFreeCount < openBoxConfig.oneConsumeFreePara_1[1] && PlayerManager.Instance.serverTime >= summonData.nextTenFreeTime)
             {
                 return PlayerManager.Instance.SummonManager.Summon(configId, 10);
             }
@@ -42,14 +42,14 @@ namespace Fort23.Mono
             AccountFileInfo.SummonData summonData = PlayerManager.Instance.SummonManager.summonDataMap[configId];
             OpenBoxConfig openBoxConfig = ConfigComponent.Instance.Get<OpenBoxConfig>(configId);
             //有免费次数,并且让到时间了就免费抽
-            if (summonData.freeCount < openBoxConfig.oneConsumeFreePara[1] && PlayerManager.Instance.serverTime >= summonData.nextFreeTime)
+            if (summonData.oneFreeCount < openBoxConfig.oneConsumeFreePara[1] && PlayerManager.Instance.serverTime >= summonData.nextOneFreeTime)
             {
                 return PlayerManager.Instance.SummonManager.Summon(configId, 1);
             }
             else
             {
                 //验证道具是否足够
-                if (PlayerManager.Instance.BagController.IsEnough(openBoxConfig.CostItemID, openBoxConfig.tenConsume))
+                if (PlayerManager.Instance.BagController.IsEnough(openBoxConfig.CostItemID, openBoxConfig.oneConsume))
                 {
                     return PlayerManager.Instance.SummonManager.Summon(configId, 1);
                 }
@@ -66,6 +66,7 @@ namespace Fort23.Mono
     public partial class BoxPanel : UIPanel
     {
         private OpenBoxConfig openBoxConfig;
+        private AccountFileInfo.SummonData summonData;
 
         public static async void OpenBoxPanel()
         {
@@ -97,6 +98,7 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
+            Btn_Score.onClick.AddListener(() => { OpenBoxScorePanel.OpenPanel(); });
             oneButton.onClick.AddListener(OnButtonCallBack);
             tenButton.onClick.AddListener(TenButtonCallBack);
             close.onClick.AddListener(CloseButtonCallBack);
@@ -141,10 +143,17 @@ namespace Fort23.Mono
 
         private async void OnButtonCallBack()
         {
+            if (summonData.isSummonSocre)
+            {
+                TipMessagePanel.OpenTipMessagePanel("已经开启300抽挑战,不能进行单抽了");
+                return;
+            }
+            
             //测试代码
             List<ItemInfo> allIitem = await BoxHelper.OneBox(openBoxConfig.ID);
             if (allIitem != null)
                 GachaPanel.OpenPanel(allIitem, 1, openBoxConfig.ID);
+            UpdateUi();
         }
 
         private async void TenButtonCallBack()
@@ -153,6 +162,8 @@ namespace Fort23.Mono
             List<ItemInfo> allIitem = await BoxHelper.TenBox(openBoxConfig.ID);
             if (allIitem != null)
                 GachaPanel.OpenPanel(allIitem, 2, openBoxConfig.ID);
+
+            UpdateUi();
         }
 
 
@@ -172,18 +183,101 @@ namespace Fort23.Mono
         public void OpenPanel()
         {
             CombatController.currActiveCombat.isUpdate = false;
-            openBoxConfig = ConfigComponent.Instance.Get<OpenBoxConfig>(1);
+            openBoxConfig = ConfigComponent.Instance.Get<OpenBoxConfig>(2);
+            ItemConfig config = ConfigComponent.Instance.Get<ItemConfig>(openBoxConfig.CostItemID);
+            icon_Oneitem.icon_name = config.icon;
+            Icon_TenItem.icon_name = config.icon;
             onCion.text = "x" + openBoxConfig.oneConsume;
             tenCion.text = "x" + openBoxConfig.tenConsume;
+            UpdateUi();
+        }
+
+        [CustomMethod(CustomMethodType.Update)]
+        public void Update()
+        {
+            if (summonData == null)
+                return;
+            if (summonData.tenFreeCount < openBoxConfig.oneConsumeFreePara_1[1] && PlayerManager.Instance.serverTime < summonData.nextTenFreeTime)
+            {
+                int time = (int)(summonData.nextTenFreeTime - PlayerManager.Instance.serverTime);
+                Text_TenFree.text = PlayerManager.TimeToHSM(time / 1000);
+            }
+            else
+            {
+                if (Text_TenFree.gameObject.activeSelf)
+                {
+                    Text_TenFree.gameObject.SetActive(false);
+                    if (summonData.tenFreeCount < openBoxConfig.oneConsumeFreePara_1[1])
+                    {
+                        tenCion.text = "免费";
+                    }
+                    else
+                    {
+                        tenCion.text = "x" + openBoxConfig.tenConsume;
+                    }
+                }
+            }
+
+            if (summonData.oneFreeCount < openBoxConfig.oneConsumeFreePara[1] && PlayerManager.Instance.serverTime < summonData.nextOneFreeTime)
+            {
+                int time = (int)(summonData.nextOneFreeTime - PlayerManager.Instance.serverTime);
+                Text_OneFree.text = PlayerManager.TimeToHSM(time / 1000);
+            }
+            else
+            {
+                if (Text_OneFree.gameObject.activeSelf)
+                {
+                    Text_OneFree.gameObject.SetActive(false);
+                    if (summonData.oneFreeCount < openBoxConfig.oneConsumeFreePara[1])
+                    {
+                        onCion.text = "免费";
+                    }
+                    else
+                    {
+                        onCion.text = "x" + openBoxConfig.oneConsume;
+                    }
+                }
+            }
+        }
+
+        public void UpdateUi()
+        {
+            summonData = PlayerManager.Instance.SummonManager.summonDataMap[openBoxConfig.ID];
+
 
-            // if (AccountFileInfo.Instance.playerData.boxFree)
-            // {
-            //     Btn_AdsFree.gameObject.SetActive(false);
-            // }
-            // else
-            // {
-            //     Btn_AdsFree.gameObject.SetActive(true);
-            // }
+            if (summonData.tenFreeCount < openBoxConfig.oneConsumeFreePara_1[1] && PlayerManager.Instance.serverTime >= summonData.nextTenFreeTime)
+            {
+                Text_TenFree.gameObject.SetActive(false);
+                tenCion.text = "免费";
+            }
+            //今日次数已用完
+            else if (summonData.tenFreeCount >= openBoxConfig.oneConsumeFreePara_1[1])
+            {
+                Text_TenFree.gameObject.SetActive(false);
+
+                tenCion.text = "x" + openBoxConfig.tenConsume;
+            }
+            else
+            {
+                Text_TenFree.gameObject.SetActive(true);
+                tenCion.text = "x" + openBoxConfig.tenConsume;
+            }
+
+            if (summonData.oneFreeCount < openBoxConfig.oneConsumeFreePara[1] && PlayerManager.Instance.serverTime >= summonData.nextOneFreeTime)
+            {
+                Text_OneFree.gameObject.SetActive(false);
+                onCion.text = "免费";
+            }
+            else if (summonData.oneFreeCount >= openBoxConfig.oneConsumeFreePara[1])
+            {
+                onCion.text = "x" + openBoxConfig.oneConsume;
+                Text_OneFree.gameObject.SetActive(false);
+            }
+            else
+            {
+                onCion.text = "x" + openBoxConfig.oneConsume;
+                Text_OneFree.gameObject.SetActive(true);
+            }
         }
     }
 }

+ 55 - 0
Assets/Scripts/GameUI/UI/BoxPanel/BoxPanelData.cs

@@ -85,6 +85,61 @@ namespace Fort23.Mono
 	      return _Btn_AdsFree;
 	     }
 	   }
+	  private MyImage _icon_Oneitem;
+	  public MyImage icon_Oneitem
+	   {
+	   get{
+	      if (_icon_Oneitem == null)
+	       {
+	         _icon_Oneitem  = GetUIUnit<MyImage>("icon_Oneitem"); 
+	       }
+	      return _icon_Oneitem;
+	     }
+	   }
+	  private MyImage _Icon_TenItem;
+	  public MyImage Icon_TenItem
+	   {
+	   get{
+	      if (_Icon_TenItem == null)
+	       {
+	         _Icon_TenItem  = GetUIUnit<MyImage>("Icon_TenItem"); 
+	       }
+	      return _Icon_TenItem;
+	     }
+	   }
+	  private Text _Text_TenFree;
+	  public Text Text_TenFree
+	   {
+	   get{
+	      if (_Text_TenFree == null)
+	       {
+	         _Text_TenFree  = GetUIUnit<Text>("Text_TenFree"); 
+	       }
+	      return _Text_TenFree;
+	     }
+	   }
+	  private Text _Text_OneFree;
+	  public Text Text_OneFree
+	   {
+	   get{
+	      if (_Text_OneFree == null)
+	       {
+	         _Text_OneFree  = GetUIUnit<Text>("Text_OneFree"); 
+	       }
+	      return _Text_OneFree;
+	     }
+	   }
+	  private Button _Btn_Score;
+	  public Button Btn_Score
+	   {
+	   get{
+	      if (_Btn_Score == null)
+	       {
+	         _Btn_Score  = GetUIUnit<Button>("Btn_Score"); 
+	       }
+	      return _Btn_Score;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

+ 34 - 5
Assets/Scripts/GameUI/UI/BoxPanel/GachaPanel.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Core.Audio;
 using Core.Language;
 using Core.Utility;
@@ -25,6 +26,8 @@ namespace Fort23.Mono
 
         List<EnergyWidget> _energyWidgets = new List<EnergyWidget>();
 
+        private AccountFileInfo.SummonData SummonData;
+
 
         private void Init()
         {
@@ -55,10 +58,21 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
-            tenButton.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel<GachaPanel>(); });
+            tenButton.onClick.AddListener(() =>
+            {
+                float beLv = Utility.UtilTools.GetRandomByWeight(_openBoxConfig.betPara1.ToList(), _openBoxConfig.betPara2);
+                
+                foreach (var itemInfo in itemInfos)
+                {
+                    ItemInfo itemInfo1 = new ItemInfo(itemInfo.itemID, (long)(itemInfo.count.Value * (beLv - 1)));
+                    PlayerManager.Instance.BagController.AddItem(itemInfo1);
+                }
+                
+                UIManager.Instance.HideUIUIPanel<GachaPanel>();
+            });
             oneButton.onClick.AddListener(async () =>
             {
-                if (type == 1)
+                /*if (type == 1)
                 {
                     itemInfos = await BoxHelper.OneBox(_openBoxConfig.ID);
                 }
@@ -86,7 +100,9 @@ namespace Fort23.Mono
                     widgetItems[i].InitWidget(itemInfos[i]);
                 }
 
-                CusstomInit();
+                CusstomInit();*/
+                
+                UIManager.Instance.HideUIUIPanel<GachaPanel>();
             });
         }
 
@@ -96,6 +112,8 @@ namespace Fort23.Mono
             type = (int)uiData[1];
             _openBoxConfig = ConfigComponent.Instance.Get<OpenBoxConfig>((int)uiData[2]);
 
+            SummonData = PlayerManager.Instance.SummonManager.summonDataMap[_openBoxConfig.ID];
+
             foreach (var widget in _energyWidgets)
             {
                 UIManager.Instance.DormancyGComponent(widget);
@@ -109,6 +127,7 @@ namespace Fort23.Mono
             // energyWidget.CustomInit(GlobalParam.Item_Diamond_ID);
             // _energyWidgets.Add(energyWidget);
 
+            /*
             if (type == 1)
             {
                 text_btnText.text = "开启一次";
@@ -118,7 +137,7 @@ namespace Fort23.Mono
             {
                 text_btnText.text = "开启十次";
                 Trxt_Cion.text = "x" + _openBoxConfig.tenConsume;
-            }
+            }*/
 
             foreach (var itemInfo in itemInfos)
             {
@@ -154,7 +173,7 @@ namespace Fort23.Mono
             _gameObjectPools.Clear();
             for (var i = 0; i < widgetItems.Count; i++)
             {
-                animTween.Play("click", false);
+                //animTween.Play("click", false);
                 fx_ui_box_click.gameObject.SetActive(true);
                 fx_ui_box_click.Play();
                 ImageMoveContainer imageMoveContainer = new ImageMoveContainer();
@@ -220,6 +239,16 @@ namespace Fort23.Mono
             }
 
             _energyWidgets.Clear();
+
+            //完成挑战过后自动打开挑战界面
+            if (_openBoxConfig.ProgressRewardChoukaCount != -1 &&
+                SummonData.drawHistory.Count >= _openBoxConfig.ProgressRewardChoukaCount)
+            {
+
+                OpenBoxScorePanel.OpenPanel();
+
+            }
+
             base.Close();
         }
 

+ 0 - 34
Assets/Scripts/GameUI/UI/BoxPanel/GachaPanelData.cs

@@ -4,7 +4,6 @@ using UnityEngine.UI;
 using UnityEngine;
 using System.Collections.Generic;
 using Coffee.UIExtensions;
-using Core.UI.UTool.UITween;
 
 namespace Fort23.Mono
 {
@@ -44,17 +43,6 @@ namespace Fort23.Mono
 	      return _tenCion;
 	     }
 	   }
-	  private Text _onCion;
-	  public Text onCion
-	   {
-	   get{
-	      if (_onCion == null)
-	       {
-	         _onCion  = GetUIUnit<Text>("onCion"); 
-	       }
-	      return _onCion;
-	     }
-	   }
 	  private RectTransform _GridItem;
 	  public RectTransform GridItem
 	   {
@@ -99,17 +87,6 @@ namespace Fort23.Mono
 	      return _fx_ui_box_click;
 	     }
 	   }
-	  private UITweenController _animTween;
-	  public UITweenController animTween
-	   {
-	   get{
-	      if (_animTween == null)
-	       {
-	         _animTween  = GetUIUnit<UITweenController>("animTween"); 
-	       }
-	      return _animTween;
-	     }
-	   }
 	  private Text _text_btnText;
 	  public Text text_btnText
 	   {
@@ -121,17 +98,6 @@ namespace Fort23.Mono
 	      return _text_btnText;
 	     }
 	   }
-	  private Text _Trxt_Cion;
-	  public Text Trxt_Cion
-	   {
-	   get{
-	      if (_Trxt_Cion == null)
-	       {
-	         _Trxt_Cion  = GetUIUnit<Text>("Trxt_Cion"); 
-	       }
-	      return _Trxt_Cion;
-	     }
-	   }
 	  private RectTransform _Group_ResourceBar;
 	  public RectTransform Group_ResourceBar
 	   {

+ 158 - 0
Assets/Scripts/GameUI/UI/BoxPanel/OpenBoxScorePanel.cs

@@ -0,0 +1,158 @@
+using System.Collections.Generic;
+using Excel2Json;
+using Fort23.Core;
+using Fort23.UTool;
+using GameLogic.Player;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "OpenBoxScorePanel")]
+    public partial class OpenBoxScorePanel : UIPanel
+    {
+        List<SummonScoreRuleWidget> summonScoreRuleWidgets = new List<SummonScoreRuleWidget>();
+        List<SummonScoreAwardWidget> summonScoreAwardWidgets = new List<SummonScoreAwardWidget>();
+        AccountFileInfo.SummonData summonData;
+        private OpenBoxProgressReward[] openBoxProgressRewards;
+        
+        OpenBoxConfig openBoxConfig;
+
+        private void Init()
+        {
+            isAddStack = true;
+            IsShowAppBar = true;
+        }
+
+        protected override void AddEvent()
+        {
+        }
+
+        protected override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+            Btn_Ok.onClick.AddListener(() =>
+            {
+                summonData.isSummonSocre = true;
+                AccountFileInfo.Instance.SavePlayerData();
+                Btn_Ok.gameObject.SetActive(!summonData.isSummonSocre);
+                StartRoot.gameObject.SetActive(summonData.isSummonSocre);
+                if (summonData.isSummonSocre)
+                {
+                    Text_JingDu.text = $"当前进度:{summonData.drawHistory.Count}/{openBoxConfig.ProgressRewardChoukaCount}";
+                    Text_Score.text = $"目前得分:{summonData.score}";
+                }
+            });
+        }
+
+        public async override CTask<bool> AsyncInit(object[] uiData)
+        {
+            summonData = PlayerManager.Instance.SummonManager.summonDataMap[2];
+            openBoxConfig = ConfigComponent.Instance.Get<OpenBoxConfig>(summonData.id);
+            List<OpenBoxScoreRule> openBoxScoreRules = PlayerManager.Instance.SummonManager.openBoxScoreRuleMap[2];
+            Btn_Ok.gameObject.SetActive(!summonData.isSummonSocre);
+            StartRoot.gameObject.SetActive(summonData.isSummonSocre);
+            if (summonData.isSummonSocre)
+            {
+                Text_JingDu.text = $"当前进度:{summonData.drawHistory.Count}/{openBoxConfig.ProgressRewardChoukaCount}";
+                Text_Score.text = $"目前得分:{summonData.score}";
+            }
+
+            foreach (var openBoxScoreRule in openBoxScoreRules)
+            {
+                SummonScoreRuleWidget summonScoreRuleWidget = await UIManager.Instance.CreateGComponent<SummonScoreRuleWidget>(null, Content1);
+                summonScoreRuleWidget.CustomInit(openBoxScoreRule);
+                summonScoreRuleWidgets.Add(summonScoreRuleWidget);
+            }
+
+            openBoxProgressRewards = ConfigComponent.Instance.GetAll<OpenBoxProgressReward>();
+            foreach (var openBoxProgressReward in openBoxProgressRewards)
+            {
+                SummonScoreAwardWidget summonScoreAwardWidget = await UIManager.Instance.CreateGComponent<SummonScoreAwardWidget>(null, Content2);
+                summonScoreAwardWidget.CustomInit(openBoxProgressReward,AwardSummonScore);
+                summonScoreAwardWidgets.Add(summonScoreAwardWidget);
+            }
+            
+            for (var i = summonScoreAwardWidgets.Count - 1; i >= 0; i--)
+            {
+                if (summonData.score >= summonScoreAwardWidgets[i]._openBoxProgressReward.TotalScore)
+                {
+                    summonScoreAwardWidgets[i].Icon_Select.gameObject.SetActive(true);
+
+                    if (summonData.drawHistory.Count >= openBoxConfig.ProgressRewardChoukaCount)
+                    {
+                        summonScoreAwardWidgets[i].Btn_LingQu.gameObject.SetActive(true);
+                    }
+                    break;
+                }
+            }
+
+            return await base.AsyncInit(uiData);
+        }
+
+        private void AwardSummonScore()
+        {
+            //到达进度自动领取奖励
+            if (openBoxConfig.ProgressRewardChoukaCount != -1 &&
+                summonData.drawHistory.Count >= openBoxConfig.ProgressRewardChoukaCount)
+            {
+                
+                
+                for (var i =openBoxProgressRewards.Length-1; i >= 0; i--)
+                {
+                    if (summonData.score >= openBoxProgressRewards[i].TotalScore)
+                    {
+                        for (var i1 = 0; i1 < openBoxProgressRewards[i].PrizeID.Length; i1++)
+                        {
+                            PlayerManager.Instance.BagController.AddItem(openBoxProgressRewards[i].PrizeID[i1],
+                                openBoxProgressRewards[i].PrizeCount[i1]);
+                        }
+                        break;
+                    }
+                }
+                
+                
+                
+                summonData.isSummonSocre = false;
+                summonData.score = 0;
+                summonData.drawHistory.Clear();
+                summonData.summonSocreData.Clear();
+                AccountFileInfo.Instance.SavePlayerData();
+            }
+            else
+            {
+                LogTool.Error("领取失败!");
+            }
+            
+          
+        }
+
+
+        public async static CTask OpenPanel()
+        {
+            await UIManager.Instance.LoadAndOpenPanel<OpenBoxScorePanel>(null, isShowBG: true);
+        }
+
+        public override void Close()
+        {
+            foreach (var summonScoreRuleWidget in summonScoreRuleWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(summonScoreRuleWidget);
+            }
+
+            summonScoreRuleWidgets.Clear();
+
+            foreach (var summonScoreRuleWidget in summonScoreAwardWidgets)
+            {
+                UIManager.Instance.DormancyGComponent(summonScoreRuleWidget);
+            }
+
+            summonScoreAwardWidgets.Clear();
+
+            AwardSummonScore();
+
+            base.Close();
+        }
+    }
+}

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

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

+ 84 - 0
Assets/Scripts/GameUI/UI/BoxPanel/OpenBoxScorePanelData.cs

@@ -0,0 +1,84 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class OpenBoxScorePanel 
+	{
+	  #region 自定义数据 
+	  private RectTransform _Content1;
+	  public RectTransform Content1
+	   {
+	   get{
+	      if (_Content1 == null)
+	       {
+	         _Content1  = GetUIUnit<RectTransform>("Content1"); 
+	       }
+	      return _Content1;
+	     }
+	   }
+	  private RectTransform _Content2;
+	  public RectTransform Content2
+	   {
+	   get{
+	      if (_Content2 == null)
+	       {
+	         _Content2  = GetUIUnit<RectTransform>("Content2"); 
+	       }
+	      return _Content2;
+	     }
+	   }
+	  private Button _Btn_Ok;
+	  public Button Btn_Ok
+	   {
+	   get{
+	      if (_Btn_Ok == null)
+	       {
+	         _Btn_Ok  = GetUIUnit<Button>("Btn_Ok"); 
+	       }
+	      return _Btn_Ok;
+	     }
+	   }
+	  private RectTransform _StartRoot;
+	  public RectTransform StartRoot
+	   {
+	   get{
+	      if (_StartRoot == null)
+	       {
+	         _StartRoot  = GetUIUnit<RectTransform>("StartRoot"); 
+	       }
+	      return _StartRoot;
+	     }
+	   }
+	  private Text _Text_JingDu;
+	  public Text Text_JingDu
+	   {
+	   get{
+	      if (_Text_JingDu == null)
+	       {
+	         _Text_JingDu  = GetUIUnit<Text>("Text_JingDu"); 
+	       }
+	      return _Text_JingDu;
+	     }
+	   }
+	  private Text _Text_Score;
+	  public Text Text_Score
+	   {
+	   get{
+	      if (_Text_Score == null)
+	       {
+	         _Text_Score  = GetUIUnit<Text>("Text_Score"); 
+	       }
+	      return _Text_Score;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

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

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

+ 62 - 0
Assets/Scripts/GameUI/UI/BoxPanel/SummonScoreAwardWidget.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using Excel2Json;
+using GameLogic.Bag;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "SummonScoreAwardWidget")]
+    public partial class SummonScoreAwardWidget : UIComponent
+    {
+        List<WidgetItem> _widgetItems = new List<WidgetItem>();
+        public OpenBoxProgressReward _openBoxProgressReward = new OpenBoxProgressReward();
+        private Action lingquCallBack;
+        private void Init()
+        {
+        }
+
+        public override void AddEvent()
+        {
+        }
+
+        public override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+            Btn_LingQu.onClick.AddListener(() =>
+            {
+                lingquCallBack?.Invoke();
+                Btn_LingQu.gameObject.SetActive(false);
+            });
+        }
+
+        public async void CustomInit(OpenBoxProgressReward openBoxProgressReward,Action lingquCallBack)
+        {
+            this.lingquCallBack = lingquCallBack;
+            _openBoxProgressReward = openBoxProgressReward;
+            Text_Name.text = $"累计达到 {openBoxProgressReward.TotalScore}";
+            for (var i = 0; i < openBoxProgressReward.PrizeID.Length; i++)
+            {
+                WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot);
+                widgetItem.InitWidget(new ItemInfo(openBoxProgressReward.PrizeID[i], openBoxProgressReward.PrizeCount[i]));
+                _widgetItems.Add(widgetItem);
+            }
+        }
+
+        public override void DormancyObj()
+        {
+            foreach (var widgetItem in _widgetItems)
+            {
+                UIManager.Instance.DormancyGComponent(widgetItem);
+            }
+
+            _widgetItems.Clear();
+            
+            Icon_Select.gameObject.SetActive(false);
+            Btn_LingQu.gameObject.SetActive(false);
+            base.DormancyObj();
+        }
+    }
+}

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

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: CyhJsH/8BnKXM/GGur5zM8p/xw0w3t79n1rtIzjJ4CT2fMGV8mFFQpcaq0nl
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 62 - 0
Assets/Scripts/GameUI/UI/BoxPanel/SummonScoreAwardWidgetData.cs

@@ -0,0 +1,62 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class SummonScoreAwardWidget 
+	{
+	  #region 自定义数据 
+	  private Text _Text_Name;
+	  public Text Text_Name
+	   {
+	   get{
+	      if (_Text_Name == null)
+	       {
+	         _Text_Name  = GetUIUnit<Text>("Text_Name"); 
+	       }
+	      return _Text_Name;
+	     }
+	   }
+	  private RectTransform _ItemRoot;
+	  public RectTransform ItemRoot
+	   {
+	   get{
+	      if (_ItemRoot == null)
+	       {
+	         _ItemRoot  = GetUIUnit<RectTransform>("ItemRoot"); 
+	       }
+	      return _ItemRoot;
+	     }
+	   }
+	  private MyImage _Icon_Select;
+	  public MyImage Icon_Select
+	   {
+	   get{
+	      if (_Icon_Select == null)
+	       {
+	         _Icon_Select  = GetUIUnit<MyImage>("Icon_Select"); 
+	       }
+	      return _Icon_Select;
+	     }
+	   }
+	  private Button _Btn_LingQu;
+	  public Button Btn_LingQu
+	   {
+	   get{
+	      if (_Btn_LingQu == null)
+	       {
+	         _Btn_LingQu  = GetUIUnit<Button>("Btn_LingQu"); 
+	       }
+	      return _Btn_LingQu;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

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

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

+ 38 - 0
Assets/Scripts/GameUI/UI/BoxPanel/SummonScoreRuleWidget.cs

@@ -0,0 +1,38 @@
+using System.Linq;
+using Core.Language;
+using Excel2Json;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "SummonScoreRuleWidget")]
+    public partial class SummonScoreRuleWidget : UIComponent
+    {
+        AccountFileInfo.SummonSocreData socreData;
+
+        private void Init()
+        {
+        }
+
+        public override void AddEvent()
+        {
+        }
+
+        public override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+        }
+
+        public void CustomInit(OpenBoxScoreRule scoreRule)
+        {
+            AccountFileInfo.SummonData summonData = PlayerManager.Instance.SummonManager.summonDataMap[scoreRule.openBoxID];
+            socreData = summonData.summonSocreData.FirstOrDefault(ss => ss.id == scoreRule.ID);
+            Text_Name.text = LanguageManager.Instance.Text(scoreRule.lanID);
+            Text_Score.text = scoreRule.score.ToString();
+            Text_CompleteCount.text = socreData == null ? "0" : socreData.count.ToString();
+            Text_AllScore.text = socreData == null ? "0" : (socreData.count * scoreRule.score).ToString();
+        }
+    }
+}

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

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

+ 62 - 0
Assets/Scripts/GameUI/UI/BoxPanel/SummonScoreRuleWidgetData.cs

@@ -0,0 +1,62 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class SummonScoreRuleWidget 
+	{
+	  #region 自定义数据 
+	  private Text _Text_Name;
+	  public Text Text_Name
+	   {
+	   get{
+	      if (_Text_Name == null)
+	       {
+	         _Text_Name  = GetUIUnit<Text>("Text_Name"); 
+	       }
+	      return _Text_Name;
+	     }
+	   }
+	  private Text _Text_Score;
+	  public Text Text_Score
+	   {
+	   get{
+	      if (_Text_Score == null)
+	       {
+	         _Text_Score  = GetUIUnit<Text>("Text_Score"); 
+	       }
+	      return _Text_Score;
+	     }
+	   }
+	  private Text _Text_CompleteCount;
+	  public Text Text_CompleteCount
+	   {
+	   get{
+	      if (_Text_CompleteCount == null)
+	       {
+	         _Text_CompleteCount  = GetUIUnit<Text>("Text_CompleteCount"); 
+	       }
+	      return _Text_CompleteCount;
+	     }
+	   }
+	  private Text _Text_AllScore;
+	  public Text Text_AllScore
+	   {
+	   get{
+	      if (_Text_AllScore == null)
+	       {
+	         _Text_AllScore  = GetUIUnit<Text>("Text_AllScore"); 
+	       }
+	      return _Text_AllScore;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

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

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

+ 1 - 0
Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanel.cs

@@ -89,6 +89,7 @@ namespace Fort23.Mono
             {
                 if (daoYouData.favorabilityLv >= _daoyouModelConfig.EmotionLvforQuest
                     && !EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.QuestID)
+                    && EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.EventCompleteforQuest)
                     && !EventSystemManager.Instance.IsEventTrigger(_daoyouModelConfig.QuestID))
                 {
                     AccountFileInfo.EventList eventList = EventSystemManager.Instance.AddEvent(_daoyouModelConfig.QuestID);

+ 1 - 0
Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouWidget.cs

@@ -68,6 +68,7 @@ namespace Fort23.Mono
                 DaoyouLevelupConfig daoyouLevelupConfig = ConfigComponent.Instance.Get<DaoyouLevelupConfig>(_daoYouData.favorabilityLv);
                 Text_DaoyouLvName.text = LanguageManager.Instance.Text(daoyouLevelupConfig.name);
                 if (_daoYouData.favorabilityLv >= _daoyouModelConfig.EmotionLvforQuest
+                    && EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.EventCompleteforQuest)
                     && !EventSystemManager.Instance.BagIsEvent(_daoyouModelConfig.QuestID)
                     && !EventSystemManager.Instance.IsEventTrigger(_daoyouModelConfig.QuestID))
                 {

+ 2 - 2
Assets/Scripts/GameUI/UI/DivineSence/BossInfoPanel.cs

@@ -97,7 +97,7 @@ namespace Fort23.Mono
                                     LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjie2) +
                                     LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjie3);
 
-                Text_Linggen.text = $"金:{PlayerManager.Instance.myHero.Metal_Injury} 木:{PlayerManager.Instance.myHero.Wood_Injury} 水:{PlayerManager.Instance.myHero.Water_Injury} 火:{PlayerManager.Instance.myHero.Fire_Injury} 土:{PlayerManager.Instance.myHero.Earth_Injury}";
+                Text_Linggen.text = $"金:{PlayerManager.Instance.myHero.Metal} 木:{PlayerManager.Instance.myHero.Wood} 水:{PlayerManager.Instance.myHero.Water} 火:{PlayerManager.Instance.myHero.Fire} 土:{PlayerManager.Instance.myHero.Earth}";
                 Text_Hp.text = PlayerManager.Instance.myHero.hp.Value.ToString();
 
                 using (CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer())
@@ -181,7 +181,7 @@ namespace Fort23.Mono
                 }
 
 
-                Text_Linggen.text = $"金:{combatHeroInfo.Metal_Injury} 木:{combatHeroInfo.Wood_Injury} 水:{combatHeroInfo.Water_Injury} 火:{combatHeroInfo.Fire_Injury} 土:{combatHeroInfo.Earth_Injury}";
+                Text_Linggen.text = $"金:{combatHeroInfo.Metal} 木:{combatHeroInfo.Wood} 水:{combatHeroInfo.Water} 火:{combatHeroInfo.Fire} 土:{combatHeroInfo.Earth}";
                 Text_Hp.text = combatHeroInfo.hp.Value.ToString();
             }
         }

+ 4 - 4
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs

@@ -162,7 +162,7 @@ namespace Fort23.Mono
 
                 // UIManager.Instance.HindCurrAllShowPanel();
 
-                CombatDrive.Instance.LoadLevelBattleCombat(heroPowerUpConfig.DujieLevelbattleID, true,
+                CombatDrive.Instance.LoadLevelBattleCombat(heroPowerUpConfig.DujieLevelbattleID, true, -1,
                     delegate(bool isWin)
                     {
                         LogTool.Log("战斗完成" + isWin);
@@ -447,7 +447,7 @@ namespace Fort23.Mono
 
         public async static CTask<HeroBreakthroughPanel> OpenPanel()
         {
-            HeroBreakthroughPanel heroBreakthroughPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughPanel>(null, UILayer.Top, isFocus: false,isShowBG:true);
+            HeroBreakthroughPanel heroBreakthroughPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughPanel>(null, UILayer.Top, isFocus: false, isShowBG: true);
             heroBreakthroughPanel.CustomInit();
             return heroBreakthroughPanel;
         }
@@ -456,7 +456,7 @@ namespace Fort23.Mono
         //渡劫预览
         public async static CTask<HeroBreakthroughPanel> OpenPanel1(HeroInfo heroInfo1)
         {
-            HeroBreakthroughPanel heroBreakthroughPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughPanel>(null, UILayer.Top, isFocus: false,isShowBG:true);
+            HeroBreakthroughPanel heroBreakthroughPanel = await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughPanel>(null, UILayer.Top, isFocus: false, isShowBG: true);
             heroBreakthroughPanel.CustomInit(heroInfo1);
             return heroBreakthroughPanel;
         }
@@ -494,7 +494,7 @@ namespace Fort23.Mono
                     }
                     else
                     {
-                        Text_HeroHp.color = new Color32(249,240,204,255);
+                        Text_HeroHp.color = new Color32(249, 240, 204, 255);
                     }
                 }
                 else

+ 2 - 2
Assets/Scripts/GameUI/UI/LevelChoosePanel/PlacesInfoPanel.cs

@@ -80,9 +80,9 @@ namespace Fort23.Mono
                 return;
             }
 
-            if (smallPlacesConfig.UnlockEnvetid != 0)
+            if (lastSmallPlacesConfig.UnlockEnvetid != 0)
             {
-                AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce => ce.eventID == smallPlacesConfig.UnlockEnvetid);
+                AccountFileInfo.EventList eventList = AccountFileInfo.Instance.playerData.completeEvents.FirstOrDefault(ce => ce.eventID == lastSmallPlacesConfig.UnlockEnvetid);
                 if (eventList == null || !eventList.isCompleted)
                 {
                     TipMessagePanel.OpenTipMessagePanel("主线任务没有完成");

+ 5 - 5
Assets/Scripts/GameUI/UI/MainHeroPnael/MainHeroPanel.cs

@@ -133,23 +133,23 @@ namespace Fort23.Mono
 
 
             heroAttributeWidget = await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null, Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("金灵根", "", PlayerManager.Instance.myHero.Metal_Injury.ToString()));
+            heroAttributeWidget.CustomInit(new HeroAttributeData("金灵根", "", PlayerManager.Instance.myHero.Metal.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget = await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null, Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("木灵根", "", PlayerManager.Instance.myHero.Wood_Injury.ToString()));
+            heroAttributeWidget.CustomInit(new HeroAttributeData("木灵根", "", PlayerManager.Instance.myHero.Wood.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget = await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null, Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("水灵根", "", PlayerManager.Instance.myHero.Water_Injury.ToString()));
+            heroAttributeWidget.CustomInit(new HeroAttributeData("水灵根", "", PlayerManager.Instance.myHero.Water.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget = await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null, Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("火灵根", "", PlayerManager.Instance.myHero.Fire_Injury.ToString()));
+            heroAttributeWidget.CustomInit(new HeroAttributeData("火灵根", "", PlayerManager.Instance.myHero.Fire.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
             heroAttributeWidget = await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null, Content, isInstance: true);
-            heroAttributeWidget.CustomInit(new HeroAttributeData("土灵根", "", PlayerManager.Instance.myHero.Earth_Injury.ToString()));
+            heroAttributeWidget.CustomInit(new HeroAttributeData("土灵根", "", PlayerManager.Instance.myHero.Earth.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
         }
 

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

@@ -283,9 +283,10 @@ namespace Fort23.Mono
         }
 
 
-        public async static CTask OpenPanel()
+        public async static CTask<MainPanel> OpenPanel()
         {
-            await UIManager.Instance.LoadAndOpenPanel<MainPanel>(null);
+            MainPanel mainPanel =  await UIManager.Instance.LoadAndOpenPanel<MainPanel>(null);
+            return mainPanel;
         }
 
         public override void Close()

+ 0 - 6
Assets/Scripts/GameUI/UI/RewardsPanel/WidgetItem.cs

@@ -1,10 +1,4 @@
-using System;
-using Core.Language;
-using Fort23.UTool;
 using GameLogic.Bag;
-using GameLogic.Equipment;
-using GameLogic.Hero;
-using UnityEngine;
 using Utility;
 
 namespace Fort23.Mono

+ 215 - 0
Assets/Scripts/GameUI/UI/ShopPanel/ShopBoxWidget.cs

@@ -0,0 +1,215 @@
+using System.Collections.Generic;
+using Excel2Json;
+using Fort23.Core;
+using Fort23.UTool;
+using GameLogic.Bag;
+using GameLogic.Combat.CombatTool;
+using UnityEngine;
+
+namespace Fort23.Mono
+{
+	[UIBinding(prefab = "ShopBoxWidget"  )]
+	public partial class ShopBoxWidget : UIComponent
+	{
+        private OpenBoxConfig openBoxConfig;
+        private AccountFileInfo.SummonData summonData;
+
+
+
+        private void Init()
+        {
+
+        }
+
+    
+
+        public override void AddEvent()
+        {
+            StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
+        }
+
+        public override void DelEvent()
+        {
+            StaticUpdater.Instance.RemoveRenderUpdateCallBack(Update);
+        }
+
+        private bool isStartAd = false;
+
+        public override void AddButtonEvent()
+        {
+
+            oneButton.onClick.AddListener(OnButtonCallBack);
+            tenButton.onClick.AddListener(TenButtonCallBack);
+
+            Btn_AdsFree.onClick.AddListener(async () =>
+            {
+                if (AccountFileInfo.Instance.playerData.boxFree)
+                {
+                    TipMessagePanel.OpenTipMessagePanel(938, Vector2.zero);
+                    return;
+                }
+
+                if (isStartAd)
+                    return;
+                isStartAd = true;
+
+                var dic = new Dictionary<string, string>();
+                dic.Add("Chouka", "");
+                // YouLoftSDK.Instance.CustomEvent("OnclickAds", dic);
+                // bool isOK = await YouLoftSDK.Instance.ShowAd();
+                bool isOK = true;
+                isStartAd = false;
+
+                if (!isOK)
+                {
+                    return;
+                }
+
+                dic = new Dictionary<string, string>();
+                dic.Add("Chouka", "");
+                // YouLoftSDK.Instance.CustomEvent("AdsPlayOver", dic);
+                AccountFileInfo.Instance.playerData.boxFree = true;
+                AccountFileInfo.Instance.SavePlayerData();
+                // Btn_AdsFree.gameObject.SetActive(false);
+
+                List<ItemInfo> allIitem = await BoxHelper.TenBox(openBoxConfig.ID, true);
+                if (allIitem != null)
+                    GachaPanel.OpenPanel(allIitem, 2, openBoxConfig.ID);
+            });
+        }
+
+
+        private async void OnButtonCallBack()
+        {
+            if (summonData.isSummonSocre)
+            {
+                TipMessagePanel.OpenTipMessagePanel("已经开启300抽挑战,不能进行单抽了");
+                return;
+            }
+            
+            //测试代码
+            List<ItemInfo> allIitem = await BoxHelper.OneBox(openBoxConfig.ID);
+            if (allIitem != null)
+                GachaPanel.OpenPanel(allIitem, 1, openBoxConfig.ID);
+            UpdateUi();
+        }
+
+        private async void TenButtonCallBack()
+        {
+            //测试代码
+            List<ItemInfo> allIitem = await BoxHelper.TenBox(openBoxConfig.ID);
+            if (allIitem != null)
+                GachaPanel.OpenPanel(allIitem, 2, openBoxConfig.ID);
+
+            UpdateUi();
+        }
+
+
+
+        public override void Close()
+        {
+            CombatController.currActiveCombat.isUpdate = true;
+            base.Close();
+        }
+
+        public void CustomInit()
+        {
+            CombatController.currActiveCombat.isUpdate = false;
+            openBoxConfig = ConfigComponent.Instance.Get<OpenBoxConfig>(1);
+            ItemConfig config = ConfigComponent.Instance.Get<ItemConfig>(openBoxConfig.CostItemID);
+            icon_Oneitem.icon_name = config.icon;
+            Icon_TenItem.icon_name = config.icon;
+            onCion.text = "x" + openBoxConfig.oneConsume;
+            tenCion.text = "x" + openBoxConfig.tenConsume;
+            UpdateUi();
+        }
+        
+        public void Update()
+        {
+            if (summonData == null)
+                return;
+            if (summonData.tenFreeCount < openBoxConfig.oneConsumeFreePara_1[1] && PlayerManager.Instance.serverTime < summonData.nextTenFreeTime)
+            {
+                int time = (int)(summonData.nextTenFreeTime - PlayerManager.Instance.serverTime);
+                Text_TenFree.text = PlayerManager.TimeToHSM(time / 1000);
+            }
+            else
+            {
+                if (Text_TenFree.gameObject.activeSelf)
+                {
+                    Text_TenFree.gameObject.SetActive(false);
+                    if (summonData.tenFreeCount < openBoxConfig.oneConsumeFreePara_1[1])
+                    {
+                        tenCion.text = "免费";
+                    }
+                    else
+                    {
+                        tenCion.text = "x" + openBoxConfig.tenConsume;
+                    }
+                }
+            }
+
+            if (summonData.oneFreeCount < openBoxConfig.oneConsumeFreePara[1] && PlayerManager.Instance.serverTime < summonData.nextOneFreeTime)
+            {
+                int time = (int)(summonData.nextOneFreeTime - PlayerManager.Instance.serverTime);
+                Text_OneFree.text = PlayerManager.TimeToHSM(time / 1000);
+            }
+            else
+            {
+                if (Text_OneFree.gameObject.activeSelf)
+                {
+                    Text_OneFree.gameObject.SetActive(false);
+                    if (summonData.oneFreeCount < openBoxConfig.oneConsumeFreePara[1])
+                    {
+                        onCion.text = "免费";
+                    }
+                    else
+                    {
+                        onCion.text = "x" + openBoxConfig.oneConsume;
+                    }
+                }
+            }
+        }
+
+        public void UpdateUi()
+        {
+            summonData = PlayerManager.Instance.SummonManager.summonDataMap[1];
+
+
+            if (summonData.tenFreeCount < openBoxConfig.oneConsumeFreePara_1[1] && PlayerManager.Instance.serverTime >= summonData.nextTenFreeTime)
+            {
+                Text_TenFree.gameObject.SetActive(false);
+                tenCion.text = "免费";
+            }
+            //今日次数已用完
+            else if (summonData.tenFreeCount >= openBoxConfig.oneConsumeFreePara_1[1])
+            {
+                Text_TenFree.gameObject.SetActive(false);
+
+                tenCion.text = "x" + openBoxConfig.tenConsume;
+            }
+            else
+            {
+                Text_TenFree.gameObject.SetActive(true);
+                tenCion.text = "x" + openBoxConfig.tenConsume;
+            }
+
+            if (summonData.oneFreeCount < openBoxConfig.oneConsumeFreePara[1] && PlayerManager.Instance.serverTime >= summonData.nextOneFreeTime)
+            {
+                Text_OneFree.gameObject.SetActive(false);
+                onCion.text = "免费";
+            }
+            else if (summonData.oneFreeCount >= openBoxConfig.oneConsumeFreePara[1])
+            {
+                onCion.text = "x" + openBoxConfig.oneConsume;
+                Text_OneFree.gameObject.SetActive(false);
+            }
+            else
+            {
+                onCion.text = "x" + openBoxConfig.oneConsume;
+                Text_OneFree.gameObject.SetActive(true);
+            }
+        }
+
+	}
+}

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

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

+ 117 - 0
Assets/Scripts/GameUI/UI/ShopPanel/ShopBoxWidgetData.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 ShopBoxWidget 
+	{
+	  #region 自定义数据 
+	  private Button _oneButton;
+	  public Button oneButton
+	   {
+	   get{
+	      if (_oneButton == null)
+	       {
+	         _oneButton  = GetUIUnit<Button>("oneButton"); 
+	       }
+	      return _oneButton;
+	     }
+	   }
+	  private Button _tenButton;
+	  public Button tenButton
+	   {
+	   get{
+	      if (_tenButton == null)
+	       {
+	         _tenButton  = GetUIUnit<Button>("tenButton"); 
+	       }
+	      return _tenButton;
+	     }
+	   }
+	  private Text _tenCion;
+	  public Text tenCion
+	   {
+	   get{
+	      if (_tenCion == null)
+	       {
+	         _tenCion  = GetUIUnit<Text>("tenCion"); 
+	       }
+	      return _tenCion;
+	     }
+	   }
+	  private Text _onCion;
+	  public Text onCion
+	   {
+	   get{
+	      if (_onCion == null)
+	       {
+	         _onCion  = GetUIUnit<Text>("onCion"); 
+	       }
+	      return _onCion;
+	     }
+	   }
+	  private Button _Btn_AdsFree;
+	  public Button Btn_AdsFree
+	   {
+	   get{
+	      if (_Btn_AdsFree == null)
+	       {
+	         _Btn_AdsFree  = GetUIUnit<Button>("Btn_AdsFree"); 
+	       }
+	      return _Btn_AdsFree;
+	     }
+	   }
+	  private MyImage _icon_Oneitem;
+	  public MyImage icon_Oneitem
+	   {
+	   get{
+	      if (_icon_Oneitem == null)
+	       {
+	         _icon_Oneitem  = GetUIUnit<MyImage>("icon_Oneitem"); 
+	       }
+	      return _icon_Oneitem;
+	     }
+	   }
+	  private MyImage _Icon_TenItem;
+	  public MyImage Icon_TenItem
+	   {
+	   get{
+	      if (_Icon_TenItem == null)
+	       {
+	         _Icon_TenItem  = GetUIUnit<MyImage>("Icon_TenItem"); 
+	       }
+	      return _Icon_TenItem;
+	     }
+	   }
+	  private Text _Text_TenFree;
+	  public Text Text_TenFree
+	   {
+	   get{
+	      if (_Text_TenFree == null)
+	       {
+	         _Text_TenFree  = GetUIUnit<Text>("Text_TenFree"); 
+	       }
+	      return _Text_TenFree;
+	     }
+	   }
+	  private Text _Text_OneFree;
+	  public Text Text_OneFree
+	   {
+	   get{
+	      if (_Text_OneFree == null)
+	       {
+	         _Text_OneFree  = GetUIUnit<Text>("Text_OneFree"); 
+	       }
+	      return _Text_OneFree;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

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

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

+ 3 - 3
Assets/Scripts/GameUI/UI/ShopPanel/ShopGroupWidgetType1.cs

@@ -15,7 +15,7 @@ namespace Fort23.Mono
         List<ShopItemWidgetType1> _shopItemWidgetType1s = new List<ShopItemWidgetType1>();
         List<ShopItemWidgetType2> _shopItemWidgetType2s = new List<ShopItemWidgetType2>();
 
-        private ShopGroupConfig _shopGroupConfig;
+        private ShopConfig _shopConfig;
 
         private void Init()
         {
@@ -66,8 +66,8 @@ namespace Fort23.Mono
 
             _shopItemWidgetType2s.Clear();
             this.shopData = shopData;
-            _shopGroupConfig = ConfigComponent.Instance.Get<ShopGroupConfig>(shopData.id);
-            Text_Title.text = LanguageManager.Instance.Text(_shopGroupConfig.shopName);
+            _shopConfig = ConfigComponent.Instance.Get<ShopConfig>(shopData.id);
+            Text_Title.text = LanguageManager.Instance.Text(_shopConfig.shopName);
             if (this.shopData.refreshTime != -1)
             {
                 Text_RefenceTime.text = PlayerManager.TimeToHSM((this.shopData.refreshTime - PlayerManager.Instance.serverTime) / 1000);

+ 21 - 6
Assets/Scripts/GameUI/UI/ShopPanel/ShopPanel.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using Core.Language;
 using Core.Utility;
 using Excel2Json;
@@ -13,7 +14,7 @@ namespace Fort23.Mono
     {
         private List<AccountFileInfo.ShopData> _shopDatas;
 
-        private List<ShopGroupWidgetType1> _shopGroupWidgetType1s = new List<ShopGroupWidgetType1>();
+        private List<UIComponent> _shopGroupWidgetType1s = new List<UIComponent>();
 
         // List<EnergyWidget> _energyWidgets = new List<EnergyWidget>();
         ShopBtnWidget currentSelectedShopBtnWidget;
@@ -51,11 +52,17 @@ namespace Fort23.Mono
             return base.LoseFocus();
         }
 
+
+        public int Sort(ShopGroupConfig s,ShopGroupConfig b)
+        {
+            return s.pageSortNum.CompareTo(b.pageSortNum);
+        }
         public async override CTask<bool> AsyncInit(object[] uiData)
         {
-            ShopGroupConfig[] shopGroupConfigs = ConfigComponent.Instance.GetAll<ShopGroupConfig>();
-            foreach (var shopGroupConfig in shopGroupConfigs)
-            {
+          List<ShopGroupConfig> shopGroupConfigs = ConfigComponent.Instance.GetAll<ShopGroupConfig>().ToList();
+          shopGroupConfigs.Sort(Sort);
+          foreach (var shopGroupConfig in shopGroupConfigs)
+          {
                 ShopBtnWidget shopBtnWidget = await UIManager.Instance.CreateGComponent<ShopBtnWidget>(null, ShopBtnContent);
                 shopBtnWidget.CustomInit(shopGroupConfig);
                 shopBtnWidget.OnClick = OnClick;
@@ -64,7 +71,7 @@ namespace Fort23.Mono
                 {
                     currentSelectedShopBtnWidget = shopBtnWidget;
                 }
-            }
+          }
 
             ShopBtnContent.GetComponent<UIToggleList>().GetChildObj();
             currentSelectedShopBtnWidget.OnPointerClick();
@@ -93,6 +100,14 @@ namespace Fort23.Mono
                 ShopConfig shopConfig = ConfigComponent.Instance.Get<ShopConfig>(shopData.id);
                 if (shopConfig.shopGroup == shopBtnWidget.ShopGroupConfig.ID)
                 {
+                    if (shopConfig.shopItemGroup == 4)
+                    {
+
+                        ShopBoxWidget shopBoxWidget = await UIManager.Instance.CreateGComponent<ShopBoxWidget>(null, Content);
+                        shopBoxWidget.CustomInit();
+                        _shopGroupWidgetType1s.Add(shopBoxWidget);
+
+                    }
                     // if (shopData.id == 1 || shopData.id == 5)
                     // {
                     //     ShopGroupWidgetType1 shopGroupWidgetType1 =
@@ -101,7 +116,7 @@ namespace Fort23.Mono
                     //     _shopGroupWidgetType1s.Add(shopGroupWidgetType1);
                     //     await shopGroupWidgetType1.CustomInit(shopData);
                     // }
-                    // else
+                    else
                     {
                         ShopGroupWidgetType1 shopGroupWidgetType1 =
                             await UIManager.Instance.CreateGComponentForObject<ShopGroupWidgetType1>(ShopGroupWidgetType2,

+ 1 - 1
Assets/Scripts/GameUI/UI/TowerPanel/TowerPanel.cs

@@ -63,7 +63,7 @@ namespace Fort23.Mono
                     AccountFileInfo.Instance.SavePlayerData();
                 }
 
-                CombatDrive.Instance.LoadLevelBattleCombat(currentLevelWidget._towerInfoConfig.typeValue[0], true,
+                CombatDrive.Instance.LoadLevelBattleCombat(currentLevelWidget._towerInfoConfig.typeValue[0], true,-1,
                     delegate(bool isWin)
                     {
                         LogTool.Log("战斗完成" + isWin);

File diff suppressed because it is too large
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


二進制
Excel2Json/Excel/ChouKa.xlsx


二進制
Excel2Json/Excel/DaoyouConfig.xlsx


二進制
Excel2Json/Excel/EventConfig.xlsx


二進制
Excel2Json/Excel/InitialPlayer.xlsx


二進制
Excel2Json/Excel/Item.xlsx


二進制
Excel2Json/Excel/Language.xlsx


二進制
Excel2Json/Excel/Maps.xlsx


二進制
Excel2Json/Excel/OpenBox.xlsx


二進制
Excel2Json/Excel/Shop.xlsx


二進制
Excel2Json/Excel/skill.xlsx


Some files were not shown because too many files changed in this diff