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

# Conflicts:
#	Excel2Json/Excel/EventConfig.xlsx   resolved by origin/master(远端) version

Assets/Res/Config/DaoyouModelConfig.json

@@ -35,7 +35,7 @@
       ],
       "EmotionLvforQuest": 2,
       "EventCompleteforQuest": 1,
-      "QuestID": 9003,
+      "QuestID": 6006,
       "EmotionLvforspecialGift": [
         3
       ],
@@ -81,7 +81,7 @@
       ],
       "EmotionLvforQuest": 2,
       "EventCompleteforQuest": 1,
-      "QuestID": 9002,
+      "QuestID": 6016,
       "EmotionLvforspecialGift": [
         4
       ],
@@ -127,7 +127,7 @@
       ],
       "EmotionLvforQuest": 2,
       "EventCompleteforQuest": 1,
-      "QuestID": 9001,
+      "QuestID": 6026,
       "EmotionLvforspecialGift": [
         5
       ],
@@ -173,7 +173,7 @@
       ],
       "EmotionLvforQuest": 3,
       "EventCompleteforQuest": 1,
-      "QuestID": 9002,
+      "QuestID": 6036,
       "EmotionLvforspecialGift": [
         4
       ],
@@ -183,98 +183,6 @@
       "specialGiftNum": [
         1
       ]
-    },
-    {
-      "ID": 5,
-      "name": 1957,
-      "quality": 4,
-      "bodyIcon": "bg_lh_xuyou",
-      "headIcon": "",
-      "growupRate": 100,
-      "des": [
-        1975,
-        1976,
-        1977
-      ],
-      "desUnlockLv": [
-        1,
-        3,
-        6
-      ],
-      "PreferGiftID": [
-        1401,
-        1402,
-        1403
-      ],
-      "shownPreferGiftID": [
-        1401
-      ],
-      "guajiBuffID": [
-        2,
-        12,
-        33
-      ],
-      "daolvSkillID": [
-        5
-      ],
-      "EmotionLvforQuest": 3,
-      "EventCompleteforQuest": 1,
-      "QuestID": 9001,
-      "EmotionLvforspecialGift": [
-        5
-      ],
-      "specialGiftID": [
-        1201
-      ],
-      "specialGiftNum": [
-        1
-      ]
-    },
-    {
-      "ID": 6,
-      "name": 1958,
-      "quality": 5,
-      "bodyIcon": "bg_lh_fengdaoren",
-      "headIcon": "",
-      "growupRate": 120,
-      "des": [
-        1978,
-        1979,
-        1980
-      ],
-      "desUnlockLv": [
-        1,
-        3,
-        6
-      ],
-      "PreferGiftID": [
-        1201,
-        1202,
-        1203
-      ],
-      "shownPreferGiftID": [
-        1201
-      ],
-      "guajiBuffID": [
-        2,
-        22,
-        43
-      ],
-      "daolvSkillID": [
-        6
-      ],
-      "EmotionLvforQuest": 3,
-      "EventCompleteforQuest": 1,
-      "QuestID": 9002,
-      "EmotionLvforspecialGift": [
-        6
-      ],
-      "specialGiftID": [
-        1202
-      ],
-      "specialGiftNum": [
-        1
-      ]
     }
   ]
 }

Assets/Res/Config/DropGroupConfig.json

@@ -51,28 +51,28 @@
     },
     {
       "ID": 8,
-      "dropRate": 658,
+      "dropRate": 830,
       "dropItemID": [
         8
       ]
     },
     {
       "ID": 9,
-      "dropRate": 270,
+      "dropRate": 166,
       "dropItemID": [
         9
       ]
     },
     {
       "ID": 10,
-      "dropRate": 54,
+      "dropRate": 3,
       "dropItemID": [
         10
       ]
     },
     {
       "ID": 11,
-      "dropRate": 18,
+      "dropRate": 1,
       "dropItemID": [
         11
       ]
@@ -93,42 +93,42 @@
     },
     {
       "ID": 14,
-      "dropRate": 667,
+      "dropRate": 855,
       "dropItemID": [
-        9
+        10
       ]
     },
     {
       "ID": 15,
-      "dropRate": 228,
+      "dropRate": 142,
       "dropItemID": [
-        10
+        11
       ]
     },
     {
       "ID": 16,
-      "dropRate": 75,
+      "dropRate": 2,
       "dropItemID": [
-        11
+        12
       ]
     },
     {
       "ID": 17,
-      "dropRate": 30,
+      "dropRate": 1,
       "dropItemID": [
-        12
+        13
       ]
     },
     {
       "ID": 18,
-      "dropRate": 830,
+      "dropRate": 910,
       "dropItemID": [
-        12
+        11
       ]
     },
     {
       "ID": 19,
-      "dropRate": 170,
+      "dropRate": 90,
       "dropItemID": [
         13
       ]

Assets/Res/Config/EventConfig.json

@@ -362,7 +362,7 @@
       ],
       "PrizeNums": [
         -7500,
-        -5000
+        -7500
       ],
       "RefreshProbability": 100,
       "RefreshCount": 0,
@@ -641,7 +641,7 @@
       ],
       "PrizeNums": [
         -15000,
-        -5000
+        -15000
       ],
       "RefreshProbability": 100,
       "RefreshCount": 0,
@@ -920,7 +920,7 @@
       ],
       "PrizeNums": [
         -30000,
-        -5000
+        -30000
       ],
       "RefreshProbability": 100,
       "RefreshCount": 0,
@@ -1199,7 +1199,7 @@
       ],
       "PrizeNums": [
         -50000,
-        -5000
+        -50000
       ],
       "RefreshProbability": 100,
       "RefreshCount": 0,
@@ -1948,6 +1948,7 @@
         1001414,
         1001415,
         1001416,
+        1001417,
         102,
         103
       ],
@@ -2022,6 +2023,8 @@
         1001606,
         1001607,
         1001608,
+        1001609,
+        1001610,
         102,
         103
       ],
@@ -2257,6 +2260,7 @@
         1002210,
         1002211,
         1002212,
+        1002213,
         102,
         103
       ],
@@ -2331,6 +2335,7 @@
         1002411,
         1002412,
         1002413,
+        1002414,
         102,
         103
       ],
@@ -3412,6 +3417,7 @@
         600204,
         600205,
         600206,
+        600207,
         102,
         103
       ],
@@ -4053,6 +4059,7 @@
         602501,
         602502,
         602503,
+        602504,
         102,
         103
       ],
@@ -4828,7 +4835,7 @@
       ],
       "PrizeNums": [
         1,
-        10000,
+        3000,
         3000
       ],
       "RefreshProbability": 40,
