上传代码

bin/json/game_buriedtype.json

@@ -1456,16 +1456,16 @@
     "id": 250,
     "insert": 1,
     "filter": [
-      "lte",
+      "eq",
-      "gte"
+      "lte"
     ]
   },
   {
     "id": 251,
     "insert": 1,
     "filter": [
-      "lte",
+      "eq",
-      "gte"
+      "lte"
     ]
   }
 ]

bin/json/game_consumetxt.json

@@ -7,8 +7,10 @@
     },
     "txt": {
       "key": "consume_consume_txt_txt_01",
-      "text": "2"
+      "text": "200%"
-    }
+    },
+    "winningstreak": 3,
+    "rewarddata": 2000
   },
   {
     "id": 2,
@@ -18,8 +20,10 @@
     },
     "txt": {
       "key": "consume_consume_txt_txt_02",
-      "text": "2.5"
+      "text": "250%"
-    }
+    },
+    "winningstreak": 5,
+    "rewarddata": 2500
   },
   {
     "id": 3,
@@ -29,8 +33,10 @@
     },
     "txt": {
       "key": "consume_consume_txt_txt_03",
-      "text": "3"
+      "text": "300%"
-    }
+    },
+    "winningstreak": 8,
+    "rewarddata": 3000
   },
   {
     "id": 4,
@@ -40,8 +46,10 @@
     },
     "txt": {
       "key": "consume_consume_txt_txt_04",
-      "text": "3.5"
+      "text": "350%"
-    }
+    },
+    "winningstreak": 10,
+    "rewarddata": 3500
   },
   {
     "id": 5,
@@ -51,7 +59,9 @@
     },
     "txt": {
       "key": "consume_consume_txt_txt_05",
-      "text": "5"
+      "text": "500%"
-    }
+    },
+    "winningstreak": 20,
+    "rewarddata": 5000
   }
 ]

bin/json/game_equippos.json

@@ -138,5 +138,23 @@
       71,
       74
     ]
+  },
+  {
+    "pos": 7,
+    "suitnum": 2,
+    "leadlibrary": [
+      56,
+      59,
+      53,
+      57,
+      60,
+      54,
+      62,
+      65,
+      68,
+      71,
+      74
+    ],
+    "addlibrary": []
   }
 ]

bin/json/game_global.json

@@ -785,6 +785,8 @@
     },
     "td_dailystage_challenge_num": 2,
     "td_dailystage_challenge_num_max": 2,
-    "guild_sign_in": 10
+    "guild_sign_in": 10,
+    "enhanceboss_ps": 10,
+    "enhanceboss_heromax": 6
   }
 ]

bin/json/game_herolevelgrow.json

@@ -4244,5 +4244,71 @@
     "atkgrow": 1300,
     "defgrow": 1250,
     "speedgrow": 0
+  },
+  {
+    "id": "85001",
+    "hp": 0,
+    "atk": 0,
+    "def": 0,
+    "speed": 70,
+    "cri": 100,
+    "cridam": 1500,
+    "effhit": 0,
+    "effre": 200,
+    "losthold": 0,
+    "understand": 0,
+    "damre": 0,
+    "causedam": 0,
+    "treadd": 0,
+    "betreadd": 0,
+    "suckblood": 0,
+    "hpgrow": 1500,
+    "atkgrow": 2000,
+    "defgrow": 1100,
+    "speedgrow": 0
+  },
+  {
+    "id": "85002",
+    "hp": 0,
+    "atk": 0,
+    "def": 0,
+    "speed": 90,
+    "cri": 100,
+    "cridam": 1500,
+    "effhit": 0,
+    "effre": 200,
+    "losthold": 0,
+    "understand": 0,
+    "damre": 0,
+    "causedam": 0,
+    "treadd": 0,
+    "betreadd": 0,
+    "suckblood": 0,
+    "hpgrow": 1500,
+    "atkgrow": 2000,
+    "defgrow": 1100,
+    "speedgrow": 0
+  },
+  {
+    "id": "85003",
+    "hp": 0,
+    "atk": 0,
+    "def": 0,
+    "speed": 95,
+    "cri": 100,
+    "cridam": 1500,
+    "effhit": 0,
+    "effre": 200,
+    "losthold": 0,
+    "understand": 0,
+    "damre": 0,
+    "causedam": 0,
+    "treadd": 0,
+    "betreadd": 0,
+    "suckblood": 0,
+    "hpgrow": 1500,
+    "atkgrow": 2000,
+    "defgrow": 1100,
+    "speedgrow": 0
   }
 ]

