配置修改

bin/json/game_annulartaskall.json

@@ -2,6 +2,7 @@
   {
     "taskgroup": 10010,
     "taskdetail": [
+      60000010,
       60000070,
       60000080,
       60000090,
@@ -46,6 +47,7 @@
   {
     "taskgroup": 10020,
     "taskdetail": [
+      60000010,
       60000070,
       60000080,
       60000090,
@@ -90,6 +92,7 @@
   {
     "taskgroup": 10030,
     "taskdetail": [
+      60000010,
       60000070,
       60000080,
       60000090,
@@ -134,6 +137,7 @@
   {
     "taskgroup": 10040,
     "taskdetail": [
+      60000010,
       60000070,
       60000080,
       60000090,

bin/json/game_catchbugstage.json

@@ -9,9 +9,9 @@
     "skill": [],
     "skilltime": [],
     "deducttime": [
-      1,
+      0,
-      2,
+      0,
-      3
+      0
     ],
     "rewardtime": [
       0,
@@ -35,7 +35,7 @@
       "k": 4,
       "v": 4
     },
-    "stagetime": 180,
+    "stagetime": 120,
     "skill": [],
     "skilltime": [],
     "deducttime": [
@@ -71,7 +71,7 @@
       "k": 4,
       "v": 4
     },
-    "stagetime": 180,
+    "stagetime": 120,
     "skill": [
       1
     ],
@@ -111,7 +111,7 @@
       "k": 4,
       "v": 4
     },
-    "stagetime": 180,
+    "stagetime": 120,
     "skill": [
       2
     ],
@@ -151,7 +151,7 @@
       "k": 4,
       "v": 4
     },
-    "stagetime": 180,
+    "stagetime": 120,
     "skill": [
       3
     ],
@@ -191,7 +191,7 @@
       "k": 4,
       "v": 4
     },
-    "stagetime": 180,
+    "stagetime": 120,
     "skill": [
       4
     ],

bin/json/game_consumehero.json

@@ -469,7 +469,7 @@
     },
     "skilltxt": {
       "key": "consume_consume_hero_skilltxt_08",
-      "text": "随机选择2中颜色，然后消除盘面上所有对应颜色的方块"
+      "text": "随机选择2种颜色，然后消除盘面上所有对应颜色的方块"
     },
     "failtxt": {
       "key": "consume_consume_hero_failtxt_08",
@@ -725,7 +725,7 @@
     },
     "intr": {
       "key": "consume_consume_hero_intr_12",
-      "text": "盖的毒苹果酒吧桌游卡"
+      "text": "盖的毒苹果酒吧桌游卡。<br>获得守护者盖后可以购买该桌游卡。<br>提升守护者盖的觉醒等级可以降低失败后的销毁概率。</br>"
     },
     "skillname": {
       "key": "consume_consume_hero_skillname_12",
@@ -733,7 +733,7 @@
     },
     "skilltxt": {
       "key": "consume_consume_hero_skilltxt_12",
-      "text": "随机将盘面内8个方块变为“烟火”，并从消除通过该技能生成的4个烟火。"
+      "text": "随机将盘面内8个方块变为“烟火”，并从消除通过该技能生成的其中4个烟火。"
     },
     "failtxt": {
       "key": "consume_consume_hero_failtxt_12",

bin/json/game_drawpool.json

@@ -32,8 +32,8 @@
     },
     "weightreadonly": [
       "2%",
-      "20%",
+      "14%",
-      "78%"
+      "84%"
     ],
     "upweight": 0
   },
@@ -93,12 +93,12 @@
     ],
     "baodihelp": {
       "key": "drawcard_drawpool_baodihelp_2",
-      "text": "1.常驻卡池，每次抽取将消耗圣桃枝<br>2.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者<br>3.随连续未抽到[color=#37d8a9]SSR[/color]角色卡牌的数量，逐步提升[color=#37d8a9]SSR[/color]角色卡牌的概率<br>4.连续[color=#37d8a9]40次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.08%[/color]<br>5.连续[color=#37d8a9]50次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.16%[/color]<br>6.连续[color=#37d8a9]60次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.32%[/color]<br>7.连续[color=#37d8a9]69次[/color]未抽到SSR卡牌时，第[color=#37d8a9]70抽[/color]必为SSR卡牌"
+      "text": "<br>1.常驻卡池，每次抽取将消耗圣桃枝。<br>2.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者<br>3.卡池中SSR概率为2%。SR概率为14%，R的概率为84%，第[color=#37d8a9]70抽[/color]必为SSR卡牌"
     },
     "weightreadonly": [
       "2%",
-      "20%",
+      "14%",
-      "78%"
+      "84%"
     ],
     "upweight": 0
   },
@@ -149,12 +149,12 @@
     ],
     "baodihelp": {
       "key": "drawcard_drawpool_baodihelp_3",
-      "text": "1.在阵营召唤中，将召唤指定阵营的英雄<br>2.每次召唤将消耗对应阵营的圣桃枝<br>3.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者<br>4.随连续未抽到[color=#37d8a9]SSR[/color]角色卡牌的数量，逐步提升[color=#37d8a9]SSR[/color]角色卡牌的概率<br>5.连续[color=#37d8a9]40次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.08%[/color]<br>6.连续[color=#37d8a9]50次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.16%[/color]<br>7.连续[color=#37d8a9]60次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.32%[/color]<br>8.连续[color=#37d8a9]69次[/color]未抽到SSR卡牌时，第[color=#37d8a9]70抽[/color]必为SSR卡牌<br>9.所有阵营的召唤保底次数[color=#37d8a9]共享"
+      "text": "1.在阵营召唤中，将召唤指定阵营的英雄<br>2.每次召唤将消耗对应阵营的圣桃枝<br>3.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者<br>4.卡池中SSR概率为2%。SR概率为14%，R的概率为84%，第[color=#37d8a9]70抽[/color]必为SSR卡牌<br>5.所有阵营的召唤保底次数[color=#37d8a9]共享"
     },
     "weightreadonly": [
       "2%",
-      "20%",
+      "14%",
-      "78%"
+      "84%"
     ],
     "upweight": 0
   },
