From 2553f010270f9dff6f1ee1403caab4ff826e00c2 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 20 三月 2019 17:12:06 +0800
Subject: [PATCH] 6374 【后端】【2.0】删除无用功能代码、封包、配置(法宝之魂)
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py | 2
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py | 3
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py | 3
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py | 2
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py | 52 ----
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.py | 2
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py | 2
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py | 52 ----
ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py | 120 ----------
/dev/null | 47 ---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.py | 2
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py | 6
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py | 308 ++++--------------------
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 22 -
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py | 35 --
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py | 3
PySysDB/PySysDBPY.h | 12 -
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py | 4
ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py | 2
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py | 1
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 15
21 files changed, 77 insertions(+), 618 deletions(-)
diff --git a/PySysDB/PySysDBPY.h b/PySysDB/PySysDBPY.h
index 6ed4d3f..5bba2cc 100644
--- a/PySysDB/PySysDBPY.h
+++ b/PySysDB/PySysDBPY.h
@@ -709,18 +709,6 @@
DWORD PowerEx; //额外固定战力
};
-//法宝特权表
-
-struct tagTreasurePrivilege
-{
- DWORD _PrivilegeID; //特权ID
- eval EffectValue; //特殊效果
- DWORD SingleValue; //进度
- DWORD MaxValue; //最大进度
- dict AddAttr; //属性
- list ItemAward; //物品奖励
- list SuccessList; //需要完成成就
-};
//连续签到奖励表
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
index 910c6f7..4adb114 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetPack.py
@@ -7871,58 +7871,6 @@
#------------------------------------------------------
-# A5 12 激活法宝之魂 #tagCMActiveMWSoul
-
-class tagCMActiveMWSoul(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ("ID", c_ubyte), #编号
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xA5
- self.SubCmd = 0x12
- return
-
- def ReadData(self, stringData, _pos=0, _len=0):
- self.Clear()
- memmove(addressof(self), stringData[_pos:], self.GetLength())
- return _pos + self.GetLength()
-
- def Clear(self):
- self.Cmd = 0xA5
- self.SubCmd = 0x12
- self.ID = 0
- return
-
- def GetLength(self):
- return sizeof(tagCMActiveMWSoul)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// A5 12 激活法宝之魂 //tagCMActiveMWSoul:
- Cmd:%s,
- SubCmd:%s,
- ID:%d
- '''\
- %(
- self.Cmd,
- self.SubCmd,
- self.ID
- )
- return DumpString
-
-
-m_NAtagCMActiveMWSoul=tagCMActiveMWSoul()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMActiveMWSoul.Cmd,m_NAtagCMActiveMWSoul.SubCmd))] = m_NAtagCMActiveMWSoul
-
-
-#------------------------------------------------------
# A5 49 大师天赋技能加点 #tagCMAddMasterSkillPoint
class tagCMMasterSkillPoint(Structure):
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
index 1bae020..826a739 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ChPyNetSendPack.py
@@ -15717,126 +15717,6 @@
#------------------------------------------------------
-# A3 53 法宝特权数据 #tagMCMWPrivilegeDataInfo
-
-class tagMCMWPrivilegeData(Structure):
- _pack_ = 1
- _fields_ = [
- ("PriID", c_int), # 特权ID
- ("State", c_ubyte), #激活状态
- ("CurValue", c_int), #当前总进度
- ("GotValue", c_int), #已领取进度
- ("ItemAwardState", c_ubyte), #物品奖励是否已领取
- ]
-
- def __init__(self):
- self.Clear()
- return
-
- def ReadData(self, stringData, _pos=0, _len=0):
- self.Clear()
- memmove(addressof(self), stringData[_pos:], self.GetLength())
- return _pos + self.GetLength()
-
- def Clear(self):
- self.PriID = 0
- self.State = 0
- self.CurValue = 0
- self.GotValue = 0
- self.ItemAwardState = 0
- return
-
- def GetLength(self):
- return sizeof(tagMCMWPrivilegeData)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// A3 53 法宝特权数据 //tagMCMWPrivilegeDataInfo:
- PriID:%d,
- State:%d,
- CurValue:%d,
- GotValue:%d,
- ItemAwardState:%d
- '''\
- %(
- self.PriID,
- self.State,
- self.CurValue,
- self.GotValue,
- self.ItemAwardState
- )
- return DumpString
-
-
-class tagMCMWPrivilegeDataInfo(Structure):
- Head = tagHead()
- Count = 0 #(BYTE Count)// 信息个数
- InfoList = list() #(vector<tagMCMWPrivilegeData> InfoList)// 信息列表
- data = None
-
- def __init__(self):
- self.Clear()
- self.Head.Cmd = 0xA3
- self.Head.SubCmd = 0x53
- return
-
- def ReadData(self, _lpData, _pos=0, _Len=0):
- self.Clear()
- _pos = self.Head.ReadData(_lpData, _pos)
- self.Count,_pos = CommFunc.ReadBYTE(_lpData, _pos)
- for i in range(self.Count):
- temInfoList = tagMCMWPrivilegeData()
- _pos = temInfoList.ReadData(_lpData, _pos)
- self.InfoList.append(temInfoList)
- return _pos
-
- def Clear(self):
- self.Head = tagHead()
- self.Head.Clear()
- self.Head.Cmd = 0xA3
- self.Head.SubCmd = 0x53
- self.Count = 0
- self.InfoList = list()
- return
-
- def GetLength(self):
- length = 0
- length += self.Head.GetLength()
- length += 1
- for i in range(self.Count):
- length += self.InfoList[i].GetLength()
-
- return length
-
- def GetBuffer(self):
- data = ''
- data = CommFunc.WriteString(data, self.Head.GetLength(), self.Head.GetBuffer())
- data = CommFunc.WriteBYTE(data, self.Count)
- for i in range(self.Count):
- data = CommFunc.WriteString(data, self.InfoList[i].GetLength(), self.InfoList[i].GetBuffer())
- return data
-
- def OutputString(self):
- DumpString = '''
- Head:%s,
- Count:%d,
- InfoList:%s
- '''\
- %(
- self.Head.OutputString(),
- self.Count,
- "..."
- )
- return DumpString
-
-
-m_NAtagMCMWPrivilegeDataInfo=tagMCMWPrivilegeDataInfo()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagMCMWPrivilegeDataInfo.Head.Cmd,m_NAtagMCMWPrivilegeDataInfo.Head.SubCmd))] = m_NAtagMCMWPrivilegeDataInfo
-
-
-#------------------------------------------------------
# A3 26 NPCID已采集次数信息 #tagMCNPCIDCollectionCntInfo
class tagMCNPCIDCollectionCnt(Structure):
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
index 12ec4f7..64ae39c 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/ShareDefine.py
@@ -1404,7 +1404,7 @@
Def_MFPType_MagicWeapon3, # 仙族法宝 17
Def_MFPType_PetSoul, # 灵宠魂石 18
Def_MFPType_HorseSoul, # 坐骑魂石 19
-Def_MFPType_MagicWeaponSoul, # 法宝之魂 20
+Def_MFPType_MagicWeaponSoul, # 法宝之魂 20 - 废弃
Def_MFPType_Dogz, # 神兽 21
Def_MFPType_GatherSoul, # 聚魂 22
Def_MFPType_MagicWeapon4, # 王者法宝 23
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index a6f3d26..858b3a6 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -1117,27 +1117,23 @@
Writer = xdh
Releaser = xdh
RegType = 0
-RegisterPackCount = 5
+RegisterPackCount = 4
PacketCMD_1=0xA5
-PacketSubCMD_1=0x12
-PacketCallFunc_1=OnActiveMWSoul
+PacketSubCMD_1=0x1D
+PacketCallFunc_1=OnWearMagicWeapon
PacketCMD_2=0xA5
-PacketSubCMD_2=0x1D
-PacketCallFunc_2=OnWearMagicWeapon
+PacketSubCMD_2=0x0E
+PacketCallFunc_2=OnOpenMagicWeapon
PacketCMD_3=0xA5
-PacketSubCMD_3=0x0E
-PacketCallFunc_3=OnOpenMagicWeapon
+PacketSubCMD_3=0x15
+PacketCallFunc_3=OnMagicWeaponUp
PacketCMD_4=0xA5
-PacketSubCMD_4=0x15
-PacketCallFunc_4=OnMagicWeaponUp
-
-PacketCMD_5=0xA5
-PacketSubCMD_5=0x16
-PacketCallFunc_5=SaveMagicWeaponState
+PacketSubCMD_4=0x16
+PacketCallFunc_4=SaveMagicWeaponState
;副本
[FBCommon]
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index 4a09053..937cfae 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -3921,17 +3921,12 @@
#法宝
Def_PDict_MagicWeaponExp = "MagicWeaponExp_%s" #法宝经验 参数法宝ID
-Def_PDict_MagicWeaponIsActive = "MagicWeaponIsActive_%s_%s" #法宝激活状态 参数(法宝类型, key编号)
-Def_PDict_MagicWeaponIsClick = "MagicWeaponIsClick_%s_%s" #法宝点击状态 参数(法宝类型, key编号)
-Def_PDict_MagicWeaponIsWear = "MagicWeaponIsWear_%s_%s" #法宝佩戴状态 参数(法宝类型, key编号)
-Def_PDict_MagicWeaponRefineLV = "MagicWeaponRefineLV_%s" #法宝精炼等级 参数法宝ID
+Def_PDict_MagicWeaponIsActive = "MagicWeaponIsActive_%s" #法宝激活状态 参数法宝ID
+Def_PDict_MagicWeaponIsClick = "MagicWeaponIsClick_%s" #法宝点击状态 参数法宝ID
+Def_PDict_MagicWeaponIsWear = "MagicWeaponIsWear_%s" #法宝佩戴状态 参数法宝ID
Def_PDict_XBXZAwardRecord = "XBXZAwardRecord_%s" #仙宝寻主领奖记录 参数ID
Def_PDict_MagicWeaponLV = "MagicWeaponLV_%s" #法宝等级 参数法宝ID
Def_PDict_MagicWeaponUpExp = "MagicWeaponUpExp_%s" #法宝升级经验 参数法宝ID
-Def_PDict_MWSoulCurValue = "MWSoulCurValue_%s" #法宝特权当前进度 参数特权ID
-Def_PDict_MWSoulGotValue = "MWSoulGotValue_%s" #法宝特权已领取进度 参数特权ID
-Def_PDict_MWSoulGotItemState = "MWSoulGotItemState_%s" #法宝特权领取物品奖励状态 参数特权ID
-Def_PDict_MWSoulActiveState = "MWSoulActiveState_%s" #法宝之魂激活状态 参数(key编号)
Def_PDict_MWFBPassLevel = "MWFBPassLevel_%s" #法宝副本通关关卡 参数(法宝ID)
#炼丹炉
Def_PDict_AlchemyLV = "AlchemyLV" #炼丹等级
@@ -4386,7 +4381,7 @@
Def_CalcAttrFunc_PetSkill, # 宠物技能属性 31
Def_CalcAttrFunc_StoveYao, # 炼丹炉丹药 32
Def_CalcAttrFunc_PetSign, # 宠物签到 33
-Def_CalcAttrFunc_MagicWeaponSoul, # 法宝之魂属性34
+Def_CalcAttrFunc_MagicWeaponSoul, # 法宝之魂属性34- 废弃
Def_CalcAttrFunc_Dogz, # 神兽35
Def_CalcAttrFunc_DogzBattleSkill, # 助战神兽技能36
Def_CalcAttrFunc_DogzEquip, # 神兽装备37
@@ -5232,7 +5227,7 @@
Def_RewardType_XBXZ, # 仙宝寻主奖励6
Def_RewardType_DayRealmPoint, # 每日任务修行点奖励7
Def_RewardType_GoldGiftFirst, # 首充礼包奖励8
-Def_RewardType_MWSoulAward, # 法宝之魂奖励9
+Def_RewardType_MWSoulAward, # 法宝之魂奖励9 -废弃
Def_RewardType_FreeGoods, # 极品白拿10
Def_RewardType_CostRebate, # 消费返利11
Def_RewardType_BossReborn, # BOSS复活12
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
index 910c6f7..4adb114 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.py
@@ -7871,58 +7871,6 @@
#------------------------------------------------------
-# A5 12 激活法宝之魂 #tagCMActiveMWSoul
-
-class tagCMActiveMWSoul(Structure):
- _pack_ = 1
- _fields_ = [
- ("Cmd", c_ubyte),
- ("SubCmd", c_ubyte),
- ("ID", c_ubyte), #编号
- ]
-
- def __init__(self):
- self.Clear()
- self.Cmd = 0xA5
- self.SubCmd = 0x12
- return
-
- def ReadData(self, stringData, _pos=0, _len=0):
- self.Clear()
- memmove(addressof(self), stringData[_pos:], self.GetLength())
- return _pos + self.GetLength()
-
- def Clear(self):
- self.Cmd = 0xA5
- self.SubCmd = 0x12
- self.ID = 0
- return
-
- def GetLength(self):
- return sizeof(tagCMActiveMWSoul)
-
- def GetBuffer(self):
- return string_at(addressof(self), self.GetLength())
-
- def OutputString(self):
- DumpString = '''// A5 12 激活法宝之魂 //tagCMActiveMWSoul:
- Cmd:%s,
- SubCmd:%s,
- ID:%d
- '''\
- %(
- self.Cmd,
- self.SubCmd,
- self.ID
- )
- return DumpString
-
-
-m_NAtagCMActiveMWSoul=tagCMActiveMWSoul()
-ChNetPackDict[eval("0x%02x%02x"%(m_NAtagCMActiveMWSoul.Cmd,m_NAtagCMActiveMWSoul.SubCmd))] = m_NAtagCMActiveMWSoul
-
-
-#------------------------------------------------------
# A5 49 大师天赋技能加点 #tagCMAddMasterSkillPoint
class tagCMMasterSkillPoint(Structure):
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py
index bc3551c..2e4a833 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.py
@@ -1852,10 +1852,6 @@
RunQuestEvent(curPlayer, "realmup", realmlv, Def_RunQuestType_RunAll)
return
-def EventRespons_MWSoulActive(curPlayer, soulid):
- #法宝之魂激活
- RunQuestEvent(curPlayer, "mwsoulactive", soulid, Def_RunQuestType_RunAll)
- return
def EventRespons_PassQueenRelecs(curPlayer, lineID, grade):
#X级通关X层娲皇遗迹
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py
index 40838f2..3efd560 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.py
@@ -7251,12 +7251,6 @@
realmlv = GameWorld.ToIntDef(curActionNode.GetAttribute("value"), 0)
return curPlayer.GetOfficialRank() >= realmlv
-##法宝之魂是否激活
-# @param None
-# @return None <Mwsoul value="id"/>
-def ConditionType_Mwsoul(curPlayer, curMission, curActionNode):
- soulID = GameWorld.ToIntDef(curActionNode.GetAttribute("value"), 0)
- return bool(PlayerMagicWeapon.GetIsActiveMWSoul(curPlayer, soulID))
##X级通关X层娲皇遗迹
# @param None
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.py
index ac4beac..861f642 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.py
@@ -48,7 +48,6 @@
ShareDefine.Def_MFPType_MagicWeapon4:"王者法宝",
ShareDefine.Def_MFPType_PetSoul:"宠魂",
ShareDefine.Def_MFPType_HorseSoul:"骑魂",
- ShareDefine.Def_MFPType_MagicWeaponSoul:"法宝之魂",
ShareDefine.Def_MFPType_Dogz:"神兽",
ShareDefine.Def_MFPType_Coat:"时装",
ShareDefine.Def_MFPType_Other:"其他",
@@ -83,7 +82,6 @@
ChConfig.Def_CalcAttrFunc_PetSkill:"宠物技能属性",
ChConfig.Def_CalcAttrFunc_StoveYao:"炼丹炉丹药",
ChConfig.Def_CalcAttrFunc_PetSign:"宠物签到",
- ChConfig.Def_CalcAttrFunc_MagicWeaponSoul:"法宝之魂",
ChConfig.Def_CalcAttrFunc_Dogz:"神兽",
ChConfig.Def_CalcAttrFunc_Coat:"时装",
}
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetMWSoul.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetMWSoul.py
deleted file mode 100644
index 50694da..0000000
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetMWSoul.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/python
-# -*- coding: GBK -*-
-#-------------------------------------------------------------------------------
-#
-#-------------------------------------------------------------------------------
-#
-##@package GM.Commands.SetMWSoul
-#
-# @todo:设置法宝之魂激活状态
-# @author xdh
-# @date 2018-08-18
-# @version 1.0
-#
-# 详细描述: 设置法宝之魂激活状态
-#
-#---------------------------------------------------------------------
-"""Version = 2018-08-18 16:30"""
-#---------------------------------------------------------------------
-import PlayerMagicWeapon
-import PlayerControl
-import ChConfig
-import GameWorld
-import EventShell
-
-#逻辑实现
-## GM命令执行入口
-# @param curPlayer 当前玩家
-# @param list 参数列表 [npcID]
-# @return None
-# @remarks 函数详细说明.
-def OnExec(curPlayer, paramList):
- if len(paramList) != 2:
- GameWorld.DebugAnswer(curPlayer, "SetMWSoul 魂ID 状态(1激活，0未激活)")
- return
- soulID = paramList[0]
- state = paramList[1]
-
- GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_PDict_MWSoulActiveState, soulID, state, True)
- if state:
- EventShell.EventRespons_MWSoulActive(curPlayer, soulID)
- PlayerMagicWeapon.CalcMagicWeaponSoulAttr(curPlayer)
- PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
-
- #通知
- PlayerMagicWeapon.Sycn_MWPrivilegeData(curPlayer, soulID)
- return
-
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.py
index 731c846..2443042 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_SealDemon.py
@@ -546,7 +546,7 @@
if rank == 1 and lineID >= 4:
EventShell.EventRespons_SealDemon(curPlayer)
- PlayerMagicWeapon.SetMWPrivilegeData(curPlayer, ChConfig.MWPrivilege_SealDemonAddAttr, addCnt, True)
+
PlayerBossReborn.AddBossRebornActionCnt(curPlayer, ChConfig.Def_BRAct_FMT, addCnt)
PlayerFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_FMT, addCnt)
PlayerNewFairyCeremony.AddFCPartyActionCnt(curPlayer, ChConfig.Def_PPAct_FMT, addCnt)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
index b623313..17f9918 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.py
@@ -593,16 +593,6 @@
("DWORD", "PowerEx", 0),
),
- "TreasurePrivilege":(
- ("DWORD", "PrivilegeID", 1),
- ("eval", "EffectValue", 0),
- ("DWORD", "SingleValue", 0),
- ("DWORD", "MaxValue", 0),
- ("dict", "AddAttr", 0),
- ("list", "ItemAward", 0),
- ("list", "SuccessList", 0),
- ),
-
"ContineSignAward":(
("BYTE", "ContineDay", 1),
("list", "ItemID", 0),
@@ -2581,27 +2571,6 @@
def GetActiveSoulID(self): return self.ActiveSoulID # 激活魂ID
def GetPowerEx(self): return self.PowerEx # 额外固定战力
-# 法宝特权表
-class IPY_TreasurePrivilege():
-
- def __init__(self):
- self.PrivilegeID = 0
- self.EffectValue = 0
- self.SingleValue = 0
- self.MaxValue = 0
- self.AddAttr = {}
- self.ItemAward = []
- self.SuccessList = []
- return
-
- def GetPrivilegeID(self): return self.PrivilegeID # 特权ID
- def GetEffectValue(self): return self.EffectValue # 特殊效果
- def GetSingleValue(self): return self.SingleValue # 进度
- def GetMaxValue(self): return self.MaxValue # 最大进度
- def GetAddAttr(self): return self.AddAttr # 属性
- def GetItemAward(self): return self.ItemAward # 物品奖励
- def GetSuccessList(self): return self.SuccessList # 需要完成成就
-
# 连续签到奖励表
class IPY_ContineSignAward():
@@ -4429,8 +4398,6 @@
self.ipyTreasureLen = len(self.ipyTreasureCache)
self.ipyTreasureUpCache = self.__LoadFileData("TreasureUp", IPY_TreasureUp)
self.ipyTreasureUpLen = len(self.ipyTreasureUpCache)
- self.ipyTreasurePrivilegeCache = self.__LoadFileData("TreasurePrivilege", IPY_TreasurePrivilege)
- self.ipyTreasurePrivilegeLen = len(self.ipyTreasurePrivilegeCache)
self.ipyContineSignAwardCache = self.__LoadFileData("ContineSignAward", IPY_ContineSignAward)
self.ipyContineSignAwardLen = len(self.ipyContineSignAwardCache)
self.ipySignAwardCache = self.__LoadFileData("SignAward", IPY_SignAward)
@@ -4877,8 +4844,6 @@
def GetTreasureByIndex(self, index): return self.ipyTreasureCache[index]
def GetTreasureUpCount(self): return self.ipyTreasureUpLen
def GetTreasureUpByIndex(self, index): return self.ipyTreasureUpCache[index]
- def GetTreasurePrivilegeCount(self): return self.ipyTreasurePrivilegeLen
- def GetTreasurePrivilegeByIndex(self, index): return self.ipyTreasurePrivilegeCache[index]
def GetContineSignAwardCount(self): return self.ipyContineSignAwardLen
def GetContineSignAwardByIndex(self, index): return self.ipyContineSignAwardCache[index]
def GetSignAwardCount(self): return self.ipySignAwardLen
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py
index 7797afd..2b1a9dc 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.py
@@ -1233,8 +1233,7 @@
PlayerControl.NomalDictSetProperty(curPlayer, key, activeCnt)
SyncAllEquipAttrActiveInfo(curPlayer, activeType)
- if activeType == 0:
- PlayerMagicWeapon.CalcMagicWeaponSoulAttr(curPlayer)
+
#注意: 需要传装备阶触发刷属性，暂屏蔽，功能修改时再处理
#else:
# RefreshPlayerEquipAttribute(curPlayer)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
index 20f58ff..fa1c5b6 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -5335,9 +5335,6 @@
# 首充礼包奖励
elif rewardType == ChConfig.Def_RewardType_GoldGiftFirst:
PlayerGoldGift.GetPlayerGoldGiftFirst(curPlayer)
- # 领取法宝之魂奖励
- elif rewardType == ChConfig.Def_RewardType_MWSoulAward:
- PlayerMagicWeapon.GetMWSoulAward(curPlayer, dataEx)
# 领取极品白拿
elif rewardType == ChConfig.Def_RewardType_FreeGoods:
PlayerFreeGoods.OnGetFreeGoods(curPlayer, dataEx)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
index f615f5f..049fbbf 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -4156,7 +4156,6 @@
PlayerPet.CalcPetItemAddPlayerAttr(curPlayer)
PlayerRune.RefreshRuneAttr(curPlayer)
PlayerMagicWeapon.CalcMagicWeaponAttr(curPlayer)
- PlayerMagicWeapon.CalcMagicWeaponSoulAttr(curPlayer)
PlayerSuccess.CalcSuccessAttr(curPlayer)
PlayerVip.CalcVIPAttr(curPlayer)
PlayerRefineStove.CalcStoveAttr(curPlayer)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py
index 6578f90..629e380 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerHorse.py
@@ -736,7 +736,6 @@
PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_Horser_LV%horseID, updateClassLV, ChConfig.Def_PDictType_Horse)
#EventReport.WriteEvent_custom_mission_log(curPlayer, ChConfig.CME_Class_Horse, ChConfig.CME_Log_End, 1, cmeInfoEx=str(updateClassLV))
sumLV = GetHorseSumLV(curPlayer)
- PlayerMagicWeapon.SetMWPrivilegeData(curPlayer, ChConfig.MWPrivilege_Horse, sumLV)
# 刷属性，更新排行榜
RefreshHorseAttr(curPlayer)
@@ -927,7 +926,6 @@
# 记录开服活动马匹阶级
sumLV = GetHorseSumLV(curPlayer)
OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_HorseLV, sumLV)
- PlayerMagicWeapon.SetMWPrivilegeData(curPlayer, ChConfig.MWPrivilege_Horse, sumLV)
PlayerWeekParty.AddWeekPartyActionCnt(curPlayer, ChConfig.Def_WPAct_Horse, horseID, False)
playerEquip = curPlayer.GetItemManager().GetPack(IPY_GameWorld.rptEquip)
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 375d629..b725a41 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.py
@@ -40,6 +40,8 @@
g_succInfoDict = {}
g_potentialsSkillDict = {}
+
+
##登录处理
# @param curPlayer 玩家
# @return None
@@ -47,15 +49,13 @@
NotifyMagicWeapon(curPlayer, True)
SyncXBXZAwardRecord(curPlayer)
Sycn_MagicWeaponLV(curPlayer)
- Sycn_MWPrivilegeData(curPlayer)
return
+
def OnDay(curPlayer):
- #重置法宝之魂每日领取记录
- for privilege in ChConfig.MWPrivilegeList:
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_MWSoulGotItemState % privilege, 0)
- Sycn_MWPrivilegeData(curPlayer, isForce=True)
+
return
+
def DoMagicWeaponOpen(curPlayer):
## 法宝功能开启 激活第一个法宝
@@ -66,6 +66,7 @@
# NotifyMagicWeapon(curPlayer)
return True
+
def GetIsActiveMagicWeapon(curPlayer, mwID, lv=0):
#获取法宝是否激活
#通过玩家字典值可直接判断是否已经激活，这里可不验证法宝ID是否存在，即使传入不存在的也是返回未激活
@@ -74,12 +75,14 @@
if lv:
curMWLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MagicWeaponLV % mwID)
return curMWLV >= lv
- return GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_MagicWeaponIsActive, mwID % 100, True, [mwID / 100])
+ return GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_MagicWeaponIsActive, mwID, True)
+
def SetMagicWeaponActiveState(curPlayer, mwID, isActive=True):
#设置法宝激活状态
- GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_PDict_MagicWeaponIsActive, mwID % 100, isActive, True, [mwID / 100])
+ GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_PDict_MagicWeaponIsActive, mwID, isActive, True)
return
+
def ActiveMagicWeapon(curPlayer, succID):
##激活法宝
@@ -109,6 +112,7 @@
return
+
def DoActiveMW(curPlayer, mwID, mwLV=0):
if not GetWMIpyData(mwID):
return
@@ -117,7 +121,6 @@
SetMagicWeaponActiveState(curPlayer, mwID)
#通知
NotifyMagicWeapon(curPlayer)
-
if mwID in IpyGameDataPY.GetFuncEvalCfg('UnblockTreasure'):
PlayerControl.NotifyCode(curPlayer, 'UnblockTreasure', [curPlayer.GetName(), mwID])
@@ -153,21 +156,21 @@
ItemControler.GivePlayerItem(curPlayer, itemID, itemCnt, 0, [IPY_GameWorld.rptItem], event=["MWAward", False, {"mwID":mwID}])
activeMWID = upIpyData.GetActiveMWID()
if activeMWID == mwID:
- GameWorld.ErrLog(' TreasureUp.txt 配置异常 不可激活自身法宝 mwID=%s'%mwID)
+ GameWorld.ErrLog(' TreasureUp.txt 配置异常 不可激活自身法宝 mwID=%s' % mwID)
elif activeMWID:
DoActiveMW(curPlayer, activeMWID)
#激活魂
- activeSoulID = upIpyData.GetActiveSoulID()
- if activeSoulID:
- __DoActiveMWSoul(curPlayer, activeSoulID, False)
+# activeSoulID = upIpyData.GetActiveSoulID()
+# if activeSoulID:
+# __DoActiveMWSoul(curPlayer, activeSoulID, False)
CalcMagicWeaponAttr(curPlayer)
PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
GameWorld.DebugLog(' 激活法宝 mwID=%s,mwLV=%s' % (mwID, mwLV))
- vipAddAtkMWID = IpyGameDataPY.GetFuncCfg("VIPAddAtkEXP", 2) # VIP杀怪加属性所需激活法宝
+ vipAddAtkMWID = IpyGameDataPY.GetFuncCfg("VIPAddAtkEXP", 2) # VIP杀怪加属性所需激活法宝
if mwID == vipAddAtkMWID:
PlayerVip.RefreshVIPAttr(curPlayer)
@@ -176,7 +179,9 @@
DataRecordPack.DR_MagicWeaponActive(curPlayer, mwID, mwLV)
return True
+
def GetWMIpyData(mwID):return IpyGameDataPY.GetIpyGameData('Treasure', mwID)
+
def GetNeedSuccIDByMWID(mwID, ipyData=None):
##获取法宝ID开启需要完成的成就ID
@@ -186,6 +191,7 @@
return []
succIDList = list(ipyData.GetSuccID())
return succIDList
+
def GetMWIDBySuccID(succID):
global g_succInfoDict
@@ -202,6 +208,7 @@
g_succInfoDict[succid] = mwID
return g_succInfoDict.get(succID)
+
def GetMWActiveCntTotal(curPlayer):
## 获取激活的法宝总个数
activeCnt = 0
@@ -212,6 +219,7 @@
if GetIsActiveMagicWeapon(curPlayer, magicWeaponID):
activeCnt += 1
return activeCnt
+
def GetMWActiveCntByType(curPlayer, mwType):
## 根据法宝类型获取已激活数量
@@ -224,6 +232,7 @@
if isActive:
activeCnt += 1
return activeCnt
+
## 给技能
# @param curPlayer
@@ -282,23 +291,20 @@
NetPackCommon.SendFakePack(curPlayer, packData)
return
-
##--------------------------------------------------------------------------------------------------
-def GetMWRefineIpyData(treasureID, treasureLV):
- #获取法宝等级信息
- return IpyGameDataPY.GetIpyGameDataNotLog("TreasureRefine", treasureID, treasureLV)
+
def CalcMagicWeaponAttr(curPlayer):
## 计算法宝属性
- allAttrList1 = [{} for _ in range(4)] #人族法宝
- allAttrList2 = [{} for _ in range(4)] #魔族法宝
- allAttrList3 = [{} for _ in range(4)] #仙族法宝
- allAttrList4 = [{} for _ in range(4)] #王者法宝
+ 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 = {} #额外战力
+ addPowerDict = {} #额外战力
signDayMWID = IpyGameDataPY.GetFuncCfg('MWSignDayAttr', 2)
ipyDataMgr = IpyGameDataPY.IPY_Data()
for i in xrange(ipyDataMgr.GetTreasureCount()):
@@ -308,20 +314,13 @@
# if not isActive:
# continue
allAttrDict = {}
- #=======================================================================
- # #铸炼属性
- # mwRefineLv = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MagicWeaponRefineLV % magicWeaponID)
- # refineipyData = GetMWRefineIpyData(magicWeaponID, mwRefineLv)
- # if refineipyData:
- # attrDict = refineipyData.GetTreasureAttr()
- # GameWorld.AddDictValue(allAttrDict, attrDict)
- #=======================================================================
+
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):
+ for lv in xrange(curMWLV + 1):
upIpyData = IpyGameDataPY.GetIpyGameDataNotLog('TreasureUp', magicWeaponID, lv)
if upIpyData:
attrDict = upIpyData.GetAddAttr()
@@ -330,7 +329,7 @@
if magicWeaponID == signDayMWID:
#签到属性
- totalSignNum = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TotalSignNum) # 总签到天数
+ totalSignNum = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_TotalSignNum) # 总签到天数
addAttr = {}
for attid, attnum in IpyGameDataPY.GetFuncEvalCfg('MWSignDayAttr', 1, {}).items():
addAttr[int(attid)] = attnum * totalSignNum
@@ -344,22 +343,13 @@
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: #副本关卡属性
+ 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():
if treasureType == 1:
@@ -423,12 +413,12 @@
for ipyData in ipyDataList:
if not GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_XBXZAwardRecord, ipyData.GetID()):
return
-
DoActiveMW(curPlayer, mwID)
return
#-------------------------------------------------------------------------------
+
def OnGetXBXZAward(curPlayer, index):
##仙宝寻主领奖
@@ -511,7 +501,7 @@
#给钱
for moneyType, value in ipyData.GetMoney():
PlayerControl.GiveMoney(curPlayer, moneyType, value)
- SyncXBXZAwardRecord(curPlayer,[index])
+ SyncXBXZAwardRecord(curPlayer, [index])
#成就
PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_XBXZ, 1, [ipyData.GetMWID()])
GameWorld.DebugLog(' 仙宝寻主领奖OK, ID=%s, cnt=%s' % (index, cnt))
@@ -531,14 +521,14 @@
succCnt = ipyDataMgr.GetXBXZCount()
if not succCnt:
return
- maxSuccid = ipyDataMgr.GetXBXZByIndex(succCnt-1).GetID()
- recordIndexList = range(maxSuccid / 31+1)
+ maxSuccid = ipyDataMgr.GetXBXZByIndex(succCnt - 1).GetID()
+ recordIndexList = range(maxSuccid / 31 + 1)
succFARPack = ChPyNetSendPack.tagMCXBXZAwardRecordList()
succFARPack.Clear()
succFARPack.RecordList = []
for i in recordIndexList:
- awardRecord=curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_XBXZAwardRecord%i)
+ awardRecord = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_XBXZAwardRecord % i)
if not awardRecord:
continue
recordInfo = ChPyNetSendPack.tagMCXBXZAwardRecord()
@@ -549,6 +539,7 @@
succFARPack.RecordCnt = len(succFARPack.RecordList)
NetPackCommon.SendFakePack(curPlayer, succFARPack)
return
+
#-------------------------------------------------------------------------------
#// A5 15 提升法宝等级 #tagCMMagicWeaponUp
@@ -564,26 +555,27 @@
curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
mwID = clientData.MWID
curMWLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MagicWeaponLV % mwID)
- nextMWLV = curMWLV+1
+ nextMWLV = curMWLV + 1
nextIpyData = IpyGameDataPY.GetIpyGameData('TreasureUp', mwID, nextMWLV)
if not nextIpyData:
return
needExp = nextIpyData.GetNeedExp()
curUpExp = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MagicWeaponUpExp % mwID)
if curUpExp < needExp:
- GameWorld.DebugLog('法宝升级经验不足%s'%needExp)
+ GameWorld.DebugLog('法宝升级经验不足%s' % needExp)
return
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_MagicWeaponUpExp % mwID, curUpExp-needExp)
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_MagicWeaponUpExp % mwID, curUpExp - needExp)
DoActiveMW(curPlayer, mwID, nextMWLV)
return
+
def AddMagicWeaponUpExp(curPlayer, mwID, addExp):
#增加法宝升级经验
- GameWorld.DebugLog('增加法宝升级经验 mwID=%s,addExp=%s'%(mwID, addExp))
+ GameWorld.DebugLog('增加法宝升级经验 mwID=%s,addExp=%s' % (mwID, addExp))
curUpExp = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MagicWeaponUpExp % mwID)
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_MagicWeaponUpExp % mwID, curUpExp+addExp)
+ PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_MagicWeaponUpExp % mwID, curUpExp + addExp)
Sycn_MagicWeaponLV(curPlayer, mwID)
# 每日活动
ipyData = GetWMIpyData(mwID)
@@ -592,7 +584,8 @@
PlayerActivity.AddDailyActionFinishCnt(curPlayer, ShareDefine.DailyActionID_MagicWeapon)
return
-def Sycn_MagicWeaponLV(curPlayer, mwID= -1):
+
+def Sycn_MagicWeaponLV(curPlayer, mwID=-1):
#通知法宝等级信息
if mwID == -1:
isAll = True
@@ -627,134 +620,6 @@
NetPackCommon.SendFakePack(curPlayer, sendPack)
return
-def GetMagicWeaponPrivilege(curPlayer, privilege):
- #法宝等级权限
- if not GetIsActiveMWSoul(curPlayer, privilege):
- return 0
- privilegeIpyData = IpyGameDataPY.GetIpyGameDataNotLog('TreasurePrivilege', privilege)
- if not privilegeIpyData:
- return 0
- return privilegeIpyData
-
-def GetMagicWeaponPrivilegeAttr(curPlayer, privilege):
- #获取法宝特权增加的属性
- addAttr = {}
- privilegeIpyData = IpyGameDataPY.GetIpyGameDataNotLog('TreasurePrivilege', privilege)
- if not privilegeIpyData:
- return addAttr
- attrInfo = privilegeIpyData.GetAddAttr()
- if not attrInfo:
- attrInfo = {}
- singleValue = privilegeIpyData.GetSingleValue()
-
- if privilege == ChConfig.MWPrivilege_EquipPlus:
- #强化加成
- #境界改版，废弃
- pass
- else:
- 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
-
- GameWorld.DebugLog(' 获取法宝特权增加的属性 privilege=%s,addAttr=%s' % (privilege,addAttr), curPlayer.GetID())
- return addAttr
-
-def SetMWPrivilegeData(curPlayer, privilege, data, isAdd=False):
- ##设置法宝特权相关数据
- 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()
- if maxValue:
- newData = min(maxValue, newData)
- if curValue != newData:
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_MWSoulCurValue % privilege, newData)
-
- Sycn_MWPrivilegeData(curPlayer, privilege)
- GameWorld.Log(' privilege=%s,data=%s,curValue=%s,newData=%s'%(privilege, data,curValue,newData))
- return
-
-def GetMWSoulAward(curPlayer, privilege):
- #领取法宝之魂奖励
- ipyData = GetMagicWeaponPrivilege(curPlayer, privilege)
- if not ipyData:
- 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
- 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()
-
-
- itemList = ipyData.GetItemAward()
- if itemList:
- #每日物品奖励
- if curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MWSoulGotItemState % privilege):
- GameWorld.Log(' 领取法宝之魂奖励 今日已领取 privilege=%s'%privilege)
- return
- needSpace = len(itemList)
- packSpace = ItemCommon.GetItemPackSpace(curPlayer, IPY_GameWorld.rptItem, needSpace)
- if needSpace > packSpace:
- PlayerControl.NotifyCode(curPlayer, "GeRen_chenxin_676165", [IPY_GameWorld.rptItem])
- return
- PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_MWSoulGotItemState % privilege, 1)
- for itemid, cnt, isBind in itemList:
- ItemControler.GivePlayerItem(curPlayer, int(itemid), int(cnt), 0, [IPY_GameWorld.rptItem], event=["MWSoulAward", False, {"privilege":privilege}])
-
- #通知
- Sycn_MWPrivilegeData(curPlayer, privilege)
- return
-
-def Sycn_MWPrivilegeData(curPlayer, privilegeID= -1, isForce=False):
- #通知法宝特权信息
- if privilegeID == -1:
- needCalList = ChConfig.MWPrivilegeList
- else:
- needCalList = [privilegeID]
- sendPack = ChPyNetSendPack.tagMCMWPrivilegeDataInfo()
- sendPack.InfoList = []
- for priID in needCalList:
- pack = ChPyNetSendPack.tagMCMWPrivilegeData()
- pack.CurValue = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MWSoulCurValue % priID)
- pack.GotValue = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MWSoulGotValue % priID)
- pack.ItemAwardState = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_MWSoulGotItemState % priID)
- pack.State = GetIsActiveMWSoul(curPlayer, priID)
- if not isForce and max([pack.CurValue, pack.GotValue, pack.ItemAwardState, pack.State]) == 0:
- continue
- pack.PriID = priID
- sendPack.InfoList.append(pack)
- sendPack.Count = len(sendPack.InfoList)
- if sendPack.Count:
- NetPackCommon.SendFakePack(curPlayer, sendPack)
- return
#// A5 16 法宝状态记录 #tagCMMagicWeaponState
#
@@ -773,14 +638,17 @@
Sycn_MagicWeaponLV(curPlayer, mwID)
return
+
def GetIsClickMagicWeapon(curPlayer, mwID):
#获取法宝是否点击认主
- return GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_MagicWeaponIsClick, mwID % 100, True, [mwID / 100])
+ return GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_MagicWeaponIsClick, mwID, True)
+
def SetMagicWeaponClickState(curPlayer, mwID, state=1):
#设置法宝是否点击认主状态
- GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_PDict_MagicWeaponIsClick, mwID % 100, state, True, [mwID / 100])
+ GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_PDict_MagicWeaponIsClick, mwID, state, True)
return
+
#// A5 1D 法宝佩戴 #tagCMWearMagicWeapon
#
@@ -804,7 +672,7 @@
if hasWearCnt >= maxCnt:
return
if GetIsWearMagicWeapon(curPlayer, mid):
- hasWearCnt +=1
+ hasWearCnt += 1
SetMagicWeaponWearState(curPlayer, mwID, isWear)
CalcMagicWeaponAttr(curPlayer)
@@ -812,84 +680,24 @@
Sycn_MagicWeaponLV(curPlayer, mwID)
return
+
def GetIsWearMagicWeapon(curPlayer, mwID):
#获取法宝是否佩戴
- return GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_MagicWeaponIsWear, mwID % 100, True, [mwID / 100])
+ return GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_MagicWeaponIsWear, mwID, True)
+
def SetMagicWeaponWearState(curPlayer, mwID, state):
#设置法宝是否佩戴
- GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_PDict_MagicWeaponIsWear, mwID % 100, state, True, [mwID / 100])
+ GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_PDict_MagicWeaponIsWear, mwID, state, True)
return
-#// A5 12 激活法宝之魂 #tagCMActiveMWSoul
-#
-#struct tagCMActiveMWSoul
-#
-#{
-# tagHead Head;
-# BYTE ID; //编号
-#};
-def OnActiveMWSoul(index, clientData, tick):
- curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
- soulID = clientData.ID
- ipyData = IpyGameDataPY.GetIpyGameData('TreasurePrivilege', soulID)
- if not ipyData:
- return
- if GetIsActiveMWSoul(curPlayer, soulID):
- GameWorld.Log(' 该法宝之魂已经激活！！ soulID=%s'%soulID)
- return
- #检查成就
- succList = ipyData.GetSuccessList()
- for succID in succList:
- if not PlayerSuccess.GetSuccHasGot(curPlayer, succID):
- GameWorld.DebugLog(' 激活法宝之魂 成就未完成 soulID=%s,succID=%s'%(soulID, succID))
- return
-
- __DoActiveMWSoul(curPlayer, soulID)
- return
-
-def __DoActiveMWSoul(curPlayer, soulID, isRefreshAttr=True):
- GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_PDict_MWSoulActiveState, soulID, 1, True)
- #任务
- EventShell.EventRespons_MWSoulActive(curPlayer, soulID)
-
- CalcMagicWeaponSoulAttr(curPlayer)
- if isRefreshAttr:
- PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
-
- #通知
- Sycn_MWPrivilegeData(curPlayer, soulID)
- return
-
-
-def GetIsActiveMWSoul(curPlayer, soulID):
- #获取法宝之魂是否已激活
- return GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_PDict_MWSoulActiveState, soulID)
-
-def CalcMagicWeaponSoulAttr(curPlayer):
- #法宝之魂属性刷新
- allAttrList = [{} for _ in range(4)]
- allAttrDict = {}
- ipyMgr = IpyGameDataPY.IPY_Data()
- for i in xrange(ipyMgr.GetTreasurePrivilegeCount()):
- ipyData = ipyMgr.GetTreasurePrivilegeByIndex(i)
- soulID = ipyData.GetPrivilegeID()
- if not GetIsActiveMWSoul(curPlayer, soulID):
- continue
- attrDict = GetMagicWeaponPrivilegeAttr(curPlayer, soulID)
- GameWorld.AddDictValue(allAttrDict, attrDict)
-
- 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())
+ 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
+ return
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py
index 45ae6dd..9636f84 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py
@@ -484,7 +484,6 @@
if not ItemControler.PlayerItemControler(curPlayer).PutInItem(petPackIndex, newPetItem):
return
- PlayerMagicWeapon.SetMWPrivilegeData(curPlayer, ChConfig.MWPrivilege_Pet, len(GetActivePetID(curPlayer)))
ItemCommon.ReduceItem(curPlayer, itemPack, itemList, needItemCnt, False, ChConfig.ItemDel_Pet)
EventShell.EventRespons_OnActivatePet(curPlayer, petNPCID)
@@ -539,7 +538,6 @@
if not ItemControler.PlayerItemControler(curPlayer).PutInItem(petPackIndex, newPetItem):
return
- PlayerMagicWeapon.SetMWPrivilegeData(curPlayer, ChConfig.MWPrivilege_Pet, len(GetActivePetID(curPlayer)))
SetPetSkillFightPower(curPlayer) # 技能战力重算
petItemIndex = GetPetDataItemIndexByNPCID(curPlayer, petNPCID)
DoChangePetState(curPlayer, petItemIndex, ShareDefine.Def_PetState_Fight)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py
index 8d5137f..bbc269a 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerRune.py
@@ -428,8 +428,7 @@
totalMJ = 0
packIndex = ShareDefine.rptRune
placeList = xrange(ItemCommon.GetVPackCnt(packIndex)) if (isAll or clientData.QualityCnt > 0) else clientData.PlaceIndexList
- wmpIpyData = PlayerMagicWeapon.GetMagicWeaponPrivilege(curPlayer, ChConfig.MWPrivilege_RuneDecompose)
- addPer = int(wmpIpyData.GetEffectValue()) if wmpIpyData else 0
+ addPer = 0
for place in placeList:
RuneData = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_VPackItem % (packIndex, place))
if not RuneData:
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
index 12ec4f7..64ae39c 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.py
@@ -1404,7 +1404,7 @@
Def_MFPType_MagicWeapon3, # 仙族法宝 17
Def_MFPType_PetSoul, # 灵宠魂石 18
Def_MFPType_HorseSoul, # 坐骑魂石 19
-Def_MFPType_MagicWeaponSoul, # 法宝之魂 20
+Def_MFPType_MagicWeaponSoul, # 法宝之魂 20 - 废弃
Def_MFPType_Dogz, # 神兽 21
Def_MFPType_GatherSoul, # 聚魂 22
Def_MFPType_MagicWeapon4, # 王者法宝 23
--
Gitblit v1.8.0