SnxxServerCode.git

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

			#游戏对象属性--------------------------------------------
			Def_Calc_AllAttrType_MAX = 127
			Def_Calc_AllAttrType_MAX = 130
			#基本属性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_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_Earth, # 土 11
			TYPE_Calc_Luck, # 气运 12
			TYPE_Calc_AttrDEF, # 防御力 13
			TYPE_Calc_AttrHit, # 命中 14
			TYPE_Calc_AttrMiss, # 闪避 15
			@@ -95,7 +93,7 @@
			TYPE_Calc_SuperHitRate, # 暴击概率 18
			TYPE_Calc_SuperHit, # 暴击伤害(固定值) 19
			TYPE_Calc_SuperHitRateReduce, # 暴击概率抗性 20
			TYPE_Calc_SuperHitReducePer, # 暴击伤害减免 21
			TYPE_Calc_SuperHitReduce, # 暴击伤害减免固定值 21

			TYPE_Calc_GreatHitRate, # 卓越一击几率 22
			TYPE_Calc_GreatHit, # 卓越一击伤害倍率 23
			@@ -103,9 +101,9 @@
			TYPE_Calc_GreatHitReducePer, # 卓越一击伤害减免 25

			TYPE_Calc_LuckyHitRate, # 会心一击几率 26
			TYPE_Calc_LuckyHit, # 会心一击伤害倍率 27
			TYPE_Calc_LuckyHit, # 会心一击伤害固定值 27
			TYPE_Calc_LuckyHitRateReduce, # 会心一击概率抗性 28
			TYPE_Calc_LuckyHitReducePer, # 会心一击伤害减免 29
			TYPE_Calc_LuckyHitReduce, # 会心一击伤害减免固定值 29

			TYPE_Calc_IgnoreDefRate, # 无视防御几率, 攻击时百分比无视目标的防御 30
			TYPE_Calc_IgnoreDefRateReduce, # 无视防御概率抗性, 受击时减少对方的无视防御属性 31
			@@ -158,15 +156,15 @@
			TYPE_Calc_ReduceSkillCD, # 减技能CD
			TYPE_Calc_SkillAtkRate, # 技能攻击比例加成
			TYPE_Calc_SkillAtkRateReduce, # 技能攻击比例减少 75
			TYPE_Calc_DamagePer, # 伤害输出计算百分比
			TYPE_Calc_AttrDamReduce, # 减少伤害
			TYPE_Calc_DamagePVP, # 伤害输出固定值
			TYPE_Calc_DamagePVPReduce, # 减少伤害固定值
			TYPE_Calc_HurtPer, # 受伤计算百分比
			TYPE_Calc_BleedDamage, # 流血伤害
			TYPE_Calc_FinalHurt, # 最终固定伤害增加 80
			TYPE_Calc_FinalHurtReduce, # 最终固定伤害减少
			TYPE_Calc_DamagePerPVP, # 伤害输出计算百分比PVP
			TYPE_Calc_DamagePerPVPReduce, # 伤害输出计算百分比PVP减少
			TYPE_Calc_DamagePerPVE, # 伤害输出计算百分比PVE
			TYPE_Calc_DamagePVE, # 伤害输出计算固定值PVE
			TYPE_Calc_NPCHurtAddPer, # 对怪物伤害加成 85
			TYPE_Calc_JobAHurtAddPer, # 目标战士伤害加成
			TYPE_Calc_JobBHurtAddPer, # 目标法师伤害加成
			@@ -188,29 +186,32 @@
			TYPE_Calc_BaseDefAddPer, # 基础防御百分比
			TYPE_Calc_BaseHitAddPer, # 基础命中百分比
			TYPE_Calc_BaseMissAddPer, # 基础闪避百分比
			TYPE_Calc_GodWeaponMaxHPPer, # 神兵生命百分比 110
			TYPE_Calc_GodWeaponAtkPer, # 神兵攻击百分比
			TYPE_Calc_GodWeaponMaxHPPer, # 神兵生命百分比
			TYPE_Calc_GodWeaponAtkPer, # 神兵攻击百分比 105
			TYPE_Calc_StoneMaxHPPer, # 宝石生命百分比
			TYPE_Calc_StoneAtkPer, # 宝石攻击百分比
			TYPE_Calc_HPCureEnhance, # 血瓶恢复效果增加
			TYPE_Calc_OnlyFinalHurt, # 额外输出伤害 115
			TYPE_Calc_PVPAtkBackHP, # PVP攻击回血
			TYPE_Calc_OnlyFinalHurt, # 额外输出伤害
			TYPE_Calc_PVPAtkBackHP, # PVP攻击回血 110
			TYPE_Calc_HitSucessRate, # 命中成功率
			TYPE_Calc_MissSucessRate, # 闪避成功率
			TYPE_Calc_AtkInterval, # NPC攻击频率
			TYPE_Calc_FuncDef, # 功能层防御 120
			TYPE_Calc_CurePer, # 治疗效果加成，默认100%
			TYPE_Calc_FuncDef, # 功能层防御
			TYPE_Calc_CurePer, # 治疗效果加成，默认100% 115
			TYPE_Calc_BeHurtPer, # 加深受到伤害百分比
			TYPE_Calc_HorseAtkPer, # 坐骑攻击百分比
			TYPE_Calc_StoneBasePer, # 宝石基础属性百分比
			TYPE_Calc_RealmBasePer, # 境界基础属性百分比 125
			TYPE_Calc_PetSkillAtkRate, # 宠物技能攻击比例加成
			TYPE_Calc_RealmBasePer, # 境界基础属性百分比
			TYPE_Calc_PetSkillAtkRate, # 宠物技能攻击比例加成 120
			TYPE_Calc_WingHPPer, # 翅膀生命百分比
			TYPE_Calc_SuiteBasePer, # 套装基础属性百分比
			TYPE_Calc_PlusBaseAtkPer, # 强化基础攻击百分比
			TYPE_Calc_ProDef, # 当前防护值 130
			TYPE_Calc_ZhuxianRate, # 诛仙一击的概率
			TYPE_Calc_ZhuxianHurtPer, # 诛仙一击的伤害比
			TYPE_Calc_ProDef, # 当前防护值
			TYPE_Calc_NormalHurt, # 普通攻击增伤 125
			TYPE_Calc_NormalHurtPer, # 普通攻击加成
			TYPE_Calc_FabaoHurt, # 法宝技能增伤
			TYPE_Calc_FabaoHurtPer, # 法宝技能加成
			TYPE_Calc_FinalHurtReducePer, # 最终伤害减少百分比
			) = range(1, Def_Calc_AllAttrType_MAX)


			@@ -220,10 +221,6 @@

			# 衰减递增的属性列表，衰减递增算法： 1-(1-a1)*(1-a2)；非衰减递增算法： a1+a2
			TYPE_Calc_DeclineList = []
			#TYPE_Calc_DeclineList = [TYPE_Calc_SuperHitReducePer, TYPE_Calc_LuckyHitRateReduce, TYPE_Calc_SkillAtkRateReduce,
			# TYPE_Calc_AttrDamReduce, TYPE_Calc_DamagePerPVPReduce,
			# TYPE_Calc_IgnoreDefRate, TYPE_Calc_IgnoreDefRateReduce, TYPE_Calc_DamChanceDef,
			# TYPE_Calc_FaintRate, TYPE_Calc_FaintDefRate, TYPE_Calc_ProDefAbsorb]

			#宠物属性列表
			Def_Pet_Attr = []
			@@ -498,19 +495,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(单次恢复)
			@@ -545,8 +529,6 @@
			Def_Item_Effect_MissionMove = 2001
			#鱼竿
			Def_Item_Effect_FishTool = 2000
			#摆摊证
			Def_Item_Effect_ShopItem = 1900
			#坐骑进阶
			Def_Item_Eff_HorseUpdate = 2819
			#官爵进阶
			@@ -570,15 +552,17 @@

			#写死的技能效果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 # 将期间受到的伤害总值，用于最后回血，不影响伤害
			Def_Skill_Effect_AttackReplace = 1009 #攻击计算，野外小怪伤害替换1010 (2018-03-07增加精英怪)
			Def_Skill_Effect_Attack = 1010 #攻击计算
			Def_Skill_Effect_LayerCnt = 1011 # BUFF层级数量 A值层数，B值层数处理方式0递增1递减
			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技能按仙盟成员数均摊伤害
			@@ -632,7 +616,7 @@


			#---------需要记录在buff管理器中的效果ID,主要用于查找用---------------------------
			Def_BuffManager_EffectsID = [Def_Skill_Effect_ProBloodPer, Def_Skill_Effect_AbsorbShieldXMZJ]
			Def_BuffManager_EffectsID = [Def_Skill_Effect_ProBloodPer, Def_Skill_Effect_AbsorbShieldXMZJ, Def_Skill_Effect_StoreBlood]
			#-------------------------------------------------------------------------

			#基础属性效果ID
			@@ -699,7 +683,6 @@
			Def_SkillID_Red = 20021 # 红名
			Def_SkillID_ReviveTired = 20030 # 复活疲劳 SkillID
			Def_SkillID_SkillReBorn = -1 # 技能复活ID
			Def_SkillID_ShopItem = -1 # 摆摊技能ID
			Def_SkillID_LimitSuperBuff = 10000 # 有限无敌BUFF SkillID
			Def_SkillID_TJGSuperBuff = 20039 # 脱机挂死亡复活保护
			Def_SkillID_Somersault = 190 # 翻滚快速闪避
			@@ -719,16 +702,13 @@
			Def_SkillID_Teleport = 1400 #瞬间移动用于不影响攻击间隔
			Def_SkillID_VipBuff = 11500 # VIPbuff
			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
			Def_SkillID_PetSignDay = 47111 # 灵宠签到属性技能, 单次签到的加成
			Def_SkillID_LFZ = 47100 # 龙凤镯技能(打怪概率经验加成)
			Def_SkillID_HorsePetRobBossKillCntBuff = 21020 # 骑宠的怨念buff

			Def_SkillID_RealmBuff = 6100 # 境界经验buff

			Def_SkillID_FamilyWar_CWinBuff = 22101 # 仙盟联赛 - 连胜buff, 由连胜次数决定等级
			Def_SkillID_FamilyWar_JoinBuff = 22131 # 仙盟联赛 - 参与buff, 由人数决定等级
			@@ -744,18 +724,11 @@
			# 脱机挂状态下不刷新buff时间的
			TJGStateNotRefreshTimeBuff = [Def_SkillID_Red]

			#===============================================================================
			# 生产相关技能ID在下面配置
			# Def_SkillID_Produce
			# Def_ProduceBuffID
			#===============================================================================

			#技能ID对应的区域类型
			Def_AreaType_SkillID_Safe = 20011 # 安全区
			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
			#----------------------------------------------------------------------
			#战斗类型
			@@ -777,7 +750,8 @@
			Def_HurtType_Zhansha, # նɱ 12
			Def_HurtType_Zhuxian, # 诛仙一击 13
			Def_HurtType_ZhognjiZhansha, # 终极斩杀 14
			) = range(1, 15)
			Def_HurtType_DeadlyHit, # 致命一击 15
			) = range(1, 16)
			#Def_HurtType_SuckBlood, # 吸血

			(
			@@ -826,8 +800,6 @@
			Def_PlayerTotalMoney_Silver = 2000000000
			#流向记录变更最小金币值(小于该值的暂不记录, 仅限金币)
			Def_DRRecord_Min_Silver = 500000
			#大额度交易记录
			Def_LargeTrade_Gold = 50 * 1000
			Def_LargeTrade_Silver = 1000 * 1000
			#初始化装备背包格子数
			Def_PackCnt_Equip = 130
			@@ -1129,14 +1101,6 @@
			Def_PlayerCanAttackBalk = 1
			#玩家攻击距离扩大N格子
			Def_PlayerAttackDistZoom = 2
			#致命一击的攻击力是普通攻击的2倍
			Def_SuperHitPercent = 20000
			#幸运一击的攻击力相对普攻倍值
			Def_LuckyHitVal = 11000
			#卓越一击的攻击力相对普攻倍值
			Def_GreatHitVal = 12500
			#富豪一击的攻击力相对普攻倍值
			Def_FuhaoHitVal = 11000
			#服务器统一使用万分率(用于计算百分比 10000为100%)
			Def_MaxRateValue = ShareDefine.Def_MaxRateValue
			Def_AtkSpeedBase = 1000.0 # 玩家攻击速度基础标准 1000毫秒
			@@ -1431,12 +1395,6 @@
			Def_GameEventExpLVDiff = 5
			#组队经验加成
			Def_TeamMemberExp=[1,1,1.1,1.15,1.2,1.25,1.3]

			#摆摊--------------------------------------------
			#可以摆摊的状态
			Def_ShopItem_PlayerState = [IPY_GameWorld.paNull, IPY_GameWorld.paAttack]
			#摆摊距离
			Def_ShopItem_Dist = 10
			#物品--------------------------------------------

			#人物背包最大个数
			@@ -1618,11 +1576,6 @@
			) = range(4, 4 + 2)

			#---玩家生产系统-------------------------------------------
			Def_ProduceLVMin = 5 # 生产材料采集玩家最小等级
			Def_SkillID_Produce = 20018 # 生产技能ID
			Def_ProduceBuffID = 20021 # 进入生产采集状态添加的buffID
			#生产采集进度条时间为10秒
			Def_ProducePortalTime = 10000
			#生产采集状态枚举值
			[
			Def_EndProduction, # 退出生产采集状态 0
			@@ -1768,7 +1721,7 @@
			Def_FBMapID_DuJie = 31110

			#麒麟之府
			Def_FBMapID_KirinHome = 31190
			Def_FBMapID_KirinHome = 311900

			#个人BOSS
			Def_FBMapID_PersonalBoss = 31240
			@@ -1809,21 +1762,36 @@
			Def_FBMapID_CrossRealmPK = 32010
			#跨服蓬莱仙境
			Def_FBMapID_CrossPenglai = 32020
			#跨服妖王
			Def_FBMapID_CrossDemonKing = 32030
			#本服妖王
			Def_FBMapID_DemonKing = 22030
			#多仙盟Boss
			Def_FBMapID_AllFamilyBoss = 31260
			#骑宠Boss
			Def_FBMapID_HorsePetBoss = 31200
			#缥缈宝藏
			Def_FBMapID_FairyTreasure = 31190
			#跨服灵草园
			Def_FBMapID_CrossGrasslandLing = 32040
			#跨服仙草园
			Def_FBMapID_CrossGrasslandXian = 32050

			#注册上传跨服服务器数据后直接进入跨服服务器的地图
			RegisterEnter_CrossServerMapIDList = [Def_FBMapID_CrossPenglai]
			RegisterEnter_CrossServerMapIDList = [Def_FBMapID_CrossPenglai, Def_FBMapID_CrossDemonKing, Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian]
			#跨服地图
			Def_CrossMapIDList = [Def_FBMapID_CrossRealmPK, Def_FBMapID_CrossPenglai]
			Def_CrossMapIDList = [Def_FBMapID_CrossRealmPK, Def_FBMapID_CrossPenglai, Def_FBMapID_CrossDemonKing, Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian]
			#跨服分区对应地图配置表名
			Def_CrossZoneMapTableName = {Def_FBMapID_CrossPenglai:"CrossPenglaiZoneMap",
			}
			#需要动态分配线路的跨服地图
			Def_CrossDynamicLineMap = [Def_FBMapID_CrossDemonKing, Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian]

			#副本关闭时未拾取的物品邮件发放给玩家
			#这里只有需要的副本才配置，不做默认逻辑，防止某些副本实际不能给导致刷物品，如麒麟之府
			Def_SendUnPickItemMailMapIDList = [Def_FBMapID_IceLode, Def_FBMapID_PersonalBoss, Def_FBMapID_MunekadoTrial,
			Def_FBMapID_SealDemon, Def_FBMapID_SealDemonEx, Def_FBMapID_ZhuXianBoss]
			Def_FBMapID_SealDemon, Def_FBMapID_SealDemonEx, Def_FBMapID_ZhuXianBoss,
			Def_FBMapID_DemonKing, Def_FBMapID_CrossDemonKing]

			#金钱不掉物品直接给玩家的地图
			Def_GiveMoneyMapIDList = []
			@@ -1837,7 +1805,8 @@
			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_DemonKing,
			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,
			@@ -1845,7 +1814,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]
			@@ -1907,10 +1876,14 @@
			'SealDemon':[Def_FBMapID_SealDemon, Def_FBMapID_SealDemonEx], #封魔坛
			'XMZZ':[Def_FBMapID_XMZZ], #仙魔之争
			'CrossRealmPK':[Def_FBMapID_CrossRealmPK], #跨服竞技场
			'CrossDemonKing':[Def_FBMapID_DemonKing, Def_FBMapID_CrossDemonKing], #妖王
			'CrossGrassland':[Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian], #草园
			'GatherSoul':[Def_FBMapID_GatherSoul],#聚魂副本
			'ZhuXianBoss':[Def_FBMapID_ZhuXianBoss],#诛仙BOSS
			'ZhuXianTower':[Def_FBMapID_ZhuXianTower],#诛仙塔
			'AllFamilyBoss':[Def_FBMapID_AllFamilyBoss],#多仙盟BOSS
			'HorsePetBoss':[Def_FBMapID_HorsePetBoss],#骑宠BOSS
			'FairyTreasure':[Def_FBMapID_FairyTreasure],#缥缈宝藏
			}

			#特殊副本ID, 由系统分配, 进入时候不验证IsMapCopyFull
			@@ -2125,7 +2098,8 @@
			DropOwnerType_Faction, # 阵营 5
			DropOwnerType_Special, # 特殊 6
			DropOwnerType_Family, # 仙盟 7
			) = range(8)
			DropOwnerType_Contend, # 争夺 8 第一个攻击的获得归属，击杀当前归属者的玩家成为新归属者
			) = range(9)

			#------------------------------------------------
			#技能类型
			@@ -2316,7 +2290,7 @@
			1000 * 10 , #9 战盟战10秒刷新排行榜
			1000 * 60 , #10 每分钟触发事件
			1000 * 60 * 5 , #11 五分钟触发事件
			800, #12 BOSS 镖车的AI间隔
			1000, #12 BOSS 镖车的AI间隔
			3000, #13 宠物AI特殊处理间隔
			]

			@@ -2434,7 +2408,6 @@
			#技能消失不重刷属性#(鞭炮,烟花,火烛)
			Def_Skill_Disappear_NoReflash = [Def_SkillID_Justice, #阵营
			Def_SkillID_Evil,
			Def_SkillID_GetFlagFamilyBuff,
			]
			#---------------------------------------------------------------------

			@@ -2998,6 +2971,11 @@
			Def_NPC_Dict_AtkDelayTick = "AtkDelayTick" # 延迟攻击时长
			Def_NPC_Dict_AtkStartTick = "AtkStartTick" # 开始攻击tick

			# 按时间掉血的NPC
			Def_NPC_Dict_TimeLostHPTick = 'TimeLostHPTick' # 上次按时间掉血tick
			Def_NPC_Dict_TimeLostHPPlayerCountTick = 'TimeLostHPPlayerCountTick ' # 上次刷新按时间掉血人数tick
			Def_NPC_Dict_TimeLostHPPlayerCount = 'TimeLostHPPlayerCount' # 按时间掉血有效人数

			#玩家状态定义，不能超过31个，如超过，需扩展多个key支持
			Def_PlayerStateList = (
			Def_PlayerState_Normal, # 无 0
			@@ -3017,13 +2995,22 @@
			Def_PlayerState_LoseBlood2, # 职业2持续掉血状态 14
			Def_PlayerState_LoseBlood3, # 职业3持续掉血状态 15
			Def_PlayerState_MissSneerAtk, # 对嘲讽攻击免疫表现为miss 16
			) = range(17)
			Def_PlayerState_BeInAir, # 浮空（做法同眩晕类） 17
			) = range(18)

			#---SetDict 含NPC字典KEY，不存于数据库---
			Def_GameObjKey_InheritOwner = "InheritOwner" # 类暴风雪计算时用主人属性

			#---SetDict 玩家字典KEY，不存于数据库---
			# key的长度不能超过29个字节
			Def_PlayerKey_SelectObjID = "selectID" # 锁定模式选中，不用SetActionObj
			Def_PlayerKey_SelectObjType = "selectType" # 锁定模式选中
			Def_PlayerKey_NormalHurt = "NormalHurt" # 属性普通攻击增伤：普通攻击附加的固定值伤害
			Def_PlayerKey_NormalHurtPer = "NormalHurtPer" # 属性普通攻击加成：普通攻击附加的伤害百分比
			Def_PlayerKey_FabaoHurt = "FabaoHurt" # 属性法宝技能增伤：法宝技能攻击附加的固定值伤害
			Def_PlayerKey_FabaoHurtPer = "FabaoHurtPer" # 属性法宝技能加成：法宝技能攻击附加的伤害百分比
			Def_PlayerKey_AddBuffLayer = "addBuffLayer" # buff当前层数
			Def_PlayerKey_BuffHurtCnt = "BuffHurtCnt" # 持续buff掉血次数
			Def_PlayerKey_Zhansha = "zhansha" # 斩杀标志
			Def_PlayerKey_ZhuxianRate = "ZXRate" # 诛仙一击的概率
			Def_PlayerKey_ZhuxianHurtPer = "ZXHurtPer" # 诛仙一击的伤害%
			@@ -3035,6 +3022,8 @@
			Def_PlayerKey_CopyFuncAttr = "CopyFuncAttr%s" # 玩家属性刷新中的计算属性缓存，便于buff刷新计算
			Def_Player_RefreshAttrByBuff = "PlayerAttrByBuff" # 玩家属性刷新功能属性缓存，便于buff刷新计算, 间隔刷新
			Def_PlayerKey_ClientCustomScene = "ClientCustomScene" # 客户端自定义场景状态
			Def_PlayerKey_ClientCustomSceneMapID = "ClientCustomSceneMapID" # 客户端自定义场景地图ID
			Def_PlayerKey_ClientCustomSceneLineID = "ClientCustomSceneLineID" # 客户端自定义场景功能线路ID
			Def_PlayerKey_ChangeMapID = "ChangeMapID" # 请求切换的地图ID
			Def_PlayerKey_ResetFBLinePosX = "ResetFBLinePosX" # 请求切换副本多合一地图功能线路ID
			Def_PlayerKey_ResetFBLinePosY = "ResetFBLinePosY" # 请求切换副本多合一地图功能线路ID
			@@ -3042,8 +3031,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" # 脱机挂结算时间起点
			@@ -3052,7 +3040,6 @@
			Def_PlayerKey_PowerPartCount = "PowerPartCount" # 蓄力技能能量次数
			Def_PlayerKey_ClientMaxHurtValue = "CMaxHValue" # 缓存单次技能攻击的最大伤害, 减少计算量
			Def_Player_RefreshAttr = "Player_RefreshAttr" # 玩家刷新属性标志
			Def_Player_NoSave_Dict_SendInviteCode = "SendInviteCode_0" # 玩家提交邀请码次数验证
			Def_PlayerKey_LoadMapIsLogin = 'LoadMapIsLogin' # 本次进入地图是否是登录的
			Def_PlayerKey_NotifyAllAttrState = 'NotifyAllAttrState' # 是否同步过所有属性，切图时第一次刷属性需要同步
			Def_PlayerKey_LoginTick = 'PlayerKey_LoginTick' # 玩家上线的当前服务器tick
			@@ -3117,8 +3104,9 @@
			Def_PlayerKey_AttrComboDamPer = "ComboDamPer" #连击伤害
			Def_PlayerKey_SkillAtkRateReduce = "SkillAtkRateReduce" #技能攻击比例减少
			Def_PlayerKey_AttrDropEquipPer = "DropEquipPer" #装备掉率
			Def_PlayerKey_AttrDamagePer = "DamagePer" #伤害输出计算百分比
			Def_PlayerKey_AttrDamagePerPVE = "DamagePerPVE" #伤害输出计算百分比PVE
			Def_PlayerKey_AttrDamagePVP = "DamagePVP" #PVP固定伤害输出
			Def_PlayerKey_AttrDamagePVPReduce = "DamagePVPReduce" #PVP固定伤害减少
			Def_PlayerKey_AttrDamagePVE = "DamagePVE" #伤害输出计算固定值PVE
			Def_PlayerKey_AttrDamagePerPVP = "DamagePerPVP" #伤害输出计算百分比PVP
			Def_PlayerKey_AttrDamagePerPVPReduce = "DamagePerPVPReduce" #伤害输出计算百分比PVP减少
			Def_PlayerKey_AttrHurtPer = "AttrHurtPer" #受伤计算百分比
			@@ -3147,6 +3135,7 @@
			Def_PlayerKey_FBCommendFightPower = "FBCommendFightPower" # 副本推荐战斗力
			Def_PlayerKey_RecordXPValue = "RecordXPValue" #临时记录XP值
			Def_PlayerKey_CollectNPCObjID = "CollectNPCObjID" #采集的NPC对象id
			Def_PlayerKey_ContendNPCObjID = "ContendNPCObjID" #竞争归属的NPC实例ID
			Def_PlayerKey_AreaRewardMultiple = "AreaRewardMultiple" #玩家所在区域福利倍值，默认1
			Def_PlayerKey_AttrActivatyNotify = "AttrActivatyNotify" # 属性激活提示类型
			Def_PlayerKey_AttrActivatyRecordStarLV = "AttrActivatyRecordStarLV" # 属性激活记录 - 强化星级
			@@ -3165,19 +3154,21 @@
			Def_PlayerKey_JobAAtkReducePer = "JobAAtkReducePer" # 战士攻击伤害减免
			Def_PlayerKey_JobBAtkReducePer = "JobBAtkReducePer" # 法师攻击伤害减免
			Def_PlayerKey_JobCAtkReducePer = "JobCAtkReducePer" # 弓手攻击伤害减免
			Def_PlayerKey_LuckyHitReducePer = "LuckyHitReducePer" # 会心一击伤害减免
			Def_PlayerKey_LuckyHitReduce = "LuckyHitReduce" # 会心一击伤害减免固定值
			Def_PlayerKey_GreatHitReducePer = "GreatHitReducePer" # 卓越一击伤害减免
			Def_PlayerKey_SuperHitReducePer = "SuperHitReducePer" # 致命一击伤害减免
			Def_PlayerKey_SuperHitReduce = "SuperHitReduce" # 暴击伤害减免固定值
			Def_PlayerKey_IgnoreDefReducePer = "IgnoreDefReducePer" # 无视防御伤害减免
			Def_PlayerKey_LuckyHitRateReduce = "LuckyHitRateReduce" # 抗会心一击概率
			Def_PlayerKey_GreatHitRateReduce = "GreatHitRateReduce" # 抗卓越一击概率
			Def_PlayerKey_SuperHitRateReduce = "SuperHitRateReduce" # 抗致命一击概率
			Def_PlayerKey_SuperHitRateReduce = "SuperHitRateReduce" # 抗暴击概率
			Def_PlayerKey_IgnoreDefRateReduce = "IgnoreDefRateReduce" # 抗无视防御概率
			Def_PlayerKey_LastHurtValue = "LastHurtValue" # 最后一次伤害值
			Def_PlayerKey_LastHurtNPCObjID = "LastHurtNPCObjID" # 最后攻击的NPCObjID
			Def_PlayerKey_LastAttackerObjID = "LastAttackerObjID" # 被攻击者记录的最近攻击玩家ID
			Def_PlayerKey_ReduceSkillCDPer = "ReduceSkillCDPer" # 减技能CD万分率
			Def_PlayerKey_CommMapExpRate = "CommMapExpRate" # 常规地图经验倍率加成
			Def_PlayerKey_FinalHurtPer = "FinalHurtPer" # 最终伤害百分比
			Def_PlayerKey_FinalHurtReducePer = "FHReducePer" # 最终伤害减免百分比
			Def_PlayerKey_FuhaoHitRate = "FuhaoHitRate" # 富豪一击概率
			Def_PlayerKey_FinalHurt = "FinalHurt" # 最终固定伤害增加
			Def_PlayerKey_BleedDamage = "BleedDamage" # 流血伤害
			@@ -3202,7 +3193,6 @@
			Def_PlayerKey_StoneAtkPer = "StoneAtkPer" # 宝石攻击百分比
			Def_PlayerKey_HPCureEnhance = "HPCureEnhance" # 血瓶恢复效果
			Def_PlayerKey_HadInitFruitAttr = "HadInitFruitAttr" # 是否已经刷新过果实属性
			Def_PlayerKey_LastReinTick = 'LastReinTick' #上次转生时间
			Def_PlayerKey_OnlyFinalHurt = "OnlyFinalHurt" # 额外输出伤害
			Def_PlayerKey_PVPAtkBackHP = "PVPAtkBackHP" # PVP攻击回血
			Def_PlayerKey_HitSucessRate = "HitSucessRate" # 命中成功率
			@@ -3215,6 +3205,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)
			@@ -3248,37 +3248,21 @@
			#玩家存数据库字典类型定义
			(
			Def_PDictType_Default, # 默认
			Def_PDictType_OnlinePrize, # 在线奖励(暂停使用)，领取后重新计时型
			Def_PDictType_FBWipeOut, # fb扫荡
			Def_PDictType_FlashSale, #限时抢购
			Def_PDictType_TJGNotify, # 脱机挂结果通知
			Def_PDictType_LVAward, # 等级奖励领取信息记录5
			Def_PDictType_GoldGift, # 充值豪礼
			Def_PDictType_LVAward, # 等级奖励领取信息记录
			Def_PDictType_OpenServerCampaign, # 开服活动
			Def_PDictType_WeekParty, #周狂欢
			Def_PDictType_FeastWeekParty, # 节日巡礼
			Def_PDictType_LoginAward, # 登录奖励运营活动
			Def_PDictType_OfficialRank, # 官爵
			Def_PDictType_Horse, # 坐骑
			Def_PDictType_Wing, # 翅膀
			Def_PDictType_FB, # 副本相关
			Def_PDictType_FightPower, # 战斗力15
			Def_PDictType_TeHuiAction, # 特惠活动
			Def_PDictType_Activity, # 活跃度
			Def_PDictType_FightPower, # 战斗力
			Def_PDictType_GoldInvest, # 投资理财
			Def_PDictType_19,
			Def_PDictType_Success, #成就20
			Def_PDictType_Success, #成就
			Def_PDictType_GFPassive, # 被动功法
			Def_PDictType_Totem, # 图腾
			Def_PDictType_GroupFRecharge, # 首充团购
			Def_PDictType_Element, # 元素
			Def_PDictType_Reincarnation, # 转生
			Def_PDictType_GreatMaster, # 大师
			Def_PDictType_BloodElf, # Ѫħ
			Def_PDictType_28,
			Def_PDictType_29,
			Def_PDictType_QQ, # QQ相关
			) = range(31)
			) = range(15)

			# 玩家字典key定义规则, key的长度不能超过29个字节, 注意尽量避免命名重复
			# 新增参数TYPE 用于字典分类，默认0
			@@ -3297,7 +3281,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个数编号
			@@ -3336,9 +3319,6 @@
			Def_Player_Dict_CabinetCount_WeaponCoat = "CabinetCount_WeaponCoat_40" #武器收纳柜
			Def_Player_Dict_CabinetCount_DressCoat = "CabinetCount_DressCoat_41" #时装收纳柜
			Def_Player_Dict_CabinetCount_Horse = "CabinetCount_Horse_42" #马匹收纳柜
			Def_Player_Dict_OffDaysAward = "OffDaysAward_45" #玩家回归奖励
			Def_Player_Dict_CheckInviteCode = "CheckInviteCode_46" #检查玩家发送的邀请码
			Def_Player_Dict_JM_OpenXW = "JM%s_OpenXw_54" # 经脉被开启的穴位数 %s对应经脉类型
			Def_Player_Dict_PackCount_Item = "PackCount_Item_72" #玩家物品背包格子数
			Def_Player_Dict_PackCount_Warehouse = "PackCount_Warehouse_73" #仓库背包格子数
			Def_Player_Dict_PlayerMapSignCnt = "PlayerMapSignCnt_75" # 大地图标记数量
			@@ -3349,6 +3329,7 @@
			Def_Player_Dict_FBFirstEnterRecord = "FBFEntRec" # 记录副本是否参与过，按位0 1 存储表示
			Def_FBStar_MaxKeyCnt = 5 # 暂时每个副本ID支持9*5个lineID记录
			Def_Player_Dict_ReqFBFuncLine = "ReqFBFuncLine" # 请求进入的副本功能线路
			Def_Player_Dict_ReqCrossFBFuncLine = "ReqCrossFBFuncLine" # 请求进入跨服的副本功能线路
			Def_Player_Dict_TeamFBAverageLV = "TeamFBAverageLV" # 请求进入的组队副本平均等级, 临时用，进入副本设置完后删除
			Def_Player_Dict_TeamFBMaxLV = "TeamFBMaxLV" # 请求进入的组队副本最大等级, 临时用，进入副本设置完后删除
			Def_Player_Dict_TeamFBPlayerCnt = "TeamFBPlayerCnt" # 请求进入的组队副本玩家个数, 临时用，进入副本设置完后删除
			@@ -3450,17 +3431,12 @@
			Def_PDict_CTGCountResetTime = "CTGCountResetTime" # CTG次数重置时间time值
			Def_PDict_TodayCTGCount = "TodayCTGCount_%s" # 当日充值次数，参数(CTG对应的商品记录ID)
			Def_PDict_CTGGoodsBuyCount = "CTGGoodsBuyCount_%s" # 对应充值商品已购买次数，参数(CTG对应的商品记录ID)
			Def_PDict_GoldGiftGetRecord = "GoldGiftGetRecord" # 充值豪礼领取信息记录，按二进制位标示
			Def_PDict_GoldGiftMailRecord = "GoldGiftMailRecord" # 充值豪礼邮件发送记录，按二进制位标示
			Def_PDict_GoldGiftFirstRecord = "GoldGiftFirstRecord" # 首充领取记录，0-未领取；1-已领取
			Def_PDict_FirstGoldRemainTime = "FirstGoldRemainTime" # 首充提示剩余时间
			Def_PDict_FirstGoldTipStartTime = "FirstGoldTipStartTime" # 首充提示开始时间
			Def_PDict_FirstGoldTry = "FirstGoldTry" # 首充试用状态 0-不可试用 1-可试用 2-已试用
			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" # 是否回城复活
			Def_PDict_FamilyWarDailyReward = "FamilyWarDailyReward" # 王者仙盟每日俸禄领取状态
			@@ -3470,30 +3446,15 @@
			Def_PDict_GiveFlowerCntByDay = "GiveFlowerCntByDay" #当日已赠送鲜次数
			Def_PDict_PackCount_FineSoul = "PackCount_FineSoul" # 已购买精魄/符文背包格子数
			Def_PDict_KillPlayerAddActive = "KillPlayerAddActiveByDay" # 杀人每日获得活跃度
			Def_PDict_FreshmanGuideDay = "FreshmanGuideDay" # 玩家新手指导员剩余天数，0为不是
			Def_PDict_FreshmanGuideSpeakerCntToday = "FreshmanGuideSpeakerCntDay" # 新手指导员今日已免费传音次数
			Def_PDict_LoginDayCnt = "PLoginDayCnt" # 累计登陆天数
			Def_PDict_LoginDayAward = "PLoginDayAward" # 累计登陆领取情况
			Def_PDict_CollNpcIDCollTime = "CollNpcIDCollTime_%s" # 采集NPCID对应每日对应采集次数，%sNPCID
			Def_PDict_CollNpcIDCollTime = "NPCIDCollTime_%s" # 采集NPCID对应每日对应采集次数，%sNPCID
			Def_PDict_CollNpcIDCollTimeTotal = "NPCIDCollTimeTotal_%s" # 采集NPCID对应对应采集总次数，%sNPCID
			Def_PDict_ShopItemDayBuyCnt = "ShopItemDayBuyCnt_%s" # 商店NPC商品已购买次数，itemIndex
			Def_PDict_ShopItemStartTime = "ShopItemStartTime_%s" # 神秘限购商品开卖时间，itemIndex
			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" #天梯积分
			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" # 脱机挂系统设定
			Def_PDict_TJGDeadTime = "TJGDeadTime" # 脱机被杀时间
			@@ -3505,10 +3466,11 @@

			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
			Def_PDict_AttrFruitAddItemCnt = "FruitAddItemCnt_%s" # 已吃增幅丹个数，参数为果实物品id


			Def_PDict_NobleLV = "NobleLV" # 贵族等级, 0位为不同贵族模式版本切换标记位, 从1位开始表示每种等级贵族开通情况， 1-已开通过；9-永久
			Def_PDict_NobleEndTime = "NobleEndTime_%s" # 贵族到期结束时间<单位s>, 参数为贵族等级, 从1开始
			@@ -3524,10 +3486,8 @@
			Def_PDict_HaveRecover = "HaveRecover_%s" # 资源找回今日是否已找回<%s-找回项索引>
			Def_PDict_RecoverGainLastTime = "RecoverGainLastTime" # 上一次资源找回时的时间


			Def_PDict_ActionItemDropTime = "ActionItemDropTime_%s" # 活动物品掉落周期控制, 记录上次掉落时间, 参数为ItemID
			Def_PDict_NPCKillCountDrop = "NPCKillDrop_%s" # NPC击杀次数掉落记录, 参数(NPCID), 击杀次数*10 + 是否已经掉落过, 只支持一次机会
			Def_PDict_NPCKillCount = "NPCKillCount_%s" # NPC已击杀次数, 参数(NPCID)
			Def_PDict_NPCKillCount = "NPCKillCount_%s" # NPC已击杀次数, 参数(NPCID) CCBBAA, AA存储公共装备次数，BB存储公共ID次数，CC存储私有次数
			Def_PDict_NPCAttackCount = "NPCAttackCount_%s" # NPC已攻击次数, 参数(NPCID)

			Def_PDict_RedPacketInviteGet = "RedPacketInviteGet" # 红包邀请领取
			Def_PDict_RedPacketGetState = "RedPacketGetState" # 红包领取状态
			@@ -3548,12 +3508,6 @@
			Def_PDict_ClothesSkinLV = "ClothesSkinLV_%s" # 时装皮肤等级,参数时装索引
			Def_PDict_ClothesChestLV = "ClothesChestLV" # 时装柜等级
			Def_PDict_ClothesChestEXP = "ClothesChestEXP" # 时装柜经验

			Def_PDict_CostVIPExp = "CostVIPExp" # 消费VIP经验
			Def_PDict_CostVIPLVReward = "CostVIPLVReward" # 消费VIP等级奖励
			Def_PDict_CostVIPBuyItem = "CostVIPBuyItem" # 消费VIP购买物品
			Def_PDict_SpecialCostVIPLVExpMark = "SpecialCostVIPLVExpMark" # 特殊处理VIP等级经验标识
			Def_PDict_CostVIPGrowUpReward = "CostVIPGrowUpReward" # 消费VIP成长奖励

			Def_PDict_SplitExpLVCnt = "SplitExpLVCnt_%s" # 单位等级经验已拆分过的等级数, 参数为实际等级

			@@ -3753,11 +3707,6 @@
			Def_PDict_LuckyTreasurePoint = "LuckyTreasurePoint" #幸运值
			Def_PDict_LuckyTreasureCnt = "LuckyTreasureCnt" #鉴宝次数
			#-------------------------------------------------------------------------------
			#类型 Def_PDictType_OnlinePrize
			Def_PDict1_OnlinePrizeCnt = "OnlinePrizeCnt" # 新手在线已领取奖励次数
			Def_PDict1_OnlinePrizeTime = "OnlinePrizeTime" # 新手在线奖励时间总和
			Def_PDict1_DayOnlinePrizeCnt = "DayOnlinePrizeCnt" # 今日在线已领取奖励次数
			Def_PDict1_DayOnlinePrizeTime = "DayOnlinePrizeTime" # 今日在线奖励时间总和

			#开服活动，Def_PDictType_OpenServerCampaign
			#奖励记录 - 从低位到高位，每位表示：0-不可领；1-可领取；2-已领
			@@ -3783,11 +3732,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" # 总战斗力
			@@ -3795,25 +3739,7 @@

			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" # 当前总活跃值
			Def_PDict_ActivityAwardRecord = "ActivityAwardRecord" # 活跃度奖励领取记录，按二进制位标识
			@@ -3822,6 +3748,8 @@
			Def_PDict_Activity_ExtraRealmPoint = "Activity_ExtraRealmPoint" # 多倍活动额外获得的修行点
			# 每日活动
			Def_PDict_DailyActionDayTimes = "DailyActionDayTimes_%s" # 每日活动今日完成次数参数每日活动ID
			Def_PDict_DailyActionDayBuyTimes = "DADayBuyTimes_%s" # 每日活动今日购买次数参数每日活动ID
			Def_PDict_DailyActionDayItemTimes = "DADayItemTimes_%s" # 每日活动今日物品增加次数参数每日活动ID
			Def_PDict_DailyActionWeekTimes = "DailyActionWeekTimes_%s" # 每日活动本周完成次数参数每日活动ID
			#仙盟活跃
			Def_PDict_FamilyActivityFinishCnt = "FamilyActivityFinishCnt%s" # 已完成次数
			@@ -3839,26 +3767,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" # 当前转生灵力
			Def_PDict_Reinc_ChangeReikiCnt = "Reinc_ChangeReikiCnt" # 今日已兑换灵力次数
			Def_PDict_Reinc_ChangeReikiAddCnt = "Reinc_ChangeReikiAddCnt" # 今日物品增加的兑换灵力次数
			Def_PDict_Reinc_AwardRecord = "Reinc_AwardRecord" # 转生奖励领取记录

			# 大师 Def_PDictType_GreatMaster
			Def_PDict_Master_Exp = "Master_Exp" # 当前大师经验
			@@ -3911,32 +3819,25 @@
			#境界
			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_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" #炼丹等级
			Def_PDict_AlchemyExp = "AlchemyExp" #炼丹经验
			Def_PDict_AlchemyCount = "AlchemyCount_%s" #特殊炼丹次数产出设定已累计次数, 参数(配方ID)
			Def_PDict_AlchemyCountSpec = "AlchemyCountSpec_%s" #特殊炼丹次数产出设定已累计次数, 参数(配方ID)
			Def_PDict_AlchemyOutputCount = "AlchemyOutputCount_%s" #炼丹特殊产出物品已产出次数，参数(物品ID)
			Def_PDict_AlchemyLearnState = "AlchemyLearnState%s" #丹方是否已学习
			Def_PDict_AlchemyItemID = "AlchemyItemID_%s" #炼丹中的丹药ID 参数丹药类型
			Def_PDict_AlchemyStartTime = "AlchemyStartTime_%s" #炼丹开始时间参数丹药ID


			Def_PDict_AlchemyPrayCnt = "AlchemyPrayCnt" #炼丹祈福次数

			Def_PDict_GFPassiveIndex = "GFP_%s_%s" # 被动功法页数-索引
			@@ -3972,7 +3873,13 @@
			#装备部位星数
			Def_PDict_EquipPartStar = "EQPartStar_%s" #装备部位星数参数装备背包格子索引


			#缥缈仙域
			Def_PDict_FairyDomainState = "FairyDomainState" #是否寻访中 0未寻访 1寻访中 2任务标记可寻访
			Def_PDict_FairyDomainEventState = "FairyDomainEventState%s" #单个事件状态1-未拜访 2-拜访中 3-已拜访参数事件ID
			Def_PDict_FairyDomainEventID = "FairyDomainEventID%s" #事件ID 参数第n个事件
			Def_PDict_FairyDomainEnergy = "FairyDomainEnergy" #体力值
			Def_PDict_FairyDomainVisitCnt = "FairyDomainVisitCnt" #寻访总次数
			Def_PDict_FairyAdventuresData = "FairyAdventuresData_%s" #奇遇数值唯一ID*100+档位参数事件ID
			#-------------------------------------------------------------------------------
			#可以从07 41封包购买的背包类型,和对应字典{背包类型:[字典key, 默认格子数]}

			@@ -4038,8 +3945,8 @@
			AttrName_PoisonDef = "PoisonDef" # 毒防
			AttrName_ThunderDef = "ThunderDef" # 雷防
			AttrName_WindDef = "WindDef" # 风攻
			AttrName_DamReducePer = "DamReduce" # 伤害吸收
			AttrName_DamagePer = "DamagePer" # 增加伤害
			AttrName_DamagePVPReduce = "DamagePVPReduce" # PVP固定减伤
			AttrName_DamagePVP = "DamagePVP" # pvp固定伤害
			AttrName_Speed = "Speed" # 移动速度
			AttrName_BothAtk = "BothAtk" # 双攻物魔
			AttrName_Hit = "Hit" # 命中
			@@ -4047,7 +3954,7 @@
			AttrName_GreatHitRate = "GreatHitRate" # 卓越一击几率
			AttrName_GreatHit = "GreatHit" # 卓越一击伤害倍率
			AttrName_LuckyHitRate = "LuckyHitRate" # 会心一击几率
			AttrName_LuckyHit = "LuckyHit" # 会心一击伤害倍率
			AttrName_LuckyHit = "LuckyHit" # 会心一击伤害固定值
			AttrName_IgnoreDefRate = "IgnoreDefRate" # 无视防御几率
			AttrName_AtkSpeed = "AtkSpeed" # 攻击速度
			AttrName_ReduceSkillCD = "ReduceSkillCD" # 减技能CD值
			@@ -4064,8 +3971,8 @@
			AttrName_GameExpRate = "GameExpRate" # 游戏事件经验倍率
			AttrName_SkillAtkRate = "SkillAtkRate" # 技能伤害加成（用作伤害加成）
			AttrName_AtkBackHPPer = "AtkBackHPPer" # 攻击回复血量比率
			AttrName_SuperHit = "SuperHit" # 致命一击伤害
			AttrName_SuperHitRate = "SuperHitRate" # 致命一击概率
			AttrName_SuperHit = "SuperHit" # 暴击伤害固定值
			AttrName_SuperHitRate = "SuperHitRate" # 暴击概率
			AttrName_NPCHurtAddPer = "NPCHurtAddPer" # 对怪物伤害加成
			AttrName_JobAHurtAddPer = "JobAHurtAddPer" # 目标战士伤害加成
			AttrName_JobBHurtAddPer = "JobBHurtAddPer" # 目标法师伤害加成
			@@ -4074,13 +3981,13 @@
			AttrName_JobAAtkReducePer = "JobAAtkReducePer" # 战士攻击伤害减免
			AttrName_JobBAtkReducePer = "JobBAtkReducePer" # 法师攻击伤害减免
			AttrName_JobCAtkReducePer = "JobCAtkReducePer" # 弓手攻击伤害减免
			AttrName_LuckyHitReducePer = "LuckyHitReducePer" # 会心一击伤害减免
			AttrName_LuckyHitReduce = "LuckyHitReduce" # 会心一击伤害减免固定值
			AttrName_GreatHitReducePer = "GreatHitReducePer" # 卓越一击伤害减免
			AttrName_SuperHitReducePer = "SuperHitReducePer" # 致命一击伤害减免
			AttrName_SuperHitReduce = "SuperHitReduce" # 暴击伤害减免固定值
			AttrName_IgnoreDefReducePer = "IgnoreDefReducePer" # 无视防御伤害减免
			AttrName_LuckyHitRateReduce = "LuckyHitRateReduce" # 抗会心一击概率
			AttrName_GreatHitRateReduce = "GreatHitRateReduce" # 抗卓越一击概率
			AttrName_SuperHitRateReduce = "SuperHitRateReduce" # 抗致命一击概率
			AttrName_SuperHitRateReduce = "SuperHitRateReduce" # 抗暴击概率
			AttrName_IgnoreDefRateReduce = "IgnoreDefRateReduce" # 抗无视防御概率
			AttrName_FinalHurtPer = "FinalHurtPer" # 最终伤害百分比
			AttrName_FuhaoHitRate = "FuhaoHitRate" # 富豪一击概率
			@@ -4097,10 +4004,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], # 最大血量
			@@ -4109,7 +4017,7 @@
			ShareDefine.Def_Effect_Miss:[[TYPE_Calc_AttrMiss], False, TYPE_Linear],
			ShareDefine.Def_Effect_SuperHitRate:[[TYPE_Calc_SuperHitRate], False, TYPE_Linear],
			ShareDefine.Def_Effect_SuperHit:[[TYPE_Calc_SuperHit], False, TYPE_Linear],
			ShareDefine.Def_Effect_SuperHitReduce:[[TYPE_Calc_SuperHitReducePer], False, TYPE_Linear],
			ShareDefine.Def_Effect_SuperHitReduce:[[TYPE_Calc_SuperHitReduce], False, TYPE_Linear],
			ShareDefine.Def_Effect_Hit:[[TYPE_Calc_AttrHit], False, TYPE_Linear],
			ShareDefine.Def_Effect_MinAtk:[[TYPE_Calc_AttrATKMin], False, TYPE_Linear],
			ShareDefine.Def_Effect_MaxAtk:[[TYPE_Calc_AttrATKMax], False, TYPE_Linear],
			@@ -4118,7 +4026,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],
			@@ -4129,11 +4037,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],
			@@ -4156,14 +4065,14 @@
			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],
			AttrName_GreatHit:[[TYPE_Calc_GreatHit], False, TYPE_Linear],
			AttrName_LuckyHitRate:[[TYPE_Calc_LuckyHitRate], False, TYPE_Linear],
			AttrName_LuckyHit:[[TYPE_Calc_LuckyHit], False, TYPE_Linear],
			AttrName_LuckyHitReducePer:[[TYPE_Calc_LuckyHitReducePer], False, TYPE_Linear],
			AttrName_LuckyHitReduce:[[TYPE_Calc_LuckyHitReduce], False, TYPE_Linear],
			AttrName_LuckyHitRateReduce:[[TYPE_Calc_LuckyHitRateReduce], False, TYPE_Linear],
			AttrName_IgnoreDefRate:[[TYPE_Calc_IgnoreDefRate], False, TYPE_Linear],
			AttrName_IgnoreDefRateReduce:[[TYPE_Calc_IgnoreDefRateReduce], False, TYPE_Linear],
			@@ -4185,8 +4094,8 @@
			ShareDefine.Def_Effect_FaintDefRate:[[TYPE_Calc_FaintDefRate], False, TYPE_Linear],
			ShareDefine.Def_Effect_SkillAtkRate:[[TYPE_Calc_SkillAtkRate], False, TYPE_Linear],
			ShareDefine.Def_Effect_SkillAtkRateReduce:[[TYPE_Calc_SkillAtkRateReduce], False, TYPE_Linear],
			ShareDefine.Def_Effect_DamagePer:[[TYPE_Calc_DamagePer], False, TYPE_Linear],
			ShareDefine.Def_Effect_DamReducePer:[[TYPE_Calc_AttrDamReduce], False, TYPE_Linear],
			ShareDefine.Def_Effect_DamagePVP:[[TYPE_Calc_DamagePVP], False, TYPE_Linear],
			ShareDefine.Def_Effect_DamagePVPReduce:[[TYPE_Calc_DamagePVPReduce], False, TYPE_Linear],
			ShareDefine.Def_Effect_DamagePerPVP:[[TYPE_Calc_DamagePerPVP], False, TYPE_Linear],
			ShareDefine.Def_Effect_DamagePerPVPReduce:[[TYPE_Calc_DamagePerPVPReduce], False, TYPE_Linear],
			ShareDefine.Def_Effect_ComboRate:[[TYPE_Calc_ComboRate], False, TYPE_Linear],
			@@ -4213,12 +4122,12 @@
			AttrName_JobBAtkReducePer:[[TYPE_Calc_JobBAtkReducePer], False, TYPE_Linear],
			AttrName_JobCAtkReducePer:[[TYPE_Calc_JobCAtkReducePer], False, TYPE_Linear],
			AttrName_GreatHitReducePer:[[TYPE_Calc_GreatHitReducePer], False, TYPE_Linear],
			AttrName_SuperHitReducePer:[[TYPE_Calc_SuperHitReducePer], False, TYPE_Linear],
			AttrName_SuperHitReduce:[[TYPE_Calc_SuperHitReduce], False, TYPE_Linear],
			AttrName_GreatHitRateReduce:[[TYPE_Calc_GreatHitRateReduce], False, TYPE_Linear],
			AttrName_SuperHitRateReduce:[[TYPE_Calc_SuperHitRateReduce], False, TYPE_Linear],
			ShareDefine.Def_Effect_SuperHitRateReduce:[[TYPE_Calc_SuperHitRateReduce], False, TYPE_Linear],
			AttrName_DamReducePer:[[TYPE_Calc_AttrDamReduce], False, TYPE_Linear],
			AttrName_DamagePer:[[TYPE_Calc_DamagePer], False, TYPE_Linear],
			AttrName_DamagePVPReduce:[[TYPE_Calc_DamagePVPReduce], False, TYPE_Linear],
			AttrName_DamagePVP:[[TYPE_Calc_DamagePVP], False, TYPE_Linear],
			AttrName_FinalHurtPer:[[TYPE_Calc_FinalHurtPer], False, TYPE_Linear],
			AttrName_FuhaoHitRate:[[TYPE_Calc_FuhaoHitRate], False, TYPE_Linear],
			ShareDefine.Def_Effect_FinalHurt:[[TYPE_Calc_FinalHurt], False, TYPE_Linear],
			@@ -4245,20 +4154,31 @@
			ShareDefine.Def_Effect_ProDefAbsorb:[[TYPE_Calc_ProDefAbsorb], False, TYPE_Linear],
			ShareDefine.Def_Effect_OnlyFinalHurt:[[TYPE_Calc_OnlyFinalHurt], False, TYPE_Linear],
			ShareDefine.Def_Effect_PVPAtkBackHP:[[TYPE_Calc_PVPAtkBackHP], False, TYPE_Linear],

			ShareDefine.Def_Effect_NormalHurt:[[TYPE_Calc_NormalHurt], False, TYPE_Linear],
			ShareDefine.Def_Effect_NormalHurtPer:[[TYPE_Calc_NormalHurtPer], False, TYPE_Linear],
			ShareDefine.Def_Effect_FabaoHurt:[[TYPE_Calc_FabaoHurt], False, TYPE_Linear],
			ShareDefine.Def_Effect_FabaoHurtPer:[[TYPE_Calc_FabaoHurtPer], False, TYPE_Linear],
			ShareDefine.Def_Effect_SuperHitRateReduce:[[TYPE_Calc_SuperHitRateReduce], False, TYPE_Linear], # 暴击概率抗性
			ShareDefine.Def_Effect_LuckyHitReduce:[[TYPE_Calc_LuckyHitReduce], False, TYPE_Linear],# 会心一击伤害固定减伤
			ShareDefine.Def_Effect_DamagePVE:[[TYPE_Calc_DamagePVE], False, TYPE_Linear], # PVE固定伤害
			ShareDefine.Def_Effect_FinalHurtPer:[[TYPE_Calc_FinalHurtPer], False, TYPE_Linear], # 最终伤害万分率
			ShareDefine.Def_Effect_FinalHurtReducePer:[[TYPE_Calc_FinalHurtReducePer], False, TYPE_Linear], # 最终伤害减少万分

			#战斗非线性
			ShareDefine.Def_Effect_SuperHitPer:[[TYPE_Calc_SuperHit], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_LuckyHitPer:[[TYPE_Calc_LuckyHit], False, TYPE_NoLinear], # 会心一击伤害百分比
			ShareDefine.Def_Effect_MaxHPPer:[[TYPE_Calc_AttrMaxHP], False, TYPE_NoLinear],
			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_LuckPer:[[TYPE_Calc_Luck], 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],
			@@ -4351,89 +4271,62 @@
			#刷属性功能分类索引
			CalcAttrFuncList = (
			Def_CalcAttrFunc_RoleBase, # 角色基础 0
			Def_CalcAttrFunc_EquipBaseWeapon, # 武器物品表基础属性 1 - 废弃
			Def_CalcAttrFunc_EquipBaseArmor, # 防具物品表基础属性 2 - 废弃
			Def_CalcAttrFunc_EquipBaseRelics, # 圣器物品表基础属性 3 - 废弃
			Def_CalcAttrFunc_Equip, # 装备其他(传奇属性 + ) 4 - 废弃
			Def_CalcAttrFunc_LingGen, # 灵根 1
			Def_CalcAttrFunc_LingGenQuailty, # 灵根品质附加属性 2
			Def_CalcAttrFunc_Equip, # 装备 3
			Def_CalcAttrFunc_Star, # 升星 4
			Def_CalcAttrFunc_Plus, # 装备位强化 5
			Def_CalcAttrFunc_PlusEx, # 装备位强化累加 6 - 废弃
			Def_CalcAttrFunc_Stone, # 装备宝石 7
			Def_CalcAttrFunc_Suit, # 套装 8 - 废弃
			Def_CalcAttrFunc_Wing, # 翅膀 9
			Def_CalcAttrFunc_Wash, # 洗练 10
			Def_CalcAttrFunc_Pet, # 灵宠 11
			Def_CalcAttrFunc_Horse, # 坐骑 12
			Def_CalcAttrFunc_Prestige, # 境界 13
			Def_CalcAttrFunc_GodWeapon, # 神兵 14
			Def_CalcAttrFunc_Dienstgrad, # 称号 15
			Def_CalcAttrFunc_Rune, # 符印 16
			Def_CalcAttrFunc_17, #
			Def_CalcAttrFunc_MagicWeapon1, # 人族法宝属性 18
			Def_CalcAttrFunc_EquipOutOfPrint, # 绝版属性随等级变化 19
			Def_CalcAttrFunc_EquipAllStars, # 装备全身星级属性 20 - 废弃
			Def_CalcAttrFunc_Success, # 成就属性 21
			Def_CalcAttrFunc_VIP, # VIP属性 22
			Def_CalcAttrFunc_Stove, # 炼丹炉 23
			Def_CalcAttrFunc_FamilyTech, # 仙盟心法 24
			Def_CalcAttrFunc_MagicWeapon2, # 魔族法宝属性 25
			Def_CalcAttrFunc_EquipDecompose, # 装备分解属性 26
			Def_CalcAttrFunc_MagicWeapon3, # 仙族法宝属性 27
			Def_CalcAttrFunc_PetSoul, # 宠物魂石 28
			Def_CalcAttrFunc_HorseSoul, # 坐骑魂石 29
			Def_CalcAttrFunc_HorseSkill, # 坐骑技能属性 30
			Def_CalcAttrFunc_PetSkill, # 宠物技能属性 31
			Def_CalcAttrFunc_StoveYao, # 炼丹炉丹药 32
			Def_CalcAttrFunc_PetSign, # 宠物签到 33
			Def_CalcAttrFunc_MagicWeaponSoul, # 法宝之魂属性34
			Def_CalcAttrFunc_Dogz, # 神兽35
			Def_CalcAttrFunc_DogzBattleSkill, # 助战神兽技能36
			Def_CalcAttrFunc_DogzEquip, # 神兽装备37
			Def_CalcAttrFunc_DogzEquipPlus, # 神兽装备强化38
			Def_CalcAttrFunc_GatherSoul, # 聚魂39
			Def_CalcAttrFunc_MagicWeapon4, # 王者法宝40
			Def_CalcAttrFunc_Coat, # ʱװ41
			Def_CalcAttrFunc_ZXEquip, # 诛仙装备42
			Def_CalcAttrFunc_ZXEquipSuit, # 诛仙装备套装43 - 废弃
			Def_CalcAttrFunc_ZXEquipStone, # 诛仙宝石属性44 - 废弃
			Def_CalcAttrFunc_45,
			Def_CalcAttrFunc_Equip1, # 境界装备1阶 46
			Def_CalcAttrFunc_Equip2, # 境界装备2阶 47
			Def_CalcAttrFunc_Equip3, # 境界装备3阶 48
			Def_CalcAttrFunc_Equip4, # 境界装备4阶 49
			Def_CalcAttrFunc_Equip5, # 境界装备5阶 50
			Def_CalcAttrFunc_Equip6, # 境界装备6阶 51
			Def_CalcAttrFunc_Equip7, # 境界装备7阶 52
			Def_CalcAttrFunc_Equip8, # 境界装备8阶 53
			Def_CalcAttrFunc_Equip9, # 境界装备9阶 54
			Def_CalcAttrFunc_Equip10, # 境界装备10阶 55
			Def_CalcAttrFunc_Equip11, # 境界装备11阶 56
			Def_CalcAttrFunc_Equip12, # 境界装备12阶 57
			Def_CalcAttrFunc_Equip13, # 境界装备13阶 58
			Def_CalcAttrFunc_Equip14, # 境界装备14阶 59
			Def_CalcAttrFunc_Equip15, # 境界装备15阶 60
			) = range(61)
			Def_CalcAttrFunc_Stone, # 装备宝石 6
			Def_CalcAttrFunc_Wash, # 洗练 7
			Def_CalcAttrFunc_Wing, # 翅膀 8
			Def_CalcAttrFunc_Pet, # 灵宠 9
			Def_CalcAttrFunc_Horse, # 坐骑 10
			Def_CalcAttrFunc_Prestige, # 境界 11
			Def_CalcAttrFunc_GodWeapon, # 神兵 12
			Def_CalcAttrFunc_Dienstgrad, # 称号 13
			Def_CalcAttrFunc_Rune, # 符印 14
			Def_CalcAttrFunc_EquipOutOfPrint, # 绝版属性随等级变化 15
			Def_CalcAttrFunc_Success, # 成就属性 16
			Def_CalcAttrFunc_VIP, # VIP属性 17
			Def_CalcAttrFunc_Stove, # 炼丹炉 18(废弃)
			Def_CalcAttrFunc_FamilyTech, # 仙盟心法 19
			Def_CalcAttrFunc_EquipDecompose, # 装备分解属性 20
			Def_CalcAttrFunc_PetSoul, # 宠物魂石 21
			Def_CalcAttrFunc_HorseSoul, # 坐骑魂石 22
			Def_CalcAttrFunc_HorseSkill, # 坐骑技能属性 23
			Def_CalcAttrFunc_PetSkill, # 宠物技能属性 24
			Def_CalcAttrFunc_StoveYao, # 炼丹炉丹药 25
			Def_CalcAttrFunc_PetSign, # 宠物签到 26
			Def_CalcAttrFunc_Dogz, # 神兽 27
			Def_CalcAttrFunc_DogzBattleSkill, # 助战神兽技能 28
			Def_CalcAttrFunc_DogzEquip, # 神兽装备 29
			Def_CalcAttrFunc_DogzEquipPlus, # 神兽装备强化 30
			Def_CalcAttrFunc_GatherSoul, # 聚魂 31
			Def_CalcAttrFunc_MagicWeapon1, # 人族法宝属性 32
			Def_CalcAttrFunc_MagicWeapon2, # 魔族法宝属性 33
			Def_CalcAttrFunc_MagicWeapon3, # 仙族法宝属性 34
			Def_CalcAttrFunc_MagicWeapon4, # 王者法宝 35
			Def_CalcAttrFunc_Coat, # ʱװ 36
			) = range(37)

			# 在此列表中的功能属性，不享受百分比加成，--属性参与战力计算
			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
			]

			# 在此列表中的功能属性，不享受百分比加成，--属性不参与战力计算，战力由技能配置决定
			CalcAttrExFuncListNoFightPower = [Def_CalcAttrFunc_HorseSkill, Def_CalcAttrFunc_PetSkill, Def_CalcAttrFunc_DogzBattleSkill]

			# 技能功能点列表 - 默认不算战力，不享受百分比加成，技能功能点暂时配置，之后优化技能属性逻辑后可去掉
			CalcAttrFuncSkillList = [Def_CalcAttrFunc_HorseSkill, Def_CalcAttrFunc_PetSkill, Def_CalcAttrFunc_DogzBattleSkill]
			# 不计算战力的功能点列表 - 由其他方式计算的战力的功能点，如装备用评分计算
			CalcAttrFuncNoFightPowerList = [Def_CalcAttrFunc_Equip, Def_CalcAttrFunc_DogzEquip]

			#战斗力分组类型对应功能点属性分类索引列表，并不是一一对应的，有些战斗力类型可由多个功能点组成
			#*注意*: 以下功能点需包含上面定义的所有功能点，不然会导致有些属性无法加上
			MFPTypeAttrFuncIndexDict = {ShareDefine.Def_MFPType_Role:[Def_CalcAttrFunc_RoleBase],
			# 因为装备评分和实际战力一直出现不匹配的情况，所以装备战力修改为直接由装备评分做为参数计算战力，所以装备评分计算的所有属性不列入战力计算，祥见评分计算函数 ItemCommom.CalcEquipGS
			# ShareDefine.Def_MFPType_Equip:[Def_CalcAttrFunc_EquipOutOfPrint],
			ShareDefine.Def_MFPType_Equip:[Def_CalcAttrFunc_Equip, Def_CalcAttrFunc_EquipOutOfPrint],
			ShareDefine.Def_MFPType_LingGen:[Def_CalcAttrFunc_LingGenQuailty, Def_CalcAttrFunc_LingGen],
			ShareDefine.Def_MFPType_Star:[Def_CalcAttrFunc_Star],
			ShareDefine.Def_MFPType_Plus:[Def_CalcAttrFunc_Plus],
			ShareDefine.Def_MFPType_Stone:[Def_CalcAttrFunc_Stone],
			ShareDefine.Def_MFPType_Wing:[Def_CalcAttrFunc_Wing],
			ShareDefine.Def_MFPType_Wash:[Def_CalcAttrFunc_Wash],
			ShareDefine.Def_MFPType_Pet:[Def_CalcAttrFunc_Pet, Def_CalcAttrFunc_PetSign],
			ShareDefine.Def_MFPType_Pet:[Def_CalcAttrFunc_Pet, Def_CalcAttrFunc_PetSign, Def_CalcAttrFunc_PetSkill],
			ShareDefine.Def_MFPType_PetSoul:[Def_CalcAttrFunc_PetSoul],
			ShareDefine.Def_MFPType_Horse:[Def_CalcAttrFunc_Horse],
			ShareDefine.Def_MFPType_Horse:[Def_CalcAttrFunc_Horse, Def_CalcAttrFunc_HorseSkill],
			ShareDefine.Def_MFPType_HorseSoul:[Def_CalcAttrFunc_HorseSoul],
			ShareDefine.Def_MFPType_Prestige:[Def_CalcAttrFunc_Prestige],
			ShareDefine.Def_MFPType_GodWeapon:[Def_CalcAttrFunc_GodWeapon],
			@@ -4444,27 +4337,9 @@
			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],
			# 诛仙装备战力、神兽战力同装备模块战力一致，受评分影响，装备评分相关的战力另外算
			ShareDefine.Def_MFPType_Dogz:[Def_CalcAttrFunc_Dogz, Def_CalcAttrFunc_DogzEquipPlus],
			#ShareDefine.Def_MFPType_ZhuXian:[Def_CalcAttrFunc_ZXEquipSuit, Def_CalcAttrFunc_ZXEquipStone],
			ShareDefine.Def_MFPType_Equip1:[Def_CalcAttrFunc_Equip1],
			ShareDefine.Def_MFPType_Equip2:[Def_CalcAttrFunc_Equip2],
			ShareDefine.Def_MFPType_Equip3:[Def_CalcAttrFunc_Equip3],
			ShareDefine.Def_MFPType_Equip4:[Def_CalcAttrFunc_Equip4],
			ShareDefine.Def_MFPType_Equip5:[Def_CalcAttrFunc_Equip5],
			ShareDefine.Def_MFPType_Equip6:[Def_CalcAttrFunc_Equip6],
			ShareDefine.Def_MFPType_Equip7:[Def_CalcAttrFunc_Equip7],
			ShareDefine.Def_MFPType_Equip8:[Def_CalcAttrFunc_Equip8],
			ShareDefine.Def_MFPType_Equip9:[Def_CalcAttrFunc_Equip9],
			ShareDefine.Def_MFPType_Equip10:[Def_CalcAttrFunc_Equip10],
			ShareDefine.Def_MFPType_Equip11:[Def_CalcAttrFunc_Equip11],
			ShareDefine.Def_MFPType_Equip12:[Def_CalcAttrFunc_Equip12],
			ShareDefine.Def_MFPType_Equip13:[Def_CalcAttrFunc_Equip13],
			ShareDefine.Def_MFPType_Equip14:[Def_CalcAttrFunc_Equip14],
			ShareDefine.Def_MFPType_Equip15:[Def_CalcAttrFunc_Equip15],
			ShareDefine.Def_MFPType_Dogz:[Def_CalcAttrFunc_Dogz, Def_CalcAttrFunc_DogzEquip, Def_CalcAttrFunc_DogzEquipPlus, Def_CalcAttrFunc_DogzBattleSkill],
			ShareDefine.Def_MFPType_Other:[Def_CalcAttrFunc_Success, Def_CalcAttrFunc_FamilyTech, Def_CalcAttrFunc_EquipDecompose],
			}

			@@ -4520,7 +4395,7 @@
			TriggerType_AttackOverPassive, # 攻击（对敌技能）后被动技能被触发在其他被动效果处理后调用，触发顺序原因 47
			TriggerType_Buff_BeAttackSubLayer, # BUFF类：被攻击减buff层，0消失 48
			TriggerType_OneDamage, # 伤害降低到1点 49
			TriggerType_LuckyHit, # 会心一击时增加会心伤害百分比 50
			TriggerType_LuckyHit, # 会心一击时增加会心伤害固定值 50
			TriggerType_ChangeHurtToHP, # 把受到伤害的xx%转化为生命值 51
			TriggerType_AddLayer, # BUFF层级增加时 52
			TriggerType_ForbidenCure, # 禁止治疗 53
			@@ -4537,11 +4412,14 @@
			TriggerType_BeLuckyHit, # 被会心一击触发技能 64
			TriggerType_BeLuckyHitSubPer, # 减少受到的会心伤害 65
			TriggerType_ZhongjiZhansha, # 终极斩杀 66
			) = range(1, 67)
			TriggerType_SuperHitSubLayer, # 暴击减层 67
			TriggerType_SuperHitSkipCD, # 暴击无冷却 68
			TriggerType_BuffHurtCnt, # 当持续buff伤害第X次时触发技能 69
			TriggerType_4074PerValue, # 特殊效果的加成 70
			TriggerType_dFinalHurtReducePer, # 防守方的最终伤害减少百分比 71
			TriggerType_IsDealy, # 是否触发致命一击 72 暂且理解为和概率是独立，有新概念产生则重定义
			) = range(1, 73)


			# NPC功能类型定义
			Def_NPCFuncType_Goblin = 70 # 盗宝哥布林

			#不可以佩戴翅膀的地图
			CanNotWearWingMapIDList = []
			@@ -4593,18 +4471,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)

			##==================================================================================================
			#游戏消费点类型定义
			@@ -4654,6 +4523,8 @@
			Def_Cost_LuckyTreasure, #幸运鉴宝
			Def_Cost_MysteryShopRefresh, # 神秘商店刷新
			Def_Cost_AuctionBid, # 拍卖行竞价
			Def_Cost_BuyDailyActionCnt, # 购买活动次数
			Def_Cost_FBBuyBuff, # 副本买buff
			#-----------以下为暂时没用的，先不删除，如有新增消费点则放在这些之前------------
			Def_Cost_RefreshArrestTask, # 刷新悬赏任务
			Def_Cost_OffLineExp, # 兑换离线经验
			@@ -4661,28 +4532,18 @@
			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

			# 消费返利不处理的消费类型列表
			CostRebate_DisableType = [Def_Cost_BourseBuy, Def_Cost_BourseCharge, Def_Cost_FreeGoods, Def_Cost_FamilyRedPacket,
			Def_Cost_Unknown, "GMSetMoney", "Warehouse", Def_Cost_AuctionBid]
			CostProfit_CostType = [Def_Cost_BourseBuy, Def_Cost_BourseCharge, Def_Cost_Unknown,
			"GMSetMoney", "Warehouse", Def_Cost_AuctionBid]

			# 消费VIP不处理的消费类型列表
			CostVIP_CostType = [Def_Cost_BourseBuy, Def_Cost_BourseCharge, Def_Cost_Unknown,
			"GMSetMoney", "Warehouse", Def_Cost_AuctionBid]

			# 可在跨服中消费的类型列表
			MergeServerCanCostType = [Def_Cost_UseSpeaker, Def_Cost_Revive, Def_Cost_FBEncourage]
			@@ -4720,7 +4581,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",
			@@ -4737,9 +4597,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",
			Def_Cost_Rename:"Rename",
			Def_Cost_SkillLvUp:"SkillLvUp",
			@@ -4758,6 +4615,8 @@
			Def_Cost_LuckyTreasure:"LuckyTreasure",
			Def_Cost_MysteryShopRefresh:"MysteryShopRefresh",
			Def_Cost_AuctionBid:"AuctionBid",
			Def_Cost_BuyDailyActionCnt:"BuyDailyActionCnt",
			Def_Cost_FBBuyBuff:"FBBuyBuff",
			}
			## -----------------------------------------------------

			@@ -4783,8 +4642,8 @@
			Def_GiveMoney_Warehouse, # 仓库
			Def_GiveMoney_SellPackItem, # 出售背包物品
			Def_GiveMoney_CollectNPC, # 采集NPC
			Def_GiveMoney_HighLadder, # 天梯竞技场 20
			Def_GiveMoney_StallItem, # 摆摊
			Def_GiveMoney_20,
			Def_GiveMoney_21,
			Def_GiveMoney_Trade, # 交易
			Def_GiveMoney_Truck, # 运镖
			Def_GiveMoney_FreeGoods, # 极品白拿
			@@ -4818,8 +4677,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",
			Def_GiveMoney_FreeGoods:"FreeGoods",
			@@ -5105,8 +4962,9 @@
			ntDestructible, #场景内可破坏的 19
			ntHelpBattleRobot, #助战机器人 20
			ntRobot, #机器人21
			ntMonsterTime, #按时间掉血的怪物 22
			ntMax
			) = range(23)
			) = range(24)


			(Def_SkillFuncType_Common, #0为通用技能
			@@ -5226,7 +5084,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
			@@ -5244,7 +5102,8 @@
			Def_RewardType_NewFairyCParty, # 新仙界盛典全民来嗨24
			Def_RewardType_FeastWeekPartyAct, # 领取节日巡礼活动奖励25
			Def_RewardType_FeastWeekPartyPoint, # 领取节日巡礼积分奖励26
			)= range(27)
			Def_RewardType_FairyAdventuresAward, #缥缈奇遇领取27
			)= range(28)


			#boss复活相关活动定义