diff --git a/bin/json/game_bukashiai.json b/bin/json/game_bukashiai.json
index 4bc6bb78f..80c2ad0a8 100644
--- a/bin/json/game_bukashiai.json
+++ b/bin/json/game_bukashiai.json
@@ -5,8 +5,8 @@
     "QualifyingType": 1,
     "BehaviorCD": 3,
     "BumpWeight": 50,
-    "BumpCD": 4,
-    "BumpFailWeight": 60,
+    "BumpCD": 1,
+    "BumpFailWeight": 200,
     "BumpSuccessWeight": [
       20,
       30,
@@ -14,6 +14,10 @@
       50,
       60
     ],
+    "BumpDodgeWeight": 80,
+    "GoldEmptyWeight": 40,
+    "GoldWeight": 10,
+    "GoldComboMax": 15,
     "HpBumpWeight": 100,
     "HpBumpCD": 35,
     "HpBumpFailWeight": 50,
@@ -34,7 +38,7 @@
     "QualifyingType": 2,
     "BehaviorCD": 3,
     "BumpWeight": 50,
-    "BumpCD": 4,
+    "BumpCD": 1,
     "BumpFailWeight": 50,
     "BumpSuccessWeight": [
       20,
@@ -43,6 +47,10 @@
       50,
       60
     ],
+    "BumpDodgeWeight": 70,
+    "GoldEmptyWeight": 40,
+    "GoldWeight": 8,
+    "GoldComboMax": 20,
     "HpBumpWeight": 100,
     "HpBumpCD": 35,
     "HpBumpFailWeight": 50,
@@ -63,7 +71,7 @@
     "QualifyingType": 3,
     "BehaviorCD": 3,
     "BumpWeight": 50,
-    "BumpCD": 4,
+    "BumpCD": 1,
     "BumpFailWeight": 40,
     "BumpSuccessWeight": [
       20,
@@ -72,6 +80,10 @@
       50,
       60
     ],
+    "BumpDodgeWeight": 60,
+    "GoldEmptyWeight": 40,
+    "GoldWeight": 6,
+    "GoldComboMax": 40,
     "HpBumpWeight": 100,
     "HpBumpCD": 35,
     "HpBumpFailWeight": 50,
@@ -92,7 +104,7 @@
     "QualifyingType": 4,
     "BehaviorCD": 2,
     "BumpWeight": 50,
-    "BumpCD": 4,
+    "BumpCD": 1,
     "BumpFailWeight": 30,
     "BumpSuccessWeight": [
       20,
@@ -101,6 +113,10 @@
       50,
       60
     ],
+    "BumpDodgeWeight": 50,
+    "GoldEmptyWeight": 40,
+    "GoldWeight": 5,
+    "GoldComboMax": 50,
     "HpBumpWeight": 100,
     "HpBumpCD": 35,
     "HpBumpFailWeight": 50,
@@ -121,7 +137,7 @@
     "QualifyingType": 5,
     "BehaviorCD": 2,
     "BumpWeight": 50,
-    "BumpCD": 4,
+    "BumpCD": 1,
     "BumpFailWeight": 20,
     "BumpSuccessWeight": [
       20,
@@ -130,6 +146,10 @@
       50,
       60
     ],
+    "BumpDodgeWeight": 50,
+    "GoldEmptyWeight": 40,
+    "GoldWeight": 5,
+    "GoldComboMax": 60,
     "HpBumpWeight": 100,
     "HpBumpCD": 35,
     "HpBumpFailWeight": 50,
@@ -150,7 +170,7 @@
     "QualifyingType": 6,
     "BehaviorCD": 2,
     "BumpWeight": 50,
-    "BumpCD": 4,
+    "BumpCD": 1,
     "BumpFailWeight": 20,
     "BumpSuccessWeight": [
       20,
@@ -159,6 +179,10 @@
       50,
       60
     ],
+    "BumpDodgeWeight": 50,
+    "GoldEmptyWeight": 40,
+    "GoldWeight": 5,
+    "GoldComboMax": 1000,
     "HpBumpWeight": 100,
     "HpBumpCD": 35,
     "HpBumpFailWeight": 50,
@@ -179,7 +203,7 @@
     "QualifyingType": 7,
     "BehaviorCD": 2,
     "BumpWeight": 50,
