|
|
@@ -315,7 +315,7 @@ func (this *DaoChang100Manager) ChallengePre(posIdx int32, hasChallengeCount boo
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-//posIdx挑战的占位 posUid挑战时位置上的玩家id
|
|
|
+// posIdx挑战的占位 posUid挑战时位置上的玩家id
|
|
|
func (this *DaoChang100Manager) ChallengeResult(posIdx int32, posUid uint64, bfInfo *serverproto.CommonPlayerBriefInfo,
|
|
|
battleResult bool, ssAckMsg *serverproto.SSDaoChang100ChallengeResultAck, ev rocommon.ProcEvent) {
|
|
|
posIdxData := this.getPosInfo(posIdx)
|
|
|
@@ -355,11 +355,11 @@ func (this *DaoChang100Manager) ChallengeResult(posIdx int32, posUid uint64, bfI
|
|
|
this.changPosIdxList.Add(posIdxData.PosIdx)
|
|
|
|
|
|
//战力校验
|
|
|
- //if posIdxData.OwnerBrief != nil && battleResult {
|
|
|
- // if !this.battleResultValidCheck(bfInfo.Uid, bfInfo.FightPower, posIdxData) {
|
|
|
- // battleResult = false
|
|
|
- // }
|
|
|
- //}
|
|
|
+ if posIdxData.OwnerBrief != nil && battleResult {
|
|
|
+ if !this.battleResultValidCheck(bfInfo.Uid, bfInfo.FightPower, posIdxData) {
|
|
|
+ battleResult = false
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
//挑战失败处理
|
|
|
if !battleResult {
|
|
|
@@ -601,7 +601,7 @@ func (this *DaoChang100Manager) GetPosIdxLog(uid, beginTime uint64, ackMsg *serv
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-//占位
|
|
|
+// 占位
|
|
|
func (this *DaoChang100Manager) inPosIdx(uid uint64, posIdxData *serverproto.DaoChang100PosIdxData, nowTime uint64, bEmptyPos bool) {
|
|
|
//先判断是否
|
|
|
posIdxData.OwnerStartTime = nowTime
|
|
|
@@ -626,7 +626,7 @@ func (this *DaoChang100Manager) inPosIdx(uid uint64, posIdxData *serverproto.Dao
|
|
|
this.changPosIdxList.Add(posIdxData.PosIdx)
|
|
|
}
|
|
|
|
|
|
-//logChange是否需要记录日志变化
|
|
|
+// logChange是否需要记录日志变化
|
|
|
func (this *DaoChang100Manager) outPosIdx(uid uint64, nowTime uint64, logChange bool, newUid uint64) (uint64, bool, int32) {
|
|
|
var logType int32 = 0
|
|
|
posIdxData := this.getPosInfoByUid(uid)
|
|
|
@@ -676,11 +676,11 @@ func (this *DaoChang100Manager) outPosIdx(uid uint64, nowTime uint64, logChange
|
|
|
|
|
|
const MaxUidLogCount int64 = 50
|
|
|
|
|
|
-//=1占领空白领地
|
|
|
-//=2自身击败机器人守卫占领领地的信息
|
|
|
-//=3自身试图占领他人领地的战斗信息
|
|
|
-//=4他人试图占领我方领地的战斗信息
|
|
|
-//=5自身占领领地达到x小时时显示为
|
|
|
+// =1占领空白领地
|
|
|
+// =2自身击败机器人守卫占领领地的信息
|
|
|
+// =3自身试图占领他人领地的战斗信息
|
|
|
+// =4他人试图占领我方领地的战斗信息
|
|
|
+// =5自身占领领地达到x小时时显示为
|
|
|
func (this *DaoChang100Manager) addPosIdxLog(uid uint64, logType, posIdx int32, battleResult bool, nickName, guildName string, targetUid uint64) {
|
|
|
logData := &serverproto.DaoChang100Log{
|
|
|
Type: logType,
|