bin/json/game_huntingboss.json

@@ -8,7 +8,9 @@
     },
     "difficulty": 1,
     "sweepId": 7,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000049
+    ],
     "BattleReadyID": 10400001,
     "firstprize": [
       {
@@ -66,7 +68,9 @@
     },
     "difficulty": 2,
     "sweepId": 7,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000050
+    ],
     "BattleReadyID": 10400001,
     "firstprize": [
       {
@@ -124,7 +128,9 @@
     },
     "difficulty": 3,
     "sweepId": 7,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000051
+    ],
     "BattleReadyID": 10400001,
     "firstprize": [
       {
@@ -187,7 +193,9 @@
     },
     "difficulty": 4,
     "sweepId": 7,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000052
+    ],
     "BattleReadyID": 10400001,
     "firstprize": [
       {
@@ -250,7 +258,9 @@
     },
     "difficulty": 5,
     "sweepId": 8,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000053
+    ],
     "BattleReadyID": 10400001,
     "firstprize": [
       {
@@ -313,7 +323,9 @@
     },
     "difficulty": 6,
     "sweepId": 8,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000054
+    ],
     "BattleReadyID": 10400001,
     "firstprize": [
       {
@@ -376,7 +388,9 @@
     },
     "difficulty": 7,
     "sweepId": 8,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000055
+    ],
     "BattleReadyID": 10400001,
     "firstprize": [
       {
@@ -444,7 +458,9 @@
     },
     "difficulty": 8,
     "sweepId": 8,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000056
+    ],
     "BattleReadyID": 10400001,
     "firstprize": [
       {
@@ -512,7 +528,9 @@
     },
     "difficulty": 9,
     "sweepId": 9,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000057
+    ],
     "BattleReadyID": 10400001,
     "firstprize": [
       {
@@ -580,7 +598,9 @@
     },
     "difficulty": 10,
     "sweepId": 9,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000058
+    ],
     "BattleReadyID": 10400001,
     "firstprize": [
       {
@@ -648,7 +668,9 @@
     },
     "difficulty": 11,
     "sweepId": 9,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000059
+    ],
     "BattleReadyID": 10400001,
     "firstprize": [
       {
@@ -716,7 +738,9 @@
     },
     "difficulty": 12,
     "sweepId": 9,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000060
+    ],
     "BattleReadyID": 10400001,
     "firstprize": [
       {
@@ -784,7 +808,9 @@
     },
     "difficulty": 1,
     "sweepId": 7,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000061
+    ],
     "BattleReadyID": 10400002,
     "firstprize": [
       {
@@ -842,7 +868,9 @@
     },
     "difficulty": 2,
     "sweepId": 7,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000062
+    ],
     "BattleReadyID": 10400002,
     "firstprize": [
       {
@@ -900,7 +928,9 @@
     },
     "difficulty": 3,
     "sweepId": 7,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000063
+    ],
     "BattleReadyID": 10400002,
     "firstprize": [
       {
@@ -963,7 +993,9 @@
     },
     "difficulty": 4,
     "sweepId": 7,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000064
+    ],
     "BattleReadyID": 10400002,
     "firstprize": [
       {
@@ -1026,7 +1058,9 @@
     },
     "difficulty": 5,
     "sweepId": 8,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000065
+    ],
     "BattleReadyID": 10400002,
     "firstprize": [
       {
@@ -1089,7 +1123,9 @@
     },
     "difficulty": 6,
     "sweepId": 8,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000066
+    ],
     "BattleReadyID": 10400002,
     "firstprize": [
       {
@@ -1152,7 +1188,9 @@
     },
     "difficulty": 7,
     "sweepId": 8,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000067
+    ],
     "BattleReadyID": 10400002,
     "firstprize": [
       {
@@ -1220,7 +1258,9 @@
     },
     "difficulty": 8,
     "sweepId": 8,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000068
+    ],
     "BattleReadyID": 10400002,
     "firstprize": [
       {
@@ -1288,7 +1328,9 @@
     },
     "difficulty": 9,
     "sweepId": 9,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000069
+    ],
     "BattleReadyID": 10400002,
     "firstprize": [
       {
@@ -1356,7 +1398,9 @@
     },
     "difficulty": 10,
     "sweepId": 9,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000070
+    ],
     "BattleReadyID": 10400002,
     "firstprize": [
       {
@@ -1424,7 +1468,9 @@
     },
     "difficulty": 11,
     "sweepId": 9,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000071
+    ],
     "BattleReadyID": 10400002,
     "firstprize": [
       {
@@ -1492,7 +1538,9 @@
     },
     "difficulty": 12,
     "sweepId": 9,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000072
+    ],
     "BattleReadyID": 10400002,
     "firstprize": [
       {
@@ -1560,7 +1608,9 @@
     },
     "difficulty": 1,
     "sweepId": 7,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000073
+    ],
     "BattleReadyID": 10400003,
     "firstprize": [
       {
@@ -1618,7 +1668,9 @@
     },
     "difficulty": 2,
     "sweepId": 7,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000074
+    ],
     "BattleReadyID": 10400003,
     "firstprize": [
       {
@@ -1676,7 +1728,9 @@
     },
     "difficulty": 3,
     "sweepId": 7,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000075
+    ],
     "BattleReadyID": 10400003,
     "firstprize": [
       {
@@ -1739,7 +1793,9 @@
     },
     "difficulty": 4,
     "sweepId": 7,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000076
+    ],
     "BattleReadyID": 10400003,
     "firstprize": [
       {
@@ -1802,7 +1858,9 @@
     },
     "difficulty": 5,
     "sweepId": 8,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000077
+    ],
     "BattleReadyID": 10400003,
     "firstprize": [
       {
@@ -1865,7 +1923,9 @@
     },
     "difficulty": 6,
     "sweepId": 8,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000078
+    ],
     "BattleReadyID": 10400003,
     "firstprize": [
       {
@@ -1928,7 +1988,9 @@
     },
     "difficulty": 7,
     "sweepId": 8,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000079
+    ],
     "BattleReadyID": 10400003,
     "firstprize": [
       {
@@ -1996,7 +2058,9 @@
     },
     "difficulty": 8,
     "sweepId": 8,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000080
+    ],
     "BattleReadyID": 10400003,
     "firstprize": [
       {
@@ -2064,7 +2128,9 @@
     },
     "difficulty": 9,
     "sweepId": 9,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000081
+    ],
     "BattleReadyID": 10400003,
     "firstprize": [
       {
@@ -2132,7 +2198,9 @@
     },
     "difficulty": 10,
     "sweepId": 9,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000082
+    ],
     "BattleReadyID": 10400003,
     "firstprize": [
       {
@@ -2200,7 +2268,9 @@
     },
     "difficulty": 11,
     "sweepId": 9,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000083
+    ],
     "BattleReadyID": 10400003,
     "firstprize": [
       {
@@ -2268,7 +2338,9 @@
     },
     "difficulty": 12,
     "sweepId": 9,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000084
+    ],
     "BattleReadyID": 10400003,
     "firstprize": [
       {
@@ -2336,7 +2408,9 @@
     },
     "difficulty": 1,
     "sweepId": 7,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000085
+    ],
     "BattleReadyID": 10400004,
     "firstprize": [
       {
@@ -2394,7 +2468,9 @@
     },
     "difficulty": 2,
     "sweepId": 7,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000086
+    ],
     "BattleReadyID": 10400004,
     "firstprize": [
       {
@@ -2452,7 +2528,9 @@
     },
     "difficulty": 3,
     "sweepId": 7,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000087
+    ],
     "BattleReadyID": 10400004,
     "firstprize": [
       {
@@ -2515,7 +2593,9 @@
     },
     "difficulty": 4,
     "sweepId": 7,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000088
+    ],
     "BattleReadyID": 10400004,
     "firstprize": [
       {
@@ -2578,7 +2658,9 @@
     },
     "difficulty": 5,
     "sweepId": 8,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000089
+    ],
     "BattleReadyID": 10400004,
     "firstprize": [
       {
@@ -2641,7 +2723,9 @@
     },
     "difficulty": 6,
     "sweepId": 8,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000090
+    ],
     "BattleReadyID": 10400004,
     "firstprize": [
       {
@@ -2704,7 +2788,9 @@
     },
     "difficulty": 7,
     "sweepId": 8,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000091
+    ],
     "BattleReadyID": 10400004,
     "firstprize": [
       {
@@ -2772,7 +2858,9 @@
     },
     "difficulty": 8,
     "sweepId": 8,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000092
+    ],
     "BattleReadyID": 10400004,
     "firstprize": [
       {
@@ -2840,7 +2928,9 @@
     },
     "difficulty": 9,
     "sweepId": 9,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000093
+    ],
     "BattleReadyID": 10400004,
     "firstprize": [
       {
@@ -2908,7 +2998,9 @@
     },
     "difficulty": 10,
     "sweepId": 9,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000094
+    ],
     "BattleReadyID": 10400004,
     "firstprize": [
       {
@@ -2976,7 +3068,9 @@
     },
     "difficulty": 11,
     "sweepId": 9,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000095
+    ],
     "BattleReadyID": 10400004,
     "firstprize": [
       {
@@ -3044,7 +3138,9 @@
     },
     "difficulty": 12,
     "sweepId": 9,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000096
+    ],
     "BattleReadyID": 10400004,
     "firstprize": [
       {

bin/json/game_item.json

@@ -20754,7 +20754,7 @@
     "access": [],
     "use_skip": 0,
     "upper_limit": 0,
-    "img": "item_24012001",
+    "img": "item_28000003",
     "intr": {
       "key": "item_item_intr_28000003",
       "text": "一个酷似螳螂的玩具，不知道有什么作用。"
@@ -20795,7 +20795,7 @@
     "access": [],
     "use_skip": 0,
     "upper_limit": 0,
-    "img": "item_24012002",
+    "img": "item_28000004",
     "intr": {
       "key": "item_item_intr_28000004",
       "text": "一个酷似金猴的玩具，不知道有什么作用。"

bin/json/game_model.json

@@ -7523,5 +7523,110 @@
       "y": 1,
       "z": 1
     }
+  },
+  {
+    "id": "85001",
+    "preson": "85001",
+    "presonshow": "85001_exhibition",
+    "presonstory": "55005_story",
+    "presondraw": "",
+    "height": 30,
+    "weight": 1,
+    "ico": "tx_js_85001",
+    "fight": "tx_js_55005",
+    "img": "sbkp_js_85001",
+    "heroimg": "hbkp_js_85001",
+    "portrait": "zm_img_85001",
+    "bust": "bust_55005",
+    "postxyz": [
+      0,
+      0,
+      0
+    ],
+    "rotation": {
+      "x": 0,
+      "y": 180,
+      "z": 0
+    },
+    "boxPos": {
+      "x": 0,
+      "y": 16,
+      "z": 0
+    },
+    "boxSize": {
+      "x": 28,
+      "y": 20,
+      "z": 1
+    }
+  },
+  {
+    "id": "85002",
+    "preson": "85002",
+    "presonshow": "85002_exhibition",
+    "presonstory": "55006_story",
+    "presondraw": "",
+    "height": 30,
+    "weight": 1,
+    "ico": "tx_js_85002",
+    "fight": "tx_js_55006",
+    "img": "sbkp_js_85002",
+    "heroimg": "hbkp_js_85002",
+    "portrait": "zm_img_85002",
+    "bust": "bust_55006",
+    "postxyz": [
+      0,
+      0,
+      0
+    ],
+    "rotation": {
+      "x": 0,
+      "y": 180,
+      "z": 0
+    },
+    "boxPos": {
+      "x": 0,
+      "y": 16,
+      "z": 0
+    },
+    "boxSize": {
+      "x": 28,
+      "y": 20,
+      "z": 1
+    }
+  },
+  {
+    "id": "85003",
+    "preson": "85003",
+    "presonshow": "85003_exhibition",
+    "presonstory": "55007_story",
+    "presondraw": "",
+    "height": 30,
+    "weight": 1,
+    "ico": "tx_js_85003",
+    "fight": "tx_js_55007",
+    "img": "sbkp_js_85003",
+    "heroimg": "hbkp_js_85003",
+    "portrait": "zm_img_85003",
+    "bust": "bust_55007",
+    "postxyz": [
+      0,
+      0,
+      0
+    ],
+    "rotation": {
+      "x": 0,
+      "y": 180,
+      "z": 0
+    },
+    "boxPos": {
+      "x": 0,
+      "y": 16,
+      "z": 0
+    },
+    "boxSize": {
+      "x": 28,
+      "y": 20,
+      "z": 1
+    }
   }
 ]

bin/json/game_playerskill.json

@@ -14,7 +14,11 @@
     "skilltype": 2,
     "skilltouch": 101,
     "number": 1,
-    "jump": 103
+    "jump": 103,
+    "unlock": {
+      "key": "consume_consume_playerskill_unlock_01",
+      "text": "可以在商店内解锁"
+    }
   },
   {
     "key": "10002",
@@ -31,7 +35,11 @@
     "skilltype": 1,
     "skilltouch": 102,
     "number": 1,
-    "jump": 103
+    "jump": 103,
+    "unlock": {
+      "key": "consume_consume_playerskill_unlock_02",
+      "text": "可以在商店内解锁"
+    }
   },
   {
     "key": "10003",
@@ -48,6 +56,10 @@
     "skilltype": 2,
     "skilltouch": 103,
     "number": 2,
-    "jump": 103
+    "jump": 103,
+    "unlock": {
+      "key": "consume_consume_playerskill_unlock_03",
+      "text": "可以在商店内解锁"
+    }
   }
 ]