-    "BumpCD": 4,
+    "BumpCD": 1,
     "BumpFailWeight": 20,
     "BumpSuccessWeight": [
       20,
@@ -188,6 +212,10 @@
       50,
       60
     ],
+    "BumpDodgeWeight": 50,
+    "GoldEmptyWeight": 40,
+    "GoldWeight": 5,
+    "GoldComboMax": 1000,
     "HpBumpWeight": 100,
     "HpBumpCD": 35,
     "HpBumpFailWeight": 50,
@@ -208,7 +236,7 @@
     "QualifyingType": 8,
     "BehaviorCD": 2,
     "BumpWeight": 50,
-    "BumpCD": 4,
+    "BumpCD": 1,
     "BumpFailWeight": 20,
     "BumpSuccessWeight": [
       20,
@@ -217,6 +245,10 @@
       50,
       60
     ],
+    "BumpDodgeWeight": 50,
+    "GoldEmptyWeight": 40,
+    "GoldWeight": 5,
+    "GoldComboMax": 1000,
     "HpBumpWeight": 100,
     "HpBumpCD": 35,
     "HpBumpFailWeight": 50,
@@ -237,7 +269,7 @@
     "QualifyingType": 1,
     "BehaviorCD": 3,
     "BumpWeight": 50,
-    "BumpCD": 4,
+    "BumpCD": 1,
     "BumpFailWeight": 60,
     "BumpSuccessWeight": [
       20,
@@ -246,6 +278,10 @@
       50,
       60
     ],
+    "BumpDodgeWeight": 80,
+    "GoldEmptyWeight": 40,
+    "GoldWeight": 10,
+    "GoldComboMax": 15,
     "HpBumpWeight": 100,
     "HpBumpCD": 35,
     "HpBumpFailWeight": 50,
@@ -266,7 +302,7 @@
     "QualifyingType": 2,
     "BehaviorCD": 3,
     "BumpWeight": 50,
-    "BumpCD": 4,
+    "BumpCD": 1,
     "BumpFailWeight": 50,
     "BumpSuccessWeight": [
       20,
@@ -275,6 +311,10 @@
       50,
       60
     ],
+    "BumpDodgeWeight": 70,
+    "GoldEmptyWeight": 40,
+    "GoldWeight": 8,
+    "GoldComboMax": 20,
     "HpBumpWeight": 100,
     "HpBumpCD": 35,
     "HpBumpFailWeight": 50,
@@ -295,7 +335,7 @@
     "QualifyingType": 3,
     "BehaviorCD": 3,
     "BumpWeight": 50,
-    "BumpCD": 4,
+    "BumpCD": 1,
     "BumpFailWeight": 40,
     "BumpSuccessWeight": [
       20,
@@ -304,6 +344,10 @@
       50,
       60
     ],
+    "BumpDodgeWeight": 60,
+    "GoldEmptyWeight": 40,
+    "GoldWeight": 6,
+    "GoldComboMax": 40,
     "HpBumpWeight": 100,
     "HpBumpCD": 35,
     "HpBumpFailWeight": 50,
@@ -324,7 +368,7 @@
     "QualifyingType": 4,
     "BehaviorCD": 2,
     "BumpWeight": 50,
-    "BumpCD": 4,
+    "BumpCD": 1,
     "BumpFailWeight": 30,
     "BumpSuccessWeight": [
       20,
@@ -333,6 +377,10 @@
       50,
       60
     ],
+    "BumpDodgeWeight": 50,
+    "GoldEmptyWeight": 40,
+    "GoldWeight": 5,
+    "GoldComboMax": 50,
     "HpBumpWeight": 100,
     "HpBumpCD": 35,
     "HpBumpFailWeight": 50,
@@ -353,7 +401,7 @@
     "QualifyingType": 5,
     "BehaviorCD": 2,
     "BumpWeight": 50,
-    "BumpCD": 4,
+    "BumpCD": 1,
     "BumpFailWeight": 20,
     "BumpSuccessWeight": [
       20,
@@ -362,6 +410,10 @@
       50,
       60
     ],
