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

Merge branch 'develop' into release

This commit is contained in:
sk 2024-08-10 00:32:42 +08:00
parent ab481509e5 f0c42316f7
commit 3796a77bbb
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gamesrv/transact/transact_addcoin.go
View File

@ -28,7 +28,7 @@ func (this *AddCoinTransactHandler) OnExcute(tNode *transact.TransNode, ud inter
s := p.GetScene() s := p.GetScene()
if s != nil { if s != nil {
sp := s.GetScenePolicy() sp := s.GetScenePolicy()
if sp != nil && sp.CanAddCoin(s, p, ctx.Coin) { if sp != nil && sp.CanAddCoin(s, p, ctx.Coin) && !s.IsMatchScene() {
p.AddCoinAsync(ctx.Coin, ctx.GainWay, true, ctx.Broadcast, ctx.Oper, ctx.Remark, ctx.WriteLog) p.AddCoinAsync(ctx.Coin, ctx.GainWay, true, ctx.Broadcast, ctx.Oper, ctx.Remark, ctx.WriteLog)
//触发下事件 //触发下事件
sp.OnPlayerEvent(s, p, base.PlayerEventRecharge, []int64{ctx.Coin}) sp.OnPlayerEvent(s, p, base.PlayerEventRecharge, []int64{ctx.Coin})
@ -57,7 +57,7 @@ func (this *AddCoinTransactHandler) OnRollBack(tNode *transact.TransNode) transa
s := p.GetScene() s := p.GetScene()
if s != nil { if s != nil {
sp := s.GetScenePolicy() sp := s.GetScenePolicy()
if sp != nil && sp.CanAddCoin(s, p, -ctx.Coin) { if sp != nil && sp.CanAddCoin(s, p, -ctx.Coin) && !s.IsMatchScene() {
p.AddCoinAsync(-ctx.Coin, ctx.GainWay, true, ctx.Broadcast, ctx.Oper, ctx.Remark, ctx.WriteLog) p.AddCoinAsync(-ctx.Coin, ctx.GainWay, true, ctx.Broadcast, ctx.Oper, ctx.Remark, ctx.WriteLog)
//触发下事件 //触发下事件
sp.OnPlayerEvent(s, p, base.PlayerEventRecharge, []int64{0}) sp.OnPlayerEvent(s, p, base.PlayerEventRecharge, []int64{0})

3
worldsrv/player.go
View File

@ -1965,7 +1965,7 @@ func (this *Player) AddCoin(num, add int64, gainWay int32, oper, remark string)
//this.TotalData(num, gainWay) //this.TotalData(num, gainWay)
async := false async := false
if num > 0 && this.scene != nil && !this.scene.IsTestScene() && this.scene.sceneMode != common.SceneMode_Thr { //游戏场中加币,需要同步到gamesrv上 if num > 0 && this.scene != nil && !this.scene.IsTestScene() && !this.scene.IsMatchScene() && this.scene.sceneMode != common.SceneMode_Thr { //游戏场中加币,需要同步到gamesrv上
if StartAsyncAddCoinTransact(this, num, gainWay, oper, remark, true, 0, true) { if StartAsyncAddCoinTransact(this, num, gainWay, oper, remark, true, 0, true) {
async = true async = true
} }
@ -3932,6 +3932,7 @@ func (this *Player) GetVIPLevel() int32 {
if vip != this.VIP { if vip != this.VIP {
//玩家VIP升级 //玩家VIP升级
this.SCVIPInfo() this.SCVIPInfo()
PetMgrSington.CheckSkinRed(this)
logger.Logger.Trace("VIP升级！") logger.Logger.Trace("VIP升级！")
} }
this.VIP = vip this.VIP = vip