11

RO_Server_Trunk-branch_0.1.39/roserver/baseserver/router/route_table.go

@@ -360,6 +360,7 @@ func init() {
 	addRule("CSClimbingTowerWjEndReq", "game", "game", 6061)
 	addRule("CSClimbingTowerWjRankReq", "game", "game", 6063)
 	addRule("SSClimbingTowerWjBossNtf", "game", "game", 6065)
+	addRule("CSClimbingTowerWjBuffReq", "game", "game", 6066)
 
 	//req和ack消息映射处理
 	ReqAckKVList[1000] = ReqAckKVInfo{1000, 1001, "CSPingReq|SCPingAck"}

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

@@ -60,7 +60,7 @@ func newRoleTower(r *Role) *RoleTower {
 	roleTower.RushFightCount = 0
 	roleTower.FightCountReward = 0
 	roleTower.RankRewardRound = 0
-	roleTower.boss = make([]int32, 0)
+	//roleTower.boss = make([]int32, 0)
 
 	roleTower.friendTower = map[int32][]*serverproto.CommonPlayerBriefInfo{}
 	return roleTower
@@ -109,6 +109,7 @@ func (this *RoleTower) Load(msg interface{}) bool {
 }
 
 func (this *RoleTower) TowerBossRandom() {
+	this.boss = make([]int32, 0)
 	count := 0
 	for k, _ := range serverproto.TowerWjBossCfgLoader {
 		if count >= 4 {
@@ -387,12 +388,9 @@ func (this *RoleTower) OnTowerWjFightEnd(towerLevel, fightTime int32, recordTime
 	//}
 
 	//给奖励
-	data, ok := model.ConvertTowerData[towerLevel]
+	data, ok := model.ConvertTowerWjData[towerLevel]
 	if ok {
 		var addItemList = map[int32]int32{}
-		for _, items := range data.ItemList {
-			addItemList[items.Key] += items.Value
-		}
 		for _, exItems := range data.ExItemList {
 			addItemList[exItems.Key] += exItems.Value
 		}
@@ -403,6 +401,7 @@ func (this *RoleTower) OnTowerWjFightEnd(towerLevel, fightTime int32, recordTime
 	//当前关卡通过//跟新当前关卡，战力到rank，排名
 	//this.passTowerInfoToRank(recordTimeStamp, int32(fightTime), false)
 	this.nowTowerWjPassTime = util.GetTimeSeconds()
+	this.TowerBossRandom() //随机下一关boss
 	this.SetDirty(true)
 
 	//this.onTowerLevelChange(this.nowTowerLevel - 1)
@@ -410,8 +409,17 @@ func (this *RoleTower) OnTowerWjFightEnd(towerLevel, fightTime int32, recordTime
 
 	ackMsg.TowerLevel = this.nowTowerWjLevel
 	ackMsg.PassTime = this.nowTowerWjPassTime
-	ackMsg.RewardList = data.ItemList
 	ackMsg.ExRewardList = data.ExItemList
+	ntf := &serverproto.SCClimbingTowerWjBossNtf{
+		Boos:           this.boss,
+		Buff1:          this.buff1,
+		Buff2:          this.buff2,
+		Buff3:          this.buff3,
+		WjLevel:        this.nowTowerWjLevel,
+		Duration:       this.duration,
+		RefreshTowerWj: this.refreshTowerWj,
+	}
+	this.role.ReplayGate(ntf, true)
 
 	//if this.role.GetRoleCard() != nil {
 	//	this.role.GetRoleCard().CheckUnLockState()

RO_Server_Trunk-branch_0.1.39/roserver/serverproto/login.proto

@@ -1550,11 +1550,26 @@ message SCClimbingTowerEndAck {
 }
 
 message SCClimbingTowerWjBossNtf {
-    int32       boos1                   = 1; //
-    int32       boss2             = 2; //
-    int32       boss3           = 3; //
-    int32       boss4               = 4; //
-    int32       wj_level =5;
+    repeated int32  boos                   = 1; //当前管卡boss
+    int32       wj_level =2;//当前层数
+    int64 refresh_tower_wj =3;//下次刷新排行榜时间
+    int32 buff1 =4;//祝福1
+    int32 buff2 =5;//祝福2
+    int32 buff3 =6;//祝福3
+    int32 duration =7;//当前周期
+}
+
+message CSClimbingTowerWjBuffReq{
+    int32 buff1 =1;//祝福1
+    int32 buff2 =2;//祝福2
+    int32 buff3 =3;//祝福3
+}
+
+message SCClimbingTowerWjBuffAck {
+    int32       error               = 1; //错误码
+    int32 buff1 =2;//祝福1
+    int32 buff2 =3;//祝福2
+    int32 buff3 =4;//祝福3
 }
 
 //挑战无尽爬塔模式

RO_Server_Trunk-branch_0.1.39/roserver/serverproto/messagedef.proto

@@ -1042,4 +1042,6 @@ enum protoMsgId{
 	CS_CLIMBING_TOWER_WJ_RANK_REQ       = 6063;		//	CSClimbingTowerWjRankReq **CSClimbingTowerWjRankReq **login.proto **game [CSClimbingTowerWjRankReq]
 	SC_CLIMBING_TOWER_WJ_RANK_ACK       = 6064;		//	SCClimbingTowerWjRankAck **SCClimbingTowerWjRankAck **login.proto ** [SCClimbingTowerWjRankAck]
 	SC_CLIMBING_TOWER_WJ_BOSS_NTF       = 6065;		//	SCClimbingTowerWjBossNtf **SCClimbingTowerWjBossNtf **login.proto ** [SCClimbingTowerWjBossNtf]
+	CS_CLIMBING_TOWER_WJ_BUFF_REQ       = 6066;		//	CSClimbingTowerWjBuffReq **CSClimbingTowerWjBuffReq **login.proto **game [CSClimbingTowerWjBuffReq]
+	SC_CLIMBING_TOWER_WJ_BUFF_ACK       = 6067;		//	SCClimbingTowerWjBuffAck **SCClimbingTowerWjBuffAck **login.proto ** [SCClimbingTowerWjBuffAck]
 }

RO_Server_Trunk-branch_0.1.39/roserver/serverproto/pbbind_gen.go

@@ -673,9 +673,11 @@ var (
 	Handle_GAME_CSClimbingTowerWjBeginReq               = func(e rocommon.ProcEvent) { panic("CSClimbingTowerWjBeginReq not implements") }
 	Handle_GAME_CSClimbingTowerWjEndReq                 = func(e rocommon.ProcEvent) { panic("CSClimbingTowerWjEndReq not implements") }
 	Handle_GAME_CSClimbingTowerWjRankReq                = func(e rocommon.ProcEvent) { panic("CSClimbingTowerWjRankReq not implements") }
+	Handle_GAME_CSClimbingTowerWjBuffReq                = func(e rocommon.ProcEvent) { panic("CSClimbingTowerWjBuffReq not implements") }
 	Handle_GAME_SCClimbingTowerWjBeginAck               = func(e rocommon.ProcEvent) { panic("SCClimbingTowerWjBeginAck not implements") }
 	Handle_GAME_SCClimbingTowerWjEndAck                 = func(e rocommon.ProcEvent) { panic("SCClimbingTowerWjEndAck not implements") }
 	Handle_GAME_SCClimbingTowerWjRankAck                = func(e rocommon.ProcEvent) { panic("SCClimbingTowerWjRankAck not implements") }
+	Handle_GAME_SCClimbingTowerWjBuffAck                = func(e rocommon.ProcEvent) { panic("SCClimbingTowerWjBuffAck not implements") }
 	Handle_GAME_SCClimbingTowerWjBossNtf                = func(e rocommon.ProcEvent) { panic("SCClimbingTowerWjBossNtf not implements") }
 	Handle_GAME_Default                                 func(e rocommon.ProcEvent)
 )
@@ -2228,12 +2230,16 @@ func GetMessageHandler(sreviceName string) rocommon.EventCallBack {
 				Handle_GAME_CSClimbingTowerWjEndReq(e)
 			case *CSClimbingTowerWjRankReq:
 				Handle_GAME_CSClimbingTowerWjRankReq(e)
+			case *CSClimbingTowerWjBuffReq:
+				Handle_GAME_CSClimbingTowerWjBuffReq(e)
 			case *SCClimbingTowerWjBeginAck:
 				Handle_GAME_SCClimbingTowerWjBeginAck(e)
 			case *SCClimbingTowerWjEndAck:
 				Handle_GAME_SCClimbingTowerWjEndAck(e)
 			case *SCClimbingTowerWjRankAck:
 				Handle_GAME_SCClimbingTowerWjRankAck(e)
+			case *SCClimbingTowerWjBuffAck:
+				Handle_GAME_SCClimbingTowerWjBuffAck(e)
 			case *SCClimbingTowerWjBossNtf:
 				Handle_GAME_SCClimbingTowerWjBossNtf(e)
 			default:
@@ -3731,4 +3737,6 @@ func init() {
 	registerInfo(6063, reflect.TypeOf((*CSClimbingTowerWjRankReq)(nil)).Elem(), 0)
 	registerInfo(6064, reflect.TypeOf((*SCClimbingTowerWjRankAck)(nil)).Elem(), 0)
 	registerInfo(6065, reflect.TypeOf((*SCClimbingTowerWjBossNtf)(nil)).Elem(), 0)
+	registerInfo(6066, reflect.TypeOf((*CSClimbingTowerWjBuffReq)(nil)).Elem(), 0)
+	registerInfo(6067, reflect.TypeOf((*SCClimbingTowerWjBuffAck)(nil)).Elem(), 0)
 }