Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

bin/json/game_gamesummary.json

@@ -277,5 +277,49 @@
     },
     "bg": "",
     "dropshow": []
+  },
+  {
+    "id": 10,
+    "name": {
+      "key": "gamesummary_node_name_2",
+      "text": "驯龙养成"
+    },
+    "tabId": 12001,
+    "type": 1,
+    "jumpId": 10045,
+    "icon": "ty_icon_xlyc",
+    "mapPos": {
+      "x": 4195,
+      "y": 2042
+    },
+    "params": "",
+    "introduce": {
+      "key": "gamesummary_node_introdunce_1",
+      "text": "起初，没有人在意这次冒险，对于反派来说，这不过是又一次嘲讽失败者的机会。"
+    },
+    "bg": "",
+    "dropshow": []
+  },
+  {
+    "id": 11,
+    "name": {
+      "key": "gamesummary_node_name_1",
+      "text": "捕羊大赛"
+    },
+    "tabId": 12001,
+    "type": 0,
+    "jumpId": 10042,
+    "icon": "ty_qp_by",
+    "mapPos": {
+      "x": 5173,
+      "y": 1748
+    },
+    "params": "",
+    "introduce": {
+      "key": "gamesummary_node_introdunce_2",
+      "text": "靴猫继续把玩着手中的剑，他等候那些跃跃欲试站在台上的人，等着那个最强者出现。"
+    },
+    "bg": "",
+    "dropshow": []
   }
 ]

bin/json/game_gamesummarytab.json

@@ -70,5 +70,23 @@
       "key": "gamesummary_fathernode_usetext_4",
       "text": "很久很久以前，在遥远的大沼泽里住着一个叫史瑞克的绿色怪物…"
     }
+  },
+  {
+    "tabId": 12001,
+    "layer": 0,
+    "name": {
+      "key": "gamesummary_fathernode_name_5",
+      "text": "成长之路"
+    },
+    "icon": "hkz_wftj_mj",
+    "mapPos": {
+      "x": 0,
+      "y": 557
+    },
+    "scale": 1.3,
+    "usetext": {
+      "key": "gamesummary_fathernode_usetext_1",
+      "text": "起初，没有人在意这次冒险，对于反派来说，这不过是又一次嘲讽失败者的机会。"
+    }
   }
 ]

bin/json/game_global.json

@@ -786,6 +786,7 @@
     "td_dailystage_challenge_num": 2,
     "td_dailystage_challenge_num_max": 2,
     "guild_sign_in": 10,
-    "enhanceboss_ps": 10
+    "enhanceboss_ps": 10,
+    "plunder_pvp_battlereadyid": 105
   }
 ]

bin/json/game_loading.json

@@ -475,6 +475,20 @@
       "text": "守护与被守护，永远是相互的。"
     }
   },
+  {
+    "scene": "MainLineScene",
+    "subScene": "12001",
+    "image": "ld_mh_bg_fc",
+    "icon": "loading_icon_fc",
+    "title": {
+      "key": "loading_Sheet1_title_23",
+      "text": "「博克岛」"
+    },
+    "prompt": {
+      "key": "loading_Sheet1_prompt_11",
+      "text": "这里是博克岛。</br>一般来说，这个板块会介绍气候、风土、民俗什么的；但提起博克岛，你需要知道的只有——龙！"
+    }
+  },
   {
     "scene": "LoginScene",
     "subScene": "",

bin/json/game_mainboss.json

@@ -2518,5 +2518,215 @@
         "n": 1
       }
     ]
