SnxxServerCode.git

			@@ -64,27 +64,34 @@
			import PlayerGameEvent
			import EventReport
			import PlayerTeHui
			import GameLogic_XMZZ
			import PlayerGatherSoul
			import PlayerSuccess
			import PlayerPet
			import PlayerGreatMaster
			import ItemControler
			import GameFuncComm
			import PlayerMergeEvent
			import IpyGameDataPY
			import PlayerRune
			import GameLogic_DuJie
			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())
			@@ -162,7 +170,7 @@
			# notifyCnt 代表广播周围玩家的数量，0为全部广播 -1为指定列表随机，其他数字为指定指
			def PyNotifyAll(curPlayer, sendPack, notifySelf=True, notifyCnt=0):
			if notifyCnt == -1:
			notifyCnt = random.choice((10, 10, 15, 15, 20, 25, 30, 50))
			notifyCnt = 8
			#GameWorld.DebugLog("PyNotifyAll %s"%notifyCnt)

			curPlayer.NotifyAll(sendPack.GetBuffer(), sendPack.GetLength(), notifySelf, notifyCnt)
			@@ -229,15 +237,22 @@
			# @param mergeMapInfo 该提示所属的跨服活动地图信息, 主要用于不同子服对应所跨的活动地图ID
			# @return 无返回值
			def WorldNotify(country, msgMark, msgParamList=[], lineID=0, mergeMinOSD=-1, mergeMaxOSD=-1, mergeMapInfo=[]):
			# 如果是跨服服务器，则广播子服
			if GameWorld.IsMergeServer():
			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

			#---------------------------------------------------------------------
			@@ -310,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, ...]
			@@ -320,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: 记录邮件流向用
			'''
			@@ -335,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), {或物品信息字典}, ...]
			# @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

			@@ -353,7 +369,7 @@
			return

			# 跨服服务器不允许发送邮件
			if GameWorld.IsMergeServer():
			if GameWorld.IsCrossServer():
			return

			itemCountDict = {}
			@@ -383,7 +399,7 @@
			for key, itemCnt in itemCountDict.items():
			itemID, isBind = key
			combineItemList.append((itemID, itemCnt, isBind))
			cmdList = [title, content, getDays, playerIDList, combineItemList, gold, goldPaper, silver, detail]
			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

			@@ -513,6 +529,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 +1217,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

			##更新保存玩家在线时间
			@@ -1426,7 +1458,8 @@

			FBLogic.DoPlayerChangeMapLogic(curPlayer, tick)
			#summonList = list()

			#召回宠物
			PetControl.ReCallFightPet(curPlayer)
			#1. 删除自己不需要的召唤兽(火焰之灵等)
			#必须用while, 因为在循环中要删除
			# 召唤兽切地图不带过去
			@@ -1498,6 +1531,11 @@
			#RouteServer未初始化不允许切换地图, 缓存处理
			GameServerRefresh.Set_PlayerRouteServerInitOK_OnLeaveFB(curPlayer, 1)
			return

			GameWorld.Log("PlayerLeaveFB...", curPlayer.GetPlayerID())
			if GameWorld.IsCrossServer():
			CrossRealmPlayer.PlayerExitCrossServer(curPlayer)
			return

			#中立地图回到上一次非中立常规地图
			if curPlayer.GetMapID() in IpyGameDataPY.GetFuncEvalCfg("MapLine", 4):
			@@ -1558,71 +1596,35 @@

			#---------------------------------------------------------------------

			def ResetMergeFBPlayerCntInfo(resetMapID):
			# 重置跨服活动副本地图人数分配情况信息
			mapID = GameWorld.GetMap().GetMapID()
			if mapID != ChConfig.Def_MergeTransMapID:
			return
			GameWorld.Log("重置跨服活动副本地图人数分配情况信息: resetMapID=%s" % resetMapID)
			gameWorld = GameWorld.GetGameWorld()
			mergeFBPlayerCntDict = ReadChConfig.GetEvalChConfig("MergeFBPlayerCount")
			for reqMapID, mapInfo in mergeFBPlayerCntDict.items():
			if resetMapID and resetMapID != reqMapID:
			continue
			for playerMapID in mapInfo[1]:
			playerCnt = gameWorld.GetGameWorldDictByKey(ChConfig.Map_WorldKey_MergeFBMapPlayerCnt % playerMapID)
			for num in xrange(1, 1 + playerCnt):
			playerID = gameWorld.GetGameWorldDictByKey(ChConfig.Map_WorldKey_MergeFBMapPlayerID % (playerMapID, num))
			gameWorld.SetGameWorldDict(ChConfig.Map_WorldKey_MergeFBMapPlayerID % (playerMapID, num), 0) # 重置对应的玩家ID
			gameWorld.SetGameWorldDict(ChConfig.Map_WorldKey_MergeFBPlayerMapID % (reqMapID, playerID), 0) # 重置玩家ID对应的地图
			gameWorld.SetGameWorldDict(ChConfig.Map_WorldKey_MergeFBMapPlayerCnt % playerMapID, 0) # 重置地图人数
			return

			def __GetMergeFBPlayerMapID(curPlayer, reqMapID):
			# 获取玩家所分配的跨服活动地图ID
			# @param reqMapID: 可以是本服活动的地图ID标识；也可以是指定的跨服活动地图ID, 如果是指定的地图ID也是直接返回

			mergeFBPlayerCntDict = ReadChConfig.GetEvalChConfig("MergeFBPlayerCount")
			if reqMapID not in mergeFBPlayerCntDict:
			return reqMapID

			def PlayerEnterCrossServer(curPlayer, mapID):
			playerID = curPlayer.GetPlayerID()
			gameWorld = GameWorld.GetGameWorld()
			GameWorld.Log("玩家请求进入跨服地图: mapID=%s" % (mapID), playerID)
			if GameWorld.IsCrossServer():
			GameWorld.DebugLog("跨服服务器不允许该操作!")
			return

			playerMapID = gameWorld.GetGameWorldDictByKey(ChConfig.Map_WorldKey_MergeFBPlayerMapID % (reqMapID, playerID))
			if playerMapID:
			GameWorld.DebugLog("已经有分配跨服活动地图，直接返回！playerMapID=%s" % (playerMapID), playerID)
			return playerMapID
			if GetCrossMapID(curPlayer):
			GameWorld.ErrLog("玩家当前为跨服状态，不允许再次请求进入跨服!", curPlayer.GetPlayerID())
			return

			# 还没分配该玩家，则开始选择分配的地图ID
			maxPlayerCnt, mapIDList = mergeFBPlayerCntDict[reqMapID]
			minPlayerCount = 0 # 最少的地图玩家人数
			minPlayerMapID = 0 # 最少人数的地图ID
			for mID in mapIDList:
			curMapPlayerCnt = gameWorld.GetGameWorldDictByKey(ChConfig.Map_WorldKey_MergeFBMapPlayerCnt % mID)
			if curMapPlayerCnt < maxPlayerCnt:
			playerMapID = mID
			break

			# 保存最少人数的地图ID信息
			if not minPlayerCount or (minPlayerCount and curMapPlayerCnt < minPlayerCount):
			minPlayerCount = curMapPlayerCnt
			minPlayerMapID = mID
			if not CrossRealmPlayer.IsCrossServerOpen():
			NotifyCode(curPlayer, "CrossMatching18")
			return

			# 如果没有人数未满的活动地图，则分配到人数较少的地图
			if not playerMapID:
			playerMapID = minPlayerMapID

			# 更新分配信息
			if playerMapID:
			mapPlayerCnt = gameWorld.GetGameWorldDictByKey(ChConfig.Map_WorldKey_MergeFBMapPlayerCnt % playerMapID) + 1
			gameWorld.SetGameWorldDict(ChConfig.Map_WorldKey_MergeFBMapPlayerCnt % playerMapID, mapPlayerCnt)
			gameWorld.SetGameWorldDict(ChConfig.Map_WorldKey_MergeFBMapPlayerID % (playerMapID, mapPlayerCnt), playerID)
			gameWorld.SetGameWorldDict(ChConfig.Map_WorldKey_MergeFBPlayerMapID % (reqMapID, playerID), playerMapID)
			GameWorld.Log("分配跨服活动玩家所属地图: plaeyrID=%s,reqMapID=%s,分配MapID=%s,mapPlayerCnt=%s"
			% (playerID, reqMapID, playerMapID, mapPlayerCnt))

			return playerMapID
			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 玩家实例
			@@ -1642,13 +1644,13 @@
			# NotifyCode(curPlayer, 'jiazu_xyj_671654')
			# return

			#跨服活动人数分流处理
			if GameWorld.IsMergeServer():
			reqMapID = mapID
			mapID = __GetMergeFBPlayerMapID(curPlayer, reqMapID)
			if not mapID:
			GameWorld.ErrLog("找不到可分配进入的跨服活动地图ID! reqMapID=%s" % reqMapID)
			return
			# #跨服活动人数分流处理
			# if GameWorld.IsCrossServer():
			# reqMapID = mapID
			# mapID = __GetMergeFBPlayerMapID(curPlayer, reqMapID)
			# if not mapID:
			# GameWorld.ErrLog("找不到可分配进入的跨服活动地图ID! reqMapID=%s" % reqMapID)
			# return

			#过滤封包地图ID
			if not GameWorld.GetMap().IsMapIDExist(mapID):
			@@ -1710,6 +1712,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

			@@ -1774,6 +1784,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状态检查
			@@ -1799,6 +1821,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：您当前所处的状态不能进行传送!
			@@ -1997,16 +2025,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

			#---------------------------------------------------------------------
			@@ -2106,7 +2136,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
			@@ -2845,12 +2876,7 @@
			SetPlayerCurrency(curPlayer, type_Price, curCurrency - price)
			else:
			GameWorld.Log("付费金钱异常 type_Price = %s" % (type_Price), curPlayer.GetPlayerID())
			return False

			#添加跨服操作事件
			if costType in ChConfig.MergeServerCanCostType:
			eventInfo = [type_Price, price, costType, infoDict, quantity, costVIPGold]
			PlayerMergeEvent.AddMSPlayerEvent(curPlayer.GetPlayerID(), PlayerMergeEvent.Def_MSPEvent_PayMoney, eventInfo)
			return False

			#付款以后后续操作
			__PayMoneyAfter(curPlayer, type_Price, price, costType, infoDict, quantity, costVIPGold)
			@@ -2957,6 +2983,7 @@
			PlayerCostRebate.AddCostRebateGold(curPlayer, costType, price, infoDict)
			# 绝版降临
			PlayerFairyCeremony.AddFCCostGold(curPlayer, costType, price)
			PlayerNewFairyCeremony.AddFCCostGold(curPlayer, costType, price)
			# 消费VIP
			# if costVIPGold < 0:
			# costVIPGold = price
			@@ -3047,6 +3074,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:
			@@ -3371,22 +3404,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

			#---------------------------------------------------------------------

			## 功能模块战斗力类
			@@ -3492,6 +3560,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) # 最大防护值
			@@ -3651,10 +3726,6 @@
			#副本获得经验, 无论获得多少经验均需通知, 有些副本逻辑需要通过获得经验时机处理
			if GameWorld.GetMap().GetMapFBType() != IPY_GameWorld.fbtNull:
			FBLogic.OnGetExp(curPlayer, finalAddExp, expViewType)

			# 跨服中获得经验
			if finalAddExp and GameWorld.IsMergeServer():
			PlayerMergeEvent.AddMSPlayerEvent(curPlayer.GetPlayerID(), PlayerMergeEvent.Def_MSPEvent_AddExp, finalAddExp)

			return finalAddExp

			@@ -3681,7 +3752,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

			# 杀怪
			@@ -3851,6 +3922,7 @@

			# 记录玩家升级
			DataRecordPack.DR_PlayerUpgrade(curPlayer, curPlayer.GetLV(), GetPlayerTotalExp(curPlayer), lvUpNeedExp)
			DataRecordPack.Cache_FightPowerChangeInfo(curPlayer, ChConfig.PowerDownType_LVUP, {'lv':curLV})

			self.__DoLVUPAddPoint() # 升级加点
			#self.__DoLvUpAddSkill() # 升级加技能
			@@ -3916,6 +3988,10 @@
			# 升级需要执行的游戏功能处理
			GameFuncComm.DoFuncOpenLogic(curPlayer)
			ChEquip.CalcEquips_OutOfPrint(curPlayer) # 缓存绝版属性
			if aftLV%10 == 0:
			# 控制下刷新次数
			PlayerPet.CalcPetItemAddPlayerAttr(curPlayer) # 宠物有随等级变化的技能

			self.RefreshPlayerAttrState(billboardFunc=PlayerBillboard.UpdatePlayerLVBillboard)
			#放在功能开启后面
			PlayerWorldAverageLv.UpdatePlayerWorldAverageLv(curPlayer)
			@@ -3928,7 +4004,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
			@@ -4083,6 +4159,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
			@@ -4437,7 +4516,14 @@
			curPlayer = self.__Player
			if GetProDefHPPer(curPlayer) == 0:
			return
			SetMaxProDef(curPlayer, curPlayer.GetMaxHP()*GetProDefHPPer(curPlayer)/ChConfig.Def_MaxRateValue)
			maxHP = curPlayer.GetMaxHP()
			proDefPer = GetProDefHPPer(curPlayer)

			#获取策划配置的表格
			GodWeapon4 = IpyGameDataPY.GetFuncCfg("GodWeapon4", 2)
			maxProDef = eval(FormulaControl.GetCompileFormula("GodWeapon4", GodWeapon4))

			SetMaxProDef(curPlayer, int(maxProDef))

			afterMaxProDef = GetMaxProDef(curPlayer)
			addValue = max(0, afterMaxProDef - beforeMaxProDef)
			@@ -4728,17 +4814,21 @@
			mfpInfo.MFPCnt = len(mfpDataList)
			mfpInfo.MFPList = mfpDataList
			NetPackCommon.SendFakePack(curPlayer, mfpInfo)

			beforeFightPower = curPlayer.GetFightPower()
			curPlayer.SetFightPower(totalFightPower, False)
			if totalFightPower < beforeFightPower:
			DataRecordPack.DR_FightPowerChangeInfo(curPlayer, beforeFightPower)
			highestFightPower = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_FightPower_Highest, 0,
			ChConfig.Def_PDictType_FightPower)
			if totalFightPower > highestFightPower:
			NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_FightPower_Highest, totalFightPower,
			ChConfig.Def_PDictType_FightPower)
			GameWorld.DebugLog("总战力: %s, 历史最高战力: %s" % (totalFightPower, highestFightPower))
			GameWorld.DebugLog("总战力: %s, 历史最高战力: %s, beforeFightPower=%s" % (totalFightPower, highestFightPower, beforeFightPower))
			PlayerBillboard.UpdatePlayerFPTotalBillboard(curPlayer)
			# 记录开服活动数据
			OpenServerCampaign.UpdOpenServerCampaignRecordData(curPlayer, ShareDefine.Def_Campaign_Type_FightPower, totalFightPower)
			if beforeFightPower != totalFightPower:
			CrossPlayerData.OnPlayerFightPowerChange(curPlayer)
			return

			def __RefreshMoveSpeed(self, allAttrListBuffs):
			@@ -4898,7 +4988,7 @@
			}

			for i in xrange(1, ChConfig.Def_Calc_AllAttrType_MAX):
			if i in [ChConfig.TYPE_Calc_AttrHP, ChConfig.TYPE_Calc_AttrMP]:
			if i in [ChConfig.TYPE_Calc_AttrHP, ChConfig.TYPE_Calc_AttrMP, ChConfig.TYPE_Calc_ProDef]:
			continue
			value = 0 if i not in initAttrDict else initAttrDict[i]
			EffGetSet.SetValueByEffIndex(curPlayer, i, value)
			@@ -5667,7 +5757,6 @@
			# ֪ͨGsmeServer;
			# SendGameServerRefreshState(int inputType, int inputValue)

			# SetExAttr15 ~ 18 对应神兵类型等级，场景特效用

			# 禁言通知gameServer
			def SetGMForbidenTalk(curPlayer, value):
			@@ -5692,6 +5781,14 @@
			def SetFBFuncLineID(curPlayer, funcLineID): return curPlayer.SetExAttr3(funcLineID, False, False)
			def GetFBFuncLineID(curPlayer): return curPlayer.GetExAttr3()

			## 跨服状态所在地图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()
			def SetSilver(curPlayer, totalSilver):
			@@ -5705,6 +5802,7 @@

			## 玩家今日已获得仙缘币
			def GetTodayXianyuanCoin(curPlayer): return curPlayer.GetExAttr11()
			def SetTodayXianyuanCoin(curPlayer, value): return curPlayer.SetExAttr11(value, False, True)
			def AddTodayXianyuanCoin(curPlayer, addValue): return curPlayer.SetExAttr11(curPlayer.GetExAttr11() + addValue, False, True)

			##VIP到期时间, 需要同步GameServer
			@@ -5714,6 +5812,27 @@
			##聊天气泡框
			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

			##影响外观的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
			@@ -5810,10 +5929,6 @@

			SetZhenQi(curPlayer, value)
			#EventReport.WriteEvent_add_zhenqi(curPlayer, eventName, eventData, addValue, value)

			if GameWorld.IsMergeServer():
			eventInfo = [addValue, eventName, eventData]
			PlayerMergeEvent.AddMSPlayerEvent(curPlayer.GetPlayerID(), PlayerMergeEvent.Def_MSPEvent_AddZhenQi, eventInfo)
			return True


			@@ -5905,19 +6020,6 @@
			def SetLongMaiLV(curPlayer, value):
			return
			#---------------------------------------------------------------------------
			## 设置玩家跨服预赛排位
			# @param curPlayer: 玩家实例
			# @param value: 威望值
			# @return:
			def SetMergeWarRank(curPlayer, value):
			return


			## 获取玩家跨服预赛排位
			# @param curPlayer: 玩家实例
			# @return: 威望值
			def GetMergeWarRank(curPlayer):
			return 0

			##获取可免费开启的格子数
			# @param curPlayer 玩家对象
			@@ -6503,7 +6605,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):
			@@ -6526,11 +6633,13 @@
			def GetPetMaxAtk(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_AttrPetMaxAtk)
			def SetPetMaxAtk(curPlayer, value): curPlayer.SetDict(ChConfig.Def_PlayerKey_AttrPetMaxAtk, value)

			#---宠物伤害百分比提升----
			def GetPetDamPer(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_AttrPetDamPer)
			def SetPetDamPer(curPlayer, value):
			curPlayer.SetDict(ChConfig.Def_PlayerKey_AttrPetDamPer, value)
			curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_PetDamPer, value, False)
			#---宠物伤害百分比提升----移到GameObj下
			#===============================================================================
			# def GetPetDamPer(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_AttrPetDamPer)
			# def SetPetDamPer(curPlayer, value):
			# curPlayer.SetDict(ChConfig.Def_PlayerKey_AttrPetDamPer, value)
			# curPlayer.SendPropertyRefresh(ShareDefine.CDBPlayerRefresh_PetDamPer, value, False)
			#===============================================================================
			#---宠物技能伤害百分比提升----
			def GetPetSkillAtkRate(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_PetSkillAtkRate)
			def SetPetSkillAtkRate(curPlayer, value): curPlayer.SetDict(ChConfig.Def_PlayerKey_PetSkillAtkRate, value)
			@@ -6549,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)


			## 增加天梯竞技场积分
			@@ -6738,6 +6859,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