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

Compare commits

base: tl_server_2:0e6487256aab6410594da4ddadbb1c0e5c640f4f
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:2eb19c922213cfad64d94f06ae7c209964093a94
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. "0e6487256aab6410594da4ddadbb1c0e5c640f4f" and "2eb19c922213cfad64d94f06ae7c209964093a94" have entirely different histories.
0e6487256a ... 2eb19c9222

2 changed files with 9 additions and 12 deletions
Show Stats Expand all files Collapse all files

3
srvdata/gamedropmgr.go
View File

@ -70,9 +70,6 @@ func (this *GameDropMgr) Init() {
func (this *GameDropMgr) GetDropInfoByBaseScore(baseCoin int32) []*GameDropData { func (this *GameDropMgr) GetDropInfoByBaseScore(baseCoin int32) []*GameDropData {
var ret []*GameDropData var ret []*GameDropData
arr := this.GameDropData arr := this.GameDropData
if len(arr) == 0 {
return ret
}
i := sort.Search(len(arr), func(i int) bool { i := sort.Search(len(arr), func(i int) bool {
return arr[i].BaseCoin > int64(baseCoin) return arr[i].BaseCoin > int64(baseCoin)
}) })

18
worldsrv/action_welfare.go
View File

@ -32,7 +32,7 @@ func (this *CSGetReliefFundHandler) Process(s *netlib.Session, packetid int, dat
if msg, ok := data.(*welfare.CSGetReliefFund); ok { if msg, ok := data.(*welfare.CSGetReliefFund); ok {
p := PlayerMgrSington.GetPlayer(sid) p := PlayerMgrSington.GetPlayer(sid)
if p == nil { if p == nil {
logger.Logger.Warnf("CSGetReliefFundHandler p == nil") logger.Logger.Warnf("CSGetReliefFundHandler p == nil p.SnId = %v", p.SnId)
return nil return nil
} }
WelfareMgrSington.GetReliefFund(p, msg.GetIsVideo()) WelfareMgrSington.GetReliefFund(p, msg.GetIsVideo())
@ -57,7 +57,7 @@ func (this *CSGetTurnplateHandler) Process(s *netlib.Session, packetid int, data
if msg, ok := data.(*welfare.CSGetTurnplate); ok { if msg, ok := data.(*welfare.CSGetTurnplate); ok {
p := PlayerMgrSington.GetPlayer(sid) p := PlayerMgrSington.GetPlayer(sid)
if p == nil { if p == nil {
logger.Logger.Warnf("CSGetTurnplateHandler p == nil") logger.Logger.Warnf("CSGetTurnplateHandler p == nil p.SnId = %v", p.SnId)
return nil return nil
} }
if msg.GetIsVideo() { if msg.GetIsVideo() {
@ -113,7 +113,7 @@ func (this *CSWelfaredInfoHandler) Process(s *netlib.Session, packetid int, data
if _, ok := data.(*welfare.CSWelfaredInfo); ok { if _, ok := data.(*welfare.CSWelfaredInfo); ok {
p := PlayerMgrSington.GetPlayer(sid) p := PlayerMgrSington.GetPlayer(sid)
if p == nil { if p == nil {
logger.Logger.Warnf("CSWelfaredInfoHandler p == nil") logger.Logger.Warnf("CSWelfaredInfoHandler p == nil p.SnId = %v", p.SnId)
return nil return nil
} }
WelfareMgrSington.WelfaredInfo(p) WelfareMgrSington.WelfaredInfo(p)
@ -138,7 +138,7 @@ func (this *CSBlindBoxInfoHandler) Process(s *netlib.Session, packetid int, data
if msg, ok := data.(*welfare.CSBlindBoxInfo); ok { if msg, ok := data.(*welfare.CSBlindBoxInfo); ok {
p := PlayerMgrSington.GetPlayer(sid) p := PlayerMgrSington.GetPlayer(sid)
if p == nil { if p == nil {
logger.Logger.Warnf("CSBlindBoxInfoHandler p == nil") logger.Logger.Warnf("CSBlindBoxInfoHandler p == nil p.SnId = %v", p.SnId)
return nil return nil
} }
WelfareMgrSington.BlindBoxInfo(p, msg.GetId()) WelfareMgrSington.BlindBoxInfo(p, msg.GetId())
@ -163,7 +163,7 @@ func (this *CSBuyBlindBoxHandler) Process(s *netlib.Session, packetid int, data
if _, ok := data.(*welfare.CSGetBlindBox); ok { if _, ok := data.(*welfare.CSGetBlindBox); ok {
p := PlayerMgrSington.GetPlayer(sid) p := PlayerMgrSington.GetPlayer(sid)
if p == nil { if p == nil {
logger.Logger.Warnf("CSBuyBlindBoxHandler p == nil") logger.Logger.Warnf("CSBuyBlindBoxHandler p == nil p.SnId = %v", p.SnId)
return nil return nil
} }
//WelfareMgrSington.BuyBlindBox(p, msg.GetId(), msg.ConfigPayId) //WelfareMgrSington.BuyBlindBox(p, msg.GetId(), msg.ConfigPayId)
@ -188,7 +188,7 @@ func (this *CSFirstPayInfoHandler) Process(s *netlib.Session, packetid int, data
if _, ok := data.(*welfare.CSWelfareFirstPayData); ok { if _, ok := data.(*welfare.CSWelfareFirstPayData); ok {
p := PlayerMgrSington.GetPlayer(sid) p := PlayerMgrSington.GetPlayer(sid)
if p == nil { if p == nil {
logger.Logger.Warnf("CSFirstPayInfoHandler p == nil") logger.Logger.Warnf("CSFirstPayInfoHandler p == nil p.SnId = %v", p.SnId)
return nil return nil
} }
WelfareMgrSington.FirstPayInfo(p) WelfareMgrSington.FirstPayInfo(p)
@ -213,7 +213,7 @@ func (this *CSBuyFirstPayHandler) Process(s *netlib.Session, packetid int, data
if _, ok := data.(*welfare.CSWelfareFirstPay); ok { if _, ok := data.(*welfare.CSWelfareFirstPay); ok {
p := PlayerMgrSington.GetPlayer(sid) p := PlayerMgrSington.GetPlayer(sid)
if p == nil { if p == nil {
logger.Logger.Warnf("CSBuyFirstPayHandler p == nil") logger.Logger.Warnf("CSBuyFirstPayHandler p == nil p.SnId = %v", p.SnId)
return nil return nil
} }
//WelfareMgrSington.BuyFirstPay(p, msg.ConfigPayId) //WelfareMgrSington.BuyFirstPay(p, msg.ConfigPayId)
@ -238,7 +238,7 @@ func (this *CSContinuousPayInfoHandler) Process(s *netlib.Session, packetid int,
if _, ok := data.(*welfare.CSWelfareContinuousPayData); ok { if _, ok := data.(*welfare.CSWelfareContinuousPayData); ok {
p := PlayerMgrSington.GetPlayer(sid) p := PlayerMgrSington.GetPlayer(sid)
if p == nil { if p == nil {
logger.Logger.Warnf("CSContinuousPayInfoHandler p == nil") logger.Logger.Warnf("CSContinuousPayInfoHandler p == nil p.SnId = %v", p.SnId)
return nil return nil
} }
WelfareMgrSington.ContinuousPayInfo(p) WelfareMgrSington.ContinuousPayInfo(p)
@ -263,7 +263,7 @@ func (this *CSBuyContinuousPayHandler) Process(s *netlib.Session, packetid int,
if _, ok := data.(*welfare.CSWelfareContinuousPay); ok { if _, ok := data.(*welfare.CSWelfareContinuousPay); ok {
p := PlayerMgrSington.GetPlayer(sid) p := PlayerMgrSington.GetPlayer(sid)
if p == nil { if p == nil {
logger.Logger.Warnf("CSBuyContinuousPayHandler p == nil") logger.Logger.Warnf("CSBuyContinuousPayHandler p == nil p.SnId = %v", p.SnId)
return nil return nil
} }
//WelfareMgrSington.BuyContinuousPay(p, msg.ConfigPayId) //WelfareMgrSington.BuyContinuousPay(p, msg.ConfigPayId)