From 794d31c3d9615701ef8f04a199417737ddf60bd7 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 11 一月 2019 09:59:57 +0800
Subject: [PATCH] 5762 子 【开发】【1.5】新增300级后的成长基金 / 【后端】【1.5】新增300级后的成长基金
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldInvest.py | 12 ++++++------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 7 +++++--
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index cdedd74..b559aef 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -5063,11 +5063,14 @@
GoldInvestType_Month, # 月卡投资
GoldInvestType_VIP, # vip投资
GoldInvestType_Gold, # 仙玉投资
-) = range(1,3+1)
+GoldInvestType_Gold2, # 仙玉投资2
+GoldInvestType_Gold3, # 仙玉投资3
+) = range(1,5+1)
#可以循环投资的类型
CanRepeatInvestType = [GoldInvestType_Month, GoldInvestType_VIP]
-
+#仙玉投资类型
+InvestGoldTypeList = [GoldInvestType_Gold, GoldInvestType_Gold2, GoldInvestType_Gold3]
#前端特殊新手引导存储标记
GuideState_BZZDShow = 202
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 af78b81..a726441 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldInvest.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerGoldInvest.py
@@ -185,7 +185,7 @@
# 不可循环投资，但可追加投资
- elif investType in [ChConfig.GoldInvestType_Gold]:
+ elif investType in ChConfig.InvestGoldTypeList:
if investGoldRecord >= investGold:
GameWorld.DebugLog(" 已投资档次=%s >= 追加投资档次=%s ,不可追加投资！"
% (investGoldRecord, investGold))
@@ -196,9 +196,9 @@
else:
GameWorld.DebugLog(" investType = %s 已投资过，不可重复投资" % investType)
return
- elif investType == ChConfig.GoldInvestType_Gold:
- goldInvestLVLimit = IpyGameDataPY.GetFuncCfg('GoldInvestLVLimit')
- if curPlayer.GetLV() > goldInvestLVLimit:
+ elif investType in ChConfig.InvestGoldTypeList:
+ goldInvestLVLimit = IpyGameDataPY.GetFuncEvalCfg('GoldInvestLVLimit', 1, {}).get(investType, 0)
+ if goldInvestLVLimit and curPlayer.GetLV() > goldInvestLVLimit:
GameWorld.DebugLog(' 仙玉投资理财 等级不能高于%s'%(goldInvestLVLimit))
return
@@ -238,7 +238,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])
# 更新投资时时间，投资金额，重置回报记录
@@ -317,7 +317,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 = []
--
Gitblit v1.8.0