lt 1 mesiac pred
rodič
commit
231b6951a3

+ 7 - 6
RO_Server_Trunk-branch_0.1.39/roserver/game/model/role_daochang100.go

@@ -346,8 +346,9 @@ func (this *RoleDaoChang100) ChallengeResult(msg *serverproto.CSDaoChang100Chall
 		util.ErrorF("uid=%v DaoChang100ChallengeResultReq battleTime=%v posUid=%v invalid", this.role.GetUUid(), msg.BattleTime, msg.PosUid)
 		return
 	}
-
-	if this.dataInfo.BaseRewardTime <= 0 {
+	time := util.GetTimeMilliseconds() - this.challengePosIdxTime
+	if (this.dataInfo.BaseRewardTime <= 0) || (time < 8000) || msg.BattleTime < 6 {
+		util.ErrorF("uid=%v targetuid=%v daochang challenge time too short time=%v", this.role.GetUUid(), msg.PosUid, time)
 		return
 	}
 	if this.challengePosIdx != posIdx || this.fightInfo == nil || this.fightInfo.BriefInfo.Uid != posUid {
@@ -487,7 +488,7 @@ func (this *RoleDaoChang100) OnChallengeResult(msg *serverproto.SSDaoChang100Cha
 	}
 }
 
-//被动变化玩家处理
+// 被动变化玩家处理
 func (this *RoleDaoChang100) OnChallengeResultNtf(ntfMsg *serverproto.SSDaoChang100ChallengeResultNtf) {
 	if !this.dataInfo.LogState && ntfMsg.PosIdxDataChange {
 		this.dataInfo.LogState = true
@@ -596,7 +597,7 @@ func (this *RoleDaoChang100) DaoChang100SetTips(tipDesc string) serverproto.Erro
 	return serverproto.ErrorCode_ERROR_OK
 }
 
-//是否属于夺宝季
+// 是否属于夺宝季
 func (this *RoleDaoChang100) checkWheelState() bool {
 	compData, ok := model.ConvertCompTimeList[CompetitionMag.curCompetitionId]
 	if !ok {
@@ -683,7 +684,7 @@ func (this *RoleDaoChang100) DaoChang100WheelOpen() serverproto.ErrorCode {
 	return serverproto.ErrorCode_ERROR_OK
 }
 
-//rewardAll false:转一次  true:获取所有奖励
+// rewardAll false:转一次  true:获取所有奖励
 func (this *RoleDaoChang100) DaoChang100WheelReward(rewardAll bool) serverproto.ErrorCode {
 	ssLogMsg := &serverproto.SSDaoChang100WheelLogAddNtf{}
 	if rewardAll {
@@ -833,7 +834,7 @@ func (this *RoleDaoChang100) DaoChang100WheelReward(rewardAll bool) serverproto.
 	return serverproto.ErrorCode_ERROR_OK
 }
 
-//抽取其中一个道具
+// 抽取其中一个道具
 func (this *RoleDaoChang100) wheelItem() (serverproto.ErrorCode, *serverproto.WheelRewardItemInfo) {
 	var randRewardList []serverproto.KeyValueType //[weight,rewardidx]
 	var rewardTotalWeight int32 = 0

+ 1 - 1
RO_Server_Trunk-branch_0.1.39/roserver/game/model/role_tower.go

@@ -551,7 +551,7 @@ func (this *RoleTower) OnTowerFightEnd(towerLevel, fightTime int32, recordTimeSt
 	//}
 
 	if fightTime < 0 || (towerCfg.MaxFightingTime+1 < fightTime) { //1秒修正时间
-		util.DebugF("[RoleTower] OnTowerFightEnd...fight time out %v, %v--%v--%v, %v ", this.role.GetUUid(), this.fightBeginTime, util.GetTimeSeconds(), fightTime, towerCfg.MaxFightingTime)
+		util.ErrorF("[RoleTower] OnTowerFightEnd...fight time out %v, %v--%v--%v, %v ", this.role.GetUUid(), this.fightBeginTime, util.GetTimeSeconds(), fightTime, towerCfg.MaxFightingTime)
 		return serverproto.ErrorCode_ERROR_CLIMBING_TOWER_OUT_OF_TIME
 	}
 

+ 13 - 13
RO_Server_Trunk-branch_0.1.39/roserver/rank/model/rank_daochang100.go

@@ -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,

+ 11 - 1
操作命令/mongo操作命令.txt

@@ -392,7 +392,7 @@ db.user.find({ _id: 10004545 }).forEach(function(doc) {
 
 //解决异端之战未重置问题将times-1重新触发重置
 db.user.updateOne(
-    { _id: 10004949 },
+    { _id: 10006675 },
     { 
         $set: { 
             "mapManager.trialInfo.times": 23,
@@ -400,3 +400,13 @@ db.user.updateOne(
     }
 );
 
+//刷新梦魇
+db.user.updateOne(
+    { _id: 10006675 },
+    { 
+        $set: { 
+            "playerManager.startMinskBattleFlag": 0
+        } 
+    }
+)
+

+ 1 - 1
操作命令/开服流程.txt

@@ -7,7 +7,7 @@ ro开启新服打开支付
 http://43.156.13.116:8086/v1/pay/openServer?sid=1&name=1%E5%8C%BA&time=2025-11-20%2012:00:00&gameid=119&signkey=92ddb83717ed91bb555dc894c06c110e
 
 
-echo "cd /data2/java/gameserver1-07 && ./run.sh start" | at 9:00 2026-04-29
+echo "cd /data2/java/gameserver1-12 && ./run.sh start" | at 9:00 2026-05-01
 docker exec -it <容器名或ID> /bin/bash
 
 redis-cli -a tmKjD1ENs3HfZ7adzLJO! KEYS "10001:VirtualBattle_SELF_RECORD:*" | xargs redis-cli -a tmKjD1ENs3HfZ7adzLJO! DEL