无尽模式完善（排行榜未做）

RO_Server_Trunk-branch_0.1.39/roserver/db/model/orm_helper.go

@@ -165,6 +165,14 @@ func ServerCompetitionGet(ssAckMsg *serverproto.SSGetServerCompetitionAck) {
 			}
 			continue
 		}
+
+		if k == "towerRound" {
+			err = model.GetDecodeMessage(ssAckMsg.TowerInfo, v)
+			if err != nil {
+				continue
+			}
+			continue
+		}
 		infoData := &serverproto.ServerCompetitionInfo{}
 		err = model.GetDecodeMessage(infoData, v)
 		if err != nil {
@@ -197,6 +205,16 @@ func ServerCompetitionSave(ntfMsg *serverproto.SSServerCompetitionInfoSaveNtf) {
 			util.WarnF("ServerCompetitionSave round end time err=%v msg=%v", err, *ntfMsg)
 		}
 	}
+	if ntfMsg.TowerInfo != nil {
+		err, msgStr := model.GetEncodeMessage(ntfMsg.TowerInfo)
+		if err != nil {
+			return
+		}
+		_, err = service.GetRedis().HSet(model.ServerCompetitionPrefix, "towerRound", msgStr).Result()
+		if err != nil {
+			util.WarnF("ServerCompetitionSave round end time err=%v msg=%v", err, *ntfMsg)
+		}
+	}
 }
 
 // 获取角色信息列表

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

