From ed229e08570d6394af15743125d03031b75096be Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 25 五月 2019 15:35:14 +0800
Subject: [PATCH] 6805 【后端】【2.0】副本前端化（给物品虚拟掉落顺序优化，补齐创建物品没有传curPlayer参数）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldInvest.py | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldInvest.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldInvest.py
index 31d6ff3..2da2a28 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldInvest.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldInvest.py
@@ -91,7 +91,7 @@
__SetPDictValue(curPlayer, ChConfig.Def_PDict_GoldInvest_GotRewardValue % (investType, i), 0)
Sync_GoldInvestInfo(curPlayer, investType, isForce=True)
return
-
+
#// A5 40 投资理财 #tagCMGoldInvest
#
#struct tagCMGoldInvest
@@ -147,7 +147,7 @@
# 不可循环投资，但可追加投资
- elif investType in [ChConfig.GoldInvestType_Gold]:
+ elif investType in ChConfig.InvestGoldTypeList:
if investGoldRecord >= investGold:
GameWorld.DebugLog(" 已投资档次=%s >= 追加投资档次=%s ,不可追加投资！"
% (investGoldRecord, investGold))
@@ -158,11 +158,11 @@
else:
GameWorld.DebugLog(" investType = %s 已投资过，不可重复投资" % investType)
return
- elif investType == ChConfig.GoldInvestType_Gold:
- goldInvestLVLimit = IpyGameDataPY.GetFuncCfg('GoldInvestLVLimit')
- if curPlayer.GetLV() > goldInvestLVLimit:
- GameWorld.DebugLog(' 仙玉投资理财 等级不能高于%s'%(goldInvestLVLimit))
- return
+# elif investType in ChConfig.InvestGoldTypeList:
+# goldInvestLVLimit = IpyGameDataPY.GetFuncEvalCfg('GoldInvestLVLimit', 1, {}).get(investType, 0)
+# if goldInvestLVLimit and curPlayer.GetLV() > goldInvestLVLimit:
+# GameWorld.DebugLog(' 仙玉投资理财 等级不能高于%s'%(goldInvestLVLimit))
+# return
__DoGoldInvest(curPlayer, investType, investGold, deductGold, awardData)
return
@@ -200,7 +200,7 @@
PlayerFamilyRedPacket.CreatRedPacketByID(curPlayer, redPacketID)
if investType == ChConfig.GoldInvestType_VIP:
PlayerControl.WorldNotify(0, 'VIPInvestmentRadio', [curPlayer.GetName()])
- elif investType == ChConfig.GoldInvestType_Gold:
+ elif investType in ChConfig.InvestGoldTypeList:
PlayerControl.WorldNotify(0, 'JadeInvestmentRadio', [curPlayer.GetName(), investGold])
# 更新投资时时间，投资金额，重置回报记录
@@ -279,7 +279,7 @@
lastDayGotData = __GetPDictValue(curPlayer, rewardValueKey) # 已领取数据
if lastDayGotData:
- if investType == ChConfig.GoldInvestType_Gold:
+ if investType in ChConfig.InvestGoldTypeList:
if awardData > lastDayGotData:
lastGotAwardList = rewardDict[str(lastDayGotData)]
rewardItemList = []
@@ -303,7 +303,7 @@
GameWorld.DebugLog(" 领取投资理财回报 rewardItemList=%s" % (rewardItemList))
if rewardItemList:
for itemID, itemCnt, isBind in rewardItemList:
- ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, isBind, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere], True, showSysInfo=True)
+ ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem, IPY_GameWorld.rptAnyWhere])
__CheckInvestReset(curPlayer)
# 记录领取事件
--
Gitblit v1.8.0