SnxxServerCode.git

			@@ -74,6 +74,7 @@
			import PlayerMagicWeapon
			import GameLogic_SealDemon
			import GameLogic_ZhuXianBoss
			import GameLogic_CrossDemonKing
			import PlayerTJG
			import PlayerVip
			import PlayerRefineStove
			@@ -1586,9 +1587,12 @@

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

			def PlayerEnterCrossServer(curPlayer, mapID):
			def PlayerEnterCrossServer(curPlayer, mapID, lineID):
			playerID = curPlayer.GetPlayerID()
			GameWorld.Log("玩家请求进入跨服地图: mapID=%s" % (mapID), playerID)
			GameWorld.Log("玩家请求进入跨服地图: mapID=%s,lineID=%s" % (mapID, lineID), playerID)
			if mapID not in ChConfig.Def_CrossMapIDList:
			return

			if GameWorld.IsCrossServer():
			GameWorld.DebugLog("跨服服务器不允许该操作!")
			return
			@@ -1611,6 +1615,30 @@

			if PlayerState.IsInPKState(curPlayer):
			NotifyCode(curPlayer, "SingleEnterPK", [mapID])
			return

			tick = GameWorld.GetGameWorld().GetTick()
			for mapIDList in ChConfig.Def_FB_MapID.values():
			if mapID not in mapIDList:
			continue
			if not FBLogic.OnEnterFBEvent(curPlayer, mapID, lineID, tick):
			NotifyCode(curPlayer, "SingleEnterDefaul")
			return
			break

			# 需要动态分布线路的地图，发送到跨服服务器进行分配
			if mapID in ChConfig.Def_CrossDynamicLineMap:
			extendInfo = {}
			if mapID == ChConfig.Def_FBMapID_CrossDemonKing:
			bossID = GameLogic_CrossDemonKing.GetCurFBLineBOSSID(lineID)
			if not bossID:
			return
			extendInfo["BossID"] = bossID

			msgDict = {"PlayerID":curPlayer.GetPlayerID(), "DataMapID":mapID, "FuncLineID":lineID}
			if extendInfo:
			msgDict.update(extendInfo)
			GameWorld.SendMsgToCrossServer(ShareDefine.ClientServerMsg_EnterFB, msgDict)
			return

			GY_Query_CrossRealmReg.RegisterEnterCrossServer(curPlayer, mapID)
			@@ -1709,6 +1737,9 @@
			if enterCnt >= FBCommon.GetEnterFBMaxCnt(curPlayer, ChConfig.Def_FBMapID_ZhuXianBoss):
			if curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_ZhuXianBossHelpCnt):
			extendParamList = [bossID, curPlayer.GetFamilyID()]
			elif mapID == ChConfig.Def_FBMapID_DemonKing:
			bossID = GameLogic_CrossDemonKing.GetCurFBLineBOSSID(lineID)
			extendParamList = [bossID]

			SendToGameServerEnterFB(curPlayer, mapID, lineID, tick, extendParamList)
			return
			@@ -3398,16 +3429,21 @@
			curLV = curPlayer.GetLV()
			if curLV < openLV:
			return 0
			# 初始点+升级点+境界点
			setFreePoint = IpyGameDataPY.GetFuncCfg("LVUPAddPoint", 2)

			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)
			for rangLVs, point in addPointDict.items():
			if curLV < rangLVs[0]:
			continue
			setFreePoint += point * (min(curLV, rangLVs[1]) - rangLVs[0] + 1)

			#境界提升点数
			setFreePoint += curPlayer.GetOfficialRank() * IpyGameDataPY.GetFuncCfg("LVUPAddPoint", 3)
			return setFreePoint

			def DoAddPointOpen(curPlayer):
			'''加点功能开启处理给自由属性点及老号处理
			清除老服玩家未加点的点数（清零），以前加的加点属性不清除，属性不变，战力不减，根据最新的加点开启等级和老服玩家的当前等级，相差的差值给予玩家对应的加点点数'''
			'''加点功能开启'''
			beforeFreePoint = curPlayer.GetFreePoint()

			setFreePoint = GetAllPointByLV(curPlayer)
			@@ -3617,6 +3653,9 @@
			# @remarks 玩家升级加点 2010-05-26 adaws修改原来有加技能点现将升级加技能提出
			def __DoLVUPAddPoint(self):
			curPlayer = self.__Player
			if not GameFuncComm.GetFuncCanUse(curPlayer, ShareDefine.GameFuncID_AddPoint):
			# 未开启前不可加点，因为DoAddPointOpen会一次性补齐，避免意外情况多加了点数
			return

			curFreePoint = curPlayer.GetFreePoint()
			addPoint = GetLvUp_AddPoint(curPlayer)
			@@ -4028,8 +4067,10 @@
			pointFuncInfo[1](curPlayer, curPQLV)
			if not curPQLV:
			continue
			pqAttrID = ipyData.GetPointQualityAttrID()
			pqAttrValueList = ipyData.GetPointQualityAttrValueList()
			pqAttrIDDict = ipyData.GetPointQualityAttrIDDict()
			pqAttrID = pqAttrIDDict[curPlayer.GetJob()]
			pqAttrValueDict = ipyData.GetPointQualityAttrValueDict()
			pqAttrValueList = pqAttrValueDict[str(curPlayer.GetJob())]
			pqAttrValue = 0 if curPQLV > len(pqAttrValueList) else pqAttrValueList[curPQLV - 1]
			CalcAttrDict_Type(pqAttrID, pqAttrValue, lingGenQualityAttrList)
			#GameWorld.DebugLog(" 属性点(%s)品阶等级属性: curPQLV=%s,pqAttrID=%s,pqAttrValue=%s" % (pointAttrID, curPQLV, pqAttrID, pqAttrValue))
			@@ -6549,6 +6590,19 @@
			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 GetNormalHurt(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_NormalHurt)
			def SetNormalHurt(curPlayer, value): curPlayer.SetDict(ChConfig.Def_PlayerKey_NormalHurt, value)
			#普通攻击加成：普通攻击附加的伤害百分比
			def GetNormalHurtPer(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_NormalHurtPer)
			def SetNormalHurtPer(curPlayer, value): curPlayer.SetDict(ChConfig.Def_PlayerKey_NormalHurtPer, value)
			#法宝技能增伤：法宝技能攻击附加的固定值伤害
			def GetFabaoHurt(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_FabaoHurt)
			def SetFabaoHurt(curPlayer, value): curPlayer.SetDict(ChConfig.Def_PlayerKey_FabaoHurt, value)
			#法宝技能加成：法宝技能攻击附加的伤害百分比
			def GetFabaoHurtPer(curPlayer): return curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_FabaoHurtPer)
			def SetFabaoHurtPer(curPlayer, value): curPlayer.SetDict(ChConfig.Def_PlayerKey_FabaoHurtPer, value)

			## 计算功能背包物品属性
			# @param curPlayer 当前玩家
			# @param packType 背包类型