@@ -4859,10 +4866,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         22008,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        3500,
         3000
       ],
       "RefreshProbability": 35,
@@ -4897,10 +4906,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         22008,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        4000,
         3000
       ],
       "RefreshProbability": 30,
@@ -4938,10 +4949,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         22008,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        4500,
         3000
       ],
       "RefreshProbability": 25,
@@ -4973,10 +4986,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         20013,
+        1001,
         1003
       ],
       "PrizeNums": [
         3,
+        5000,
         3000
       ],
       "RefreshProbability": 20,
@@ -5026,10 +5041,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         22008,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        5500,
         3000
       ],
       "RefreshProbability": 15,
@@ -5072,9 +5089,11 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
+        1001,
         1003
       ],
       "PrizeNums": [
+        6000,
         3120
       ],
       "RefreshProbability": 40,
@@ -5106,10 +5125,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         22008,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        6500,
         3120
       ],
       "RefreshProbability": 35,
@@ -5151,9 +5172,11 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
+        1001,
         1003
       ],
       "PrizeNums": [
+        7000,
         3120
       ],
       "RefreshProbability": 30,
@@ -5191,10 +5214,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         22008,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        7500,
         3330
       ],
       "RefreshProbability": 25,
@@ -5229,9 +5254,11 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
+        1001,
         1003
       ],
       "PrizeNums": [
+        8000,
         3330
       ],
       "RefreshProbability": 20,
@@ -5276,10 +5303,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         22008,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        8500,
         3330
       ],
       "RefreshProbability": 15,
@@ -5337,9 +5366,11 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
+        1001,
         1003
       ],
       "PrizeNums": [
+        9000,
         3660
       ],
       "RefreshProbability": 40,
@@ -5366,10 +5397,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         22008,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        9500,
         3660
       ],
       "RefreshProbability": 35,
@@ -5402,10 +5435,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         20014,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        10000,
         3660
       ],
       "RefreshProbability": 30,
@@ -5439,10 +5474,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         22008,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        10500,
         3660
       ],
       "RefreshProbability": 25,
@@ -5480,9 +5517,11 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
+        1001,
         1003
       ],
       "PrizeNums": [
+        11000,
         4050
       ],
       "RefreshProbability": 30,
@@ -5513,10 +5552,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         22008,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        11500,
         4050
       ],
       "RefreshProbability": 20,
@@ -5560,9 +5601,11 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
+        1001,
         1003
       ],
       "PrizeNums": [
+        12000,
         4050
       ],
       "RefreshProbability": 15,
@@ -5599,10 +5642,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         22008,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        12500,
         4050
       ],
       "RefreshProbability": 30,
@@ -5629,9 +5674,11 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
+        1001,
         1003
       ],
       "PrizeNums": [
+        13000,
         4050
       ],
       "RefreshProbability": 20,
@@ -5674,10 +5721,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         22008,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        13500,
         4050
       ],
       "RefreshProbability": 15,
@@ -5715,9 +5764,11 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
+        1001,
         1003
       ],
       "PrizeNums": [
+        14000,
         4470
       ],
       "RefreshProbability": 40,
@@ -5758,10 +5809,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         22008,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        14500,
         4470
       ],
       "RefreshProbability": 35,
@@ -5794,9 +5847,11 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
+        1001,
         1003
       ],
       "PrizeNums": [
+        15000,
         4470
       ],
       "RefreshProbability": 30,
@@ -5831,10 +5886,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         22008,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        15500,
         4470
       ],
       "RefreshProbability": 25,
@@ -5870,9 +5927,11 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
+        1001,
         1003
       ],
       "PrizeNums": [
+        16000,
         4470
       ],
       "RefreshProbability": 20,
@@ -5911,10 +5970,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         22008,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        16500,
         4470
       ],
       "RefreshProbability": 15,
@@ -5952,9 +6013,11 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
+        1001,
         1003
       ],
       "PrizeNums": [
+        17000,
         5460
       ],
       "RefreshProbability": 30,
@@ -5981,10 +6044,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         22008,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        17500,
         5460
       ],
       "RefreshProbability": 20,
@@ -6021,9 +6086,11 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
+        1001,
         1003
       ],
       "PrizeNums": [
+        18000,
         6690
       ],
       "RefreshProbability": 30,
@@ -6053,10 +6120,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         22008,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        18500,
         6690
       ],
       "RefreshProbability": 20,
@@ -6097,9 +6166,11 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
+        1001,
         1003
       ],
       "PrizeNums": [
+        19000,
         9030
       ],
       "RefreshProbability": 30,
@@ -6127,10 +6198,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         22008,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        19500,
         9030
       ],
       "RefreshProbability": 25,
@@ -6172,9 +6245,11 @@
       "Score": 1,
       "EventQuality": 3,
       "PrizeIDs": [
+        1001,
         1003
       ],
       "PrizeNums": [
+        20000,
         11040
       ],
       "RefreshProbability": 20,
@@ -6215,10 +6290,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         22008,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        20500,
         11040
       ],
       "RefreshProbability": 15,
@@ -6252,10 +6329,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         1401,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        -5000,
         -3000
       ],
       "RefreshProbability": 30,
@@ -6289,10 +6368,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         1401,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        -5000,
         -3000
       ],
       "RefreshProbability": 20,
@@ -6327,10 +6408,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         1401,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        -5000,
         -3000
       ],
       "RefreshProbability": 15,
@@ -6365,10 +6448,12 @@
       "EventQuality": 1,
       "PrizeIDs": [
         1401,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        -5000,
         -3000
       ],
       "RefreshProbability": 50,
@@ -6400,10 +6485,12 @@
       "EventQuality": 1,
       "PrizeIDs": [
         1401,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        -5000,
         -3000
       ],
       "RefreshProbability": 50,
@@ -6435,10 +6522,12 @@
       "EventQuality": 2,
       "PrizeIDs": [
         1402,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        -5000,
         -3000
       ],
       "RefreshProbability": 50,
@@ -6478,10 +6567,12 @@
       "EventQuality": 2,
       "PrizeIDs": [
         1402,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        -5000,
         -3000
       ],
       "RefreshProbability": 50,
@@ -6518,10 +6609,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         1403,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        -5000,
         -3000
       ],
       "RefreshProbability": 50,
@@ -6559,10 +6652,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         1403,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        -5000,
         -3000
       ],
       "RefreshProbability": 50,
@@ -6583,6 +6678,9 @@
         915605,
         915606,
         915607,
+        915608,
+        915609,
+        915610,
         102,
         103
       ],
