陆恒 / HappyCat

Download as
Browse Code »

Commit af5024181009c08bfc8dc1fe91177d6e0bb8f203

Authored by 陆恒
1 parent bcf0359b
Exists in master

提交

Showing 1 changed file with 7 additions and 7 deletions   Show diff stats
src/HttpServer/logic/function.go
  Diff comments   View file @af50241
... ... @@ -973,7 +973,7 @@ func (udata *UserData) AddToRank() error {
973 973 }
974 974  
975 975 //计算最高等级猫的名字
976   -func (u *UserData) CalcHigestCatName() string {
  976 +func (u *UserData) CalcHigestCatName() (string, int) {
977 977 higestlv := 0
978 978 for _, val := range u.PosInfo {
979 979 if val.Cat < BOXGIFTEXTRA && higestlv < val.Cat {
... ... @@ -985,13 +985,13 @@ func (u *UserData) CalcHigestCatName() string {
985 985 udatastr, err := redishandler.GetRedisClient().HGet(redis.USER_WAREHOUSE_INFO, strconv.Itoa(u.UserId))
986 986 if err != nil {
987 987 logger.Error("CalcHigestCatName failed err=%v", err)
988   - return ""
  988 + return "", 0
989 989 }
990 990 wdata := new(UserWareHouseData)
991 991 err = json.Unmarshal([]byte(udatastr), wdata)
992 992 if err != nil {
993 993 logger.Error("CalcHigestCatName Unmarshal redis failed ")
994   - return ""
  994 + return "", 0
995 995 }
996 996 for _, val := range wdata.Info {
997 997 reallv := val.Warelv
... ... @@ -1005,16 +1005,16 @@ func (u *UserData) CalcHigestCatName() string {
1005 1005 cfg := jsonconf.GetRedCatConfig(higestlv)
1006 1006 if cfg == nil {
1007 1007 logger.Error("CalcHigestCatName failed getcfg higestlv=%v", higestlv)
1008   - return ""
  1008 + return "", 0
1009 1009 }
1010   - return cfg.Name
  1010 + return cfg.Name, higestlv
1011 1011 } else {
1012 1012 cfg := jsonconf.GetCatConfig(higestlv)
1013 1013 if cfg == nil {
1014 1014 logger.Error("CalcHigestCatName failed getcfg higestlv=%v", higestlv)
1015   - return ""
  1015 + return "", 0
1016 1016 }
1017   - return cfg.Name
  1017 + return cfg.Name, higestlv
1018 1018 }
1019 1019  
1020 1020 }
... ...