@@ -205,12 +205,12 @@
     ],
     "baodihelp": {
       "key": "drawcard_drawpool_baodihelp_4",
-      "text": "1.在阵营召唤中，将召唤指定阵营的英雄<br>2.每次召唤将消耗对应阵营的圣桃枝<br>3.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者<br>4.随连续未抽到[color=#37d8a9]SSR[/color]角色卡牌的数量，逐步提升[color=#37d8a9]SSR[/color]角色卡牌的概率<br>5.连续[color=#37d8a9]40次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.08%[/color]<br>6.连续[color=#37d8a9]50次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.16%[/color]<br>7.连续[color=#37d8a9]60次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.32%[/color]<br>8.连续[color=#37d8a9]69次[/color]未抽到SSR卡牌时，第[color=#37d8a9]70抽[/color]必为SSR卡牌<br>9.所有阵营的召唤保底次数[color=#37d8a9]共享"
+      "text": "1.在阵营召唤中，将召唤指定阵营的英雄<br>2.每次召唤将消耗对应阵营的圣桃枝<br>3.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者<br>4.卡池中SSR概率为2%。SR概率为14%，R的概率为84%，第[color=#37d8a9]70抽[/color]必为SSR卡牌<br>5.所有阵营的召唤保底次数[color=#37d8a9]共享"
     },
     "weightreadonly": [
       "2%",
-      "20%",
+      "14%",
-      "78%"
+      "84%"
     ],
     "upweight": 0
   },
@@ -261,12 +261,12 @@
     ],
     "baodihelp": {
       "key": "drawcard_drawpool_baodihelp_5",
-      "text": "1.在阵营召唤中，将召唤指定阵营的英雄<br>2.每次召唤将消耗对应阵营的圣桃枝<br>3.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者<br>4.随连续未抽到[color=#37d8a9]SSR[/color]角色卡牌的数量，逐步提升[color=#37d8a9]SSR[/color]角色卡牌的概率<br>5.连续[color=#37d8a9]40次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.08%[/color]<br>6.连续[color=#37d8a9]50次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.16%[/color]<br>7.连续[color=#37d8a9]60次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.32%[/color]<br>8.连续[color=#37d8a9]69次[/color]未抽到SSR卡牌时，第[color=#37d8a9]70抽[/color]必为SSR卡牌<br>9.所有阵营的召唤保底次数[color=#37d8a9]共享"
+      "text": "1.在阵营召唤中，将召唤指定阵营的英雄<br>2.每次召唤将消耗对应阵营的圣桃枝<br>3.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者<br>4.卡池中SSR概率为2%。SR概率为14%，R的概率为84%，第[color=#37d8a9]70抽[/color]必为SSR卡牌<br>5.所有阵营的召唤保底次数[color=#37d8a9]共享"
     },
     "weightreadonly": [
       "2%",
-      "20%",
+      "14%",
-      "78%"
+      "84%"
     ],
     "upweight": 0
   },
