SnxxServerCode.git

			@@ -62,13 +62,19 @@
			(
			Def_Buff_Replace_Better, # 相同typeid取最高，如果新的是低级的则不处理
			Def_Buff_Replace_New, # 相同typeid替换最新，即使是低级的
			Def_Buff_Coexist, # 不同的释放者可共存
			Def_Buff_Recharge, # 若同类型buff存在不管等级高低，只给原buff充能只改变值或时间
			) = range(3)

			# CanRepeatTime字段百位数，同一个释放者只能存在同一个技能buff，不同释放者根据情况而定
			(
			Def_Buff_Coexist, # 不同的释放者可共存，默认可同时存在
			Def_Buff_NoCoexist, # 不同的释放者亦不可共存，假设战士给别人加攻击buff，A战士加1级攻击BUFF，B战士加2级攻击BUFF，那么只能存在一个高级的2级攻击BUFF
			) = range(2)

			Def_BuffValue_Count = 3 # buff记录的value个数

			#游戏对象属性--------------------------------------------
			Def_Calc_AllAttrType_MAX = 132
			Def_Calc_AllAttrType_MAX = 135
			#基本属性BUFF计算，顺序与 ObjProperty_AttrByIndex 对应，同时也为buff效果ID同步通知策划
			TYPE_Calc_AttrList = (
			TYPE_Calc_Metal, # 金 1
			@@ -211,9 +217,12 @@
			TYPE_Calc_NormalHurtPer, # 普通攻击加成
			TYPE_Calc_FabaoHurt, # 法宝技能增伤
			TYPE_Calc_FabaoHurtPer, # 法宝技能加成
			TYPE_Calc_SuperHitPer, # 暴击伤害万分率加成
			TYPE_Calc_LuckyHitPer, # 会心一击伤害万分率加成 130
			TYPE_Calc_FinalHurtReducePer, # 最终伤害减少百分比
			TYPE_Calc_YinjiTime, # 每X秒自动消失一个印记 130
			TYPE_Calc_TheFBSkillsCD, # 减少指定技能组CD XX%
			TYPE_Calc_BurnValue, # 灼烧固定伤害
			TYPE_Calc_BurnTimePer, # 延长灼烧时间百分比
			TYPE_Calc_SubSpeedPer, # 减移动速度百分比
			) = range(1, Def_Calc_AllAttrType_MAX)


			@@ -440,6 +449,7 @@
			Def_Effect_ItemGiveHonor = 242 #使用道具给予荣誉
			Def_Effect_ItemGiveWeekPartyPoint = 245 #使用道具给予七日巡礼积分
			Def_Effect_ItemGiveWeekPartyPoint1 = 246 #使用道具给予节日巡礼积分
			Def_Effect_AddRealmExpRate = 251 #增加聚灵效率
			#----以下未使用或代码依然存在的---
			Def_Effect_ItemGiveGongXun = 1920 #使用道具给予功勋
			Def_Effect_ItemGiveRuneJH = 1925 #使用道具给予符印精华
			@@ -565,6 +575,7 @@
			Def_Skill_Effect_SummonAttr = 1013 # 召唤兽属性
			Def_Skill_Effect_BoomSeedID = 1014 # 引爆BUFF种子
			Def_Skill_Effect_ReCD = 1016 # 重置CD
			Def_Skill_Effect_Burn = 1034 # 灼烧
			Def_Skill_Effect_RandWarn = 1061 # 随机预警
			Def_Skill_Effect_AttackReplaceByNPCSeries = 1062 # 对指定系的伤害
			Def_Skill_Effect_AvgHurtFMCnt = 1064 # NPC技能按仙盟成员数均摊伤害
			@@ -572,7 +583,8 @@
			Def_Skill_Effect_PowerPart = 1206 # 充能能量分段，触发即算一次充能，拉进度条蓄力
			Def_Skill_Effect_ProcessAttack = 1314 # 间隔性攻击，A值为攻击次数，B值为是否广播客户端
			Def_Skill_Effect_BuffTick = 9999 #BUFF的时间处理间隔
			Def_Skill_Effect_ProBloodPer = 4505 #buff中中毒伤害百分比增加（给受害者的buff）
			Def_Skill_Effect_BurnToAddHP = 1091 #buff中灼烧伤害转化吸血给放灼烧者


			#写死的技能效果ID------------NPC专用
			Def_Skill_Effect_AttackMove = 2100 # NPC位移战斗
			@@ -618,7 +630,8 @@


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

			#基础属性效果ID
			@@ -634,9 +647,6 @@
			# 非线性增加
			#1015:("NoLinePlus", [TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax]), # 提高攻击力百分比

			# 非线性减少
			#1098:("NoLineReduce", [TYPE_Calc_AttrATKMax, TYPE_Calc_AttrATKMin,
			# TYPE_Calc_AttrMATKMax, TYPE_Calc_AttrMATKMin]), # 降低攻击百分比

			# 根据等级段线性增加，效果B值为等级段配置
			500:("LinePlusByLV", [TYPE_Calc_HPCureEnhance]), # 提高血瓶恢复效果
			@@ -753,7 +763,8 @@
			Def_HurtType_Zhuxian, # 诛仙一击 13
			Def_HurtType_ZhognjiZhansha, # 终极斩杀 14
			Def_HurtType_DeadlyHit, # 致命一击 15
			) = range(1, 16)
			Def_HurtType_ThumpHit, # 重击 16
			) = range(1, 17)
			#Def_HurtType_SuckBlood, # 吸血

			(
			@@ -780,6 +791,10 @@
			Def_HurtType_SuperHit, # 暴击 7
			Def_HurtType_LuckyHit, # 会心一击伤害 8
			Def_HurtType_RealmSupress, # 境界压制 11

			Def_HurtType_Zhuxian, # 诛仙一击 13
			Def_HurtType_DeadlyHit, # 致命一击 15
			Def_HurtType_ThumpHit, # 重击 16
			]

			#---------------------------------------------------------------------
			@@ -1149,6 +1164,7 @@
			Def_Skill_HappenState_HitOn = 0x0001 # 必命中
			Def_Skill_HappenState_SuperHit = 0x0002 # 必暴击
			Def_Skill_HappenState_LuckyHit = 0x0004 # 必会心一击
			Def_Skill_HappenState_ThumpHit = 0x0008 # 必重击


			#技能施法目标
			@@ -1248,7 +1264,7 @@
			Def_SkillType_PassivePlsBuff, #被动触发增益类buff 16
			Def_SkillType_PassiveDepBuff, #被动触发减益类buff 17
			Def_SkillType_PassiveActionBuff, #被动触发的控制类buff 18
			Def_SkillType_PassiveBuff, # 被动BUFF 19
			Def_SkillType_PassiveBuff, # 被动BUFF 19 (废弃，无此定义分散为其他buff)
			Def_SkillType_AttrSkill, # 属性类技能 20
			Def_SkillType_PassiveLstPlsBuff, #被动触发持续增益类buff 21
			Def_SkillType_PassiveLstDepBuff, #被动触发持续减益类buff 22
			@@ -1263,7 +1279,7 @@
			Def_SkillType_LstDepBuff : IPY_GameWorld.bfProcessDeBuff , #持续减益BUFF 4
			Def_SkillType_PlsBuff : IPY_GameWorld.bfBuff , #增益BUFF 5
			Def_SkillType_DepBuff : IPY_GameWorld.bfDeBuff , #减益BUFF 6
			Def_SkillType_PassiveBuff : IPY_GameWorld.btPassiveBuf, # 被动技能 7
			Def_SkillType_PassiveBuff : IPY_GameWorld.btPassiveBuf, # 被动技能 7 (废弃，无此定义分散为其他buff)
			Def_SkillType_Revive : IPY_GameWorld.bfIncBuff, #复活 8
			Def_SkillType_Increment : IPY_GameWorld.bfIncBuff, #增值技能（不可清除）9
			Def_SkillType_Aura : IPY_GameWorld.bfAura , #光环技能 10
			@@ -1308,6 +1324,9 @@
			Def_SkillType_Aura , #光环技能 10
			Def_SkillType_Summon , #召唤 13
			]

			# 玩家独有的，NPC没有这些接口
			Def_BuffType_OnlyPlayer = [IPY_GameWorld.bfIncBuff, IPY_GameWorld.btPassiveBuf, IPY_GameWorld.bfEquipBuff, IPY_GameWorld.bfMapBuff]

			# Buff层级增减定义
			Def_BuffLayer_Add = 0 # 每次触发层级递增
			@@ -1752,8 +1771,8 @@
			Def_FBMapID_SealDemonEx = 52020
			#诛仙BOSS
			Def_FBMapID_ZhuXianBoss = 31380
			#诛仙塔
			Def_FBMapID_ZhuXianTower = 31370
			#天星塔
			Def_FBMapID_SkyTower = 31370
			#仙魔之争
			Def_FBMapID_XMZZ = 31010
			#神兽副本
			@@ -1783,7 +1802,15 @@
			RegisterEnter_CrossServerMapIDList = [Def_FBMapID_CrossPenglai, Def_FBMapID_CrossDemonKing, Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian]
			#跨服地图
			Def_CrossMapIDList = [Def_FBMapID_CrossRealmPK, Def_FBMapID_CrossPenglai, Def_FBMapID_CrossDemonKing, Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian]
			#跨服分区对应地图配置表名
			#跨服分区类型配置, 没配置的默认 CrossZoneComm
			Def_CrossZoneTypeName = {0:"CrossZoneComm", # 特殊0，默认常规分区
			Def_FBMapID_CrossPenglai:"CrossZoneComm",
			Def_FBMapID_CrossRealmPK:"CrossZonePK",
			Def_FBMapID_CrossDemonKing:"CrossZonePK",
			Def_FBMapID_CrossGrasslandLing:"CrossZonePK",
			Def_FBMapID_CrossGrasslandXian:"CrossZonePK",
			}
			#跨服分区对应地图配置表名 - 仅适用于固定地图及虚拟分线的跨服玩法
			Def_CrossZoneMapTableName = {Def_FBMapID_CrossPenglai:"CrossPenglaiZoneMap",
			}
			#需要动态分配线路的跨服地图
			@@ -1882,7 +1909,7 @@
			'CrossGrassland':[Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian], #草园
			'GatherSoul':[Def_FBMapID_GatherSoul],#聚魂副本
			'ZhuXianBoss':[Def_FBMapID_ZhuXianBoss],#诛仙BOSS
			'ZhuXianTower':[Def_FBMapID_ZhuXianTower],#诛仙塔
			'SkyTower':[Def_FBMapID_SkyTower],#天星塔
			'AllFamilyBoss':[Def_FBMapID_AllFamilyBoss],#多仙盟BOSS
			'HorsePetBoss':[Def_FBMapID_HorsePetBoss],#骑宠BOSS
			'FairyTreasure':[Def_FBMapID_FairyTreasure],#缥缈宝藏
			@@ -2381,6 +2408,8 @@
			EquipPlace_Special = [ShareDefine.retNeck, ShareDefine.retFairyCan, ShareDefine.retFairyCan2, ShareDefine.retJade]
			## 装备位 - 所有基础
			EquipPlace_Base = EquipPlace_BaseWeapon + EquipPlace_BaseArmor
			## 装备位 - 灵器
			EquipPlace_LingQi = [ShareDefine.retWing, ShareDefine.retGuard1, ShareDefine.retPeerlessWeapon, ShareDefine.retPeerlessWeapon2]

			#装备物品位置,不需要重刷属性
			EquipItemNoRefreshState = [
			@@ -2392,15 +2421,14 @@

			# 需要广播外观的装备部位(除了境界装备3部位)
			Def_SyncEquipStateByIndex = [
			ShareDefine.retWing, #11 翅膀
			ShareDefine.retWing, #13 翅膀
			ShareDefine.retGuard1, #14 守护1
			ShareDefine.retHorse, #19 坐骑
			]

			#---------------------------------------------------------------------
			#特殊物品光环，永久存在
			Def_SuperBuffList = [
			]
			Def_SuperBuffList = []

			#------------------------------------------------------------

			@@ -2977,6 +3005,7 @@
			Def_NPC_Dict_TimeLostHPTick = 'TimeLostHPTick' # 上次按时间掉血tick
			Def_NPC_Dict_TimeLostHPPlayerCountTick = 'TimeLostHPPlayerCountTick ' # 上次刷新按时间掉血人数tick
			Def_NPC_Dict_TimeLostHPPlayerCount = 'TimeLostHPPlayerCount' # 按时间掉血有效人数
			Def_NPC_Dict_TimeLostHPFightPower = 'TimeLostHPFightPower' # 按时间掉血战力

			#玩家状态定义，不能超过31个，如超过，需扩展多个key支持
			Def_PlayerStateList = (
			@@ -2993,22 +3022,32 @@
			Def_PlayerState_LimitSkill, # 禁魔状态 10
			Def_PlayerState_LimitAddHP, # 禁疗状态 11
			Def_PlayerState_Blind, # 致盲状态 12
			Def_PlayerState_LoseBlood1, # 职业1持续掉血状态 13
			Def_PlayerState_Burn, # 灼烧 13
			Def_PlayerState_LoseBlood2, # 职业2持续掉血状态 14
			Def_PlayerState_LoseBlood3, # 职业3持续掉血状态 15
			Def_PlayerState_MissSneerAtk, # 对嘲讽攻击免疫表现为miss 16
			Def_PlayerState_BeInAir, # 浮空（做法同眩晕类） 17
			) = range(18)
			Def_PlayerState_zqdlj, # 紫气东来金灵根技能状态 18
			Def_PlayerState_Ice, # 寒冰状态（同减速） 19
			) = range(20)

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

			#---SetDict 玩家字典KEY，不存于数据库---
			# key的长度不能超过29个字节
			Def_PlayerKey_BurnOwnerID = "burnOwnerID" # 灼烧BUFF特殊处理，部分buff跟随灼烧消失
			Def_PlayerKey_SkillInDelBuff = "SkillInDelBuff" # buff中释放技能添加buff要特殊记录给后续处理，直接删除/添加会导致错乱
			Def_PlayerKey_TheFBSkillsCD = "TheFBSkillsCD" # 减少指定技能组CD XX%
			Def_PlayerKey_BurnValue = "BurnValue" # 灼烧固定伤害
			Def_PlayerKey_BurnTimePer = "BurnTimePer" # 延长灼烧时间百分比
			Def_PlayerKey_SubSpeedPer = "SubSpeedPer" # 减移动速度百分比
			Def_PlayerKey_YinjiCnt = "YinjiCnt" # 当前印记数
			Def_PlayerKey_LostYinjiTime = "LostYinjiTime" # 每X秒自动消失一个印记
			Def_PlayerKey_1314HurtCount = "1314cnt" # 类剑刃风暴技能的1314效果，伤害次数处理
			Def_PlayerKey_FirstDefender = "FDID" # 第一个防守者，只用于比较
			Def_PlayerKey_SelectObjID = "selectID" # 锁定模式选中，不用SetActionObj
			Def_PlayerKey_SelectObjType = "selectType" # 锁定模式选中
			Def_PlayerKey_LuckyHitPer = "LuckyHitPer" # 会心一击伤害万分率
			Def_PlayerKey_SuperHitPer = "SuperHitPer" # 暴击伤害万分率
			Def_PlayerKey_NormalHurt = "NormalHurt" # 属性普通攻击增伤：普通攻击附加的固定值伤害
			Def_PlayerKey_NormalHurtPer = "NormalHurtPer" # 属性普通攻击加成：普通攻击附加的伤害百分比
			Def_PlayerKey_FabaoHurt = "FabaoHurt" # 属性法宝技能增伤：法宝技能攻击附加的固定值伤害
			@@ -3021,26 +3060,24 @@
			Def_PlayerKey_LockHPSkillID = "LockHPSkillID" # 锁血功能的技能
			Def_PlayerKey_GodWeaponBeforeProDef = "GWBPD" # 神兵护盾被攻击前的值
			Def_PlayerKey_curHurtValue = "curHurtValue" # 计算中的临时伤害值，技能特殊用
			Def_PlayerKey_DefenderObjID = "DefenderObjID" # 后续触发技能需要用到的对象ID，暂用于玩家
			Def_PlayerKey_SomersaultTime = "Somersault" # 翻滚一定时间内无敌，表现为MISS
			Def_PlayerKey_CopyFuncAttr = "CopyFuncAttr%s" # 玩家属性刷新中的计算属性缓存，便于buff刷新计算
			Def_Player_RefreshAttrByBuff = "PlayerAttrByBuff" # 玩家属性刷新功能属性缓存，便于buff刷新计算, 间隔刷新
			Def_Player_HadRefreshAttr = "HadRefreshAttr" # 玩家在本地图是否刷新过属性
			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
			Def_PlayerKey_AttackFollowMaster = "FollowAtk" # 召唤兽跟随攻击
			Def_PlayerKey_MoreHurtValue = "MoreHurtValue" # 额外的伤害值，一般用于不走公式
			Def_PlayerKey_BloodShiledHurt = "BSHurt" # 伤害值用于血盾抵消
			Def_PlayerKey_AbsorbShieldValue = "AbsorbShieldValue" # 麒麟盾吸收减免伤害百分比
			Def_PlayerKey_AbsorbValue = "AbsorbValue" # 麒麟盾吸收的单次伤害
			Def_PlayerKey_StartEquipCnt = "StartEquipCnt" # 珍品数量
			Def_PlayerKey_TJGPackFullAfterEat = "TJGFullEat" # 脱机挂吞噬后背包依然满的情况
			Def_PlayerKey_TJGStartTime = "TJGStartTime" # 脱机挂结算时间起点
			Def_PlayerKey_EquipTime = "EquipTime" # 时效装备
			Def_PlayerKey_PowerPartTime = "PowerPartTime" # 蓄力每次消耗时间，因攻速改变
			Def_PlayerKey_PowerPartCount = "PowerPartCount" # 蓄力技能能量次数
			Def_PlayerKey_ClientMaxHurtValue = "CMaxHValue" # 缓存单次技能攻击的最大伤害, 减少计算量
			Def_Player_RefreshAttr = "Player_RefreshAttr" # 玩家刷新属性标志
			Def_PlayerKey_LoadMapIsLogin = 'LoadMapIsLogin' # 本次进入地图是否是登录的
			Def_PlayerKey_NotifyAllAttrState = 'NotifyAllAttrState' # 是否同步过所有属性，切图时第一次刷属性需要同步
			@@ -3062,6 +3099,7 @@
			Def_PlayerKey_TransMoneyType = 'TransMoneyType' # 扣除的金钱类型
			Def_PlayerKey_TransTick = 'TransTick' # 传送tick
			Def_PlayerKey_SyncVIPKillNPCLVInfo = 'SyncVIPKillNPCLVInfo' # 击杀NPC增加VIP杀怪等级经验信息同步开关
			Def_PlayerKey_RequestEnterCrossServerTick = 'RequestEnterCrossServerTick' # 上次请求进入跨服tick

			Def_PlayerKey_FamilyArrestQueryState = 'ArrestQueryState' # 家族悬赏任务完成查询状态
			Def_PlayerKey_Frist_Lock = "Frist_Lock" # 是否接受了任务1
			@@ -3140,11 +3178,7 @@
			Def_PlayerKey_ContendNPCObjID = "ContendNPCObjID" #竞争归属的NPC实例ID
			Def_PlayerKey_AreaRewardMultiple = "AreaRewardMultiple" #玩家所在区域福利倍值，默认1
			Def_PlayerKey_AttrActivatyNotify = "AttrActivatyNotify" # 属性激活提示类型
			Def_PlayerKey_AttrActivatyRecordStarLV = "AttrActivatyRecordStarLV" # 属性激活记录 - 强化星级
			Def_PlayerKey_AttrActivatyRecordStoneLV = "AttrActivatyRecordStoneLV" # 属性激活记录 - 宝石星级
			Def_PlayerKey_AttrActivatyRecordQualityECnt = "AttrActivatyRecordQualityECnt" # 属性激活记录 - 卓越装备件数
			Def_PlayerKey_AttrActivatyRecordSuiteCnt = "AttrActivatyRecordSuiteCnt" # 属性激活记录 - 套装件数
			Def_PlayerKey_AttrActivatyRecordQualityCnt = "AttrActivatyRecordQualityCnt" # 属性激活记录 - 卓越条数
			Def_PlayerKey_EquipOrangeCount = "EquipOrangeCount" # 装备信息 - 橙装及以上件数
			Def_PlayerKey_LastHurt = "PlayerLastHurt" # 最后补刀
			Def_PlayerKey_AddBackHPPer = "AddBackHPPer" #增加生命恢复效果
			Def_PlayerKey_ReduceBackHPPer = "ReduceBackHPPer" #降低生命恢复效果
			@@ -3331,6 +3365,8 @@
			Def_Player_Dict_FBFirstEnterRecord = "FBFEntRec" # 记录副本是否参与过，按位0 1 存储表示
			Def_FBStar_MaxKeyCnt = 5 # 暂时每个副本ID支持9*5个lineID记录
			Def_Player_Dict_ReqFBFuncLine = "ReqFBFuncLine" # 请求进入的副本功能线路
			Def_Player_Dict_ReqCrossFBZoneID = "ReqCrossFBZoneID" # 请求进入跨服的跨服分区ID
			Def_Player_Dict_ReqCrossFBFuncLine = "ReqCrossFBFuncLine" # 请求进入跨服的副本功能线路
			Def_Player_Dict_TeamFBAverageLV = "TeamFBAverageLV" # 请求进入的组队副本平均等级, 临时用，进入副本设置完后删除
			Def_Player_Dict_TeamFBMaxLV = "TeamFBMaxLV" # 请求进入的组队副本最大等级, 临时用，进入副本设置完后删除
			Def_Player_Dict_TeamFBPlayerCnt = "TeamFBPlayerCnt" # 请求进入的组队副本玩家个数, 临时用，进入副本设置完后删除
			@@ -3424,7 +3460,7 @@

			Def_PDict_OnlinePrizeNote = "OnlinePrizeNote%s" # 当日在线奖励领取信息，记录信息参数天数


			Def_PDict_EquipViewCacheState = "EquipViewCacheState" # 本次上线是否同步过装备缓存
			Def_PDict_DayOnlineTime = "OnlineTime" # 当日在线时长
			Def_PDict_OnlineStartTick = "OnlineStartTime" # 在线计算时间
			Def_PDict_LVAwardGetRecord = "LVAwardGetRecord" # 等级奖励领取信息记录，按二进制位标示
			@@ -3488,6 +3524,7 @@
			Def_PDict_RecoverGainLastTime = "RecoverGainLastTime" # 上一次资源找回时的时间

			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" # 红包领取状态
			@@ -3526,14 +3563,18 @@
			Def_PDict_RunTaskNextMissionID = "RunTaskNextMissionID_%s" # 跑环本轮结束下个任务ID 参数任务类型

			#强化
			Def_PDict_TotalPlusLV = "TotalPlusLV" # 总强化等级
			Def_PDict_EquipPartPlusLV = "EPPlusLV_%s_%s" # 装备部位对应公共强化星级，参数为(packType, index)
			Def_PDict_EquipActiveStarLV = "EquipActiveStarLV" #装备已激活总强化等级
			Def_PDict_EquipPartProficiency = "EPProf_%s_%s" # 装备部位对应公共强化熟练度，参数为(packType, index)
			Def_PDict_EquipPartPlusEvolveLV = "EPPlusEvolveLV_%s_%s" # 装备部位对应公共强化进化等级，参数为(packType, index)
			Def_PDict_TotalPlusEvolveLV = "TotalPlusEvolveLV" # 装备部位对应公共强化进化总等级
			# 宝石
			Def_PDict_EquipPartStoneID = "StoneID_%s_%s" # 装备位_孔位存储宝石ID*10+是(1)否(0)绑定
			Def_PDict_TotalStoneLV = "TotalStoneLV" # 装备位宝石总等级

			# 装备洗练, 暂不区分背包类型，如果有不同背包，策划设定不同的装备位
			Def_PDict_TotalEquipWashLV = "TotalEquipWashLV" # 装备部位洗练总等级
			Def_PDict_EquipWashLV = "EquipWashLV_%s" # 装备部位洗练等级，参数为(place)
			Def_PDict_EquipWashValue = "EquipWashV_%s_%s" # 装备部位洗练当前值，参数为(place, 属性编号)
			Def_PDict_EquipWashValueTemp = "EquipWashVT_%s_%s" # 装备部位洗练当前临时洗练值，参数为(place, 属性编号)
			@@ -3542,6 +3583,7 @@
			Def_PDict_BZZD_TotalFightExp = "BZZD_TExp" # 最后一次进入副本挑战获得总经验, 领取多倍奖励时用
			Def_PDict_BZZD_TotalFightExpPoint = "BZZD_TExpPoint" # 最后一次进入副本挑战获得总经验点, 领取多倍奖励时用
			Def_PDict_BZZD_FirstEnterExpTime = "BZZD_FirstEnterExpTime" # 首次进入经验保底补差时长，可用于判断是否首次进入
			Def_PDict_BZZD_HistoryEnterCnt = "BZZD_HistoryEnterCnt" # 历史进入总次数

			# 公共CD副本扫荡
			Def_PDict_PubCDFBS_Time = "PCDFBS_%s_Time" # 开始扫荡时间, 参数(公共组编号)
			@@ -3566,6 +3608,8 @@
			Def_Player_Dict_ZhuXianTowerPassLV = "ZhuXianTowerPassLV" # 诛仙塔已通关层数
			Def_Player_Dict_ZhuXianTowerLastFloor = "ZhuXianTowerLastFloor" # 诛仙塔上次挑战层数
			Def_Player_Dict_ZhuXianTowerCostTime = "ZhuXianTowerCostTime" # 诛仙塔通关时间
			#天星塔
			Def_Player_Dict_SkyTowerFloor = "SkyTowerFloor" # 天星塔已通关层数

			#古神禁地
			Def_Player_Dict_GodArea_Anger = "GodArea_Anger" # 古神禁地怒气值
			@@ -3822,6 +3866,8 @@
			Def_PDict_RealmExp = "RealmExp" #境界修为池总经验
			Def_PDict_RealmExpPoint = "RealmExpPoint" #境界修为池总经验点
			Def_PDict_RealmExpBeginTime = "RealmExpBeginTime" #境界修为池经验开始计时时间
			Def_PDict_RealmExpBuffRemainTime = "RealmExpBuffRemainTime" #境界修为池经验buff剩余时间
			Def_PDict_RealmExpBuffAddRate = "RealmExpBuffAddRate" #境界修为池经验增加百分比(万分率)

			#法宝
			Def_PDict_MagicWeaponIsWear = "MagicWeaponIsWear_%s" #法宝佩戴状态参数法宝ID
			@@ -3836,7 +3882,7 @@
			Def_PDict_AlchemyLearnState = "AlchemyLearnState%s" #丹方是否已学习
			Def_PDict_AlchemyItemID = "AlchemyItemID_%s" #炼丹中的丹药ID 参数丹药类型
			Def_PDict_AlchemyStartTime = "AlchemyStartTime_%s" #炼丹开始时间参数丹药ID

			Def_PDict_AlchemyCommonCnt = "AlchemyCommonCnt" #普通丹药炼丹次数

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

			@@ -3871,6 +3917,7 @@
			Def_PDict_DogzBuyHelpbattleCount = "DogzBuyHelpbattleCount" # 额外购买的神兽助战位

			#装备部位星数
			Def_PDict_TotalEquipStar = "TotalEquipStar" #装备部位星数总数
			Def_PDict_EquipPartStar = "EQPartStar_%s" #装备部位星数参数装备背包格子索引

			#缥缈仙域
			@@ -3880,6 +3927,11 @@
			Def_PDict_FairyDomainEnergy = "FairyDomainEnergy" #体力值
			Def_PDict_FairyDomainVisitCnt = "FairyDomainVisitCnt" #寻访总次数
			Def_PDict_FairyAdventuresData = "FairyAdventuresData_%s" #奇遇数值唯一ID*100+档位参数事件ID
			Def_PDict_FairyDomainEventAppearCnt = "FDEventAppearCnt%s" #事件出现次数参数事件ID AAABBB BBB:小时段出现次数 AAA:今日出现次数

			#五行专精
			Def_PDict_SkillElementID = "SkillElementID%s" #主技能选择的专精技能参数主技能ID
			Def_PDict_SkillElementLV = "SkillElementLV%s" #专精技能技能等级参数技能ID
			#-------------------------------------------------------------------------------
			#可以从07 41封包购买的背包类型,和对应字典{背包类型:[字典key, 默认格子数]}

			@@ -4154,13 +4206,24 @@
			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_SuperHitPer:[[TYPE_Calc_SuperHitPer], 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_YinjiTime:[[TYPE_Calc_YinjiTime], False, TYPE_Linear], # 每X秒自动消失一个印记
			ShareDefine.Def_Effect_TheFBSkillsCD:[[TYPE_Calc_TheFBSkillsCD], False, TYPE_Linear], # 减少指定技能组CD XX%
			ShareDefine.Def_Effect_BurnValue:[[TYPE_Calc_BurnValue], False, TYPE_Linear], # 灼烧固定伤害
			ShareDefine.Def_Effect_BurnTimePer:[[TYPE_Calc_BurnTimePer], False, TYPE_Linear], # 延长灼烧时间百分比
			ShareDefine.Def_Effect_SubSpeedPer:[[TYPE_Calc_SubSpeedPer], 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],
			@@ -4301,7 +4364,8 @@
			Def_CalcAttrFunc_MagicWeapon3, # 仙族法宝属性 34
			Def_CalcAttrFunc_MagicWeapon4, # 王者法宝 35
			Def_CalcAttrFunc_Coat, # ʱװ 36
			) = range(37)
			Def_CalcAttrFunc_LingQi, # 灵器 37
			) = range(38)

			# 技能功能点列表 - 默认不算战力，不享受百分比加成，技能功能点暂时配置，之后优化技能属性逻辑后可去掉
			CalcAttrFuncSkillList = [Def_CalcAttrFunc_HorseSkill, Def_CalcAttrFunc_PetSkill, Def_CalcAttrFunc_DogzBattleSkill]
			@@ -4316,7 +4380,7 @@
			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_Wing:[Def_CalcAttrFunc_Wing, Def_CalcAttrFunc_LingQi],
			ShareDefine.Def_MFPType_Wash:[Def_CalcAttrFunc_Wash],
			ShareDefine.Def_MFPType_Pet:[Def_CalcAttrFunc_Pet, Def_CalcAttrFunc_PetSign, Def_CalcAttrFunc_PetSkill],
			ShareDefine.Def_MFPType_PetSoul:[Def_CalcAttrFunc_PetSoul],
			@@ -4342,7 +4406,7 @@
			(
			TriggerType_BeSuperHit, # 被暴击触发技能 1
			TriggerType_BuffState, # 进入4012的某个状态触发技能
			TriggerType_AddDamagePer, # 提高增加伤害属性值，计算时
			TriggerType_AddPVPDamagePer, # 提高PVP增加伤害属性值，计算时
			TriggerType_AttackOver, # 攻击（对敌技能）后被动技能被触发
			TriggerType_AttackAddSkillPer, # 所有攻击伤害(SkillPer)增加，含普攻，计算时 5
			TriggerType_SuperHit, # 暴击时触发技能
			@@ -4366,7 +4430,7 @@
			TriggerType_AttackKill, # նɱ
			TriggerType_WillDead, # 进入濒死状态时触发技能 25
			TriggerType_BuffBoom, # 中毒后爆炸
			TriggerType_Success_Buff_SkillPer, # 提高4501成功概率
			TriggerType_BeAttackAddSkillPer, # 被攻击提高技能伤害
			TriggerType_HurtObjAddBuff, # 在算伤害时群攻1对1加buff，可用于一个伤害多次触发
			TriggerType_BeBoomSeed, # 被动引爆视野内对象的buff种子 29
			TriggerType_AttackCnt, # 增加技能攻击数量（效果ID1200） 30
			@@ -4412,11 +4476,18 @@
			TriggerType_4074PerValue, # 特殊效果的加成 70
			TriggerType_dFinalHurtReducePer, # 防守方的最终伤害减少百分比 71
			TriggerType_IsDealy, # 是否触发致命一击 72 暂且理解为和概率是独立，有新概念产生则重定义
			) = range(1, 73)
			TriggerType_AddThumpHitRate, # 提高重击概率 73
			TriggerType_ThumpHit, # 重击时触发技能74
			TriggerType_AddThumpHitPer, # 重击时增加重击百分比 75 默认10000
			TriggerType_SkillSuccess, # 任何技能释放成功都可触发 76
			TriggerType_BounceHPPerByAttacker, # 反弹伤害百分比值, 由攻击方决定 77
			TriggerType_NoControl, # 使关联技能不受控制 78
			TriggerType_SuperHitSuckBloodPer, # 暴击百分比吸血, 79
			TriggerType_BurnPer, # 灼烧伤害百分比 80
			TriggerType_BurnDisappear, # 灼烧消失触发 81
			TriggerType_SkillValue, # 增加技能伤害固定值 82
			) = range(1, 83)


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

			#不可以佩戴翅膀的地图
			CanNotWearWingMapIDList = []
			@@ -4959,9 +5030,11 @@
			ntDestructible, #场景内可破坏的 19
			ntHelpBattleRobot, #助战机器人 20
			ntRobot, #机器人21
			ntMonsterTime, #按时间掉血的怪物 22
			ntMonsterTime, #按时间掉血的怪物 22 废弃，以是否有配置在时间掉血怪物表为准
			ntPriWoodPilePVE, #专属私有木桩 - PVE 23
			ntPriWoodPilePVP, #专属私有木桩 - PVP 24
			ntMax
			) = range(24)
			) = range(26)


			(Def_SkillFuncType_Common, #0为通用技能