From e31941c379deaf160c5d34649c78ebb3f112c47b Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 28 Apr 2023 18:37:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=AB=9E=E6=8A=80=E5=9C=BA=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E7=8E=A9=E5=AE=B6=E7=AD=89=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/arena/modelarena.go | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/arena/modelarena.go b/modules/arena/modelarena.go index 3e2073f05..fde137e05 100644 --- a/modules/arena/modelarena.go +++ b/modules/arena/modelarena.go @@ -129,6 +129,7 @@ func (this *modelArena) updateArenaUserInfo(info *pb.DBArenaUser) (err error) { "defendtotaluum": info.Defendtotaluum, "loc": []float64{float64(dan), float64(rand.Int31n(100)) / 1000.0}, "isdef": info.Isdef, + "lv": info.Lv, }) return } From dc73de7b4e27feb6840eacf6aaf18145906448fd Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Fri, 28 Apr 2023 19:13:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_arenarankreward.json | 44 ++ bin/json/game_arenarobot.json | 32 +- bin/json/game_battleready.json | 2 +- bin/json/game_bubblegroup.json | 396 ++++++++++++++++++ bin/json/game_dispatch_battle.json | 4 +- bin/json/game_dispatch_task.json | 148 +++---- bin/json/game_guildsign.json | 10 +- bin/json/game_navigation.json | 62 ++- bin/json/game_rdtaskcondi.json | 2 +- bin/json/game_rdtasknpc.json | 14 + .../structs/Game.ArenaRankRewardData.go | 2 + 11 files changed, 601 insertions(+), 115 deletions(-) diff --git a/bin/json/game_arenarankreward.json b/bin/json/game_arenarankreward.json index a882ee69b..475d7b389 100644 --- a/bin/json/game_arenarankreward.json +++ b/bin/json/game_arenarankreward.json @@ -3,6 +3,10 @@ "id": 1, "rank_low": 1, "rank_up": 2, + "rank_display": { + "key": "arena_rank_reward_rank_display1", + "text": "1-1名" + }, "rank_reward": [ { "a": "attr", @@ -20,6 +24,10 @@ "id": 2, "rank_low": 2, "rank_up": 3, + "rank_display": { + "key": "arena_rank_reward_rank_display2", + "text": "2-2名" + }, "rank_reward": [ { "a": "attr", @@ -37,6 +45,10 @@ "id": 3, "rank_low": 3, "rank_up": 4, + "rank_display": { + "key": "arena_rank_reward_rank_display3", + "text": "3-3名" + }, "rank_reward": [ { "a": "attr", @@ -54,6 +66,10 @@ "id": 4, "rank_low": 4, "rank_up": 11, + "rank_display": { + "key": "arena_rank_reward_rank_display4", + "text": "4-10名" + }, "rank_reward": [ { "a": "attr", @@ -71,6 +87,10 @@ "id": 5, "rank_low": 11, "rank_up": 21, + "rank_display": { + "key": "arena_rank_reward_rank_display5", + "text": "11-20名" + }, "rank_reward": [ { "a": "attr", @@ -88,6 +108,10 @@ "id": 6, "rank_low": 21, "rank_up": 51, + "rank_display": { + "key": "arena_rank_reward_rank_display6", + "text": "21-50名" + }, "rank_reward": [ { "a": "attr", @@ -105,6 +129,10 @@ "id": 7, "rank_low": 51, "rank_up": 101, + "rank_display": { + "key": "arena_rank_reward_rank_display7", + "text": "51-100名" + }, "rank_reward": [ { "a": "attr", @@ -122,6 +150,10 @@ "id": 8, "rank_low": 101, "rank_up": 201, + "rank_display": { + "key": "arena_rank_reward_rank_display8", + "text": "101-200名" + }, "rank_reward": [ { "a": "attr", @@ -139,6 +171,10 @@ "id": 9, "rank_low": 201, "rank_up": 501, + "rank_display": { + "key": "arena_rank_reward_rank_display9", + "text": "201-500名" + }, "rank_reward": [ { "a": "attr", @@ -156,6 +192,10 @@ "id": 10, "rank_low": 501, "rank_up": 1001, + "rank_display": { + "key": "arena_rank_reward_rank_display10", + "text": "501-1000名" + }, "rank_reward": [ { "a": "attr", @@ -173,6 +213,10 @@ "id": 11, "rank_low": 1001, "rank_up": 100000000, + "rank_display": { + "key": "arena_rank_reward_rank_display11", + "text": "1000+" + }, "rank_reward": [ { "a": "attr", diff --git a/bin/json/game_arenarobot.json b/bin/json/game_arenarobot.json index 639ef60e9..65c88e0f0 100644 --- a/bin/json/game_arenarobot.json +++ b/bin/json/game_arenarobot.json @@ -2,97 +2,97 @@ { "id": 1, "lv_id": 1, - "monsterformat_id": 301011, + "monsterformat_id": 101011, "weight": 1000 }, { "id": 2, "lv_id": 1, - "monsterformat_id": 301012, + "monsterformat_id": 101021, "weight": 1000 }, { "id": 3, "lv_id": 2, - "monsterformat_id": 301013, + "monsterformat_id": 101031, "weight": 1000 }, { "id": 4, "lv_id": 2, - "monsterformat_id": 301014, + "monsterformat_id": 101032, "weight": 1000 }, { "id": 5, "lv_id": 3, - "monsterformat_id": 301015, + "monsterformat_id": 101041, "weight": 1000 }, { "id": 6, "lv_id": 3, - "monsterformat_id": 301016, + "monsterformat_id": 101042, "weight": 1000 }, { "id": 7, "lv_id": 4, - "monsterformat_id": 301017, + "monsterformat_id": 101051, "weight": 1000 }, { "id": 8, "lv_id": 4, - "monsterformat_id": 301018, + "monsterformat_id": 101052, "weight": 1000 }, { "id": 9, "lv_id": 5, - "monsterformat_id": 301019, + "monsterformat_id": 101061, "weight": 1000 }, { "id": 10, "lv_id": 5, - "monsterformat_id": 301020, + "monsterformat_id": 101062, "weight": 1000 }, { "id": 11, "lv_id": 6, - "monsterformat_id": 301021, + "monsterformat_id": 101071, "weight": 1000 }, { "id": 12, "lv_id": 6, - "monsterformat_id": 301022, + "monsterformat_id": 101072, "weight": 1000 }, { "id": 13, "lv_id": 7, - "monsterformat_id": 301023, + "monsterformat_id": 101081, "weight": 1000 }, { "id": 14, "lv_id": 7, - "monsterformat_id": 301024, + "monsterformat_id": 101082, "weight": 1000 }, { "id": 15, "lv_id": 8, - "monsterformat_id": 301025, + "monsterformat_id": 101091, "weight": 1000 }, { "id": 16, "lv_id": 8, - "monsterformat_id": 301026, + "monsterformat_id": 101092, "weight": 1000 } ] \ No newline at end of file diff --git a/bin/json/game_battleready.json b/bin/json/game_battleready.json index 4afd72006..23d22bdec 100644 --- a/bin/json/game_battleready.json +++ b/bin/json/game_battleready.json @@ -12,7 +12,7 @@ "DisableHero": [], "LockSlots": [], "AssistTeam": 0, - "CanFriendHelp": 1, + "CanFriendHelp": 0, "Numrounds": 0 }, { diff --git a/bin/json/game_bubblegroup.json b/bin/json/game_bubblegroup.json index c095fb63c..7b9a404ef 100644 --- a/bin/json/game_bubblegroup.json +++ b/bin/json/game_bubblegroup.json @@ -334,5 +334,401 @@ "key": "bubblegroup_28", "text": "没错就是这样" } + }, + { + "KeyId": 29, + "GroupID": 43007, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_29", + "text": "希卡普真应该来看看我打造的艺术品。" + } + }, + { + "KeyId": 30, + "GroupID": 43007, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_30", + "text": "我都忍不住要举杯高歌了。" + } + }, + { + "KeyId": 31, + "GroupID": 43007, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_31", + "text": "祝你旅途愉快。" + } + }, + { + "KeyId": 32, + "GroupID": 35001, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_32", + "text": "知己知彼，百战百胜。" + } + }, + { + "KeyId": 33, + "GroupID": 35001, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_33", + "text": "内心平静，内心平静。" + } + }, + { + "KeyId": 34, + "GroupID": 35001, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_34", + "text": "每个大侠都要有自己的领悟。" + } + }, + { + "KeyId": 35, + "GroupID": 25001, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_35", + "text": "嘿...哈...嘿...哈" + } + }, + { + "KeyId": 36, + "GroupID": 25001, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_36", + "text": "准备好和神龙大侠进行每日一练了吗？" + } + }, + { + "KeyId": 37, + "GroupID": 25001, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_37", + "text": "练过之后是不是觉得全身舒畅！" + } + }, + { + "KeyId": 38, + "GroupID": 35006, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_38", + "text": "豆包...阳春面...这些都是阿宝爱吃的......" + } + }, + { + "KeyId": 39, + "GroupID": 35006, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_39", + "text": "你什么都可以吃，就是不能吃萝卜。" + } + }, + { + "KeyId": 40, + "GroupID": 35006, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_40", + "text": "也不知道阿宝现在在做什么......" + } + }, + { + "KeyId": 41, + "GroupID": 25004, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_41", + "text": "舞动秀发，跟我一起嗨！" + } + }, + { + "KeyId": 42, + "GroupID": 25004, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_42", + "text": "我会把快乐传递给所有的植物，啦啦啦。" + } + }, + { + "KeyId": 43, + "GroupID": 25004, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_43", + "text": "哇，它好像又长高了！" + } + }, + { + "KeyId": 44, + "GroupID": 34007, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_44", + "text": "史莱克，你什么时候才会回来......" + } + }, + { + "KeyId": 45, + "GroupID": 34007, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_45", + "text": "魔药的配方？想按什么比例配都可以。" + } + }, + { + "KeyId": 46, + "GroupID": 34007, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_46", + "text": "我只想和我嫁的怪物一起幸福的生活。" + } + }, + { + "KeyId": 47, + "GroupID": 34001, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_47", + "text": "好想念泥巴蚯蚓酱、姜饼人纽扣糖霜......" + } + }, + { + "KeyId": 48, + "GroupID": 34001, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_48", + "text": "狩猎的东西都准备好了，快出发吧！" + } + }, + { + "KeyId": 49, + "GroupID": 34001, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_49", + "text": "我亲爱的火龙还好吗？" + } + }, + { + "KeyId": 50, + "GroupID": 35002, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_50", + "text": "嘿，想像我一样成为真正的龙骑士么？" + } + }, + { + "KeyId": 51, + "GroupID": 35002, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_51", + "text": "尽情享受在空中飞行的快乐吧！" + } + }, + { + "KeyId": 52, + "GroupID": 35002, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_52", + "text": "龙是我们维京人最忠诚的伙伴。" + } + }, + { + "KeyId": 53, + "GroupID": 24009, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_53", + "text": "和我击掌，我才会告诉你正确的路。" + } + }, + { + "KeyId": 54, + "GroupID": 24009, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_54", + "text": "三明治、火腿是你最后的午餐，哈哈哈！" + } + }, + { + "KeyId": 55, + "GroupID": 24009, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_55", + "text": "好了好了，我们拥抱一下吧。" + } + }, + { + "KeyId": 56, + "GroupID": 53001, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_56", + "text": "我是世界上最厉害的捕龙猎手。" + } + }, + { + "KeyId": 57, + "GroupID": 53001, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_57", + "text": "谢谢你保护我，现在轮到我保护你了。" + } + }, + { + "KeyId": 58, + "GroupID": 53001, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_58", + "text": "希卡普驯龙果然有一套。" + } + }, + { + "KeyId": 59, + "GroupID": 14001, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_59", + "text": "今天要做个了断，不计代价！" + } + }, + { + "KeyId": 60, + "GroupID": 14001, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_60", + "text": "茫茫大海中，不畏巨浪，欢乐的驾驭。" + } + }, + { + "KeyId": 61, + "GroupID": 14001, + "Type": 1, + "TaskIDMin": 0, + "TaskIDMax": 0, + "weight": 10, + "Text_Bubble": { + "key": "bubblegroup_61", + "text": "希卡普，我的儿子，我为你骄傲！" + } } ] \ No newline at end of file diff --git a/bin/json/game_dispatch_battle.json b/bin/json/game_dispatch_battle.json index 394747784..7d2722cc7 100644 --- a/bin/json/game_dispatch_battle.json +++ b/bin/json/game_dispatch_battle.json @@ -1,7 +1,7 @@ [ { "id": 1, - "model": "51004", + "model": "NPC/kungfu/kungfu_51004", "idleAni": "kungfu_pavilion_action_1_act", "weight": 1000, "startstory": 4001, @@ -45,7 +45,7 @@ }, { "id": 2, - "model": "51005", + "model": "NPC/kungfu/kungfu_51005", "idleAni": "kungfu_pavilion_action_2_act", "weight": 1000, "startstory": 4001, diff --git a/bin/json/game_dispatch_task.json b/bin/json/game_dispatch_task.json index 1add57303..eea76c28d 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": 93, + "tasktime": 125, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -56,7 +56,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 174, + "tasktime": 141, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -104,7 +104,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 60, + "tasktime": 110, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -152,7 +152,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 96, + "tasktime": 176, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -200,7 +200,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 90, + "tasktime": 66, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -248,7 +248,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 83, + "tasktime": 129, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -296,7 +296,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 128, + "tasktime": 64, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -344,7 +344,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 68, + "tasktime": 136, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -392,7 +392,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 155, + "tasktime": 126, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -440,7 +440,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 100, + "tasktime": 164, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -488,7 +488,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 77, + "tasktime": 145, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -536,7 +536,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 158, + "tasktime": 116, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -584,7 +584,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 130, + "tasktime": 153, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -632,7 +632,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 158, + "tasktime": 89, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -680,7 +680,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 173, + "tasktime": 120, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -728,7 +728,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 130, + "tasktime": 87, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -776,7 +776,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 156, + "tasktime": 99, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -824,7 +824,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 116, + "tasktime": 77, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -872,7 +872,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 100, + "tasktime": 80, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -920,7 +920,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 109, + "tasktime": 92, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -968,7 +968,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 101, + "tasktime": 75, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1016,7 +1016,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 108, + "tasktime": 91, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1064,7 +1064,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 85, + "tasktime": 74, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1112,7 +1112,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 120, + "tasktime": 93, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1160,7 +1160,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 167, + "tasktime": 147, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1208,7 +1208,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 96, + "tasktime": 132, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1256,7 +1256,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 62, + "tasktime": 74, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1304,7 +1304,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 90, + "tasktime": 63, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1352,7 +1352,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 158, + "tasktime": 118, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1400,7 +1400,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 67, + "tasktime": 83, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1448,7 +1448,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 93, + "tasktime": 164, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1496,7 +1496,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 87, + "tasktime": 139, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1544,7 +1544,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 112, + "tasktime": 107, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1592,7 +1592,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 89, + "tasktime": 160, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1640,7 +1640,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 171, + "tasktime": 73, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1688,7 +1688,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 126, + "tasktime": 111, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1736,7 +1736,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 155, + "tasktime": 154, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1784,7 +1784,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 148, + "tasktime": 150, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1832,7 +1832,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 174, + "tasktime": 134, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1880,7 +1880,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 97, + "tasktime": 150, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1928,7 +1928,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 121, + "tasktime": 99, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1976,7 +1976,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 103, + "tasktime": 72, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2024,7 +2024,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 155, + "tasktime": 106, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2072,7 +2072,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 73, + "tasktime": 165, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2120,7 +2120,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 180, + "tasktime": 95, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2168,7 +2168,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 168, + "tasktime": 175, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2216,7 +2216,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 146, + "tasktime": 168, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2264,7 +2264,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 86, + "tasktime": 83, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2312,7 +2312,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 126, + "tasktime": 122, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2360,7 +2360,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 103, + "tasktime": 168, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2408,7 +2408,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 73, + "tasktime": 171, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2456,7 +2456,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 99, + "tasktime": 174, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2504,7 +2504,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 121, + "tasktime": 78, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2552,7 +2552,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 172, + "tasktime": 94, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2600,7 +2600,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 146, + "tasktime": 62, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2648,7 +2648,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 173, + "tasktime": 152, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2696,7 +2696,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 173, + "tasktime": 146, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2744,7 +2744,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 160, + "tasktime": 128, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2792,7 +2792,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 99, + "tasktime": 165, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2840,7 +2840,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 139, + "tasktime": 140, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2888,7 +2888,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 81, + "tasktime": 124, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2936,7 +2936,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 173, + "tasktime": 63, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2984,7 +2984,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 135, + "tasktime": 121, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -3032,7 +3032,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 128, + "tasktime": 120, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -3080,7 +3080,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 84, + "tasktime": 73, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -3128,7 +3128,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 94, + "tasktime": 146, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -3176,7 +3176,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 96, + "tasktime": 126, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -3224,7 +3224,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 68, + "tasktime": 111, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -3272,7 +3272,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 161, + "tasktime": 163, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -3320,7 +3320,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 151, + "tasktime": 166, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -3368,7 +3368,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 177, + "tasktime": 80, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -3416,7 +3416,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 169, + "tasktime": 119, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -3464,7 +3464,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 104, + "tasktime": 78, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -3512,7 +3512,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 123, + "tasktime": 159, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" diff --git a/bin/json/game_guildsign.json b/bin/json/game_guildsign.json index bf82f0713..0756a38f2 100644 --- a/bin/json/game_guildsign.json +++ b/bin/json/game_guildsign.json @@ -2,7 +2,7 @@ { "id": 1, "down": 0, - "up": 4, + "up": 5, "SignIn_text": { "key": "signin1", "text": "昨日0人签到" @@ -28,7 +28,7 @@ { "id": 2, "down": 5, - "up": 9, + "up": 10, "SignIn_text": { "key": "signin2", "text": "昨日5人签到" @@ -54,7 +54,7 @@ { "id": 3, "down": 10, - "up": 14, + "up": 15, "SignIn_text": { "key": "signin3", "text": "昨日10人签到" @@ -80,7 +80,7 @@ { "id": 4, "down": 15, - "up": 19, + "up": 20, "SignIn_text": { "key": "signin4", "text": "昨日15人签到" @@ -106,7 +106,7 @@ { "id": 5, "down": 20, - "up": 99, + "up": 100, "SignIn_text": { "key": "signin5", "text": "昨日20人签到" diff --git a/bin/json/game_navigation.json b/bin/json/game_navigation.json index d68dd2c0e..b8d354898 100644 --- a/bin/json/game_navigation.json +++ b/bin/json/game_navigation.json @@ -6,7 +6,7 @@ "key": "navigationscenename_1", "text": "中轴城" }, - "sceneicon": "ty_qp_gh", + "sceneicon": "ty_qp_my01", "functionname": { "key": "navigation_functionname_2", "text": "商人" @@ -21,7 +21,7 @@ "key": "navigationscenename_1", "text": "中轴城" }, - "sceneicon": "ty_qp_gh", + "sceneicon": "ty_qp_my01", "functionname": { "key": "navigation_functionname_4", "text": "公告" @@ -36,7 +36,7 @@ "key": "navigationscenename_1", "text": "中轴城" }, - "sceneicon": "ty_qp_gh", + "sceneicon": "ty_qp_my01", "functionname": { "key": "navigation_functionname_5", "text": "邮件" @@ -51,7 +51,7 @@ "key": "navigationscenename_1", "text": "中轴城" }, - "sceneicon": "ty_qp_gh", + "sceneicon": "ty_qp_my01", "functionname": { "key": "navigation_functionname_8", "text": "捕羊大赛" @@ -66,7 +66,7 @@ "key": "navigationscenename_1", "text": "中轴城" }, - "sceneicon": "ty_qp_gh", + "sceneicon": "ty_qp_my01", "functionname": { "key": "navigation_functionname_13", "text": "签到" @@ -81,7 +81,7 @@ "key": "navigationscenename_1", "text": "中轴城" }, - "sceneicon": "ty_qp_gh", + "sceneicon": "ty_qp_my01", "functionname": { "key": "navigation_functionname_14", "text": "魔药" @@ -96,7 +96,7 @@ "key": "navigationscenename_1", "text": "中轴城" }, - "sceneicon": "ty_qp_gh", + "sceneicon": "ty_qp_my01", "functionname": { "key": "navigation_functionname_15", "text": "烹饪" @@ -105,13 +105,13 @@ "functionicon": "ty_qp_pr" }, { - "Id": 15, + "Id": 8, "scene": "GameMain", "scenename": { "key": "navigationscenename_1", "text": "中轴城" }, - "sceneicon": "ty_qp_gh", + "sceneicon": "ty_qp_my01", "functionname": { "key": "navigation_functionname_26", "text": "指挥部" @@ -120,7 +120,37 @@ "functionicon": "ty_qp_zhb" }, { - "Id": 8, + "Id": 9, + "scene": "GameMain", + "scenename": { + "key": "navigationscenename_1", + "text": "中轴城" + }, + "sceneicon": "ty_qp_my01", + "functionname": { + "key": "navigation_functionname_27", + "text": "竞技场" + }, + "npcName": "功能入口-竞技场", + "functionicon": "ty_qp_jjc" + }, + { + "Id": 10, + "scene": "GameMain", + "scenename": { + "key": "navigationscenename_1", + "text": "中轴城" + }, + "sceneicon": "ty_qp_my01", + "functionname": { + "key": "navigation_functionname_28", + "text": "工会" + }, + "npcName": "功能入口-工会申请", + "functionicon": "ty_qp_gh" + }, + { + "Id": 11, "scene": "SmithyScene", "scenename": { "key": "navigationscenename_2", @@ -135,7 +165,7 @@ "functionicon": "ty_qp_zm" }, { - "Id": 9, + "Id": 12, "scene": "SmithyScene", "scenename": { "key": "navigationscenename_2", @@ -150,7 +180,7 @@ "functionicon": "ty_qp_wdj" }, { - "Id": 10, + "Id": 13, "scene": "SmithyScene", "scenename": { "key": "navigationscenename_2", @@ -165,7 +195,7 @@ "functionicon": "ty_qp_sj" }, { - "Id": 11, + "Id": 14, "scene": "WuGuanScene", "scenename": { "key": "navigationscenename_3", @@ -180,7 +210,7 @@ "functionicon": "ty_qp_jx" }, { - "Id": 12, + "Id": 15, "scene": "WuGuanScene", "scenename": { "key": "navigationscenename_3", @@ -195,7 +225,7 @@ "functionicon": "ty_qp_mryj" }, { - "Id": 13, + "Id": 16, "scene": "WuGuanScene", "scenename": { "key": "navigationscenename_3", @@ -210,7 +240,7 @@ "functionicon": "ty_qp_gsb" }, { - "Id": 14, + "Id": 17, "scene": "WuGuanScene", "scenename": { "key": "navigationscenename_3", diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json index 88ce8a5cf..fa0923d34 100644 --- a/bin/json/game_rdtaskcondi.json +++ b/bin/json/game_rdtaskcondi.json @@ -1736,7 +1736,7 @@ }, "type": 70, "valid": 0, - "NPC": 10120, + "NPC": 10121, "data1": 1, "data2": 102, "data3": 0, diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index 99a3eedb3..ad95a6560 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -363,6 +363,20 @@ ], "goto": 0 }, + { + "id": 10121, + "heroid": 25001, + "datas": [ + "GameMain", + "20020_熊猫_2", + "901" + ], + "event": [ + 2, + 642 + ], + "goto": 0 + }, { "id": 10130, "heroid": 25001, diff --git a/sys/configure/structs/Game.ArenaRankRewardData.go b/sys/configure/structs/Game.ArenaRankRewardData.go index 4b4e33283..780dcd7aa 100644 --- a/sys/configure/structs/Game.ArenaRankRewardData.go +++ b/sys/configure/structs/Game.ArenaRankRewardData.go @@ -14,6 +14,7 @@ type GameArenaRankRewardData struct { Id int32 RankLow int32 RankUp int32 + RankDisplay string RankReward []*Gameatn } @@ -27,6 +28,7 @@ func (_v *GameArenaRankRewardData)Deserialize(_buf map[string]interface{}) (err { 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["rank_low"].(float64); !_ok_ { err = errors.New("rank_low error"); return }; _v.RankLow = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rank_up"].(float64); !_ok_ { err = errors.New("rank_up error"); return }; _v.RankUp = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["rank_display"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.RankDisplay error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.RankDisplay, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _arr_ []interface{} var _ok_ bool