@@ -305,12 +305,12 @@
     "consumeB10": [],
     "baodihelp": {
       "key": "drawcard_drawpool_baodihelp_7",
-      "text": "1.召唤中，获取SSR卡时有[color=#37d8a9]50%[/color]概率可获得本次卡池概率提升的SSR卡<br>2.可以在列表中，选择心仪的守护者作为本期的概率提升SSR<br>3.每次召唤到的SSR角色不是保底SSR角色时，下次召唤到的SSR角色必为该保底SSR角色<br>4.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者<br>5.随连续未抽到[color=#37d8a9]SSR[/color]角色卡牌的数量，逐步提升[color=#37d8a9]SSR[/color]角色卡牌的概率<br>6.连续[color=#37d8a9]40次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.08%[/color]<br>7.连续[color=#37d8a9]50次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.16%[/color]<br>8.连续[color=#37d8a9]60次[/color]未抽到SSR卡牌时，SSR守护者获得概率提升到[color=#37d8a9]0.32%[/color]<br>9.连续[color=#37d8a9]69次[/color]未抽到SSR卡牌时，第[color=#37d8a9]70抽[/color]必为SSR卡牌<br>10.中途更换选定英雄，仍将[color=#37d8a9]保留[/color]保底次数<br>11.限定卡池结束后，召唤保底次数将[color=#37d8a9]保留[/color]至下个限定卡池"
+      "text": "1.召唤中，获取SSR卡时有[color=#37d8a9]50%[/color]概率可获得本次卡池概率提升的SSR卡。<br>2.可以在列表中，选择心仪的守护者作为本期的概率提升SSR<br>3.每次召唤到的SSR角色不是保底SSR角色时，下次召唤到的SSR角色必为该保底SSR角色<br>4.每[color=#37d8a9]10次[/color]抽卡必定获得[color=#37d8a9]SR[/color]及以上守护者<br>5.卡池中SSR概率为2%。SR概率为14%，R的概率为84%，第[color=#37d8a9]70抽[/color]必为SSR卡牌<br>6.中途更换选定英雄，仍将[color=#37d8a9]保留[/color]保底次数<br>7.限定卡池结束后，召唤保底次数将[color=#37d8a9]保留[/color]至下个限定卡池"
     },
     "weightreadonly": [
       "2%",
-      "20%",
+      "14%",
-      "78%"
+      "84%"
     ],
     "upweight": 500
   },

bin/json/game_drawreplace.json

