|
|
@@ -303,16 +303,16 @@ func (this *YuanHangTrialManager) addNotifyList(notifyItem *serverproto.YuanHang
|
|
|
}
|
|
|
|
|
|
func (this *YuanHangTrialManager) getFightRoleInfo(uid uint64) *serverproto.FightRoleInfo {
|
|
|
- if fightInfo, ok := this.cacheFightRoleInfoList[uid]; ok {
|
|
|
- return fightInfo
|
|
|
- }
|
|
|
+ //if fightInfo, ok := this.cacheFightRoleInfoList[uid]; ok {
|
|
|
+ // return fightInfo
|
|
|
+ //}
|
|
|
|
|
|
err, fightInfo := GetFightInfoFromRedis(uid)
|
|
|
if err != nil {
|
|
|
util.InfoF("getFightRoleInfo uid=%v err=%v", uid, err)
|
|
|
return nil
|
|
|
}
|
|
|
- this.cacheFightRoleInfoList[uid] = fightInfo
|
|
|
+ //this.cacheFightRoleInfoList[uid] = fightInfo
|
|
|
return fightInfo
|
|
|
}
|
|
|
|
|
|
@@ -347,7 +347,8 @@ func (this *YuanHangTrialManager) YuanHangTrial(fromZone int32, uid uint64, tria
|
|
|
|
|
|
err := SetFightInfoToRedis(uid, fightInfo)
|
|
|
util.InfoF("uid=%v YuanHangTrial err=%v addTrialItem=%v", uid, err, addTrialItem)
|
|
|
- this.cacheFightRoleInfoList[uid] = fightInfo
|
|
|
+ //弃用缓存
|
|
|
+ //this.cacheFightRoleInfoList[uid] = fightInfo
|
|
|
|
|
|
//notify other
|
|
|
return addTrialItem
|
|
|
@@ -366,7 +367,7 @@ func (this *YuanHangTrialManager) YuanHangTrialForceSelf(ssMsg *serverproto.SSCr
|
|
|
addTrialItem := this.addTrialItem(ssMsg.SelfUid, ssMsg.TrialType, ssMsg.EndTimeStamp, ssMsg.DurationTime, zone, fromZone)
|
|
|
//err := SetFightInfoToRedis(ssMsg.SelfUid, ssMsg.SelfFightInfo)
|
|
|
util.InfoF("uid=%v YuanHangTrialForceSelf addTrialItem=%v", ssMsg.SelfUid, addTrialItem)
|
|
|
- this.cacheFightRoleInfoList[ssMsg.SelfUid] = ssMsg.SelfFightInfo
|
|
|
+ //this.cacheFightRoleInfoList[ssMsg.SelfUid] = ssMsg.SelfFightInfo
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -434,7 +435,7 @@ func (this *YuanHangTrialManager) GetChallengeTrialItem(selfUid, challengeUid, c
|
|
|
ssAckMsg.FightInfo = fightInfo
|
|
|
ssAckMsg.ChallengeUid = challengeUid
|
|
|
ssAckMsg.ChallengeUidEndTime = challengeUidEndTime
|
|
|
- util.ErrorF("fight info:%v", fightInfo.HeroDataList)
|
|
|
+ //util.ErrorF("uid:%v fight info:%v", challengeUid, fightInfo.HeroDataList)
|
|
|
|
|
|
return serverproto.ErrorCode_ERROR_OK
|
|
|
}
|
|
|
@@ -460,7 +461,7 @@ func (this *YuanHangTrialManager) ChallengeTrialItemResult(selfUid, challengeUid
|
|
|
}
|
|
|
}
|
|
|
SetFightInfoToRedis(selfUid, fightInfo)
|
|
|
- this.cacheFightRoleInfoList[selfUid] = fightInfo
|
|
|
+ //this.cacheFightRoleInfoList[selfUid] = fightInfo
|
|
|
|
|
|
//挑战日志记录
|
|
|
beChallengePlayer := this.getFightRoleInfo(trialItem.Uid)
|
