Commit bad1948e authored by hujiebin's avatar hujiebin

Merge branch 'feature/family' into feature/3.5

parents d40ac5ea cb7541b7
...@@ -30,7 +30,7 @@ type CvGroupPowerMember struct { ...@@ -30,7 +30,7 @@ type CvGroupPowerMember struct {
type CvGroupPowerGrade struct { type CvGroupPowerGrade struct {
Grade groupPower_e.GroupPowerGrade `json:"grade"` // 等级 0:青铜 1:白银 2:黄金 3:黑金 Grade groupPower_e.GroupPowerGrade `json:"grade"` // 等级 0:青铜 1:白银 2:黄金 3:黑金
Exp uint32 `json:"exp"` // 经验值 Exp uint32 `json:"exp"` // 经验值
NextExp uint32 `json:"nextExp,omitempty"` // 级所需经验值 NextExp uint32 `json:"nextExp,omitempty"` // 下个等级所需经验值
ExpireAt string `json:"expireAt,omitempty"` // 有效期 ExpireAt string `json:"expireAt,omitempty"` // 有效期
} }
......
...@@ -198,7 +198,7 @@ func GroupPowerGradeDetail(c *gin.Context) (*mycontext.MyContext, error) { ...@@ -198,7 +198,7 @@ func GroupPowerGradeDetail(c *gin.Context) (*mycontext.MyContext, error) {
grade := gradeM[groupPowerId] grade := gradeM[groupPowerId]
nextExp := mysql.Num(0) nextExp := mysql.Num(0)
if grade.Grade != groupPower_e.GroupPowerGradeMax { if grade.Grade != groupPower_e.GroupPowerGradeMax {
nextExp = groupPower_e.GroupPowerGradeExp[grade.Grade+1] - groupPower_e.GroupPowerGradeExp[grade.Grade] nextExp = groupPower_e.GroupPowerGradeExp[grade.Grade+1]
} }
expireAt := "" expireAt := ""
if grade.ExpireAt.After(time.Now()) { if grade.ExpireAt.After(time.Now()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment