server/game2006go
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2024-09-19 14:52:03 +08:00
parent 4b4406070d
commit 7b1143186f
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/matchserver/common/types.go
View File

@ -24,6 +24,7 @@ type LoginRsp struct {
HeadFrame string `json:"head_frame"` HeadFrame string `json:"head_frame"`
TotalLucky interface{} `json:"total_lucky"` TotalLucky interface{} `json:"total_lucky"`
AdmissionItemNum interface{} `json:"admission_item_num"` AdmissionItemNum interface{} `json:"admission_item_num"`
CircuitScore interface{} `json:"circuit_score"`
} `json:"user_info"` } `json:"user_info"`
HeroInfo struct { HeroInfo struct {
HeroUniId string `json:"hero_uniid"` HeroUniId string `json:"hero_uniid"`
@ -54,6 +55,7 @@ type UserRsp struct {
HeadFrame string `json:"head_frame"` HeadFrame string `json:"head_frame"`
TotalLucky interface{} `json:"total_lucky"` TotalLucky interface{} `json:"total_lucky"`
AdmissionItemNum interface{} `json:"admission_item_num"` AdmissionItemNum interface{} `json:"admission_item_num"`
CircuitScore interface{} `json:"circuit_score"`
} `json:"user_info"` } `json:"user_info"`
HeroInfo struct { HeroInfo struct {
HeroUniId string `json:"hero_uniid"` HeroUniId string `json:"hero_uniid"`
@ -102,6 +104,7 @@ type UpdateBattleInfoRsp struct {
SpecSkill string `json:"spec_skill"` SpecSkill string `json:"spec_skill"`
TotalLucky interface{} `json:"total_lucky"` TotalLucky interface{} `json:"total_lucky"`
AdmissionItemNum interface{} `json:"admission_item_num"` AdmissionItemNum interface{} `json:"admission_item_num"`
CircuitScore interface{} `json:"circuit_score"`
} `json:"user_info"` } `json:"user_info"`
HeroInfo struct { HeroInfo struct {
HeroUniId string `json:"hero_uniid"` HeroUniId string `json:"hero_uniid"`

6
server/matchserver/player/player.go
View File

@ -38,6 +38,7 @@ type player struct {
isReady int32 isReady int32
permission int32 permission int32
admissionItemNum int32 admissionItemNum int32
circuitScore int32
totalLucky int64 totalLucky int64
hero hero hero hero
team common.Team team common.Team
@ -61,6 +62,7 @@ func (this *player) init(req *pendingLoginRequest, rsp *common.LoginRsp){
this.avatarUrl = rsp.Info.UserInfo.HeadId this.avatarUrl = rsp.Info.UserInfo.HeadId
this.headFrame = rsp.Info.UserInfo.HeadFrame this.headFrame = rsp.Info.UserInfo.HeadFrame
q5.DuckToSimple(rsp.Info.UserInfo.AdmissionItemNum, &this.admissionItemNum) q5.DuckToSimple(rsp.Info.UserInfo.AdmissionItemNum, &this.admissionItemNum)
q5.DuckToSimple(rsp.Info.UserInfo.CircuitScore, &this.circuitScore)
q5.DuckToSimple(rsp.Info.UserInfo.TotalLucky, &this.totalLucky) q5.DuckToSimple(rsp.Info.UserInfo.TotalLucky, &this.totalLucky)
{ {
this.hero.heroUniId = rsp.Info.HeroInfo.HeroUniId this.hero.heroUniId = rsp.Info.HeroInfo.HeroUniId
@ -85,6 +87,7 @@ func (this *player) againInit(req *pendingLoginRequest, rsp *common.LoginRsp){
this.avatarUrl = rsp.Info.UserInfo.HeadId this.avatarUrl = rsp.Info.UserInfo.HeadId
this.headFrame = rsp.Info.UserInfo.HeadFrame this.headFrame = rsp.Info.UserInfo.HeadFrame
q5.DuckToSimple(rsp.Info.UserInfo.AdmissionItemNum, &this.admissionItemNum) q5.DuckToSimple(rsp.Info.UserInfo.AdmissionItemNum, &this.admissionItemNum)
q5.DuckToSimple(rsp.Info.UserInfo.CircuitScore, &this.circuitScore)
q5.DuckToSimple(rsp.Info.UserInfo.TotalLucky, &this.totalLucky) q5.DuckToSimple(rsp.Info.UserInfo.TotalLucky, &this.totalLucky)
{ {
this.hero.heroUniId = rsp.Info.HeroInfo.HeroUniId this.hero.heroUniId = rsp.Info.HeroInfo.HeroUniId
@ -234,6 +237,7 @@ func (this *player) FillMFTeamMember(member_pb *cs.MFTeamMember) {
member_pb.TotalLucky = proto.Int64(this.totalLucky) member_pb.TotalLucky = proto.Int64(this.totalLucky)
member_pb.ValidLefttime = proto.Int32(this.hero.validLeftTime) member_pb.ValidLefttime = proto.Int32(this.hero.validLeftTime)
member_pb.AdmissionItemNum = proto.Int32(this.admissionItemNum) member_pb.AdmissionItemNum = proto.Int32(this.admissionItemNum)
member_pb.CircuitScore = proto.Int32(this.circuitScore)
} }
func (this *player) CMLeaveTeam(hdr *f5.MsgHdr, msg *cs.CMLeaveTeam) { func (this *player) CMLeaveTeam(hdr *f5.MsgHdr, msg *cs.CMLeaveTeam) {
@ -428,6 +432,7 @@ func (this *player) CMRefreshUser(hdr *f5.MsgHdr, msg *cs.CMRefreshUser) {
this.avatarUrl = rspObj.Info.UserInfo.HeadId this.avatarUrl = rspObj.Info.UserInfo.HeadId
this.headFrame = rspObj.Info.UserInfo.HeadFrame this.headFrame = rspObj.Info.UserInfo.HeadFrame
q5.DuckToSimple(rspObj.Info.UserInfo.AdmissionItemNum, &this.admissionItemNum) q5.DuckToSimple(rspObj.Info.UserInfo.AdmissionItemNum, &this.admissionItemNum)
q5.DuckToSimple(rspObj.Info.UserInfo.CircuitScore, &this.circuitScore)
q5.DuckToSimple(rspObj.Info.UserInfo.TotalLucky, &this.totalLucky) q5.DuckToSimple(rspObj.Info.UserInfo.TotalLucky, &this.totalLucky)
{ {
this.hero.heroUniId = rspObj.Info.HeroInfo.HeroUniId this.hero.heroUniId = rspObj.Info.HeroInfo.HeroUniId
@ -481,6 +486,7 @@ func (this *player) updateChoose(skillId int32, heroUniId string,
this.avatarUrl = rspObj.Info.UserInfo.HeadId this.avatarUrl = rspObj.Info.UserInfo.HeadId
this.headFrame = rspObj.Info.UserInfo.HeadFrame this.headFrame = rspObj.Info.UserInfo.HeadFrame
q5.DuckToSimple(rspObj.Info.UserInfo.AdmissionItemNum, &this.admissionItemNum) q5.DuckToSimple(rspObj.Info.UserInfo.AdmissionItemNum, &this.admissionItemNum)
q5.DuckToSimple(rspObj.Info.UserInfo.CircuitScore, &this.circuitScore)
q5.DuckToSimple(rspObj.Info.UserInfo.TotalLucky, &this.totalLucky) q5.DuckToSimple(rspObj.Info.UserInfo.TotalLucky, &this.totalLucky)
{ {
this.hero.heroUniId = rspObj.Info.HeroInfo.HeroUniId this.hero.heroUniId = rspObj.Info.HeroInfo.HeroUniId

1
server/matchserver/proto/cs_proto.proto
View File

@ -140,6 +140,7 @@ message MFTeamMember
optional int32 valid_lefttime = 13; //最大有效时间 optional int32 valid_lefttime = 13; //最大有效时间
optional int32 admission_item_num = 14; //门票数 optional int32 admission_item_num = 14; //门票数
optional int32 battling = 15; //是否战斗中 optional int32 battling = 15; //是否战斗中
optional int32 circuit_score = 16; //循回赛积分
} }
//队伍信息 //队伍信息