diff --git a/bin/json/game_equipcompose.json b/bin/json/game_equipcompose.json index e66f0013a..79452bb52 100644 --- a/bin/json/game_equipcompose.json +++ b/bin/json/game_equipcompose.json @@ -16,10 +16,10 @@ ], "ico": "zb_icon_01", "equip": [ - 10001, - 10002, - 10003, - 10004 + "10001", + "10002", + "10003", + "10004" ], "probability": [ 10001, @@ -45,10 +45,10 @@ ], "ico": "zb_icon_02", "equip": [ - 10001, - 10002, - 10003, - 10004 + "10001", + "10002", + "10003", + "10004" ], "probability": [ 10001, @@ -74,10 +74,10 @@ ], "ico": "zb_icon_03", "equip": [ - 10001, - 10002, - 10003, - 10004 + "10001", + "10002", + "10003", + "10004" ], "probability": [ 10001, @@ -103,10 +103,10 @@ ], "ico": "zb_icon_04", "equip": [ - 10001, - 10002, - 10003, - 10004 + "10001", + "10002", + "10003", + "10004" ], "probability": [ 10001, @@ -132,10 +132,10 @@ ], "ico": "zb_icon_05", "equip": [ - 10001, - 10002, - 10003, - 10004 + "10001", + "10002", + "10003", + "10004" ], "probability": [ 10001, @@ -161,10 +161,10 @@ ], "ico": "zb_icon_06", "equip": [ - 10001, - 10002, - 10003, - 10004 + "10001", + "10002", + "10003", + "10004" ], "probability": [ 10001, @@ -190,10 +190,10 @@ ], "ico": "zb_icon_01", "equip": [ - 10001, - 10002, - 10003, - 10004 + "10001", + "10002", + "10003", + "10004" ], "probability": [ 10001, @@ -219,10 +219,10 @@ ], "ico": "zb_icon_02", "equip": [ - 10001, - 10002, - 10003, - 10004 + "10001", + "10002", + "10003", + "10004" ], "probability": [ 10001, @@ -248,10 +248,10 @@ ], "ico": "zb_icon_03", "equip": [ - 10001, - 10002, - 10003, - 10004 + "10001", + "10002", + "10003", + "10004" ], "probability": [ 10001, @@ -277,10 +277,10 @@ ], "ico": "zb_icon_04", "equip": [ - 10001, - 10002, - 10003, - 10004 + "10001", + "10002", + "10003", + "10004" ], "probability": [ 10001, @@ -306,10 +306,10 @@ ], "ico": "zb_icon_05", "equip": [ - 10001, - 10002, - 10003, - 10004 + "10001", + "10002", + "10003", + "10004" ], "probability": [ 10001, @@ -335,10 +335,10 @@ ], "ico": "zb_icon_06", "equip": [ - 10001, - 10002, - 10003, - 10004 + "10001", + "10002", + "10003", + "10004" ], "probability": [ 10001, @@ -364,10 +364,10 @@ ], "ico": "zb_icon_01", "equip": [ - 10001, - 10002, - 10003, - 10004 + "10001", + "10002", + "10003", + "10004" ], "probability": [ 10001, @@ -393,10 +393,10 @@ ], "ico": "zb_icon_02", "equip": [ - 10001, - 10002, - 10003, - 10004 + "10001", + "10002", + "10003", + "10004" ], "probability": [ 10001, @@ -422,10 +422,10 @@ ], "ico": "zb_icon_03", "equip": [ - 10001, - 10002, - 10003, - 10004 + "10001", + "10002", + "10003", + "10004" ], "probability": [ 10001, @@ -451,10 +451,10 @@ ], "ico": "zb_icon_04", "equip": [ - 10001, - 10002, - 10003, - 10004 + "10001", + "10002", + "10003", + "10004" ], "probability": [ 10001, @@ -480,10 +480,10 @@ ], "ico": "zb_icon_05", "equip": [ - 10001, - 10002, - 10003, - 10004 + "10001", + "10002", + "10003", + "10004" ], "probability": [ 10001, @@ -509,10 +509,10 @@ ], "ico": "zb_icon_06", "equip": [ - 10001, - 10002, - 10003, - 10004 + "10001", + "10002", + "10003", + "10004" ], "probability": [ 10001, @@ -538,10 +538,10 @@ ], "ico": "zb_icon_01", "equip": [ - 10001, - 10002, - 10003, - 10004 + "10001", + "10002", + "10003", + "10004" ], "probability": [ 10001, @@ -567,10 +567,10 @@ ], "ico": "zb_icon_02", "equip": [ - 10001, - 10002, - 10003, - 10004 + "10001", + "10002", + "10003", + "10004" ], "probability": [ 10001, @@ -596,10 +596,10 @@ ], "ico": "zb_icon_03", "equip": [ - 10001, - 10002, - 10003, - 10004 + "10001", + "10002", + "10003", + "10004" ], "probability": [ 10001, diff --git a/modules/equipment/api_forg.go b/modules/equipment/api_forg.go index 8effe9cf6..09d1ac666 100644 --- a/modules/equipment/api_forg.go +++ b/modules/equipment/api_forg.go @@ -46,7 +46,7 @@ func (this *apiComp) Forg(session comm.IUserSession, req *pb.EquipmentForgReq) ( } } index := comm.GetRandW(conf.Probability) - equis[string(conf.Equip[index])]++ + equis[conf.Equip[index]]++ } if code = this.module.ConsumeRes(session, need, true); code != pb.ErrorCode_Success { return diff --git a/sys/configure/structs/Game.EquipComposeData.go b/sys/configure/structs/Game.EquipComposeData.go index 81edf58dc..f4a50b3ce 100644 --- a/sys/configure/structs/Game.EquipComposeData.go +++ b/sys/configure/structs/Game.EquipComposeData.go @@ -17,7 +17,7 @@ type GameEquipComposeData struct { Skillintr string Need []*Gameatn Ico string - Equip []int32 + Equip []string Probability []int32 } @@ -52,11 +52,11 @@ func (_v *GameEquipComposeData)Deserialize(_buf map[string]interface{}) (err err var _ok_ bool if _arr_, _ok_ = _buf["equip"].([]interface{}); !_ok_ { err = errors.New("equip error"); return } - _v.Equip = make([]int32, 0, len(_arr_)) + _v.Equip = make([]string, 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_) } + var _list_v_ string + { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } _v.Equip = append(_v.Equip, _list_v_) } }