From be32e1cdcfbc9ff59e60de3be0610b11aca2e56f Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 03 十二月 2018 10:56:55 +0800
Subject: [PATCH] 2553 【1.3.100】【1.3】宗门试炼、娲皇已经增加副本次数不足进入防范
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py | 86 +++++++++++++++++++++++++++++++++----------
1 files changed, 66 insertions(+), 20 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py
index 8108289..487b97e 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py
@@ -507,8 +507,8 @@
treasureIpyData = ipyDataMgr.GetTreasureByIndex(i)
magicWeaponID = treasureIpyData.GetID()
isActive = GetIsActiveMagicWeapon(curPlayer, magicWeaponID)
- if not isActive:
- continue
+# if not isActive:
+# continue
allAttrDict = {}
#=======================================================================
# #铸炼属性
@@ -519,23 +519,41 @@
# GameWorld.AddDictValue(allAttrDict, attrDict)
#=======================================================================
treasureType = treasureIpyData.GetTreasureType()
- #等级属性
- curMWLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MagicWeaponLV % magicWeaponID)
- for lv in xrange(curMWLV+1):
- upIpyData = IpyGameDataPY.GetIpyGameDataNotLog('TreasureUp', magicWeaponID, lv)
- if upIpyData:
- attrDict = upIpyData.GetAddAttr()
- GameWorld.AddDictValue(allAttrDict, attrDict)
+ if isActive:
+ #等级属性
+ curMWLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MagicWeaponLV % magicWeaponID)
+ for lv in xrange(curMWLV+1):
+ upIpyData = IpyGameDataPY.GetIpyGameDataNotLog('TreasureUp', magicWeaponID, lv)
+ if upIpyData:
+ attrDict = upIpyData.GetAddAttr()
+ GameWorld.AddDictValue(allAttrDict, attrDict)
+
+ if magicWeaponID == signDayMWID:
+ #签到属性
+ totalSignNum = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TotalSignNum) # 总签到天数
+ addAttr = {}
+ for attid, attnum in IpyGameDataPY.GetFuncEvalCfg('MWSignDayAttr', 1, {}).items():
+ addAttr[int(attid)] = attnum * totalSignNum
+ GameWorld.AddDictValue(allAttrDict, addAttr)
+
+ fbpasslv = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MWFBPassLevel % magicWeaponID)
+ #老号已激活的魔族法宝没有关卡属性，直接设置满关卡
+ if isActive and not fbpasslv:
+ ipyDataList = IpyGameDataPY.GetIpyGameDataByCondition('MagicWeaponFB', {'MWID':magicWeaponID}, True, False)
+ if ipyDataList:
+ maxLevel = ipyDataList[-1].GetLevel()
+ fbpasslv = maxLevel
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_MWFBPassLevel % magicWeaponID, maxLevel)
+ GameWorld.Log('老号已激活的魔族法宝没有关卡属性，直接设置满关卡 magicWeaponID=%s,maxLevel=%s'%(magicWeaponID, maxLevel), curPlayer.GetID())
+ if fbpasslv: #副本关卡属性
+ fbipyData = IpyGameDataPY.GetIpyGameData('MagicWeaponFB', magicWeaponID, fbpasslv)
+ if fbipyData:
+ attrDict = fbipyData.GetAttrDict()
+ for effID, value in attrDict.items():
+ effID = int(effID)
+ allAttrDict[effID] = allAttrDict.get(effID, 0) + value
- if magicWeaponID == signDayMWID:
- #签到属性
- totalSignNum = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TotalSignNum) # 总签到天数
- addAttr = {}
- for attid, attnum in IpyGameDataPY.GetFuncEvalCfg('MWSignDayAttr', 1, {}).items():
- addAttr[int(attid)] = attnum * totalSignNum
- GameWorld.AddDictValue(allAttrDict, addAttr)
-
-
+
for effID, value in allAttrDict.items():
if treasureType == 1:
PlayerControl.CalcAttrDict_Type(effID, value, allAttrList1)
@@ -899,13 +917,15 @@
mwLv = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MagicWeaponLV % mwID)
curUpExp = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MagicWeaponUpExp % mwID)
state = GetIsClickMagicWeapon(curPlayer, mwID)
- if not mwLv and not curUpExp and not state:
+ FBPassLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MWFBPassLevel % mwID)
+ if not mwLv and not curUpExp and not state and not FBPassLV:
continue
pack = ChPyNetSendPack.tagMCMagicWeaponInfo()
pack.MWID = mwID
pack.LV = mwLv
pack.Exp = curUpExp
pack.State = state
+ pack.FBPassLV = FBPassLV
sendPack.InfoList.append(pack)
sendPack.Count = len(sendPack.InfoList)
if sendPack.Count:
@@ -939,6 +959,9 @@
multiple = 1 #倍数
if singleValue:
gotValue = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MWSoulGotValue % privilege)
+ maxValue = privilegeIpyData.GetMaxValue()
+ if maxValue:
+ gotValue = min(maxValue, gotValue)
multiple = gotValue/singleValue
for attid, attnum in attrInfo.items():
addAttr[int(attid)] = attnum * multiple
@@ -951,6 +974,13 @@
privilegeIpyData = IpyGameDataPY.GetIpyGameDataNotLog('TreasurePrivilege', privilege)
if not privilegeIpyData:
return
+ curGotValue = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MWSoulGotValue % privilege)
+ singleValue = privilegeIpyData.GetSingleValue()
+ if singleValue and curGotValue % singleValue:
+ fixGotValue = curGotValue/singleValue*singleValue
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_MWSoulGotValue % privilege, fixGotValue)
+ GameWorld.Log('玩家法宝之魂已领的数据不是单次进度的倍数，修复! privilege=%s,curGotValue=%s, fixGotValue=%s'%(privilege, curGotValue, fixGotValue))
+
curValue = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MWSoulCurValue % privilege)
newData = curValue + data if isAdd else data
maxValue = privilegeIpyData.GetMaxValue()
@@ -970,14 +1000,20 @@
GameWorld.DebugLog('领取法宝之魂奖励，对应法宝之魂未激活，或未配置 privilege=%s'%privilege)
return
singleValue = ipyData.GetSingleValue()
+ maxValue = ipyData.GetMaxValue()
if singleValue:
#达到进度则可领取属性
curValue = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MWSoulCurValue % privilege)
gotValue = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MWSoulGotValue % privilege)
+ if gotValue >= curValue:
+ return
canGetCnt = (curValue - gotValue) / singleValue
+ if canGetCnt <= 0 and maxValue and curValue >= maxValue:
+ canGetCnt = 1 #已达到次数上限，最后一次不管是否满足都让领(一般是因为配置错误或者变更导致)
if canGetCnt <= 0:
return
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_MWSoulGotValue % privilege, gotValue+canGetCnt*singleValue)
+ updGotCnt = min(maxValue, gotValue+canGetCnt*singleValue) if maxValue else gotValue+canGetCnt*singleValue
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_MWSoulGotValue % privilege, updGotCnt)
CalcMagicWeaponSoulAttr(curPlayer)
PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
@@ -1113,4 +1149,14 @@
for attrID, attrValue in allAttrDict.items():
PlayerControl.CalcAttrDict_Type(attrID, attrValue, allAttrList)
PlayerControl.SetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_MagicWeaponSoul, allAttrList)
+ return
+
+def UptateMWFBPasslv(curPlayer, mwID, passLV):
+ GameWorld.Log('更新关卡 mwID=%s,level=%s'%(mwID, passLV), curPlayer.GetID())
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_MWFBPassLevel % mwID, passLV)
+ CalcMagicWeaponAttr(curPlayer)
+ PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
+ Sycn_MagicWeaponLV(curPlayer, mwID)
+
+ EventShell.EventRespons_MagicWeaponFBPassLV(curPlayer, mwID, passLV)
return
\ No newline at end of file
--
Gitblit v1.8.0