From f0969f7a09f5f5919ff0dd4064f936bbc6d36e71 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 9 Nov 2023 17:21:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=A9=E5=AE=B6=E8=B5=84=E6=BA=90=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E8=AE=B0=E5=BD=95=E8=B7=A8=E6=9C=8D=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_buriedcondi.json | 25 + bin/json/game_gameid.json | 16 +- bin/json/game_rdtasknpc.json | 30 ++ bin/json/game_skillafteratk.json | 518 +++++++++++++++++++++ bin/json/game_skillatk.json | 470 +++++++++++++++++++ bin/json/game_skillbuff.json | 31 ++ bin/json/game_skillpassive.json | 22 +- bin/json/game_tdmonster.json | 14 +- bin/json/game_tdweapon.json | 6 + bin/json/game_worldtask.json | 45 +- modules/entertainment/xxl_test.go | 12 +- modules/modeluserlog.go | 42 +- modules/modulebase.go | 9 +- modules/pagoda/module.go | 2 + modules/viking/api_challengeover.go | 1 + sys/configure/structs/Game.TDWeaponData.go | 4 + 16 files changed, 1211 insertions(+), 36 deletions(-) diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 25d9c74de..2e44f728d 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -32924,5 +32924,30 @@ 24004 ], "filter2": [] + }, + { + "id": 600000010, + "rtype": 1, + "ctype": 1, + "notify": [], + "type_sp": 1, + "tasktxt": { + "key": "buried_buried_condi_tasktxt_1134", + "text": "看看希卡普在哪？" + }, + "type": 20001, + "valid": 0, + "head": { + "a": "attr", + "t": "gold", + "n": 1 + }, + "Npc_event_type": 0, + "NPC": 600011, + "value": 1, + "filter": [ + 7000020 + ], + "filter2": [] } ] \ No newline at end of file diff --git a/bin/json/game_gameid.json b/bin/json/game_gameid.json index 077ae0dac..5f284a9eb 100644 --- a/bin/json/game_gameid.json +++ b/bin/json/game_gameid.json @@ -48,23 +48,23 @@ "type": 3 }, { - "id": 30002, + "id": 40001, + "type": 4 + }, + { + "id": 40002, "type": 3 }, { - "id": 30003, + "id": 40003, "type": 3 }, { - "id": 30004, + "id": 40004, "type": 3 }, { - "id": 30005, - "type": 3 - }, - { - "id": 30006, + "id": 40005, "type": 3 } ] \ No newline at end of file diff --git a/bin/json/game_rdtasknpc.json b/bin/json/game_rdtasknpc.json index bb2fbfe68..08ec1b34a 100644 --- a/bin/json/game_rdtasknpc.json +++ b/bin/json/game_rdtasknpc.json @@ -9533,5 +9533,35 @@ "datas": [], "event": [], "goto": 0 + }, + { + "id": 600010, + "heroid": 43006, + "Levelid": 0, + "datas": [ + "SmithyScene", + "彩蛋礼物", + "139" + ], + "event": [ + 2, + 7000010 + ], + "goto": 0 + }, + { + "id": 600011, + "heroid": 35002, + "Levelid": 0, + "datas": [ + "GameMain", + "功能入口-维京远征", + "901" + ], + "event": [ + 2, + 7000020 + ], + "goto": 0 } ] \ No newline at end of file diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 125e6fd54..131e14b8a 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -63004,5 +63004,523 @@ "DpsCondition": "", "RevisiCondition": "", "RevisiParams": [] + }, + { + "Id": 245012111, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 2500 + ], + "FollowSK": [], + "SucFollowSK": [ + 245012112 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 245012121, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 2600 + ], + "FollowSK": [], + "SucFollowSK": [ + 245012112 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 245012131, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 2700 + ], + "FollowSK": [], + "SucFollowSK": [ + 245012112 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 245012141, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 2800 + ], + "FollowSK": [], + "SucFollowSK": [ + 245012112 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 245012151, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 2900 + ], + "FollowSK": [], + "SucFollowSK": [ + 245012112 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 245012112, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001110, + 500, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 245012211, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 4300 + ], + "FollowSK": [], + "SucFollowSK": [ + 245012212 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 245012221, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 4400 + ], + "FollowSK": [], + "SucFollowSK": [ + 245012212 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 245012231, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 4500 + ], + "FollowSK": [], + "SucFollowSK": [ + 245012212 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 245012241, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 4600 + ], + "FollowSK": [], + "SucFollowSK": [ + 245012212 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 245012251, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 4700 + ], + "FollowSK": [], + "SucFollowSK": [ + 245012212 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 245012212, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001105, + 700, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 245012311, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 445012311, + -1, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 245012312, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 391000100, + 1000, + 3, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 245012313, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 391000100, + 1000, + 3, + -1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 245012314, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 3, + "Type": 1, + "Argu": [ + 1, + 4, + 2400 + ], + "FollowSK": [], + "SucFollowSK": [ + 245012315 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 245012324, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 3, + "Type": 1, + "Argu": [ + 1, + 4, + 2500 + ], + "FollowSK": [], + "SucFollowSK": [ + 245012315 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 245012334, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 3, + "Type": 1, + "Argu": [ + 1, + 4, + 2600 + ], + "FollowSK": [], + "SucFollowSK": [ + 245012315 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 245012344, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 3, + "Type": 1, + "Argu": [ + 1, + 4, + 2700 + ], + "FollowSK": [], + "SucFollowSK": [ + 245012315 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 245012354, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 3, + "Type": 1, + "Argu": [ + 1, + 4, + 2800 + ], + "FollowSK": [], + "SucFollowSK": [ + 245012315 + ], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 245012315, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": "", + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001101, + 1000, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] } ] \ No newline at end of file diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 9a7ab4193..0fc84662b 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -48321,5 +48321,475 @@ }, "buffid": [], "map": "" + }, + { + "id": 145012111, + "level": 1, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_145012111", + "text": "" + }, + "ico": "jn_45012_1", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 245012111 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_145012111_1", + "text": "对敌方一个目标造成自身攻击250%的伤害，50%概率为目标附加1回合【挑衅】" + }, + "buffid": [ + 390001110 + ], + "map": "" + }, + { + "id": 145012111, + "level": 2, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_145012111", + "text": "" + }, + "ico": "jn_45012_1", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 245012121 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_145012111_2", + "text": "伤害提升至260%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 145012111, + "level": 3, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_145012111", + "text": "" + }, + "ico": "jn_45012_1", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 245012131 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_145012111_3", + "text": "伤害提升至270%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 145012111, + "level": 4, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_145012111", + "text": "" + }, + "ico": "jn_45012_1", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 245012141 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_145012111_4", + "text": "伤害提升至280%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 145012111, + "level": 5, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_145012111", + "text": "" + }, + "ico": "jn_45012_1", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 245012151 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_145012111_5", + "text": "伤害提升至290%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 145012211, + "level": 1, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_145012211", + "text": "" + }, + "ico": "jn_45012_2", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_2", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 245012211 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_145012211_1", + "text": "像敌方中心位置投掷一颗魔豆，魔豆落地后野蛮生长，击飞敌方全体目标。造成攻击力430%的伤害，并有70%概率【眩晕】目标1回合" + }, + "buffid": [], + "map": "" + }, + { + "id": 145012211, + "level": 2, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_145012211", + "text": "" + }, + "ico": "jn_45012_2", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_2", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 245012221 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_145012211_2", + "text": "伤害提升至440%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 145012211, + "level": 3, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_145012211", + "text": "" + }, + "ico": "jn_45012_2", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_2", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 245012231 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_145012211_3", + "text": "伤害提升至450%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 145012211, + "level": 4, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_145012211", + "text": "" + }, + "ico": "jn_45012_2", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_2", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 245012241 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_145012211_4", + "text": "伤害提升至460%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 145012211, + "level": 5, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_145012211", + "text": "" + }, + "ico": "jn_45012_2", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_2", + "Type": 1, + "CD": 3, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 245012251 + ] + }, + "passSkill": [], + "Desc": { + "key": "skill_skill_atk_Desc_145012211_5", + "text": "伤害提升至470%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 145012311, + "level": 1, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_145012311", + "text": "" + }, + "ico": "jn_45012_3", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_3", + "Type": 1, + "CD": 5, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 245012313, + 245012314 + ] + }, + "passSkill": [ + 245012311 + ], + "Desc": { + "key": "skill_skill_atk_Desc_145012311_1", + "text": "蛋先生主动释放技能进入【金蛋】状态。同时立即呼唤大白鹅攻击敌方全体目标3次，每次造成攻击240%的伤害，并100%概率附加1回合【恐惧】。【金蛋】金蛋内置嘲讽效果，共3点血量，每次受到攻击强制扣除1点血量，血量为0或回合结束后金蛋破碎目标解除金蛋状态。根据金蛋剩余血量按对应百分比回复蛋先生血量。\n被动效果：受到致命伤害后会进入1回合【金蛋】状态。同时立即呼唤大白鹅攻击敌方全体目标3次，每次造成攻击240%的伤害，并100%概率附加1回合【童年阴影】。每场战斗只可触发一次" + }, + "buffid": [ + 390001101, + 391000100 + ], + "map": "" + }, + { + "id": 145012311, + "level": 2, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_145012311", + "text": "" + }, + "ico": "jn_45012_3", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_3", + "Type": 1, + "CD": 5, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 245012313, + 245012324 + ] + }, + "passSkill": [ + 245012311 + ], + "Desc": { + "key": "skill_skill_atk_Desc_145012311_2", + "text": "伤害提升至250%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 145012311, + "level": 3, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_145012311", + "text": "" + }, + "ico": "jn_45012_3", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_3", + "Type": 1, + "CD": 5, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 245012313, + 245012334 + ] + }, + "passSkill": [ + 245012311 + ], + "Desc": { + "key": "skill_skill_atk_Desc_145012311_3", + "text": "伤害提升至260%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 145012311, + "level": 4, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_145012311", + "text": "" + }, + "ico": "jn_45012_3", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_3", + "Type": 1, + "CD": 5, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 245012313, + 245012344 + ] + }, + "passSkill": [ + 245012311 + ], + "Desc": { + "key": "skill_skill_atk_Desc_145012311_4", + "text": "伤害提升至270%。" + }, + "buffid": [], + "map": "" + }, + { + "id": 145012311, + "level": 5, + "MaxLV": 5, + "UnavailablePlayTypes": [], + "Name": { + "key": "skill_skill_atk_Name_145012311", + "text": "" + }, + "ico": "jn_45012_3", + "CorrectPos": 0, + "IsMelee": 0, + "act": "Skill_3", + "Type": 1, + "CD": 5, + "Where": [], + "Target": 2, + "ChildSkill": { + "Id": [ + 245012313, + 245012354 + ] + }, + "passSkill": [ + 245012311 + ], + "Desc": { + "key": "skill_skill_atk_Desc_145012311_5", + "text": "伤害提升至280%。" + }, + "buffid": [], + "map": "" } ] \ No newline at end of file diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 8eac9d2d0..d90162885 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -11683,5 +11683,36 @@ "buffeffect": "", "buffpos": "根节点", "forbidFloat": 0 + }, + { + "Id": 391000100, + "Name": { + "key": "skill_skill_buff_Name_391000100", + "text": "金蛋" + }, + "Desc": { + "key": "skill_skill_buff_Desc_391000100", + "text": "金蛋内置嘲讽效果，共3点血量，每次受到攻击强制扣除1点血量，血量为0或回合结束后金蛋破碎目标解除金蛋状态。根据金蛋剩余血量按对应百分比回复蛋先生血量。" + }, + "BuffType": 0, + "EffectArgu": [], + "BufParNum": 1, + "RelyCheckArgu": [], + "CoexistCheckArgu": [], + "Effect": [ + 0, + 3 + ], + "AddEffect": false, + "RemoveType": false, + "Priority": 0, + "NotOverlay": 0, + "OverlayTimes": 1, + "SameID": false, + "golbalbufficon": "", + "buffIcon": "ty_icon_buff_jd", + "buffeffect": "", + "buffpos": "", + "forbidFloat": 0 } ] \ No newline at end of file diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 3dfb26108..73737f923 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -9269,7 +9269,7 @@ "BuffCheck": "", "DpsCheck": "", "AddCon": [], - "PasPr": 10000, + "PasPr": 1000, "PasCorrection": 0, "Type": "CallSkillPas", "MaxEmitTimesInRoundByRole": 0, @@ -9278,5 +9278,25 @@ "Callback": [ 223011314 ] + }, + { + "Id": 445012311, + "When": 15, + "FromCheck": "", + "TargetCheck": "Target=3", + "MainSkillCheck": "", + "AfterSkillCheck": "", + "BuffCheck": "", + "DpsCheck": "", + "AddCon": [], + "PasPr": 1000, + "PasCorrection": 0, + "Type": "CallSkillPas", + "MaxEmitTimesInRoundByRole": 0, + "MaxEmitTimes": 1, + "MaxEmitTimesInRound": 0, + "Callback": [ + 245012312 + ] } ] \ No newline at end of file diff --git a/bin/json/game_tdmonster.json b/bin/json/game_tdmonster.json index b7b989ef5..6c5dc852e 100644 --- a/bin/json/game_tdmonster.json +++ b/bin/json/game_tdmonster.json @@ -11,7 +11,7 @@ "multiple": 1, "width": 1, "height": 1, - "hp": 100, + "hp": 20, "dis": 2, "atk": 1, "atk_speed": 2000, @@ -30,7 +30,7 @@ "multiple": 1, "width": 1, "height": 1, - "hp": 500, + "hp": 30, "dis": 3, "atk": 3, "atk_speed": 5000, @@ -49,7 +49,7 @@ "multiple": 1, "width": 1, "height": 1.5, - "hp": 70, + "hp": 20, "dis": 4, "atk": 1, "atk_speed": 1500, @@ -68,7 +68,7 @@ "multiple": 1, "width": 1, "height": 1.5, - "hp": 100, + "hp": 30, "dis": 5, "atk": 1, "atk_speed": 2000, @@ -87,7 +87,7 @@ "multiple": 1, "width": 1, "height": 2, - "hp": 200, + "hp": 50, "dis": 6, "atk": 1, "atk_speed": 2000, @@ -106,7 +106,7 @@ "multiple": 1, "width": 1, "height": 2, - "hp": 300, + "hp": 100, "dis": 7, "atk": 1, "atk_speed": 2000, @@ -125,7 +125,7 @@ "multiple": 1, "width": 3, "height": 3, - "hp": 3000, + "hp": 100, "dis": 8, "atk": 2, "atk_speed": 2000, diff --git a/bin/json/game_tdweapon.json b/bin/json/game_tdweapon.json index 35095f146..04840d48d 100644 --- a/bin/json/game_tdweapon.json +++ b/bin/json/game_tdweapon.json @@ -12,7 +12,9 @@ "sak": 20, "atk_speed": 2000, "weapon_type": 1, + "bulletPrefab": "", "fly_speed": 10, + "hitRange": 1, "data": 0, "pro": 1000 }, @@ -29,7 +31,9 @@ "sak": 50, "atk_speed": 5000, "weapon_type": 2, + "bulletPrefab": "", "fly_speed": 8, + "hitRange": 1, "data": 50, "pro": 1000 }, @@ -46,7 +50,9 @@ "sak": 15, "atk_speed": 2000, "weapon_type": 3, + "bulletPrefab": "", "fly_speed": 10, + "hitRange": 1, "data": 3, "pro": 1000 } diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 1d11d7ff1..a2927bfc8 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -6729,7 +6729,7 @@ "id_after": 0, "group": 320, "exgroup": 311, - "des": 4, + "des": 3, "icon": "25001", "task_name": { "key": "worldtask_world_task_task_name_141", @@ -9307,5 +9307,48 @@ } ], "module": [] + }, + { + "key": 600010, + "opencond": "", + "lock": 1, + "lockend": 999, + "ontxe": 0, + "id_after": 0, + "group": 320, + "exgroup": 600, + "des": 3, + "icon": "25001", + "task_name": { + "key": "worldtask_world_task_task_name_189", + "text": "希卡普的礼物" + }, + "task_details": { + "key": "worldtask_world_task_task_details_188", + "text": "铁匠铺发现一个非常奇怪的礼盒，戈伯让我交给希卡普，我们可以看看希卡普怎么说" + }, + "npctxt": { + "key": "worldtask_world_task_npctxt_188", + "text": "铁匠铺逛逛" + }, + "get_item": [], + "trigger": 0, + "npc": 600010, + "completetask": [ + 600000010 + ], + "deliver_npc": 0, + "taskend_removeitem": [], + "auto_accept": 0, + "tasktips": 1, + "lock_add": 0, + "reword": [ + { + "a": "attr", + "t": "gold", + "n": 5000 + } + ], + "module": [] } ] \ No newline at end of file diff --git a/modules/entertainment/xxl_test.go b/modules/entertainment/xxl_test.go index adcb7c482..c9ff15af2 100644 --- a/modules/entertainment/xxl_test.go +++ b/modules/entertainment/xxl_test.go @@ -78,11 +78,11 @@ func Test_Main(t *testing.T) { s.OnInstallComp( //装备组件 services.NewGateRouteComp(), //此服务需要接受用户的消息 需要装备网关组件 ) - go func() { - lego.Run(s, //运行模块 - entertainment.NewModule(), - ) - }() + //go func() { + lego.Run(s, //运行模块 + entertainment.NewModule(), + ) + //}() print(math.Pow(2, 238)) // sz := utils.RandomNumbers(0, 2, 2) @@ -112,7 +112,7 @@ func Test_Main(t *testing.T) { } var mids map[int]struct{} mids = make(map[int]struct{}, 0) - // k := m.Skill3(24, 0) + m.Skill3(35, 0) for i := 0; i < 4; i++ { dd := m.Skill3(24, int32(i)) diff --git a/modules/modeluserlog.go b/modules/modeluserlog.go index 1ddc1ba38..853069ce3 100644 --- a/modules/modeluserlog.go +++ b/modules/modeluserlog.go @@ -6,6 +6,8 @@ import ( "go_dreamfactory/lego/core" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" + "go_dreamfactory/sys/db" + "go_dreamfactory/utils" "time" "go.mongodb.org/mongo-driver/bson" @@ -36,23 +38,43 @@ func (this *modelUserLog) Init(service core.IService, module core.IModule, comp return } +// 用户操作明细数据记录 func (this *modelUserLog) AddUserLog(uid string, tag string, data interface{}) { var ( - jsonStr []byte + dbModel *db.DBModel err error + jsonStr []byte ) if jsonStr, err = json.Marshal(data); err != nil { log.Errorln(err) return } - if _, err = this.DBModel.DB.InsertOne(core.SqlTable(this.TableName), &pb.DBUserLog{ - Id: primitive.NewObjectID().Hex(), - Uid: uid, - ExpireAt: time.Now().Add(time.Hour * 24 * 8).Unix(), - Tag: tag, - Data: string(jsonStr), - }); err != nil { - log.Errorln(err) - return + if db.IsCross() { //如果是跨服 直接找到对应的本服 + if tag, _, b := utils.UIdSplit(uid); b { + if conn, err := db.ServerDBConn(tag); err == nil { + dbModel = db.NewDBModel(comm.TableEntertainm, conn) + if _, err = dbModel.DB.InsertOne(core.SqlTable(this.TableName), &pb.DBUserLog{ + Id: primitive.NewObjectID().Hex(), + Uid: uid, + ExpireAt: time.Now().Add(time.Hour * 24 * 8).Unix(), + Tag: tag, + Data: string(jsonStr), + }); err != nil { + log.Errorln(err) + return + } + } + } + } else { // 本服 直接操作本服数据 + if _, err = this.DBModel.DB.InsertOne(core.SqlTable(this.TableName), &pb.DBUserLog{ + Id: primitive.NewObjectID().Hex(), + Uid: uid, + ExpireAt: time.Now().Add(time.Hour * 24 * 8).Unix(), + Tag: tag, + Data: string(jsonStr), + }); err != nil { + log.Errorln(err) + return + } } } diff --git a/modules/modulebase.go b/modules/modulebase.go index c02facf43..f92e9d02b 100644 --- a/modules/modulebase.go +++ b/modules/modulebase.go @@ -769,6 +769,7 @@ func (this *ModuleBase) DispenseAtno(session comm.IUserSession, res []*cfg.Gamea if atno, errdata = this.ModuleUser.AddAttributeValues(session, attrs, bPush); errdata != nil { return } + // for k, v := range attrs { // atno = append(atno, &pb.UserAtno{ // A: comm.AttrType, @@ -871,7 +872,7 @@ func (this *ModuleBase) DispenseAtno(session comm.IUserSession, res []*cfg.Gamea N: v, }) } - this.Debugf("发放用户皮肤资源资源: %v errdata: %v", mts, errdata) + this.Debugf("发放用户皮肤资源资源: %v errdata: %v", per, errdata) } if len(title) > 0 { if errdata = this.ModuleUser.AddTitle(session, title, bPush); errdata != nil { @@ -884,7 +885,7 @@ func (this *ModuleBase) DispenseAtno(session comm.IUserSession, res []*cfg.Gamea N: v, }) } - this.Debugf("发放用户称号资源资源: %v errdata: %v", mts, errdata) + this.Debugf("发放用户称号资源资源: %v errdata: %v", title, errdata) } if len(xxl) > 0 { @@ -898,8 +899,10 @@ func (this *ModuleBase) DispenseAtno(session comm.IUserSession, res []*cfg.Gamea N: v, }) } - this.Debugf("发放三消卡片资源资源: %v errdata: %v", mts, errdata) + this.Debugf("发放三消卡片资源资源: %v errdata: %v", xxl, errdata) } + + this.WriteUserLog(session.GetUserId(), "userlog", res) return } diff --git a/modules/pagoda/module.go b/modules/pagoda/module.go index c31a37e07..95457809e 100644 --- a/modules/pagoda/module.go +++ b/modules/pagoda/module.go @@ -16,6 +16,8 @@ import ( "github.com/go-redis/redis/v8" ) +var _ comm.IPagoda = (*Pagoda)(nil) + type Pagoda struct { modules.ModuleBase modelPagoda *ModelPagoda diff --git a/modules/viking/api_challengeover.go b/modules/viking/api_challengeover.go index c49704574..a33583551 100644 --- a/modules/viking/api_challengeover.go +++ b/modules/viking/api_challengeover.go @@ -109,6 +109,7 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.VikingChal mapData["bossTime"] = viking.BossTime // 更新时间 this.module.CheckRank(session.GetUserId(), req.BossId, req.Difficulty, req.Report) } + if req.Auto == 1 { viking.Round = make(map[int32]int32) viking.Round[req.Auto] = req.Report.Round diff --git a/sys/configure/structs/Game.TDWeaponData.go b/sys/configure/structs/Game.TDWeaponData.go index a80f83806..70acc2984 100644 --- a/sys/configure/structs/Game.TDWeaponData.go +++ b/sys/configure/structs/Game.TDWeaponData.go @@ -17,7 +17,9 @@ type GameTDWeaponData struct { Sak int32 AtkSpeed int32 WeaponType int32 + BulletPrefab string FlySpeed float32 + HitRange float32 Data int32 Pro int32 } @@ -35,7 +37,9 @@ func (_v *GameTDWeaponData)Deserialize(_buf map[string]interface{}) (err error) { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sak"].(float64); !_ok_ { err = errors.New("sak error"); return }; _v.Sak = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atk_speed"].(float64); !_ok_ { err = errors.New("atk_speed error"); return }; _v.AtkSpeed = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["weapon_type"].(float64); !_ok_ { err = errors.New("weapon_type error"); return }; _v.WeaponType = int32(_tempNum_) } + { var _ok_ bool; if _v.BulletPrefab, _ok_ = _buf["bulletPrefab"].(string); !_ok_ { err = errors.New("bulletPrefab error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["fly_speed"].(float64); !_ok_ { err = errors.New("fly_speed error"); return }; _v.FlySpeed = float32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hitRange"].(float64); !_ok_ { err = errors.New("hitRange error"); return }; _v.HitRange = float32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data"].(float64); !_ok_ { err = errors.New("data error"); return }; _v.Data = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pro"].(float64); !_ok_ { err = errors.New("pro error"); return }; _v.Pro = int32(_tempNum_) } return