Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Assets/StreamingAssets/assetConfig.txt
#	UserSettings/Layouts/default-2022.dwlt

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.05407384
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.0000059582544
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Res/Config/EventConfig.json

@@ -196,11 +196,11 @@
       ],
       "PrizeIDs": [
         1003,
-        1004
+        1201
       ],
       "PrizeNums": [
         -5000,
-        10
+        1
       ],
       "RefreshProbability": 20,
       "RefreshCount": 0,
@@ -466,11 +466,11 @@
       ],
       "PrizeIDs": [
         1003,
-        1004
+        1201
       ],
       "PrizeNums": [
         -7500,
-        10
+        2
       ],
       "RefreshProbability": 25,
       "RefreshCount": 0,
@@ -736,11 +736,11 @@
       ],
       "PrizeIDs": [
         1003,
-        1004
+        1202
       ],
       "PrizeNums": [
         -15000,
-        10
+        1
       ],
       "RefreshProbability": 30,
       "RefreshCount": 0,
@@ -770,7 +770,7 @@
       ],
       "PrizeNums": [
         -15000,
-        1
+        2
       ],
       "RefreshProbability": 70,
       "RefreshCount": 0,
@@ -800,7 +800,7 @@
       ],
       "PrizeNums": [
         -15000,
-        1
+        2
       ],
       "RefreshProbability": 50,
       "RefreshCount": 0,
@@ -1006,11 +1006,11 @@
       ],
       "PrizeIDs": [
         1003,
-        1004
+        1203
       ],
       "PrizeNums": [
         -30000,
-        10
+        1
       ],
       "RefreshProbability": 35,
       "RefreshCount": 0,
@@ -1040,7 +1040,7 @@
       ],
       "PrizeNums": [
         -30000,
-        1
+        2
       ],
       "RefreshProbability": 75,
       "RefreshCount": 0,
@@ -1070,7 +1070,7 @@
       ],
       "PrizeNums": [
         -30000,
-        1
+        2
       ],
       "RefreshProbability": 55,
       "RefreshCount": 0,
@@ -1276,11 +1276,11 @@
       ],
       "PrizeIDs": [
         1003,
-        1004
+        1204
       ],
       "PrizeNums": [
         -50000,
-        10
+        1
       ],
       "RefreshProbability": 40,
       "RefreshCount": 0,
@@ -1310,7 +1310,7 @@
       ],
       "PrizeNums": [
         -50000,
-        1
+        3
       ],
       "RefreshProbability": 80,
       "RefreshCount": 0,
@@ -1340,7 +1340,7 @@
       ],
       "PrizeNums": [
         -50000,
-        1
+        3
       ],
       "RefreshProbability": 60,
       "RefreshCount": 0,

Assets/Res/Config/GroupConfig.json

@@ -254,888 +254,1423 @@
         9004
       ]
     },
