公会战修复+噩梦模式bug修复

RO_Server_Trunk-branch_0.1.39/roserver/game/model/role_battle.go

@@ -1363,7 +1363,7 @@ func (this *RoleBattle) BossReward(challengeTime uint32, mapId, mapLevel uint32,
 		} else if isHard == 2 {
 			this.mapLevelHard2++
 			//TaskMagCheck(this.role, serverproto.TaskType_Level_Hard_Battle_Count, 0)
-			this.addHardMapRank(1, oldHard2MapId, oldHard2MapLevel, challengeTime, recordTimeStamp)
+			this.addHard2MapRank(1, oldHard2MapId, oldHard2MapLevel, challengeTime, recordTimeStamp)
 			util.InfoF("uid=%v hard2 BossReward to next mapId=%v level=%v", this.role.GetUUid(), this.mapIdHard2, this.mapLevelHard2)
 		} else {
 			this.mapLevel++
@@ -1532,7 +1532,7 @@ func (this *RoleBattle) GetMapRank() {
 			ackMsg.Error = int32(serverproto.ErrorCode_ERROR_OK)
 			ackMsg.SelfRank = this.selfHard2Rank
 			ackMsg.TotalRank = this.totalHard2Ranks
-			ackMsg.TopPlayerList = append(this.topHardRankList)
+			ackMsg.TopPlayerList = append(this.topHard2RankList)
 		} else {
 			ackMsg.Error = int32(serverproto.ErrorCode_ERROR_OK)
 			ackMsg.SelfRank = this.selfRank

RO_Server_Trunk-branch_0.1.39/roserver/game/model/role_task.go

@@ -1230,7 +1230,7 @@ func (this *RoleTask) AddHard2Task() bool {
 func (this *RoleTask) GetTaskScoreReward(rewardType, rewardIdx uint32) serverproto.ErrorCode {
 	this.initTaskTypeList()
 
-	if (rewardIdx <= 0 || rewardIdx > 32) && rewardType != model.TASK_TYPE_HARD && rewardType != model.TASK_TYPE_HARD_GROUP {
+	if (rewardIdx <= 0 || rewardIdx > 32) && rewardType != model.TASK_TYPE_HARD && rewardType != model.TASK_TYPE_HARD_GROUP && rewardType != model.TASK_TYPE_HARD2_GROUP && rewardType != model.TASK_TYPE_HARD2 {
 		return serverproto.ErrorCode_ERROR_FAIL
 	}
 

RO_Server_Trunk-branch_0.1.39/roserver/rank/msg/rank_msg.go

@@ -61,7 +61,7 @@ func init() {
 				ackMsg.Rank = selfRank + 1
 			}
 			ackMsg.RankPlayers = totalRank
-			ackMsg.TopPlayerList = append(rankMode.MapHardRankTopThree)
+			ackMsg.TopPlayerList = append(rankMode.MapHard2RankTopThree)
 		} else {
 			var selfRank uint32 = 0
 			var totalRank uint32 = 0

RO_Server_Trunk-branch_0.1.39/roserver/test/model/combine_service.go

@@ -198,7 +198,7 @@ func getUidListFromRedis() []uint64 {
 	return uidList
 }
 
-//role_activity.go
+// role_activity.go
 func convertActivityOldRedis(typeServerActsList set.Interface, uid uint64) {
 	uidStr := strconv.FormatUint(uid, 10)
 	tmpRoleActivity := &serverproto.RoleActivity{}
@@ -251,7 +251,7 @@ func convertActivityOldRedis(typeServerActsList set.Interface, uid uint64) {
 	}
 }
 
-//roleanera
+// roleanera
 func convertArenaOldRedis(uid uint64) {
 	//uidStr := strconv.FormatUint(uid, 10)
 	//1.竞技场赛季个人数据重置
@@ -306,7 +306,7 @@ func convertArenaOldCommonRedis() {
 	service.GetRedis().Del(model.RushArenaPrefix) //最终排行
 }
 
-//rolebattle
+// rolebattle
 func convertRoleBattleOldRedis(uid uint64) {
 	//uidStr := strconv.FormatUint(uid, 10)
 	tmpRoleBattle := &serverproto.RoleBattle{}
@@ -332,7 +332,7 @@ func convertRoleBattleOldRedis(uid uint64) {
 	}
 }
 
-//rolecompetition
+// rolecompetition
 func convertRoleCompetitionOldRedis(uid uint64) {
 	uidStr := strconv.FormatUint(uid, 10)
 	service.GetRedis().Del(model2.RoleCompetitionDataPrefix + uidStr)
@@ -381,7 +381,7 @@ func convertRoleCompetitionOldCommonRedis() {
 	}
 }
 
-//roleguild
+// roleguild
 func convertRoleGuildOldRedis(uid uint64) {
 	//serverproto.SSGuildBossRefreshNtf
 	//公会个人数据清楚
@@ -453,6 +453,7 @@ func convertRoleGuildOldCommonRedis() {
 	for idx := 0; idx < len(tmpList); idx++ {
 		service.GetRedis().Del(tmpList[idx])
 	}
+	//公会战合服
 	service.GetRedis().Del(model7.GuildBattleRankPrefix)
 	tmpList, _ = service.GetRedis().Keys(model7.GuildBattleRankPrefix + "*").Result()
 	for idx := 0; idx < len(tmpList); idx++ {
@@ -467,7 +468,7 @@ func convertRoleGuildOldCommonRedis() {
 	service.GetRedis().Del(model7.GuildBattleTablePrefix)
 }
 
-//roledaochang100
+// roledaochang100
 func convertRoleDaochang100OldRedis(uid uint64) {
 	uidStr := strconv.FormatUint(uid, 10)
 	//1.log状态重置
@@ -507,7 +508,7 @@ func convertRoleDaochang100OldCommonRedis() {
 	}
 }
 
-//rolemail
+// rolemail
 func convertRoleMailOldRedis(uid uint64) {
 	uidStr := strconv.FormatUint(uid, 10)
 	keyStr := model2.RoleMailDataPrefix + uidStr
@@ -526,7 +527,7 @@ func convertRoleMailOldCommonRedis() {
 	}
 }
 
-//rolemap
+// rolemap
 func convertRoleMapOldRedis(uid uint64) {
 	//uidStr := strconv.FormatUint(uid, 10)
 	tmpRoleMap := &serverproto.RoleMap{}
@@ -554,7 +555,7 @@ func convertRoleMapOldCommonRedis() {
 	}
 }
 
-//rolerune
+// rolerune
 func convertRoleRuneOldRedis(uid uint64) {
 	uidStr := strconv.FormatUint(uid, 10)
 	keyStr := model2.RoleRuneDataPrefix + uidStr
@@ -584,7 +585,7 @@ func convertRoleRuneOldRedis(uid uint64) {
 	}
 }
 
-//rolerush
+// rolerush
 func convertRoleRushOldRedis(uid uint64) {
 	//1.技能盛典个人数据清除
 	uidStr := strconv.FormatUint(uid, 10)
@@ -636,7 +637,7 @@ func convertRoleRushOldCommonRedis() {
 	}
 }
 
-//rolecross
+// rolecross
 func convertRoleCrossOldRedisCommon() {
 	//1.巅峰之塔
 	service.GetRedis().Del(model5.CrossMaxFightPowerRankPrefix)
@@ -651,7 +652,7 @@ func convertRoleCrossOldRedisCommon() {
 	service.GetRedis().Del(model6.YuanHangTrialRankPrefix)
 }
 
-//roletower
+// roletower
 func convertRoleTowerOldRedis(uid uint64) {
 	//个人冲榜数据清除
 	tmpRoleTower := &serverproto.RoleTower{}
@@ -668,7 +669,7 @@ func convertRoleTowerOldRedis(uid uint64) {
 	}
 }
 
-//1.12背包数据删除(背包内的活动数据)
+// 1.12背包数据删除(背包内的活动数据)
 func convertRoleBagOldRedis(uid uint64) {
 	tmpRoleBag := &serverproto.RoleBag{}
 	err := model2.GetSystemDataFromRedis(model2.RoleBagDataPrefix, uid, tmpRoleBag)