+  },
+  {
+    "id": 1200101,
+    "monster_chapter": 12001,
+    "monster_strength": 1,
+    "battlereadyid": 10500003,
+    "formatList": [
+      302013
+    ],
+    "reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "10000003",
+        "n": 1
+      }
+    ]
+  },
+  {
+    "id": 1200102,
+    "monster_chapter": 12001,
+    "monster_strength": 2,
+    "battlereadyid": 10500003,
+    "formatList": [
+      302016
+    ],
+    "reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "10000003",
+        "n": 1
+      }
+    ]
+  },
+  {
+    "id": 1200103,
+    "monster_chapter": 12001,
+    "monster_strength": 3,
+    "battlereadyid": 10500003,
+    "formatList": [
+      302019
+    ],
+    "reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "10000003",
+        "n": 1
+      }
+    ]
+  },
+  {
+    "id": 1200104,
+    "monster_chapter": 12001,
+    "monster_strength": 4,
+    "battlereadyid": 10500003,
+    "formatList": [
+      302022
+    ],
+    "reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "10000003",
+        "n": 1
+      }
+    ]
+  },
+  {
+    "id": 1200105,
+    "monster_chapter": 12001,
+    "monster_strength": 5,
+    "battlereadyid": 10500003,
+    "formatList": [
+      302025
+    ],
+    "reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "10000003",
+        "n": 1
+      }
+    ]
+  },
+  {
+    "id": 1200106,
+    "monster_chapter": 12001,
+    "monster_strength": 6,
+    "battlereadyid": 10500003,
+    "formatList": [
+      302028
+    ],
+    "reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "10000003",
+        "n": 1
+      }
+    ]
+  },
+  {
+    "id": 1200107,
+    "monster_chapter": 12001,
+    "monster_strength": 7,
+    "battlereadyid": 10500003,
+    "formatList": [
+      302031
+    ],
+    "reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "10000003",
+        "n": 1
+      }
+    ]
+  },
+  {
+    "id": 1200108,
+    "monster_chapter": 12001,
+    "monster_strength": 8,
+    "battlereadyid": 10500003,
+    "formatList": [
+      302034
+    ],
+    "reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "10000003",
+        "n": 1
+      }
+    ]
+  },
+  {
+    "id": 1200109,
+    "monster_chapter": 12001,
+    "monster_strength": 9,
+    "battlereadyid": 10500003,
+    "formatList": [
+      302037
+    ],
+    "reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "10000003",
+        "n": 1
+      }
+    ]
+  },
+  {
+    "id": 1200110,
+    "monster_chapter": 12001,
+    "monster_strength": 10,
+    "battlereadyid": 10500003,
+    "formatList": [
+      302040
+    ],
+    "reward": [
+      {
+        "a": "item",
+        "t": "10000001",
+        "n": 1
+      },
+      {
+        "a": "item",
+        "t": "10000003",
+        "n": 1
+      }
+    ]
   }
 ]

bin/json/game_mainchapter.json

@@ -44,6 +44,51 @@
     "bosspng": "zxgq_boss_001",
     "image": "zx_cjsp_img_14003"
   },
