diff --git a/bin/json/game_caravancity.json b/bin/json/game_caravancity.json index af26bf65f..2e423bf2c 100644 --- a/bin/json/game_caravancity.json +++ b/bin/json/game_caravancity.json @@ -9,7 +9,7 @@ { "a": "item", "t": "10000005", - "n": 1 + "n": 10 } ], "cityexlock": [ @@ -33,10 +33,10 @@ "citytype": 1, "citytypenum": 2, "special": [ - "21000001", "21000002", "21000003", - "21000004" + "21000004", + "21000005" ], "specialnum": 500, "exspecial": [ @@ -62,7 +62,7 @@ { "a": "item", "t": "10000005", - "n": 1 + "n": 5 } ], "cityexlock": [ @@ -86,10 +86,10 @@ "citytype": 1, "citytypenum": 3, "special": [ - "21000001", - "21000002", - "21000003", - "21000007" + "21000006", + "21000007", + "21000008", + "21000009" ], "specialnum": 500, "exspecial": [ @@ -116,7 +116,7 @@ { "a": "item", "t": "10000005", - "n": 1 + "n": 7 } ], "cityexlock": [ @@ -140,10 +140,10 @@ "citytype": 1, "citytypenum": 4, "special": [ - "21000001", - "21000002", - "21000003", - "21000004" + "21000010", + "21000011", + "21000012", + "21000013" ], "specialnum": 500, "exspecial": [ @@ -170,7 +170,7 @@ { "a": "item", "t": "10000005", - "n": 1 + "n": 3 } ], "cityexlock": [ @@ -194,10 +194,10 @@ "citytype": 1, "citytypenum": 3, "special": [ - "21000001", - "21000002", - "21000003", - "21000004" + "21000014", + "21000015", + "21000016", + "21000017" ], "specialnum": 500, "exspecial": [ @@ -223,7 +223,7 @@ { "a": "item", "t": "10000005", - "n": 1 + "n": 6 } ], "cityexlock": [ @@ -247,10 +247,10 @@ "citytype": 1, "citytypenum": 4, "special": [ - "21000001", - "21000002", - "21000003", - "21000009" + "21000018", + "21000019", + "21000020", + "21000021" ], "specialnum": 500, "exspecial": [ diff --git a/bin/json/game_caravanevent.json b/bin/json/game_caravanevent.json index 631657ac4..6fc4f76d6 100644 --- a/bin/json/game_caravanevent.json +++ b/bin/json/game_caravanevent.json @@ -8,7 +8,7 @@ "citystory": 50020010, "citynormal": 50020030, "cityabnormal": 50020020, - "worldtask": 500, + "worldtask": 520, "traintips": { "key": "caravan_caravan_event_traintips_1", "text": "列车上来了外人,这个人看上去有很急切的事情,我们必须先解决这个再离开这里。" @@ -38,7 +38,7 @@ "citystory": 50020010, "citynormal": 50020030, "cityabnormal": 50020020, - "worldtask": 510, + "worldtask": 540, "traintips": { "key": "caravan_caravan_event_traintips_2", "text": "这个事情看上去有回旋的余地,但我建议先处理掉这个事情。" @@ -68,7 +68,7 @@ "citystory": 50020010, "citynormal": 50020030, "cityabnormal": 50020020, - "worldtask": 520, + "worldtask": 510, "traintips": { "key": "caravan_caravan_event_traintips_3", "text": "最好先解决这个麻烦,再前往其他地方。" diff --git a/bin/json/game_caravanlv.json b/bin/json/game_caravanlv.json index 6422578be..921502b80 100644 --- a/bin/json/game_caravanlv.json +++ b/bin/json/game_caravanlv.json @@ -3,11 +3,11 @@ "lv": 0, "newmoneyexp": 0, "bagtop": 20, - "bagtagnum": 100, + "bagtagnum": 5, "tickettop": { "a": "item", "t": "21000001", - "n": 40 + "n": 50 }, "moneynumtop": { "a": "attr", @@ -22,11 +22,11 @@ "lv": 1, "newmoneyexp": 100000, "bagtop": 24, - "bagtagnum": 100, + "bagtagnum": 10, "tickettop": { "a": "item", "t": "21000001", - "n": 41 + "n": 60 }, "moneynumtop": { "a": "attr", @@ -47,11 +47,11 @@ "lv": 2, "newmoneyexp": 200000, "bagtop": 28, - "bagtagnum": 100, + "bagtagnum": 15, "tickettop": { "a": "item", "t": "21000001", - "n": 42 + "n": 70 }, "moneynumtop": { "a": "attr", @@ -72,11 +72,11 @@ "lv": 3, "newmoneyexp": 300000, "bagtop": 32, - "bagtagnum": 100, + "bagtagnum": 20, "tickettop": { "a": "item", "t": "21000001", - "n": 43 + "n": 80 }, "moneynumtop": { "a": "attr", @@ -97,11 +97,11 @@ "lv": 4, "newmoneyexp": 400000, "bagtop": 36, - "bagtagnum": 100, + "bagtagnum": 22, "tickettop": { "a": "item", "t": "21000001", - "n": 44 + "n": 90 }, "moneynumtop": { "a": "attr", @@ -122,11 +122,11 @@ "lv": 5, "newmoneyexp": 500000, "bagtop": 40, - "bagtagnum": 100, + "bagtagnum": 24, "tickettop": { "a": "item", "t": "21000001", - "n": 45 + "n": 100 }, "moneynumtop": { "a": "attr", @@ -147,11 +147,11 @@ "lv": 6, "newmoneyexp": 600000, "bagtop": 44, - "bagtagnum": 100, + "bagtagnum": 25, "tickettop": { "a": "item", "t": "21000001", - "n": 46 + "n": 110 }, "moneynumtop": { "a": "attr", @@ -172,11 +172,11 @@ "lv": 7, "newmoneyexp": 700000, "bagtop": 48, - "bagtagnum": 100, + "bagtagnum": 27, "tickettop": { "a": "item", "t": "21000001", - "n": 47 + "n": 120 }, "moneynumtop": { "a": "attr", @@ -197,11 +197,11 @@ "lv": 8, "newmoneyexp": 800000, "bagtop": 52, - "bagtagnum": 100, + "bagtagnum": 29, "tickettop": { "a": "item", "t": "21000001", - "n": 48 + "n": 130 }, "moneynumtop": { "a": "attr", @@ -222,11 +222,11 @@ "lv": 9, "newmoneyexp": 900000, "bagtop": 56, - "bagtagnum": 100, + "bagtagnum": 30, "tickettop": { "a": "item", "t": "21000001", - "n": 49 + "n": 140 }, "moneynumtop": { "a": "attr", @@ -247,11 +247,11 @@ "lv": 10, "newmoneyexp": 1000000, "bagtop": 60, - "bagtagnum": 100, + "bagtagnum": 31, "tickettop": { "a": "item", "t": "21000001", - "n": 50 + "n": 150 }, "moneynumtop": { "a": "attr", @@ -272,11 +272,11 @@ "lv": 11, "newmoneyexp": 1100000, "bagtop": 64, - "bagtagnum": 100, + "bagtagnum": 31, "tickettop": { "a": "item", "t": "21000001", - "n": 51 + "n": 160 }, "moneynumtop": { "a": "attr", @@ -297,11 +297,11 @@ "lv": 12, "newmoneyexp": 1200000, "bagtop": 68, - "bagtagnum": 100, + "bagtagnum": 32, "tickettop": { "a": "item", "t": "21000001", - "n": 52 + "n": 170 }, "moneynumtop": { "a": "attr", diff --git a/bin/json/game_caravanthing.json b/bin/json/game_caravanthing.json index 3c05d5ad1..e04595c39 100644 --- a/bin/json/game_caravanthing.json +++ b/bin/json/game_caravanthing.json @@ -1,36 +1,7 @@ [ - { - "itemid": "21000001", - "goodsprice": 1000, - "changeperiod": [ - 5, - 15 - ], - "PriceChangeWeight": [ - 40, - 20, - 40 - ], - "PriceChangeWeight_one": [ - 80, - 20 - ], - "PriceChangeWeight_two": [ - 50, - 50 - ], - "PriceChangeWeight_three": [ - 20, - 80 - ], - "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, - "goodsnum": 80 - }, { "itemid": "21000002", - "goodsprice": 900, + "goodsprice": 1000, "changeperiod": [ 5, 15 @@ -59,7 +30,7 @@ }, { "itemid": "21000003", - "goodsprice": 500, + "goodsprice": 900, "changeperiod": [ 5, 15 @@ -88,7 +59,7 @@ }, { "itemid": "21000004", - "goodsprice": 1500, + "goodsprice": 500, "changeperiod": [ 5, 15 @@ -117,7 +88,7 @@ }, { "itemid": "21000005", - "goodsprice": 2300, + "goodsprice": 1500, "changeperiod": [ 5, 15 @@ -146,7 +117,7 @@ }, { "itemid": "21000006", - "goodsprice": 1130, + "goodsprice": 2300, "changeperiod": [ 5, 15 @@ -175,7 +146,7 @@ }, { "itemid": "21000007", - "goodsprice": 1000, + "goodsprice": 1130, "changeperiod": [ 5, 15 @@ -204,7 +175,7 @@ }, { "itemid": "21000008", - "goodsprice": 900, + "goodsprice": 1000, "changeperiod": [ 5, 15 @@ -233,7 +204,7 @@ }, { "itemid": "21000009", - "goodsprice": 500, + "goodsprice": 900, "changeperiod": [ 5, 15 @@ -262,7 +233,7 @@ }, { "itemid": "21000010", - "goodsprice": 1500, + "goodsprice": 500, "changeperiod": [ 5, 15 @@ -291,151 +262,6 @@ }, { "itemid": "21000011", - "goodsprice": 2300, - "changeperiod": [ - 5, - 15 - ], - "PriceChangeWeight": [ - 40, - 20, - 40 - ], - "PriceChangeWeight_one": [ - 80, - 20 - ], - "PriceChangeWeight_two": [ - 50, - 50 - ], - "PriceChangeWeight_three": [ - 20, - 80 - ], - "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, - "goodsnum": 80 - }, - { - "itemid": "21000012", - "goodsprice": 1130, - "changeperiod": [ - 5, - 15 - ], - "PriceChangeWeight": [ - 40, - 20, - 40 - ], - "PriceChangeWeight_one": [ - 80, - 20 - ], - "PriceChangeWeight_two": [ - 50, - 50 - ], - "PriceChangeWeight_three": [ - 20, - 80 - ], - "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, - "goodsnum": 80 - }, - { - "itemid": "21000013", - "goodsprice": 1000, - "changeperiod": [ - 5, - 15 - ], - "PriceChangeWeight": [ - 40, - 20, - 40 - ], - "PriceChangeWeight_one": [ - 80, - 20 - ], - "PriceChangeWeight_two": [ - 50, - 50 - ], - "PriceChangeWeight_three": [ - 20, - 80 - ], - "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, - "goodsnum": 80 - }, - { - "itemid": "21000014", - "goodsprice": 900, - "changeperiod": [ - 5, - 15 - ], - "PriceChangeWeight": [ - 40, - 20, - 40 - ], - "PriceChangeWeight_one": [ - 80, - 20 - ], - "PriceChangeWeight_two": [ - 50, - 50 - ], - "PriceChangeWeight_three": [ - 20, - 80 - ], - "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, - "goodsnum": 80 - }, - { - "itemid": "21000015", - "goodsprice": 500, - "changeperiod": [ - 5, - 15 - ], - "PriceChangeWeight": [ - 40, - 20, - 40 - ], - "PriceChangeWeight_one": [ - 80, - 20 - ], - "PriceChangeWeight_two": [ - 50, - 50 - ], - "PriceChangeWeight_three": [ - 20, - 80 - ], - "FluctuationRange": 500, - "pricemin": 200, - "pricemax": 3000, - "goodsnum": 80 - }, - { - "itemid": "21000016", "goodsprice": 1500, "changeperiod": [ 5, @@ -464,7 +290,7 @@ "goodsnum": 80 }, { - "itemid": "21000017", + "itemid": "21000012", "goodsprice": 2300, "changeperiod": [ 5, @@ -493,7 +319,7 @@ "goodsnum": 80 }, { - "itemid": "21000018", + "itemid": "21000013", "goodsprice": 1130, "changeperiod": [ 5, @@ -522,7 +348,7 @@ "goodsnum": 80 }, { - "itemid": "21000019", + "itemid": "21000014", "goodsprice": 1000, "changeperiod": [ 5, @@ -551,7 +377,7 @@ "goodsnum": 80 }, { - "itemid": "21000020", + "itemid": "21000015", "goodsprice": 900, "changeperiod": [ 5, @@ -580,7 +406,7 @@ "goodsnum": 80 }, { - "itemid": "21000021", + "itemid": "21000016", "goodsprice": 500, "changeperiod": [ 5, @@ -607,5 +433,150 @@ "pricemin": 200, "pricemax": 3000, "goodsnum": 80 + }, + { + "itemid": "21000017", + "goodsprice": 1500, + "changeperiod": [ + 5, + 15 + ], + "PriceChangeWeight": [ + 40, + 20, + 40 + ], + "PriceChangeWeight_one": [ + 80, + 20 + ], + "PriceChangeWeight_two": [ + 50, + 50 + ], + "PriceChangeWeight_three": [ + 20, + 80 + ], + "FluctuationRange": 500, + "pricemin": 200, + "pricemax": 3000, + "goodsnum": 80 + }, + { + "itemid": "21000018", + "goodsprice": 2300, + "changeperiod": [ + 5, + 15 + ], + "PriceChangeWeight": [ + 40, + 20, + 40 + ], + "PriceChangeWeight_one": [ + 80, + 20 + ], + "PriceChangeWeight_two": [ + 50, + 50 + ], + "PriceChangeWeight_three": [ + 20, + 80 + ], + "FluctuationRange": 500, + "pricemin": 200, + "pricemax": 3000, + "goodsnum": 80 + }, + { + "itemid": "21000019", + "goodsprice": 1130, + "changeperiod": [ + 5, + 15 + ], + "PriceChangeWeight": [ + 40, + 20, + 40 + ], + "PriceChangeWeight_one": [ + 80, + 20 + ], + "PriceChangeWeight_two": [ + 50, + 50 + ], + "PriceChangeWeight_three": [ + 20, + 80 + ], + "FluctuationRange": 500, + "pricemin": 200, + "pricemax": 3000, + "goodsnum": 80 + }, + { + "itemid": "21000020", + "goodsprice": 1000, + "changeperiod": [ + 5, + 15 + ], + "PriceChangeWeight": [ + 40, + 20, + 40 + ], + "PriceChangeWeight_one": [ + 80, + 20 + ], + "PriceChangeWeight_two": [ + 50, + 50 + ], + "PriceChangeWeight_three": [ + 20, + 80 + ], + "FluctuationRange": 500, + "pricemin": 200, + "pricemax": 3000, + "goodsnum": 80 + }, + { + "itemid": "21000021", + "goodsprice": 900, + "changeperiod": [ + 5, + 15 + ], + "PriceChangeWeight": [ + 40, + 20, + 40 + ], + "PriceChangeWeight_one": [ + 80, + 20 + ], + "PriceChangeWeight_two": [ + 50, + 50 + ], + "PriceChangeWeight_three": [ + 20, + 80 + ], + "FluctuationRange": 500, + "pricemin": 200, + "pricemax": 3000, + "goodsnum": 80 } ] \ No newline at end of file diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 4119fc7d4..e735e5b36 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -8,7 +8,7 @@ "id_after": 20011, "group": 10, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_1", "text": "我是传承者?" @@ -47,7 +47,7 @@ "id_after": 20012, "group": 10, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_2", "text": "半透明的困扰" @@ -86,7 +86,7 @@ "id_after": 20020, "group": 10, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_3", "text": "踏入中轴城" @@ -130,7 +130,7 @@ "id_after": 20030, "group": 10, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_4", "text": "突如起来的袭击" @@ -162,14 +162,14 @@ }, { "key": 20030, - "opencond": "", + "opencond": "heroic_teaching", "lock": 1, "lockend": 999, "ontxe": 20020, "id_after": 20040, "group": 10, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_5", "text": "安全守卫员邦尼兔!" @@ -208,7 +208,7 @@ "id_after": 20050, "group": 10, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_6", "text": "获取邦尼兔的信任" @@ -252,7 +252,7 @@ "id_after": 20060, "group": 10, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_7", "text": "可疑人物入侵" @@ -296,7 +296,7 @@ "id_after": 20070, "group": 10, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_8", "text": "召唤守护者" @@ -335,7 +335,7 @@ "id_after": 20080, "group": 10, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_9", "text": "初识浣熊师父" @@ -374,7 +374,7 @@ "id_after": 20090, "group": 10, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_10", "text": "调查熊猫武馆" @@ -415,7 +415,7 @@ "id_after": 20100, "group": 10, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_11", "text": "来自指挥部的呼叫" @@ -459,7 +459,7 @@ "id_after": 20110, "group": 10, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_12", "text": "返回指挥部" @@ -523,7 +523,7 @@ "id_after": 20120, "group": 10, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_13", "text": "为守护者穿戴装备" @@ -562,7 +562,7 @@ "id_after": 20130, "group": 10, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_14", "text": "继续寻找月光原石" @@ -601,7 +601,7 @@ "id_after": 20140, "group": 10, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_15", "text": "前往戈伯铁匠铺" @@ -640,7 +640,7 @@ "id_after": 20150, "group": 10, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_16", "text": "委托戈伯锻造装备" @@ -704,7 +704,7 @@ "id_after": 20160, "group": 10, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_17", "text": "艺术家戈伯的作品" @@ -743,7 +743,7 @@ "id_after": 20170, "group": 10, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_18", "text": "装备强化" @@ -782,7 +782,7 @@ "id_after": 20180, "group": 10, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_19", "text": "决战巨型猩猩怪" @@ -826,7 +826,7 @@ "id_after": 20190, "group": 10, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_20", "text": "交付月光原石" @@ -870,7 +870,7 @@ "id_after": 20200, "group": 10, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_21", "text": "召唤更多的守护者" @@ -909,7 +909,7 @@ "id_after": 20210, "group": 10, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_22", "text": "恐惧笼罩中轴城" @@ -948,7 +948,7 @@ "id_after": 20220, "group": 10, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_23", "text": "黑暗漆黑重生" @@ -987,7 +987,7 @@ "id_after": 0, "group": 10, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_24", "text": "熊猫武馆纷争" @@ -1026,7 +1026,7 @@ "id_after": 20240, "group": 20, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_25", "text": "木人桩训练" @@ -1070,7 +1070,7 @@ "id_after": 20250, "group": 20, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_26", "text": "功夫大师挑战塔" @@ -1109,7 +1109,7 @@ "id_after": 20260, "group": 20, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_27", "text": "阿宝的决定" @@ -1173,7 +1173,7 @@ "id_after": 20270, "group": 20, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_28", "text": "检查装备穿戴情况" @@ -1212,7 +1212,7 @@ "id_after": 20280, "group": 20, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_29", "text": "装备强化进阶" @@ -1251,7 +1251,7 @@ "id_after": 20290, "group": 20, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_30", "text": "月光原石新动向" @@ -1295,7 +1295,7 @@ "id_after": 0, "group": 20, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_31", "text": "系统异常" @@ -1336,7 +1336,7 @@ "id_after": 20310, "group": 30, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_32", "text": "波比的邀请" @@ -1380,7 +1380,7 @@ "id_after": 20320, "group": 30, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_33", "text": "海面异象" @@ -1419,7 +1419,7 @@ "id_after": 20330, "group": 30, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_34", "text": "继续强化装备" @@ -1458,7 +1458,7 @@ "id_after": 20340, "group": 30, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_35", "text": "前往坏蛋联盟世界" @@ -1497,7 +1497,7 @@ "id_after": 20350, "group": 30, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_36", "text": "戈伯的记挂" @@ -1546,7 +1546,7 @@ "id_after": 20360, "group": 30, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_37", "text": "检查装备穿戴情况" @@ -1586,7 +1586,7 @@ "id_after": 0, "group": 30, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_38", "text": "失窃的月光原石" @@ -1630,7 +1630,7 @@ "id_after": 20380, "group": 40, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_39", "text": "通缉果酱教授" @@ -1674,7 +1674,7 @@ "id_after": 20390, "group": 40, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_40", "text": "魔药区奇闻" @@ -1713,7 +1713,7 @@ "id_after": 20400, "group": 40, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_41", "text": "贫嘴驴的提醒" @@ -1752,7 +1752,7 @@ "id_after": 20410, "group": 40, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_42", "text": "泰坦挑战" @@ -1791,7 +1791,7 @@ "id_after": 20420, "group": 40, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_43", "text": "戈伯的新技术" @@ -1830,7 +1830,7 @@ "id_after": 20430, "group": 40, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_44", "text": "邦尼兔的苦恼" @@ -1869,7 +1869,7 @@ "id_after": 0, "group": 40, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_45", "text": "前往怪物史莱克世界" @@ -1913,7 +1913,7 @@ "id_after": 20450, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_46", "text": "击退豺狼人" @@ -1952,7 +1952,7 @@ "id_after": 20460, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_47", "text": "冰霜泰坦难度1" @@ -1991,7 +1991,7 @@ "id_after": 20470, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_48", "text": "剧情" @@ -2030,7 +2030,7 @@ "id_after": 20480, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_49", "text": "6件装备+6" @@ -2069,7 +2069,7 @@ "id_after": 20490, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_50", "text": "冒险5-4通关" @@ -2108,7 +2108,7 @@ "id_after": 20500, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_51", "text": "冰霜泰坦难度2" @@ -2147,7 +2147,7 @@ "id_after": 20510, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_52", "text": "冒险5-8通关" @@ -2191,7 +2191,7 @@ "id_after": 20520, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_53", "text": "剧情" @@ -2230,7 +2230,7 @@ "id_after": 20530, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_54", "text": "剧情" @@ -2269,7 +2269,7 @@ "id_after": 20540, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_55", "text": "功夫大师挑战塔5层" @@ -2313,7 +2313,7 @@ "id_after": 20550, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_56", "text": "击退豺狼人" @@ -2352,7 +2352,7 @@ "id_after": 20560, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_57", "text": "击退豺狼人" @@ -2391,7 +2391,7 @@ "id_after": 20570, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_58", "text": "击退豺狼人" @@ -2430,7 +2430,7 @@ "id_after": 20580, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_59", "text": "森林泰坦难度1" @@ -2469,7 +2469,7 @@ "id_after": 20590, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_60", "text": "主角星座觉醒3次" @@ -2508,7 +2508,7 @@ "id_after": 20600, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_61", "text": "9件装备强化+6" @@ -2547,7 +2547,7 @@ "id_after": 20610, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_62", "text": "击退豺狼人" @@ -2586,7 +2586,7 @@ "id_after": 20620, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_63", "text": "击退豺狼人" @@ -2625,7 +2625,7 @@ "id_after": 20630, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_64", "text": "剧情" @@ -2664,7 +2664,7 @@ "id_after": 20640, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_65", "text": "冒险6-8通关" @@ -2708,7 +2708,7 @@ "id_after": 20650, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_66", "text": "森林泰坦难度2" @@ -2747,7 +2747,7 @@ "id_after": 20660, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_67", "text": "12件装备强化+6" @@ -2786,7 +2786,7 @@ "id_after": 20670, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_68", "text": "武馆木桩解锁3根" @@ -2825,7 +2825,7 @@ "id_after": 20680, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_69", "text": "功夫大师挑战塔10层" @@ -2869,7 +2869,7 @@ "id_after": 20690, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_70", "text": "冒险7-8通关" @@ -2913,7 +2913,7 @@ "id_after": 20700, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_71", "text": "击退豺狼人" @@ -2952,7 +2952,7 @@ "id_after": 20710, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_72", "text": "击退豺狼人" @@ -2991,7 +2991,7 @@ "id_after": 20720, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_73", "text": "穿+6的无极神功套装" @@ -3030,7 +3030,7 @@ "id_after": 20730, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_74", "text": "加入任意公会" @@ -3069,7 +3069,7 @@ "id_after": 20740, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_75", "text": "森林泰坦难度3" @@ -3108,7 +3108,7 @@ "id_after": 20750, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_76", "text": "森林泰坦难度4" @@ -3147,7 +3147,7 @@ "id_after": 20760, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_77", "text": "守护者回响解锁次数10次" @@ -3186,7 +3186,7 @@ "id_after": 20770, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_78", "text": "守护者回响解锁次数15次" @@ -3225,7 +3225,7 @@ "id_after": 20780, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_79", "text": "冒险8-8通关" @@ -3269,7 +3269,7 @@ "id_after": 20790, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_80", "text": "12件装备强化+9" @@ -3308,7 +3308,7 @@ "id_after": 20800, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_81", "text": "竞技场3胜" @@ -3347,7 +3347,7 @@ "id_after": 20810, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_82", "text": "森林泰坦难度5" @@ -3386,7 +3386,7 @@ "id_after": 20820, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_83", "text": "守护者回响解锁解锁20次" @@ -3425,7 +3425,7 @@ "id_after": 20830, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_84", "text": "冒险9-8通关" @@ -3469,7 +3469,7 @@ "id_after": 20840, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_85", "text": "搜集12个4星装备" @@ -3508,7 +3508,7 @@ "id_after": 20850, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_86", "text": "功夫大师挑战塔20层" @@ -3552,7 +3552,7 @@ "id_after": 20860, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_87", "text": "冒险10-8通关" @@ -3596,7 +3596,7 @@ "id_after": 20870, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_88", "text": "森林泰坦难度6" @@ -3635,7 +3635,7 @@ "id_after": 20880, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_89", "text": "18件强化+9" @@ -3674,7 +3674,7 @@ "id_after": 20890, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_90", "text": "冒险11-8通关" @@ -3718,7 +3718,7 @@ "id_after": 20900, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_91", "text": "守护者回响解锁25次" @@ -3757,7 +3757,7 @@ "id_after": 20910, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_92", "text": "冒险12-3通关" @@ -3796,7 +3796,7 @@ "id_after": 20920, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_93", "text": "森林泰坦难度7" @@ -3835,7 +3835,7 @@ "id_after": 20930, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_94", "text": "8件任意装备强化+12" @@ -3874,7 +3874,7 @@ "id_after": 20940, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_95", "text": "冒险12-6通关" @@ -3913,7 +3913,7 @@ "id_after": 20950, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_96", "text": "竞技场获胜20次" @@ -3952,7 +3952,7 @@ "id_after": 20960, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_97", "text": "冒险12-8通关" @@ -3996,7 +3996,7 @@ "id_after": 20970, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_98", "text": "冒险关卡困难1-3" @@ -4035,7 +4035,7 @@ "id_after": 20980, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_99", "text": "冒险关卡困难1-6" @@ -4074,7 +4074,7 @@ "id_after": 20990, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_100", "text": "冒险关卡困难2-3" @@ -4113,7 +4113,7 @@ "id_after": 21000, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_101", "text": "冒险关卡困难2-6" @@ -4152,7 +4152,7 @@ "id_after": 21010, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_102", "text": "冒险关卡困难3-3" @@ -4191,7 +4191,7 @@ "id_after": 21020, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_103", "text": "冒险关卡困难3-6" @@ -4230,7 +4230,7 @@ "id_after": 21030, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_104", "text": "冒险关卡困难4-3" @@ -4269,7 +4269,7 @@ "id_after": 21040, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_105", "text": "冒险关卡困难4-6" @@ -4308,7 +4308,7 @@ "id_after": 21050, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_106", "text": "冒险关卡困难5-3" @@ -4347,7 +4347,7 @@ "id_after": 21060, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_107", "text": "冒险关卡困难5-6" @@ -4386,7 +4386,7 @@ "id_after": 21070, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_108", "text": "冒险关卡困难6-3" @@ -4425,7 +4425,7 @@ "id_after": 21080, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_109", "text": "冒险关卡困难6-6" @@ -4464,7 +4464,7 @@ "id_after": 21090, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_110", "text": "冒险关卡困难7-3" @@ -4503,7 +4503,7 @@ "id_after": 21100, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_111", "text": "冒险关卡困难7-6" @@ -4542,7 +4542,7 @@ "id_after": 21110, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_112", "text": "冒险关卡困难8-3" @@ -4581,7 +4581,7 @@ "id_after": 21120, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_113", "text": "冒险关卡困难8-6" @@ -4620,7 +4620,7 @@ "id_after": 21130, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_114", "text": "冒险关卡困难9-3" @@ -4659,7 +4659,7 @@ "id_after": 21140, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_115", "text": "冒险关卡困难9-6" @@ -4698,7 +4698,7 @@ "id_after": 21150, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_116", "text": "冒险关卡困难10-3" @@ -4737,7 +4737,7 @@ "id_after": 21160, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_117", "text": "冒险关卡困难10-6" @@ -4776,7 +4776,7 @@ "id_after": 21170, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_118", "text": "冒险关卡困难11-3" @@ -4815,7 +4815,7 @@ "id_after": 21180, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_119", "text": "冒险关卡困难11-6" @@ -4854,7 +4854,7 @@ "id_after": 21190, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_120", "text": "冒险关卡困难12-3" @@ -4893,7 +4893,7 @@ "id_after": 0, "group": 50, "des": 2, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_121", "text": "冒险关卡困难12-6" @@ -4929,10 +4929,10 @@ "lock": 1, "lockend": 999, "ontxe": 0, - "id_after": 500020, - "group": 500, + "id_after": 0, + "group": 510, "des": 5, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_122", "text": "商队任务1-任意1装备+3" @@ -4969,11 +4969,11 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 500010, - "id_after": 500030, - "group": 500, + "ontxe": 0, + "id_after": 0, + "group": 520, "des": 5, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_123", "text": "商队任务1-任意2装备+3" @@ -5010,11 +5010,11 @@ "opencond": "", "lock": 1, "lockend": 999, - "ontxe": 500020, + "ontxe": 0, "id_after": 0, - "group": 500, + "group": 530, "des": 5, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_124", "text": "商队任务1-任意3装备+3" @@ -5053,9 +5053,9 @@ "lockend": 999, "ontxe": 0, "id_after": 0, - "group": 510, + "group": 540, "des": 5, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_125", "text": "商队任务2-维京远征2次" @@ -5094,9 +5094,9 @@ "lockend": 999, "ontxe": 0, "id_after": 0, - "group": 520, + "group": 550, "des": 5, - "icon": "", + "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_126", "text": "商队任务3-维京远征4次" diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index a0fe54114..ea1a3a633 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -109,6 +109,8 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal mapData["bossTime"] = viking.BossTime // 更新时间 this.module.CheckRank(session.GetUserId(), req.BossId, req.Difficulty, req.Report) } + //this.module.CheckSeasonRank(session.GetUserId(), req.BossId, req.Difficulty, 1, nil, 11, true) + user := this.module.ModuleUser.GetUser(session.GetUserId()) reward = this.module.ModuleTools.GetGroupDataByLottery(vikingCfg.Drop, user.Vip, user.Lv) //reward = this.module.configure.GetDropReward(vikingCfg.Drop) // 获取掉落奖励 diff --git a/modules/viking/module.go b/modules/viking/module.go index e67dfdfa1..3aa430fbd 100644 --- a/modules/viking/module.go +++ b/modules/viking/module.go @@ -430,6 +430,7 @@ func (this *Viking) CheckSeasonRank(uid string, boosID int32, difficulty int32, conn_ *db.DBConn err error ) + bcross = this.CheckCurSeasonData() if bcross { conn_, err = db.Cross() // 获取跨服数据库对象 if err != nil { @@ -509,4 +510,28 @@ func (this *Viking) CheckSeasonRank(uid string, boosID int32, difficulty int32, this.Errorln(err) return } + + // 以下是测试 + + var ( + szRank []*pb.DBVSeasonRank + rd *redis.StringSliceCmd + conn *db.DBConn + ) + dbModel := db.NewDBModel(comm.TableVikingRank, 0, conn) + + pipe = conn.Redis.RedisPipe(context.TODO()) + rd = pipe.ZRevRange("vSeasonRank"+strconv.Itoa(int(1)), 0, comm.MaxRankList) + + if _, err := pipe.Exec(); err != nil { + this.Errorln(err) + return + } + _dataList := rd.Val() + for _, v := range _dataList { + result := &pb.DBVSeasonRank{} + if err := dbModel.Redis.HGetAll(v, result); err == nil { + szRank = append(szRank, result) + } + } }