@@ -96,7 +96,7 @@ func (this *RoleTower) Load(msg interface{}) bool {
 		//无尽模式初始化第一层boss
 		if this.nowTowerWjLevel == 0 {
 			this.nowTowerWjLevel = 1
-			this.duration = 1
+			this.duration = TowerMag.day
 			//this.TowerRefreshRankTime()
 			this.TowerBossRandom()
 			this.SetDirty(true)
@@ -285,7 +285,7 @@ func (this *RoleTower) OnTowerWjFightBegin(towerLevel int32) serverproto.ErrorCo
 	return serverproto.ErrorCode_ERROR_OK
 }
 
-func (this *RoleTower) OnTowerWjFightBuff(buff1, buff2, bufff3 int32) (b1, b2, b3 int32, err serverproto.ErrorCode) {
+func (this *RoleTower) OnTowerWjFightBuff(buff1, buff2, buff3 int32) (b1, b2, b3 int32, err serverproto.ErrorCode) {
 	if this.IsTowerUnlock() == false {
 		return 0, 0, 0, serverproto.ErrorCode_ERROR_CLIMBING_TOWER_IS_LOCKED
 	}
@@ -309,7 +309,7 @@ func (this *RoleTower) OnTowerWjFightBuff(buff1, buff2, bufff3 int32) (b1, b2, b
 				}
 			}
 		}
-	} else if bufff3 > 0 {
+	} else if buff3 > 0 {
 		globalData = serverproto.GlobalCfgLoader[int32(serverproto.GlobalType_Global_TowerBuff3Cost)]
 		if this.buff3 < globalData.IVal {
 			for i, v := range model.TowerBuff3Cost {
@@ -332,11 +332,12 @@ func (this *RoleTower) OnTowerWjFightBuff(buff1, buff2, bufff3 int32) (b1, b2, b
 		this.buff1++
 	} else if buff2 > 0 {
 		this.buff2++
-	} else if bufff3 > 0 {
+	} else if buff3 > 0 {
 		this.buff3++
 	} else {
 		return 0, 0, 0, serverproto.ErrorCode_ERROR_FAIL
 	}
+	this.SetDirty(true)
 	util.InfoF("uuid:%v tower buff buy buff1:%v,buff2:%v,buff3:%v", this.role.GetUUid(), this.buff1, this.buff2, this.buff3)
 	return this.buff1, this.buff2, this.buff3, serverproto.ErrorCode_ERROR_OK
 }
@@ -410,7 +411,7 @@ func (this *RoleTower) OnTowerWjFightEnd(towerLevel, fightTime int32, recordTime
 	//给奖励
 	var v *model.TowerWjReward
 	if this.rewardLevel < towerLevel {
-		for _, v = range model.ConvertTowerWjData[this.duration] {
+		for _, v = range model.ConvertTowerWjData[TowerMag.day] {
 			if this.nowTowerWjLevel >= v.Min && this.nowTowerWjLevel <= v.Max {
 				var addItemList = map[int32]int32{}
 				for _, exItems := range v.ExItemList {
@@ -441,7 +442,7 @@ func (this *RoleTower) OnTowerWjFightEnd(towerLevel, fightTime int32, recordTime
 		Buff2:          this.buff2,
 		Buff3:          this.buff3,
 		WjLevel:        this.nowTowerWjLevel,
-		Duration:       this.duration,
+		Duration:       TowerMag.day,
 		RefreshTowerWj: this.refreshTowerWj,
 		RewardLevel:    this.rewardLevel,
 	}

RO_Server_Trunk-branch_0.1.39/roserver/serverproto/framework.pb.go

@@ -1087,6 +1087,7 @@ var xxx_messageInfo_SSGetServerCompetitionReq proto.InternalMessageInfo
 type SSGetServerCompetitionAck struct {
 	CompetitionDataList  []*ServerCompetitionInfo `protobuf:"bytes,1,rep,name=competition_data_list,json=competitionDataList,proto3" json:"competition_data_list,omitempty"`
 	RounInfo             *StRecRound              `protobuf:"bytes,2,opt,name=roun_info,json=rounInfo,proto3" json:"roun_info,omitempty"`
+	TowerInfo            *TowerRound              `protobuf:"bytes,3,opt,name=tower_info,json=towerInfo,proto3" json:"tower_info,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}                 `json:"-"`
 	XXX_unrecognized     []byte                   `json:"-"`
 	XXX_sizecache        int32                    `json:"-"`
@@ -1131,10 +1132,65 @@ func (m *SSGetServerCompetitionAck) GetRounInfo() *StRecRound {
 	return nil
 }
 
+func (m *SSGetServerCompetitionAck) GetTowerInfo() *TowerRound {
+	if m != nil {
+		return m.TowerInfo
+	}
+	return nil
+}
+
+type TowerRound struct {
+	Day                  int32    `protobuf:"varint,1,opt,name=Day,proto3" json:"Day,omitempty"`
+	IsRefresh            bool     `protobuf:"varint,2,opt,name=is_refresh,json=isRefresh,proto3" json:"is_refresh,omitempty"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *TowerRound) Reset()         { *m = TowerRound{} }
+func (m *TowerRound) String() string { return proto.CompactTextString(m) }
+func (*TowerRound) ProtoMessage()    {}
+func (*TowerRound) Descriptor() ([]byte, []int) {
+	return fileDescriptor_d31604874e01146d, []int{20}
+}
+
+func (m *TowerRound) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_TowerRound.Unmarshal(m, b)
+}
+func (m *TowerRound) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_TowerRound.Marshal(b, m, deterministic)
+}
+func (m *TowerRound) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_TowerRound.Merge(m, src)
+}
+func (m *TowerRound) XXX_Size() int {
+	return xxx_messageInfo_TowerRound.Size(m)
+}
+func (m *TowerRound) XXX_DiscardUnknown() {
+	xxx_messageInfo_TowerRound.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_TowerRound proto.InternalMessageInfo
+
+func (m *TowerRound) GetDay() int32 {
+	if m != nil {
+		return m.Day
+	}
+	return 0
+}
+
+func (m *TowerRound) GetIsRefresh() bool {
+	if m != nil {
+		return m.IsRefresh
+	}
+	return false
+}
+
 // 服务器保存赛季信息
 type SSServerCompetitionInfoSaveNtf struct {
 	CompetitionData      *ServerCompetitionInfo `protobuf:"bytes,1,opt,name=competition_data,json=competitionData,proto3" json:"competition_data,omitempty"`
 	RoundInfo            *StRecRound            `protobuf:"bytes,2,opt,name=round_info,json=roundInfo,proto3" json:"round_info,omitempty"`
+	TowerInfo            *TowerRound            `protobuf:"bytes,3,opt,name=tower_info,json=towerInfo,proto3" json:"tower_info,omitempty"`
 	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
 	XXX_unrecognized     []byte                 `json:"-"`
 	XXX_sizecache        int32                  `json:"-"`
@@ -1144,7 +1200,7 @@ func (m *SSServerCompetitionInfoSaveNtf) Reset()         { *m = SSServerCompetit
 func (m *SSServerCompetitionInfoSaveNtf) String() string { return proto.CompactTextString(m) }
 func (*SSServerCompetitionInfoSaveNtf) ProtoMessage()    {}
 func (*SSServerCompetitionInfoSaveNtf) Descriptor() ([]byte, []int) {
-	return fileDescriptor_d31604874e01146d, []int{20}
+	return fileDescriptor_d31604874e01146d, []int{21}
 }
 
 func (m *SSServerCompetitionInfoSaveNtf) XXX_Unmarshal(b []byte) error {
@@ -1179,6 +1235,13 @@ func (m *SSServerCompetitionInfoSaveNtf) GetRoundInfo() *StRecRound {
 	return nil
 }
 
+func (m *SSServerCompetitionInfoSaveNtf) GetTowerInfo() *TowerRound {
+	if m != nil {
+		return m.TowerInfo
+	}
+	return nil
+}
+
 // 配置文件热加载
 type SSServerConfigReloadNtf struct {
 	CfgList              []string `protobuf:"bytes,1,rep,name=cfg_list,json=cfgList,proto3" json:"cfg_list,omitempty"`
@@ -1191,7 +1254,7 @@ func (m *SSServerConfigReloadNtf) Reset()         { *m = SSServerConfigReloadNtf
 func (m *SSServerConfigReloadNtf) String() string { return proto.CompactTextString(m) }
 func (*SSServerConfigReloadNtf) ProtoMessage()    {}
 func (*SSServerConfigReloadNtf) Descriptor() ([]byte, []int) {
-	return fileDescriptor_d31604874e01146d, []int{21}
+	return fileDescriptor_d31604874e01146d, []int{22}
 }
 
 func (m *SSServerConfigReloadNtf) XXX_Unmarshal(b []byte) error {
@@ -1232,7 +1295,7 @@ func (m *StRecRound) Reset()         { *m = StRecRound{} }
 func (m *StRecRound) String() string { return proto.CompactTextString(m) }
 func (*StRecRound) ProtoMessage()    {}
 func (*StRecRound) Descriptor() ([]byte, []int) {
-	return fileDescriptor_d31604874e01146d, []int{22}
+	return fileDescriptor_d31604874e01146d, []int{23}
 }
 
 func (m *StRecRound) XXX_Unmarshal(b []byte) error {
@@ -1287,7 +1350,7 @@ func (m *SSGetGServerStateReq) Reset()         { *m = SSGetGServerStateReq{} }
 func (m *SSGetGServerStateReq) String() string { return proto.CompactTextString(m) }
 func (*SSGetGServerStateReq) ProtoMessage()    {}
 func (*SSGetGServerStateReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_d31604874e01146d, []int{23}
+	return fileDescriptor_d31604874e01146d, []int{24}
 }
 
 func (m *SSGetGServerStateReq) XXX_Unmarshal(b []byte) error {
@@ -1327,7 +1390,7 @@ func (m *SSGetGServerStateAck) Reset()         { *m = SSGetGServerStateAck{} }
 func (m *SSGetGServerStateAck) String() string { return proto.CompactTextString(m) }
 func (*SSGetGServerStateAck) ProtoMessage()    {}
 func (*SSGetGServerStateAck) Descriptor() ([]byte, []int) {
-	return fileDescriptor_d31604874e01146d, []int{24}
+	return fileDescriptor_d31604874e01146d, []int{25}
 }
 
 func (m *SSGetGServerStateAck) XXX_Unmarshal(b []byte) error {
@@ -1383,6 +1446,7 @@ func init() {
 	proto.RegisterType((*ServerCompetitionInfo)(nil), "serverproto.ServerCompetitionInfo")
 	proto.RegisterType((*SSGetServerCompetitionReq)(nil), "serverproto.SSGetServerCompetitionReq")
 	proto.RegisterType((*SSGetServerCompetitionAck)(nil), "serverproto.SSGetServerCompetitionAck")
+	proto.RegisterType((*TowerRound)(nil), "serverproto.TowerRound")
 	proto.RegisterType((*SSServerCompetitionInfoSaveNtf)(nil), "serverproto.SSServerCompetitionInfoSaveNtf")
 	proto.RegisterType((*SSServerConfigReloadNtf)(nil), "serverproto.SSServerConfigReloadNtf")
 	proto.RegisterType((*StRecRound)(nil), "serverproto.StRecRound")
@@ -1395,78 +1459,80 @@ func init() {
 }
 
 var fileDescriptor_d31604874e01146d = []byte{
-	// 1153 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x56, 0xcf, 0x6e, 0x23, 0xc5,
-	0x13, 0xd6, 0x38, 0xfe, 0x33, 0x53, 0x49, 0xec, 0x64, 0xb2, 0xf9, 0xc5, 0x89, 0xf7, 0x07, 0x66,
-	0x94, 0x45, 0x01, 0x89, 0x20, 0xed, 0xae, 0x40, 0x08, 0x21, 0x11, 0x02, 0x8a, 0xac, 0x6c, 0xa2,
-	0xa8, 0x27, 0xbb, 0x87, 0xbd, 0x8c, 0x26, 0x33, 0x35, 0x43, 0xcb, 0x9e, 0x6e, 0x67, 0xba, 0xed,
-	0xc5, 0x1c, 0x39, 0xc0, 0x95, 0x1b, 0x8f, 0x80, 0xb8, 0x21, 0xde, 0x85, 0xf7, 0x41, 0xdd, 0x3d,
-	0xb6, 0xc7, 0xde, 0x98, 0x44, 0x42, 0x9c, 0x38, 0xd9, 0x5d, 0x55, 0xfd, 0x55, 0xf5, 0x57, 0x5f,
-	0xd7, 0x34, 0xb4, 0x92, 0x3c, 0xcc, 0xf0, 0x0d, 0xcf, 0xfb, 0xc7, 0xc3, 0x9c, 0x4b, 0xee, 0xae,
-	0x0b, 0xcc, 0xc7, 0x98, 0xeb, 0xc5, 0x01, 0x8c, 0x04, 0xe6, 0xc6, 0xe1, 0xfd, 0x60, 0x81, 0xeb,
-	0x63, 0x3e, 0xa6, 0x11, 0xf6, 0x62, 0x64, 0x92, 0x26, 0x93, 0x93, 0xd3, 0x73, 0xf7, 0x3d, 0xd8,
-	0x10, 0xc6, 0x1a, 0xb0, 0x30, 0xc3, 0xb6, 0xd5, 0xb5, 0x8e, 0x1c, 0xb2, 0x5e, 0xd8, 0x2e, 0xc3,
-	0x0c, 0xdd, 0xff, 0x03, 0x4c, 0x43, 0x68, 0xdc, 0xae, 0xe8, 0x00, 0x47, 0x4c, 0xa1, 0xdc, 0x0f,
-	0x61, 0xdb, 0xe4, 0x0c, 0x84, 0x0c, 0x73, 0x19, 0x48, 0x9a, 0x61, 0x7b, 0xad, 0x6b, 0x1d, 0x55,
-	0x49, 0xcb, 0x38, 0x7c, 0x65, 0xbf, 0xa6, 0x19, 0x7a, 0x3f, 0x5b, 0xd0, 0x3a, 0x0b, 0x25, 0x5e,
-	0xe7, 0x21, 0x13, 0x19, 0x95, 0x27, 0x51, 0xdf, 0xdd, 0x85, 0x7a, 0x26, 0x52, 0x05, 0xad, 0x72,
-	0x6f, 0x92, 0x5a, 0x26, 0xd2, 0x5e, 0xec, 0xee, 0x83, 0xad, 0xcc, 0x71, 0x28, 0x43, 0x9d, 0x73,
-	0x83, 0x34, 0x32, 0x91, 0x7e, 0x1d, 0xca, 0xd0, 0xed, 0x80, 0x13, 0x0d, 0x28, 0x32, 0xa9, 0x36,
-	0x99, 0x4c, 0xb6, 0x31, 0xf4, 0x62, 0x05, 0x27, 0xf0, 0x56, 0x79, 0xaa, 0x06, 0x4e, 0xe0, 0x6d,
-	0x2f, 0x76, 0xf7, 0xa0, 0xd1, 0x1f, 0x9b, 0xda, 0x6a, 0x7a, 0x47, 0xbd, 0x3f, 0xd6, 0x25, 0xfd,
-	0x51, 0x99, 0xf1, 0xf2, 0x2f, 0x56, 0x75, 0x08, 0xcd, 0x99, 0x33, 0x18, 0x50, 0x21, 0xdb, 0xd5,
-	0xee, 0xda, 0x51, 0x95, 0x6c, 0x4c, 0x23, 0x5e, 0x50, 0x21, 0x4b, 0xb5, 0xd7, 0xca, 0xb5, 0x77,
-	0xc0, 0xa1, 0x22, 0xc8, 0x42, 0x21, 0x31, 0x6f, 0xd7, 0xbb, 0xd6, 0x91, 0x4d, 0x6c, 0x2a, 0x2e,
-	0xf4, 0xba, 0x7c, 0xb0, 0x46, 0xf9, 0x60, 0xaa, 0x2f, 0x49, 0xce, 0xb3, 0x60, 0xd6, 0x5e, 0x1e,
-	0x63, 0xdb, 0xd6, 0xdd, 0x6b, 0x29, 0x47, 0x71, 0xe8, 0x4b, 0x1e, 0xa3, 0x7b, 0x0c, 0x3b, 0x32,
-	0xcc, 0x53, 0x94, 0x8b, 0xd1, 0x8e, 0x8e, 0xde, 0x36, 0xae, 0x52, 0xbc, 0xf7, 0x67, 0x05, 0xda,
-	0x4b, 0xa4, 0x11, 0x3e, 0x92, 0x98, 0x5f, 0xca, 0xe4, 0x3f, 0x46, 0x5d, 0x07, 0x1c, 0x1d, 0xfb,
-	0x3d, 0x67, 0x86, 0xb0, 0x1a, 0xb1, 0x95, 0xe1, 0x35, 0x67, 0x2b, 0x79, 0x85, 0x55, 0xbc, 0x7e,
-	0x09, 0xad, 0x53, 0x7d, 0xaa, 0xd3, 0x01, 0x17, 0x18, 0xab, 0x0b, 0xda, 0x84, 0x4a, 0xc1, 0x64,
-	0x95, 0x54, 0x68, 0x7c, 0xcf, 0x6d, 0xf4, 0x62, 0xd8, 0xf4, 0xfd, 0x97, 0x02, 0xf3, 0x73, 0x1a,
-	0xf5, 0x55, 0x37, 0x1e, 0x41, 0x0d, 0xf3, 0x9c, 0xe7, 0x1a, 0xa2, 0x46, 0xcc, 0xe2, 0xef, 0x19,
-	0xef, 0xc2, 0xc6, 0x4d, 0xc8, 0x02, 0x64, 0xb1, 0x21, 0xa7, 0xaa, 0xfd, 0x70, 0x13, 0xb2, 0x6f,
-	0x58, 0xac, 0x2f, 0xcd, 0x2f, 0x16, 0x80, 0xef, 0xbf, 0xe0, 0x29, 0x65, 0x0f, 0xcc, 0x51, 0x59,
-	0xca, 0xf1, 0x19, 0x38, 0x11, 0x67, 0x2c, 0xa0, 0x2c, 0xe1, 0xba, 0x80, 0xf5, 0xa7, 0x8f, 0x8f,
-	0x4b, 0xb3, 0xeb, 0x58, 0x9d, 0xe1, 0x94, 0x33, 0x86, 0x91, 0xec, 0xb1, 0x84, 0x13, 0x5b, 0x85,
-	0xab, 0x7f, 0x0a, 0x57, 0xc4, 0xfd, 0x60, 0x18, 0xe6, 0x61, 0xa6, 0x6b, 0x73, 0x88, 0x2d, 0xe2,
-	0xfe, 0x95, 0x5a, 0x7b, 0x3f, 0x59, 0xb0, 0xeb, 0xfb, 0x7e, 0x38, 0xc6, 0x25, 0x00, 0xd5, 0x6d,
-	0x3e, 0x44, 0x36, 0xd5, 0xa5, 0x43, 0xea, 0x6a, 0xf9, 0xcf, 0x4a, 0x39, 0x00, 0x7b, 0x38, 0x08,
-	0x65, 0xc2, 0xf3, 0x59, 0x25, 0xd3, 0xb5, 0xd7, 0x03, 0xd7, 0xf7, 0xfd, 0x89, 0x90, 0x98, 0x5d,
-	0xa0, 0x10, 0x61, 0x8a, 0x8a, 0xaa, 0x67, 0xd0, 0x10, 0x13, 0x11, 0x64, 0x22, 0x6d, 0x5b, 0xdd,
-	0xb5, 0xa3, 0xf5, 0xa7, 0x07, 0x0b, 0xa9, 0x16, 0xe2, 0x49, 0x5d, 0x4c, 0xc4, 0x85, 0x48, 0xbd,
-	0x2b, 0x68, 0xfa, 0x3e, 0xc1, 0xc8, 0xd4, 0x40, 0xf0, 0x76, 0xf5, 0x61, 0x9e, 0x40, 0x73, 0x5a,
-	0x41, 0x20, 0x79, 0x1f, 0x59, 0x21, 0x91, 0xcd, 0xa9, 0xf5, 0x5a, 0x19, 0xbd, 0x0f, 0x16, 0x10,
-	0xd5, 0xc0, 0x5b, 0x85, 0xe8, 0x9d, 0x40, 0xdb, 0xf7, 0xcf, 0x50, 0xbe, 0xa2, 0xf8, 0x06, 0xe3,
-	0x6b, 0xad, 0x59, 0x4d, 0x03, 0xde, 0xba, 0x5b, 0xb0, 0x36, 0x9a, 0xa9, 0x53, 0xfd, 0x75, 0x77,
-	0xa0, 0x26, 0x83, 0xd1, 0xac, 0xe1, 0x55, 0xf9, 0x92, 0xc6, 0xde, 0x8f, 0xd6, 0x0a, 0x0c, 0x95,
-	0xf8, 0x61, 0x18, 0x73, 0x8d, 0xad, 0x95, 0x35, 0xf6, 0x11, 0x54, 0x75, 0xdb, 0xaa, 0xba, 0x6d,
-	0xfb, 0x0b, 0x5c, 0xaa, 0x64, 0x84, 0x0f, 0x50, 0x17, 0xab, 0xc3, 0xbc, 0x0c, 0x9a, 0x3e, 0x8f,
-	0x68, 0x38, 0xe8, 0x31, 0x2a, 0xf5, 0xe8, 0x79, 0x3b, 0xfb, 0xfb, 0xd0, 0x2a, 0x5f, 0xd6, 0xf9,
-	0x2d, 0xdb, 0x14, 0xf3, 0x9b, 0xda, 0x8b, 0xd5, 0x97, 0x33, 0xc7, 0x24, 0x47, 0xf1, 0x6d, 0xf9,
-	0x93, 0xb7, 0x5e, 0xd8, 0xf4, 0x35, 0x69, 0xc3, 0xff, 0xf4, 0xb1, 0x17, 0x73, 0x12, 0xbc, 0xf5,
-	0x7e, 0xb7, 0xee, 0x74, 0x29, 0x3e, 0x7a, 0xe0, 0x72, 0x36, 0xa0, 0x0c, 0x83, 0xe1, 0x20, 0x9c,
-	0x60, 0x6e, 0x66, 0x9e, 0x11, 0x4b, 0x67, 0x51, 0x2c, 0x8b, 0xb0, 0x5b, 0x66, 0xdb, 0x95, 0xde,
-	0xa5, 0x87, 0xe2, 0x39, 0xec, 0xf0, 0x24, 0x79, 0x0b, 0xab, 0x72, 0x3f, 0xd6, 0x76, 0xb1, 0x6f,
-	0x0e, 0xe6, 0x1d, 0x42, 0xe3, 0x8a, 0xb2, 0x54, 0xb5, 0x7d, 0x1f, 0x6c, 0x86, 0x18, 0x07, 0x61,
-	0xd4, 0xd7, 0xcc, 0xd9, 0xa4, 0xa1, 0xd6, 0x27, 0x51, 0xdf, 0xfb, 0x0e, 0x76, 0x7d, 0x0d, 0x7b,
-	0xca, 0xb3, 0x21, 0x4a, 0x2a, 0x29, 0x37, 0x57, 0xe5, 0x09, 0x34, 0xa3, 0xb9, 0x69, 0x2a, 0xb3,
-	0x1a, 0xd9, 0x2c, 0x59, 0x7b, 0x66, 0xbc, 0xcd, 0x9f, 0x11, 0x46, 0x00, 0x8e, 0x98, 0x3e, 0x20,
-	0x54, 0xe6, 0xd9, 0x58, 0x32, 0x84, 0x37, 0xb0, 0x98, 0x49, 0x1d, 0xd8, 0x37, 0x8c, 0x2e, 0xa7,
-	0x57, 0x7c, 0xff, 0x66, 0xad, 0xf2, 0x2a, 0xca, 0x5f, 0xc1, 0x6e, 0xb9, 0x36, 0xf5, 0x89, 0x2a,
-	0xb3, 0xee, 0x2d, 0x32, 0x75, 0xd7, 0xf1, 0xc8, 0x4e, 0x09, 0x40, 0x31, 0xa8, 0xf9, 0x7f, 0x0e,
-	0x4e, 0xce, 0x47, 0xc5, 0x64, 0xa9, 0x68, 0x89, 0xee, 0x2d, 0x62, 0x49, 0x82, 0x11, 0xe1, 0x23,
-	0x16, 0x13, 0x5b, 0x45, 0x2a, 0x28, 0xef, 0x57, 0x0b, 0xde, 0xf1, 0xfd, 0x3b, 0xd3, 0xa8, 0xb9,
-	0xa6, 0xa6, 0xc8, 0x05, 0x6c, 0x2d, 0x17, 0xac, 0xe9, 0x7c, 0x58, 0xad, 0xad, 0xa5, 0x5a, 0xdd,
-	0x4f, 0x00, 0x54, 0xf6, 0xf8, 0x41, 0x85, 0xea, 0x23, 0xc5, 0xba, 0xd2, 0xe7, 0xb0, 0x37, 0x2f,
-	0x94, 0x25, 0x34, 0x25, 0x38, 0xe0, 0x61, 0xac, 0x2a, 0xdc, 0x07, 0x3b, 0x4a, 0xd2, 0x39, 0x8b,
-	0x0e, 0x69, 0x44, 0x49, 0xaa, 0x85, 0xc4, 0x00, 0xe6, 0x70, 0xaa, 0xe1, 0x5c, 0x3d, 0x1e, 0x35,
-	0x6a, 0xa1, 0x09, 0x47, 0x59, 0x8c, 0xbb, 0x03, 0x7a, 0x51, 0x96, 0x83, 0xad, 0x0c, 0x5a, 0x0d,
-	0x87, 0xd0, 0x34, 0x62, 0xa1, 0x2c, 0x2d, 0x6b, 0x62, 0x43, 0x5b, 0x7b, 0x2c, 0xd5, 0xc2, 0xf8,
-	0x14, 0x1e, 0xe9, 0xd6, 0x9f, 0xf9, 0xd3, 0xd7, 0xa8, 0x44, 0xa5, 0xe2, 0x77, 0xa1, 0x78, 0x2c,
-	0x07, 0x72, 0x32, 0xc4, 0x22, 0x35, 0x18, 0xd3, 0xf5, 0x64, 0x88, 0xde, 0xf8, 0x8e, 0x8d, 0x4a,
-	0x2e, 0xf7, 0x6d, 0x74, 0xbf, 0x98, 0x05, 0x94, 0xee, 0xdb, 0xe3, 0x3b, 0x3a, 0xa3, 0x21, 0x75,
-	0x4f, 0x8a, 0xed, 0x8a, 0xa0, 0xaf, 0xb6, 0x5e, 0x37, 0x8f, 0x3f, 0xfe, 0xbc, 0x14, 0x7d, 0x53,
-	0xd7, 0x3f, 0xcf, 0xfe, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x29, 0x78, 0x58, 0x7c, 0xef, 0x0b, 0x00,
-	0x00,
+	// 1196 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x56, 0x4f, 0x6f, 0x1b, 0x45,
+	0x14, 0xd7, 0x3a, 0x76, 0xbc, 0xfb, 0x92, 0xd8, 0xe9, 0xa6, 0xa1, 0x4e, 0x53, 0x20, 0xac, 0x5a,
+	0x14, 0x90, 0x08, 0x52, 0x5b, 0x81, 0x10, 0xaa, 0x44, 0x48, 0x51, 0x65, 0xb5, 0xa9, 0xa2, 0xd9,
+	0xb4, 0x87, 0x5e, 0x56, 0xdb, 0xdd, 0xb7, 0xcb, 0xc8, 0xde, 0x19, 0x67, 0x67, 0x92, 0x62, 0x8e,
+	0x1c, 0xe0, 0xca, 0x8d, 0xaf, 0x81, 0xf8, 0x2e, 0x9c, 0x11, 0xdf, 0x04, 0xbd, 0x99, 0xb5, 0xbd,
+	0x76, 0x63, 0x12, 0xa9, 0xe2, 0xc4, 0xc9, 0x9e, 0xf7, 0xff, 0xfd, 0xde, 0x6f, 0xde, 0x0e, 0x74,
+	0xb3, 0x32, 0x2e, 0xf0, 0x8d, 0x2c, 0x07, 0x07, 0xa3, 0x52, 0x6a, 0xe9, 0xaf, 0x29, 0x2c, 0x2f,
+	0xb0, 0x34, 0x87, 0xdb, 0x70, 0xae, 0xb0, 0xb4, 0x8a, 0xe0, 0x27, 0x07, 0xfc, 0x10, 0xcb, 0x0b,
+	0x9e, 0x60, 0x3f, 0x45, 0xa1, 0x79, 0x36, 0x3e, 0x3c, 0x7a, 0xea, 0x7f, 0x04, 0xeb, 0xca, 0x4a,
+	0x23, 0x11, 0x17, 0xd8, 0x73, 0xf6, 0x9c, 0x7d, 0x8f, 0xad, 0x55, 0xb2, 0xe7, 0x71, 0x81, 0xfe,
+	0xfb, 0x00, 0x13, 0x13, 0x9e, 0xf6, 0x1a, 0xc6, 0xc0, 0x53, 0x93, 0x50, 0xfe, 0xa7, 0x70, 0xc3,
+	0xe6, 0x8c, 0x94, 0x8e, 0x4b, 0x1d, 0x69, 0x5e, 0x60, 0x6f, 0x65, 0xcf, 0xd9, 0x6f, 0xb2, 0xae,
+	0x55, 0x84, 0x24, 0x3f, 0xe5, 0x05, 0x06, 0xbf, 0x3a, 0xd0, 0x7d, 0x12, 0x6b, 0x3c, 0x2d, 0x63,
+	0xa1, 0x0a, 0xae, 0x0f, 0x93, 0x81, 0xbf, 0x0d, 0xab, 0x85, 0xca, 0x29, 0x34, 0xe5, 0xde, 0x60,
+	0xad, 0x42, 0xe5, 0xfd, 0xd4, 0xdf, 0x01, 0x97, 0xc4, 0x69, 0xac, 0x63, 0x93, 0x73, 0x9d, 0xb5,
+	0x0b, 0x95, 0x3f, 0x8e, 0x75, 0xec, 0xef, 0x82, 0x97, 0x0c, 0x39, 0x0a, 0x4d, 0x4e, 0x36, 0x93,
+	0x6b, 0x05, 0xfd, 0x94, 0xc2, 0x29, 0x3c, 0x23, 0x4d, 0xd3, 0x86, 0x53, 0x78, 0xd6, 0x4f, 0xfd,
+	0x5b, 0xd0, 0x1e, 0x5c, 0xd8, 0xda, 0x5a, 0xc6, 0x63, 0x75, 0x70, 0x61, 0x4a, 0xfa, 0xa3, 0x31,
+	0xc5, 0xe5, 0x3f, 0xac, 0xea, 0x2e, 0x74, 0xa6, 0xca, 0x68, 0xc8, 0x95, 0xee, 0x35, 0xf7, 0x56,
+	0xf6, 0x9b, 0x6c, 0x7d, 0x62, 0xf1, 0x8c, 0x2b, 0x5d, 0xab, 0xbd, 0x55, 0xaf, 0x7d, 0x17, 0x3c,
+	0xae, 0xa2, 0x22, 0x56, 0x1a, 0xcb, 0xde, 0xea, 0x9e, 0xb3, 0xef, 0x32, 0x97, 0xab, 0x63, 0x73,
+	0xae, 0x37, 0xd6, 0xae, 0x37, 0x46, 0x73, 0xc9, 0x4a, 0x59, 0x44, 0xd3, 0xf1, 0xca, 0x14, 0x7b,
+	0xae, 0x99, 0x5e, 0x97, 0x14, 0x55, 0xd3, 0xcf, 0x65, 0x8a, 0xfe, 0x01, 0x6c, 0xe9, 0xb8, 0xcc,
+	0x51, 0xcf, 0x5b, 0x7b, 0xc6, 0xfa, 0x86, 0x55, 0xd5, 0xec, 0x83, 0x3f, 0x1b, 0xd0, 0x5b, 0x00,
+	0x8d, 0xc9, 0x73, 0x8d, 0xe5, 0x73, 0x9d, 0xfd, 0xcf, 0xa0, 0xdb, 0x05, 0xcf, 0xd8, 0xfe, 0x28,
+	0x85, 0x05, 0xac, 0xc5, 0x5c, 0x12, 0xbc, 0x92, 0x62, 0x29, 0xae, 0xb0, 0x0c, 0xd7, 0x6f, 0xa0,
+	0x7b, 0x64, 0xba, 0x3a, 0x1a, 0x4a, 0x85, 0x29, 0x5d, 0xd0, 0x0e, 0x34, 0x2a, 0x24, 0x9b, 0xac,
+	0xc1, 0xd3, 0x2b, 0x6e, 0x63, 0x90, 0xc2, 0x46, 0x18, 0xbe, 0x50, 0x58, 0x3e, 0xe5, 0xc9, 0x80,
+	0xa6, 0x71, 0x13, 0x5a, 0x58, 0x96, 0xb2, 0x34, 0x21, 0x5a, 0xcc, 0x1e, 0xfe, 0x1d, 0xf1, 0x3d,
+	0x58, 0x7f, 0x1d, 0x8b, 0x08, 0x45, 0x6a, 0xc1, 0x69, 0x1a, 0x3d, 0xbc, 0x8e, 0xc5, 0x77, 0x22,
+	0x35, 0x97, 0xe6, 0x37, 0x07, 0x20, 0x0c, 0x9f, 0xc9, 0x9c, 0x8b, 0x6b, 0xe6, 0x68, 0x2c, 0xe4,
+	0xf8, 0x0a, 0xbc, 0x44, 0x0a, 0x11, 0x71, 0x91, 0x49, 0x53, 0xc0, 0xda, 0xfd, 0x3b, 0x07, 0xb5,
+	0xdd, 0x75, 0x40, 0x3d, 0x1c, 0x49, 0x21, 0x30, 0xd1, 0x7d, 0x91, 0x49, 0xe6, 0x92, 0x39, 0xfd,
+	0xa3, 0xb8, 0x2a, 0x1d, 0x44, 0xa3, 0xb8, 0x8c, 0x0b, 0x53, 0x9b, 0xc7, 0x5c, 0x95, 0x0e, 0x4e,
+	0xe8, 0x1c, 0xfc, 0xe2, 0xc0, 0x76, 0x18, 0x86, 0xf1, 0x05, 0x2e, 0x04, 0xa0, 0x69, 0xcb, 0x11,
+	0x8a, 0x09, 0x2f, 0x3d, 0xb6, 0x4a, 0xc7, 0x77, 0x2b, 0xe5, 0x36, 0xb8, 0xa3, 0x61, 0xac, 0x33,
+	0x59, 0x4e, 0x2b, 0x99, 0x9c, 0x83, 0x3e, 0xf8, 0x61, 0x18, 0x8e, 0x95, 0xc6, 0xe2, 0x18, 0x95,
+	0x8a, 0x73, 0x24, 0xa8, 0x1e, 0x40, 0x5b, 0x8d, 0x55, 0x54, 0xa8, 0xbc, 0xe7, 0xec, 0xad, 0xec,
+	0xaf, 0xdd, 0xbf, 0x3d, 0x97, 0x6a, 0xce, 0x9e, 0xad, 0xaa, 0xb1, 0x3a, 0x56, 0x79, 0x70, 0x02,
+	0x9d, 0x30, 0x64, 0x98, 0xd8, 0x1a, 0x18, 0x9e, 0x2d, 0x6f, 0xe6, 0x1e, 0x74, 0x26, 0x15, 0x44,
+	0x5a, 0x0e, 0x50, 0x54, 0x14, 0xd9, 0x98, 0x48, 0x4f, 0x49, 0x18, 0x7c, 0x32, 0x17, 0x91, 0x16,
+	0xde, 0xb2, 0x88, 0xc1, 0x21, 0xf4, 0xc2, 0xf0, 0x09, 0xea, 0x97, 0x1c, 0xdf, 0x60, 0x7a, 0x6a,
+	0x38, 0x6b, 0x60, 0xc0, 0x33, 0x7f, 0x13, 0x56, 0xce, 0xa7, 0xec, 0xa4, 0xbf, 0xfe, 0x16, 0xb4,
+	0x74, 0x74, 0x3e, 0x1d, 0x78, 0x53, 0xbf, 0xe0, 0x69, 0xf0, 0xb3, 0xb3, 0x24, 0x06, 0x25, 0xbe,
+	0x5e, 0x8c, 0x19, 0xc7, 0x56, 0xea, 0x1c, 0xfb, 0x0c, 0x9a, 0x66, 0x6c, 0x4d, 0x33, 0xb6, 0x9d,
+	0x39, 0x2c, 0x29, 0x19, 0x93, 0x43, 0x34, 0xc5, 0x1a, 0xb3, 0xa0, 0x80, 0x4e, 0x28, 0x13, 0x1e,
+	0x0f, 0xfb, 0x82, 0x6b, 0xb3, 0x7a, 0xde, 0xce, 0xfe, 0x31, 0x74, 0xeb, 0x97, 0x75, 0x76, 0xcb,
+	0x36, 0xd4, 0xec, 0xa6, 0xf6, 0x53, 0xfa, 0x72, 0x96, 0x98, 0x95, 0xa8, 0xbe, 0xaf, 0x7f, 0xf2,
+	0xd6, 0x2a, 0x99, 0xb9, 0x26, 0x3d, 0x78, 0xcf, 0xb4, 0x3d, 0x9f, 0x93, 0xe1, 0x59, 0xf0, 0xbb,
+	0x73, 0xa9, 0x8a, 0xf0, 0xe8, 0x83, 0x2f, 0xc5, 0x90, 0x0b, 0x8c, 0x46, 0xc3, 0x78, 0x8c, 0xa5,
+	0xdd, 0x79, 0x96, 0x2c, 0xbb, 0xf3, 0x64, 0x99, 0x0f, 0xbb, 0x69, 0xdd, 0x4e, 0x8c, 0x97, 0x59,
+	0x8a, 0x4f, 0x61, 0x4b, 0x66, 0xd9, 0x5b, 0xb1, 0x1a, 0x57, 0xc7, 0xba, 0x51, 0xf9, 0xcd, 0x82,
+	0x05, 0x77, 0xa1, 0x7d, 0xc2, 0x45, 0x4e, 0x63, 0xdf, 0x01, 0x57, 0x20, 0xa6, 0x51, 0x9c, 0x0c,
+	0x0c, 0x72, 0x2e, 0x6b, 0xd3, 0xf9, 0x30, 0x19, 0x04, 0x3f, 0xc0, 0x76, 0x68, 0xc2, 0x1e, 0xc9,
+	0x62, 0x84, 0x9a, 0x6b, 0x2e, 0xed, 0x55, 0xb9, 0x07, 0x9d, 0x64, 0x26, 0x9a, 0xd0, 0xac, 0xc5,
+	0x36, 0x6a, 0xd2, 0xbe, 0x5d, 0x6f, 0xb3, 0x67, 0x84, 0x25, 0x80, 0xa7, 0x26, 0x0f, 0x08, 0xca,
+	0x3c, 0x5d, 0x4b, 0x16, 0xf0, 0x36, 0x56, 0x3b, 0x69, 0x17, 0x76, 0x2c, 0xa2, 0x8b, 0xe9, 0x09,
+	0xef, 0xbf, 0x9d, 0x65, 0x5a, 0x82, 0xfc, 0x25, 0x6c, 0xd7, 0x6b, 0xa3, 0x4f, 0x54, 0x1d, 0xf5,
+	0x60, 0x1e, 0xa9, 0xcb, 0xda, 0x63, 0x5b, 0xb5, 0x00, 0x84, 0xa0, 0xc1, 0xff, 0x21, 0x78, 0xa5,
+	0x3c, 0xaf, 0x36, 0x4b, 0xc3, 0x50, 0xf4, 0xd6, 0x7c, 0x2c, 0xcd, 0x30, 0x61, 0xf2, 0x5c, 0xa4,
+	0xcc, 0x25, 0x4b, 0x83, 0xd4, 0x17, 0x00, 0x5a, 0xbe, 0xc1, 0xb2, 0xbe, 0x90, 0xe6, 0xdd, 0x4e,
+	0x49, 0x6d, 0xdd, 0x3c, 0x63, 0x4a, 0x7e, 0xc1, 0x23, 0x80, 0x99, 0x82, 0x88, 0xfd, 0x38, 0x1e,
+	0x57, 0x20, 0xd3, 0x5f, 0x82, 0x96, 0xab, 0xa8, 0xe2, 0xa7, 0x29, 0xc7, 0x65, 0x1e, 0x57, 0xcc,
+	0x0a, 0x82, 0xbf, 0x1c, 0xf8, 0x20, 0x0c, 0x2f, 0xed, 0x8e, 0xd6, 0x29, 0x2d, 0xaf, 0x63, 0xd8,
+	0x5c, 0xc4, 0xc9, 0x24, 0xb8, 0x1e, 0x44, 0xdd, 0x05, 0x88, 0xa8, 0x51, 0x6a, 0x3a, 0xbd, 0x16,
+	0x3e, 0x06, 0xc9, 0xf4, 0x9d, 0x00, 0x7a, 0x08, 0xb7, 0x66, 0x0d, 0x8a, 0x8c, 0xe7, 0x0c, 0x87,
+	0x32, 0x4e, 0xa9, 0xb3, 0x1d, 0x70, 0x93, 0x2c, 0x9f, 0x0d, 0xdd, 0x63, 0xed, 0x24, 0xcb, 0x0d,
+	0xef, 0x05, 0xc0, 0xac, 0x0c, 0x02, 0x51, 0xd2, 0x5b, 0xd7, 0x54, 0x53, 0xa1, 0xeb, 0x91, 0xc4,
+	0xaa, 0x77, 0xc1, 0x1c, 0xea, 0xec, 0x75, 0x49, 0x60, 0xc8, 0x7b, 0x17, 0x3a, 0x96, 0xdb, 0x5c,
+	0xe4, 0x75, 0x0a, 0xaf, 0x1b, 0x69, 0x5f, 0xe4, 0x86, 0xc7, 0x5f, 0xc2, 0x4d, 0xc3, 0xd4, 0x27,
+	0xe1, 0xe4, 0xf1, 0xac, 0x91, 0x2e, 0xdd, 0x87, 0x50, 0xbd, 0xed, 0x23, 0x3d, 0x1e, 0x61, 0x95,
+	0x1a, 0xac, 0xe8, 0x74, 0x3c, 0xc2, 0xe0, 0xe2, 0x12, 0x47, 0x62, 0xf7, 0x55, 0x8e, 0xfe, 0xa3,
+	0xa9, 0x41, 0x6d, 0x3d, 0xdc, 0xb9, 0x64, 0xa2, 0x26, 0xa4, 0x99, 0x65, 0xe5, 0x4e, 0x00, 0x7d,
+	0xbb, 0xf9, 0xaa, 0x73, 0xf0, 0xf9, 0xd7, 0x35, 0xeb, 0xd7, 0xab, 0xe6, 0xe7, 0xc1, 0x3f, 0x01,
+	0x00, 0x00, 0xff, 0xff, 0xfe, 0x95, 0xf1, 0x8e, 0x9e, 0x0c, 0x00, 0x00,
 }

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

@@ -118,11 +118,20 @@ message SSGetServerCompetitionReq { //project db
 message SSGetServerCompetitionAck { //project game
     repeated ServerCompetitionInfo competition_data_list       = 1; //当前已经进行到的赛季id（结束或者进行中）
     StRecRound roun_info     =2;         // 飞艇数据记录
+    TowerRound tower_info =3;//本服务器无尽模式周期
 }
+
+
+message TowerRound {
+    int32 Day =1;//本服务器无尽模式周期
+    bool is_refresh =2;//本服务器是否有玩家本期达到1000层
+}
+
 //服务器保存赛季信息
 message SSServerCompetitionInfoSaveNtf {    //project db
     ServerCompetitionInfo competition_data      = 1;
     StRecRound round_info      = 2;
+    TowerRound tower_info =3;//本服务器无尽模式周期
 }
 //配置文件热加载
 message SSServerConfigReloadNtf {   //project social|game

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

@@ -1129,8 +1129,8 @@ message RoleTower{
     uint64 sys_reward_time             = 4; //获取系统补偿奖励(印记奖励)时间戳
     uint64 tower_level_day_reward_time = 5; // 每天馈赠奖励可领取时间戳
     repeated int32 boss =6;//无尽模式当前官卡boss
-    int32    now_tower_wj_level           = 7; //
-    int64    now_tower_wj_time            = 8; //
+    int32    now_tower_wj_level           = 7; //当前无尽关卡
+    int64    now_tower_wj_time            = 8; //上衣关卡挑战时间点
     int64 refresh_tower_wj =9;//下次刷新排行榜时间
     int32 buff1 =10;//祝福1
     int32 buff2 =11;//祝福2