From 7050e6c9faf79a2d1ebec387f967f3963ca2d506 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Mon, 10 Apr 2023 19:47:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=85=8D=E7=BD=AE=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_skillafteratk.json | 96 +++++++++---------- bin/json/game_skillatk.json | 39 ++------ bin/json/game_skillpassive.json | 8 +- bin/json/game_smithycustomer.json | 2 +- bin/json/game_worldtask.json | 64 ++++++------- .../structs/Game.MonsterFormatData.go | 2 + 6 files changed, 91 insertions(+), 120 deletions(-) diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 5ad9d4cad..6f3646775 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -8126,6 +8126,54 @@ "RevisiCondition": "", "RevisiParams": [] }, + { + "Id": 215005315, + "EmitPR": 1000, + "From": 1, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 2, + "Argu": [ + 415005212, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, + { + "Id": 215005316, + "EmitPR": 1000, + "From": 9, + "Where": [], + "Order": "", + "Limit": 1, + "ExecuteCnt": 1, + "Type": 28, + "Argu": [ + 390001112, + 1000, + 1, + 2, + 1200 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "DpsRevisiType": 0, + "DpsCondition": "", + "RevisiCondition": "", + "RevisiParams": [] + }, { "Id": 215005322, "EmitPR": 1000, @@ -8195,54 +8243,6 @@ "RevisiCondition": "", "RevisiParams": [] }, - { - "Id": 915005213, - "EmitPR": 1000, - "From": 1, - "Where": [], - "Order": "", - "Limit": 1, - "ExecuteCnt": 1, - "Type": 2, - "Argu": [ - 415005212, - 1, - 1 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, - { - "Id": 915005214, - "EmitPR": 1000, - "From": 9, - "Where": [], - "Order": "", - "Limit": 1, - "ExecuteCnt": 1, - "Type": 28, - "Argu": [ - 390001112, - 1000, - 1, - 2, - 1200 - ], - "FollowSK": [], - "SucFollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "DpsRevisiType": 0, - "DpsCondition": "", - "RevisiCondition": "", - "RevisiParams": [] - }, { "Id": 215004011, "EmitPR": 1000, diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index b782935bf..7c7279cd4 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -2610,9 +2610,7 @@ "Target": 2, "ChildSkill": { "Id": [ - 225001341, - 225001312, - 225001313 + 66 ] }, "Desc": { @@ -5331,6 +5329,7 @@ "Target": 0, "ChildSkill": { "Id": [ + 215005315, 215005311, 215005312, 215005313, @@ -5362,6 +5361,7 @@ "Target": 0, "ChildSkill": { "Id": [ + 215005315, 215005311, 215005322, 215005313, @@ -5393,6 +5393,7 @@ "Target": 0, "ChildSkill": { "Id": [ + 215005315, 215005311, 215005332, 215005313, @@ -5424,6 +5425,7 @@ "Target": 0, "ChildSkill": { "Id": [ + 215005315, 215005311, 215005342, 215005313, @@ -5455,6 +5457,7 @@ "Target": 0, "ChildSkill": { "Id": [ + 215005315, 215005311, 215005342, 215005313, @@ -5468,36 +5471,6 @@ "buffid": [], "map": "" }, - { - "id": 115005411, - "level": 1, - "MaxLV": 1, - "UnavailablePlayTypes": [], - "Name": { - "key": "skillname_115005411", - "text": "净化烟火" - }, - "ico": "jn_icon_023", - "CorrectPos": 0, - "IsMelee": 0, - "act": "Skill_2", - "Type": 1, - "CD": 5, - "Target": 0, - "ChildSkill": { - "Id": [ - 215005211, - 915005213, - 915005214 - ] - }, - "Desc": { - "key": "skill_1150054111", - "text": "治疗时净化目标1个减益。治疗量溢出时附加2回合【护盾】，护盾量为溢出治疗量的120%。" - }, - "buffid": [], - "map": "" - }, { "id": 115004011, "level": 1, diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 677861a6d..65a575e6f 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -483,9 +483,9 @@ }, { "Id": 415005212, - "When": 7, - "FromCheck": "Target=3,HpproGreater=1000", - "TargetCheck": "", + "When": 17, + "FromCheck": "Target=3", + "TargetCheck": "HpproGreater=1000", "MainSkillCheck": "", "AfterSkillCheck": "", "BuffCheck": "", @@ -494,7 +494,7 @@ "Type": "CallSkillPas", "MaxEmitTimes": 1, "Callback": [ - 915005214 + 215005316 ] }, { diff --git a/bin/json/game_smithycustomer.json b/bin/json/game_smithycustomer.json index 9c5af0b4d..3ba8a3e5b 100644 --- a/bin/json/game_smithycustomer.json +++ b/bin/json/game_smithycustomer.json @@ -11,7 +11,7 @@ { "a": "attr", "t": "gold", - "n": 10 + "n": 0 } ], "weight": 4500 diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index b9d9d847e..f2c6682c5 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -33,9 +33,7 @@ "n": 100 } ], - "module": [ - "practice" - ] + "module": [] }, { "key": 20020, @@ -71,9 +69,7 @@ "n": 101 } ], - "module": [ - "practice" - ] + "module": [] }, { "key": 20030, @@ -697,7 +693,7 @@ "des": 1, "icon": "", "task_Tname": { - "key": "story_80", + "key": "Daily_tasks1", "text": "1" }, "task_name": { @@ -705,7 +701,7 @@ "text": "1" }, "task_display": { - "key": "story_80", + "key": "Daily_tasks1", "text": "1" }, "npc": 10010, @@ -733,7 +729,7 @@ "des": 1, "icon": "", "task_Tname": { - "key": "story_80", + "key": "Daily_tasks2", "text": "1" }, "task_name": { @@ -741,7 +737,7 @@ "text": "1" }, "task_display": { - "key": "story_80", + "key": "Daily_tasks2", "text": "1" }, "npc": 10010, @@ -769,7 +765,7 @@ "des": 1, "icon": "", "task_Tname": { - "key": "story_80", + "key": "Daily_tasks3", "text": "1" }, "task_name": { @@ -777,7 +773,7 @@ "text": "1" }, "task_display": { - "key": "story_80", + "key": "Daily_tasks3", "text": "1" }, "npc": 10010, @@ -805,7 +801,7 @@ "des": 1, "icon": "", "task_Tname": { - "key": "story_80", + "key": "Daily_tasks4", "text": "1" }, "task_name": { @@ -813,7 +809,7 @@ "text": "1" }, "task_display": { - "key": "story_80", + "key": "Daily_tasks4", "text": "1" }, "npc": 10010, @@ -841,7 +837,7 @@ "des": 1, "icon": "", "task_Tname": { - "key": "story_80", + "key": "Daily_tasks5", "text": "1" }, "task_name": { @@ -849,7 +845,7 @@ "text": "1" }, "task_display": { - "key": "story_80", + "key": "Daily_tasks5", "text": "1" }, "npc": 10010, @@ -877,7 +873,7 @@ "des": 1, "icon": "", "task_Tname": { - "key": "story_80", + "key": "Daily_tasks6", "text": "1" }, "task_name": { @@ -885,7 +881,7 @@ "text": "1" }, "task_display": { - "key": "story_80", + "key": "Daily_tasks6", "text": "1" }, "npc": 10010, @@ -913,7 +909,7 @@ "des": 1, "icon": "", "task_Tname": { - "key": "story_80", + "key": "Daily_tasks7", "text": "1" }, "task_name": { @@ -921,7 +917,7 @@ "text": "1" }, "task_display": { - "key": "story_80", + "key": "Daily_tasks7", "text": "1" }, "npc": 10010, @@ -949,7 +945,7 @@ "des": 4, "icon": "", "task_Tname": { - "key": "story_80", + "key": "Weekly_Tasks1", "text": "1" }, "task_name": { @@ -957,7 +953,7 @@ "text": "1" }, "task_display": { - "key": "story_80", + "key": "Weekly_Tasks1", "text": "1" }, "npc": 10040, @@ -985,7 +981,7 @@ "des": 4, "icon": "", "task_Tname": { - "key": "story_80", + "key": "Weekly_Tasks2", "text": "1" }, "task_name": { @@ -993,7 +989,7 @@ "text": "1" }, "task_display": { - "key": "story_80", + "key": "Weekly_Tasks2", "text": "1" }, "npc": 10040, @@ -1021,7 +1017,7 @@ "des": 4, "icon": "", "task_Tname": { - "key": "story_80", + "key": "Weekly_Tasks3", "text": "1" }, "task_name": { @@ -1029,7 +1025,7 @@ "text": "1" }, "task_display": { - "key": "story_80", + "key": "Weekly_Tasks3", "text": "1" }, "npc": 10040, @@ -1057,7 +1053,7 @@ "des": 4, "icon": "", "task_Tname": { - "key": "story_80", + "key": "Weekly_Tasks4", "text": "1" }, "task_name": { @@ -1065,7 +1061,7 @@ "text": "1" }, "task_display": { - "key": "story_80", + "key": "Weekly_Tasks4", "text": "1" }, "npc": 10040, @@ -1093,7 +1089,7 @@ "des": 4, "icon": "", "task_Tname": { - "key": "story_80", + "key": "Weekly_Tasks5", "text": "1" }, "task_name": { @@ -1101,7 +1097,7 @@ "text": "1" }, "task_display": { - "key": "story_80", + "key": "Weekly_Tasks5", "text": "1" }, "npc": 10040, @@ -1129,7 +1125,7 @@ "des": 4, "icon": "", "task_Tname": { - "key": "story_80", + "key": "Weekly_Tasks6", "text": "1" }, "task_name": { @@ -1137,7 +1133,7 @@ "text": "1" }, "task_display": { - "key": "story_80", + "key": "Weekly_Tasks6", "text": "1" }, "npc": 10040, @@ -1165,7 +1161,7 @@ "des": 4, "icon": "", "task_Tname": { - "key": "story_80", + "key": "Weekly_Tasks7", "text": "1" }, "task_name": { @@ -1173,7 +1169,7 @@ "text": "1" }, "task_display": { - "key": "story_80", + "key": "Weekly_Tasks7", "text": "1" }, "npc": 10040, diff --git a/sys/configure/structs/Game.MonsterFormatData.go b/sys/configure/structs/Game.MonsterFormatData.go index de1981a7f..73d3e6790 100644 --- a/sys/configure/structs/Game.MonsterFormatData.go +++ b/sys/configure/structs/Game.MonsterFormatData.go @@ -15,6 +15,7 @@ type GameMonsterFormatData struct { Pos int32 CaptainId int32 IsBoss int32 + BossHpCnt int32 Monster int32 Lv int32 Hppro float32 @@ -34,6 +35,7 @@ func (_v *GameMonsterFormatData)Deserialize(_buf map[string]interface{}) (err er { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pos"].(float64); !_ok_ { err = errors.New("pos error"); return }; _v.Pos = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["captainId"].(float64); !_ok_ { err = errors.New("captainId error"); return }; _v.CaptainId = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["IsBoss"].(float64); !_ok_ { err = errors.New("IsBoss error"); return }; _v.IsBoss = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["bossHpCnt"].(float64); !_ok_ { err = errors.New("bossHpCnt error"); return }; _v.BossHpCnt = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["monster"].(float64); !_ok_ { err = errors.New("monster error"); return }; _v.Monster = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lv"].(float64); !_ok_ { err = errors.New("lv error"); return }; _v.Lv = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hppro"].(float64); !_ok_ { err = errors.New("hppro error"); return }; _v.Hppro = float32(_tempNum_) }