@@ -6593,10 +6691,12 @@
       "EventQuality": 3,
       "PrizeIDs": [
         1403,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        -5000,
         -3000
       ],
       "RefreshProbability": 50,
@@ -6624,10 +6724,12 @@
       "EventQuality": 4,
       "PrizeIDs": [
         1404,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        -5000,
         -3000
       ],
       "RefreshProbability": 50,
@@ -6655,10 +6757,12 @@
       "EventQuality": 4,
       "PrizeIDs": [
         1404,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        -5000,
         -3000
       ],
       "RefreshProbability": 50,
@@ -6686,10 +6790,12 @@
       "EventQuality": 4,
       "PrizeIDs": [
         1404,
+        1001,
         1003
       ],
       "PrizeNums": [
         1,
+        -5000,
         -3000
       ],
       "RefreshProbability": 50,
@@ -6718,10 +6824,12 @@
       "EventQuality": 5,
       "PrizeIDs": [
         1404,
+        1001,
         1003
       ],
       "PrizeNums": [
         2,
+        -5000,
         -3000
       ],
       "RefreshProbability": 50,
@@ -6750,10 +6858,12 @@
       "EventQuality": 5,
       "PrizeIDs": [
         1404,
+        1001,
         1003
       ],
       "PrizeNums": [
         2,
+        -5000,
         -3000
       ],
       "RefreshProbability": 50,
@@ -6782,10 +6892,12 @@
       "EventQuality": 5,
       "PrizeIDs": [
         1404,
+        1001,
         1003
       ],
       "PrizeNums": [
         2,
+        -5000,
         -3000
       ],
       "RefreshProbability": 50,

Assets/Res/Config/GroupConfig.json

@@ -634,13 +634,13 @@
         1005
       ],
       "hpQiangDu": [
-        60
+        80
       ],
       "attQiangDu": [
-        60
+        80
       ],
       "duipingQiangDu": [
-        60
+        80
       ]
     },
     {
@@ -649,13 +649,13 @@
         1006
       ],
       "hpQiangDu": [
-        70
+        85
       ],
       "attQiangDu": [
-        70
+        85
       ],
       "duipingQiangDu": [
-        70
+        85
       ]
     },
     {
@@ -664,13 +664,13 @@
         1007
       ],
       "hpQiangDu": [
-        80
+        90
       ],
       "attQiangDu": [
-        80
+        90
       ],
       "duipingQiangDu": [
-        80
+        90
       ]
     },
     {
@@ -679,13 +679,13 @@
         1008
       ],
       "hpQiangDu": [
-        90
+        95
       ],
       "attQiangDu": [
-        90
+        95
       ],
       "duipingQiangDu": [
-        90
+        95
       ]
     },
     {
@@ -709,13 +709,13 @@
         1005
       ],
       "hpQiangDu": [
-        60
+        80
       ],
       "attQiangDu": [
-        60
+        80
       ],
       "duipingQiangDu": [
-        60
+        80
       ]
     },
     {
@@ -724,13 +724,13 @@
         1006
       ],
       "hpQiangDu": [
-        70
+        85
       ],
       "attQiangDu": [
-        70
+        85
       ],
       "duipingQiangDu": [
-        70
+        85
       ]
     },
     {
@@ -739,13 +739,13 @@
         1007
       ],
       "hpQiangDu": [
-        80
+        90
       ],
       "attQiangDu": [
-        80
+        90
       ],
       "duipingQiangDu": [
-        80
+        90
       ]
     },
     {
@@ -754,13 +754,13 @@
         1008
       ],
       "hpQiangDu": [
-        90
+        95
       ],
       "attQiangDu": [
-        90
+        95
       ],
       "duipingQiangDu": [
-        90
+        95
       ]
     },
     {

Assets/Res/Config/HeroModelConfig.json

@@ -124,10 +124,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 98,
-      "hp": 74,
+      "attack": 101,
+      "hp": 77,
       "def": 100,
-      "shield": 74,
+      "shield": 77,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -181,10 +181,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 89,
-      "hp": 81,
+      "attack": 92,
+      "hp": 84,
       "def": 100,
-      "shield": 81,
+      "shield": 84,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -238,10 +238,10 @@
       "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 81,
-      "hp": 89,
+      "attack": 84,
+      "hp": 93,
       "def": 100,
-      "shield": 89,
+      "shield": 93,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -296,10 +296,10 @@
       "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 72,
-      "hp": 100,
+      "attack": 75,
+      "hp": 104,
       "def": 100,
-      "shield": 100,
+      "shield": 104,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -354,10 +354,10 @@
       "model": "Boss_Tree_xiao",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 60,
-      "hp": 121,
+      "attack": 62,
+      "hp": 126,
       "def": 100,
-      "shield": 121,
+      "shield": 126,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -412,10 +412,10 @@
       "model": "gw_xianhe",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 77,
-      "hp": 94,
+      "attack": 79,
+      "hp": 98,
       "def": 100,
-      "shield": 94,
+      "shield": 98,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -470,10 +470,10 @@
       "model": "gw_huli",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 94,
-      "hp": 77,
+      "attack": 97,
+      "hp": 80,
       "def": 100,
-      "shield": 77,
+      "shield": 80,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -528,10 +528,10 @@
       "model": "Gw_zhizhu",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 111,
-      "hp": 65,
+      "attack": 114,
+      "hp": 68,
       "def": 100,
-      "shield": 65,
+      "shield": 68,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -586,10 +586,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 101,
-      "hp": 84,
+      "attack": 103,
+      "hp": 85,
       "def": 100,
-      "shield": 84,
+      "shield": 85,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -644,10 +644,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 83,
-      "hp": 102,
+      "attack": 85,
+      "hp": 104,
       "def": 100,
-      "shield": 102,
+      "shield": 104,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -702,10 +702,10 @@
       "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 92,
-      "hp": 92,
+      "attack": 94,
+      "hp": 94,
       "def": 100,
-      "shield": 92,
+      "shield": 94,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -760,10 +760,10 @@
       "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 110,
-      "hp": 77,
+      "attack": 113,
+      "hp": 78,
       "def": 100,
-      "shield": 77,
+      "shield": 78,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -818,10 +818,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 74,
-      "hp": 115,
+      "attack": 75,
+      "hp": 118,
       "def": 100,
-      "shield": 115,
+      "shield": 118,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -876,10 +876,10 @@
       "model": "Boss_ShuGuai",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 106,
-      "hp": 80,
+      "attack": 108,
+      "hp": 82,
       "def": 100,
-      "shield": 80,
+      "shield": 82,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -934,10 +934,10 @@
       "model": "Boss_QiongQi",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 97,
-      "hp": 88,
+      "attack": 99,
+      "hp": 90,
       "def": 100,
-      "shield": 88,
+      "shield": 90,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1340,10 +1340,10 @@
       "model": "Boss_fenghuang",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 85,
-      "hp": 43,
+      "attack": 88,
+      "hp": 44,
       "def": 100,
-      "shield": 85,
+      "shield": 88,
       "speed_atk": 2.0,
       "Linggen": [
         100,
@@ -1398,10 +1398,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 2,
-      "attack": 85,
-      "hp": 85,
+      "attack": 88,
+      "hp": 88,
       "def": 100,
-      "shield": 85,
+      "shield": 88,
       "speed_atk": 0.0,
       "Linggen": [
         100,

Assets/Res/Config/InitialPlayerConfig.json

@@ -9,7 +9,7 @@
         1201
       ],
       "itemAmount": [
-        200000,
+        30000,
         8000,
         6000,
         1

Assets/Res/Config/ItemConfig.json

@@ -221,7 +221,7 @@
       "associateID": 9,
       "associateVlaue": [
         1004,
-        1
+        6
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -250,7 +250,7 @@
       "associateID": 9,
       "associateVlaue": [
         1004,
-        6
+        30
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -279,7 +279,7 @@
       "associateID": 9,
       "associateVlaue": [
         1004,
-        30
+        68
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -308,7 +308,7 @@
       "associateID": 9,
       "associateVlaue": [
         1004,
-        98
+        128
       ],
       "sort": 0,
       "itemDesc2": 0
@@ -337,7 +337,7 @@
       "associateID": 9,
       "associateVlaue": [
         1004,
-        268
+        328
       ],
       "sort": 0,
       "itemDesc2": 0

Assets/Res/Config/LevelbattleConfig.json

@@ -710,7 +710,7 @@
         1402
       ],
       "awardNum": [
-        36300,
+        3600,
         1
       ],
       "combatTime": 120.0,
@@ -728,7 +728,7 @@
         1702
       ],
       "awardNum": [
-        37500,
+        3600,
         1
       ],
       "combatTime": 120.0,
@@ -746,7 +746,7 @@
         21012
       ],
       "awardNum": [
-        38400,
+        3900,
         1
       ],
       "combatTime": 120.0,
@@ -764,7 +764,7 @@
         1402
       ],
       "awardNum": [
-        39600,
+        3900,
         1
       ],
       "combatTime": 120.0,
@@ -782,7 +782,7 @@
         1702
       ],
       "awardNum": [
-        40800,
+        4200,
         1
       ],
       "combatTime": 120.0,
@@ -800,7 +800,7 @@
         21012
       ],
       "awardNum": [
-        42300,
+        4200,
         1
       ],
       "combatTime": 120.0,
