diff --git a/modules/equipment/api_equip.go b/modules/equipment/api_equip.go index 5731c0469..c5f5458b1 100644 --- a/modules/equipment/api_equip.go +++ b/modules/equipment/api_equip.go @@ -110,12 +110,12 @@ func (this *apiComp) Equip(session comm.IUserSession, agrs map[string]interface{ if confs[0].Suittype == confs[1].Suittype && confs[1].Suittype == confs[2].Suittype && confs[2].Suittype == confs[3].Suittype { - + hero.SuiteId = confs[0].Suittype } } if subsit { //后2个位置都有装备 判断是否存在套装 if confs[4].Suittype == confs[5].Suittype { - + hero.SuiteExtId = confs[4].Suittype } } //更新装备数据加成 diff --git a/sys/configure/structs/game.equipData.go b/sys/configure/structs/game.equipData.go index df17d74b1..2f2644dde 100644 --- a/sys/configure/structs/game.equipData.go +++ b/sys/configure/structs/game.equipData.go @@ -1,4 +1,3 @@ - //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -11,57 +10,133 @@ package cfg import "errors" type Game_equipData struct { - Id int32 - Suittype int32 - Suitintr string - Pos int32 - Star int32 - Leadlibrary int32 - Addattrnum []int32 - Addattrnump []int32 - Addlibrary int32 + Id int32 + Suittype int32 + Suitintr string + Pos int32 + Star int32 + Leadlibrary int32 + Addattrnum []int32 + Addattrnump []int32 + Addlibrary int32 } func (Game_equipData) GetTypeId() int { - return 1778846974 + return 1778846974 } func NewGame_equipData(_buf map[string]interface{}) (_v *Game_equipData, err error) { - _v = &Game_equipData{} - { 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["suittype"].(float64); !_ok_ { err = errors.New("suittype error"); return }; _v.Suittype = int32(_tempNum_) } - { var _ok_ bool; if _v.Suitintr, _ok_ = _buf["suitintr"].(string); !_ok_ { err = errors.New("suitintr error"); return } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pos"].(float64); !_ok_ { err = errors.New("pos error"); return }; _v.Pos = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["leadlibrary"].(float64); !_ok_ { err = errors.New("leadlibrary error"); return }; _v.Leadlibrary = int32(_tempNum_) } - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["addattrnum"].([]interface{}); !_ok_ { err = errors.New("addattrnum error"); return } + _v = &Game_equipData{} + { + 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["suittype"].(float64); !_ok_ { + err = errors.New("suittype error") + return + } + _v.Suittype = int32(_tempNum_) + } + { + var _ok_ bool + if _v.Suitintr, _ok_ = _buf["suitintr"].(string); !_ok_ { + err = errors.New("suitintr error") + return + } + } + { + var _ok_ bool + var _tempNum_ float64 + if _tempNum_, _ok_ = _buf["pos"].(float64); !_ok_ { + err = errors.New("pos error") + return + } + _v.Pos = int32(_tempNum_) + } + { + var _ok_ bool + var _tempNum_ float64 + if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { + err = errors.New("star error") + return + } + _v.Star = int32(_tempNum_) + } + { + var _ok_ bool + var _tempNum_ float64 + if _tempNum_, _ok_ = _buf["leadlibrary"].(float64); !_ok_ { + err = errors.New("leadlibrary error") + return + } + _v.Leadlibrary = int32(_tempNum_) + } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["addattrnum"].([]interface{}); !_ok_ { + err = errors.New("addattrnum error") + return + } - _v.Addattrnum = 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.Addattrnum = append(_v.Addattrnum, _list_v_) - } - } + _v.Addattrnum = make([]int32, 0, len(_arr_)) - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["addattrnump"].([]interface{}); !_ok_ { err = errors.New("addattrnump error"); return } + 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.Addattrnum = append(_v.Addattrnum, _list_v_) + } + } - _v.Addattrnump = 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.Addattrnump = append(_v.Addattrnump, _list_v_) - } - } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["addattrnump"].([]interface{}); !_ok_ { + err = errors.New("addattrnump error") + return + } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["addlibrary"].(float64); !_ok_ { err = errors.New("addlibrary error"); return }; _v.Addlibrary = int32(_tempNum_) } - return + _v.Addattrnump = 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.Addattrnump = append(_v.Addattrnump, _list_v_) + } + } + + { + var _ok_ bool + var _tempNum_ float64 + if _tempNum_, _ok_ = _buf["addlibrary"].(float64); !_ok_ { + err = errors.New("addlibrary error") + return + } + _v.Addlibrary = int32(_tempNum_) + } + return }