From b6ba2976a06e9d288c740e8ab83186b7feb5dcea Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 26 十二月 2018 08:03:05 +0800
Subject: [PATCH] 860312 buff封包补齐
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py | 76 ++++++++++++++++++++++++++++++++------
1 files changed, 64 insertions(+), 12 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 a228d01..78b0270 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py
@@ -500,7 +500,12 @@
allAttrList1 = [{} for _ in range(4)] #人族法宝
allAttrList2 = [{} for _ in range(4)] #魔族法宝
allAttrList3 = [{} for _ in range(4)] #仙族法宝
-
+ allAttrList4 = [{} for _ in range(4)] #王者法宝
+ mwTypeMfpTypeDict = {1:ShareDefine.Def_MFPType_MagicWeapon1,
+ 2:ShareDefine.Def_MFPType_MagicWeapon2,
+ 3:ShareDefine.Def_MFPType_MagicWeapon3,
+ 4:ShareDefine.Def_MFPType_MagicWeapon4}
+ addPowerDict = {} #额外战力
signDayMWID = IpyGameDataPY.GetFuncCfg('MWSignDayAttr', 2)
ipyDataMgr = IpyGameDataPY.IPY_Data()
for i in xrange(ipyDataMgr.GetTreasureCount()):
@@ -520,6 +525,7 @@
#=======================================================================
treasureType = treasureIpyData.GetTreasureType()
if isActive:
+ mfpType = mwTypeMfpTypeDict.get(treasureType, ShareDefine.Def_MFPType_Role)
#等级属性
curMWLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MagicWeaponLV % magicWeaponID)
for lv in xrange(curMWLV+1):
@@ -527,6 +533,7 @@
if upIpyData:
attrDict = upIpyData.GetAddAttr()
GameWorld.AddDictValue(allAttrDict, attrDict)
+ addPowerDict[mfpType] = addPowerDict.get(mfpType, 0) + upIpyData.GetPowerEx()
if magicWeaponID == signDayMWID:
#签到属性
@@ -535,15 +542,29 @@
for attid, attnum in IpyGameDataPY.GetFuncEvalCfg('MWSignDayAttr', 1, {}).items():
addAttr[int(attid)] = attnum * totalSignNum
GameWorld.AddDictValue(allAttrDict, addAttr)
- else:
- fbpasslv = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MWFBPassLevel % magicWeaponID)
- 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
+ #王者法宝属性
+ kingAwardMark = 1
+ kingMWIpyData = IpyGameDataPY.GetIpyGameDataNotLog('MagicWeaponOfKing', magicWeaponID, kingAwardMark)
+ if kingMWIpyData and GetIsWearMagicWeapon(curPlayer, magicWeaponID):
+ attrDict = kingMWIpyData.GetAddAttr()
+ GameWorld.AddDictValue(allAttrDict, attrDict)
+
+ 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
for effID, value in allAttrDict.items():
@@ -553,6 +574,8 @@
PlayerControl.CalcAttrDict_Type(effID, value, allAttrList2)
elif treasureType == 3:
PlayerControl.CalcAttrDict_Type(effID, value, allAttrList3)
+ elif treasureType == 4:
+ PlayerControl.CalcAttrDict_Type(effID, value, allAttrList4)
else:
GameWorld.ErrLog("未知法宝属性, magicWeaponID=%s,treasureType=%s,effID=%s,value=%s"
% (magicWeaponID, treasureType, effID, value), curPlayer.GetPlayerID())
@@ -560,9 +583,9 @@
PlayerControl.SetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_MagicWeapon1, allAttrList1)
PlayerControl.SetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_MagicWeapon2, allAttrList2)
PlayerControl.SetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_MagicWeapon3, allAttrList3)
+ PlayerControl.SetCalcAttrListValue(curPlayer, ChConfig.Def_CalcAttrFunc_MagicWeapon4, allAttrList4)
#技能解锁战力
nextSkillDict = GetPotentialsSkillInfo(curPlayer)
- addPowerDict = {}
for skillID, info in nextSkillDict.items():
needSkilllv, nextSkillID, addPower = info
skillManager = curPlayer.GetSkillManager()
@@ -1079,6 +1102,33 @@
GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_PDict_MagicWeaponIsClick, mwID % 100, state, True, [mwID / 100])
return
+#// A5 1D 法宝佩戴 #tagCMWearMagicWeapon
+#
+#struct tagCMWearMagicWeapon
+#
+#{
+# tagHead Head;
+# DWORD MWID; //法宝ID
+# BYTE State; //0-卸下 1-佩戴
+#};
+def OnWearMagicWeapon(index, clientData, tick):
+ curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+ mwID = clientData.MWID
+ if not GetIsActiveMagicWeapon(curPlayer, mwID):
+ return
+
+ SetMagicWeaponWearState(curPlayer, mwID, clientData.State)
+ Sycn_MagicWeaponLV(curPlayer, mwID)
+ return
+
+def GetIsWearMagicWeapon(curPlayer, mwID):
+ #获取法宝是否佩戴
+ return GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_MagicWeaponIsClick, mwID % 100, True, [mwID / 100])
+
+def SetMagicWeaponWearState(curPlayer, mwID, state):
+ #设置法宝是否佩戴
+ GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_PDict_MagicWeaponIsClick, mwID % 100, state, True, [mwID / 100])
+ return
#// A5 12 激活法宝之魂 #tagCMActiveMWSoul
#
@@ -1144,9 +1194,11 @@
return
def UptateMWFBPasslv(curPlayer, mwID, passLV):
- GameWorld.Log('更新关卡 mwID=%s,level=%s'%(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