From 8ddb747ebd56d56cd4fb93e7de9bcdfae87ae5c8 Mon Sep 17 00:00:00 2001 From: hxp <ale99527@vip.qq.com> Date: 星期五, 15 二月 2019 17:13:15 +0800 Subject: [PATCH] 2903 【BUG】【1.6】玉佩有灵宠增加伤害,但属性里没有 --- ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py | 232 ++++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 209 insertions(+), 23 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 ded7ad0..d174759 100644 --- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py +++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py @@ -76,15 +76,22 @@ import PyGameData import PlayerMagicWeapon import GameLogic_SealDemon +import GameLogic_ZhuXianBoss import PlayerTJG import PlayerVip import PlayerRefineStove import PlayerFamilyTech 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 import PlayerDogz @@ -115,6 +122,7 @@ Def_Max_Move_Tick = 5000 if abs(gameWorldTick - clientWorldTick) >= Def_Max_Move_Tick: + curPlayer.Sync_ClientTick() #时间相差过大,可能因网络引起,拉回 GameWorld.DebugLog("PlayerMoveCheckClientWorldTick -- 服务器tick %s-客户端%s时间相差过大,可能因网络引起,拉回" % ( gameWorldTick, clientWorldTick), curPlayer.GetID()) @@ -229,15 +237,22 @@ # @param mergeMapInfo 该提示所属的跨服活动地图信息, 主要用于不同子服对应所跨的活动地图ID # @return 无返回值 def WorldNotify(country, msgMark, msgParamList=[], lineID=0, mergeMinOSD=-1, mergeMaxOSD=-1, mergeMapInfo=[]): - # 如果是跨服服务器,则广播子服 - if GameWorld.IsCrossServer(): - sendMsg = str([country, msgMark, msgParamList, lineID, mergeMinOSD, mergeMaxOSD, mergeMapInfo]) - GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, 'MergeWorldNotify', - sendMsg, len(sendMsg)) - FBNotify(msgMark, msgParamList) # 跨服中的全服广播只在地图中做广播即可,防止不同跨服分区的地图会相互看到广播,体验不好 - else: - GameWorld.GetPlayerManager().BroadcastCountry_NotifyCode(country, 0, msgMark, - __GetNotifyCodeList(msgParamList), lineID) + GameWorld.GetPlayerManager().BroadcastCountry_NotifyCode(country, 0, msgMark, __GetNotifyCodeList(msgParamList), lineID) + return + +def GetCrossWorldNotifyInfo(country, msgMark, msgParamList=[]): + return {"Type":ShareDefine.CrossNotify_World, "Params":[country, msgMark, msgParamList]} + +def GetCrossFamilyNotifyInfo(familyID, msgMark, msgParamList=[]): + return {"Type":ShareDefine.CrossNotify_Family, "Params":[familyID, msgMark, msgParamList]} + +def CrossNotify(serverGroupIDList, crossNotifyList): + ''' 跨服广播信息提示,支持同步多条,同时也建议多条一起同步 + @param serverGroupIDList: 需要同步到的目标服务器组ID列表 + @param crossNotifyList: 信息提示列表,通过 GetCrossWorldNotifyInfo GetCrossFamilyNotifyInfo 函数获得返回值添加到列表 + ''' + sendMsg = str([serverGroupIDList, crossNotifyList]) + GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, "CrossNotify", sendMsg, len(sendMsg)) return #--------------------------------------------------------------------- @@ -513,6 +528,14 @@ if GameWorld.GetMap().GetMapID() not in IpyGameDataPY.GetFuncEvalCfg('DungeonDeliver', 1): NotifyCode(curPlayer, "Carry_lhs_844170") return False + + 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 @@ -1193,6 +1216,14 @@ PyGameData.g_needRefreshMapServerState = True # 有玩家离开地图设置需要刷新 PlayerSuccess.FinishDelayAddSuccessProgress(curPlayer, tick) + + if not isDisconnect: + CrossPlayerData.ClearCrossSyncDataCache(curPlayer) + + #清除地图玩家缓存 + playerID = curPlayer.GetPlayerID() + PyGameData.g_zhuXianSkillAddPerDict.pop(playerID, None) + PyGameData.g_zhuXianSkillReducePerDict.pop(playerID, None) return ##更新保存玩家在线时间 @@ -1564,6 +1595,36 @@ #--------------------------------------------------------------------- +def PlayerEnterCrossServer(curPlayer, mapID): + playerID = curPlayer.GetPlayerID() + GameWorld.Log("玩家请求进入跨服地图: mapID=%s" % (mapID), playerID) + if GameWorld.IsCrossServer(): + GameWorld.DebugLog("跨服服务器不允许该操作!") + return + + if GetCrossMapID(curPlayer): + GameWorld.ErrLog("玩家当前为跨服状态,不允许再次请求进入跨服!", curPlayer.GetPlayerID()) + return + + if not CrossRealmPlayer.IsCrossServerOpen(): + NotifyCode(curPlayer, "CrossMatching18") + return + + if curPlayer.GetHP() <= 0: + NotifyCode(curPlayer, "CrossMap4") + return + + if PlayerCrossRealmPK.GetIsCrossPKMatching(curPlayer): + NotifyCode(curPlayer, "CrossMap3") + return + + if PlayerState.IsInPKState(curPlayer): + NotifyCode(curPlayer, "SingleEnterPK", [mapID]) + return + + GY_Query_CrossRealmReg.RegisterEnterCrossServer(curPlayer, mapID) + return + ##玩家进入副本 # @param curPlayer 玩家实例 # @param mapID 地图ID @@ -1650,6 +1711,14 @@ else: bossID = GameLogic_SealDemon.CurFBLineBOSSID(lineID) extendParamList = [bossID] + elif mapID == ChConfig.Def_FBMapID_ZhuXianBoss: + bossID = GameLogic_ZhuXianBoss.CurFBLineBOSSID(lineID) + extendParamList = [bossID, -1] + enterCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_EnterFbCntDay % ChConfig.Def_FBMapID_ZhuXianBoss) + if enterCnt >= FBCommon.GetEnterFBMaxCnt(curPlayer, ChConfig.Def_FBMapID_ZhuXianBoss): + if curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ZhuXianBossHelpCnt): + extendParamList = [bossID, curPlayer.GetFamilyID()] + SendToGameServerEnterFB(curPlayer, mapID, lineID, tick, extendParamList) return @@ -1714,6 +1783,18 @@ NotifyCode(curPlayer, "SingleEnterPK", [mapID]) return ShareDefine.EntFBAskRet_PKState + ## 跨服PK匹配中 + if PlayerCrossRealmPK.GetIsCrossPKMatching(curPlayer): + if isNotify: + NotifyCode(curPlayer, "CrossMatching8", [mapID]) + return ShareDefine.EntFBAskRet_CrossPKMatching + + ## 跨服地图中 + if GetCrossMapID(curPlayer) and mapID not in ChConfig.Def_CrossMapIDList: + if isNotify: + NotifyCode(curPlayer, "CrossMap5", [mapID]) + return ShareDefine.EntFBAskRet_InCrossMap + #=============================================================================================== # # 这里不做状态限制,由前端处理,因为策划要根据界面来处理,同一传送功能有可能在不同界面 # # PK状态检查 @@ -1739,6 +1820,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:您当前所处的状态不能进行传送! @@ -1937,16 +2024,18 @@ sendPack.FuncLineID = funcLineID NetPackCommon.SendFakePack(curPlayer, sendPack) + GameWorld.Log("准备切换地图", curPlayer.GetID()) return # 通知开始切换地图 def NotifyStartChangeMap(curPlayer): - GameWorld.DebugLog("通知开始切换地图, NotifyStartChangeMap") sendPack = ChPyNetSendPack.tagMCStartChangeMap() sendPack.Clear() sendPack.MapID = curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ChangeMapID) sendPack.FuncLineID = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_ReqFBFuncLine) NetPackCommon.SendFakePack(curPlayer, sendPack) + + GameWorld.Log("通知开始切换地图", curPlayer.GetID()) return #--------------------------------------------------------------------- @@ -2046,7 +2135,8 @@ if PlayerTJG.GetIsTJG(curPlayer): GameWorld.DebugLog("脱机的玩家不处理分流!", curPlayer.GetPlayerID()) return tagLineID - + if GameWorld.IsCrossServer(): + return tagLineID # 非常规地图之间的切换不处理 if curMapID not in PyGameData.g_commMapLinePlayerCountDict or tagMapID not in PyGameData.g_commMapLinePlayerCountDict: return tagLineID @@ -2892,6 +2982,7 @@ PlayerCostRebate.AddCostRebateGold(curPlayer, costType, price, infoDict) # 绝版降临 PlayerFairyCeremony.AddFCCostGold(curPlayer, costType, price) + PlayerNewFairyCeremony.AddFCCostGold(curPlayer, costType, price) # 消费VIP # if costVIPGold < 0: # costVIPGold = price @@ -2982,6 +3073,12 @@ if value < 0: GameWorld.Log('玩家获得金钱异常 , value = %s , priceType = %s ,' % (value, priceType)) return + + if GameWorld.IsCrossServer(): + serverGroupID = GetPlayerServerGroupID(curPlayer) + msgInfo = {"PlayerID":curPlayer.GetPlayerID(), "MoneyType":priceType, "Value":value, "GiveType":giveType, "AddDataDict":addDataDict} + GameWorld.SendMsgToClientServer(ShareDefine.CrossServerMsg_GiveMoney, msgInfo, [serverGroupID]) + return True if priceType == IPY_GameWorld.TYPE_Price_Gold_Money: if curPlayer.GetGold() + value > ChConfig.Def_PlayerTotalMoney_Gold: @@ -3306,22 +3403,57 @@ return int(addPoint) +def GetAllPointByLV(curPlayer): + ##获取当前等级可得到属性点数 + openLV = GameFuncComm.GetFuncLimitLV(ShareDefine.GameFuncID_AddPoint) + curLV = curPlayer.GetLV() + if curLV < openLV: + return 0 + addPointDict = IpyGameDataPY.GetFuncEvalCfg("LVUPAddPoint", 1, {}) + initFreePoint = IpyGameDataPY.GetFuncCfg("LVUPAddPoint", 2) + setFreePoint = initFreePoint + for lv in xrange(openLV, curLV+1): + setFreePoint += GameWorld.GetDictValueByRangeKey(addPointDict, lv, 0) + return setFreePoint + def DoAddPointOpen(curPlayer): '''加点功能开启 处理给自由属性点及老号处理 清除老服玩家未加点的点数(清零),以前加的加点属性不清除,属性不变,战力不减, 根据最新的加点开启等级和老服玩家的当前等级,相差的差值给予玩家对应的加点点数''' beforeFreePoint = curPlayer.GetFreePoint() - addPointDict = IpyGameDataPY.GetFuncEvalCfg("LVUPAddPoint", 1, {}) - initFreePoint = IpyGameDataPY.GetFuncCfg("LVUPAddPoint", 2) - openLV = GameFuncComm.GetFuncLimitLV(ShareDefine.GameFuncID_AddPoint) - setFreePoint = initFreePoint + + setFreePoint = GetAllPointByLV(curPlayer) curLV = curPlayer.GetLV() - for lv in xrange(openLV, curLV+1): - setFreePoint += GameWorld.GetDictValueByRangeKey(addPointDict, lv, 0) addDataDict = {'beforeFreePoint':beforeFreePoint} - DataRecordPack.DR_Freepoint(curPlayer, "AddPointOpen", setFreePoint, addDataDict) curPlayer.SetFreePoint(setFreePoint) + DataRecordPack.DR_Freepoint(curPlayer, "AddPointOpen", setFreePoint, addDataDict) GameWorld.DebugLog(' 加点功能开启处理 beforeFreePoint=%s,curLV=%s, setFreePoint=%s'%(beforeFreePoint, curLV, setFreePoint), curPlayer.GetID()) return + +def FixOldAddPoint(curPlayer): + ##老号加点处理 重置已加点数, + if GameWorld.GetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_VersionFix, ChConfig.Def_VerFix_AddPoint): + return + GameWorld.SetDictValueByBit(curPlayer, ChConfig.Def_Player_Dict_VersionFix, ChConfig.Def_VerFix_AddPoint, 1) + baseSTR, basePNE, basePHY, baseCON = GetPlayerBasePoint(curPlayer.GetJob()) + addPoint = curPlayer.GetFreePoint() + attrInfoDict = {'BaseSTR':baseSTR,'BasePNE':basePNE,'BasePHY':basePHY,'BaseCON':baseCON} + for attrKey, basePoint in attrInfoDict.items(): + addPoint += (getattr(curPlayer, 'Get%s'%attrKey)() - basePoint) + fixFreePoint = GetAllPointByLV(curPlayer) + if addPoint != fixFreePoint: + for attrKey, basePoint in attrInfoDict.items(): + getattr(curPlayer, 'Set%s'%attrKey)(basePoint) + curPlayer.SetFreePoint(fixFreePoint) + #重置天赋 + PlayerGreatMaster.DoResetMasterSkillPoint(curPlayer) + #邮件补偿 + SendMailByKey('PointCompensation', [curPlayer.GetID()], [], goldPaper=200) + + addDataDict = {'beforeTotalPoint':addPoint} + DataRecordPack.DR_Freepoint(curPlayer, "FixOldAddPoint", fixFreePoint, addDataDict) + GameWorld.Log('老号加点处理 重置已加点数 addPoint=%s, fixFreePoint=%s' % (addPoint, fixFreePoint)) + return + #--------------------------------------------------------------------- ## 功能模块战斗力类 @@ -3427,6 +3559,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) # 最大防护值 @@ -3612,7 +3751,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 # 杀怪 @@ -4019,7 +4158,9 @@ PlayerFamilyTech.CalcFamilyTechAttr(curPlayer) PlayerEquipDecompose.RefreshEDAttr(curPlayer) PlayerDogz.RefreshDogzAttr(curPlayer) + EquipZhuXian.CalcZhuXianAttr(curPlayer) PlayerGatherSoul.RefreshGatherSoulAttr(curPlayer) + PlayerCoat.CalcClothesCoatSkinAttr(curPlayer) self.RefreshAllState(isForce=True) GameWorld.DebugLog("End ReCalcAllState!!!") return @@ -4685,6 +4826,8 @@ PlayerBillboard.UpdatePlayerFPTotalBillboard(curPlayer) # 记录开服活动数据 OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_FightPower, totalFightPower) + if beforeFightPower != totalFightPower: + CrossPlayerData.OnPlayerFightPowerChange(curPlayer) return def __RefreshMoveSpeed(self, allAttrListBuffs): @@ -5638,9 +5781,13 @@ def SetFBFuncLineID(curPlayer, funcLineID): return curPlayer.SetExAttr3(funcLineID, False, False) def GetFBFuncLineID(curPlayer): return curPlayer.GetExAttr3() -## 跨服状态: 0-非跨服状态,1-跨服状态 -def GetCrossRealmState(curPlayer): return curPlayer.GetExAttr5() -def SetCrossRealmState(curPlayer, value): curPlayer.SetExAttr5(value, False, True) +## 跨服状态所在地图ID: 0-非跨服状态,非0-跨服状态对应的地图ID +def GetCrossMapID(curPlayer): return curPlayer.GetExAttr5() +def SetCrossMapID(curPlayer, value): + curPlayer.SetExAttr5(value, False, True) + if not value: + CrossPlayerData.ClearCrossSyncDataCache(curPlayer) + return ## 铜钱点, 支持铜钱超20亿 def GetSilver(curPlayer): return curPlayer.GetExAttr6() * ChConfig.Def_PerPointValue + curPlayer.GetSilver() @@ -5665,6 +5812,21 @@ ##聊天气泡框 def GetChatBubbleBox(curPlayer): return curPlayer.GetExAttr10() def SetChatBubbleBox(curPlayer, value): return curPlayer.SetExAttr10(value, False, True) + +## 玩家所属服务器组ID +def GetPlayerServerGroupID(curPlayer): return curPlayer.GetExAttr13() +def UpdPlayerServerGroupID(curPlayer): + # 更新自己的服务器组ID, 跨服服务器不处理 + if GameWorld.IsCrossServer(): + return + serverGroupID = GameWorld.GetServerGroupID() + if not serverGroupID: + return + playerServerGroupID = curPlayer.GetExAttr13() + if playerServerGroupID != serverGroupID: + curPlayer.SetExAttr13(serverGroupID, False, True) + GameWorld.DebugLog("更新玩家所属服务器组ID: serverGroupID=%s" % serverGroupID) + return ##获得玩家威望值 def GetPrestige(curPlayer): return 0 @@ -6437,7 +6599,12 @@ #---当前防护值,需存DB---- def GetProDef(curPlayer): return curPlayer.GetExAttr4() -def SetProDef(curPlayer, value): curPlayer.SetExAttr4(value) +def SetProDef(curPlayer, value): + if GameWorld.IsCrossServer(): + curPlayer.SetExAttr4(value, True) # 跨服服务器需要广播周围玩家 + else: + curPlayer.SetExAttr4(value) + #---最大防护值---- def GetMaxProDef(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_AttrMaxProDef) def SetMaxProDef(curPlayer, value): @@ -6485,6 +6652,18 @@ #---功能层防御值---- def GetFuncDef(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_CopyFuncAttr % (ChConfig.TYPE_Calc_AttrDEF - 1)) def SetFuncDef(curPlayer, value): curPlayer.SetDict(ChConfig.Def_PlayerKey_CopyFuncAttr % (ChConfig.TYPE_Calc_AttrDEF - 1), value) + +#---诛仙一击概率--- +def GetZhuXianRate(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ZhuxianRate) +def SetZhuXianRate(curPlayer, value): + curPlayer.SetDict(ChConfig.Def_PlayerKey_ZhuxianRate, value) + curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_ZhuxianRate, value, False) + +#---诛仙一击伤害百分比--- +def GetZhuXianHurtPer(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ZhuxianHurtPer) +def SetZhuXianHurtPer(curPlayer, value): + curPlayer.SetDict(ChConfig.Def_PlayerKey_ZhuxianHurtPer, value) + curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_ZhuxianHurtPer, value, False) ## 增加天梯竞技场积分 @@ -6674,6 +6853,13 @@ #------------------------------------------------------------------------------- ## 设置玩家字典值, 存库 def NomalDictSetProperty(curPlayer, key, value, dType=0): + if CrossPlayerData.IsNeedProcessCrossPlayer(curPlayer) and key not in \ + [ChConfig.Def_PDict_FightPower_Total, ChConfig.Def_PlayerKey_CrossRegisterMap]: + playerID = curPlayer.GetPlayerID() + changeDict = PyGameData.g_crossPlayerDictChangeInfo.get(playerID, {}) + changeDict[(key, dType)] = value + PyGameData.g_crossPlayerDictChangeInfo[playerID] = changeDict + if value == 0: curPlayer.NomalDictDelProperty(key, dType) return -- Gitblit v1.8.0