From 4bc77e3c629f8fa7b40629d2822a14fd8e5d7e90 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 19 一月 2021 20:01:11 +0800
Subject: [PATCH] 8701 【主干】【后端】活动相关的充值界面显示优化(永久累充、每日礼包、限时礼包、累计充值);

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 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 65088fb..345a2ac 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py
@@ -55,6 +55,7 @@
 import PlayerWeekParty
 import PlayerGoldInvest
 import ItemCommon
+import CommFunc
 
 import time
 
@@ -171,7 +172,7 @@
     ## 直接充值自定义金额
     prizeGold = 0
     giveItemList = []
-    orderCoin = orderRMB * 100
+    orderCoin = CommFunc.RMBToCoin(orderRMB)
     addGold = orderRMB * GetCoinRate()
     addDRDict = {"orderCoin":orderCoin, "isAddBourseMoney":isAddBourseMoney, "eventName":eventName}
     DoCTGLogic(curPlayer, CoinType_Gold, orderCoin, addGold, prizeGold, giveItemList, isAddBourseMoney, eventName, addDRDict)
@@ -181,7 +182,7 @@
     ## 使用赠送的物品兑换点券,一般用于bt版
     prizeGold = 0
     giveItemList = []
-    orderCoin = orderRMB * 100 # 单位,分
+    orderCoin = CommFunc.RMBToCoin(orderRMB) # 单位,分
     addGold = orderRMB * GetCoinRate()
     addDRDict = {"orderCoin":orderCoin, "eventName":eventName}
     DoCTGLogic(curPlayer, CoinType_Item, orderCoin, addGold, prizeGold, giveItemList, isAddBourseMoney, eventName, addDRDict)
@@ -194,7 +195,7 @@
         return
     
     cPlayerCoin = CPY_PlayerCoinToGold()
-    cPlayerCoin.useCoin = int(ipyData.GetPayRMBNum() * 100)
+    cPlayerCoin.useCoin = CommFunc.RMBToCoin(ipyData.GetPayRMBNum())
     cPlayerCoin.orderInfo = orderInfo
     cPlayerCoin.appID = appID
     cPlayerCoin.isAddBourseMoney = isAddBourseMoney
@@ -232,7 +233,7 @@
         return
     
     payRMBNum = ipyData.GetPayRMBNum() # 单位,元
-    if orderCoin != int(payRMBNum * 100):
+    if orderCoin != CommFunc.RMBToCoin(payRMBNum):
         DataRecordPack.DR_CTGError(curPlayer, "The orderCoin is not equal to the ipyData's RMB(%s)!" % payRMBNum, addDRDict)
         return
     
@@ -358,21 +359,22 @@
     DataRecordPack.DR_CTGOK(curPlayer, addDRDict)
     
     #---充值成功后逻辑---
-    orderRMB = orderCoin / 100
+    # 功能统一以分存储记录,玩家字典不支持存小数
+    
     # 所有真实充值均有效的
     if coinType in [CoinType_Gold, CoinType_Buy]:
         #跨服充值排行活动
-        CrossActCTGBillboard.AddCTGRMB(curPlayer, orderRMB)
+        CrossActCTGBillboard.AddCTGRMB(curPlayer, orderCoin)
         
     #仙界盛典-充值大礼
     PlayerFairyCeremony.OnFCRecharge(curPlayer)
     PlayerNewFairyCeremony.OnFCRecharge(curPlayer)
-    PlayerGoldGift.OnPlayerChargeGold(curPlayer, addGold)
+    PlayerGoldGift.OnPlayerChargeGold(curPlayer)
     #累积充值X元
-    PlayerActTotalRecharge.AddTotalRechargeGold(curPlayer, orderCoin/100, 1)
-    PlayerActTotalRecharge.AddTotalRechargeGold(curPlayer, orderCoin/100, 2)
-    PlayerFairyCeremony.AddFCCTGRMB(curPlayer, orderCoin/100)
-    PlayerNewFairyCeremony.AddFCCostGold(curPlayer, orderCoin/100)
+    PlayerActTotalRecharge.AddTotalRechargeGold(curPlayer, orderCoin, 1)
+    PlayerActTotalRecharge.AddTotalRechargeGold(curPlayer, orderCoin, 2)
+    PlayerFairyCeremony.AddFCCTGRMB(curPlayer, orderCoin)
+    PlayerNewFairyCeremony.AddFCCostGold(curPlayer, orderCoin)
     #开服活动
     #OpenServerCampaign.AddOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_Recharge, orderCoin)
     PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_Recharge, addVIPExp)

--
Gitblit v1.8.0