SnxxServerCode.git

			@@ -258,11 +258,12 @@
			Def_ItemID_VIPExperience = 985 # VIP体验卡

			# 直接转换为对应数值的物品ID列表
			Def_ItemID_GoldMoney = 20 # 直接给仙玉
			Def_ItemID_SilverMoney = 22 # 直接给铜钱
			Def_ItemID_FamilyContribution = 26 # 直接给战盟贡献点
			Def_ItemID_FamilyActive = 28 # 直接给战盟活跃点
			Def_ItemID_SP = 29 # 直接给sp
			Def_ItemID_GoldPaper = 30 # 直接给绑玉
			#Def_ItemID_GoldPaper = 30 # 直接给绑玉
			Def_ItemID_RealmPoint = 24 # 直接给修行点
			Def_ItemID_BossReborn = 21 # 直接给boss复活点
			Def_ItemID_Ysog = 4306 # 直接给符印融合石
			@@ -270,9 +271,11 @@
			Def_ItemID_SoulSplinters = 701 # 直接给聚魂碎片
			Def_ItemID_SoulCore = 702 # 直接给核心环
			Def_ItemID_Honor = 2141 # 直接给荣誉
			Def_TransformItemIDList = [Def_ItemID_FamilyContribution, Def_ItemID_FamilyActive, Def_ItemID_SP, Def_ItemID_GoldPaper,
			Def_ItemID_XianyuanCoin = 2138 # 直接给仙缘币
			Def_TransformItemIDList = [Def_ItemID_FamilyContribution, Def_ItemID_FamilyActive, Def_ItemID_SP, #Def_ItemID_GoldPaper,
			Def_ItemID_RealmPoint, Def_ItemID_SilverMoney, Def_ItemID_BossReborn, Def_ItemID_Ysog,
			Def_ItemID_SoulDust, Def_ItemID_SoulSplinters, Def_ItemID_SoulCore, Def_ItemID_Honor]
			Def_ItemID_SoulDust, Def_ItemID_SoulSplinters, Def_ItemID_SoulCore, Def_ItemID_Honor, Def_ItemID_GoldMoney,
			Def_ItemID_XianyuanCoin]
			#---------------------------------------------------------------------
			#写死的物品类型都放这边
			Def_ItemType_All = -1 #所有类型
			@@ -360,20 +363,7 @@
			Def_ItemType_DogzEquipScute = 123 # 神兽鳞甲
			Def_ItemType_AddCrossRealmPKCnt = 127 #增加跨服PK次数

			Def_ItemType_ZXCloak = 128 # 诛仙披风
			Def_ItemType_ZXMask = 129 # 诛仙面具
			Def_ItemType_ZXGlove = 130 # 诛仙手套
			Def_ItemType_ZXRuyi = 131 # 诛仙如意
			Def_ItemType_ZXPendant = 132 # 诛仙吊坠
			Def_ItemType_ZXRing = 133 # 诛仙戒指
			Def_ItemType_ZXWeapon1 = 134 # 诛仙剑1
			Def_ItemType_ZXWeapon2 = 135 # 诛仙剑2
			Def_ItemType_ZXWeapon3 = 136 # 诛仙剑3
			Def_ItemType_ZXWeapon4 = 137 # 诛仙剑4
			Def_ItemType_ZhuXianStuff = 138 # 诛仙材料

			Def_ItemType_DogzStuff = 139 # 神兽材料
			Def_ItemType_ZhuXianStone = 140 # 诛仙宝石

			#以下定义物品类型下次删除
			Def_Item_Type_Horse = 1000036 #坐骑
			@@ -450,6 +440,9 @@
			Def_Effect_ItemGiveWeekPartyPoint = 245 #使用道具给予七日巡礼积分
			Def_Effect_ItemGiveWeekPartyPoint1 = 246 #使用道具给予节日巡礼积分
			Def_Effect_AddRealmExpRate = 251 #增加聚灵效率
			Def_Effect_TouchMission = 252 #触发任务
			Def_Effect_HorsePetSkinExp = 253 #骑宠觉醒值
			Def_Effect_ItemGiveTreasureScore = 254 #使用道具给予寻宝积分
			#----以下未使用或代码依然存在的---
			Def_Effect_ItemGiveGongXun = 1920 #使用道具给予功勋
			Def_Effect_ItemGiveRuneJH = 1925 #使用道具给予符印精华
			@@ -584,7 +577,8 @@
			Def_Skill_Effect_ProcessAttack = 1314 # 间隔性攻击，A值为攻击次数，B值为是否广播客户端
			Def_Skill_Effect_BuffTick = 9999 #BUFF的时间处理间隔
			Def_Skill_Effect_BurnToAddHP = 1091 #buff中灼烧伤害转化吸血给放灼烧者

			Def_Skill_Effect_ChangeSkillTypeID = 1305 # 改变释放的技能ID
			Def_Skill_Effect_AddExpRate = 1306 # 被技能杀死的额外加经验

			#写死的技能效果ID------------NPC专用
			Def_Skill_Effect_AttackMove = 2100 # NPC位移战斗
			@@ -729,6 +723,7 @@
			Def_SkillID_FamilyWar_RandBuffAttr = 22203 # 仙盟联赛 - 随机buff属性加成，根据采集次数，成长buff等级
			Def_SkillID_FamilyWar_OwnerlessBuff = 22213 # 仙盟联赛 - 无主buff，随机N个敌方水晶变为无主

			Def_SkillID_LXHY_AddExpRate = 47113 # 流星火雨杀死的怪增加经验

			# 切地图需清除的buff
			ClearBuffOnMapChangeList = [Def_SkillID_DropOwnerBuff, Def_SkillID_FamilyWar_CWinBuff,
			@@ -778,13 +773,10 @@

			Def_EquipItemType_TJGAutoEat = xrange(Def_ItemType_retWeapon, Def_ItemType_retShoes + 1)
			#装备类型
			Def_EquipItemType = range(Def_ItemType_retWeapon, Def_ItemType_DogzEquipScute + 1) + range(Def_ItemType_ZXCloak, Def_ItemType_ZXWeapon4 + 1)
			Def_EquipItemType = range(Def_ItemType_retWeapon, Def_ItemType_DogzEquipScute + 1)

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

			#诛仙装备类型
			Def_ZhuXianEquiipType = xrange(Def_ItemType_ZXCloak, Def_ItemType_ZXWeapon4 + 1)

			# 技能造成实质性伤害的类型
			Def_RealAttack_Type = [
			@@ -805,11 +797,6 @@
			#内网GM等级
			Def_GM_LV_God = 90
			#---------------------------------------------------------------------
			#游戏中所有的金钱类型
			Def_MoneyType_All = [IPY_GameWorld.TYPE_Price_Gold_Money, # 元宝
			IPY_GameWorld.TYPE_Price_Gold_Paper, # 礼券
			IPY_GameWorld.TYPE_Price_Silver_Money, # 银子
			]

			#客户端心跳响应封包间隔(毫秒)
			Def_PlayerOnLineReply_ClientReply = 30000 #30000
			@@ -850,10 +837,6 @@
			Def_PackCnt_DogzItem = 100
			#初始化神兽装备格子数
			Def_PackCnt_DogzEquip = 100
			#初始化诛仙背包格子数
			Def_PackCnt_ZhuXianItem = 100
			#初始化诛仙装备格子数
			Def_PackCnt_ZhuXianEquip = 12
			#初始化装备栏2
			Def_PackCnt_Equip2 = 0
			#初始化回收站
			@@ -1097,8 +1080,6 @@
			ShareDefine.rptPet,
			ShareDefine.rptDogzItem,
			ShareDefine.rptDogzEquip,
			ShareDefine.rptZhuXianItem,
			ShareDefine.rptZhuXianEquip,
			]

			#装备可强化背包列表
			@@ -1247,7 +1228,7 @@
			) = range( 0, Def_AutoAtkSkillType )

			#技能类型
			Def_SkillType_Count = 24
			Def_SkillType_Count = 25
			(
			Def_SkillType_Special , #特殊技能 0
			Def_SkillType_Atk , #攻击类 1
			@@ -1273,6 +1254,7 @@
			Def_SkillType_PassiveLstPlsBuff, #被动触发持续增益类buff 21
			Def_SkillType_PassiveLstDepBuff, #被动触发持续减益类buff 22
			Def_SkillType_AttrSkillNoLearn, # 可叠加的同类型ID属性类技能不可学习算属性直接取表目前用于神兽技能 23
			Def_SkillType_PassiveLstPlsBuffAtk, #被动持续攻击类BUFF 24

			) = range( 0, Def_SkillType_Count )

			@@ -1296,20 +1278,21 @@
			Def_SkillType_PassiveActionBuff : IPY_GameWorld.bfActionBuff , #影响行为BUFF 14
			Def_SkillType_PassiveLstPlsBuff: IPY_GameWorld.bfProcessBuff, #被动触发持续增益类buff 3
			Def_SkillType_PassiveLstDepBuff: IPY_GameWorld.bfProcessDeBuff, #被动触发持续减益类buff 4
			Def_SkillType_PassiveLstPlsBuffAtk : IPY_GameWorld.bfProcessBuff , #持续增益BUFF 3

			}

			# 伤害型技能
			Def_HurtSkill_List = [Def_SkillType_Atk, Def_SkillType_LstPlsBuffAtk]
			Def_HurtSkill_List = [Def_SkillType_Atk, Def_SkillType_LstPlsBuffAtk, Def_SkillType_PassiveLstPlsBuffAtk]


			#持续型技能列表
			Def_LstBuff_List = [ Def_SkillType_LstPlsBuff, Def_SkillType_LstDepBuff, Def_SkillType_LstPlsBuffAtk,
			Def_LstBuff_List = [ Def_SkillType_LstPlsBuff, Def_SkillType_LstDepBuff, Def_SkillType_LstPlsBuffAtk, Def_SkillType_PassiveLstPlsBuffAtk,
			Def_SkillType_PassiveLstPlsBuff, Def_SkillType_PassiveLstDepBuff ]

			#对敌使用技能列表
			Def_CanAttackSkill_List = [ Def_SkillType_LstDepBuff, Def_SkillType_DepBuff, Def_SkillType_Atk,
			Def_SkillType_Action, Def_SkillType_LstPlsBuffAtk,
			Def_SkillType_Action, Def_SkillType_LstPlsBuffAtk, Def_SkillType_PassiveLstPlsBuffAtk,
			Def_SkillType_PassiveDepBuff, Def_SkillType_PassiveActionBuff, Def_SkillType_PassiveLstDepBuff ]

			#不利BUFF给NPC添加仇恨
			@@ -1454,7 +1437,7 @@
			#自动恢复计算间隔
			Def_HPRestoreInterval = 5000
			#允许重置的背包索引
			Def_CanItemResetPack = [IPY_GameWorld.rptItem, IPY_GameWorld.rptWarehouse, ShareDefine.rptTreasure, ShareDefine.rptZhuXianItem]
			Def_CanItemResetPack = [IPY_GameWorld.rptItem, IPY_GameWorld.rptWarehouse, ShareDefine.rptTreasure]
			#仓库分页个数
			Def_ItemReset_WarehousePageCnt = 56
			#玩家捡起物品的距离 8
			@@ -1773,9 +1756,9 @@
			Def_FBMapID_SealDemon = 52010
			#单人封魔坛
			Def_FBMapID_SealDemonEx = 52020
			#诛仙BOSS
			#诛仙BOSS/雷罚BOSS
			Def_FBMapID_ZhuXianBoss = 31380
			#天星塔
			#天星塔/丹塔
			Def_FBMapID_SkyTower = 31370
			#仙魔之争
			Def_FBMapID_XMZZ = 31010
			@@ -1850,10 +1833,12 @@
			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]
			Def_NoLimitEnterCntMap = [Def_FBMapID_AllFamilyBoss, Def_FBMapID_FamilyParty, Def_FBMapID_FamilyWar, Def_FBMapID_FamilyInvade, Def_FBMapID_ElderBattlefield]

			# 无玩家时不自动关闭的自伸缩副本
			Def_NoPlayerNotCloseAutoSizeMap = [Def_FBMapID_FamilyInvade, Def_FBMapID_FamilyBossMap, Def_FBMapID_GatherSoul]
			# 无玩家时自动关闭的非自伸缩副本
			Def_NoPlayerCloseNotAutoSizeMap = [Def_FBMapID_ZhuXianBoss]

			# 不可切换PK模式的地图
			Def_CanNotChangeAtkModelMap = []
			@@ -2974,6 +2959,7 @@
			Def_NPC_Dict_FromRefreshValue = 'FromRefreshValue'
			#召唤地图NPC的玩家ID
			Def_NPC_Dict_SummonMapNPCPlayerID = 'SummonMapNPCPlayerID'
			Def_NPC_Dict_PriWoodPilePlayerID = 'PriWoodPilePlayerID'
			#NPC技能已使用次数
			Def_NPC_Dict_SkillUseCnt = 'NPCSkillUseCnt_%s' # 参数skillTypeID
			#不死的boss
			@@ -3383,6 +3369,7 @@
			Def_Player_Dict_EnterFbCntWeek = "EnterFbCntWeek_%s" # 本周进入副本次数, 参数为副本ID
			Def_Player_Dict_FbCntRegainStartTime = "FbCntRegainStartTime_%s" # 副本次数恢复开始时间, 参数为副本ID
			Def_Player_Dict_FbCntRegainTotalTime = "FbCntRegainTotalTime_%s" # 副本次数恢复还需时间, 参数为副本ID
			Def_Player_Dict_FbCntRegainOverTime = "FbCntRegainOverTime_%s" # 副本次数恢复超出的次数, 参数为副本ID
			Def_Player_Dict_FBHistoryMaxLine = "FBHistoryMaxLine_%s" # 副本历史最高通关, 参数为副本ID
			Def_Player_Dict_IceLoadLineID = "IceLoadLineID_%s" # 副本星级星级信息, 参数为[key编号], 按位存储每个lineID是否选中
			Def_Player_Dict_RefurbishGoodBookPlayerLv = "RefurbishGoodBookPlayerLv_97" # 刷新天书任务时的玩家等级
			@@ -3468,6 +3455,7 @@
			Def_PDict_OnlineStartTick = "OnlineStartTime" # 在线计算时间
			Def_PDict_LVAwardGetRecord = "LVAwardGetRecord" # 等级奖励领取信息记录，按二进制位标示
			Def_PDict_LVAwardVIPGetRecord = "LVAwardVIPGetRecord" # 等级奖励vip领取信息记录，按二进制位标示
			Def_PDict_HistoryChargeAwardGetRecord = "HTotalGoldAwardRecord" # 历史累计充值奖励领取信息记录，按二进制位标示
			Def_PDict_CTGCountResetTime = "CTGCountResetTime" # CTG次数重置时间time值
			Def_PDict_TodayCTGCount = "TodayCTGCount_%s" # 当日充值次数，参数(CTG对应的商品记录ID)
			Def_PDict_CTGGoodsBuyCount = "CTGGoodsBuyCount_%s" # 对应充值商品已购买次数，参数(CTG对应的商品记录ID)
			@@ -3509,8 +3497,8 @@
			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_AttrFruitAddItemCnt = "FruitAddItemCnt_%s" # 增幅丹增加上限数，参数为果实物品id
			Def_PDict_AttrFruitItemBreakCnt = "FruitItemBreakCnt_%s" # 增幅丹突破次数，参数为果实物品id

			Def_PDict_NobleLV = "NobleLV" # 贵族等级, 0位为不同贵族模式版本切换标记位, 从1位开始表示每种等级贵族开通情况， 1-已开通过；9-永久
			Def_PDict_NobleEndTime = "NobleEndTime_%s" # 贵族到期结束时间<单位s>, 参数为贵族等级, 从1开始
			@@ -3523,7 +3511,7 @@
			Def_PDict_RecoverFBNoBuyCnt = "RecoverFBNoBuyCnt_%s" # 资源找回副本普通次数 <%s-找回项索引>
			Def_PDict_RecoverGainData = "RecoverGainData_%s" # 资源找回额外数据<%s-找回项索引>
			Def_PDict_RecoverGainDataEx = "RecoverGainDataEx_%s" # 资源找回额外数据<%s-找回项索引>
			Def_PDict_HaveRecover = "HaveRecover_%s" # 资源找回今日是否已找回<%s-找回项索引>
			Def_PDict_HaveRecover = "HaveRecover_%s" # 资源找回今日是否已找回<%s-找回项索引> 1：找回了普通 2：找回了vip 3：2个都有找回
			Def_PDict_RecoverGainLastTime = "RecoverGainLastTime" # 上一次资源找回时的时间

			Def_PDict_NPCKillCount = "NPCKillCount_%s" # NPC已击杀次数, 参数(NPCID) CCBBAA, AA存储公共装备次数，BB存储公共ID次数，CC存储私有次数
			@@ -3607,10 +3595,6 @@
			#试炼之塔
			Def_Player_Dict_TrialTower_PassLV = "TrialTower_PassLV" # 试炼之塔通关层数
			Def_Player_Dict_TrialTower_LastDayPassLV = "Tower_LastDayPassLV" # 试炼之塔昨日通关层数
			#诛仙塔
			Def_Player_Dict_ZhuXianTowerPassLV = "ZhuXianTowerPassLV" # 诛仙塔已通关层数
			Def_Player_Dict_ZhuXianTowerLastFloor = "ZhuXianTowerLastFloor" # 诛仙塔上次挑战层数
			Def_Player_Dict_ZhuXianTowerCostTime = "ZhuXianTowerCostTime" # 诛仙塔通关时间
			#天星塔
			Def_Player_Dict_SkyTowerFloor = "SkyTowerFloor" # 天星塔已通关层数

			@@ -3766,7 +3750,9 @@
			Def_PDict_Horser_LV = "Horser_LV_%d" # 坐骑等级 0代表未激活 1代表1级
			Def_PDict_Horser_Exp = "Horser_Exp_%d" # 坐骑经验
			Def_PDict_Horser_Multiple = "Horser_Multiple" # 坐骑下次升阶暴击倍数

			#骑宠觉醒
			Def_PDict_HorsePetSkinData = "HorsePetSkinData%d_%s" #觉醒等级*100+外观索引参数(类型,关联ID) 1-坐骑 2-灵宠
			Def_PDict_HorsePetSkinExp = "HorsePetSkinExp%d_%s" #经验参数(类型,关联ID) 1-坐骑 2-灵宠
			# 符印
			Def_PDict_Rune_HoleOpenState = "Rune_HoleOpenState" # 符印解锁状态
			Def_PDict_Rune_Data = "Rune_Data_%s" # 符印镶嵌数据, 参数(第几孔)
			@@ -3788,11 +3774,14 @@

			# 每日活跃度
			Def_PDict_Activity_FinishCnt = "Activity_FinishCnt_%s" # 活跃度类型对应完成次数
			Def_PDict_Activity_TotalPoint = "Activity_TotalPoint" # 当前总活跃值
			Def_PDict_Activity_TotalPoint = "Activity_TotalPoint" # 当前总活跃值（不可消耗）
			Def_PDict_ActivityCanCostTotalPoint = "ActivityCanCostTotalPoint" # 当前总活跃值（可消耗）
			Def_PDict_ActivityHistoryPoint = "ActivityHistoryPoint" # 累积获得活跃值
			Def_PDict_ActivityAwardRecord = "ActivityAwardRecord" # 活跃度奖励领取记录，按二进制位标识
			Def_PDict_Activity_AwardStage = "Activity_AwardStage" # 当前活跃奖励阶段
			Def_PDict_Activity_RealmPoint = "Activity_RealmPoint" # 当前可领修行点
			Def_PDict_Activity_ExtraRealmPoint = "Activity_ExtraRealmPoint" # 多倍活动额外获得的修行点

			# 每日活动
			Def_PDict_DailyActionDayTimes = "DailyActionDayTimes_%s" # 每日活动今日完成次数参数每日活动ID
			Def_PDict_DailyActionDayBuyTimes = "DADayBuyTimes_%s" # 每日活动今日购买次数参数每日活动ID
			@@ -3826,7 +3815,8 @@
			Def_PDict_CrossPK_DanLV = "CrossPK_DanLV" # 当前段位
			Def_PDict_CrossPK_PKCount = "CrossPK_PKCount" # 当前总PK次数
			Def_PDict_CrossPK_WinCount = "CrossPK_WinCount" # 当前胜利次数
			Def_PDict_CrossPK_CWinCount = "CrossPK_CWinCount" # 跨当前连胜次数
			Def_PDict_CrossPK_CWinCount = "CrossPK_CWinCount" # 当前连胜次数
			Def_PDict_CrossPK_CLoseCount = "CrossPK_CLoseCount" # 当前连败次数
			Def_PDict_CrossPK_TodayPKCount = "CrossPK_TodayPKCount" # 今日已PK次数
			Def_PDict_CrossPK_TodayWinCount = "CrossPK_TodayWinCount" # 今日已胜利次数
			Def_PDict_CrossPK_TodayBuyCount = "CrossPK_TodayBuyCount" # 今日已购买PK次数
			@@ -3885,6 +3875,7 @@
			Def_PDict_AlchemyLearnState = "AlchemyLearnState%s" #丹方是否已学习
			Def_PDict_AlchemyItemID = "AlchemyItemID_%s" #炼丹中的丹药ID 参数丹药类型
			Def_PDict_AlchemyStartTime = "AlchemyStartTime_%s" #炼丹开始时间参数丹药ID
			Def_PDict_AlchemyTimes = "AlchemyTimes_%s" #本次炼丹几次参数丹药ID
			Def_PDict_AlchemyCnt = "AlchemyCnt%s" #丹药炼丹次数

			Def_PDict_AlchemyPrayCnt = "AlchemyPrayCnt" #炼丹祈福次数
			@@ -4071,6 +4062,9 @@

			#战斗线性
			ShareDefine.Def_Effect_MaxHP:[[TYPE_Calc_AttrMaxHP], False, TYPE_Linear], # 最大血量
			ShareDefine.Def_Effect_MaxHP_ShenPin:[[TYPE_Calc_AttrMaxHP], False, TYPE_Linear], # 最大血量
			ShareDefine.Def_Effect_MaxHP_XianPin:[[TYPE_Calc_AttrMaxHP], False, TYPE_Linear], # 最大血量
			ShareDefine.Def_Effect_MaxHP_JiPin:[[TYPE_Calc_AttrMaxHP], False, TYPE_Linear], # 最大血量
			ShareDefine.Def_Effect_MaxMP:[[TYPE_Calc_AttrMaxMP], False, TYPE_Linear],
			ShareDefine.Def_Effect_Def:[[TYPE_Calc_AttrDEF], False, TYPE_Linear],
			ShareDefine.Def_Effect_Miss:[[TYPE_Calc_AttrMiss], False, TYPE_Linear],
			@@ -4081,6 +4075,9 @@
			ShareDefine.Def_Effect_MinAtk:[[TYPE_Calc_AttrATKMin], False, TYPE_Linear],
			ShareDefine.Def_Effect_MaxAtk:[[TYPE_Calc_AttrATKMax], False, TYPE_Linear],
			ShareDefine.Def_Effect_Atk:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_Linear],
			ShareDefine.Def_Effect_Atk_ShenPin:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_Linear],
			ShareDefine.Def_Effect_Atk_XianPin:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_Linear],
			ShareDefine.Def_Effect_Atk_JiPin:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_Linear],
			#ShareDefine.Def_Effect_Atk:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax,
			# TYPE_Calc_AttrMATKMin, TYPE_Calc_AttrMATKMax], False, TYPE_Linear],
			ShareDefine.Def_Effect_AddAtk:[[TYPE_Calc_AttrATKMax], False, TYPE_Linear],
			@@ -4108,12 +4105,18 @@
			AttrName_MaxMP:[[TYPE_Calc_AttrMaxMP], False, TYPE_Linear],
			AttrName_IceAtk:[[TYPE_Calc_AttrIceAtk], False, TYPE_Linear],
			ShareDefine.Def_Effect_IceAtk:[[TYPE_Calc_AttrIceAtk], False, TYPE_Linear],
			ShareDefine.Def_Effect_IceAtk_ShenPin:[[TYPE_Calc_AttrIceAtk], False, TYPE_Linear],
			ShareDefine.Def_Effect_IceAtk_XianPin:[[TYPE_Calc_AttrIceAtk], False, TYPE_Linear],
			ShareDefine.Def_Effect_IceAtk_JiPin:[[TYPE_Calc_AttrIceAtk], False, TYPE_Linear],
			AttrName_FireAtk:[[TYPE_Calc_AttrFireAtk], False, TYPE_Linear],
			AttrName_PoisonAtk:[[TYPE_Calc_AttrPoisonAtk], False, TYPE_Linear],
			AttrName_ThunderAtk:[[TYPE_Calc_AttrThunderAtk], False, TYPE_Linear],
			AttrName_WindAtk:[[TYPE_Calc_AttrWindAtk], False, TYPE_Linear],
			AttrName_IceDef:[[TYPE_Calc_AttrIceDef], False, TYPE_Linear],
			ShareDefine.Def_Effect_IceDef:[[TYPE_Calc_AttrIceDef], False, TYPE_Linear],
			ShareDefine.Def_Effect_IceDef_ShenPin:[[TYPE_Calc_AttrIceDef], False, TYPE_Linear],
			ShareDefine.Def_Effect_IceDef_XianPin:[[TYPE_Calc_AttrIceDef], False, TYPE_Linear],
			ShareDefine.Def_Effect_IceDef_JiPin:[[TYPE_Calc_AttrIceDef], False, TYPE_Linear],
			AttrName_FireDef:[[TYPE_Calc_AttrFireDef], False, TYPE_Linear],
			AttrName_PoisonDef:[[TYPE_Calc_AttrPoisonDef], False, TYPE_Linear],
			AttrName_ThunderDef:[[TYPE_Calc_AttrThunderDef], False, TYPE_Linear],
			@@ -4300,8 +4303,14 @@
			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_BaseEquipAtkAddPer: [-2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
			ShareDefine.Def_Effect_BaseEquipAtkAddPer_ShenPin: [-2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
			ShareDefine.Def_Effect_BaseEquipAtkAddPer_XianPin: [-2, [ShareDefine.Def_Effect_Atk, ShareDefine.Def_Effect_MinAtk, ShareDefine.Def_Effect_MaxAtk]],
			ShareDefine.Def_Effect_BaseEquipAtkAddPer_JiPin: [-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_BaseEquipMaxHPAddPer_ShenPin: [-2, [ShareDefine.Def_Effect_MaxHP]],
			ShareDefine.Def_Effect_BaseEquipMaxHPAddPer_XianPin: [-2, [ShareDefine.Def_Effect_MaxHP]],
			ShareDefine.Def_Effect_BaseEquipMaxHPAddPer_JiPin: [-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]],
			@@ -4342,14 +4351,14 @@
			Def_CalcAttrFunc_Plus, # 装备位强化 5
			Def_CalcAttrFunc_Stone, # 装备宝石 6
			Def_CalcAttrFunc_Wash, # 洗练 7
			Def_CalcAttrFunc_Wing, # 翅膀 8
			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_15,
			Def_CalcAttrFunc_Success, # 成就属性 16
			Def_CalcAttrFunc_VIP, # VIP属性 17
			Def_CalcAttrFunc_Stove, # 炼丹炉 18(废弃)
			@@ -4372,26 +4381,29 @@
			Def_CalcAttrFunc_MagicWeapon4, # 王者法宝 35
			Def_CalcAttrFunc_Coat, # ʱװ 36
			Def_CalcAttrFunc_LingQi, # 灵器 37
			) = range(38)
			Def_CalcAttrFunc_LingQiAttr, # 灵器属性 38
			Def_CalcAttrFunc_HorseSkin, # 坐骑觉醒 39
			Def_CalcAttrFunc_PetSkin, # 灵宠觉醒 40
			) = range(41)

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

			#战斗力分组类型对应功能点属性分类索引列表，并不是一一对应的，有些战斗力类型可由多个功能点组成
			#*注意*: 以下功能点需包含上面定义的所有功能点，不然会导致有些属性无法加上
			MFPTypeAttrFuncIndexDict = {ShareDefine.Def_MFPType_Role:[Def_CalcAttrFunc_RoleBase],
			ShareDefine.Def_MFPType_Equip:[Def_CalcAttrFunc_Equip, Def_CalcAttrFunc_EquipOutOfPrint],
			ShareDefine.Def_MFPType_Equip:[Def_CalcAttrFunc_Equip],
			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, Def_CalcAttrFunc_LingQi],
			ShareDefine.Def_MFPType_LingQi:[Def_CalcAttrFunc_LingQi, Def_CalcAttrFunc_LingQiAttr],
			ShareDefine.Def_MFPType_Wash:[Def_CalcAttrFunc_Wash],
			ShareDefine.Def_MFPType_Pet:[Def_CalcAttrFunc_Pet, Def_CalcAttrFunc_PetSign, Def_CalcAttrFunc_PetSkill],
			ShareDefine.Def_MFPType_Pet:[Def_CalcAttrFunc_Pet, Def_CalcAttrFunc_PetSign, Def_CalcAttrFunc_PetSkill, Def_CalcAttrFunc_PetSkin],
			ShareDefine.Def_MFPType_PetSoul:[Def_CalcAttrFunc_PetSoul],
			ShareDefine.Def_MFPType_Horse:[Def_CalcAttrFunc_Horse, Def_CalcAttrFunc_HorseSkill],
			ShareDefine.Def_MFPType_Horse:[Def_CalcAttrFunc_Horse, Def_CalcAttrFunc_HorseSkill, Def_CalcAttrFunc_HorseSkin],
			ShareDefine.Def_MFPType_HorseSoul:[Def_CalcAttrFunc_HorseSoul],
			ShareDefine.Def_MFPType_Prestige:[Def_CalcAttrFunc_Prestige],
			ShareDefine.Def_MFPType_GodWeapon:[Def_CalcAttrFunc_GodWeapon],
			@@ -4494,7 +4506,14 @@
			TriggerType_BurnDisappear, # 灼烧消失触发 81
			TriggerType_SkillValue, # 增加技能伤害固定值 82
			TriggerType_HitSuccess, # 命中成功率 83
			) = range(1, 84)
			TriggerType_AddHP, # 技能回血 84
			TriggerType_ThumpHitSuckBloodPer, # 重击百分比吸血, 85
			TriggerType_SuperHitPer, # 暴击伤害百分比 86
			TriggerType_SkillSuccessExpend, # 使用技能成功后不触发技能处理消耗等问题用 87
			TriggerType_ThumpSkillValue, # 重击增加技能固定值伤害 88
			TriggerType_HitValue, # 记录命中个数 89
			TriggerType_ChangeSkillEff, # 改变技能特效广播 90
			) = range(1, 91)


			#不可以佩戴翅膀的地图
			@@ -4547,9 +4566,9 @@
			}

			#版本修正标记, 使用key格式 Def_Player_Dict_VersionFix
			#(
			#
			#) = range(0)
			(
			Def_VerFix_LingGenShow, #灵根特效外观
			) = range(1)

			##==================================================================================================
			#游戏消费点类型定义
			@@ -4601,6 +4620,8 @@
			Def_Cost_AuctionBid, # 拍卖行竞价
			Def_Cost_BuyDailyActionCnt, # 购买活动次数
			Def_Cost_FBBuyBuff, # 副本买buff
			Def_Cost_CreatFamily, # 创建仙盟
			Def_Cost_BuyKillBossCnt, #购买boss次数
			#-----------以下为暂时没用的，先不删除，如有新增消费点则放在这些之前------------
			Def_Cost_RefreshArrestTask, # 刷新悬赏任务
			Def_Cost_OffLineExp, # 兑换离线经验
			@@ -4613,7 +4634,7 @@
			Def_Cost_Trade, # 交易
			Def_Cost_Rename, # 改名
			Def_Cost_SkillLvUp, # 技能升级
			) = range(2000, 2000 + 58)
			) = range(2000, 2000 + 60)

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

			@@ -4693,6 +4714,8 @@
			Def_Cost_AuctionBid:"AuctionBid",
			Def_Cost_BuyDailyActionCnt:"BuyDailyActionCnt",
			Def_Cost_FBBuyBuff:"FBBuyBuff",
			Def_Cost_CreatFamily:"CreatFamily",
			Def_Cost_BuyKillBossCnt:"BuyKillBossCnt",
			}
			## -----------------------------------------------------

			@@ -4787,7 +4810,8 @@
			ItemGive_Chests, # 宝箱
			ItemGive_TrialExchange, # 宗门兑换
			ItemGive_LuckyTreasure, #幸运鉴宝
			) = range(1000, 1000 + 21)
			ItemGive_LingQiEquipBreak, #灵器突破
			) = range(1000, 1000 + 22)

			# 物品获得类型对应信息 {类型:eventName, ...}
			ItemGiveTypeDict = {
			@@ -4812,6 +4836,7 @@
			ItemGive_Chests:"Chests",
			ItemGive_TrialExchange:"TrialExchange",
			ItemGive_LuckyTreasure:"LuckyTreasure",
			ItemGive_LingQiEquipBreak:"LingQiEquipBreak",
			}

			## 物品扣除类型定义，与获得类型不重复，类型定义为 2000 ~ 2999
			@@ -4853,10 +4878,12 @@
			ItemDel_ChatBubbleBox, # 激活聊天气泡框
			ItemDel_GatherSoul, # 聚魂分解
			ItemDel_CoatDecompose, # 时装分解
			ItemDel_ZhuXianDecompose, # 诛仙装备分解
			ItemDel_2037,
			ItemDel_EquipStarUp, # 装备升星
			ItemDel_EquipPlusEvolve, # 装备强化进化
			) = range(2000, 2000 + 40)
			ItemDel_LingQiEquipBreak, # 灵器突破
			ItemDel_HorsePetAwake, # 骑宠觉醒
			) = range(2000, 2000 + 42)

			# 物品扣除类型对应信息 {类型:eventName, ...}
			ItemDelTypeDict = {
			@@ -4897,9 +4924,10 @@
			ItemDel_ChatBubbleBox:"ChatBubbleBox",
			ItemDel_GatherSoul:"GatherSoul",
			ItemDel_CoatDecompose:"CoatDecompose",
			ItemDel_ZhuXianDecompose:"ZhuXianDecompose",
			ItemDel_EquipStarUp:"EquipStarUp",
			ItemDel_EquipPlusEvolve:"EquipPlusEvolve",
			ItemDel_LingQiEquipBreak:"LingQiEquipBreak",
			ItemDel_HorsePetAwake:"HorsePetAwake",
			}

			##==================================================================================================
			@@ -5001,8 +5029,8 @@
			VIPPrivilege_18, #18 洗炼副本购买次数 - 副本总表统一处理
			VIPPrivilege_19, #19 虚无禁地额外次数 - 副本总表统一处理
			VIPPrivilege_20, #20 暮光神庙购买次数
			VIPPrivilege_21, #21 恶魔深渊购买次数 - 副本总表统一处理
			VIPPrivilege_22, #22 黑暗之门购买次数
			VIPPrivilege_21, #21 仙界秘境 - 副本总表统一处理
			VIPPrivilege_22, #22 宗门试炼购买次数
			VIPPrivilege_FamilyGoldPack, #23 仙盟钻石红包
			VIPPrivilege_BoursePwd, #24 集市上架使用密码
			VIPPrivilege_25, #25 封魔坛购买次数 - 副本总表统一处理
			@@ -5016,7 +5044,9 @@
			VIPPrivilege_XianyuanCoinUpperAdd, #33 仙缘币上限加成
			VIPPrivilege_XianyuanCoinAddPer, #34 仙缘币获得倍率加成（万分比）
			VIPPrivilege_35, #35 诛仙BOSS购买次数 - 副本总表统一处理
			) = range(1, 36)
			VIPPrivilege_36, #36 仙丹批量炼制
			VIPPrivilege_BossHomeBuy, #37 BOSS之家购买次数
			) = range(1, 38)


			(
			@@ -5052,7 +5082,7 @@
			(Def_SkillFuncType_Common, #0为通用技能
			Def_SkillFuncType_FbSkill, #1为法宝功能获得的主动技能
			Def_SkillFuncType_FbPassiveSkill, #2为法宝功能获得的被动技能
			Def_SkillFuncType_FbSPSkill, #3为法宝功能获得的SP技能
			Def_SkillFuncType_FbSPSkill, #3为法宝功能获得的SP技能 (专精)
			Def_SkillFuncType_GiftSkill, #4为天赋技能
			Def_SkillFuncType_HorseSkill, #5为坐骑技能
			Def_SkillFuncType_PetSkill, #6为宠物技能
			@@ -5063,7 +5093,9 @@
			Def_SkillFuncType_RealmSuppress, #11为境界压制目前是NPC在用
			Def_SkillFuncType_Dogz, #12 神兽技能
			Def_SkillFuncType_ZhuXian, #13 诛仙技能
			) = range(14)
			Def_SkillFuncType_SuiteSkill, #14 套装技能
			Def_SkillFuncType_PassiveSkillWithSP, #15 可有专精的被动技能
			) = range(16)

			# 受技能效果完全影响的怪，对应 Def_BattleRelationType_CommNoBoss
			Def_SkillAttack_NPCIsBoss = [ Def_NPCType_Ogre_Normal , #平凡小怪 0 # c++ 定义为普通NPC视野刷新
			@@ -5095,20 +5127,24 @@
			Def_SkillFuncType_HorseSkill:ShareDefine.Def_MFPType_Horse,
			Def_SkillFuncType_PetSkill:ShareDefine.Def_MFPType_Pet,
			Def_SkillFuncType_GWSkill:ShareDefine.Def_MFPType_Prestige,
			Def_SkillFuncType_SuiteSkill:ShareDefine.Def_MFPType_Equip,
			}


			# 投资理财类型
			GoldInvestTypeList = (
			GoldInvestType_Month, # 月卡投资
			GoldInvestType_VIP, # vip投资
			GoldInvestType_Gold, # 仙玉投资
			GoldInvestType_Gold2, # 仙玉投资2
			GoldInvestType_Gold3, # 仙玉投资3
			) = range(1,5+1)
			GoldInvestType_Month, # 旧月卡投资1(已废弃)
			GoldInvestType_VIP, # vip投资2
			GoldInvestType_Gold, # 仙玉投资3
			GoldInvestType_Gold2, # 仙玉投资4
			GoldInvestType_Gold3, # 仙玉投资5
			GoldInvestType_Week, # 周卡投资6(已废弃)
			GoldInvestType_NewMonth, # 至尊月卡投资7
			GoldInvestType_Month1, # 新30元月卡投资8
			) = range(1,8+1)

			#可以循环投资的类型
			CanRepeatInvestType = [GoldInvestType_Month, GoldInvestType_VIP]
			CanRepeatInvestType = [GoldInvestType_Week, GoldInvestType_Month, GoldInvestType_VIP, GoldInvestType_NewMonth, GoldInvestType_Month1]
			#仙玉投资类型
			InvestGoldTypeList = [GoldInvestType_Gold, GoldInvestType_Gold2, GoldInvestType_Gold3]

			@@ -5185,7 +5221,8 @@
			Def_RewardType_FeastWeekPartyAct, # 领取节日巡礼活动奖励25
			Def_RewardType_FeastWeekPartyPoint, # 领取节日巡礼积分奖励26
			Def_RewardType_FairyAdventuresAward, #缥缈奇遇领取27
			)= range(28)
			Def_RewardType_HistoryChargeAward, #历史累计充值领取28
			)= range(29)


			#boss复活相关活动定义
			@@ -5207,7 +5244,7 @@
			Def_BRAct_FamilyBoss, #仙盟BOSS 15
			) = range(1, 15+1)

			#全民来嗨活动定义
			#全民来嗨活动定义(仙界盛典)
			PeoplePartyActIDList = (
			Def_PPAct_Fireworks, #购买烟花 1
			Def_PPAct_Treasure, #极品寻宝 2
			@@ -5222,11 +5259,14 @@
			Def_PPAct_Pray, #祈愿 11
			Def_PPAct_BossHome, #boss之家 12
			Def_PPAct_VIPBoss, #vipBOSS 13
			) = range(1, 13+1)
			Def_PPAct_RunFamilyTask, #仙盟任务 14
			Def_PPAct_FamilyBoss, #仙盟Boss 15
			Def_PPAct_FairyDomain, #缥缈仙域 16
			) = range(1, 16+1)

			#周狂欢活动定义
			#周狂欢活动定义（七天巡礼）
			WeekPartyActIDList = (
			Def_WPAct_RunTask, #师门悬赏 1
			Def_WPAct_RunTask, #仙盟任务 1
			Def_WPAct_XJMJ, #仙境秘境 2
			Def_WPAct_KirinHome, #麒麟之府 3
			Def_WPAct_QueenRelices, #娲皇遗迹 4
			@@ -5239,7 +5279,7 @@
			Def_WPAct_CrossPK, #跨服pk 11
			Def_WPAct_Recharge, #充值X仙玉 12
			Def_WPAct_GiftBag, #购买限时礼包 13
			Def_WPAct_FamilyRobBoss, #boss争夺战 14
			Def_WPAct_HorsePetBoss, #骑宠争夺 14
			Def_WPAct_SWRH, #守卫人皇 15
			Def_WPAct_ElderBattlefield, #上古战场 16
			Def_WPAct_ChaosDemon, #混乱妖域 17
			@@ -5253,7 +5293,9 @@
			Def_WPAct_GodWeapon, #神兵总等级 25
			Def_WPAct_Rune, #穿戴某品质符印 26
			Def_WPAct_Pray, #祈愿 27
			) = range(1, 27+1)
			Def_WPAct_FamilyBoss, #仙盟Boss 28
			Def_WPAct_FairyDomain, #缥缈仙域 29
			) = range(1, 29+1)

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