From 01e033a79a5ce63e298015d0783560a77ccffea9 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 14 九月 2018 11:46:46 +0800
Subject: [PATCH] fix:3543 【后端】【主干】【1.0.15】开服红包优化 每天赠送次数
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.py | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.py
index 43802b3..6eb0ab1 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRecover.py
@@ -32,6 +32,7 @@
import GameFuncComm
import PlayerTJG
import PlayerActivity
+import PlayerSuccess
import PyGameData
import copy
@@ -43,7 +44,7 @@
) = range(2)
Def_TJGRecoverID = 1 #脱机挂找回索引ID
-
+Def_QueenRelics = 11 #娲皇遗迹找回索引ID
## OnDay处理
# @param curPlayer
# @return None
@@ -260,7 +261,12 @@
infoDict = {ChConfig.Def_Cost_Reason_SonKey:recoverWay}
for moneyType, moneyCnt in costMoneyDict.items():
- PlayerControl.PayMoney(curPlayer, moneyType, moneyCnt, ChConfig.Def_Cost_RecoverGain, infoDict)
+ costMoneyList = PlayerControl.HaveMoneyEx(curPlayer, moneyType, moneyCnt)
+ GameWorld.DebugLog(' moneyType=%s,moneyCnt=%s,costMoneyList=%s'%(moneyType, moneyCnt, costMoneyList))
+ if not costMoneyList:
+ return
+ for mType, mCnt in costMoneyList:
+ PlayerControl.PayMoney(curPlayer, mType, mCnt, ChConfig.Def_Cost_RecoverGain, infoDict)
if totalExp > 0:
@@ -286,7 +292,8 @@
if Def_TJGRecoverID in recoverCntDict:
#脱机挂经验找回后重置
PlayerTJG.ResetTJGDeadInfo(curPlayer)
-
+ if Def_QueenRelics in recoverCntDict:
+ PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_QueenRelicsEx, recoverCntDict[Def_QueenRelics])
DataRecordPack.DR_PlayerRecover(curPlayer, recoverWay, recoverCntDict, totalExp, totalMoney, totalSP, totalItemDict)
__SetRecoverNum(curPlayer, recoverCntDict)
__NotifyRecoverNum(curPlayer)
@@ -328,17 +335,16 @@
costMoney = int(normalCostJade * recoverSecond / float(3600))
else:
costMoney = min(commonCnt, recoverCnt) * normalCostJade + vipCostJade * max(0, recoverCnt - commonCnt)
- costMoneyList = PlayerControl.HaveMoneyEx(curPlayer, ShareDefine.TYPE_Price_Gold_Paper_Money, costMoney)
+ costMoneyList = [[ShareDefine.TYPE_Price_Gold_Paper_Money, costMoney]]
else:
costCopper = ipyData.GetCostCopper()
if index == Def_TJGRecoverID:
costMoney = int(costCopper * recoverSecond / float(3600))
else:
costMoney = recoverCnt * costCopper
- if PlayerControl.HaveMoney(curPlayer, IPY_GameWorld.TYPE_Price_Silver_Money, costMoney, False):
- costMoneyList = [[IPY_GameWorld.TYPE_Price_Silver_Money, costMoney]]
- else:
- costMoneyList = []
+
+ costMoneyList = [[IPY_GameWorld.TYPE_Price_Silver_Money, costMoney]]
+
return costMoneyList, recoverCnt
def __GetCanRecoverCnt(curPlayer, index):
@@ -393,7 +399,7 @@
reExp = PlayerControl.GetPlayerReExp(curPlayer)
expRate = PlayerControl.GetLimitExpRate(curPlayer, ChConfig.ExpRateLimitType_Recover)
extraData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_RecoverGainData % index, 0)
- extraData2 = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_RecoverGainDataEx % index, 0)
+ dataEx = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_RecoverGainDataEx % index, 0)
tjgExp = 0 #脱机挂找回经验
exp = 0
--
Gitblit v1.8.0