SnxxServerCode.git

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

			#游戏对象属性--------------------------------------------
			Def_Calc_AllAttrType_MAX = 133
			Def_Calc_AllAttrType_MAX = 127
			#基本属性BUFF计算，顺序与 ObjProperty_AttrByIndex 对应，同时也为buff效果ID同步通知策划
			TYPE_Calc_AttrList = (
			#基础属性
			@@ -188,12 +188,6 @@
			TYPE_Calc_BaseDefAddPer, # 基础防御百分比
			TYPE_Calc_BaseHitAddPer, # 基础命中百分比
			TYPE_Calc_BaseMissAddPer, # 基础闪避百分比
			TYPE_Calc_HorcruxBasePer, # 魂器基础百分比
			TYPE_Calc_EquipBaseAddPer, # 装备基础百分比 105
			TYPE_Calc_WeaponAtkAddPer, # 武器基础攻击百分比
			TYPE_Calc_RelicsAtkAddPer, # 圣器基础攻击百分比
			TYPE_Calc_ArmorMaxHPAddPer, # 防具基础生命百分比
			TYPE_Calc_ArmorDefAddPer, # 防具基础防御百分比
			TYPE_Calc_GodWeaponMaxHPPer, # 神兵生命百分比 110
			TYPE_Calc_GodWeaponAtkPer, # 神兵攻击百分比
			TYPE_Calc_StoneMaxHPPer, # 宝石生命百分比
			@@ -340,17 +334,16 @@
			Def_ItemType_retBelt = 105 #5 腰带
			Def_ItemType_retTrousers = 106 #6 裤子
			Def_ItemType_retShoes = 107 #7 鞋子
			Def_ItemType_retNeck = 108 #8 项链
			Def_ItemType_retFairyCan = 109 #9 仙器
			Def_ItemType_retFairyCan2 = 110 #10 仙器
			Def_ItemType_retWing = 111 #11 翅膀
			Def_ItemType_retGuard = 112 #12 守护
			Def_ItemType_retBaldric1 = 113 #13 佩饰
			Def_ItemType_retBaldric2 = 114 #14 佩饰
			Def_ItemType_retBaldric3 = 115 #15 佩饰
			Def_ItemType_retBaldric4 = 116 #16 佩饰
			Def_ItemType_retBaldric5 = 117 #17 佩饰
			Def_ItemType_retBaldric6 = 118 #18 佩饰
			Def_ItemType_retGlove = 108 #8 手套
			Def_ItemType_retNeck = 109 #9 项链
			Def_ItemType_retFairyCan = 110 #10 仙器1
			Def_ItemType_retFairyCan2 = 111 #11 仙器2
			Def_ItemType_retJade = 112 #12 玉佩
			Def_ItemType_retWing = 113 #13 翅膀
			Def_ItemType_retGuard1 = 114 #14 守护1
			Def_ItemType_retGuard2 = 115 #15 守护2
			Def_ItemType_retPeerlessWeapon = 116 #16 绝世武器
			Def_ItemType_retPeerlessWeapon2 = 117 #17 绝世副手

			Def_ItemType_DogzEquipHorn = 119 # 神兽兽角
			Def_ItemType_DogzEquipEye = 120 # 神兽魔眼
			@@ -404,17 +397,14 @@
			ShareDefine.retBelt:[Def_ItemType_retBelt],
			ShareDefine.retTrousers:[Def_ItemType_retTrousers],
			ShareDefine.retShoes:[Def_ItemType_retShoes],
			ShareDefine.retGlove:[Def_ItemType_retGlove],
			ShareDefine.retNeck:[Def_ItemType_retNeck],
			ShareDefine.retFairyCan:[Def_ItemType_retFairyCan, Def_ItemType_retFairyCan2],
			ShareDefine.retFairyCan2:[Def_ItemType_retFairyCan, Def_ItemType_retFairyCan2],
			ShareDefine.retFairyCan:[Def_ItemType_retFairyCan],
			ShareDefine.retFairyCan2:[Def_ItemType_retFairyCan2],
			ShareDefine.retJade:[Def_ItemType_retJade],
			ShareDefine.retWing:[Def_ItemType_retWing],
			ShareDefine.retGuard:[Def_ItemType_retGuard],
			ShareDefine.retBaldric1:[Def_ItemType_retBaldric1],
			ShareDefine.retBaldric2:[Def_ItemType_retBaldric2],
			ShareDefine.retBaldric3:[Def_ItemType_retBaldric3],
			ShareDefine.retBaldric4:[Def_ItemType_retBaldric4],
			ShareDefine.retBaldric5:[Def_ItemType_retBaldric5],
			ShareDefine.retBaldric6:[Def_ItemType_retBaldric6],
			ShareDefine.retGuard1:[Def_ItemType_retGuard1],
			ShareDefine.retGuard2:[Def_ItemType_retGuard2],
			}
			#---------------------------------------------------------------------
			#写死的物品效果ID都放这边------请按数值顺序存放
			@@ -449,6 +439,8 @@
			Def_Effect_ItemGiveSoulSplinters = 240 # 使用道具给予聚魂碎片
			Def_Effect_ItemGiveSoulCore = 241 #使用道具给予核心环
			Def_Effect_ItemGiveHonor = 242 #使用道具给予荣誉
			Def_Effect_ItemGiveWeekPartyPoint = 245 #使用道具给予七日巡礼积分
			Def_Effect_ItemGiveWeekPartyPoint1 = 246 #使用道具给予节日巡礼积分
			#----以下未使用或代码依然存在的---
			Def_Effect_ItemGiveGongXun = 1920 #使用道具给予功勋
			Def_Effect_ItemGiveRuneJH = 1925 #使用道具给予符印精华
			@@ -581,6 +573,7 @@
			Def_Skill_Effect_AbsorbShield = 801 # A值记录吸收伤害值，B值记录吸收值上限为xx%血量上限值 C值为释放的爆炸技能ID 如麒麟盾
			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递减
			@@ -640,7 +633,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
			@@ -799,9 +792,6 @@
			#装备类型
			Def_EquipItemType = range(Def_ItemType_retWeapon, Def_ItemType_DogzEquipScute + 1) + range(Def_ItemType_ZXCloak, Def_ItemType_ZXWeapon4 + 1)

			#武器类型
			Def_WeaponItemType = [Def_ItemType_retWeapon, Def_ItemType_retWeapon2]

			#神兽装备类型
			Def_DogzEquiipType = xrange(Def_ItemType_DogzEquipHorn, Def_ItemType_DogzEquipScute + 1)

			@@ -840,6 +830,8 @@
			#大额度交易记录
			Def_LargeTrade_Gold = 50 * 1000
			Def_LargeTrade_Silver = 1000 * 1000
			#初始化装备背包格子数
			Def_PackCnt_Equip = 130
			#主角交易栏最大格数
			Def_PlayerTradeMaxItemCount = 20
			#主角刚登陆游戏开启背包格子数
			@@ -1818,15 +1810,16 @@
			Def_FBMapID_CrossRealmPK = 32010
			#跨服蓬莱仙境
			Def_FBMapID_CrossPenglai = 32020

			#多仙盟Boss
			Def_FBMapID_AllFamilyBoss = 31260

			#注册上传跨服服务器数据后直接进入跨服服务器的地图
			RegisterEnter_CrossServerMapIDList = [Def_FBMapID_CrossPenglai]
			#跨服地图
			Def_CrossMapIDList = [Def_FBMapID_CrossRealmPK, Def_FBMapID_CrossPenglai]
			#跨服对应分区配置表名
			Def_CrossZoneTableName = {Def_FBMapID_CrossPenglai:"CrossPenglaiZone",
			}
			#跨服分区对应地图配置表名
			Def_CrossZoneMapTableName = {Def_FBMapID_CrossPenglai:"CrossPenglaiZoneMap",
			}

			#副本关闭时未拾取的物品邮件发放给玩家
			#这里只有需要的副本才配置，不做默认逻辑，防止某些副本实际不能给导致刷物品，如麒麟之府
			@@ -1845,7 +1838,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_MapID_LineIDToPropertyID
			Def_MapID_SendToGameServer = [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,
			@@ -1853,10 +1846,10 @@
			# + Def_FBMapID_ClearDevil

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

			# 可重复进的副本
			Def_NoLimitEnterCntMap = [Def_FBMapID_FamilyParty, Def_FBMapID_FamilyWar, Def_FBMapID_FamilyInvade, Def_FBMapID_ElderBattlefield, Def_FBMapID_ZhuXianBoss]
			Def_NoLimitEnterCntMap = [Def_FBMapID_AllFamilyBoss, Def_FBMapID_FamilyParty, Def_FBMapID_FamilyWar, Def_FBMapID_FamilyInvade, Def_FBMapID_ElderBattlefield, Def_FBMapID_ZhuXianBoss]

			# 无玩家时不自动关闭的自伸缩副本
			Def_NoPlayerNotCloseAutoSizeMap = [Def_FBMapID_FamilyInvade, Def_FBMapID_FamilyBossMap, Def_FBMapID_GatherSoul]
			@@ -1918,6 +1911,7 @@
			'GatherSoul':[Def_FBMapID_GatherSoul],#聚魂副本
			'ZhuXianBoss':[Def_FBMapID_ZhuXianBoss],#诛仙BOSS
			'ZhuXianTower':[Def_FBMapID_ZhuXianTower],#诛仙塔
			'AllFamilyBoss':[Def_FBMapID_AllFamilyBoss],#多仙盟BOSS
			}

			#特殊副本ID, 由系统分配, 进入时候不验证IsMapCopyFull
			@@ -2384,18 +2378,6 @@
			#数据中的装备位置和程序中的装备位置对照表
			#参考 ShareDefine.RoleEquipType

			#武器装备栏位置列表
			Def_WeaponRetList = [ShareDefine.retWeapon, ShareDefine.retWeapon2]

			#仙器, 装备栏位置列表
			Def_FairyCanList = [ShareDefine.retFairyCan, ShareDefine.retFairyCan2]


			#攻击类装备, 装备栏位置列表
			Def_AttackEquipRetList = [ShareDefine.retWeapon]
			#防御类装备, 装备栏位置列表
			Def_DefenceEquipRetList = [ShareDefine.retClothes]

			# 可操作强化洗练等功能的公共装备部位索引
			Pack_EquipPart_CanPlusStar = {
			IPY_GameWorld.rptEquip:[
			@@ -2406,23 +2388,24 @@
			ShareDefine.retBelt, #5 腰带
			ShareDefine.retTrousers, #6 裤子
			ShareDefine.retShoes, #7 鞋子
			ShareDefine.retNeck, #8 项链
			ShareDefine.retFairyCan, #9 仙器
			ShareDefine.retFairyCan2, #10 仙器
			ShareDefine.retGlove, #8 手套
			ShareDefine.retNeck, #9 项链
			ShareDefine.retFairyCan, #10 仙器1
			ShareDefine.retFairyCan2, #11 仙器2
			ShareDefine.retJade, #12 玉佩
			],

			}

			## 基础装备位 - 武器
			BaseEquipPlace_Weapon = [ShareDefine.retWeapon, ShareDefine.retWeapon2]
			## 基础装备位 - 防具
			BaseEquipPlace_Armor = [ShareDefine.retHat, ShareDefine.retClothes, ShareDefine.retBelt, ShareDefine.retTrousers, ShareDefine.retShoes]
			## 基础装备位 - 圣器
			BaseEquipPlace_Relics = [ShareDefine.retNeck, ShareDefine.retFairyCan, ShareDefine.retFairyCan2]
			BaseEquipPlaceList = BaseEquipPlace_Weapon + BaseEquipPlace_Armor + BaseEquipPlace_Relics

			#玩家当前可装备的装备类型
			Type_Equip_CanTake = ShareDefine.RoleEquipType
			## 装备位 - 基础攻击类
			EquipPlace_BaseWeapon = [ShareDefine.retWeapon, ShareDefine.retWeapon2, ShareDefine.retBelt, ShareDefine.retGlove]
			## 装备位 - 基础防具类
			EquipPlace_BaseArmor = [ShareDefine.retHat, ShareDefine.retClothes, ShareDefine.retTrousers, ShareDefine.retShoes]
			## 装备位 - 仙器
			EquipPlace_Relics = [ShareDefine.retFairyCan, ShareDefine.retFairyCan2]
			## 装备位 - 特殊
			EquipPlace_Special = [ShareDefine.retNeck, ShareDefine.retFairyCan, ShareDefine.retFairyCan2, ShareDefine.retJade]
			## 装备位 - 所有基础
			EquipPlace_Base = EquipPlace_BaseWeapon + EquipPlace_BaseArmor

			#装备物品位置,不需要重刷属性
			EquipItemNoRefreshState = [
			@@ -2432,21 +2415,10 @@
			ShareDefine.retWeapon2Skin, #22 时装副手
			]

			# 需要广播外观的装备部位
			# 需要广播外观的装备部位(除了境界装备3部位)
			Def_SyncEquipStateByIndex = [

			ShareDefine.retWeapon, #1 主手
			ShareDefine.retWeapon2, #2 副手
			ShareDefine.retHat, #3 帽子
			ShareDefine.retClothes, #4 衣服
			ShareDefine.retBelt, #5 腰带
			ShareDefine.retTrousers, #6 裤子
			ShareDefine.retShoes, #7 鞋子
			ShareDefine.retNeck, #8 项链
			ShareDefine.retFairyCan, #9 仙器
			ShareDefine.retFairyCan2, #10 仙器
			ShareDefine.retWing, #11 翅膀
			ShareDefine.retGuard, #12 守护
			ShareDefine.retGuard1, #14 守护1
			ShareDefine.retHorse, #19 坐骑
			]

			@@ -3046,13 +3018,16 @@
			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_AddBuffLayer = "addBuffLayer" # buff当前层数
			Def_PlayerKey_BuffHurtCnt = "BuffHurtCnt" # 持续buff掉血次数
			Def_PlayerKey_Zhansha = "zhansha" # 斩杀标志
			Def_PlayerKey_ZhuxianRate = "ZXRate" # 诛仙一击的概率
			Def_PlayerKey_ZhuxianHurtPer = "ZXHurtPer" # 诛仙一击的伤害%
			@@ -3063,6 +3038,7 @@
			Def_PlayerKey_SomersaultTime = "Somersault" # 翻滚一定时间内无敌，表现为MISS
			Def_PlayerKey_CopyFuncAttr = "CopyFuncAttr%s" # 玩家属性刷新中的计算属性缓存，便于buff刷新计算
			Def_Player_RefreshAttrByBuff = "PlayerAttrByBuff" # 玩家属性刷新功能属性缓存，便于buff刷新计算, 间隔刷新
			Def_PlayerKey_ClientCustomScene = "ClientCustomScene" # 客户端自定义场景状态
			Def_PlayerKey_ChangeMapID = "ChangeMapID" # 请求切换的地图ID
			Def_PlayerKey_ResetFBLinePosX = "ResetFBLinePosX" # 请求切换副本多合一地图功能线路ID
			Def_PlayerKey_ResetFBLinePosY = "ResetFBLinePosY" # 请求切换副本多合一地图功能线路ID
			@@ -3113,7 +3089,6 @@
			Def_PlayerKey_AtkInterval = "NormalAtkInterval_%s" # 公共技能CD类型
			Def_PlayerKey_AtkTick = "NormalAtkTick_%s" # 公共技能CD类型
			Def_PlayerKey_QueryOpenServerAwardState = "QueryOpenServerAwardState" # 查询开服奖励状态
			Def_PlayerKey_QueryMixServerAwardState = "QueryMixServerAwardState" # 查询合服奖励状态
			Def_PlayerKey_QueryFamilyStoreTick = "QueryFamilyStoreTick" # 战盟仓库操作tick

			Def_PlayerKey_QueryMarkIdCardIndex = 'QueryMarkIdCardIndex' # 指定账号生成卡类型
			@@ -3127,6 +3102,7 @@
			Def_PlayerKey_ComboBuffProcessState = "ComboBuffProcessState" #持续性buff连击处理状态
			Def_PlayerKey_LvAwardQueryState = 'LvAwardQueryState' # 等级奖励领奖查询状态
			Def_PlayerKey_StoreQueryState = 'StoreQueryState' # 商店全服购买次数查询状态
			Def_PlayerKey_MysticalShopLastTime = 'MysticalShopLastTime' # 神秘商店刷新时间
			#===============================================================================
			# # 持续性buff伤害处理连击技能ID列表
			# # 因为释放一次技能后一段时间内是持续性的, 故连接判断效果仅处理一次, 持续时间内均受此效果影响, 不重复处理连击
			@@ -3203,6 +3179,7 @@
			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" # 最终伤害百分比
			@@ -3224,12 +3201,6 @@
			Def_PlayerKey_BaseDefAddPer = "BaseDefAddPer" # 基础防御百分比
			Def_PlayerKey_BaseHitAddPer = "BaseHitAddPer" # 基础命中百分比
			Def_PlayerKey_BaseMissAddPer = "BaseMissAddPer" # 基础闪避百分比
			Def_PlayerKey_HorcruxBasePer = "HorcruxBasePer" # 魂器基础百分比
			Def_PlayerKey_EquipBaseAddPer = "EquipBaseAddPer" # 装备基础百分比
			Def_PlayerKey_WeaponAtkAddPer = "WeaponAtkAddPer" # 武器基础攻击百分比
			Def_PlayerKey_RelicsAtkAddPer = "RelicsAtkAddPer" # 圣器基础攻击百分比
			Def_PlayerKey_ArmorMaxHPAddPer = "ArmorMaxHPAddPer" # 防具基础生命百分比
			Def_PlayerKey_ArmorDefAddPer = "ArmorDefAddPer" # 防具基础防御百分比
			Def_PlayerKey_GodWeaponMaxHPPer = "GodWeaponMaxHPPer" # 神兵生命百分比
			Def_PlayerKey_GodWeaponAtkPer = "GodWeaponAtkPer" # 神兵攻击百分比
			Def_PlayerKey_StoneMaxHPPer = "StoneMaxHPPer" # 宝石生命百分比
			@@ -3254,9 +3225,6 @@
			Def_PlayerKey_FruitAttr = "FruitAttr_%s_%s" # 属性果实增加的属性，参数为(功能索引, 物品效果id)
			Def_PlayerKey_FruitFightPowerEx = "FruitFightPowerEx_%s" # 属性果实增加的附加战力，参数为(功能索引)
			Def_PlayerKey_FamilyLVLeave = "FamilyLVLeave" # 离开的最后一个家族的等级

			Def_PlayerKey_CalcAddAttrType = "CalcAType_%s_%s_%s" # 刷属性类型, 参数[funcIndex, attrIndex, 缓存编号]
			Def_PlayerKey_CalcAddAttrValue = "CalcAValue_%s_%s_%s" # 刷属性值, 参数[funcIndex, attrIndex, 缓存编号]

			Def_PDict_QueryTechLVUPState = "QueryTechLVUPState" # 查询科技等级提升状态

			@@ -3499,8 +3467,6 @@
			Def_PDict_SuperGiftHasOpen = "SuperGiftHasOpen" # 超值礼包是否开过
			Def_PDict_DailyGoldChargePrizeRecord = "DailyGoldChargePrizeRecord" # 天天首充领奖记录，0-不可领；1-可领；2-已领
			Def_PDict_DailyGoldChargeCnt = "DailyGoldChargeCnt" # 当日已充值数
			Def_PDict_SingleGoldGiftIndex = "SingleGoldGiftIndex" # 单日充值多选一礼包领取状态, 0-未领取,>0已领取索引
			Def_PDict_UnlimitedGoldGiftCnt = "UnlimitedGoldGiftCnt" # 当日无限领取礼包已领取次数
			Def_PDict_IsReBorn = "Def_PDict_IsReBorn" # 是否回城复活
			Def_PDict_FamilyWarDailyReward = "FamilyWarDailyReward" # 王者仙盟每日俸禄领取状态
			Def_PDict_Family_Contribution = "FamilyContribution" #战盟贡献度
			@@ -3516,6 +3482,9 @@
			Def_PDict_CollNpcIDCollTime = "CollNpcIDCollTime_%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)
			@@ -3529,7 +3498,6 @@
			Def_PDict_HighLadder_IsRelCD = "HighLadderIsRelCD" #天梯是否进入真正挑战冷却
			Def_PDict_HighLadder_WinningStreak = "HighLadderWinningStreak" #天梯连胜场次
			Def_PDict_HighLadder_HistoryMaxOrder = "HighLadderMaxOrder" #天梯历史最高排名
			Def_PDict_MixLoginDayState = "PMixLoginDayState" # 合服天登陆状态<按登陆天从低位起0-未领1-可领2-已领>
			Def_PDict_FestivalLoginState = "FestivalLoginState_%s" # 节日登陆奖励状态_%s表示节日类型<按登陆天从低位起0-未领1-可领2-已领>
			Def_PDict_Currency = "PlayerCurrency_%s" # 自定义货币类型, 参数[自定义货币类型]
			Def_PDict_TJGSet = "TJGSet" # 脱机挂系统设定
			@@ -3540,9 +3508,7 @@

			Def_PDict_LoginClientType = "LoginClientType" # 客户端登录类型

			Def_PDict_ReUpdBillboardSign = "ReUpdBillboardSign" # 重新同步排行表标记
			Def_PDict_MSFirstLogin_UpdBillboard = "MSFirstLogin_UpdBillboard" # 合服首登同步排行榜信息
			Def_PDict_MixLoginDay = "MixLoginDay" # 合服首登处理标记
			Def_PDict_MixLoginDay = "MixLoginDay" # 合服首登处理标记天

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

			@@ -3609,12 +3575,13 @@
			Def_PDict_RunTaskAwardState = "RunTaskAwardState_%s" # 是否已领取跑环本轮结束奖励参数任务类型
			Def_PDict_RunTaskAwardRecord = "RunTaskAwardRecord_%s" # 跑环本轮结束奖励记录参数任务类型
			Def_PDict_RunTaskNextMissionID = "RunTaskNextMissionID_%s" # 跑环本轮结束下个任务ID 参数任务类型
			# 宝石

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

			# 装备洗练, 暂不区分背包类型，如果有不同背包，策划设定不同的装备位
			@@ -3649,6 +3616,7 @@
			#诛仙塔
			Def_Player_Dict_ZhuXianTowerPassLV = "ZhuXianTowerPassLV" # 诛仙塔已通关层数
			Def_Player_Dict_ZhuXianTowerLastFloor = "ZhuXianTowerLastFloor" # 诛仙塔上次挑战层数
			Def_Player_Dict_ZhuXianTowerCostTime = "ZhuXianTowerCostTime" # 诛仙塔通关时间

			#古神禁地
			Def_Player_Dict_GodArea_Anger = "GodArea_Anger" # 古神禁地怒气值
			@@ -3685,12 +3653,14 @@
			Def_PDict_CostRebateTemplateID = "CostRebateTemplateID" # 玩家身上的消费返利模板ID
			Def_PDict_CostRebateGold = "CostRebateGold" # 消费返利总累计消费仙玉
			Def_PDict_CostRebateAwardRecord = "CostRebateAwardRecord" # 消费返利领奖记录
			Def_PDict_CostRebateWorldLV = "CostRebateWorldLV" #消费返利活动开启时世界等级

			#累计充值活动
			Def_PDict_TotalRechargeID = "TotalRechargeID" # 玩家身上的累计充值活动ID，唯一标识，取活动开始日期time值
			Def_PDict_TotalRechargeTemplateID = "TotalRechargeTemplateID" # 玩家身上的累计充值模板ID
			Def_PDict_TotalRechargeGold = "TotalRechargeGold" # 消费返利总累计充值X元
			Def_PDict_TotalRechargeAwardRecord = "TotalRechargeAwardRecord" # 累计充值领奖记录
			Def_PDict_TotalRechargeWorldLV = "TotalRechargeWorldLV" #累计充值活动开启时世界等级

			#限时特惠活动
			Def_PDict_SpringSaleID = "SpringSaleID" # 玩家身上的限时特惠活动ID，唯一标识，取活动开始日期time
			@@ -3706,7 +3676,7 @@
			Def_PDict_BossRebornTemplateID = "BossRebornTemplateID" # 玩家身上的BOSS复活模板ID
			Def_PDict_BRActionCurTimes = "BRActionCurTimes_%s" #当前完成次数参数BOSS复活活动ID
			Def_PDict_BRActionGotTimes = "BRActionGotTimes_%s" #当前已领次数参数BOSS复活活动ID
			Def_PDict_BRActionWorldLV = "BRActionWorldLV_%s" #BOSS复活活动开启时世界等级
			Def_PDict_BRActionWorldLV = "BRActionWorldLV" #BOSS复活活动开启时世界等级

			#仙界盛典
			Def_PDict_FairyCeremonyID = "FairyCeremonyID" # 玩家身上的仙界盛典活动ID，唯一标识，取活动开始日期time值
			@@ -3777,9 +3747,16 @@
			Def_PDict_LoginAwardID = "LoginAwardID" # 玩家身上的BOSS复活活动ID，唯一标识，取活动开始日期time值
			Def_PDict_LoginAwardCurTimes = "LoginAwardCurTimes_%s_%s" #当前完成次数参数(第X天,模板ID)
			Def_PDict_LoginAwardGotTimes = "LoginAwardGotTimes_%s_%s" #当前已领次数参数(第X天,模板ID)
			Def_PDict_LoginAwardWorldLV = "LoginAwardWorldLV%s" #活动开启时世界等级参数(第X天)

			#诛仙BOSS
			Def_PDict_ZhuXianBossHelpCnt = "ZhuXianBossHelpCnt" # 协助次数

			#幸运鉴宝
			Def_PDict_LuckyTreasureID = "LuckyTreasureID" # 玩家身上的活动ID，唯一标识，取活动开始日期time值
			Def_PDict_LuckyTreasureFree = "LuckyTreasureFree" #是否免费过
			Def_PDict_LuckyTreasurePoint = "LuckyTreasurePoint" #幸运值
			Def_PDict_LuckyTreasureCnt = "LuckyTreasureCnt" #鉴宝次数
			#-------------------------------------------------------------------------------
			#类型 Def_PDictType_OnlinePrize
			Def_PDict1_OnlinePrizeCnt = "OnlinePrizeCnt" # 新手在线已领取奖励次数
			@@ -3793,10 +3770,6 @@
			Def_PDict_OSC_TagAwardRecord = "OSCTagAwardRecord_%s" # 开服活动目标奖励记录, 参数(活动类型), 按奖励位存储是否领取
			Def_PDict_OSC_RecordData = "OSCRecordData_%s" # 开服活动记录数值, 参数(活动类型)
			Def_PDict_OSC_EndMailState = "EndMailState" # 开服活动结束发放邮件处理状态, 记录该状态的目的是防止开服活动版本变更导致旧号重复补发奖励；

			Def_PDict_MixServerCampaign_AwardRecord = "MSCAwardRecord_%s" # 合服活动奖励记录
			Def_PDict_MixServerCampaign_RecordData = "MSCRecordData_%s" # 合服活动记录数值
			Def_PDict_MixServerCampaign_MailState = "MSCMailState" # 合服活动结束补发未领奖记录邮件状态, 按类型位二进制存储状态

			# 坐骑 Def_PDictType_Horse
			Def_PDict_Horser_LV = "Horser_LV_%d" # 坐骑等级 0代表未激活 1代表1级
			@@ -3995,11 +3968,15 @@

			#套装
			Def_PDict_EquipPartSuiteLV = "EQPartSuiteLV_%s_%s" #部位套装等级参数部位、套装类型
			Def_PDict_EquipPartSuiteNotify = "EQPartSuiteNotify_%s_%s_%s" #部位套装提示记录参数组合类型、套装类型、X件
			Def_PDict_EquipPartSuiteNotify = "EQPartSuiteNotify_%s" #部位套装提示记录参数标记

			#神兽
			Def_PDict_DogzFightState = "DogzFightState_%s" # 神兽助战状态，参数为key编号，按神兽ID二进制位存储
			Def_PDict_DogzBuyHelpbattleCount = "DogzBuyHelpbattleCount" # 额外购买的神兽助战位

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


			#-------------------------------------------------------------------------------
			#可以从07 41封包购买的背包类型,和对应字典{背包类型:[字典key, 默认格子数]}
			@@ -4304,13 +4281,6 @@
			ShareDefine.Def_Effect_BaseDefAddPer:[[TYPE_Calc_BaseDefAddPer], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_BaseHitAddPer:[[TYPE_Calc_BaseHitAddPer], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_BaseMissAddPer:[[TYPE_Calc_BaseMissAddPer], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_HorcruxBasePer:[[TYPE_Calc_HorcruxBasePer], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_EquipBaseAddPer:[[TYPE_Calc_WeaponAtkAddPer, TYPE_Calc_RelicsAtkAddPer,
			TYPE_Calc_ArmorMaxHPAddPer, TYPE_Calc_ArmorDefAddPer], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_WeaponAtkAddPer:[[TYPE_Calc_WeaponAtkAddPer], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_RelicsAtkAddPer:[[TYPE_Calc_RelicsAtkAddPer], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_ArmorMaxHPAddPer:[[TYPE_Calc_ArmorMaxHPAddPer], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_ArmorDefAddPer:[[TYPE_Calc_ArmorDefAddPer], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_GodWeaponMaxHPPer:[[TYPE_Calc_GodWeaponMaxHPPer], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_GodWeaponAtkPer:[[TYPE_Calc_GodWeaponAtkPer], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_StoneMaxHPPer:[[TYPE_Calc_StoneMaxHPPer], False, TYPE_NoLinear],
			@@ -4331,14 +4301,6 @@
			TYPE_Calc_BaseDefAddPer:[TYPE_Calc_AttrDEF],
			TYPE_Calc_BaseHitAddPer:[TYPE_Calc_AttrHit],
			TYPE_Calc_BaseMissAddPer:[TYPE_Calc_AttrMiss],
			TYPE_Calc_HorcruxBasePer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax,
			TYPE_Calc_AttrMaxHP, TYPE_Calc_AttrDEF],
			TYPE_Calc_EquipBaseAddPer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax,
			TYPE_Calc_AttrMaxHP, TYPE_Calc_AttrDEF],
			TYPE_Calc_WeaponAtkAddPer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax],
			TYPE_Calc_RelicsAtkAddPer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax],
			TYPE_Calc_ArmorMaxHPAddPer:[TYPE_Calc_AttrMaxHP],
			TYPE_Calc_ArmorDefAddPer:[TYPE_Calc_AttrDEF],
			TYPE_Calc_GodWeaponMaxHPPer:[TYPE_Calc_AttrMaxHP],
			TYPE_Calc_GodWeaponAtkPer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax],
			TYPE_Calc_StoneMaxHPPer:[TYPE_Calc_AttrMaxHP],
			@@ -4353,6 +4315,27 @@
			TYPE_Calc_AttrMaxHP],
			TYPE_Calc_PlusBaseAtkPer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax],
			}

			# 对装备基础属性加成配置 {属性ID:[影响部位信息, [影响的计算属性列表]], ...}
			# 影响部位信息: 大于0-指定部位; -1-所有部位; -2-基础部位
			EquipBassAttrAddInfoSet = {
			ShareDefine.Def_Effect_EquipBaseAddPer: [-1, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
			ShareDefine.Def_Effect_BaseEquipAddPer: [-2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
			ShareDefine.Def_Effect_BaseEquipAtkAddPer: [-2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
			ShareDefine.Def_Effect_BaseEquipMaxHPAddPer: [-2, [ShareDefine.Def_Effect_MaxHP]],
			ShareDefine.Def_Effect_WeaponAddPer: [ShareDefine.retWeapon, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
			ShareDefine.Def_Effect_Weapon2AddPer: [ShareDefine.retWeapon2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
			ShareDefine.Def_Effect_BeltAddPer: [ShareDefine.retBelt, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
			ShareDefine.Def_Effect_GloveAddPer: [ShareDefine.retGlove, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
			ShareDefine.Def_Effect_ClothesAddPer: [ShareDefine.retClothes, [ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
			ShareDefine.Def_Effect_HatAddPer: [ShareDefine.retHat, [ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
			ShareDefine.Def_Effect_TrousersAddPer: [ShareDefine.retTrousers, [ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
			ShareDefine.Def_Effect_ShoesAddPer: [ShareDefine.retShoes, [ShareDefine.Def_Effect_MaxHP, ShareDefine.Def_Effect_Def]],
			ShareDefine.Def_Effect_FairyCanAddPer: [ShareDefine.retFairyCan, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
			ShareDefine.Def_Effect_FairyCan2AddPer: [ShareDefine.retFairyCan2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
			ShareDefine.Def_Effect_NeckAddPer: [ShareDefine.retNeck, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
			ShareDefine.Def_Effect_JadeAddPer: [ShareDefine.retJade, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk, ShareDefine.Def_Effect_MaxHP]],
			}

			#属性线性索引
			CalcAttrIndexList = (
			@@ -4373,14 +4356,14 @@
			#刷属性功能分类索引
			CalcAttrFuncList = (
			Def_CalcAttrFunc_RoleBase, # 角色基础 0
			Def_CalcAttrFunc_EquipBaseWeapon, # 武器物品表基础属性 1
			Def_CalcAttrFunc_EquipBaseArmor, # 防具物品表基础属性 2
			Def_CalcAttrFunc_EquipBaseRelics, # 圣器物品表基础属性 3
			Def_CalcAttrFunc_Equip, # 装备其他(传奇属性 + ) 4
			Def_CalcAttrFunc_PlusBase, # 装备位强化基础 5
			Def_CalcAttrFunc_PlusEx, # 装备位强化累加 6
			Def_CalcAttrFunc_EquipBaseWeapon, # 武器物品表基础属性 1 - 废弃
			Def_CalcAttrFunc_EquipBaseArmor, # 防具物品表基础属性 2 - 废弃
			Def_CalcAttrFunc_EquipBaseRelics, # 圣器物品表基础属性 3 - 废弃
			Def_CalcAttrFunc_Equip, # 装备其他(传奇属性 + ) 4 - 废弃
			Def_CalcAttrFunc_Plus, # 装备位强化 5
			Def_CalcAttrFunc_PlusEx, # 装备位强化累加 6 - 废弃
			Def_CalcAttrFunc_Stone, # 装备宝石 7
			Def_CalcAttrFunc_Suit, # 套装 8
			Def_CalcAttrFunc_Suit, # 套装 8 - 废弃
			Def_CalcAttrFunc_Wing, # 翅膀 9
			Def_CalcAttrFunc_Wash, # 洗练 10
			Def_CalcAttrFunc_Pet, # 灵宠 11
			@@ -4389,10 +4372,10 @@
			Def_CalcAttrFunc_GodWeapon, # 神兵 14
			Def_CalcAttrFunc_Dienstgrad, # 称号 15
			Def_CalcAttrFunc_Rune, # 符印 16
			Def_CalcAttrFunc_Horcrux, # 魂器 17
			Def_CalcAttrFunc_17, #
			Def_CalcAttrFunc_MagicWeapon1, # 人族法宝属性 18
			Def_CalcAttrFunc_EquipOutOfPrint, # 绝版属性随等级变化 19
			Def_CalcAttrFunc_EquipAllStars, # 装备全身星级属性 20
			Def_CalcAttrFunc_EquipAllStars, # 装备全身星级属性 20 - 废弃
			Def_CalcAttrFunc_Success, # 成就属性 21
			Def_CalcAttrFunc_VIP, # VIP属性 22
			Def_CalcAttrFunc_Stove, # 炼丹炉 23
			@@ -4415,10 +4398,25 @@
			Def_CalcAttrFunc_MagicWeapon4, # 王者法宝40
			Def_CalcAttrFunc_Coat, # ʱװ41
			Def_CalcAttrFunc_ZXEquip, # 诛仙装备42
			Def_CalcAttrFunc_ZXEquipSuit, # 诛仙装备套装43
			Def_CalcAttrFunc_ZXEquipStone, # 诛仙宝石属性44
			) = range(45)

			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)

			# 在此列表中的功能属性，不享受百分比加成，--属性参与战力计算
			CalcAttrExFuncList = [Def_CalcAttrFunc_MagicWeapon1, Def_CalcAttrFunc_MagicWeapon2, Def_CalcAttrFunc_MagicWeapon3, Def_CalcAttrFunc_MagicWeapon4,
			@@ -4433,13 +4431,9 @@
			#战斗力分组类型对应功能点属性分类索引列表，并不是一一对应的，有些战斗力类型可由多个功能点组成
			MFPTypeAttrFuncIndexDict = {ShareDefine.Def_MFPType_Role:[Def_CalcAttrFunc_RoleBase],
			# 因为装备评分和实际战力一直出现不匹配的情况，所以装备战力修改为直接由装备评分做为参数计算战力，所以装备评分计算的所有属性不列入战力计算，祥见评分计算函数 ItemCommom.CalcEquipGS
			# ShareDefine.Def_MFPType_Equip:[Def_CalcAttrFunc_EquipBaseWeapon, Def_CalcAttrFunc_EquipBaseRelics,
			# Def_CalcAttrFunc_EquipBaseArmor, Def_CalcAttrFunc_Equip,
			# Def_CalcAttrFunc_EquipOutOfPrint, Def_CalcAttrFunc_EquipAllStars],
			ShareDefine.Def_MFPType_Equip:[Def_CalcAttrFunc_EquipAllStars],
			ShareDefine.Def_MFPType_Plus:[Def_CalcAttrFunc_PlusBase, Def_CalcAttrFunc_PlusEx],
			# ShareDefine.Def_MFPType_Equip:[Def_CalcAttrFunc_EquipOutOfPrint],
			ShareDefine.Def_MFPType_Plus:[Def_CalcAttrFunc_Plus],
			ShareDefine.Def_MFPType_Stone:[Def_CalcAttrFunc_Stone],
			ShareDefine.Def_MFPType_Suit:[Def_CalcAttrFunc_Suit],
			ShareDefine.Def_MFPType_Wing:[Def_CalcAttrFunc_Wing],
			ShareDefine.Def_MFPType_Wash:[Def_CalcAttrFunc_Wash],
			ShareDefine.Def_MFPType_Pet:[Def_CalcAttrFunc_Pet, Def_CalcAttrFunc_PetSign],
			@@ -4450,7 +4444,6 @@
			ShareDefine.Def_MFPType_GodWeapon:[Def_CalcAttrFunc_GodWeapon],
			ShareDefine.Def_MFPType_Dienstgrad:[Def_CalcAttrFunc_Dienstgrad],
			ShareDefine.Def_MFPType_Rune:[Def_CalcAttrFunc_Rune],
			ShareDefine.Def_MFPType_Horcrux:[Def_CalcAttrFunc_Horcrux],
			ShareDefine.Def_MFPType_MagicWeapon1:[Def_CalcAttrFunc_MagicWeapon1],
			ShareDefine.Def_MFPType_MagicWeapon2:[Def_CalcAttrFunc_MagicWeapon2],
			ShareDefine.Def_MFPType_MagicWeapon3:[Def_CalcAttrFunc_MagicWeapon3, Def_CalcAttrFunc_Stove, Def_CalcAttrFunc_VIP],
			@@ -4461,7 +4454,22 @@
			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_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_Other:[Def_CalcAttrFunc_Success, Def_CalcAttrFunc_FamilyTech, Def_CalcAttrFunc_EquipDecompose],
			}

			@@ -4534,7 +4542,10 @@
			TriggerType_BeLuckyHit, # 被会心一击触发技能 64
			TriggerType_BeLuckyHitSubPer, # 减少受到的会心伤害 65
			TriggerType_ZhongjiZhansha, # 终极斩杀 66
			) = range(1, 67)
			TriggerType_SuperHitSubLayer, # 暴击减层 67
			TriggerType_SuperHitSkipCD, # 暴击无冷却 68
			TriggerType_BuffHurtCnt, # 当持续buff伤害第X次时触发技能 69
			) = range(1, 70)


			# NPC功能类型定义
			@@ -4648,6 +4659,9 @@
			Def_Cost_FBHelpBattle, # 副本助战
			Def_Cost_FBGatherSoulBoss, # 聚魂副本BOSS召唤 40
			Def_Cost_CrossRealmPK, # 跨服PK
			Def_Cost_LuckyTreasure, #幸运鉴宝
			Def_Cost_MysteryShopRefresh, # 神秘商店刷新
			Def_Cost_AuctionBid, # 拍卖行竞价
			#-----------以下为暂时没用的，先不删除，如有新增消费点则放在这些之前------------
			Def_Cost_RefreshArrestTask, # 刷新悬赏任务
			Def_Cost_OffLineExp, # 兑换离线经验
			@@ -4664,24 +4678,24 @@
			Def_Cost_Trade, # 交易
			Def_Cost_Rename, # 改名
			Def_Cost_SkillLvUp, # 技能升级
			) = range(2000, 2000 + 57)
			) = range(2000, 2000 + 60)

			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_Unknown, "GMSetMoney", "Warehouse", Def_Cost_AuctionBid]
			CostProfit_CostType = [Def_Cost_BourseBuy, Def_Cost_BourseCharge, Def_Cost_Unknown,
			"GMSetMoney", "Warehouse"]
			"GMSetMoney", "Warehouse", Def_Cost_AuctionBid]

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

			# 可在跨服中消费的类型列表
			MergeServerCanCostType = [Def_Cost_UseSpeaker, Def_Cost_Revive, Def_Cost_FBEncourage]
			#内部仙玉不能用的消费类型列表
			UnUseInner_CostType = [Def_Cost_BourseBuy, Def_Cost_FamilyRedPacket]
			UnUseInner_CostType = [Def_Cost_BourseBuy, Def_Cost_FamilyRedPacket, Def_Cost_AuctionBid]
			# 消费类型对应信息字典{消费类型:[eventName, 中文说明reason_name, 发送给9377的数据是否分消费子类], }
			# 由于9377那边数据建议所有消费点总和最好不超过500个，故这里对部分发送给对方的数据进行归组为不分子类，或直接归属于商城分组
			# .使用原价购买的物品统一归属为商城组，消费对应为AutoBuy的也归属于商城分组
			@@ -4749,6 +4763,9 @@
			Def_Cost_FBHelpBattle:"FBHelpBattle",
			Def_Cost_FBGatherSoulBoss:"FBGatherSoulBoss",
			Def_Cost_CrossRealmPK:"CrossRealmPK",
			Def_Cost_LuckyTreasure:"LuckyTreasure",
			Def_Cost_MysteryShopRefresh:"MysteryShopRefresh",
			Def_Cost_AuctionBid:"AuctionBid",
			}
			## -----------------------------------------------------

			@@ -4781,7 +4798,9 @@
			Def_GiveMoney_FreeGoods, # 极品白拿
			Def_GiveMoney_BindJadeWheel, # 绑玉转盘 25
			Def_GiveMoney_GatherSoulDecompose, #聚魂分解 26
			) = range(1000, 1000 + 27)
			Def_GiveMoney_AuctionBidReturn, #拍卖竞价返还
			Def_GiveMoney_AuctionGain, #拍卖获得利润
			) = range(1000, 1000 + 29)

			Def_Give_Reason_SonKey = "reason_name_son" # 原因子类说明key

			@@ -4814,6 +4833,8 @@
			Def_GiveMoney_FreeGoods:"FreeGoods",
			Def_GiveMoney_BindJadeWheel:"BindJadeWheel",
			Def_GiveMoney_GatherSoulDecompose:"GatherSoulDecompose",
			Def_GiveMoney_AuctionBidReturn:"AuctionBidReturn",
			Def_GiveMoney_AuctionGain:"AuctionGain",
			}

			##==================================================================================================
			@@ -4840,7 +4861,8 @@
			ItemGive_Refine, # 炼丹
			ItemGive_Chests, # 宝箱
			ItemGive_TrialExchange, # 宗门兑换
			) = range(1000, 1000 + 20)
			ItemGive_LuckyTreasure, #幸运鉴宝
			) = range(1000, 1000 + 21)

			# 物品获得类型对应信息 {类型:eventName, ...}
			ItemGiveTypeDict = {
			@@ -4864,6 +4886,7 @@
			ItemGive_Refine:"Refine",
			ItemGive_Chests:"Chests",
			ItemGive_TrialExchange:"TrialExchange",
			ItemGive_LuckyTreasure:"LuckyTreasure",
			}

			## 物品扣除类型定义，与获得类型不重复，类型定义为 2000 ~ 2999
			@@ -4906,7 +4929,9 @@
			ItemDel_GatherSoul, # 聚魂分解
			ItemDel_CoatDecompose, # 时装分解
			ItemDel_ZhuXianDecompose, # 诛仙装备分解
			) = range(2000, 2000 + 38)
			ItemDel_EquipStarUp, # 装备升星
			ItemDel_EquipPlusEvolve, # 装备强化进化
			) = range(2000, 2000 + 40)

			# 物品扣除类型对应信息 {类型:eventName, ...}
			ItemDelTypeDict = {
			@@ -4948,6 +4973,8 @@
			ItemDel_GatherSoul:"GatherSoul",
			ItemDel_CoatDecompose:"CoatDecompose",
			ItemDel_ZhuXianDecompose:"ZhuXianDecompose",
			ItemDel_EquipStarUp:"EquipStarUp",
			ItemDel_EquipPlusEvolve:"EquipPlusEvolve",
			}

			##==================================================================================================
			@@ -5290,11 +5317,35 @@
			Def_WPAct_Stone, #宝石总等级 24
			Def_WPAct_GodWeapon, #神兵总等级 25
			Def_WPAct_Rune, #穿戴某品质符印 26
			) = range(1, 26+1)
			Def_WPAct_Pray, #祈愿 27
			) = range(1, 27+1)

			#可提前完成的周狂欢活动
			AheadFinishWPActList = [Def_WPAct_Horse, Def_WPAct_Pet, Def_WPAct_Dogz, Def_WPAct_Rune]

			#登录奖励活动定义
			LoginAwardActIDList = (
			Def_LoginAct_Login, #每日登录1
			Def_LoginAct_Pray, #祈愿2
			Def_LoginAct_TowerSweep, #符印塔扫荡 3
			Def_LoginAct_KirinHome, #麒麟之府 4
			Def_LoginAct_RunTask, #师门悬赏5
			Def_LoginAct_XJMJ, #仙境秘境 6
			Def_LoginAct_FMT, #封魔坛7
			Def_LoginAct_MunekadoTrial, #宗门试炼8
			Def_LoginAct_FamilyParty, #仙盟宴会9
			Def_LoginAct_WorldBOSS, #世界boss 10
			Def_LoginAct_QueenRelices, #娲皇遗迹 11
			Def_LoginAct_IceLode, #冰晶矿脉 12
			Def_LoginAct_GodArea, #古神禁地 13
			Def_LoginAct_ZhuXianTower, #诛仙塔挑战 14
			Def_LoginAct_ZhuXianBOSS, #诛仙boss 15
			Def_LoginAct_Alchemy, #炼丹 16
			Def_LoginAct_EquipPlus, #强化 17
			Def_LoginAct_EquipWash, #洗炼 18
			) = range(1, 18+1)


			# 套装枚举，普通套装，强化套装
			(EquipSuitType_Normal,
			EquipSuitType_Plus,