bin/json/game_rdtasknpc.json

@@ -9669,7 +9669,7 @@
     "Levelid": 0,
     "datas": [
       "GameMain",
-      "功能入口-狩猎",
+      "功能入口-烹饪",
       "901"
     ],
     "event": [

bin/json/game_skillafteratk.json

@@ -74167,5 +74167,55 @@
     "DpsCondition": "",
     "RevisiCondition": "",
     "RevisiParams": []
+  },
+  {
+    "Id": 285001111,
+    "EmitPR": 1000,
+    "From": 2,
+    "Where": [],
+    "Order": "Leader",
+    "Limit": 1,
+    "ExecuteCnt": 1,
+    "TriggerAnim": "",
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      4000
+    ],
+    "FollowSK": [
+      285001112
+    ],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 285001112,
+    "EmitPR": 1000,
+    "From": 11,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "TriggerAnim": "",
+    "Type": 1,
+    "Argu": [
+      1,
+      4,
+      4000
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
   }
 ]

bin/json/game_skillatk.json

@@ -61076,5 +61076,38 @@
     },
     "buffid": [],
     "map": ""
+  },
+  {
+    "id": 185001111,
+    "level": 1,
+    "MaxLV": 1,
+    "UnavailablePlayTypes": [],
+    "SkillFlag": 3,
+    "EffectFlag": 6,
+    "Priority": 0,
+    "Name": {
+      "key": "skill_skill_atk_Name_185001111",
+      "text": ""
+    },
+    "ico": "jn_85001_1",
+    "CorrectPos": 0,
+    "IsMelee": 0,
+    "act": "",
+    "Type": 1,
+    "CD": 0,
+    "Where": [],
+    "Target": 2,
+    "ChildSkill": {
+      "Id": [
+        285001111
+      ]
+    },
+    "passSkill": [],
+    "Desc": {
+      "key": "skill_skill_atk_Desc_185001111_1",
+      "text": "优先攻击队长目标，对目标造成一次伤害，队长目标防御越低，造成的伤害越高,敌方所有受击目标分摊此次伤害。"
+    },
+    "buffid": [],
+    "map": ""
   }
 ]

