diff --git a/bin/json/game_combatmanster.json b/bin/json/game_combatmanster.json index 1cda05891..c078de435 100644 --- a/bin/json/game_combatmanster.json +++ b/bin/json/game_combatmanster.json @@ -1,6 +1,53 @@ [ { "id": 101011, + "type": 1, + "sencenstory": [ + 3000011, + 3000012 + ], + "time": 3, + "clickstory": 0, + "formatList": [ + 101011 + ], + "award": [ + { + "a": "attr", + "t": "gold", + "n": 1650 + } + ] + }, + { + "id": 101012, + "type": 1, + "sencenstory": [ + 3000011, + 3000012 + ], + "time": 3, + "clickstory": 0, + "formatList": [ + 101011 + ], + "award": [ + { + "a": "attr", + "t": "gold", + "n": 1650 + } + ] + }, + { + "id": 101013, + "type": 1, + "sencenstory": [ + 3000011, + 3000012 + ], + "time": 3, + "clickstory": 0, "formatList": [ 101011 ], @@ -14,6 +61,13 @@ }, { "id": 101021, + "type": 1, + "sencenstory": [ + 3000011, + 3000012 + ], + "time": 3, + "clickstory": 0, "formatList": [ 101021 ], @@ -27,6 +81,13 @@ }, { "id": 110213, + "type": 1, + "sencenstory": [ + 3000011, + 3000012 + ], + "time": 3, + "clickstory": 0, "formatList": [ 101072 ], @@ -40,6 +101,10 @@ }, { "id": 110214, + "type": 1, + "sencenstory": [], + "time": 0, + "clickstory": 0, "formatList": [ 101072 ], @@ -53,6 +118,10 @@ }, { "id": 110215, + "type": 1, + "sencenstory": [], + "time": 0, + "clickstory": 0, "formatList": [ 101072 ], @@ -66,6 +135,10 @@ }, { "id": 110216, + "type": 1, + "sencenstory": [], + "time": 0, + "clickstory": 0, "formatList": [ 101072 ], @@ -79,6 +152,10 @@ }, { "id": 120031, + "type": 1, + "sencenstory": [], + "time": 0, + "clickstory": 0, "formatList": [ 101072 ], @@ -92,6 +169,10 @@ }, { "id": 120032, + "type": 1, + "sencenstory": [], + "time": 0, + "clickstory": 0, "formatList": [ 101072 ], @@ -105,6 +186,10 @@ }, { "id": 120033, + "type": 1, + "sencenstory": [], + "time": 0, + "clickstory": 0, "formatList": [ 101072 ], @@ -118,6 +203,10 @@ }, { "id": 120034, + "type": 1, + "sencenstory": [], + "time": 0, + "clickstory": 0, "formatList": [ 101072 ], @@ -131,6 +220,10 @@ }, { "id": 120035, + "type": 1, + "sencenstory": [], + "time": 0, + "clickstory": 0, "formatList": [ 101072 ], @@ -144,6 +237,10 @@ }, { "id": 120036, + "type": 1, + "sencenstory": [], + "time": 0, + "clickstory": 0, "formatList": [ 101072 ], @@ -157,6 +254,10 @@ }, { "id": 130011, + "type": 1, + "sencenstory": [], + "time": 0, + "clickstory": 0, "formatList": [ 101072 ], @@ -170,6 +271,10 @@ }, { "id": 130012, + "type": 1, + "sencenstory": [], + "time": 0, + "clickstory": 0, "formatList": [ 101072 ], @@ -183,6 +288,10 @@ }, { "id": 130013, + "type": 1, + "sencenstory": [], + "time": 0, + "clickstory": 0, "formatList": [ 101072 ], @@ -193,5 +302,41 @@ "n": 1650 } ] + }, + { + "id": 200001, + "type": 2, + "sencenstory": [ + 3000011, + 3000012 + ], + "time": 3, + "clickstory": 100002, + "formatList": [], + "award": [] + }, + { + "id": 200002, + "type": 2, + "sencenstory": [ + 3000011, + 3000012 + ], + "time": 3, + "clickstory": 100002, + "formatList": [], + "award": [] + }, + { + "id": 200003, + "type": 2, + "sencenstory": [ + 3000011, + 3000012 + ], + "time": 3, + "clickstory": 100002, + "formatList": [], + "award": [] } ] \ No newline at end of file diff --git a/bin/json/game_rdtaskcondi.json b/bin/json/game_rdtaskcondi.json index 724974408..7772c3fdf 100644 --- a/bin/json/game_rdtaskcondi.json +++ b/bin/json/game_rdtaskcondi.json @@ -1076,6 +1076,17 @@ "data4": 4, "data5": 4 }, + { + "id": 194, + "datatype": 2, + "type": 138, + "inited": [], + "data1": 30, + "data2": 0, + "data3": 0, + "data4": 0, + "data5": 0 + }, { "id": 10001, "datatype": 2, diff --git a/sys/configure/structs/Game.CombatLevelData.go b/sys/configure/structs/Game.CombatLevelData.go index 532ddd9fd..944fa2a35 100644 --- a/sys/configure/structs/Game.CombatLevelData.go +++ b/sys/configure/structs/Game.CombatLevelData.go @@ -12,6 +12,7 @@ import "errors" type GameCombatLevelData struct { Id int32 + Scene string FormatList []int32 Droplist []int32 PassformatList []int32 @@ -27,6 +28,7 @@ func (*GameCombatLevelData) GetTypeId() int32 { func (_v *GameCombatLevelData)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; if _v.Scene, _ok_ = _buf["scene"].(string); !_ok_ { err = errors.New("scene error"); return } } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/Game.CombatMansterData.go b/sys/configure/structs/Game.CombatMansterData.go index f059cb9c5..acf8c9548 100644 --- a/sys/configure/structs/Game.CombatMansterData.go +++ b/sys/configure/structs/Game.CombatMansterData.go @@ -12,6 +12,10 @@ import "errors" type GameCombatMansterData struct { Id int32 + Type int32 + Sencenstory []int32 + Time int32 + Clickstory int32 FormatList []int32 Award []*Gameatn } @@ -24,6 +28,23 @@ func (*GameCombatMansterData) GetTypeId() int32 { func (_v *GameCombatMansterData)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["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["sencenstory"].([]interface{}); !_ok_ { err = errors.New("sencenstory error"); return } + + _v.Sencenstory = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + 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.Sencenstory = append(_v.Sencenstory, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["time"].(float64); !_ok_ { err = errors.New("time error"); return }; _v.Time = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["clickstory"].(float64); !_ok_ { err = errors.New("clickstory error"); return }; _v.Clickstory = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool