上传配置文件

bin/json/game_fightglobalevent.json

@@ -2,6 +2,7 @@
   {
     "Id": 1,
     "Count": 1,
+    "LoopTime": 0,
     "desc": {
       "key": "teach_task_10001",
       "text": "使用<img src='ui://icon/jn_icon_x003' width='20' height='20'/>攻击全体敌人，并吸收敌人的行动值。"
@@ -20,6 +21,7 @@
   {
     "Id": 2,
     "Count": 1,
+    "LoopTime": 0,
     "desc": {
       "key": "teach_task_10002",
       "text": "使用<img src='ui://icon/jn_icon_x001' width='20' height='20'/>击杀首领，并获得生命值恢复。"
@@ -38,6 +40,7 @@
   {
     "Id": 3,
     "Count": 1,
+    "LoopTime": 0,
     "desc": {
       "key": "teach_task_10003",
       "text": "获得本次战斗胜利。"
@@ -56,6 +59,7 @@
   {
     "Id": 4,
     "Count": 1,
+    "LoopTime": 0,
     "desc": {
       "key": "teach_task_10001",
       "text": "使用<img src='ui://icon/jn_icon_x003' width='20' height='20'/>攻击全体敌人，并吸收敌人的行动值。"
@@ -74,6 +78,7 @@
   {
     "Id": 5,
     "Count": 1,
+    "LoopTime": 0,
     "desc": {
       "key": "teach_task_10002",
       "text": "使用<img src='ui://icon/jn_icon_x001' width='20' height='20'/>击杀首领，并获得生命值恢复。"
@@ -92,6 +97,7 @@
   {
     "Id": 6,
     "Count": 1,
+    "LoopTime": 0,
     "desc": {
       "key": "teach_task_10003",
       "text": "获得本次战斗胜利。"
@@ -110,6 +116,7 @@
   {
     "Id": 7,
     "Count": 1,
+    "LoopTime": 0,
     "desc": {
       "key": "teach_task_10001",
       "text": "使用<img src='ui://icon/jn_icon_x003' width='20' height='20'/>攻击全体敌人，并吸收敌人的行动值。"
@@ -128,6 +135,7 @@
   {
     "Id": 8,
     "Count": 1,
+    "LoopTime": 0,
     "desc": {
       "key": "teach_task_10002",
       "text": "使用<img src='ui://icon/jn_icon_x001' width='20' height='20'/>击杀首领，并获得生命值恢复。"
@@ -146,6 +154,7 @@
   {
     "Id": 9,
     "Count": 1,
+    "LoopTime": 0,
     "desc": {
       "key": "teach_task_10003",
       "text": "获得本次战斗胜利。"
@@ -164,6 +173,7 @@
   {
     "Id": 10,
     "Count": 1,
+    "LoopTime": 0,
     "desc": {
       "key": "teach_task_10001",
       "text": "使用<img src='ui://icon/jn_icon_x003' width='20' height='20'/>攻击全体敌人，并吸收敌人的行动值。"
@@ -182,6 +192,7 @@
   {
     "Id": 11,
     "Count": 1,
+    "LoopTime": 0,
     "desc": {
       "key": "teach_task_10002",
       "text": "使用<img src='ui://icon/jn_icon_x001' width='20' height='20'/>击杀首领，并获得生命值恢复。"
@@ -200,6 +211,7 @@
   {
     "Id": 12,
     "Count": 1,
+    "LoopTime": 0,
     "desc": {
       "key": "teach_task_10002",
       "text": "使用<img src='ui://icon/jn_icon_x001' width='20' height='20'/>击杀首领，并获得生命值恢复。"
@@ -218,6 +230,7 @@
   {
     "Id": 13,
     "Count": 1,
+    "LoopTime": 0,
     "desc": {
       "key": "teach_task_10002",
       "text": "使用<img src='ui://icon/jn_icon_x001' width='20' height='20'/>击杀首领，并获得生命值恢复。"
@@ -238,6 +251,7 @@
   {
     "Id": 14,
     "Count": 1,
+    "LoopTime": 0,
     "desc": {
       "key": "teach_task_10002",
       "text": "使用<img src='ui://icon/jn_icon_x001' width='20' height='20'/>击杀首领，并获得生命值恢复。"
@@ -256,5 +270,281 @@
       0,
       225001312
     ]
+  },
+  {
+    "Id": 15,
+    "Count": 1,
+    "LoopTime": 1,
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "When": 1,
+    "FromCheck": "",
+    "TargetCheck": "",
+    "MainSkillCheck": "",
+    "AfterSkillCheck": "",
+    "BuffCheck": "",
+    "FightEndCheck": "",
+    "AddCon": [
+      "WaveGreater=1"
+    ],
+    "Execution": 1,
+    "Args": [
+      1,
+      0,
+      200004001
+    ]
+  },
+  {
+    "Id": 16,
+    "Count": 1,
+    "LoopTime": 0,
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "When": 18,
+    "FromCheck": "",
+    "TargetCheck": "Side=1",
+    "MainSkillCheck": "",
+    "AfterSkillCheck": "",
+    "BuffCheck": "BuffID=390001001",
+    "FightEndCheck": "",
+    "AddCon": [],
+    "Execution": 0,
+    "Args": []
+  },
+  {
+    "Id": 17,
+    "Count": 1,
+    "LoopTime": 0,
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "When": 18,
+    "FromCheck": "",
+    "TargetCheck": "Side=2",
+    "MainSkillCheck": "",
+    "AfterSkillCheck": "",
+    "BuffCheck": "BuffID=390001007",
+    "FightEndCheck": "",
+    "AddCon": [],
+    "Execution": 0,
+    "Args": []
+  },
+  {
+    "Id": 18,
+    "Count": 1,
+    "LoopTime": 0,
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "When": 18,
+    "FromCheck": "",
+    "TargetCheck": "Side=1",
+    "MainSkillCheck": "",
+    "AfterSkillCheck": "",
+    "BuffCheck": "BuffID=390001002",
+    "FightEndCheck": "",
+    "AddCon": [],
+    "Execution": 0,
+    "Args": []
+  },
+  {
+    "Id": 19,
+    "Count": 1,
+    "LoopTime": 0,
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "When": 18,
+    "FromCheck": "",
+    "TargetCheck": "Side=2",
+    "MainSkillCheck": "",
+    "AfterSkillCheck": "",
+    "BuffCheck": "BuffID=390001001",
+    "FightEndCheck": "",
+    "AddCon": [],
+    "Execution": 0,
+    "Args": []
+  },
+  {
+    "Id": 20,
+    "Count": 1,
+    "LoopTime": 0,
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "When": 14,
+    "FromCheck": "",
+    "TargetCheck": "Side=2",
+    "MainSkillCheck": "MainSkillID=153003211",
+    "AfterSkillCheck": "",
+    "BuffCheck": "",
+    "FightEndCheck": "",
+    "AddCon": [],
+    "Execution": 0,
+    "Args": []
+  },
+  {
+    "Id": 21,
+    "Count": 1,
+    "LoopTime": 0,
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "When": 25,
+    "FromCheck": "",
+    "TargetCheck": "",
+    "MainSkillCheck": "",
+    "AfterSkillCheck": "",
+    "BuffCheck": "",
+    "FightEndCheck": "",
+    "AddCon": [],
+    "Execution": 4,
+    "Args": [
+      1
+    ]
+  },
+  {
+    "Id": 22,
+    "Count": 2,
+    "LoopTime": 0,
+    "desc": {
+      "key": "",
+      "text": ""
+    },
+    "When": 25,
+    "FromCheck": "",
+    "TargetCheck": "",
+    "MainSkillCheck": "",
+    "AfterSkillCheck": "",
+    "BuffCheck": "",
+    "FightEndCheck": "",
+    "AddCon": [],
+    "Execution": 4,
+    "Args": [
+      3
+    ]
+  },
+  {
+    "Id": 101,
+    "Count": 1,
+    "LoopTime": 0,
+    "desc": {
+      "key": "teach_task_101",
+      "text": "使用<img src='ui://icon/jn_icon_005' width='20' height='20'/>给我方增加【攻击提升】状态。"
+    },
+    "When": 18,
+    "FromCheck": "",
+    "TargetCheck": "Side=1",
+    "MainSkillCheck": "",
+    "AfterSkillCheck": "",
+    "BuffCheck": "BuffID=390001001",
+    "FightEndCheck": "",
+    "AddCon": [],
+    "Execution": 0,
+    "Args": []
+  },
+  {
+    "Id": 102,
+    "Count": 1,
+    "LoopTime": 0,
+    "desc": {
+      "key": "teach_task_102",
+      "text": "使用<img src='ui://icon/jn_icon_056' width='20' height='20'/>给敌方增加【防御下降】状态。"
+    },
+    "When": 18,
+    "FromCheck": "",
+    "TargetCheck": "Side=2",
+    "MainSkillCheck": "",
+    "AfterSkillCheck": "",
+    "BuffCheck": "BuffID=390001007",
+    "FightEndCheck": "",
+    "AddCon": [],
+    "Execution": 0,
+    "Args": []
+  },
+  {
+    "Id": 103,
+    "Count": 1,
+    "LoopTime": 0,
+    "desc": {
+      "key": "teach_task_103",
+      "text": "使用<img src='ui://icon/jn_icon_020' width='20' height='22'/>击杀首领。"
+    },
+    "When": 14,
+    "FromCheck": "",
+    "TargetCheck": "Side=2",
+    "MainSkillCheck": "MainSkillID=144005211",
+    "AfterSkillCheck": "",
+    "BuffCheck": "",
+    "FightEndCheck": "",
+    "AddCon": [],
+    "Execution": 0,
+    "Args": []
+  },
+  {
+    "Id": 104,
+    "Count": 1,
+    "LoopTime": 0,
+    "desc": {
+      "key": "teach_task_104",
+      "text": "使用<img src='ui://icon/jn_icon_024' width='20' height='20'/>给我方增加【护盾】和【免疫】状态。"
+    },
+    "When": 18,
+    "FromCheck": "",
+    "TargetCheck": "Side=1",
+    "MainSkillCheck": "",
+    "AfterSkillCheck": "",
+    "BuffCheck": "BuffID=390001111",
+    "FightEndCheck": "",
+    "AddCon": [],
+    "Execution": 0,
+    "Args": []
+  },
+  {
+    "Id": 105,
+    "Count": 1,
+    "LoopTime": 0,
+    "desc": {
+      "key": "teach_task_105",
+      "text": "使用<img src='ui://icon/jn_icon_012' width='20' height='20'/>给敌方增加【冰冻】状态。"
+    },
+    "When": 18,
+    "FromCheck": "",
+    "TargetCheck": "Side=2",
+    "MainSkillCheck": "",
+    "AfterSkillCheck": "",
+    "BuffCheck": "BuffID=390001106",
+    "FightEndCheck": "",
+    "AddCon": [],
+    "Execution": 0,
+    "Args": []
+  },
+  {
+    "Id": 106,
+    "Count": 1,
+    "LoopTime": 0,
+    "desc": {
+      "key": "teach_task_106",
+      "text": "使用<img src='ui://icon/jn_icon_018' width='20' height='22'/>击杀首领。"
+    },
+    "When": 14,
+    "FromCheck": "",
+    "TargetCheck": "Side=2",
+    "MainSkillCheck": "MainSkillID=135001311",
+    "AfterSkillCheck": "",
+    "BuffCheck": "",
+    "FightEndCheck": "",
+    "AddCon": [],
+    "Execution": 0,
+    "Args": []
   }
 ]

bin/json/game_item.json

@@ -2839,6 +2839,138 @@
       "text": "竞技场挑战券不足"
     }
   },
+  {
+    "id": "110001",
+    "name": {
+      "key": "itemname_110001",
+      "text": "木材"
+    },
+    "usetype": 3,
+    "color": 2,
+    "bagtype": 0,
+    "index": 12,
+    "special_type": 0,
+    "time": 0,
+    "effects": "",
+    "box_id": 0,
+    "synthetize_num": 0,
+    "access": [
+      140
+    ],
+    "use_skip": 140,
+    "upper_limit": 999,
+    "uselv": 0,
+    "isani": 0,
+    "star": 0,
+    "race": 0,
+    "img": "wp_icon_10012",
+    "ico": "wp_icon_10012",
+    "intr": {
+      "key": "itemdesc_110001",
+      "text": "散发着香气的木材，可以用来烹饪"
+    },
+    "sale": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1000
+      }
+    ],
+    "synthetize_deplete": [],
+    "decompose_deplete": [],
+    "tipstxt": {
+      "key": "itemtipstxt_110001",
+      "text": "木材不足"
+    }
+  },
+  {
+    "id": "110002",
+    "name": {
+      "key": "itemname_110002",
+      "text": "菜谱"
+    },
+    "usetype": 3,
+    "color": 2,
+    "bagtype": 0,
+    "index": 12,
+    "special_type": 0,
+    "time": 0,
+    "effects": "",
+    "box_id": 0,
+    "synthetize_num": 0,
+    "access": [
+      140
+    ],
+    "use_skip": 140,
+    "upper_limit": 999,
+    "uselv": 0,
+    "isani": 0,
+    "star": 0,
+    "race": 0,
+    "img": "wp_icon_10009",
+    "ico": "wp_icon_10009",
+    "intr": {
+      "key": "itemdesc_110002",
+      "text": "来自世界各地的菜谱，可以用来提升厨师等级"
+    },
+    "sale": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1000
+      }
+    ],
+    "synthetize_deplete": [],
+    "decompose_deplete": [],
+    "tipstxt": {
+      "key": "itemtipstxt_110002",
+      "text": "菜谱不足"
+    }
+  },
+  {
+    "id": "120001",
+    "name": {
+      "key": "itemname_120001",
+      "text": "铁矿"
+    },
+    "usetype": 2,
+    "color": 3,
+    "bagtype": 1,
+    "index": 3,
+    "special_type": 0,
+    "time": 0,
+    "effects": "",
+    "box_id": 0,
+    "synthetize_num": 0,
+    "access": [
+      122
+    ],
+    "use_skip": 0,
+    "upper_limit": 999,
+    "uselv": 0,
+    "isani": 0,
+    "star": 0,
+    "race": 0,
+    "img": "wp_icon_10002",
+    "ico": "wp_icon_10002",
+    "intr": {
+      "key": "itemdesc_120001",
+      "text": "把它交给铁矿，可以打造稀有装备"
+    },
+    "sale": [
+      {
+        "a": "attr",
+        "t": "gold",
+        "n": 1000
+      }
+    ],
+    "synthetize_deplete": [],
+    "decompose_deplete": [],
+    "tipstxt": {
+      "key": "itemtipstxt_120001",
+      "text": "铁矿不足"
+    }
+  },
   {
     "id": "513001",
     "name": {

bin/json/game_monster.json

@@ -10168,5 +10168,125 @@
     "skill2": 1,
     "skill3": 1,
     "speed": 100
+  },
+  {
+    "monster_id": 1000101,
+    "hero_id": "44005",
+    "name": {
+      "key": "hero_44005",
+      "text": "小伊"
+    },
+    "star": 4,
+    "equip2": 10,
+    "equip4": 1,
+    "skill1": 1,
+    "skill2": 1,
+    "skill3": 1,
+    "speed": 100
+  },
+  {
+    "monster_id": 1000102,
+    "hero_id": "25004",
+    "name": {
+      "key": "hero_25004",
+      "text": "波比"
+    },
+    "star": 5,
+    "equip2": 10,
+    "equip4": 1,
+    "skill1": 1,
+    "skill2": 1,
+    "skill3": 1,
+    "speed": 150
+  },
+  {
+    "monster_id": 1000103,
+    "hero_id": "45001",
+    "name": {
+      "key": "hero_45001",
+      "text": "乌龟大师"
+    },
+    "star": 5,
+    "equip2": 10,
+    "equip4": 1,
+    "skill1": 1,
+    "skill2": 1,
+    "skill3": 1,
+    "speed": 140
+  },
+  {
+    "monster_id": 1000104,
+    "hero_id": "35001",
+    "name": {
+      "key": "hero_35001",
+      "text": "师父"
+    },
+    "star": 5,
+    "equip2": 10,
+    "equip4": 1,
+    "skill1": 1,
+    "skill2": 1,
+    "skill3": 1,
+    "speed": 220
+  },
+  {
+    "monster_id": 1000201,
+    "hero_id": "15005",
+    "name": {
+      "key": "hero_15005",
+      "text": "亚历克斯"
+    },
+    "star": 5,
+    "equip2": 10,
+    "equip4": 1,
+    "skill1": 1,
+    "skill2": 1,
+    "skill3": 1,
+    "speed": 140
+  },
+  {
+    "monster_id": 1000202,
+    "hero_id": "34006",
+    "name": {
+      "key": "hero_34006",
+      "text": "冰霜杰克"
+    },
+    "star": 4,
+    "equip2": 10,
+    "equip4": 1,
+    "skill1": 1,
+    "skill2": 1,
+    "skill3": 1,
+    "speed": 150
+  },
+  {
+    "monster_id": 1000203,
+    "hero_id": "35001",
+    "name": {
+      "key": "hero_35001",
+      "text": "师父"
+    },
+    "star": 5,
+    "equip2": 10,
+    "equip4": 1,
+    "skill1": 1,
+    "skill2": 1,
+    "skill3": 1,
+    "speed": 120
+  },
+  {
+    "monster_id": 1000204,
+    "hero_id": "34006",
+    "name": {
+      "key": "hero_34006",
+      "text": "冰霜杰克"
+    },
+    "star": 4,
+    "equip2": 10,
+    "equip4": 1,
+    "skill1": 1,
+    "skill2": 1,
+    "skill3": 1,
+    "speed": 130
   }
 ]

bin/json/game_monsterformat.json

@@ -25,7 +25,7 @@
     "Id": 101011,
     "pos": 3,
     "captainId": 0,
-    "monster": 510023,
+    "monster": -1,
     "lv": 10,
     "hppro": 0.6,
     "atkpro": 1,
@@ -37,7 +37,7 @@
     "pos": 4,
     "captainId": 0,
     "monster": 240023,
-    "lv": 10,
+    "lv": 17,
     "hppro": 0.6,
     "atkpro": 1,
     "defpro": 0.8,
@@ -47,7 +47,7 @@
     "Id": 101011,
     "pos": 5,
     "captainId": 0,
-    "monster": 510023,
+    "monster": -1,
     "lv": 10,
     "hppro": 0.6,
     "atkpro": 1,
@@ -91,7 +91,7 @@
     "Id": 101021,
     "pos": 4,
     "captainId": 0,
-    "monster": 240023,
+    "monster": -1,
     "lv": 10,
     "hppro": 0.6,
     "atkpro": 1,
@@ -421,7 +421,7 @@
     "Id": 101052,
     "pos": 4,
     "captainId": 0,
-    "monster": 530013,
+    "monster": 250013,
     "lv": 14,
     "hppro": 0.6,
     "atkpro": 1,
@@ -1235,7 +1235,7 @@
     "Id": 102032,
     "pos": 3,
     "captainId": 0,
-    "monster": 530013,
+    "monster": 250013,
     "lv": 30,
     "hppro": 0.6,
     "atkpro": 1,
@@ -2280,7 +2280,7 @@
     "Id": 103032,
     "pos": 3,
     "captainId": 0,
-    "monster": 530013,
+    "monster": 250013,
     "lv": 48,
     "hppro": 0.6,
     "atkpro": 1,
@@ -3325,7 +3325,7 @@
     "Id": 104032,
     "pos": 3,
     "captainId": 0,
-    "monster": 530013,
+    "monster": 250013,
     "lv": 67,
     "hppro": 0.6,
     "atkpro": 1,
@@ -4370,7 +4370,7 @@
     "Id": 105032,
     "pos": 3,
     "captainId": 0,
-    "monster": 530013,
+    "monster": 250013,
     "lv": 60,
     "hppro": 0.6,
     "atkpro": 1,
@@ -5415,7 +5415,7 @@
     "Id": 106032,
     "pos": 3,
     "captainId": 0,
-    "monster": 530013,
+    "monster": 250013,
     "lv": 60,
     "hppro": 0.6,
     "atkpro": 1,
@@ -6460,7 +6460,7 @@
     "Id": 107032,
     "pos": 3,
     "captainId": 0,
-    "monster": 530013,
+    "monster": 250013,
     "lv": 60,
     "hppro": 0.6,
     "atkpro": 1,
@@ -7505,7 +7505,7 @@
     "Id": 108032,
     "pos": 3,
     "captainId": 0,
-    "monster": 530013,
+    "monster": 250013,
     "lv": 60,
     "hppro": 0.6,
     "atkpro": 1,
@@ -8550,7 +8550,7 @@
     "Id": 109032,
     "pos": 3,
     "captainId": 0,
-    "monster": 530013,
+    "monster": 250013,
     "lv": 60,
     "hppro": 0.6,
     "atkpro": 1,
@@ -9595,7 +9595,7 @@
     "Id": 110032,
     "pos": 3,
     "captainId": 0,
-    "monster": 530013,
+    "monster": 250013,
     "lv": 60,
     "hppro": 0.6,
     "atkpro": 1,
@@ -10640,7 +10640,7 @@
     "Id": 111032,
     "pos": 3,
     "captainId": 0,
-    "monster": 530013,
+    "monster": 250013,
     "lv": 60,
     "hppro": 0.6,
     "atkpro": 1,
@@ -11685,7 +11685,7 @@
     "Id": 112032,
     "pos": 3,
     "captainId": 0,
-    "monster": 530013,
+    "monster": 250013,
     "lv": 60,
     "hppro": 0.6,
     "atkpro": 1,
@@ -73956,7 +73956,7 @@
     "Id": 700015,
     "pos": 4,
     "captainId": 0,
-    "monster": 530013,
+    "monster": 250013,
     "lv": 10,
     "hppro": 1.2,
     "atkpro": 1.5,
@@ -74589,5 +74589,126 @@
     "atkpro": 1,
     "defpro": 0.8,
     "modelsize": 1
+  },
+  {
+    "Id": 710101,
+    "pos": 1,
+    "captainId": 0,
+    "monster": 1000101,
+    "lv": 10,
+    "hppro": 1,
+    "atkpro": 1.7,
+    "defpro": 1,
+    "modelsize": 1
+  },
+  {
+    "Id": 710101,
+    "pos": 2,
+    "captainId": 0,
+    "monster": 1000102,
+    "lv": 10,
+    "hppro": 1,
+    "atkpro": 0.5,
+    "defpro": 1,
+    "modelsize": 1
+  },
+  {
+    "Id": 710101,
+    "pos": 3,
+    "captainId": 0,
+    "monster": 1000103,
+    "lv": 10,
+    "hppro": 1,
+    "atkpro": 0.5,
+    "defpro": 1,
+    "modelsize": 1
+  },
+  {
+    "Id": 710102,
+    "pos": 3,
+    "captainId": 0,
+    "monster": 1000104,
+    "lv": 10,
+    "hppro": 1,
+    "atkpro": 4,
+    "defpro": 1,
+    "modelsize": 1
+  },
+  {
+    "Id": 710201,
+    "pos": 1,
+    "captainId": 0,
+    "monster": 1000201,
+    "lv": 15,
+    "hppro": 1,
+    "atkpro": 0.5,
+    "defpro": 1,
+    "modelsize": 1
+  },
+  {
+    "Id": 710201,
+    "pos": 2,
+    "captainId": 0,
+    "monster": 1000202,
+    "lv": 15,
+    "hppro": 1,
+    "atkpro": 0.5,
+    "defpro": 1,
+    "modelsize": 1
+  },
+  {
+    "Id": 710201,
+    "pos": 3,
+    "captainId": 0,
+    "monster": 1000203,
+    "lv": 15,
+    "hppro": 1,
+    "atkpro": 5,
+    "defpro": 1,
+    "modelsize": 1
+  },
+  {
+    "Id": 710202,
+    "pos": 1,
+    "captainId": 0,
+    "monster": 1000204,
+    "lv": 10,
+    "hppro": 1,
+    "atkpro": 1,
+    "defpro": 1,
+    "modelsize": 1
+  },
+  {
+    "Id": 710202,
+    "pos": 2,
+    "captainId": 0,
+    "monster": 1000204,
+    "lv": 10,
+    "hppro": 1,
+    "atkpro": 1,
+    "defpro": 1,
+    "modelsize": 1
+  },
+  {
+    "Id": 710202,
+    "pos": 3,
+    "captainId": 0,
+    "monster": 1000204,
+    "lv": 10,
+    "hppro": 1,
+    "atkpro": 1,
+    "defpro": 1,
+    "modelsize": 1
+  },
+  {
+    "Id": 710202,
+    "pos": 4,
+    "captainId": 0,
+    "monster": 1000204,
+    "lv": 10,
+    "hppro": 1,
+    "atkpro": 1,
+    "defpro": 1,
+    "modelsize": 1
   }
 ]

bin/json/game_shop.json

@@ -55,11 +55,6 @@
       "text": ""
     },
     "needshow": [
-      {
-        "a": "attr",
-        "t": "friend",
-        "n": 1
-      },
       {
         "a": "attr",
         "t": "diamond",
@@ -72,7 +67,10 @@
     "rneed": [],
     "shopitem": [
       20001,
-      20002
+      20002,
+      20003,
+      20004,
+      20005
     ]
   },
   {

bin/json/game_shopitem.json

@@ -6121,6 +6121,114 @@
   },
   {
     "key": 171,
+    "id": 20003,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "110001",
+        "n": 10
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 50
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 999,
+    "buymaxnum": 999,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 172,
+    "id": 20004,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "110002",
+        "n": 10
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 50
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 999,
+    "buymaxnum": 999,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 173,
+    "id": 20005,
+    "iteminfo": [
+      {
+        "a": "item",
+        "t": "120001",
+        "n": 10
+      }
+    ],
+    "preview": false,
+    "probability": 1000,
+    "need": [
+      {
+        "a": "attr",
+        "t": "diamond",
+        "n": 50
+      }
+    ],
+    "sale": 1000,
+    "salelist": [
+      1000,
+      1000,
+      1000,
+      1000,
+      1000,
+      1000
+    ],
+    "buyminnum": 999,
+    "buymaxnum": 999,
+    "vip": 0,
+    "lvmin": 1,
+    "lvmax": 60,
+    "mapidmin": 101,
+    "mapidmax": 9999
+  },
+  {
+    "key": 174,
     "id": 30001,
     "iteminfo": [
       {
@@ -6156,7 +6264,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 172,
+    "key": 175,
     "id": 30002,
     "iteminfo": [
       {
@@ -6192,7 +6300,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 173,
+    "key": 176,
     "id": 30003,
     "iteminfo": [
       {
@@ -6228,7 +6336,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 174,
+    "key": 177,
     "id": 40001,
     "iteminfo": [
       {
@@ -6264,7 +6372,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 175,
+    "key": 178,
     "id": 40002,
     "iteminfo": [
       {
@@ -6300,7 +6408,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 176,
+    "key": 179,
     "id": 40003,
     "iteminfo": [
       {
@@ -6336,7 +6444,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 177,
+    "key": 180,
     "id": 40004,
     "iteminfo": [
       {
@@ -6372,7 +6480,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 178,
+    "key": 181,
     "id": 40005,
     "iteminfo": [
       {
@@ -6408,7 +6516,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 179,
+    "key": 182,
     "id": 40006,
     "iteminfo": [
       {
@@ -6444,7 +6552,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 180,
+    "key": 183,
     "id": 50001,
     "iteminfo": [
       {
@@ -6480,7 +6588,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 181,
+    "key": 184,
     "id": 50002,
     "iteminfo": [
       {
@@ -6516,7 +6624,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 182,
+    "key": 185,
     "id": 50003,
     "iteminfo": [
       {
@@ -6552,7 +6660,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 183,
+    "key": 186,
     "id": 50004,
     "iteminfo": [
       {
@@ -6588,7 +6696,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 184,
+    "key": 187,
     "id": 50005,
     "iteminfo": [
       {
@@ -6624,7 +6732,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 185,
+    "key": 188,
     "id": 50006,
     "iteminfo": [
       {
@@ -6660,7 +6768,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 186,
+    "key": 189,
     "id": 50007,
     "iteminfo": [
       {
@@ -6696,7 +6804,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 187,
+    "key": 190,
     "id": 1000001,
     "iteminfo": [
       {
@@ -6732,7 +6840,7 @@
     "mapidmax": 9999
   },
   {
-    "key": 188,
+    "key": 191,
     "id": 1000002,
     "iteminfo": [
       {

bin/json/game_teaching.json

@@ -1,9 +1,24 @@
 [
   {
     "id": 10001,
+    "tab": 1,
     "suittype": 1,
+    "png1": "buff_2",
+    "png1_text": {
+      "key": "TeachingPngTextbuff_2",
+      "text": "攻击上升"
+    },
+    "png2": "ty_zd_buff_j015",
+    "png2_text": {
+      "key": "TeachingPngTextty_zd_buff_j015",
+      "text": "防御下降"
+    },
+    "suitname": {
+      "key": "Teaching_suitname",
+      "text": "在实战中学习能够影响攻击力和防御力的技能作用"
+    },
     "desc": {
-      "key": "mainline_desc_10001",
+      "key": "Teaching_desc",
       "text": "在实战中学习能够影响攻击力和防御力的技能作用"
     },
     "tips": {
@@ -11,15 +26,15 @@
       "text": "在实战中学习能够影响攻击力和防御力的技能作用"
     },
     "task": [
-      1,
+      101,
-      2,
+      102,
-      3
+      103
     ],
     "us_FormatList": [
-      101072
+      710101
     ],
     "FormatList": [
-      101062
+      710102
     ],
     "award": [
       {
@@ -31,9 +46,24 @@
   },
   {
     "id": 10002,
+    "tab": 1,
     "suittype": 1,
+    "png1": "debuff_1",
+    "png1_text": {
+      "key": "TeachingPngTextdebuff_1",
+      "text": "冰冻"
+    },
+    "png2": "ty_zd_buff_z005",
+    "png2_text": {
+      "key": "TeachingPngTextty_zd_buff_z005",
+      "text": "免疫"
+    },
+    "suitname": {
+      "key": "Teaching_suitname",
+      "text": "在实战中学习能够影响攻击力和防御力的技能作用"
+    },
     "desc": {
-      "key": "mainline_desc_10001",
+      "key": "Teaching_desc",
       "text": "在实战中学习能够影响攻击力和防御力的技能作用"
     },
     "tips": {
@@ -41,15 +71,15 @@
       "text": "在实战中学习能够影响攻击力和防御力的技能作用"
     },
     "task": [
-      1,
+      104,
-      2,
+      105,
-      3
+      106
     ],
     "us_FormatList": [
-      101072
+      710201
     ],
     "FormatList": [
-      101062
+      710202
     ],
     "award": [
       {
@@ -61,9 +91,24 @@
   },
   {
     "id": 10003,
+    "tab": 1,
     "suittype": 1,
+    "png1": "buff_2",
+    "png1_text": {
+      "key": "TeachingPngTextbuff_2",
+      "text": "攻击上升"
+    },
+    "png2": "ty_zd_buff_j015",
+    "png2_text": {
+      "key": "TeachingPngTextty_zd_buff_j015",
+      "text": "防御下降"
+    },
+    "suitname": {
+      "key": "Teaching_suitname",
+      "text": "在实战中学习能够影响攻击力和防御力的技能作用"
+    },
     "desc": {
-      "key": "mainline_desc_10001",
+      "key": "Teaching_desc",
       "text": "在实战中学习能够影响攻击力和防御力的技能作用"
     },
     "tips": {
@@ -91,9 +136,24 @@
   },
   {
     "id": 20001,
+    "tab": 1,
     "suittype": 2,
+    "png1": "buff_2",
+    "png1_text": {
+      "key": "TeachingPngTextbuff_2",
+      "text": "攻击上升"
+    },
+    "png2": "ty_zd_buff_j015",
+    "png2_text": {
+      "key": "TeachingPngTextty_zd_buff_j015",
+      "text": "防御下降"
+    },
+    "suitname": {
+      "key": "Teaching_suitname",
+      "text": "在实战中学习能够影响攻击力和防御力的技能作用"
+    },
     "desc": {
-      "key": "mainline_desc_10001",
+      "key": "Teaching_desc",
       "text": "在实战中学习能够影响攻击力和防御力的技能作用"
     },
     "tips": {
@@ -121,9 +181,24 @@
   },
   {
     "id": 20002,
+    "tab": 1,
     "suittype": 2,
+    "png1": "buff_2",
+    "png1_text": {
+      "key": "TeachingPngTextbuff_2",
+      "text": "攻击上升"
+    },
+    "png2": "ty_zd_buff_j015",
+    "png2_text": {
+      "key": "TeachingPngTextty_zd_buff_j015",
+      "text": "防御下降"
+    },
+    "suitname": {
+      "key": "Teaching_suitname",
+      "text": "在实战中学习能够影响攻击力和防御力的技能作用"
+    },
     "desc": {
-      "key": "mainline_desc_10001",
+      "key": "Teaching_desc",
       "text": "在实战中学习能够影响攻击力和防御力的技能作用"
     },
     "tips": {
@@ -151,9 +226,24 @@
   },
   {
     "id": 20003,
+    "tab": 1,
     "suittype": 2,
+    "png1": "buff_2",
+    "png1_text": {
+      "key": "TeachingPngTextbuff_2",
+      "text": "攻击上升"
+    },
+    "png2": "ty_zd_buff_j015",
+    "png2_text": {
+      "key": "TeachingPngTextty_zd_buff_j015",
+      "text": "防御下降"
+    },
+    "suitname": {
+      "key": "Teaching_suitname",
+      "text": "在实战中学习能够影响攻击力和防御力的技能作用"
+    },
     "desc": {
-      "key": "mainline_desc_10001",
+      "key": "Teaching_desc",
       "text": "在实战中学习能够影响攻击力和防御力的技能作用"
     },
     "tips": {
@@ -181,9 +271,24 @@
   },
   {
     "id": 30001,
+    "tab": 1,
     "suittype": 3,
+    "png1": "buff_2",
+    "png1_text": {
+      "key": "TeachingPngTextbuff_2",
+      "text": "攻击上升"
+    },
+    "png2": "ty_zd_buff_j015",
+    "png2_text": {
+      "key": "TeachingPngTextty_zd_buff_j015",
+      "text": "防御下降"
+    },
+    "suitname": {
+      "key": "Teaching_suitname",
+      "text": "在实战中学习能够影响攻击力和防御力的技能作用"
+    },
     "desc": {
-      "key": "mainline_desc_10001",
+      "key": "Teaching_desc",
       "text": "在实战中学习能够影响攻击力和防御力的技能作用"
     },
     "tips": {
@@ -211,9 +316,24 @@
   },
   {
     "id": 30002,
+    "tab": 1,
     "suittype": 3,
+    "png1": "buff_2",
+    "png1_text": {
+      "key": "TeachingPngTextbuff_2",
+      "text": "攻击上升"
+    },
+    "png2": "ty_zd_buff_j015",
+    "png2_text": {
+      "key": "TeachingPngTextty_zd_buff_j015",
+      "text": "防御下降"
+    },
+    "suitname": {
+      "key": "Teaching_suitname",
+      "text": "在实战中学习能够影响攻击力和防御力的技能作用"
+    },
     "desc": {
-      "key": "mainline_desc_10001",
+      "key": "Teaching_desc",
       "text": "在实战中学习能够影响攻击力和防御力的技能作用"
     },
     "tips": {
@@ -241,9 +361,24 @@
   },
   {
     "id": 30003,
+    "tab": 1,
     "suittype": 3,
+    "png1": "buff_2",
+    "png1_text": {
+      "key": "TeachingPngTextbuff_2",
+      "text": "攻击上升"
+    },
+    "png2": "ty_zd_buff_j015",
+    "png2_text": {
+      "key": "TeachingPngTextty_zd_buff_j015",
+      "text": "防御下降"
+    },
+    "suitname": {
+      "key": "Teaching_suitname",
+      "text": "在实战中学习能够影响攻击力和防御力的技能作用"
+    },
     "desc": {
-      "key": "mainline_desc_10001",
+      "key": "Teaching_desc",
       "text": "在实战中学习能够影响攻击力和防御力的技能作用"
     },
     "tips": {
@@ -271,9 +406,24 @@
   },
   {
     "id": 40001,
+    "tab": 1,
     "suittype": 4,
+    "png1": "buff_2",
+    "png1_text": {
+      "key": "TeachingPngTextbuff_2",
+      "text": "攻击上升"
+    },
+    "png2": "ty_zd_buff_j015",
+    "png2_text": {
+      "key": "TeachingPngTextty_zd_buff_j015",
+      "text": "防御下降"
+    },
+    "suitname": {
+      "key": "Teaching_suitname",
+      "text": "在实战中学习能够影响攻击力和防御力的技能作用"
+    },
     "desc": {
-      "key": "mainline_desc_10001",
+      "key": "Teaching_desc",
       "text": "在实战中学习能够影响攻击力和防御力的技能作用"
     },
     "tips": {
@@ -301,9 +451,24 @@
   },
   {
     "id": 40002,
+    "tab": 1,
     "suittype": 4,
+    "png1": "buff_2",
+    "png1_text": {
+      "key": "TeachingPngTextbuff_2",
+      "text": "攻击上升"
+    },
+    "png2": "ty_zd_buff_j015",
+    "png2_text": {
+      "key": "TeachingPngTextty_zd_buff_j015",
+      "text": "防御下降"
+    },
+    "suitname": {
+      "key": "Teaching_suitname",
+      "text": "在实战中学习能够影响攻击力和防御力的技能作用"
+    },
     "desc": {
-      "key": "mainline_desc_10001",
+      "key": "Teaching_desc",
       "text": "在实战中学习能够影响攻击力和防御力的技能作用"
     },
     "tips": {
@@ -331,9 +496,24 @@
   },
   {
     "id": 40003,
+    "tab": 1,
     "suittype": 4,
+    "png1": "buff_2",
+    "png1_text": {
+      "key": "TeachingPngTextbuff_2",
+      "text": "攻击上升"
+    },
+    "png2": "ty_zd_buff_j015",
+    "png2_text": {
+      "key": "TeachingPngTextty_zd_buff_j015",
+      "text": "防御下降"
+    },
+    "suitname": {
+      "key": "Teaching_suitname",
+      "text": "在实战中学习能够影响攻击力和防御力的技能作用"
+    },
     "desc": {
-      "key": "mainline_desc_10001",
+      "key": "Teaching_desc",
       "text": "在实战中学习能够影响攻击力和防御力的技能作用"
     },
     "tips": {
@@ -361,9 +541,24 @@
   },
   {
     "id": 50001,
+    "tab": 1,
     "suittype": 5,
+    "png1": "buff_2",
+    "png1_text": {
+      "key": "TeachingPngTextbuff_2",
+      "text": "攻击上升"
+    },
+    "png2": "ty_zd_buff_j015",
+    "png2_text": {
+      "key": "TeachingPngTextty_zd_buff_j015",
+      "text": "防御下降"
+    },
+    "suitname": {
+      "key": "Teaching_suitname",
+      "text": "在实战中学习能够影响攻击力和防御力的技能作用"
+    },
     "desc": {
-      "key": "mainline_desc_10001",
+      "key": "Teaching_desc",
       "text": "在实战中学习能够影响攻击力和防御力的技能作用"
     },
     "tips": {
@@ -391,9 +586,24 @@
   },
   {
     "id": 50002,
+    "tab": 1,
     "suittype": 5,
+    "png1": "buff_2",
+    "png1_text": {
+      "key": "TeachingPngTextbuff_2",
+      "text": "攻击上升"
+    },
+    "png2": "ty_zd_buff_j015",
+    "png2_text": {
+      "key": "TeachingPngTextty_zd_buff_j015",
+      "text": "防御下降"
+    },
+    "suitname": {
+      "key": "Teaching_suitname",
+      "text": "在实战中学习能够影响攻击力和防御力的技能作用"
+    },
     "desc": {
-      "key": "mainline_desc_10001",
+      "key": "Teaching_desc",
       "text": "在实战中学习能够影响攻击力和防御力的技能作用"
     },
     "tips": {
@@ -421,9 +631,24 @@
   },
   {
     "id": 50003,
+    "tab": 1,
     "suittype": 5,
+    "png1": "buff_2",
+    "png1_text": {
+      "key": "TeachingPngTextbuff_2",
+      "text": "攻击上升"
+    },
+    "png2": "ty_zd_buff_j015",
+    "png2_text": {
+      "key": "TeachingPngTextty_zd_buff_j015",
+      "text": "防御下降"
+    },
+    "suitname": {
+      "key": "Teaching_suitname",
+      "text": "在实战中学习能够影响攻击力和防御力的技能作用"
+    },
     "desc": {
-      "key": "mainline_desc_10001",
+      "key": "Teaching_desc",
       "text": "在实战中学习能够影响攻击力和防御力的技能作用"
     },
     "tips": {