+    "BumpDodgeWeight": 50,
+    "GoldEmptyWeight": 40,
+    "GoldWeight": 5,
+    "GoldComboMax": 60,
     "HpBumpWeight": 100,
     "HpBumpCD": 35,
     "HpBumpFailWeight": 50,
@@ -382,7 +434,7 @@
     "QualifyingType": 6,
     "BehaviorCD": 2,
     "BumpWeight": 50,
-    "BumpCD": 4,
+    "BumpCD": 1,
     "BumpFailWeight": 20,
     "BumpSuccessWeight": [
       20,
@@ -391,6 +443,10 @@
       50,
       60
     ],
+    "BumpDodgeWeight": 50,
+    "GoldEmptyWeight": 40,
+    "GoldWeight": 5,
+    "GoldComboMax": 1000,
     "HpBumpWeight": 100,
     "HpBumpCD": 35,
     "HpBumpFailWeight": 50,
@@ -411,7 +467,7 @@
     "QualifyingType": 7,
     "BehaviorCD": 2,
     "BumpWeight": 50,
-    "BumpCD": 4,
+    "BumpCD": 1,
     "BumpFailWeight": 20,
     "BumpSuccessWeight": [
       20,
@@ -420,6 +476,10 @@
       50,
       60
     ],
+    "BumpDodgeWeight": 50,
+    "GoldEmptyWeight": 40,
+    "GoldWeight": 5,
+    "GoldComboMax": 1000,
     "HpBumpWeight": 100,
     "HpBumpCD": 35,
     "HpBumpFailWeight": 50,
@@ -440,7 +500,7 @@
     "QualifyingType": 8,
     "BehaviorCD": 2,
     "BumpWeight": 50,
-    "BumpCD": 4,
+    "BumpCD": 1,
     "BumpFailWeight": 20,
     "BumpSuccessWeight": [
       20,
@@ -449,6 +509,10 @@
       50,
       60
     ],
+    "BumpDodgeWeight": 50,
+    "GoldEmptyWeight": 40,
+    "GoldWeight": 5,
+    "GoldComboMax": 1000,
     "HpBumpWeight": 100,
     "HpBumpCD": 35,
     "HpBumpFailWeight": 50,