@@ -818,7 +818,7 @@
         1402
       ],
       "awardNum": [
-        43500,
+        4200,
         1
       ],
       "combatTime": 120.0,
@@ -836,7 +836,7 @@
         1702
       ],
       "awardNum": [
-        44700,
+        4500,
         1
       ],
       "combatTime": 120.0,
@@ -854,7 +854,7 @@
         21012
       ],
       "awardNum": [
-        46200,
+        4500,
         1
       ],
       "combatTime": 120.0,
@@ -872,7 +872,7 @@
         1402
       ],
       "awardNum": [
-        47700,
+        4800,
         1
       ],
       "combatTime": 120.0,
@@ -890,7 +890,7 @@
         1702
       ],
       "awardNum": [
-        48900,
+        4800,
         1
       ],
       "combatTime": 120.0,
@@ -908,7 +908,7 @@
         21012
       ],
       "awardNum": [
-        50400,
+        5100,
         1
       ],
       "combatTime": 120.0,
@@ -926,7 +926,7 @@
         1402
       ],
       "awardNum": [
-        52200,
+        5100,
         1
       ],
       "combatTime": 120.0,
@@ -944,7 +944,7 @@
         1702
       ],
       "awardNum": [
-        53700,
+        5400,
         1
       ],
       "combatTime": 120.0,
@@ -962,7 +962,7 @@
         21012
       ],
       "awardNum": [
-        55200,
+        5400,
         1
       ],
       "combatTime": 120.0,
@@ -980,7 +980,7 @@
         1402
       ],
       "awardNum": [
-        57000,
+        5700,
         1
       ],
       "combatTime": 120.0,
@@ -998,7 +998,7 @@
         1702
       ],
       "awardNum": [
-        58800,
+        6000,
         1
       ],
       "combatTime": 120.0,
@@ -1016,7 +1016,7 @@
         21012
       ],
       "awardNum": [
-        60600,
+        6000,
         1
       ],
       "combatTime": 120.0,
@@ -1034,7 +1034,7 @@
         1402
       ],
       "awardNum": [
-        62400,
+        6300,
         1
       ],
       "combatTime": 120.0,
@@ -1052,7 +1052,7 @@
         1702
       ],
       "awardNum": [
-        64200,
+        6300,
         1
       ],
       "combatTime": 120.0,
@@ -1070,7 +1070,7 @@
         21012
       ],
       "awardNum": [
-        66300,
+        6600,
         1
       ],
       "combatTime": 120.0,
@@ -1088,7 +1088,7 @@
         1402
       ],
       "awardNum": [
-        68100,
+        6900,
         1
       ],
       "combatTime": 120.0,
@@ -1106,7 +1106,7 @@
         1702
       ],
       "awardNum": [
-        70200,
+        6900,
         1
       ],
       "combatTime": 120.0,
@@ -1124,7 +1124,7 @@
         21012
       ],
       "awardNum": [
-        72600,
+        7200,
         1
       ],
       "combatTime": 120.0,
@@ -1142,7 +1142,7 @@
         1402
       ],
       "awardNum": [
-        74700,
+        7500,
         1
       ],
       "combatTime": 120.0,
@@ -1160,7 +1160,7 @@
         1702
       ],
       "awardNum": [
-        76800,
+        7800,
         1
       ],
       "combatTime": 120.0,
@@ -1178,7 +1178,7 @@
         21012
       ],
       "awardNum": [
-        79200,
+        7800,
         1
       ],
       "combatTime": 120.0,
@@ -1196,7 +1196,7 @@
         1402
       ],
       "awardNum": [
-        81600,
+        8100,
         1
       ],
       "combatTime": 120.0,
@@ -1214,7 +1214,7 @@
         1702
       ],
       "awardNum": [
-        84300,
+        8400,
         1
       ],
       "combatTime": 120.0,
@@ -1232,7 +1232,7 @@
         21012
       ],
       "awardNum": [
-        86700,
+        8700,
         1
       ],
       "combatTime": 120.0,
