提交

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