tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: tl_server_2:168c2cc8c3d44bbbddd57c0f473870810332bc26
Branches Tags
tl_server_2:main
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
..
compare: tl_server_2:f1dee4a54ad4ee614bda4a45773579880a54941a
Branches Tags
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
tl_server_2:main

No commits in common. "168c2cc8c3d44bbbddd57c0f473870810332bc26" and "f1dee4a54ad4ee614bda4a45773579880a54941a" have entirely different histories.
168c2cc8c3 ... f1dee4a54a

22 changed files with 102 additions and 226 deletions
Show Stats Expand all files Collapse all files

9
common/constant.go
View File

@ -268,10 +268,6 @@ const (
GainWayItemWeekActive = 82 //周活跃奖励 GainWayItemWeekActive = 82 //周活跃奖励
GainWayContinueSign = 83 //累计签到 GainWayContinueSign = 83 //累计签到
GainWayBackend = 84 // 后台操作 GainWayBackend = 84 // 后台操作
GainWayBuyCoin = 85 // 商城购买金币
GainWayBuyItem = 86 // 商城购买道具
GainWayBuyWeekCard = 87 // 商城购买周卡
GainWayVipBuyCoin = 88 // vip商城购买金币
) )
// 后台选择 金币变化类型 的充值 类型id号起始 // 后台选择 金币变化类型 的充值 类型id号起始
@ -757,8 +753,3 @@ const (
ChannelSwitchExchange = 1 ChannelSwitchExchange = 1
ChannelSwitchDropItem = 2 ChannelSwitchDropItem = 2
) )
// 特殊商品id
const (
ShopIdWeekCard = 970001 // 周卡
)

2
data/gameparam.json
View File

@ -1,5 +1,5 @@
{ {
"NewPlayerCoin":100000000, "NewPlayerCoin":1000000,
"UpgradeAccountGiveCoin":0, "UpgradeAccountGiveCoin":0,
"LogBatchWriteCount":1024, "LogBatchWriteCount":1024,
"LogBatchWriteInterval":1, "LogBatchWriteInterval":1,

3
dbproxy/svc/l_coinlog.go
View File

@ -30,9 +30,8 @@ func CoinLogsCollection(plt string) *mongo.Collection {
c_coinlogrec.EnsureIndex(mgo.Index{Key: []string{"seqno"}, Background: true, Sparse: true}) c_coinlogrec.EnsureIndex(mgo.Index{Key: []string{"seqno"}, Background: true, Sparse: true})
c_coinlogrec.EnsureIndex(mgo.Index{Key: []string{"gamefreeid"}, Background: true, Sparse: true}) c_coinlogrec.EnsureIndex(mgo.Index{Key: []string{"gamefreeid"}, Background: true, Sparse: true})
c_coinlogrec.EnsureIndex(mgo.Index{Key: []string{"cointype"}, Background: true, Sparse: true}) c_coinlogrec.EnsureIndex(mgo.Index{Key: []string{"cointype"}, Background: true, Sparse: true})
c_coinlogrec.EnsureIndex(mgo.Index{Key: []string{"-ts"}, Background: true, Sparse: true})
c_coinlogrec.EnsureIndex(mgo.Index{Key: []string{"ts"}, Background: true, Sparse: true}) c_coinlogrec.EnsureIndex(mgo.Index{Key: []string{"ts"}, Background: true, Sparse: true})
c_coinlogrec.EnsureIndex(mgo.Index{Key: []string{"channel"}, Background: true, Sparse: true})
c_coinlogrec.EnsureIndex(mgo.Index{Key: []string{"-ts", "logtype", "cointype", "channel"}, Background: true, Sparse: true})
} }
return c_coinlogrec return c_coinlogrec
} }

4
dbproxy/svc/l_gamedetailed.go
View File

@ -18,16 +18,14 @@ func GameDetailedLogsCollection(plt string) *mongo.Collection {
if s != nil { if s != nil {
c_gamedetailed, first := s.DB().C(model.GameDetailedLogCollName) c_gamedetailed, first := s.DB().C(model.GameDetailedLogCollName)
if first { if first {
c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"platform"}, Background: true, Sparse: true}) // 兼容老代码
c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"gameid"}, Background: true, Sparse: true}) c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"gameid"}, Background: true, Sparse: true})
c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"gamefreeid"}, Background: true, Sparse: true}) c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"gamefreeid"}, Background: true, Sparse: true})
c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"logid"}, Background: true, Sparse: true}) c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"logid"}, Background: true, Sparse: true})
c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"time"}, Background: true, Sparse: true}) c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"time"}, Background: true, Sparse: true})
c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"-time"}, Background: true, Sparse: true}) c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"-time"}, Background: true, Sparse: true})
c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"ts"}, Background: true, Sparse: true}) c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"ts"}, Background: true, Sparse: true})
c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"-ts"}, Background: true, Sparse: true})
c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"matchid"}, Background: true, Sparse: true}) c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"matchid"}, Background: true, Sparse: true})
c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"-ts", "gameid"}, Background: true, Sparse: true})
c_gamedetailed.EnsureIndex(mgo.Index{Key: []string{"-ts", "gamefreeid"}, Background: true, Sparse: true})
} }
return c_gamedetailed return c_gamedetailed
} }

6
dbproxy/svc/l_gameplayerlistlog.go
View File

