From e37ebb9190108505b317d0f1e62f71d96974995e Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Mon, 20 Nov 2023 15:50:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_guide.json | 6 +-- bin/json/game_puggsyrecruit.json | 32 ++++++++++++ sys/configure/structs/Game.OpencondType.go | 1 - sys/configure/structs/Game.PuggsyRecruit.go | 42 ++++++++++++++++ .../structs/Game.PuggsyRecruitData.go | 50 +++++++++++++++++++ sys/configure/structs/Tables.go | 7 +++ 6 files changed, 134 insertions(+), 4 deletions(-) create mode 100644 bin/json/game_puggsyrecruit.json create mode 100644 sys/configure/structs/Game.PuggsyRecruit.go create mode 100644 sys/configure/structs/Game.PuggsyRecruitData.go diff --git a/bin/json/game_guide.json b/bin/json/game_guide.json index 3dcd0d818..36f8f94aa 100644 --- a/bin/json/game_guide.json +++ b/bin/json/game_guide.json @@ -643,7 +643,7 @@ "x": 0, "y": 0 }, - "txt": "", + "txt": "1000109", "speakerface": 0, "sound": "", "mask": 0, @@ -681,7 +681,7 @@ "x": 0, "y": 0 }, - "txt": "", + "txt": "1000110", "speakerface": 0, "sound": "", "mask": 1, @@ -718,7 +718,7 @@ "x": 0, "y": 0 }, - "txt": "", + "txt": "1000111", "speakerface": 0, "sound": "", "mask": 0, diff --git a/bin/json/game_puggsyrecruit.json b/bin/json/game_puggsyrecruit.json new file mode 100644 index 000000000..41603c72c --- /dev/null +++ b/bin/json/game_puggsyrecruit.json @@ -0,0 +1,32 @@ +[ + { + "star": 3, + "need": [ + { + "a": "attr", + "t": "diamond", + "n": 300 + } + ] + }, + { + "star": 4, + "need": [ + { + "a": "attr", + "t": "diamond", + "n": 300 + } + ] + }, + { + "star": 5, + "need": [ + { + "a": "attr", + "t": "diamond", + "n": 300 + } + ] + } +] \ No newline at end of file diff --git a/sys/configure/structs/Game.OpencondType.go b/sys/configure/structs/Game.OpencondType.go index c95fe8fc4..a7be337cb 100644 --- a/sys/configure/structs/Game.OpencondType.go +++ b/sys/configure/structs/Game.OpencondType.go @@ -14,5 +14,4 @@ const ( GameOpencondType_Maxmapid = 2 GameOpencondType_Worldtaskid = 3 GameOpencondType_Friend = 4 - GameOpencondType_MoonLevel = 5 ) diff --git a/sys/configure/structs/Game.PuggsyRecruit.go b/sys/configure/structs/Game.PuggsyRecruit.go new file mode 100644 index 000000000..cc388e3fa --- /dev/null +++ b/sys/configure/structs/Game.PuggsyRecruit.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 GamePuggsyRecruit struct { + _dataMap map[int32]*GamePuggsyRecruitData + _dataList []*GamePuggsyRecruitData +} + +func NewGamePuggsyRecruit(_buf []map[string]interface{}) (*GamePuggsyRecruit, error) { + _dataList := make([]*GamePuggsyRecruitData, 0, len(_buf)) + dataMap := make(map[int32]*GamePuggsyRecruitData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGamePuggsyRecruitData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Star] = _v + } + } + return &GamePuggsyRecruit{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GamePuggsyRecruit) GetDataMap() map[int32]*GamePuggsyRecruitData { + return table._dataMap +} + +func (table *GamePuggsyRecruit) GetDataList() []*GamePuggsyRecruitData { + return table._dataList +} + +func (table *GamePuggsyRecruit) Get(key int32) *GamePuggsyRecruitData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.PuggsyRecruitData.go b/sys/configure/structs/Game.PuggsyRecruitData.go new file mode 100644 index 000000000..78670dd9e --- /dev/null +++ b/sys/configure/structs/Game.PuggsyRecruitData.go @@ -0,0 +1,50 @@ +//------------------------------------------------------------------------------ +// +// 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 GamePuggsyRecruitData struct { + Star int32 + Need []*Gameatn +} + +const TypeId_GamePuggsyRecruitData = -648363711 + +func (*GamePuggsyRecruitData) GetTypeId() int32 { + return -648363711 +} + +func (_v *GamePuggsyRecruitData)Deserialize(_buf map[string]interface{}) (err error) { + { 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["need"].([]interface{}); !_ok_ { err = errors.New("need error"); return } + + _v.Need = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.Need = append(_v.Need, _list_v_) + } + } + + return +} + +func DeserializeGamePuggsyRecruitData(_buf map[string]interface{}) (*GamePuggsyRecruitData, error) { + v := &GamePuggsyRecruitData{} + 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 f80f00491..38dd2429c 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -309,6 +309,7 @@ type Tables struct { TrackType *GameTrackType PuggsyStar *GamePuggsyStar PuggsyMake *GamePuggsyMake + PuggsyRecruit *GamePuggsyRecruit } func NewTables(loader JsonLoader) (*Tables, error) { @@ -2104,5 +2105,11 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.PuggsyMake, err = NewGamePuggsyMake(buf) ; err != nil { return nil, err } + if buf, err = loader("game_puggsyrecruit") ; err != nil { + return nil, err + } + if tables.PuggsyRecruit, err = NewGamePuggsyRecruit(buf) ; err != nil { + return nil, err + } return tables, nil }