From a1dd4e92306ad37bacf390825efd39ca315e8b5e Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 16 八月 2021 15:25:04 +0800
Subject: [PATCH] 8721 【主干】【BT3】【后端】H.活动-合服庆典（转盘活动改为支持配置消耗的货币类型 主干冲突）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
index 475d84e..ef151d0 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -3155,7 +3155,7 @@
def __PayMoneyAfter(curPlayer, type_Price, price, costType, infoDict, quantity, costVIPGold):
#金子支付
if type_Price == IPY_GameWorld.TYPE_Price_Gold_Money:
- __PayMoneyAfterByGoldMoney(curPlayer, price, costType, infoDict, costVIPGold)
+ __PayMoneyAfterByGoldMoney(curPlayer, type_Price, price, costType, infoDict, costVIPGold)
#金票支付
elif type_Price == IPY_GameWorld.TYPE_Price_Gold_Paper:
@@ -3233,7 +3233,7 @@
# @param curPlayer 玩家实例
# @param price ,货币价格
# @return None
-def __PayMoneyAfterByGoldMoney(curPlayer, price, costType, infoDict, costVIPGold):
+def __PayMoneyAfterByGoldMoney(curPlayer, type_Price, price, costType, infoDict, costVIPGold):
# 充值活动玩家消耗元宝处理
@@ -3243,7 +3243,7 @@
if costType not in ChConfig.CostRebate_DisableType:
PlayerCostRebate.AddCostRebateGold(curPlayer, costType, price, infoDict)
PlayerFeastTravel.AddFeastTravelTaskValue(curPlayer, ChConfig.Def_FeastTravel_UseGold, price)
- PlayerActTurntable.OnPlayerUseGold(curPlayer, price)
+ PlayerActTurntable.OnPlayerUseGold(curPlayer, type_Price, price)
PlayerActGarbageSorting.AddActGarbageTaskProgress(curPlayer, ChConfig.Def_GarbageTask_UseGold, price)
else:
GameWorld.DebugLog("不计入消费活动的消费类型!costType=%s" % costType, curPlayer.GetPlayerID())
--
Gitblit v1.8.0