@ -21,7 +21,6 @@ func GamePlayerListLogsCollection(plt string) *mongo.Collection {
if s != nil { if s != nil {
c_gameplayerlistlog, first := s.DB().C(model.GamePlayerListLogCollName) c_gameplayerlistlog, first := s.DB().C(model.GamePlayerListLogCollName)
if first { if first {
c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"platform"}, Background: true, Sparse: true}) // 兼容老代码
c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"snid"}, Background: true, Sparse: true}) c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"snid"}, Background: true, Sparse: true})
c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"channel"}, Background: true, Sparse: true}) c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"channel"}, Background: true, Sparse: true})
c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"promoter"}, Background: true, Sparse: true}) c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"promoter"}, Background: true, Sparse: true})
@ -32,15 +31,12 @@ func GamePlayerListLogsCollection(plt string) *mongo.Collection {
c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"gamefreeid"}, Background: true, Sparse: true}) c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"gamefreeid"}, Background: true, Sparse: true})
c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"gamedetailedlogid"}, Background: true, Sparse: true}) c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"gamedetailedlogid"}, Background: true, Sparse: true})
c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"ts"}, Background: true, Sparse: true}) c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"ts"}, Background: true, Sparse: true})
c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"-ts"}, Background: true, Sparse: true})
c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"time"}, Background: true, Sparse: true}) c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"time"}, Background: true, Sparse: true})
c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"-time"}, Background: true, Sparse: true}) c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"-time"}, Background: true, Sparse: true})
c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"name"}, Background: true, Sparse: true}) c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"name"}, Background: true, Sparse: true})
c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"matchid"}, Background: true, Sparse: true}) c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"matchid"}, Background: true, Sparse: true})
c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"matchtype"}, Background: true, Sparse: true}) c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"matchtype"}, Background: true, Sparse: true})
c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"-ts", "gameid"}, Background: true, Sparse: true})
c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"-ts", "gamefreeid"}, Background: true, Sparse: true})
c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"-ts", "snid", "gameid"}, Background: true, Sparse: true})
c_gameplayerlistlog.EnsureIndex(mgo.Index{Key: []string{"-ts", "snid", "gamefreeid"}, Background: true, Sparse: true})
} }
return c_gameplayerlistlog return c_gameplayerlistlog
} }

2
gamesrv/base/player.go
View File