diff --git a/bin/json/game_buriedtype.json b/bin/json/game_buriedtype.json
index 7bb579e4d..4a0c68923 100644
--- a/bin/json/game_buriedtype.json
+++ b/bin/json/game_buriedtype.json
@@ -1484,15 +1484,13 @@
     "id": 254,
     "insert": 1,
     "filter": [
-      "eq"
+      "gte"
     ]
   },
   {
     "id": 255,
     "insert": 2,
-    "filter": [
-      "eq"
-    ]
+    "filter": []
   },
   {
     "id": 256,
diff --git a/bin/json/game_integralbuff.json b/bin/json/game_integralbuff.json
index b2b941891..8bd3fd977 100644
--- a/bin/json/game_integralbuff.json
+++ b/bin/json/game_integralbuff.json
@@ -10,7 +10,7 @@
     ],
     "name": {
       "key": "IntegralBoss_Integralbuff_name_01",
-      "text": "我方增益"
+      "text": "生机勃勃"
     },
     "icon": "ty_icon_buff_sjbb",
     "des": {
@@ -29,7 +29,7 @@
     ],
     "name": {
       "key": "IntegralBoss_Integralbuff_name_02",
-      "text": "我方增益"
+      "text": "月光庇佑"
     },
     "icon": "ty_icon_buff_ygbh",
     "des": {
@@ -48,7 +48,7 @@
     ],
     "name": {
       "key": "IntegralBoss_Integralbuff_name_03",
-      "text": "我方增益"
+      "text": "绝境反击"
     },
     "icon": "ty_icon_buff_jjfj",
     "des": {
@@ -67,7 +67,7 @@
     ],
     "name": {
       "key": "IntegralBoss_Integralbuff_name_04",
-      "text": "敌方增益"
+      "text": "一层噩梦"
     },
     "icon": "ty_icon_buff_ycem",
     "des": {
@@ -86,7 +86,7 @@
     ],
     "name": {
       "key": "IntegralBoss_Integralbuff_name_05",
-      "text": "敌方增益"
+      "text": "二层噩梦"
     },
     "icon": "ty_icon_buff_ecem",
     "des": {
@@ -105,7 +105,7 @@
     ],
     "name": {
       "key": "IntegralBoss_Integralbuff_name_06",
-      "text": "敌方增益"
+      "text": "三层噩梦"
     },
     "icon": "ty_icon_buff_scem",
     "des": {
@@ -124,7 +124,7 @@
     ],
     "name": {
       "key": "IntegralBoss_Integralbuff_name_07",
-      "text": "敌方增益"
+      "text": "一速进"
     },
     "icon": "ty_icon_buff_ysj",
     "des": {
@@ -143,7 +143,7 @@
     ],
     "name": {
       "key": "IntegralBoss_Integralbuff_name_08",
-      "text": "敌方增益"
+      "text": "二速进"
     },
     "icon": "ty_icon_buff_esj",
     "des": {
@@ -162,7 +162,7 @@
     ],
     "name": {
       "key": "IntegralBoss_Integralbuff_name_09",
-      "text": "敌方增益"
+      "text": "三速进"
     },
     "icon": "ty_icon_buff_ssj",
     "des": {
@@ -181,7 +181,7 @@
     ],
     "name": {
       "key": "IntegralBoss_Integralbuff_name_10",
-      "text": "敌方增益"
+      "text": "一次沉沦"
     },
     "icon": "ty_icon_buff_yccl",
     "des": {
@@ -200,7 +200,7 @@
     ],
     "name": {
       "key": "IntegralBoss_Integralbuff_name_11",
-      "text": "敌方增益"
+      "text": "二次沉沦"
     },
     "icon": "ty_icon_buff_eccl",
     "des": {
@@ -219,7 +219,7 @@
     ],
     "name": {
       "key": "IntegralBoss_Integralbuff_name_12",
-      "text": "敌方增益"
+      "text": "三次沉沦"
     },
     "icon": "ty_icon_buff_sccl",
     "des": {
@@ -238,7 +238,7 @@
     ],
     "name": {
       "key": "IntegralBoss_Integralbuff_name_13",
-      "text": "敌方增益"
+      "text": "血涌不止"
     },
     "icon": "ty_icon_buff_xybz",
     "des": {
@@ -257,7 +257,7 @@
     ],
     "name": {
       "key": "IntegralBoss_Integralbuff_name_14",
-      "text": "敌方增益"
+      "text": "败血持续"
     },
     "icon": "ty_icon_buff_bxcx",
     "des": {
@@ -276,7 +276,7 @@
     ],
     "name": {
       "key": "IntegralBoss_Integralbuff_name_15",
-      "text": "敌方增益"
+      "text": "神经衰弱"
     },
     "icon": "ty_icon_buff_sjsr",
     "des": {
@@ -295,7 +295,7 @@
     ],
     "name": {
       "key": "IntegralBoss_Integralbuff_name_16",
-      "text": "敌方增益"
+      "text": "浴血收割"
     },
     "icon": "ty_icon_buff_yxsg",
     "des": {
@@ -314,7 +314,7 @@
     ],
     "name": {
       "key": "IntegralBoss_Integralbuff_name_17",
-      "text": "敌方增益"
+      "text": "梦境主宰"
     },
     "icon": "ty_icon_buff_mjzz",
     "des": {
@@ -333,7 +333,7 @@
     ],
     "name": {
       "key": "IntegralBoss_Integralbuff_name_18",
-      "text": "敌方增益"
+      "text": "时间操纵"
     },
     "icon": "ty_icon_buff_sjcz",
     "des": {
@@ -352,7 +352,7 @@
     ],
     "name": {
       "key": "IntegralBoss_Integralbuff_name_19",
-      "text": "敌方增益"
+      "text": "无尽绝望"
     },
     "icon": "ty_icon_buff_wjjw",
     "des": {
@@ -371,9 +371,9 @@
     ],
     "name": {
       "key": "IntegralBoss_Integralbuff_name_20",
-      "text": "敌方增益"
+      "text": "噩梦索命"
     },
