Compare commits
No commits in common. "c482f45e70fd0b00f0c8cd93ac2ddfc9d6fb5ecf" and "a95c6b6c901d6bfb83412f5a9f4c9ac245bf9d72" have entirely different histories.
c482f45e70
...
a95c6b6c90
|
@ -378,7 +378,7 @@ message SCPigbankTakeCoin{
|
||||||
OpResultCode OpRetCode = 1; // 结果
|
OpResultCode OpRetCode = 1; // 结果
|
||||||
int64 TakeCoinNum = 2; // 领取金币数量
|
int64 TakeCoinNum = 2; // 领取金币数量
|
||||||
int32 TakeTimes = 3; // 领取次数
|
int32 TakeTimes = 3; // 领取次数
|
||||||
repeated PropInfo RewardItems = 4;
|
//repeated PigBankCoinInfo info = 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 钻石存钱罐信息
|
// 钻石存钱罐信息
|
||||||
|
@ -411,7 +411,7 @@ message SCDiamondBankTakeDiamond{
|
||||||
OpResultCode OpRetCode = 1; // 结果
|
OpResultCode OpRetCode = 1; // 结果
|
||||||
double TakeDiamondNum = 2; // 领取钻石数量
|
double TakeDiamondNum = 2; // 领取钻石数量
|
||||||
int32 TakeTimes = 3; // 领取次数
|
int32 TakeTimes = 3; // 领取次数
|
||||||
//repeated PropInfo RewardItems = 4;
|
//repeated PigBankDiamondInfo info = 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 赛季通行证信息
|
// 赛季通行证信息
|
||||||
|
|
|
@ -1891,11 +1891,6 @@ func (this *WelfareMgr) PigbankTakeCoin(p *Player) {
|
||||||
p.WelfData.PigBank.TakeRecord[infoData.Id] = p.WelfData.PigBank.BankCoin
|
p.WelfData.PigBank.TakeRecord[infoData.Id] = p.WelfData.PigBank.BankCoin
|
||||||
}
|
}
|
||||||
|
|
||||||
pack.RewardItems = append(pack.RewardItems, &welfare.PropInfo{
|
|
||||||
ItemId: common.ItemIDCoin,
|
|
||||||
ItemNum: p.WelfData.PigBank.BankCoin,
|
|
||||||
})
|
|
||||||
|
|
||||||
if infoData.GoldExc != nil {
|
if infoData.GoldExc != nil {
|
||||||
// 发放奖励道具
|
// 发放奖励道具
|
||||||
var items []*model.Item
|
var items []*model.Item
|
||||||
|
@ -1904,11 +1899,6 @@ func (this *WelfareMgr) PigbankTakeCoin(p *Player) {
|
||||||
ItemId: int32(v.ItemId),
|
ItemId: int32(v.ItemId),
|
||||||
ItemNum: v.ItemNum,
|
ItemNum: v.ItemNum,
|
||||||
})
|
})
|
||||||
|
|
||||||
pack.RewardItems = append(pack.RewardItems, &welfare.PropInfo{
|
|
||||||
ItemId: v.ItemId,
|
|
||||||
ItemNum: v.ItemNum,
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
BagMgrSingleton.AddItems(&model.AddItemParam{
|
BagMgrSingleton.AddItems(&model.AddItemParam{
|
||||||
Platform: p.Platform,
|
Platform: p.Platform,
|
||||||
|
@ -2069,12 +2059,6 @@ func (this *WelfareMgr) DiamondBankTakeCoin(p *Player) (retItemArr []*model.Item
|
||||||
// 发放奖励道具
|
// 发放奖励道具
|
||||||
if infoData.DiamondExc != nil {
|
if infoData.DiamondExc != nil {
|
||||||
var items []*model.Item
|
var items []*model.Item
|
||||||
|
|
||||||
retItemArr = append(retItemArr, &model.Item{
|
|
||||||
ItemId: common.ItemIDDiamond,
|
|
||||||
ItemNum: addDiamond,
|
|
||||||
})
|
|
||||||
|
|
||||||
for _, v := range infoData.DiamondExc {
|
for _, v := range infoData.DiamondExc {
|
||||||
items = append(items, &model.Item{
|
items = append(items, &model.Item{
|
||||||
ItemId: v.ItemId,
|
ItemId: v.ItemId,
|
||||||
|
|
Loading…
Reference in New Issue