From 448b5e5b8c9dcb0bfa6da26f554f26911801fba7 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 24 Mar 2023 15:20:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=82=89=E6=B8=A9=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/smithy/api_rise.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/smithy/api_rise.go b/modules/smithy/api_rise.go index 760199b6d..f55abe818 100644 --- a/modules/smithy/api_rise.go +++ b/modules/smithy/api_rise.go @@ -44,7 +44,7 @@ func (this *apiComp) Rise(session comm.IUserSession, req *pb.SmithyRiseReq) (cod N: raise.N * req.Count, }) - if stove.Temperature+req.Count*raise_temperatureNum < (conf.MaxTemperature - raise_temperatureNum) { + if stove.Temperature+req.Count*raise_temperatureNum >= (conf.MaxTemperature - raise_temperatureNum) { code = pb.ErrorCode_SmithyMaxTemperature return } From 95c22e3bec7b8cee916b78ed0b4511e479765662 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 24 Mar 2023 15:52:21 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=BE=8E=E9=A3=9F=E9=A6=86=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_combatbox.json | 69 +- bin/json/game_combatlevel.json | 10 + bin/json/game_combatmanster.json | 21 + bin/json/game_dispatch_battle.json | 16 +- bin/json/game_dispatch_task.json | 2558 +++++++++--------- bin/json/game_global.json | 2 +- bin/json/game_gm.json | 4 +- bin/json/game_initial.json | 10 + bin/json/game_monsterformat.json | 40 +- bin/json/game_opencond.json | 39 + bin/json/game_pagoda.json | 360 +-- bin/json/game_pandamasjs.json | 18 +- bin/json/game_pandamasjx.json | 40 +- bin/json/game_pandamasmz.json | 40 +- bin/json/game_pandamastj.json | 64 +- bin/json/game_pandamasyxjx.json | 32 +- bin/json/game_show.json | 24 +- bin/json/game_trolltrain.json | 3 + sys/configure/structs/Game.PandamasJsData.go | 2 + sys/configure/structs/Tables.go | 21 - 20 files changed, 1751 insertions(+), 1622 deletions(-) diff --git a/bin/json/game_combatbox.json b/bin/json/game_combatbox.json index 6a764e8bd..85f4afd95 100644 --- a/bin/json/game_combatbox.json +++ b/bin/json/game_combatbox.json @@ -1,94 +1,117 @@ [ { "id": 10001, - "drop": 1002 + "drop": 1002, + "boxname": "Moon Box" }, { "id": 10002, - "drop": 1002 + "drop": 1002, + "boxname": "Moon Box" }, { "id": 10003, - "drop": 1002 + "drop": 1002, + "boxname": "Moon Box" }, { "id": 10004, - "drop": 1001 + "drop": 1001, + "boxname": "Moon Box" }, { "id": 10005, - "drop": 1001 + "drop": 1001, + "boxname": "Moon Box" }, { "id": 10006, - "drop": 1001 + "drop": 1001, + "boxname": "Moon Box" }, { "id": 10007, - "drop": 1001 + "drop": 1001, + "boxname": "Moon Box" }, { "id": 10008, - "drop": 1001 + "drop": 1001, + "boxname": "Moon Box" }, { "id": 10009, - "drop": 1001 + "drop": 1001, + "boxname": "Moon Box" }, { "id": 10010, - "drop": 1001 + "drop": 1001, + "boxname": "Moon Box" }, { "id": 10011, - "drop": 1001 + "drop": 1001, + "boxname": "Moon Box" }, { "id": 10012, - "drop": 1001 + "drop": 1001, + "boxname": "Moon Box" }, { "id": 10013, - "drop": 1001 + "drop": 1001, + "boxname": "Moon Box" }, { "id": 10014, - "drop": 1001 + "drop": 1001, + "boxname": "Moon Box" }, { "id": 10015, - "drop": 1001 + "drop": 1001, + "boxname": "Moon Box" }, { "id": 10101, - "drop": 1001 + "drop": 1001, + "boxname": "Moon Box" }, { "id": 10102, - "drop": 1001 + "drop": 1001, + "boxname": "Moon Box" }, { "id": 10103, - "drop": 1001 + "drop": 1001, + "boxname": "Moon Box" }, { "id": 10301, - "drop": 1001 + "drop": 1001, + "boxname": "Psionics Of The Tree" }, { "id": 10302, - "drop": 1002 + "drop": 1002, + "boxname": "Psionics Of The Tree" }, { "id": 10401, - "drop": 1001 + "drop": 1001, + "boxname": "Moon Box" }, { "id": 10402, - "drop": 1001 + "drop": 1001, + "boxname": "Moon Box" }, { "id": 10403, - "drop": 1001 + "drop": 1001, + "boxname": "Moon Box" } ] \ No newline at end of file diff --git a/bin/json/game_combatlevel.json b/bin/json/game_combatlevel.json index 6ae8dd772..3e40df06b 100644 --- a/bin/json/game_combatlevel.json +++ b/bin/json/game_combatlevel.json @@ -21,6 +21,7 @@ "n": 1 } ], + "description": "Mission Successed！", "scenemusic": "scenemusic_leveldemo_fcamer_1_1", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_1" }, @@ -45,6 +46,7 @@ "n": 1 } ], + "description": "Mission Successed！", "scenemusic": "scenemusic_leveldemo_fcamer_1_3", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_3" }, @@ -70,6 +72,7 @@ "n": 1 } ], + "description": "Mission Successed！", "scenemusic": "scenemusic_leveldemo_fcamer_1_2", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_2" }, @@ -95,6 +98,7 @@ "n": 1 } ], + "description": "Mission Successed！", "scenemusic": "scenemusic_leveldemo_fcamer_1_4", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_4" }, @@ -120,6 +124,7 @@ "n": 1 } ], + "description": "Mission Successed！", "scenemusic": "scenemusic_leveldemo_fcamer_1_5", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_5" }, @@ -143,6 +148,7 @@ "n": 1 } ], + "description": "Mission Successed！", "scenemusic": "scenemusic_leveldemo_fcamer_1_6", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_6" }, @@ -168,6 +174,7 @@ "n": 1 } ], + "description": "Mission Successed！", "scenemusic": "scenemusic_leveldemo_fcamer_1_7", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_7" }, @@ -192,6 +199,7 @@ "n": 1 } ], + "description": "Mission Successed！", "scenemusic": "scenemusic_leveldemo_fcamer_1_8", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_8" }, @@ -216,6 +224,7 @@ "n": 1 } ], + "description": "Mission Successed！", "scenemusic": "scenemusic_leveldemo_fcamer_1_9", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_9" }, @@ -240,6 +249,7 @@ "n": 1 } ], + "description": "Mission Successed！", "scenemusic": "scenemusic_leveldemo_fcamer_1_10", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_10" } diff --git a/bin/json/game_combatmanster.json b/bin/json/game_combatmanster.json index 4a158a6dc..23bd489bd 100644 --- a/bin/json/game_combatmanster.json +++ b/bin/json/game_combatmanster.json @@ -2,6 +2,7 @@ { "id": 101011, "type": 1, + "monstername": "Guard NO.1", "sencenstory": [ 301, 301 @@ -23,6 +24,7 @@ { "id": 101012, "type": 1, + "monstername": "Guard NO.2", "sencenstory": [ 302, 302 @@ -44,6 +46,7 @@ { "id": 101013, "type": 1, + "monstername": "Guard NO.3", "sencenstory": [ 301, 301 @@ -65,6 +68,7 @@ { "id": 101021, "type": 1, + "monstername": "Guard NO.4", "sencenstory": [ 302, 302 @@ -86,6 +90,7 @@ { "id": 110213, "type": 1, + "monstername": "Guard NO.5", "sencenstory": [ 301, 301 @@ -107,6 +112,7 @@ { "id": 110214, "type": 1, + "monstername": "Guard NO.6", "sencenstory": [], "time": 0, "clickstory": 0, @@ -125,6 +131,7 @@ { "id": 110215, "type": 1, + "monstername": "Guard NO.7", "sencenstory": [], "time": 0, "clickstory": 0, @@ -143,6 +150,7 @@ { "id": 110216, "type": 1, + "monstername": "Guard NO.8", "sencenstory": [], "time": 0, "clickstory": 0, @@ -161,6 +169,7 @@ { "id": 120031, "type": 1, + "monstername": "Guard NO.9", "sencenstory": [], "time": 0, "clickstory": 0, @@ -179,6 +188,7 @@ { "id": 120032, "type": 1, + "monstername": "Guard NO.10", "sencenstory": [], "time": 0, "clickstory": 0, @@ -197,6 +207,7 @@ { "id": 120033, "type": 1, + "monstername": "Guard NO.11", "sencenstory": [], "time": 0, "clickstory": 0, @@ -215,6 +226,7 @@ { "id": 120034, "type": 1, + "monstername": "Guard NO.12", "sencenstory": [], "time": 0, "clickstory": 0, @@ -233,6 +245,7 @@ { "id": 120035, "type": 1, + "monstername": "Guard NO.13", "sencenstory": [], "time": 0, "clickstory": 0, @@ -251,6 +264,7 @@ { "id": 120036, "type": 1, + "monstername": "Guard NO.14", "sencenstory": [], "time": 0, "clickstory": 0, @@ -269,6 +283,7 @@ { "id": 130011, "type": 1, + "monstername": "Guard NO.15", "sencenstory": [], "time": 0, "clickstory": 0, @@ -287,6 +302,7 @@ { "id": 130012, "type": 1, + "monstername": "Guard NO.16", "sencenstory": [], "time": 0, "clickstory": 0, @@ -305,6 +321,7 @@ { "id": 130013, "type": 1, + "monstername": "Guard NO.17", "sencenstory": [], "time": 0, "clickstory": 0, @@ -323,6 +340,7 @@ { "id": 200001, "type": 2, + "monstername": "Guard NO.18", "sencenstory": [ 301, 301 @@ -336,6 +354,7 @@ { "id": 200002, "type": 2, + "monstername": "Guard NO.19", "sencenstory": [ 302, 302 @@ -349,6 +368,7 @@ { "id": 200003, "type": 2, + "monstername": "Guard NO.20", "sencenstory": [ 301, 301 @@ -362,6 +382,7 @@ { "id": 720013, "type": 1, + "monstername": "Guard Rhino ", "sencenstory": [], "time": 3, "clickstory": 0, diff --git a/bin/json/game_dispatch_battle.json b/bin/json/game_dispatch_battle.json index c52740bff..915e0f89b 100644 --- a/bin/json/game_dispatch_battle.json +++ b/bin/json/game_dispatch_battle.json @@ -1,11 +1,11 @@ [ { "id": 1, - "model": "34006", + "model": "14005", "weight": 1000, - "startstory": 3007, - "rejectstory": 3001, - "endstory": 3002, + "startstory": 4001, + "rejectstory": 4002, + "endstory": 0, "battlename": { "key": "story_80", "text": "踢馆1号" @@ -55,11 +55,11 @@ }, { "id": 2, - "model": "35002", + "model": "44006", "weight": 1000, - "startstory": 3007, - "rejectstory": 3001, - "endstory": 3002, + "startstory": 4001, + "rejectstory": 4002, + "endstory": 0, "battlename": { "key": "story_81", "text": "踢馆2号" diff --git a/bin/json/game_dispatch_task.json b/bin/json/game_dispatch_task.json index 540a1da28..1e30aa334 100644 --- a/bin/json/game_dispatch_task.json +++ b/bin/json/game_dispatch_task.json @@ -8,16 +8,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 117, + "tasktime": 150, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 1, + "taskneed": 2, "taskreq": [ { "key": 1, - "param": 14 + "param": 24 } ], "reqtxt": [ @@ -56,16 +56,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 143, + "tasktime": 140, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 4, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 21 + "param": 15 } ], "reqtxt": [ @@ -104,16 +104,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 176, + "tasktime": 122, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于焊娇虎的专属委托" }, - "taskneed": 2, + "taskneed": 3, "taskreq": [ { "key": 1, - "param": 19 + "param": 14 } ], "reqtxt": [ @@ -152,7 +152,7 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 176, + "tasktime": 106, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -161,7 +161,7 @@ "taskreq": [ { "key": 1, - "param": 3 + "param": 16 } ], "reqtxt": [ @@ -200,7 +200,7 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 149, + "tasktime": 70, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -209,7 +209,7 @@ "taskreq": [ { "key": 1, - "param": 13 + "param": 24 } ], "reqtxt": [ @@ -248,16 +248,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 110, + "tasktime": 118, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 2, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 5 + "param": 28 } ], "reqtxt": [ @@ -296,16 +296,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 62, + "tasktime": 85, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于焊娇虎的专属委托" }, - "taskneed": 2, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 24 + "param": 4 } ], "reqtxt": [ @@ -344,16 +344,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 114, + "tasktime": 102, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 4, + "taskneed": 3, "taskreq": [ { "key": 1, - "param": 26 + "param": 23 } ], "reqtxt": [ @@ -392,16 +392,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 152, + "tasktime": 84, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 4, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 28 + "param": 15 } ], "reqtxt": [ @@ -440,7 +440,7 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 104, + "tasktime": 135, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -449,7 +449,7 @@ "taskreq": [ { "key": 1, - "param": 15 + "param": 3 } ], "reqtxt": [ @@ -488,7 +488,7 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 104, + "tasktime": 97, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于焊娇虎的专属委托" @@ -497,7 +497,7 @@ "taskreq": [ { "key": 1, - "param": 6 + "param": 3 } ], "reqtxt": [ @@ -536,12 +536,12 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 137, + "tasktime": 90, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 2, + "taskneed": 1, "taskreq": [ { "key": 1, @@ -584,16 +584,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 178, + "tasktime": 89, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 4, + "taskneed": 2, "taskreq": [ { "key": 1, - "param": 18 + "param": 30 } ], "reqtxt": [ @@ -632,16 +632,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 137, + "tasktime": 60, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 3, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 20 + "param": 11 } ], "reqtxt": [ @@ -680,16 +680,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 129, + "tasktime": 143, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于焊娇虎的专属委托" }, - "taskneed": 2, + "taskneed": 4, "taskreq": [ { "key": 1, - "param": 27 + "param": 2 } ], "reqtxt": [ @@ -728,16 +728,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 60, + "tasktime": 119, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 2, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 4 + "param": 1 } ], "reqtxt": [ @@ -776,16 +776,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 93, + "tasktime": 178, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 4, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 16 + "param": 23 } ], "reqtxt": [ @@ -824,12 +824,12 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 73, + "tasktime": 132, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 3, + "taskneed": 1, "taskreq": [ { "key": 1, @@ -872,16 +872,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 118, + "tasktime": 168, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于焊娇虎的专属委托" }, - "taskneed": 3, + "taskneed": 2, "taskreq": [ { "key": 1, - "param": 1 + "param": 28 } ], "reqtxt": [ @@ -920,16 +920,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 98, + "tasktime": 130, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 1, + "taskneed": 3, "taskreq": [ { "key": 1, - "param": 6 + "param": 8 } ], "reqtxt": [ @@ -968,7 +968,7 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 84, + "tasktime": 85, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1016,7 +1016,7 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 122, + "tasktime": 65, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1025,7 +1025,7 @@ "taskreq": [ { "key": 1, - "param": 25 + "param": 1 } ], "reqtxt": [ @@ -1064,16 +1064,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 160, + "tasktime": 91, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于焊娇虎的专属委托" }, - "taskneed": 3, + "taskneed": 4, "taskreq": [ { "key": 1, - "param": 6 + "param": 4 } ], "reqtxt": [ @@ -1112,7 +1112,7 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 130, + "tasktime": 153, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1121,7 +1121,7 @@ "taskreq": [ { "key": 1, - "param": 2 + "param": 26 } ], "reqtxt": [ @@ -1160,16 +1160,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 165, + "tasktime": 136, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 4, + "taskneed": 3, "taskreq": [ { "key": 1, - "param": 17 + "param": 24 } ], "reqtxt": [ @@ -1208,16 +1208,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 154, + "tasktime": 139, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 4, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 10 + "param": 16 } ], "reqtxt": [ @@ -1256,16 +1256,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 178, + "tasktime": 92, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于焊娇虎的专属委托" }, - "taskneed": 4, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 9 + "param": 12 } ], "reqtxt": [ @@ -1304,16 +1304,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 73, + "tasktime": 109, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 4, + "taskneed": 2, "taskreq": [ { "key": 1, - "param": 30 + "param": 23 } ], "reqtxt": [ @@ -1352,16 +1352,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 173, + "tasktime": 85, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 4, + "taskneed": 2, "taskreq": [ { "key": 1, - "param": 7 + "param": 19 } ], "reqtxt": [ @@ -1400,16 +1400,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 145, + "tasktime": 117, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 1, + "taskneed": 4, "taskreq": [ { "key": 1, - "param": 23 + "param": 29 } ], "reqtxt": [ @@ -1448,7 +1448,7 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 167, + "tasktime": 126, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于焊娇虎的专属委托" @@ -1496,7 +1496,7 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 74, + "tasktime": 104, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1505,7 +1505,7 @@ "taskreq": [ { "key": 1, - "param": 12 + "param": 21 } ], "reqtxt": [ @@ -1544,12 +1544,12 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 133, + "tasktime": 171, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 2, + "taskneed": 4, "taskreq": [ { "key": 1, @@ -1592,16 +1592,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 133, + "tasktime": 101, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 2, + "taskneed": 4, "taskreq": [ { "key": 1, - "param": 20 + "param": 1 } ], "reqtxt": [ @@ -1640,7 +1640,7 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 81, + "tasktime": 78, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于焊娇虎的专属委托" @@ -1649,7 +1649,7 @@ "taskreq": [ { "key": 1, - "param": 8 + "param": 17 } ], "reqtxt": [ @@ -1688,16 +1688,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 93, + "tasktime": 90, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 3, + "taskneed": 4, "taskreq": [ { "key": 1, - "param": 16 + "param": 8 } ], "reqtxt": [ @@ -1736,7 +1736,7 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 90, + "tasktime": 99, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1745,7 +1745,7 @@ "taskreq": [ { "key": 1, - "param": 11 + "param": 18 } ], "reqtxt": [ @@ -1784,16 +1784,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 128, + "tasktime": 107, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 3, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 8 + "param": 2 } ], "reqtxt": [ @@ -1832,16 +1832,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 78, + "tasktime": 114, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于焊娇虎的专属委托" }, - "taskneed": 2, + "taskneed": 4, "taskreq": [ { "key": 1, - "param": 3 + "param": 13 } ], "reqtxt": [ @@ -1880,16 +1880,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 96, + "tasktime": 162, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 3, + "taskneed": 4, "taskreq": [ { "key": 1, - "param": 7 + "param": 27 } ], "reqtxt": [ @@ -1928,16 +1928,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 177, + "tasktime": 129, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 1, + "taskneed": 4, "taskreq": [ { "key": 1, - "param": 14 + "param": 28 } ], "reqtxt": [ @@ -1976,16 +1976,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 119, + "tasktime": 179, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 3, + "taskneed": 2, "taskreq": [ { "key": 1, - "param": 4 + "param": 16 } ], "reqtxt": [ @@ -2024,16 +2024,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 131, + "tasktime": 154, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于焊娇虎的专属委托" }, - "taskneed": 2, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 22 + "param": 21 } ], "reqtxt": [ @@ -2072,7 +2072,7 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 145, + "tasktime": 110, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2081,7 +2081,7 @@ "taskreq": [ { "key": 1, - "param": 20 + "param": 12 } ], "reqtxt": [ @@ -2120,16 +2120,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 154, + "tasktime": 158, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 1, + "taskneed": 2, "taskreq": [ { "key": 1, - "param": 16 + "param": 23 } ], "reqtxt": [ @@ -2168,7 +2168,199 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 72, + "tasktime": 99, + "tasktxt": { + "key": "Entrustment details of Bobi", + "text": "这是属于波比的专属委托" + }, + "taskneed": 1, + "taskreq": [ + { + "key": 1, + "param": 17 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20003", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 47, + "type": 3, + "taskname": { + "key": "Entrustment of Tiger", + "text": "焊娇虎的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 167, + "tasktxt": { + "key": "Entrustment details of Tiger", + "text": "这是属于焊娇虎的专属委托" + }, + "taskneed": 4, + "taskreq": [ + { + "key": 1, + "param": 14 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20003", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 48, + "type": 3, + "taskname": { + "key": "Entrustment of Shifu", + "text": "师父的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 127, + "tasktxt": { + "key": "Entrustment details of Shifu", + "text": "这是属于师父的专属委托" + }, + "taskneed": 2, + "taskreq": [ + { + "key": 1, + "param": 24 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20003", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 49, + "type": 3, + "taskname": { + "key": "Entrustment of Po", + "text": "阿宝的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 99, + "tasktxt": { + "key": "Entrustment details of Po", + "text": "这是属于阿宝的专属委托" + }, + "taskneed": 4, + "taskreq": [ + { + "key": 1, + "param": 23 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20003", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 50, + "type": 3, + "taskname": { + "key": "Entrustment of Bobi", + "text": "波比的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 159, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2207,198 +2399,6 @@ } ] }, - { - "id": 47, - "type": 3, - "taskname": { - "key": "Entrustment of Tiger", - "text": "焊娇虎的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 75, - "tasktxt": { - "key": "Entrustment details of Tiger", - "text": "这是属于焊娇虎的专属委托" - }, - "taskneed": 3, - "taskreq": [ - { - "key": 1, - "param": 6 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 48, - "type": 3, - "taskname": { - "key": "Entrustment of Shifu", - "text": "师父的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 156, - "tasktxt": { - "key": "Entrustment details of Shifu", - "text": "这是属于师父的专属委托" - }, - "taskneed": 4, - "taskreq": [ - { - "key": 1, - "param": 16 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 49, - "type": 3, - "taskname": { - "key": "Entrustment of Po", - "text": "阿宝的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 102, - "tasktxt": { - "key": "Entrustment details of Po", - "text": "这是属于阿宝的专属委托" - }, - "taskneed": 3, - "taskreq": [ - { - "key": 1, - "param": 5 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 50, - "type": 3, - "taskname": { - "key": "Entrustment of Bobi", - "text": "波比的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 101, - "tasktxt": { - "key": "Entrustment details of Bobi", - "text": "这是属于波比的专属委托" - }, - "taskneed": 3, - "taskreq": [ - { - "key": 1, - "param": 27 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, { "id": 51, "type": 3, @@ -2408,7 +2408,7 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 145, + "tasktime": 92, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于焊娇虎的专属委托" @@ -2417,7 +2417,7 @@ "taskreq": [ { "key": 1, - "param": 20 + "param": 4 } ], "reqtxt": [ @@ -2456,966 +2456,6 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 107, - "tasktxt": { - "key": "Entrustment details of Shifu", - "text": "这是属于师父的专属委托" - }, - "taskneed": 2, - "taskreq": [ - { - "key": 1, - "param": 29 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 53, - "type": 3, - "taskname": { - "key": "Entrustment of Po", - "text": "阿宝的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 75, - "tasktxt": { - "key": "Entrustment details of Po", - "text": "这是属于阿宝的专属委托" - }, - "taskneed": 3, - "taskreq": [ - { - "key": 1, - "param": 3 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 54, - "type": 3, - "taskname": { - "key": "Entrustment of Bobi", - "text": "波比的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 141, - "tasktxt": { - "key": "Entrustment details of Bobi", - "text": "这是属于波比的专属委托" - }, - "taskneed": 3, - "taskreq": [ - { - "key": 1, - "param": 20 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 55, - "type": 3, - "taskname": { - "key": "Entrustment of Tiger", - "text": "焊娇虎的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 70, - "tasktxt": { - "key": "Entrustment details of Tiger", - "text": "这是属于焊娇虎的专属委托" - }, - "taskneed": 2, - "taskreq": [ - { - "key": 1, - "param": 24 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 56, - "type": 3, - "taskname": { - "key": "Entrustment of Shifu", - "text": "师父的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 150, - "tasktxt": { - "key": "Entrustment details of Shifu", - "text": "这是属于师父的专属委托" - }, - "taskneed": 3, - "taskreq": [ - { - "key": 1, - "param": 20 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 57, - "type": 3, - "taskname": { - "key": "Entrustment of Po", - "text": "阿宝的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 90, - "tasktxt": { - "key": "Entrustment details of Po", - "text": "这是属于阿宝的专属委托" - }, - "taskneed": 4, - "taskreq": [ - { - "key": 1, - "param": 9 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 58, - "type": 3, - "taskname": { - "key": "Entrustment of Bobi", - "text": "波比的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 113, - "tasktxt": { - "key": "Entrustment details of Bobi", - "text": "这是属于波比的专属委托" - }, - "taskneed": 1, - "taskreq": [ - { - "key": 1, - "param": 15 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 59, - "type": 3, - "taskname": { - "key": "Entrustment of Tiger", - "text": "焊娇虎的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 73, - "tasktxt": { - "key": "Entrustment details of Tiger", - "text": "这是属于焊娇虎的专属委托" - }, - "taskneed": 1, - "taskreq": [ - { - "key": 1, - "param": 9 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 60, - "type": 4, - "taskname": { - "key": "Entrustment of Shifu", - "text": "师父的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 67, - "tasktxt": { - "key": "Entrustment details of Shifu", - "text": "这是属于师父的专属委托" - }, - "taskneed": 2, - "taskreq": [ - { - "key": 1, - "param": 25 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 510000 - } - ] - }, - { - "id": 61, - "type": 4, - "taskname": { - "key": "Entrustment of Po", - "text": "阿宝的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 62, - "tasktxt": { - "key": "Entrustment details of Po", - "text": "这是属于阿宝的专属委托" - }, - "taskneed": 1, - "taskreq": [ - { - "key": 1, - "param": 27 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 510000 - } - ] - }, - { - "id": 62, - "type": 4, - "taskname": { - "key": "Entrustment of Bobi", - "text": "波比的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 112, - "tasktxt": { - "key": "Entrustment details of Bobi", - "text": "这是属于波比的专属委托" - }, - "taskneed": 1, - "taskreq": [ - { - "key": 1, - "param": 15 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 510000 - } - ] - }, - { - "id": 63, - "type": 4, - "taskname": { - "key": "Entrustment of Tiger", - "text": "焊娇虎的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 124, - "tasktxt": { - "key": "Entrustment details of Tiger", - "text": "这是属于焊娇虎的专属委托" - }, - "taskneed": 2, - "taskreq": [ - { - "key": 1, - "param": 6 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 510000 - } - ] - }, - { - "id": 64, - "type": 4, - "taskname": { - "key": "Entrustment of Shifu", - "text": "师父的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 90, - "tasktxt": { - "key": "Entrustment details of Shifu", - "text": "这是属于师父的专属委托" - }, - "taskneed": 4, - "taskreq": [ - { - "key": 1, - "param": 9 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 510000 - } - ] - }, - { - "id": 65, - "type": 4, - "taskname": { - "key": "Entrustment of Po", - "text": "阿宝的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 99, - "tasktxt": { - "key": "Entrustment details of Po", - "text": "这是属于阿宝的专属委托" - }, - "taskneed": 4, - "taskreq": [ - { - "key": 1, - "param": 16 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 510000 - } - ] - }, - { - "id": 66, - "type": 4, - "taskname": { - "key": "Entrustment of Bobi", - "text": "波比的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 165, - "tasktxt": { - "key": "Entrustment details of Bobi", - "text": "这是属于波比的专属委托" - }, - "taskneed": 2, - "taskreq": [ - { - "key": 1, - "param": 16 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 510000 - } - ] - }, - { - "id": 67, - "type": 4, - "taskname": { - "key": "Entrustment of Tiger", - "text": "焊娇虎的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 131, - "tasktxt": { - "key": "Entrustment details of Tiger", - "text": "这是属于焊娇虎的专属委托" - }, - "taskneed": 1, - "taskreq": [ - { - "key": 1, - "param": 28 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 510000 - } - ] - }, - { - "id": 68, - "type": 4, - "taskname": { - "key": "Entrustment of Shifu", - "text": "师父的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 99, - "tasktxt": { - "key": "Entrustment details of Shifu", - "text": "这是属于师父的专属委托" - }, - "taskneed": 3, - "taskreq": [ - { - "key": 1, - "param": 24 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 510000 - } - ] - }, - { - "id": 69, - "type": 4, - "taskname": { - "key": "Entrustment of Po", - "text": "阿宝的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 163, - "tasktxt": { - "key": "Entrustment details of Po", - "text": "这是属于阿宝的专属委托" - }, - "taskneed": 1, - "taskreq": [ - { - "key": 1, - "param": 8 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 510000 - } - ] - }, - { - "id": 70, - "type": 4, - "taskname": { - "key": "Entrustment of Bobi", - "text": "波比的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 161, - "tasktxt": { - "key": "Entrustment details of Bobi", - "text": "这是属于波比的专属委托" - }, - "taskneed": 3, - "taskreq": [ - { - "key": 1, - "param": 11 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 510000 - } - ] - }, - { - "id": 71, - "type": 4, - "taskname": { - "key": "Entrustment of Tiger", - "text": "焊娇虎的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 74, - "tasktxt": { - "key": "Entrustment details of Tiger", - "text": "这是属于焊娇虎的专属委托" - }, - "taskneed": 3, - "taskreq": [ - { - "key": 1, - "param": 5 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 510000 - } - ] - }, - { - "id": 72, - "type": 4, - "taskname": { - "key": "Entrustment of Shifu", - "text": "师父的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, "tasktime": 179, "tasktxt": { "key": "Entrustment details of Shifu", @@ -3447,6 +2487,966 @@ "n": 1 } ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 53, + "type": 3, + "taskname": { + "key": "Entrustment of Po", + "text": "阿宝的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 100, + "tasktxt": { + "key": "Entrustment details of Po", + "text": "这是属于阿宝的专属委托" + }, + "taskneed": 2, + "taskreq": [ + { + "key": 1, + "param": 20 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20003", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 54, + "type": 3, + "taskname": { + "key": "Entrustment of Bobi", + "text": "波比的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 124, + "tasktxt": { + "key": "Entrustment details of Bobi", + "text": "这是属于波比的专属委托" + }, + "taskneed": 3, + "taskreq": [ + { + "key": 1, + "param": 14 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20003", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 55, + "type": 3, + "taskname": { + "key": "Entrustment of Tiger", + "text": "焊娇虎的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 77, + "tasktxt": { + "key": "Entrustment details of Tiger", + "text": "这是属于焊娇虎的专属委托" + }, + "taskneed": 4, + "taskreq": [ + { + "key": 1, + "param": 20 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20003", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 56, + "type": 3, + "taskname": { + "key": "Entrustment of Shifu", + "text": "师父的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 151, + "tasktxt": { + "key": "Entrustment details of Shifu", + "text": "这是属于师父的专属委托" + }, + "taskneed": 3, + "taskreq": [ + { + "key": 1, + "param": 23 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20003", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 57, + "type": 3, + "taskname": { + "key": "Entrustment of Po", + "text": "阿宝的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 77, + "tasktxt": { + "key": "Entrustment details of Po", + "text": "这是属于阿宝的专属委托" + }, + "taskneed": 1, + "taskreq": [ + { + "key": 1, + "param": 6 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20003", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 58, + "type": 3, + "taskname": { + "key": "Entrustment of Bobi", + "text": "波比的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 116, + "tasktxt": { + "key": "Entrustment details of Bobi", + "text": "这是属于波比的专属委托" + }, + "taskneed": 3, + "taskreq": [ + { + "key": 1, + "param": 5 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20003", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 59, + "type": 3, + "taskname": { + "key": "Entrustment of Tiger", + "text": "焊娇虎的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 110, + "tasktxt": { + "key": "Entrustment details of Tiger", + "text": "这是属于焊娇虎的专属委托" + }, + "taskneed": 1, + "taskreq": [ + { + "key": 1, + "param": 1 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20003", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 60, + "type": 4, + "taskname": { + "key": "Entrustment of Shifu", + "text": "师父的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 134, + "tasktxt": { + "key": "Entrustment details of Shifu", + "text": "这是属于师父的专属委托" + }, + "taskneed": 3, + "taskreq": [ + { + "key": 1, + "param": 26 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20003", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 510000 + } + ] + }, + { + "id": 61, + "type": 4, + "taskname": { + "key": "Entrustment of Po", + "text": "阿宝的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 135, + "tasktxt": { + "key": "Entrustment details of Po", + "text": "这是属于阿宝的专属委托" + }, + "taskneed": 3, + "taskreq": [ + { + "key": 1, + "param": 18 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20003", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 510000 + } + ] + }, + { + "id": 62, + "type": 4, + "taskname": { + "key": "Entrustment of Bobi", + "text": "波比的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 124, + "tasktxt": { + "key": "Entrustment details of Bobi", + "text": "这是属于波比的专属委托" + }, + "taskneed": 1, + "taskreq": [ + { + "key": 1, + "param": 8 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20003", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 510000 + } + ] + }, + { + "id": 63, + "type": 4, + "taskname": { + "key": "Entrustment of Tiger", + "text": "焊娇虎的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 156, + "tasktxt": { + "key": "Entrustment details of Tiger", + "text": "这是属于焊娇虎的专属委托" + }, + "taskneed": 1, + "taskreq": [ + { + "key": 1, + "param": 14 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20003", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 510000 + } + ] + }, + { + "id": 64, + "type": 4, + "taskname": { + "key": "Entrustment of Shifu", + "text": "师父的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 132, + "tasktxt": { + "key": "Entrustment details of Shifu", + "text": "这是属于师父的专属委托" + }, + "taskneed": 4, + "taskreq": [ + { + "key": 1, + "param": 14 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20003", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 510000 + } + ] + }, + { + "id": 65, + "type": 4, + "taskname": { + "key": "Entrustment of Po", + "text": "阿宝的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 164, + "tasktxt": { + "key": "Entrustment details of Po", + "text": "这是属于阿宝的专属委托" + }, + "taskneed": 1, + "taskreq": [ + { + "key": 1, + "param": 13 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20003", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 510000 + } + ] + }, + { + "id": 66, + "type": 4, + "taskname": { + "key": "Entrustment of Bobi", + "text": "波比的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 168, + "tasktxt": { + "key": "Entrustment details of Bobi", + "text": "这是属于波比的专属委托" + }, + "taskneed": 1, + "taskreq": [ + { + "key": 1, + "param": 1 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20003", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 510000 + } + ] + }, + { + "id": 67, + "type": 4, + "taskname": { + "key": "Entrustment of Tiger", + "text": "焊娇虎的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 146, + "tasktxt": { + "key": "Entrustment details of Tiger", + "text": "这是属于焊娇虎的专属委托" + }, + "taskneed": 4, + "taskreq": [ + { + "key": 1, + "param": 18 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20003", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 510000 + } + ] + }, + { + "id": 68, + "type": 4, + "taskname": { + "key": "Entrustment of Shifu", + "text": "师父的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 62, + "tasktxt": { + "key": "Entrustment details of Shifu", + "text": "这是属于师父的专属委托" + }, + "taskneed": 4, + "taskreq": [ + { + "key": 1, + "param": 5 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20003", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 510000 + } + ] + }, + { + "id": 69, + "type": 4, + "taskname": { + "key": "Entrustment of Po", + "text": "阿宝的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 67, + "tasktxt": { + "key": "Entrustment details of Po", + "text": "这是属于阿宝的专属委托" + }, + "taskneed": 3, + "taskreq": [ + { + "key": 1, + "param": 23 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20003", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 510000 + } + ] + }, + { + "id": 70, + "type": 4, + "taskname": { + "key": "Entrustment of Bobi", + "text": "波比的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 66, + "tasktxt": { + "key": "Entrustment details of Bobi", + "text": "这是属于波比的专属委托" + }, + "taskneed": 1, + "taskreq": [ + { + "key": 1, + "param": 2 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20003", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 510000 + } + ] + }, + { + "id": 71, + "type": 4, + "taskname": { + "key": "Entrustment of Tiger", + "text": "焊娇虎的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 96, + "tasktxt": { + "key": "Entrustment details of Tiger", + "text": "这是属于焊娇虎的专属委托" + }, + "taskneed": 2, + "taskreq": [ + { + "key": 1, + "param": 21 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20003", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 510000 + } + ] + }, + { + "id": 72, + "type": 4, + "taskname": { + "key": "Entrustment of Shifu", + "text": "师父的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 91, + "tasktxt": { + "key": "Entrustment details of Shifu", + "text": "这是属于师父的专属委托" + }, + "taskneed": 3, + "taskreq": [ + { + "key": 1, + "param": 22 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20003", + "n": 1 + } + ], "rewardex": [ { "a": "attr", @@ -3464,16 +3464,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 144, + "tasktime": 165, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 1, + "taskneed": 2, "taskreq": [ { "key": 1, - "param": 14 + "param": 27 } ], "reqtxt": [ @@ -3512,16 +3512,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 95, + "tasktime": 159, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 4, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 23 + "param": 17 } ], "reqtxt": [ diff --git a/bin/json/game_global.json b/bin/json/game_global.json index f53dab463..d89cf2d23 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -571,7 +571,7 @@ "dispatch_numoftimes": 60, "dispatch_numtools": { "a": "item", - "t": "10012", + "t": "100001", "n": 1 }, "dispatch_npctimes": 2, diff --git a/bin/json/game_gm.json b/bin/json/game_gm.json index e4787ac87..cec0634e2 100644 --- a/bin/json/game_gm.json +++ b/bin/json/game_gm.json @@ -244,9 +244,9 @@ "type": 2, "text": { "key": "GM_12", - "text": "跳到主线关卡XX关（填关卡）" + "text": "跳到主线关卡XX关（填关卡Id）" }, - "data": "1,101", + "data": "1100101", "prefix": "bingo:mainline,{0}" }, { diff --git a/bin/json/game_initial.json b/bin/json/game_initial.json index 934f41ca0..353af021f 100644 --- a/bin/json/game_initial.json +++ b/bin/json/game_initial.json @@ -338,5 +338,15 @@ "n": 300 } ] + }, + { + "index": "200", + "var": [ + { + "a": "item", + "t": "10012", + "n": 60 + } + ] } ] \ No newline at end of file diff --git a/bin/json/game_monsterformat.json b/bin/json/game_monsterformat.json index 0a4eabeec..1ea09f109 100644 --- a/bin/json/game_monsterformat.json +++ b/bin/json/game_monsterformat.json @@ -6,8 +6,8 @@ "IsBoss": 0, "monster": 510023, "lv": 10, - "hppro": 100, - "atkpro": 0.1, + "hppro": 0.5, + "atkpro": 10, "defpro": 0.1, "modelsize": 1 }, @@ -18,8 +18,8 @@ "IsBoss": 0, "monster": 510053, "lv": 10, - "hppro": 100, - "atkpro": 0.1, + "hppro": 0.5, + "atkpro": 10, "defpro": 0.1, "modelsize": 1 }, @@ -30,8 +30,8 @@ "IsBoss": 0, "monster": 510043, "lv": 10, - "hppro": 100, - "atkpro": 0.1, + "hppro": 0.5, + "atkpro": 10, "defpro": 0.1, "modelsize": 1 }, @@ -42,8 +42,8 @@ "IsBoss": 0, "monster": 530013, "lv": 12, - "hppro": 100, - "atkpro": 0.1, + "hppro": 0.5, + "atkpro": 10, "defpro": 0.1, "modelsize": 1 }, @@ -54,8 +54,8 @@ "IsBoss": 0, "monster": 510033, "lv": 10, - "hppro": 100, - "atkpro": 0.1, + "hppro": 0.5, + "atkpro": 10, "defpro": 0.1, "modelsize": 1 }, @@ -66,8 +66,8 @@ "IsBoss": 0, "monster": 510023, "lv": 12, - "hppro": 0.5, - "atkpro": 1, + "hppro": 100, + "atkpro": 0.1, "defpro": 0.4, "modelsize": 1 }, @@ -78,8 +78,8 @@ "IsBoss": 0, "monster": 510023, "lv": 12, - "hppro": 0.5, - "atkpro": 1, + "hppro": 100, + "atkpro": 0.1, "defpro": 0.4, "modelsize": 1 }, @@ -90,8 +90,8 @@ "IsBoss": 0, "monster": 510033, "lv": 12, - "hppro": 0.5, - "atkpro": 1, + "hppro": 100, + "atkpro": 0.1, "defpro": 0.4, "modelsize": 1 }, @@ -102,8 +102,8 @@ "IsBoss": 0, "monster": 510033, "lv": 12, - "hppro": 0.5, - "atkpro": 1, + "hppro": 100, + "atkpro": 0.1, "defpro": 0.4, "modelsize": 1 }, @@ -114,8 +114,8 @@ "IsBoss": 0, "monster": 510033, "lv": 12, - "hppro": 0.5, - "atkpro": 1, + "hppro": 100, + "atkpro": 0.1, "defpro": 0.4, "modelsize": 1 }, diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index 3b7764ba8..3a96e8c03 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -1406,5 +1406,44 @@ "text": "请先完成主线剧情" }, "uiid": 0 + }, + { + "id": "Master_challenges_the_tower", + "name": { + "key": "panda_1001", + "text": "功夫大师挑战塔" + }, + "main": [ + { + "key": 1, + "param": 1 + } + ], + "optional": "", + "wkqbx": 1, + "kqbx": 0, + "img": "", + "prompt": { + "key": "opencond_prompt_Master_challenges_the_tower", + "text": "功能暂未开启" + }, + "uiid": 0 + }, + { + "id": " ", + "name": { + "key": "", + "text": "" + }, + "main": [], + "optional": "", + "wkqbx": 0, + "kqbx": 0, + "img": "", + "prompt": { + "key": "", + "text": "" + }, + "uiid": 0 } ] \ No newline at end of file diff --git a/bin/json/game_pagoda.json b/bin/json/game_pagoda.json index d28c5448b..5345e5f0d 100644 --- a/bin/json/game_pagoda.json +++ b/bin/json/game_pagoda.json @@ -367,10 +367,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer11", - "text": "第11层" + "text": "第1层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100102 }, { "key": 12, @@ -400,10 +400,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer12", - "text": "第12层" + "text": "第2层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100102 }, { "key": 13, @@ -433,10 +433,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer13", - "text": "第13层" + "text": "第3层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100102 }, { "key": 14, @@ -466,10 +466,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer14", - "text": "第14层" + "text": "第4层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100102 }, { "key": 15, @@ -499,10 +499,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer15", - "text": "第15层" + "text": "第5层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100102 }, { "key": 16, @@ -532,10 +532,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer16", - "text": "第16层" + "text": "第6层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100102 }, { "key": 17, @@ -565,10 +565,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer17", - "text": "第17层" + "text": "第7层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100102 }, { "key": 18, @@ -598,10 +598,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer18", - "text": "第18层" + "text": "第8层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100102 }, { "key": 19, @@ -631,10 +631,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer19", - "text": "第19层" + "text": "第9层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100102 }, { "key": 20, @@ -664,10 +664,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer20", - "text": "第20层" + "text": "第10层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100102 }, { "key": 21, @@ -697,10 +697,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer21", - "text": "第21层" + "text": "第1层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100103 }, { "key": 22, @@ -730,10 +730,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer22", - "text": "第22层" + "text": "第2层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100103 }, { "key": 23, @@ -763,10 +763,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer23", - "text": "第23层" + "text": "第3层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100103 }, { "key": 24, @@ -796,10 +796,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer24", - "text": "第24层" + "text": "第4层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100103 }, { "key": 25, @@ -829,10 +829,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer25", - "text": "第25层" + "text": "第5层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100103 }, { "key": 26, @@ -862,10 +862,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer26", - "text": "第26层" + "text": "第6层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100103 }, { "key": 27, @@ -895,10 +895,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer27", - "text": "第27层" + "text": "第7层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100103 }, { "key": 28, @@ -928,10 +928,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer28", - "text": "第28层" + "text": "第8层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100103 }, { "key": 29, @@ -961,10 +961,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer29", - "text": "第29层" + "text": "第9层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100103 }, { "key": 30, @@ -994,10 +994,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer30", - "text": "第30层" + "text": "第10层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100103 }, { "key": 31, @@ -1027,10 +1027,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer31", - "text": "第31层" + "text": "第1层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100104 }, { "key": 32, @@ -1060,10 +1060,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer32", - "text": "第32层" + "text": "第2层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100104 }, { "key": 33, @@ -1093,10 +1093,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer33", - "text": "第33层" + "text": "第3层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100104 }, { "key": 34, @@ -1126,10 +1126,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer34", - "text": "第34层" + "text": "第4层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100104 }, { "key": 35, @@ -1159,10 +1159,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer35", - "text": "第35层" + "text": "第5层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100104 }, { "key": 36, @@ -1192,10 +1192,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer36", - "text": "第36层" + "text": "第6层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100104 }, { "key": 37, @@ -1225,10 +1225,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer37", - "text": "第37层" + "text": "第7层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100104 }, { "key": 38, @@ -1258,10 +1258,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer38", - "text": "第38层" + "text": "第8层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100104 }, { "key": 39, @@ -1291,10 +1291,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer39", - "text": "第39层" + "text": "第9层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100104 }, { "key": 40, @@ -1324,10 +1324,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer40", - "text": "第40层" + "text": "第10层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100104 }, { "key": 41, @@ -1357,10 +1357,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer41", - "text": "第41层" + "text": "第1层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100105 }, { "key": 42, @@ -1390,10 +1390,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer42", - "text": "第42层" + "text": "第2层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100105 }, { "key": 43, @@ -1423,10 +1423,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer43", - "text": "第43层" + "text": "第3层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100105 }, { "key": 44, @@ -1456,10 +1456,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer44", - "text": "第44层" + "text": "第4层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100105 }, { "key": 45, @@ -1489,10 +1489,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer45", - "text": "第45层" + "text": "第5层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100105 }, { "key": 46, @@ -1522,10 +1522,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer46", - "text": "第46层" + "text": "第6层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100105 }, { "key": 47, @@ -1555,10 +1555,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer47", - "text": "第47层" + "text": "第7层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100105 }, { "key": 48, @@ -1588,10 +1588,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer48", - "text": "第48层" + "text": "第8层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100105 }, { "key": 49, @@ -1621,10 +1621,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer49", - "text": "第49层" + "text": "第9层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100105 }, { "key": 50, @@ -1654,10 +1654,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer50", - "text": "第50层" + "text": "第10层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100105 }, { "key": 51, @@ -1687,10 +1687,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer51", - "text": "第51层" + "text": "第1层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100106 }, { "key": 52, @@ -1720,10 +1720,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer52", - "text": "第52层" + "text": "第2层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100106 }, { "key": 53, @@ -1753,10 +1753,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer53", - "text": "第53层" + "text": "第3层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100106 }, { "key": 54, @@ -1786,10 +1786,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer54", - "text": "第54层" + "text": "第4层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100106 }, { "key": 55, @@ -1819,10 +1819,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer55", - "text": "第55层" + "text": "第5层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100106 }, { "key": 56, @@ -1852,10 +1852,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer56", - "text": "第56层" + "text": "第6层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100106 }, { "key": 57, @@ -1885,10 +1885,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer57", - "text": "第57层" + "text": "第7层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100106 }, { "key": 58, @@ -1918,10 +1918,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer58", - "text": "第58层" + "text": "第8层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100106 }, { "key": 59, @@ -1951,10 +1951,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer59", - "text": "第59层" + "text": "第9层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100106 }, { "key": 60, @@ -1984,10 +1984,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer60", - "text": "第60层" + "text": "第10层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100106 }, { "key": 61, @@ -2017,10 +2017,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer61", - "text": "第61层" + "text": "第1层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 62, @@ -2050,10 +2050,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer62", - "text": "第62层" + "text": "第2层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 63, @@ -2083,10 +2083,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer63", - "text": "第63层" + "text": "第3层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 64, @@ -2116,10 +2116,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer64", - "text": "第64层" + "text": "第4层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 65, @@ -2149,10 +2149,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer65", - "text": "第65层" + "text": "第5层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 66, @@ -2182,10 +2182,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer66", - "text": "第66层" + "text": "第6层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 67, @@ -2215,10 +2215,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer67", - "text": "第67层" + "text": "第7层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 68, @@ -2248,10 +2248,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer68", - "text": "第68层" + "text": "第8层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 69, @@ -2281,10 +2281,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer69", - "text": "第69层" + "text": "第9层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 70, @@ -2314,10 +2314,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer70", - "text": "第70层" + "text": "第10层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 71, @@ -2347,10 +2347,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer71", - "text": "第71层" + "text": "第1层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 72, @@ -2380,10 +2380,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer72", - "text": "第72层" + "text": "第2层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 73, @@ -2413,10 +2413,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer73", - "text": "第73层" + "text": "第3层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 74, @@ -2446,10 +2446,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer74", - "text": "第74层" + "text": "第4层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 75, @@ -2479,10 +2479,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer75", - "text": "第75层" + "text": "第5层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 76, @@ -2512,10 +2512,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer76", - "text": "第76层" + "text": "第6层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 77, @@ -2545,10 +2545,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer77", - "text": "第77层" + "text": "第7层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 78, @@ -2578,10 +2578,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer78", - "text": "第78层" + "text": "第8层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 79, @@ -2611,10 +2611,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer79", - "text": "第79层" + "text": "第9层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 80, @@ -2644,10 +2644,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer80", - "text": "第80层" + "text": "第10层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 81, @@ -2677,10 +2677,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer81", - "text": "第81层" + "text": "第1层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 82, @@ -2710,10 +2710,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer82", - "text": "第82层" + "text": "第2层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 83, @@ -2743,10 +2743,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer83", - "text": "第83层" + "text": "第3层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 84, @@ -2776,10 +2776,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer84", - "text": "第84层" + "text": "第4层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 85, @@ -2809,10 +2809,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer85", - "text": "第85层" + "text": "第5层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 86, @@ -2842,10 +2842,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer86", - "text": "第86层" + "text": "第6层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 87, @@ -2875,10 +2875,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer87", - "text": "第87层" + "text": "第7层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 88, @@ -2908,10 +2908,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer88", - "text": "第88层" + "text": "第8层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 89, @@ -2941,10 +2941,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer89", - "text": "第89层" + "text": "第9层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 90, @@ -2974,10 +2974,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer90", - "text": "第90层" + "text": "第10层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 91, @@ -3007,10 +3007,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer91", - "text": "第91层" + "text": "第1层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 92, @@ -3040,10 +3040,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer92", - "text": "第92层" + "text": "第2层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 93, @@ -3073,10 +3073,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer93", - "text": "第93层" + "text": "第3层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 94, @@ -3106,10 +3106,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer94", - "text": "第94层" + "text": "第4层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 95, @@ -3139,10 +3139,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer95", - "text": "第95层" + "text": "第5层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 96, @@ -3172,10 +3172,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer96", - "text": "第96层" + "text": "第6层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 97, @@ -3205,10 +3205,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer97", - "text": "第97层" + "text": "第7层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 98, @@ -3238,10 +3238,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer98", - "text": "第98层" + "text": "第8层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 99, @@ -3271,10 +3271,10 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer99", - "text": "第99层" + "text": "第9层" }, "model_display": 34006, - "unlock": 1100101 + "unlock": 1100107 }, { "key": 100, @@ -3304,9 +3304,9 @@ "fight_scene": "", "name_display": { "key": "pagoda_layer100", - "text": "第100层" + "text": "第10层" }, "model_display": 25001, - "unlock": 1100101 + "unlock": 1100107 } ] \ No newline at end of file diff --git a/bin/json/game_pandamasjs.json b/bin/json/game_pandamasjs.json index 340de4d8f..73077a1c3 100644 --- a/bin/json/game_pandamasjs.json +++ b/bin/json/game_pandamasjs.json @@ -1,14 +1,26 @@ [ { "id": 1, - "unlock_condition": 20010 + "unlock_condition": 20010, + "unlock_conditiondes": { + "key": "通关主线1-1后解锁", + "text": "通关主线1-1后解锁" + } }, { "id": 2, - "unlock_condition": 20011 + "unlock_condition": 20011, + "unlock_conditiondes": { + "key": "通关主线1-2后解锁", + "text": "通关主线1-2后解锁" + } }, { "id": 3, - "unlock_condition": 20012 + "unlock_condition": 20012, + "unlock_conditiondes": { + "key": "通关主线1-3后解锁", + "text": "通关主线1-3后解锁" + } } ] \ No newline at end of file diff --git a/bin/json/game_pandamasjx.json b/bin/json/game_pandamasjx.json index f98e5912d..c41e295e9 100644 --- a/bin/json/game_pandamasjx.json +++ b/bin/json/game_pandamasjx.json @@ -339,7 +339,7 @@ "effects": "", "access": 0, "heroid": "", - "img": "", + "img": "wg_icon_ss", "ico": "", "intr": "石锁", "description": { @@ -373,7 +373,7 @@ "effects": "", "access": 0, "heroid": "", - "img": "", + "img": "wg_icon_kz", "ico": "", "intr": "双头空竹", "description": { @@ -396,7 +396,7 @@ "effects": "", "access": 0, "heroid": "", - "img": "", + "img": "wg_icon_pj", "ico": "", "intr": "木爬架", "description": { @@ -419,7 +419,7 @@ "effects": "", "access": 0, "heroid": "", - "img": "", + "img": "wg_icon_bdw", "ico": "", "intr": "不倒翁", "description": { @@ -442,7 +442,7 @@ "effects": "", "access": 0, "heroid": "", - "img": "", + "img": "wg_icon_pc", "ico": "", "intr": "棒槌", "description": { @@ -465,7 +465,7 @@ "effects": "", "access": 0, "heroid": "", - "img": "", + "img": "wg_icon_tl", "ico": "", "intr": "铜铃", "description": { @@ -488,7 +488,7 @@ "effects": "", "access": 0, "heroid": "", - "img": "", + "img": "wg_icon_tj", "ico": "", "intr": "尖刺吊环", "description": { @@ -511,7 +511,7 @@ "effects": "", "access": 0, "heroid": "", - "img": "", + "img": "wg_icon_tj01", "ico": "", "intr": "陀螺", "description": { @@ -534,7 +534,7 @@ "effects": "", "access": 0, "heroid": "", - "img": "", + "img": "wg_icon_zl", "ico": "", "intr": "大转轮", "description": { @@ -568,7 +568,7 @@ "effects": "", "access": 0, "heroid": "", - "img": "", + "img": "wg_icon_mp", "ico": "", "intr": "木头牌", "description": { @@ -602,7 +602,7 @@ "effects": "", "access": 0, "heroid": "", - "img": "", + "img": "wg_icon_sjg", "ico": "", "intr": "双节棍", "description": { @@ -636,7 +636,7 @@ "effects": "", "access": 0, "heroid": "", - "img": "", + "img": "wg_icon_yd", "ico": "", "intr": "练功带", "description": { @@ -670,7 +670,7 @@ "effects": "", "access": 0, "heroid": "", - "img": "", + "img": "wg_icon_tj", "ico": "", "intr": "七彩花棍", "description": { @@ -704,7 +704,7 @@ "effects": "", "access": 0, "heroid": "", - "img": "", + "img": "wg_icon_fb", "ico": "", "intr": "流星飞镖", "description": { @@ -727,7 +727,7 @@ "effects": "", "access": 0, "heroid": "", - "img": "", + "img": "wg_icon_mxl", "ico": "", "intr": "冥想锣", "description": { @@ -750,7 +750,7 @@ "effects": "", "access": 0, "heroid": "", - "img": "", + "img": "wg_icon_ct", "ico": "", "intr": "彩条龙", "description": { @@ -773,7 +773,7 @@ "effects": "", "access": 0, "heroid": "", - "img": "", + "img": "wg_icon_kqms", "ico": "", "intr": "孔雀毛扇", "description": { @@ -805,7 +805,7 @@ "effects": "", "access": 0, "heroid": "", - "img": "", + "img": "wg_icon_ph", "ico": "", "intr": "平衡木", "description": { @@ -837,7 +837,7 @@ "effects": "", "access": 0, "heroid": "", - "img": "", + "img": "wg_icon_th", "ico": "", "intr": "铁环", "description": { @@ -869,7 +869,7 @@ "effects": "", "access": 0, "heroid": "", - "img": "", + "img": "wg_icon_tj", "ico": "", "intr": "太极球", "description": { diff --git a/bin/json/game_pandamasmz.json b/bin/json/game_pandamasmz.json index f4b0e4515..8ea852e10 100644 --- a/bin/json/game_pandamasmz.json +++ b/bin/json/game_pandamasmz.json @@ -20,7 +20,13 @@ "min_exp": 10, "placement_duration": 2, "prop_position": 0, - "photo_guide_unlocking": [] + "photo_guide_unlocking": [ + { + "a": "panda", + "t": "100001", + "n": 1 + } + ] }, { "lv": 2, @@ -43,7 +49,13 @@ "min_exp": 15, "placement_duration": 2, "prop_position": 1, - "photo_guide_unlocking": [] + "photo_guide_unlocking": [ + { + "a": "panda", + "t": "100002", + "n": 1 + } + ] }, { "lv": 3, @@ -66,7 +78,13 @@ "min_exp": 20, "placement_duration": 2, "prop_position": 1, - "photo_guide_unlocking": [] + "photo_guide_unlocking": [ + { + "a": "panda", + "t": "100003", + "n": 1 + } + ] }, { "lv": 4, @@ -89,7 +107,13 @@ "min_exp": 25, "placement_duration": 2, "prop_position": 1, - "photo_guide_unlocking": [] + "photo_guide_unlocking": [ + { + "a": "panda", + "t": "100004", + "n": 1 + } + ] }, { "lv": 5, @@ -106,6 +130,12 @@ "min_exp": 30, "placement_duration": 2, "prop_position": 1, - "photo_guide_unlocking": [] + "photo_guide_unlocking": [ + { + "a": "panda", + "t": "100005", + "n": 1 + } + ] } ] \ No newline at end of file diff --git a/bin/json/game_pandamastj.json b/bin/json/game_pandamastj.json index 3eb28751f..319c26a25 100644 --- a/bin/json/game_pandamastj.json +++ b/bin/json/game_pandamastj.json @@ -104,7 +104,7 @@ "key": "wuguan_2", "text": "图鉴信息描述" }, - "icon": "sbkp_js_13002", + "icon": "ytx_js_13002", "atlas_score": 105 }, { @@ -122,7 +122,7 @@ "key": "wuguan_2", "text": "图鉴信息描述" }, - "icon": "sbkp_js_13001", + "icon": "ytx_js_13001", "atlas_score": 120 }, { @@ -140,7 +140,7 @@ "key": "wuguan_2", "text": "图鉴信息描述" }, - "icon": "sbkp_js_44002", + "icon": "ytx_js_44002", "atlas_score": 135 }, { @@ -158,7 +158,7 @@ "key": "wuguan_2", "text": "图鉴信息描述" }, - "icon": "sbkp_js_24005", + "icon": "ytx_js_24005", "atlas_score": 150 }, { @@ -176,7 +176,7 @@ "key": "wuguan_2", "text": "图鉴信息描述" }, - "icon": "sbkp_js_14005", + "icon": "ytx_js_14005", "atlas_score": 165 }, { @@ -194,7 +194,7 @@ "key": "wuguan_2", "text": "图鉴信息描述" }, - "icon": "sbkp_js_44006", + "icon": "ytx_js_44006", "atlas_score": 180 }, { @@ -212,7 +212,7 @@ "key": "wuguan_2", "text": "图鉴信息描述" }, - "icon": "sbkp_js_43001", + "icon": "ytx_js_43001", "atlas_score": 195 }, { @@ -230,7 +230,7 @@ "key": "wuguan_2", "text": "图鉴信息描述" }, - "icon": "sbkp_js_35002", + "icon": "ytx_js_35002", "atlas_score": 210 }, { @@ -248,7 +248,7 @@ "key": "wuguan_2", "text": "图鉴信息描述" }, - "icon": "sbkp_js_45004", + "icon": "ytx_js_45004", "atlas_score": 225 }, { @@ -266,7 +266,7 @@ "key": "wuguan_2", "text": "图鉴信息描述" }, - "icon": "sbkp_js_35001", + "icon": "ytx_js_35001", "atlas_score": 240 }, { @@ -284,7 +284,7 @@ "key": "wuguan_2", "text": "图鉴信息描述" }, - "icon": "sbkp_js_25001", + "icon": "ytx_js_25001", "atlas_score": 255 }, { @@ -302,7 +302,7 @@ "key": "wuguan_2", "text": "图鉴信息描述" }, - "icon": "sbkp_js_45001", + "icon": "ytx_js_45001", "atlas_score": 270 }, { @@ -320,7 +320,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, - "icon": "", + "icon": "wg_icon_ss", "atlas_score": 285 }, { @@ -338,7 +338,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, - "icon": "", + "icon": "wg_icon_kz", "atlas_score": 300 }, { @@ -356,7 +356,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, - "icon": "", + "icon": "wg_icon_pj", "atlas_score": 315 }, { @@ -374,7 +374,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, - "icon": "", + "icon": "wg_icon_bdw", "atlas_score": 330 }, { @@ -392,7 +392,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, - "icon": "", + "icon": "wg_icon_pc", "atlas_score": 345 }, { @@ -410,7 +410,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, - "icon": "", + "icon": "wg_icon_tl", "atlas_score": 360 }, { @@ -428,7 +428,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, - "icon": "", + "icon": "wg_icon_dh", "atlas_score": 375 }, { @@ -446,7 +446,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, - "icon": "", + "icon": "wg_icon_tj01", "atlas_score": 390 }, { @@ -464,7 +464,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, - "icon": "", + "icon": "wg_icon_zl", "atlas_score": 405 }, { @@ -482,7 +482,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, - "icon": "", + "icon": "wg_icon_mp", "atlas_score": 420 }, { @@ -500,7 +500,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, - "icon": "", + "icon": "wg_icon_sjg", "atlas_score": 435 }, { @@ -518,7 +518,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, - "icon": "", + "icon": "wg_icon_yd", "atlas_score": 450 }, { @@ -536,7 +536,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, - "icon": "", + "icon": "wg_icon_hl", "atlas_score": 465 }, { @@ -554,7 +554,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, - "icon": "", + "icon": "wg_icon_fb", "atlas_score": 480 }, { @@ -572,7 +572,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, - "icon": "", + "icon": "wg_icon_mxl", "atlas_score": 495 }, { @@ -590,7 +590,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, - "icon": "", + "icon": "wg_icon_ct", "atlas_score": 510 }, { @@ -608,7 +608,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, - "icon": "", + "icon": "wg_icon_kqms", "atlas_score": 525 }, { @@ -626,7 +626,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, - "icon": "", + "icon": "wg_icon_ph", "atlas_score": 540 }, { @@ -644,7 +644,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, - "icon": "", + "icon": "wg_icon_th", "atlas_score": 555 }, { @@ -662,7 +662,7 @@ "key": "wuguan_3", "text": "图鉴信息描述" }, - "icon": "", + "icon": "wg_icon_tj", "atlas_score": 570 } ] \ No newline at end of file diff --git a/bin/json/game_pandamasyxjx.json b/bin/json/game_pandamasyxjx.json index 7e038fd34..d65b97f00 100644 --- a/bin/json/game_pandamasyxjx.json +++ b/bin/json/game_pandamasyxjx.json @@ -7,8 +7,8 @@ }, "camp": 1, "occupation": 0, - "register": 2, - "exp_bonus": 5 + "register": 1, + "exp_bonus": 1 }, { "id": 2, @@ -18,8 +18,8 @@ }, "camp": 2, "occupation": 0, - "register": 2, - "exp_bonus": 5 + "register": 1, + "exp_bonus": 1 }, { "id": 3, @@ -29,8 +29,8 @@ }, "camp": 3, "occupation": 0, - "register": 2, - "exp_bonus": 5 + "register": 1, + "exp_bonus": 1 }, { "id": 4, @@ -40,8 +40,8 @@ }, "camp": 4, "occupation": 0, - "register": 2, - "exp_bonus": 5 + "register": 1, + "exp_bonus": 1 }, { "id": 5, @@ -51,8 +51,8 @@ }, "camp": 0, "occupation": 1, - "register": 2, - "exp_bonus": 5 + "register": 1, + "exp_bonus": 1 }, { "id": 6, @@ -62,8 +62,8 @@ }, "camp": 0, "occupation": 2, - "register": 2, - "exp_bonus": 5 + "register": 1, + "exp_bonus": 1 }, { "id": 7, @@ -73,8 +73,8 @@ }, "camp": 0, "occupation": 3, - "register": 2, - "exp_bonus": 5 + "register": 1, + "exp_bonus": 1 }, { "id": 8, @@ -84,7 +84,7 @@ }, "camp": 0, "occupation": 4, - "register": 2, - "exp_bonus": 5 + "register": 1, + "exp_bonus": 1 } ] \ No newline at end of file diff --git a/bin/json/game_show.json b/bin/json/game_show.json index fff914502..dc0960968 100644 --- a/bin/json/game_show.json +++ b/bin/json/game_show.json @@ -8,8 +8,8 @@ "access": 0, "position": "", "sex": 1, - "resources": "Tag/dialogue.prefab", - "vague": "Tag/dialogue.prefab" + "resources": "Person/10000/10000M.prefab", + "vague": "Person/10000/10000M.prefab" }, { "id": 100002, @@ -20,8 +20,8 @@ "access": 0, "position": "", "sex": 1, - "resources": "Tag/dialogue.prefab", - "vague": "Tag/dialogue.prefab" + "resources": "Person/10000/10000M.prefab", + "vague": "Person/10000/10000M.prefab" }, { "id": 100003, @@ -32,8 +32,8 @@ "access": 0, "position": "", "sex": 1, - "resources": "Tag/dialogue.prefab", - "vague": "Tag/dialogue.prefab" + "resources": "Person/10000/10000M.prefab", + "vague": "Person/10000/10000M.prefab" }, { "id": 200001, @@ -44,8 +44,8 @@ "access": 0, "position": "", "sex": 2, - "resources": "Tag/dialogue.prefab", - "vague": "Tag/dialogue.prefab" + "resources": "Person/10000/10000M.prefab", + "vague": "Person/10000/10000M.prefab" }, { "id": 200002, @@ -56,8 +56,8 @@ "access": 0, "position": "", "sex": 2, - "resources": "Tag/dialogue.prefab", - "vague": "Tag/dialogue.prefab" + "resources": "Person/10000/10000M.prefab", + "vague": "Person/10000/10000M.prefab" }, { "id": 200003, @@ -68,7 +68,7 @@ "access": 0, "position": "", "sex": 2, - "resources": "Tag/dialogue.prefab", - "vague": "Tag/dialogue.prefab" + "resources": "Person/10000/10000M.prefab", + "vague": "Person/10000/10000M.prefab" } ] \ No newline at end of file diff --git a/bin/json/game_trolltrain.json b/bin/json/game_trolltrain.json index 2b2edca2c..e29a32baa 100644 --- a/bin/json/game_trolltrain.json +++ b/bin/json/game_trolltrain.json @@ -4,6 +4,7 @@ "name": "右屏商人", "information": "这是一位熊猫商人", "ico": "action_11001", + "scene": "1", "time": 300 }, { @@ -11,6 +12,7 @@ "name": "上屏商人", "information": "这是一位波比商人再此", "ico": "action_11003", + "scene": "2", "time": 400 }, { @@ -18,6 +20,7 @@ "name": "左屏商人", "information": "这是一位滑板鞋王子", "ico": "ytx_js_14007", + "scene": "3", "time": 500 } ] \ No newline at end of file diff --git a/sys/configure/structs/Game.PandamasJsData.go b/sys/configure/structs/Game.PandamasJsData.go index a693016b6..20da37438 100644 --- a/sys/configure/structs/Game.PandamasJsData.go +++ b/sys/configure/structs/Game.PandamasJsData.go @@ -13,6 +13,7 @@ import "errors" type GamePandamasJsData struct { Id int32 UnlockCondition int32 + UnlockConditiondes string } const TypeId_GamePandamasJsData = -1008362572 @@ -24,6 +25,7 @@ func (*GamePandamasJsData) GetTypeId() int32 { func (_v *GamePandamasJsData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["unlock_condition"].(float64); !_ok_ { err = errors.New("unlock_condition error"); return }; _v.UnlockCondition = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["unlock_conditiondes"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.UnlockConditiondes error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.UnlockConditiondes, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } return } diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 5be1b235f..7a30e4777 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -63,8 +63,6 @@ type Tables struct { SeasonLoop *GameSeasonLoop PagodaSeasonReward *GamePagodaSeasonReward RdtaskCondi *GameRdtaskCondi - KungfuUnlock *GameKungfuUnlock - KungfuMasterworker *GameKungfuMasterworker Gourmet *GameGourmet Drop *GameDrop VikingBoss *GameVikingBoss @@ -160,7 +158,6 @@ type Tables struct { SmithyStoveV1 *GameSmithyStoveV1 SmithyTool *GameSmithyTool SmithyIdTool *GameSmithyIdTool - pandsmasexp *Gamepandsmasexp SmithyCustomer *GameSmithyCustomer SmithyModelPool *GameSmithyModelPool SmithyAtlas *GameSmithyAtlas @@ -498,18 +495,6 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.RdtaskCondi, err = NewGameRdtaskCondi(buf) ; err != nil { return nil, err } - if buf, err = loader("game_kungfuunlock") ; err != nil { - return nil, err - } - if tables.KungfuUnlock, err = NewGameKungfuUnlock(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_kungfumasterworker") ; err != nil { - return nil, err - } - if tables.KungfuMasterworker, err = NewGameKungfuMasterworker(buf) ; err != nil { - return nil, err - } if buf, err = loader("game_gourmet") ; err != nil { return nil, err } @@ -1080,12 +1065,6 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.SmithyIdTool, err = NewGameSmithyIdTool(buf) ; err != nil { return nil, err } - if buf, err = loader("game_pandsmasexp") ; err != nil { - return nil, err - } - if tables.pandsmasexp, err = NewGamepandsmasexp(buf) ; err != nil { - return nil, err - } if buf, err = loader("game_smithycustomer") ; err != nil { return nil, err } From d8dd0d6ebf8ddc7db6e7eda4f1491150f940f580 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 24 Mar 2023 15:53:38 +0800 Subject: [PATCH 3/4] update --- bin/json/game_combatbox.json | 69 +- bin/json/game_combatlevel.json | 10 - bin/json/game_combatmanster.json | 21 - bin/json/game_dispatch_battle.json | 8 +- bin/json/game_dispatch_task.json | 4404 ++++++++--------- bin/json/game_pandamasjs.json | 4 +- bin/json/game_trolltrain.json | 3 - bin/json/game_worldtask.json | 6 +- sys/configure/structs/Game.Breakingbad.go | 42 + sys/configure/structs/Game.BreakingbadData.go | 56 + sys/configure/structs/Game.RdtaskNpc.go | 42 + sys/configure/structs/Game.RdtaskNpcData.go | 67 + sys/configure/structs/Tables.go | 14 + .../structs/game.equipAttrlibrary.go | 18 +- 14 files changed, 2461 insertions(+), 2303 deletions(-) create mode 100644 sys/configure/structs/Game.Breakingbad.go create mode 100644 sys/configure/structs/Game.BreakingbadData.go create mode 100644 sys/configure/structs/Game.RdtaskNpc.go create mode 100644 sys/configure/structs/Game.RdtaskNpcData.go diff --git a/bin/json/game_combatbox.json b/bin/json/game_combatbox.json index 85f4afd95..6a764e8bd 100644 --- a/bin/json/game_combatbox.json +++ b/bin/json/game_combatbox.json @@ -1,117 +1,94 @@ [ { "id": 10001, - "drop": 1002, - "boxname": "Moon Box" + "drop": 1002 }, { "id": 10002, - "drop": 1002, - "boxname": "Moon Box" + "drop": 1002 }, { "id": 10003, - "drop": 1002, - "boxname": "Moon Box" + "drop": 1002 }, { "id": 10004, - "drop": 1001, - "boxname": "Moon Box" + "drop": 1001 }, { "id": 10005, - "drop": 1001, - "boxname": "Moon Box" + "drop": 1001 }, { "id": 10006, - "drop": 1001, - "boxname": "Moon Box" + "drop": 1001 }, { "id": 10007, - "drop": 1001, - "boxname": "Moon Box" + "drop": 1001 }, { "id": 10008, - "drop": 1001, - "boxname": "Moon Box" + "drop": 1001 }, { "id": 10009, - "drop": 1001, - "boxname": "Moon Box" + "drop": 1001 }, { "id": 10010, - "drop": 1001, - "boxname": "Moon Box" + "drop": 1001 }, { "id": 10011, - "drop": 1001, - "boxname": "Moon Box" + "drop": 1001 }, { "id": 10012, - "drop": 1001, - "boxname": "Moon Box" + "drop": 1001 }, { "id": 10013, - "drop": 1001, - "boxname": "Moon Box" + "drop": 1001 }, { "id": 10014, - "drop": 1001, - "boxname": "Moon Box" + "drop": 1001 }, { "id": 10015, - "drop": 1001, - "boxname": "Moon Box" + "drop": 1001 }, { "id": 10101, - "drop": 1001, - "boxname": "Moon Box" + "drop": 1001 }, { "id": 10102, - "drop": 1001, - "boxname": "Moon Box" + "drop": 1001 }, { "id": 10103, - "drop": 1001, - "boxname": "Moon Box" + "drop": 1001 }, { "id": 10301, - "drop": 1001, - "boxname": "Psionics Of The Tree" + "drop": 1001 }, { "id": 10302, - "drop": 1002, - "boxname": "Psionics Of The Tree" + "drop": 1002 }, { "id": 10401, - "drop": 1001, - "boxname": "Moon Box" + "drop": 1001 }, { "id": 10402, - "drop": 1001, - "boxname": "Moon Box" + "drop": 1001 }, { "id": 10403, - "drop": 1001, - "boxname": "Moon Box" + "drop": 1001 } ] \ No newline at end of file diff --git a/bin/json/game_combatlevel.json b/bin/json/game_combatlevel.json index 3e40df06b..6ae8dd772 100644 --- a/bin/json/game_combatlevel.json +++ b/bin/json/game_combatlevel.json @@ -21,7 +21,6 @@ "n": 1 } ], - "description": "Mission Successed！", "scenemusic": "scenemusic_leveldemo_fcamer_1_1", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_1" }, @@ -46,7 +45,6 @@ "n": 1 } ], - "description": "Mission Successed！", "scenemusic": "scenemusic_leveldemo_fcamer_1_3", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_3" }, @@ -72,7 +70,6 @@ "n": 1 } ], - "description": "Mission Successed！", "scenemusic": "scenemusic_leveldemo_fcamer_1_2", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_2" }, @@ -98,7 +95,6 @@ "n": 1 } ], - "description": "Mission Successed！", "scenemusic": "scenemusic_leveldemo_fcamer_1_4", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_4" }, @@ -124,7 +120,6 @@ "n": 1 } ], - "description": "Mission Successed！", "scenemusic": "scenemusic_leveldemo_fcamer_1_5", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_5" }, @@ -148,7 +143,6 @@ "n": 1 } ], - "description": "Mission Successed！", "scenemusic": "scenemusic_leveldemo_fcamer_1_6", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_6" }, @@ -174,7 +168,6 @@ "n": 1 } ], - "description": "Mission Successed！", "scenemusic": "scenemusic_leveldemo_fcamer_1_7", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_7" }, @@ -199,7 +192,6 @@ "n": 1 } ], - "description": "Mission Successed！", "scenemusic": "scenemusic_leveldemo_fcamer_1_8", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_8" }, @@ -224,7 +216,6 @@ "n": 1 } ], - "description": "Mission Successed！", "scenemusic": "scenemusic_leveldemo_fcamer_1_9", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_9" }, @@ -249,7 +240,6 @@ "n": 1 } ], - "description": "Mission Successed！", "scenemusic": "scenemusic_leveldemo_fcamer_1_10", "atmosphere": "atmospheremusic_leveldemo_fcamer_1_10" } diff --git a/bin/json/game_combatmanster.json b/bin/json/game_combatmanster.json index 23bd489bd..4a158a6dc 100644 --- a/bin/json/game_combatmanster.json +++ b/bin/json/game_combatmanster.json @@ -2,7 +2,6 @@ { "id": 101011, "type": 1, - "monstername": "Guard NO.1", "sencenstory": [ 301, 301 @@ -24,7 +23,6 @@ { "id": 101012, "type": 1, - "monstername": "Guard NO.2", "sencenstory": [ 302, 302 @@ -46,7 +44,6 @@ { "id": 101013, "type": 1, - "monstername": "Guard NO.3", "sencenstory": [ 301, 301 @@ -68,7 +65,6 @@ { "id": 101021, "type": 1, - "monstername": "Guard NO.4", "sencenstory": [ 302, 302 @@ -90,7 +86,6 @@ { "id": 110213, "type": 1, - "monstername": "Guard NO.5", "sencenstory": [ 301, 301 @@ -112,7 +107,6 @@ { "id": 110214, "type": 1, - "monstername": "Guard NO.6", "sencenstory": [], "time": 0, "clickstory": 0, @@ -131,7 +125,6 @@ { "id": 110215, "type": 1, - "monstername": "Guard NO.7", "sencenstory": [], "time": 0, "clickstory": 0, @@ -150,7 +143,6 @@ { "id": 110216, "type": 1, - "monstername": "Guard NO.8", "sencenstory": [], "time": 0, "clickstory": 0, @@ -169,7 +161,6 @@ { "id": 120031, "type": 1, - "monstername": "Guard NO.9", "sencenstory": [], "time": 0, "clickstory": 0, @@ -188,7 +179,6 @@ { "id": 120032, "type": 1, - "monstername": "Guard NO.10", "sencenstory": [], "time": 0, "clickstory": 0, @@ -207,7 +197,6 @@ { "id": 120033, "type": 1, - "monstername": "Guard NO.11", "sencenstory": [], "time": 0, "clickstory": 0, @@ -226,7 +215,6 @@ { "id": 120034, "type": 1, - "monstername": "Guard NO.12", "sencenstory": [], "time": 0, "clickstory": 0, @@ -245,7 +233,6 @@ { "id": 120035, "type": 1, - "monstername": "Guard NO.13", "sencenstory": [], "time": 0, "clickstory": 0, @@ -264,7 +251,6 @@ { "id": 120036, "type": 1, - "monstername": "Guard NO.14", "sencenstory": [], "time": 0, "clickstory": 0, @@ -283,7 +269,6 @@ { "id": 130011, "type": 1, - "monstername": "Guard NO.15", "sencenstory": [], "time": 0, "clickstory": 0, @@ -302,7 +287,6 @@ { "id": 130012, "type": 1, - "monstername": "Guard NO.16", "sencenstory": [], "time": 0, "clickstory": 0, @@ -321,7 +305,6 @@ { "id": 130013, "type": 1, - "monstername": "Guard NO.17", "sencenstory": [], "time": 0, "clickstory": 0, @@ -340,7 +323,6 @@ { "id": 200001, "type": 2, - "monstername": "Guard NO.18", "sencenstory": [ 301, 301 @@ -354,7 +336,6 @@ { "id": 200002, "type": 2, - "monstername": "Guard NO.19", "sencenstory": [ 302, 302 @@ -368,7 +349,6 @@ { "id": 200003, "type": 2, - "monstername": "Guard NO.20", "sencenstory": [ 301, 301 @@ -382,7 +362,6 @@ { "id": 720013, "type": 1, - "monstername": "Guard Rhino ", "sencenstory": [], "time": 3, "clickstory": 0, diff --git a/bin/json/game_dispatch_battle.json b/bin/json/game_dispatch_battle.json index 915e0f89b..945b4cbdf 100644 --- a/bin/json/game_dispatch_battle.json +++ b/bin/json/game_dispatch_battle.json @@ -8,11 +8,11 @@ "endstory": 0, "battlename": { "key": "story_80", - "text": "踢馆1号" + "text": "闹事之人" }, "battletxt": { "key": "story_80", - "text": "踢馆1号的文本" + "text": "有人前来闹事，快去解决掉他" }, "BattleReadyID": 100, "EventList": [], @@ -62,11 +62,11 @@ "endstory": 0, "battlename": { "key": "story_81", - "text": "踢馆2号" + "text": "闹事之人" }, "battletxt": { "key": "story_81", - "text": "踢馆2号的文本" + "text": "有人前来闹事，快去解决掉他" }, "BattleReadyID": 100, "EventList": [], diff --git a/bin/json/game_dispatch_task.json b/bin/json/game_dispatch_task.json index 1e30aa334..39b240c3c 100644 --- a/bin/json/game_dispatch_task.json +++ b/bin/json/game_dispatch_task.json @@ -8,16 +8,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 150, + "tasktime": 103, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 2, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 24 + "param": 10 } ], "reqtxt": [ @@ -35,7 +35,7 @@ "reward": [ { "a": "panda", - "t": "20003", + "t": "20001", "n": 1 } ], @@ -56,16 +56,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 140, + "tasktime": 98, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 1, + "taskneed": 3, "taskreq": [ { "key": 1, - "param": 15 + "param": 17 } ], "reqtxt": [ @@ -83,7 +83,7 @@ "reward": [ { "a": "panda", - "t": "20003", + "t": "20002", "n": 1 } ], @@ -100,20 +100,20 @@ "type": 1, "taskname": { "key": "Entrustment of Tiger", - "text": "焊娇虎的委托" + "text": "悍娇虎的委托" }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 122, + "tasktime": 101, "tasktxt": { "key": "Entrustment details of Tiger", - "text": "这是属于焊娇虎的专属委托" + "text": "这是属于悍娇虎的专属委托" }, - "taskneed": 3, + "taskneed": 4, "taskreq": [ { "key": 1, - "param": 14 + "param": 27 } ], "reqtxt": [ @@ -152,16 +152,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 106, + "tasktime": 147, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 4, + "taskneed": 3, "taskreq": [ { "key": 1, - "param": 16 + "param": 29 } ], "reqtxt": [ @@ -179,7 +179,7 @@ "reward": [ { "a": "panda", - "t": "20003", + "t": "20004", "n": 1 } ], @@ -200,204 +200,12 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 70, + "tasktime": 74, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, "taskneed": 4, - "taskreq": [ - { - "key": 1, - "param": 24 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ] - }, - { - "id": 6, - "type": 1, - "taskname": { - "key": "Entrustment of Bobi", - "text": "波比的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 118, - "tasktxt": { - "key": "Entrustment details of Bobi", - "text": "这是属于波比的专属委托" - }, - "taskneed": 1, - "taskreq": [ - { - "key": 1, - "param": 28 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ] - }, - { - "id": 7, - "type": 1, - "taskname": { - "key": "Entrustment of Tiger", - "text": "焊娇虎的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 85, - "tasktxt": { - "key": "Entrustment details of Tiger", - "text": "这是属于焊娇虎的专属委托" - }, - "taskneed": 1, - "taskreq": [ - { - "key": 1, - "param": 4 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 20000 - } - ] - }, - { - "id": 8, - "type": 1, - "taskname": { - "key": "Entrustment of Shifu", - "text": "师父的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 102, - "tasktxt": { - "key": "Entrustment details of Shifu", - "text": "这是属于师父的专属委托" - }, - "taskneed": 3, - "taskreq": [ - { - "key": 1, - "param": 23 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 40000 - } - ] - }, - { - "id": 9, - "type": 1, - "taskname": { - "key": "Entrustment of Po", - "text": "阿宝的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 84, - "tasktxt": { - "key": "Entrustment details of Po", - "text": "这是属于阿宝的专属委托" - }, - "taskneed": 1, "taskreq": [ { "key": 1, @@ -419,7 +227,7 @@ "reward": [ { "a": "panda", - "t": "20003", + "t": "20005", "n": 1 } ], @@ -427,12 +235,12 @@ { "a": "attr", "t": "gold", - "n": 40000 + "n": 20000 } ] }, { - "id": 10, + "id": 6, "type": 1, "taskname": { "key": "Entrustment of Bobi", @@ -440,16 +248,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 135, + "tasktime": 168, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 4, + "taskneed": 3, "taskreq": [ { "key": 1, - "param": 3 + "param": 22 } ], "reqtxt": [ @@ -467,7 +275,7 @@ "reward": [ { "a": "panda", - "t": "20003", + "t": "20006", "n": 1 } ], @@ -475,121 +283,25 @@ { "a": "attr", "t": "gold", - "n": 40000 + "n": 20000 } ] }, { - "id": 11, + "id": 7, "type": 1, "taskname": { "key": "Entrustment of Tiger", - "text": "焊娇虎的委托" + "text": "悍娇虎的委托" }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 97, + "tasktime": 111, "tasktxt": { "key": "Entrustment details of Tiger", - "text": "这是属于焊娇虎的专属委托" + "text": "这是属于悍娇虎的专属委托" }, - "taskneed": 1, - "taskreq": [ - { - "key": 1, - "param": 3 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 40000 - } - ] - }, - { - "id": 12, - "type": 1, - "taskname": { - "key": "Entrustment of Shifu", - "text": "师父的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 90, - "tasktxt": { - "key": "Entrustment details of Shifu", - "text": "这是属于师父的专属委托" - }, - "taskneed": 1, - "taskreq": [ - { - "key": 1, - "param": 8 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 40000 - } - ] - }, - { - "id": 13, - "type": 1, - "taskname": { - "key": "Entrustment of Po", - "text": "阿宝的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 89, - "tasktxt": { - "key": "Entrustment details of Po", - "text": "这是属于阿宝的专属委托" - }, - "taskneed": 2, + "taskneed": 3, "taskreq": [ { "key": 1, @@ -611,7 +323,55 @@ "reward": [ { "a": "panda", - "t": "20003", + "t": "20007", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 20000 + } + ] + }, + { + "id": 8, + "type": 1, + "taskname": { + "key": "Entrustment of Shifu", + "text": "师父的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 137, + "tasktxt": { + "key": "Entrustment details of Shifu", + "text": "这是属于师父的专属委托" + }, + "taskneed": 4, + "taskreq": [ + { + "key": 1, + "param": 1 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20008", "n": 1 } ], @@ -624,7 +384,55 @@ ] }, { - "id": 14, + "id": 9, + "type": 1, + "taskname": { + "key": "Entrustment of Po", + "text": "阿宝的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 115, + "tasktxt": { + "key": "Entrustment details of Po", + "text": "这是属于阿宝的专属委托" + }, + "taskneed": 3, + "taskreq": [ + { + "key": 1, + "param": 14 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20009", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ] + }, + { + "id": 10, "type": 1, "taskname": { "key": "Entrustment of Bobi", @@ -632,12 +440,156 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 60, + "tasktime": 100, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, + "taskneed": 3, + "taskreq": [ + { + "key": 1, + "param": 15 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20010", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ] + }, + { + "id": 11, + "type": 1, + "taskname": { + "key": "Entrustment of Tiger", + "text": "悍娇虎的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 132, + "tasktxt": { + "key": "Entrustment details of Tiger", + "text": "这是属于悍娇虎的专属委托" + }, + "taskneed": 3, + "taskreq": [ + { + "key": 1, + "param": 3 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20011", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ] + }, + { + "id": 12, + "type": 1, + "taskname": { + "key": "Entrustment of Shifu", + "text": "师父的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 139, + "tasktxt": { + "key": "Entrustment details of Shifu", + "text": "这是属于师父的专属委托" + }, "taskneed": 1, + "taskreq": [ + { + "key": 1, + "param": 21 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20012", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ] + }, + { + "id": 13, + "type": 1, + "taskname": { + "key": "Entrustment of Po", + "text": "阿宝的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 141, + "tasktxt": { + "key": "Entrustment details of Po", + "text": "这是属于阿宝的专属委托" + }, + "taskneed": 4, "taskreq": [ { "key": 1, @@ -659,7 +611,55 @@ "reward": [ { "a": "panda", - "t": "20003", + "t": "20013", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ] + }, + { + "id": 14, + "type": 1, + "taskname": { + "key": "Entrustment of Bobi", + "text": "波比的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 169, + "tasktxt": { + "key": "Entrustment details of Bobi", + "text": "这是属于波比的专属委托" + }, + "taskneed": 3, + "taskreq": [ + { + "key": 1, + "param": 6 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20014", "n": 1 } ], @@ -676,14 +676,254 @@ "type": 1, "taskname": { "key": "Entrustment of Tiger", - "text": "焊娇虎的委托" + "text": "悍娇虎的委托" }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 143, + "tasktime": 171, "tasktxt": { "key": "Entrustment details of Tiger", - "text": "这是属于焊娇虎的专属委托" + "text": "这是属于悍娇虎的专属委托" + }, + "taskneed": 2, + "taskreq": [ + { + "key": 1, + "param": 12 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20015", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ] + }, + { + "id": 16, + "type": 1, + "taskname": { + "key": "Entrustment of Shifu", + "text": "师父的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 91, + "tasktxt": { + "key": "Entrustment details of Shifu", + "text": "这是属于师父的专属委托" + }, + "taskneed": 1, + "taskreq": [ + { + "key": 1, + "param": 25 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20016", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ] + }, + { + "id": 17, + "type": 1, + "taskname": { + "key": "Entrustment of Po", + "text": "阿宝的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 149, + "tasktxt": { + "key": "Entrustment details of Po", + "text": "这是属于阿宝的专属委托" + }, + "taskneed": 3, + "taskreq": [ + { + "key": 1, + "param": 14 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20017", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ] + }, + { + "id": 18, + "type": 1, + "taskname": { + "key": "Entrustment of Bobi", + "text": "波比的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 66, + "tasktxt": { + "key": "Entrustment details of Bobi", + "text": "这是属于波比的专属委托" + }, + "taskneed": 4, + "taskreq": [ + { + "key": 1, + "param": 6 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20018", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ] + }, + { + "id": 19, + "type": 2, + "taskname": { + "key": "Entrustment of Tiger", + "text": "悍娇虎的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 113, + "tasktxt": { + "key": "Entrustment details of Tiger", + "text": "这是属于悍娇虎的专属委托" + }, + "taskneed": 3, + "taskreq": [ + { + "key": 1, + "param": 26 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20019", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ] + }, + { + "id": 20, + "type": 2, + "taskname": { + "key": "Entrustment of Shifu", + "text": "师父的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 97, + "tasktxt": { + "key": "Entrustment details of Shifu", + "text": "这是属于师父的专属委托" }, "taskneed": 4, "taskreq": [ @@ -707,247 +947,7 @@ "reward": [ { "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 40000 - } - ] - }, - { - "id": 16, - "type": 1, - "taskname": { - "key": "Entrustment of Shifu", - "text": "师父的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 119, - "tasktxt": { - "key": "Entrustment details of Shifu", - "text": "这是属于师父的专属委托" - }, - "taskneed": 1, - "taskreq": [ - { - "key": 1, - "param": 1 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 40000 - } - ] - }, - { - "id": 17, - "type": 1, - "taskname": { - "key": "Entrustment of Po", - "text": "阿宝的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 178, - "tasktxt": { - "key": "Entrustment details of Po", - "text": "这是属于阿宝的专属委托" - }, - "taskneed": 1, - "taskreq": [ - { - "key": 1, - "param": 23 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 40000 - } - ] - }, - { - "id": 18, - "type": 1, - "taskname": { - "key": "Entrustment of Bobi", - "text": "波比的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 132, - "tasktxt": { - "key": "Entrustment details of Bobi", - "text": "这是属于波比的专属委托" - }, - "taskneed": 1, - "taskreq": [ - { - "key": 1, - "param": 1 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 40000 - } - ] - }, - { - "id": 19, - "type": 2, - "taskname": { - "key": "Entrustment of Tiger", - "text": "焊娇虎的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 168, - "tasktxt": { - "key": "Entrustment details of Tiger", - "text": "这是属于焊娇虎的专属委托" - }, - "taskneed": 2, - "taskreq": [ - { - "key": 1, - "param": 28 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 40000 - } - ] - }, - { - "id": 20, - "type": 2, - "taskname": { - "key": "Entrustment of Shifu", - "text": "师父的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 130, - "tasktxt": { - "key": "Entrustment details of Shifu", - "text": "这是属于师父的专属委托" - }, - "taskneed": 3, - "taskreq": [ - { - "key": 1, - "param": 8 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", + "t": "20020", "n": 1 } ], @@ -968,60 +968,12 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 85, + "tasktime": 108, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 2, - "taskreq": [ - { - "key": 1, - "param": 16 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 40000 - } - ] - }, - { - "id": 22, - "type": 2, - "taskname": { - "key": "Entrustment of Bobi", - "text": "波比的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 65, - "tasktxt": { - "key": "Entrustment details of Bobi", - "text": "这是属于波比的专属委托" - }, - "taskneed": 4, + "taskneed": 1, "taskreq": [ { "key": 1, @@ -1043,7 +995,55 @@ "reward": [ { "a": "panda", - "t": "20003", + "t": "20001", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ] + }, + { + "id": 22, + "type": 2, + "taskname": { + "key": "Entrustment of Bobi", + "text": "波比的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 104, + "tasktxt": { + "key": "Entrustment details of Bobi", + "text": "这是属于波比的专属委托" + }, + "taskneed": 3, + "taskreq": [ + { + "key": 1, + "param": 25 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20002", "n": 1 } ], @@ -1060,20 +1060,20 @@ "type": 2, "taskname": { "key": "Entrustment of Tiger", - "text": "焊娇虎的委托" + "text": "悍娇虎的委托" }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 91, + "tasktime": 167, "tasktxt": { "key": "Entrustment details of Tiger", - "text": "这是属于焊娇虎的专属委托" + "text": "这是属于悍娇虎的专属委托" }, "taskneed": 4, "taskreq": [ { "key": 1, - "param": 4 + "param": 18 } ], "reqtxt": [ @@ -1112,300 +1112,12 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 153, - "tasktxt": { - "key": "Entrustment details of Shifu", - "text": "这是属于师父的专属委托" - }, - "taskneed": 1, - "taskreq": [ - { - "key": 1, - "param": 26 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 40000 - } - ] - }, - { - "id": 25, - "type": 2, - "taskname": { - "key": "Entrustment of Po", - "text": "阿宝的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 136, - "tasktxt": { - "key": "Entrustment details of Po", - "text": "这是属于阿宝的专属委托" - }, - "taskneed": 3, - "taskreq": [ - { - "key": 1, - "param": 24 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 40000 - } - ] - }, - { - "id": 26, - "type": 2, - "taskname": { - "key": "Entrustment of Bobi", - "text": "波比的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 139, - "tasktxt": { - "key": "Entrustment details of Bobi", - "text": "这是属于波比的专属委托" - }, - "taskneed": 1, - "taskreq": [ - { - "key": 1, - "param": 16 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 40000 - } - ] - }, - { - "id": 27, - "type": 2, - "taskname": { - "key": "Entrustment of Tiger", - "text": "焊娇虎的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 92, - "tasktxt": { - "key": "Entrustment details of Tiger", - "text": "这是属于焊娇虎的专属委托" - }, - "taskneed": 1, - "taskreq": [ - { - "key": 1, - "param": 12 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 40000 - } - ] - }, - { - "id": 28, - "type": 2, - "taskname": { - "key": "Entrustment of Shifu", - "text": "师父的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 109, + "tasktime": 78, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, "taskneed": 2, - "taskreq": [ - { - "key": 1, - "param": 23 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 40000 - } - ] - }, - { - "id": 29, - "type": 2, - "taskname": { - "key": "Entrustment of Po", - "text": "阿宝的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 85, - "tasktxt": { - "key": "Entrustment details of Po", - "text": "这是属于阿宝的专属委托" - }, - "taskneed": 2, - "taskreq": [ - { - "key": 1, - "param": 19 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 40000 - } - ] - }, - { - "id": 30, - "type": 2, - "taskname": { - "key": "Entrustment of Bobi", - "text": "波比的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 117, - "tasktxt": { - "key": "Entrustment details of Bobi", - "text": "这是属于波比的专属委托" - }, - "taskneed": 4, "taskreq": [ { "key": 1, @@ -1427,7 +1139,7 @@ "reward": [ { "a": "panda", - "t": "20003", + "t": "20004", "n": 1 } ], @@ -1440,24 +1152,24 @@ ] }, { - "id": 31, + "id": 25, "type": 2, "taskname": { - "key": "Entrustment of Tiger", - "text": "焊娇虎的委托" + "key": "Entrustment of Po", + "text": "阿宝的委托" }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 126, + "tasktime": 140, "tasktxt": { - "key": "Entrustment details of Tiger", - "text": "这是属于焊娇虎的专属委托" + "key": "Entrustment details of Po", + "text": "这是属于阿宝的专属委托" }, "taskneed": 1, "taskreq": [ { "key": 1, - "param": 5 + "param": 7 } ], "reqtxt": [ @@ -1475,7 +1187,7 @@ "reward": [ { "a": "panda", - "t": "20003", + "t": "20005", "n": 1 } ], @@ -1488,303 +1200,15 @@ ] }, { - "id": 32, + "id": 26, "type": 2, - "taskname": { - "key": "Entrustment of Shifu", - "text": "师父的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 104, - "tasktxt": { - "key": "Entrustment details of Shifu", - "text": "这是属于师父的专属委托" - }, - "taskneed": 3, - "taskreq": [ - { - "key": 1, - "param": 21 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 40000 - } - ] - }, - { - "id": 33, - "type": 2, - "taskname": { - "key": "Entrustment of Po", - "text": "阿宝的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 171, - "tasktxt": { - "key": "Entrustment details of Po", - "text": "这是属于阿宝的专属委托" - }, - "taskneed": 4, - "taskreq": [ - { - "key": 1, - "param": 23 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 40000 - } - ] - }, - { - "id": 34, - "type": 3, "taskname": { "key": "Entrustment of Bobi", "text": "波比的委托" }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 101, - "tasktxt": { - "key": "Entrustment details of Bobi", - "text": "这是属于波比的专属委托" - }, - "taskneed": 4, - "taskreq": [ - { - "key": 1, - "param": 1 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 35, - "type": 3, - "taskname": { - "key": "Entrustment of Tiger", - "text": "焊娇虎的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 78, - "tasktxt": { - "key": "Entrustment details of Tiger", - "text": "这是属于焊娇虎的专属委托" - }, - "taskneed": 2, - "taskreq": [ - { - "key": 1, - "param": 17 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 36, - "type": 3, - "taskname": { - "key": "Entrustment of Shifu", - "text": "师父的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 90, - "tasktxt": { - "key": "Entrustment details of Shifu", - "text": "这是属于师父的专属委托" - }, - "taskneed": 4, - "taskreq": [ - { - "key": 1, - "param": 8 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 37, - "type": 3, - "taskname": { - "key": "Entrustment of Po", - "text": "阿宝的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 99, - "tasktxt": { - "key": "Entrustment details of Po", - "text": "这是属于阿宝的专属委托" - }, - "taskneed": 3, - "taskreq": [ - { - "key": 1, - "param": 18 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 38, - "type": 3, - "taskname": { - "key": "Entrustment of Bobi", - "text": "波比的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 107, + "tasktime": 111, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1811,7 +1235,7 @@ "reward": [ { "a": "panda", - "t": "20003", + "t": "20006", "n": 1 } ], @@ -1819,25 +1243,121 @@ { "a": "attr", "t": "gold", - "n": 50000 + "n": 40000 } ] }, { - "id": 39, - "type": 3, + "id": 27, + "type": 2, "taskname": { "key": "Entrustment of Tiger", - "text": "焊娇虎的委托" + "text": "悍娇虎的委托" }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 114, + "tasktime": 125, "tasktxt": { "key": "Entrustment details of Tiger", - "text": "这是属于焊娇虎的专属委托" + "text": "这是属于悍娇虎的专属委托" }, - "taskneed": 4, + "taskneed": 1, + "taskreq": [ + { + "key": 1, + "param": 19 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20007", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ] + }, + { + "id": 28, + "type": 2, + "taskname": { + "key": "Entrustment of Shifu", + "text": "师父的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 159, + "tasktxt": { + "key": "Entrustment details of Shifu", + "text": "这是属于师父的专属委托" + }, + "taskneed": 1, + "taskreq": [ + { + "key": 1, + "param": 21 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20008", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ] + }, + { + "id": 29, + "type": 2, + "taskname": { + "key": "Entrustment of Po", + "text": "阿宝的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 139, + "tasktxt": { + "key": "Entrustment details of Po", + "text": "这是属于阿宝的专属委托" + }, + "taskneed": 2, "taskreq": [ { "key": 1, @@ -1859,7 +1379,7 @@ "reward": [ { "a": "panda", - "t": "20003", + "t": "20009", "n": 1 } ], @@ -1867,25 +1387,25 @@ { "a": "attr", "t": "gold", - "n": 50000 + "n": 40000 } ] }, { - "id": 40, - "type": 3, + "id": 30, + "type": 2, "taskname": { - "key": "Entrustment of Shifu", - "text": "师父的委托" + "key": "Entrustment of Bobi", + "text": "波比的委托" }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 162, + "tasktime": 93, "tasktxt": { - "key": "Entrustment details of Shifu", - "text": "这是属于师父的专属委托" + "key": "Entrustment details of Bobi", + "text": "这是属于波比的专属委托" }, - "taskneed": 4, + "taskneed": 2, "taskreq": [ { "key": 1, @@ -1907,7 +1427,487 @@ "reward": [ { "a": "panda", - "t": "20003", + "t": "20010", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ] + }, + { + "id": 31, + "type": 2, + "taskname": { + "key": "Entrustment of Tiger", + "text": "悍娇虎的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 161, + "tasktxt": { + "key": "Entrustment details of Tiger", + "text": "这是属于悍娇虎的专属委托" + }, + "taskneed": 1, + "taskreq": [ + { + "key": 1, + "param": 24 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20011", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ] + }, + { + "id": 32, + "type": 2, + "taskname": { + "key": "Entrustment of Shifu", + "text": "师父的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 175, + "tasktxt": { + "key": "Entrustment details of Shifu", + "text": "这是属于师父的专属委托" + }, + "taskneed": 3, + "taskreq": [ + { + "key": 1, + "param": 29 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20012", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ] + }, + { + "id": 33, + "type": 2, + "taskname": { + "key": "Entrustment of Po", + "text": "阿宝的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 176, + "tasktxt": { + "key": "Entrustment details of Po", + "text": "这是属于阿宝的专属委托" + }, + "taskneed": 1, + "taskreq": [ + { + "key": 1, + "param": 7 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20013", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ] + }, + { + "id": 34, + "type": 3, + "taskname": { + "key": "Entrustment of Bobi", + "text": "波比的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 109, + "tasktxt": { + "key": "Entrustment details of Bobi", + "text": "这是属于波比的专属委托" + }, + "taskneed": 2, + "taskreq": [ + { + "key": 1, + "param": 3 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20014", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 35, + "type": 3, + "taskname": { + "key": "Entrustment of Tiger", + "text": "悍娇虎的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 139, + "tasktxt": { + "key": "Entrustment details of Tiger", + "text": "这是属于悍娇虎的专属委托" + }, + "taskneed": 4, + "taskreq": [ + { + "key": 1, + "param": 19 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20015", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 36, + "type": 3, + "taskname": { + "key": "Entrustment of Shifu", + "text": "师父的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 107, + "tasktxt": { + "key": "Entrustment details of Shifu", + "text": "这是属于师父的专属委托" + }, + "taskneed": 1, + "taskreq": [ + { + "key": 1, + "param": 17 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20016", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 37, + "type": 3, + "taskname": { + "key": "Entrustment of Po", + "text": "阿宝的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 165, + "tasktxt": { + "key": "Entrustment details of Po", + "text": "这是属于阿宝的专属委托" + }, + "taskneed": 3, + "taskreq": [ + { + "key": 1, + "param": 23 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20017", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 38, + "type": 3, + "taskname": { + "key": "Entrustment of Bobi", + "text": "波比的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 140, + "tasktxt": { + "key": "Entrustment details of Bobi", + "text": "这是属于波比的专属委托" + }, + "taskneed": 4, + "taskreq": [ + { + "key": 1, + "param": 18 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20018", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 39, + "type": 3, + "taskname": { + "key": "Entrustment of Tiger", + "text": "悍娇虎的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 175, + "tasktxt": { + "key": "Entrustment details of Tiger", + "text": "这是属于悍娇虎的专属委托" + }, + "taskneed": 1, + "taskreq": [ + { + "key": 1, + "param": 1 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20019", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 40, + "type": 3, + "taskname": { + "key": "Entrustment of Shifu", + "text": "师父的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 113, + "tasktxt": { + "key": "Entrustment details of Shifu", + "text": "这是属于师父的专属委托" + }, + "taskneed": 1, + "taskreq": [ + { + "key": 1, + "param": 20 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20020", "n": 1 } ], @@ -1928,7 +1928,7 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 129, + "tasktime": 108, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1937,7 +1937,7 @@ "taskreq": [ { "key": 1, - "param": 28 + "param": 11 } ], "reqtxt": [ @@ -1955,7 +1955,7 @@ "reward": [ { "a": "panda", - "t": "20003", + "t": "20001", "n": 1 } ], @@ -1976,16 +1976,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 179, + "tasktime": 95, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 2, + "taskneed": 4, "taskreq": [ { "key": 1, - "param": 16 + "param": 25 } ], "reqtxt": [ @@ -2003,7 +2003,7 @@ "reward": [ { "a": "panda", - "t": "20003", + "t": "20002", "n": 1 } ], @@ -2020,20 +2020,20 @@ "type": 3, "taskname": { "key": "Entrustment of Tiger", - "text": "焊娇虎的委托" + "text": "悍娇虎的委托" }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 154, + "tasktime": 80, "tasktxt": { "key": "Entrustment details of Tiger", - "text": "这是属于焊娇虎的专属委托" + "text": "这是属于悍娇虎的专属委托" }, - "taskneed": 1, + "taskneed": 3, "taskreq": [ { "key": 1, - "param": 21 + "param": 12 } ], "reqtxt": [ @@ -2072,12 +2072,684 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 110, + "tasktime": 140, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, "taskneed": 4, + "taskreq": [ + { + "key": 1, + "param": 20 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20004", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 45, + "type": 3, + "taskname": { + "key": "Entrustment of Po", + "text": "阿宝的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 144, + "tasktxt": { + "key": "Entrustment details of Po", + "text": "这是属于阿宝的专属委托" + }, + "taskneed": 1, + "taskreq": [ + { + "key": 1, + "param": 11 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20005", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 46, + "type": 3, + "taskname": { + "key": "Entrustment of Bobi", + "text": "波比的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 133, + "tasktxt": { + "key": "Entrustment details of Bobi", + "text": "这是属于波比的专属委托" + }, + "taskneed": 1, + "taskreq": [ + { + "key": 1, + "param": 13 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20006", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 47, + "type": 3, + "taskname": { + "key": "Entrustment of Tiger", + "text": "悍娇虎的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 65, + "tasktxt": { + "key": "Entrustment details of Tiger", + "text": "这是属于悍娇虎的专属委托" + }, + "taskneed": 2, + "taskreq": [ + { + "key": 1, + "param": 4 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20007", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 48, + "type": 3, + "taskname": { + "key": "Entrustment of Shifu", + "text": "师父的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 123, + "tasktxt": { + "key": "Entrustment details of Shifu", + "text": "这是属于师父的专属委托" + }, + "taskneed": 2, + "taskreq": [ + { + "key": 1, + "param": 9 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20008", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 49, + "type": 3, + "taskname": { + "key": "Entrustment of Po", + "text": "阿宝的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 176, + "tasktxt": { + "key": "Entrustment details of Po", + "text": "这是属于阿宝的专属委托" + }, + "taskneed": 3, + "taskreq": [ + { + "key": 1, + "param": 30 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20009", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 50, + "type": 3, + "taskname": { + "key": "Entrustment of Bobi", + "text": "波比的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 157, + "tasktxt": { + "key": "Entrustment details of Bobi", + "text": "这是属于波比的专属委托" + }, + "taskneed": 3, + "taskreq": [ + { + "key": 1, + "param": 1 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20010", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 51, + "type": 3, + "taskname": { + "key": "Entrustment of Tiger", + "text": "悍娇虎的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 169, + "tasktxt": { + "key": "Entrustment details of Tiger", + "text": "这是属于悍娇虎的专属委托" + }, + "taskneed": 4, + "taskreq": [ + { + "key": 1, + "param": 7 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20011", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 52, + "type": 3, + "taskname": { + "key": "Entrustment of Shifu", + "text": "师父的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 98, + "tasktxt": { + "key": "Entrustment details of Shifu", + "text": "这是属于师父的专属委托" + }, + "taskneed": 2, + "taskreq": [ + { + "key": 1, + "param": 30 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20012", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 53, + "type": 3, + "taskname": { + "key": "Entrustment of Po", + "text": "阿宝的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 175, + "tasktxt": { + "key": "Entrustment details of Po", + "text": "这是属于阿宝的专属委托" + }, + "taskneed": 4, + "taskreq": [ + { + "key": 1, + "param": 29 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20013", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 54, + "type": 3, + "taskname": { + "key": "Entrustment of Bobi", + "text": "波比的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 157, + "tasktxt": { + "key": "Entrustment details of Bobi", + "text": "这是属于波比的专属委托" + }, + "taskneed": 4, + "taskreq": [ + { + "key": 1, + "param": 13 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20014", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 55, + "type": 3, + "taskname": { + "key": "Entrustment of Tiger", + "text": "悍娇虎的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 179, + "tasktxt": { + "key": "Entrustment details of Tiger", + "text": "这是属于悍娇虎的专属委托" + }, + "taskneed": 3, + "taskreq": [ + { + "key": 1, + "param": 24 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20015", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 56, + "type": 3, + "taskname": { + "key": "Entrustment of Shifu", + "text": "师父的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 103, + "tasktxt": { + "key": "Entrustment details of Shifu", + "text": "这是属于师父的专属委托" + }, + "taskneed": 1, + "taskreq": [ + { + "key": 1, + "param": 13 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20016", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 57, + "type": 3, + "taskname": { + "key": "Entrustment of Po", + "text": "阿宝的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 102, + "tasktxt": { + "key": "Entrustment details of Po", + "text": "这是属于阿宝的专属委托" + }, + "taskneed": 4, + "taskreq": [ + { + "key": 1, + "param": 22 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20017", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ] + }, + { + "id": 58, + "type": 3, + "taskname": { + "key": "Entrustment of Bobi", + "text": "波比的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 118, + "tasktxt": { + "key": "Entrustment details of Bobi", + "text": "这是属于波比的专属委托" + }, + "taskneed": 1, "taskreq": [ { "key": 1, @@ -2099,7 +2771,7 @@ "reward": [ { "a": "panda", - "t": "20003", + "t": "20018", "n": 1 } ], @@ -2112,120 +2784,24 @@ ] }, { - "id": 45, - "type": 3, - "taskname": { - "key": "Entrustment of Po", - "text": "阿宝的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 158, - "tasktxt": { - "key": "Entrustment details of Po", - "text": "这是属于阿宝的专属委托" - }, - "taskneed": 2, - "taskreq": [ - { - "key": 1, - "param": 23 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 46, - "type": 3, - "taskname": { - "key": "Entrustment of Bobi", - "text": "波比的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 99, - "tasktxt": { - "key": "Entrustment details of Bobi", - "text": "这是属于波比的专属委托" - }, - "taskneed": 1, - "taskreq": [ - { - "key": 1, - "param": 17 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 47, + "id": 59, "type": 3, "taskname": { "key": "Entrustment of Tiger", - "text": "焊娇虎的委托" + "text": "悍娇虎的委托" }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 167, + "tasktime": 161, "tasktxt": { "key": "Entrustment details of Tiger", - "text": "这是属于焊娇虎的专属委托" + "text": "这是属于悍娇虎的专属委托" }, - "taskneed": 4, + "taskneed": 3, "taskreq": [ { "key": 1, - "param": 14 + "param": 25 } ], "reqtxt": [ @@ -2243,7 +2819,7 @@ "reward": [ { "a": "panda", - "t": "20003", + "t": "20019", "n": 1 } ], @@ -2256,19 +2832,67 @@ ] }, { - "id": 48, - "type": 3, + "id": 60, + "type": 4, "taskname": { "key": "Entrustment of Shifu", "text": "师父的委托" }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 127, + "tasktime": 138, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, + "taskneed": 3, + "taskreq": [ + { + "key": 1, + "param": 29 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20020", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 510000 + } + ] + }, + { + "id": 61, + "type": 4, + "taskname": { + "key": "Entrustment of Po", + "text": "阿宝的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 91, + "tasktxt": { + "key": "Entrustment details of Po", + "text": "这是属于阿宝的专属委托" + }, "taskneed": 2, "taskreq": [ { @@ -2291,631 +2915,7 @@ "reward": [ { "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 49, - "type": 3, - "taskname": { - "key": "Entrustment of Po", - "text": "阿宝的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 99, - "tasktxt": { - "key": "Entrustment details of Po", - "text": "这是属于阿宝的专属委托" - }, - "taskneed": 4, - "taskreq": [ - { - "key": 1, - "param": 23 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 50, - "type": 3, - "taskname": { - "key": "Entrustment of Bobi", - "text": "波比的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 159, - "tasktxt": { - "key": "Entrustment details of Bobi", - "text": "这是属于波比的专属委托" - }, - "taskneed": 3, - "taskreq": [ - { - "key": 1, - "param": 12 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 51, - "type": 3, - "taskname": { - "key": "Entrustment of Tiger", - "text": "焊娇虎的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 92, - "tasktxt": { - "key": "Entrustment details of Tiger", - "text": "这是属于焊娇虎的专属委托" - }, - "taskneed": 3, - "taskreq": [ - { - "key": 1, - "param": 4 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 52, - "type": 3, - "taskname": { - "key": "Entrustment of Shifu", - "text": "师父的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 179, - "tasktxt": { - "key": "Entrustment details of Shifu", - "text": "这是属于师父的专属委托" - }, - "taskneed": 3, - "taskreq": [ - { - "key": 1, - "param": 10 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 53, - "type": 3, - "taskname": { - "key": "Entrustment of Po", - "text": "阿宝的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 100, - "tasktxt": { - "key": "Entrustment details of Po", - "text": "这是属于阿宝的专属委托" - }, - "taskneed": 2, - "taskreq": [ - { - "key": 1, - "param": 20 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 54, - "type": 3, - "taskname": { - "key": "Entrustment of Bobi", - "text": "波比的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 124, - "tasktxt": { - "key": "Entrustment details of Bobi", - "text": "这是属于波比的专属委托" - }, - "taskneed": 3, - "taskreq": [ - { - "key": 1, - "param": 14 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 55, - "type": 3, - "taskname": { - "key": "Entrustment of Tiger", - "text": "焊娇虎的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 77, - "tasktxt": { - "key": "Entrustment details of Tiger", - "text": "这是属于焊娇虎的专属委托" - }, - "taskneed": 4, - "taskreq": [ - { - "key": 1, - "param": 20 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 56, - "type": 3, - "taskname": { - "key": "Entrustment of Shifu", - "text": "师父的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 151, - "tasktxt": { - "key": "Entrustment details of Shifu", - "text": "这是属于师父的专属委托" - }, - "taskneed": 3, - "taskreq": [ - { - "key": 1, - "param": 23 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 57, - "type": 3, - "taskname": { - "key": "Entrustment of Po", - "text": "阿宝的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 77, - "tasktxt": { - "key": "Entrustment details of Po", - "text": "这是属于阿宝的专属委托" - }, - "taskneed": 1, - "taskreq": [ - { - "key": 1, - "param": 6 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 58, - "type": 3, - "taskname": { - "key": "Entrustment of Bobi", - "text": "波比的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 116, - "tasktxt": { - "key": "Entrustment details of Bobi", - "text": "这是属于波比的专属委托" - }, - "taskneed": 3, - "taskreq": [ - { - "key": 1, - "param": 5 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 59, - "type": 3, - "taskname": { - "key": "Entrustment of Tiger", - "text": "焊娇虎的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 110, - "tasktxt": { - "key": "Entrustment details of Tiger", - "text": "这是属于焊娇虎的专属委托" - }, - "taskneed": 1, - "taskreq": [ - { - "key": 1, - "param": 1 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 50000 - } - ] - }, - { - "id": 60, - "type": 4, - "taskname": { - "key": "Entrustment of Shifu", - "text": "师父的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 134, - "tasktxt": { - "key": "Entrustment details of Shifu", - "text": "这是属于师父的专属委托" - }, - "taskneed": 3, - "taskreq": [ - { - "key": 1, - "param": 26 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 510000 - } - ] - }, - { - "id": 61, - "type": 4, - "taskname": { - "key": "Entrustment of Po", - "text": "阿宝的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 135, - "tasktxt": { - "key": "Entrustment details of Po", - "text": "这是属于阿宝的专属委托" - }, - "taskneed": 3, - "taskreq": [ - { - "key": 1, - "param": 18 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", + "t": "20001", "n": 1 } ], @@ -2936,16 +2936,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 124, + "tasktime": 106, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 1, + "taskneed": 4, "taskreq": [ { "key": 1, - "param": 8 + "param": 9 } ], "reqtxt": [ @@ -2963,7 +2963,7 @@ "reward": [ { "a": "panda", - "t": "20003", + "t": "20002", "n": 1 } ], @@ -2980,20 +2980,20 @@ "type": 4, "taskname": { "key": "Entrustment of Tiger", - "text": "焊娇虎的委托" + "text": "悍娇虎的委托" }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 156, + "tasktime": 102, "tasktxt": { "key": "Entrustment details of Tiger", - "text": "这是属于焊娇虎的专属委托" + "text": "这是属于悍娇虎的专属委托" }, - "taskneed": 1, + "taskneed": 4, "taskreq": [ { "key": 1, - "param": 14 + "param": 23 } ], "reqtxt": [ @@ -3032,7 +3032,7 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 132, + "tasktime": 116, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -3041,7 +3041,7 @@ "taskreq": [ { "key": 1, - "param": 14 + "param": 4 } ], "reqtxt": [ @@ -3059,7 +3059,7 @@ "reward": [ { "a": "panda", - "t": "20003", + "t": "20004", "n": 1 } ], @@ -3080,16 +3080,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 164, + "tasktime": 152, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 1, + "taskneed": 3, "taskreq": [ { "key": 1, - "param": 13 + "param": 6 } ], "reqtxt": [ @@ -3107,7 +3107,7 @@ "reward": [ { "a": "panda", - "t": "20003", + "t": "20005", "n": 1 } ], @@ -3128,156 +3128,12 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 168, + "tasktime": 108, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 1, - "taskreq": [ - { - "key": 1, - "param": 1 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 510000 - } - ] - }, - { - "id": 67, - "type": 4, - "taskname": { - "key": "Entrustment of Tiger", - "text": "焊娇虎的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 146, - "tasktxt": { - "key": "Entrustment details of Tiger", - "text": "这是属于焊娇虎的专属委托" - }, "taskneed": 4, - "taskreq": [ - { - "key": 1, - "param": 18 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 510000 - } - ] - }, - { - "id": 68, - "type": 4, - "taskname": { - "key": "Entrustment of Shifu", - "text": "师父的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 62, - "tasktxt": { - "key": "Entrustment details of Shifu", - "text": "这是属于师父的专属委托" - }, - "taskneed": 4, - "taskreq": [ - { - "key": 1, - "param": 5 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 510000 - } - ] - }, - { - "id": 69, - "type": 4, - "taskname": { - "key": "Entrustment of Po", - "text": "阿宝的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 67, - "tasktxt": { - "key": "Entrustment details of Po", - "text": "这是属于阿宝的专属委托" - }, - "taskneed": 3, "taskreq": [ { "key": 1, @@ -3299,7 +3155,7 @@ "reward": [ { "a": "panda", - "t": "20003", + "t": "20006", "n": 1 } ], @@ -3312,68 +3168,20 @@ ] }, { - "id": 70, - "type": 4, - "taskname": { - "key": "Entrustment of Bobi", - "text": "波比的委托" - }, - "icon": "wg_cj1_img01", - "taskcd": 200, - "tasktime": 66, - "tasktxt": { - "key": "Entrustment details of Bobi", - "text": "这是属于波比的专属委托" - }, - "taskneed": 1, - "taskreq": [ - { - "key": 1, - "param": 2 - } - ], - "reqtxt": [ - "DispatchCond1" - ], - "taskreqex": [ - { - "key": 2, - "param": 5 - } - ], - "reqextxt": [ - "DispatchCond2" - ], - "reward": [ - { - "a": "panda", - "t": "20003", - "n": 1 - } - ], - "rewardex": [ - { - "a": "attr", - "t": "gold", - "n": 510000 - } - ] - }, - { - "id": 71, + "id": 67, "type": 4, "taskname": { "key": "Entrustment of Tiger", - "text": "焊娇虎的委托" + "text": "悍娇虎的委托" }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 96, + "tasktime": 167, "tasktxt": { "key": "Entrustment details of Tiger", - "text": "这是属于焊娇虎的专属委托" + "text": "这是属于悍娇虎的专属委托" }, - "taskneed": 2, + "taskneed": 1, "taskreq": [ { "key": 1, @@ -3395,7 +3203,199 @@ "reward": [ { "a": "panda", - "t": "20003", + "t": "20007", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 510000 + } + ] + }, + { + "id": 68, + "type": 4, + "taskname": { + "key": "Entrustment of Shifu", + "text": "师父的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 78, + "tasktxt": { + "key": "Entrustment details of Shifu", + "text": "这是属于师父的专属委托" + }, + "taskneed": 4, + "taskreq": [ + { + "key": 1, + "param": 21 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20008", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 510000 + } + ] + }, + { + "id": 69, + "type": 4, + "taskname": { + "key": "Entrustment of Po", + "text": "阿宝的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 129, + "tasktxt": { + "key": "Entrustment details of Po", + "text": "这是属于阿宝的专属委托" + }, + "taskneed": 2, + "taskreq": [ + { + "key": 1, + "param": 3 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20009", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 510000 + } + ] + }, + { + "id": 70, + "type": 4, + "taskname": { + "key": "Entrustment of Bobi", + "text": "波比的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 130, + "tasktxt": { + "key": "Entrustment details of Bobi", + "text": "这是属于波比的专属委托" + }, + "taskneed": 4, + "taskreq": [ + { + "key": 1, + "param": 23 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20010", + "n": 1 + } + ], + "rewardex": [ + { + "a": "attr", + "t": "gold", + "n": 510000 + } + ] + }, + { + "id": 71, + "type": 4, + "taskname": { + "key": "Entrustment of Tiger", + "text": "悍娇虎的委托" + }, + "icon": "wg_cj1_img01", + "taskcd": 200, + "tasktime": 80, + "tasktxt": { + "key": "Entrustment details of Tiger", + "text": "这是属于悍娇虎的专属委托" + }, + "taskneed": 1, + "taskreq": [ + { + "key": 1, + "param": 23 + } + ], + "reqtxt": [ + "DispatchCond1" + ], + "taskreqex": [ + { + "key": 2, + "param": 5 + } + ], + "reqextxt": [ + "DispatchCond2" + ], + "reward": [ + { + "a": "panda", + "t": "20011", "n": 1 } ], @@ -3416,16 +3416,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 91, + "tasktime": 110, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" }, - "taskneed": 3, + "taskneed": 1, "taskreq": [ { "key": 1, - "param": 22 + "param": 30 } ], "reqtxt": [ @@ -3443,7 +3443,7 @@ "reward": [ { "a": "panda", - "t": "20003", + "t": "20012", "n": 1 } ], @@ -3464,16 +3464,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 165, + "tasktime": 154, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" }, - "taskneed": 2, + "taskneed": 3, "taskreq": [ { "key": 1, - "param": 27 + "param": 2 } ], "reqtxt": [ @@ -3491,7 +3491,7 @@ "reward": [ { "a": "panda", - "t": "20003", + "t": "20013", "n": 1 } ], @@ -3512,16 +3512,16 @@ }, "icon": "wg_cj1_img01", "taskcd": 200, - "tasktime": 159, + "tasktime": 145, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" }, - "taskneed": 1, + "taskneed": 2, "taskreq": [ { "key": 1, - "param": 17 + "param": 10 } ], "reqtxt": [ @@ -3539,7 +3539,7 @@ "reward": [ { "a": "panda", - "t": "20003", + "t": "20014", "n": 1 } ], diff --git a/bin/json/game_pandamasjs.json b/bin/json/game_pandamasjs.json index 73077a1c3..a18446144 100644 --- a/bin/json/game_pandamasjs.json +++ b/bin/json/game_pandamasjs.json @@ -3,8 +3,8 @@ "id": 1, "unlock_condition": 20010, "unlock_conditiondes": { - "key": "通关主线1-1后解锁", - "text": "通关主线1-1后解锁" + "key": "完成任务“这是哪里”", + "text": "完成任务“这是哪里”" } }, { diff --git a/bin/json/game_trolltrain.json b/bin/json/game_trolltrain.json index e29a32baa..2b2edca2c 100644 --- a/bin/json/game_trolltrain.json +++ b/bin/json/game_trolltrain.json @@ -4,7 +4,6 @@ "name": "右屏商人", "information": "这是一位熊猫商人", "ico": "action_11001", - "scene": "1", "time": 300 }, { @@ -12,7 +11,6 @@ "name": "上屏商人", "information": "这是一位波比商人再此", "ico": "action_11003", - "scene": "2", "time": 400 }, { @@ -20,7 +18,6 @@ "name": "左屏商人", "information": "这是一位滑板鞋王子", "ico": "ytx_js_14007", - "scene": "3", "time": 500 } ] \ No newline at end of file diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 0ded356ba..07d7152bc 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -753,7 +753,7 @@ "key": 30001, "lock": 1, "ontxe": 20010, - "id_after": 30002, + "id_after": 0, "group": 3, "des": 2, "icon": "", @@ -769,11 +769,11 @@ "key": "story_80", "text": "新手引导" }, - "npc": 27, + "npc": 29, "completetask": [ 301 ], - "deliver_npc": 28, + "deliver_npc": 1, "auto_accept": 0, "reword": [], "module": [] diff --git a/sys/configure/structs/Game.Breakingbad.go b/sys/configure/structs/Game.Breakingbad.go new file mode 100644 index 000000000..4a7f30adf --- /dev/null +++ b/sys/configure/structs/Game.Breakingbad.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameBreakingbad struct { + _dataMap map[string]*GameBreakingbadData + _dataList []*GameBreakingbadData +} + +func NewGameBreakingbad(_buf []map[string]interface{}) (*GameBreakingbad, error) { + _dataList := make([]*GameBreakingbadData, 0, len(_buf)) + dataMap := make(map[string]*GameBreakingbadData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameBreakingbadData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Delicacies] = _v + } + } + return &GameBreakingbad{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameBreakingbad) GetDataMap() map[string]*GameBreakingbadData { + return table._dataMap +} + +func (table *GameBreakingbad) GetDataList() []*GameBreakingbadData { + return table._dataList +} + +func (table *GameBreakingbad) Get(key string) *GameBreakingbadData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.BreakingbadData.go b/sys/configure/structs/Game.BreakingbadData.go new file mode 100644 index 000000000..f32d98500 --- /dev/null +++ b/sys/configure/structs/Game.BreakingbadData.go @@ -0,0 +1,56 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameBreakingbadData struct { + Delicacies string + Recipe []*Gameatr + Type int32 + Flame int32 + Unlockreward *Gameatn +} + +const TypeId_GameBreakingbadData = -702491792 + +func (*GameBreakingbadData) GetTypeId() int32 { + return -702491792 +} + +func (_v *GameBreakingbadData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; if _v.Delicacies, _ok_ = _buf["delicacies"].(string); !_ok_ { err = errors.New("delicacies error"); return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["recipe"].([]interface{}); !_ok_ { err = errors.New("recipe error"); return } + + _v.Recipe = make([]*Gameatr, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatr + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatr(_x_); err != nil { return } } + _v.Recipe = append(_v.Recipe, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Type"].(float64); !_ok_ { err = errors.New("Type error"); return }; _v.Type = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["flame"].(float64); !_ok_ { err = errors.New("flame error"); return }; _v.Flame = int32(_tempNum_) } + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["unlockreward"].(map[string]interface{}); !_ok_ { err = errors.New("unlockreward error"); return }; if _v.Unlockreward, err = DeserializeGameatn(_x_); err != nil { return } } + return +} + +func DeserializeGameBreakingbadData(_buf map[string]interface{}) (*GameBreakingbadData, error) { + v := &GameBreakingbadData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.RdtaskNpc.go b/sys/configure/structs/Game.RdtaskNpc.go new file mode 100644 index 000000000..ab18b5ee0 --- /dev/null +++ b/sys/configure/structs/Game.RdtaskNpc.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameRdtaskNpc struct { + _dataMap map[int32]*GameRdtaskNpcData + _dataList []*GameRdtaskNpcData +} + +func NewGameRdtaskNpc(_buf []map[string]interface{}) (*GameRdtaskNpc, error) { + _dataList := make([]*GameRdtaskNpcData, 0, len(_buf)) + dataMap := make(map[int32]*GameRdtaskNpcData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameRdtaskNpcData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GameRdtaskNpc{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameRdtaskNpc) GetDataMap() map[int32]*GameRdtaskNpcData { + return table._dataMap +} + +func (table *GameRdtaskNpc) GetDataList() []*GameRdtaskNpcData { + return table._dataList +} + +func (table *GameRdtaskNpc) Get(key int32) *GameRdtaskNpcData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.RdtaskNpcData.go b/sys/configure/structs/Game.RdtaskNpcData.go new file mode 100644 index 000000000..b09616ae6 --- /dev/null +++ b/sys/configure/structs/Game.RdtaskNpcData.go @@ -0,0 +1,67 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameRdtaskNpcData struct { + Id int32 + Datas []string + Event []int32 + Goto int32 +} + +const TypeId_GameRdtaskNpcData = -2132874632 + +func (*GameRdtaskNpcData) GetTypeId() int32 { + return -2132874632 +} + +func (_v *GameRdtaskNpcData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["datas"].([]interface{}); !_ok_ { err = errors.New("datas error"); return } + + _v.Datas = make([]string, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + _v.Datas = append(_v.Datas, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["event"].([]interface{}); !_ok_ { err = errors.New("event error"); return } + + _v.Event = 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.Event = append(_v.Event, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["goto"].(float64); !_ok_ { err = errors.New("goto error"); return }; _v.Goto = int32(_tempNum_) } + return +} + +func DeserializeGameRdtaskNpcData(_buf map[string]interface{}) (*GameRdtaskNpcData, error) { + v := &GameRdtaskNpcData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 7a30e4777..5d555fa86 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -63,6 +63,7 @@ type Tables struct { SeasonLoop *GameSeasonLoop PagodaSeasonReward *GamePagodaSeasonReward RdtaskCondi *GameRdtaskCondi + RdtaskNpc *GameRdtaskNpc Gourmet *GameGourmet Drop *GameDrop VikingBoss *GameVikingBoss @@ -176,6 +177,7 @@ type Tables struct { PandamasTjjl *GamePandamasTjjl PandamasYxjx *GamePandamasYxjx BubbleGroup *GameBubbleGroup + Breakingbad *GameBreakingbad } func NewTables(loader JsonLoader) (*Tables, error) { @@ -495,6 +497,12 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.RdtaskCondi, err = NewGameRdtaskCondi(buf) ; err != nil { return nil, err } + if buf, err = loader("game_rdtasknpc") ; err != nil { + return nil, err + } + if tables.RdtaskNpc, err = NewGameRdtaskNpc(buf) ; err != nil { + return nil, err + } if buf, err = loader("game_gourmet") ; err != nil { return nil, err } @@ -1173,5 +1181,11 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.BubbleGroup, err = NewGameBubbleGroup(buf) ; err != nil { return nil, err } + if buf, err = loader("game_breakingbad") ; err != nil { + return nil, err + } + if tables.Breakingbad, err = NewGameBreakingbad(buf) ; err != nil { + return nil, err + } return tables, nil } diff --git a/sys/configure/structs/game.equipAttrlibrary.go b/sys/configure/structs/game.equipAttrlibrary.go index 968f74f27..b91463458 100644 --- a/sys/configure/structs/game.equipAttrlibrary.go +++ b/sys/configure/structs/game.equipAttrlibrary.go @@ -9,32 +9,26 @@ package cfg type GameEquipAttrlibrary struct { - _dataMap map[int32]*GameEquipAttrlibraryData - _dataList []*GameEquipAttrlibraryData + _dataList []*GameEquipAttrlibraryData } func NewGameEquipAttrlibrary(_buf []map[string]interface{}) (*GameEquipAttrlibrary, error) { _dataList := make([]*GameEquipAttrlibraryData, 0, len(_buf)) - dataMap := make(map[int32]*GameEquipAttrlibraryData) for _, _ele_ := range _buf { if _v, err2 := DeserializeGameEquipAttrlibraryData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) - dataMap[_v.Key] = _v } } - return &GameEquipAttrlibrary{_dataList: _dataList, _dataMap: dataMap}, nil -} - -func (table *GameEquipAttrlibrary) GetDataMap() map[int32]*GameEquipAttrlibraryData { - return table._dataMap + return &GameEquipAttrlibrary{_dataList:_dataList}, nil } func (table *GameEquipAttrlibrary) GetDataList() []*GameEquipAttrlibraryData { - return table._dataList + return table._dataList } -func (table *GameEquipAttrlibrary) Get(key int32) *GameEquipAttrlibraryData { - return table._dataMap[key] +func (table *GameEquipAttrlibrary) Get(index int) *GameEquipAttrlibraryData { + return table._dataList[index] } + From 394c7e6a13d98f65be07fd621b2a3c043e45e4b6 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 24 Mar 2023 15:56:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=A3=85=E5=A4=87=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sys/configure/structs/game.equipAttrlibrary.go | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/sys/configure/structs/game.equipAttrlibrary.go b/sys/configure/structs/game.equipAttrlibrary.go index b91463458..968f74f27 100644 --- a/sys/configure/structs/game.equipAttrlibrary.go +++ b/sys/configure/structs/game.equipAttrlibrary.go @@ -9,26 +9,32 @@ package cfg type GameEquipAttrlibrary struct { - _dataList []*GameEquipAttrlibraryData + _dataMap map[int32]*GameEquipAttrlibraryData + _dataList []*GameEquipAttrlibraryData } func NewGameEquipAttrlibrary(_buf []map[string]interface{}) (*GameEquipAttrlibrary, error) { _dataList := make([]*GameEquipAttrlibraryData, 0, len(_buf)) + dataMap := make(map[int32]*GameEquipAttrlibraryData) for _, _ele_ := range _buf { if _v, err2 := DeserializeGameEquipAttrlibraryData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) + dataMap[_v.Key] = _v } } - return &GameEquipAttrlibrary{_dataList:_dataList}, nil + return &GameEquipAttrlibrary{_dataList: _dataList, _dataMap: dataMap}, nil +} + +func (table *GameEquipAttrlibrary) GetDataMap() map[int32]*GameEquipAttrlibraryData { + return table._dataMap } func (table *GameEquipAttrlibrary) GetDataList() []*GameEquipAttrlibraryData { - return table._dataList + return table._dataList } -func (table *GameEquipAttrlibrary) Get(index int) *GameEquipAttrlibraryData { - return table._dataList[index] +func (table *GameEquipAttrlibrary) Get(key int32) *GameEquipAttrlibraryData { + return table._dataMap[key] } -