bin/json/game_vikingboss.json

@@ -9,7 +9,9 @@
     },
     "difficulty": 1,
     "sweepId": 4,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000001
+    ],
     "BattleReadyID": 10500004,
     "captionrecommend": [
       25001,
@@ -76,7 +78,9 @@
     },
     "difficulty": 2,
     "sweepId": 4,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000002
+    ],
     "BattleReadyID": 10500001,
     "captionrecommend": [
       25001,
@@ -138,7 +142,9 @@
     },
     "difficulty": 3,
     "sweepId": 4,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000003
+    ],
     "BattleReadyID": 10500001,
     "captionrecommend": [
       25001,
@@ -205,7 +211,9 @@
     },
     "difficulty": 4,
     "sweepId": 4,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000004
+    ],
     "BattleReadyID": 10500001,
     "captionrecommend": [
       25001,
@@ -267,7 +275,9 @@
     },
     "difficulty": 5,
     "sweepId": 5,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000005
+    ],
     "BattleReadyID": 10500001,
     "captionrecommend": [
       25001,
@@ -334,7 +344,9 @@
     },
     "difficulty": 6,
     "sweepId": 5,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000006
+    ],
     "BattleReadyID": 10500001,
     "captionrecommend": [
       25001,
@@ -401,7 +413,9 @@
     },
     "difficulty": 7,
     "sweepId": 5,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000007