+  {
+    "id": 12001,
+    "reward": {
+      "a": "item",
+      "t": "10000001",
+      "n": 3
+    },
+    "describe": {
+      "key": "mainchapter_main_chapter_describe_13",
+      "text": "通关获得奖励。"
+    },
+    "achunlock": 11001001,
+    "venturecurrency": [
+      {
+        "a": "item",
+        "t": "24041001",
+        "n": 1
+      }
+    ],
+    "name": {
+      "key": "mainchapter_main_chapter_name_13",
+      "text": "希卡普的故事"
+    },
+    "worldname": {
+      "key": "mainchapter_main_chapter_worldname_1",
+      "text": "极北龙岛群"
+    },
+    "map": "scenes_chapter_05_spur",
+    "title": {
+      "key": "mainchapter_main_chapter_title_13",
+      "text": "01"
+    },
+    "desc": {
+      "key": "mainchapter_main_chapter_desc_13",
+      "text": "可是在一场特殊的比武大会上胜出的人要代表“和平谷”将邪恶的大龙永久地驱除出去，啥都不会的阿宝却在经历了一系列阴差阳错之后屏雀中选，让所有人都大跌眼镜。"
+    },
+    "starreward": 14001,
+    "exploreward": 14001,
+    "bosspro": 1,
+    "models": [
+      25001
+    ],
+    "bosspng": "zxgq_boss_001",
+    "image": "zx_cjsp_img_44005"
+  },
   {
     "id": 11002,
     "reward": {

bin/json/game_mainventure.json

@@ -238,5 +238,129 @@
       "text": "Boss挑战"
     },
     "jumpidList": []
+  },
+  {
+    "chapterid": 12001,
+    "pos": 0,
+    "venturetext": {
+      "key": "mainchapter_main_venture_venturetext_1",
+      "text": "藏宝图"
+    },
+    "jumpidList": [
+      10066
+    ]
+  },
+  {
+    "chapterid": 12001,
+    "pos": 1,
+    "venturetext": {
+      "key": "mainchapter_main_venture_venturetext_2",
+      "text": "驯龙"
+    },
+    "jumpidList": [
+      10045
+    ]
+  },
+  {
+    "chapterid": 12001,
+    "pos": 2,
+    "venturetext": {
+      "key": "mainchapter_main_venture_venturetext_3",
+      "text": "捕羊大赛"
+    },
+    "jumpidList": [
+      10042
+    ]
+  },
+  {
+    "chapterid": 12001,
+    "pos": 3,
+    "venturetext": {
+      "key": "mainchapter_main_venture_venturetext_4",
+      "text": "驯龙篇秘宝"
+    },
+    "jumpidList": [
+      10044
+    ]
+  },
+  {
+    "chapterid": 12001,
+    "pos": 4,
+    "venturetext": {
+      "key": "mainchapter_main_venture_venturetext_5",
+      "text": "埃雷特的试炼"
+    },
+    "jumpidList": []
+  },
+  {
+    "chapterid": 12001,
+    "pos": 5,
+    "venturetext": {
+      "key": "mainchapter_main_venture_venturetext_6",
+      "text": "Boss挑战"
+    },
+    "jumpidList": []
+  },
+  {
+    "chapterid": 12002,
+    "pos": 0,
+    "venturetext": {
+      "key": "mainchapter_main_venture_venturetext_7",
+      "text": "藏宝图"
+    },
+    "jumpidList": [
+      10066
+    ]
+  },
+  {
+    "chapterid": 12002,
+    "pos": 1,
+    "venturetext": {
+      "key": "mainchapter_main_venture_venturetext_8",
+      "text": "捉虫子"
+    },
+    "jumpidList": [
+      10068
+    ]
+  },
+  {
+    "chapterid": 12002,
+    "pos": 2,
+    "venturetext": {
+      "key": "mainchapter_main_venture_venturetext_9",
+      "text": "石阵秘境"
+    },
+    "jumpidList": [
+      10027
+    ]
+  },
+  {
+    "chapterid": 12002,
+    "pos": 3,
+    "venturetext": {
+      "key": "mainchapter_main_venture_venturetext_10",
+      "text": "原始人秘宝"
+    },
+    "jumpidList": [
+      10044
+    ]
+  },
+  {
+    "chapterid": 12002,
+    "pos": 4,
+    "venturetext": {
+      "key": "mainchapter_main_venture_venturetext_11",
+      "text": "精英挑战"
+    },
+    "jumpidList": []
+  },
+  {
+    "chapterid": 12002,
+    "pos": 5,
+    "venturetext": {
+      "key": "mainchapter_main_venture_venturetext_12",
+      "text": "Boss挑战"
+    },
+    "jumpidList": []
   }
 ]

bin/json/game_monsterformat.json

@@ -123756,12 +123756,12 @@
     "newskill": [],
     "lv": 65,
     "hppro": 20,
