SnxxServerCode.git

			@@ -2663,22 +2663,6 @@
			return playerlist

			#---------------------------------------------------------------------
			##转变付费货币类型
			# @param curPlayer 玩家实例
			# @param moneyType 货币类型 1表示金子，2表示金票，3表示银子，4表示银票, 5:金子/金票 6:银子/银票
			# @return 返回值, 货币类型
			# @remarks 转变付费货币类型
			def ChangeMoneyType(curPlayer, moneyType):
			# if moneyType == 5:
			# return curPlayer.GetUseGoldType()
			#
			# if moneyType == 6:
			# return curPlayer.GetUseSilverType()
			if moneyType not in ChConfig.Def_MoneyType_All:
			GameWorld.ErrLog("金钱类型填写错误 %s" % moneyType)

			return moneyType
			#---------------------------------------------------------------------
			##获取玩家货币数
			# @param curPlayer 玩家实例
			# @param TYPE_Price ,货币类型
			@@ -2887,6 +2871,9 @@
			GameWorld.Log('###---扣钱异常 = %s' % (price), curPlayer.GetPlayerID())
			return False

			if type_Price == IPY_GameWorld.TYPE_Price_Gold_Paper:
			type_Price = IPY_GameWorld.TYPE_Price_Gold_Money #新版无绑玉，原先绑玉再仙玉的扣法改成扣仙玉 2019/6/3

			#金子支付
			if type_Price == IPY_GameWorld.TYPE_Price_Gold_Money:
			curPlayerGold = curPlayer.GetGold()
			@@ -3155,13 +3142,13 @@
			GiveMoney(curPlayer, ShareDefine.TYPE_Price_BourseMoney, value)
			addDataDict["BourseMoney"] = GetMoney(curPlayer, ShareDefine.TYPE_Price_BourseMoney)

			elif priceType == IPY_GameWorld.TYPE_Price_Gold_Paper:
			if curPlayer.GetGoldPaper() + value > ChConfig.Def_PlayerTotalMoney_Gold:
			#超过金钱上限
			NotifyCode(curPlayer, "MoneyIsFull", [priceType])
			return

			curPlayer.SetGoldPaper(curPlayer.GetGoldPaper() + value)
			# elif priceType == IPY_GameWorld.TYPE_Price_Gold_Paper:
			# if curPlayer.GetGoldPaper() + value > ChConfig.Def_PlayerTotalMoney_Gold:
			# #超过金钱上限
			# NotifyCode(curPlayer, "MoneyIsFull", [priceType])
			# return
			#
			# curPlayer.SetGoldPaper(curPlayer.GetGoldPaper() + value)

			elif priceType == IPY_GameWorld.TYPE_Price_Silver_Money:
			# 金钱支持超过20亿, 暂不做上限控制
			@@ -3191,7 +3178,8 @@
			PlayerSuccess.DoAddSuccessProgress(curPlayer, ShareDefine.SuccType_GetRealmPoint, value)
			EventShell.EventRespons_GetRealmPoint(curPlayer)
			else:
			GameWorld.Log("金钱类型错误, priceType = %s" % (priceType), curPlayer.GetPlayerID())
			GameWorld.ErrLog("金钱类型错误, priceType=%s,value=%s,giveType=%s" % (priceType, value, giveType), curPlayer.GetPlayerID())
			DataRecordPack.DR_GiveMoneyError(curPlayer, priceType, value, giveType, addDataDict)
			return

			if isSysHint and priceType != ShareDefine.TYPE_Price_BourseMoney:
			@@ -4069,7 +4057,7 @@
			PlayerGreatMaster.Sync_GreatMasterFreeSkillPoint(curPlayer)
			# 升级需要执行的游戏功能处理
			GameFuncComm.DoFuncOpenLogic(curPlayer)
			#ChEquip.CalcEquips_OutOfPrint(curPlayer) # 缓存绝版属性
			ChEquip.RefreshPlayerLingQiEquipAttr(curPlayer) # 灵器属性会随等级成长
			if aftLV%10 == 0:
			# 控制下刷新次数
			PlayerPet.CalcPetItemAddPlayerAttr(curPlayer) # 宠物有随等级变化的技能
			@@ -4259,7 +4247,6 @@
			ChEquip.RefreshPlayerEquipAttribute(curPlayer)
			ChEquip.RefreshPlayerLingQiEquipAttr(curPlayer)
			#SkillShell.RefreshPlayerBuffOnAttrAddEffect(curPlayer)
			#PlayerWing.CalcWingAttr(curPlayer) # 翅膀暂时算在灵器里面
			PlayerHorse.CalcHorseAttrEx(curPlayer)
			PlayerPrestigeSys.CalcOfficialRankAttr(curPlayer)
			PlayerGodWeapon.CalcGodWeaponAttr(curPlayer)
			@@ -4458,6 +4445,8 @@
			# 3.1 战斗属性层级交叉影响基值数值汇总
			# 基础层级(角色基础属性)
			baseAttrList = AddAttrListValue([funcAttrInfoList[ChConfig.Def_CalcAttrFunc_RoleBase],
			funcAttrInfoList[ChConfig.Def_CalcAttrFunc_LingGen],
			funcAttrInfoList[ChConfig.Def_CalcAttrFunc_LingGenQuailty],
			])
			#GameWorld.DebugLog("基础层级: %s" % baseAttrList)

			@@ -4474,7 +4463,6 @@
			ChConfig.TYPE_Calc_StoneBasePer:funcAttrInfoList[ChConfig.Def_CalcAttrFunc_Stone],
			ChConfig.TYPE_Calc_RealmBasePer:funcAttrInfoList[ChConfig.Def_CalcAttrFunc_Prestige],
			ChConfig.TYPE_Calc_HorseAtkPer:funcAttrInfoList[ChConfig.Def_CalcAttrFunc_Horse],
			ChConfig.TYPE_Calc_WingHPPer:funcAttrInfoList[ChConfig.Def_CalcAttrFunc_Wing],
			}
			# 3.2 统计各功能之间非线性属性交叉影响累加
			funcCrossAttrPerInfoDict = {} # 百分比交叉影响所提升的属性值 {功能属性编号:{提升的属性类型:数值, ...}, ...}
			@@ -4510,7 +4498,7 @@
			# 3.3 统计所有功能固定属性影响累加
			allFixAttrDict = {} # 固定属性层级总属性基值
			for funcIndex, funcAttrList in enumerate(funcAttrInfoList):
			# 技能模块不算计入功能固定属性、不计战力
			# 技能模块不计入功能固定属性、不计战力
			if funcIndex in ChConfig.CalcAttrFuncSkillList:
			continue
			AddAttrDictValue(allFixAttrDict, funcAttrList[ChConfig.CalcAttr_Battle])
			@@ -4541,6 +4529,9 @@
			mfpAttrList = [{} for _ in range(4)]
			mfpAttrExDict = {}
			for funcIndex in attrFuncIndexList:
			if funcIndex in ChConfig.CalcAttrFuncSkillList:
			# 技能模块不计入功能固定属性、不计战力
			continue
			funcAttrList = funcAttrInfoList[funcIndex]
			funcInsidePerAttrDict = funcInsidePerAttrList[funcIndex] # 功能点内部百分比加成属性
			funcCrossPerAttrDict = funcCrossAttrPerInfoDict.get(funcIndex, {}) # 功能点交叉百分比加成属性
			@@ -4551,7 +4542,7 @@
			CalcLineEffect.ChangePlayerAttrInLineEffectList(curPlayer, funcCrossPerAttrDict)
			CalcLineEffect.ChangePlayerAttrInLineEffectList(curPlayer, fixPerAttrDict)
			# 不算战力的
			if funcIndex in ChConfig.CalcAttrFuncNoFightPowerList or funcIndex in ChConfig.CalcAttrFuncSkillList:
			if funcIndex in ChConfig.CalcAttrFuncNoFightPowerList:
			continue
			mfpAttrList = AddAttrListValue([mfpAttrList, funcAttrList])
			AddAttrDictValue(mfpAttrExDict, funcInsidePerAttrDict)
			@@ -4680,12 +4671,12 @@
			# 速度特殊处理计算一次
			self.__RefreshMoveSpeed(allAttrListBuffs)

			# GM测试属性特殊逻辑
			self.__DoRefreshGMAttr()

			# 刷新攻击速度
			self.__SetAtkInterval()
			GameWorld.DebugLog("Buff层属性: %s" % allAttrListBuffs)

			# GM测试属性特殊逻辑
			self.__DoRefreshGMAttr()
			return

			def __DoRefreshGMAttr(self):
			@@ -4738,8 +4729,8 @@
			setAttrDict[ChConfig.AttrName_Def] = int(lvIpyData.GetReDef() * attrPer) # 防御
			setAttrDict[ChConfig.AttrName_Hit] = int(lvIpyData.GetReHit() * attrPer) # 命中
			setAttrDict[ChConfig.AttrName_DefRate] = int(lvIpyData.GetReMiss() * attrPer) # 闪避
			setAttrDict[ChConfig.AttrName_AtkSpeed] = int(lvIpyData.GetReAtkSpeed() * attrPer) # 攻击速度
			setAttrDict[ChConfig.AttrName_SkillAtkRate] = int(lvIpyData.GetReSkillAtkRate() * attrPer) # 技能伤害比例
			setAttrDict[ChConfig.AttrName_AtkSpeed] = int((lvIpyData.GetReAtkSpeed() + 10000) * attrPer) # 攻击速度, 策划等级表配置的是附加值，所以这里要加
			setAttrDict[ChConfig.AttrName_SkillAtkRate] = int(max(0, lvIpyData.GetReSkillAtkRate() - 10000) * attrPer) # 技能伤害比例, 策划等级表配置的是最终值，初始值是0，所以这里要减
			setAttrDict[ChConfig.AttrName_DamagePVP] = int(lvIpyData.GetReDamagePer() * attrPer) # PVP固定伤害
			setAttrDict[ChConfig.AttrName_DamagePVPReduce] = int(lvIpyData.GetReDamReduce() * attrPer) # PVP固定减伤
			setAttrDict[ChConfig.AttrName_IgnoreDefRate] = int(lvIpyData.GetReIgnoreDefRate() * attrPer) # 无视防御比例
			@@ -4749,7 +4740,7 @@
			setAttrDict[ChConfig.AttrName_IceAtk] = int(lvIpyData.GetReIceAtk() * attrPer) # 真实伤害
			setAttrDict[ChConfig.AttrName_IceDef] = int(lvIpyData.GetReIceDef() * attrPer) # 真实抵御
			setAttrDict[ChConfig.AttrName_PetAtk] = int(lvIpyData.GetRePetAtk() * attrPer) # 灵宠攻击
			setAttrDict[ChConfig.AttrName_PetSkillAtkRate] = int(lvIpyData.GetRePetSkillAtkRate() * attrPer) # 灵宠技能
			setAttrDict[ChConfig.AttrName_PetSkillAtkRate] = int(max(0, lvIpyData.GetRePetSkillAtkRate() - 10000) * attrPer) # 灵宠技能, 策划等级表配置的是最终值，初始值是0，所以这里要减
			setAttrDict[ChConfig.AttrName_PetDamPer] = int(lvIpyData.GetRePetDamPer() * attrPer) # 灵宠伤害增加
			setAttrDict[ChConfig.AttrName_FinalHurt] = int(lvIpyData.GetReFinalHurt() * attrPer) # 固定伤害增加
			setAttrDict[ChConfig.AttrName_FinalHurtReduce] = int(lvIpyData.GetReFinalHurtReduce() * attrPer) # 固定伤害减少