diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index d4717eed8..d184bf783 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -32982,7 +32982,7 @@ }, "value": 1, "filter": [ - 20352 + 20351 ], "filter2": [] }, diff --git a/bin/json/game_fightglobalevent.json b/bin/json/game_fightglobalevent.json index 11f376b10..d5ff9bf06 100644 --- a/bin/json/game_fightglobalevent.json +++ b/bin/json/game_fightglobalevent.json @@ -2,7 +2,8 @@ { "Id": 1, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "fightevent_fight_global_event_desc_1", "text": "使用攻击全体敌人,并吸收敌人的行动值。" @@ -22,7 +23,8 @@ { "Id": 2, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "fightevent_fight_global_event_desc_2", "text": "使用击杀首领,并获得生命值恢复。" @@ -42,7 +44,8 @@ { "Id": 3, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "fightevent_fight_global_event_desc_3", "text": "获得本次战斗胜利。" @@ -62,7 +65,8 @@ { "Id": 4, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "fightevent_fight_global_event_desc_4", "text": "使用攻击全体敌人,并吸收敌人的行动值。" @@ -82,7 +86,8 @@ { "Id": 5, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "fightevent_fight_global_event_desc_5", "text": "使用击杀首领,并获得生命值恢复。" @@ -102,7 +107,8 @@ { "Id": 6, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "fightevent_fight_global_event_desc_6", "text": "获得本次战斗胜利。" @@ -122,7 +128,8 @@ { "Id": 7, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "fightevent_fight_global_event_desc_7", "text": "使用攻击全体敌人,并吸收敌人的行动值。" @@ -142,7 +149,8 @@ { "Id": 8, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "fightevent_fight_global_event_desc_8", "text": "使用击杀首领,并获得生命值恢复。" @@ -162,7 +170,8 @@ { "Id": 9, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "fightevent_fight_global_event_desc_9", "text": "获得本次战斗胜利。" @@ -182,7 +191,8 @@ { "Id": 10, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "fightevent_fight_global_event_desc_10", "text": "使用攻击全体敌人,并吸收敌人的行动值。" @@ -202,7 +212,8 @@ { "Id": 11, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "fightevent_fight_global_event_desc_11", "text": "使用击杀首领,并获得生命值恢复。" @@ -222,7 +233,8 @@ { "Id": 12, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "fightevent_fight_global_event_desc_12", "text": "使用击杀首领,并获得生命值恢复。" @@ -244,7 +256,8 @@ { "Id": 13, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "fightevent_fight_global_event_desc_13", "text": "使用击杀首领,并获得生命值恢复。" @@ -266,7 +279,8 @@ { "Id": 14, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "fightevent_fight_global_event_desc_14", "text": "使用击杀首领,并获得生命值恢复。" @@ -289,8 +303,9 @@ }, { "Id": 15, - "Count": 1, - "LoopTime": true, + "Count": 0, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -318,7 +333,8 @@ { "Id": 16, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -338,7 +354,8 @@ { "Id": 17, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -358,7 +375,8 @@ { "Id": 18, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -378,7 +396,8 @@ { "Id": 19, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -398,7 +417,8 @@ { "Id": 20, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -418,7 +438,8 @@ { "Id": 21, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -440,7 +461,8 @@ { "Id": 22, "Count": 2, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -462,7 +484,8 @@ { "Id": 101, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "fightevent_fight_global_event_desc_15", "text": "使用给我方增加【攻击提升】状态。" @@ -482,7 +505,8 @@ { "Id": 102, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "fightevent_fight_global_event_desc_16", "text": "使用给敌方增加【防御下降】状态。" @@ -502,7 +526,8 @@ { "Id": 103, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "fightevent_fight_global_event_desc_17", "text": "使用击杀首领。" @@ -522,7 +547,8 @@ { "Id": 104, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "fightevent_fight_global_event_desc_18", "text": "使用给我方增加【护盾】和【免疫】状态。" @@ -542,7 +568,8 @@ { "Id": 105, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "fightevent_fight_global_event_desc_19", "text": "使用给敌方增加【冰冻】状态。" @@ -562,7 +589,8 @@ { "Id": 106, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "fightevent_fight_global_event_desc_20", "text": "使用击杀首领。" @@ -582,7 +610,8 @@ { "Id": 107, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "fightevent_fight_global_event_desc_15", "text": "使用给敌方增加【眩晕】状态。" @@ -602,7 +631,8 @@ { "Id": 108, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "fightevent_fight_global_event_desc_16", "text": "使用给敌方增加【无法获得增益】状态。" @@ -622,7 +652,8 @@ { "Id": 109, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -646,7 +677,8 @@ { "Id": 110, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -668,7 +700,8 @@ { "Id": 111, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -690,7 +723,8 @@ { "Id": 112, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -712,7 +746,8 @@ { "Id": 113, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -734,7 +769,8 @@ { "Id": 114, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -756,7 +792,8 @@ { "Id": 120, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -778,7 +815,8 @@ { "Id": 121, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -802,7 +840,8 @@ { "Id": 122, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -826,7 +865,8 @@ { "Id": 123, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -848,7 +888,8 @@ { "Id": 124, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -872,7 +913,8 @@ { "Id": 125, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -894,7 +936,8 @@ { "Id": 126, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -918,7 +961,8 @@ { "Id": 130, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -942,7 +986,8 @@ { "Id": 131, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -964,7 +1009,8 @@ { "Id": 132, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -986,7 +1032,8 @@ { "Id": 133, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -1010,7 +1057,8 @@ { "Id": 134, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -1034,7 +1082,8 @@ { "Id": 135, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -1056,7 +1105,8 @@ { "Id": 136, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -1078,7 +1128,8 @@ { "Id": 137, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -1103,7 +1154,8 @@ { "Id": 138, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -1128,7 +1180,8 @@ { "Id": 139, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -1153,7 +1206,8 @@ { "Id": 140, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -1178,7 +1232,8 @@ { "Id": 141, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -1203,7 +1258,8 @@ { "Id": 142, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" @@ -1232,7 +1288,8 @@ { "Id": 143, "Count": 1, - "LoopTime": false, + "Progress": false, + "ResultInv": false, "desc": { "key": "", "text": "" diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 9f5359ae0..c9613aee2 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -2297,6 +2297,59 @@ ], "gm": 1 }, + { + "id": "11023011", + "name": { + "key": "item_item_name_11023011", + "text": "伟大力碎片" + }, + "usetype": 7, + "color": 2, + "bagtype": 2, + "index": 2, + "special_type": 0, + "hold": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 50, + "synthetize_deplete": [], + "synthetize_get": [ + { + "a": "hero", + "t": "23004", + "n": 1 + } + ], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 0, + "img": "item_50013001", + "intr": { + "key": "item_item_intr_11023011", + "text": "伟大力碎片碎片,集齐一定数量可以兑换相应的守护者。" + }, + "describe": { + "key": "item_item_describe_11023011", + "text": "伟大力碎片碎片。" + }, + "dialogue": { + "key": "item_item_dialogue_11023011", + "text": "" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "gm": 1 + }, { "id": "11024001", "name": { @@ -5976,6 +6029,55 @@ ], "gm": 0 }, + { + "id": "12023011", + "name": { + "key": "item_item_name_12023011", + "text": "伟大力守护之心" + }, + "usetype": 1, + "color": 2, + "bagtype": 3, + "index": 99, + "special_type": 0, + "hold": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [ + 107 + ], + "use_skip": 166, + "upper_limit": 0, + "img": "xxtx_js_23004", + "intr": { + "key": "item_item_intr_12023011", + "text": "伟大力守护之心,可在觉醒界面用于相应守护者的觉醒等级提升。" + }, + "describe": { + "key": "item_item_describe_12023011", + "text": "明明是一个西部单身汉,为什么有草莓的味道?" + }, + "dialogue": { + "key": "item_item_dialogue_12023011", + "text": "" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "gm": 0 + }, { "id": "12024001", "name": { diff --git a/bin/json/game_worldtask.json b/bin/json/game_worldtask.json index 2e9ddd2a1..85ac3ef4f 100644 --- a/bin/json/game_worldtask.json +++ b/bin/json/game_worldtask.json @@ -11659,7 +11659,7 @@ "text": "委托-美肚鲨寻物-接取" }, "get_item": [], - "trigger": 0, + "trigger": 1, "show_mode": 0, "npc": 60430, "completetask": [ @@ -11702,7 +11702,7 @@ "text": "委托-胡德先生寻物-接取" }, "get_item": [], - "trigger": 0, + "trigger": 1, "show_mode": 0, "npc": 60440, "completetask": [ @@ -11745,7 +11745,7 @@ "text": "委托-暴芙纳特寻物-接取" }, "get_item": [], - "trigger": 0, + "trigger": 1, "show_mode": 0, "npc": 60450, "completetask": [ @@ -11788,7 +11788,7 @@ "text": "委托-靴猫寻物-接取" }, "get_item": [], - "trigger": 0, + "trigger": 1, "show_mode": 0, "npc": 60460, "completetask": [ @@ -11831,7 +11831,7 @@ "text": "委托-啊啊寻物-接取" }, "get_item": [], - "trigger": 0, + "trigger": 1, "show_mode": 0, "npc": 60470, "completetask": [ diff --git a/sys/configure/structs/Game.FightGlobalEventData.go b/sys/configure/structs/Game.FightGlobalEventData.go index f68c38a3d..d861db4e2 100644 --- a/sys/configure/structs/Game.FightGlobalEventData.go +++ b/sys/configure/structs/Game.FightGlobalEventData.go @@ -13,7 +13,8 @@ import "errors" type GameFightGlobalEventData struct { Id int32 Count int32 - LoopTime bool + Progress bool + ResultInv bool Desc string When int32 FromCheck string @@ -37,7 +38,8 @@ func (*GameFightGlobalEventData) GetTypeId() int32 { func (_v *GameFightGlobalEventData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Id"].(float64); !_ok_ { err = errors.New("Id error"); return }; _v.Id = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Count"].(float64); !_ok_ { err = errors.New("Count error"); return }; _v.Count = int32(_tempNum_) } - { var _ok_ bool; if _v.LoopTime, _ok_ = _buf["LoopTime"].(bool); !_ok_ { err = errors.New("LoopTime error"); return } } + { var _ok_ bool; if _v.Progress, _ok_ = _buf["Progress"].(bool); !_ok_ { err = errors.New("Progress error"); return } } + { var _ok_ bool; if _v.ResultInv, _ok_ = _buf["ResultInv"].(bool); !_ok_ { err = errors.New("ResultInv error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["desc"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["When"].(float64); !_ok_ { err = errors.New("When error"); return }; _v.When = int32(_tempNum_) } { var _ok_ bool; if _v.FromCheck, _ok_ = _buf["FromCheck"].(string); !_ok_ { err = errors.New("FromCheck error"); return } }