From bf398236af3eefb4587f8138a5d6c916c69838d3 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 20 三月 2019 15:23:29 +0800
Subject: [PATCH] 6382 【后端】【2.0】功能是否绑定及拍品优化调整（拍品限制使用）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py | 198 ++++++++++++++++++++-----------------------------
1 files changed, 82 insertions(+), 116 deletions(-)
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 17a6cb5..f615f5f 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -84,11 +84,13 @@
import PlayerCostRebate
import GY_Query_CrossRealmReg
import PlayerFairyCeremony
+import PlayerNewFairyCeremony
import PlayerCrossRealmPK
import FunctionNPCCommon
import CrossRealmPlayer
import CrossPlayerData
import ChNetSendPack
+#import EquipZhuXian
import PlayerCoat
import PlayerState
import QuestCommon
@@ -323,7 +325,7 @@
return
#---------------------------------------------------------------------
-def SendMailBatch(mailTypeKey, batchPlayerIDList, batchAddItemList=[], batchParamList=[], batchGold=[], batchGoldPaper=[], batchSilver=[], batchDetail=[]):
+def SendMailBatch(mailTypeKey, batchPlayerIDList, batchAddItemList=[], batchParamList=[], batchGold=[], batchGoldPaper=[], batchSilver=[], batchDetail=[], moneySource=ChConfig.Def_GiveMoney_Mail):
'''批量发送邮件, 用于瞬间需要发送多封（大量）邮件的，比如一些公共副本活动等结算时
@param mailTypeKey: 邮件模板key
@param batchPlayerIDList: [playerIDList, playerIDList, ...]
@@ -333,14 +335,15 @@
@param batchGoldPaper: [batchGoldPaper, batchGoldPaper, ...]
@param batchSilver: [batchSilver, batchSilver, ...]
@param batchDetail: [记录邮件流向用, ...]
+ @param moneySource: 货币来源
'''
- msgInfo = str([mailTypeKey, batchPlayerIDList, batchAddItemList, batchParamList, batchGold, batchGoldPaper, batchSilver, batchDetail])
+ msgInfo = str([mailTypeKey, batchPlayerIDList, batchAddItemList, batchParamList, batchGold, batchGoldPaper, batchSilver, batchDetail, moneySource])
GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, "SendMailBatch", msgInfo, len(msgInfo))
GameWorld.Log("SendMailBatch %s, batchPlayerIDList=%s, batchAddItemList=%s, batchParamList=%s, batchGold=%s, batchGoldPaper=%s, batchSilver=%s"
% (mailTypeKey, batchPlayerIDList, batchAddItemList, batchParamList, batchGold, batchGoldPaper, batchSilver))
return
-def SendMailByKey(mailTypeKey, playerIDList, addItemList, paramList=[], gold=0, goldPaper=0, silver=0, detail=""):
+def SendMailByKey(mailTypeKey, playerIDList, addItemList, paramList=[], gold=0, goldPaper=0, silver=0, detail="", moneySource=ChConfig.Def_GiveMoney_Mail):
'''
@param detail: 记录邮件流向用
'''
@@ -348,13 +351,13 @@
mailTypeKey = ShareDefine.DefaultLackSpaceMailType
content = "<MailTemplate>%s</MailTemplate>%s" % (mailTypeKey, json.dumps(paramList, ensure_ascii=False))
- SendMail("", content, 30, playerIDList, addItemList, gold, goldPaper, silver, detail)
+ SendMail("", content, 30, playerIDList, addItemList, gold, goldPaper, silver, detail, moneySource)
return
## 功能发放物品补偿/奖励邮件
-# @param addItemList [(itemID, itemCnt, isBind), {或物品信息字典}, ...]
+# @param addItemList [(itemID, itemCnt, 是否拍品), {或物品信息字典}, ...]
# @return
-def SendMail(title, content, getDays, playerIDList, addItemList, gold=0, goldPaper=0, silver=0, detail=""):
+def SendMail(title, content, getDays, playerIDList, addItemList, gold=0, goldPaper=0, silver=0, detail="", moneySource=ChConfig.Def_GiveMoney_Mail):
if not playerIDList:
return
@@ -379,24 +382,26 @@
if len(mailItem) != 3:
continue
- itemID, itemCnt, isBind = mailItem
+ itemID, itemCnt, isAuctionItem = mailItem
if ItemControler.GetAppointItemRealID(itemID):
# 定制物品转化为物品信息字典
- appointItemObj = ItemControler.GetItemByData(ItemControler.GetAppointItemDictData(itemID, isBind))
+ appointItemObj = ItemControler.GetItemByData(ItemControler.GetAppointItemDictData(itemID, isAuctionItem))
if not appointItemObj:
- GameWorld.ErrLog("邮件定制物品转化失败！itemID, itemCnt, isBind" % (itemID, itemCnt, isBind))
+ GameWorld.ErrLog("邮件定制物品转化失败！itemID, itemCnt, isAuctionItem" % (itemID, itemCnt, isAuctionItem))
continue
combineItemList.append(ItemCommon.GetMailItemDict(appointItemObj))
appointItemObj.Clear()
+ elif isAuctionItem:
+ combineItemList.append((itemID, itemCnt, isAuctionItem))
else:
- key = (itemID, isBind)
+ key = (itemID, isAuctionItem)
itemCountDict[key] = itemCountDict.get(key, 0) + itemCnt
for key, itemCnt in itemCountDict.items():
- itemID, isBind = key
- combineItemList.append((itemID, itemCnt, isBind))
- cmdList = [title, content, getDays, playerIDList, combineItemList, gold, goldPaper, silver, detail]
+ itemID, isAuctionItem = key
+ combineItemList.append((itemID, itemCnt, isAuctionItem))
+ cmdList = [title, content, getDays, playerIDList, combineItemList, gold, goldPaper, silver, detail, moneySource]
GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, "SendMail", '%s' % (cmdList), len(str(cmdList)))
return True
@@ -529,6 +534,10 @@
if not GameWorld.IsCrossServer() and GetCrossMapID(curPlayer):
NotifyCode(curPlayer, "CrossMap10")
+ return False
+
+ if curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomScene):
+ GameWorld.Log("客户端自定义场景下无法传送!", curPlayer.GetPlayerID())
return False
return True
@@ -1213,6 +1222,13 @@
if not isDisconnect:
CrossPlayerData.ClearCrossSyncDataCache(curPlayer)
+
+ #清除地图玩家缓存
+ playerID = curPlayer.GetPlayerID()
+ PyGameData.g_zhuXianSkillAddPerDict.pop(playerID, None)
+ PyGameData.g_zhuXianSkillReducePerDict.pop(playerID, None)
+ PyGameData.g_playerFuncAttrDict.pop(playerID, None)
+ PyGameData.g_playerEquipPartAttrDict.pop(playerID, None)
return
##更新保存玩家在线时间
@@ -1809,6 +1825,12 @@
if isNotify:
NotifyCode(curPlayer, "Carry_lhs_697674")
return ShareDefine.EntFBAskRet_Sit
+
+ if curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomScene):
+ if isNotify:
+ NotifyCode(curPlayer, "Carry_lhs_697674")
+ GameWorld.Log("客户端自定义场景下无法进入副本!", curPlayer.GetPlayerID())
+ return ShareDefine.EntFBAskRet_Other
if playerAction in ChConfig.Def_Player_Cannot_TransState:
#Carry_lhs_697674：您当前所处的状态不能进行传送!
@@ -2965,6 +2987,7 @@
PlayerCostRebate.AddCostRebateGold(curPlayer, costType, price, infoDict)
# 绝版降临
PlayerFairyCeremony.AddFCCostGold(curPlayer, costType, price)
+ PlayerNewFairyCeremony.AddFCCostGold(curPlayer, costType, price)
# 消费VIP
# if costVIPGold < 0:
# costVIPGold = price
@@ -3541,6 +3564,13 @@
FinalHurtReduce = getattr(self, self.__AttrName % ChConfig.TYPE_Calc_FinalHurtReduce) # 最终固定伤害减少
DamagePerPVP = getattr(self, self.__AttrName % ChConfig.TYPE_Calc_DamagePerPVP) * fpParam.GetCftDamagePerPVP() # 伤害输出计算百分比PVP
DamagePerPVPReduce = getattr(self, self.__AttrName % ChConfig.TYPE_Calc_DamagePerPVPReduce) * fpParam.GetCftDamagePerPVPReduce() # 伤害输出计算百分比PVP减少
+ JobAHurtAddPer = getattr(self, self.__AttrName % ChConfig.TYPE_Calc_JobAHurtAddPer) * fpParam.GetCftJobAHurtAddPer() # 对目标战士伤害加成
+ JobBHurtAddPer = getattr(self, self.__AttrName % ChConfig.TYPE_Calc_JobBHurtAddPer) * fpParam.GetCftJobBHurtAddPer() # 对目标法师伤害加成
+ JobCHurtAddPer = getattr(self, self.__AttrName % ChConfig.TYPE_Calc_JobCHurtAddPer) * fpParam.GetCftJobCHurtAddPer() # 对目标弓箭伤害加成
+ JobAAtkReducePer = getattr(self, self.__AttrName % ChConfig.TYPE_Calc_JobAAtkReducePer) * fpParam.GetCftJobAAtkReducePer() # 战士攻击伤害减免
+ JobBAtkReducePer = getattr(self, self.__AttrName % ChConfig.TYPE_Calc_JobBAtkReducePer) * fpParam.GetCftJobBAtkReducePer() # 法师攻击伤害减免
+ JobCAtkReducePer = getattr(self, self.__AttrName % ChConfig.TYPE_Calc_JobCAtkReducePer) * fpParam.GetCftJobCAtkReducePer() # 弓箭攻击伤害减免
+
ComboRate = getattr(self, self.__AttrName % ChConfig.TYPE_Calc_ComboRate) # 连击几率
ComboDamPer = getattr(self, self.__AttrName % ChConfig.TYPE_Calc_ComboDamPer) # 连击伤害
#MaxProDef = getattr(self, self.__AttrName % ChConfig.TYPE_Calc_MaxProDef) # 最大防护值
@@ -3726,7 +3756,7 @@
# 检查最大等级
if curLV >= maxLV and curTotalExp >= maxLVExpStore:
self.__NotifyExpFull(curPlayer, "GeRen_admin_825676")
- GameWorld.DebugLog("经验已满！已满级！curLV=%s" % (curLV), curPlayer.GetPlayerID())
+ #GameWorld.DebugLog("经验已满！已满级！curLV=%s" % (curLV), curPlayer.GetPlayerID())
return 0, expViewType
# 杀怪
@@ -3961,7 +3991,7 @@
PlayerGreatMaster.Sync_GreatMasterFreeSkillPoint(curPlayer)
# 升级需要执行的游戏功能处理
GameFuncComm.DoFuncOpenLogic(curPlayer)
- ChEquip.CalcEquips_OutOfPrint(curPlayer) # 缓存绝版属性
+ #ChEquip.CalcEquips_OutOfPrint(curPlayer) # 缓存绝版属性
if aftLV%10 == 0:
# 控制下刷新次数
PlayerPet.CalcPetItemAddPlayerAttr(curPlayer) # 宠物有随等级变化的技能
@@ -3978,7 +4008,7 @@
# 记录开服活动冲级数据
OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_LV, curPlayer.GetLV())
#神秘限购
- FunctionNPCCommon.MysticalShopOpen(curPlayer, befLV, aftLV)
+ FunctionNPCCommon.MysticalLimitShopOpen(curPlayer, befLV, aftLV)
#不需要做升级任务, 设置玩家经验
SetPlayerTotalExp(curPlayer, curTotalExp)
return
@@ -4133,6 +4163,7 @@
PlayerFamilyTech.CalcFamilyTechAttr(curPlayer)
PlayerEquipDecompose.RefreshEDAttr(curPlayer)
PlayerDogz.RefreshDogzAttr(curPlayer)
+ #EquipZhuXian.CalcZhuXianAttr(curPlayer)
PlayerGatherSoul.RefreshGatherSoulAttr(curPlayer)
PlayerCoat.CalcClothesCoatSkinAttr(curPlayer)
self.RefreshAllState(isForce=True)
@@ -4269,6 +4300,7 @@
curPlayer.BeginRefreshState()
self.ResetFightPowerObj()
#self.PrintAttr(curPlayer, "重置后")
+ notAttrList = [{} for _ in range(4)]
# 1.初始化人物各项状态及属性
self.InitPlayerState()
@@ -4292,7 +4324,8 @@
funcAttrInfoList.append(roleBaseAttrInfo)
continue
attrInfo = GetCalcAttrListValue(curPlayer, funcIndex)
- GameWorld.DebugLog("功能点属性: %s, %s" % (funcIndex, attrInfo))
+ if attrInfo != notAttrList:
+ GameWorld.DebugLog("功能点属性: %s, %s" % (funcIndex, attrInfo))
funcAttrInfoList.append(attrInfo)
# 不同功能点间的数值累加，需使用支持衰减递增的计算方式
AddAttrDictValue(baseAttrDict, attrInfo[ChConfig.CalcAttr_Base])
@@ -4315,17 +4348,8 @@
# 3.计算战斗属性
# 3.1 战斗属性层级交叉影响基值数值汇总
- # 装备基础
- equipBaseAttrList = AddAttrListValue([funcAttrInfoList[ChConfig.Def_CalcAttrFunc_EquipBaseWeapon],
- funcAttrInfoList[ChConfig.Def_CalcAttrFunc_EquipBaseArmor],
- funcAttrInfoList[ChConfig.Def_CalcAttrFunc_EquipBaseRelics],
- ])
- #GameWorld.DebugLog("装备基础: %s" % equipBaseAttrList)
-
- # 基础层级(角色基础属性、装备基础属性、强化基础属性)
+ # 基础层级(角色基础属性)
baseAttrList = AddAttrListValue([funcAttrInfoList[ChConfig.Def_CalcAttrFunc_RoleBase],
- equipBaseAttrList,
- funcAttrInfoList[ChConfig.Def_CalcAttrFunc_PlusBase],
])
#GameWorld.DebugLog("基础层级: %s" % baseAttrList)
@@ -4335,11 +4359,6 @@
ChConfig.TYPE_Calc_BaseDefAddPer:baseAttrList,
ChConfig.TYPE_Calc_BaseHitAddPer:baseAttrList,
ChConfig.TYPE_Calc_BaseMissAddPer:baseAttrList,
- ChConfig.TYPE_Calc_EquipBaseAddPer:equipBaseAttrList,
- ChConfig.TYPE_Calc_WeaponAtkAddPer:funcAttrInfoList[ChConfig.Def_CalcAttrFunc_EquipBaseWeapon],
- ChConfig.TYPE_Calc_RelicsAtkAddPer:funcAttrInfoList[ChConfig.Def_CalcAttrFunc_EquipBaseRelics],
- ChConfig.TYPE_Calc_ArmorMaxHPAddPer:funcAttrInfoList[ChConfig.Def_CalcAttrFunc_EquipBaseArmor],
- ChConfig.TYPE_Calc_ArmorDefAddPer:funcAttrInfoList[ChConfig.Def_CalcAttrFunc_EquipBaseArmor],
ChConfig.TYPE_Calc_GodWeaponMaxHPPer:funcAttrInfoList[ChConfig.Def_CalcAttrFunc_GodWeapon],
ChConfig.TYPE_Calc_GodWeaponAtkPer:funcAttrInfoList[ChConfig.Def_CalcAttrFunc_GodWeapon],
ChConfig.TYPE_Calc_StoneMaxHPPer:funcAttrInfoList[ChConfig.Def_CalcAttrFunc_Stone],
@@ -4347,10 +4366,7 @@
ChConfig.TYPE_Calc_StoneBasePer:funcAttrInfoList[ChConfig.Def_CalcAttrFunc_Stone],
ChConfig.TYPE_Calc_RealmBasePer:funcAttrInfoList[ChConfig.Def_CalcAttrFunc_Prestige],
ChConfig.TYPE_Calc_HorseAtkPer:funcAttrInfoList[ChConfig.Def_CalcAttrFunc_Horse],
- ChConfig.TYPE_Calc_HorcruxBasePer:funcAttrInfoList[ChConfig.Def_CalcAttrFunc_Horcrux],
ChConfig.TYPE_Calc_WingHPPer:funcAttrInfoList[ChConfig.Def_CalcAttrFunc_Wing],
- ChConfig.TYPE_Calc_SuiteBasePer:funcAttrInfoList[ChConfig.Def_CalcAttrFunc_Suit],
- ChConfig.TYPE_Calc_PlusBaseAtkPer:funcAttrInfoList[ChConfig.Def_CalcAttrFunc_PlusBase],
}
# 3.2 统计各功能之间非线性属性交叉影响累加
funcAddAttrPerInfoDict = {} # 百分比交叉影响所提升的属性值 {功能属性编号:{提升的属性类型:数值, ...}, ...}
@@ -4444,9 +4460,10 @@
fpParam = IpyGameDataPY.GetIpyGameData("FightPowerParam", curLV)
mfpDict = {} # 模块战斗力
for mfpObj in mfpObjAttrDict.keys():
- mfpDict[mfpObj.mfpType] = 0 if not fpParam else mfpObj.GetModuleFightPower(fpParam)
- mfpDict[mfpObj.mfpType] = mfpDict[mfpObj.mfpType] + curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_MFPSkill % mfpObj.mfpType)
- mfpDict[mfpObj.mfpType] = mfpDict[mfpObj.mfpType] + curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_MFPEx % mfpObj.mfpType)
+ mfp = 0 if not fpParam else mfpObj.GetModuleFightPower(fpParam)
+ mfp += curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_MFPSkill % mfpObj.mfpType)
+ mfp += curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_MFPEx % mfpObj.mfpType)
+ mfpDict[mfpObj.mfpType] = mfp
# 最后在附加上特殊附加层级线性属性、永久技能层级固定值
CalcLineEffect.ChangePlayerAttrInLineEffectList(curPlayer, allAttrExList[ChConfig.CalcAttr_Battle])
@@ -5730,7 +5747,6 @@
# 通知GsmeServer;
# SendGameServerRefreshState(int inputType, int inputValue)
-# SetExAttr15 ~ 18 对应神兵类型等级，场景特效用
# 禁言 通知gameServer
def SetGMForbidenTalk(curPlayer, value):
@@ -5738,13 +5754,6 @@
curPlayer.SendGameServerRefreshState(ShareDefine.CDBPlayerRefresh_ForbidenTalk, value)
curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_ForbidenTalk, value, False)
return
-
-
-## 职业阶数
-def GetJobRank(curPlayer): return curPlayer.GetExAttr1()
-def SetJobRank(curPlayer, jobRank):
- curPlayer.SendGameServerRefreshState(IPY_GameWorld.CDBPlayerRefresh_ExAttr1, jobRank)
- return curPlayer.SetExAttr1(jobRank)
## 队伍相关审核开关状态, joinReqCheck-入队申请是否需要审核; inviteCheck-组队邀请是否需要审核;
def SetTeamCheckStateEx(curPlayer, joinReqCheck, inviteCheck): return SetTeamCheckState(curPlayer, joinReqCheck * 10 + inviteCheck)
@@ -5801,6 +5810,12 @@
curPlayer.SetExAttr13(serverGroupID, False, True)
GameWorld.DebugLog("更新玩家所属服务器组ID: serverGroupID=%s" % serverGroupID)
return
+
+##影响外观的3部位索引记录 123456789 123:武器格子索引 456：副手 789：衣服
+def GetFaceEquipIndexList(curPlayer):
+ attr15 = curPlayer.GetExAttr15()
+ return [attr15%1000, attr15/1000%1000, attr15/1000000]
+def SetFaceEquipIndex(curPlayer, value): return curPlayer.SetExAttr15(value)
##获得玩家威望值
def GetPrestige(curPlayer): return 0
@@ -6389,24 +6404,6 @@
# 基础闪避百分比
def GetBaseMissAddPer(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_BaseMissAddPer)
def SetBaseMissAddPer(curPlayer, value): curPlayer.SetDict(ChConfig.Def_PlayerKey_BaseMissAddPer, value)
-# 魂器基础百分比
-def GetHorcruxBasePer(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_HorcruxBasePer)
-def SetHorcruxBasePer(curPlayer, value): curPlayer.SetDict(ChConfig.Def_PlayerKey_HorcruxBasePer, value)
-# 装备基础百分比
-def GetEquipBaseAddPer(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_EquipBaseAddPer)
-def SetEquipBaseAddPer(curPlayer, value): curPlayer.SetDict(ChConfig.Def_PlayerKey_EquipBaseAddPer, value)
-# 武器基础攻击百分比
-def GetWeaponAtkAddPer(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_WeaponAtkAddPer)
-def SetWeaponAtkAddPer(curPlayer, value): curPlayer.SetDict(ChConfig.Def_PlayerKey_WeaponAtkAddPer, value)
-# 圣器基础攻击百分比
-def GetRelicsAtkAddPer(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_RelicsAtkAddPer)
-def SetRelicsAtkAddPer(curPlayer, value): curPlayer.SetDict(ChConfig.Def_PlayerKey_RelicsAtkAddPer, value)
-# 防具基础生命百分比
-def GetArmorMaxHPAddPer(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ArmorMaxHPAddPer)
-def SetArmorMaxHPAddPer(curPlayer, value): curPlayer.SetDict(ChConfig.Def_PlayerKey_ArmorMaxHPAddPer, value)
-# 防具基础防御百分比
-def GetArmorDefAddPer(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ArmorDefAddPer)
-def SetArmorDefAddPer(curPlayer, value): curPlayer.SetDict(ChConfig.Def_PlayerKey_ArmorDefAddPer, value)
# 神兵生命百分比
def GetGodWeaponMaxHPPer(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_GodWeaponMaxHPPer)
def SetGodWeaponMaxHPPer(curPlayer, value): curPlayer.SetDict(ChConfig.Def_PlayerKey_GodWeaponMaxHPPer, value)
@@ -6714,12 +6711,6 @@
return
#-------------------------------------------------------------------------------
-# 每个功能最多加几个属性
-# 即以这种方式优化刷属性效率，一个功能需要额外占用Def_MaxAddAttrTypeCnt*2个临时字典缓存(一个存类型，一个存值)
-Def_MaxAddAttrTypeCnt = 15
-
-# 通过SetCalcAttrListValue先缓存功能计算增加的属性值，仅在变更时重新计算设置
-# 通过AddCalcAttrListValue取出缓存中已经算好的属性值，在刷属性中进行累加，从而减少每次重新计算功能增加的属性
## 设置保存功能事先计算好的属性值
def SetCalcAttrListValue(curPlayer, funcIndex, allAttrList):
@@ -6738,21 +6729,12 @@
addMaxHP = curPlayer.GetLV() * battleAttrDict[ChConfig.TYPE_Calc_PerLVMaxHP]
battleAttrDict[ChConfig.TYPE_Calc_AttrMaxHP] = battleAttrDict.get(ChConfig.TYPE_Calc_AttrMaxHP, 0) + addMaxHP
- for attrIndex, addAttrDict in enumerate(allAttrList):
- findIndex = -1
- for attrType, attrValue in addAttrDict.items():
- if not isinstance(attrValue, int):
- GameWorld.ErrLog("SetCalcAttrListValue funcIndex=%s,attrType=%s,Value=%s is not int!"
- % (funcIndex, attrType, attrValue), curPlayer.GetPlayerID())
- continue
- for i in xrange(findIndex + 1, Def_MaxAddAttrTypeCnt):
- addAttrTypeKey = ChConfig.Def_PlayerKey_CalcAddAttrType % (funcIndex, attrIndex, i)
- addAttrValueKey = ChConfig.Def_PlayerKey_CalcAddAttrValue % (funcIndex, attrIndex, i)
- if curPlayer.GetDictByKey(addAttrTypeKey) == 0:
- findIndex = i
- curPlayer.SetDict(addAttrTypeKey, attrType)
- curPlayer.SetDict(addAttrValueKey, attrValue)
- break
+ playerID = curPlayer.GetPlayerID()
+ if playerID not in PyGameData.g_playerFuncAttrDict:
+ PyGameData.g_playerFuncAttrDict[playerID] = {}
+ funcAttrDict = PyGameData.g_playerFuncAttrDict[playerID]
+ funcAttrDict[funcIndex] = allAttrList
+ #GameWorld.DebugLog("保存功能点属性: funcIndex=%s, %s" % (funcIndex, allAttrList))
return
def GetCalcAttrListValue(curPlayer, funcIndex):
@@ -6765,42 +6747,26 @@
else:
return attrList
+ playerID = curPlayer.GetPlayerID()
+ if playerID not in PyGameData.g_playerFuncAttrDict:
+ return attrList
+ funcAttrDict = PyGameData.g_playerFuncAttrDict[playerID]
for funcIndex in funcIndexList:
- for attrIndex, attrDict in enumerate(attrList):
- for i in xrange(Def_MaxAddAttrTypeCnt):
- attrType = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_CalcAddAttrType % (funcIndex, attrIndex, i))
- if attrType == 0:
- break
- attrValue = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_CalcAddAttrValue % (funcIndex, attrIndex, i))
- if attrType in attrDict:
- attrDict[attrType] = attrValue + attrDict[attrType]
- else:
- attrDict[attrType] = attrValue
+ if funcIndex not in funcAttrDict:
+ continue
+ funcAttrList = funcAttrDict[funcIndex]
+ for i, attrDict in enumerate(attrList):
+ curAttrDict = funcAttrList[i]
+ AddAttrDictValue(attrDict, curAttrDict)
return attrList
-
-## 刷属性时累加功能事先计算好的属性值
-def AddCalcAttrListValue(curPlayer, funcIndex, allAttrList):
- for attrIndex in ChConfig.CalcAttrIndexList:
- for i in xrange(Def_MaxAddAttrTypeCnt):
- curAddAttrType = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_CalcAddAttrType % (funcIndex, attrIndex, i))
- if curAddAttrType == 0:
- break
- curAddAttrValue = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_CalcAddAttrValue % (funcIndex, attrIndex, i))
- addAttrDict = allAttrList[attrIndex]
- AddAttrDictValue(addAttrDict, {curAddAttrType:curAddAttrValue})
-
- return allAttrList
## 重置缓存
def ClearCalcAttrListValue(curPlayer, funcIndex):
- for attrIndex in ChConfig.CalcAttrIndexList:
- for i in xrange(Def_MaxAddAttrTypeCnt):
- addAttrTypeKey = ChConfig.Def_PlayerKey_CalcAddAttrType % (funcIndex, attrIndex, i)
- attrType = curPlayer.GetDictByKey(addAttrTypeKey)
- if not attrType:
- break
- curPlayer.SetDict(addAttrTypeKey, 0)
- curPlayer.SetDict(ChConfig.Def_PlayerKey_CalcAddAttrValue % (funcIndex, attrIndex, i), 0)
+ playerID = curPlayer.GetPlayerID()
+ if playerID not in PyGameData.g_playerFuncAttrDict:
+ return
+ funcAttrDict = PyGameData.g_playerFuncAttrDict[playerID]
+ funcAttrDict.pop(funcIndex, None)
return
def AddAttrListValue(attrList):
--
Gitblit v1.8.0