From 33d7639758f71890d81d37cc17a787c0214a98ed Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 18 十月 2024 14:28:42 +0800
Subject: [PATCH] 10287 【英文】1折活动
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 d6097d3..cc4026c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.py
@@ -62,6 +62,7 @@
import PlayerFeastTravel
import PlayerWeekParty
import PlayerGoldInvest
+import PlayerSuperDiscount
import PlayerActTurntable
import PlayerTongTianLing
import PlayerZhanling
@@ -83,7 +84,7 @@
PayOrderType_PayCoin, # 代币 6
) = range(1, 1 + 6)
-PayOrderType_Default = PayOrderType_VND
+PayOrderType_Default = PayOrderType_USD
# 充值类型定义
PayType_Gold = 2 # 常规仙玉充值
@@ -440,16 +441,18 @@
DataRecordPack.DR_CTGError(curPlayer, "Can not found the orderInfo.", addDRDict)
return
- # 越南版本配表及coin均使用越南盾原值，但是验证用美元验证
- GameWorld.Log("越南充值验证美元: orderInfo=%s,orderCoin=%s,orderID=%s" % (orderInfo, orderCoin, orderID), curPlayer.GetPlayerID())
+ # 英文1折版两种奖励，根据至尊卡判断， GetPayRMBNum-原价；GetUsdMoney-1折价格
+ discountState = PlayerSuperDiscount.GetSuperDiscountState(curPlayer)
+ GameWorld.Log("英文1折充值验证至尊卡: orderInfo=%s,orderCoin=%s,orderID=%s" % (orderInfo, orderCoin, orderID), curPlayer.GetPlayerID())
orderCoinUsd = orderCoin # 入库的是美元分
- orderCoin = CommFunc.RMBToCoin(ipyData.GetPayRMBNum()) # 游戏内orderCoin转化为越南盾
- usdMoney = ipyData.GetUsdMoney()
+ orderCoin = CommFunc.RMBToCoin(ipyData.GetPayRMBNum()) # 游戏内orderCoin为原价
+ usdMoney = ipyData.GetUsdMoney() if discountState else ipyData.GetPayRMBNum()
GameWorld.Log(" 转化后: orderInfo=%s,orderCoin=%s,orderCoinUsd=%s" % (orderInfo, orderCoin, orderCoinUsd), curPlayer.GetPlayerID())
addDRDict["orderCoin"] = orderCoin
addDRDict["orderCoinUsd"] = orderCoinUsd
+ GameWorld.Log(" 充值验证: orderCoinUsd=%s,usdMoney=%s,discountState=%s" % (orderCoinUsd, usdMoney, discountState), curPlayer.GetPlayerID())
if orderCoinUsd != CommFunc.RMBToCoin(usdMoney, 100):
- DataRecordPack.DR_CTGError(curPlayer, "The orderCoinUsd is not equal to the ipyData's UsdMoney(%s)!" % usdMoney, addDRDict)
+ DataRecordPack.DR_CTGError(curPlayer, "The orderCoinUsd is not equal to the ipyData's UsdMoney(%s)! discountState=%s" % (usdMoney, discountState), addDRDict)
return
if payOrderType == PayOrderType_PayCoin:
@@ -763,6 +766,7 @@
#投资
if ctgIpyData:
ctgID = ctgIpyData.GetRecordID()
+ PlayerSuperDiscount.ActSuperDiscountByCTG(curPlayer, ctgID)
PlayerGoldInvest.InvestByCTG(curPlayer, ctgID)
PlayerGoldGift.OnGiftByCTGID(curPlayer, ctgID)
PlayerZhanling.OnActiviteByCTGID(curPlayer, ctgID)
--
Gitblit v1.8.0