From 1f84d4e9e0d017e7d4c598b7aaabca319d6bfc4f Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Mon, 5 Feb 2024 10:50:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E6=8A=BD=E4=B8=8D?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E8=8B=B1=E9=9B=84=E5=AE=9E=E4=BE=8B=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/hero/model_hero.go | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index e4ec05417..5cf600a62 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -953,6 +953,9 @@ func (this *ModelHero) createHero(session comm.IUserSession, heroCfgId string, c N: 1, O: hero.Id, }) + go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { + this.module.ModuleEntertain.AddXxlCard(session, map[string]int32{hero.HeroID: 1}, true) + }) } res := make([]*cfg.Gameatn, 0) rst, err := this.module.ModuleUser.GetUserExpand(session.GetUserId()) @@ -1137,7 +1140,11 @@ func (this *ModelHero) ImitateHeros(session comm.IUserSession, cids []string, bI if bFirst { // 没有当前英雄 if bImitate { - hero = this.InitHero(uid, heroCfgId) + // 模拟英雄不用真实数据 + hero = &pb.DBHero{ + HeroID: heroCfgId, + } + //hero = this.InitHero(uid, heroCfgId) } else { hero, err = this.initHeroOverlying(uid, heroCfgId, 1) } @@ -1203,18 +1210,16 @@ func (this *ModelHero) ImitateHeros(session comm.IUserSession, cids []string, bI } addres = append(addres, res) } - if !bImitate && bChange { - this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{ - "herofrag": rst.Herofrag, - "expitem": rst.Expitem, - }) - } - if !bImitate { // 获得三消卡片资源数据 + if !bImitate { go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - this.module.ModuleEntertain.AddXxlCard(session, szCard, true) - }) + if bChange { + this.module.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{ + "herofrag": rst.Herofrag, + "expitem": rst.Expitem, + }) + } } return } From 51e5ce0fbbb5c875917cdf59f2438af7597d24ad Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Mon, 5 Feb 2024 10:56:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_battleready.json | 36 +- bin/json/game_buriedcondi.json | 194 +-- bin/json/game_equipattribute.json | 82 +- bin/json/game_fightglobalevent.json | 57 + bin/json/game_global.json | 2 +- bin/json/game_item.json | 24 +- bin/json/game_mainstage.json | 615 ++++++++- bin/json/game_monsterformat.json | 529 +++++++- bin/json/game_opencond.json | 25 + bin/json/game_pagoda.json | 200 --- bin/json/game_rdtasknpc.json | 100 +- bin/json/game_skillafteratk.json | 25 + bin/json/game_skillatk.json | 33 + bin/json/game_skillbuff.json | 37 +- bin/json/game_skillproperty.json | 1187 ++++++++++------- bin/json/game_treasuremap.json | 60 +- bin/json/game_worldtask.json | 20 +- sys/configure/structs/Game.BuffType.go | 1 + sys/configure/structs/Game.FightEventType.go | 1 + .../structs/Game.FightGlobalEventData.go | 2 + .../structs/Game.SkillPropertyData.go | 70 +- sys/configure/structs/game.pagodaData.go | 4 - 22 files changed, 2375 insertions(+), 929 deletions(-) diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index 03e4b953b..58d894e59 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -3029,8 +3029,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, - "ShowSweep": false, - "ShowAutoBattle": false, + "ShowSweep": true, + "ShowAutoBattle": true, "Numrounds": 0, "BossRounds": 0 }, @@ -3067,8 +3067,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, - "ShowSweep": false, - "ShowAutoBattle": false, + "ShowSweep": true, + "ShowAutoBattle": true, "Numrounds": 0, "BossRounds": 0 }, @@ -3105,8 +3105,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, - "ShowSweep": false, - "ShowAutoBattle": false, + "ShowSweep": true, + "ShowAutoBattle": true, "Numrounds": 0, "BossRounds": 0 }, @@ -3143,8 +3143,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, - "ShowSweep": false, - "ShowAutoBattle": false, + "ShowSweep": true, + "ShowAutoBattle": true, "Numrounds": 0, "BossRounds": 0 }, @@ -3181,8 +3181,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, - "ShowSweep": false, - "ShowAutoBattle": false, + "ShowSweep": true, + "ShowAutoBattle": true, "Numrounds": 0, "BossRounds": 0 }, @@ -3219,8 +3219,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, - "ShowSweep": false, - "ShowAutoBattle": false, + "ShowSweep": true, + "ShowAutoBattle": true, "Numrounds": 0, "BossRounds": 0 }, @@ -3257,8 +3257,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, - "ShowSweep": false, - "ShowAutoBattle": false, + "ShowSweep": true, + "ShowAutoBattle": true, "Numrounds": 0, "BossRounds": 0 }, @@ -3297,8 +3297,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, - "ShowSweep": false, - "ShowAutoBattle": false, + "ShowSweep": true, + "ShowAutoBattle": true, "Numrounds": 0, "BossRounds": 0 }, @@ -3715,8 +3715,8 @@ "RedAssistTeam": 0, "BlueAssistTeam": 0, "CanFriendHelp": false, - "ShowSweep": false, - "ShowAutoBattle": false, + "ShowSweep": true, + "ShowAutoBattle": true, "Numrounds": 60, "BossRounds": 0 }, diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 55e77787d..d5b12e2aa 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -5640,7 +5640,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_165", - "text": "通过一次教习塔" + "text": "通过一次修炼塔" }, "type": 168, "valid": 0, @@ -35447,7 +35447,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1159", - "text": "30回合内完成战斗" + "text": "30回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -35478,7 +35478,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1160", - "text": "50回合内完成战斗" + "text": "50回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -35509,7 +35509,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1161", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -35540,7 +35540,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1162", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -35571,7 +35571,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1163", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -35602,7 +35602,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1164", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -35633,7 +35633,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1165", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -35664,7 +35664,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1166", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -35695,7 +35695,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1167", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -35726,7 +35726,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1168", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -35757,7 +35757,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1169", - "text": "90回合内完成战斗" + "text": "90回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -35788,7 +35788,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1170", - "text": "90回合内完成战斗" + "text": "90回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -35819,7 +35819,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1171", - "text": "30回合内完成战斗" + "text": "30回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -35850,7 +35850,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1172", - "text": "50回合内完成战斗" + "text": "50回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -35881,7 +35881,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1173", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -35912,7 +35912,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1174", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -35943,7 +35943,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1175", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -35974,7 +35974,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1176", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36005,7 +36005,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1177", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36036,7 +36036,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1178", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36067,7 +36067,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1179", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36098,7 +36098,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1180", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36129,7 +36129,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1181", - "text": "90回合内完成战斗" + "text": "90回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36160,7 +36160,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1182", - "text": "90回合内完成战斗" + "text": "90回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36191,7 +36191,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1183", - "text": "30回合内完成战斗" + "text": "30回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36222,7 +36222,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1184", - "text": "50回合内完成战斗" + "text": "50回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36253,7 +36253,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1185", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36284,7 +36284,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1186", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36315,7 +36315,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1187", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36346,7 +36346,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1188", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36377,7 +36377,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1189", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36408,7 +36408,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1190", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36439,7 +36439,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1191", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36470,7 +36470,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1192", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36501,7 +36501,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1193", - "text": "90回合内完成战斗" + "text": "90回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36532,7 +36532,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1194", - "text": "90回合内完成战斗" + "text": "90回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36563,7 +36563,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1195", - "text": "20回合内完成战斗" + "text": "20回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36594,7 +36594,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1196", - "text": "30回合内完成战斗" + "text": "30回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36625,7 +36625,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1197", - "text": "40回合内完成战斗" + "text": "40回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36656,7 +36656,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1198", - "text": "40回合内完成战斗" + "text": "40回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36687,7 +36687,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1199", - "text": "50回合内完成战斗" + "text": "50回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36718,7 +36718,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1200", - "text": "50回合内完成战斗" + "text": "50回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36749,7 +36749,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1201", - "text": "60回合内完成战斗" + "text": "60回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36780,7 +36780,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1202", - "text": "60回合内完成战斗" + "text": "60回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36811,7 +36811,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1203", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36842,7 +36842,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1204", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36873,7 +36873,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1205", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36904,7 +36904,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1206", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 250, "valid": 0, @@ -36935,7 +36935,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1207", - "text": "30回合内完成战斗" + "text": "30回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -36966,7 +36966,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1208", - "text": "50回合内完成战斗" + "text": "50回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -36997,7 +36997,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1209", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37028,7 +37028,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1210", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37059,7 +37059,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1211", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37090,7 +37090,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1212", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37121,7 +37121,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1213", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37152,7 +37152,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1214", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37183,7 +37183,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1215", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37214,7 +37214,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1216", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37245,7 +37245,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1217", - "text": "90回合内完成战斗" + "text": "90回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37276,7 +37276,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1218", - "text": "90回合内完成战斗" + "text": "90回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37307,7 +37307,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1219", - "text": "30回合内完成战斗" + "text": "30回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37338,7 +37338,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1220", - "text": "50回合内完成战斗" + "text": "50回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37369,7 +37369,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1221", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37400,7 +37400,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1222", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37431,7 +37431,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1223", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37462,7 +37462,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1224", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37493,7 +37493,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1225", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37524,7 +37524,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1226", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37555,7 +37555,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1227", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37586,7 +37586,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1228", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37617,7 +37617,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1229", - "text": "90回合内完成战斗" + "text": "90回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37648,7 +37648,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1230", - "text": "90回合内完成战斗" + "text": "90回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37679,7 +37679,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1231", - "text": "30回合内完成战斗" + "text": "30回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37710,7 +37710,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1232", - "text": "50回合内完成战斗" + "text": "50回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37741,7 +37741,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1233", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37772,7 +37772,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1234", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37803,7 +37803,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1235", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37834,7 +37834,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1236", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37865,7 +37865,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1237", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37896,7 +37896,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1238", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37927,7 +37927,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1239", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37958,7 +37958,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1240", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -37989,7 +37989,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1241", - "text": "90回合内完成战斗" + "text": "90回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -38020,7 +38020,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1242", - "text": "90回合内完成战斗" + "text": "90回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -38051,7 +38051,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1243", - "text": "30回合内完成战斗" + "text": "30回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -38082,7 +38082,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1244", - "text": "50回合内完成战斗" + "text": "50回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -38113,7 +38113,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1245", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -38144,7 +38144,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1246", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -38175,7 +38175,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1247", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -38206,7 +38206,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1248", - "text": "70回合内完成战斗" + "text": "70回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -38237,7 +38237,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1249", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -38268,7 +38268,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1250", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -38299,7 +38299,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1251", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -38330,7 +38330,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1252", - "text": "80回合内完成战斗" + "text": "80回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -38361,7 +38361,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1253", - "text": "90回合内完成战斗" + "text": "90回合内完成战斗开启" }, "type": 251, "valid": 0, @@ -38392,7 +38392,7 @@ "type_sp": 1, "tasktxt": { "key": "buried_buried_condi_tasktxt_1254", - "text": "90回合内完成战斗" + "text": "90回合内完成战斗开启" }, "type": 251, "valid": 0, diff --git a/bin/json/game_equipattribute.json b/bin/json/game_equipattribute.json index fb3235b56..8f3e64423 100644 --- a/bin/json/game_equipattribute.json +++ b/bin/json/game_equipattribute.json @@ -4,7 +4,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_1", - "text": "对感观之林属性守护者伤害增加" + "text": "对感观之林属性守护者伤害增加{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_1", @@ -24,7 +24,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_2", - "text": "对热情之火属性守护者伤害增加" + "text": "对热情之火属性守护者伤害增加{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_2", @@ -44,7 +44,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_3", - "text": "对包容之水属性守护者伤害增加" + "text": "对包容之水属性守护者伤害增加{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_3", @@ -64,7 +64,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_4", - "text": "对荣耀之光属性守护者伤害增加" + "text": "对荣耀之光属性守护者伤害增加{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_4", @@ -84,7 +84,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_5", - "text": "减少受到的感观之林属性守护者伤害" + "text": "减少受到的感观之林属性守护者伤害{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_5", @@ -104,7 +104,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_6", - "text": "减少受到的热情之火属性守护者伤害" + "text": "减少受到的热情之火属性守护者伤害{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_6", @@ -124,7 +124,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_7", - "text": "减少受到的包容之水属性守护者伤害" + "text": "减少受到的包容之水属性守护者伤害{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_7", @@ -144,7 +144,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_8", - "text": "减少受到的荣耀之光属性守护者伤害" + "text": "减少受到的荣耀之光属性守护者伤害{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_8", @@ -164,7 +164,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_9", - "text": "提升自身失去生命值百分比*系数的攻击" + "text": "提升自身已损失生命值{0}的攻击" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_9", @@ -184,7 +184,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_10", - "text": "提升自身失去生命值百分比*系数的防御" + "text": "提升自身已损失生命值{0}的防御" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_10", @@ -204,7 +204,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_11", - "text": "提升自身失去生命值百分比*系数的速度" + "text": "提升自身已损失生命值{0}的速度" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_11", @@ -224,7 +224,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_12", - "text": "提升自身失去生命值百分比*系数的暴击" + "text": "提升自身已损失生命值{0}的暴击" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_12", @@ -244,7 +244,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_13", - "text": "提升自身失去生命值百分比*系数的暴击伤害" + "text": "提升自身已损失生命值{0}的暴击伤害" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_13", @@ -264,7 +264,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_14", - "text": "提升自身失去生命值百分比*系数的命中" + "text": "提升自身已损失生命值{0}的效果命中" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_14", @@ -284,7 +284,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_15", - "text": "提升自身失去生命值百分比*系数的效果抵抗" + "text": "提升自身已损失生命值{0}效果抵抗" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_15", @@ -304,7 +304,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_16", - "text": "攻击敌人时，增加敌人失去生命值比例*系数的暴击伤害" + "text": "攻击敌人时，增加敌人已损失生命值{0}的暴击伤害" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_16", @@ -324,7 +324,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_17", - "text": "攻击敌人时，增加敌人拥有生命值比例*系数的暴击伤害" + "text": "攻击敌人时，增加敌人已损失生命值{0}的暴击伤害" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_17", @@ -344,7 +344,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_18", - "text": "增加相当于A%攻击的追加伤害" + "text": "增加相当于{0}攻击的追加伤害" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_18", @@ -364,7 +364,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_19", - "text": "增加相当于A%防御的追加伤害" + "text": "增加相当于{0}防御的追加伤害" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_19", @@ -384,7 +384,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_20", - "text": "增加相当于A%生命的追加伤害" + "text": "增加相当于{0}生命的追加伤害" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_20", @@ -404,7 +404,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_21", - "text": "增加相当于A%速度的追加伤害" + "text": "增加相当于{0}速度的追加伤害" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_21", @@ -424,7 +424,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_22", - "text": "攻击强化效果增加" + "text": "攻击强化效果增加{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_22", @@ -444,7 +444,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_23", - "text": "反击造成的伤害增加" + "text": "反击造成的伤害增加{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_23", @@ -464,7 +464,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_24", - "text": "复活时行动值增加" + "text": "复活时行动值增加{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_24", @@ -484,7 +484,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_25", - "text": "复活时体力值增加" + "text": "复活时体力值增加{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_25", @@ -504,7 +504,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_26", - "text": "吸血量增加" + "text": "吸血量增加{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_26", @@ -524,7 +524,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_27", - "text": "出血造成的伤害增加" + "text": "出血造成的伤害增加{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_27", @@ -544,7 +544,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_28", - "text": "中毒造成的伤害增加" + "text": "中毒造成的伤害增加{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_28", @@ -564,7 +564,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_29", - "text": "被暴击时减少A%的伤害" + "text": "被暴击时减少{0}的伤害" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_29", @@ -584,7 +584,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_30", - "text": "[1号技能]的回复量提升" + "text": "[1号技能]的回复量提升{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_30", @@ -604,7 +604,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_31", - "text": "[1号技能]的暴击伤害提升" + "text": "[1号技能]的暴击伤害提升{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_31", @@ -624,7 +624,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_32", - "text": "[1号技能]的命中提升" + "text": "[1号技能]的命中提升{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_32", @@ -644,7 +644,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_33", - "text": "[2号技能]的回复量提升" + "text": "[2号技能]的回复量提升{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_33", @@ -664,7 +664,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_34", - "text": "[2号技能]的暴击伤害提升" + "text": "[2号技能]的暴击伤害提升{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_34", @@ -684,7 +684,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_35", - "text": "[2号技能]的命中提升" + "text": "[2号技能]的命中提升{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_35", @@ -704,7 +704,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_36", - "text": "[3号技能]的回复量提升" + "text": "[3号技能]的回复量提升{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_36", @@ -724,7 +724,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_37", - "text": "[3号技能]的暴击伤害提升" + "text": "[3号技能]的暴击伤害提升{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_37", @@ -744,7 +744,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_38", - "text": "[3号技能]的命中提升" + "text": "[3号技能]的命中提升{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_38", @@ -764,7 +764,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_39", - "text": "速度提升的效果增加" + "text": "速度提升的效果增加{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_39", @@ -784,7 +784,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_40", - "text": "暴击提升的效果增加" + "text": "暴击提升的效果增加{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_40", @@ -804,7 +804,7 @@ "skill_id": 110001111, "attribute_text": { "key": "equip_equip_attribute_attribute_text_41", - "text": "爆伤提升的效果增加" + "text": "暴击伤害提升的效果增加{0}" }, "attribute_text_novalue": { "key": "equip_equip_attribute_attribute_text_novalue_41", diff --git a/bin/json/game_fightglobalevent.json b/bin/json/game_fightglobalevent.json index ec32cfa43..11f376b10 100644 --- a/bin/json/game_fightglobalevent.json +++ b/bin/json/game_fightglobalevent.json @@ -10,6 +10,7 @@ "When": 16, "FromCheck": "HeroID=25001", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "MainSkillID=125001111", "AfterSkillCheck": "", "BuffCheck": "", @@ -29,6 +30,7 @@ "When": 16, "FromCheck": "HeroID=25001", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "MainSkillID=125001311", "AfterSkillCheck": "", "BuffCheck": "", @@ -48,6 +50,7 @@ "When": 25, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -67,6 +70,7 @@ "When": 16, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -86,6 +90,7 @@ "When": 16, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -105,6 +110,7 @@ "When": 25, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -124,6 +130,7 @@ "When": 16, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -143,6 +150,7 @@ "When": 16, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -162,6 +170,7 @@ "When": 25, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -181,6 +190,7 @@ "When": 16, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -200,6 +210,7 @@ "When": 16, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -219,6 +230,7 @@ "When": 21, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -240,6 +252,7 @@ "When": 2, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -261,6 +274,7 @@ "When": 1, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -284,6 +298,7 @@ "When": 1, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -311,6 +326,7 @@ "When": 19, "FromCheck": "", "TargetCheck": "Side=1", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffID=390001001", @@ -330,6 +346,7 @@ "When": 19, "FromCheck": "", "TargetCheck": "Side=2", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffID=390001007", @@ -349,6 +366,7 @@ "When": 19, "FromCheck": "", "TargetCheck": "Side=1", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffID=390001002", @@ -368,6 +386,7 @@ "When": 19, "FromCheck": "", "TargetCheck": "Side=2", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffID=390001001", @@ -387,6 +406,7 @@ "When": 15, "FromCheck": "", "TargetCheck": "Side=2", + "PassiveCheck": "", "MainSkillCheck": "MainSkillID=153003211", "AfterSkillCheck": "", "BuffCheck": "", @@ -406,6 +426,7 @@ "When": 26, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -427,6 +448,7 @@ "When": 26, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -448,6 +470,7 @@ "When": 19, "FromCheck": "", "TargetCheck": "Side=1", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffID=390001001", @@ -467,6 +490,7 @@ "When": 19, "FromCheck": "", "TargetCheck": "Side=2", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffID=390001007", @@ -486,6 +510,7 @@ "When": 15, "FromCheck": "", "TargetCheck": "Side=2", + "PassiveCheck": "", "MainSkillCheck": "MainSkillID=144005211", "AfterSkillCheck": "", "BuffCheck": "", @@ -505,6 +530,7 @@ "When": 19, "FromCheck": "", "TargetCheck": "Side=1", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffID=390001111", @@ -524,6 +550,7 @@ "When": 19, "FromCheck": "", "TargetCheck": "Side=2", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffID=390001106", @@ -543,6 +570,7 @@ "When": 15, "FromCheck": "", "TargetCheck": "Side=2", + "PassiveCheck": "", "MainSkillCheck": "MainSkillID=135001311", "AfterSkillCheck": "", "BuffCheck": "", @@ -562,6 +590,7 @@ "When": 19, "FromCheck": "", "TargetCheck": "Side=2", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffID=390001105", @@ -581,6 +610,7 @@ "When": 19, "FromCheck": "", "TargetCheck": "Side=2", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "BuffID=390001115", @@ -600,6 +630,7 @@ "When": 1, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -623,6 +654,7 @@ "When": 20, "FromCheck": "Side=2,HeroID=24004", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -644,6 +676,7 @@ "When": 21, "FromCheck": "Side=2", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -665,6 +698,7 @@ "When": 2, "FromCheck": "Side=2", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -686,6 +720,7 @@ "When": 25, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -707,6 +742,7 @@ "When": 21, "FromCheck": "Side=2", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -728,6 +764,7 @@ "When": 20, "FromCheck": "Side=2,HeroID=55007", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -749,6 +786,7 @@ "When": 1, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -772,6 +810,7 @@ "When": 20, "FromCheck": "Side=2", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -795,6 +834,7 @@ "When": 20, "FromCheck": "Side=1,HeroID=55007", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -816,6 +856,7 @@ "When": 1, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -839,6 +880,7 @@ "When": 25, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -860,6 +902,7 @@ "When": 20, "FromCheck": "Side=2", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -883,6 +926,7 @@ "When": 1, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -906,6 +950,7 @@ "When": 20, "FromCheck": "Side=1,HeroID=44006", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -927,6 +972,7 @@ "When": 20, "FromCheck": "Side=1,HeroID=25001", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -948,6 +994,7 @@ "When": 1, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -971,6 +1018,7 @@ "When": 20, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -994,6 +1042,7 @@ "When": 1, "FromCheck": "Side=1", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -1015,6 +1064,7 @@ "When": 1, "FromCheck": "Side=1", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -1036,6 +1086,7 @@ "When": 20, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -1060,6 +1111,7 @@ "When": 20, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -1084,6 +1136,7 @@ "When": 20, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -1108,6 +1161,7 @@ "When": 20, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -1132,6 +1186,7 @@ "When": 20, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -1156,6 +1211,7 @@ "When": 20, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -1184,6 +1240,7 @@ "When": 1, "FromCheck": "", "TargetCheck": "", + "PassiveCheck": "", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 2f7452c51..d585e7299 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -775,7 +775,7 @@ "stonehenge_guideStage": 88, "story_waittime": 0.8, "sx_ranknum": 200, - "IntegralBoss_challenge_num": 3, + "IntegralBoss_challenge_num": 9999, "friend_help_hero_refresh_num": 5, "td_mainstage_challenge_num": 2, "td_mainstage_challenge_num_max": 10, diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 03ad1b0d6..9f5359ae0 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -20053,7 +20053,7 @@ "id": "24012204", "name": { "key": "item_item_name_24012204", - "text": "猩猩藏宝图碎片3" + "text": "山丘藏宝图碎屑1" }, "usetype": 1, "color": 2, @@ -20077,15 +20077,15 @@ "img": "item_50013001", "intr": { "key": "item_item_intr_24012204", - "text": "隐藏于原始人聚集地的藏宝图，只是其中的一个碎片。" + "text": "隐藏于原始人聚集地的藏宝图，与其说是藏宝图，不如说是根据碎屑去推测宝藏的所在地。" }, "describe": { "key": "item_item_describe_24012204", - "text": "猩猩洞这种地方怎么可能不埋藏着宝藏呢，当然，前提是你能活着找到。" + "text": "所以，原始人的地图总是有些奇奇怪怪的地方有东西，不是吗？" }, "dialogue": { "key": "item_item_dialogue_24012204", - "text": "【聪明的猩猩，劣质的图】" + "text": "【越过山丘~才发现宝藏在等我~】" }, "sale": [], "gm": 0 @@ -20094,7 +20094,7 @@ "id": "24012205", "name": { "key": "item_item_name_24012205", - "text": "山丘藏宝图碎屑1" + "text": "山丘藏宝图碎屑2" }, "usetype": 1, "color": 2, @@ -20135,7 +20135,7 @@ "id": "24012206", "name": { "key": "item_item_name_24012206", - "text": "山丘藏宝图碎屑2" + "text": "山丘藏宝图碎屑3" }, "usetype": 1, "color": 2, @@ -20176,7 +20176,7 @@ "id": "24012207", "name": { "key": "item_item_name_24012207", - "text": "山丘藏宝图碎屑3" + "text": "树林藏宝图碎片1" }, "usetype": 1, "color": 2, @@ -20200,15 +20200,15 @@ "img": "item_50013001", "intr": { "key": "item_item_intr_24012207", - "text": "隐藏于原始人聚集地的藏宝图，与其说是藏宝图，不如说是根据碎屑去推测宝藏的所在地。" + "text": "隐藏于原始人聚集地的藏宝图，传说埋藏着小猴子们所有的财宝。" }, "describe": { "key": "item_item_describe_24012207", - "text": "所以，原始人的地图总是有些奇奇怪怪的地方有东西，不是吗？" + "text": "我把所有的财宝都放在了密林深处，猴子们！去寻找吧！" }, "dialogue": { "key": "item_item_dialogue_24012207", - "text": "【越过山丘~才发现宝藏在等我~】" + "text": "【其实，猴子好像，没有藏财宝的习惯，不是龙】" }, "sale": [], "gm": 0 @@ -20217,7 +20217,7 @@ "id": "24012208", "name": { "key": "item_item_name_24012208", - "text": "树林藏宝图碎片1" + "text": "树林藏宝图碎片2" }, "usetype": 1, "color": 2, @@ -20258,7 +20258,7 @@ "id": "24012209", "name": { "key": "item_item_name_24012209", - "text": "树林藏宝图碎片2" + "text": "树林藏宝图碎片3" }, "usetype": 1, "color": 2, diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 9b5f18e02..7aacc06c5 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -14008,6 +14008,11 @@ "a": "equi", "t": "10134", "n": 1 + }, + { + "a": "item", + "t": "24012207", + "n": 1 } ], "lotteryward": 17110110, @@ -15040,6 +15045,11 @@ "a": "equi", "t": "10134", "n": 1 + }, + { + "a": "item", + "t": "24012208", + "n": 1 } ], "lotteryward": 17110110, @@ -16079,7 +16089,13 @@ } ], "lotteryward": 0, - "commonaward": [], + "commonaward": [ + { + "a": "item", + "t": "24021001", + "n": 50 + } + ], "BattleReadyID": 0, "FormatList": [], "helphero": [], @@ -16274,6 +16290,11 @@ "a": "equi", "t": "11120", "n": 1 + }, + { + "a": "item", + "t": "24021001", + "n": 50 } ], "BattleReadyID": 102, @@ -16376,7 +16397,13 @@ } ], "lotteryward": 0, - "commonaward": [], + "commonaward": [ + { + "a": "item", + "t": "24021001", + "n": 50 + } + ], "BattleReadyID": 0, "FormatList": [], "helphero": [], @@ -16544,7 +16571,13 @@ } ], "lotteryward": 0, - "commonaward": [], + "commonaward": [ + { + "a": "item", + "t": "24010003", + "n": 1 + } + ], "BattleReadyID": 0, "FormatList": [], "helphero": [], @@ -16628,10 +16661,26 @@ "a": "item", "t": "24021001", "n": 50 + }, + { + "a": "item", + "t": "24012201", + "n": 1 } ], "lotteryward": 0, - "commonaward": [], + "commonaward": [ + { + "a": "item", + "t": "24012201", + "n": 1 + }, + { + "a": "item", + "t": "24021001", + "n": 50 + } + ], "BattleReadyID": 0, "FormatList": [], "helphero": [], @@ -16826,6 +16875,11 @@ "a": "equi", "t": "11120", "n": 1 + }, + { + "a": "item", + "t": "24021001", + "n": 50 } ], "BattleReadyID": 102, @@ -17090,7 +17144,13 @@ } ], "lotteryward": 0, - "commonaward": [], + "commonaward": [ + { + "a": "item", + "t": "24021001", + "n": 50 + } + ], "BattleReadyID": 0, "FormatList": [], "helphero": [], @@ -17177,7 +17237,13 @@ } ], "lotteryward": 0, - "commonaward": [], + "commonaward": [ + { + "a": "item", + "t": "24021001", + "n": 50 + } + ], "BattleReadyID": 0, "FormatList": [], "helphero": [], @@ -17345,7 +17411,13 @@ } ], "lotteryward": 0, - "commonaward": [], + "commonaward": [ + { + "a": "item", + "t": "24021001", + "n": 50 + } + ], "BattleReadyID": 0, "FormatList": [], "helphero": [], @@ -17675,7 +17747,13 @@ } ], "lotteryward": 0, - "commonaward": [], + "commonaward": [ + { + "a": "item", + "t": "24021001", + "n": 50 + } + ], "BattleReadyID": 0, "FormatList": [], "helphero": [], @@ -18005,7 +18083,13 @@ } ], "lotteryward": 0, - "commonaward": [], + "commonaward": [ + { + "a": "item", + "t": "24021001", + "n": 50 + } + ], "BattleReadyID": 0, "FormatList": [], "helphero": [], @@ -18023,8 +18107,8 @@ 100220 ], "previoustage": 0, - "buried_type": 0, - "buried": 0, + "buried_type": 2, + "buried": 6, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -18056,12 +18140,12 @@ "key": "", "text": "" }, - "hide": false, + "hide": true, "destroy": true, "progress": 0, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 312300, "afterstoryid": 0, "maingroupName": { "key": "", @@ -18084,9 +18168,21 @@ "hero_exp": 0, "ps_consume": [], "ps_mg": [], - "firstaward": [], + "firstaward": [ + { + "a": "item", + "t": "10000001", + "n": 3 + } + ], "lotteryward": 0, - "commonaward": [], + "commonaward": [ + { + "a": "item", + "t": "10000001", + "n": 3 + } + ], "BattleReadyID": 0, "FormatList": [], "helphero": [], @@ -18104,10 +18200,10 @@ 100220 ], "previoustage": 0, - "buried_type": 0, - "buried": 0, + "buried_type": 2, + "buried": 7, "grouptype": [], - "Episodetype": 7, + "Episodetype": 1, "stage_param": 0, "inherit": false, "battle_fail": false, @@ -18137,13 +18233,13 @@ "key": "", "text": "" }, - "hide": false, + "hide": true, "destroy": true, "progress": 0, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, - "afterstoryid": 0, + "frontstoryid": 312290, + "afterstoryid": 312291, "maingroupName": { "key": "", "text": "" @@ -18154,27 +18250,70 @@ "text": "" }, "title": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_title_160", + "text": "猩猩的智慧" }, "desc": { - "key": "", - "text": "" + "key": "mainchapter_main_stage_desc_160", + "text": "猩猩的智慧！是无穷的！" }, "exp": 0, - "hero_exp": 0, - "ps_consume": [], - "ps_mg": [], - "firstaward": [], + "hero_exp": 330, + "ps_consume": [ + { + "a": "attr", + "t": "ps", + "n": 9 + } + ], + "ps_mg": [ + { + "a": "attr", + "t": "ps", + "n": 1 + } + ], + "firstaward": [ + { + "a": "item", + "t": "10000001", + "n": 3 + }, + { + "a": "item", + "t": "15000201", + "n": 3 + } + ], "lotteryward": 0, - "commonaward": [], - "BattleReadyID": 0, - "FormatList": [], + "commonaward": [ + { + "a": "item", + "t": "10000001", + "n": 3 + } + ], + "BattleReadyID": 10400001, + "FormatList": [ + 401006 + ], "helphero": [], "banhero": [], - "star": [], - "star_type": [], - "star_value": [], + "star": [ + 1, + 1, + 1 + ], + "star_type": [ + 1, + 2, + 2 + ], + "star_value": [ + 0, + 2, + 1 + ], "challengeward": 0 }, { @@ -18185,8 +18324,8 @@ 100220 ], "previoustage": 0, - "buried_type": 0, - "buried": 0, + "buried_type": 2, + "buried": 8, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -18218,12 +18357,12 @@ "key": "", "text": "" }, - "hide": false, + "hide": true, "destroy": true, "progress": 0, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 312320, "afterstoryid": 0, "maingroupName": { "key": "", @@ -18246,9 +18385,21 @@ "hero_exp": 0, "ps_consume": [], "ps_mg": [], - "firstaward": [], + "firstaward": [ + { + "a": "item", + "t": "10000001", + "n": 3 + } + ], "lotteryward": 0, - "commonaward": [], + "commonaward": [ + { + "a": "item", + "t": "10000001", + "n": 3 + } + ], "BattleReadyID": 0, "FormatList": [], "helphero": [], @@ -18266,8 +18417,8 @@ 100220 ], "previoustage": 0, - "buried_type": 0, - "buried": 0, + "buried_type": 2, + "buried": 9, "grouptype": [], "Episodetype": 7, "stage_param": 0, @@ -18299,7 +18450,7 @@ "key": "", "text": "" }, - "hide": false, + "hide": true, "destroy": true, "progress": 0, "timelineplayer": false, @@ -18327,9 +18478,21 @@ "hero_exp": 0, "ps_consume": [], "ps_mg": [], - "firstaward": [], + "firstaward": [ + { + "a": "item", + "t": "10000001", + "n": 3 + } + ], "lotteryward": 0, - "commonaward": [], + "commonaward": [ + { + "a": "item", + "t": "10000001", + "n": 3 + } + ], "BattleReadyID": 0, "FormatList": [], "helphero": [], @@ -18380,12 +18543,105 @@ "key": "", "text": "" }, - "hide": false, + "hide": true, "destroy": true, "progress": 0, "timelineplayer": false, "stroyshow": false, - "frontstoryid": 0, + "frontstoryid": 312310, + "afterstoryid": 0, + "maingroupName": { + "key": "", + "text": "" + }, + "maingroupIcon": "", + "mainlineName": { + "key": "", + "text": "" + }, + "title": { + "key": "", + "text": "" + }, + "desc": { + "key": "", + "text": "" + }, + "exp": 0, + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [ + { + "a": "item", + "t": "24012205", + "n": 1 + } + ], + "lotteryward": 0, + "commonaward": [ + { + "a": "item", + "t": "24012205", + "n": 1 + } + ], + "BattleReadyID": 0, + "FormatList": [], + "helphero": [], + "banhero": [], + "star": [], + "star_type": [], + "star_value": [], + "challengeward": 0 + }, + { + "id": 1102088, + "chapterid": 11002, + "group_id": 100262, + "previous_group_id": [ + 100220 + ], + "previoustage": 0, + "buried_type": 0, + "buried": 0, + "grouptype": [], + "Episodetype": 7, + "stage_param": 0, + "inherit": false, + "battle_fail": false, + "venturemodelspeed": 0, + "venturemodelscale": 0, + "move_type": 0, + "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, + "venturetype": 0, + "ventureavatar": [], + "scene_effect": [], + "scene_effectfilter": "", + "is_near": false, + "openlevel": 1, + "EditorStage": 0, + "herocolor": 2, + "heroimg": "zxgq_qp_icon_gth", + "bubbletext": { + "key": "", + "text": "" + }, + "animation": [], + "prewarbubbletext": { + "key": "", + "text": "" + }, + "hide": true, + "destroy": true, + "progress": 0, + "timelineplayer": false, + "stroyshow": false, + "frontstoryid": 312270, "afterstoryid": 0, "maingroupName": { "key": "", @@ -18421,9 +18677,252 @@ "challengeward": 0 }, { - "id": 1102088, + "id": 1102089, "chapterid": 11002, - "group_id": 100262, + "group_id": 100263, + "previous_group_id": [ + 100220 + ], + "previoustage": 0, + "buried_type": 0, + "buried": 0, + "grouptype": [], + "Episodetype": 7, + "stage_param": 0, + "inherit": false, + "battle_fail": false, + "venturemodelspeed": 0, + "venturemodelscale": 0, + "move_type": 0, + "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, + "venturetype": 0, + "ventureavatar": [], + "scene_effect": [], + "scene_effectfilter": "", + "is_near": false, + "openlevel": 1, + "EditorStage": 0, + "herocolor": 2, + "heroimg": "zxgq_qp_icon_gth", + "bubbletext": { + "key": "", + "text": "" + }, + "animation": [], + "prewarbubbletext": { + "key": "", + "text": "" + }, + "hide": true, + "destroy": true, + "progress": 0, + "timelineplayer": false, + "stroyshow": false, + "frontstoryid": 312280, + "afterstoryid": 0, + "maingroupName": { + "key": "", + "text": "" + }, + "maingroupIcon": "", + "mainlineName": { + "key": "", + "text": "" + }, + "title": { + "key": "", + "text": "" + }, + "desc": { + "key": "", + "text": "" + }, + "exp": 0, + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], + "helphero": [], + "banhero": [], + "star": [], + "star_type": [], + "star_value": [], + "challengeward": 0 + }, + { + "id": 1102090, + "chapterid": 11002, + "group_id": 100264, + "previous_group_id": [ + 100220 + ], + "previoustage": 0, + "buried_type": 0, + "buried": 0, + "grouptype": [], + "Episodetype": 7, + "stage_param": 0, + "inherit": false, + "battle_fail": false, + "venturemodelspeed": 0, + "venturemodelscale": 0, + "move_type": 0, + "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, + "venturetype": 0, + "ventureavatar": [], + "scene_effect": [], + "scene_effectfilter": "", + "is_near": false, + "openlevel": 1, + "EditorStage": 0, + "herocolor": 2, + "heroimg": "zxgq_qp_icon_gth", + "bubbletext": { + "key": "", + "text": "" + }, + "animation": [], + "prewarbubbletext": { + "key": "", + "text": "" + }, + "hide": true, + "destroy": true, + "progress": 0, + "timelineplayer": false, + "stroyshow": false, + "frontstoryid": 312310, + "afterstoryid": 0, + "maingroupName": { + "key": "", + "text": "" + }, + "maingroupIcon": "", + "mainlineName": { + "key": "", + "text": "" + }, + "title": { + "key": "", + "text": "" + }, + "desc": { + "key": "", + "text": "" + }, + "exp": 0, + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], + "helphero": [], + "banhero": [], + "star": [], + "star_type": [], + "star_value": [], + "challengeward": 0 + }, + { + "id": 1102091, + "chapterid": 11002, + "group_id": 100265, + "previous_group_id": [ + 100220 + ], + "previoustage": 0, + "buried_type": 0, + "buried": 0, + "grouptype": [], + "Episodetype": 7, + "stage_param": 0, + "inherit": false, + "battle_fail": false, + "venturemodelspeed": 0, + "venturemodelscale": 0, + "move_type": 0, + "venturemodel": "", + "bubbletalk": { + "key": "", + "text": "" + }, + "venturetype": 0, + "ventureavatar": [], + "scene_effect": [], + "scene_effectfilter": "", + "is_near": false, + "openlevel": 1, + "EditorStage": 0, + "herocolor": 2, + "heroimg": "zxgq_qp_icon_gth", + "bubbletext": { + "key": "", + "text": "" + }, + "animation": [], + "prewarbubbletext": { + "key": "", + "text": "" + }, + "hide": true, + "destroy": true, + "progress": 0, + "timelineplayer": false, + "stroyshow": false, + "frontstoryid": 312310, + "afterstoryid": 0, + "maingroupName": { + "key": "", + "text": "" + }, + "maingroupIcon": "", + "mainlineName": { + "key": "", + "text": "" + }, + "title": { + "key": "", + "text": "" + }, + "desc": { + "key": "", + "text": "" + }, + "exp": 0, + "hero_exp": 0, + "ps_consume": [], + "ps_mg": [], + "firstaward": [], + "lotteryward": 0, + "commonaward": [], + "BattleReadyID": 0, + "FormatList": [], + "helphero": [], + "banhero": [], + "star": [], + "star_type": [], + "star_value": [], + "challengeward": 0 + }, + { + "id": 1102092, + "chapterid": 11002, + "group_id": 100266, "previous_group_id": [ 100220 ], @@ -18489,9 +18988,21 @@ "hero_exp": 0, "ps_consume": [], "ps_mg": [], - "firstaward": [], + "firstaward": [ + { + "a": "item", + "t": "24012209", + "n": 1 + } + ], "lotteryward": 0, - "commonaward": [], + "commonaward": [ + { + "a": "item", + "t": "24012209", + "n": 1 + } + ], "BattleReadyID": 0, "FormatList": [], "helphero": [], diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index 5dcddafbf..8e239e378 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -3783,6 +3783,531 @@ "modelsize": 1, "skillSequence": [] }, + { + "Id": 101511, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 24002, + "star": 3, + "equip": [], + "newskill": [], + "lv": 7, + "hppro": 0.3, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 59, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 101511, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51050, + "star": 3, + "equip": [], + "newskill": [], + "lv": 7, + "hppro": 0.3, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 60, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 101511, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51050, + "star": 3, + "equip": [], + "newskill": [], + "lv": 7, + "hppro": 0.3, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 63, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 101511, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51052, + "star": 3, + "equip": [], + "newskill": [], + "lv": 7, + "hppro": 0.3, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 62, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 101511, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51052, + "star": 3, + "equip": [], + "newskill": [], + "lv": 7, + "hppro": 0.3, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 58, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 101521, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 15004, + "star": 3, + "equip": [], + "newskill": [], + "lv": 7, + "hppro": 0.3, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 59, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 101521, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51050, + "star": 3, + "equip": [], + "newskill": [], + "lv": 7, + "hppro": 0.3, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 60, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 101521, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51050, + "star": 3, + "equip": [], + "newskill": [], + "lv": 7, + "hppro": 0.3, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 63, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 101521, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51052, + "star": 3, + "equip": [], + "newskill": [], + "lv": 7, + "hppro": 0.3, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 62, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 101521, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51052, + "star": 3, + "equip": [], + "newskill": [], + "lv": 7, + "hppro": 0.3, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 58, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 101531, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 14005, + "star": 3, + "equip": [], + "newskill": [], + "lv": 7, + "hppro": 0.3, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 59, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 101531, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51004, + "star": 3, + "equip": [], + "newskill": [], + "lv": 7, + "hppro": 0.3, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 60, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 101531, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51004, + "star": 3, + "equip": [], + "newskill": [], + "lv": 7, + "hppro": 0.3, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 63, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 101531, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51004, + "star": 3, + "equip": [], + "newskill": [], + "lv": 7, + "hppro": 0.3, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 62, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 101531, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51004, + "star": 3, + "equip": [], + "newskill": [], + "lv": 7, + "hppro": 0.3, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 58, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 101541, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 44002, + "star": 3, + "equip": [], + "newskill": [], + "lv": 7, + "hppro": 0.3, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 59, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 101541, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51054, + "star": 3, + "equip": [], + "newskill": [], + "lv": 7, + "hppro": 0.3, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 60, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 101541, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51054, + "star": 3, + "equip": [], + "newskill": [], + "lv": 7, + "hppro": 0.3, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 63, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 101541, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51054, + "star": 3, + "equip": [], + "newskill": [], + "lv": 7, + "hppro": 0.3, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 62, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 101541, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51054, + "star": 3, + "equip": [], + "newskill": [], + "lv": 7, + "hppro": 0.3, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 58, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 101551, + "pos": 1, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 33005, + "star": 3, + "equip": [], + "newskill": [], + "lv": 7, + "hppro": 0.3, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 59, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 101551, + "pos": 2, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51002, + "star": 3, + "equip": [], + "newskill": [], + "lv": 7, + "hppro": 0.3, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 60, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 101551, + "pos": 3, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51002, + "star": 3, + "equip": [], + "newskill": [], + "lv": 7, + "hppro": 0.3, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 63, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 101551, + "pos": 4, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51003, + "star": 3, + "equip": [], + "newskill": [], + "lv": 7, + "hppro": 0.3, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 62, + "modelsize": 1, + "skillSequence": [] + }, + { + "Id": 101551, + "pos": 5, + "captainId": 0, + "IsBoss": false, + "bossHpCnt": 0, + "heroid": 51003, + "star": 3, + "equip": [], + "newskill": [], + "lv": 7, + "hppro": 0.3, + "atkpro": 0.5, + "defpro": 0.1, + "skill1": 1, + "skill2": 1, + "skill3": 1, + "speed": 58, + "modelsize": 1, + "skillSequence": [] + }, { "Id": 101611, "pos": 1, @@ -6837,7 +7362,9 @@ "heroid": 51050, "star": 3, "equip": [], - "newskill": [], + "newskill": [ + 155002511 + ], "lv": 11, "hppro": 2, "atkpro": 2, diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index c58933a22..12818f223 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -3031,5 +3031,30 @@ "key": "", "text": "" } + }, + { + "id": "systemnotice", + "name": { + "key": "opencond_opencond_name_117", + "text": "主系统通知" + }, + "opencondi": [ + 18000118 + ], + "wkqbx": 2, + "img": "", + "prompt": { + "key": "", + "text": "" + }, + "uiid": 0, + "activateType": false, + "notify": [], + "kqbx": false, + "kqbx_ui": "", + "kqbx_text": { + "key": "opencond_opencond_kqbx_text_114", + "text": "主系统通知功能开启" + } } ] \ No newline at end of file diff --git a/bin/json/game_pagoda.json b/bin/json/game_pagoda.json index 27cf4bad5..dd0f0e131 100644 --- a/bin/json/game_pagoda.json +++ b/bin/json/game_pagoda.json @@ -1,7 +1,6 @@ [ { "key": 1, - "Level_type": 1, "layer_num": 1, "tab": 1, "tabIcon": "tx_jz_13002", @@ -26,7 +25,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_1", "text": "第1层" @@ -36,7 +34,6 @@ }, { "key": 2, - "Level_type": 1, "layer_num": 2, "tab": 1, "tabIcon": "tx_jz_13002", @@ -56,7 +53,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_2", "text": "第2层" @@ -66,7 +62,6 @@ }, { "key": 3, - "Level_type": 1, "layer_num": 3, "tab": 1, "tabIcon": "tx_jz_13002", @@ -86,7 +81,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_3", "text": "第3层" @@ -96,7 +90,6 @@ }, { "key": 4, - "Level_type": 1, "layer_num": 4, "tab": 1, "tabIcon": "tx_jz_13002", @@ -116,7 +109,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_4", "text": "第4层" @@ -126,7 +118,6 @@ }, { "key": 5, - "Level_type": 1, "layer_num": 5, "tab": 1, "tabIcon": "tx_jz_13002", @@ -157,7 +148,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_5", "text": "第5层" @@ -167,7 +157,6 @@ }, { "key": 6, - "Level_type": 1, "layer_num": 6, "tab": 1, "tabIcon": "tx_jz_13002", @@ -187,7 +176,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_6", "text": "第6层" @@ -197,7 +185,6 @@ }, { "key": 7, - "Level_type": 1, "layer_num": 7, "tab": 1, "tabIcon": "tx_jz_13002", @@ -217,7 +204,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_7", "text": "第7层" @@ -227,7 +213,6 @@ }, { "key": 8, - "Level_type": 1, "layer_num": 8, "tab": 1, "tabIcon": "tx_jz_13002", @@ -247,7 +232,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_8", "text": "第8层" @@ -257,7 +241,6 @@ }, { "key": 9, - "Level_type": 1, "layer_num": 9, "tab": 1, "tabIcon": "tx_jz_13002", @@ -277,7 +260,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_9", "text": "第9层" @@ -287,7 +269,6 @@ }, { "key": 10, - "Level_type": 1, "layer_num": 10, "tab": 1, "tabIcon": "tx_jz_13002", @@ -319,7 +300,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_10", "text": "第10层" @@ -329,7 +309,6 @@ }, { "key": 11, - "Level_type": 1, "layer_num": 1, "tab": 2, "tabIcon": "tx_jz_13001", @@ -349,7 +328,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_11", "text": "第1层" @@ -359,7 +337,6 @@ }, { "key": 12, - "Level_type": 1, "layer_num": 2, "tab": 2, "tabIcon": "tx_jz_13001", @@ -379,7 +356,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_12", "text": "第2层" @@ -389,7 +365,6 @@ }, { "key": 13, - "Level_type": 1, "layer_num": 3, "tab": 2, "tabIcon": "tx_jz_13001", @@ -409,7 +384,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_13", "text": "第3层" @@ -419,7 +393,6 @@ }, { "key": 14, - "Level_type": 1, "layer_num": 4, "tab": 2, "tabIcon": "tx_jz_13001", @@ -439,7 +412,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_14", "text": "第4层" @@ -449,7 +421,6 @@ }, { "key": 15, - "Level_type": 1, "layer_num": 5, "tab": 2, "tabIcon": "tx_jz_13001", @@ -480,7 +451,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_15", "text": "第5层" @@ -490,7 +460,6 @@ }, { "key": 16, - "Level_type": 1, "layer_num": 6, "tab": 2, "tabIcon": "tx_jz_13001", @@ -510,7 +479,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_16", "text": "第6层" @@ -520,7 +488,6 @@ }, { "key": 17, - "Level_type": 1, "layer_num": 7, "tab": 2, "tabIcon": "tx_jz_13001", @@ -540,7 +507,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_17", "text": "第7层" @@ -550,7 +516,6 @@ }, { "key": 18, - "Level_type": 1, "layer_num": 8, "tab": 2, "tabIcon": "tx_jz_13001", @@ -570,7 +535,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_18", "text": "第8层" @@ -580,7 +544,6 @@ }, { "key": 19, - "Level_type": 1, "layer_num": 9, "tab": 2, "tabIcon": "tx_jz_13001", @@ -600,7 +563,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_19", "text": "第9层" @@ -610,7 +572,6 @@ }, { "key": 20, - "Level_type": 1, "layer_num": 10, "tab": 2, "tabIcon": "tx_jz_13001", @@ -642,7 +603,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_20", "text": "第10层" @@ -652,7 +612,6 @@ }, { "key": 21, - "Level_type": 1, "layer_num": 1, "tab": 3, "tabIcon": "tx_jz_45003", @@ -672,7 +631,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_21", "text": "第1层" @@ -682,7 +640,6 @@ }, { "key": 22, - "Level_type": 1, "layer_num": 2, "tab": 3, "tabIcon": "tx_jz_45003", @@ -702,7 +659,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_22", "text": "第2层" @@ -712,7 +668,6 @@ }, { "key": 23, - "Level_type": 1, "layer_num": 3, "tab": 3, "tabIcon": "tx_jz_45003", @@ -732,7 +687,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_23", "text": "第3层" @@ -742,7 +696,6 @@ }, { "key": 24, - "Level_type": 1, "layer_num": 4, "tab": 3, "tabIcon": "tx_jz_45003", @@ -762,7 +715,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_24", "text": "第4层" @@ -772,7 +724,6 @@ }, { "key": 25, - "Level_type": 1, "layer_num": 5, "tab": 3, "tabIcon": "tx_jz_45003", @@ -803,7 +754,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_25", "text": "第5层" @@ -813,7 +763,6 @@ }, { "key": 26, - "Level_type": 1, "layer_num": 6, "tab": 3, "tabIcon": "tx_jz_45003", @@ -833,7 +782,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_26", "text": "第6层" @@ -843,7 +791,6 @@ }, { "key": 27, - "Level_type": 1, "layer_num": 7, "tab": 3, "tabIcon": "tx_jz_45003", @@ -863,7 +810,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_27", "text": "第7层" @@ -873,7 +819,6 @@ }, { "key": 28, - "Level_type": 1, "layer_num": 8, "tab": 3, "tabIcon": "tx_jz_45003", @@ -893,7 +838,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_28", "text": "第8层" @@ -903,7 +847,6 @@ }, { "key": 29, - "Level_type": 1, "layer_num": 9, "tab": 3, "tabIcon": "tx_jz_45003", @@ -923,7 +866,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_29", "text": "第9层" @@ -933,7 +875,6 @@ }, { "key": 30, - "Level_type": 1, "layer_num": 10, "tab": 3, "tabIcon": "tx_jz_45003", @@ -965,7 +906,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_30", "text": "第10层" @@ -975,7 +915,6 @@ }, { "key": 31, - "Level_type": 1, "layer_num": 1, "tab": 4, "tabIcon": "tx_jz_24005", @@ -995,7 +934,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_31", "text": "第1层" @@ -1005,7 +943,6 @@ }, { "key": 32, - "Level_type": 1, "layer_num": 2, "tab": 4, "tabIcon": "tx_jz_24005", @@ -1025,7 +962,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_32", "text": "第2层" @@ -1035,7 +971,6 @@ }, { "key": 33, - "Level_type": 1, "layer_num": 3, "tab": 4, "tabIcon": "tx_jz_24005", @@ -1055,7 +990,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_33", "text": "第3层" @@ -1065,7 +999,6 @@ }, { "key": 34, - "Level_type": 1, "layer_num": 4, "tab": 4, "tabIcon": "tx_jz_24005", @@ -1085,7 +1018,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_34", "text": "第4层" @@ -1095,7 +1027,6 @@ }, { "key": 35, - "Level_type": 1, "layer_num": 5, "tab": 4, "tabIcon": "tx_jz_24005", @@ -1126,7 +1057,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_35", "text": "第5层" @@ -1136,7 +1066,6 @@ }, { "key": 36, - "Level_type": 1, "layer_num": 6, "tab": 4, "tabIcon": "tx_jz_24005", @@ -1156,7 +1085,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_36", "text": "第6层" @@ -1166,7 +1094,6 @@ }, { "key": 37, - "Level_type": 1, "layer_num": 7, "tab": 4, "tabIcon": "tx_jz_24005", @@ -1186,7 +1113,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_37", "text": "第7层" @@ -1196,7 +1122,6 @@ }, { "key": 38, - "Level_type": 1, "layer_num": 8, "tab": 4, "tabIcon": "tx_jz_24005", @@ -1216,7 +1141,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_38", "text": "第8层" @@ -1226,7 +1150,6 @@ }, { "key": 39, - "Level_type": 1, "layer_num": 9, "tab": 4, "tabIcon": "tx_jz_24005", @@ -1246,7 +1169,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_39", "text": "第9层" @@ -1256,7 +1178,6 @@ }, { "key": 40, - "Level_type": 1, "layer_num": 10, "tab": 4, "tabIcon": "tx_jz_24005", @@ -1288,7 +1209,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_40", "text": "第10层" @@ -1298,7 +1218,6 @@ }, { "key": 41, - "Level_type": 1, "layer_num": 1, "tab": 5, "tabIcon": "tx_jz_14005", @@ -1318,7 +1237,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_41", "text": "第1层" @@ -1328,7 +1246,6 @@ }, { "key": 42, - "Level_type": 1, "layer_num": 2, "tab": 5, "tabIcon": "tx_jz_14005", @@ -1348,7 +1265,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_42", "text": "第2层" @@ -1358,7 +1274,6 @@ }, { "key": 43, - "Level_type": 1, "layer_num": 3, "tab": 5, "tabIcon": "tx_jz_14005", @@ -1378,7 +1293,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_43", "text": "第3层" @@ -1388,7 +1302,6 @@ }, { "key": 44, - "Level_type": 1, "layer_num": 4, "tab": 5, "tabIcon": "tx_jz_14005", @@ -1408,7 +1321,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_44", "text": "第4层" @@ -1418,7 +1330,6 @@ }, { "key": 45, - "Level_type": 1, "layer_num": 5, "tab": 5, "tabIcon": "tx_jz_14005", @@ -1449,7 +1360,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_45", "text": "第5层" @@ -1459,7 +1369,6 @@ }, { "key": 46, - "Level_type": 1, "layer_num": 6, "tab": 5, "tabIcon": "tx_jz_14005", @@ -1479,7 +1388,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_46", "text": "第6层" @@ -1489,7 +1397,6 @@ }, { "key": 47, - "Level_type": 1, "layer_num": 7, "tab": 5, "tabIcon": "tx_jz_14005", @@ -1509,7 +1416,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_47", "text": "第7层" @@ -1519,7 +1425,6 @@ }, { "key": 48, - "Level_type": 1, "layer_num": 8, "tab": 5, "tabIcon": "tx_jz_14005", @@ -1539,7 +1444,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_48", "text": "第8层" @@ -1549,7 +1453,6 @@ }, { "key": 49, - "Level_type": 1, "layer_num": 9, "tab": 5, "tabIcon": "tx_jz_14005", @@ -1569,7 +1472,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_49", "text": "第9层" @@ -1579,7 +1481,6 @@ }, { "key": 50, - "Level_type": 1, "layer_num": 10, "tab": 5, "tabIcon": "tx_jz_14005", @@ -1611,7 +1512,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_50", "text": "第10层" @@ -1621,7 +1521,6 @@ }, { "key": 51, - "Level_type": 1, "layer_num": 1, "tab": 6, "tabIcon": "tx_jz_44006", @@ -1641,7 +1540,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_51", "text": "第1层" @@ -1651,7 +1549,6 @@ }, { "key": 52, - "Level_type": 1, "layer_num": 2, "tab": 6, "tabIcon": "tx_jz_44006", @@ -1671,7 +1568,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_52", "text": "第2层" @@ -1681,7 +1577,6 @@ }, { "key": 53, - "Level_type": 1, "layer_num": 3, "tab": 6, "tabIcon": "tx_jz_44006", @@ -1701,7 +1596,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_53", "text": "第3层" @@ -1711,7 +1605,6 @@ }, { "key": 54, - "Level_type": 1, "layer_num": 4, "tab": 6, "tabIcon": "tx_jz_44006", @@ -1731,7 +1624,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_54", "text": "第4层" @@ -1741,7 +1633,6 @@ }, { "key": 55, - "Level_type": 1, "layer_num": 5, "tab": 6, "tabIcon": "tx_jz_44006", @@ -1772,7 +1663,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_55", "text": "第5层" @@ -1782,7 +1672,6 @@ }, { "key": 56, - "Level_type": 1, "layer_num": 6, "tab": 6, "tabIcon": "tx_jz_44006", @@ -1802,7 +1691,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_56", "text": "第6层" @@ -1812,7 +1700,6 @@ }, { "key": 57, - "Level_type": 1, "layer_num": 7, "tab": 6, "tabIcon": "tx_jz_44006", @@ -1832,7 +1719,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_57", "text": "第7层" @@ -1842,7 +1728,6 @@ }, { "key": 58, - "Level_type": 1, "layer_num": 8, "tab": 6, "tabIcon": "tx_jz_44006", @@ -1862,7 +1747,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_58", "text": "第8层" @@ -1872,7 +1756,6 @@ }, { "key": 59, - "Level_type": 1, "layer_num": 9, "tab": 6, "tabIcon": "tx_jz_44006", @@ -1892,7 +1775,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_59", "text": "第9层" @@ -1902,7 +1784,6 @@ }, { "key": 60, - "Level_type": 1, "layer_num": 10, "tab": 6, "tabIcon": "tx_jz_44006", @@ -1934,7 +1815,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_60", "text": "第10层" @@ -1944,7 +1824,6 @@ }, { "key": 61, - "Level_type": 1, "layer_num": 1, "tab": 7, "tabIcon": "tx_jz_35001", @@ -1964,7 +1843,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_61", "text": "第1层" @@ -1974,7 +1852,6 @@ }, { "key": 62, - "Level_type": 1, "layer_num": 2, "tab": 7, "tabIcon": "tx_jz_35001", @@ -1994,7 +1871,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_62", "text": "第2层" @@ -2004,7 +1880,6 @@ }, { "key": 63, - "Level_type": 1, "layer_num": 3, "tab": 7, "tabIcon": "tx_jz_35001", @@ -2024,7 +1899,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_63", "text": "第3层" @@ -2034,7 +1908,6 @@ }, { "key": 64, - "Level_type": 1, "layer_num": 4, "tab": 7, "tabIcon": "tx_jz_35001", @@ -2054,7 +1927,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_64", "text": "第4层" @@ -2064,7 +1936,6 @@ }, { "key": 65, - "Level_type": 1, "layer_num": 5, "tab": 7, "tabIcon": "tx_jz_35001", @@ -2095,7 +1966,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_65", "text": "第5层" @@ -2105,7 +1975,6 @@ }, { "key": 66, - "Level_type": 1, "layer_num": 6, "tab": 7, "tabIcon": "tx_jz_35001", @@ -2125,7 +1994,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_66", "text": "第6层" @@ -2135,7 +2003,6 @@ }, { "key": 67, - "Level_type": 1, "layer_num": 7, "tab": 7, "tabIcon": "tx_jz_35001", @@ -2155,7 +2022,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_67", "text": "第7层" @@ -2165,7 +2031,6 @@ }, { "key": 68, - "Level_type": 1, "layer_num": 8, "tab": 7, "tabIcon": "tx_jz_35001", @@ -2185,7 +2050,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_68", "text": "第8层" @@ -2195,7 +2059,6 @@ }, { "key": 69, - "Level_type": 1, "layer_num": 9, "tab": 7, "tabIcon": "tx_jz_35001", @@ -2215,7 +2078,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_69", "text": "第9层" @@ -2225,7 +2087,6 @@ }, { "key": 70, - "Level_type": 1, "layer_num": 10, "tab": 7, "tabIcon": "tx_jz_35001", @@ -2257,7 +2118,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_70", "text": "第10层" @@ -2267,7 +2127,6 @@ }, { "key": 71, - "Level_type": 1, "layer_num": 1, "tab": 8, "tabIcon": "tx_jz_44002", @@ -2287,7 +2146,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_71", "text": "第1层" @@ -2297,7 +2155,6 @@ }, { "key": 72, - "Level_type": 1, "layer_num": 2, "tab": 8, "tabIcon": "tx_jz_44002", @@ -2317,7 +2174,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_72", "text": "第2层" @@ -2327,7 +2183,6 @@ }, { "key": 73, - "Level_type": 1, "layer_num": 3, "tab": 8, "tabIcon": "tx_jz_44002", @@ -2347,7 +2202,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_73", "text": "第3层" @@ -2357,7 +2211,6 @@ }, { "key": 74, - "Level_type": 1, "layer_num": 4, "tab": 8, "tabIcon": "tx_jz_44002", @@ -2377,7 +2230,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_74", "text": "第4层" @@ -2387,7 +2239,6 @@ }, { "key": 75, - "Level_type": 1, "layer_num": 5, "tab": 8, "tabIcon": "tx_jz_44002", @@ -2418,7 +2269,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_75", "text": "第5层" @@ -2428,7 +2278,6 @@ }, { "key": 76, - "Level_type": 1, "layer_num": 6, "tab": 8, "tabIcon": "tx_jz_44002", @@ -2448,7 +2297,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_76", "text": "第6层" @@ -2458,7 +2306,6 @@ }, { "key": 77, - "Level_type": 1, "layer_num": 7, "tab": 8, "tabIcon": "tx_jz_44002", @@ -2478,7 +2325,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_77", "text": "第7层" @@ -2488,7 +2334,6 @@ }, { "key": 78, - "Level_type": 1, "layer_num": 8, "tab": 8, "tabIcon": "tx_jz_44002", @@ -2508,7 +2353,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_78", "text": "第8层" @@ -2518,7 +2362,6 @@ }, { "key": 79, - "Level_type": 1, "layer_num": 9, "tab": 8, "tabIcon": "tx_jz_44002", @@ -2538,7 +2381,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_79", "text": "第9层" @@ -2548,7 +2390,6 @@ }, { "key": 80, - "Level_type": 1, "layer_num": 10, "tab": 8, "tabIcon": "tx_jz_44002", @@ -2580,7 +2421,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_80", "text": "第10层" @@ -2590,7 +2430,6 @@ }, { "key": 81, - "Level_type": 1, "layer_num": 1, "tab": 9, "tabIcon": "tx_jz_35002", @@ -2610,7 +2449,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_81", "text": "第1层" @@ -2620,7 +2458,6 @@ }, { "key": 82, - "Level_type": 1, "layer_num": 2, "tab": 9, "tabIcon": "tx_jz_35002", @@ -2640,7 +2477,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_82", "text": "第2层" @@ -2650,7 +2486,6 @@ }, { "key": 83, - "Level_type": 1, "layer_num": 3, "tab": 9, "tabIcon": "tx_jz_35002", @@ -2670,7 +2505,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_83", "text": "第3层" @@ -2680,7 +2514,6 @@ }, { "key": 84, - "Level_type": 1, "layer_num": 4, "tab": 9, "tabIcon": "tx_jz_35002", @@ -2700,7 +2533,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_84", "text": "第4层" @@ -2710,7 +2542,6 @@ }, { "key": 85, - "Level_type": 1, "layer_num": 5, "tab": 9, "tabIcon": "tx_jz_35002", @@ -2741,7 +2572,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_85", "text": "第5层" @@ -2751,7 +2581,6 @@ }, { "key": 86, - "Level_type": 1, "layer_num": 6, "tab": 9, "tabIcon": "tx_jz_35002", @@ -2771,7 +2600,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_86", "text": "第6层" @@ -2781,7 +2609,6 @@ }, { "key": 87, - "Level_type": 1, "layer_num": 7, "tab": 9, "tabIcon": "tx_jz_35002", @@ -2801,7 +2628,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_87", "text": "第7层" @@ -2811,7 +2637,6 @@ }, { "key": 88, - "Level_type": 1, "layer_num": 8, "tab": 9, "tabIcon": "tx_jz_35002", @@ -2831,7 +2656,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_88", "text": "第8层" @@ -2841,7 +2665,6 @@ }, { "key": 89, - "Level_type": 1, "layer_num": 9, "tab": 9, "tabIcon": "tx_jz_35002", @@ -2861,7 +2684,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_89", "text": "第9层" @@ -2871,7 +2693,6 @@ }, { "key": 90, - "Level_type": 1, "layer_num": 10, "tab": 9, "tabIcon": "tx_jz_35002", @@ -2903,7 +2724,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_90", "text": "第10层" @@ -2913,7 +2733,6 @@ }, { "key": 91, - "Level_type": 1, "layer_num": 1, "tab": 10, "tabIcon": "tx_jz_45004", @@ -2933,7 +2752,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_91", "text": "第1层" @@ -2943,7 +2761,6 @@ }, { "key": 92, - "Level_type": 1, "layer_num": 2, "tab": 10, "tabIcon": "tx_jz_45004", @@ -2963,7 +2780,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_92", "text": "第2层" @@ -2973,7 +2789,6 @@ }, { "key": 93, - "Level_type": 1, "layer_num": 3, "tab": 10, "tabIcon": "tx_jz_45004", @@ -2993,7 +2808,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_93", "text": "第3层" @@ -3003,7 +2817,6 @@ }, { "key": 94, - "Level_type": 1, "layer_num": 4, "tab": 10, "tabIcon": "tx_jz_45004", @@ -3023,7 +2836,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_94", "text": "第4层" @@ -3033,7 +2845,6 @@ }, { "key": 95, - "Level_type": 1, "layer_num": 5, "tab": 10, "tabIcon": "tx_jz_45004", @@ -3064,7 +2875,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_95", "text": "第5层" @@ -3074,7 +2884,6 @@ }, { "key": 96, - "Level_type": 1, "layer_num": 6, "tab": 10, "tabIcon": "tx_jz_45004", @@ -3094,7 +2903,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_96", "text": "第6层" @@ -3104,7 +2912,6 @@ }, { "key": 97, - "Level_type": 1, "layer_num": 7, "tab": 10, "tabIcon": "tx_jz_45004", @@ -3124,7 +2931,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_97", "text": "第7层" @@ -3134,7 +2940,6 @@ }, { "key": 98, - "Level_type": 1, "layer_num": 8, "tab": 10, "tabIcon": "tx_jz_45004", @@ -3154,7 +2959,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_98", "text": "第8层" @@ -3164,7 +2968,6 @@ }, { "key": 99, - "Level_type": 1, "layer_num": 9, "tab": 10, "tabIcon": "tx_jz_45004", @@ -3184,7 +2987,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_99", "text": "第9层" @@ -3194,7 +2996,6 @@ }, { "key": 100, - "Level_type": 1, "layer_num": 10, "tab": 10, "tabIcon": "tx_jz_45004", @@ -3226,7 +3027,6 @@ } ], "exp": 600, - "fight_scene": "", "name_display": { "key": "pandamas_pagoda_name_display_100", "text": "第10层" diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index 71651b139..63e215416 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -7002,7 +7002,7 @@ }, { "id": 11190, - "heroid": 25001, + "heroid": 44004, "Levelid": 0, "datas": [ "CommandScene", @@ -8494,6 +8494,102 @@ ], "goto": 0 }, + { + "id": 320310, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "总教习", + "901" + ], + "event": [], + "goto": 0 + }, + { + "id": 320320, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "总教习", + "901" + ], + "event": [], + "goto": 0 + }, + { + "id": 320330, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "总教习", + "901" + ], + "event": [], + "goto": 0 + }, + { + "id": 320340, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "总教习", + "901" + ], + "event": [], + "goto": 0 + }, + { + "id": 320350, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "总教习", + "901" + ], + "event": [], + "goto": 0 + }, + { + "id": 320360, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "总教习", + "901" + ], + "event": [], + "goto": 0 + }, + { + "id": 320370, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "总教习", + "901" + ], + "event": [], + "goto": 0 + }, + { + "id": 320380, + "heroid": 25001, + "Levelid": 0, + "datas": [ + "GameMain", + "总教习", + "901" + ], + "event": [], + "goto": 0 + }, { "id": 50010, "heroid": 25001, @@ -9150,7 +9246,7 @@ }, { "id": 60108, - "heroid": 25001, + "heroid": 43004, "Levelid": 0, "datas": [ "GameMain", diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 077d6205c..db67b8fa3 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -76484,5 +76484,30 @@ "DpsCondition": "", "RevisiCondition": "", "RevisiParams": [] + }, + { + "Id": 210000005, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "TriggerAnim": "", + "Type": 3, + "Argu": [ + 391000160, + 1000, + 1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] } ] \ No newline at end of file diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 3af6006f1..3f7fcc0ae 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -63173,5 +63173,38 @@ }, "buffid": [], "map": "" + }, + { + "id": 100000005, + "level": 1, + "MaxLV": 1, + "UnavailablePlayTypes": [], + "SkillFlag": 0, + "EffectFlag": 0, + "Priority": 0, + "Name": { + "key": "skill_skill_atk_Name_100000005", + "text": "" + }, + "ico": "", + "CorrectPos": 0, + "IsMelee": 0, + "act": "", + "Type": 4, + "CD": 0, + "Where": [], + "Target": 0, + "ChildSkill": { + "Id": [ + 210000005 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_100000005_1", + "text": "boss无限血" + }, + "buffid": [], + "map": "" } ] \ No newline at end of file diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index eb6870a43..fe792a64f 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -14480,7 +14480,7 @@ "SameID": false, "golbalbufficon": "", "buffIcon": "ty_icon_buff_gjts", - "buffeffect": "", + "buffeffect": "effect_55002_evil_heiyan", "buffpos": "根节点", "AddTrigger": 0, "TriggerEffect": "", @@ -16152,5 +16152,40 @@ "TriggerAnim": "", "forbidFloat": 0, "ReplaceBuffID": 0 + }, + { + "Id": 391000160, + "Name": { + "key": "skill_skill_buff_Name_391000160", + "text": "无限血" + }, + "Desc": { + "key": "skill_skill_buff_Desc_391000160", + "text": "无限血" + }, + "BuffType": 155, + "EffectArgu": [], + "BufParNum": 1, + "RelyCheckArgu": [], + "CoexistCheckArgu": [], + "Effect": [ + 0 + ], + "AddEffect": false, + "RemoveType": false, + "Priority": 0, + "NotOverlay": 0, + "OverlayTimes": 1, + "SameID": false, + "golbalbufficon": "", + "buffIcon": "", + "buffeffect": "", + "buffpos": "", + "AddTrigger": 0, + "TriggerEffect": "", + "TriggerPos": "", + "TriggerAnim": "", + "forbidFloat": 0, + "ReplaceBuffID": 0 } ] \ No newline at end of file diff --git a/bin/json/game_skillproperty.json b/bin/json/game_skillproperty.json index 8d8d2c465..ea24f84ee 100644 --- a/bin/json/game_skillproperty.json +++ b/bin/json/game_skillproperty.json @@ -1,1245 +1,1528 @@ [ { "ProType": 0, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 1, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 1, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 2, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 1, "MaxValue": 0, - "BaseTerms": 37, - "ExtraTerms": 45, - "PerTerms": 21, - "FixTerms": 29 + "BaseTerms": [ + 37 + ], + "ExtraTerms": [ + 45 + ], + "PerTerms": [ + 21 + ], + "FixTerms": [ + 29 + ] }, { "ProType": 3, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 4, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 38, - "ExtraTerms": 46, - "PerTerms": 22, - "FixTerms": 30 + "BaseTerms": [ + 38 + ], + "ExtraTerms": [ + 46 + ], + "PerTerms": [ + 22 + ], + "FixTerms": [ + 30 + ] }, { "ProType": 5, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 39, - "ExtraTerms": 47, - "PerTerms": 23, - "FixTerms": 31 + "BaseTerms": [ + 39 + ], + "ExtraTerms": [ + 47 + ], + "PerTerms": [ + 23 + ], + "FixTerms": [ + 31 + ] }, { "ProType": 6, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 40, - "ExtraTerms": 48, - "PerTerms": 87, - "FixTerms": 32 + "BaseTerms": [ + 40 + ], + "ExtraTerms": [ + 48 + ], + "PerTerms": [ + 87 + ], + "FixTerms": [ + 32 + ] }, { "ProType": 7, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 1000, - "BaseTerms": 41, - "ExtraTerms": 49, - "PerTerms": 90, - "FixTerms": 33 + "BaseTerms": [ + 41 + ], + "ExtraTerms": [ + 49 + ], + "PerTerms": [ + 90 + ], + "FixTerms": [ + 33 + ] }, { "ProType": 8, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 42, - "ExtraTerms": 50, - "PerTerms": 93, - "FixTerms": 34 + "BaseTerms": [ + 42 + ], + "ExtraTerms": [ + 50 + ], + "PerTerms": [ + 93 + ], + "FixTerms": [ + 34 + ] }, { "ProType": 9, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 1000, - "BaseTerms": 43, - "ExtraTerms": 51, - "PerTerms": 96, - "FixTerms": 35 + "BaseTerms": [ + 43 + ], + "ExtraTerms": [ + 51 + ], + "PerTerms": [ + 96 + ], + "FixTerms": [ + 35 + ] }, { "ProType": 10, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 200, "MaxValue": 1000, - "BaseTerms": 44, - "ExtraTerms": 52, - "PerTerms": 28, - "FixTerms": 36 + "BaseTerms": [ + 44 + ], + "ExtraTerms": [ + 52 + ], + "PerTerms": [ + 28 + ], + "FixTerms": [ + 36 + ] }, { "ProType": 11, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 1000, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 12, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 1000, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 13, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 14, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 15, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 16, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 17, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 18, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 19, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 20, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 21, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 22, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 23, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 24, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 25, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 26, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 27, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 28, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 29, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 30, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 31, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 32, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 33, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 34, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 35, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 36, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 37, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 53, - "ExtraTerms": 0, - "PerTerms": 54, - "FixTerms": 55 + "BaseTerms": [ + 53 + ], + "ExtraTerms": [], + "PerTerms": [ + 54 + ], + "FixTerms": [ + 55 + ] }, { "ProType": 38, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 56, - "ExtraTerms": 0, - "PerTerms": 57, - "FixTerms": 58 + "BaseTerms": [ + 56 + ], + "ExtraTerms": [], + "PerTerms": [ + 57 + ], + "FixTerms": [ + 58 + ] }, { "ProType": 39, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 59, - "ExtraTerms": 0, - "PerTerms": 60, - "FixTerms": 61 + "BaseTerms": [ + 59 + ], + "ExtraTerms": [], + "PerTerms": [ + 60 + ], + "FixTerms": [ + 61 + ] }, { "ProType": 40, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 62, - "ExtraTerms": 0, - "PerTerms": 63, - "FixTerms": 64 + "BaseTerms": [ + 62 + ], + "ExtraTerms": [], + "PerTerms": [ + 63 + ], + "FixTerms": [ + 64 + ] }, { "ProType": 41, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 65, - "ExtraTerms": 0, - "PerTerms": 66, - "FixTerms": 67 + "BaseTerms": [ + 65 + ], + "ExtraTerms": [], + "PerTerms": [ + 66 + ], + "FixTerms": [ + 67 + ] }, { "ProType": 42, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 68, - "ExtraTerms": 0, - "PerTerms": 69, - "FixTerms": 70 + "BaseTerms": [ + 68 + ], + "ExtraTerms": [], + "PerTerms": [ + 69 + ], + "FixTerms": [ + 70 + ] }, { "ProType": 43, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 71, - "ExtraTerms": 0, - "PerTerms": 72, - "FixTerms": 73 + "BaseTerms": [ + 71 + ], + "ExtraTerms": [], + "PerTerms": [ + 72 + ], + "FixTerms": [ + 73 + ] }, { "ProType": 44, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 74, - "ExtraTerms": 0, - "PerTerms": 75, - "FixTerms": 76 + "BaseTerms": [ + 74 + ], + "ExtraTerms": [], + "PerTerms": [ + 75 + ], + "FixTerms": [ + 76 + ] }, { "ProType": 45, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 77, - "ExtraTerms": 0, - "PerTerms": 78, - "FixTerms": 79 + "BaseTerms": [ + 77 + ], + "ExtraTerms": [], + "PerTerms": [ + 78 + ], + "FixTerms": [ + 79 + ] }, { "ProType": 46, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 80, - "ExtraTerms": 0, - "PerTerms": 81, - "FixTerms": 82 + "BaseTerms": [ + 80 + ], + "ExtraTerms": [], + "PerTerms": [ + 81 + ], + "FixTerms": [ + 82 + ] }, { "ProType": 47, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 83, - "ExtraTerms": 0, - "PerTerms": 84, - "FixTerms": 85 + "BaseTerms": [ + 83 + ], + "ExtraTerms": [], + "PerTerms": [ + 84 + ], + "FixTerms": [ + 85 + ] }, { "ProType": 48, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 86, - "ExtraTerms": 0, - "PerTerms": 87, - "FixTerms": 88 + "BaseTerms": [ + 86 + ], + "ExtraTerms": [], + "PerTerms": [ + 87 + ], + "FixTerms": [ + 88 + ] }, { "ProType": 49, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 89, - "ExtraTerms": 0, - "PerTerms": 90, - "FixTerms": 91 + "BaseTerms": [ + 89 + ], + "ExtraTerms": [], + "PerTerms": [ + 90 + ], + "FixTerms": [ + 91 + ] }, { "ProType": 50, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 92, - "ExtraTerms": 0, - "PerTerms": 93, - "FixTerms": 94 + "BaseTerms": [ + 92 + ], + "ExtraTerms": [], + "PerTerms": [ + 93 + ], + "FixTerms": [ + 94 + ] }, { "ProType": 51, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 95, - "ExtraTerms": 0, - "PerTerms": 96, - "FixTerms": 97 + "BaseTerms": [ + 95 + ], + "ExtraTerms": [], + "PerTerms": [ + 96 + ], + "FixTerms": [ + 97 + ] }, { "ProType": 52, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 98, - "ExtraTerms": 0, - "PerTerms": 99, - "FixTerms": 100 + "BaseTerms": [ + 98 + ], + "ExtraTerms": [], + "PerTerms": [ + 99 + ], + "FixTerms": [ + 100 + ] }, { "ProType": 53, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 54, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 55, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 56, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 57, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 58, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 59, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 60, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 61, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 62, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 63, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 64, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 65, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 66, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 67, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 68, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 69, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 70, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 71, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 72, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 73, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 74, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 75, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 76, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 77, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 78, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 79, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 80, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 81, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 82, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 83, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 84, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 85, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 86, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 87, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 88, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 89, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 90, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 91, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 92, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 93, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 94, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 95, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 96, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 97, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 98, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 99, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 100, + "GroupId": 0, "ProLevel": 1, "LimitValue": 0, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 101, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 102, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 103, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 104, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 105, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 107, - "ExtraTerms": 108, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [ + 107 + ], + "ExtraTerms": [ + 108 + ], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 106, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 107, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 108, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 109, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 110, + "GroupId": 0, "ProLevel": 2, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 1, - "ExtraTerms": 0, - "PerTerms": 111, - "FixTerms": 112 + "BaseTerms": [ + 1 + ], + "ExtraTerms": [], + "PerTerms": [ + 111 + ], + "FixTerms": [ + 112 + ] }, { "ProType": 111, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] }, { "ProType": 112, + "GroupId": 0, "ProLevel": 1, "LimitValue": 1, "MinValue": 0, "MaxValue": 0, - "BaseTerms": 0, - "ExtraTerms": 0, - "PerTerms": 0, - "FixTerms": 0 + "BaseTerms": [], + "ExtraTerms": [], + "PerTerms": [], + "FixTerms": [] } ] \ No newline at end of file diff --git a/bin/json/game_treasuremap.json b/bin/json/game_treasuremap.json index 9d2a3a11c..9078a683c 100644 --- a/bin/json/game_treasuremap.json +++ b/bin/json/game_treasuremap.json @@ -248,7 +248,7 @@ "id": 7, "pic": "cbt_sp07_00", "chapter": 11002, - "type": 0, + "type": 1, "unlock": [ { "a": "item", @@ -260,11 +260,6 @@ "t": "24012202", "n": 1 }, - { - "a": "item", - "t": "24012202", - "n": 1 - }, { "a": "item", "t": "24012203", @@ -274,26 +269,6 @@ "a": "item", "t": "24012203", "n": 1 - }, - { - "a": "item", - "t": "24012203", - "n": 1 - }, - { - "a": "item", - "t": "24012204", - "n": 1 - }, - { - "a": "item", - "t": "24012204", - "n": 1 - }, - { - "a": "item", - "t": "24012204", - "n": 1 } ], "name": { @@ -347,17 +322,17 @@ }, { "a": "item", - "t": "24012207", + "t": "24012204", "n": 1 }, { "a": "item", - "t": "24012207", + "t": "24012204", "n": 1 }, { "a": "item", - "t": "24012207", + "t": "24012204", "n": 1 } ], @@ -378,7 +353,7 @@ "id": 9, "pic": "cbt_sp09_00", "chapter": 11002, - "type": 1, + "type": 0, "unlock": [ { "a": "item", @@ -390,6 +365,11 @@ "t": "24012208", "n": 1 }, + { + "a": "item", + "t": "24012208", + "n": 1 + }, { "a": "item", "t": "24012209", @@ -399,6 +379,26 @@ "a": "item", "t": "24012209", "n": 1 + }, + { + "a": "item", + "t": "24012209", + "n": 1 + }, + { + "a": "item", + "t": "24012207", + "n": 1 + }, + { + "a": "item", + "t": "24012207", + "n": 1 + }, + { + "a": "item", + "t": "24012207", + "n": 1 } ], "name": { diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 39ab27da8..dbcacec15 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -3035,7 +3035,7 @@ "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_52", - "text": "功夫大师挑战塔" + "text": "功夫大师的挑战" }, "task_details": { "key": "worldtask_world_task_task_details_52", @@ -3043,7 +3043,7 @@ }, "npctxt": { "key": "worldtask_world_task_npctxt_52", - "text": "教习" + "text": "和师傅聊聊" }, "get_item": [], "trigger": 0, @@ -9021,7 +9021,7 @@ "get_item": [], "trigger": 0, "show_mode": 0, - "npc": 11190, + "npc": 320310, "completetask": [ 14000030 ], @@ -9064,7 +9064,7 @@ "get_item": [], "trigger": 0, "show_mode": 0, - "npc": 11190, + "npc": 320320, "completetask": [ 14000040 ], @@ -9107,7 +9107,7 @@ "get_item": [], "trigger": 0, "show_mode": 0, - "npc": 11190, + "npc": 320330, "completetask": [ 14000050 ], @@ -9150,7 +9150,7 @@ "get_item": [], "trigger": 0, "show_mode": 0, - "npc": 11190, + "npc": 320340, "completetask": [ 14000060 ], @@ -9193,7 +9193,7 @@ "get_item": [], "trigger": 0, "show_mode": 0, - "npc": 11190, + "npc": 320350, "completetask": [ 14000070 ], @@ -9236,7 +9236,7 @@ "get_item": [], "trigger": 0, "show_mode": 0, - "npc": 11190, + "npc": 320360, "completetask": [ 14000080 ], @@ -9279,7 +9279,7 @@ "get_item": [], "trigger": 0, "show_mode": 0, - "npc": 11190, + "npc": 320370, "completetask": [ 14000090 ], @@ -9322,7 +9322,7 @@ "get_item": [], "trigger": 0, "show_mode": 0, - "npc": 11190, + "npc": 320380, "completetask": [ 14000100 ], diff --git a/sys/configure/structs/Game.BuffType.go b/sys/configure/structs/Game.BuffType.go index d57637472..1956c69da 100644 --- a/sys/configure/structs/Game.BuffType.go +++ b/sys/configure/structs/Game.BuffType.go @@ -145,4 +145,5 @@ const ( GameBuffType_FRIGID = 152 GameBuffType_SHADE = 153 GameBuffType_ADD_EFFECT = 154 + GameBuffType_INFINITE_HP = 155 ) diff --git a/sys/configure/structs/Game.FightEventType.go b/sys/configure/structs/Game.FightEventType.go index 6e6b8146f..115c2bf72 100644 --- a/sys/configure/structs/Game.FightEventType.go +++ b/sys/configure/structs/Game.FightEventType.go @@ -45,4 +45,5 @@ const ( GameFightEventType_OnBuffEnd = 33 GameFightEventType_OnDrawActValue = 34 GameFightEventType_OnEnchantBossBuffChanged = 35 + GameFightEventType_OnPassiveTrigger = 36 ) diff --git a/sys/configure/structs/Game.FightGlobalEventData.go b/sys/configure/structs/Game.FightGlobalEventData.go index bc80243c1..f68c38a3d 100644 --- a/sys/configure/structs/Game.FightGlobalEventData.go +++ b/sys/configure/structs/Game.FightGlobalEventData.go @@ -18,6 +18,7 @@ type GameFightGlobalEventData struct { When int32 FromCheck string TargetCheck string + PassiveCheck string MainSkillCheck string AfterSkillCheck string BuffCheck string @@ -41,6 +42,7 @@ func (_v *GameFightGlobalEventData)Deserialize(_buf map[string]interface{}) (err { 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 } } + { var _ok_ bool; if _v.PassiveCheck, _ok_ = _buf["PassiveCheck"].(string); !_ok_ { err = errors.New("PassiveCheck error"); return } } { var _ok_ bool; if _v.MainSkillCheck, _ok_ = _buf["MainSkillCheck"].(string); !_ok_ { err = errors.New("MainSkillCheck error"); return } } { var _ok_ bool; if _v.AfterSkillCheck, _ok_ = _buf["AfterSkillCheck"].(string); !_ok_ { err = errors.New("AfterSkillCheck error"); return } } { var _ok_ bool; if _v.BuffCheck, _ok_ = _buf["BuffCheck"].(string); !_ok_ { err = errors.New("BuffCheck error"); return } } diff --git a/sys/configure/structs/Game.SkillPropertyData.go b/sys/configure/structs/Game.SkillPropertyData.go index b63457878..578881f1c 100644 --- a/sys/configure/structs/Game.SkillPropertyData.go +++ b/sys/configure/structs/Game.SkillPropertyData.go @@ -12,14 +12,15 @@ import "errors" type GameSkillPropertyData struct { ProType int32 + GroupId int32 ProLevel int32 LimitValue int32 MinValue int32 MaxValue int32 - BaseTerms int32 - ExtraTerms int32 - PerTerms int32 - FixTerms int32 + BaseTerms []int32 + ExtraTerms []int32 + PerTerms []int32 + FixTerms []int32 } const TypeId_GameSkillPropertyData = 880868628 @@ -30,14 +31,67 @@ func (*GameSkillPropertyData) GetTypeId() int32 { func (_v *GameSkillPropertyData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ProType"].(float64); !_ok_ { err = errors.New("ProType error"); return }; _v.ProType = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["GroupId"].(float64); !_ok_ { err = errors.New("GroupId error"); return }; _v.GroupId = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ProLevel"].(float64); !_ok_ { err = errors.New("ProLevel error"); return }; _v.ProLevel = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["LimitValue"].(float64); !_ok_ { err = errors.New("LimitValue error"); return }; _v.LimitValue = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MinValue"].(float64); !_ok_ { err = errors.New("MinValue error"); return }; _v.MinValue = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MaxValue"].(float64); !_ok_ { err = errors.New("MaxValue error"); return }; _v.MaxValue = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BaseTerms"].(float64); !_ok_ { err = errors.New("BaseTerms error"); return }; _v.BaseTerms = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ExtraTerms"].(float64); !_ok_ { err = errors.New("ExtraTerms error"); return }; _v.ExtraTerms = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["PerTerms"].(float64); !_ok_ { err = errors.New("PerTerms error"); return }; _v.PerTerms = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["FixTerms"].(float64); !_ok_ { err = errors.New("FixTerms error"); return }; _v.FixTerms = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["BaseTerms"].([]interface{}); !_ok_ { err = errors.New("BaseTerms error"); return } + + _v.BaseTerms = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.BaseTerms = append(_v.BaseTerms, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["ExtraTerms"].([]interface{}); !_ok_ { err = errors.New("ExtraTerms error"); return } + + _v.ExtraTerms = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.ExtraTerms = append(_v.ExtraTerms, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["PerTerms"].([]interface{}); !_ok_ { err = errors.New("PerTerms error"); return } + + _v.PerTerms = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.PerTerms = append(_v.PerTerms, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["FixTerms"].([]interface{}); !_ok_ { err = errors.New("FixTerms error"); return } + + _v.FixTerms = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.FixTerms = append(_v.FixTerms, _list_v_) + } + } + return } diff --git a/sys/configure/structs/game.pagodaData.go b/sys/configure/structs/game.pagodaData.go index 796a58bd6..7863b2185 100644 --- a/sys/configure/structs/game.pagodaData.go +++ b/sys/configure/structs/game.pagodaData.go @@ -12,7 +12,6 @@ import "errors" type GamePagodaData struct { Key int32 - LevelType int32 LayerNum int32 Tab int32 TabIcon string @@ -21,7 +20,6 @@ type GamePagodaData struct { MonsterId []int32 Reward []*Gameatn Exp int32 - FightScene string NameDisplay string ModelDisplay int32 Unlock int32 @@ -35,7 +33,6 @@ func (*GamePagodaData) GetTypeId() int32 { func (_v *GamePagodaData)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 _tempNum_ float64; if _tempNum_, _ok_ = _buf["Level_type"].(float64); !_ok_ { err = errors.New("Level_type error"); return }; _v.LevelType = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["layer_num"].(float64); !_ok_ { err = errors.New("layer_num error"); return }; _v.LayerNum = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tab"].(float64); !_ok_ { err = errors.New("tab error"); return }; _v.Tab = int32(_tempNum_) } { var _ok_ bool; if _v.TabIcon, _ok_ = _buf["tabIcon"].(string); !_ok_ { err = errors.New("tabIcon error"); return } } @@ -70,7 +67,6 @@ func (_v *GamePagodaData)Deserialize(_buf map[string]interface{}) (err error) { } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["exp"].(float64); !_ok_ { err = errors.New("exp error"); return }; _v.Exp = int32(_tempNum_) } - { var _ok_ bool; if _v.FightScene, _ok_ = _buf["fight_scene"].(string); !_ok_ { err = errors.New("fight_scene error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name_display"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.NameDisplay error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.NameDisplay, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["model_display"].(float64); !_ok_ { err = errors.New("model_display error"); return }; _v.ModelDisplay = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["unlock"].(float64); !_ok_ { err = errors.New("unlock error"); return }; _v.Unlock = int32(_tempNum_) } From 91a28d556d668776b11ff0dd5f03c6ee874b1b6b Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Mon, 5 Feb 2024 10:57:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=B8=BB=E7=BA=BF=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_mainstage.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 0ec72b055..7aacc06c5 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -18636,7 +18636,7 @@ "key": "", "text": "" }, - "hide": false, + "hide": true, "destroy": true, "progress": 0, "timelineplayer": false, @@ -18717,7 +18717,7 @@ "key": "", "text": "" }, - "hide": false, + "hide": true, "destroy": true, "progress": 0, "timelineplayer": false, @@ -18798,7 +18798,7 @@ "key": "", "text": "" }, - "hide": false, + "hide": true, "destroy": true, "progress": 0, "timelineplayer": false, @@ -18879,7 +18879,7 @@ "key": "", "text": "" }, - "hide": false, + "hide": true, "destroy": true, "progress": 0, "timelineplayer": false, From 9152db60e53bbcc706388df47f3086c1504f4f4e Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Mon, 5 Feb 2024 14:25:58 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/plunder/api_rankscore.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/plunder/api_rankscore.go b/modules/plunder/api_rankscore.go index b20d7294a..f8414a351 100644 --- a/modules/plunder/api_rankscore.go +++ b/modules/plunder/api_rankscore.go @@ -34,7 +34,7 @@ func (this *apiComp) RankSocre(session comm.IUserSession, req *pb.PlunderRankSoc } return } - session.SendMsg(string(this.module.GetType()), "refresh", &pb.PlunderRankSocreResp{ + session.SendMsg(string(this.module.GetType()), "ranksocre", &pb.PlunderRankSocreResp{ Score: land.Score, })