@@ -2,7 +2,7 @@
   {
     "id": 1,
     "pool": 1,
-    "hero_initial": "14003",
+    "hero_initial": "15005",
     "hero_replace": "15005",
     "replace_cd": 0,
     "replace_num": 0,
@@ -15,7 +15,7 @@
   {
     "id": 2,
     "pool": 1,
-    "hero_initial": "14003",
+    "hero_initial": "15005",
     "hero_replace": "35005",
     "replace_cd": 0,
     "replace_num": 0,
@@ -28,7 +28,7 @@
   {
     "id": 3,
     "pool": 1,
-    "hero_initial": "14003",
+    "hero_initial": "15005",
     "hero_replace": "45003",
     "replace_cd": 0,
     "replace_num": 0,
@@ -41,7 +41,7 @@
   {
     "id": 4,
     "pool": 2,
-    "hero_initial": "15002",
+    "hero_initial": "35001",
     "hero_replace": "35001",
     "replace_cd": 5184000,
     "replace_num": 0,
@@ -54,7 +54,7 @@
   {
     "id": 5,
     "pool": 2,
-    "hero_initial": "15002",
+    "hero_initial": "35001",
     "hero_replace": "15004",
     "replace_cd": 5184000,
     "replace_num": 200,
@@ -67,7 +67,7 @@
   {
     "id": 6,
     "pool": 2,
-    "hero_initial": "15002",
+    "hero_initial": "35001",
     "hero_replace": "15005",
     "replace_cd": 5184000,
     "replace_num": 200,
@@ -80,7 +80,7 @@
   {
     "id": 7,
     "pool": 2,
-    "hero_initial": "15002",
+    "hero_initial": "35001",
     "hero_replace": "25002",
     "replace_cd": 5184000,
     "replace_num": 200,
@@ -93,7 +93,7 @@
   {
     "id": 8,
     "pool": 2,
-    "hero_initial": "15002",
+    "hero_initial": "35001",
     "hero_replace": "15002",
     "replace_cd": 5184000,
     "replace_num": 200,
@@ -106,7 +106,7 @@
   {
     "id": 9,
     "pool": 2,
-    "hero_initial": "15002",
+    "hero_initial": "35001",
     "hero_replace": "35002",
     "replace_cd": 5184000,
     "replace_num": 500,
@@ -119,7 +119,7 @@
   {
     "id": 10,
     "pool": 2,
-    "hero_initial": "15002",
+    "hero_initial": "35001",
     "hero_replace": "35005",
     "replace_cd": 5184000,
     "replace_num": 500,
@@ -132,7 +132,7 @@
   {
     "id": 11,
     "pool": 2,
-    "hero_initial": "15002",
+    "hero_initial": "35001",
     "hero_replace": "44005",
     "replace_cd": 5184000,
     "replace_num": 500,
@@ -145,7 +145,7 @@
   {
     "id": 12,
     "pool": 2,
-    "hero_initial": "15002",
+    "hero_initial": "35001",
     "hero_replace": "44002",
     "replace_cd": 5184000,
     "replace_num": 500,

bin/json/game_hero.json

@@ -7473,7 +7473,7 @@
     "hid": "54003",
     "name": {
       "key": "hero_main_name_54003",
-      "text": "黑猫"
+      "text": "阿奇波德"
     },
     "star": 3,
     "color": 2,
@@ -7549,7 +7549,7 @@
     "expitemnum": 7,
     "herointr": {
       "key": "hero_main_herointr_54003",
-      "text": "传说中的守护者“黑猫”,拥有不俗的战斗能力"
+      "text": "传说中的守护者“阿奇波德”,拥有不俗的战斗能力"
     }
   },
   {

bin/json/game_item.json

@@ -46765,5 +46765,210 @@
       }
     ],
     "gm": 1
+  },
+  {
+    "id": "25010001",
+    "name": {
+      "key": "item_item_name_25010001",
+      "text": "希卡普的头盔"
+    },
+    "usetype": 1,
+    "color": 4,
+    "bagtype": 0,
+    "index": 1,
+    "special_type": 0,
+    "hold": 0,
+    "time": 0,
+    "reddottype": 0,
+    "effects": "",
+    "modelName": "",
+    "box_id": 0,
+    "synthetize_num": 0,
+    "synthetize_deplete": [],
+    "synthetize_get": [],
+    "decompose_deplete": [],
+    "decompose_get": [],
+    "access": [],
+    "use_skip": 0,
+    "upper_limit": 0,
+    "img": "item_25010001",
+    "intr": {
+      "key": "item_item_intr_25010001",
+      "text": "希卡普的头盔，看上去已经有些年头了。"
+    },
+    "describe": {
+      "key": "",
+      "text": ""
+    },
+    "dialogue": {
+      "key": "",
+      "text": ""
+    },
+    "sale": [],
+    "gm": 0
+  },
+  {
+    "id": "25010002",
+    "name": {
+      "key": "item_item_name_25010002",
+      "text": "阿比盖尔的马鞍"
+    },
+    "usetype": 1,
+    "color": 4,
+    "bagtype": 0,
+    "index": 1,
+    "special_type": 0,
+    "hold": 0,
+    "time": 0,
+    "reddottype": 0,
+    "effects": "",
+    "modelName": "",
+    "box_id": 0,
+    "synthetize_num": 0,
+    "synthetize_deplete": [],
+    "synthetize_get": [],
+    "decompose_deplete": [],
+    "decompose_get": [],
+    "access": [],
+    "use_skip": 0,
+    "upper_limit": 0,
+    "img": "item_25010002",
+    "intr": {
+      "key": "item_item_intr_25010002",
+      "text": "久经使用的马鞍，上面有明显的洗刷痕迹。"
+    },
+    "describe": {
+      "key": "",
+      "text": ""
+    },
+    "dialogue": {
+      "key": "",
+      "text": ""
+    },
+    "sale": [],
+    "gm": 0
+  },
+  {
+    "id": "25010003",
+    "name": {
+      "key": "item_item_name_25010003",
+      "text": "波比的琴"
+    },
+    "usetype": 1,
+    "color": 4,
+    "bagtype": 0,
+    "index": 1,
+    "special_type": 0,
+    "hold": 0,
+    "time": 0,
+    "reddottype": 0,
+    "effects": "",
+    "modelName": "",
+    "box_id": 0,
+    "synthetize_num": 0,
+    "synthetize_deplete": [],
+    "synthetize_get": [],
+    "decompose_deplete": [],
+    "decompose_get": [],
+    "access": [],
+    "use_skip": 0,
+    "upper_limit": 0,
+    "img": "item_25010003",
+    "intr": {
+      "key": "item_item_intr_25010003",
+      "text": "造型夸张的小竖琴，想必它的主人是一位小巧可爱的家伙。"
+    },
+    "describe": {
+      "key": "",
+      "text": ""
+    },
+    "dialogue": {
+      "key": "",
+      "text": ""
+    },
+    "sale": [],
+    "gm": 0
+  },
+  {
+    "id": "25010004",
+    "name": {
+      "key": "item_item_name_25010004",
+      "text": "菲奥娜的魔药书"
+    },
+    "usetype": 1,
+    "color": 4,
+    "bagtype": 0,
+    "index": 1,
+    "special_type": 0,
+    "hold": 0,
+    "time": 0,
+    "reddottype": 0,
+    "effects": "",
+    "modelName": "",
+    "box_id": 0,
+    "synthetize_num": 0,
+    "synthetize_deplete": [],
+    "synthetize_get": [],
+    "decompose_deplete": [],
+    "decompose_get": [],
+    "access": [],
+    "use_skip": 0,
+    "upper_limit": 0,
+    "img": "item_25010004",
+    "intr": {
+      "key": "item_item_intr_25010004",
+      "text": "十分厚重的书籍，上面有一股很奇怪的味道，说不出来是香味，还是苦味。"
+    },
+    "describe": {
+      "key": "",
+      "text": ""
+    },
+    "dialogue": {
+      "key": "",
+      "text": ""
+    },
+    "sale": [],
+    "gm": 0
+  },
+  {
+    "id": "25010005",
+    "name": {
+      "key": "item_item_name_25010005",
+      "text": "戈伯的工具箱"
+    },
+    "usetype": 1,
+    "color": 4,
+    "bagtype": 0,
+    "index": 1,
+    "special_type": 0,
+    "hold": 0,
+    "time": 0,
+    "reddottype": 0,
+    "effects": "",
+    "modelName": "",
+    "box_id": 0,
+    "synthetize_num": 0,
+    "synthetize_deplete": [],
+    "synthetize_get": [],
+    "decompose_deplete": [],
+    "decompose_get": [],
+    "access": [],
+    "use_skip": 0,
+    "upper_limit": 0,
+    "img": "item_25010005",
+    "intr": {
+      "key": "item_item_intr_25010005",
+      "text": "摇起来哐当作响，大多都是些锯齿，锤子之类的东西，而且规格看上去也十分统一。"
+    },
+    "describe": {
+      "key": "",
+      "text": ""
+    },
+    "dialogue": {
+      "key": "",
+      "text": ""
+    },
+    "sale": [],
+    "gm": 0
   }
 ]

bin/json/game_lattice.json

@@ -1,6 +1,10 @@
 [
   {
     "key": 1,
+    "txt": {
+      "key": "consume_consume_lattice_txt_01",
+      "text": "锣鼓喧天"
+    },
     "belongto": 5,
     "regular": 1,
     "place": {
@@ -15,6 +19,10 @@
   },
   {
     "key": 2,
+    "txt": {
+      "key": "consume_consume_lattice_txt_02",
+      "text": "电闪雷鸣"
+    },
     "belongto": 6,
     "regular": 2,
     "place": {
@@ -32,6 +40,10 @@
   },
   {
     "key": 3,
+    "txt": {
+      "key": "consume_consume_lattice_txt_03",
+      "text": "飞天舞女"
+    },
     "belongto": 7,
     "regular": 2,
     "place": {

bin/json/game_lottery.json

@@ -98542,5 +98542,125 @@
     "playerlvmin": 0,
     "playerlvmax": 0,
     "notice": 0
+  },
+  {
+    "id": 4107,
+    "lotteryid": 18001020,
+    "description": "跑环希卡普的头盔",
+    "type": 1,
+    "groupwt": 1000,
+    "groupid": 1000,
+    "subtype": 1,
+    "groupnum": 1,
+    "itemid": {
+      "a": "item",
+      "t": "25010001",
+      "n": 1
+    },
+    "itemdes": "希卡普的头盔",
+    "itemwt": 1000,
+    "min": 1,
+    "max": 1,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 4108,
+    "lotteryid": 18001021,
+    "description": "跑环阿比盖尔的马鞍",
+    "type": 1,
+    "groupwt": 1000,
+    "groupid": 1000,
+    "subtype": 1,
+    "groupnum": 1,
+    "itemid": {
+      "a": "item",
+      "t": "25010002",
+      "n": 1
+    },
+    "itemdes": "阿比盖尔的马鞍",
+    "itemwt": 1000,
+    "min": 1,
+    "max": 1,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 4109,
+    "lotteryid": 18001022,
+    "description": "跑环波比的琴",
+    "type": 1,
+    "groupwt": 1000,
+    "groupid": 1000,
+    "subtype": 1,
+    "groupnum": 1,
+    "itemid": {
+      "a": "item",
+      "t": "25010003",
+      "n": 1
+    },
+    "itemdes": "波比的琴",
+    "itemwt": 1000,
+    "min": 1,
+    "max": 1,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 4110,
+    "lotteryid": 18001023,
+    "description": "跑环菲奥娜的魔药书",
+    "type": 1,
+    "groupwt": 1000,
+    "groupid": 1000,
+    "subtype": 1,
+    "groupnum": 1,
+    "itemid": {
+      "a": "item",
+      "t": "25010004",
+      "n": 1
+    },
+    "itemdes": "菲奥娜的魔药书",
+    "itemwt": 1000,
+    "min": 1,
+    "max": 1,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
+  },
+  {
+    "id": 4111,
+    "lotteryid": 18001024,
+    "description": "跑环戈伯的工具箱",
+    "type": 1,
+    "groupwt": 1000,
+    "groupid": 1000,
+    "subtype": 1,
+    "groupnum": 1,
+    "itemid": {
+      "a": "item",
+      "t": "25010005",
+      "n": 1
+    },
+    "itemdes": "戈伯的工具箱",
+    "itemwt": 1000,
+    "min": 1,
+    "max": 1,
+    "VIPmin": 0,
+    "VIPmax": 15,
+    "playerlvmin": 0,
+    "playerlvmax": 0,
+    "notice": 0
   }
 ]

bin/json/game_rdtasknpc.json

@@ -8718,9 +8718,9 @@
     "heroid": 25001,
     "Levelid": 0,
     "datas": [
-      "GameMain",
+      "CommandScene",
-      "功能入口-浇水拼图",
+      "功能入口_主线",
-      "901"
+      "905"
     ],
     "event": [
       2,
@@ -8748,9 +8748,9 @@
     "heroid": 25001,
     "Levelid": 0,
     "datas": [
-      "GameMain",
+      "CommandScene",
-      "功能入口-浇水拼图",
+      "功能入口_主线",
-      "901"
+      "905"
     ],
     "event": [
       2,
@@ -8808,9 +8808,9 @@
     "heroid": 25001,
     "Levelid": 0,
     "datas": [
-      "GameMain",
+      "CommandScene",
-      "功能入口-浇水拼图",
+      "功能入口_主线",
-      "901"
+      "905"
     ],
     "event": [
       2,
@@ -8838,9 +8838,9 @@
     "heroid": 25001,
     "Levelid": 0,
     "datas": [
-      "GameMain",
+      "CommandScene",
-      "功能入口-浇水拼图",
+      "功能入口_主线",
-      "901"
+      "905"
     ],
     "event": [
       2,
@@ -8853,9 +8853,9 @@
     "heroid": 25001,
     "Levelid": 0,
     "datas": [
-      "GameMain",
+      "CommandScene",
-      "功能入口-浇水拼图",
+      "功能入口_主线",
-      "901"
+      "905"
     ],
     "event": [
       2,
@@ -8883,9 +8883,9 @@
     "heroid": 25001,
     "Levelid": 0,
     "datas": [
-      "GameMain",
+      "CommandScene",
-      "功能入口-浇水拼图",
+      "功能入口_主线",
-      "901"
+      "905"
     ],
     "event": [
       2,
@@ -8898,9 +8898,9 @@
     "heroid": 25001,
     "Levelid": 0,
     "datas": [
-      "GameMain",
+      "CommandScene",
-      "功能入口-浇水拼图",
+      "功能入口_主线",
-      "901"
+      "905"
     ],
     "event": [
       2,
@@ -8928,9 +8928,9 @@
     "heroid": 25001,
     "Levelid": 0,
     "datas": [
-      "GameMain",
+      "CommandScene",
-      "功能入口-浇水拼图",
+      "功能入口_主线",
-      "901"
+      "905"
     ],
     "event": [
       2,
@@ -8943,9 +8943,9 @@
     "heroid": 25001,
     "Levelid": 0,
     "datas": [
-      "GameMain",
+      "CommandScene",
-      "功能入口-浇水拼图",
+      "功能入口_主线",
-      "901"
+      "905"
     ],
     "event": [
       2,
@@ -8973,9 +8973,9 @@
     "heroid": 25001,
     "Levelid": 0,
     "datas": [
-      "GameMain",
+      "CommandScene",
-      "功能入口-浇水拼图",
+      "功能入口_主线",
-      "901"
+      "905"
     ],
     "event": [
       2,
@@ -8988,9 +8988,9 @@
     "heroid": 25001,
     "Levelid": 0,
     "datas": [
-      "GameMain",
+      "CommandScene",
-      "功能入口-浇水拼图",
+      "功能入口_主线",
-      "901"
+      "905"
     ],
     "event": [
       2,
@@ -9018,9 +9018,9 @@
     "heroid": 25001,
     "Levelid": 0,
     "datas": [
-      "GameMain",
+      "CommandScene",
-      "功能入口-浇水拼图",
+      "功能入口_主线",
-      "901"
+      "905"
     ],
     "event": [
       2,

bin/json/game_searchitemall.json

@@ -4,12 +4,10 @@
     "tasktype": 1,
     "pointnum": 1,
     "point": [
-      1,
+      1
-      2
     ],
     "pointweight": [
-      2000,
+      10000
-      2000
     ]
   },
   {
@@ -17,12 +15,10 @@
     "tasktype": 1,
     "pointnum": 1,
     "point": [
-      3,
+      2
-      4
     ],
     "pointweight": [
-      2000,
+      10000
-      2000
     ]
   },
   {
@@ -30,12 +26,10 @@
     "tasktype": 1,
     "pointnum": 1,
     "point": [
-      5,
+      3
-      6
     ],
     "pointweight": [
-      2000,
+      10000
-      2000
     ]
   },
   {
@@ -43,12 +37,10 @@
     "tasktype": 1,
     "pointnum": 1,
     "point": [
-      7,
+      4
-      8
     ],
     "pointweight": [
-      2000,
+      10000
-      2000
     ]
   },
   {
@@ -56,12 +48,10 @@
     "tasktype": 1,
     "pointnum": 1,
     "point": [
-      9,
+      5
-      10
     ],
     "pointweight": [
-      2000,
+      10000
-      2000
     ]
   },
   {
@@ -69,12 +59,10 @@
     "tasktype": 1,
     "pointnum": 1,
     "point": [
-      6,
+      6
-      10
     ],
     "pointweight": [
-      5000,
+      10000
-      5000
     ]
   },
   {

bin/json/game_searchitembox.json

@@ -6,7 +6,7 @@
       "GameMain",
       "位置1"
     ],
-    "drown": 14010000,
+    "drown": 18001022,
     "pointweight": 1000
   },
   {
@@ -16,7 +16,7 @@
       "GameMain",
       "位置2"
     ],
-    "drown": 14010000,
+    "drown": 18001020,
     "pointweight": 1000
   },
   {
@@ -26,7 +26,7 @@
       "GameMain",
       "位置3"
     ],
-    "drown": 14010000,
+    "drown": 18001023,
     "pointweight": 1000
   },
   {
@@ -36,7 +36,7 @@
       "GameMain",
       "位置4"
     ],
-    "drown": 14010000,
+    "drown": 18001024,
     "pointweight": 1000
   },
   {
@@ -46,7 +46,7 @@
       "GameMain",
       "位置5"
     ],
-    "drown": 14010000,
+    "drown": 18001021,
     "pointweight": 1000
   },
   {

bin/json/game_skillafteratk.json

@@ -3586,7 +3586,7 @@
     "Order": "",
     "Limit": 1,
     "ExecuteCnt": 1,
-    "TriggerAnim": "",
+    "TriggerAnim": "Passive",
     "Type": 3,
     "Argu": [
       390001209,
@@ -3732,7 +3732,7 @@
     "Order": "",
     "Limit": 1,
     "ExecuteCnt": 1,
-    "TriggerAnim": "",
+    "TriggerAnim": "Passive",
     "Type": 3,
     "Argu": [
       390001209,
@@ -3878,7 +3878,7 @@
     "Order": "",
     "Limit": 1,
     "ExecuteCnt": 1,
-    "TriggerAnim": "",
+    "TriggerAnim": "Passive",
     "Type": 3,
     "Argu": [
       390001209,
@@ -6036,7 +6036,7 @@
     "TriggerAnim": "",
     "Type": 2,
     "Argu": [
-      413002211,
+      413002212,
       -1,
       1
     ],
@@ -32918,10 +32918,10 @@
       4,
       2300
     ],
-    "FollowSK": [
+    "FollowSK": [],
+    "SucFollowSK": [
       243007112
     ],
-    "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -32944,10 +32944,10 @@
       4,
       2400
     ],
-    "FollowSK": [
+    "FollowSK": [],
+    "SucFollowSK": [
       243007112
     ],
-    "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -32970,10 +32970,10 @@
       4,
       2500
     ],
-    "FollowSK": [
+    "FollowSK": [],
+    "SucFollowSK": [
       243007112
     ],
-    "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -32996,10 +32996,10 @@
       4,
       2600
     ],
-    "FollowSK": [
+    "FollowSK": [],
+    "SucFollowSK": [
       243007112
     ],
-    "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -33022,10 +33022,10 @@
       4,
       2700
     ],
-    "FollowSK": [
+    "FollowSK": [],
+    "SucFollowSK": [
       243007112
     ],
-    "SucFollowSK": [],
     "FailFollowSK": [],
     "MustHit": false,
     "DpsRevisiType": 0,
@@ -33036,7 +33036,7 @@
   {
     "Id": 243007112,
     "EmitPR": 1000,
-    "From": 2,
+    "From": 4,
     "Where": [],
     "Order": "",
     "Limit": 1,
@@ -38611,7 +38611,7 @@
     "TriggerAnim": "",
     "Type": 2,
     "Argu": [
-      435004212,
+      435004211,
       -1,
       1
     ],
@@ -40373,10 +40373,10 @@
   {
     "Id": 225002215,
     "EmitPR": 1000,
-    "From": 1,
+    "From": 3,
     "Where": [],
     "Order": "",
-    "Limit": 1,
+    "Limit": 10,
     "ExecuteCnt": 1,
     "TriggerAnim": "",
     "Type": 2,

bin/json/game_skillatk.json

@@ -27722,7 +27722,7 @@
       "key": "skill_skill_atk_Name_133005211",
       "text": "振奋怒吼"
     },
-    "ico": "jn_34003_2",
+    "ico": "jn_33005_2",
     "CorrectPos": 0,
     "IsMelee": 0,
     "act": "Skill_2",
@@ -27732,8 +27732,7 @@
     "Target": 2,
     "ChildSkill": {
       "Id": [
-        233005211,
+        233005211
-        233005213
       ]
     },
     "passSkill": [
@@ -28497,8 +28496,7 @@
     "Target": 1,
     "ChildSkill": {
       "Id": [
-        244003211,
+        244003211
-        244003212
       ]
     },
     "passSkill": [

modules/pagoda/comp_configure.go

@@ -276,47 +276,3 @@ func (this *configureComp) GetSixDirectionsConf(boxid int32) (conf []*cfg.GameSi
 	this.hlock.RUnlock()
 	return
 }
-
-
-//# File: .github/workflows/repo-sync.yml
-name: sync-sazs34-scripts
-on:
-  schedule:
-    - cron: '5 0,7,15 * * *'
-  workflow_dispatch:
-  watch:
-    types: started
-  repository_dispatch:
-    types: sync-sazs34-scripts
-jobs:
-  repo-sync:
-    env:
-      PAT: ${{ secrets.PAT || github.event.client_payload.PAT }} #此处PAT需要申请,教程详见:https://www.jianshu.com/p/bb82b3ad1d11
-    runs-on: ubuntu-latest
-    if: github.event.repository.owner.id == github.event.sender.id
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          persist-credentials: false
-
-      - name: sync sazs34-scripts
-        uses: repo-sync/github-sync@v2
-        if: env.PAT
-        with:
-          source_repo: "https://github.com/sazs34/MyActions.git"
-          source_branch: "master"
-          destination_branch: "main"
-          github_token: ${{ secrets.PAT || github.event.client_payload.PAT }}
-
-		  UPSTREAM_REPO=https://github.com/mx730129/auto-workflow-JD.com-jdcoin.git
-BRANCHES=master:main
-Resetting origin to: ***github.com/mxf007/tesjdcoin
-Adding tmp_upstream https://github.com/mx730129/auto-workflow-JD.com-jdcoin.git
-Fetching tmp_upstream
-origin	***github.com/mxf007/tesjdcoin (fetch)
-origin	***github.com/mxf007/tesjdcoin (push)
-tmp_upstream	https://github.com/mx730129/auto-workflow-JD.com-jdcoin.git (fetch)
-tmp_upstream	https://github.com/mx730129/auto-workflow-JD.com-jdcoin.git (push)
-Pushing changings from tmp_upstream to origin
-error: src refspec refs/remotes/tmp_upstream/master does not match any
-error: failed to push some refs to '***github.com/mxf007/tesjdcoin'

sys/configure/structs/Game.LatticeData.go

@@ -13,6 +13,7 @@ import "bright/serialization"
 
 type GameLatticeData struct {
     Key int32
+    Txt string
     Belongto int32
     Regular int32
     Place serialization.Vector2
@@ -31,6 +32,7 @@ func (*GameLatticeData) GetTypeId() int32 {
 
 func (_v *GameLatticeData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = 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["belongto"].(float64); !_ok_ { err = errors.New("belongto error"); return }; _v.Belongto = int32(_tempNum_) }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["regular"].(float64); !_ok_ { err = errors.New("regular error"); return }; _v.Regular = int32(_tempNum_) }
     { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["place"].(map[string]interface{}); !_ok_ { err = errors.New("place error"); return }

sys/configure/structs/game.opencondData.go

@@ -13,7 +13,6 @@ import "errors"
 type GameOpencondData struct {
     Id string
     Name string
-    Main []*GameOpenedCond
     Opencondi []int32
     Wkqbx int32
     Img string
@@ -35,20 +34,6 @@ func (*GameOpencondData) GetTypeId() int32 {
 func (_v *GameOpencondData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
     {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
-     {
-                var _arr_ []interface{}
-                var _ok_ bool
-                if _arr_, _ok_ = _buf["main"].([]interface{}); !_ok_ { err = errors.New("main error"); return }
-
-                _v.Main = make([]*GameOpenedCond, 0, len(_arr_))
-                
-                for _, _e_ := range _arr_ {
-                    var _list_v_ *GameOpenedCond
-                    { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameOpenedCond(_x_); err != nil { return } }
-                    _v.Main = append(_v.Main, _list_v_)
-                }
-            }
-
      {
                 var _arr_ []interface{}
                 var _ok_ bool

sys/configure/structs/game.skillPassiveData.go

@@ -12,6 +12,8 @@ import "errors"
 
 type GameSkillPassiveData struct {
     Id int32
+    Name string
+    Icon string
     When int32
     FromCheck string
     TargetCheck string
@@ -38,6 +40,8 @@ func (*GameSkillPassiveData) GetTypeId() int32 {
 
 func (_v *GameSkillPassiveData)Deserialize(_buf map[string]interface{}) (err error) {
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Id"].(float64); !_ok_ { err = errors.New("Id error"); return }; _v.Id = int32(_tempNum_) }
+    {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return };  { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
+    { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
     { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["When"].(float64); !_ok_ { err = errors.New("When error"); return }; _v.When = int32(_tempNum_) }
     { var _ok_ bool; if _v.FromCheck, _ok_ = _buf["FromCheck"].(string); !_ok_ { err = errors.New("FromCheck error"); return } }
     { var _ok_ bool; if _v.TargetCheck, _ok_ = _buf["TargetCheck"].(string); !_ok_ { err = errors.New("TargetCheck error"); return } }