diff --git a/src/server/conf/charge/ChargeCfg.go b/src/server/conf/charge/ChargeCfg.go index 2d557aec..cb4e2361 100644 --- a/src/server/conf/charge/ChargeCfg.go +++ b/src/server/conf/charge/ChargeCfg.go @@ -265,10 +265,14 @@ func GetWishCount(ItemId int) int { } func GetPetCoinShopReward(ChargeId int) []*item.Item { - data, err := gamedata.GetDataByIntKey(CFG_CHARGE_PETCOIN, ChargeId) + data, err := gamedata.GetData(CFG_CHARGE_PETCOIN) if err != nil { return nil } - Item := gamedata.GetValue(data, "Items") - return item.ParseItem(Item) + for _, v := range data { + if gamedata.GetIntValue(v, "ChargeId") == ChargeId { + return gamedata.GetItemList(v, "Items") + } + } + return nil } diff --git a/src/server/game/ChargeFunc.go b/src/server/game/ChargeFunc.go index a7a10426..085f0298 100644 --- a/src/server/game/ChargeFunc.go +++ b/src/server/game/ChargeFunc.go @@ -70,7 +70,6 @@ func PiggyBankFire(p *Player, ChargeId int) { } LimitedTimePiggyBankTrigger(p) p.PlayMod.save() - p.PushClientRes(PiggyBankMod.BackData()) p.TeLog("piggy_bank_open", map[string]interface{}{ "piggy_bank_type": piggyBank.PIGGY_BANK_TYPE_CHARGE, "item_list": Item,