@@ -1250,7 +1250,7 @@
         1403
       ],
       "awardNum": [
-        89400,
+        9000,
         1
       ],
       "combatTime": 120.0,
@@ -1268,7 +1268,7 @@
         1702
       ],
       "awardNum": [
-        92100,
+        9300,
         1
       ],
       "combatTime": 120.0,
@@ -1286,7 +1286,7 @@
         21012
       ],
       "awardNum": [
-        95100,
+        9600,
         1
       ],
       "combatTime": 120.0,
@@ -1304,7 +1304,7 @@
         1403
       ],
       "awardNum": [
-        97800,
+        9900,
         1
       ],
       "combatTime": 120.0,
@@ -1322,7 +1322,7 @@
         1702
       ],
       "awardNum": [
-        100800,
+        10200,
         1
       ],
       "combatTime": 120.0,
@@ -1340,7 +1340,7 @@
         21012
       ],
       "awardNum": [
-        103800,
+        10500,
         1
       ],
       "combatTime": 120.0,
@@ -1358,7 +1358,7 @@
         1403
       ],
       "awardNum": [
-        107100,
+        10800,
         1
       ],
       "combatTime": 120.0,
@@ -1376,7 +1376,7 @@
         1702
       ],
       "awardNum": [
-        110400,
+        11100,
         1
       ],
       "combatTime": 120.0,
@@ -1394,7 +1394,7 @@
         21012
       ],
       "awardNum": [
-        113700,
+        11400,
         1
       ],
       "combatTime": 120.0,
@@ -1412,7 +1412,7 @@
         1403
       ],
       "awardNum": [
-        117300,
+        11700,
         1
       ],
       "combatTime": 120.0,
@@ -1430,7 +1430,7 @@
         1702
       ],
       "awardNum": [
-        120900,
+        12000,
         1
       ],
       "combatTime": 120.0,
@@ -1448,7 +1448,7 @@
         21012
       ],
       "awardNum": [
-        124500,
+        12300,
         1
       ],
       "combatTime": 120.0,
@@ -1466,7 +1466,7 @@
         1403
       ],
       "awardNum": [
-        128400,
+        12900,
         1
       ],
       "combatTime": 120.0,
@@ -1484,7 +1484,7 @@
         1702
       ],
       "awardNum": [
-        132300,
+        13200,
         1
       ],
       "combatTime": 120.0,
@@ -1502,7 +1502,7 @@
         21012
       ],
       "awardNum": [
-        136200,
+        13500,
         1
       ],
       "combatTime": 120.0,
@@ -1520,7 +1520,7 @@
         1403
       ],
       "awardNum": [
-        140400,
+        14100,
         1
       ],
       "combatTime": 120.0,
@@ -1538,7 +1538,7 @@
         1702
       ],
       "awardNum": [
-        144600,
+        14400,
         1
       ],
       "combatTime": 120.0,
@@ -1556,7 +1556,7 @@
         21012
       ],
       "awardNum": [
-        149100,
+        15000,
         1
       ],
       "combatTime": 120.0,
@@ -1574,7 +1574,7 @@
         1403
       ],
       "awardNum": [
-        153600,
+        15300,
         1
       ],
       "combatTime": 120.0,
@@ -1592,7 +1592,7 @@
         1702
       ],
       "awardNum": [
-        158400,
+        15900,
         1
       ],
       "combatTime": 120.0,
@@ -1610,7 +1610,7 @@
         21012
       ],
       "awardNum": [
-        163200,
+        16200,
         1
       ],
       "combatTime": 120.0,
@@ -1628,7 +1628,7 @@
         1403
       ],
       "awardNum": [
-        168000,
+        16800,
         1
       ],
       "combatTime": 120.0,
@@ -1646,7 +1646,7 @@
         1702
       ],
       "awardNum": [
-        173100,
+        17400,
         1
       ],
       "combatTime": 120.0,
@@ -1664,7 +1664,7 @@
         21012
       ],
       "awardNum": [
-        178500,
+        18000,
         1
       ],
       "combatTime": 120.0,
@@ -1682,7 +1682,7 @@
         1403
       ],
       "awardNum": [
-        183900,
+        18300,
         1
       ],
       "combatTime": 120.0,
@@ -1700,7 +1700,7 @@
         1702
       ],
       "awardNum": [
-        189600,
+        18900,
         1
       ],
       "combatTime": 120.0,
@@ -1718,7 +1718,7 @@
         21012
       ],
       "awardNum": [
-        195300,
+        19500,
         1
       ],
       "combatTime": 120.0,
@@ -1736,7 +1736,7 @@
         1403
       ],
       "awardNum": [
-        201300,
+        20100,
         1
       ],
       "combatTime": 120.0,
@@ -1754,7 +1754,7 @@
         1702
       ],
       "awardNum": [
-        207600,
+        20700,
         1
       ],
       "combatTime": 120.0,
@@ -1772,7 +1772,7 @@
         21012
       ],
       "awardNum": [
-        213900,
+        21300,
         1
       ],
       "combatTime": 120.0,
@@ -1790,7 +1790,7 @@
         1404
       ],
       "awardNum": [
-        220200,
+        21900,
         1
       ],
       "combatTime": 120.0,
@@ -1808,7 +1808,7 @@
         1702
       ],
       "awardNum": [
-        227100,
+        22800,
         1
       ],
       "combatTime": 120.0,
@@ -1826,7 +1826,7 @@
         21012
       ],
       "awardNum": [
-        234000,
+        23400,
         1
       ],
       "combatTime": 120.0,
@@ -1844,7 +1844,7 @@
         1404
       ],
       "awardNum": [
-        241200,
+        24000,
         1
       ],
       "combatTime": 120.0,
@@ -1862,7 +1862,7 @@
         1702
       ],
       "awardNum": [
-        248400,
+        24900,
         1
       ],
       "combatTime": 120.0,
@@ -1880,7 +1880,7 @@
         21012
       ],
       "awardNum": [
-        255900,
+        25500,
         1
       ],
       "combatTime": 120.0,
@@ -1898,7 +1898,7 @@
         1404
       ],
       "awardNum": [
-        263700,
+        26400,
         1
       ],
       "combatTime": 120.0,
@@ -1916,7 +1916,7 @@
         1702
       ],
       "awardNum": [
-        271800,
+        27300,
         1
       ],
       "combatTime": 120.0,
@@ -1934,7 +1934,7 @@
         21012
       ],
       "awardNum": [
-        280200,
+        27900,
         1
       ],
       "combatTime": 120.0,