+    {
+      "ID": 3001,
+      "GroupMonsterLevel": [
+        15
+      ],
+      "GroupMonster": [
+        1005
+      ]
+    },
+    {
+      "ID": 3002,
+      "GroupMonsterLevel": [
+        25
+      ],
+      "GroupMonster": [
+        9006
+      ]
+    },
+    {
+      "ID": 3003,
+      "GroupMonsterLevel": [
+        20
+      ],
+      "GroupMonster": [
+        1005
+      ]
+    },
+    {
+      "ID": 3004,
+      "GroupMonsterLevel": [
+        30
+      ],
+      "GroupMonster": [
+        1005
+      ]
+    },
+    {
+      "ID": 3005,
+      "GroupMonsterLevel": [
+        30
+      ],
+      "GroupMonster": [
+        5003
+      ]
+    },
+    {
+      "ID": 3006,
+      "GroupMonsterLevel": [
+        40
+      ],
+      "GroupMonster": [
+        5003
+      ]
+    },
+    {
+      "ID": 3007,
+      "GroupMonsterLevel": [
+        60
+      ],
+      "GroupMonster": [
+        5003
+      ]
+    },
+    {
+      "ID": 3008,
+      "GroupMonsterLevel": [
+        60
+      ],
+      "GroupMonster": [
+        9002
+      ]
+    },
+    {
+      "ID": 3009,
+      "GroupMonsterLevel": [
+        120
+      ],
+      "GroupMonster": [
+        5003
+      ]
+    },
+    {
+      "ID": 3010,
+      "GroupMonsterLevel": [
+        130
+      ],
+      "GroupMonster": [
+        5002
+      ]
+    },
+    {
+      "ID": 3011,
+      "GroupMonsterLevel": [
+        130
+      ],
+      "GroupMonster": [
+        1006
+      ]
+    },
+    {
+      "ID": 3012,
+      "GroupMonsterLevel": [
+        150
+      ],
+      "GroupMonster": [
+        5005
+      ]
+    },
+    {
+      "ID": 3013,
+      "GroupMonsterLevel": [
+        160
+      ],
+      "GroupMonster": [
+        5001
+      ]
+    },
+    {
+      "ID": 3014,
+      "GroupMonsterLevel": [
+        170
+      ],
+      "GroupMonster": [
+        5004
+      ]
+    },
+    {
+      "ID": 3015,
+      "GroupMonsterLevel": [
+        190
+      ],
+      "GroupMonster": [
+        9001
+      ]
+    },
+    {
+      "ID": 10001,
+      "GroupMonsterLevel": [
+        205
+      ],
+      "GroupMonster": [
+        9005
+      ]
+    },
+    {
+      "ID": 4001,
+      "GroupMonsterLevel": [
+        1
+      ],
+      "GroupMonster": [
+        1005
+      ]
+    },
+    {
+      "ID": 4002,
+      "GroupMonsterLevel": [
+        1
+      ],
+      "GroupMonster": [
+        1006
+      ]
+    },
+    {
+      "ID": 4003,
+      "GroupMonsterLevel": [
+        5
+      ],
+      "GroupMonster": [
+        1007
+      ]
+    },
+    {
+      "ID": 4004,
+      "GroupMonsterLevel": [
+        5
+      ],
+      "GroupMonster": [
+        1008
+      ]
+    },
+    {
+      "ID": 4005,
+      "GroupMonsterLevel": [
+        5
+      ],
+      "GroupMonster": [
+        1001
+      ]
+    },
+    {
+      "ID": 4006,
+      "GroupMonsterLevel": [
+        11
+      ],
+      "GroupMonster": [
+        1005
+      ]
+    },
+    {
+      "ID": 4007,
+      "GroupMonsterLevel": [
+        11
+      ],
+      "GroupMonster": [
+        1006
+      ]
+    },
+    {
+      "ID": 4008,
+      "GroupMonsterLevel": [
+        11
+      ],
+      "GroupMonster": [
+        1007
+      ]
+    },
+    {
+      "ID": 4009,
+      "GroupMonsterLevel": [
+        21
+      ],
+      "GroupMonster": [
+        1008
+      ]
+    },
+    {
+      "ID": 4010,
+      "GroupMonsterLevel": [
+        21
+      ],
+      "GroupMonster": [
+        1001
+      ]
+    },
+    {
+      "ID": 4011,
+      "GroupMonsterLevel": [
+        31
+      ],
+      "GroupMonster": [
+        1005
+      ]
+    },
+    {
+      "ID": 4012,
+      "GroupMonsterLevel": [
+        31
+      ],
+      "GroupMonster": [
+        1006
+      ]
+    },
+    {
+      "ID": 4013,
+      "GroupMonsterLevel": [
+        31
+      ],
+      "GroupMonster": [
+        1007
+      ]
+    },
+    {
+      "ID": 4014,
+      "GroupMonsterLevel": [
+        31
+      ],
+      "GroupMonster": [
+        1008
+      ]
+    },
+    {
+      "ID": 4015,
+      "GroupMonsterLevel": [
+        41
+      ],
+      "GroupMonster": [
+        1001
+      ]
+    },
+    {
+      "ID": 4016,
+      "GroupMonsterLevel": [
+        41
+      ],
+      "GroupMonster": [
+        1005
+      ]
+    },
+    {
+      "ID": 4017,
+      "GroupMonsterLevel": [
+        41
+      ],
+      "GroupMonster": [
+        1006
+      ]
+    },
+    {
+      "ID": 4018,
+      "GroupMonsterLevel": [
+        41
+      ],
+      "GroupMonster": [
+        1007
+      ]
+    },
+    {
+      "ID": 4019,
+      "GroupMonsterLevel": [
+        41
+      ],
+      "GroupMonster": [
+        1008
+      ]
+    },
+    {
+      "ID": 4020,
+      "GroupMonsterLevel": [
+        61
+      ],
+      "GroupMonster": [
+        1001
+      ]
+    },
+    {
+      "ID": 4021,
+      "GroupMonsterLevel": [
+        61
+      ],
+      "GroupMonster": [
+        1005
+      ]
+    },
+    {
+      "ID": 4022,
+      "GroupMonsterLevel": [
+        61
+      ],
+      "GroupMonster": [
+        1006
+      ]
+    },
+    {
+      "ID": 4023,
+      "GroupMonsterLevel": [
+        81
+      ],
+      "GroupMonster": [
+        1007
+      ]
+    },
+    {
+      "ID": 4024,
+      "GroupMonsterLevel": [
+        111
+      ],
+      "GroupMonster": [
+        1008
+      ]
+    },
+    {
+      "ID": 4025,
+      "GroupMonsterLevel": [
+        131
+      ],
+      "GroupMonster": [
+        1001
+      ]
+    },
+    {
+      "ID": 5001,
+      "GroupMonster": [
+        1005
+      ],
+      "hpQiangDu": [
+        60
+      ],
+      "attQiangDu": [
+        60
+      ],
+      "duipingQiangDu": [
+        60
+      ]
+    },
+    {
+      "ID": 5002,
+      "GroupMonster": [
+        1006
+      ],
+      "hpQiangDu": [
+        70
+      ],
+      "attQiangDu": [
+        70
+      ],
+      "duipingQiangDu": [
+        70
+      ]
+    },
+    {
+      "ID": 5003,
+      "GroupMonster": [
+        1007
+      ],
+      "hpQiangDu": [
+        80
+      ],
+      "attQiangDu": [
+        80
+      ],
+      "duipingQiangDu": [
+        80
+      ]
+    },
+    {
+      "ID": 5004,
+      "GroupMonster": [
+        1008
+      ],
+      "hpQiangDu": [
+        90
+      ],
+      "attQiangDu": [
+        90
+      ],
+      "duipingQiangDu": [
+        90
+      ]
+    },
+    {
+      "ID": 5005,
+      "GroupMonster": [
+        1001
+      ],
+      "hpQiangDu": [
+        100
+      ],
+      "attQiangDu": [
+        100
+      ],
+      "duipingQiangDu": [
+        100
+      ]
+    },
+    {
+      "ID": 5006,
+      "GroupMonster": [
+        1005
+      ],
+      "hpQiangDu": [
+        60
+      ],
+      "attQiangDu": [
+        60
+      ],
+      "duipingQiangDu": [
+        60
+      ]
+    },
+    {
+      "ID": 5007,
+      "GroupMonster": [
+        1006
+      ],
+      "hpQiangDu": [
+        70
+      ],
+      "attQiangDu": [
+        70
+      ],
+      "duipingQiangDu": [
+        70
+      ]
+    },
+    {
+      "ID": 5008,
+      "GroupMonster": [
+        1007
+      ],
+      "hpQiangDu": [
+        80
+      ],
+      "attQiangDu": [
+        80
+      ],
+      "duipingQiangDu": [
+        80
+      ]
+    },
+    {
+      "ID": 5009,
+      "GroupMonster": [
+        1008
+      ],
+      "hpQiangDu": [
+        90
+      ],
+      "attQiangDu": [
+        90
+      ],
+      "duipingQiangDu": [
+        90
+      ]
+    },
+    {
+      "ID": 5010,
+      "GroupMonster": [
+        1001
+      ],
+      "hpQiangDu": [
+        100
+      ],
+      "attQiangDu": [
+        100
+      ],
+      "duipingQiangDu": [
+        100
+      ]
+    },
     {
       "ID": 2001,
       "GroupMonsterLevel": [
-        40,
-        40
+        10
+      ],
+      "GroupMonster": [
+        5001
+      ]
+    },
+    {
+      "ID": 2002,
+      "GroupMonsterLevel": [
+        13
+      ],
+      "GroupMonster": [
+        5002
+      ]
+    },
+    {
+      "ID": 2003,
+      "GroupMonsterLevel": [
+        16
+      ],
+      "GroupMonster": [
+        5003
+      ]
+    },
+    {
+      "ID": 2004,
+      "GroupMonsterLevel": [
+        19
+      ],
+      "GroupMonster": [
+        5004
+      ]
+    },
+    {
+      "ID": 2005,
+      "GroupMonsterLevel": [
+        22
+      ],
+      "GroupMonster": [
+        9001
+      ]
+    },
+    {
+      "ID": 2006,
+      "GroupMonsterLevel": [
+        25
+      ],
+      "GroupMonster": [
+        5004
+      ]
+    },
+    {
+      "ID": 2007,
+      "GroupMonsterLevel": [
+        28
+      ],
+      "GroupMonster": [
+        5005
+      ]
+    },
+    {
+      "ID": 2008,
+      "GroupMonsterLevel": [
+        31
+      ],
+      "GroupMonster": [
+        5006
+      ]
+    },
+    {
+      "ID": 2009,
+      "GroupMonsterLevel": [
+        34
+      ],
+      "GroupMonster": [
+        5007
+      ]
+    },
+    {
+      "ID": 2010,
+      "GroupMonsterLevel": [
+        37
+      ],
+      "GroupMonster": [
+        9002
+      ]
+    },
+    {
+      "ID": 2011,
+      "GroupMonsterLevel": [
+        40
+      ],
+      "GroupMonster": [
+        5001
+      ]
+    },
+    {
+      "ID": 2012,
+      "GroupMonsterLevel": [
+        43
+      ],
+      "GroupMonster": [
+        5002
+      ]
+    },
+    {
+      "ID": 2013,
+      "GroupMonsterLevel": [
+        46
+      ],
+      "GroupMonster": [
+        5003
+      ]
+    },
+    {
+      "ID": 2014,
+      "GroupMonsterLevel": [
+        49
+      ],
+      "GroupMonster": [
+        5004
+      ]
+    },
+    {
+      "ID": 2015,
+      "GroupMonsterLevel": [
+        52
+      ],
+      "GroupMonster": [
+        9003
+      ]
+    },
+    {
+      "ID": 2016,
+      "GroupMonsterLevel": [
+        55
+      ],
+      "GroupMonster": [
+        5004
+      ]
+    },
+    {
+      "ID": 2017,
+      "GroupMonsterLevel": [
+        58
+      ],
+      "GroupMonster": [
+        5005
+      ]
+    },
+    {
+      "ID": 2018,
+      "GroupMonsterLevel": [
+        61
+      ],
+      "GroupMonster": [
+        5006
+      ]
+    },
+    {
+      "ID": 2019,
+      "GroupMonsterLevel": [
+        64
+      ],
+      "GroupMonster": [
+        5007
+      ]
+    },
+    {
+      "ID": 2020,
+      "GroupMonsterLevel": [
+        67
+      ],
+      "GroupMonster": [
+        9004
+      ]
+    },
+    {
+      "ID": 2021,
+      "GroupMonsterLevel": [
+        70
+      ],
+      "GroupMonster": [
+        5001
+      ]
+    },
+    {
+      "ID": 2022,
+      "GroupMonsterLevel": [
+        73
+      ],
+      "GroupMonster": [
+        5002
+      ]
+    },
+    {
+      "ID": 2023,
+      "GroupMonsterLevel": [
+        76
+      ],
+      "GroupMonster": [
+        5003
+      ]
+    },
+    {
+      "ID": 2024,
+      "GroupMonsterLevel": [
+        79
+      ],
+      "GroupMonster": [
+        5004
+      ]
+    },
+    {
+      "ID": 2025,
+      "GroupMonsterLevel": [
+        82
+      ],
+      "GroupMonster": [
+        9005
+      ]
+    },
+    {
+      "ID": 2026,
+      "GroupMonsterLevel": [
+        85
+      ],
+      "GroupMonster": [
+        5004
+      ]
+    },
+    {
+      "ID": 2027,
+      "GroupMonsterLevel": [
+        88
+      ],
+      "GroupMonster": [
+        5005
+      ]
+    },
+    {
+      "ID": 2028,
+      "GroupMonsterLevel": [
+        91
       ],
       "GroupMonster": [
-        5001,
-        1001
-      ],
-      "hpQiangDu": [
-        70,
-        30
-      ],
-      "levelAdd": [
-        70,
-        30
+        5006
       ]
     },
     {
-      "ID": 2002,
+      "ID": 2029,
       "GroupMonsterLevel": [
-        50,
-        50
+        94
       ],
       "GroupMonster": [
-        5002,
-        1002
-      ],
-      "hpQiangDu": [
-        70,
-        30
-      ],
-      "levelAdd": [
-        70,
-        30
+        5007
       ]
     },
     {
-      "ID": 2003,
+      "ID": 2030,
       "GroupMonsterLevel": [
-        60,
-        60
+        97
       ],
       "GroupMonster": [
-        5003,
-        1003
-      ],
-      "hpQiangDu": [
-        70,
-        30
-      ],
-      "levelAdd": [
-        70,
-        30
+        9006
       ]
     },
     {
-      "ID": 2004,
+      "ID": 2031,
       "GroupMonsterLevel": [
-        70,
-        70
+        100
       ],
       "GroupMonster": [
-        5004,
-        1004
-      ],
-      "hpQiangDu": [
-        70,
-        30
-      ],
-      "levelAdd": [
-        70,
-        30
+        5001
       ]
     },
     {
-      "ID": 2005,
+      "ID": 2032,
       "GroupMonsterLevel": [
-        80,
-        80
+        103
       ],
       "GroupMonster": [
-        5005,
-        1005
-      ],
-      "hpQiangDu": [
-        70,
-        30
-      ],
-      "levelAdd": [
-        70,
-        30
+        5002
       ]
     },
     {
-      "ID": 2006,
+      "ID": 2033,
       "GroupMonsterLevel": [
-        90
+        106
       ],
       "GroupMonster": [
-        5001,
-        1001
-      ],
-      "hpQiangDu": [
-        70,
-        30
-      ],
-      "levelAdd": [
-        70,
-        30
+        5003
       ]
     },
     {
-      "ID": 2007,
+      "ID": 2034,
       "GroupMonsterLevel": [
-        100
+        109
       ],
       "GroupMonster": [
-        5002,
-        1002
-      ],
-      "hpQiangDu": [
-        70,
-        30
-      ],
-      "levelAdd": [
-        70,
-        30
+        5004
       ]
     },
     {
-      "ID": 2008,
+      "ID": 2035,
       "GroupMonsterLevel": [
-        110
+        112
       ],
       "GroupMonster": [
-        5003,
-        1003
-      ],
-      "hpQiangDu": [
-        70,
-        30
-      ],
-      "levelAdd": [
-        70,
-        30
+        9001
       ]
     },
     {
-      "ID": 2009,
+      "ID": 2036,
       "GroupMonsterLevel": [
-        120
+        115
       ],
       "GroupMonster": [
-        5004,
-        1004
-      ],
-      "hpQiangDu": [
-        70,
-        30
-      ],
-      "levelAdd": [
-        70,
-        30
+        5004
       ]
     },
     {
-      "ID": 2010,
+      "ID": 2037,
       "GroupMonsterLevel": [
-        130
+        118
       ],
       "GroupMonster": [
-        5005,
-        1005
-      ],
-      "hpQiangDu": [
-        70,
-        30
-      ],
-      "levelAdd": [
-        70,
-        30
+        5005
       ]
     },
     {
-      "ID": 2011,
+      "ID": 2038,
       "GroupMonsterLevel": [
-        140
+        121
       ],
       "GroupMonster": [
-        5001,
-        1001
-      ],
-      "hpQiangDu": [
-        70,
-        30
-      ],
-      "levelAdd": [
-        70,
-        30
+        5006
       ]
     },
     {
-      "ID": 2012,
+      "ID": 2039,
       "GroupMonsterLevel": [
-        150
+        124
       ],
       "GroupMonster": [
-        5002,
-        1002
-      ],
-      "hpQiangDu": [
-        70,
-        30
-      ],
-      "levelAdd": [
-        70,
-        30
+        5007
       ]
     },
     {
-      "ID": 2013,
+      "ID": 2040,
       "GroupMonsterLevel": [
-        160
+        127
       ],
       "GroupMonster": [
-        5003,
-        1003
-      ],
-      "hpQiangDu": [
-        70,
-        30
-      ],
-      "levelAdd": [
-        70,
-        30
+        9002
       ]
     },
     {
-      "ID": 2014,
+      "ID": 2041,
       "GroupMonsterLevel": [
-        170
+        130
       ],
       "GroupMonster": [
-        5004,
-        1004
-      ],
-      "hpQiangDu": [
-        70,
-        30
-      ],
-      "levelAdd": [
-        70,
-        30
+        5001
       ]
     },
     {
-      "ID": 2015,
+      "ID": 2042,
       "GroupMonsterLevel": [
-        180
+        133
       ],
       "GroupMonster": [
-        5005,
-        1005
-      ],
-      "hpQiangDu": [
-        70,
-        30
-      ],
-      "levelAdd": [
-        70,
-        30
+        5002
       ]
     },
     {
-      "ID": 2016,
+      "ID": 2043,
       "GroupMonsterLevel": [
-        190
+        136
       ],
       "GroupMonster": [
-        5001,
-        1001
-      ],
-      "hpQiangDu": [
-        70,
-        30
-      ],
-      "levelAdd": [
-        70,
-        30
+        5003
       ]
     },
     {
-      "ID": 2017,
+      "ID": 2044,
       "GroupMonsterLevel": [
-        200
+        139
       ],
       "GroupMonster": [
-        5002,
-        1002
-      ],
-      "hpQiangDu": [
-        70,
-        30
-      ],
-      "levelAdd": [
-        70,
-        30
+        5004
       ]
     },
     {
-      "ID": 2018,
+      "ID": 2045,
       "GroupMonsterLevel": [
-        210
+        142
       ],
       "GroupMonster": [
-        5003,
-        1003
-      ],
-      "hpQiangDu": [
-        70,
-        30
-      ],
-      "levelAdd": [
-        70,
-        30
+        9003
       ]
     },
     {
-      "ID": 2019,
+      "ID": 2046,
       "GroupMonsterLevel": [
-        220
+        145
       ],
       "GroupMonster": [
-        5004,
-        1004
-      ],
-      "hpQiangDu": [
-        70,
-        30
+        5004
+      ]
+    },
+    {
+      "ID": 2047,
+      "GroupMonsterLevel": [
+        148
       ],
-      "levelAdd": [
-        70,
-        30
+      "GroupMonster": [
+        5005
       ]
     },
     {
-      "ID": 2020,
+      "ID": 2048,
       "GroupMonsterLevel": [
-        230
+        151
       ],
       "GroupMonster": [
-        5005,
-        1005
+        5006
+      ]
+    },
+    {
+      "ID": 2049,
+      "GroupMonsterLevel": [
+        154
       ],
-      "hpQiangDu": [
-        70,
-        30
+      "GroupMonster": [
+        5007
+      ]
+    },
+    {
+      "ID": 2050,
+      "GroupMonsterLevel": [
+        157
       ],
-      "levelAdd": [
-        70,
-        30
+      "GroupMonster": [
+        9004
       ]
     },
     {
-      "ID": 3001,
+      "ID": 2051,
       "GroupMonsterLevel": [
-        15
+        160
       ],
       "GroupMonster": [
-        1005
+        5001
       ]
     },
     {
-      "ID": 3002,
+      "ID": 2052,
       "GroupMonsterLevel": [
-        25
+        163
       ],
       "GroupMonster": [
-        9006
+        5002
       ]
     },
     {
-      "ID": 3003,
+      "ID": 2053,
       "GroupMonsterLevel": [
-        20
+        166
       ],
       "GroupMonster": [
-        1005
+        5003
       ]
     },
     {
-      "ID": 3004,
+      "ID": 2054,
       "GroupMonsterLevel": [
-        30
+        169
       ],
       "GroupMonster": [
-        1005
+        5004
       ]
     },
     {
-      "ID": 3005,
+      "ID": 2055,
       "GroupMonsterLevel": [
-        30
+        172
       ],
       "GroupMonster": [
-        5003
+        9005
       ]
     },
     {
-      "ID": 3006,
+      "ID": 2056,
       "GroupMonsterLevel": [
-        40
+        175
       ],
       "GroupMonster": [
-        5003
+        5004
       ]
     },
     {
-      "ID": 3007,
+      "ID": 2057,
       "GroupMonsterLevel": [
-        60
+        178
       ],
       "GroupMonster": [
-        5003
+        5005
       ]
     },
     {
-      "ID": 3008,
+      "ID": 2058,
       "GroupMonsterLevel": [
-        60
+        181
       ],
       "GroupMonster": [
-        9002
+        5006
       ]
     },
     {
-      "ID": 3009,
+      "ID": 2059,
       "GroupMonsterLevel": [
-        120
+        184
       ],
       "GroupMonster": [
-        5003
+        5007
       ]
     },
     {
-      "ID": 3010,
+      "ID": 2060,
       "GroupMonsterLevel": [
-        130
+        187
       ],
       "GroupMonster": [
-        5002
+        9006
       ]
     },
     {
-      "ID": 3011,
+      "ID": 2061,
       "GroupMonsterLevel": [
-        130
+        190
       ],
       "GroupMonster": [
-        1006
+        5001
       ]
     },
     {
-      "ID": 3012,
+      "ID": 2062,
       "GroupMonsterLevel": [
-        150
+        193
       ],
       "GroupMonster": [
-        5005
+        5002
       ]
     },
     {
-      "ID": 3013,
+      "ID": 2063,
       "GroupMonsterLevel": [
-        160
+        196
       ],
       "GroupMonster": [
-        5001
+        5003
       ]
     },
     {
-      "ID": 3014,
+      "ID": 2064,
       "GroupMonsterLevel": [
-        170
+        199
       ],
       "GroupMonster": [
         5004
       ]
     },
     {
-      "ID": 3015,
+      "ID": 2065,
       "GroupMonsterLevel": [
-        190
+        202
       ],
       "GroupMonster": [
         9001
       ]
     },
     {
-      "ID": 10001,
+      "ID": 2066,
       "GroupMonsterLevel": [
         205
       ],
       "GroupMonster": [
-        9005
+        5004
       ]
     },
     {
-      "ID": 4001,
+      "ID": 2067,
       "GroupMonsterLevel": [
-        1
+        208
       ],
       "GroupMonster": [
-        1005
+        5005
       ]
     },
     {
-      "ID": 4002,
+      "ID": 2068,
       "GroupMonsterLevel": [
-        1
+        211
       ],
       "GroupMonster": [
-        1006
+        5006
       ]
     },
     {
-      "ID": 4003,
+      "ID": 2069,
       "GroupMonsterLevel": [
-        5
+        214
       ],
       "GroupMonster": [
-        1007
+        5007
       ]
     },
     {
-      "ID": 4004,
+      "ID": 2070,
       "GroupMonsterLevel": [
-        5
+        217
       ],
       "GroupMonster": [
-        1008
+        9002
       ]
     },
     {
-      "ID": 4005,
+      "ID": 2071,
       "GroupMonsterLevel": [
-        5
+        220
       ],
       "GroupMonster": [
-        1001
+        5001
       ]
     },
     {
-      "ID": 4006,
+      "ID": 2072,
       "GroupMonsterLevel": [
-        11
+        223
       ],
       "GroupMonster": [
-        1005
+        5002
       ]
     },
     {
-      "ID": 4007,
+      "ID": 2073,
       "GroupMonsterLevel": [
-        11
+        226
       ],
       "GroupMonster": [
-        1006
+        5003
       ]
     },
     {
-      "ID": 4008,
+      "ID": 2074,
       "GroupMonsterLevel": [
-        11
+        229
       ],
       "GroupMonster": [
-        1007
+        5004
       ]
     },
     {
-      "ID": 4009,
+      "ID": 2075,
       "GroupMonsterLevel": [
-        21
+        232
       ],
       "GroupMonster": [
-        1008
+        9003
       ]
     },
     {
-      "ID": 4010,
+      "ID": 2076,
       "GroupMonsterLevel": [
-        21
+        235
       ],
       "GroupMonster": [
-        1001
+        5004
       ]
     },
     {
-      "ID": 4011,
+      "ID": 2077,
       "GroupMonsterLevel": [
-        31
+        238
       ],
       "GroupMonster": [
-        1005
+        5005
       ]
     },
     {
-      "ID": 4012,
+      "ID": 2078,
       "GroupMonsterLevel": [
-        31
+        241
       ],
       "GroupMonster": [
-        1006
+        5006
       ]
     },
     {
-      "ID": 4013,
+      "ID": 2079,
       "GroupMonsterLevel": [
-        31
+        244
       ],
       "GroupMonster": [
-        1007
+        5007
       ]
     },
     {
-      "ID": 4014,
+      "ID": 2080,
       "GroupMonsterLevel": [
-        31
+        247
       ],
       "GroupMonster": [
-        1008
+        9004
       ]
     },
     {
-      "ID": 4015,
+      "ID": 2081,
       "GroupMonsterLevel": [
-        41
+        250
       ],
       "GroupMonster": [
-        1001
+        5001
       ]
     },
     {
-      "ID": 4016,
+      "ID": 2082,
       "GroupMonsterLevel": [
-        41
+        253
       ],
       "GroupMonster": [
-        1005
+        5002
       ]
     },
     {
-      "ID": 4017,
+      "ID": 2083,
       "GroupMonsterLevel": [
-        41
+        256
       ],
       "GroupMonster": [
-        1006
+        5003
       ]
     },
     {
-      "ID": 4018,
+      "ID": 2084,
       "GroupMonsterLevel": [
-        41
+        259
       ],
       "GroupMonster": [
-        1007
+        5004
       ]
     },
     {
-      "ID": 4019,
+      "ID": 2085,
       "GroupMonsterLevel": [
-        41
+        262
       ],
       "GroupMonster": [
-        1008
+        9005
       ]
     },
     {
-      "ID": 4020,
+      "ID": 2086,
       "GroupMonsterLevel": [
-        61
+        265
       ],
       "GroupMonster": [
-        1001
+        5004
       ]
     },
     {
-      "ID": 4021,
+      "ID": 2087,
       "GroupMonsterLevel": [
-        61
+        268
       ],
       "GroupMonster": [
-        1005
+        5005
       ]
     },
     {
-      "ID": 4022,
+      "ID": 2088,
       "GroupMonsterLevel": [
-        61
+        271
       ],
       "GroupMonster": [
-        1006
+        5006
       ]
     },
     {
-      "ID": 4023,
+      "ID": 2089,
       "GroupMonsterLevel": [
-        81
+        274
       ],
       "GroupMonster": [
-        1007
+        5007
       ]
     },
     {
-      "ID": 4024,
+      "ID": 2090,
       "GroupMonsterLevel": [
-        111
+        277
       ],
       "GroupMonster": [
-        1008
+        9006
       ]
     },
     {
-      "ID": 4025,
+      "ID": 2091,
       "GroupMonsterLevel": [
-        131
+        280
       ],
       "GroupMonster": [
-        1001
+        5001
       ]
     },
     {
-      "ID": 5001,
-      "GroupMonster": [
-        1005
-      ],
-      "hpQiangDu": [
-        60
-      ],
-      "attQiangDu": [
-        60
+      "ID": 2092,
+      "GroupMonsterLevel": [
+        283
       ],
-      "duipingQiangDu": [
-        60
-      ]
-    },
-    {
-      "ID": 5002,
       "GroupMonster": [
-        1006
-      ],
-      "hpQiangDu": [
-        70
-      ],
-      "attQiangDu": [
-        70
-      ],
-      "duipingQiangDu": [
-        70
+        5002
       ]
     },
     {
-      "ID": 5003,
-      "GroupMonster": [
-        1007
-      ],
-      "hpQiangDu": [
-        80
-      ],
-      "attQiangDu": [
-        80
+      "ID": 2093,
+      "GroupMonsterLevel": [
+        286
       ],
-      "duipingQiangDu": [
-        80
+      "GroupMonster": [
+        5003
       ]
     },
     {
-      "ID": 5004,
-      "GroupMonster": [
-        1008
-      ],
-      "hpQiangDu": [
-        90
-      ],
-      "attQiangDu": [
-        90
+      "ID": 2094,
+      "GroupMonsterLevel": [
+        288
       ],
-      "duipingQiangDu": [
-        90
+      "GroupMonster": [
+        5004
       ]
     },
     {
-      "ID": 5005,
-      "GroupMonster": [
-        1001
-      ],
-      "hpQiangDu": [
-        100
-      ],
-      "attQiangDu": [
-        100
+      "ID": 2095,
+      "GroupMonsterLevel": [
+        290
       ],
-      "duipingQiangDu": [
-        100
+      "GroupMonster": [
+        9005
       ]
     },
     {
-      "ID": 5006,
-      "GroupMonster": [
-        1005
-      ],
-      "hpQiangDu": [
-        60
-      ],
-      "attQiangDu": [
-        60
+      "ID": 2096,
+      "GroupMonsterLevel": [
+        292
       ],
-      "duipingQiangDu": [
-        60
+      "GroupMonster": [
+        5004
       ]
     },
     {
-      "ID": 5007,
-      "GroupMonster": [
-        1006
-      ],
-      "hpQiangDu": [
-        70
-      ],
-      "attQiangDu": [
-        70
+      "ID": 2097,
+      "GroupMonsterLevel": [
+        294
       ],
-      "duipingQiangDu": [
-        70
+      "GroupMonster": [
+        5005
       ]
     },
     {
-      "ID": 5008,
-      "GroupMonster": [
-        1007
-      ],
-      "hpQiangDu": [
-        80
-      ],
-      "attQiangDu": [
-        80
+      "ID": 2098,
+      "GroupMonsterLevel": [
+        296
       ],
-      "duipingQiangDu": [
-        80
+      "GroupMonster": [
+        5006
       ]
     },
     {
-      "ID": 5009,
-      "GroupMonster": [
-        1008
-      ],
-      "hpQiangDu": [
-        90
-      ],
-      "attQiangDu": [
-        90
+      "ID": 2099,
+      "GroupMonsterLevel": [
+        298
       ],
-      "duipingQiangDu": [
-        90
+      "GroupMonster": [
+        5007
       ]
     },
     {
-      "ID": 5010,
-      "GroupMonster": [
-        1001
-      ],
-      "hpQiangDu": [
-        100
-      ],
-      "attQiangDu": [
-        100
+      "ID": 2100,
+      "GroupMonsterLevel": [
+        300
       ],
-      "duipingQiangDu": [
-        100
+      "GroupMonster": [
+        9006
       ]
     }
   ]

Assets/Res/Config/LanguageChineseConfig.json

@@ -7598,7 +7598,7 @@
     },
     {
       "ID": 1900,
-      "txt": "GM商店"
+      "txt": "GM资源"
     },
     {
       "ID": 1901,
@@ -7614,11 +7614,11 @@
     },
     {
       "ID": 1904,
-      "txt": "法宝商店"
+      "txt": "GM法宝"
     },
     {
       "ID": 1905,
-      "txt": "功法商店"
+      "txt": "GM功法"
     },
     {
       "ID": 1906,
@@ -7786,11 +7786,11 @@
     },
     {
       "ID": 1947,
-      "txt": "好感度礼物1"
+      "txt": "清茶"
     },
     {
       "ID": 1948,
-      "txt": "好感度礼物2"
+      "txt": "茉莉花茶"
     },
     {
       "ID": 1949,
@@ -7802,7 +7802,7 @@
     },
     {
       "ID": 1951,
-      "txt": "心情礼物"
+      "txt": "妃子笑"
     },
     {
       "ID": 1952,
@@ -12774,107 +12774,107 @@
     },
     {
       "ID": 3194,
-      "txt": "神识符-金币"
+      "txt": "灵石神识符"
     },
     {
       "ID": 3195,
-      "txt": "神识符-修为"
+      "txt": "修为神识符"
     },
     {
       "ID": 3196,
-      "txt": "神识符-功法灵气"
+      "txt": "灵气神识符"
     },
     {
       "ID": 3197,
-      "txt": "神识符-法宝灵韵"
+      "txt": "玄晶神识符"
     },
     {
       "ID": 3198,
-      "txt": "神识符-功法碎片"
+      "txt": "功法神识符"
     },
     {
       "ID": 3199,
-      "txt": "神识符-法宝碎片"
+      "txt": "法宝神识符"
     },
     {
       "ID": 3200,
-      "txt": "神识符-修为丹"
+      "txt": "修为神识符"
     },
     {
       "ID": 3201,
-      "txt": "神识符-天材地宝"
+      "txt": "天地神识符"
     },
     {
       "ID": 3202,
-      "txt": "神识符-渡劫丹"
+      "txt": "渡劫神识符"
     },
     {
       "ID": 3203,
-      "txt": "神识符-好感度礼物"
+      "txt": "好感神识符"
     },
     {
       "ID": 3204,
-      "txt": "神识符-心情礼物"
+      "txt": "心情神识符"
     },
     {
       "ID": 3205,
-      "txt": "紫色神识提升符"
+      "txt": "紫色神识符"
     },
     {
       "ID": 3206,
-      "txt": "橙色神识提升符"
+      "txt": "橙色神识符"
     },
     {
       "ID": 3207,
-      "txt": "使用后必定出现产出金币的神识事件。"
+      "txt": "探索神识时，指定获得大量灵石作为奖励。"
     },
     {
       "ID": 3208,
-      "txt": "使用后必定出现产出修为的神识事件。"
+      "txt": "探索神识时，指定获得大量修为作为奖励。"
     },
     {
       "ID": 3209,
-      "txt": "使用后必定出现产出功法灵气的神识事件。"
+      "txt": "探索神识时，指定获得大量灵气作为奖励。"
     },
     {
       "ID": 3210,
-      "txt": "使用后必定出现产出法宝灵韵的神识事件。"
+      "txt": "探索神识时，指定获得大量玄晶作为奖励。"
     },
     {
       "ID": 3211,
-      "txt": "使用后必定出现产出功法碎片的神识事件。"
+      "txt": "探索神识时，指定获得大量功法碎片作为奖励。"
     },
     {
       "ID": 3212,
-      "txt": "使用后必定出现产出法宝碎片的神识事件。"
+      "txt": "探索神识时，指定获得大量法宝碎片作为奖励。"
     },
     {
       "ID": 3213,
-      "txt": "使用后必定出现产出修为丹的神识事件。"
+      "txt": "探索神识时，指定获得大量修为作为奖励。"
     },
     {
       "ID": 3214,
-      "txt": "使用后必定出现产出天材地宝的神识事件。"
+      "txt": "探索神识时，指定获得大量天材地宝作为奖励。"
     },
     {
       "ID": 3215,
-      "txt": "使用后必定出现产出渡劫丹的神识事件。"
+      "txt": "探索神识时，指定获得大量渡劫丹作为奖励。"
     },
     {
       "ID": 3216,
-      "txt": "使用后必定出现产出好感度礼物的神识事件。"
+      "txt": "探索神识时，指定获得大量好感度礼物作为奖励。"
     },
     {
       "ID": 3217,
-      "txt": "使用后必定出现产出心情礼物的神识事件。"
+      "txt": "探索神识时，指定获得大量心情礼物作为奖励。"
     },
     {
       "ID": 3218,
-      "txt": "使用后大幅提升紫色神识事件出现的概率。"
+      "txt": "探索神识时，必定探得紫色品质神识。"
     },
     {
       "ID": 3219,
-      "txt": "使用后大幅提升橙色神识事件出现的概率。"
+      "txt": "探索神识时，必定探得橙色品质神识。"
     },
     {
       "ID": 3220,
@@ -12950,11 +12950,11 @@
     },
     {
       "ID": 3238,
-      "txt": "清识还元丹"
+      "txt": "归识还元丹"
     },
     {
       "ID": 3239,
-      "txt": "清识还元丹"
+      "txt": "净识还元丹"
     },
     {
       "ID": 3240,
@@ -13066,15 +13066,15 @@
     },
     {
       "ID": 4007,
-      "txt": "[资源]仙缘宝券"
+      "txt": "[资源]渡劫丹"
     },
     {
       "ID": 4008,
-      "txt": "[资源]好感度礼物1"
+      "txt": "[资源]清茶"
     },
     {
       "ID": 4009,
-      "txt": "[资源]心情礼物1"
+      "txt": "[资源]妃子笑"
     },
     {
       "ID": 4010,
@@ -13102,15 +13102,15 @@
     },
     {
       "ID": 4016,
-      "txt": "[资源]仙缘宝券"
+      "txt": "[资源]渡劫丹"
     },
     {
       "ID": 4017,
-      "txt": "[资源]好感度礼物1"
+      "txt": "[资源]清茶"
     },
     {
       "ID": 4018,
-      "txt": "[资源]心情礼物1"
+      "txt": "[资源]妃子笑"
     },
     {
       "ID": 4019,
@@ -14254,15 +14254,15 @@
     },
     {
       "ID": 4304,
-      "txt": "[资源]仙缘宝券"
+      "txt": "[资源]良品渡劫丹"
     },
     {
       "ID": 4305,
-      "txt": "[资源]好感度礼物1"
+      "txt": "[资源]清茶"
     },
     {
       "ID": 4306,
-      "txt": "[资源]心情礼物1"
+      "txt": "[资源]妃子笑"
     },
     {
       "ID": 4307,
@@ -14290,15 +14290,15 @@
     },
     {
       "ID": 4313,
-      "txt": "[资源]仙缘宝券"
+      "txt": "[资源]上品渡劫丹"
     },
     {
       "ID": 4314,
-      "txt": "[资源]好感度礼物1"
+      "txt": "[资源]清茶"
     },
     {
       "ID": 4315,
-      "txt": "[资源]心情礼物1"
+      "txt": "[资源]妃子笑"
     },
     {
       "ID": 4316,
@@ -14326,15 +14326,15 @@
     },
     {
       "ID": 4322,
-      "txt": "[资源]仙缘宝券"
+      "txt": "[资源]极品渡劫丹"
     },
     {
       "ID": 4323,
-      "txt": "[资源]好感度礼物1"
+      "txt": "[资源]清茶"
     },
     {
       "ID": 4324,
-      "txt": "[资源]心情礼物1"
+      "txt": "[资源]妃子笑"
     },
     {
       "ID": 4325,
@@ -20154,7 +20154,7 @@
     },
     {
       "ID": 5779,
-      "txt": "你偶遇正在修炼的雀灵儿"
+      "txt": "你偶遇正在修炼的1"
     },
     {
       "ID": 5780,
@@ -20162,7 +20162,7 @@
     },
     {
       "ID": 5781,
-      "txt": "你偶遇正在修炼的云枝"
+      "txt": "你偶遇正在修炼的2"
     },
     {
       "ID": 5782,
@@ -20170,7 +20170,7 @@
     },
     {
       "ID": 5783,
-      "txt": "你偶遇正在修炼的风瑶"
+      "txt": "你偶遇正在修炼的3"
     },
     {
       "ID": 5784,
@@ -20178,7 +20178,7 @@
     },
     {
       "ID": 5785,
-      "txt": "你偶遇正在修炼的婉溪"
+      "txt": "你偶遇正在修炼的4"
     },
     {
       "ID": 5786,
@@ -20186,7 +20186,7 @@
     },
     {
       "ID": 5787,
-      "txt": "你偶遇正在修炼的许由"
+      "txt": "你偶遇正在修炼的5"
     },
     {
       "ID": 5788,
@@ -20194,7 +20194,7 @@
     },
     {
       "ID": 5789,
-      "txt": "你偶遇正在修炼的疯道人"
+      "txt": "你偶遇正在修炼的6"
     },
     {
       "ID": 5790,
@@ -20202,7 +20202,7 @@
     },
     {
       "ID": 5791,
-      "txt": "你偶遇正在修炼的道友7"
+      "txt": "你偶遇正在修炼的7"
     },
     {
       "ID": 5792,
@@ -20210,7 +20210,7 @@
     },
     {
       "ID": 5793,
-      "txt": "你偶遇正在修炼的道友8"
+      "txt": "你偶遇正在修炼的8"
     },
     {
       "ID": 5794,
@@ -20218,7 +20218,7 @@
     },
     {
       "ID": 5795,
-      "txt": "你偶遇正在修炼的道友9"
+      "txt": "你偶遇正在修炼的9"
     },
     {
       "ID": 5796,
@@ -20226,7 +20226,7 @@
     },
     {
       "ID": 5797,
-      "txt": "你偶遇正在修炼的道友10"
+      "txt": "你偶遇正在修炼的10"
     },
     {
       "ID": 5798,
@@ -37462,7 +37462,7 @@
     },
     {
       "ID": 10106,
-      "txt": "礼包"
+      "txt": "新手礼包"
     },
     {
       "ID": 10107,
@@ -38418,27 +38418,99 @@
     },
     {
       "ID": 10345,
-      "txt": "0.7"
+      "txt": "70%"
     },
     {
       "ID": 10346,
-      "txt": "0.19"
+      "txt": "19%"
     },
     {
       "ID": 10347,
-      "txt": "0.06"
+      "txt": "6%"
     },
     {
       "ID": 10348,
-      "txt": "0.03"
+      "txt": "3%"
     },
     {
       "ID": 10349,
-      "txt": "0.015"
+      "txt": "1.5%"
     },
     {
       "ID": 10350,
-      "txt": "0.005"
+      "txt": "0.5%"
+    },
+    {
+      "ID": 10351,
+      "txt": "每日特惠"
+    },
+    {
+      "ID": 10352,
+      "txt": "白嫖氪金"
+    },
+    {
+      "ID": 10353,
+      "txt": "妖丹兑换"
+    },
+    {
+      "ID": 10354,
+      "txt": "道具兑换"
+    },
+    {
+      "ID": 10355,
+      "txt": "白嫖代金券"
+    },
+    {
+      "ID": 10356,
+      "txt": "兑换商店-每日特惠"
+    },
+    {
+      "ID": 10357,
+      "txt": "兑换商店-妖丹兑换"
+    },
+    {
+      "ID": 10358,
+      "txt": "主线剧情"
+    },
+    {
+      "ID": 10359,
+      "txt": "白嫖氪金-新手礼包"
+    },
+    {
+      "ID": 10360,
+      "txt": "探宝"
+    },
+    {
+      "ID": 10361,
+      "txt": "岁酬"
+    },
+    {
+      "ID": 10362,
+      "txt": "支线剧情"
+    },
+    {
+      "ID": 10363,
+      "txt": "探宝-200抽挑战"
+    },
+    {
+      "ID": 10364,
+      "txt": "命运峰"
+    },
+    {
+      "ID": 10365,
+      "txt": "第{0}层"
+    },
+    {
+      "ID": 10366,
+      "txt": "已达最大购买次数"
+    },
+    {
+      "ID": 10367,
+      "txt": "用途"
+    },
+    {
+      "ID": 10368,
+      "txt": "购买"
     }
   ]
 }

Assets/Res/Config/LevelbattleConfig.json

@@ -190,206 +190,6 @@
       "MonsterGroupTruePower": 100,
       "MonsterGroupPower": 100
     },
-    {
-      "ID": 2001,
-      "Group": [
-        2001
-      ],
-      "combatTime": 120.0,
-      "combatType": 1,
-      "MonsterGroupTruePower": 100,
-      "MonsterGroupPower": 100
-    },
-    {
-      "ID": 2002,
-      "Group": [
-        2002
-      ],
-      "combatTime": 120.0,
-      "combatType": 1,
-      "MonsterGroupTruePower": 100,
-      "MonsterGroupPower": 100
-    },
-    {
-      "ID": 2003,
-      "Group": [
-        2003
-      ],
-      "combatTime": 120.0,
-      "combatType": 1,
-      "MonsterGroupTruePower": 100,
-      "MonsterGroupPower": 100
-    },
-    {
-      "ID": 2004,
-      "Group": [
-        2004
-      ],
-      "combatTime": 120.0,
-      "combatType": 1,
-      "MonsterGroupTruePower": 100,
-      "MonsterGroupPower": 100
-    },
-    {
-      "ID": 2005,
-      "Group": [
-        2005
-      ],
-      "combatTime": 120.0,
-      "combatType": 1,
-      "MonsterGroupTruePower": 100,
-      "MonsterGroupPower": 100
-    },
-    {
-      "ID": 2006,
-      "Group": [
-        2006
-      ],
-      "combatTime": 120.0,
-      "combatType": 1,
-      "MonsterGroupTruePower": 100,
-      "MonsterGroupPower": 100
-    },
-    {
-      "ID": 2007,
-      "Group": [
-        2007
-      ],
-      "combatTime": 120.0,
-      "combatType": 1,
-      "MonsterGroupTruePower": 100,
-      "MonsterGroupPower": 100
-    },
-    {
-      "ID": 2008,
-      "Group": [
-        2008
-      ],
-      "combatTime": 120.0,
-      "combatType": 1,
-      "MonsterGroupTruePower": 100,
-      "MonsterGroupPower": 100
-    },
-    {
-      "ID": 2009,
-      "Group": [
-        2009
-      ],
-      "combatTime": 120.0,
-      "combatType": 1,
-      "MonsterGroupTruePower": 100,
-      "MonsterGroupPower": 100
-    },
-    {
-      "ID": 2010,
-      "Group": [
-        2010
-      ],
-      "combatTime": 120.0,
-      "combatType": 1,
-      "MonsterGroupTruePower": 100,
-      "MonsterGroupPower": 100
-    },
-    {
-      "ID": 2011,
-      "Group": [
-        2011
-      ],
-      "combatTime": 120.0,
-      "combatType": 1,
-      "MonsterGroupTruePower": 100,
-      "MonsterGroupPower": 100
-    },
-    {
-      "ID": 2012,
-      "Group": [
-        2012
-      ],
-      "combatTime": 120.0,
-      "combatType": 1,
-      "MonsterGroupTruePower": 100,
-      "MonsterGroupPower": 100
-    },
-    {
-      "ID": 2013,
-      "Group": [
-        2013
-      ],
-      "combatTime": 120.0,
-      "combatType": 1,
-      "MonsterGroupTruePower": 100,
-      "MonsterGroupPower": 100
-    },
-    {
-      "ID": 2014,
-      "Group": [
-        2014
-      ],
-      "combatTime": 120.0,
-      "combatType": 1,
-      "MonsterGroupTruePower": 100,
-      "MonsterGroupPower": 100
-    },
-    {
-      "ID": 2015,
-      "Group": [
-        2015
-      ],
-      "combatTime": 120.0,
-      "combatType": 1,
-      "MonsterGroupTruePower": 100,
-      "MonsterGroupPower": 100
-    },
-    {
-      "ID": 2016,
-      "Group": [
-        2016
-      ],
-      "combatTime": 120.0,
-      "combatType": 1,
-      "MonsterGroupTruePower": 100,
-      "MonsterGroupPower": 100
-    },
-    {
-      "ID": 2017,
-      "Group": [
-        2017
-      ],
-      "combatTime": 120.0,
-      "combatType": 1,
-      "MonsterGroupTruePower": 100,
-      "MonsterGroupPower": 100
-    },
-    {
-      "ID": 2018,
-      "Group": [
-        2018
-      ],
-      "combatTime": 120.0,
-      "combatType": 1,
-      "MonsterGroupTruePower": 100,
-      "MonsterGroupPower": 100
-    },
-    {
-      "ID": 2019,
-      "Group": [
-        2019
-      ],
-      "combatTime": 120.0,
-      "combatType": 1,
-      "MonsterGroupTruePower": 100,
-      "MonsterGroupPower": 100
-    },
-    {
-      "ID": 2020,
-      "Group": [
-        2020
-      ],
-      "combatTime": 120.0,
-      "combatType": 1,
-      "MonsterGroupTruePower": 100,
-      "MonsterGroupPower": 100
-    },
     {
       "ID": 3001,
       "Group": [
@@ -899,6 +699,1806 @@
       "combatType": 1,
       "MonsterGroupTruePower": 100,
       "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2001,
+      "Group": [
+        2001
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        21888
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2002,
+      "Group": [
+        2002
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        2260
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2003,
+      "Group": [
+        2003
+      ],
+      "awardDrop": [
+        21012,
+        1401
+      ],
+      "awardNum": [
+        1,
+        1
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2004,
+      "Group": [
+        2004
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        23952
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2005,
+      "Group": [
+        2005
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        2460
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2006,
+      "Group": [
+        2006
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        25436
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2007,
+      "Group": [
+        2007
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        2620
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2008,
+      "Group": [
+        2008
+      ],
+      "awardDrop": [
+        21012,
+        1401
+      ],
+      "awardNum": [
+        1,
+        1
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2009,
+      "Group": [
+        2009
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        27836
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2010,
+      "Group": [
+        2010
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        2860
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2011,
+      "Group": [
+        2011
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        29562
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2012,
+      "Group": [
+        2012
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        3040
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2013,
+      "Group": [
+        2013
+      ],
+      "awardDrop": [
+        21012,
+        1401
+      ],
+      "awardNum": [
+        1,
+        1
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2014,
+      "Group": [
+        2014
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        32352
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2015,
+      "Group": [
+        2015
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        3340
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2016,
+      "Group": [
+        2016
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        34356
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2017,
+      "Group": [
+        2017
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        3540
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2018,
+      "Group": [
+        2018
+      ],
+      "awardDrop": [
+        21012,
+        1401
+      ],
+      "awardNum": [
+        1,
+        1
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2019,
+      "Group": [
+        2019
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        37598
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2020,
+      "Group": [
+        2020
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        3880
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2021,
+      "Group": [
+        2021
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        39928
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2022,
+      "Group": [
+        2022
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        4120
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2023,
+      "Group": [
+        2023
+      ],
+      "awardDrop": [
+        21012,
+        1401
+      ],
+      "awardNum": [
+        1,
+        1
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2024,
+      "Group": [
+        2024
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        43694
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2025,
+      "Group": [
+        2025
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        4500
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2026,
+      "Group": [
+        2026
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        46402
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2027,
+      "Group": [
+        2027
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        4780
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2028,
+      "Group": [
+        2028
+      ],
+      "awardDrop": [
+        21012,
+        1402
+      ],
+      "awardNum": [
+        1,
+        1
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2029,
+      "Group": [
+        2029
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        50780
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2030,
+      "Group": [
+        2030
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        5240
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2031,
+      "Group": [
+        2031
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        53926
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2032,
+      "Group": [
+        2032
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        5560
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2033,
+      "Group": [
+        2033
+      ],
+      "awardDrop": [
+        21012,
+        1402
+      ],
+      "awardNum": [
+        1,
+        1
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2034,
+      "Group": [
+        2034
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        59016
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2035,
+      "Group": [
+        2035
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        6080
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2036,
+      "Group": [
+        2036
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        62672
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2037,
+      "Group": [
+        2037
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        6460
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2038,
+      "Group": [
+        2038
+      ],
+      "awardDrop": [
+        21012,
+        1402
+      ],
+      "awardNum": [
+        1,
+        1
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2039,
+      "Group": [
+        2039
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        68586
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2040,
+      "Group": [
+        2040
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        7060
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2041,
+      "Group": [
+        2041
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        72836
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2042,
+      "Group": [
+        2042
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        7500
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2043,
+      "Group": [
+        2043
+      ],
+      "awardDrop": [
+        21012,
+        1402
+      ],
+      "awardNum": [
+        1,
+        1
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2044,
+      "Group": [
+        2044
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        79708
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2045,
+      "Group": [
+        2045
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        8220
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2046,
+      "Group": [
+        2046
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        84648
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2047,
+      "Group": [
+        2047
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        8720
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2048,
+      "Group": [
+        2048
+      ],
+      "awardDrop": [
+        21012,
+        1402
+      ],
+      "awardNum": [
+        1,
+        1
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2049,
+      "Group": [
+        2049
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        92634
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2050,
+      "Group": [
+        2050
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        9540
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2051,
+      "Group": [
+        2051
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        98374
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2052,
+      "Group": [
+        2052
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        10140
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2053,
+      "Group": [
+        2053
+      ],
+      "awardDrop": [
+        21012,
+        1403
+      ],
+      "awardNum": [
+        1,
+        1
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2054,
+      "Group": [
+        2054
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        107658
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2055,
+      "Group": [
+        2055
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        11100
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2056,
+      "Group": [
+        2056
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        114328
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2057,
+      "Group": [
+        2057
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        11780
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2058,
+      "Group": [
+        2058
+      ],
+      "awardDrop": [
+        21012,
+        1403
+      ],
+      "awardNum": [
+        1,
+        1
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2059,
+      "Group": [
+        2059
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        125116
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2060,
+      "Group": [
+        2060
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        12900
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2061,
+      "Group": [
+        2061
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        132868
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2062,
+      "Group": [
+        2062
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        13700
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2063,
+      "Group": [
+        2063
+      ],
+      "awardDrop": [
+        21012,
+        1403
+      ],
+      "awardNum": [
+        1,
+        1
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2064,
+      "Group": [
+        2064
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        145406
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2065,
+      "Group": [
+        2065
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        14980
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2066,
+      "Group": [
+        2066
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        154414
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2067,
+      "Group": [
+        2067
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        15920
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2068,
+      "Group": [
+        2068
+      ],
+      "awardDrop": [
+        21012,
+        1403
+      ],
+      "awardNum": [
+        1,
+        1
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2069,
+      "Group": [
+        2069
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        168986
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2070,
+      "Group": [
+        2070
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        17420
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2071,
+      "Group": [
+        2071
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        179456
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2072,
+      "Group": [
+        2072
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        18500
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2073,
+      "Group": [
+        2073
+      ],
+      "awardDrop": [
+        21012,
+        1403
+      ],
+      "awardNum": [
+        1,
+        1
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2074,
+      "Group": [
+        2074
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        196390
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2075,
+      "Group": [
+        2075
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        20240
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2076,
+      "Group": [
+        2076
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        208558
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2077,
+      "Group": [
+        2077
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        21500
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2078,
+      "Group": [
+        2078
+      ],
+      "awardDrop": [
+        21012,
+        1404
+      ],
+      "awardNum": [
+        1,
+        1
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2079,
+      "Group": [
+        2079
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        228238
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2080,
+      "Group": [
+        2080
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        23520
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2081,
+      "Group": [
+        2081
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        242380
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2082,
+      "Group": [
+        2082
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        24980
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2083,
+      "Group": [
+        2083
+      ],
+      "awardDrop": [
+        21012,
+        1404
+      ],
+      "awardNum": [
+        1,
+        1
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2084,
+      "Group": [
+        2084
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        265252
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2085,
+      "Group": [
+        2085
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        27340
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2086,
+      "Group": [
+        2086
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        281686
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2087,
+      "Group": [
+        2087
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        29020
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2088,
+      "Group": [
+        2088
+      ],
+      "awardDrop": [
+        21012,
+        1404
+      ],
+      "awardNum": [
+        1,
+        1
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2089,
+      "Group": [
+        2089
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        308266
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2090,
+      "Group": [
+        2090
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        31760
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2091,
+      "Group": [
+        2091
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        327366
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2092,
+      "Group": [
+        2092
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        33740
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2093,
+      "Group": [
+        2093
+      ],
+      "awardDrop": [
+        21012,
+        1404
+      ],
+      "awardNum": [
+        1,
+        1
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2094,
+      "Group": [
+        2094
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        354686
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2095,
+      "Group": [
+        2095
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        36180
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2096,
+      "Group": [
+        2096
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        369190
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2097,
+      "Group": [
+        2097
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        37660
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2098,
+      "Group": [
+        2098
+      ],
+      "awardDrop": [
+        21012,
+        1404
+      ],
+      "awardNum": [
+        1,
+        1
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2099,
+      "Group": [
+        2099
+      ],
+      "awardDrop": [
+        21012,
+        1001
+      ],
+      "awardNum": [
+        1,
+        392064
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
+    },
+    {
+      "ID": 2100,
+      "Group": [
+        2100
+      ],
+      "awardDrop": [
+        21012,
+        1003
+      ],
+      "awardNum": [
+        1,
+        40000
+      ],
+      "combatTime": 120.0,
+      "combatType": 1,
+      "MonsterGroupTruePower": 100,
+      "MonsterGroupPower": 100
     }
   ]
 }

Assets/Res/Config/QiankundaiConfig.json

@@ -14,7 +14,7 @@
         21001
       ],
       "DropCount": [
-        5
+        2
       ]
     },
     {
@@ -28,10 +28,10 @@
       "dropPara1": 2,
       "dropPara2": 1,
       "ChoukaID": [
-        21002
+        21003
       ],
       "DropCount": [
-        5
+        2
       ]
     },
     {
@@ -45,10 +45,10 @@
       "dropPara1": 2,
       "dropPara2": 1,
       "ChoukaID": [
-        21003
+        21004
       ],
       "DropCount": [
-        5
+        2
       ]
     },
     {
@@ -62,10 +62,27 @@
       "dropPara1": 2,
       "dropPara2": 1,
       "ChoukaID": [
-        21004
+        21005
+      ],
+      "DropCount": [
+        1
+      ]
+    },
+    {
+      "ID": 5,
+      "dropLevel": [
+        1,
+        300
+      ],
+      "dropType": 2,
+      "dropTypePara": 0,
+      "dropPara1": 2,
+      "dropPara2": 1,
+      "ChoukaID": [
+        21006
       ],
       "DropCount": [
-        5
+        1
       ]
     },
     {

Assets/Res/Config/ShopConfig.json

@@ -30,6 +30,16 @@
       "refreshCostItemId": -1,
       "refreshLimit": -1
     },
+    {
+      "ID": 6,
+      "shopName": 10106,
+      "shopGroup": 5,
+      "shopItemGroup": 6,
+      "pageSortNum": 2,
+      "RefreshType": 1,
+      "refreshCostItemId": -1,
+      "refreshLimit": -1
+    },
     {
       "ID": 4,
       "shopName": -1,
@@ -46,26 +56,26 @@
       "shopGroup": 4,
       "shopItemGroup": 5,
       "pageSortNum": 2,
-      "RefreshType": 2,
+      "RefreshType": 0,
       "refreshCostItemId": -1,
       "refreshLimit": -1
     },
     {
-      "ID": 6,
-      "shopName": 10106,
-      "shopGroup": 5,
-      "shopItemGroup": 6,
-      "pageSortNum": 2,
-      "RefreshType": 1,
+      "ID": 7,
+      "shopName": 10353,
+      "shopGroup": 6,
+      "shopItemGroup": 7,
+      "pageSortNum": 1,
+      "RefreshType": 0,
       "refreshCostItemId": -1,
       "refreshLimit": -1
     },
     {
-      "ID": 7,
-      "shopName": 10330,
+      "ID": 8,
+      "shopName": 10351,
       "shopGroup": 6,
-      "shopItemGroup": 7,
-      "pageSortNum": 1,
+      "shopItemGroup": 8,
+      "pageSortNum": 2,
       "RefreshType": 1,
       "refreshCostItemId": -1,
       "refreshLimit": -1

Assets/Res/Config/ShopGroupConfig.json

@@ -3,55 +3,57 @@
     {
       "ID": 1,
       "shopName": 1900,
-      "pageSortNum": 2,
+      "pageSortNum": 99,
       "isShow": true,
       "titleShowItemIds": [
-        1004
+        1001
       ]
     },
     {
       "ID": 2,
       "shopName": 1904,
-      "pageSortNum": 4,
+      "pageSortNum": 97,
       "isShow": true,
       "titleShowItemIds": [
-        1004
+        1001
       ]
     },
     {
       "ID": 3,
       "shopName": 1905,
-      "pageSortNum": 5,
+      "pageSortNum": 98,
       "isShow": true,
       "titleShowItemIds": [
-        1004
+        1001
       ]
     },
     {
-      "ID": 4,
-      "shopName": 10106,
-      "pageSortNum": 1,
-      "isShow": true,
+      "ID": 5,
+      "shopName": -1,
+      "pageSortNum": 96,
+      "isShow": false,
       "titleShowItemIds": [
         1004
       ]
     },
     {
-      "ID": 5,
-      "shopName": 10106,
-      "pageSortNum": 6,
-      "isShow": false,
+      "ID": 4,
+      "shopName": 10352,
+      "pageSortNum": 1,
+      "isShow": true,
       "titleShowItemIds": [
-        1004
+        1004,
+        1002
       ]
     },
     {
       "ID": 6,
       "shopName": 10330,
-      "pageSortNum": 3,
+      "pageSortNum": 2,
       "isShow": true,
       "titleShowItemIds": [
-        1004
+        1004,
+        1002
       ]
     }
   ]

Assets/Res/Config/ShopItemConfig.json

@@ -145,7 +145,7 @@
         1301
       ],
       "itemCount": [
-        999
+        1
       ],
       "costItemId": 1001,
       "price": 1,
@@ -165,10 +165,10 @@
       "ID": 8,
       "giftID": "",
       "itemId": [
-        1302
+        1701
       ],
       "itemCount": [
-        999
+        99
       ],
       "costItemId": 1001,
       "price": 1,
@@ -188,10 +188,10 @@
       "ID": 9,
       "giftID": "",
       "itemId": [
-        1303
+        1702
       ],
       "itemCount": [
-        999
+        99
       ],
       "costItemId": 1001,
       "price": 1,
@@ -211,10 +211,10 @@
       "ID": 10,
       "giftID": "",
       "itemId": [
-        1304
+        1703
       ],
       "itemCount": [
-        999
+        99
       ],
       "costItemId": 1001,
       "price": 1,
@@ -349,7 +349,7 @@
       "ID": 16,
       "giftID": "",
       "itemId": [
-        21002
+        1501
       ],
       "itemCount": [
         99
@@ -464,7 +464,7 @@
       "ID": 21,
       "giftID": "",
       "itemId": [
-        21007
+        1401
       ],
       "itemCount": [
         99
@@ -487,7 +487,7 @@
       "ID": 22,
       "giftID": "",
       "itemId": [
-        21008
+        1402
       ],
       "itemCount": [
         99
@@ -510,7 +510,7 @@
       "ID": 23,
       "giftID": "",
       "itemId": [
-        21009
+        1403
       ],
       "itemCount": [
         99
@@ -533,7 +533,7 @@
       "ID": 24,
       "giftID": "",
       "itemId": [
-        21010
+        1404
       ],
       "itemCount": [
         99
@@ -556,7 +556,7 @@
       "ID": 25,
       "giftID": "",
       "itemId": [
-        21011
+        1601
       ],
       "itemCount": [
         99
@@ -1637,16 +1637,16 @@
       "ID": 301,
       "giftID": "",
       "itemId": [
-        13001
+        10002
       ],
       "itemCount": [
-        100
+        1
       ],
-      "costItemId": 1001,
-      "price": 1,
+      "costItemId": 9999,
+      "price": 6,
       "oldPrice": 1,
-      "buyCount": -1,
-      "maxBuyCount": -1,
+      "buyCount": 1,
+      "maxBuyCount": 1,
       "shopItemGroup": 5,
       "continueTime": -1,
       "shopName": 0,
@@ -1660,16 +1660,16 @@
       "ID": 302,
       "giftID": "",
       "itemId": [
-        13002
+        12016
       ],
       "itemCount": [
-        100
+        1
       ],
-      "costItemId": 1001,
-      "price": 1,
+      "costItemId": 9999,
+      "price": 6,
       "oldPrice": 1,
-      "buyCount": -1,
-      "maxBuyCount": -1,
+      "buyCount": 1,
+      "maxBuyCount": 1,
       "shopItemGroup": 5,
       "continueTime": -1,
       "shopName": 0,
@@ -1683,16 +1683,16 @@
       "ID": 303,
       "giftID": "",
       "itemId": [
-        13003
+        12518
       ],
       "itemCount": [
-        100
+        1
       ],
-      "costItemId": 1001,
-      "price": 1,
+      "costItemId": 9999,
+      "price": 6,
       "oldPrice": 1,
-      "buyCount": -1,
-      "maxBuyCount": -1,
+      "buyCount": 1,
+      "maxBuyCount": 1,
       "shopItemGroup": 5,
       "continueTime": -1,
       "shopName": 0,
@@ -1706,16 +1706,16 @@
       "ID": 304,
       "giftID": "",
       "itemId": [
-        13004
+        1703
       ],
       "itemCount": [
-        100
+        10
       ],
-      "costItemId": 1001,
-      "price": 1,
+      "costItemId": 9999,
+      "price": 12,
       "oldPrice": 1,
-      "buyCount": -1,
-      "maxBuyCount": -1,
+      "buyCount": 1,
+      "maxBuyCount": 1,
       "shopItemGroup": 5,
       "continueTime": -1,
       "shopName": 0,
@@ -1729,16 +1729,16 @@
       "ID": 305,
       "giftID": "",
       "itemId": [
-        13005
+        21013
       ],
       "itemCount": [
-        100
+        30
       ],
-      "costItemId": 1001,
-      "price": 1,
+      "costItemId": 9999,
+      "price": 12,
       "oldPrice": 1,
-      "buyCount": -1,
-      "maxBuyCount": -1,
+      "buyCount": 1,
+      "maxBuyCount": 1,
       "shopItemGroup": 5,
       "continueTime": -1,
       "shopName": 0,
@@ -1752,17 +1752,40 @@
       "ID": 306,
       "giftID": "",
       "itemId": [
-        13006
+        23002
       ],
       "itemCount": [
-        100
+        1
       ],
-      "costItemId": 1001,
+      "costItemId": 9999,
+      "price": 30,
+      "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": 5,
+      "shopItemGroup": 4,
       "continueTime": -1,
       "shopName": 0,
       "shopDesc": 0,
@@ -1772,20 +1795,43 @@
       ]
     },
     {
-      "ID": 307,
+      "ID": 601,
       "giftID": "",
       "itemId": [
-        13007
+        1702
       ],
       "itemCount": [
-        100
+        1
       ],
-      "costItemId": 1001,
-      "price": 1,
+      "costItemId": 1004,
+      "price": 200,
+      "oldPrice": 1,
+      "buyCount": 5,
+      "maxBuyCount": -1,
+      "shopItemGroup": 6,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ]
+    },
+    {
+      "ID": 701,
+      "giftID": "",
+      "itemId": [
+        1002
+      ],
+      "itemCount": [
+        60
+      ],
+      "costItemId": 1004,
+      "price": 6,
       "oldPrice": 1,
       "buyCount": -1,
       "maxBuyCount": -1,
-      "shopItemGroup": 5,
+      "shopItemGroup": 7,
       "continueTime": -1,
       "shopName": 0,
       "shopDesc": 0,
@@ -1795,20 +1841,20 @@
       ]
     },
     {
-      "ID": 401,
+      "ID": 702,
       "giftID": "",
       "itemId": [
-        0
+        1002
       ],
       "itemCount": [
-        0
+        300
       ],
-      "costItemId": 0,
-      "price": 1,
+      "costItemId": 1004,
+      "price": 30,
       "oldPrice": 1,
       "buyCount": -1,
       "maxBuyCount": -1,
-      "shopItemGroup": 4,
+      "shopItemGroup": 7,
       "continueTime": -1,
       "shopName": 0,
       "shopDesc": 0,
@@ -1818,20 +1864,20 @@
       ]
     },
     {
-      "ID": 601,
+      "ID": 703,
       "giftID": "",
       "itemId": [
-        1702
+        1002
       ],
       "itemCount": [
-        1
+        980
       ],
       "costItemId": 1004,
-      "price": 200,
+      "price": 98,
       "oldPrice": 1,
-      "buyCount": 5,
+      "buyCount": -1,
       "maxBuyCount": -1,
-      "shopItemGroup": 6,
+      "shopItemGroup": 7,
       "continueTime": -1,
       "shopName": 0,
       "shopDesc": 0,
@@ -1841,16 +1887,16 @@
       ]
     },
     {
-      "ID": 701,
+      "ID": 704,
       "giftID": "",
       "itemId": [
         1002
       ],
       "itemCount": [
-        10
+        1680
       ],
       "costItemId": 1004,
-      "price": 1,
+      "price": 168,
       "oldPrice": 1,
       "buyCount": -1,
       "maxBuyCount": -1,
@@ -1864,16 +1910,16 @@
       ]
     },
     {
-      "ID": 702,
+      "ID": 705,
       "giftID": "",
       "itemId": [
         1002
       ],
       "itemCount": [
-        100
+        3280
       ],
       "costItemId": 1004,
-      "price": 10,
+      "price": 328,
       "oldPrice": 1,
       "buyCount": -1,
       "maxBuyCount": -1,
@@ -1887,16 +1933,16 @@
       ]
     },
     {
-      "ID": 703,
+      "ID": 706,
       "giftID": "",
       "itemId": [
         1002
       ],
       "itemCount": [
-        10000
+        6480
       ],
       "costItemId": 1004,
-      "price": 1000,
+      "price": 648,
       "oldPrice": 1,
       "buyCount": -1,
       "maxBuyCount": -1,
@@ -1908,6 +1954,144 @@
       "shopShowTemplateParm": [
         "icon_Gem_Star_Blue"
       ]
+    },
+    {
+      "ID": 801,
+      "giftID": "",
+      "itemId": [
+        1201
+      ],
+      "itemCount": [
+        1
+      ],
+      "costItemId": 1004,
+      "price": 6,
+      "oldPrice": 1,
+      "buyCount": 4,
+      "maxBuyCount": -1,
+      "shopItemGroup": 8,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ]
+    },
+    {
+      "ID": 802,
+      "giftID": "",
+      "itemId": [
+        1202
+      ],
+      "itemCount": [
+        1
+      ],
+      "costItemId": 1004,
+      "price": 30,
+      "oldPrice": 1,
+      "buyCount": 2,
+      "maxBuyCount": -1,
+      "shopItemGroup": 8,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ]
+    },
+    {
+      "ID": 803,
+      "giftID": "",
+      "itemId": [
+        1701
+      ],
+      "itemCount": [
+        1
+      ],
+      "costItemId": 1004,
+      "price": 98,
+      "oldPrice": 1,
+      "buyCount": 10,
+      "maxBuyCount": -1,
+      "shopItemGroup": 8,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ]
+    },
+    {
+      "ID": 804,
+      "giftID": "",
+      "itemId": [
+        12004
+      ],
+      "itemCount": [
+        1
+      ],
+      "costItemId": 1004,
+      "price": 168,
+      "oldPrice": 1,
+      "buyCount": 1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 8,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ]
+    },
+    {
+      "ID": 805,
+      "giftID": "",
+      "itemId": [
+        12510
+      ],
+      "itemCount": [
+        1
+      ],
+      "costItemId": 1004,
+      "price": 328,
+      "oldPrice": 1,
+      "buyCount": 1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 8,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ]
+    },
+    {
+      "ID": 806,
+      "giftID": "",
+      "itemId": [
+        10010
+      ],
+      "itemCount": [
+        1
+      ],
+      "costItemId": 1004,
+      "price": 648,
+      "oldPrice": 1,
+      "buyCount": 1,
+      "maxBuyCount": -1,
+      "shopItemGroup": 8,
+      "continueTime": -1,
+      "shopName": 0,
+      "shopDesc": 0,
+      "shopShowTemplate": 3,
+      "shopShowTemplateParm": [
+        "icon_Gem_Star_Blue"
+      ]
     }
   ]
 }

Assets/Res/Config/SkiptoConfig.json

@@ -10,7 +10,7 @@
     },
     {
       "ID": 2,
-      "SkipType": 2,
+      "SkipType": 1,
       "SkipID": 2,
       "SkipTxt": 10108,
       "UnlockType": 0,
@@ -18,7 +18,7 @@
     },
     {
       "ID": 3,
-      "SkipType": 3,
+      "SkipType": 1,
       "SkipID": 3,
       "SkipTxt": 10109,
       "UnlockType": 0,
@@ -26,18 +26,18 @@
     },
     {
       "ID": 4,
-      "SkipType": 4,
+      "SkipType": 1,
       "SkipID": 4,
       "SkipArguments": [
         7
       ],
-      "SkipTxt": 10110,
+      "SkipTxt": 10357,
       "UnlockType": 0,
       "UnlockPara2": 0
     },
     {
       "ID": 5,
-      "SkipType": 5,
+      "SkipType": 1,
       "SkipID": 5,
       "SkipTxt": 10111,
       "UnlockType": 0,
@@ -45,9 +45,82 @@
     },
     {
       "ID": 6,
-      "SkipType": 6,
+      "SkipType": 1,
+      "SkipID": 4,
+      "SkipArguments": [
+        4
+      ],
+      "SkipTxt": 10355,
+      "UnlockType": 0,
+      "UnlockPara2": 0
+    },
+    {
+      "ID": 7,
+      "SkipType": 1,
       "SkipID": 4,
-      "SkipTxt": 0,
+      "SkipArguments": [
+        8
+      ],
+      "SkipTxt": 10356,
+      "UnlockType": 0,
+      "UnlockPara2": 0
+    },
+    {
+      "ID": 8,
+      "SkipType": 1,
+      "SkipID": 7,
+      "SkipTxt": 10358,
+      "UnlockType": 0,
+      "UnlockPara2": 0
+    },
+    {
+      "ID": 9,
+      "SkipType": 1,
+      "SkipID": 4,
+      "SkipArguments": [
+        9
+      ],
+      "SkipTxt": 10359,
+      "UnlockType": 0,
+      "UnlockPara2": 0
+    },
+    {
+      "ID": 10,
+      "SkipType": 1,
+      "SkipID": 8,
+      "SkipTxt": 10360,
+      "UnlockType": 0,
+      "UnlockPara2": 0
+    },
+    {
+      "ID": 11,
+      "SkipType": 1,
+      "SkipID": 9,
+      "SkipTxt": 10361,
+      "UnlockType": 0,
+      "UnlockPara2": 0
+    },
+    {
+      "ID": 12,
+      "SkipType": 1,
+      "SkipID": 10,
+      "SkipTxt": 10362,
+      "UnlockType": 0,
+      "UnlockPara2": 0
+    },
+    {
+      "ID": 13,
+      "SkipType": 1,
+      "SkipID": 8,
+      "SkipTxt": 10363,
+      "UnlockType": 0,
+      "UnlockPara2": 0
+    },
+    {
+      "ID": 14,
+      "SkipType": 1,
+      "SkipID": 6,
+      "SkipTxt": 10364,
       "UnlockType": 0,
       "UnlockPara2": 0
     }

Assets/Res/Config/TowerInfoConfig.json

@@ -11,7 +11,8 @@
         2001
       ],
       "reward": [
-        1002
+        1001,
+        21012
       ],
       "unlockValue": 0
     },
@@ -26,7 +27,8 @@
         2002
       ],
       "reward": [
-        1002
+        1003,
+        21012
       ],
       "unlockValue": 0
     },
@@ -41,7 +43,8 @@
         2003
       ],
       "reward": [
-        1002
+        1401,
+        21012
       ],
       "unlockValue": 0
     },
@@ -56,7 +59,8 @@
         2004
       ],
       "reward": [
-        1002
+        1001,
+        21012
       ],
       "unlockValue": 0
     },
@@ -71,7 +75,8 @@
         2005
       ],
       "reward": [
-        1002
+        1003,
+        21012
       ],
       "unlockValue": 0
     },
@@ -86,7 +91,8 @@
         2006
       ],
       "reward": [
-        1002
+        1001,
+        21012
       ],
       "unlockValue": 0
     },
@@ -101,7 +107,8 @@
         2007
       ],
       "reward": [
-        1002
+        1003,
+        21012
       ],
       "unlockValue": 0
     },
@@ -116,7 +123,8 @@
         2008
       ],
       "reward": [
-        1002
+        1401,
+        21012
       ],
       "unlockValue": 0
     },
@@ -131,7 +139,8 @@
         2009
       ],
       "reward": [
-        1002
+        1001,
+        21012
       ],
       "unlockValue": 0
     },
@@ -146,7 +155,8 @@
         2010
       ],
       "reward": [
-        1002
+        1003,
+        21012
       ],
       "unlockValue": 0
     },
@@ -161,7 +171,8 @@
         2011
       ],
       "reward": [
-        1002
+        1001,
+        21012
       ],
       "unlockValue": 0
     },
@@ -176,7 +187,8 @@
         2012
       ],
       "reward": [
-        1002
+        1003,
+        21012
       ],
       "unlockValue": 0
     },
@@ -191,7 +203,8 @@
         2013
       ],
       "reward": [
-        1002
+        1401,
+        21012
       ],
       "unlockValue": 0
     },
@@ -206,7 +219,8 @@
         2014
       ],
       "reward": [
-        1002
+        1001,
+        21012
       ],
       "unlockValue": 0
     },
@@ -221,7 +235,8 @@
         2015
       ],
       "reward": [
-        1002
+        1003,
+        21012
       ],
       "unlockValue": 0
     },
@@ -236,7 +251,8 @@
         2016
       ],
       "reward": [
-        1002
+        1001,
+        21012
       ],
       "unlockValue": 0
     },
@@ -251,7 +267,8 @@
         2017
       ],
       "reward": [
-        1002
+        1003,
+        21012
       ],
       "unlockValue": 0
     },
@@ -266,7 +283,8 @@
         2018
       ],
       "reward": [
-        1002
+        1401,
+        21012
       ],
       "unlockValue": 0
     },
@@ -281,7 +299,8 @@
         2019
       ],
       "reward": [
-        1002
+        1001,
+        21012
       ],
       "unlockValue": 0
     },
@@ -296,7 +315,1288 @@
         2020
       ],
       "reward": [
-        1002
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 21,
+      "groupId": 1,
+      "level": 21,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2021
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 22,
+      "groupId": 1,
+      "level": 22,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2022
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 23,
+      "groupId": 1,
+      "level": 23,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2023
+      ],
+      "reward": [
+        1401,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 24,
+      "groupId": 1,
+      "level": 24,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2024
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 25,
+      "groupId": 1,
+      "level": 25,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2025
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 26,
+      "groupId": 1,
+      "level": 26,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2026
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 27,
+      "groupId": 1,
+      "level": 27,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2027
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 28,
+      "groupId": 1,
+      "level": 28,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2028
+      ],
+      "reward": [
+        1402,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 29,
+      "groupId": 1,
+      "level": 29,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2029
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 30,
+      "groupId": 1,
+      "level": 30,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2030
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 31,
+      "groupId": 1,
+      "level": 31,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2031
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 32,
+      "groupId": 1,
+      "level": 32,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2032
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 33,
+      "groupId": 1,
+      "level": 33,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2033
+      ],
+      "reward": [
+        1402,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 34,
+      "groupId": 1,
+      "level": 34,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2034
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 35,
+      "groupId": 1,
+      "level": 35,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2035
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 36,
+      "groupId": 1,
+      "level": 36,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2036
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 37,
+      "groupId": 1,
+      "level": 37,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2037
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 38,
+      "groupId": 1,
+      "level": 38,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2038
+      ],
+      "reward": [
+        1402,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 39,
+      "groupId": 1,
+      "level": 39,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2039
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 40,
+      "groupId": 1,
+      "level": 40,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2040
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 41,
+      "groupId": 1,
+      "level": 41,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2041
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 42,
+      "groupId": 1,
+      "level": 42,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2042
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 43,
+      "groupId": 1,
+      "level": 43,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2043
+      ],
+      "reward": [
+        1402,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 44,
+      "groupId": 1,
+      "level": 44,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2044
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 45,
+      "groupId": 1,
+      "level": 45,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2045
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 46,
+      "groupId": 1,
+      "level": 46,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2046
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 47,
+      "groupId": 1,
+      "level": 47,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2047
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 48,
+      "groupId": 1,
+      "level": 48,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2048
+      ],
+      "reward": [
+        1402,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 49,
+      "groupId": 1,
+      "level": 49,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2049
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 50,
+      "groupId": 1,
+      "level": 50,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2050
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 51,
+      "groupId": 1,
+      "level": 51,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2051
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 52,
+      "groupId": 1,
+      "level": 52,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2052
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 53,
+      "groupId": 1,
+      "level": 53,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2053
+      ],
+      "reward": [
+        1403,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 54,
+      "groupId": 1,
+      "level": 54,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2054
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 55,
+      "groupId": 1,
+      "level": 55,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2055
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 56,
+      "groupId": 1,
+      "level": 56,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2056
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 57,
+      "groupId": 1,
+      "level": 57,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2057
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 58,
+      "groupId": 1,
+      "level": 58,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2058
+      ],
+      "reward": [
+        1403,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 59,
+      "groupId": 1,
+      "level": 59,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2059
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 60,
+      "groupId": 1,
+      "level": 60,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2060
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 61,
+      "groupId": 1,
+      "level": 61,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2061
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 62,
+      "groupId": 1,
+      "level": 62,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2062
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 63,
+      "groupId": 1,
+      "level": 63,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2063
+      ],
+      "reward": [
+        1403,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 64,
+      "groupId": 1,
+      "level": 64,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2064
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 65,
+      "groupId": 1,
+      "level": 65,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2065
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 66,
+      "groupId": 1,
+      "level": 66,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2066
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 67,
+      "groupId": 1,
+      "level": 67,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2067
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 68,
+      "groupId": 1,
+      "level": 68,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2068
+      ],
+      "reward": [
+        1403,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 69,
+      "groupId": 1,
+      "level": 69,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2069
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 70,
+      "groupId": 1,
+      "level": 70,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2070
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 71,
+      "groupId": 1,
+      "level": 71,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2071
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 72,
+      "groupId": 1,
+      "level": 72,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2072
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 73,
+      "groupId": 1,
+      "level": 73,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2073
+      ],
+      "reward": [
+        1403,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 74,
+      "groupId": 1,
+      "level": 74,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2074
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 75,
+      "groupId": 1,
+      "level": 75,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2075
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 76,
+      "groupId": 1,
+      "level": 76,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2076
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 77,
+      "groupId": 1,
+      "level": 77,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2077
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 78,
+      "groupId": 1,
+      "level": 78,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2078
+      ],
+      "reward": [
+        1404,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 79,
+      "groupId": 1,
+      "level": 79,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2079
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 80,
+      "groupId": 1,
+      "level": 80,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2080
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 81,
+      "groupId": 1,
+      "level": 81,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2081
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 82,
+      "groupId": 1,
+      "level": 82,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2082
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 83,
+      "groupId": 1,
+      "level": 83,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2083
+      ],
+      "reward": [
+        1404,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 84,
+      "groupId": 1,
+      "level": 84,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2084
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 85,
+      "groupId": 1,
+      "level": 85,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2085
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 86,
+      "groupId": 1,
+      "level": 86,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2086
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 87,
+      "groupId": 1,
+      "level": 87,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2087
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 88,
+      "groupId": 1,
+      "level": 88,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2088
+      ],
+      "reward": [
+        1404,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 89,
+      "groupId": 1,
+      "level": 89,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2089
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 90,
+      "groupId": 1,
+      "level": 90,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2090
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 91,
+      "groupId": 1,
+      "level": 91,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2091
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 92,
+      "groupId": 1,
+      "level": 92,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2092
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 93,
+      "groupId": 1,
+      "level": 93,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2093
+      ],
+      "reward": [
+        1404,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 94,
+      "groupId": 1,
+      "level": 94,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2094
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 95,
+      "groupId": 1,
+      "level": 95,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2095
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 96,
+      "groupId": 1,
+      "level": 96,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2096
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 97,
+      "groupId": 1,
+      "level": 97,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2097
+      ],
+      "reward": [
+        1003,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 98,
+      "groupId": 1,
+      "level": 98,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2098
+      ],
+      "reward": [
+        1404,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 99,
+      "groupId": 1,
+      "level": 99,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2099
+      ],
+      "reward": [
+        1001,
+        21012
+      ],
+      "unlockValue": 0
+    },
+    {
+      "ID": 100,
+      "groupId": 1,
+      "level": 100,
+      "name": 0,
+      "massge": 0,
+      "towerType": 1,
+      "typeValue": [
+        2100
+      ],
+      "reward": [
+        1003,
+        21012
       ],
       "unlockValue": 0
     }

Assets/Res/UI/ShopPanel/ShopBoxWidget.prefab

@@ -100,6 +100,7 @@ GameObject:
   - component: {fileID: 2996915339685145454}
   - component: {fileID: 7645501109871432598}
   - component: {fileID: 7480171292643897060}
+  - component: {fileID: 972698312368462541}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_GaiLv
@@ -169,6 +170,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 57.2%
+--- !u!114 &972698312368462541
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 273976862557575735}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10345
 --- !u!1 &276280393870148480
 GameObject:
   m_ObjectHideFlags: 0
@@ -276,6 +290,7 @@ GameObject:
   - component: {fileID: 7616230294427577458}
   - component: {fileID: 2641973346719233169}
   - component: {fileID: 3368294147520607031}
+  - component: {fileID: 801627964597532628}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_GaiLv
@@ -345,6 +360,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 57.2%
+--- !u!114 &801627964597532628
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 333650309939419374}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10348
 --- !u!1 &384269343322849443
 GameObject:
   m_ObjectHideFlags: 0
@@ -638,6 +666,7 @@ GameObject:
   - component: {fileID: 2251815705129355552}
   - component: {fileID: 8547480128435490556}
   - component: {fileID: 8302120544150499690}
+  - component: {fileID: 6113714825081615785}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Count
@@ -722,6 +751,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
+--- !u!114 &6113714825081615785
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 975401785670832517}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10339
 --- !u!1 &1035644628526415440
 GameObject:
   m_ObjectHideFlags: 0
@@ -827,6 +869,7 @@ GameObject:
   - component: {fileID: 6489511897426837363}
   - component: {fileID: 8018608956383153944}
   - component: {fileID: 2652679519094550969}
+  - component: {fileID: 3041011865347631961}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Count
@@ -911,6 +954,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
+--- !u!114 &3041011865347631961
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1050126008742067804}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10343
 --- !u!1 &1113902231855745381
 GameObject:
   m_ObjectHideFlags: 0
@@ -1239,6 +1295,7 @@ GameObject:
   - component: {fileID: 6835024070903822679}
   - component: {fileID: 5443285785340945435}
   - component: {fileID: 8641416447764666386}
+  - component: {fileID: 7425153803128017848}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Count
@@ -1323,6 +1380,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
+--- !u!114 &7425153803128017848
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1497394059788302979}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10342
 --- !u!1 &1501700663442146284
 GameObject:
   m_ObjectHideFlags: 0
@@ -2785,6 +2855,7 @@ GameObject:
   - component: {fileID: 1020755580111855999}
   - component: {fileID: 7819499848898734414}
   - component: {fileID: 233595083899320124}
+  - component: {fileID: 4691126149763750233}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_GaiLv
@@ -2854,6 +2925,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 57.2%
+--- !u!114 &4691126149763750233
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5089696736954208135}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10346
 --- !u!1 &5224817420243648246
 GameObject:
   m_ObjectHideFlags: 0
@@ -3563,6 +3647,7 @@ GameObject:
   - component: {fileID: 1553552100879311145}
   - component: {fileID: 1749525848610587373}
   - component: {fileID: 303764932847384926}
+  - component: {fileID: 8749281574509086637}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_GaiLv
@@ -3632,6 +3717,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 57.2%
+--- !u!114 &8749281574509086637
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7321907789896462625}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10350
 --- !u!1 &7476230505333882773
 GameObject:
   m_ObjectHideFlags: 0
@@ -3920,6 +4018,7 @@ GameObject:
   - component: {fileID: 7232477341919064873}
   - component: {fileID: 3169445059514101149}
   - component: {fileID: 2911314765555782532}
+  - component: {fileID: 2435785671868476975}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Count
@@ -4004,6 +4103,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
+--- !u!114 &2435785671868476975
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8211786058160201744}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10344
 --- !u!1 &8241209294658023724
 GameObject:
   m_ObjectHideFlags: 0
@@ -4016,6 +4128,7 @@ GameObject:
   - component: {fileID: 2019571704989516606}
   - component: {fileID: 2347753902682301191}
   - component: {fileID: 7379481711500463364}
+  - component: {fileID: 6837790045357976236}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Count
@@ -4100,6 +4213,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
+--- !u!114 &6837790045357976236
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8241209294658023724}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10340
 --- !u!1 &8426370114494986623
 GameObject:
   m_ObjectHideFlags: 0
@@ -4358,6 +4484,7 @@ GameObject:
   - component: {fileID: 6534534746643793319}
   - component: {fileID: 680072671824350836}
   - component: {fileID: 5269235145391843916}
+  - component: {fileID: 9043192436549308730}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_GaiLv
@@ -4427,6 +4554,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 57.2%
+--- !u!114 &9043192436549308730
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8669257028166209448}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10347
 --- !u!1 &8890653371124553055
 GameObject:
   m_ObjectHideFlags: 0
@@ -4549,6 +4689,7 @@ GameObject:
   - component: {fileID: 5887267035750045562}
   - component: {fileID: 584594056667099355}
   - component: {fileID: 3656733740707354268}
+  - component: {fileID: 7080381614908417301}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Count
@@ -4633,6 +4774,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 2, y: -2}
   m_UseGraphicAlpha: 1
+--- !u!114 &7080381614908417301
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9097259295526567356}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10341
 --- !u!1 &9097704230371347564
 GameObject:
   m_ObjectHideFlags: 0
@@ -4644,6 +4798,7 @@ GameObject:
   - component: {fileID: 1986555005657420446}
   - component: {fileID: 7818776012246767499}
   - component: {fileID: 1305258739368705495}
+  - component: {fileID: 8028858648905026995}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_GaiLv
@@ -4713,6 +4868,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 57.2%
+--- !u!114 &8028858648905026995
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9097704230371347564}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10349
 --- !u!1 &9183658485641831872
 GameObject:
   m_ObjectHideFlags: 0

Assets/Res/UI/ShopPanel/ShopBuyItemPanel.prefab

@@ -1642,6 +1642,7 @@ GameObject:
   - component: {fileID: 8986685959622995071}
   - component: {fileID: 8099809648833845961}
   - component: {fileID: 2814981318285203683}
+  - component: {fileID: 612931872748925225}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Title
@@ -1711,6 +1712,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u7528\u56FE"
+--- !u!114 &612931872748925225
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4421624734917338975}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10367
 --- !u!1 &4600936787556439174
 GameObject:
   m_ObjectHideFlags: 0
@@ -2655,6 +2669,7 @@ GameObject:
   - component: {fileID: 6086569560218178807}
   - component: {fileID: 8222933101076642453}
   - component: {fileID: 5720279122955918844}
+  - component: {fileID: 6463934290641258330}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy) (1)
@@ -2724,6 +2739,19 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u8D2D\u4E70"
+--- !u!114 &6463934290641258330
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7483183420122722035}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10368
 --- !u!1 &7711143027347006985
 GameObject:
   m_ObjectHideFlags: 0
@@ -2772,6 +2800,7 @@ GameObject:
   - component: {fileID: 2980301551769529947}
   - component: {fileID: 186436975627440937}
   - component: {fileID: 7258802916437755773}
+  - component: {fileID: 7798939367883031472}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text_Function
@@ -2856,6 +2885,19 @@ MonoBehaviour:
   m_EffectColor: {r: 0.427451, g: 0.24705884, b: 0.0627451, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
+--- !u!114 &7798939367883031472
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7742152475391071874}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d272e2a31d4cd8c408dc4d1c8963f314, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: 10368
 --- !u!1 &8103780915703377457
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/Core/Utility/GlobalParam.cs

@@ -10,7 +10,7 @@ namespace Core.Utility
         public static int Item_Diamond_ID = 1002;
         public static int Item_HeroExp_ID = 1003;
 
-        public static int RMB_1031 = 1031;
+        public static int RMB_1031 = 9999;
         /// <summary>
         /// 英雄最大上阵数量
         /// </summary>

Assets/Scripts/GameData/ExcelConfig/ShopItemConfig.cs

@@ -55,7 +55,7 @@ namespace Excel2Json
 		
 
 		/// <summary>
-		///消耗道具ID  0 = 免费 1032 = 广告
+		///消耗道具ID  0 = 免费 1032 = 广告 9999 = 真实充值
 		/// </summary>
 #if !COMBAT_SERVER
 		public int costItemId;

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceRestoredWidget.cs

@@ -37,7 +37,16 @@ namespace Fort23.Mono
                 {
                     if (ShopItemConfig.buyCount != -1 && shopItem.buyCount >= ShopItemConfig.buyCount)
                     {
-                        TipMessagePanel.OpenTipMessagePanel(811, Vector2.zero);
+                        TipMessagePanel.OpenTipMessagePanel(10366, Vector2.zero);
+                        return;
+                    }
+
+                    if (ShopItemConfig.price != 0 &&
+                        !PlayerManager.Instance.BagController.IsEnough(ShopItemConfig.costItemId,
+                            ShopItemConfig.price * 1))
+                    {
+                        ItemSourcePanel.OpenPanel(ShopItemConfig.costItemId);
+                        // TipMessagePanel.OpenTipMessagePanel(829, Vector2.zero);
                         return;
                     }
 

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

@@ -36,12 +36,14 @@ namespace Fort23.Mono
 
             _shopItemConfig = ConfigComponent.Instance.Get<ShopItemConfig>(shopItem.id);
             _callback = callback;
-            WidgetItem itemWidget = await UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot, poolName: _poolName);
+            WidgetItem itemWidget =
+                await UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot, poolName: _poolName);
             itemWidget.InitWidget(new ItemInfo(_shopItemConfig.itemId[0], _shopItemConfig.itemCount[0]));
             ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(_shopItemConfig.itemId[0]);
             Text_name.text = LanguageManager.Instance.Text(itemConfig.itemName);
-            Text_desc.text = LanguageManager.Instance.Text(itemWidget.itemInfo.config.itemName);
-            Text_ItemCount.text = "当前持有：" + PlayerManager.Instance.BagController.GetItemCount(_shopItemConfig.itemId[0]);
+            Text_desc.text = LanguageManager.Instance.Text(itemWidget.itemInfo.config.itemDesc);
+            Text_ItemCount.text =
+                "当前持有：" + PlayerManager.Instance.BagController.GetItemCount(_shopItemConfig.itemId[0]);
             // UseSlider.value = 1;
             // UseSlider.minValue = 1;
             Text_BuyCount.text = "1";
@@ -59,7 +61,8 @@ namespace Fort23.Mono
                 Text_LimitCount.text = "无";
                 if (_shopItemConfig.price != 0)
                 {
-                    int total = (int)(PlayerManager.Instance.BagController.GetItemCount(_shopItemConfig.costItemId) / _shopItemConfig.price);
+                    int total = (int)(PlayerManager.Instance.BagController.GetItemCount(_shopItemConfig.costItemId) /
+                                      _shopItemConfig.price);
                     maxCount = total >= 10 ? 10 : total;
                 }
 
@@ -76,11 +79,12 @@ namespace Fort23.Mono
             else
             {
                 LimitObj.SetActive(true);
-                Text_LimitCount.text = $"{_shopItemConfig.buyCount - _shopItem.buyCount}/{_shopItemConfig.buyCount}";
+                Text_LimitCount.text = $"{_shopItem.buyCount}/{_shopItemConfig.buyCount}";
                 maxCount = _shopItemConfig.buyCount - _shopItem.buyCount;
                 if (_shopItemConfig.price != 0)
                 {
-                    int temp = (int)(PlayerManager.Instance.BagController.GetItemCount(_shopItemConfig.costItemId) / _shopItemConfig.price);
+                    int temp = (int)(PlayerManager.Instance.BagController.GetItemCount(_shopItemConfig.costItemId) /
+                                     _shopItemConfig.price);
                     if (temp < maxCount)
                     {
                         maxCount = temp;
@@ -98,13 +102,20 @@ namespace Fort23.Mono
                 // UseSlider.value = 1;
             }
 
-            Text_Price.text = _shopItemConfig.price.ToString();
+
             if (_shopItemConfig.costItemId == GlobalParam.RMB_1031)
             {
+                Text_Price.text = "￥" + _shopItemConfig.price.ToString();
                 ImageCurrency.gameObject.SetActive(false);
             }
+            else if (_shopItemConfig.costItemId == 0)
+            {
+                ImageCurrency.gameObject.SetActive(false);
+                Text_Price.text = "免费";
+            }
             else
             {
+                Text_Price.text = _shopItemConfig.price.ToString();
                 ImageCurrency.gameObject.SetActive(true);
             }
 
@@ -214,7 +225,25 @@ namespace Fort23.Mono
             int count = (int)arg0;
             currentSelectCount = count;
             Text_BuyCount.text = count.ToString();
-            Text_Price.text = $"{(count * _shopItemConfig.price).ToString()}";
+
+
+            if (_shopItemConfig.costItemId == GlobalParam.RMB_1031)
+            {
+                Text_Price.text = $"￥{(count * _shopItemConfig.price).ToString()}";
+
+                ImageCurrency.gameObject.SetActive(false);
+            }
+            else if (_shopItemConfig.costItemId == 0)
+            {
+                Text_Price.text = "免费";
+            }
+            else
+            {
+                Text_Price.text = $"{(count * _shopItemConfig.price).ToString()}";
+                ImageCurrency.gameObject.SetActive(true);
+            }
+
+            // Text_Price.text = $"{(count * _shopItemConfig.price).ToString()}";
         }
 
         public async override CTask Close()

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

@@ -32,28 +32,28 @@ namespace Fort23.Mono
         {
             Btn_Buy.onClick.AddListener(async () =>
             {
-                //人名币和看广告一个一个购买
-                if (_shopItemConfig.costItemId == 1031 || _shopItemConfig.costItemId == 1032)
-                {
-                    if (_shopItemConfig.buyCount != -1 && _shopItem.buyCount >= _shopItemConfig.buyCount)
-                    {
-                        TipMessagePanel.OpenTipMessagePanel(811, Vector2.zero);
-                        return;
-                    }
-
-                    List<ItemInfo> itemInfos = await ShopManger.Instance.BuyItem(_shopItemConfig.ID, 1);
-                    if (itemInfos != null)
-                    {
-                        RewardsPanel.OpenPanel(itemInfos);
-                    }
-                    else
-                    {
-                        TipMessagePanel.OpenTipMessagePanel(833, Vector2.zero);
-                    }
-
-                    CustomInit(_shopItem);
-                }
-                else
+                // //人名币和看广告一个一个购买
+                // if (_shopItemConfig.costItemId == 9999 || _shopItemConfig.costItemId == 1032)
+                // {
+                //     if (_shopItemConfig.buyCount != -1 && _shopItem.buyCount >= _shopItemConfig.buyCount)
+                //     {
+                //         TipMessagePanel.OpenTipMessagePanel(10366, Vector2.zero);
+                //         return;
+                //     }
+                //
+                //     List<ItemInfo> itemInfos = await ShopManger.Instance.BuyItem(_shopItemConfig.ID, 1);
+                //     if (itemInfos != null)
+                //     {
+                //         RewardsPanel.OpenPanel(itemInfos);
+                //     }
+                //     else
+                //     {
+                //         TipMessagePanel.OpenTipMessagePanel(833, Vector2.zero);
+                //     }
+                //
+                //     CustomInit(_shopItem);
+                // }
+                // else
                 {
                     ShopBuyItemPanel shopBuyItemPanel =
                         await UIManager.Instance.LoadAndOpenPanel<ShopBuyItemPanel>(null, isShowBG: true,
@@ -62,17 +62,22 @@ namespace Fort23.Mono
                     {
                         if (b)
                         {
-                            if (_shopItemConfig.price != 0 &&
-                                !PlayerManager.Instance.BagController.IsEnough(_shopItemConfig.costItemId,
-                                    _shopItemConfig.price * count))
+                            if (_shopItemConfig.costItemId != 9999)
                             {
-                                TipMessagePanel.OpenTipMessagePanel(829, Vector2.zero);
-                                return;
+                                if (_shopItemConfig.price != 0 &&
+                                    !PlayerManager.Instance.BagController.IsEnough(_shopItemConfig.costItemId,
+                                        _shopItemConfig.price * count))
+                                {
+                                    ItemSourcePanel.OpenPanel(_shopItemConfig.costItemId);
+                                    // TipMessagePanel.OpenTipMessagePanel(829, Vector2.zero);
+                                    return;
+                                }
                             }
 
+
                             if (_shopItemConfig.buyCount != -1 && _shopItem.buyCount >= _shopItemConfig.buyCount)
                             {
-                                TipMessagePanel.OpenTipMessagePanel(811, Vector2.zero);
+                                TipMessagePanel.OpenTipMessagePanel(10366, Vector2.zero);
                                 return;
                             }
 
@@ -126,7 +131,7 @@ namespace Fort23.Mono
                 Text_Free.gameObject.SetActive(true);
             }
             //人名币
-            else if (_shopItemConfig.costItemId == 1031)
+            else if (_shopItemConfig.costItemId == 9999)
             {
                 // Icon_adsImage.gameObject.SetActive(false);
                 Csc.ChangeState(2);
@@ -231,7 +236,7 @@ namespace Fort23.Mono
             {
                 Icon_Skill.gameObject.SetActive(false);
                 Icon_Item.icon_name = "icon_shenshitishengfu";
-                Icon_Item2.icon_name =_itemConfig.icon;
+                Icon_Item2.icon_name = _itemConfig.icon;
                 Icon_Item2.gameObject.SetActive(true);
             }
             else