From f8beab3a844b6bcecf31145ed4a3f7732880ece3 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 12 Apr 2023 15:38:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_dispatch_task.json | 148 +++++++++++------------ bin/json/game_global.json | 3 +- bin/json/game_lottery.json | 34 +++--- bin/json/game_model.json | 6 +- bin/json/game_pandamastj.json | 64 +++++----- bin/json/game_skillafteratk.json | 2 +- modules/comp_configure.go | 28 ++--- modules/smithy/api_forgeequip.go | 12 +- modules/smithy/api_rise.go | 6 + modules/smithy/api_stoveup.go | 1 - modules/smithy/model_stove.go | 34 +++--- sys/configure/structs/Tables.go | 7 -- sys/configure/structs/game.globalData.go | 2 + 13 files changed, 173 insertions(+), 174 deletions(-) diff --git a/bin/json/game_dispatch_task.json b/bin/json/game_dispatch_task.json index 0eb375407..175116a81 100644 --- a/bin/json/game_dispatch_task.json +++ b/bin/json/game_dispatch_task.json @@ -8,7 +8,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 102, + "tasktime": 63, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -56,7 +56,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 64, + "tasktime": 131, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -104,7 +104,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 88, + "tasktime": 64, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -152,7 +152,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 128, + "tasktime": 170, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -200,7 +200,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 135, + "tasktime": 169, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -248,7 +248,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 133, + "tasktime": 112, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -296,7 +296,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 102, + "tasktime": 89, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -344,7 +344,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 178, + "tasktime": 115, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -392,7 +392,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 123, + "tasktime": 91, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -440,7 +440,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 140, + "tasktime": 119, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -488,7 +488,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 128, + "tasktime": 71, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -536,7 +536,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 152, + "tasktime": 156, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -584,7 +584,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 110, + "tasktime": 96, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -632,7 +632,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 82, + "tasktime": 160, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -680,7 +680,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 173, + "tasktime": 175, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -728,7 +728,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 167, + "tasktime": 163, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -776,7 +776,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 95, + "tasktime": 63, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -824,7 +824,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 180, + "tasktime": 135, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -872,7 +872,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 152, + "tasktime": 60, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -920,7 +920,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 126, + "tasktime": 148, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -968,7 +968,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 93, + "tasktime": 101, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1016,7 +1016,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 93, + "tasktime": 61, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1064,7 +1064,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 145, + "tasktime": 129, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1112,7 +1112,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 129, + "tasktime": 154, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1160,7 +1160,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 141, + "tasktime": 87, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1208,7 +1208,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 96, + "tasktime": 157, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1256,7 +1256,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 159, + "tasktime": 147, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1304,7 +1304,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 106, + "tasktime": 62, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1352,7 +1352,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 83, + "tasktime": 163, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1400,7 +1400,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 133, + "tasktime": 114, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1448,7 +1448,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 167, + "tasktime": 148, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1496,7 +1496,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 118, + "tasktime": 83, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1544,7 +1544,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 159, + "tasktime": 88, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1592,7 +1592,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 94, + "tasktime": 85, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1640,7 +1640,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 152, + "tasktime": 153, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1688,7 +1688,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 138, + "tasktime": 169, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1736,7 +1736,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 154, + "tasktime": 119, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1784,7 +1784,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 162, + "tasktime": 171, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1832,7 +1832,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 113, + "tasktime": 166, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1880,7 +1880,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 107, + "tasktime": 128, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1928,7 +1928,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 172, + "tasktime": 162, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1976,7 +1976,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 171, + "tasktime": 117, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2024,7 +2024,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 121, + "tasktime": 106, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2072,7 +2072,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 120, + "tasktime": 162, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2120,7 +2120,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 137, + "tasktime": 81, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2168,7 +2168,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 116, + "tasktime": 64, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2216,7 +2216,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 145, + "tasktime": 113, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2264,7 +2264,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 101, + "tasktime": 71, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2312,7 +2312,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 117, + "tasktime": 75, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2360,7 +2360,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 102, + "tasktime": 157, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2408,7 +2408,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 62, + "tasktime": 97, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2456,7 +2456,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 75, + "tasktime": 148, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2504,7 +2504,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 67, + "tasktime": 129, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2552,7 +2552,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 140, + "tasktime": 144, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2600,7 +2600,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 174, + "tasktime": 169, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2648,7 +2648,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 110, + "tasktime": 112, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2696,7 +2696,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 72, + "tasktime": 173, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2744,7 +2744,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 167, + "tasktime": 133, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2792,7 +2792,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 95, + "tasktime": 127, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2840,7 +2840,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 86, + "tasktime": 98, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2888,7 +2888,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 163, + "tasktime": 169, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2936,7 +2936,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 117, + "tasktime": 82, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2984,7 +2984,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 139, + "tasktime": 79, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -3032,7 +3032,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 128, + "tasktime": 164, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -3080,7 +3080,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 174, + "tasktime": 95, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -3128,7 +3128,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 116, + "tasktime": 84, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -3176,7 +3176,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 115, + "tasktime": 176, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -3224,7 +3224,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 116, + "tasktime": 129, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -3272,7 +3272,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 111, + "tasktime": 141, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -3320,7 +3320,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 91, + "tasktime": 169, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -3368,7 +3368,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 80, + "tasktime": 163, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -3416,7 +3416,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 157, + "tasktime": 141, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -3464,7 +3464,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 155, + "tasktime": 156, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -3512,7 +3512,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 102, + "tasktime": 75, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 341dccbf4..078637909 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -660,6 +660,7 @@ "puzzlePromptNum": 5, "Daily_Tips": 3, "Daily_Num": 2, - "Week_Num": 2 + "Week_Num": 2, + "fitnessModelId": "25001" } ] \ No newline at end of file diff --git a/bin/json/game_lottery.json b/bin/json/game_lottery.json index d5bad4b39..a4592901a 100644 --- a/bin/json/game_lottery.json +++ b/bin/json/game_lottery.json @@ -44,7 +44,7 @@ "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, - "playerlvmax": 240, + "playerlvmax": 0, "notice": 0 }, { @@ -68,7 +68,7 @@ "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, - "playerlvmax": 240, + "playerlvmax": 0, "notice": 0 }, { @@ -92,7 +92,7 @@ "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, - "playerlvmax": 240, + "playerlvmax": 0, "notice": 0 }, { @@ -116,7 +116,7 @@ "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, - "playerlvmax": 240, + "playerlvmax": 0, "notice": 0 }, { @@ -124,10 +124,10 @@ "lotteryid": 40001001, "description": "随机蓝色英雄", "type": 0, - "groupwt": 0, - "groupid": 1001, - "subtype": 0, - "groupnum": 0, + "groupwt": 500, + "groupid": 1002, + "subtype": 2, + "groupnum": 1, "itemid": { "a": "item", "t": "132005", @@ -140,7 +140,7 @@ "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, - "playerlvmax": 240, + "playerlvmax": 0, "notice": 0 }, { @@ -149,7 +149,7 @@ "description": "随机蓝色英雄", "type": 0, "groupwt": 0, - "groupid": 1001, + "groupid": 1002, "subtype": 0, "groupnum": 0, "itemid": { @@ -164,7 +164,7 @@ "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, - "playerlvmax": 240, + "playerlvmax": 0, "notice": 0 }, { @@ -173,7 +173,7 @@ "description": "随机蓝色英雄", "type": 0, "groupwt": 0, - "groupid": 1001, + "groupid": 1002, "subtype": 0, "groupnum": 0, "itemid": { @@ -188,7 +188,7 @@ "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, - "playerlvmax": 240, + "playerlvmax": 0, "notice": 0 }, { @@ -197,7 +197,7 @@ "description": "随机蓝色英雄", "type": 0, "groupwt": 0, - "groupid": 1001, + "groupid": 1002, "subtype": 0, "groupnum": 0, "itemid": { @@ -212,7 +212,7 @@ "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, - "playerlvmax": 240, + "playerlvmax": 0, "notice": 0 }, { @@ -221,7 +221,7 @@ "description": "随机蓝色英雄", "type": 0, "groupwt": 0, - "groupid": 1001, + "groupid": 1002, "subtype": 0, "groupnum": 0, "itemid": { @@ -236,7 +236,7 @@ "VIPmin": 0, "VIPmax": 15, "playerlvmin": 0, - "playerlvmax": 240, + "playerlvmax": 0, "notice": 0 }, { diff --git a/bin/json/game_model.json b/bin/json/game_model.json index 2f68152d9..caeee1b96 100644 --- a/bin/json/game_model.json +++ b/bin/json/game_model.json @@ -2601,9 +2601,9 @@ }, { "id": "55006", - "preson": "11021", - "presonshow": "11021_exhibition", - "presonstory": "11021", + "preson": "55006", + "presonshow": "55006_exhibition", + "presonstory": "55006", "presondraw": "", "height": 1, "weight": 1, diff --git a/bin/json/game_pandamastj.json b/bin/json/game_pandamastj.json index b85c116e2..4f4c069df 100644 --- a/bin/json/game_pandamastj.json +++ b/bin/json/game_pandamastj.json @@ -102,7 +102,7 @@ }, "content_text": { "key": "tujian_6", - "text": "图鉴信息描述" + "text": "食人鱼一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "icon": "ytx_js_13002", "atlas_score": 105 @@ -120,7 +120,7 @@ }, "content_text": { "key": "tujian_7", - "text": "图鉴信息描述" + "text": "闪闪一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "icon": "ytx_js_13001", "atlas_score": 120 @@ -138,7 +138,7 @@ }, "content_text": { "key": "tujian_8", - "text": "图鉴信息描述" + "text": "蛇先生一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "icon": "ytx_js_44002", "atlas_score": 135 @@ -156,7 +156,7 @@ }, "content_text": { "key": "tujian_9", - "text": "图鉴信息描述" + "text": "金猴一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "icon": "ytx_js_24005", "atlas_score": 150 @@ -174,7 +174,7 @@ }, "content_text": { "key": "tujian_10", - "text": "图鉴信息描述" + "text": "鹤大师一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "icon": "ytx_js_14005", "atlas_score": 165 @@ -192,7 +192,7 @@ }, "content_text": { "key": "tujian_11", - "text": "图鉴信息描述" + "text": "悍娇虎一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "icon": "ytx_js_44006", "atlas_score": 180 @@ -210,7 +210,7 @@ }, "content_text": { "key": "tujian_12", - "text": "图鉴信息描述" + "text": "盖一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "icon": "ytx_js_43001", "atlas_score": 195 @@ -228,7 +228,7 @@ }, "content_text": { "key": "tujian_13", - "text": "图鉴信息描述" + "text": "希卡普一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "icon": "ytx_js_35002", "atlas_score": 210 @@ -246,7 +246,7 @@ }, "content_text": { "key": "tujian_14", - "text": "图鉴信息描述" + "text": "穿靴猫一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "icon": "ytx_js_45004", "atlas_score": 225 @@ -264,7 +264,7 @@ }, "content_text": { "key": "tujian_15", - "text": "图鉴信息描述" + "text": "师父一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "icon": "ytx_js_35001", "atlas_score": 240 @@ -282,7 +282,7 @@ }, "content_text": { "key": "tujian_16", - "text": "图鉴信息描述" + "text": "阿宝一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "icon": "ytx_js_25001", "atlas_score": 255 @@ -300,7 +300,7 @@ }, "content_text": { "key": "tujian_17", - "text": "图鉴信息描述" + "text": "乌龟大师一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "icon": "ytx_js_45001", "atlas_score": 270 @@ -318,7 +318,7 @@ }, "content_text": { "key": "tujian_18", - "text": "图鉴信息描述" + "text": "能够显著提高使用者的身体素质" }, "icon": "wg_icon_ss", "atlas_score": 285 @@ -336,7 +336,7 @@ }, "content_text": { "key": "tujian_19", - "text": "图鉴信息描述" + "text": "能够显著提高使用者的身体素质" }, "icon": "wg_icon_kz", "atlas_score": 300 @@ -354,7 +354,7 @@ }, "content_text": { "key": "tujian_20", - "text": "图鉴信息描述" + "text": "能够显著提高使用者的身体素质" }, "icon": "wg_icon_pj", "atlas_score": 315 @@ -372,7 +372,7 @@ }, "content_text": { "key": "tujian_21", - "text": "图鉴信息描述" + "text": "能够显著提高使用者的身体素质" }, "icon": "wg_icon_bdw", "atlas_score": 330 @@ -390,7 +390,7 @@ }, "content_text": { "key": "tujian_22", - "text": "图鉴信息描述" + "text": "能够显著提高使用者的身体素质" }, "icon": "wg_icon_pc", "atlas_score": 345 @@ -408,7 +408,7 @@ }, "content_text": { "key": "tujian_23", - "text": "图鉴信息描述" + "text": "能够显著提高使用者的身体素质" }, "icon": "wg_icon_tl", "atlas_score": 360 @@ -426,7 +426,7 @@ }, "content_text": { "key": "tujian_24", - "text": "图鉴信息描述" + "text": "能够显著提高使用者的身体素质" }, "icon": "wg_icon_dh", "atlas_score": 375 @@ -444,7 +444,7 @@ }, "content_text": { "key": "tujian_25", - "text": "图鉴信息描述" + "text": "能够显著提高使用者的身体素质" }, "icon": "wg_icon_tj01", "atlas_score": 390 @@ -462,7 +462,7 @@ }, "content_text": { "key": "tujian_26", - "text": "图鉴信息描述" + "text": "能够显著提高使用者的身体素质" }, "icon": "wg_icon_zl", "atlas_score": 405 @@ -480,7 +480,7 @@ }, "content_text": { "key": "tujian_27", - "text": "图鉴信息描述" + "text": "能够显著提高使用者的身体素质" }, "icon": "wg_icon_mp", "atlas_score": 420 @@ -498,7 +498,7 @@ }, "content_text": { "key": "tujian_28", - "text": "图鉴信息描述" + "text": "能够显著提高使用者的身体素质" }, "icon": "wg_icon_sjg", "atlas_score": 435 @@ -516,7 +516,7 @@ }, "content_text": { "key": "tujian_29", - "text": "图鉴信息描述" + "text": "能够显著提高使用者的身体素质" }, "icon": "wg_icon_yd", "atlas_score": 450 @@ -534,7 +534,7 @@ }, "content_text": { "key": "tujian_30", - "text": "图鉴信息描述" + "text": "能够显著提高使用者的身体素质" }, "icon": "wg_icon_hl", "atlas_score": 465 @@ -552,7 +552,7 @@ }, "content_text": { "key": "tujian_31", - "text": "图鉴信息描述" + "text": "能够显著提高使用者的身体素质" }, "icon": "wg_icon_fb", "atlas_score": 480 @@ -570,7 +570,7 @@ }, "content_text": { "key": "tujian_32", - "text": "图鉴信息描述" + "text": "能够显著提高使用者的身体素质" }, "icon": "wg_icon_mxl", "atlas_score": 495 @@ -588,7 +588,7 @@ }, "content_text": { "key": "tujian_33", - "text": "图鉴信息描述" + "text": "能够显著提高使用者的身体素质" }, "icon": "wg_icon_ct", "atlas_score": 510 @@ -606,7 +606,7 @@ }, "content_text": { "key": "tujian_34", - "text": "图鉴信息描述" + "text": "能够显著提高使用者的身体素质" }, "icon": "wg_icon_kqms", "atlas_score": 525 @@ -624,7 +624,7 @@ }, "content_text": { "key": "tujian_35", - "text": "图鉴信息描述" + "text": "能够显著提高使用者的身体素质" }, "icon": "wg_icon_ph", "atlas_score": 540 @@ -642,7 +642,7 @@ }, "content_text": { "key": "tujian_36", - "text": "图鉴信息描述" + "text": "能够显著提高使用者的身体素质" }, "icon": "wg_icon_th", "atlas_score": 555 @@ -660,7 +660,7 @@ }, "content_text": { "key": "tujian_37", - "text": "图鉴信息描述" + "text": "能够显著提高使用者的身体素质" }, "icon": "wg_icon_tj", "atlas_score": 570 diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 1c20920b7..7abfa7022 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -14002,7 +14002,7 @@ "Where": [], "Order": "", "Limit": 10, - "ExecuteCnt": 2, + "ExecuteCnt": 3, "Type": 1, "Argu": [ 1, diff --git a/modules/comp_configure.go b/modules/comp_configure.go index ef8e0315e..171ac96ea 100644 --- a/modules/comp_configure.go +++ b/modules/comp_configure.go @@ -135,16 +135,16 @@ func (this *MCompConfigure) LoadGroupData() { } // 实际掉落逻辑 (传入 掉落组ID vip等级 玩家等级 返回获得的道具) -func (this *MCompConfigure) GetGroupData(lotterId int32, vipLv int32, lv int32) (items []*cfg.Gameatn) { +func (this *MCompConfigure) GetGroupDataByLottery(lotteryId int32, vipLv int32, lv int32) (items []*cfg.Gameatn) { - if _, ok := this._lotteryType1[lotterId]; !ok { - if _, ok := this._lotteryType2[lotterId]; !ok { - fmt.Printf("not found config lotterId:%d", lotterId) + if _, ok := this._lotteryType1[lotteryId]; !ok { + if _, ok := this._lotteryType2[lotteryId]; !ok { + fmt.Printf("not found config lotterId:%d", lotteryId) return } } // 优先校验大组ID 的类型 - if this.Btype[lotterId] == 1 { // 该大组中的小组为权重掉落，必定从N个小组中随机出1个小组 + if this.Btype[lotteryId] == 1 { // 该大组中的小组为权重掉落，必定从N个小组中随机出1个小组 var ( szW []int32 // 权重数组 szID []int32 // 小组ID 数组 @@ -154,7 +154,7 @@ func (this *MCompConfigure) GetGroupData(lotterId int32, vipLv int32, lv int32) gourp = make(map[int32]int32, 0) // 随机小组id - for _, v := range this._lotteryType1[lotterId] { + for _, v := range this._lotteryType1[lotteryId] { if _data := this.GetLotterConfById(v); _data != nil { if (_data.Playerlvmax == 0 || _data.Playerlvmin <= lv && lv <= _data.Playerlvmax) && (_data.VIPmax == 0 || _data.VIPmin <= vipLv && vipLv <= _data.VIPmax) { // 过滤等级等条件 if _, ok := gourp[_data.Groupid]; !ok { @@ -168,7 +168,7 @@ func (this *MCompConfigure) GetGroupData(lotterId int32, vipLv int32, lv int32) groupID = szID[comm.GetRandW(szW)] // 获得小组ID fmt.Printf("获得小组ID :%d", groupID) - key := int64(lotterId)<<31 + int64(groupID) + key := int64(lotteryId)<<31 + int64(groupID) // 小组ID 类型判断 if this.Stype[key] == 1 { // 该小组的道具为权重掉落，必定从N个道具中随机出1个道具 for i := 0; i < int(this.SNum[key]); i++ { @@ -186,7 +186,7 @@ func (this *MCompConfigure) GetGroupData(lotterId int32, vipLv int32, lv int32) index := comm.GetRandW(szW) _data := this.GetLotterConfById(szID[index]) fmt.Printf("获得最终的道具 :%d", _data.Id) - count := comm.GetRandNum(_data.Min, _data.Max) + count := comm.GetRandNum(_data.Min, _data.Max+1) // 随机获得的数量 items = append(items, &cfg.Gameatn{ A: _data.Itemid.A, @@ -199,7 +199,7 @@ func (this *MCompConfigure) GetGroupData(lotterId int32, vipLv int32, lv int32) for _, v := range this._groupType2[key] { if _data := this.GetLotterConfById(v); _data != nil { // 权重赋值 if _data.Itemwt >= comm.GetRandNum(0, 1000) { // 命中 - count := comm.GetRandNum(_data.Min, _data.Max) + count := comm.GetRandNum(_data.Min, _data.Max+1) items = append(items, &cfg.Gameatn{ A: _data.Itemid.A, T: _data.Itemid.T, @@ -210,11 +210,11 @@ func (this *MCompConfigure) GetGroupData(lotterId int32, vipLv int32, lv int32) } return } - } else if this.Btype[lotterId] == 2 { // 该大组中的小组为概率掉落，每个小组都会随机一次是否会掉落（单位为千分比） + } else if this.Btype[lotteryId] == 2 { // 该大组中的小组为概率掉落，每个小组都会随机一次是否会掉落（单位为千分比） // 每个小组id 都随机取一次 var szGroupID []int32 // 获得的权重数组 gourp := make(map[int32]*cfg.GameLotteryData, 0) // key 小组ID value 权重 - for _, v := range this._lotteryType2[lotterId] { + for _, v := range this._lotteryType2[lotteryId] { if _data := this.GetLotterConfById(v); _data != nil { if (_data.Playerlvmax == 0 || _data.Playerlvmin <= lv && lv <= _data.Playerlvmax) && (_data.VIPmax == 0 || _data.VIPmin <= vipLv && vipLv <= _data.VIPmax) { // 过滤等级等条件 if _, ok := gourp[_data.Groupid]; !ok { @@ -227,7 +227,7 @@ func (this *MCompConfigure) GetGroupData(lotterId int32, vipLv int32, lv int32) for k, v := range gourp { if v.Itemwt >= comm.GetRandNum(0, 1000) { // 命中 szGroupID = append(szGroupID, k) - key := int64(lotterId)<<31 + int64(k) + key := int64(lotteryId)<<31 + int64(k) if this.Stype[key] == 1 { // 随机一组数据 for i := 0; i < int(this.SNum[key]); i++ { szW := make([]int32, 0) @@ -244,7 +244,7 @@ func (this *MCompConfigure) GetGroupData(lotterId int32, vipLv int32, lv int32) index := comm.GetRandW(szW) _data := this.GetLotterConfById(szID[index]) fmt.Printf("获得最终的道具 :%d", _data.Id) - count := comm.GetRandNum(_data.Min, _data.Max) + count := comm.GetRandNum(_data.Min, _data.Max+1) // 随机获得的数量 items = append(items, &cfg.Gameatn{ A: _data.Itemid.A, @@ -256,7 +256,7 @@ func (this *MCompConfigure) GetGroupData(lotterId int32, vipLv int32, lv int32) for _, v := range this._groupType2[key] { if _data := this.GetLotterConfById(v); _data != nil { // 权重赋值 if _data.Itemwt >= comm.GetRandNum(0, 1000) { // 命中 - count := comm.GetRandNum(_data.Min, _data.Max) + count := comm.GetRandNum(_data.Min, _data.Max+1) items = append(items, &cfg.Gameatn{ A: _data.Itemid.A, T: _data.Itemid.T, diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go index 9585f3b0d..f26306c76 100644 --- a/modules/smithy/api_forgeequip.go +++ b/modules/smithy/api_forgeequip.go @@ -65,12 +65,12 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq } // 校验是不是装备定制打造 if req.SuiteId != 0 { - // 检查消耗 - if code = this.module.CheckRes(session, []*cfg.Gameatn{reelcfg.CustomizedCos1}); code != pb.ErrorCode_Success { - return - } - costRes = append(costRes, reelcfg.CustomizedCos1) if req.Position == -1 { + if code = this.module.CheckRes(session, []*cfg.Gameatn{reelcfg.CustomizedCos1}); code != pb.ErrorCode_Success { + return + } + costRes = append(costRes, reelcfg.CustomizedCos1) + } else { if code = this.module.CheckRes(session, []*cfg.Gameatn{reelcfg.CustomizedCos2}); code != pb.ErrorCode_Success { return } @@ -87,7 +87,7 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq t := this.module.modelStove.CheckTemperature(req.ReelId, stove.Data[req.ReelId].Lv) needTemperatureCos = reelcfg.TemperatureCos * (1000 - t) / 1000 // 千分比 - if req.Lava > 0 { // 是否是熔岩打造 + if req.Lava > 0 { // 熔岩打造 exemption := this.module.configure.GetGlobalConf().ExemptionTemperatureCos // 预计消耗温度 gloabNum := this.module.configure.GetGlobalConf().ExemptionTemperatureCosNum if needTemperatureCos > req.Lava*gloabNum { diff --git a/modules/smithy/api_rise.go b/modules/smithy/api_rise.go index a70210449..f80aaf14b 100644 --- a/modules/smithy/api_rise.go +++ b/modules/smithy/api_rise.go @@ -53,6 +53,12 @@ func (this *apiComp) Rise(session comm.IUserSession, req *pb.SmithyRiseReq) (cod } stove.Temperature += req.Count * raise_temperatureNum update := make(map[string]interface{}, 0) + + if stove.RecoveTime != 0 && stove.Temperature >= conf.MaxTemperature { + stove.RecoveTime = 0 + update["recoveTime"] = stove.RecoveTime + } + update["temperature"] = stove.Temperature this.module.modelStove.updateSmithyStove(session.GetUserId(), update) session.SendMsg(string(this.module.GetType()), "rise", &pb.SmithyRiseResp{Data: stove}) diff --git a/modules/smithy/api_stoveup.go b/modules/smithy/api_stoveup.go index a221620c1..db8a60005 100644 --- a/modules/smithy/api_stoveup.go +++ b/modules/smithy/api_stoveup.go @@ -45,7 +45,6 @@ func (this *apiComp) StoveUp(session comm.IUserSession, req *pb.SmithyStoveUpReq update["recoveTime"] = stove.RecoveTime } - //update["temperature"] = stove.Temperature update["lv"] = stove.Lv this.module.modelStove.updateSmithyStove(session.GetUserId(), update) session.SendMsg(string(this.module.GetType()), "stoveup", &pb.SmithyStoveUpResp{Data: stove}) diff --git a/modules/smithy/model_stove.go b/modules/smithy/model_stove.go index 78e02abeb..847bceac9 100644 --- a/modules/smithy/model_stove.go +++ b/modules/smithy/model_stove.go @@ -124,25 +124,23 @@ func (this *modelStove) CheckForgeConsume(reelId int32, lv int32) (atn []*cfg.Ga // 计算恢复进度 func (this *modelStove) calculationRecoveryT(uid string, stove *pb.DBStove) { - - conf := this.module.configure.GetSmithyStoveConf(stove.Lv) - if conf == nil { - return - } - if stove.Temperature < conf.MaxTemperature { - update := make(map[string]interface{}) - // 小于最高温度就开始恢复 - addT := (configure.Now().Unix() - stove.RecoveTime) / int64(conf.TemperatureRecovery) - stove.Temperature += int32(addT) - if stove.Temperature > conf.MaxTemperature { - stove.Temperature = conf.MaxTemperature - stove.RecoveTime = 0 - } else { - stove.RecoveTime += addT * int64(conf.TemperatureRecovery) + if conf := this.module.configure.GetSmithyStoveConf(stove.Lv); conf != nil { + if stove.Temperature < conf.MaxTemperature { + // 小于最高温度就开始恢复 + if addT := (configure.Now().Unix() - stove.RecoveTime) / int64(conf.TemperatureRecovery); addT > 0 { + stove.Temperature += int32(addT) + if stove.Temperature > conf.MaxTemperature { + stove.Temperature = conf.MaxTemperature + stove.RecoveTime = 0 + } else { + stove.RecoveTime += addT * int64(conf.TemperatureRecovery) + } + update := make(map[string]interface{}) + update["temperature"] = stove.Temperature + update["recoveTime"] = stove.RecoveTime + this.module.modelStove.updateSmithyStove(uid, update) + } } - update["temperature"] = stove.Temperature - update["recoveTime"] = stove.RecoveTime - this.module.modelStove.updateSmithyStove(uid, update) } } diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index f01baa1eb..ab5138859 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -75,7 +75,6 @@ type Tables struct { HuntingOpenTime *GameHuntingOpenTime HuntingLineup *GameHuntingLineup MonsterFormat *GameMonsterFormat - Link *GameLink GetResource *GameGetResource VikingBossSkill *GameVikingBossSkill LibraryFetter *GameLibraryFetter @@ -572,12 +571,6 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.MonsterFormat, err = NewGameMonsterFormat(buf) ; err != nil { return nil, err } - if buf, err = loader("game_link") ; err != nil { - return nil, err - } - if tables.Link, err = NewGameLink(buf) ; err != nil { - return nil, err - } if buf, err = loader("game_getresource") ; err != nil { return nil, err } diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index 0aae368df..6a1fd496f 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -202,6 +202,7 @@ type GameGlobalData struct { DailyTips int32 DailyNum int32 WeekNum int32 + FitnessModelId string } const TypeId_GameGlobalData = 477542761 @@ -818,6 +819,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Daily_Tips"].(float64); !_ok_ { err = errors.New("Daily_Tips error"); return }; _v.DailyTips = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Daily_Num"].(float64); !_ok_ { err = errors.New("Daily_Num error"); return }; _v.DailyNum = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Week_Num"].(float64); !_ok_ { err = errors.New("Week_Num error"); return }; _v.WeekNum = int32(_tempNum_) } + { var _ok_ bool; if _v.FitnessModelId, _ok_ = _buf["fitnessModelId"].(string); !_ok_ { err = errors.New("fitnessModelId error"); return } } return }