SnxxServerCode.git

			@@ -717,9 +717,27 @@
			continue
			npcObj.StopMove()
			npcObj.ChangePos(npcPos.PosX, npcPos.PosY)

			BeatBackMove(curPlayer, npcObj)
			return

			# 针对NPC被推出远距离一直卡墙角问题，法宝挑战副本特殊处理为超过4米 NPC自动回退一些
			def BeatBackMove(curPlayer, npcObj):
			if GameWorld.GetMap().GetMapID() != ChConfig.Def_FBMapID_MagicWeapon:
			return
			if npcObj.GetCurAction() == IPY_GameWorld.laNPCSkillWarning:
			return

			posMap = npcObj.GetRefreshPosAt(npcObj.GetCurRefreshPointIndex())
			#范围校验
			posMapX = posMap.GetPosX()
			posMapY = posMap.GetPosY()
			if GameWorld.GetDist(npcObj.GetPosX(), npcObj.GetPosY(), posMapX, posMapY) < 8:
			# 单次位移不超过5米
			return
			npcControl = NPCCommon.NPCControl(npcObj)
			moveDestX, moveDestY = npcControl.GetMoveNearPosEx(posMapX, posMapY, 5)
			npcObj.Move(moveDestX, moveDestY)
			return

			#===============================================================================
			# //B4 03 吸引NPC仇恨 #tagNPCAttention
			@@ -1340,6 +1358,10 @@
			if curPlayer.GetHP() <= 0:
			return

			if curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_ClientCustomScene):
			#GameWorld.DebugLog("自定义场景中，不检查!")
			return True

			#===========================================================================
			# if curPlayer.IsMoving():
			# GameWorld.DebugLog("移动中不可使用技能")
			@@ -1848,7 +1870,7 @@
			#获得技能等级
			curSkillLV = curSkill.GetSkillLV()
			DataRecordPack.DR_LearnORUPSkill(curPlayer, curSkillID, curSkillLV)
			EventShell.EventRespons_SkillUp(curPlayer, curSkill.GetFuncType())
			EventShell.EventRespons_SkillUp(curPlayer, curSkill.GetFuncType(), curSkillLV)
			GameWorld.Log("升级技能名 = %s 成功, 当前等级 = %s"%(curSkill.GetSkillName(), curSkill.GetSkillLV()), curPlayer.GetPlayerID())
			return True

			@@ -2042,6 +2064,8 @@

			## 获取技能升级属性需求 rutrun attrID, attrvalue
			def GetSkillUpNeedAttr(stateSkillLV):return stateSkillLV /100000, stateSkillLV%100000
			## 获取技能专精类型
			def GetSkillElementType(curSkill): return curSkill.GetStateSkillLV() /100000

			#// A5 16 选择技能五行专精 #tagCMSelectSkillElement
			#
			@@ -2049,6 +2073,7 @@
			#{
			# tagHead Head;
			# DWORD SkillTypeID; // 专精技能ID
			# BYTE DoType; // 0-激活升级 1-使用
			#};
			def OnSelectSkillElement(index, clientData, tick):
			curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
			@@ -2066,51 +2091,64 @@
			if not mainSkill:
			GameWorld.DebugLog('主技能未学习，无法选专精mainSkillID=%s'%mainSkillID)
			return
			doType = clientData.DoType
			curElementSkillID = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SkillElementID % mainSkillID)
			activeSkillLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SkillElementLV % selectSkillID)
			#先判断是否可升级
			updSelectSkillLV = activeSkillLV
			nextSkill = GameWorld.GetGameData().FindSkillByType(selectSkillID, activeSkillLV + 1)
			if nextSkill:
			if CheckLearnSkillNeedAttr(curPlayer, nextSkill):
			updSelectSkillLV = activeSkillLV + 1
			isChangeSkill = False #是否变更生效的技能
			if updSelectSkillLV != activeSkillLV:
			updSelectSkillLV = activeSkillLV
			#先判断是否可升级
			if doType is 0:
			nextSkill = GameWorld.GetGameData().FindSkillByType(selectSkillID, activeSkillLV + 1)
			if not nextSkill:
			return

			if not CheckLearnSkillNeedAttr(curPlayer, nextSkill):
			return
			updSelectSkillLV = activeSkillLV + 1
			skillElementType = GetSkillElementType(nextSkill)

			#可升级则激活升一级
			EventShell.EventRespons_ElementSkill(curPlayer, mainSkillID, skillElementType, updSelectSkillLV)
			PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_SkillElementLV % selectSkillID, updSelectSkillLV)
			if curElementSkillID == selectSkillID:
			#正在使用的专精技能，则立即生效
			isChangeSkill = True
			elif selectSkillID != curElementSkillID:
			else: # 使用
			if not activeSkillLV:
			#未激活不能使用
			return
			if selectSkillID == curElementSkillID:
			return
			isChangeSkill = True


			if isChangeSkill:
			#更换专精
			if not RefreshElementSkill(curPlayer, selectSkillID):
			if not RefreshElementSkill(curPlayer, selectSkillID)[1]:
			GameWorld.DebugLog('更换专精不成功 selectSkillID=%s'%selectSkillID)
			return

			PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_SkillElementID % mainSkillID, selectSkillID)
			if curElementSkillID:
			if curElementSkillID != selectSkillID:
			#原技能删除
			skillManager.DeleteSkillBySkillTypeID(curElementSkillID)
			else:
			EventShell.EventRespons_ElementSkill(curPlayer)
			if curElementSkillID and curElementSkillID != selectSkillID:
			#原技能删除
			skillManager.DeleteSkillBySkillTypeID(curElementSkillID)


			# 重刷被动技能
			PassiveBuffEffMng.GetPassiveEffManager().RegistPassiveEff(curPlayer)
			# 重刷技能战力
			PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
			curControl = PlayerControl.PlayerControl(curPlayer)
			curControl.RefreshAllSkill()
			curControl.RefreshPlayerAttrState()

			NotifyElementSkillInfo(curPlayer, mainSkillID, selectSkillID if updSelectSkillLV != activeSkillLV else 0)
			return

			def RefreshElementSkill(curPlayer, skillTypeID):
			def RefreshElementSkill(curPlayer, skillTypeID, isChangeLV=True):
			##更新专精技能生效的等级
			isNotify, hasChangeLV = False, False
			__InitElementSkillInfo()
			if skillTypeID not in PyGameData.g_elemntSkillDict:
			return
			return isNotify, hasChangeLV
			baseAttrDict = {
			ShareDefine.Def_Effect_Metal:PlayerControl.GetMetal(curPlayer),
			ShareDefine.Def_Effect_Wood:PlayerControl.GetWood(curPlayer),
			@@ -2130,13 +2168,16 @@
			break
			if activeSkillLV > updSkillLV:
			PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_SkillElementLV % skillTypeID, updSkillLV)
			isNotify = True
			updSkillLV = min(updSkillLV, activeSkillLV) #不可超过激活的等级
			skillManager = curPlayer.GetSkillManager()
			curSkill = skillManager.FindSkillBySkillTypeID(skillTypeID)
			curSkillLV = curSkill.GetSkillLV() if curSkill else 0
			#GameWorld.DebugLog('更新专精技能生效的等级 skillTypeID=%s,curSkillLV=%s,activeSkillLV=%s,updSkillLV=%s'%(skillTypeID, curSkillLV, activeSkillLV, updSkillLV))
			if not isChangeLV:
			return isNotify, hasChangeLV
			if updSkillLV == curSkillLV:
			return
			return isNotify, hasChangeLV
			elif updSkillLV < curSkillLV:
			skillManager.DeleteSkillBySkillTypeID(skillTypeID)
			for _ in xrange(updSkillLV):
			@@ -2145,16 +2186,17 @@
			ipyData = IpyGameDataPY.GetIpyGameData('SkillElement', skillTypeID)
			mainSkillID = ipyData.GetMainSkillID()
			PlayerControl.NomalDictSetProperty(curPlayer, ChConfig.Def_PDict_SkillElementID % mainSkillID, 0)
			isNotify = True
			else:
			for _ in xrange(updSkillLV-curSkillLV):
			skillManager.LVUpSkillBySkillTypeID(skillTypeID)
			return True
			return isNotify, True

			def RefreshElementSkillByAttr(curPlayer, attrIDList):
			#加点、丹药、境界、洗点会影响灵根点
			__InitElementSkillInfo()

			needRefreshSkillIDList = []
			needRefreshSkillIDDict = {} #{skillid:是否变更技能等级}
			skillManager = curPlayer.GetSkillManager()
			for i in xrange(skillManager.GetSkillCount()):
			hasSkill = skillManager.GetSkillByIndex(i)
			@@ -2162,6 +2204,7 @@
			ipyDataList = IpyGameDataPY.GetIpyGameDataByCondition('SkillElement', {'MainSkillID':hasSkillID}, True, False)
			if not ipyDataList:
			continue
			curSelectSkillID = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SkillElementID % hasSkillID)
			for ipyData in ipyDataList:
			curElementSkillID = ipyData.GetElementSkillID()
			if curElementSkillID not in PyGameData.g_elemntSkillDict:
			@@ -2169,34 +2212,50 @@
			attrID = GetSkillUpNeedAttr(PyGameData.g_elemntSkillDict[curElementSkillID][0])[0]
			if attrID not in attrIDList:
			continue
			needRefreshSkillIDList.append(curElementSkillID)
			needRefreshSkillIDDict[curElementSkillID] = curSelectSkillID == curElementSkillID

			#GameWorld.DebugLog('属性点变更刷新专精attrIDList=%s,needRefreshSkillIDList=%s'%(attrIDList,needRefreshSkillIDList))
			isRefresh = False
			for skillID in needRefreshSkillIDList:
			if RefreshElementSkill(curPlayer, skillID):
			needNotify, isRefresh = False, False
			for skillID, isChangeLV in needRefreshSkillIDDict.items():
			isNotify, hasChangeLV = RefreshElementSkill(curPlayer, skillID, isChangeLV)
			if isNotify:
			needNotify = True
			if hasChangeLV:
			isRefresh = True
			if isRefresh:
			# 重刷被动技能
			PassiveBuffEffMng.GetPassiveEffManager().RegistPassiveEff(curPlayer)
			# 重刷技能战力
			PlayerControl.PlayerControl(curPlayer).RefreshPlayerAttrState()
			NotifyElementSkillInfo(curPlayer)
			curControl = PlayerControl.PlayerControl(curPlayer)
			curControl.RefreshAllSkill()
			curControl.RefreshPlayerAttrState()
			if needNotify:
			NotifyElementSkillInfo(curPlayer)
			return

			def GetElementSkillCnt(curPlayer):
			def GetElementSkillCnt(curPlayer, mainSkillIDList, activeLV, elementType=0):
			##获取已选择的专精技能数量
			# @param elementType: 专精类型，对应灵根ID
			gameData = GameWorld.GetGameData()
			cnt = 0
			skillManager = curPlayer.GetSkillManager()
			for i in xrange(skillManager.GetSkillCount()):
			hasSkill = skillManager.GetSkillByIndex(i)
			hasSkillID = hasSkill.GetSkillTypeID()
			ipyData = IpyGameDataPY.GetIpyGameDataByCondition('SkillElement', {'MainSkillID':hasSkillID}, False, False)
			if not ipyData:
			if hasSkillID not in mainSkillIDList:
			continue
			curElementSkillID = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SkillElementID % hasSkillID)
			if not curElementSkillID:
			ipyDataList = IpyGameDataPY.GetIpyGameDataByCondition('SkillElement', {'MainSkillID':hasSkillID}, True, False)
			if not ipyDataList:
			continue
			cnt +=1
			for ipyData in ipyDataList:
			elementSkillID = ipyData.GetElementSkillID()
			if elementType:
			elementSkillData = gameData.GetSkillBySkillID(elementSkillID)
			if GetSkillElementType(elementSkillData) != elementType:
			continue
			curActiveLV = curPlayer.NomalDictGetProperty(ChConfig.Def_PDict_SkillElementLV % elementSkillID)
			if curActiveLV >= activeLV:
			cnt += 1
			return cnt

			def __InitElementSkillInfo():
			@@ -2719,10 +2778,12 @@
			if callFunc:
			callFunc(objDetel, curEffect, allAttrList[index], curBuff)

			# 持续性属性变化的buff，目前只有持续减益
			callFunc = GameWorld.GetExecFunc(GameBuffs, "BuffProcess_%s.%s"%(moduleSuffix, "OnCalcBuffEx"))
			if callFunc:
			callFunc(objDetel, curEffect, allAttrList[index], curBuff)
			#是否持续性技能
			if curBuff and curBuff.GetSkill().GetSkillType() in ChConfig.Def_LstBuff_List:
			# 持续性属性变化的buff，目前只有持续减益
			callFunc = GameWorld.GetExecFunc(GameBuffs, "BuffProcess_%s.%s"%(moduleSuffix, "OnCalcBuffEx"))
			if callFunc:
			callFunc(objDetel, curEffect, allAttrList[index], curBuff)
			return

			## 获得buff效果的计算模块文件后缀
			@@ -3479,6 +3540,7 @@
			# return True

			if isEnhanceSkill:
			BaseAttack.OnHurtTypeTriggerPassiveSkill(attacker, defender, curSkill, tick)
			return True

			#在这边调用避免群攻时多次扣除消耗
			@@ -3611,7 +3673,7 @@
			return

			#---------------------------------------------------------------------
			# 获得关联技能,0 全部 1是主动型技能（法宝，普攻）其他技能ID
			# 获得关联技能,0 全部 1是主动型技能（法宝，普攻） 2 为人族法宝技能 3为普攻其他技能ID
			def GetConnectSkillID(curSkill):
			return curSkill.GetExAttr1()

			@@ -3750,6 +3812,23 @@



			## 获取某类型技能达到X等级的个数
			# @param curPlayer
			# @return
			def GetSkillCntByFunc(curPlayer, funcType, skilllv=0):
			allSkillCnt = 0
			skillManager = curPlayer.GetSkillManager()
			for i in xrange(skillManager.GetSkillCount()):
			curPlayerSkill = skillManager.GetSkillByIndex(i)
			if curPlayerSkill == None:
			continue
			if curPlayerSkill.GetFuncType() != funcType:
			continue
			if curPlayerSkill.GetSkillLV() >= skilllv:
			allSkillCnt += 1

			return allSkillCnt

			## 获取技能总等级
			# @param curPlayer
			# @return allSkillLV:总技能等级
			@@ -3764,7 +3843,4 @@
			continue
			skillLV = curPlayerSkill.GetSkillLV()
			allSkillLV += skillLV

			return allSkillLV