+    ],
     "BattleReadyID": 10500001,
     "captionrecommend": [
       25001,
@@ -473,7 +487,9 @@
     },
     "difficulty": 8,
     "sweepId": 5,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000008
+    ],
     "BattleReadyID": 10500001,
     "captionrecommend": [
       25001,
@@ -540,7 +556,9 @@
     },
     "difficulty": 9,
     "sweepId": 6,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000009
+    ],
     "BattleReadyID": 10500001,
     "captionrecommend": [
       25001,
@@ -612,7 +630,9 @@
     },
     "difficulty": 10,
     "sweepId": 6,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000010
+    ],
     "BattleReadyID": 10500001,
     "captionrecommend": [
       25001,
@@ -684,7 +704,9 @@
     },
     "difficulty": 11,
     "sweepId": 6,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000011
+    ],
     "BattleReadyID": 10500001,
     "captionrecommend": [
       25001,
@@ -756,7 +778,9 @@
     },
     "difficulty": 12,
     "sweepId": 6,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000012
+    ],
     "BattleReadyID": 10500001,
     "captionrecommend": [
       25001,
@@ -823,7 +847,9 @@
     },
     "difficulty": 1,
     "sweepId": 4,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000013
+    ],
     "BattleReadyID": 10500003,
     "captionrecommend": [
       14007,
@@ -890,7 +916,9 @@
     },
     "difficulty": 2,
     "sweepId": 4,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000014
