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

Merge branch 'develop' into sk

This commit is contained in:
sk 2025-01-02 09:22:36 +08:00
parent d5cedb814e 135f2f99b1
commit a95c6b6c90
3 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/constant.go
View File

@ -775,11 +775,15 @@ const (
var PetIDs = []int32{PetIDChicken} var PetIDs = []int32{PetIDChicken}
const ( const (
ChannelSwitchExchange = 1 // 兑换商城开关 ChannelSwitchExchange = 1 // 兑换商城开关
ChannelSwitchDropItem = 2 // v卡掉落开关 ChannelSwitchDropItem = 2 // v卡掉落开关
ChannelSwitchInvite = 3 // 邀请开关 ChannelSwitchInvite = 3 // 邀请开关
ChannelSwitchPermit = 4 // 典藏通行证开关 ChannelSwitchPermit = 4 // 典藏通行证开关
ChannelSwitchDiamondLottery = 5 // 钻石抽奖开关 ChannelSwitchDiamondLottery = 5 // 钻石抽奖开关
ChannelSwitchItemRecExpire = 8 // 记牌器开关
ChannelSwitchPigBankCoin = 13 // 金币存钱罐开关
ChannelSwitchPigBankDiamond = 14 // 钻石存钱罐开关
) )
// 特殊商品id // 特殊商品id

5
gamesrv/base/player.go
View File

@ -1243,6 +1243,11 @@ func (this *Player) UpdatePigBankCoin(gainTexCoin int64) {
return return
} }
// 渠道开关
if !ConfigMgrInst.IsOn(this.Platform, common.ChannelSwitchPigBankCoin, this.LastChannel) {
return
}
if this.PlayerData.WelfData == nil || this.PlayerData.WelfData.PigBank == nil { if this.PlayerData.WelfData == nil || this.PlayerData.WelfData.PigBank == nil {
return return
} }

17
worldsrv/welfmgr.go
View File

@ -1688,6 +1688,9 @@ func (this *WelfareMgr) BuyContinuousPay(p *Player, ConfigPayId int32) {
// PigbankGetInfo 存钱罐信息 // PigbankGetInfo 存钱罐信息
func (this *WelfareMgr) PigbankGetInfo(p *Player) { func (this *WelfareMgr) PigbankGetInfo(p *Player) {
if !PlatformMgrSingleton.IsOn(p.Platform, common.ChannelSwitchPigBankCoin, p.LastChannel) {
return
}
pack := &welfare.SCPigbankGetInfo{ pack := &welfare.SCPigbankGetInfo{
OpRetCode: welfare.OpResultCode_OPRC_Error, OpRetCode: welfare.OpResultCode_OPRC_Error,
} }
@ -1777,6 +1780,10 @@ func (this *WelfareMgr) PigbankGetInfo(p *Player) {
// PigbankTakeCoin 存钱罐领取金币 // PigbankTakeCoin 存钱罐领取金币
func (this *WelfareMgr) PigbankTakeCoin(p *Player) { func (this *WelfareMgr) PigbankTakeCoin(p *Player) {
if !PlatformMgrSingleton.IsOn(p.Platform, common.ChannelSwitchPigBankCoin, p.LastChannel) {
return
}
pack := &welfare.SCPigbankTakeCoin{ pack := &welfare.SCPigbankTakeCoin{
OpRetCode: welfare.OpResultCode_OPRC_Error, OpRetCode: welfare.OpResultCode_OPRC_Error,
} }
@ -1936,6 +1943,10 @@ func (this *WelfareMgr) DayResetPigBank(p *Player) {
// 钻石储存罐信息 // 钻石储存罐信息
func (this *WelfareMgr) DiamondBankGetInfo(p *Player) { func (this *WelfareMgr) DiamondBankGetInfo(p *Player) {
if !PlatformMgrSingleton.IsOn(p.Platform, common.ChannelSwitchPigBankDiamond, p.LastChannel) {
return
}
pack := &welfare.SCDiamondBankGetInfo{ pack := &welfare.SCDiamondBankGetInfo{
OpRetCode: welfare.OpResultCode_OPRC_Error, OpRetCode: welfare.OpResultCode_OPRC_Error,
} }
@ -1979,7 +1990,7 @@ func (this *WelfareMgr) DiamondBankGetInfo(p *Player) {
bankInfo.Price = int64(data.DiamondPrice) bankInfo.Price = int64(data.DiamondPrice)
bankInfo.NowPrice = int64(data.DiamondNowPrice) bankInfo.NowPrice = int64(data.DiamondNowPrice)
bankInfo.ShopId = data.DiamondId bankInfo.ShopId = data.DiamondId
for _, v := range data.GoldExc { for _, v := range data.DiamondExc {
bankInfo.DiamondExc[int64(v.ItemId)] = v.ItemNum bankInfo.DiamondExc[int64(v.ItemId)] = v.ItemNum
} }
@ -2003,6 +2014,10 @@ func (this *WelfareMgr) DiamondBankGetInfo(p *Player) {
// DiamondBankTakeCoin 钻石存钱罐领取钻石 // DiamondBankTakeCoin 钻石存钱罐领取钻石
func (this *WelfareMgr) DiamondBankTakeCoin(p *Player) (retItemArr []*model.Item) { func (this *WelfareMgr) DiamondBankTakeCoin(p *Player) (retItemArr []*model.Item) {
if !PlatformMgrSingleton.IsOn(p.Platform, common.ChannelSwitchPigBankDiamond, p.LastChannel) {
return
}
pack := &welfare.SCDiamondBankTakeDiamond{ pack := &welfare.SCDiamondBankTakeDiamond{
OpRetCode: welfare.OpResultCode_OPRC_Error, OpRetCode: welfare.OpResultCode_OPRC_Error,
} }