-    "icon": "ty_icon_buff_zmsm",
+    "icon": "ty_icon_buff_emsm",
     "des": {
       "key": "IntegralBoss_Integralbuff_des_20",
       "text": "战斗开始后，我方全体各自失去20%生命"
@@ -390,7 +390,7 @@
     ],
     "name": {
       "key": "IntegralBoss_Integralbuff_name_21",
-      "text": "敌方增益"
+      "text": "狂暴梦魔"
     },
     "icon": "ty_icon_buff_emsm",
     "des": {
@@ -409,7 +409,7 @@
     ],
     "name": {
       "key": "IntegralBoss_Integralbuff_name_22",
-      "text": "敌方增益"
+      "text": "禁锢无效"
     },
     "icon": "ty_icon_buff_jgwx",
     "des": {
diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json
index a253d7b11..d2b1182f0 100644
--- a/bin/json/game_mainstage.json
+++ b/bin/json/game_mainstage.json
@@ -19861,7 +19861,7 @@
     "buried_type": 0,
     "buried": 0,
     "grouptype": [],
-    "Episodetype": 1,
+    "Episodetype": 3,
     "stage_param": 0,
     "inherit": false,
     "battle_fail": false,
@@ -19921,67 +19921,19 @@
       "text": "原来这一切都是果酱教授的诡计，一定不能让他跑了！"
     },
     "exp": 0,
-    "hero_exp": 400,
-    "ps_consume": [
-      {
-        "a": "attr",
-        "t": "ps",
-        "n": 9
-      }
-    ],
-    "ps_mg": [
-      {
-        "a": "attr",
-        "t": "ps",
-        "n": 1
-      }
-    ],
-    "firstaward": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 8000
-      },
-      {
-        "a": "equi",
-        "t": "11615",
-        "n": 1
-      }
-    ],
-    "lotteryward": 17111610,
-    "commonaward": [
-      {
-        "a": "attr",
-        "t": "gold",
-        "n": 8000
-      },
-      {
-        "a": "equi",
-        "t": "11625",
-        "n": 1
-      }
-    ],
-    "BattleReadyID": 10106002,
-    "FormatList": [
-      103071
-    ],
+    "hero_exp": 0,
+    "ps_consume": [],
+    "ps_mg": [],
+    "firstaward": [],
+    "lotteryward": 0,
+    "commonaward": [],
+    "BattleReadyID": 0,
+    "FormatList": [],
     "helphero": [],
     "banhero": [],