+    ],
     "BattleReadyID": 10500003,
     "captionrecommend": [
       14007,
@@ -952,7 +980,9 @@
     },
     "difficulty": 3,
     "sweepId": 4,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000015
+    ],
     "BattleReadyID": 10500003,
     "captionrecommend": [
       14007,
@@ -1019,7 +1049,9 @@
     },
     "difficulty": 4,
     "sweepId": 4,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000016
+    ],
     "BattleReadyID": 10500003,
     "captionrecommend": [
       14007,
@@ -1081,7 +1113,9 @@
     },
     "difficulty": 5,
     "sweepId": 5,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000017
+    ],
     "BattleReadyID": 10500003,
     "captionrecommend": [
       14007,
@@ -1148,7 +1182,9 @@
     },
     "difficulty": 6,
     "sweepId": 5,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000018
+    ],
     "BattleReadyID": 10500003,
     "captionrecommend": [
       14007,
@@ -1215,7 +1251,9 @@
     },
     "difficulty": 7,
     "sweepId": 5,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000019
+    ],
     "BattleReadyID": 10500003,
     "captionrecommend": [
       14007,
@@ -1287,7 +1325,9 @@
     },
     "difficulty": 8,
     "sweepId": 5,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000020
+    ],
     "BattleReadyID": 10500003,
     "captionrecommend": [
       14007,
@@ -1354,7 +1394,9 @@
     },
     "difficulty": 9,
     "sweepId": 6,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000021
+    ],
     "BattleReadyID": 10500003,
     "captionrecommend": [
       14007,
@@ -1426,7 +1468,9 @@
     },
     "difficulty": 10,
     "sweepId": 6,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000022
+    ],
     "BattleReadyID": 10500003,
     "captionrecommend": [
       14007,
@@ -1498,7 +1542,9 @@
     },
     "difficulty": 11,
     "sweepId": 6,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000023
+    ],
     "BattleReadyID": 10500003,
     "captionrecommend": [
       14007,
@@ -1570,7 +1616,9 @@
     },
     "difficulty": 12,
     "sweepId": 6,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000024
+    ],
     "BattleReadyID": 10500003,
     "captionrecommend": [
       14007,
@@ -1637,7 +1685,9 @@
     },
     "difficulty": 1,
     "sweepId": 4,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000025
+    ],
     "BattleReadyID": 10500002,
     "captionrecommend": [
       25003,
@@ -1704,7 +1754,9 @@
     },
     "difficulty": 2,
     "sweepId": 4,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000026
+    ],
     "BattleReadyID": 10500002,
     "captionrecommend": [
       25003,
@@ -1766,7 +1818,9 @@
     },
     "difficulty": 3,
     "sweepId": 4,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000027
+    ],
     "BattleReadyID": 10500002,
     "captionrecommend": [
       25003,
@@ -1833,7 +1887,9 @@
     },
     "difficulty": 4,
     "sweepId": 4,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000028
+    ],
     "BattleReadyID": 10500002,
     "captionrecommend": [
       25003,
@@ -1895,7 +1951,9 @@
     },
     "difficulty": 5,
     "sweepId": 5,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000029
+    ],
     "BattleReadyID": 10500002,
     "captionrecommend": [
       25003,
@@ -1962,7 +2020,9 @@
     },
     "difficulty": 6,
     "sweepId": 5,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000030
+    ],
     "BattleReadyID": 10500002,
     "captionrecommend": [
       25003,
@@ -2029,7 +2089,9 @@
     },
     "difficulty": 7,
     "sweepId": 5,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000031
+    ],
     "BattleReadyID": 10500002,
     "captionrecommend": [
       25003,
@@ -2101,7 +2163,9 @@
     },
     "difficulty": 8,
     "sweepId": 5,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000032
