From 9c165088d06e2b2e84352613ed8027d094735166 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 15 七月 2019 16:27:16 +0800
Subject: [PATCH] 8066 子 【主干】仙界盛典-绝版降临 / 【后端】【主干】仙界盛典-绝版降临

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerNewFairyCeremony.py |    9 +++++----
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py             |    2 ++
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFairyCeremony.py    |    9 +++++----
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py          |    4 ++--
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py
index ed76a27..f6e8aba 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py
@@ -316,6 +316,8 @@
     PlayerGoldGift.DayChargeRedPackAward(curPlayer)
     #累积充值X元
     PlayerActTotalRecharge.AddTotalRechargeGold(curPlayer, orderCoin/100)
+    PlayerFairyCeremony.AddFCCostGold(curPlayer, orderCoin/100)
+    PlayerNewFairyCeremony.AddFCCostGold(curPlayer, orderCoin/100)
     #开服活动
     #OpenServerCampaign.AddOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_Recharge, orderCoin)
     PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_Recharge, addVIPExp)
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 95e2b3b..6697720 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -3034,8 +3034,8 @@
     # 消费返利
     PlayerCostRebate.AddCostRebateGold(curPlayer, costType, price, infoDict)
     # 绝版降临
-    PlayerFairyCeremony.AddFCCostGold(curPlayer, costType, price)
-    PlayerNewFairyCeremony.AddFCCostGold(curPlayer, costType, price)
+#    PlayerFairyCeremony.AddFCCostGold(curPlayer, costType, price)
+#    PlayerNewFairyCeremony.AddFCCostGold(curPlayer, costType, price)
     
     # 事件汇报
     #===========================================================================
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFairyCeremony.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFairyCeremony.py
index d02802e..6f2f9de 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFairyCeremony.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFairyCeremony.py
@@ -284,12 +284,13 @@
     return
 
 #################绝版降临##############################
-def AddFCCostGold(curPlayer, costType, costGold):
+def AddFCCostGold(curPlayer, costGold):
+    ##充值X元
     if costGold <= 0:
         return
-    if costType in ChConfig.CostRebate_DisableType:
-        #GameWorld.DebugLog("不计入绝版降临消费的消费类型!costType=%s" % costType, curPlayer.GetPlayerID())
-        return
+#    if costType in ChConfig.CostRebate_DisableType:
+#        #GameWorld.DebugLog("不计入绝版降临消费的消费类型!costType=%s" % costType, curPlayer.GetPlayerID())
+#        return
     if not __IsAtFCAction():
         return
     curCostGold = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FCCostGold)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerNewFairyCeremony.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerNewFairyCeremony.py
index 99d9348..f3b0744 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerNewFairyCeremony.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerNewFairyCeremony.py
@@ -284,12 +284,13 @@
     return
 
 #################绝版降临##############################
-def AddFCCostGold(curPlayer, costType, costGold):
+def AddFCCostGold(curPlayer, costGold):
+    ##充值X元
     if costGold <= 0:
         return
-    if costType in ChConfig.CostRebate_DisableType:
-        #GameWorld.DebugLog("不计入绝版降临消费的消费类型!costType=%s" % costType, curPlayer.GetPlayerID())
-        return
+#    if costType in ChConfig.CostRebate_DisableType:
+#        #GameWorld.DebugLog("不计入绝版降临消费的消费类型!costType=%s" % costType, curPlayer.GetPlayerID())
+#        return
     if not __IsAtFCAction():
         return
     curCostGold = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_NewFCCostGold)

--
Gitblit v1.8.0