From 7e2fba6800afaaeef3ac9d2d3c8c42ebcefd2016 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 05 三月 2019 15:53:48 +0800
Subject: [PATCH] 6328 【后端】优化代码eval
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py | 131 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 115 insertions(+), 16 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 6ffbb43..a5cbd7d 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -76,6 +76,7 @@
import PyGameData
import PlayerMagicWeapon
import GameLogic_SealDemon
+import GameLogic_ZhuXianBoss
import PlayerTJG
import PlayerVip
import PlayerRefineStove
@@ -83,10 +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
@@ -118,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())
@@ -232,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
#---------------------------------------------------------------------
@@ -516,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
@@ -1196,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
##更新保存玩家在线时间
@@ -1574,12 +1602,24 @@
GameWorld.DebugLog("跨服服务器不允许该操作!")
return
- if GetCrossRealmState(curPlayer):
+ 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)
@@ -1671,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
@@ -1741,6 +1789,12 @@
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状态检查
@@ -1766,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：您当前所处的状态不能进行传送!
@@ -2922,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
@@ -3498,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) # 最大防护值
@@ -3683,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
# 杀怪
@@ -3935,7 +4003,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
@@ -4090,6 +4158,7 @@
PlayerFamilyTech.CalcFamilyTechAttr(curPlayer)
PlayerEquipDecompose.RefreshEDAttr(curPlayer)
PlayerDogz.RefreshDogzAttr(curPlayer)
+ EquipZhuXian.CalcZhuXianAttr(curPlayer)
PlayerGatherSoul.RefreshGatherSoulAttr(curPlayer)
PlayerCoat.CalcClothesCoatSkinAttr(curPlayer)
self.RefreshAllState(isForce=True)
@@ -4757,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):
@@ -5685,7 +5756,6 @@
# 通知GsmeServer;
# SendGameServerRefreshState(int inputType, int inputValue)
-# SetExAttr15 ~ 18 对应神兵类型等级，场景特效用
# 禁言 通知gameServer
def SetGMForbidenTalk(curPlayer, value):
@@ -5710,9 +5780,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()
@@ -5752,6 +5826,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
@@ -6578,6 +6658,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)
+
## 增加天梯竞技场积分
# @param curPlayer 玩家实例
@@ -6766,6 +6858,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