+    ],
     "BattleReadyID": 10500002,
     "captionrecommend": [
       25003,
@@ -2168,7 +2232,9 @@
     },
     "difficulty": 9,
     "sweepId": 6,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000033
+    ],
     "BattleReadyID": 10500002,
     "captionrecommend": [
       25003,
@@ -2240,7 +2306,9 @@
     },
     "difficulty": 10,
     "sweepId": 6,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000034
+    ],
     "BattleReadyID": 10500002,
     "captionrecommend": [
       25003,
@@ -2312,7 +2380,9 @@
     },
     "difficulty": 11,
     "sweepId": 6,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000035
+    ],
     "BattleReadyID": 10500002,
     "captionrecommend": [
       25003,
@@ -2384,7 +2454,9 @@
     },
     "difficulty": 12,
     "sweepId": 6,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000036
+    ],
     "BattleReadyID": 10500002,
     "captionrecommend": [
       25003,
@@ -4091,7 +4163,9 @@
     },
     "difficulty": 1,
     "sweepId": 1,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000037
+    ],
     "BattleReadyID": 11904001,
     "captionrecommend": [
       25001,
@@ -4158,7 +4232,9 @@
     },
     "difficulty": 2,
     "sweepId": 1,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000038
+    ],
     "BattleReadyID": 11904001,
     "captionrecommend": [
       25001,
@@ -4225,7 +4301,9 @@
     },
     "difficulty": 3,
     "sweepId": 1,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000039
+    ],
     "BattleReadyID": 11904001,
     "captionrecommend": [
       25001,
@@ -4292,7 +4370,9 @@
     },
     "difficulty": 4,
     "sweepId": 1,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000040
+    ],
     "BattleReadyID": 11904001,
     "captionrecommend": [
       25001,
@@ -4360,7 +4440,9 @@
     },
     "difficulty": 5,
     "sweepId": 2,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000041
+    ],
     "BattleReadyID": 11904001,
     "captionrecommend": [
       25001,
@@ -4428,7 +4510,9 @@
     },
     "difficulty": 6,
     "sweepId": 2,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000042
+    ],
     "BattleReadyID": 11904001,
     "captionrecommend": [
       25001,
@@ -4496,7 +4580,9 @@
     },
     "difficulty": 7,
     "sweepId": 2,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000043
+    ],
     "BattleReadyID": 11904001,
     "captionrecommend": [
       25001,
@@ -4564,7 +4650,9 @@
     },
     "difficulty": 8,
     "sweepId": 2,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000044
+    ],
     "BattleReadyID": 11904001,
     "captionrecommend": [
       25001,
@@ -4633,7 +4721,9 @@
     },
     "difficulty": 9,
     "sweepId": 3,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000045
+    ],
     "BattleReadyID": 11904001,
     "captionrecommend": [
       25001,
@@ -4707,7 +4797,9 @@
     },
     "difficulty": 10,
     "sweepId": 3,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000046
+    ],
     "BattleReadyID": 11904001,
     "captionrecommend": [
       25001,
@@ -4781,7 +4873,9 @@
     },
     "difficulty": 11,
     "sweepId": 3,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000047
+    ],
     "BattleReadyID": 11904001,
     "captionrecommend": [
       25001,
@@ -4855,7 +4949,9 @@
     },
     "difficulty": 12,
     "sweepId": 3,