@@ -1952,7 +1952,7 @@
         1404
       ],
       "awardNum": [
-        288600,
+        28800,
         1
       ],
       "combatTime": 120.0,
@@ -1970,7 +1970,7 @@
         1702
       ],
       "awardNum": [
-        297600,
+        29700,
         1
       ],
       "combatTime": 120.0,
@@ -1988,7 +1988,7 @@
         21012
       ],
       "awardNum": [
-        306600,
+        30600,
         1
       ],
       "combatTime": 120.0,
@@ -2006,7 +2006,7 @@
         1404
       ],
       "awardNum": [
-        315900,
+        31500,
         1
       ],
       "combatTime": 120.0,
@@ -2024,7 +2024,7 @@
         1702
       ],
       "awardNum": [
-        325500,
+        32700,
         1
       ],
       "combatTime": 120.0,
@@ -2042,7 +2042,7 @@
         21012
       ],
       "awardNum": [
-        335700,
+        33600,
         1
       ],
       "combatTime": 120.0,
@@ -2060,7 +2060,7 @@
         1404
       ],
       "awardNum": [
-        345900,
+        34500,
         1
       ],
       "combatTime": 120.0,
@@ -2078,7 +2078,7 @@
         1702
       ],
       "awardNum": [
-        356400,
+        35700,
         1
       ],
       "combatTime": 120.0,
@@ -2096,7 +2096,7 @@
         21012
       ],
       "awardNum": [
-        367200,
+        36600,
         1
       ],
       "combatTime": 120.0,
@@ -2114,7 +2114,7 @@
         1404
       ],
       "awardNum": [
-        378300,
+        37800,
         1
       ],
       "combatTime": 120.0,
@@ -2132,7 +2132,7 @@
         1702
       ],
       "awardNum": [
-        390000,
+        39000,
         1
       ],
       "combatTime": 120.0,
@@ -2150,7 +2150,7 @@
         21012
       ],
       "awardNum": [
-        402000,
+        40200,
         1
       ],
       "combatTime": 120.0,
@@ -2168,7 +2168,7 @@
         1404
       ],
       "awardNum": [
-        414000,
+        41400,
         1
       ],
       "combatTime": 120.0,
@@ -2186,7 +2186,7 @@
         1702
       ],
       "awardNum": [
-        426900,
+        42600,
         1
       ],
       "combatTime": 120.0,
@@ -2204,7 +2204,7 @@
         21012
       ],
       "awardNum": [
-        435300,
+        43500,
         1
       ],
       "combatTime": 120.0,
@@ -2222,7 +2222,7 @@
         1404
       ],
       "awardNum": [
-        444300,
+        44400,
         1
       ],
       "combatTime": 120.0,
@@ -2240,7 +2240,7 @@
         1702
       ],
       "awardNum": [
-        453300,
+        45300,
         1
       ],
       "combatTime": 120.0,
@@ -2258,7 +2258,7 @@
         21012
       ],
       "awardNum": [
-        462300,
+        46200,
         1
       ],
       "combatTime": 120.0,
@@ -2276,7 +2276,7 @@
         1404
       ],
       "awardNum": [
-        471900,
+        47100,
         1
       ],
       "combatTime": 120.0,
@@ -2294,7 +2294,7 @@
         1702
       ],
       "awardNum": [
-        481200,
+        48000,
         1
       ],
       "combatTime": 120.0,
@@ -2312,7 +2312,7 @@
         21012
       ],
       "awardNum": [
-        491100,
+        49200,
         1
       ],
       "combatTime": 120.0,
@@ -2330,7 +2330,7 @@
         1404
       ],
       "awardNum": [
-        501000,
+        50100,
         1
       ],
       "combatTime": 120.0,
@@ -2348,7 +2348,7 @@
         1702
       ],
       "awardNum": [
-        511200,
+        51000,
         1
       ],
       "combatTime": 120.0,
@@ -2366,7 +2366,7 @@
         21012
       ],
       "awardNum": [
-        521400,
+        52200,
         1
       ],
       "combatTime": 120.0,
@@ -2384,7 +2384,7 @@
         1404
       ],
       "awardNum": [
-        531900,
+        53100,
         1
       ],
       "combatTime": 120.0,
@@ -2402,7 +2402,7 @@
         1702
       ],
       "awardNum": [
-        542700,
+        54300,
         1
       ],
       "combatTime": 120.0,
@@ -2420,7 +2420,7 @@
         21012
       ],
       "awardNum": [
-        553800,
+        55500,
         1
       ],
       "combatTime": 120.0,
@@ -2438,7 +2438,7 @@
         1404
       ],
       "awardNum": [
-        564900,
+        56400,
         1
       ],
       "combatTime": 120.0,
@@ -2456,7 +2456,7 @@
         1702
       ],
       "awardNum": [
-        576300,
+        57600,
         1
       ],
       "combatTime": 120.0,
@@ -2474,7 +2474,7 @@
         21012
       ],
       "awardNum": [
-        588000,
+        58800,
         1
       ],
       "combatTime": 120.0,
@@ -2492,7 +2492,7 @@
         1404
       ],
       "awardNum": [
-        600000,
+        60000,
         1
       ],
       "combatTime": 120.0,

Assets/Res/Config/OpenBoxConfig.json

@@ -37,14 +37,14 @@
       "reward2para1": 100,
       "ProgressRewardChoukaCount": -1,
       "betPara1": [
-        2.0,
-        3.0,
-        4.0
+        1.2,
+        1.6,
+        2.0
       ],
       "betPara2": [
-        600,
-        300,
-        100
+        425,
+        400,
+        175
       ]
     },
     {
@@ -84,14 +84,14 @@
       "reward2para1": 100,
       "ProgressRewardChoukaCount": 200,
       "betPara1": [
-        2.0,
-        3.0,
-        4.0
+        1.2,
+        1.6,
+        2.0
       ],
       "betPara2": [
-        600,
-        300,
-        100
+        425,
+        400,
+        175
       ]
     }
   ]

Assets/Res/UI/DivineSence/DivineSenceEventPreviewPanel.prefab

