|
@@ -3,7 +3,6 @@ package models
|
|
|
import (
|
|
|
"context"
|
|
|
"fmt"
|
|
|
- jsoniter "github.com/json-iterator/go"
|
|
|
mhayaString "github.com/mhaya/extend/string"
|
|
|
mhayaTime "github.com/mhaya/extend/time"
|
|
|
"github.com/mhaya/game/game_cluster/internal/constant"
|
|
@@ -271,7 +270,7 @@ func (p *Player) FinishAchieveTaskByType1(id int) bool {
|
|
|
} else {
|
|
|
p.AchieveTask[id].Validate = 0 //验证成功
|
|
|
p.AchieveTask[id].Status = 0
|
|
|
- mhayaLogger.Warnf("FinishAchieveTaskByType1 验证失败 username :%v, id : v%", p.UserName, id)
|
|
|
+ mhayaLogger.Warnf("FinishAchieveTaskByType1 验证失败 username :%v, id : %v", p.UserName, id)
|
|
|
return false
|
|
|
}
|
|
|
|
|
@@ -661,19 +660,19 @@ func (p *Player) SetPassiveInviteReward() {
|
|
|
//获取邀请人
|
|
|
pUid := mdb.RDB.Get(context.Background(), key).Val()
|
|
|
|
|
|
- pbase := mdb.RDB.HGet(context.Background(), constant.PlayerBaseKey, pUid).Val()
|
|
|
- mdb.RDB.Del(context.Background(), key)
|
|
|
- var base param.PlayerBase
|
|
|
- err := jsoniter.Unmarshal([]byte(pbase), &base)
|
|
|
- if err != nil {
|
|
|
- return
|
|
|
- }
|
|
|
+ /* pbase := mdb.RDB.HGet(context.Background(), constant.PlayerBaseKey, pUid).Val()
|
|
|
+ mdb.RDB.Del(context.Background(), key)
|
|
|
+ var base param.PlayerBase
|
|
|
+ err := jsoniter.Unmarshal([]byte(pbase), &base)
|
|
|
+ if err != nil {
|
|
|
+ return
|
|
|
+ }*/
|
|
|
|
|
|
var addItem []data.ItemReward
|
|
|
if p.IsVip == 0 {
|
|
|
//主动邀请记录, 设置邀请人数量+1
|
|
|
key = fmt.Sprintf("%v:%v:%v", constant.InviteKey, InvitePlayer, pUid)
|
|
|
- err = mdb.RDB.IncrBy(context.Background(), key, 1).Err()
|
|
|
+ err := mdb.RDB.IncrBy(context.Background(), key, 1).Err()
|
|
|
if err != nil {
|
|
|
mhayaLogger.Infof("player SetPassiveInviteReward,not vip invite playerName=%v,level=%v,param=%v,err=%v", p.UserName, p.Level, key, err)
|
|
|
}
|
|
@@ -682,21 +681,21 @@ func (p *Player) SetPassiveInviteReward() {
|
|
|
} else {
|
|
|
//主动邀请记录, 设置邀请人数量+1
|
|
|
key = fmt.Sprintf("%v:%v:%v", constant.InviteKey, InviteVipPlayer, pUid)
|
|
|
- err = mdb.RDB.IncrBy(context.Background(), key, 1).Err()
|
|
|
+ err := mdb.RDB.IncrBy(context.Background(), key, 1).Err()
|
|
|
if err != nil {
|
|
|
mhayaLogger.Infof("player SetPassiveInviteReward, vip invite playerName=%v,level=%v,param=%v,err=%v", p.UserName, p.Level, key, err)
|
|
|
}
|
|
|
addItem = append(addItem, ret3.Reward...)
|
|
|
}
|
|
|
|
|
|
- //社区长额外奖励
|
|
|
- if base.IsLeader == 1 {
|
|
|
- ret, ok := data.DiscreteRuleConfig.Get(InvitePlayerByLeader)
|
|
|
- if !ok {
|
|
|
- return
|
|
|
- }
|
|
|
- addItem = append(addItem, ret.Reward...)
|
|
|
- }
|
|
|
+ /* //社区长额外奖励
|
|
|
+ if base.IsLeader == 1 {
|
|
|
+ ret, ok := data.DiscreteRuleConfig.Get(InvitePlayerByLeader)
|
|
|
+ if !ok {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ addItem = append(addItem, ret.Reward...)
|
|
|
+ }*/
|
|
|
if p.InviteReward.IsClaim == 2 {
|
|
|
p.InviteReward.Reward = []data.ItemReward{}
|
|
|
p.InviteReward.IsClaim = 0
|