-    "atkpro": 0.5,
+    "atkpro": 1.5,
-    "defpro": 0.8,
+    "defpro": 1,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
-    "speed": 105,
+    "speed": 160,
     "modelsize": 1
   },
   {
@@ -123775,13 +123775,13 @@
     "equip": [],
     "newskill": [],
     "lv": 65,
-    "hppro": 22,
+    "hppro": 20,
     "atkpro": 1.6,
-    "defpro": 0.5,
+    "defpro": 1,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
-    "speed": 104,
+    "speed": 150,
     "modelsize": 1
   },
   {
@@ -123796,12 +123796,12 @@
     "newskill": [],
     "lv": 65,
     "hppro": 20,
-    "atkpro": 0.5,
+    "atkpro": 1.5,
-    "defpro": 0.8,
+    "defpro": 1,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
-    "speed": 114,
+    "speed": 155,
     "modelsize": 1
   },
   {
@@ -127361,7 +127361,7 @@
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
-    "speed": 105,
+    "speed": 155,
     "modelsize": 1
   },
   {
@@ -127375,13 +127375,13 @@
     "equip": [],
     "newskill": [],
     "lv": 65,
-    "hppro": 25,
+    "hppro": 22,
-    "atkpro": 6.5,
+    "atkpro": 3.5,
     "defpro": 0.5,
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
-    "speed": 135,
+    "speed": 145,
     "modelsize": 1
   },
   {
@@ -127401,7 +127401,7 @@
     "skill1": 1,
     "skill2": 1,
     "skill3": 1,
-    "speed": 114,
+    "speed": 155,
     "modelsize": 1
   },
   {

bin/json/game_msgdistrib.json

@@ -178,5 +178,11 @@
     "open": true,
     "routrules": "~/worker",
     "describe": "积分boss"
+  },
+  {
+    "msgid": "plunder",
+    "open": true,
+    "routrules": "~/worker",
+    "describe": "掠夺"
   }
 ]

bin/json/game_skillafteratk.json

@@ -9128,13 +9128,13 @@
     "Where": [],
     "Order": "",
     "Limit": 10,
-    "ExecuteCnt": 6,
+    "ExecuteCnt": 3,
     "TriggerAnim": "",
     "Type": 1,
     "Argu": [
       1,
       5,
-      500
+      1000
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -9152,13 +9152,13 @@
     "Where": [],
     "Order": "",
     "Limit": 10,
-    "ExecuteCnt": 3,
+    "ExecuteCnt": 2,
     "TriggerAnim": "",
     "Type": 1,
     "Argu": [
       1,
       5,
-      800
+      1250
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -9231,13 +9231,13 @@
     "Where": [],
     "Order": "",
     "Limit": 10,
-    "ExecuteCnt": 6,
+    "ExecuteCnt": 3,
     "TriggerAnim": "",
     "Type": 1,
     "Argu": [
       1,
       5,
-      400
+      1100
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -9255,13 +9255,13 @@
     "Where": [],
     "Order": "",
     "Limit": 10,
-    "ExecuteCnt": 3,
+    "ExecuteCnt": 2,
     "TriggerAnim": "",
     "Type": 1,
     "Argu": [
       1,
       5,
-      550
+      1250
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -9334,13 +9334,13 @@
     "Where": [],
     "Order": "",
     "Limit": 10,
-    "ExecuteCnt": 6,
+    "ExecuteCnt": 3,
     "TriggerAnim": "",
     "Type": 1,
     "Argu": [
       1,
       5,
-      400
+      1200
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -9358,13 +9358,13 @@
     "Where": [],
     "Order": "",
     "Limit": 10,
-    "ExecuteCnt": 3,
+    "ExecuteCnt": 2,
     "TriggerAnim": "",
     "Type": 1,
     "Argu": [
       1,
       5,
-      550
+      1250
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -9437,13 +9437,13 @@
     "Where": [],
     "Order": "",
     "Limit": 10,
-    "ExecuteCnt": 6,
+    "ExecuteCnt": 3,
     "TriggerAnim": "",
     "Type": 1,
     "Argu": [
       1,
       5,
-      400
+      1200
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -9461,13 +9461,13 @@
     "Where": [],
     "Order": "",
     "Limit": 10,
-    "ExecuteCnt": 3,
+    "ExecuteCnt": 2,
     "TriggerAnim": "",
     "Type": 1,
     "Argu": [
       1,
       5,
-      700
+      1300
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -9540,13 +9540,13 @@
     "Where": [],
     "Order": "",
     "Limit": 10,
-    "ExecuteCnt": 6,
+    "ExecuteCnt": 3,
     "TriggerAnim": "",
     "Type": 1,
     "Argu": [
       1,
       5,
-      400
+      1200
     ],
     "FollowSK": [],
     "SucFollowSK": [],
@@ -9564,13 +9564,13 @@
     "Where": [],
     "Order": "",
     "Limit": 10,
-    "ExecuteCnt": 3,
+    "ExecuteCnt": 2,
     "TriggerAnim": "",
     "Type": 1,
     "Argu": [
       1,
       5,
-      750
+      1350
     ],
     "FollowSK": [],
     "SucFollowSK": [
@@ -31012,7 +31012,7 @@
     "Argu": [
       390001415,
       1000,
-      1,
+      2,
       -1
     ],
     "FollowSK": [],
@@ -31111,7 +31111,7 @@
     "Argu": [
       390001415,
       1000,
-      10,
+      15,
       -1
     ],
     "FollowSK": [],
@@ -31241,7 +31241,32 @@
     "Argu": [
       1,
       4,
-      3600
+      4500
+    ],
+    "FollowSK": [],
+    "SucFollowSK": [],
+    "FailFollowSK": [],
+    "MustHit": false,
+    "DpsRevisiType": 0,
+    "DpsCondition": "",
+    "RevisiCondition": "",
+    "RevisiParams": []
+  },
+  {
+    "Id": 255007320,
+    "EmitPR": 1000,
+    "From": 3,
+    "Where": [],
+    "Order": "",
+    "Limit": 10,
+    "ExecuteCnt": 1,
+    "TriggerAnim": "",
+    "Type": 3,
+    "Argu": [
+      390001415,
+      1000,
+      5,
+      -1
     ],
     "FollowSK": [],
     "SucFollowSK": [],

bin/json/game_skillatk.json

@@ -24403,12 +24403,12 @@
       "Id": [
         255001211,
         255001213,
-        255005215
+        255001215
       ]
     },
     "passSkill": [
       255001211,
-      255005215
+      255001215
     ],
     "Desc": {
       "key": "skill_skill_atk_Desc_155001211_1",
@@ -24820,7 +24820,7 @@
     "IsMelee": 0,
     "act": "Skill_2",
     "Type": 1,
-    "CD": 2,
+    "CD": 0,
     "Where": [
       "SelfHasBuff=390001415"
     ],
@@ -24903,7 +24903,8 @@
     "ChildSkill": {
       "Id": [
         255007315,
-        255007319
+        255007319,
+        255007320
       ]
     },
     "passSkill": [],

bin/json/game_skillbuff.json

@@ -4989,7 +4989,7 @@
     "RemoveType": false,
     "Priority": 0,
     "NotOverlay": 0,
-    "OverlayTimes": 6,
+    "OverlayTimes": 10,
     "SameID": false,
     "golbalbufficon": "",
     "buffIcon": "ty_icon_buff_shts15",

bin/json/game_skillpassive.json

@@ -2544,8 +2544,8 @@
     },
     "icon": "jn_55005_2",
     "When": 21,
-    "FromCheck": "",
+    "FromCheck": "Target=3",
-    "TargetCheck": "",
+    "TargetCheck": "Target=3",
     "MainSkillCheck": "",
     "AfterSkillCheck": "",
     "BuffCheck": "",

bin/json/game_worldtask.json

@@ -8698,7 +8698,7 @@
   {
     "key": 300010,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 20364,
     "id_after": 300011,
@@ -8744,7 +8744,7 @@
   {
     "key": 300011,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 300010,
     "id_after": 300020,
@@ -8790,7 +8790,7 @@
   {
     "key": 300020,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 300011,
     "id_after": 0,
@@ -8838,7 +8838,7 @@
   {
     "key": 300030,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 20250,
     "id_after": 0,
@@ -8884,7 +8884,7 @@
   {
     "key": 300031,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 20114,
     "id_after": 0,
@@ -8932,7 +8932,7 @@
   {
     "key": 300040,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 20124,
     "id_after": 300050,
@@ -8986,7 +8986,7 @@
   {
     "key": 300050,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 300040,
     "id_after": 300060,
@@ -9034,7 +9034,7 @@
   {
     "key": 300060,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 300050,
     "id_after": 300070,
@@ -9082,7 +9082,7 @@
   {
     "key": 300070,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 300060,
     "id_after": 300080,
@@ -9128,7 +9128,7 @@
   {
     "key": 300080,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 300070,
     "id_after": 300090,
@@ -9174,7 +9174,7 @@
   {
     "key": 300090,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 300080,
     "id_after": 0,
@@ -9220,7 +9220,7 @@
   {
     "key": 300100,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 20118,
     "id_after": 0,
@@ -9266,7 +9266,7 @@
   {
     "key": 300101,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 20252,
     "id_after": 0,
@@ -9320,7 +9320,7 @@
   {
     "key": 300102,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 20255,
     "id_after": 300103,
@@ -9368,7 +9368,7 @@
   {
     "key": 300103,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 300102,
     "id_after": 0,
@@ -9416,7 +9416,7 @@
   {
     "key": 300104,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 20257,
     "id_after": 0,
@@ -9470,7 +9470,7 @@
   {
     "key": 300105,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 20109,
     "id_after": 0,
@@ -9512,7 +9512,7 @@
   {
     "key": 300106,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 20109,
     "id_after": 0,
@@ -9554,7 +9554,7 @@
   {
     "key": 320110,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 20250,
     "id_after": 0,
@@ -9602,7 +9602,7 @@
   {
     "key": 320120,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 20250,
     "id_after": 0,
@@ -9650,7 +9650,7 @@
   {
     "key": 320130,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 20250,
     "id_after": 0,
@@ -9696,7 +9696,7 @@
   {
     "key": 320140,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 20250,
     "id_after": 0,
@@ -9742,7 +9742,7 @@
   {
     "key": 320150,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 21190,
     "id_after": 0,
@@ -9788,7 +9788,7 @@
   {
     "key": 320160,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 21190,
     "id_after": 320161,
@@ -9836,7 +9836,7 @@
   {
     "key": 320161,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 320160,
     "id_after": 0,
@@ -9884,7 +9884,7 @@
   {
     "key": 320170,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 21190,
     "id_after": 0,
@@ -9932,7 +9932,7 @@
   {
     "key": 320180,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 20250,
     "id_after": 0,
@@ -9978,7 +9978,7 @@
   {
     "key": 320190,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 20250,
     "id_after": 0,
@@ -10024,7 +10024,7 @@
   {
     "key": 320200,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 20250,
     "id_after": 0,
@@ -10070,7 +10070,7 @@
   {
     "key": 320210,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 20250,
     "id_after": 0,
@@ -10116,7 +10116,7 @@
   {
     "key": 320220,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 20250,
     "id_after": 0,
@@ -10162,7 +10162,7 @@
   {
     "key": 320230,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 20250,
     "id_after": 320231,
@@ -10208,7 +10208,7 @@
   {
     "key": 320231,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 320230,
     "id_after": 0,
@@ -10254,7 +10254,7 @@
   {
     "key": 320240,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 20250,
     "id_after": 0,
@@ -10300,7 +10300,7 @@
   {
     "key": 320250,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 20250,
     "id_after": 0,
@@ -10346,7 +10346,7 @@
   {
     "key": 320260,
     "opencond": [],
-    "lock": 1,
+    "lock": 999,
     "lockend": 999,
     "ontxe": 20250,
     "id_after": 0,

sys/configure/structs/game.globalData.go

@@ -280,6 +280,7 @@ type GameGlobalData struct {
     TdDailystageChallengeNumMax int32
     GuildSignIn int32
     EnhancebossPs int32
+    PlunderPvpBattlereadyid int32
 }
 
 const TypeId_GameGlobalData = 477542761
@@ -1091,6 +1092,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
     { 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["plunder_pvp_battlereadyid"].(float64); !_ok_ { err = errors.New("plunder_pvp_battlereadyid error"); return }; _v.PlunderPvpBattlereadyid = int32(_tempNum_) }
     return
 }