diff --git a/bin/json/game_linestorystagetask.json b/bin/json/game_linestorystagetask.json index 1386f77fd..ffa3a3b0c 100644 --- a/bin/json/game_linestorystagetask.json +++ b/bin/json/game_linestorystagetask.json @@ -1,7 +1,7 @@ [ { "id": 100101, - "posTId": -1, + "preTId": -1, "nextTId": 100102, "cond": [ 101, @@ -18,12 +18,11 @@ "t": "diamond", "n": 10 } - ], - "jump": "heronewlist" + ] }, { "id": 100102, - "posTId": 100101, + "preTId": 100101, "nextTId": 100103, "cond": [ 104 @@ -39,37 +38,33 @@ "t": "diamond", "n": 10 } - ], - "jump": "roleupgrade" + ] }, { "id": 100103, - "posTId": 100102, + "preTId": 100102, "nextTId": 100104, "cond": [ 106 ], - "reward": [], - "jump": "equistrengthen" + "reward": [] }, { "id": 100104, - "posTId": 100103, + "preTId": 100103, "nextTId": 100105, "cond": [ 108 ], - "reward": [], - "jump": "roleupgrade" + "reward": [] }, { "id": 100105, - "posTId": 100103, + "preTId": 100103, "nextTId": -1, "cond": [ 109 ], - "reward": [], - "jump": "roleupgrade" + "reward": [] } ] \ No newline at end of file diff --git a/bin/json/game_linestorytask.json b/bin/json/game_linestorytask.json index afe8b540f..d042a1a25 100644 --- a/bin/json/game_linestorytask.json +++ b/bin/json/game_linestorytask.json @@ -19,7 +19,8 @@ } ], "finish": 0, - "ending": 1 + "ending": 1, + "resetto": -1 }, { "id": 1002, @@ -41,7 +42,8 @@ } ], "finish": 0, - "ending": 1 + "ending": 1, + "resetto": -1 }, { "id": 1003, @@ -63,7 +65,8 @@ } ], "finish": 0, - "ending": 1 + "ending": 1, + "resetto": -1 }, { "id": 1004, @@ -72,20 +75,10 @@ 100101, 100102 ], - "reward": [ - { - "a": "attr", - "t": "gold", - "n": 100 - }, - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ], + "reward": [], "finish": 1, - "ending": 0 + "ending": 0, + "resetto": 1001 }, { "id": 1005, @@ -94,20 +87,10 @@ 100101, 100102 ], - "reward": [ - { - "a": "attr", - "t": "gold", - "n": 100 - }, - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ], + "reward": [], "finish": 0, - "ending": 1 + "ending": 1, + "resetto": -1 }, { "id": 1006, @@ -116,19 +99,9 @@ 100101, 100102 ], - "reward": [ - { - "a": "attr", - "t": "gold", - "n": 100 - }, - { - "a": "attr", - "t": "diamond", - "n": 10 - } - ], + "reward": [], "finish": 1, - "ending": 1 + "ending": 1, + "resetto": -1 } ] \ No newline at end of file diff --git a/sys/configure/structs/Game.VikingBossSkill.go b/sys/configure/structs/Game.VikingBossSkill.go new file mode 100644 index 000000000..fc41f99ff --- /dev/null +++ b/sys/configure/structs/Game.VikingBossSkill.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +type GameVikingBossSkill struct { + _dataMap map[int32]*GameVikingBossSkillData + _dataList []*GameVikingBossSkillData +} + +func NewGameVikingBossSkill(_buf []map[string]interface{}) (*GameVikingBossSkill, error) { + _dataList := make([]*GameVikingBossSkillData, 0, len(_buf)) + dataMap := make(map[int32]*GameVikingBossSkillData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameVikingBossSkillData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Type] = _v + } + } + return &GameVikingBossSkill{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameVikingBossSkill) GetDataMap() map[int32]*GameVikingBossSkillData { + return table._dataMap +} + +func (table *GameVikingBossSkill) GetDataList() []*GameVikingBossSkillData { + return table._dataList +} + +func (table *GameVikingBossSkill) Get(key int32) *GameVikingBossSkillData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.VikingBossSkillData.go b/sys/configure/structs/Game.VikingBossSkillData.go new file mode 100644 index 000000000..3b91b0cc1 --- /dev/null +++ b/sys/configure/structs/Game.VikingBossSkillData.go @@ -0,0 +1,56 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg + +import "errors" + +type GameVikingBossSkillData struct { + Type int32 + Name string + Introduce string + Icon string + Guardskill []int32 +} + +const TypeId_GameVikingBossSkillData = -1331434488 + +func (*GameVikingBossSkillData) GetTypeId() int32 { + return -1331434488 +} + +func (_v *GameVikingBossSkillData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["introduce"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Introduce error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Introduce, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["guardskill"].([]interface{}); !_ok_ { err = errors.New("guardskill error"); return } + + _v.Guardskill = 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.Guardskill = append(_v.Guardskill, _list_v_) + } + } + + return +} + +func DeserializeGameVikingBossSkillData(_buf map[string]interface{}) (*GameVikingBossSkillData, error) { + v := &GameVikingBossSkillData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 749f010ff..6f46c173b 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -58,7 +58,6 @@ type Tables struct { Facemod *GameFacemod Msgdistrib *GameMsgdistrib Opencond *GameOpencond - Stroy *GameStroy Pagoda *GamePagoda PagodaTaskReward *GamePagodaTaskReward PagodaSeasonReward *GamePagodaSeasonReward @@ -87,6 +86,7 @@ type Tables struct { LineStoryChapter *GameLineStoryChapter LineStoryTask *GameLineStoryTask LineStoryStageTask *GameLineStoryStageTask + VikingBossSkill *GameVikingBossSkill } func NewTables(loader JsonLoader) (*Tables, error) { @@ -376,12 +376,6 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.Opencond, err = NewGameOpencond(buf) ; err != nil { return nil, err } - if buf, err = loader("game_stroy") ; err != nil { - return nil, err - } - if tables.Stroy, err = NewGameStroy(buf) ; err != nil { - return nil, err - } if buf, err = loader("game_pagoda") ; err != nil { return nil, err } @@ -550,5 +544,11 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.LineStoryStageTask, err = NewGameLineStoryStageTask(buf) ; err != nil { return nil, err } + if buf, err = loader("game_vikingbossskill") ; err != nil { + return nil, err + } + if tables.VikingBossSkill, err = NewGameVikingBossSkill(buf) ; err != nil { + return nil, err + } return tables, nil } diff --git a/sys/configure/structs/game.monsterData.go b/sys/configure/structs/game.monsterData.go index 8b7270be2..71c1b4138 100644 --- a/sys/configure/structs/game.monsterData.go +++ b/sys/configure/structs/game.monsterData.go @@ -15,7 +15,8 @@ type GameMonsterData struct { HeroId string Name string Star int32 - Equip []int32 + Equip2 int32 + Equip4 int32 } const TypeId_GameMonsterData = 31965864 @@ -29,20 +30,8 @@ func (_v *GameMonsterData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; if _v.HeroId, _ok_ = _buf["hero_id"].(string); !_ok_ { err = errors.New("hero_id error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["equip"].([]interface{}); !_ok_ { err = errors.New("equip error"); return } - - _v.Equip = 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.Equip = append(_v.Equip, _list_v_) - } - } - + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["equip2"].(float64); !_ok_ { err = errors.New("equip2 error"); return }; _v.Equip2 = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["equip4"].(float64); !_ok_ { err = errors.New("equip4 error"); return }; _v.Equip4 = int32(_tempNum_) } return } diff --git a/sys/configure/structs/game.opencondData.go b/sys/configure/structs/game.opencondData.go index e7fa7b104..3d6a2a42b 100644 --- a/sys/configure/structs/game.opencondData.go +++ b/sys/configure/structs/game.opencondData.go @@ -13,7 +13,7 @@ import "errors" type GameOpencondData struct { Id string Name string - Main string + Main int32 Optional string Wkqbx int32 Kqbx int32 @@ -31,7 +31,7 @@ func (*GameOpencondData) GetTypeId() int32 { func (_v *GameOpencondData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } - { var _ok_ bool; if _v.Main, _ok_ = _buf["main"].(string); !_ok_ { err = errors.New("main error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["main"].(float64); !_ok_ { err = errors.New("main error"); return }; _v.Main = int32(_tempNum_) } { var _ok_ bool; if _v.Optional, _ok_ = _buf["optional"].(string); !_ok_ { err = errors.New("optional error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["wkqbx"].(float64); !_ok_ { err = errors.New("wkqbx error"); return }; _v.Wkqbx = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["kqbx"].(float64); !_ok_ { err = errors.New("kqbx error"); return }; _v.Kqbx = int32(_tempNum_) } diff --git a/sys/configure/structs/game.stroy.go b/sys/configure/structs/game.stroy.go deleted file mode 100644 index a6fa0afff..000000000 --- a/sys/configure/structs/game.stroy.go +++ /dev/null @@ -1,42 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -package cfg - -type GameStroy struct { - _dataMap map[int32]*GameStroyData - _dataList []*GameStroyData -} - -func NewGameStroy(_buf []map[string]interface{}) (*GameStroy, error) { - _dataList := make([]*GameStroyData, 0, len(_buf)) - dataMap := make(map[int32]*GameStroyData) - for _, _ele_ := range _buf { - if _v, err2 := DeserializeGameStroyData(_ele_); err2 != nil { - return nil, err2 - } else { - _dataList = append(_dataList, _v) - dataMap[_v.Id] = _v - } - } - return &GameStroy{_dataList:_dataList, _dataMap:dataMap}, nil -} - -func (table *GameStroy) GetDataMap() map[int32]*GameStroyData { - return table._dataMap -} - -func (table *GameStroy) GetDataList() []*GameStroyData { - return table._dataList -} - -func (table *GameStroy) Get(key int32) *GameStroyData { - return table._dataMap[key] -} - - diff --git a/sys/configure/structs/game.stroyData.go b/sys/configure/structs/game.stroyData.go deleted file mode 100644 index fe8c01ba2..000000000 --- a/sys/configure/structs/game.stroyData.go +++ /dev/null @@ -1,128 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -package cfg - -import "errors" -import "bright/serialization" - -type GameStroyData struct { - Id int32 - Groupid int32 - Before int32 - Next int32 - Type int32 - Bg string - Place int32 - Speak string - Listen string - Emoji string - Des string -<<<<<<< HEAD - Modelstatetarget string - Modelstate int32 -======= ->>>>>>> e241cbe (支线剧情任务) - Modelaction string - State string - Chose []int32 - Turn int32 - Show int32 - Move string - Action string - Sound string - Position serialization.Vector3 - Revolve serialization.Vector3 - Size serialization.Vector3 - Perf string - Cg string - Skip bool -} - -const TypeId_GameStroyData = 1697302313 - -func (*GameStroyData) GetTypeId() int32 { - return 1697302313 -} - -func (_v *GameStroyData)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["groupid"].(float64); !_ok_ { err = errors.New("groupid error"); return }; _v.Groupid = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["before"].(float64); !_ok_ { err = errors.New("before error"); return }; _v.Before = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["next"].(float64); !_ok_ { err = errors.New("next error"); return }; _v.Next = 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 _ok_ bool; if _v.Bg, _ok_ = _buf["bg"].(string); !_ok_ { err = errors.New("bg error"); return } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["place"].(float64); !_ok_ { err = errors.New("place error"); return }; _v.Place = int32(_tempNum_) } - { var _ok_ bool; if _v.Speak, _ok_ = _buf["speak"].(string); !_ok_ { err = errors.New("speak error"); return } } - { var _ok_ bool; if _v.Listen, _ok_ = _buf["listen"].(string); !_ok_ { err = errors.New("listen error"); return } } - { var _ok_ bool; if _v.Emoji, _ok_ = _buf["emoji"].(string); !_ok_ { err = errors.New("emoji error"); return } } - { var _ok_ bool; if _v.Des, _ok_ = _buf["des"].(string); !_ok_ { err = errors.New("des error"); return } } -<<<<<<< HEAD - { var _ok_ bool; if _v.Modelstatetarget, _ok_ = _buf["modelstatetarget"].(string); !_ok_ { err = errors.New("modelstatetarget error"); return } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["modelstate"].(float64); !_ok_ { err = errors.New("modelstate error"); return }; _v.Modelstate = int32(_tempNum_) } -======= ->>>>>>> e241cbe (支线剧情任务) - { var _ok_ bool; if _v.Modelaction, _ok_ = _buf["modelaction"].(string); !_ok_ { err = errors.New("modelaction error"); return } } - { var _ok_ bool; if _v.State, _ok_ = _buf["state"].(string); !_ok_ { err = errors.New("state error"); return } } - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["chose"].([]interface{}); !_ok_ { err = errors.New("chose error"); return } - - _v.Chose = 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.Chose = append(_v.Chose, _list_v_) - } - } - - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["turn"].(float64); !_ok_ { err = errors.New("turn error"); return }; _v.Turn = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["show"].(float64); !_ok_ { err = errors.New("show error"); return }; _v.Show = int32(_tempNum_) } - { var _ok_ bool; if _v.Move, _ok_ = _buf["move"].(string); !_ok_ { err = errors.New("move error"); return } } - { var _ok_ bool; if _v.Action, _ok_ = _buf["action"].(string); !_ok_ { err = errors.New("action error"); return } } - { var _ok_ bool; if _v.Sound, _ok_ = _buf["sound"].(string); !_ok_ { err = errors.New("sound error"); return } } - { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["position"].(map[string]interface{}); !_ok_ { err = errors.New("position error"); return } - var _x_, _y_, _z_ float32; - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["z"].(float64); !_ok_ { err = errors.New("z error"); return }; _z_ = float32(_tempNum_) } - _v.Position = serialization.NewVector3(_x_, _y_, _z_) - } - - { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["revolve"].(map[string]interface{}); !_ok_ { err = errors.New("revolve error"); return } - var _x_, _y_, _z_ float32; - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["z"].(float64); !_ok_ { err = errors.New("z error"); return }; _z_ = float32(_tempNum_) } - _v.Revolve = serialization.NewVector3(_x_, _y_, _z_) - } - - { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["size"].(map[string]interface{}); !_ok_ { err = errors.New("size error"); return } - var _x_, _y_, _z_ float32; - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["z"].(float64); !_ok_ { err = errors.New("z error"); return }; _z_ = float32(_tempNum_) } - _v.Size = serialization.NewVector3(_x_, _y_, _z_) - } - - { var _ok_ bool; if _v.Perf, _ok_ = _buf["perf"].(string); !_ok_ { err = errors.New("perf error"); return } } - { var _ok_ bool; if _v.Cg, _ok_ = _buf["cg"].(string); !_ok_ { err = errors.New("cg error"); return } } - { var _ok_ bool; if _v.Skip, _ok_ = _buf["skip"].(bool); !_ok_ { err = errors.New("skip error"); return } } - return -} - -func DeserializeGameStroyData(_buf map[string]interface{}) (*GameStroyData, error) { - v := &GameStroyData{} - if err := v.Deserialize(_buf); err == nil { - return v, nil - } else { - return nil, err - } -}