SnxxServerCode.git

			@@ -68,27 +68,29 @@
			Def_BuffValue_Count = 3 # buff记录的value个数

			#游戏对象属性--------------------------------------------
			Def_Calc_AllAttrType_MAX = 127
			Def_Calc_AllAttrType_MAX = 125
			#基本属性BUFF计算，顺序与 ObjProperty_AttrByIndex 对应，同时也为buff效果ID同步通知策划
			TYPE_Calc_AttrList = (
			#基础属性
			TYPE_Calc_AttrCurSTR, # 力量 1
			TYPE_Calc_AttrCurPNE, # 灵力（智力） 2
			TYPE_Calc_AttrCurPHY, # 身法（敏捷） 3
			TYPE_Calc_AttrCurCON, # 体质 4
			TYPE_Calc_Metal, # 金 1
			TYPE_Calc_Wood, # ľ 2
			TYPE_Calc_Water, # ˮ 3
			TYPE_Calc_Fire, # 火 4
			TYPE_Calc_Earth, # 土 5

			#战斗属性
			TYPE_Calc_AttrHP, # 当前HP 5
			TYPE_Calc_AttrMP, # 当前MP 6
			TYPE_Calc_AttrMaxHP, # 最大血量 7
			TYPE_Calc_AttrMaxMP, # 最大魔法值 8
			TYPE_Calc_AttrATKMin, # 最小攻击力 9
			TYPE_Calc_AttrATKMax, # 最大攻击力 10
			TYPE_Calc_AttrMATKMin, # 最小魔法攻击力 11 #废弃：NPC表字段代表境界
			TYPE_Calc_AttrMATKMax, # 最大魔法攻击力 12 #废弃
			TYPE_Calc_AttrDEF, # 防御力 13
			TYPE_Calc_AttrHit, # 命中 14
			TYPE_Calc_AttrMiss, # 闪避 15
			TYPE_Calc_AttrMaxHP, # 最大血量 6
			TYPE_Calc_AttrMaxMP, # 最大魔法值 7
			TYPE_Calc_AttrDEF, # 防御力 8
			TYPE_Calc_AttrHit, # 命中 9
			TYPE_Calc_AttrMiss, # 闪避 10
			TYPE_Calc_AttrATKMin, # 最小攻击力 11
			TYPE_Calc_AttrATKMax, # 最大攻击力 12
			TYPE_Calc_AttrHP, # 当前HP 13
			TYPE_Calc_AttrMP, # 当前MP 14
			#TYPE_Calc_AttrMATKMin, # 最小魔法攻击力 #废弃：NPC表字段代表境界
			#TYPE_Calc_AttrMATKMax, # 最大魔法攻击力 #废弃
			TYPE_Calc_Luck, # 气运 15
			TYPE_Calc_AttrSpeed, # 移动速度 16
			TYPE_Calc_AttrAtkSpeed, # 攻击速度 17

			@@ -209,8 +211,6 @@
			TYPE_Calc_SuiteBasePer, # 套装基础属性百分比
			TYPE_Calc_PlusBaseAtkPer, # 强化基础攻击百分比
			TYPE_Calc_ProDef, # 当前防护值 130
			TYPE_Calc_ZhuxianRate, # 诛仙一击的概率
			TYPE_Calc_ZhuxianHurtPer, # 诛仙一击的伤害比
			) = range(1, Def_Calc_AllAttrType_MAX)


			@@ -498,19 +498,6 @@

			#写死的物品效果都放这边

			#增加%d伤害值,其中a值为最小伤害值,b值为最大伤害值
			Def_Effect_AddAtk = ShareDefine.Def_Effect_AddAtk
			#增加%d防御值
			Def_Effect_Def = ShareDefine.Def_Effect_Def
			#增加%d力量
			Def_Effect_STR = ShareDefine.Def_Effect_STR
			#增加%d真元
			Def_Effect_PNE = ShareDefine.Def_Effect_PNE
			#增加%d筋骨
			Def_Effect_PHY = ShareDefine.Def_Effect_PHY
			#增加%d体魄
			Def_Effect_CON = ShareDefine.Def_Effect_CON

			#立刻恢复%d的HP(单次恢复)
			Def_Effect_AddHP_Once = 207
			#立刻恢复%d的MP(单次恢复)
			@@ -570,7 +557,7 @@

			#写死的技能效果ID---------------------------------------------------------------------
			Def_Skill_Effect_AddAtkByHP = 503 # 每损失XX血量增加攻击XX，最高攻击加成XX
			Def_Skill_Effect_AbsorbShield = 801 # A值记录吸收伤害值，B值记录吸收值上限为xx%血量上限值 C值为释放的爆炸技能ID 如麒麟盾
			Def_Skill_Effect_AbsorbShield = 801 # A值记录吸收伤害值
			Def_Skill_Effect_AbsorbShieldXMZJ = 802 # 须弥真界神兵技能吸收伤害百分比
			Def_Skill_Effect_BoomSeedHurt = 804 # BUFF种子单层伤害
			Def_Skill_Effect_StoreBlood = 809 # 将期间受到的伤害总值，用于最后回血，不影响伤害
			@@ -580,6 +567,7 @@
			Def_Skill_Effect_MasterBuff = 1012 # 主从技能（同步buff持续时间）
			Def_Skill_Effect_SummonAttr = 1013 # 召唤兽属性
			Def_Skill_Effect_BoomSeedID = 1014 # 引爆BUFF种子
			Def_Skill_Effect_ReCD = 1016 # 重置CD
			Def_Skill_Effect_RandWarn = 1061 # 随机预警
			Def_Skill_Effect_AttackReplaceByNPCSeries = 1062 # 对指定系的伤害
			Def_Skill_Effect_AvgHurtFMCnt = 1064 # NPC技能按仙盟成员数均摊伤害
			@@ -1812,6 +1800,8 @@
			Def_FBMapID_CrossPenglai = 32020
			#多仙盟Boss
			Def_FBMapID_AllFamilyBoss = 31260
			#骑宠Boss
			Def_FBMapID_HorsePetBoss = 31200

			#注册上传跨服服务器数据后直接进入跨服服务器的地图
			RegisterEnter_CrossServerMapIDList = [Def_FBMapID_CrossPenglai]
			@@ -1838,7 +1828,7 @@
			Def_MapID_LineIDToPropertyID = [Def_FBMapID_ElderBattlefield]

			# 进入副本需要发送到GameServer的地图
			Def_MapID_SendToGameServer = [Def_FBMapID_FamilyInvade, Def_FBMapID_FamilyBossMap, Def_FBMapID_SealDemon, Def_FBMapID_FamilyWar, Def_FBMapID_ZhuXianBoss, Def_FBMapID_AllFamilyBoss] + Def_MapID_LineIDToPropertyID
			Def_MapID_SendToGameServer = [Def_FBMapID_HorsePetBoss, Def_FBMapID_FamilyInvade, Def_FBMapID_FamilyBossMap, Def_FBMapID_SealDemon, Def_FBMapID_FamilyWar, Def_FBMapID_ZhuXianBoss, Def_FBMapID_AllFamilyBoss] + Def_MapID_LineIDToPropertyID

			## 进入副本需要根据请求的功能线路处理的地图， hxp-改了进入模式，暂不需要了 180320
			#Def_MapID_ReqFBFuncLine = [Def_FBMapID_KirinHome, Def_FBMapID_BZZD, Def_FBMapID_SealDemonEx,
			@@ -1846,7 +1836,7 @@
			# + Def_FBMapID_ClearDevil

			# 刷新标识点在无玩家的情况下也需要刷新的地图
			Def_NoPlayerNeedProcessRefreshPointMap = [Def_FBMapID_SealDemon, Def_FBMapID_GodArea, Def_FBMapID_BossHome, Def_FBMapID_GatherSoul, Def_FBMapID_ZhuXianBoss, Def_FBMapID_AllFamilyBoss]
			Def_NoPlayerNeedProcessRefreshPointMap = [Def_FBMapID_HorsePetBoss, Def_FBMapID_SealDemon, Def_FBMapID_GodArea, Def_FBMapID_BossHome, Def_FBMapID_GatherSoul, Def_FBMapID_ZhuXianBoss, Def_FBMapID_AllFamilyBoss]

			# 可重复进的副本
			Def_NoLimitEnterCntMap = [Def_FBMapID_AllFamilyBoss, Def_FBMapID_FamilyParty, Def_FBMapID_FamilyWar, Def_FBMapID_FamilyInvade, Def_FBMapID_ElderBattlefield, Def_FBMapID_ZhuXianBoss]
			@@ -1912,6 +1902,7 @@
			'ZhuXianBoss':[Def_FBMapID_ZhuXianBoss],#诛仙BOSS
			'ZhuXianTower':[Def_FBMapID_ZhuXianTower],#诛仙塔
			'AllFamilyBoss':[Def_FBMapID_AllFamilyBoss],#多仙盟BOSS
			'HorsePetBoss':[Def_FBMapID_HorsePetBoss],#骑宠BOSS
			}

			#特殊副本ID, 由系统分配, 进入时候不验证IsMapCopyFull
			@@ -3046,8 +3037,7 @@
			Def_PlayerKey_MoreHurtValue = "MoreHurtValue" # 额外的伤害值，一般用于不走公式
			Def_PlayerKey_BloodShiledHurt = "BSHurt" # 伤害值用于血盾抵消
			Def_PlayerKey_AbsorbShieldValue = "AbsorbShieldValue" # 麒麟盾吸收减免伤害百分比
			Def_PlayerKey_AbsorbShieldMax = "AbsorbShieldMax" # 麒麟盾吸收最大伤害量
			Def_PlayerKey_AbsorbShield = "AbsorbShield" # 麒麟盾吸收的伤害量用于爆炸
			Def_PlayerKey_AbsorbValue = "AbsorbValue" # 麒麟盾吸收的单次伤害
			Def_PlayerKey_StartEquipCnt = "StartEquipCnt" # 珍品数量
			Def_PlayerKey_TJGPackFullAfterEat = "TJGFullEat" # 脱机挂吞噬后背包依然满的情况
			Def_PlayerKey_TJGStartTime = "TJGStartTime" # 脱机挂结算时间起点
			@@ -3220,6 +3210,16 @@
			Def_PlayerKey_WingHPPer = "WingHPPer" # 翅膀生命百分比
			Def_PlayerKey_SuiteBasePer = "SuiteBasePer" # 套装基础属性百分比
			Def_PlayerKey_PlusBaseAtkPer = "PlusBaseAtkPer" # 强化基础攻击百分比
			Def_PlayerKey_Metal = "PointMetal" # 金
			Def_PlayerKey_Wood = "PointWood" # ľ
			Def_PlayerKey_Water = "PointWater" # ˮ
			Def_PlayerKey_Fire = "PointFire" # 火
			Def_PlayerKey_Earth = "PointEarth" # 土
			Def_PlayerKey_MetalQualityLV = "MetalQualityLV" # 金灵根品级
			Def_PlayerKey_WoodQualityLV = "WoodQualityLV" # 木灵根品级
			Def_PlayerKey_WaterQualityLV = "WaterQualityLV" # 水灵根品级
			Def_PlayerKey_FireQualityLV = "FireQualityLV" # 火灵根品级
			Def_PlayerKey_EarthQualityLV = "EarthQualityLV" # 土灵根品级

			#功能索引ShareDefine.Def_AttrFruitFuncList
			Def_PlayerKey_FruitAttr = "FruitAttr_%s_%s" # 属性果实增加的属性，参数为(功能索引, 物品效果id)
			@@ -3268,7 +3268,7 @@
			Def_PDictType_Wing, # 翅膀
			Def_PDictType_FB, # 副本相关
			Def_PDictType_FightPower, # 战斗力15
			Def_PDictType_TeHuiAction, # 特惠活动
			Def_PDictType_16,
			Def_PDictType_Activity, # 活跃度
			Def_PDictType_GoldInvest, # 投资理财
			Def_PDictType_19,
			@@ -3464,7 +3464,6 @@
			Def_PDict_DailyGoldChargeState = "DailyGoldChargeState" # 天天首充活动状态，0-未开启；1-已开启
			Def_PDict_DailyChargeState = "DailyChargeState" # 当日是否已充值
			Def_PDict_SuperGiftStartTime = "SuperGiftStartTime" # 超值礼包开始时间
			Def_PDict_SuperGiftHasOpen = "SuperGiftHasOpen" # 超值礼包是否开过
			Def_PDict_DailyGoldChargePrizeRecord = "DailyGoldChargePrizeRecord" # 天天首充领奖记录，0-不可领；1-可领；2-已领
			Def_PDict_DailyGoldChargeCnt = "DailyGoldChargeCnt" # 当日已充值数
			Def_PDict_IsReBorn = "Def_PDict_IsReBorn" # 是否回城复活
			@@ -3485,10 +3484,6 @@
			Def_PDict_MysticalShopGoods = "MysticalShopGoods_%s" # 神秘商店商品ID，索引
			Def_PDict_MysticalShopRefreshCnt = "MysticalShopRefreshCnt" # 神秘商店已手动刷新次数
			Def_PDict_MysticalShopLVRefreshCnt = "MysticalShopLVRefreshCnt" # 神秘商店等级段刷新次数
			Def_PDict_ShopItemBuyCnt = "ShopItemBuyCnt_%s_%s" # 自定义商品已购买次数，(shopID, itemIndex)
			Def_PDict_ShopItemOpenState = "ShopItemOpenState_%s_%s" # 自定义神秘商店物品开启状态，(shopID, keyNum)
			Def_PDict_TimeShopRefreshCnt = "TimeShopRefreshCnt_%s" # 自定义神秘商店已手动刷新次数，(shopID)
			Def_PDict_TimeShopLastGlobalRefreshTime = "TimeShopLastGlobalRTime_%s" # 玩家上次刷新神秘商店是的全服标记，(shopID)
			Def_PDict_HighLadderFightCnt = "HighLadderFightCnt" #天梯每日挑战次数记录
			Def_PDict_HighLadderAddCnt = "HighLadderAddCnt" #天梯已购买次数
			Def_PDict_HighLadder_Currency = "HighLadderCurrency" #天梯积分
			@@ -3512,6 +3507,7 @@

			Def_PDict_ExcActionItemCnt = "ExcI_%s_%s" # 活动兑换物品已兑换次数,参数(活动key,兑换物品对应次数编号标识)

			Def_PDict_AddPointValue = "AddPointValue_%s" # 已加属性点数, 参数(属性ID)
			Def_PDict_AttrFruitEatCnt = "AttrFruitEatCnt_%s" # 已吃属性果实个数，参数为物品id
			Def_PDict_AttrFruitAddValue = "AttrFruitAddValue_%s" # 已吃属性果实增加的属性，参数为物品id

			@@ -3799,24 +3795,6 @@

			Def_PDict_FightPower_List = [Def_PDict_FightPower_Total, Def_PDict_FightPower_Horse]


			# 特惠活动 Def_PDictType_TeHuiAction
			Def_PDict_TeHui_ActionID = "%s_ID" # 玩家身上的特惠活动id，参数为GameServer同步的活动标识
			Def_PDict_TeHui_ClassUPAwardRecord = "TH_ClassUPAwardRecord_%s" # 升阶特惠奖励记录，参数(升阶特惠类型)
			Def_PDict_TeHui_RechargeGotCnt = "TH_RechargeGotCnt_%s" # 充值特惠奖励已领取次数，参数(规则索引，从0开始)
			Def_PDict_TeHui_RechargeCanGetCnt = "TH_RechargeCanGetCnt_%s" # 充值特惠奖励可领取次数，参数同上
			Def_PDict_TeHui_RechargeCurTotalGold = "TH_RechargeCurTotalGold_%s" # 充值特惠奖励累计充值钻石，参数同上
			Def_PDict_TeHui_RechargeTotalGold = "TH_RechargeTotalGold_%s" # 充值特惠奖励总累计充值钻石,有参数,但是没给参数值,有一定几率更新不了key值,改为没参数的
			Def_PDict_TeHui_RechargeTotalGoldEx = "TH_RechargeTotalGold" # 充值特惠奖励总累计充值钻石
			Def_PDict_TeHui_LastRechargeNum = "TH_LastRechargeNum" # 上次充值特惠活动标识, 用于补发上次未领取的奖励
			Def_PDict_TeHui_RechargeRankTotalGold = "TH_RechargeRankTGold_%s" # 充值排行特惠奖励总累计充值钻石,有参数,但是没给参数值,有一定几率更新不了key值,改为没参数的
			Def_PDict_TeHui_RechargeRankTotalGoldEx = "TH_RechargeRankTGold" # 充值排行特惠奖励总累计充值钻石
			Def_PDict_TeHui_CostTotalGold = "TH_CostTotalGold" # 消费返利总累计消费钻石
			Def_PDict_TeHui_CostAwardState = "TH_CostAwardState" # 消费奖励领取状态
			Def_PDict_TeHui_LastCostIndex = "TH_LastCostIndex" # 上次消费返利活动标识, 用于补发上次未领取的奖励
			Def_PDict_TeHui_CostRankTotalGold = "TH_CostRankTGold_%s" # 消费排行特惠奖励总累计充值钻石,有参数,但是没给参数值,有一定几率更新不了key值,改为没参数的
			Def_PDict_TeHui_CostRankTotalGoldEx = "TH_CostRankTGold" # 消费排行特惠奖励总累计充值钻石

			# 每日活跃度 Def_PDictType_Activity
			Def_PDict_Activity_FinishCnt = "Activity_FinishCnt_%s" # 活跃度类型对应完成次数
			Def_PDict_Activity_TotalPoint = "Activity_TotalPoint" # 当前总活跃值
			@@ -3915,25 +3893,18 @@
			#境界
			Def_PDict_RealmFBIsOpen = "RealmFBIsOpen" #渡劫副本是否开启 0未开启 1已开启 2可升级境界
			Def_PDict_RealmFBAttrAdd = "RealmFBAttrAdd_%s" #渡劫副本属性加成参数属性ID
			Def_PDict_RealmSitAllTime = "RealmSitAllTime" #打坐总时间
			Def_PDict_RealmSitRemainTime = "RealmSitRemainTime" #开始打坐前剩余时间秒
			Def_PDict_RealmSitStartTime = "RealmSitStartTime" #开始打坐时间
			Def_PDict_RealmSitStopTime = "RealmSitStopTime" #离线时是否在打坐

			Def_PDict_RealmExp = "RealmExp" #境界修为池总经验
			Def_PDict_RealmExpPoint = "RealmExpPoint" #境界修为池总经验点
			Def_PDict_RealmExpBeginTime = "RealmExpBeginTime" #境界修为池经验开始计时时间

			#法宝
			Def_PDict_MagicWeaponExp = "MagicWeaponExp_%s" #法宝经验参数法宝ID
			Def_PDict_MagicWeaponIsActive = "MagicWeaponIsActive_%s_%s" #法宝激活状态参数(法宝类型, key编号)
			Def_PDict_MagicWeaponIsClick = "MagicWeaponIsClick_%s_%s" #法宝点击状态参数(法宝类型, key编号)
			Def_PDict_MagicWeaponIsWear = "MagicWeaponIsWear_%s_%s" #法宝佩戴状态参数(法宝类型, key编号)
			Def_PDict_MagicWeaponRefineLV = "MagicWeaponRefineLV_%s" #法宝精炼等级参数法宝ID
			Def_PDict_MagicWeaponIsActive = "MagicWeaponIsActive_%s" #法宝激活状态参数法宝ID
			Def_PDict_MagicWeaponIsClick = "MagicWeaponIsClick_%s" #法宝点击状态参数法宝ID
			Def_PDict_MagicWeaponIsWear = "MagicWeaponIsWear_%s" #法宝佩戴状态参数法宝ID
			Def_PDict_XBXZAwardRecord = "XBXZAwardRecord_%s" #仙宝寻主领奖记录参数ID
			Def_PDict_MagicWeaponLV = "MagicWeaponLV_%s" #法宝等级参数法宝ID
			Def_PDict_MagicWeaponUpExp = "MagicWeaponUpExp_%s" #法宝升级经验参数法宝ID
			Def_PDict_MWSoulCurValue = "MWSoulCurValue_%s" #法宝特权当前进度参数特权ID
			Def_PDict_MWSoulGotValue = "MWSoulGotValue_%s" #法宝特权已领取进度参数特权ID
			Def_PDict_MWSoulGotItemState = "MWSoulGotItemState_%s" #法宝特权领取物品奖励状态参数特权ID
			Def_PDict_MWSoulActiveState = "MWSoulActiveState_%s" #法宝之魂激活状态参数(key编号)
			Def_PDict_MWFBPassLevel = "MWFBPassLevel_%s" #法宝副本通关关卡参数(法宝ID)
			#炼丹炉
			Def_PDict_AlchemyLV = "AlchemyLV" #炼丹等级
			@@ -4101,10 +4072,11 @@
			#对应 Def_Calc_AllAttrType_MAX
			ItemEffect_AttrDict = {
			#基础属性
			Def_Effect_STR:[[TYPE_Calc_AttrCurSTR], True, TYPE_Linear], # 力量
			Def_Effect_PNE:[[TYPE_Calc_AttrCurPNE], True, TYPE_Linear], # 智力
			Def_Effect_PHY:[[TYPE_Calc_AttrCurPHY], True, TYPE_Linear], # 敏捷
			Def_Effect_CON:[[TYPE_Calc_AttrCurCON], True, TYPE_Linear], # 体力
			ShareDefine.Def_Effect_Metal:[[TYPE_Calc_Metal], True, TYPE_Linear],
			ShareDefine.Def_Effect_Wood:[[TYPE_Calc_Wood], True, TYPE_Linear],
			ShareDefine.Def_Effect_Water:[[TYPE_Calc_Water], True, TYPE_Linear],
			ShareDefine.Def_Effect_Fire:[[TYPE_Calc_Fire], True, TYPE_Linear],
			ShareDefine.Def_Effect_Earth:[[TYPE_Calc_Earth], True, TYPE_Linear],

			#战斗线性
			ShareDefine.Def_Effect_MaxHP:[[TYPE_Calc_AttrMaxHP], False, TYPE_Linear], # 最大血量
			@@ -4122,7 +4094,7 @@
			# TYPE_Calc_AttrMATKMin, TYPE_Calc_AttrMATKMax], False, TYPE_Linear],
			ShareDefine.Def_Effect_AddAtk:[[TYPE_Calc_AttrATKMax], False, TYPE_Linear],
			#ShareDefine.Def_Effect_AddAtk:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_Linear],
			ShareDefine.Def_Effect_AddMAtk:[[TYPE_Calc_AttrMATKMin, TYPE_Calc_AttrMATKMax], False, TYPE_Linear],
			#ShareDefine.Def_Effect_AddMAtk:[[TYPE_Calc_AttrMATKMin, TYPE_Calc_AttrMATKMax], False, TYPE_Linear],
			ShareDefine.Def_Effect_AtkSpeed:[[TYPE_Calc_AttrAtkSpeed], False, TYPE_Linear],
			ShareDefine.Def_Effect_ToxinDef:[[TYPE_Calc_AttrPoisonDef], False, TYPE_Linear],
			ShareDefine.Def_Effect_ThunderDef:[[TYPE_Calc_AttrThunderDef], False, TYPE_Linear],
			@@ -4133,11 +4105,12 @@
			ShareDefine.Def_Effect_LuckyHit:[[TYPE_Calc_LuckyHit], False, TYPE_Linear],
			ShareDefine.Def_Effect_LuckyHitRate:[[TYPE_Calc_LuckyHitRate], False, TYPE_Linear],
			ShareDefine.Def_Effect_LuckyHitRateReduce:[[TYPE_Calc_LuckyHitRateReduce], False, TYPE_Linear],
			ShareDefine.Def_Effect_Luck:[[TYPE_Calc_Luck], False, TYPE_Linear],
			ShareDefine.Def_Effect_ReduceSkillCD:[[TYPE_Calc_ReduceSkillCD], False, TYPE_Linear],
			AttrName_MinAtk:[[TYPE_Calc_AttrATKMin], False, TYPE_Linear],
			AttrName_MaxAtk:[[TYPE_Calc_AttrATKMax], False, TYPE_Linear],
			AttrName_MinMAtk:[[TYPE_Calc_AttrMATKMin], False, TYPE_Linear],
			AttrName_MaxMAtk:[[TYPE_Calc_AttrMATKMax], False, TYPE_Linear],
			#AttrName_MinMAtk:[[TYPE_Calc_AttrMATKMin], False, TYPE_Linear],
			#AttrName_MaxMAtk:[[TYPE_Calc_AttrMATKMax], False, TYPE_Linear],
			AttrName_Def:[[TYPE_Calc_AttrDEF], False, TYPE_Linear],
			AttrName_DefRate:[[TYPE_Calc_AttrMiss], False, TYPE_Linear],
			AttrName_MaxHP:[[TYPE_Calc_AttrMaxHP], False, TYPE_Linear],
			@@ -4160,7 +4133,7 @@
			AttrName_Hit:[[TYPE_Calc_AttrHit], False, TYPE_Linear],
			AttrName_Atk:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_Linear],
			#AttrName_Atk:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_Linear],
			AttrName_MAtk:[[TYPE_Calc_AttrMATKMin, TYPE_Calc_AttrMATKMax], False, TYPE_Linear],
			#AttrName_MAtk:[[TYPE_Calc_AttrMATKMin, TYPE_Calc_AttrMATKMax], False, TYPE_Linear],
			AttrName_AutoRestoreHPPer:[[TYPE_Calc_HPRestorePer], False, TYPE_Linear],
			ShareDefine.Def_Effect_HPRestore:[[TYPE_Calc_HPRestorePer], False, TYPE_Linear],
			AttrName_GreatHitRate:[[TYPE_Calc_GreatHitRate], False, TYPE_Linear],
			@@ -4255,14 +4228,14 @@
			ShareDefine.Def_Effect_DefPer:[[TYPE_Calc_AttrDEF], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_HitRate:[[TYPE_Calc_AttrHit], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_MissRate:[[TYPE_Calc_AttrMiss], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_AddMAtkByPer:[[TYPE_Calc_AttrMATKMin, TYPE_Calc_AttrMATKMax], False, TYPE_NoLinear],
			#ShareDefine.Def_Effect_AddMAtkByPer:[[TYPE_Calc_AttrMATKMin, TYPE_Calc_AttrMATKMax], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_AddAtkByPer:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_SuperHitPer:[[TYPE_Calc_SuperHit], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_SpeedPer:[[TYPE_Calc_AttrSpeed], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_IceAtkPer:[[TYPE_Calc_AttrIceAtk], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_IceDefPer:[[TYPE_Calc_AttrIceDef], False, TYPE_NoLinear],
			#ShareDefine.Def_Effect_AddAtkByPer:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_NoLinear],
			AttrName_MagAtkPer:[[TYPE_Calc_AttrMATKMin, TYPE_Calc_AttrMATKMax], False, TYPE_NoLinear],
			#AttrName_MagAtkPer:[[TYPE_Calc_AttrMATKMin, TYPE_Calc_AttrMATKMax], False, TYPE_NoLinear],
			AttrName_AtkPer:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_NoLinear],
			#AttrName_AtkPer:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_NoLinear],
			AttrName_BothAtkPer:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_NoLinear],
			@@ -4355,14 +4328,14 @@
			#刷属性功能分类索引
			CalcAttrFuncList = (
			Def_CalcAttrFunc_RoleBase, # 角色基础 0
			Def_CalcAttrFunc_EquipBaseWeapon, # 武器物品表基础属性 1 - 废弃
			Def_CalcAttrFunc_EquipBaseArmor, # 防具物品表基础属性 2 - 废弃
			Def_CalcAttrFunc_EquipBaseRelics, # 圣器物品表基础属性 3 - 废弃
			Def_CalcAttrFunc_Equip, # 装备其他(传奇属性 + ) 4 - 废弃
			Def_CalcAttrFunc_1,
			Def_CalcAttrFunc_2,
			Def_CalcAttrFunc_LingGenQuailty, # 灵根品质附加属性 3
			Def_CalcAttrFunc_LingGen, # 灵根 4
			Def_CalcAttrFunc_Plus, # 装备位强化 5
			Def_CalcAttrFunc_PlusEx, # 装备位强化累加 6 - 废弃
			Def_CalcAttrFunc_6,
			Def_CalcAttrFunc_Stone, # 装备宝石 7
			Def_CalcAttrFunc_Suit, # 套装 8 - 废弃
			Def_CalcAttrFunc_8,
			Def_CalcAttrFunc_Wing, # 翅膀 9
			Def_CalcAttrFunc_Wash, # 洗练 10
			Def_CalcAttrFunc_Pet, # 灵宠 11
			@@ -4371,10 +4344,10 @@
			Def_CalcAttrFunc_GodWeapon, # 神兵 14
			Def_CalcAttrFunc_Dienstgrad, # 称号 15
			Def_CalcAttrFunc_Rune, # 符印 16
			Def_CalcAttrFunc_17, #
			Def_CalcAttrFunc_17,
			Def_CalcAttrFunc_MagicWeapon1, # 人族法宝属性 18
			Def_CalcAttrFunc_EquipOutOfPrint, # 绝版属性随等级变化 19
			Def_CalcAttrFunc_EquipAllStars, # 装备全身星级属性 20 - 废弃
			Def_CalcAttrFunc_20,
			Def_CalcAttrFunc_Success, # 成就属性 21
			Def_CalcAttrFunc_VIP, # VIP属性 22
			Def_CalcAttrFunc_Stove, # 炼丹炉 23
			@@ -4388,7 +4361,7 @@
			Def_CalcAttrFunc_PetSkill, # 宠物技能属性 31
			Def_CalcAttrFunc_StoveYao, # 炼丹炉丹药 32
			Def_CalcAttrFunc_PetSign, # 宠物签到 33
			Def_CalcAttrFunc_MagicWeaponSoul, # 法宝之魂属性34
			Def_CalcAttrFunc_34,
			Def_CalcAttrFunc_Dogz, # 神兽35
			Def_CalcAttrFunc_DogzBattleSkill, # 助战神兽技能36
			Def_CalcAttrFunc_DogzEquip, # 神兽装备37
			@@ -4420,7 +4393,7 @@
			# 在此列表中的功能属性，不享受百分比加成，--属性参与战力计算
			CalcAttrExFuncList = [Def_CalcAttrFunc_MagicWeapon1, Def_CalcAttrFunc_MagicWeapon2, Def_CalcAttrFunc_MagicWeapon3, Def_CalcAttrFunc_MagicWeapon4,
			Def_CalcAttrFunc_Stove, Def_CalcAttrFunc_VIP, Def_CalcAttrFunc_PetSoul, Def_CalcAttrFunc_HorseSoul,
			Def_CalcAttrFunc_StoveYao, Def_CalcAttrFunc_PetSign, Def_CalcAttrFunc_MagicWeaponSoul
			Def_CalcAttrFunc_StoveYao, Def_CalcAttrFunc_PetSign
			]

			# 在此列表中的功能属性，不享受百分比加成，--属性不参与战力计算，战力由技能配置决定
			@@ -4431,6 +4404,7 @@
			MFPTypeAttrFuncIndexDict = {ShareDefine.Def_MFPType_Role:[Def_CalcAttrFunc_RoleBase],
			# 因为装备评分和实际战力一直出现不匹配的情况，所以装备战力修改为直接由装备评分做为参数计算战力，所以装备评分计算的所有属性不列入战力计算，祥见评分计算函数 ItemCommom.CalcEquipGS
			# ShareDefine.Def_MFPType_Equip:[Def_CalcAttrFunc_EquipOutOfPrint],
			ShareDefine.Def_MFPType_LingGen:[Def_CalcAttrFunc_LingGenQuailty, Def_CalcAttrFunc_LingGen],
			ShareDefine.Def_MFPType_Plus:[Def_CalcAttrFunc_Plus],
			ShareDefine.Def_MFPType_Stone:[Def_CalcAttrFunc_Stone],
			ShareDefine.Def_MFPType_Wing:[Def_CalcAttrFunc_Wing],
			@@ -4448,7 +4422,6 @@
			ShareDefine.Def_MFPType_MagicWeapon3:[Def_CalcAttrFunc_MagicWeapon3, Def_CalcAttrFunc_Stove, Def_CalcAttrFunc_VIP],
			ShareDefine.Def_MFPType_MagicWeapon4:[Def_CalcAttrFunc_MagicWeapon4],
			ShareDefine.Def_MFPType_StoveYao:[Def_CalcAttrFunc_StoveYao],
			ShareDefine.Def_MFPType_MagicWeaponSoul:[Def_CalcAttrFunc_MagicWeaponSoul],
			ShareDefine.Def_MFPType_GatherSoul:[Def_CalcAttrFunc_GatherSoul],
			ShareDefine.Def_MFPType_Coat:[Def_CalcAttrFunc_Coat],
			# 诛仙装备战力、神兽战力同装备模块战力一致，受评分影响，装备评分相关的战力另外算
			@@ -4544,7 +4517,8 @@
			TriggerType_SuperHitSubLayer, # 暴击减层 67
			TriggerType_SuperHitSkipCD, # 暴击无冷却 68
			TriggerType_BuffHurtCnt, # 当持续buff伤害第X次时触发技能 69
			) = range(1, 70)
			TriggerType_4074PerValue, # 特殊效果的加成 70
			) = range(1, 71)


			# NPC功能类型定义
			@@ -4600,18 +4574,9 @@
			}

			#版本修正标记, 使用key格式 Def_Player_Dict_VersionFix
			(
			Def_VerFix_ChatBubbleBox, # 1.2版本购买VIP礼包可获得激活气泡框道具，针对已购买过VIP礼包的老号处理;
			Def_VerFix_CTGDoublePrize, # 1.2版本开放首充双倍，重置老号充值ID对应累计充值次数;
			Def_VerFix_RuneSource, # 修复老号双属性符印的获取途径;
			Def_VerFix_FMTDouble, # 1.3版本VIP特权变更，记录切换版本前的VIP特权(封魔坛双倍挑战);
			Def_VerFix_SuperGift, # 超值礼包开启变更,原领取首充开启，改成等级到开启;
			Def_VerFix_Horse, # 坐骑等级上限修改，对应技能触发修改;
			Def_VerFix_Pet, # 灵宠等级上限修改，对应技能触发修改;
			Def_VerFix_AddPoint, # 老号属性点修复;
			Def_VerFix_GodWeaponItem, # 1.5删除中级神兵石;
			Def_VerFix_ZXTower, # 诛仙塔奖励变更补偿;
			) = range(10)
			#(
			#
			#) = range(0)

			##==================================================================================================
			#游戏消费点类型定义
			@@ -5233,7 +5198,7 @@
			Def_RewardType_XBXZ, # 仙宝寻主奖励6
			Def_RewardType_DayRealmPoint, # 每日任务修行点奖励7
			Def_RewardType_GoldGiftFirst, # 首充礼包奖励8
			Def_RewardType_MWSoulAward, # 法宝之魂奖励9
			Def_RewardType_MWSoulAward, # 法宝之魂奖励9 -废弃
			Def_RewardType_FreeGoods, # 极品白拿10
			Def_RewardType_CostRebate, # 消费返利11
			Def_RewardType_BossReborn, # BOSS复活12