Commit 629587fa665f3f18f9ce91ce440d30e32d307220
1 parent
6d67acc6
Exists in
master
提交
Showing
3 changed files
with
9 additions
and
4 deletions
Show diff stats
src/HttpServer/jsonconf/jsonconf.go
| @@ -102,7 +102,7 @@ func GetTurnTableCfg(id int) *TurnTableDesc { | @@ -102,7 +102,7 @@ func GetTurnTableCfg(id int) *TurnTableDesc { | ||
| 102 | 102 | ||
| 103 | //获取红包猫配置 | 103 | //获取红包猫配置 |
| 104 | func GetRedCatConfig(lv int) *RedCatDesc { | 104 | func GetRedCatConfig(lv int) *RedCatDesc { |
| 105 | - reallv := lv - 100 | 105 | + reallv := lv - 37 |
| 106 | if reallv < 1 { | 106 | if reallv < 1 { |
| 107 | reallv = 1 | 107 | reallv = 1 |
| 108 | } | 108 | } |
src/HttpServer/logic/function.go
| @@ -585,7 +585,7 @@ func (udata *UserData) CalcGoldRate() int64 { | @@ -585,7 +585,7 @@ func (udata *UserData) CalcGoldRate() int64 { | ||
| 585 | if v.Warelv == 0 { | 585 | if v.Warelv == 0 { |
| 586 | continue | 586 | continue |
| 587 | } | 587 | } |
| 588 | - rcfg := jsonconf.GetRedCatConfig(v.Warelv + REDCATIDEXTRA) | 588 | + rcfg := jsonconf.GetRedCatConfig(v.Warelv) |
| 589 | if rcfg != nil { | 589 | if rcfg != nil { |
| 590 | if rcfg.Is_37 != 0 { | 590 | if rcfg.Is_37 != 0 { |
| 591 | onerate, _ := strconv.ParseInt(cfg37.Gold_get, 10, 64) | 591 | onerate, _ := strconv.ParseInt(cfg37.Gold_get, 10, 64) |
| @@ -631,7 +631,7 @@ func (u *UserData) CalcHigestCatName() string { | @@ -631,7 +631,7 @@ func (u *UserData) CalcHigestCatName() string { | ||
| 631 | return "" | 631 | return "" |
| 632 | } | 632 | } |
| 633 | for _, val := range wdata.Info { | 633 | for _, val := range wdata.Info { |
| 634 | - reallv := val.Warelv + REDCATIDEXTRA | 634 | + reallv := val.Warelv |
| 635 | if higestlv < reallv { | 635 | if higestlv < reallv { |
| 636 | higestlv = reallv | 636 | higestlv = reallv |
| 637 | } | 637 | } |
| @@ -713,5 +713,10 @@ func (u *UserData) tryPutToWareHouse(info *UserWareHouseData, pos int, uuid int) | @@ -713,5 +713,10 @@ func (u *UserData) tryPutToWareHouse(info *UserWareHouseData, pos int, uuid int) | ||
| 713 | 713 | ||
| 714 | //根据id获得仓位位置 | 714 | //根据id获得仓位位置 |
| 715 | func (w *UserWareHouseData) GetWarePosById(cid int) int { | 715 | func (w *UserWareHouseData) GetWarePosById(cid int) int { |
| 716 | + for k, v := range w.Info { | ||
| 717 | + if v.Warelv == cid { | ||
| 718 | + return k | ||
| 719 | + } | ||
| 720 | + } | ||
| 716 | return -1 | 721 | return -1 |
| 717 | } | 722 | } |
src/HttpServer/logic/logic.go
| @@ -1289,7 +1289,7 @@ func HandlerQueryWareHouse(w http.ResponseWriter, data string, uuid int) { | @@ -1289,7 +1289,7 @@ func HandlerQueryWareHouse(w http.ResponseWriter, data string, uuid int) { | ||
| 1289 | } | 1289 | } |
| 1290 | 1290 | ||
| 1291 | for _, v := range udata.Info { | 1291 | for _, v := range udata.Info { |
| 1292 | - catlv := v.Warelv + REDCATIDEXTRA | 1292 | + catlv := v.Warelv |
| 1293 | resp.Data.CatList = append(resp.Data.CatList, catlv) | 1293 | resp.Data.CatList = append(resp.Data.CatList, catlv) |
| 1294 | } | 1294 | } |
| 1295 | 1295 |