-    "sweepOpenId": [],
+    "sweepOpenId": [
+      21000048
+    ],
     "BattleReadyID": 11904001,
     "captionrecommend": [
       25001,

bin/json/game_worldtask.json

@@ -11353,7 +11353,7 @@
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_207",
-      "text": "阿比盖尔的失物找回"
+      "text": "阿比盖尔正哭得伤心，她那可怜的样子引起了你的注意。"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_207",
@@ -11605,7 +11605,7 @@
     },
     "task_details": {
       "key": "worldtask_world_task_task_details_211",
-      "text": "森林传来的低吼，或是豺狼们潜入了进来。"
+      "text": "果酱教授真是对豚鼠情有独钟，可惜他做坏事向来成不了气候还出尽洋相。"
     },
     "npctxt": {
       "key": "worldtask_world_task_npctxt_211",

modules/dailytask/configure.go

@@ -144,7 +144,7 @@ func (this *configureComp) getOpencondCfg(id string) (conf *cfg.GameOpencondData
 		v  interface{}
 		ok bool
 	)
-	if v, err = this.GetConfigure(game_opencond); err == nil {
+	if v, err = this.GetConfigure(game_opencond); err != nil {
 		err = fmt.Errorf("%T no is *cfg.GameOpencond", v)
 		return
 	}

sys/configure/structs/Game.BuffEffectType.go

@@ -22,4 +22,5 @@ const (
     GameBuffEffectType_Dot = 10
     GameBuffEffectType_CanRollBuff = 11
     GameBuffEffectType_CanRollDeBuff = 12
+    GameBuffEffectType_EnchantBossBuff = 13
 )

sys/configure/structs/Game.PlayerSkillData.go

@@ -20,6 +20,7 @@ type GamePlayerSkillData struct {
     Skilltouch int32
     Number int32
     Jump int32
+    Unlock string
 }
 
 const TypeId_GamePlayerSkillData = 244367806
@@ -38,6 +39,7 @@ func (_v *GamePlayerSkillData)Deserialize(_buf map[string]interface{}) (err erro
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skilltouch"].(float64); !_ok_ { err = errors.New("skilltouch error"); return }; _v.Skilltouch = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["number"].(float64); !_ok_ { err = errors.New("number error"); return }; _v.Number = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["jump"].(float64); !_ok_ { err = errors.New("jump error"); return }; _v.Jump = int32(_tempNum_) }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["unlock"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Unlock error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Unlock, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     return
 }
 

sys/configure/structs/Game.StoneRoomData.go

@@ -22,6 +22,7 @@ type GameStoneRoomData struct {
     EventStoreGroup int32
     BossEvent int32
     Condition []int32
+    ConditionText string
 }
 
 const TypeId_GameStoneRoomData = -108410450
@@ -55,6 +56,7 @@ func (_v *GameStoneRoomData)Deserialize(_buf map[string]interface{}) (err error)
                 }
             }
 
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["ConditionText"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.ConditionText error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.ConditionText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     return
 }
 

sys/configure/structs/game.globalData.go

@@ -279,6 +279,8 @@ type GameGlobalData struct {
     TdDailystageChallengeNum int32
     TdDailystageChallengeNumMax int32
     GuildSignIn int32
+    EnhancebossPs int32
+    EnhancebossHeromax int32
 }
 
 const TypeId_GameGlobalData = 477542761
@@ -1089,6 +1091,8 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["td_dailystage_challenge_num"].(float64); !_ok_ { err = errors.New("td_dailystage_challenge_num error"); return }; _v.TdDailystageChallengeNum = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["td_dailystage_challenge_num_max"].(float64); !_ok_ { err = errors.New("td_dailystage_challenge_num_max error"); return }; _v.TdDailystageChallengeNumMax = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["guild_sign_in"].(float64); !_ok_ { err = errors.New("guild_sign_in error"); return }; _v.GuildSignIn = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["enhanceboss_ps"].(float64); !_ok_ { err = errors.New("enhanceboss_ps error"); return }; _v.EnhancebossPs = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["enhanceboss_heromax"].(float64); !_ok_ { err = errors.New("enhanceboss_heromax error"); return }; _v.EnhancebossHeromax = int32(_tempNum_) }
     return
 }
 

sys/configure/structs/game.heroData.go

@@ -40,6 +40,9 @@ type GameHeroData struct {
     Skill1 int32
     Skill2 int32
     Skill3 int32
+    Skill4 int32
+    Skill5 int32
+    Skill6 int32
     Txt string
     Enteranivalue int32
     Camerainterval float32
@@ -136,6 +139,9 @@ func (_v *GameHeroData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill1"].(float64); !_ok_ { err = errors.New("skill1 error"); return }; _v.Skill1 = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill2"].(float64); !_ok_ { err = errors.New("skill2 error"); return }; _v.Skill2 = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill3"].(float64); !_ok_ { err = errors.New("skill3 error"); return }; _v.Skill3 = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill4"].(float64); !_ok_ { err = errors.New("skill4 error"); return }; _v.Skill4 = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill5"].(float64); !_ok_ { err = errors.New("skill5 error"); return }; _v.Skill5 = int32(_tempNum_) }
+    { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill6"].(float64); !_ok_ { err = errors.New("skill6 error"); return }; _v.Skill6 = int32(_tempNum_) }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["enteranivalue"].(float64); !_ok_ { err = errors.New("enteranivalue error"); return }; _v.Enteranivalue = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["camerainterval"].(float64); !_ok_ { err = errors.New("camerainterval error"); return }; _v.Camerainterval = float32(_tempNum_) }