11

RO_Server_Trunk-branch_0.1.39/roserver/guild/model/guild_battle.go

@@ -1170,7 +1170,7 @@ func (this *GuildBattleManager) sendGuildBattleFinalsReward() {
 	}
 	if team != nil {
 		if team.battleBaseData != nil {
-			util.ErrorF("send battle final reward:%v", team.battleBaseData)
+			util.ErrorF("send battle final reward:%v，win:%v,lost:%v", team.battleBaseData, winGuild, lostGuild)
 		}
 	}
 	//发送奖励给

RO_Server_Trunk-branch_0.1.39/roserver/test/main.go

@@ -42,7 +42,8 @@ func (this *a1) GetBase() *abase {
 
 func main() {
 
-	testModel.ConvertOldRedis()
+	//testModel.ConvertOldRedis()
+	testModel.ConvertGuildRedis()
 	return
 
 	//tmpa1 := &a1{}

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

@@ -80,6 +80,38 @@ func ConvertOldRedis() {
 	//}
 }
 
+func ConvertGuildRedis() {
+	cli := service.NewNetRedisConnector([]string{"127.0.0.1:6379"}, "", 21, 0)
+	service.SetRedis(cli)
+	//0.获取角色uid列表
+	uidList := getUidListFromRedis()
+	//util.InfoF("uidListSize=%v", len(uidList))
+	//log.Info(len(uidList))
+	for idx := 0; idx < len(uidList); idx++ {
+		uid := uidList[idx]
+		convertRoleGuildOldRedis2(uid)
+	}
+}
+
+func convertRoleGuildOldRedis2(uid uint64) {
+	//serverproto.SSGuildBossRefreshNtf
+	//公会个人数据清楚
+	tmpRoleGuild := &serverproto.RoleGuild{}
+	err := model2.GetSystemDataFromRedis(model2.RoleGuildDataPrefix, uid, tmpRoleGuild)
+	if err != nil && err != service.NIL {
+		util.InfoF("uid=%v [convertRolegGuildOldRedis] err%v", uid, err)
+		return
+	}
+	if tmpRoleGuild.GuildBattle != nil {
+		tmpRoleGuild.GuildBattle.RewardRound = 0
+		tmpRoleGuild.GuildBattle.MvpRewardRound = 0
+	}
+	err = model2.SetSystemDataToRedis(model2.RoleGuildDataPrefix, uid, tmpRoleGuild)
+	if err != nil {
+		util.ErrorF("uid=%v [convertRolegGuildOldRedis] err=%v", uid, err)
+	}
+}
+
 func convertOldRedis(redisIpStr string, lastOne bool) {
 	//直接获取远端redis数据，调用db接口
 	//redisIpStr = "127.0.0.1:6379"

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

@@ -27,11 +27,11 @@ func test() {
 
 	log.Println("prepare to connect gate...")
 
-	var cliSession rocommon.Session
+	//var cliSession rocommon.Session
 	go CreateClientConn(func(s rocommon.Session) {
 		log.Println("connect success addr:127.0.0.1:21001")
 
-		cliSession = s
+		//cliSession = s
 
 		/*
 			msg := serverproto.PingReq{}