-    "star": [
-      1,
-      1,
-      1
-    ],
-    "star_type": [
-      1,
-      2,
-      2
-    ],
-    "star_value": [
-      0,
-      2,
-      1
-    ],
+    "star": [],
+    "star_type": [],
+    "star_value": [],
     "challengeward": 0
   },
   {
@@ -19999,16 +19951,19 @@
     "stage_param": 0,
     "inherit": false,
     "battle_fail": false,
-    "venturemodelspeed": 0,
-    "venturemodelscale": 0,
+    "venturemodelspeed": 12,
+    "venturemodelscale": 1,
     "move_type": 0,
-    "venturemodel": "",
+    "venturemodel": "Person/badcar/badcar.prefab",
     "bubbletalk": {
       "key": "",
       "text": ""
     },
-    "venturetype": 0,
-    "ventureavatar": [],
+    "venturetype": 2,
+    "ventureavatar": [
+      "player",
+      "sbkp_js_25002"
+    ],
     "scene_effect": [
       "shandian"
     ],
@@ -20017,7 +19972,7 @@
     "openlevel": 1,
     "EditorStage": 0,
     "herocolor": 1,
-    "heroimg": "",
+    "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
       "key": "main_stage_bubbletext_177",
       "text": "嘁嘁——嘁——"
@@ -20130,16 +20085,19 @@
     "stage_param": 0,
     "inherit": false,
     "battle_fail": false,
-    "venturemodelspeed": 0,
-    "venturemodelscale": 0,
+    "venturemodelspeed": 12,
+    "venturemodelscale": 1,
     "move_type": 0,
-    "venturemodel": "",
+    "venturemodel": "Person/badcar/badcar.prefab",
     "bubbletalk": {
       "key": "",
       "text": ""
     },
-    "venturetype": 0,
-    "ventureavatar": [],
+    "venturetype": 2,
+    "ventureavatar": [
+      "player",
+      "sbkp_js_25002"
+    ],
     "scene_effect": [
       "shandian"
     ],
@@ -20148,7 +20106,7 @@
     "openlevel": 1,
     "EditorStage": 0,
     "herocolor": 1,
-    "heroimg": "",
+    "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
       "key": "main_stage_bubbletext_177",
       "text": "嘁嘁——嘁——"
@@ -20261,16 +20219,19 @@
     "stage_param": 0,
     "inherit": false,
     "battle_fail": false,
-    "venturemodelspeed": 0,
-    "venturemodelscale": 0,
+    "venturemodelspeed": 12,
+    "venturemodelscale": 1,
     "move_type": 0,
-    "venturemodel": "",
+    "venturemodel": "Person/badcar/badcar.prefab",
     "bubbletalk": {
       "key": "",
       "text": ""
     },
-    "venturetype": 0,
-    "ventureavatar": [],
+    "venturetype": 2,
+    "ventureavatar": [
+      "player",
+      "sbkp_js_25002"
+    ],
     "scene_effect": [
       "shandian"
     ],
@@ -20279,7 +20240,7 @@
     "openlevel": 1,
     "EditorStage": 0,
     "herocolor": 1,
-    "heroimg": "",
+    "heroimg": "zxgq_qp_icon_zd",
     "bubbletext": {
       "key": "main_stage_bubbletext_177",
       "text": "嘁嘁——嘁——"
@@ -20394,8 +20355,8 @@
     "stage_param": 0,
     "inherit": false,
     "battle_fail": false,
-    "venturemodelspeed": 12,
-    "venturemodelscale": 4,
+    "venturemodelspeed": 0,
+    "venturemodelscale": 0,
     "move_type": 0,
     "venturemodel": "",
     "bubbletalk": {
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index 8dbf8bd72..0d3fef6ff 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -30170,7 +30170,7 @@
     "Type": 2,
     "Argu": [
       455001212,
-      1,
+      -1,
       -1
     ],
     "FollowSK": [],
@@ -30185,7 +30185,7 @@
   {
     "Id": 255001114,
     "EmitPR": 1000,
-    "From": 1,
+    "From": 13,
     "Where": [],
     "Order": "",
     "Limit": 10,
diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json
index 57254da3b..7a27bb783 100644
--- a/bin/json/game_skillatk.json
+++ b/bin/json/game_skillatk.json
@@ -61994,9 +61994,7 @@
         255001113
       ]
     },
-    "passSkill": [
-      255001113
-    ],
+    "passSkill": [],
     "Desc": {
       "key": "skill_skill_atk_Desc_100000003_1",
       "text": "积分boss复活"
diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json
index 84651791c..87e4538c4 100644
--- a/bin/json/game_skillpassive.json
+++ b/bin/json/game_skillpassive.json
@@ -4151,8 +4151,8 @@
       "text": ""
     },
     "icon": "",
-    "When": 15,
-    "FromCheck": "Target=2",
+    "When": 21,
+    "FromCheck": "",
     "TargetCheck": "",
     "MainSkillCheck": "",
     "AfterSkillCheck": "",
@@ -4167,7 +4167,7 @@
     "Type": "CallSkillPas",
     "MaxEmitTimesInRoundByRole": 0,
     "MaxEmitTimes": 0,
-    "MaxEmitTimesInRound": 2,
+    "MaxEmitTimesInRound": 1,
     "Callback": [
       255001114
     ]
diff --git a/bin/json/game_vikingbossskill.json b/bin/json/game_vikingbossskill.json
index af43de7dd..2e5be2950 100644
--- a/bin/json/game_vikingbossskill.json
+++ b/bin/json/game_vikingbossskill.json
@@ -104,7 +104,7 @@
     "copytype": 4,
     "name": {
       "key": "vikingexpedition_bossskill_name_6",
-      "text": "梦境回廊"
+      "text": "塔岗监狱"
     },
     "back_png": "xmwg_jyfb_boss1",
     "introduce": {
diff --git a/modules/integral/api_challengeover.go b/modules/integral/api_challengeover.go
index bcc192b50..f04f57d20 100644
--- a/modules/integral/api_challengeover.go
+++ b/modules/integral/api_challengeover.go
@@ -183,7 +183,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.IntegralCh
 	var tasks []*pb.BuriedParam
 	tasks = append(tasks, comm.GetBuriedParam(comm.Rtype254, 1, req.Nandu))
 	tasks = append(tasks, comm.GetBuriedParam(comm.Rtype255, 1))
-	tasks = append(tasks, comm.GetBuriedParam(comm.Rtype256, req.Nandu, req.Report.Grade))
+	tasks = append(tasks, comm.GetBuriedParam(comm.Rtype256, req.Report.Grade))
 
 	var skillgroup int32
 	// 异化埋点数据校验
diff --git a/modules/integral/comp_configure.go b/modules/integral/comp_configure.go
index 631cfcb03..f87b776cd 100644
--- a/modules/integral/comp_configure.go
+++ b/modules/integral/comp_configure.go
@@ -270,3 +270,21 @@ func (this *configureComp) GetIntegralBUffSkillGroup() (sz []int32, err error) {
 	err = comm.NewNotFoundConfErr(string(this.module.GetType()), game_integralbuffgroup, "")
 	return
 }
+func (this *configureComp) GetIntegralAchieveAllTask() (task []int32) {
+
+	if v, err := this.GetConfigure(game_integralachieve); err == nil {
+		if configure, ok := v.(*cfg.GameIntegralAchieve); ok {
+			for _, v := range configure.GetDataList() {
+				task = append(task, v.Taskid)
+			}
+		}
+	}
+	if v, err := this.GetConfigure(game_integralcondition); err == nil {
+		if configure, ok := v.(*cfg.GameIntegralCondition); ok {
+			for _, v := range configure.GetDataList() {
+				task = append(task, v.TaskId)
+			}
+		}
+	}
+	return
+}
diff --git a/modules/integral/model_integral.go b/modules/integral/model_integral.go
index bd99936cf..f6e19bf9c 100644
--- a/modules/integral/model_integral.go
+++ b/modules/integral/model_integral.go
@@ -108,6 +108,12 @@ func (this *modelIntegral) getIntegralList(session comm.IUserSession) (result *p
 		}
 
 		err = this.Add(uid, result) //  入库
+		var condIds []int32
+		condIds = this.module.configure.GetIntegralAchieveAllTask()
+		// 激活所有任务
+		if len(condIds) > 0 {
+			this.module.ModuleBuried.ActiveCondition(session, condIds...)
+		}
 		return
 	}
 	return result, err
diff --git a/sys/configure/structs/Game.BukashiAiData.go b/sys/configure/structs/Game.BukashiAiData.go
index f4e8b34b3..81f82b236 100644
--- a/sys/configure/structs/Game.BukashiAiData.go
+++ b/sys/configure/structs/Game.BukashiAiData.go
@@ -19,6 +19,10 @@ type GameBukashiAiData struct {
     BumpCD int32
     BumpFailWeight int32
     BumpSuccessWeight []int32
+    BumpDodgeWeight int32
+    GoldEmptyWeight int32
+    GoldWeight int32
+    GoldComboMax int32
     HpBumpWeight int32
     HpBumpCD int32
     HpBumpFailWeight int32
@@ -58,6 +62,10 @@ func (_v *GameBukashiAiData)Deserialize(_buf map[string]interface{}) (err error)
                 }
             }
 
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BumpDodgeWeight"].(float64); !_ok_ { err = errors.New("BumpDodgeWeight error"); return }; _v.BumpDodgeWeight = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["GoldEmptyWeight"].(float64); !_ok_ { err = errors.New("GoldEmptyWeight error"); return }; _v.GoldEmptyWeight = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["GoldWeight"].(float64); !_ok_ { err = errors.New("GoldWeight error"); return }; _v.GoldWeight = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["GoldComboMax"].(float64); !_ok_ { err = errors.New("GoldComboMax error"); return }; _v.GoldComboMax = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["HpBumpWeight"].(float64); !_ok_ { err = errors.New("HpBumpWeight error"); return }; _v.HpBumpWeight = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["HpBumpCD"].(float64); !_ok_ { err = errors.New("HpBumpCD error"); return }; _v.HpBumpCD = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["HpBumpFailWeight"].(float64); !_ok_ { err = errors.New("HpBumpFailWeight error"); return }; _v.HpBumpFailWeight = int32(_tempNum_) }