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(单次恢复)
			@@ -723,7 +710,6 @@
			Def_SkillID_TeamVIPBuff = 22000 # VIP队伍buff, 攻守同盟
			Def_SkillID_CostVipBuff = 61018 # CostVIPbuff
			Def_SkillID_FBEncourageBuff = 20051 # 副本鼓舞buff
			Def_SkillID_GetFlagFamilyBuff = 11506 # 战盟战获得夺旗战盟buff特效
			Def_SkillID_FreshmanGuideBuff = 21219 # 新手指导员buff
			Def_SkillID_PoisonAtkBuff = 25180 # 毒攻buff
			Def_SkillID_DropOwnerBuff = 20040 # 掉落归属buff
			@@ -757,7 +743,6 @@
			Def_AreaType_SkillID_FreePK = 20010 # pk区
			Def_AreaType_SkillID_FamilyPK = 20012 # 家族区
			Def_AreaType_SkillID_Boss = 20008 # Boss区域
			Def_SkillID_ManorFlagArea = 20017 # 战旗区域buff，动态
			Def_SkillID_SitArea = 20009 # 打坐区域buff
			#----------------------------------------------------------------------
			#战斗类型
			@@ -1813,6 +1798,8 @@
			Def_FBMapID_CrossPenglai = 32020
			#多仙盟Boss
			Def_FBMapID_AllFamilyBoss = 31260
			#骑宠Boss
			Def_FBMapID_HorsePetBoss = 31200

			#注册上传跨服服务器数据后直接进入跨服服务器的地图
			RegisterEnter_CrossServerMapIDList = [Def_FBMapID_CrossPenglai]
			@@ -1839,7 +1826,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,
			@@ -1847,7 +1834,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]
			@@ -1913,6 +1900,7 @@
			'ZhuXianBoss':[Def_FBMapID_ZhuXianBoss],#诛仙BOSS
			'ZhuXianTower':[Def_FBMapID_ZhuXianTower],#诛仙塔
			'AllFamilyBoss':[Def_FBMapID_AllFamilyBoss],#多仙盟BOSS
			'HorsePetBoss':[Def_FBMapID_HorsePetBoss],#骑宠BOSS
			}

			#特殊副本ID, 由系统分配, 进入时候不验证IsMapCopyFull
			@@ -2436,7 +2424,6 @@
			#技能消失不重刷属性#(鞭炮,烟花,火烛)
			Def_Skill_Disappear_NoReflash = [Def_SkillID_Justice, #阵营
			Def_SkillID_Evil,
			Def_SkillID_GetFlagFamilyBuff,
			]
			#---------------------------------------------------------------------

			@@ -3220,6 +3207,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)
			@@ -3280,10 +3277,7 @@
			Def_PDictType_Reincarnation, # 转生
			Def_PDictType_GreatMaster, # 大师
			Def_PDictType_BloodElf, # Ѫħ
			Def_PDictType_28,
			Def_PDictType_29,
			Def_PDictType_QQ, # QQ相关
			) = range(31)
			) = range(28)

			# 玩家字典key定义规则, key的长度不能超过29个字节, 注意尽量避免命名重复
			# 新增参数TYPE 用于字典分类，默认0
			@@ -3302,7 +3296,6 @@
			Def_PDict_OnMonthEx = "OnMonthEx" # 特殊时间点凌晨X点过月
			Def_Player_Dict_PlayerFromPID = "PlayerFromPID" # pid
			Def_Player_Dict_Account_Type = "account_type" # account_type
			Def_Player_Dict_TencentPF = "tencentPF" # 腾讯平台来源pf
			Def_Player_Dict_FirstLogin = "FirstLogin" # 首登标记 0-未首登; 1-首登过
			Def_GuideStateKeyCount = 8 # 引导状态key最大个数
			Def_Player_Dict_GuideState = "GuideState_%s" # 引导状态记录，参数为key个数编号
			@@ -3484,15 +3477,6 @@
			Def_PDict_MysticalShopGoods = "MysticalShopGoods_%s" # 神秘商店商品ID，索引
			Def_PDict_MysticalShopRefreshCnt = "MysticalShopRefreshCnt" # 神秘商店已手动刷新次数
			Def_PDict_MysticalShopLVRefreshCnt = "MysticalShopLVRefreshCnt" # 神秘商店等级段刷新次数
			Def_PDict_HighLadderFightCnt = "HighLadderFightCnt" #天梯每日挑战次数记录
			Def_PDict_HighLadderAddCnt = "HighLadderAddCnt" #天梯已购买次数
			Def_PDict_HighLadder_Currency = "HighLadderCurrency" #天梯积分
			Def_PDict_HighLadder_DayRewardGot = "HighLadderDayRewardGot" #天梯每日奖励是否已领取
			Def_PDict_HighLadder_CDTime = "HighLadderCDTime" #天梯冷却时间
			Def_PDict_HighLadder_CDBeginTime = "HighLadderCDBeginTime" #天梯冷却时间计时起点
			Def_PDict_HighLadder_IsRelCD = "HighLadderIsRelCD" #天梯是否进入真正挑战冷却
			Def_PDict_HighLadder_WinningStreak = "HighLadderWinningStreak" #天梯连胜场次
			Def_PDict_HighLadder_HistoryMaxOrder = "HighLadderMaxOrder" #天梯历史最高排名
			Def_PDict_FestivalLoginState = "FestivalLoginState_%s" # 节日登陆奖励状态_%s表示节日类型<按登陆天从低位起0-未领1-可领2-已领>
			Def_PDict_Currency = "PlayerCurrency_%s" # 自定义货币类型, 参数[自定义货币类型]
			Def_PDict_TJGSet = "TJGSet" # 脱机挂系统设定
			@@ -3505,8 +3489,7 @@

			Def_PDict_MixLoginDay = "MixLoginDay" # 合服首登处理标记天

			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

			@@ -3524,8 +3507,6 @@
			Def_PDict_HaveRecover = "HaveRecover_%s" # 资源找回今日是否已找回<%s-找回项索引>
			Def_PDict_RecoverGainLastTime = "RecoverGainLastTime" # 上一次资源找回时的时间


			Def_PDict_ActionItemDropTime = "ActionItemDropTime_%s" # 活动物品掉落周期控制, 记录上次掉落时间, 参数为ItemID
			Def_PDict_NPCKillCount = "NPCKillCount_%s" # NPC已击杀次数, 参数(NPCID) CCBBAA, AA存储公共装备次数，BB存储公共ID次数，CC存储私有次数

			Def_PDict_RedPacketInviteGet = "RedPacketInviteGet" # 红包邀请领取
			@@ -3782,11 +3763,6 @@
			Def_PDict_LastEnterFBPropertyID = "LastEnterFBPropertyID_%s" # 上次进入副本的propertyID%s副本id
			Def_PDict_LastEnterFBTick = "LastEnterFBTick_%s" # 上次进入副本的时间%s副本id

			Def_PDict_ManorWarJoinDay = "ManorWarJoinDay" # 上次参加领地争夺战时记录的开服天数
			Def_PDict_ManorWarContinueTick = "ManorWarContinueTick" # 领地争夺战在战场总时间
			Def_PDict_ManorWarJoinAwardState = "ManorWarJoinAwardState" # 领地战参与奖励情况0-不可领，1-可领，2-已领
			Def_PDict_ManorWarDailyAwardRecord = "ManorWarDailyAwardRecord" # 领地争夺战每日奖励领取记录，按位表示

			# 战斗力 Def_PDictType_FightPower
			Def_PDict_FightPower_Highest = "FightPower_Highest" # 历史最高总战斗力
			Def_PDict_FightPower_Total = "FightPower_Total" # 总战斗力
			@@ -3820,20 +3796,6 @@
			Def_PDict_Success_CntValue = "Su_%s_%s" # 当前次数值,参数(成就类型、条件)
			Def_PDict_Success_FinishTime = "Succ_FinishTime_%s" # 成就是否已完成,参数(索引)
			Def_PDict_Success_CheckVersion = "Succ_CheckVersion" #老玩家某些功能成就检查版本

			# QQ相关 Def_PDictType_QQ
			Def_PDict_QQUpYellowAwardRecord = "QQUpYellowAwardRecord" # QQ成长礼包奖励是否已领取(黄钻)
			Def_PDict_QQUpBlueAwardRecord = "QQUpBlueAwardRecord" # QQ成长礼包奖励是否已领取(蓝钻)
			Def_PDict_QQNewManAwardRecord = "QQNewManAwardRecord" # QQ新手礼包奖励是否已领取
			Def_PDict_QQDayGiftAwardRecord = "QQDayGiftAwardRecord" # QQ每日礼包奖励是否已领取
			Def_PDict_QQTaskMarketRecord = "QQTaskMarketRecord_%s" # 任务集市领奖记录, 参数为任务记录编号

			Def_Tencent_PF_List = ["tencent", "qzone", "pengyou","qplus","qqgame","3366"] # 腾讯平台来源pf

			# qzone
			Def_PDict_QzoneUpAwardRecord = "QzoneUpAwardRecord" # qzone成长礼包奖励是否已领取
			Def_PDict_QzoneNewManAwardRecord = "QzoneNewManRecord" # qzone新手礼包奖励是否已领取
			Def_PDict_QzoneDayAwardRecord = "QQDayGiftRecord" # qzone每日礼包奖励是否已领取

			# 转生 Def_PDictType_Reincarnation
			Def_PDict_Reinc_Reiki = "Reinc_Reiki" # 当前转生灵力
			@@ -3897,14 +3859,12 @@
			Def_PDict_RealmExpBeginTime = "RealmExpBeginTime" #境界修为池经验开始计时时间

			#法宝
			Def_PDict_MagicWeaponExp = "MagicWeaponExp_%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_MWFBPassLevel = "MWFBPassLevel_%s" #法宝副本通关关卡参数(法宝ID)

			#炼丹炉
			Def_PDict_AlchemyLV = "AlchemyLV" #炼丹等级
			Def_PDict_AlchemyExp = "AlchemyExp" #炼丹经验
			@@ -4071,10 +4031,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], # 最大血量
			@@ -4092,7 +4053,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],
			@@ -4103,11 +4064,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],
			@@ -4130,7 +4092,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],
			@@ -4225,14 +4187,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],
			@@ -4325,14 +4287,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
			@@ -4341,10 +4303,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
			@@ -4358,7 +4320,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
			@@ -4390,7 +4352,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
			]

			# 在此列表中的功能属性，不享受百分比加成，--属性不参与战力计算，战力由技能配置决定
			@@ -4401,6 +4363,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],
			@@ -4418,7 +4381,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],
			# 诛仙装备战力、神兽战力同装备模块战力一致，受评分影响，装备评分相关的战力另外算
			@@ -4630,16 +4592,14 @@
			Def_Cost_FinishTruck, # 完成镖车
			Def_Cost_RefreshTimeShop, # 刷新神秘商店
			Def_Cost_OpenNoble, # 开通贵族
			Def_Cost_HighLadder, # 天梯竞技场
			Def_Cost_Reincarnation, # 转生
			Def_Cost_BuyStallItem, # 购买摆摊物品
			Def_Cost_Warehouse, # 仓库
			Def_Cost_BuyItemBack, # 回购
			Def_Cost_ExchangeActionItem, # 活动物品兑换
			Def_Cost_Trade, # 交易
			Def_Cost_Rename, # 改名
			Def_Cost_SkillLvUp, # 技能升级
			) = range(2000, 2000 + 60)
			) = range(2000, 2000 + 58)

			Def_Cost_Reason_SonKey = "reason_name_son" # 消费点原因子类说明key

			@@ -4689,7 +4649,6 @@
			Def_Cost_BourseBuy:"BourseBuy",
			Def_Cost_BourseCharge:"BourseCharge",
			Def_Cost_EquipWash:"EquipWash",
			Def_Cost_HighLadder:"HighLadder",
			Def_Cost_UseItem:"UseItem",
			Def_Cost_AddSignDay:"AddSignDay",
			Def_Cost_FBSweep:"FBSweep",
			@@ -4706,7 +4665,6 @@
			Def_Cost_Transport:"Transport",
			Def_Cost_OffLineExp:"OffLineExp",
			Def_Cost_GameServer:"GameServer",
			Def_Cost_ExchangeActionItem:"ExchangeActionItem",
			Def_Cost_Reincarnation:"Reincarnation",
			Def_Cost_BuyStallItem:"BuyStallItem",
			Def_Cost_Trade:"Trade",
			@@ -4752,7 +4710,7 @@
			Def_GiveMoney_Warehouse, # 仓库
			Def_GiveMoney_SellPackItem, # 出售背包物品
			Def_GiveMoney_CollectNPC, # 采集NPC
			Def_GiveMoney_HighLadder, # 天梯竞技场 20
			Def_GiveMoney_20,
			Def_GiveMoney_StallItem, # 摆摊
			Def_GiveMoney_Trade, # 交易
			Def_GiveMoney_Truck, # 运镖
			@@ -4787,7 +4745,6 @@
			Def_GiveMoney_Warehouse:"Warehouse",
			Def_GiveMoney_SellPackItem:"SellPackItem",
			Def_GiveMoney_CollectNPC:"CollectNPC",
			Def_GiveMoney_HighLadder:"HighLadder",
			Def_GiveMoney_StallItem:"StallItem",
			Def_GiveMoney_Trade:"Trade",
			Def_GiveMoney_Truck:"Truck",