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

Merge branch 'dev_pigbank2' into develop

This commit is contained in:
DESKTOP-45ANQ2C\unis 2024-12-27 17:23:43 +08:00
parent f657773a5e 5b28a10602
commit 425424c68b
4 changed files with 60 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gamesrv/base/player.go
View File

@ -1248,7 +1248,8 @@ func (this *Player) UpdatePigBankCoin(gainTexCoin int64) {
}
fGetPropValue := func(propName string) int64 {
pool := srvdata.PBDB_Pigbank_PropMgr.Datas.GetArr()
//pool := srvdata.PBDB_Pigbank_PropMgr.Datas.GetArr()
pool := ConfigMgrInst.GetConfig(this.Platform).GamePigBankPropConfig.PropInfo
for _, PropItem := range pool {
if PropItem.PorpName == propName {
return int64(PropItem.PropValue)
@ -1257,7 +1258,9 @@ func (this *Player) UpdatePigBankCoin(gainTexCoin int64) {
return 0
}
BankCoinMax := int64(0)
for _, data := range srvdata.PBDB_PigBank_DiamondMgr.Datas.GetArr() {
// pool := srvdata.PBDB_PigBank_DiamondMgr.Datas.GetArr()
pool := ConfigMgrInst.GetConfig(this.Platform).GamePigBankDiamondConfig.DiamondInfo
for _, data := range pool {
if this.WelfData.PigBank.DayBuyTimes+1 >= data.BuyCountMin && this.WelfData.PigBank.DayBuyTimes+1 <= data.BuyCountMax {
BankCoinMax = int64(data.MaxGold)
break

18
model/config.go
View File

@ -540,3 +540,21 @@ func (cm *ConfigMgr) CustomIsOn(plt string, configId int32) bool {
return true
}
func (cm *ConfigMgr) GetPigBankDiamondArr(plt string) []*webapi.PigBankDiamondInfo {
cfg := cm.GetConfig(plt).GamePigBankDiamondConfig
if cfg == nil {
return nil
}
return cfg.DiamondInfo
}
func (cm *ConfigMgr) GetPigBankPropArr(plt string) []*webapi.PigBankPropInfo {
cfg := cm.GetConfig(plt).GamePigBankPropConfig
if cfg == nil {
return nil
}
return cfg.PropInfo
}

4
worldsrv/action_shop.go
View File

@ -12,7 +12,6 @@ import (
"mongo.games.com/game/model"
"mongo.games.com/game/proto"
"mongo.games.com/game/protocol/shop"
"mongo.games.com/game/srvdata"
)
type CSShopInfoPacketFactory struct {
@ -426,7 +425,8 @@ func (this *CSPayInfoHandler) Process(s *netlib.Session, packetid int, data inte
if shopInfo.Page == ShopPageDiamondBank {
// 检查每日领取次数
fGetPropValue := func(propName string) int32 {
pool := srvdata.PBDB_Pigbank_PropMgr.Datas.GetArr()
//pool := srvdata.PBDB_Pigbank_PropMgr.Datas.GetArr()
pool := PlatformMgrSingleton.GetPigBankPropArr(p.Platform)
for _, PropItem := range pool {
if PropItem.PorpName == propName {
return PropItem.PropValue

56
worldsrv/welfmgr.go
View File

@ -1118,7 +1118,7 @@ func (this *WelfareMgr) BlindBoxInfo(p *Player, bid int32) {
if cyc == 1 || blindBox.Cycle == model.WelfareOpen {
p.WelfData.BlindBoxId = 0
}
} // == 1代表当日循环
} // == 1代表当日循环
if p.WelfData.BlindBoxId == 0 { // 未领取过发随机Date
idx := bid
@ -1691,7 +1691,8 @@ func (this *WelfareMgr) PigbankGetInfo(p *Player) {
}
fGetPropValue := func(propName string) int32 {
pool := srvdata.PBDB_Pigbank_PropMgr.Datas.GetArr()
//pool := srvdata.PBDB_Pigbank_PropMgr.Datas.GetArr()
pool := PlatformMgrSingleton.GetPigBankPropArr(p.Platform)
for _, PropItem := range pool {
if PropItem.PorpName == propName {
return PropItem.PropValue
@ -1734,7 +1735,8 @@ func (this *WelfareMgr) PigbankGetInfo(p *Player) {
//}
DayBuyMaxCnt := fGetPropValue("DayBuyMaxCnt")
for _, data := range srvdata.PBDB_PigBank_DiamondMgr.Datas.GetArr() {
pool := PlatformMgrSingleton.GetPigBankDiamondArr(p.Platform)
for _, data := range pool {
if data == nil {
continue
}
@ -1748,7 +1750,10 @@ func (this *WelfareMgr) PigbankGetInfo(p *Player) {
bankInfo.DayBuyMaxCnt = DayBuyMaxCnt
bankInfo.Price = int64(data.CoinPrice)
bankInfo.BankMaxCoin = int64(data.MaxGold)
bankInfo.GoldExc = data.GoldExc
for _, v := range data.GoldExc {
bankInfo.GoldExc[int64(v.ItemId)] = v.ItemNum
}
if takeRecorcd, exist := p.WelfData.PigBank.TakeRecord[data.Id]; exist {
bankInfo.TakeCoin = takeRecorcd
@ -1775,7 +1780,8 @@ func (this *WelfareMgr) PigbankTakeCoin(p *Player) {
}
fGetPropValue := func(propName string) int32 {
pool := srvdata.PBDB_Pigbank_PropMgr.Datas.GetArr()
//pool := srvdata.PBDB_Pigbank_PropMgr.Datas.GetArr()
pool := PlatformMgrSingleton.GetPigBankPropArr(p.Platform)
for _, PropItem := range pool {
if PropItem.PorpName == propName {
return PropItem.PropValue
@ -1804,7 +1810,8 @@ func (this *WelfareMgr) PigbankTakeCoin(p *Player) {
p.WelfData.PigBank.TakeRecord = make(map[int32]int64, 8)
}
pool := srvdata.PBDB_PigBank_DiamondMgr.Datas.GetArr()
//pool := srvdata.PBDB_PigBank_DiamondMgr.Datas.GetArr()
pool := PlatformMgrSingleton.GetPigBankDiamondArr(p.Platform)
infoData := pool[0]
for _, data := range pool {
if data == nil {
@ -1817,7 +1824,7 @@ func (this *WelfareMgr) PigbankTakeCoin(p *Player) {
}
BankMaxCoin := int64(0)
for _, data := range srvdata.PBDB_PigBank_DiamondMgr.Datas.GetArr() {
for _, data := range pool {
if data == nil {
continue
}
@ -1878,10 +1885,10 @@ func (this *WelfareMgr) PigbankTakeCoin(p *Player) {
if infoData.GoldExc != nil {
// 发放奖励道具
var items []*model.Item
for k, v := range infoData.GoldExc {
for _, v := range infoData.GoldExc {
items = append(items, &model.Item{
ItemId: int32(k),
ItemNum: v,
ItemId: int32(v.ItemId),
ItemNum: v.ItemNum,
})
}
BagMgrSingleton.AddItems(&model.AddItemParam{
@ -1931,7 +1938,8 @@ func (this *WelfareMgr) DiamondBankGetInfo(p *Player) {
OpRetCode: welfare.OpResultCode_OPRC_Error,
}
fGetPropValue := func(propName string) int32 {
pool := srvdata.PBDB_Pigbank_PropMgr.Datas.GetArr()
//pool := srvdata.PBDB_Pigbank_PropMgr.Datas.GetArr()
pool := PlatformMgrSingleton.GetPigBankPropArr(p.Platform)
for _, PropItem := range pool {
if PropItem.PorpName == propName {
return PropItem.PropValue
@ -1940,7 +1948,8 @@ func (this *WelfareMgr) DiamondBankGetInfo(p *Player) {
return 0
}
pool := srvdata.PBDB_PigBank_DiamondMgr.Datas.GetArr()
//pool := srvdata.PBDB_PigBank_DiamondMgr.Datas.GetArr()
pool := PlatformMgrSingleton.GetPigBankDiamondArr(p.Platform)
//infoData := pool[0]
if p.WelfData.DiamondBank == nil {
p.WelfData.DiamondBank = &model.DiamondBankData{
@ -1968,7 +1977,9 @@ func (this *WelfareMgr) DiamondBankGetInfo(p *Player) {
bankInfo.Price = int64(data.DiamondPrice)
bankInfo.NowPrice = int64(data.DiamondNowPrice)
bankInfo.ShopId = data.DiamondId
bankInfo.DiamondExc = data.DiamondExc
for _, v := range data.GoldExc {
bankInfo.DiamondExc[int64(v.ItemId)] = v.ItemNum
}
if takeRecorcd, exist := p.WelfData.DiamondBank.TakeRecord[data.Id]; exist {
bankInfo.TakeDiamond = float64(takeRecorcd)
@ -1994,7 +2005,8 @@ func (this *WelfareMgr) DiamondBankTakeCoin(p *Player) (retItemArr []*model.Item
OpRetCode: welfare.OpResultCode_OPRC_Error,
}
pool := srvdata.PBDB_PigBank_DiamondMgr.Datas.GetArr()
//pool := srvdata.PBDB_PigBank_DiamondMgr.Datas.GetArr()
pool := PlatformMgrSingleton.GetPigBankDiamondArr(p.Platform)
infoData := pool[0]
for _, data := range pool {
if p.WelfData.DiamondBank.DayBuyTimes+1 >= data.BuyCountMin && p.WelfData.DiamondBank.DayBuyTimes+1 <= data.BuyCountMax {
@ -2030,15 +2042,15 @@ func (this *WelfareMgr) DiamondBankTakeCoin(p *Player) (retItemArr []*model.Item
// 发放奖励道具
if infoData.DiamondExc != nil {
var items []*model.Item
for k, v := range infoData.DiamondExc {
for _, v := range infoData.DiamondExc {
items = append(items, &model.Item{
ItemId: int32(k),
ItemNum: v,
ItemId: v.ItemId,
ItemNum: v.ItemNum,
})
retItemArr = append(retItemArr, &model.Item{
ItemId: int32(k),
ItemNum: v,
ItemId: v.ItemId,
ItemNum: v.ItemNum,
})
}
@ -2087,7 +2099,8 @@ func (this *WelfareMgr) UpdateDiamondBankData(p *Player, coinNum int64, isWin bo
p.WelfData.DiamondBank = &model.DiamondBankData{}
}
fGetPropValue := func(propName string) int32 {
pool := srvdata.PBDB_Pigbank_PropMgr.Datas.GetArr()
//pool := srvdata.PBDB_Pigbank_PropMgr.Datas.GetArr()
pool := PlatformMgrSingleton.GetPigBankPropArr(p.Platform)
for _, PropItem := range pool {
if PropItem.PorpName == propName {
return PropItem.PropValue
@ -2110,7 +2123,8 @@ func (this *WelfareMgr) UpdateDiamondBankData(p *Player, coinNum int64, isWin bo
//保留小数点后4位
addDiamond = math.Round(addDiamond*10000) / 10000
p.WelfData.DiamondBank.BankDiamond += addDiamond
pool := srvdata.PBDB_PigBank_DiamondMgr.Datas.GetArr()
//pool := srvdata.PBDB_PigBank_DiamondMgr.Datas.GetArr()
pool := PlatformMgrSingleton.GetPigBankDiamondArr(p.Platform)
infoData := pool[0]
for _, data := range pool {
if p.WelfData.DiamondBank.DayBuyTimes+1 >= data.BuyCountMin && p.WelfData.DiamondBank.DayBuyTimes+1 <= data.BuyCountMax {