@ -445,7 +445,6 @@ func (this *Player) AddCoin(num int64, gainWay int32, syncFlag int, oper, remark
log := model.NewCoinLogEx(&model.CoinLogParam{ log := model.NewCoinLogEx(&model.CoinLogParam{
Platform: this.Platform, Platform: this.Platform,
SnID: this.SnId, SnID: this.SnId,
Channel: this.Channel,
ChangeType: common.BillTypeCoin, ChangeType: common.BillTypeCoin,
ChangeNum: num, ChangeNum: num,
RemainNum: this.Coin, RemainNum: this.Coin,
@ -530,7 +529,6 @@ func (this *Player) AddCoinAsync(num int64, gainWay int32, notifyC, broadcast bo
log := model.NewCoinLogEx(&model.CoinLogParam{ log := model.NewCoinLogEx(&model.CoinLogParam{
Platform: this.Platform, Platform: this.Platform,
SnID: this.SnId, SnID: this.SnId,
Channel: this.Channel,
ChangeType: common.BillTypeCoin, ChangeType: common.BillTypeCoin,
ChangeNum: num, ChangeNum: num,
RemainNum: this.Coin, RemainNum: this.Coin,

4
model/coinlog.go
View File

@ -77,7 +77,6 @@ func NewCoinLog() *CoinLog {
type CoinLogParam struct { type CoinLogParam struct {
Platform string // 平台id Platform string // 平台id
SnID int32 // 玩家id SnID int32 // 玩家id
Channel string // 渠道
ChangeType int32 // 变化类型 common.BillTypeCoin 金币 common.BillTypeDiamond 钻石 ChangeType int32 // 变化类型 common.BillTypeCoin 金币 common.BillTypeDiamond 钻石
ChangeNum int64 // 变化数量 ChangeNum int64 // 变化数量
RemainNum int64 // 余额 RemainNum int64 // 余额
@ -93,9 +92,8 @@ type CoinLogParam struct {
func NewCoinLogEx(param *CoinLogParam) *CoinLog { func NewCoinLogEx(param *CoinLogParam) *CoinLog {
tNow := time.Now() tNow := time.Now()
cl := NewCoinLog() cl := NewCoinLog()
cl.Platform = param.Platform
cl.SnId = param.SnID cl.SnId = param.SnID
cl.Channel = param.Channel cl.Platform = param.Platform
cl.Count = param.ChangeNum cl.Count = param.ChangeNum
cl.Oper = param.Operator cl.Oper = param.Operator
cl.Remark = param.Remark cl.Remark = param.Remark

1
model/gameparam.go
View File

@ -79,7 +79,6 @@ type GameParam struct {
CloseChannelSwitch bool //关闭渠道开关功能 CloseChannelSwitch bool //关闭渠道开关功能
BackendTimeLocal int //后台时区 BackendTimeLocal int //后台时区
GameStaticsFightVersion int // 对战场统计数据版本 GameStaticsFightVersion int // 对战场统计数据版本
TestRankMatchAward bool // 测试段位奖励领取通知，直接改玩家排位积分使玩家获得奖励
} }
var GameParamPath = "../data/gameparam.json" var GameParamPath = "../data/gameparam.json"

5
model/playerrankseason.go
View File

@ -15,9 +15,8 @@ type RankAward struct {
} }
type PlayerRankInfo struct { type PlayerRankInfo struct {
LastScore int64 // 上次积分 Score int64 // 积分
Score int64 // 积分 Awards []*RankAward // 赛季奖励
Awards []*RankAward // 赛季奖励
} }
type PlayerRankSeason struct { type PlayerRankSeason struct {

182
protocol/rankmatch/rankmatch.pb.go
View File

@ -136,12 +136,11 @@ type SeasonInfo struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Id int32 `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty"` // 排位类型 Id int32 `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty"` // 排位类型
Lv int32 `protobuf:"varint,2,opt,name=Lv,proto3" json:"Lv,omitempty"` // 段位 Lv int32 `protobuf:"varint,2,opt,name=Lv,proto3" json:"Lv,omitempty"` // 段位
Score int64 `protobuf:"varint,3,opt,name=Score,proto3" json:"Score,omitempty"` // 积分 Score int64 `protobuf:"varint,3,opt,name=Score,proto3" json:"Score,omitempty"` // 积分
LastLv int32 `protobuf:"varint,4,opt,name=LastLv,proto3" json:"LastLv,omitempty"` // 上赛季段位 LastLv int32 `protobuf:"varint,4,opt,name=LastLv,proto3" json:"LastLv,omitempty"` // 上赛季段位
LastScore int64 `protobuf:"varint,5,opt,name=LastScore,proto3" json:"LastScore,omitempty"` // 上赛季积分 LastScore int64 `protobuf:"varint,5,opt,name=LastScore,proto3" json:"LastScore,omitempty"` // 上赛季积分
Award *AwardItem `protobuf:"bytes,6,opt,name=Award,proto3" json:"Award,omitempty"` // 奖励列表
} }
func (x *SeasonInfo) Reset() { func (x *SeasonInfo) Reset() {
@ -211,13 +210,6 @@ func (x *SeasonInfo) GetLastScore() int64 {
return 0 return 0
} }
func (x *SeasonInfo) GetAward() *AwardItem {
if x != nil {
return x.Award
}
return nil
}
// PACKET_RM_SCRMSeasonInfo // PACKET_RM_SCRMSeasonInfo
type SCRMSeasonInfo struct { type SCRMSeasonInfo struct {
state protoimpl.MessageState state protoimpl.MessageState
@ -799,81 +791,78 @@ var File_rankmatch_proto protoreflect.FileDescriptor
var file_rankmatch_proto_rawDesc = []byte{ var file_rankmatch_proto_rawDesc = []byte{
0x0a, 0x0f, 0x72, 0x61, 0x6e, 0x6b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x0a, 0x0f, 0x72, 0x61, 0x6e, 0x6b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x12, 0x09, 0x72, 0x61, 0x6e, 0x6b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x22, 0x10, 0x0a, 0x0e, 0x6f, 0x12, 0x09, 0x72, 0x61, 0x6e, 0x6b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x22, 0x10, 0x0a, 0x0e,
0x43, 0x53, 0x52, 0x4d, 0x53, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0xa4, 0x43, 0x53, 0x52, 0x4d, 0x53, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x78,
0x01, 0x0a, 0x0a, 0x53, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x0a, 0x0a, 0x53, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02,
0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02,
0x02, 0x4c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x4c, 0x76, 0x12, 0x14, 0x0a, 0x4c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x4c, 0x76, 0x12, 0x14, 0x0a, 0x05,
0x05, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x53, 0x63, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x53, 0x63, 0x6f,
0x6f, 0x72, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x4c, 0x61, 0x73, 0x74, 0x4c, 0x76, 0x18, 0x04, 0x20, 0x72, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x4c, 0x61, 0x73, 0x74, 0x4c, 0x76, 0x18, 0x04, 0x20, 0x01,
0x01, 0x28, 0x05, 0x52, 0x06, 0x4c, 0x61, 0x73, 0x74, 0x4c, 0x76, 0x12, 0x1c, 0x0a, 0x09, 0x4c, 0x28, 0x05, 0x52, 0x06, 0x4c, 0x61, 0x73, 0x74, 0x4c, 0x76, 0x12, 0x1c, 0x0a, 0x09, 0x4c, 0x61,
0x61, 0x73, 0x74, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x73, 0x74, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x4c,
0x4c, 0x61, 0x73, 0x74, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x12, 0x2a, 0x0a, 0x05, 0x41, 0x77, 0x61, 0x61, 0x73, 0x74, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x22, 0x6f, 0x0a, 0x0e, 0x53, 0x43, 0x52, 0x4d,
0x72, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x72, 0x61, 0x6e, 0x6b, 0x6d, 0x53, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64,
0x61, 0x74, 0x63, 0x68, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x54, 0x69,
0x41, 0x77, 0x61, 0x72, 0x64, 0x22, 0x6f, 0x0a, 0x0e, 0x53, 0x43, 0x52, 0x4d, 0x53, 0x65, 0x61, 0x6d, 0x65, 0x53, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x03, 0x52, 0x09, 0x54,
0x73, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x69, 0x6d, 0x65, 0x53, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x2f, 0x0a, 0x07, 0x53, 0x65, 0x61, 0x73,
0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x72, 0x61, 0x6e, 0x6b,
0x74, 0x61, 0x6d, 0x70, 0x18, 0x02, 0x20, 0x03, 0x28, 0x03, 0x52, 0x09, 0x54, 0x69, 0x6d, 0x65, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x53, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f,
0x53, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x2f, 0x0a, 0x07, 0x53, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x53, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x73, 0x22, 0x20, 0x0a, 0x0e, 0x43, 0x53, 0x52,
0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x72, 0x61, 0x6e, 0x6b, 0x6d, 0x61, 0x74, 0x4d, 0x52, 0x61, 0x6e, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x49,
0x63, 0x68, 0x2e, 0x53, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x07, 0x53, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x22, 0x54, 0x0a, 0x08, 0x52,
0x65, 0x61, 0x73, 0x6f, 0x6e, 0x73, 0x22, 0x20, 0x0a, 0x0e, 0x43, 0x53, 0x52, 0x4d, 0x52, 0x61, 0x61, 0x6e, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20,
0x6e, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01,
0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x22, 0x54, 0x0a, 0x08, 0x52, 0x61, 0x6e, 0x6b,
0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
0x52, 0x02, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x4c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
0x52, 0x02, 0x4c, 0x76, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01,
0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x63, 0x6f, 0x72,
0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x22, 0x3b,
0x0a, 0x0e, 0x53, 0x43, 0x52, 0x4d, 0x52, 0x61, 0x6e, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
0x12, 0x29, 0x0a, 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x13, 0x2e, 0x72, 0x61, 0x6e, 0x6b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x52, 0x61, 0x6e, 0x6b,
0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x21, 0x0a, 0x0f, 0x43,
0x53, 0x52, 0x4d, 0x41, 0x77, 0x61, 0x72, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x0e,
0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x22, 0x29,
0x0a, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20,
0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75, 0x6d, 0x18, 0x02,
0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x22, 0x8d, 0x01, 0x0a, 0x09, 0x41, 0x77,
0x61, 0x72, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20,
0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x4c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x4c, 0x76, 0x18, 0x02, 0x20,
0x01, 0x28, 0x05, 0x52, 0x02, 0x4c, 0x76, 0x12, 0x28, 0x0a, 0x06, 0x41, 0x77, 0x61, 0x72, 0x64, 0x01, 0x28, 0x05, 0x52, 0x02, 0x4c, 0x76, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18,
0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x72, 0x61, 0x6e, 0x6b, 0x6d, 0x61, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x53,
0x74, 0x63, 0x68, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x06, 0x41, 0x77, 0x61, 0x72, 0x64, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x53, 0x63, 0x6f, 0x72,
0x73, 0x12, 0x20, 0x0a, 0x0b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x54, 0x79, 0x70, 0x65, 0x65, 0x22, 0x3b, 0x0a, 0x0e, 0x53, 0x43, 0x52, 0x4d, 0x52, 0x61, 0x6e, 0x6b, 0x43, 0x6f, 0x6e,
0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x54, 0x66, 0x69, 0x67, 0x12, 0x29, 0x0a, 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03,
0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x72, 0x61, 0x6e, 0x6b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x52,
0x28, 0x03, 0x52, 0x05, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x22, 0x3b, 0x0a, 0x0f, 0x53, 0x43, 0x52, 0x61, 0x6e, 0x6b, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x21,
0x4d, 0x41, 0x77, 0x61, 0x72, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x28, 0x0a, 0x04, 0x0a, 0x0f, 0x43, 0x53, 0x52, 0x4d, 0x41, 0x77, 0x61, 0x72, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69,
0x4c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x72, 0x61, 0x6e, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49,
0x6b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x64, 0x22, 0x29, 0x0a, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64,
0x52, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x35, 0x0a, 0x09, 0x43, 0x53, 0x52, 0x4d, 0x41, 0x77, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x4e, 0x75,
0x61, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x4e, 0x75, 0x6d, 0x22, 0x8d, 0x01, 0x0a,
0x02, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x41, 0x77, 0x61, 0x72, 0x64, 0x49, 0x64, 0x18, 0x02, 0x09, 0x41, 0x77, 0x61, 0x72, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64,
0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x41, 0x77, 0x61, 0x72, 0x64, 0x49, 0x64, 0x22, 0x2f, 0x0a, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x4c, 0x76,
0x09, 0x53, 0x43, 0x52, 0x4d, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x43, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x4c, 0x76, 0x12, 0x28, 0x0a, 0x06, 0x41, 0x77,
0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0e, 0x61, 0x72, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x72, 0x61, 0x6e,
0x0a, 0x02, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x2a, 0x8f, 0x6b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x52, 0x06, 0x41, 0x77,
0x02, 0x0a, 0x09, 0x52, 0x61, 0x6e, 0x6b, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x12, 0x0a, 0x0e, 0x61, 0x72, 0x64, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x54,
0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x4d, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x52, 0x65, 0x63, 0x65, 0x69,
0x12, 0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x4d, 0x5f, 0x43, 0x53, 0x76, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x18,
0x52, 0x4d, 0x53, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0xdc, 0x15, 0x12, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x22, 0x3b, 0x0a, 0x0f,
0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x4d, 0x5f, 0x53, 0x43, 0x52, 0x53, 0x43, 0x52, 0x4d, 0x41, 0x77, 0x61, 0x72, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
0x4d, 0x53, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0xdd, 0x15, 0x12, 0x1d, 0x28, 0x0a, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e,
0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x4d, 0x5f, 0x43, 0x53, 0x52, 0x4d, 0x72, 0x61, 0x6e, 0x6b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x49,
0x52, 0x61, 0x6e, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x10, 0xe0, 0x15, 0x12, 0x1d, 0x0a, 0x74, 0x65, 0x6d, 0x52, 0x04, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x35, 0x0a, 0x09, 0x43, 0x53, 0x52,
0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x4d, 0x5f, 0x53, 0x43, 0x52, 0x4d, 0x52, 0x4d, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01,
0x61, 0x6e, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x10, 0xe1, 0x15, 0x12, 0x1e, 0x0a, 0x19, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x41, 0x77, 0x61, 0x72, 0x64, 0x49,
0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x4d, 0x5f, 0x43, 0x53, 0x52, 0x4d, 0x41, 0x77, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x41, 0x77, 0x61, 0x72, 0x64, 0x49, 0x64,
0x61, 0x72, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x10, 0xe2, 0x15, 0x12, 0x1e, 0x0a, 0x19, 0x22, 0x2f, 0x0a, 0x09, 0x53, 0x43, 0x52, 0x4d, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x12, 0x0a,
0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x4d, 0x5f, 0x53, 0x43, 0x52, 0x4d, 0x41, 0x77, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x43, 0x6f, 0x64,
0x61, 0x72, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x10, 0xe3, 0x15, 0x12, 0x18, 0x0a, 0x13, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49,
0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x4d, 0x5f, 0x43, 0x53, 0x52, 0x4d, 0x41, 0x77, 0x64, 0x2a, 0x8f, 0x02, 0x0a, 0x09, 0x52, 0x61, 0x6e, 0x6b, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12,
0x61, 0x72, 0x64, 0x10, 0xe4, 0x15, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x12, 0x0a, 0x0e, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x4d, 0x5f, 0x5a, 0x45, 0x52,
0x5f, 0x52, 0x4d, 0x5f, 0x53, 0x43, 0x52, 0x4d, 0x41, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe5, 0x15, 0x4f, 0x10, 0x00, 0x12, 0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x4d,
0x42, 0x29, 0x5a, 0x27, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x5f, 0x43, 0x53, 0x52, 0x4d, 0x53, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x10,
0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0xdc, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x4d, 0x5f,
0x6c, 0x2f, 0x72, 0x61, 0x6e, 0x6b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x53, 0x43, 0x52, 0x4d, 0x53, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0xdd,
0x74, 0x6f, 0x33, 0x15, 0x12, 0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x4d, 0x5f, 0x43,
0x53, 0x52, 0x4d, 0x52, 0x61, 0x6e, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x10, 0xe0, 0x15,
0x12, 0x1d, 0x0a, 0x18, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x4d, 0x5f, 0x53, 0x43,
0x52, 0x4d, 0x52, 0x61, 0x6e, 0x6b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x10, 0xe1, 0x15, 0x12,
0x1e, 0x0a, 0x19, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x4d, 0x5f, 0x43, 0x53, 0x52,
0x4d, 0x41, 0x77, 0x61, 0x72, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x10, 0xe2, 0x15, 0x12,
0x1e, 0x0a, 0x19, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x4d, 0x5f, 0x53, 0x43, 0x52,
0x4d, 0x41, 0x77, 0x61, 0x72, 0x64, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x10, 0xe3, 0x15, 0x12,
0x18, 0x0a, 0x13, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x52, 0x4d, 0x5f, 0x43, 0x53, 0x52,
0x4d, 0x41, 0x77, 0x61, 0x72, 0x64, 0x10, 0xe4, 0x15, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x41, 0x43,
0x4b, 0x45, 0x54, 0x5f, 0x52, 0x4d, 0x5f, 0x53, 0x43, 0x52, 0x4d, 0x41, 0x77, 0x61, 0x72, 0x64,
0x10, 0xe5, 0x15, 0x42, 0x29, 0x5a, 0x27, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d,
0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x72, 0x61, 0x6e, 0x6b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x62, 0x06,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
var ( var (
@ -906,16 +895,15 @@ var file_rankmatch_proto_goTypes = []interface{}{
(*SCRMAward)(nil), // 12: rankmatch.SCRMAward (*SCRMAward)(nil), // 12: rankmatch.SCRMAward
} }
var file_rankmatch_proto_depIdxs = []int32{ var file_rankmatch_proto_depIdxs = []int32{
9, // 0: rankmatch.SeasonInfo.Award:type_name -> rankmatch.AwardItem 2, // 0: rankmatch.SCRMSeasonInfo.Seasons:type_name -> rankmatch.SeasonInfo
2, // 1: rankmatch.SCRMSeasonInfo.Seasons:type_name -> rankmatch.SeasonInfo 5, // 1: rankmatch.SCRMRankConfig.Items:type_name -> rankmatch.RankItem
5, // 2: rankmatch.SCRMRankConfig.Items:type_name -> rankmatch.RankItem 8, // 2: rankmatch.AwardItem.Awards:type_name -> rankmatch.Award
8, // 3: rankmatch.AwardItem.Awards:type_name -> rankmatch.Award 9, // 3: rankmatch.SCRMAwardConfig.List:type_name -> rankmatch.AwardItem
9, // 4: rankmatch.SCRMAwardConfig.List:type_name -> rankmatch.AwardItem 4, // [4:4] is the sub-list for method output_type
5, // [5:5] is the sub-list for method output_type 4, // [4:4] is the sub-list for method input_type
5, // [5:5] is the sub-list for method input_type 4, // [4:4] is the sub-list for extension type_name
5, // [5:5] is the sub-list for extension type_name 4, // [4:4] is the sub-list for extension extendee
5, // [5:5] is the sub-list for extension extendee 0, // [0:4] is the sub-list for field type_name
0, // [0:5] is the sub-list for field type_name
} }
func init() { file_rankmatch_proto_init() } func init() { file_rankmatch_proto_init() }

1
protocol/rankmatch/rankmatch.proto
View File

@ -29,7 +29,6 @@ message SeasonInfo{
int64 Score = 3; // 积分 int64 Score = 3; // 积分
int32 LastLv = 4; // 上赛季段位 int32 LastLv = 4; // 上赛季段位
int64 LastScore = 5; // 上赛季积分 int64 LastScore = 5; // 上赛季积分
AwardItem Award = 6; // 奖励列表
} }
// PACKET_RM_SCRMSeasonInfo // PACKET_RM_SCRMSeasonInfo

2
public

@ -1 +1 @@
Subproject commit 363a22034898c87b42588d088a7838134d84dcb6 Subproject commit e26134143eba5c7ced96afc84bde42705a9297be

2
worldsrv/action_game.go
View File

@ -522,7 +522,6 @@ func _LeaveTransferThird2SystemTask(p *Player) {
coinlogex = model.NewCoinLogEx(&model.CoinLogParam{ coinlogex = model.NewCoinLogEx(&model.CoinLogParam{
Platform: p.Platform, Platform: p.Platform,
SnID: p.SnId, SnID: p.SnId,
Channel: p.Channel,
ChangeType: common.BillTypeCoin, ChangeType: common.BillTypeCoin,
ChangeNum: amount, ChangeNum: amount,
RemainNum: p.Coin + amount, RemainNum: p.Coin + amount,
@ -1163,7 +1162,6 @@ func RefreshTransferThird2SystemTask(p *Player) {
coinlogex = model.NewCoinLogEx(&model.CoinLogParam{ coinlogex = model.NewCoinLogEx(&model.CoinLogParam{
Platform: p.Platform, Platform: p.Platform,
SnID: p.SnId, SnID: p.SnId,
Channel: p.Channel,
ChangeType: common.BillTypeCoin, ChangeType: common.BillTypeCoin,
ChangeNum: amount, ChangeNum: amount,
RemainNum: p.Coin + amount, RemainNum: p.Coin + amount,

1
worldsrv/action_player.go
View File

@ -1414,7 +1414,6 @@ func (this *CSPlayerRegisterHandler) Process(s *netlib.Session, packetid int, da
log := model.NewCoinLogEx(&model.CoinLogParam{ log := model.NewCoinLogEx(&model.CoinLogParam{
Platform: pi.Platform, Platform: pi.Platform,
SnID: pi.SnId, SnID: pi.SnId,
Channel: pi.Channel,
ChangeType: common.BillTypeCoin, ChangeType: common.BillTypeCoin,
ChangeNum: int64(model.GameParamData.NewPlayerCoin), ChangeNum: int64(model.GameParamData.NewPlayerCoin),
RemainNum: pi.Coin + int64(model.GameParamData.NewPlayerCoin), RemainNum: pi.Coin + int64(model.GameParamData.NewPlayerCoin),

2
worldsrv/action_rankmatch.go
View File

@ -61,7 +61,6 @@ func CSRMSeasonInfo(s *netlib.Session, packetId int, data interface{}, sid int64
pack.Seasons = append(pack.Seasons, info) pack.Seasons = append(pack.Seasons, info)
} }
} }
p.SendToClient(int(rankmatch.RankMatch_PACKET_RM_SCRMSeasonInfo), pack) p.SendToClient(int(rankmatch.RankMatch_PACKET_RM_SCRMSeasonInfo), pack)
logger.Logger.Trace("SCTMSeasonInfo:", pack) logger.Logger.Trace("SCTMSeasonInfo:", pack)
return nil return nil
@ -271,7 +270,6 @@ func CSRMAward(s *netlib.Session, packetId int, data interface{}, sid int64) err
Id: d.Award3Id, Id: d.Award3Id,
Num: d.Award3Num, Num: d.Award3Num,
}) })
RankMgrSingleton.CheckShowRed(p.SnId)
} }
p.SendToClient(int(rankmatch.RankMatch_PACKET_RM_SCRMAward), pack) p.SendToClient(int(rankmatch.RankMatch_PACKET_RM_SCRMAward), pack)

18
worldsrv/action_server.go
View File

@ -100,23 +100,7 @@ func init() {
RankMgrSingleton.UpdateRobotSeason(p.Platform, p.SnId, scene.dbGameFree.GetRankType(), RankMgrSingleton.UpdateRobotSeason(p.Platform, p.SnId, scene.dbGameFree.GetRankType(),
msg.GetRankScore()[scene.dbGameFree.GetRankType()], p.Name, p.Sex, p.HeadUrl, p.Coin, p.PlayerData.GetRoleId()) msg.GetRankScore()[scene.dbGameFree.GetRankType()], p.Name, p.Sex, p.HeadUrl, p.Coin, p.PlayerData.GetRoleId())
} else { } else {
if model.GameParamData.TestRankMatchAward { RankMgrSingleton.UpdatePlayerSeason(p.SnId, msg.GetRankScore())
if RankMgrSingleton.playerSeasons[p.SnId] != nil {
if RankMgrSingleton.playerSeasons[p.SnId].RankType == nil {
RankMgrSingleton.playerSeasons[p.SnId].RankType = make(map[int32]*model.PlayerRankInfo)
}
if RankMgrSingleton.playerSeasons[p.SnId].RankType[1] == nil {
RankMgrSingleton.playerSeasons[p.SnId].RankType[1] = &model.PlayerRankInfo{}
}
RankMgrSingleton.playerSeasons[p.SnId].RankType[1].LastScore = 7500
RankMgrSingleton.playerSeasons[p.SnId].RankType[1].Score = 7500
RankMgrSingleton.playerSeasons[p.SnId].RankType[1].Awards = nil
}
RankMgrSingleton.UpdatePlayerSeason(p.SnId, map[int32]int64{1: 10000})
} else {
RankMgrSingleton.UpdatePlayerSeason(p.SnId, msg.GetRankScore())
}
} }
} }
//更新玩家等级排行榜 //更新玩家等级排行榜

41
worldsrv/player.go
View File

@ -1899,7 +1899,6 @@ func (this *Player) AddDiamond(num, add int64, gainWay int32, oper, remark strin
log := model.NewCoinLogEx(&model.CoinLogParam{ log := model.NewCoinLogEx(&model.CoinLogParam{
Platform: this.Platform, Platform: this.Platform,
SnID: this.SnId, SnID: this.SnId,
Channel: this.Channel,
ChangeType: common.BillTypeDiamond, ChangeType: common.BillTypeDiamond,
ChangeNum: num, ChangeNum: num,
RemainNum: this.Diamond, RemainNum: this.Diamond,
@ -1955,7 +1954,6 @@ func (this *Player) AddCoin(num, add int64, gainWay int32, oper, remark string)
log := model.NewCoinLogEx(&model.CoinLogParam{ log := model.NewCoinLogEx(&model.CoinLogParam{
Platform: this.Platform, Platform: this.Platform,
SnID: this.SnId, SnID: this.SnId,
Channel: this.Channel,
ChangeType: common.BillTypeCoin, ChangeType: common.BillTypeCoin,
ChangeNum: num, ChangeNum: num,
RemainNum: this.Coin, RemainNum: this.Coin,
@ -2010,7 +2008,6 @@ func (this *Player) AddCoinAsync(num, add int64, gainWay int32, oper, remark str
log := model.NewCoinLogEx(&model.CoinLogParam{ log := model.NewCoinLogEx(&model.CoinLogParam{
Platform: this.Platform, Platform: this.Platform,
SnID: this.SnId, SnID: this.SnId,
Channel: this.Channel,
ChangeType: common.BillTypeCoin, ChangeType: common.BillTypeCoin,
ChangeNum: num, ChangeNum: num,
RemainNum: this.Coin, RemainNum: this.Coin,
@ -3607,7 +3604,7 @@ func (this *Player) SendShowRed(showType hall_proto.ShowRedCode, showChild, isSh
}, },
} }
proto.SetDefaults(pack) proto.SetDefaults(pack)
logger.Logger.Trace("SCShowRed:", pack) //logger.Logger.Trace("SCShowRed:", pack)
this.SendToClient(int(hall_proto.HallPacketID_PACKET_SC_SHOWRED), pack) this.SendToClient(int(hall_proto.HallPacketID_PACKET_SC_SHOWRED), pack)
} }
@ -4012,42 +4009,6 @@ func (this *Player) SendRankSeason() {
info := &rankmatch.SeasonInfo{Id: k} info := &rankmatch.SeasonInfo{Id: k}
info.Lv, info.Score = RankMgrSingleton.GetPlayerRankLV(k, this.SnId) info.Lv, info.Score = RankMgrSingleton.GetPlayerRankLV(k, this.SnId)
info.LastLv, info.LastScore = RankMgrSingleton.GetPlayerLastRankLV(k, this.SnId) info.LastLv, info.LastScore = RankMgrSingleton.GetPlayerLastRankLV(k, this.SnId)
se := RankMgrSingleton.GetPlayerSeason(this.SnId)
if se != nil && se.RankType[k] != nil {
if se.RankType[k].LastScore < se.RankType[k].Score {
oldLv := srvdata.RankLevelMgr.GetRankLevel(k, se.RankType[k].LastScore)
if info.Lv > oldLv {
var awards *rankmatch.AwardItem
var maxLv int32 = -1
for _, item := range RankMgrSingleton.GetRankAwardList(k) {
// 1 可领取 2已领取
if info.Lv >= item.Lv {
has := false
// 是否已领取
for _, vv := range v.Awards {
if vv.Id == item.Id {
if vv.Ts > 0 {
has = true
}
break
}
}
if !has {
if item.Lv > maxLv {
awards = item
maxLv = item.Lv
}
}
}
}
if awards != nil {
info.Award = awards
}
}
se.RankType[k].LastScore = se.RankType[k].Score
}
}
pack.Seasons = append(pack.Seasons, info) pack.Seasons = append(pack.Seasons, info)
} }
} }

10
worldsrv/rankmatch.go
View File

@ -126,7 +126,6 @@ func (this *PlayerRankSeason) CheckNewSeason() {
} }
for k, v := range this.RankType { for k, v := range this.RankType {
this.RankType[k].Score = RankMgrSingleton.NewSeasonScore(v.Score) this.RankType[k].Score = RankMgrSingleton.NewSeasonScore(v.Score)
this.RankType[k].LastScore = this.RankType[k].Score
this.RankType[k].Awards = nil this.RankType[k].Awards = nil
} }
@ -156,7 +155,6 @@ func (this *PlayerRankSeason) Update(rankScore map[int32]int64) {
for k, v := range this.RankType { for k, v := range this.RankType {
if v != nil && v.Score != rankScore[k] { if v != nil && v.Score != rankScore[k] {
v.LastScore = v.Score
v.Score = rankScore[k] v.Score = rankScore[k]
this.Dirty = true this.Dirty = true
this.CheckShowRed(k) this.CheckShowRed(k)
@ -209,12 +207,10 @@ here:
break break
} }
} }
p := PlayerMgrSington.GetPlayerBySnId(this.SnId) if has {
if p != nil { p := PlayerMgrSington.GetPlayerBySnId(this.SnId)
if has { if p != nil {
p.SendShowRed(hall_proto.ShowRedCode_RankReward, rankType, 1) p.SendShowRed(hall_proto.ShowRedCode_RankReward, rankType, 1)
} else {
p.SendShowRed(hall_proto.ShowRedCode_RankReward, rankType, 0)
} }
} }
} }

21
worldsrv/shopmgr.go
View File

@ -646,28 +646,13 @@ func (this *ShopMgr) GainShop(shopInfo *model.ShopInfo, p *Player, vipShopId, po
costNum := this.GetCostNum(p, shopInfo, vipShopId) costNum := this.GetCostNum(p, shopInfo, vipShopId)
if shopInfo.Ad <= 0 { //消耗 if shopInfo.Ad <= 0 { //消耗
logger.Logger.Tracef("GainShop ConstType[%v],shopName[%v],costNum[%v]", shopInfo.ConstType, shopName, costNum) logger.Logger.Tracef("GainShop ConstType[%v],shopName[%v],costNum[%v]", shopInfo.ConstType, shopName, costNum)
var gainWay int32 = common.GainWay_Shop_Buy
switch shopInfo.Page {
case ShopPageCoin:
gainWay = common.GainWayBuyCoin
case ShopPageGift:
if shopInfo.Id == common.ShopIdWeekCard {
gainWay = common.GainWayBuyWeekCard
}
case ShopPageItem:
gainWay = common.GainWayBuyItem
case ShopPageVip:
gainWay = common.GainWayVipBuyCoin
}
switch shopInfo.ConstType { switch shopInfo.ConstType {
case ShopConsumeCoin: case ShopConsumeCoin:
p.AddCoin(-costNum, 0, gainWay, "sys", shopName) p.AddCoin(-costNum, 0, common.GainWay_Shop_Buy, "sys", shopName)
case ShopConsumeDiamond: case ShopConsumeDiamond:
p.AddDiamond(-costNum, 0, gainWay, "sys", shopName) p.AddDiamond(-costNum, 0, common.GainWay_Shop_Buy, "sys", shopName)
case ShopConsumePhoneScore: case ShopConsumePhoneScore:
p.AddPhoneScore(-costNum, 0, gainWay, "sys", shopName) p.AddPhoneScore(-costNum, 0, common.GainWay_Shop_Buy, "sys", shopName)
default: default:
logger.Logger.Errorf("GainShop ConstType[%v] err", shopInfo.ConstType) logger.Logger.Errorf("GainShop ConstType[%v] err", shopInfo.ConstType)
return shop.OpResultCode_OPRC_Error return shop.OpResultCode_OPRC_Error

3
worldsrv/task_login.go
View File

@ -135,7 +135,6 @@ func (t *TaskLogin) Call(o *basic.Object) interface{} {
log := model.NewCoinLogEx(&model.CoinLogParam{ log := model.NewCoinLogEx(&model.CoinLogParam{
Platform: playerData.Platform, Platform: playerData.Platform,
SnID: playerData.SnId, SnID: playerData.SnId,
Channel: playerData.Channel,
ChangeType: common.BillTypeCoin, ChangeType: common.BillTypeCoin,
ChangeNum: int64(model.GameParamData.NewPlayerCoin), ChangeNum: int64(model.GameParamData.NewPlayerCoin),
RemainNum: playerData.Coin + int64(model.GameParamData.NewPlayerCoin), RemainNum: playerData.Coin + int64(model.GameParamData.NewPlayerCoin),
@ -166,7 +165,6 @@ func (t *TaskLogin) Call(o *basic.Object) interface{} {
log := model.NewCoinLogEx(&model.CoinLogParam{ log := model.NewCoinLogEx(&model.CoinLogParam{
Platform: playerData.Platform, Platform: playerData.Platform,
SnID: playerData.SnId, SnID: playerData.SnId,
Channel: playerData.Channel,
ChangeType: common.BillTypeCoin, ChangeType: common.BillTypeCoin,
ChangeNum: coin, ChangeNum: coin,
RemainNum: playerData.Coin + coin, RemainNum: playerData.Coin + coin,
@ -191,7 +189,6 @@ func (t *TaskLogin) Call(o *basic.Object) interface{} {
log := model.NewCoinLogEx(&model.CoinLogParam{ log := model.NewCoinLogEx(&model.CoinLogParam{
Platform: playerData.Platform, Platform: playerData.Platform,
SnID: playerData.SnId, SnID: playerData.SnId,
Channel: playerData.Channel,
ChangeType: common.BillTypeDiamond, ChangeType: common.BillTypeDiamond,
ChangeNum: diamond, ChangeNum: diamond,
RemainNum: playerData.Diamond + diamond, RemainNum: playerData.Diamond + diamond,

3
worldsrv/tournament.go
View File

@ -1616,8 +1616,7 @@ func (this *Tournament) FixMatchTimeStamp(d *webapiproto.GameMatchDate) {
for _, v := range d.MatchTimeWeek { for _, v := range d.MatchTimeWeek {
if v == int32(week) { if v == int32(week) {
stSub := st.Unix() - nowtool.New(st).BeginningOfDay().Unix() stSub := st.Unix() - nowtool.New(st).BeginningOfDay().Unix()
etSub := et.Unix() - nowtool.New(et).BeginningOfDay().Unix() sub := d.MatchTimeStamp[1] - d.MatchTimeStamp[0]
sub := etSub - stSub
d.MatchTimeStamp[0] = nowtool.New(bTs).BeginningOfDay().Add(time.Duration(stSub) * time.Second).Unix() d.MatchTimeStamp[0] = nowtool.New(bTs).BeginningOfDay().Add(time.Duration(stSub) * time.Second).Unix()
d.MatchTimeStamp[1] = d.MatchTimeStamp[0] + sub d.MatchTimeStamp[1] = d.MatchTimeStamp[0] + sub

6
worldsrv/trascate_webapi.go
View File

@ -898,7 +898,6 @@ func init() {
coinlogex := model.NewCoinLogEx(&model.CoinLogParam{ coinlogex := model.NewCoinLogEx(&model.CoinLogParam{
Platform: pd.Platform, Platform: pd.Platform,
SnID: member_snid, SnID: member_snid,
Channel: pd.Channel,
ChangeType: common.BillTypeCoin, ChangeType: common.BillTypeCoin,
ChangeNum: coin, ChangeNum: coin,
RemainNum: oldGold + coin, RemainNum: oldGold + coin,
@ -1024,7 +1023,6 @@ func init() {
coinlogex := model.NewCoinLogEx(&model.CoinLogParam{ coinlogex := model.NewCoinLogEx(&model.CoinLogParam{
Platform: pd.Platform, Platform: pd.Platform,
SnID: member_snid, SnID: member_snid,
Channel: pd.Channel,
ChangeType: common.BillTypeCoin, ChangeType: common.BillTypeCoin,
ChangeNum: coin, ChangeNum: coin,
RemainNum: oldGold + coin, RemainNum: oldGold + coin,
@ -1667,7 +1665,6 @@ func init() {
coinlogex := model.NewCoinLogEx(&model.CoinLogParam{ coinlogex := model.NewCoinLogEx(&model.CoinLogParam{
Platform: player.Platform, Platform: player.Platform,
SnID: player.SnId, SnID: player.SnId,
Channel: player.Channel,
ChangeType: msg.GetLogType(), ChangeType: msg.GetLogType(),
ChangeNum: msg.GetGold(), ChangeNum: msg.GetGold(),
RemainNum: remainNum + msg.GetGold(), RemainNum: remainNum + msg.GetGold(),
@ -1753,7 +1750,6 @@ func init() {
coinlogex := model.NewCoinLogEx(&model.CoinLogParam{ coinlogex := model.NewCoinLogEx(&model.CoinLogParam{
Platform: findPlayer.Platform, Platform: findPlayer.Platform,
SnID: findPlayer.SnId, SnID: findPlayer.SnId,
Channel: findPlayer.Channel,
ChangeType: msg.GetLogType(), ChangeType: msg.GetLogType(),
ChangeNum: msg.GetGold(), ChangeNum: msg.GetGold(),
RemainNum: remainNum + msg.GetGold(), RemainNum: remainNum + msg.GetGold(),
@ -1875,7 +1871,6 @@ func init() {
coinlogex := model.NewCoinLogEx(&model.CoinLogParam{ coinlogex := model.NewCoinLogEx(&model.CoinLogParam{
Platform: pd.Platform, Platform: pd.Platform,
SnID: member_snid, SnID: member_snid,
Channel: pd.Channel,
ChangeType: common.BillTypeCoin, ChangeType: common.BillTypeCoin,
ChangeNum: coin + coinEx, ChangeNum: coin + coinEx,
RemainNum: oldGold + coin + coinEx, RemainNum: oldGold + coin + coinEx,
@ -2000,7 +1995,6 @@ func init() {
coinlogex := model.NewCoinLogEx(&model.CoinLogParam{ coinlogex := model.NewCoinLogEx(&model.CoinLogParam{
Platform: pd.Platform, Platform: pd.Platform,
SnID: member_snid, SnID: member_snid,
Channel: pd.Channel,
ChangeType: common.BillTypeCoin, ChangeType: common.BillTypeCoin,
ChangeNum: coin + coinEx, ChangeNum: coin + coinEx,
RemainNum: oldGold + coin + coinEx, RemainNum: oldGold + coin + coinEx,