@@ -248,7 +248,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 220, y: 0.20947266}
-  m_SizeDelta: {x: 221.2423, y: 4.8994}
+  m_SizeDelta: {x: 221.2423, y: 3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1404112302102908525
 CanvasRenderer:
@@ -566,8 +566,8 @@ GameObject:
   - component: {fileID: 8429405667931584362}
   - component: {fileID: 1526515506040239878}
   - component: {fileID: 9181876341202037186}
-  - component: {fileID: 1659429409413804256}
   - component: {fileID: 5277193031132899660}
+  - component: {fileID: 2905003392454692597}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_ShenShiCount (1)
@@ -625,10 +625,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 34
+    m_FontSize: 36
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 3
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -637,7 +637,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u9053\u53CB\u4E8B\u4EF6"
---- !u!114 &1659429409413804256
+--- !u!114 &5277193031132899660
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -646,13 +646,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 1245667844451503244}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0.38823533, g: 0.45098042, b: 0.3529412, a: 1}
-  m_EffectDistance: {x: 2, y: -2}
-  m_UseGraphicAlpha: 1
---- !u!114 &5277193031132899660
+  id: 10154
+--- !u!114 &2905003392454692597
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -661,10 +659,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 1245667844451503244}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  id: 10154
+  effectColor: {r: 0.112272955, g: 0.4103772, b: 0.18488856, a: 1}
+  effectDistanceX: 2
+  effectDistanceY: 2
+  samplingRate: 5
 --- !u!1 &1737360981415971026
 GameObject:
   m_ObjectHideFlags: 0
@@ -701,9 +702,9 @@ RectTransform:
   - {fileID: 3138869795302671254}
   m_Father: {fileID: 8599819629026832582}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -99.70001, y: -37}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 29, y: -37}
   m_SizeDelta: {x: 53.517395, y: 47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &342810598981405438
@@ -1034,16 +1035,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2476116567943002456}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8599819629026832582}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 1}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -62.699554, y: -36.469482}
+  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 62, y: -36.469482}
   m_SizeDelta: {x: 125.39911, y: 53.895996}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8276815795892205159
@@ -1238,7 +1239,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.1137255, g: 0.15294118, b: 0.121568635, a: 1}
+  m_Color: {r: 0.2299527, g: 0.3066036, b: 0.24528289, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1247,10 +1248,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 72
+    m_FontSize: 68
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 7
+    m_MinSize: 6
     m_MaxSize: 72
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -1421,7 +1422,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.7830189, g: 0.76455146, b: 0.76455146, a: 1}
+  m_Color: {r: 0.8376645, g: 0.9811319, b: 0.9319799, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1430,10 +1431,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 44
-    m_FontStyle: 1
+    m_FontSize: 36
+    m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 3
     m_MaxSize: 44
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -2292,7 +2293,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -7.700012, y: 2}
+  m_AnchoredPosition: {x: 8, y: 2}
   m_SizeDelta: {x: -553.2323, y: -6.971}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7790443248632903804
@@ -2326,7 +2327,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 32
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
@@ -2534,7 +2535,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8941177, g: 0.97647065, b: 0.909804, a: 1}
+  m_Color: {r: 0.3264061, g: 0.42452818, b: 0.34372175, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2579,7 +2580,7 @@ GameObject:
   - component: {fileID: 7705849554225510677}
   - component: {fileID: 3127181873672424435}
   - component: {fileID: 1674366787068327515}
-  - component: {fileID: 4312004086963515338}
+  - component: {fileID: 4751600542081159404}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_ShenShiCount (1)
@@ -2637,11 +2638,11 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 34
+    m_FontSize: 36
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
-    m_MaxSize: 40
+    m_MinSize: 3
+    m_MaxSize: 47
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -2649,7 +2650,7 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u795E\u8BC6\u4E8B\u4EF6"
---- !u!114 &4312004086963515338
+--- !u!114 &4751600542081159404
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -2658,12 +2659,13 @@ MonoBehaviour:
   m_GameObject: {fileID: 7587375694572286685}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Script: {fileID: 11500000, guid: d8d4ef1212a480c4286901b11158a0b7, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0.6156863, g: 0.48235297, b: 0.2509804, a: 1}
-  m_EffectDistance: {x: 2, y: -2}
-  m_UseGraphicAlpha: 1
+  effectColor: {r: 0.5801885, g: 0.41613734, b: 0.24904312, a: 1}
+  effectDistanceX: 2
+  effectDistanceY: 2
+  samplingRate: 5
 --- !u!1 &7638606920926905235
 GameObject:
   m_ObjectHideFlags: 0
@@ -3014,8 +3016,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -220.6, y: 0.20947266}
-  m_SizeDelta: {x: 221.2423, y: 4.8994}
+  m_AnchoredPosition: {x: -220, y: 0.20947266}
+  m_SizeDelta: {x: 221.2423, y: 3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5380472091474674072
 CanvasRenderer:
@@ -3175,6 +3177,26 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -86.7
       objectReference: {fileID: 0}
+    - target: {fileID: 521768857768353200, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_FontData.m_MinSize
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 521768857768353200, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_FontData.m_FontSize
+      value: 26
+      objectReference: {fileID: 0}
+    - target: {fileID: 521768857768353200, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_FontData.m_FontStyle
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 595589076442330505, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 595589076442330505, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 2
+      objectReference: {fileID: 0}
     - target: {fileID: 690487615239233780, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
       propertyPath: m_Color.b
       value: 0.3019608
@@ -3261,7 +3283,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2080350128756554473, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 1.2719
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2080350128756554473, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
       propertyPath: m_AnchoredPosition.x
@@ -3411,6 +3433,22 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 286
       objectReference: {fileID: 0}
+    - target: {fileID: 3935838372477410148, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_Color.a
+      value: 0.6117647
+      objectReference: {fileID: 0}
+    - target: {fileID: 3935838372477410148, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_Color.b
+      value: 0.35281673
+      objectReference: {fileID: 0}
+    - target: {fileID: 3935838372477410148, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_Color.g
+      value: 0.4331556
+      objectReference: {fileID: 0}
+    - target: {fileID: 3935838372477410148, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_Color.r
+      value: 0.47641498
+      objectReference: {fileID: 0}
     - target: {fileID: 4231878762216119874, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
       propertyPath: m_IsActive
       value: 0
@@ -3447,6 +3485,10 @@ PrefabInstance:
       propertyPath: m_Color.r
       value: 0.14901961
       objectReference: {fileID: 0}
+    - target: {fileID: 5637155694417808183, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_FontData.m_FontStyle
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5808298135736668641, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
       propertyPath: m_Name
       value: ShengShiEventWidgetType2Game
@@ -3511,6 +3553,26 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -15.5
       objectReference: {fileID: 0}
+    - target: {fileID: 7694624349492924708, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_Color.b
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7694624349492924708, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_Color.g
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7694624349492924708, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_Color.r
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7694624349492924708, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_FontData.m_MinSize
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 7694624349492924708, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
+      propertyPath: m_FontData.m_FontSize
+      value: 40
+      objectReference: {fileID: 0}
     - target: {fileID: 8807649875490934103, guid: fc3029474cddd344aba5d33d8a0c0a8c, type: 3}
       propertyPath: m_SizeDelta.x
       value: 682.732

Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab

@@ -622,7 +622,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.25882354, g: 0.4039216, b: 0.3529412, a: 1}
+  m_Color: {r: 0.40784317, g: 0.5058824, b: 0.40000004, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -812,7 +812,6 @@ GameObject:
   - component: {fileID: 1357364587688641971}
   - component: {fileID: 570113842003181522}
   - component: {fileID: 7694624349492924708}
-  - component: {fileID: 102496722109560873}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Go
@@ -861,7 +860,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9333334, g: 0.9058824, b: 0.8588236, a: 1}
+  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
@@ -870,10 +869,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 43
+    m_FontSize: 40
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 4
     m_MaxSize: 45
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -882,21 +881,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u524D\u5F80"
---- !u!114 &102496722109560873
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3348088768749406642}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0.5058824, g: 0.40784317, b: 0.2784314, a: 1}
-  m_EffectDistance: {x: 1.5, y: -1.5}
-  m_UseGraphicAlpha: 1
 --- !u!1 &4038213450023413557
 GameObject:
   m_ObjectHideFlags: 0
@@ -1123,7 +1107,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_shenshi_dengji_sheng
+  _icon_name: dec_shenshi_dengji_fan
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: cdfc87cecacbc6d43a18b124c77cdb3c, type: 3}
   packInfo:
@@ -1450,7 +1434,7 @@ MonoBehaviour:
     - Target: {fileID: 6730899750744253868}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.70980394, y: 0.68235296, z: 0.64705884, w: 1}
+      - {x: 0.5895335, y: 0.6792451, z: 0.63400584, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 1904131733610652650}
@@ -1481,7 +1465,7 @@ MonoBehaviour:
     - Target: {fileID: 6730899750744253868}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.5568628, y: 0.6901961, z: 0.8196079, w: 1}
+      - {x: 0.601415, y: 0.72345334, z: 0.8018867, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 1904131733610652650}
@@ -1493,13 +1477,13 @@ MonoBehaviour:
     - Target: {fileID: 8552613376447685522}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.54509807, y: 0.69411767, z: 0.6156863, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 6198714990258003341}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.5686275, y: 0.72156864, z: 0.6392157, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 4231878762216119874}
@@ -1524,13 +1508,13 @@ MonoBehaviour:
     - Target: {fileID: 8552613376447685522}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.54509807, y: 0.69411767, z: 0.6156863, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 6198714990258003341}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.5686275, y: 0.72156864, z: 0.6392157, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 4231878762216119874}
@@ -1543,7 +1527,7 @@ MonoBehaviour:
     - Target: {fileID: 6730899750744253868}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.81568635, y: 0.73333335, z: 0.5568628, w: 1}
