diff --git a/bin/json/game_puggsypasscheck.json b/bin/json/game_puggsypasscheck.json new file mode 100644 index 000000000..fcd36683c --- /dev/null +++ b/bin/json/game_puggsypasscheck.json @@ -0,0 +1,212 @@ +[ + { + "id": 10001, + "pay_id": "passcheck_1", + "parameter": 5, + "unlock_text": { + "key": "passcheck_passcheck_unlock_text_10001", + "text": "{0}个地格" + }, + "free_reward": { + "a": "attr", + "t": "diamond", + "n": 30 + }, + "pay_reward": [ + { + "a": "attr", + "t": "diamond", + "n": 300 + } + ] + }, + { + "id": 10002, + "pay_id": "passcheck_1", + "parameter": 10, + "unlock_text": { + "key": "passcheck_passcheck_unlock_text_10002", + "text": "{0}个地格" + }, + "free_reward": { + "a": "attr", + "t": "diamond", + "n": 30 + }, + "pay_reward": [ + { + "a": "attr", + "t": "diamond", + "n": 300 + } + ] + }, + { + "id": 10003, + "pay_id": "passcheck_1", + "parameter": 15, + "unlock_text": { + "key": "passcheck_passcheck_unlock_text_10003", + "text": "{0}个地格" + }, + "free_reward": { + "a": "attr", + "t": "diamond", + "n": 30 + }, + "pay_reward": [ + { + "a": "attr", + "t": "diamond", + "n": 300 + } + ] + }, + { + "id": 10004, + "pay_id": "passcheck_1", + "parameter": 20, + "unlock_text": { + "key": "passcheck_passcheck_unlock_text_10004", + "text": "{0}个地格" + }, + "free_reward": { + "a": "attr", + "t": "diamond", + "n": 30 + }, + "pay_reward": [ + { + "a": "attr", + "t": "diamond", + "n": 300 + } + ] + }, + { + "id": 10005, + "pay_id": "passcheck_1", + "parameter": 25, + "unlock_text": { + "key": "passcheck_passcheck_unlock_text_10005", + "text": "{0}个地格" + }, + "free_reward": { + "a": "attr", + "t": "diamond", + "n": 30 + }, + "pay_reward": [ + { + "a": "attr", + "t": "diamond", + "n": 300 + } + ] + }, + { + "id": 10006, + "pay_id": "passcheck_1", + "parameter": 30, + "unlock_text": { + "key": "passcheck_passcheck_unlock_text_10006", + "text": "{0}个地格" + }, + "free_reward": { + "a": "attr", + "t": "diamond", + "n": 30 + }, + "pay_reward": [ + { + "a": "attr", + "t": "diamond", + "n": 300 + } + ] + }, + { + "id": 10007, + "pay_id": "passcheck_1", + "parameter": 35, + "unlock_text": { + "key": "passcheck_passcheck_unlock_text_10007", + "text": "{0}个地格" + }, + "free_reward": { + "a": "attr", + "t": "diamond", + "n": 30 + }, + "pay_reward": [ + { + "a": "attr", + "t": "diamond", + "n": 300 + } + ] + }, + { + "id": 10008, + "pay_id": "passcheck_1", + "parameter": 40, + "unlock_text": { + "key": "passcheck_passcheck_unlock_text_10008", + "text": "{0}个地格" + }, + "free_reward": { + "a": "attr", + "t": "diamond", + "n": 30 + }, + "pay_reward": [ + { + "a": "attr", + "t": "diamond", + "n": 300 + } + ] + }, + { + "id": 10009, + "pay_id": "passcheck_1", + "parameter": 45, + "unlock_text": { + "key": "passcheck_passcheck_unlock_text_10009", + "text": "{0}个地格" + }, + "free_reward": { + "a": "attr", + "t": "diamond", + "n": 30 + }, + "pay_reward": [ + { + "a": "attr", + "t": "diamond", + "n": 300 + } + ] + }, + { + "id": 10010, + "pay_id": "passcheck_1", + "parameter": 50, + "unlock_text": { + "key": "passcheck_passcheck_unlock_text_10010", + "text": "{0}个地格" + }, + "free_reward": { + "a": "attr", + "t": "diamond", + "n": 30 + }, + "pay_reward": [ + { + "a": "attr", + "t": "diamond", + "n": 300 + } + ] + } +] \ No newline at end of file diff --git a/modules/island/api_receive.go b/modules/island/api_receive.go index 92e857443..93d27807c 100644 --- a/modules/island/api_receive.go +++ b/modules/island/api_receive.go @@ -17,7 +17,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.IsLandReceiveReq var ( info *pb.DBIsland warorder *pb.Warorder - confs []*cfg.GamePuggsyPasscheckData + confs []*cfg.GamePuggsyPassCheckData awards []*cfg.Gameatn award []*pb.UserAtno err error diff --git a/modules/island/configure.go b/modules/island/configure.go index c825f1b41..f9d46ab13 100644 --- a/modules/island/configure.go +++ b/modules/island/configure.go @@ -31,7 +31,7 @@ func (this *ConfigureComp) Init(service core.IService, module core.IModule, comp err = this.LoadConfigure(game_puggsyskill, cfg.NewGamePuggsySkill) err = this.LoadConfigure(game_puggsyfight, cfg.NewGamePuggsyFight) err = this.LoadConfigure(game_puggsyscore, cfg.NewGamePuggsyScore) - err = this.LoadConfigure(game_puggsypasscheck, cfg.NewGamePuggsyPasscheck) + err = this.LoadConfigure(game_puggsypasscheck, cfg.NewGamePuggsyPassCheck) return } @@ -133,14 +133,14 @@ func (this *ConfigureComp) getGamePuggsyScoreData(harm int32) (results *cfg.Game } // 获取伤害对应的评分组 -func (this *ConfigureComp) getGamePuggsyPasscheckData() (results []*cfg.GamePuggsyPasscheckData, err error) { +func (this *ConfigureComp) getGamePuggsyPasscheckData() (results []*cfg.GamePuggsyPassCheckData, err error) { var ( v interface{} ) if v, err = this.GetConfigure(game_puggsyscore); err != nil { return } else { - results = v.(*cfg.GamePuggsyPasscheck).GetDataList() + results = v.(*cfg.GamePuggsyPassCheck).GetDataList() } return } diff --git a/sys/configure/structs/Game.PuggsyPassCheck.go b/sys/configure/structs/Game.PuggsyPassCheck.go new file mode 100644 index 000000000..c122f0b29 --- /dev/null +++ b/sys/configure/structs/Game.PuggsyPassCheck.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 GamePuggsyPassCheck struct { + _dataMap map[int32]*GamePuggsyPassCheckData + _dataList []*GamePuggsyPassCheckData +} + +func NewGamePuggsyPassCheck(_buf []map[string]interface{}) (*GamePuggsyPassCheck, error) { + _dataList := make([]*GamePuggsyPassCheckData, 0, len(_buf)) + dataMap := make(map[int32]*GamePuggsyPassCheckData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGamePuggsyPassCheckData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GamePuggsyPassCheck{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GamePuggsyPassCheck) GetDataMap() map[int32]*GamePuggsyPassCheckData { + return table._dataMap +} + +func (table *GamePuggsyPassCheck) GetDataList() []*GamePuggsyPassCheckData { + return table._dataList +} + +func (table *GamePuggsyPassCheck) Get(key int32) *GamePuggsyPassCheckData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.PuggsyPassCheckData.go b/sys/configure/structs/Game.PuggsyPassCheckData.go new file mode 100644 index 000000000..793bdbd6e --- /dev/null +++ b/sys/configure/structs/Game.PuggsyPassCheckData.go @@ -0,0 +1,58 @@ +//------------------------------------------------------------------------------ +// +// 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 GamePuggsyPassCheckData struct { + Id int32 + PayId string + Parameter int32 + UnlockText string + FreeReward *Gameatn + PayReward []*Gameatn +} + +const TypeId_GamePuggsyPassCheckData = -216498502 + +func (*GamePuggsyPassCheckData) GetTypeId() int32 { + return -216498502 +} + +func (_v *GamePuggsyPassCheckData)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.PayId, _ok_ = _buf["pay_id"].(string); !_ok_ { err = errors.New("pay_id error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["parameter"].(float64); !_ok_ { err = errors.New("parameter error"); return }; _v.Parameter = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["unlock_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.UnlockText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.UnlockText, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["free_reward"].(map[string]interface{}); !_ok_ { err = errors.New("free_reward error"); return }; if _v.FreeReward, err = DeserializeGameatn(_x_); err != nil { return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["pay_reward"].([]interface{}); !_ok_ { err = errors.New("pay_reward error"); return } + + _v.PayReward = 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.PayReward = append(_v.PayReward, _list_v_) + } + } + + return +} + +func DeserializeGamePuggsyPassCheckData(_buf map[string]interface{}) (*GamePuggsyPassCheckData, error) { + v := &GamePuggsyPassCheckData{} + 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 8efb8c5b7..57bf949ac 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -291,6 +291,7 @@ type Tables struct { PuggsyScore *GamePuggsyScore PuggsySkill *GamePuggsySkill Catchrabbit *GameCatchrabbit + PuggsyPassCheck *GamePuggsyPassCheck } func NewTables(loader JsonLoader) (*Tables, error) { @@ -1978,5 +1979,11 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.Catchrabbit, err = NewGameCatchrabbit(buf) ; err != nil { return nil, err } + if buf, err = loader("game_puggsypasscheck") ; err != nil { + return nil, err + } + if tables.PuggsyPassCheck, err = NewGamePuggsyPassCheck(buf) ; err != nil { + return nil, err + } return tables, nil }