From 3cce3dfb049a40922159b904608317481bbd1cd5 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Wed, 19 Apr 2023 20:20:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_camplv.json | 774 +++++++++++++++++- bin/json/game_coin.json | 70 +- bin/json/game_dispatch_task.json | 146 ++-- bin/json/game_favorability.json | 730 ++++++----------- bin/json/game_friends.json | 30 +- bin/json/game_global.json | 4 +- bin/json/game_gm.json | 10 + bin/json/game_item.json | 8 +- bin/json/game_msgdistrib.json | 6 + bin/json/game_opencond.json | 12 +- bin/json/game_pandamasjx.json | 64 +- bin/json/game_pandamasmryl.json | 48 +- bin/json/game_skillafteratk.json | 18 +- bin/json/game_skillbuff.json | 157 +++- bin/json/game_skillpassive.json | 2 +- modules/parkour/api_changemts.go | 47 +- modules/parkour/api_invite.go | 4 +- modules/parkour/api_invitehandle.go | 7 +- modules/parkour/module.go | 12 +- .../structs/Game.FavorabilityData.go | 23 +- sys/configure/structs/Game.FriendsData.go | 4 +- sys/configure/structs/game.coinData.go | 2 +- sys/configure/structs/game.globalData.go | 4 + sys/configure/structs/game.skillBuffData.go | 2 + 24 files changed, 1457 insertions(+), 727 deletions(-) diff --git a/bin/json/game_camplv.json b/bin/json/game_camplv.json index 632ff25d0..b7178514d 100644 --- a/bin/json/game_camplv.json +++ b/bin/json/game_camplv.json @@ -1,9 +1,9 @@ [ { "id": 1, - "reputation_lv": 1, + "reputation_lv": 0, "raceType": 1, - "reputation_exp": 20, + "reputation_exp": 0, "Reward": { "a": "attr", "t": "talent1", @@ -12,6 +12,17 @@ }, { "id": 2, + "reputation_lv": 1, + "raceType": 1, + "reputation_exp": 20, + "Reward": { + "a": "attr", + "t": "talent1", + "n": 1 + } + }, + { + "id": 3, "reputation_lv": 2, "raceType": 1, "reputation_exp": 30, @@ -22,7 +33,7 @@ } }, { - "id": 3, + "id": 4, "reputation_lv": 3, "raceType": 1, "reputation_exp": 40, @@ -33,7 +44,7 @@ } }, { - "id": 4, + "id": 5, "reputation_lv": 4, "raceType": 1, "reputation_exp": 50, @@ -44,7 +55,7 @@ } }, { - "id": 5, + "id": 6, "reputation_lv": 5, "raceType": 1, "reputation_exp": 60, @@ -55,7 +66,7 @@ } }, { - "id": 6, + "id": 7, "reputation_lv": 6, "raceType": 1, "reputation_exp": 70, @@ -66,7 +77,7 @@ } }, { - "id": 7, + "id": 8, "reputation_lv": 7, "raceType": 1, "reputation_exp": 80, @@ -77,10 +88,10 @@ } }, { - "id": 8, - "reputation_lv": 1, - "raceType": 2, - "reputation_exp": 10, + "id": 9, + "reputation_lv": 8, + "raceType": 1, + "reputation_exp": 90, "Reward": { "a": "attr", "t": "talent2", @@ -88,8 +99,151 @@ } }, { - "id": 9, - "reputation_lv": 2, + "id": 10, + "reputation_lv": 9, + "raceType": 1, + "reputation_exp": 100, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 11, + "reputation_lv": 10, + "raceType": 1, + "reputation_exp": 110, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 12, + "reputation_lv": 11, + "raceType": 1, + "reputation_exp": 120, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 13, + "reputation_lv": 12, + "raceType": 1, + "reputation_exp": 130, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 14, + "reputation_lv": 13, + "raceType": 1, + "reputation_exp": 140, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 15, + "reputation_lv": 14, + "raceType": 1, + "reputation_exp": 150, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 16, + "reputation_lv": 15, + "raceType": 1, + "reputation_exp": 160, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 17, + "reputation_lv": 16, + "raceType": 1, + "reputation_exp": 170, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 18, + "reputation_lv": 17, + "raceType": 1, + "reputation_exp": 180, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 19, + "reputation_lv": 18, + "raceType": 1, + "reputation_exp": 190, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 20, + "reputation_lv": 19, + "raceType": 1, + "reputation_exp": 200, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 21, + "reputation_lv": 20, + "raceType": 1, + "reputation_exp": 210, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 22, + "reputation_lv": 0, + "raceType": 2, + "reputation_exp": 0, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 23, + "reputation_lv": 1, "raceType": 2, "reputation_exp": 20, "Reward": { @@ -99,8 +253,8 @@ } }, { - "id": 10, - "reputation_lv": 3, + "id": 24, + "reputation_lv": 2, "raceType": 2, "reputation_exp": 30, "Reward": { @@ -110,8 +264,8 @@ } }, { - "id": 11, - "reputation_lv": 4, + "id": 25, + "reputation_lv": 3, "raceType": 2, "reputation_exp": 40, "Reward": { @@ -121,8 +275,8 @@ } }, { - "id": 12, - "reputation_lv": 5, + "id": 26, + "reputation_lv": 4, "raceType": 2, "reputation_exp": 50, "Reward": { @@ -132,8 +286,8 @@ } }, { - "id": 13, - "reputation_lv": 6, + "id": 27, + "reputation_lv": 5, "raceType": 2, "reputation_exp": 60, "Reward": { @@ -143,8 +297,8 @@ } }, { - "id": 14, - "reputation_lv": 7, + "id": 28, + "reputation_lv": 6, "raceType": 2, "reputation_exp": 70, "Reward": { @@ -154,8 +308,8 @@ } }, { - "id": 15, - "reputation_lv": 8, + "id": 29, + "reputation_lv": 7, "raceType": 2, "reputation_exp": 80, "Reward": { @@ -165,8 +319,8 @@ } }, { - "id": 16, - "reputation_lv": 9, + "id": 30, + "reputation_lv": 8, "raceType": 2, "reputation_exp": 90, "Reward": { @@ -176,8 +330,8 @@ } }, { - "id": 17, - "reputation_lv": 10, + "id": 31, + "reputation_lv": 9, "raceType": 2, "reputation_exp": 100, "Reward": { @@ -187,8 +341,8 @@ } }, { - "id": 18, - "reputation_lv": 11, + "id": 32, + "reputation_lv": 10, "raceType": 2, "reputation_exp": 110, "Reward": { @@ -198,8 +352,8 @@ } }, { - "id": 19, - "reputation_lv": 12, + "id": 33, + "reputation_lv": 11, "raceType": 2, "reputation_exp": 120, "Reward": { @@ -209,8 +363,8 @@ } }, { - "id": 20, - "reputation_lv": 20, + "id": 34, + "reputation_lv": 12, "raceType": 2, "reputation_exp": 130, "Reward": { @@ -218,5 +372,555 @@ "t": "talent2", "n": 1 } + }, + { + "id": 35, + "reputation_lv": 13, + "raceType": 2, + "reputation_exp": 140, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 36, + "reputation_lv": 14, + "raceType": 2, + "reputation_exp": 150, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 37, + "reputation_lv": 15, + "raceType": 2, + "reputation_exp": 160, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 38, + "reputation_lv": 16, + "raceType": 2, + "reputation_exp": 170, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 39, + "reputation_lv": 17, + "raceType": 2, + "reputation_exp": 180, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 40, + "reputation_lv": 18, + "raceType": 2, + "reputation_exp": 190, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 41, + "reputation_lv": 19, + "raceType": 2, + "reputation_exp": 200, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 42, + "reputation_lv": 20, + "raceType": 2, + "reputation_exp": 210, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 43, + "reputation_lv": 0, + "raceType": 3, + "reputation_exp": 0, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 44, + "reputation_lv": 1, + "raceType": 3, + "reputation_exp": 20, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 45, + "reputation_lv": 2, + "raceType": 3, + "reputation_exp": 30, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 46, + "reputation_lv": 3, + "raceType": 3, + "reputation_exp": 40, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 47, + "reputation_lv": 4, + "raceType": 3, + "reputation_exp": 50, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 48, + "reputation_lv": 5, + "raceType": 3, + "reputation_exp": 60, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 49, + "reputation_lv": 6, + "raceType": 3, + "reputation_exp": 70, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 50, + "reputation_lv": 7, + "raceType": 3, + "reputation_exp": 80, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 51, + "reputation_lv": 8, + "raceType": 3, + "reputation_exp": 90, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 52, + "reputation_lv": 9, + "raceType": 3, + "reputation_exp": 100, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 53, + "reputation_lv": 10, + "raceType": 3, + "reputation_exp": 110, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 54, + "reputation_lv": 11, + "raceType": 3, + "reputation_exp": 120, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 55, + "reputation_lv": 12, + "raceType": 3, + "reputation_exp": 130, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 56, + "reputation_lv": 13, + "raceType": 3, + "reputation_exp": 140, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 57, + "reputation_lv": 14, + "raceType": 3, + "reputation_exp": 150, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 58, + "reputation_lv": 15, + "raceType": 3, + "reputation_exp": 160, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 59, + "reputation_lv": 16, + "raceType": 3, + "reputation_exp": 170, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 60, + "reputation_lv": 17, + "raceType": 3, + "reputation_exp": 180, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 61, + "reputation_lv": 18, + "raceType": 3, + "reputation_exp": 190, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 62, + "reputation_lv": 19, + "raceType": 3, + "reputation_exp": 200, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 63, + "reputation_lv": 20, + "raceType": 3, + "reputation_exp": 210, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 64, + "reputation_lv": 0, + "raceType": 4, + "reputation_exp": 0, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 65, + "reputation_lv": 1, + "raceType": 4, + "reputation_exp": 20, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 66, + "reputation_lv": 2, + "raceType": 4, + "reputation_exp": 30, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 67, + "reputation_lv": 3, + "raceType": 4, + "reputation_exp": 40, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 68, + "reputation_lv": 4, + "raceType": 4, + "reputation_exp": 50, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 69, + "reputation_lv": 5, + "raceType": 4, + "reputation_exp": 60, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 70, + "reputation_lv": 6, + "raceType": 4, + "reputation_exp": 70, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 71, + "reputation_lv": 7, + "raceType": 4, + "reputation_exp": 80, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 72, + "reputation_lv": 8, + "raceType": 4, + "reputation_exp": 90, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 73, + "reputation_lv": 9, + "raceType": 4, + "reputation_exp": 100, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 74, + "reputation_lv": 10, + "raceType": 4, + "reputation_exp": 110, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 75, + "reputation_lv": 11, + "raceType": 4, + "reputation_exp": 120, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 76, + "reputation_lv": 12, + "raceType": 4, + "reputation_exp": 130, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 77, + "reputation_lv": 13, + "raceType": 4, + "reputation_exp": 140, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 78, + "reputation_lv": 14, + "raceType": 4, + "reputation_exp": 150, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 79, + "reputation_lv": 15, + "raceType": 4, + "reputation_exp": 160, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 80, + "reputation_lv": 16, + "raceType": 4, + "reputation_exp": 170, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 81, + "reputation_lv": 17, + "raceType": 4, + "reputation_exp": 180, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 82, + "reputation_lv": 18, + "raceType": 4, + "reputation_exp": 190, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 83, + "reputation_lv": 19, + "raceType": 4, + "reputation_exp": 200, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } + }, + { + "id": 84, + "reputation_lv": 20, + "raceType": 4, + "reputation_exp": 210, + "Reward": { + "a": "attr", + "t": "talent2", + "n": 1 + } } ] \ No newline at end of file diff --git a/bin/json/game_coin.json b/bin/json/game_coin.json index fa92196a0..e7dfcdbb9 100644 --- a/bin/json/game_coin.json +++ b/bin/json/game_coin.json @@ -6,7 +6,10 @@ "effects": "", "access": 123, "img": "wp_icon_10035", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_gold", + "text": "可以用来购买各种道具的基础货币" + } }, { "key": "diamond", @@ -15,7 +18,10 @@ "effects": "", "access": 158, "img": "wp_icon_10036", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_diamond", + "text": "珍惜的高级货币，可以用来购买各种稀有道具" + } }, { "key": "exp", @@ -24,7 +30,10 @@ "effects": "", "access": 113, "img": "icon_hy", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_exp", + "text": "可用于提升角色等级" + } }, { "key": "friendPoint", @@ -33,7 +42,10 @@ "effects": "", "access": 115, "img": "wp_icon_10014", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_friendPoint", + "text": "好友赠送的友情点，可以用于有情商店兑换各种道具" + } }, { "key": "palyexp", @@ -42,7 +54,10 @@ "effects": "", "access": 113, "img": "wp_icon_0002", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_palyexp", + "text": "可用于提升角色等级" + } }, { "key": "guildexp", @@ -51,7 +66,10 @@ "effects": "", "access": 157, "img": "wp_icon_10024", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_guildexp", + "text": "有多种功能的基础货币" + } }, { "key": "guildactive", @@ -60,7 +78,10 @@ "effects": "", "access": 157, "img": "wp_icon_0001", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_guildactive", + "text": "有多种功能的基础货币" + } }, { "key": "guildcoin", @@ -69,7 +90,10 @@ "effects": "", "access": 157, "img": "wp_icon_10017", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_guildcoin", + "text": "有多种功能的基础货币" + } }, { "key": "starcoin", @@ -78,7 +102,10 @@ "effects": "", "access": 158, "img": "wp_icon_10017", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_starcoin", + "text": "有多种功能的基础货币" + } }, { "key": "vipexp", @@ -87,7 +114,10 @@ "effects": "", "access": 158, "img": "wp_icon_0002", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_vipexp", + "text": "有多种功能的基础货币" + } }, { "key": "arenacoin", @@ -96,7 +126,10 @@ "effects": "", "access": 156, "img": "icon_ry", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_arenacoin", + "text": "有多种功能的基础货币" + } }, { "key": "ps", @@ -105,7 +138,10 @@ "effects": "", "access": 156, "img": "wp_icon_0002", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_ps", + "text": "有多种功能的基础货币" + } }, { "key": "heroexp", @@ -114,7 +150,10 @@ "effects": "", "access": 0, "img": "wp_icon_10009", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_heroexp", + "text": "有多种功能的基础货币" + } }, { "key": "moongold", @@ -123,6 +162,9 @@ "effects": "", "access": 107, "img": "wp_icon_10009", - "intr": "Currency used to purchase goods" + "intr": { + "key": "item_coin_intr_moongold", + "text": "有多种功能的基础货币" + } } ] \ No newline at end of file diff --git a/bin/json/game_dispatch_task.json b/bin/json/game_dispatch_task.json index 724d80405..5520cd8b2 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": 140, + "tasktime": 138, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -56,7 +56,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 73, + "tasktime": 163, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -104,7 +104,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 137, + "tasktime": 164, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -152,7 +152,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 132, + "tasktime": 105, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -200,7 +200,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 126, + "tasktime": 101, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -248,7 +248,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 82, + "tasktime": 157, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -296,7 +296,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 166, + "tasktime": 138, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -344,7 +344,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 79, + "tasktime": 133, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -392,7 +392,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 124, + "tasktime": 144, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -440,7 +440,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 158, + "tasktime": 155, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -488,7 +488,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 168, + "tasktime": 127, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -536,7 +536,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 170, + "tasktime": 115, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -584,7 +584,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 83, + "tasktime": 176, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -632,7 +632,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 124, + "tasktime": 61, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -680,7 +680,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 141, + "tasktime": 80, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -728,7 +728,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 92, + "tasktime": 127, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -776,7 +776,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 128, + "tasktime": 96, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -824,7 +824,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 136, + "tasktime": 89, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -872,7 +872,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 132, + "tasktime": 145, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -920,7 +920,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 122, + "tasktime": 107, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1016,7 +1016,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 84, + "tasktime": 129, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1064,7 +1064,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 122, + "tasktime": 176, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1112,7 +1112,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 124, + "tasktime": 102, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1160,7 +1160,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 159, + "tasktime": 155, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1208,7 +1208,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 88, + "tasktime": 93, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1256,7 +1256,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 94, + "tasktime": 167, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1304,7 +1304,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 132, + "tasktime": 86, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1352,7 +1352,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 169, + "tasktime": 153, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1400,7 +1400,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 147, + "tasktime": 146, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1448,7 +1448,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 61, + "tasktime": 115, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1496,7 +1496,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 130, + "tasktime": 115, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1544,7 +1544,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 160, + "tasktime": 139, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1592,7 +1592,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 109, + "tasktime": 177, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1640,7 +1640,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 60, + "tasktime": 137, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1688,7 +1688,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 105, + "tasktime": 121, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1736,7 +1736,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 103, + "tasktime": 97, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1784,7 +1784,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 122, + "tasktime": 174, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -1832,7 +1832,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 76, + "tasktime": 63, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -1880,7 +1880,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 140, + "tasktime": 116, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -1928,7 +1928,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 89, + "tasktime": 171, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -1976,7 +1976,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 81, + "tasktime": 92, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2024,7 +2024,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 166, + "tasktime": 75, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2072,7 +2072,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 180, + "tasktime": 102, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2120,7 +2120,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 95, + "tasktime": 86, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2168,7 +2168,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 146, + "tasktime": 60, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2216,7 +2216,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 153, + "tasktime": 117, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2264,7 +2264,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 113, + "tasktime": 118, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2312,7 +2312,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 70, + "tasktime": 170, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2360,7 +2360,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 69, + "tasktime": 107, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2408,7 +2408,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 160, + "tasktime": 73, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2456,7 +2456,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 141, + "tasktime": 114, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2504,7 +2504,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 143, + "tasktime": 99, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2552,7 +2552,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 91, + "tasktime": 106, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2600,7 +2600,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 120, + "tasktime": 136, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2648,7 +2648,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 119, + "tasktime": 96, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2696,7 +2696,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 129, + "tasktime": 114, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2744,7 +2744,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 76, + "tasktime": 109, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2792,7 +2792,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 84, + "tasktime": 80, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -2840,7 +2840,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 68, + "tasktime": 172, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -2888,7 +2888,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 152, + "tasktime": 103, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -2936,7 +2936,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 129, + "tasktime": 157, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -2984,7 +2984,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 105, + "tasktime": 154, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -3032,7 +3032,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 73, + "tasktime": 82, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -3080,7 +3080,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 144, + "tasktime": 135, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -3128,7 +3128,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 124, + "tasktime": 63, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -3176,7 +3176,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 88, + "tasktime": 137, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -3224,7 +3224,7 @@ }, "icon": "xmwg_rw_pt5", "taskcd": 200, - "tasktime": 123, + "tasktime": 121, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -3272,7 +3272,7 @@ }, "icon": "xmwg_rw_pt6", "taskcd": 200, - "tasktime": 152, + "tasktime": 119, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -3320,7 +3320,7 @@ }, "icon": "xmwg_rw_pt7", "taskcd": 200, - "tasktime": 62, + "tasktime": 89, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" @@ -3368,7 +3368,7 @@ }, "icon": "xmwg_rw_pt1", "taskcd": 200, - "tasktime": 132, + "tasktime": 72, "tasktxt": { "key": "Entrustment details of Tiger", "text": "这是属于悍娇虎的专属委托" @@ -3416,7 +3416,7 @@ }, "icon": "xmwg_rw_pt2", "taskcd": 200, - "tasktime": 64, + "tasktime": 134, "tasktxt": { "key": "Entrustment details of Shifu", "text": "这是属于师父的专属委托" @@ -3464,7 +3464,7 @@ }, "icon": "xmwg_rw_pt3", "taskcd": 200, - "tasktime": 70, + "tasktime": 128, "tasktxt": { "key": "Entrustment details of Po", "text": "这是属于阿宝的专属委托" @@ -3512,7 +3512,7 @@ }, "icon": "xmwg_rw_pt4", "taskcd": 200, - "tasktime": 71, + "tasktime": 98, "tasktxt": { "key": "Entrustment details of Bobi", "text": "这是属于波比的专属委托" diff --git a/bin/json/game_favorability.json b/bin/json/game_favorability.json index 99fee7d74..07f09b7ac 100644 --- a/bin/json/game_favorability.json +++ b/bin/json/game_favorability.json @@ -1,102 +1,4 @@ [ - { - "id": 1, - "hid": "14002", - "name": { - "key": "hero_14002", - "text": "大龙" - }, - "favor_lv": 0, - "favor_exp": 100, - "lv_name": { - "key": "favorability_favorability_lv_name_0", - "text": "萍水相逢" - }, - "privilege_type": 0, - "privilege_value": 0, - "return_reward": [], - "return_txt": { - "key": "", - "text": "" - }, - "likes_food": [], - "disliking_food": [], - "likes_txt": { - "key": "favorability_favorability_likes_txt_14002", - "text": "我很喜欢，谢谢！" - }, - "ordinary_txt": { - "key": "favorability_favorability_ordinary_txt_14002", - "text": "送我的？谢谢！" - }, - "disliking_txt": { - "key": "favorability_favorabilit_disliking_txt_14002", - "text": "这味道，一言难尽......" - }, - "favorlv": [ - 1, - 3, - 5 - ], - "biography_name": [ - "140021", - "140022", - "140023" - ], - "biography_txt": [ - "140021", - "140022", - "140023" - ], - "biography_reward1": [ - { - "a": "item", - "t": "30001", - "n": 1 - } - ], - "biography_reward2": [ - { - "a": "item", - "t": "30001", - "n": 1 - } - ], - "biography_reward3": [ - { - "a": "item", - "t": "30001", - "n": 1 - } - ], - "plot_unlock": [ - 2, - 4, - 6, - 8 - ], - "startid": 300001, - "endid": [ - 3000015, - 3000017, - 3000018 - ], - "rightend": 3000014, - "stroyprize": [ - { - "a": "attr", - "t": "gold", - "n": 1000 - } - ], - "special_stroyprize": [ - { - "a": "attr", - "t": "gold", - "n": 2000 - } - ] - }, { "id": 2, "hid": "14002", @@ -108,7 +10,7 @@ "favor_exp": 200, "lv_name": { "key": "favorability_favorability_lv_name_1", - "text": "点头之交" + "text": "萍水相逢" }, "privilege_type": 0, "privilege_value": 0, @@ -117,6 +19,11 @@ "a": "item", "t": "30001", "n": 1 + }, + { + "a": "item", + "t": "30001", + "n": 2 } ], "return_txt": { @@ -143,14 +50,9 @@ 5 ], "biography_name": [ - "140021", - "140022", - "140023" - ], - "biography_txt": [ - "140021", - "140022", - "140023" + 140021, + 140022, + 140023 ], "biography_reward1": [ { @@ -216,10 +118,21 @@ }, "privilege_type": 0, "privilege_value": 0, - "return_reward": [], + "return_reward": [ + { + "a": "item", + "t": "30001", + "n": 2 + }, + { + "a": "item", + "t": "30001", + "n": 3 + } + ], "return_txt": { - "key": "", - "text": "" + "key": "favorability_favorability_return_txt", + "text": "达到好感度{0}级可领取" }, "likes_food": [], "disliking_food": [], @@ -241,14 +154,9 @@ 5 ], "biography_name": [ - "140021", - "140022", - "140023" - ], - "biography_txt": [ - "140021", - "140022", - "140023" + 140021, + 140022, + 140023 ], "biography_reward1": [ { @@ -318,7 +226,12 @@ { "a": "item", "t": "30001", - "n": 1 + "n": 3 + }, + { + "a": "item", + "t": "30001", + "n": 4 } ], "return_txt": { @@ -345,14 +258,9 @@ 5 ], "biography_name": [ - "140021", - "140022", - "140023" - ], - "biography_txt": [ - "140021", - "140022", - "140023" + 140021, + 140022, + 140023 ], "biography_reward1": [ { @@ -418,10 +326,21 @@ }, "privilege_type": 0, "privilege_value": 0, - "return_reward": [], + "return_reward": [ + { + "a": "item", + "t": "30001", + "n": 4 + }, + { + "a": "item", + "t": "30001", + "n": 5 + } + ], "return_txt": { - "key": "", - "text": "" + "key": "favorability_favorability_return_txt", + "text": "达到好感度{0}级可领取" }, "likes_food": [], "disliking_food": [], @@ -443,14 +362,9 @@ 5 ], "biography_name": [ - "140021", - "140022", - "140023" - ], - "biography_txt": [ - "140021", - "140022", - "140023" + 140021, + 140022, + 140023 ], "biography_reward1": [ { @@ -520,7 +434,12 @@ { "a": "item", "t": "30001", - "n": 1 + "n": 5 + }, + { + "a": "item", + "t": "30001", + "n": 6 } ], "return_txt": { @@ -547,14 +466,9 @@ 5 ], "biography_name": [ - "140021", - "140022", - "140023" - ], - "biography_txt": [ - "140021", - "140022", - "140023" + 140021, + 140022, + 140023 ], "biography_reward1": [ { @@ -620,10 +534,21 @@ }, "privilege_type": 0, "privilege_value": 0, - "return_reward": [], + "return_reward": [ + { + "a": "item", + "t": "30001", + "n": 6 + }, + { + "a": "item", + "t": "30001", + "n": 7 + } + ], "return_txt": { - "key": "", - "text": "" + "key": "favorability_favorability_return_txt", + "text": "达到好感度{0}级可领取" }, "likes_food": [], "disliking_food": [], @@ -645,14 +570,9 @@ 5 ], "biography_name": [ - "140021", - "140022", - "140023" - ], - "biography_txt": [ - "140021", - "140022", - "140023" + 140021, + 140022, + 140023 ], "biography_reward1": [ { @@ -722,7 +642,12 @@ { "a": "item", "t": "30001", - "n": 1 + "n": 7 + }, + { + "a": "item", + "t": "30001", + "n": 8 } ], "return_txt": { @@ -749,14 +674,9 @@ 5 ], "biography_name": [ - "140021", - "140022", - "140023" - ], - "biography_txt": [ - "140021", - "140022", - "140023" + 140021, + 140022, + 140023 ], "biography_reward1": [ { @@ -822,10 +742,21 @@ }, "privilege_type": 0, "privilege_value": 0, - "return_reward": [], + "return_reward": [ + { + "a": "item", + "t": "30001", + "n": 8 + }, + { + "a": "item", + "t": "30001", + "n": 9 + } + ], "return_txt": { - "key": "", - "text": "" + "key": "favorability_favorability_return_txt", + "text": "达到好感度{0}级可领取" }, "likes_food": [], "disliking_food": [], @@ -847,14 +778,9 @@ 5 ], "biography_name": [ - "140021", - "140022", - "140023" - ], - "biography_txt": [ - "140021", - "140022", - "140023" + 140021, + 140022, + 140023 ], "biography_reward1": [ { @@ -924,7 +850,12 @@ { "a": "item", "t": "30001", - "n": 1 + "n": 9 + }, + { + "a": "item", + "t": "30001", + "n": 10 } ], "return_txt": { @@ -951,14 +882,9 @@ 5 ], "biography_name": [ - "140021", - "140022", - "140023" - ], - "biography_txt": [ - "140021", - "140022", - "140023" + 140021, + 140022, + 140023 ], "biography_reward1": [ { @@ -1024,10 +950,21 @@ }, "privilege_type": 0, "privilege_value": 0, - "return_reward": [], + "return_reward": [ + { + "a": "item", + "t": "30001", + "n": 10 + }, + { + "a": "item", + "t": "30001", + "n": 11 + } + ], "return_txt": { - "key": "", - "text": "" + "key": "favorability_favorability_return_txt", + "text": "达到好感度{0}级可领取" }, "likes_food": [], "disliking_food": [], @@ -1049,14 +986,9 @@ 5 ], "biography_name": [ - "140021", - "140022", - "140023" - ], - "biography_txt": [ - "140021", - "140022", - "140023" + 140021, + 140022, + 140023 ], "biography_reward1": [ { @@ -1114,10 +1046,10 @@ "key": "hero_14005", "text": "鹤大师" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -1147,14 +1079,9 @@ 3 ], "biography_name": [ - "140051", - "140052", - "140053" - ], - "biography_txt": [ - "140051", - "140052", - "140053" + 140051, + 140052, + 140053 ], "biography_reward1": [ { @@ -1212,10 +1139,10 @@ "key": "hero_14006", "text": "布兰奇" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -1245,14 +1172,9 @@ 3 ], "biography_name": [ - "140061", - "140062", - "140063" - ], - "biography_txt": [ - "140061", - "140062", - "140063" + 140061, + 140062, + 140063 ], "biography_reward1": [ { @@ -1310,10 +1232,10 @@ "key": "hero_15004", "text": "小欧" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -1343,14 +1265,9 @@ 3 ], "biography_name": [ - "150041", - "150042", - "150043" - ], - "biography_txt": [ - "150041", - "150042", - "150043" + 150041, + 150042, + 150043 ], "biography_reward1": [ { @@ -1408,10 +1325,10 @@ "key": "hero_24002", "text": "牙仙" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -1441,14 +1358,9 @@ 3 ], "biography_name": [ - "240021", - "240022", - "240023" - ], - "biography_txt": [ - "240021", - "240022", - "240023" + 240021, + 240022, + 240023 ], "biography_reward1": [ { @@ -1506,10 +1418,10 @@ "key": "hero_24003", "text": "睡神沙人" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -1539,14 +1451,9 @@ 3 ], "biography_name": [ - "240031", - "240032", - "240033" - ], - "biography_txt": [ - "240031", - "240032", - "240033" + 240031, + 240032, + 240033 ], "biography_reward1": [ { @@ -1604,10 +1511,10 @@ "key": "hero_24004", "text": "邦尼兔" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -1637,14 +1544,9 @@ 3 ], "biography_name": [ - "240041", - "240042", - "240043" - ], - "biography_txt": [ - "240041", - "240042", - "240043" + 240041, + 240042, + 240043 ], "biography_reward1": [ { @@ -1702,10 +1604,10 @@ "key": "hero_24005", "text": "金猴" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -1735,14 +1637,9 @@ 3 ], "biography_name": [ - "240051", - "240052", - "240053" - ], - "biography_txt": [ - "240051", - "240052", - "240053" + 240051, + 240052, + 240053 ], "biography_reward1": [ { @@ -1800,10 +1697,10 @@ "key": "hero_24008", "text": "暴芙那特" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -1833,14 +1730,9 @@ 3 ], "biography_name": [ - "240081", - "240082", - "240083" - ], - "biography_txt": [ - "240081", - "240082", - "240083" + 240081, + 240082, + 240083 ], "biography_reward1": [ { @@ -1898,10 +1790,10 @@ "key": "hero_25001", "text": "阿宝" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -1931,14 +1823,9 @@ 3 ], "biography_name": [ - "250011", - "250012", - "250013" - ], - "biography_txt": [ - "250011", - "250012", - "250013" + 250011, + 250012, + 250013 ], "biography_reward1": [ { @@ -1996,10 +1883,10 @@ "key": "hero_25003", "text": "羊仙姑" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -2029,14 +1916,9 @@ 3 ], "biography_name": [ - "250031", - "250032", - "250033" - ], - "biography_txt": [ - "250031", - "250032", - "250033" + 250031, + 250032, + 250033 ], "biography_reward1": [ { @@ -2094,10 +1976,10 @@ "key": "hero_25004", "text": "波比" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -2127,14 +2009,9 @@ 3 ], "biography_name": [ - "250041", - "250042", - "250043" - ], - "biography_txt": [ - "250041", - "250042", - "250043" + 250041, + 250042, + 250043 ], "biography_reward1": [ { @@ -2192,10 +2069,10 @@ "key": "hero_34001", "text": "贫嘴驴" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -2225,14 +2102,9 @@ 3 ], "biography_name": [ - "340011", - "340012", - "340013" - ], - "biography_txt": [ - "340011", - "340012", - "340013" + 340011, + 340012, + 340013 ], "biography_reward1": [ { @@ -2290,10 +2162,10 @@ "key": "hero_34003", "text": "圣诞老人" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -2323,14 +2195,9 @@ 3 ], "biography_name": [ - "340031", - "340032", - "340033" - ], - "biography_txt": [ - "340031", - "340032", - "340033" + 340031, + 340032, + 340033 ], "biography_reward1": [ { @@ -2388,10 +2255,10 @@ "key": "hero_34004", "text": "瓜哥" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -2421,14 +2288,9 @@ 3 ], "biography_name": [ - "340041", - "340042", - "340043" - ], - "biography_txt": [ - "340041", - "340042", - "340043" + 340041, + 340042, + 340043 ], "biography_reward1": [ { @@ -2486,10 +2348,10 @@ "key": "hero_34006", "text": "冰霜杰克" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -2519,14 +2381,9 @@ 3 ], "biography_name": [ - "340061", - "340062", - "340063" - ], - "biography_txt": [ - "340061", - "340062", - "340063" + 340061, + 340062, + 340063 ], "biography_reward1": [ { @@ -2584,10 +2441,10 @@ "key": "hero_34008", "text": "悍夫那特" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -2617,14 +2474,9 @@ 3 ], "biography_name": [ - "340081", - "340082", - "340083" - ], - "biography_txt": [ - "340081", - "340082", - "340083" + 340081, + 340082, + 340083 ], "biography_reward1": [ { @@ -2682,10 +2534,10 @@ "key": "hero_35001", "text": "师父" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -2715,14 +2567,9 @@ 3 ], "biography_name": [ - "350011", - "350012", - "350013" - ], - "biography_txt": [ - "350011", - "350012", - "350013" + 350011, + 350012, + 350013 ], "biography_reward1": [ { @@ -2780,10 +2627,10 @@ "key": "hero_35002", "text": "希卡普" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -2813,14 +2660,9 @@ 3 ], "biography_name": [ - "350021", - "350022", - "350023" - ], - "biography_txt": [ - "350021", - "350022", - "350023" + 350021, + 350022, + 350023 ], "biography_reward1": [ { @@ -2878,10 +2720,10 @@ "key": "hero_35003", "text": "漆黑" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -2911,14 +2753,9 @@ 3 ], "biography_name": [ - "350031", - "350032", - "350033" - ], - "biography_txt": [ - "350031", - "350032", - "350033" + 350031, + 350032, + 350033 ], "biography_reward1": [ { @@ -2976,10 +2813,10 @@ "key": "hero_35004", "text": "黛安·福克斯顿" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -3009,14 +2846,9 @@ 3 ], "biography_name": [ - "350041", - "350042", - "350043" - ], - "biography_txt": [ - "350041", - "350042", - "350043" + 350041, + 350042, + 350043 ], "biography_reward1": [ { @@ -3074,10 +2906,10 @@ "key": "hero_35006", "text": "平先生" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -3107,14 +2939,9 @@ 3 ], "biography_name": [ - "350061", - "350062", - "350063" - ], - "biography_txt": [ - "350061", - "350062", - "350063" + 350061, + 350062, + 350063 ], "biography_reward1": [ { @@ -3172,10 +2999,10 @@ "key": "hero_43005", "text": "瓦希尔指挥官" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -3205,12 +3032,8 @@ 3 ], "biography_name": [ - "430051", - "430052" - ], - "biography_txt": [ - "430051", - "430052" + 430051, + 430052 ], "biography_reward1": [ { @@ -3268,10 +3091,10 @@ "key": "hero_43007", "text": "戈伯" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -3301,14 +3124,9 @@ 3 ], "biography_name": [ - "430071", - "430072", - "430073" - ], - "biography_txt": [ - "430071", - "430072", - "430073" + 430071, + 430072, + 430073 ], "biography_reward1": [ { @@ -3366,10 +3184,10 @@ "key": "hero_44006", "text": "悍娇虎" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -3399,14 +3217,9 @@ 3 ], "biography_name": [ - "440061", - "440062", - "440063" - ], - "biography_txt": [ - "440061", - "440062", - "440063" + 440061, + 440062, + 440063 ], "biography_reward1": [ { @@ -3464,10 +3277,10 @@ "key": "hero_45001", "text": "乌龟大师" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -3497,14 +3310,9 @@ 3 ], "biography_name": [ - "450011", - "450012", - "450013" - ], - "biography_txt": [ - "450011", - "450012", - "450013" + 450011, + 450012, + 450013 ], "biography_reward1": [ { @@ -3562,10 +3370,10 @@ "key": "hero_53001", "text": "埃雷特" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -3595,14 +3403,9 @@ 3 ], "biography_name": [ - "530011", - "530012", - "530013" - ], - "biography_txt": [ - "530011", - "530012", - "530013" + 530011, + 530012, + 530013 ], "biography_reward1": [ { @@ -3660,10 +3463,10 @@ "key": "hero_54005", "text": "无牙仔" }, - "favor_lv": 0, + "favor_lv": 1, "favor_exp": 100, "lv_name": { - "key": "favorability_favorability_lv_name_0", + "key": "favorability_favorability_lv_name_1", "text": "萍水相逢" }, "privilege_type": 0, @@ -3693,14 +3496,9 @@ 3 ], "biography_name": [ - "540051", - "540052", - "540053" - ], - "biography_txt": [ - "540051", - "540052", - "540053" + 540051, + 540052, + 540053 ], "biography_reward1": [ { diff --git a/bin/json/game_friends.json b/bin/json/game_friends.json index 1f3436742..f4f50d05b 100644 --- a/bin/json/game_friends.json +++ b/bin/json/game_friends.json @@ -14,7 +14,7 @@ "png": "jiban_img_zu02", "friends_lv": 1, "favorability_lv": 1, - "hid": 25001, + "hid": "25001", "attribute": [ { "a": "atkpro", @@ -41,7 +41,7 @@ "png": "jiban_img_zu02", "friends_lv": 1, "favorability_lv": 1, - "hid": 35001, + "hid": "35001", "attribute": [ { "a": "atk", @@ -68,7 +68,7 @@ "png": "jiban_img_zu02", "friends_lv": 2, "favorability_lv": 9, - "hid": 25001, + "hid": "25001", "attribute": [ { "a": "atkpro", @@ -95,7 +95,7 @@ "png": "jiban_img_zu02", "friends_lv": 2, "favorability_lv": 9, - "hid": 35001, + "hid": "35001", "attribute": [ { "a": "atk", @@ -122,7 +122,7 @@ "png": "jiban_img_zu02", "friends_lv": 3, "favorability_lv": 15, - "hid": 25001, + "hid": "25001", "attribute": [ { "a": "atkpro", @@ -149,7 +149,7 @@ "png": "jiban_img_zu02", "friends_lv": 3, "favorability_lv": 15, - "hid": 35001, + "hid": "35001", "attribute": [ { "a": "atk", @@ -176,7 +176,7 @@ "png": "jiban_img_zu02", "friends_lv": 1, "favorability_lv": 1, - "hid": 25001, + "hid": "25001", "attribute": [ { "a": "atkpro", @@ -203,7 +203,7 @@ "png": "jiban_img_zu02", "friends_lv": 1, "favorability_lv": 1, - "hid": 35001, + "hid": "35001", "attribute": [ { "a": "atk", @@ -230,7 +230,7 @@ "png": "jiban_img_zu02", "friends_lv": 1, "favorability_lv": 1, - "hid": 15004, + "hid": "15004", "attribute": [ { "a": "HP", @@ -257,7 +257,7 @@ "png": "jiban_img_zu02", "friends_lv": 2, "favorability_lv": 9, - "hid": 25001, + "hid": "25001", "attribute": [ { "a": "atkpro", @@ -284,7 +284,7 @@ "png": "jiban_img_zu02", "friends_lv": 2, "favorability_lv": 9, - "hid": 35001, + "hid": "35001", "attribute": [ { "a": "atk", @@ -311,7 +311,7 @@ "png": "jiban_img_zu02", "friends_lv": 2, "favorability_lv": 9, - "hid": 15004, + "hid": "15004", "attribute": [ { "a": "HP", @@ -338,7 +338,7 @@ "png": "jiban_img_zu02", "friends_lv": 3, "favorability_lv": 15, - "hid": 25001, + "hid": "25001", "attribute": [ { "a": "atkpro", @@ -365,7 +365,7 @@ "png": "jiban_img_zu02", "friends_lv": 3, "favorability_lv": 15, - "hid": 35001, + "hid": "35001", "attribute": [ { "a": "atk", @@ -392,7 +392,7 @@ "png": "jiban_img_zu02", "friends_lv": 3, "favorability_lv": 15, - "hid": 15004, + "hid": "15004", "attribute": [ { "a": "HP", diff --git a/bin/json/game_global.json b/bin/json/game_global.json index b810bdc20..3e9776337 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -682,6 +682,8 @@ "business_maxint": 1000, "business_bag": 20, "business_rewardday": 1, - "business_renovatething": 180 + "business_renovatething": 180, + "favorability_likes": 1500, + "favorability_dislikes": 500 } ] \ No newline at end of file diff --git a/bin/json/game_gm.json b/bin/json/game_gm.json index cec0634e2..6ca8d11d0 100644 --- a/bin/json/game_gm.json +++ b/bin/json/game_gm.json @@ -298,5 +298,15 @@ }, "data": "", "prefix": "bingo:{0}" + }, + { + "id": 31, + "type": 1, + "text": { + "key": "GM_31", + "text": "清除踢馆NPC（需刷新）" + }, + "data": "", + "prefix": "bingo:cleannpc" } ] \ No newline at end of file diff --git a/bin/json/game_item.json b/bin/json/game_item.json index c509b495d..4056f0c89 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -2158,7 +2158,7 @@ "box_id": 0, "synthetize_num": 0, "access": [ - 123 + 1128 ], "use_skip": 139, "upper_limit": -1, @@ -2188,7 +2188,7 @@ "box_id": 0, "synthetize_num": 0, "access": [ - 123 + 1128 ], "use_skip": 139, "upper_limit": -1, @@ -2218,7 +2218,7 @@ "box_id": 0, "synthetize_num": 0, "access": [ - 123 + 1128 ], "use_skip": 139, "upper_limit": -1, @@ -2248,7 +2248,7 @@ "box_id": 0, "synthetize_num": 0, "access": [ - 123 + 1128 ], "use_skip": 139, "upper_limit": -1, diff --git a/bin/json/game_msgdistrib.json b/bin/json/game_msgdistrib.json index 0cdc521cf..c9666b435 100644 --- a/bin/json/game_msgdistrib.json +++ b/bin/json/game_msgdistrib.json @@ -118,5 +118,11 @@ "open": true, "routrules": "~/worker", "describe": "好友排行" + }, + { + "msgid": "parkour", + "open": true, + "routrules": "~/worker", + "describe": "捕羊大赛" } ] \ No newline at end of file diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index 4204d2d64..394e64a95 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -235,7 +235,7 @@ "key": "opencond_prompt_trials", "text": "功能暂未开启" }, - "uiid": 0, + "uiid": 166, "activateType": 0, "notify": [] }, @@ -283,7 +283,7 @@ "key": "opencond_prompt_story", "text": "功能暂未开启" }, - "uiid": 0, + "uiid": 169, "activateType": 0, "notify": [] }, @@ -715,7 +715,7 @@ "key": "opencond_prompt_hunting", "text": "功能暂未开启" }, - "uiid": 0, + "uiid": 168, "activateType": 0, "notify": [] }, @@ -907,7 +907,7 @@ "key": "opencond_prompt_arena", "text": "功能暂未开启" }, - "uiid": 0, + "uiid": 156, "activateType": 0, "notify": [] }, @@ -1435,7 +1435,7 @@ "key": "opencond_prompt_vikingexpedition_entrance", "text": "功能暂未开启" }, - "uiid": 0, + "uiid": 167, "activateType": 0, "notify": [] }, @@ -1555,7 +1555,7 @@ "key": "opencond_prompt_Master_challenges_the_tower", "text": "功能暂未开启" }, - "uiid": 0, + "uiid": 10004, "activateType": 0, "notify": [] }, diff --git a/bin/json/game_pandamasjx.json b/bin/json/game_pandamasjx.json index ce582a162..47e193081 100644 --- a/bin/json/game_pandamasjx.json +++ b/bin/json/game_pandamasjx.json @@ -13,7 +13,7 @@ "heroid": "13002", "img": "sbkp_js_13002", "intr": { - "key": "shirenyu10001", + "key": "miaosushirenyu10001", "text": "作为教习，食人鱼一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "standard_text": 25001, @@ -47,7 +47,7 @@ "heroid": "13001", "img": "sbkp_js_13001", "intr": { - "key": "shirenyu10002", + "key": "miaosushirenyu10002", "text": "作为教习，闪闪一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "standard_text": 25001, @@ -81,7 +81,7 @@ "heroid": "44002", "img": "sbkp_js_44002", "intr": { - "key": "shirenyu10003", + "key": "miaosushirenyu10003", "text": "作为教习，蛇先生一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "standard_text": 25001, @@ -115,7 +115,7 @@ "heroid": "24005", "img": "sbkp_js_24005", "intr": { - "key": "shirenyu10004", + "key": "miaosushirenyu10004", "text": "作为教习，金猴一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "standard_text": 25001, @@ -160,7 +160,7 @@ "heroid": "14005", "img": "sbkp_js_14005", "intr": { - "key": "shirenyu10005", + "key": "miaosushirenyu10005", "text": "作为教习，鹤大师一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "standard_text": 25001, @@ -194,7 +194,7 @@ "heroid": "44006", "img": "sbkp_js_44006", "intr": { - "key": "shirenyu10006", + "key": "miaosushirenyu10006", "text": "作为教习，悍娇虎一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "standard_text": 25001, @@ -228,7 +228,7 @@ "heroid": "43001", "img": "sbkp_js_43001", "intr": { - "key": "shirenyu10007", + "key": "miaosushirenyu10007", "text": "作为教习，盖一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "standard_text": 25001, @@ -262,7 +262,7 @@ "heroid": "35002", "img": "sbkp_js_35002", "intr": { - "key": "shirenyu10008", + "key": "miaosushirenyu10008", "text": "作为教习，希卡普一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "standard_text": 25001, @@ -296,7 +296,7 @@ "heroid": "45004", "img": "sbkp_js_45004", "intr": { - "key": "shirenyu10009", + "key": "miaosushirenyu10009", "text": "作为教习，穿靴猫一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "standard_text": 25001, @@ -341,7 +341,7 @@ "heroid": "35001", "img": "sbkp_js_35001", "intr": { - "key": "shirenyu10010", + "key": "miaosushirenyu10010", "text": "作为教习，师父一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "standard_text": 25001, @@ -386,7 +386,7 @@ "heroid": "25001", "img": "sbkp_js_25001", "intr": { - "key": "shirenyu10011", + "key": "miaosushirenyu10011", "text": "作为教习，阿宝一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "standard_text": 25001, @@ -431,7 +431,7 @@ "heroid": "45001", "img": "sbkp_js_45001", "intr": { - "key": "shirenyu10012", + "key": "miaosushirenyu10012", "text": "作为教习，乌龟大师一直秉承着严厉的教习态度，在他手下训练的英雄可以获得巨大提升" }, "standard_text": 25001, @@ -476,7 +476,7 @@ "heroid": "", "img": "wg_icon_ss", "intr": { - "key": "shirenyu20001", + "key": "miaosushirenyu20001", "text": "石锁，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -521,7 +521,7 @@ "heroid": "", "img": "wg_icon_kz", "intr": { - "key": "shirenyu20002", + "key": "miaosushirenyu20002", "text": "双头空竹，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -555,7 +555,7 @@ "heroid": "", "img": "wg_icon_pj", "intr": { - "key": "shirenyu20003", + "key": "miaosushirenyu20003", "text": "木爬架，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -589,7 +589,7 @@ "heroid": "", "img": "wg_icon_bdw", "intr": { - "key": "shirenyu20004", + "key": "miaosushirenyu20004", "text": "不倒翁，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -623,7 +623,7 @@ "heroid": "", "img": "wg_icon_pc", "intr": { - "key": "shirenyu20005", + "key": "miaosushirenyu20005", "text": "棒槌，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -657,7 +657,7 @@ "heroid": "", "img": "wg_icon_tl", "intr": { - "key": "shirenyu20006", + "key": "miaosushirenyu20006", "text": "铜铃，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -691,7 +691,7 @@ "heroid": "", "img": "wg_icon_tj", "intr": { - "key": "shirenyu20007", + "key": "miaosushirenyu20007", "text": "尖刺吊环，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -725,7 +725,7 @@ "heroid": "", "img": "wg_icon_tj01", "intr": { - "key": "shirenyu20008", + "key": "miaosushirenyu20008", "text": "陀螺，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -759,7 +759,7 @@ "heroid": "", "img": "wg_icon_zl", "intr": { - "key": "shirenyu20009", + "key": "miaosushirenyu20009", "text": "大转轮，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -804,7 +804,7 @@ "heroid": "", "img": "wg_icon_mp", "intr": { - "key": "shirenyu20010", + "key": "miaosushirenyu20010", "text": "木头牌，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -849,7 +849,7 @@ "heroid": "", "img": "wg_icon_sjg", "intr": { - "key": "shirenyu20011", + "key": "miaosushirenyu20011", "text": "双节棍，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -894,7 +894,7 @@ "heroid": "", "img": "wg_icon_yd", "intr": { - "key": "shirenyu20012", + "key": "miaosushirenyu20012", "text": "练功带，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -939,7 +939,7 @@ "heroid": "", "img": "wg_icon_tj", "intr": { - "key": "shirenyu20013", + "key": "miaosushirenyu20013", "text": "七彩花棍，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -984,7 +984,7 @@ "heroid": "", "img": "wg_icon_fb", "intr": { - "key": "shirenyu20014", + "key": "miaosushirenyu20014", "text": "流星飞镖，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -1018,7 +1018,7 @@ "heroid": "", "img": "wg_icon_mxl", "intr": { - "key": "shirenyu20015", + "key": "miaosushirenyu20015", "text": "冥想锣，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -1052,7 +1052,7 @@ "heroid": "", "img": "wg_icon_ct", "intr": { - "key": "shirenyu20016", + "key": "miaosushirenyu20016", "text": "彩条龙，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -1086,7 +1086,7 @@ "heroid": "", "img": "wg_icon_kqms", "intr": { - "key": "shirenyu20017", + "key": "miaosushirenyu20017", "text": "孔雀毛扇，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -1129,7 +1129,7 @@ "heroid": "", "img": "wg_icon_ph", "intr": { - "key": "shirenyu20018", + "key": "miaosushirenyu20018", "text": "平衡木，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -1172,7 +1172,7 @@ "heroid": "", "img": "wg_icon_th", "intr": { - "key": "shirenyu20019", + "key": "miaosushirenyu20019", "text": "铁环，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, @@ -1215,7 +1215,7 @@ "heroid": "", "img": "wg_icon_tj", "intr": { - "key": "shirenyu20020", + "key": "miaosushirenyu20020", "text": "太极球，传闻是师父在训练阿宝时经常使用到的道具" }, "standard_text": 0, diff --git a/bin/json/game_pandamasmryl.json b/bin/json/game_pandamasmryl.json index c70c9a078..505123a29 100644 --- a/bin/json/game_pandamasmryl.json +++ b/bin/json/game_pandamasmryl.json @@ -5,9 +5,9 @@ "key": "wuguandongzuo_101", "text": "开合跳" }, - "icon": "wg_js_dz001", + "icon": "开合跳", "des": { - "key": "wuguandongzuo_wg_js_dz001", + "key": "wuguandongzuo_开合跳", "text": "双脚并立,双臂自然垂在身体的两侧。向上跳,双腿打开,双手举过头顶。\n再向上跳,双脚并拢,手臂放回身体两侧，重复这个动作。这项运动锻炼身体所有的大肌肉群。" }, "ticks": 3, @@ -23,9 +23,9 @@ "key": "wuguandongzuo_102", "text": "手臂环绕" }, - "icon": "wg_js_dz001", + "icon": "手臂环绕", "des": { - "key": "wuguandongzuo_wg_js_dz001", + "key": "wuguandongzuo_手臂环绕", "text": "双腿与肩同宽,双臂与肩同高平伸于身体两侧。\n然后双臂进行顺时针绕环活动,之后逆时针绕环。" }, "ticks": 3, @@ -41,9 +41,9 @@ "key": "wuguandongzuo_103", "text": "肩部拉伸" }, - "icon": "wg_js_dz001", + "icon": "开合跳", "des": { - "key": "wuguandongzuo_wg_js_dz001", + "key": "wuguandongzuo_开合跳", "text": "一只手臂放于胸前,与地面平行，另一只手臂将它拉向胸部。\n坚持一会儿，再拉伸另一侧肩膀，重复练习。" }, "ticks": 3, @@ -59,9 +59,9 @@ "key": "wuguandongzuo_104", "text": "波比" }, - "icon": "wg_js_dz001", + "icon": "手臂环绕", "des": { - "key": "wuguandongzuo_wg_js_dz001", + "key": "wuguandongzuo_手臂环绕", "text": "双脚与肩同宽，然后下蹲并双手着地,同时双腿向后蹬直。\n快速做一个俯卧撑的动作，然后起身向上跳起。重复这套动作。" }, "ticks": 3, @@ -77,9 +77,9 @@ "key": "wuguandongzuo_105", "text": "交错俯卧撑" }, - "icon": "wg_js_dz001", + "icon": "开合跳", "des": { - "key": "wuguandongzuo_wg_js_dz001", + "key": "wuguandongzuo_开合跳", "text": "从标准的俯卧撑姿势开始，但两只手一前一后。\n双臂做一个俯卧撑的动作，然后换另一只手靠前。注意身体要保持成一条直线的状态。" }, "ticks": 3, @@ -95,9 +95,9 @@ "key": "wuguandongzuo_106", "text": "钻石俯卧撑" }, - "icon": "wg_js_dz001", + "icon": "手臂环绕", "des": { - "key": "wuguandongzuo_wg_js_dz001", + "key": "wuguandongzuo_手臂环绕", "text": "四肢着地,双手的食指和拇指分别相对,放于脸颊下方。\n身体保持呈一条直线，然后做俯卧撑动作。" }, "ticks": 3, @@ -113,9 +113,9 @@ "key": "wuguandongzuo_107", "text": "掌上压后转身" }, - "icon": "wg_js_dz001", + "icon": "开合跳", "des": { - "key": "wuguandongzuo_wg_js_dz001", + "key": "wuguandongzuo_开合跳", "text": "从标准的俯卧撑姿势开始。向下做一个俯卧撑动作,起身的同时，旋转上半身，并将右臂向上伸直。\n然后换另一条手臂重复这一动作。这个动作能够锻炼你的胸部、肩膀和手臂,同时也能锻炼腹部肌肉。" }, "ticks": 3, @@ -131,9 +131,9 @@ "key": "wuguandongzuo_108", "text": "眼镜蛇式拉伸" }, - "icon": "wg_js_dz001", + "icon": "手臂环绕", "des": { - "key": "wuguandongzuo_wg_js_dz001", + "key": "wuguandongzuo_手臂环绕", "text": "腹部向下俯卧，肘部弯曲，双手放置在肩膀下方。\n然后胸部离地,尽量伸展。保持这个姿势数秒。" }, "ticks": 3, @@ -149,9 +149,9 @@ "key": "wuguandongzuo_109", "text": "胸部拉伸" }, - "icon": "wg_js_dz001", + "icon": "开合跳", "des": { - "key": "wuguandongzuo_wg_js_dz001", + "key": "wuguandongzuo_开合跳", "text": "站在门前，腿部呈弓步姿势，两臂倚在门框上，两肘略低于肩膀,胸部慢慢向前移。\n坚持30至40秒。慢慢还原姿势,手臂自然放下，再做几圈摆臂练习。" }, "ticks": 3, @@ -167,9 +167,9 @@ "key": "wuguandongzuo_110", "text": "原地跑" }, - "icon": "wg_js_dz001", + "icon": "手臂环绕", "des": { - "key": "wuguandongzuo_wg_js_dz001", + "key": "wuguandongzuo_手臂环绕", "text": "原地跑" }, "ticks": 3, @@ -185,9 +185,9 @@ "key": "wuguandongzuo_111", "text": "深蹲" }, - "icon": "wg_js_dz001", + "icon": "开合跳", "des": { - "key": "wuguandongzuo_wg_js_dz001", + "key": "wuguandongzuo_开合跳", "text": "深蹲" }, "ticks": 3, @@ -203,9 +203,9 @@ "key": "wuguandongzuo_112", "text": "仰卧起坐" }, - "icon": "wg_js_dz001", + "icon": "手臂环绕", "des": { - "key": "wuguandongzuo_wg_js_dz001", + "key": "wuguandongzuo_手臂环绕", "text": "仰卧起坐" }, "ticks": 3, diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 8d4c0aeb6..9f777ec87 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -6192,7 +6192,7 @@ { "Id": 224004311, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 1, @@ -6215,7 +6215,7 @@ { "Id": 224004312, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 1, @@ -6239,7 +6239,7 @@ { "Id": 224004313, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 1, @@ -6263,7 +6263,7 @@ { "Id": 224004321, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 1, @@ -6286,7 +6286,7 @@ { "Id": 224004331, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 1, @@ -6309,7 +6309,7 @@ { "Id": 224004341, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 1, @@ -6332,7 +6332,7 @@ { "Id": 224004351, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 1, @@ -6355,7 +6355,7 @@ { "Id": 224004361, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 1, @@ -13566,7 +13566,7 @@ { "Id": 214001112, "EmitPR": 1000, - "From": 2, + "From": 4, "Where": [], "Order": "", "Limit": 10, diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 1dced6dff..e5e119e09 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -21,6 +21,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z009", "buffeffect": "", "buffpos": "根节点" @@ -47,6 +48,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z003", "buffeffect": "", "buffpos": "根节点" @@ -73,6 +75,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z011", "buffeffect": "", "buffpos": "根节点" @@ -99,6 +102,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z006", "buffeffect": "", "buffpos": "根节点" @@ -125,6 +129,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z008", "buffeffect": "", "buffpos": "根节点" @@ -151,6 +156,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j016", "buffeffect": "", "buffpos": "根节点" @@ -177,6 +183,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j001", "buffeffect": "", "buffpos": "根节点" @@ -203,6 +210,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j006", "buffeffect": "", "buffpos": "根节点" @@ -229,6 +237,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -255,6 +264,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -281,6 +291,7 @@ "RemoveType": true, "OverlayTimes": 3, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -307,6 +318,7 @@ "RemoveType": true, "OverlayTimes": 3, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -333,6 +345,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j009", "buffeffect": "", "buffpos": "根节点" @@ -359,6 +372,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j005", "buffeffect": "", "buffpos": "根节点" @@ -383,6 +397,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z007", "buffeffect": "", "buffpos": "根节点" @@ -409,6 +424,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z002", "buffeffect": "", "buffpos": "根节点" @@ -433,6 +449,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j007", "buffeffect": "effect_debuff_yun", "buffpos": "根节点" @@ -457,8 +474,9 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j008", - "buffeffect": "effect_jiaoxia_jiaobing\u00A0", + "buffeffect": "effect_jiaoxia_jiaobing", "buffpos": "脚底" }, { @@ -481,6 +499,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j012", "buffeffect": "", "buffpos": "根节点" @@ -505,6 +524,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j015", "buffeffect": "", "buffpos": "根节点" @@ -529,6 +549,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j004", "buffeffect": "", "buffpos": "根节点" @@ -553,6 +574,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j010", "buffeffect": "", "buffpos": "根节点" @@ -577,6 +599,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z005", "buffeffect": "", "buffpos": "根节点" @@ -605,9 +628,10 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z010", "buffeffect": "effect_hudun_1", - "buffpos": "根节点" + "buffpos": "胸" }, { "Id": 390001113, @@ -629,6 +653,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -653,6 +678,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -677,6 +703,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j013", "buffeffect": "", "buffpos": "根节点" @@ -701,6 +728,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -725,6 +753,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -749,6 +778,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j014", "buffeffect": "effect_debuff_sleep", "buffpos": "根节点" @@ -773,6 +803,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_ts003", "buffeffect": "", "buffpos": "根节点" @@ -797,6 +828,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_ts004", "buffeffect": "", "buffpos": "根节点" @@ -821,6 +853,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_ts005", "buffeffect": "", "buffpos": "根节点" @@ -849,9 +882,10 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z010", - "buffeffect": "", - "buffpos": "根节点" + "buffeffect": "effect_hudun_1", + "buffpos": "胸" }, { "Id": 390001123, @@ -877,9 +911,10 @@ "RemoveType": true, "OverlayTimes": 3, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z010", - "buffeffect": "", - "buffpos": "根节点" + "buffeffect": "effect_hudun_1", + "buffpos": "胸" }, { "Id": 390001124, @@ -901,6 +936,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -929,6 +965,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z010", "buffeffect": "", "buffpos": "根节点" @@ -953,6 +990,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -977,6 +1015,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z004", "buffeffect": "effect_34002_skill_1_hit", "buffpos": "胸" @@ -1001,6 +1040,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z001", "buffeffect": "", "buffpos": "根节点" @@ -1029,9 +1069,10 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z010", - "buffeffect": "", - "buffpos": "根节点" + "buffeffect": "effect_hudun_1", + "buffpos": "胸" }, { "Id": 390001130, @@ -1057,9 +1098,10 @@ "RemoveType": true, "OverlayTimes": 3, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z010", - "buffeffect": "", - "buffpos": "根节点" + "buffeffect": "effect_hudun_1", + "buffpos": "胸" }, { "Id": 390001201, @@ -1081,6 +1123,7 @@ "RemoveType": false, "OverlayTimes": 10, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_ts003", "buffeffect": "", "buffpos": "根节点" @@ -1108,6 +1151,7 @@ "RemoveType": false, "OverlayTimes": 10, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_ts004", "buffeffect": "effect_14001_skill_2", "buffpos": "根节点" @@ -1132,6 +1176,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_ts005", "buffeffect": "", "buffpos": "根节点" @@ -1156,6 +1201,7 @@ "RemoveType": false, "OverlayTimes": 8, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1180,6 +1226,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1204,6 +1251,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_ts007", "buffeffect": "", "buffpos": "根节点" @@ -1230,6 +1278,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_ts007", "buffeffect": "", "buffpos": "根节点" @@ -1254,6 +1303,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_ts001", "buffeffect": "", "buffpos": "根节点" @@ -1280,6 +1330,7 @@ "RemoveType": false, "OverlayTimes": 5, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_ts002", "buffeffect": "", "buffpos": "根节点" @@ -1304,6 +1355,7 @@ "RemoveType": false, "OverlayTimes": 5, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1331,6 +1383,7 @@ "RemoveType": false, "OverlayTimes": 50, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_ts008", "buffeffect": "", "buffpos": "根节点" @@ -1357,6 +1410,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j002", "buffeffect": "", "buffpos": "根节点" @@ -1381,6 +1435,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -1407,6 +1462,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z011", "buffeffect": "", "buffpos": "根节点" @@ -1431,6 +1487,7 @@ "RemoveType": false, "OverlayTimes": 0, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -1455,6 +1512,7 @@ "RemoveType": false, "OverlayTimes": 0, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -1481,6 +1539,7 @@ "RemoveType": false, "OverlayTimes": 8, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -1507,6 +1566,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1533,6 +1593,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1559,6 +1620,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1585,6 +1647,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1611,6 +1674,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1637,6 +1701,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1663,6 +1728,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1689,6 +1755,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1715,6 +1782,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1741,6 +1809,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1767,6 +1836,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1793,6 +1863,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1819,6 +1890,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1845,6 +1917,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1871,6 +1944,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1897,6 +1971,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1923,6 +1998,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1949,6 +2025,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -1975,6 +2052,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -2001,6 +2079,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -2027,6 +2106,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -2053,6 +2133,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -2079,6 +2160,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2105,6 +2187,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2131,6 +2214,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2157,6 +2241,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2183,6 +2268,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2209,6 +2295,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": true, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j003", "buffeffect": "effect_debuff_zhongdu", "buffpos": "Bip001" @@ -2235,6 +2322,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -2261,6 +2349,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -2285,6 +2374,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": true, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j011", "buffeffect": "", "buffpos": "根节点" @@ -2312,6 +2402,7 @@ "RemoveType": false, "OverlayTimes": 99, "SameID": true, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2338,6 +2429,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": true, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2364,6 +2456,7 @@ "RemoveType": true, "OverlayTimes": 3, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2391,6 +2484,7 @@ "RemoveType": false, "OverlayTimes": 99, "SameID": true, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2417,6 +2511,7 @@ "RemoveType": false, "OverlayTimes": 99, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2443,6 +2538,7 @@ "RemoveType": true, "OverlayTimes": 3, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2469,6 +2565,7 @@ "RemoveType": true, "OverlayTimes": 99, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2495,6 +2592,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2519,6 +2617,7 @@ "RemoveType": false, "OverlayTimes": 99, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2545,6 +2644,7 @@ "RemoveType": false, "OverlayTimes": 99, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2571,6 +2671,7 @@ "RemoveType": true, "OverlayTimes": 99, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2595,6 +2696,7 @@ "RemoveType": false, "OverlayTimes": 0, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2621,6 +2723,7 @@ "RemoveType": false, "OverlayTimes": 0, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2647,6 +2750,7 @@ "RemoveType": false, "OverlayTimes": 0, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2675,9 +2779,10 @@ "RemoveType": true, "OverlayTimes": 3, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z010", - "buffeffect": "", - "buffpos": "根节点" + "buffeffect": "effect_hudun_1", + "buffpos": "胸" }, { "Id": 390001421, @@ -2699,6 +2804,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2725,6 +2831,7 @@ "RemoveType": false, "OverlayTimes": 0, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2751,6 +2858,7 @@ "RemoveType": true, "OverlayTimes": 10, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -2775,6 +2883,7 @@ "RemoveType": false, "OverlayTimes": 0, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2801,6 +2910,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": true, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2825,6 +2935,7 @@ "RemoveType": false, "OverlayTimes": 0, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2851,6 +2962,7 @@ "RemoveType": false, "OverlayTimes": 5, "SameID": true, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2877,6 +2989,7 @@ "RemoveType": false, "OverlayTimes": 99, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2901,6 +3014,7 @@ "RemoveType": false, "OverlayTimes": 0, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -2925,6 +3039,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": true, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j011", "buffeffect": "", "buffpos": "根节点" @@ -2951,6 +3066,7 @@ "RemoveType": true, "OverlayTimes": 99, "SameID": true, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z006", "buffeffect": "", "buffpos": "根节点" @@ -2975,6 +3091,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": true, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j011", "buffeffect": "", "buffpos": "根节点" @@ -2999,6 +3116,7 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": true, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_j011", "buffeffect": "", "buffpos": "根节点" @@ -3027,9 +3145,10 @@ "RemoveType": true, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z010", - "buffeffect": "", - "buffpos": "根节点" + "buffeffect": "effect_hudun_1", + "buffpos": "胸" }, { "Id": 390001435, @@ -3051,6 +3170,7 @@ "RemoveType": false, "OverlayTimes": 3, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z010", "buffeffect": "", "buffpos": "根节点" @@ -3077,6 +3197,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z010", "buffeffect": "", "buffpos": "根节点" @@ -3103,6 +3224,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -3129,6 +3251,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z003", "buffeffect": "", "buffpos": "根节点" @@ -3155,6 +3278,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z006", "buffeffect": "", "buffpos": "根节点" @@ -3181,6 +3305,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "ty_zd_buff_z008", "buffeffect": "", "buffpos": "根节点" @@ -3207,6 +3332,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -3233,6 +3359,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "根节点" @@ -3260,6 +3387,7 @@ "RemoveType": false, "OverlayTimes": 0, "SameID": false, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" @@ -3286,6 +3414,7 @@ "RemoveType": false, "OverlayTimes": 1, "SameID": true, + "golbalbufficon": "", "buffIcon": "", "buffeffect": "", "buffpos": "" diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index c202cd671..aae9609c8 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -778,7 +778,7 @@ "When": 3, "FromCheck": "Target=3,HasBuff=390001202,OverlayNum=10", "TargetCheck": "Target=2", - "MainSkillCheck": "114001311", + "MainSkillCheck": "MainSkillID=114001311", "AfterSkillCheck": "", "BuffCheck": "", "AddCon": [], diff --git a/modules/parkour/api_changemts.go b/modules/parkour/api_changemts.go index c014fd3d6..951ada26a 100644 --- a/modules/parkour/api_changemts.go +++ b/modules/parkour/api_changemts.go @@ -14,6 +14,7 @@ func (this *apiComp) ChangeMtsCheck(session comm.IUserSession, req *pb.ParkourCh func (this *apiComp) ChangeMts(session comm.IUserSession, req *pb.ParkourChangeMtsReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( info *pb.DBParkour + team *pb.DBParkour err error ) if code = this.ChangeMtsCheck(session, req); code != pb.ErrorCode_Success { @@ -28,9 +29,47 @@ func (this *apiComp) ChangeMts(session comm.IUserSession, req *pb.ParkourChangeM return } info.Dfmount = req.Mtsid - this.module.parkourComp.Change(session.GetUserId(), map[string]interface{}{ - "dfmount": info.Dfmount, - }) - session.SendMsg(string(this.module.GetType()), "avoid", &pb.ParkourAvoidResp{}) + + if info.Captainid != "" { + if info.Captainid == session.GetUserId() { + for _, v := range info.Member { + if v.Uid == session.GetUserId() { + v.Mount = info.Dfmount + } + } + if err = this.module.parkourComp.Change(session.GetUserId(), map[string]interface{}{ + "dfmount": info.Dfmount, + "member": info.Member, + }); err != nil { + code = pb.ErrorCode_DBError + return + } + } else { + if team, err = this.module.parkourComp.queryinfo(info.Captainid); err != nil { + code = pb.ErrorCode_DBError + return + } + for _, v := range team.Member { + if v.Uid == session.GetUserId() { + v.Mount = info.Dfmount + } + } + if err = this.module.parkourComp.Change(team.Captainid, map[string]interface{}{ + "member": team.Member, + }); err != nil { + code = pb.ErrorCode_DBError + return + } + } + } else { + if err = this.module.parkourComp.Change(session.GetUserId(), map[string]interface{}{ + "dfmount": info.Dfmount, + }); err != nil { + code = pb.ErrorCode_DBError + return + } + } + + session.SendMsg(string(this.module.GetType()), "changemts", &pb.ParkourChangeMtsResp{Issucc: true, Mtsid: req.Mtsid}) return } diff --git a/modules/parkour/api_invite.go b/modules/parkour/api_invite.go index 6db6073e1..5e3d45222 100644 --- a/modules/parkour/api_invite.go +++ b/modules/parkour/api_invite.go @@ -43,7 +43,7 @@ func (this *apiComp) Invite(session comm.IUserSession, req *pb.ParkourInviteReq) } //目标是否在线 if !this.module.ModuleUser.IsOnline(req.Uid) { - info.Member = append(info.Member, &pb.DBRaceMember{Uid: tuser.Uid, Name: tuser.Name, Isai: true}) + info.Member = append(info.Member, &pb.DBRaceMember{Uid: tuser.Uid, Name: tuser.Name, Avatar: tuser.Avatar, Mount: info.Dfmount, Isai: true}) } else { if tinfo, err = this.module.parkourComp.queryinfo(req.Uid); err != nil { code = pb.ErrorCode_DBError @@ -62,7 +62,7 @@ func (this *apiComp) Invite(session comm.IUserSession, req *pb.ParkourInviteReq) } } if !ok { - info.Invite = append(info.Invite, &pb.DBRaceInvite{Uid: tuser.Uid, Name: tuser.Name}) + info.Invite = append(info.Invite, &pb.DBRaceInvite{Uid: tuser.Uid, Name: tuser.Name, Avatar: tuser.Avatar}) } this.module.SendMsgToUser(string(this.module.GetType()), "invitenotice", &pb.ParkourInviteNoticePush{Team: info, State: 1}, req.Uid) diff --git a/modules/parkour/api_invitehandle.go b/modules/parkour/api_invitehandle.go index 274c11d20..71684951c 100644 --- a/modules/parkour/api_invitehandle.go +++ b/modules/parkour/api_invitehandle.go @@ -15,6 +15,7 @@ func (this *apiComp) InviteHandleCheck(session comm.IUserSession, req *pb.Parkou ///邀请组队 func (this *apiComp) InviteHandle(session comm.IUserSession, req *pb.ParkourInviteHandleReq) (code pb.ErrorCode, data *pb.ErrorData) { var ( + info *pb.DBParkour tean *pb.DBParkour invite *pb.DBRaceInvite member *pb.DBRaceMember @@ -25,6 +26,10 @@ func (this *apiComp) InviteHandle(session comm.IUserSession, req *pb.ParkourInvi if code = this.InviteHandleCheck(session, req); code != pb.ErrorCode_Success { return } + if info, err = this.module.parkourComp.queryinfo(session.GetUserId()); err != nil { + code = pb.ErrorCode_DBError + return + } if tean, err = this.module.parkourComp.queryinfo(req.Captainid); err != nil { code = pb.ErrorCode_DBError return @@ -48,7 +53,7 @@ func (this *apiComp) InviteHandle(session comm.IUserSession, req *pb.ParkourInvi for i, v := range tean.Member { users[i] = v.Uid } - member = &pb.DBRaceMember{Uid: invite.Uid, Name: invite.Name} + member = &pb.DBRaceMember{Uid: invite.Uid, Name: invite.Name, Avatar: invite.Avatar, Mount: info.Dfmount} tean.Captainid = tean.Uid tean.Member = append(tean.Member, member) if err = this.module.parkourComp.Change(session.GetUserId(), map[string]interface{}{ diff --git a/modules/parkour/module.go b/modules/parkour/module.go index 5fd0e2fb9..15d334f78 100644 --- a/modules/parkour/module.go +++ b/modules/parkour/module.go @@ -119,6 +119,7 @@ func (this *Parkour) createbattle(ctx context.Context, req *pb.RPCParkourMatchSu } for _, v := range req.Red { + v.Hp = 6 if !v.Isai { //非AI session, online := this.GetUserSession(v.Uid) v.Isoff = !online @@ -128,8 +129,10 @@ func (this *Parkour) createbattle(ctx context.Context, req *pb.RPCParkourMatchSu } } + sessions = append(sessions, battle.RedSession...) battle.RedMember = req.Red for _, v := range req.Bule { + v.Hp = 6 if !v.Isai { //非AI session, online := this.GetUserSession(v.Uid) v.Isoff = !online @@ -138,6 +141,7 @@ func (this *Parkour) createbattle(ctx context.Context, req *pb.RPCParkourMatchSu } } } + sessions = append(sessions, battle.BuleSession...) battle.BuleMember = req.Bule if err = this.raceComp.addrace(race); err != nil { return @@ -145,7 +149,7 @@ func (this *Parkour) createbattle(ctx context.Context, req *pb.RPCParkourMatchSu this.lock.Lock() this.battles[race.Id] = battle this.lock.Unlock() - if err = this.SendMsgToSession(string(comm.ModulePvp), "racematchsucc", &pb.ParkourRaceMatchSuccPush{ + if err = this.SendMsgToSession(string(this.GetType()), "racematchsucc", &pb.ParkourRaceMatchSuccPush{ Race: race, }, sessions...); err != nil { this.Errorln(err) @@ -189,7 +193,7 @@ func (this *Parkour) shot(id string, uid string) { if ok { sessions = append(sessions, battle.RedSession...) sessions = append(sessions, battle.BuleSession...) - if err = this.SendMsgToSession(string(comm.ModulePvp), "finish", &pb.ParkourRaceStartPush{ + if err = this.SendMsgToSession(string(this.GetType()), "finish", &pb.ParkourRaceStartPush{ Countdown: 3, }, sessions...); err != nil { this.Errorln(err) @@ -211,7 +215,7 @@ func (this *Parkour) avoid(id string, uid string, dis int32) { if ok { sessions = append(sessions, battle.RedSession...) sessions = append(sessions, battle.BuleSession...) - if err = this.SendMsgToSession(string(comm.ModulePvp), "finish", &pb.ParkourRaceStartPush{ + if err = this.SendMsgToSession(string(this.GetType()), "finish", &pb.ParkourRaceStartPush{ Countdown: 3, }, sessions...); err != nil { this.Errorln(err) @@ -239,7 +243,7 @@ func (this *Parkour) overtimer(task *timewheel.Task, args ...interface{}) { this.raceComp.delrace(id) sessions = append(sessions, battle.RedSession...) sessions = append(sessions, battle.BuleSession...) - if err = this.SendMsgToSession(string(comm.ModulePvp), "finish", &pb.ParkourRaceOverPush{ + if err = this.SendMsgToSession(string(this.GetType()), "finish", &pb.ParkourRaceOverPush{ Race: &pb.DBRace{ Id: battle.Id, }, diff --git a/sys/configure/structs/Game.FavorabilityData.go b/sys/configure/structs/Game.FavorabilityData.go index 2b5fffaae..bae6ca2f1 100644 --- a/sys/configure/structs/Game.FavorabilityData.go +++ b/sys/configure/structs/Game.FavorabilityData.go @@ -27,8 +27,7 @@ type GameFavorabilityData struct { OrdinaryTxt string DislikingTxt string Favorlv []int32 - BiographyName []string - BiographyTxt []string + BiographyName []int32 BiographyReward1 []*Gameatn BiographyReward2 []*Gameatn BiographyReward3 []*Gameatn @@ -120,29 +119,15 @@ func (_v *GameFavorabilityData)Deserialize(_buf map[string]interface{}) (err err var _ok_ bool if _arr_, _ok_ = _buf["biography_name"].([]interface{}); !_ok_ { err = errors.New("biography_name error"); return } - _v.BiographyName = make([]string, 0, len(_arr_)) + _v.BiographyName = make([]int32, 0, len(_arr_)) for _, _e_ := range _arr_ { - var _list_v_ string - { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } _v.BiographyName = append(_v.BiographyName, _list_v_) } } - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["biography_txt"].([]interface{}); !_ok_ { err = errors.New("biography_txt error"); return } - - _v.BiographyTxt = make([]string, 0, len(_arr_)) - - for _, _e_ := range _arr_ { - var _list_v_ string - { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } - _v.BiographyTxt = append(_v.BiographyTxt, _list_v_) - } - } - { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/Game.FriendsData.go b/sys/configure/structs/Game.FriendsData.go index 2bbee09aa..afd00823f 100644 --- a/sys/configure/structs/Game.FriendsData.go +++ b/sys/configure/structs/Game.FriendsData.go @@ -19,7 +19,7 @@ type GameFriendsData struct { Png string FriendsLv int32 FavorabilityLv int32 - Hid int32 + Hid string Attribute []*Gameatr AttributeTxt string } @@ -39,7 +39,7 @@ func (_v *GameFriendsData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; if _v.Png, _ok_ = _buf["png"].(string); !_ok_ { err = errors.New("png error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["friends_lv"].(float64); !_ok_ { err = errors.New("friends_lv error"); return }; _v.FriendsLv = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["favorability_lv"].(float64); !_ok_ { err = errors.New("favorability_lv error"); return }; _v.FavorabilityLv = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hid"].(float64); !_ok_ { err = errors.New("hid error"); return }; _v.Hid = int32(_tempNum_) } + { var _ok_ bool; if _v.Hid, _ok_ = _buf["hid"].(string); !_ok_ { err = errors.New("hid error"); return } } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/game.coinData.go b/sys/configure/structs/game.coinData.go index b72ccc6e7..9066ab081 100644 --- a/sys/configure/structs/game.coinData.go +++ b/sys/configure/structs/game.coinData.go @@ -33,7 +33,7 @@ func (_v *GameCoinData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; if _v.Effects, _ok_ = _buf["effects"].(string); !_ok_ { err = errors.New("effects error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["access"].(float64); !_ok_ { err = errors.New("access error"); return }; _v.Access = int32(_tempNum_) } { var _ok_ bool; if _v.Img, _ok_ = _buf["img"].(string); !_ok_ { err = errors.New("img error"); return } } - { var _ok_ bool; if _v.Intr, _ok_ = _buf["intr"].(string); !_ok_ { err = errors.New("intr error"); return } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["intr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Intr error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Intr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } return } diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index 5cc3afaef..22c982fca 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -212,6 +212,8 @@ type GameGlobalData struct { BusinessBag int32 BusinessRewardday int32 BusinessRenovatething int32 + FavorabilityLikes int32 + FavorabilityDislikes int32 } const TypeId_GameGlobalData = 477542761 @@ -838,6 +840,8 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_bag"].(float64); !_ok_ { err = errors.New("business_bag error"); return }; _v.BusinessBag = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_rewardday"].(float64); !_ok_ { err = errors.New("business_rewardday error"); return }; _v.BusinessRewardday = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["business_renovatething"].(float64); !_ok_ { err = errors.New("business_renovatething error"); return }; _v.BusinessRenovatething = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["favorability_likes"].(float64); !_ok_ { err = errors.New("favorability_likes error"); return }; _v.FavorabilityLikes = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["favorability_dislikes"].(float64); !_ok_ { err = errors.New("favorability_dislikes error"); return }; _v.FavorabilityDislikes = int32(_tempNum_) } return } diff --git a/sys/configure/structs/game.skillBuffData.go b/sys/configure/structs/game.skillBuffData.go index 48d5715db..0ad0b1d91 100644 --- a/sys/configure/structs/game.skillBuffData.go +++ b/sys/configure/structs/game.skillBuffData.go @@ -24,6 +24,7 @@ type GameSkillBuffData struct { RemoveType bool OverlayTimes byte SameID bool + Golbalbufficon string BuffIcon string Buffeffect string Buffpos string @@ -88,6 +89,7 @@ func (_v *GameSkillBuffData)Deserialize(_buf map[string]interface{}) (err error) { var _ok_ bool; if _v.RemoveType, _ok_ = _buf["RemoveType"].(bool); !_ok_ { err = errors.New("RemoveType error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["OverlayTimes"].(float64); !_ok_ { err = errors.New("OverlayTimes error"); return }; _v.OverlayTimes = byte(_tempNum_) } { var _ok_ bool; if _v.SameID, _ok_ = _buf["SameID"].(bool); !_ok_ { err = errors.New("SameID error"); return } } + { var _ok_ bool; if _v.Golbalbufficon, _ok_ = _buf["golbalbufficon"].(string); !_ok_ { err = errors.New("golbalbufficon error"); return } } { var _ok_ bool; if _v.BuffIcon, _ok_ = _buf["buffIcon"].(string); !_ok_ { err = errors.New("buffIcon error"); return } } { var _ok_ bool; if _v.Buffeffect, _ok_ = _buf["buffeffect"].(string); !_ok_ { err = errors.New("buffeffect error"); return } } { var _ok_ bool; if _v.Buffpos, _ok_ = _buf["buffpos"].(string); !_ok_ { err = errors.New("buffpos error"); return } }