+      - {x: 0.8726414, y: 0.7377412, z: 0.44866928, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 1904131733610652650}
@@ -1555,13 +1539,13 @@ MonoBehaviour:
     - Target: {fileID: 8552613376447685522}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.54509807, y: 0.69411767, z: 0.6156863, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 6198714990258003341}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.5686275, y: 0.72156864, z: 0.6392157, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 4231878762216119874}
@@ -1574,7 +1558,7 @@ MonoBehaviour:
     - Target: {fileID: 6730899750744253868}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.81568635, y: 0.64705884, z: 0.54509807, w: 1}
+      - {x: 0.9198112, y: 0.65753794, z: 0.4989541, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 1904131733610652650}
@@ -1586,13 +1570,13 @@ MonoBehaviour:
     - Target: {fileID: 8552613376447685522}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.54509807, y: 0.69411767, z: 0.6156863, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 6198714990258003341}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.5686275, y: 0.72156864, z: 0.6392157, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 4231878762216119874}
@@ -1605,7 +1589,7 @@ MonoBehaviour:
     - Target: {fileID: 6730899750744253868}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.7960785, y: 0.5686275, z: 0.5411765, w: 1}
+      - {x: 0.8537735, y: 0.49442026, z: 0.45105004, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 1904131733610652650}
@@ -1617,13 +1601,13 @@ MonoBehaviour:
     - Target: {fileID: 8552613376447685522}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.54509807, y: 0.69411767, z: 0.6156863, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 6198714990258003341}
       UIStateV4Types: 40000000
       UIStateV4Datas:
-      - {x: 0.5686275, y: 0.72156864, z: 0.6392157, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
     - Target: {fileID: 4231878762216119874}
@@ -1639,7 +1623,7 @@ MonoBehaviour:
   - {fileID: 6198714990258003341}
   - {fileID: 4231878762216119874}
   AllComsStateTypes: 4000000040000000800000004000000000020000
-  CurrIndex: 5
+  CurrIndex: 0
 --- !u!1 &6161269103075097772
 GameObject:
   m_ObjectHideFlags: 0
@@ -1847,7 +1831,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.5686275, g: 0.72156864, b: 0.6392157, a: 1}
+  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
@@ -1936,7 +1920,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9215687, g: 0.8941177, b: 0.8470589, a: 1}
+  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
@@ -1945,8 +1929,8 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 24
-    m_FontStyle: 1
+    m_FontSize: 26
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
@@ -1956,7 +1940,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u4E3B\u7EBF"
+  m_Text: "\u652F\u7EBF"
 --- !u!1 &6730899750744253868
 GameObject:
   m_ObjectHideFlags: 0
@@ -2016,7 +2000,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.7960785, g: 0.5686275, b: 0.5411765, a: 1}
+  m_Color: {r: 0.5895335, g: 0.6792451, b: 0.63400584, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2082,7 +2066,7 @@ RectTransform:
   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.000030517578, y: 0}
+  m_AnchoredPosition: {x: -1, y: 0.75}
   m_SizeDelta: {x: 53, y: 55}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8423151277308321694
@@ -2249,8 +2233,8 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 22
-    m_FontStyle: 1
+    m_FontSize: 26
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
@@ -2425,7 +2409,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.54509807, g: 0.69411767, b: 0.6156863, a: 1}
+  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
@@ -2435,7 +2419,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 24
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40

Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs

@@ -104,6 +104,16 @@ namespace Excel2Json
 #endif
 		
 
+		/// <summary>
+		///步骤
+		/// </summary>
+#if !COMBAT_SERVER
+		public int step;
+#else
+		public int step{ set; get; }
+#endif
+		
+
 		/// <summary>
 		///条件判断类型
 		/// </summary>

UserSettings/EditorUserSettings.asset

@@ -45,10 +45,10 @@ EditorUserSettings:
       value: 0002065506010b09555d0e7a12750a4443151a297a2e70317d7d4d6be1e1616f
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615