Commit 5f687d488ae27c43db90f620c85dfa11f6851565
1 parent
54eee51a
Exists in
master
提交修复bug
Showing
1 changed file
with
23 additions
and
2 deletions
Show diff stats
src/HttpServer/logic/function.go
| ... | ... | @@ -1050,7 +1050,18 @@ func (u *UserData) CalcHigestCatName() (string, int) { |
| 1050 | 1050 | higestlv := 0 |
| 1051 | 1051 | for _, val := range u.PosInfo { |
| 1052 | 1052 | if val.Cat < BOXGIFTEXTRA && higestlv < val.Cat { |
| 1053 | - higestlv = val.Cat | |
| 1053 | + if val.Cat < REDCATIDEXTRA { | |
| 1054 | + higestlv = val.Cat | |
| 1055 | + } else { | |
| 1056 | + //需要判断一下是否是37j猫 | |
| 1057 | + rdcfg := jsonconf.GetRedCatConfig(val.Cat) | |
| 1058 | + if rdcfg != nil { | |
| 1059 | + if rdcfg.Is_37 != 0 { | |
| 1060 | + higestlv = val.Cat | |
| 1061 | + } | |
| 1062 | + } | |
| 1063 | + } | |
| 1064 | + | |
| 1054 | 1065 | } |
| 1055 | 1066 | } |
| 1056 | 1067 | |
| ... | ... | @@ -1069,7 +1080,17 @@ func (u *UserData) CalcHigestCatName() (string, int) { |
| 1069 | 1080 | for _, val := range wdata.Info { |
| 1070 | 1081 | reallv := val.Warelv |
| 1071 | 1082 | if higestlv < reallv { |
| 1072 | - higestlv = reallv | |
| 1083 | + if reallv < REDCATIDEXTRA { | |
| 1084 | + higestlv = reallv | |
| 1085 | + } else { | |
| 1086 | + rdcfg := jsonconf.GetRedCatConfig(reallv) | |
| 1087 | + if rdcfg != nil { | |
| 1088 | + if rdcfg.Is_37 != 0 { | |
| 1089 | + higestlv = reallv | |
| 1090 | + } | |
| 1091 | + } | |
| 1092 | + } | |
| 1093 | + | |
| 1073 | 1094 | } |
| 1074 | 1095 | } |
| 1075 | 1096 | ... | ... |