SnxxServerCode.git

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

			#游戏对象属性--------------------------------------------
			Def_Calc_AllAttrType_MAX = 130
			Def_Calc_AllAttrType_MAX = 131
			#基本属性BUFF计算，顺序与 ObjProperty_AttrByIndex 对应，同时也为buff效果ID同步通知策划
			TYPE_Calc_AttrList = (
			#基础属性
			@@ -214,6 +214,7 @@
			TYPE_Calc_WingHPPer, # 翅膀生命百分比
			TYPE_Calc_SuiteBasePer, # 套装基础属性百分比
			TYPE_Calc_PlusBaseAtkPer, # 强化基础攻击百分比
			TYPE_Calc_ProDef, # 当前防护值
			) = range(1, Def_Calc_AllAttrType_MAX)


			@@ -261,8 +262,13 @@
			Def_ItemID_RealmPoint = 24 # 直接给修行点
			Def_ItemID_BossReborn = 21 # 直接给boss复活点
			Def_ItemID_Ysog = 4306 # 直接给符印融合石
			Def_ItemID_SoulDust = 700 # 直接给魂尘
			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_RealmPoint, Def_ItemID_SilverMoney, Def_ItemID_BossReborn, Def_ItemID_Ysog]
			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_ItemType_All = -1 #所有类型
			@@ -312,6 +318,9 @@
			Def_ItemType_FamilyBossFood = 50 #仙盟兽粮
			Def_ItemType_SuccessItem = 53 # 用于完成成就的物品，不存在背包
			Def_ItemType_ResetAttrPoint = 59 #洗点卷轴使用后将某个属性一定值变为未分配属性
			Def_ItemType_GatherSoulExp = 61 #聚魂精华材料
			Def_ItemType_GatherSoul = 62 #普通聚魂
			Def_ItemType_GatherSoulCore = 63 #聚魂核心

			Def_ItemType_DogzEquipExp = 70 # 神兽装备经验

			@@ -353,6 +362,7 @@
			#虚拟背包最大格子数功能配置表对应的key
			Def_VPackCnt_Dict = {
			ShareDefine.rptRune:'RunePackageNum',
			ShareDefine.rptGatherSoul:'GatherSoulPackCount',
			}

			#虚拟背包可以放入的物品字典
			@@ -360,6 +370,7 @@
			ShareDefine.rptRune:[Def_ItemType_Rune, Def_ItemType_RuneExp],
			ShareDefine.rptDogzItem:[Def_ItemType_DogzEquipExp, Def_ItemType_DogzEquipHorn, Def_ItemType_DogzEquipEye,
			Def_ItemType_DogzEquipTooth, Def_ItemType_DogzEquipClaw, Def_ItemType_DogzEquipScute],
			ShareDefine.rptGatherSoul:[Def_ItemType_GatherSoulExp, Def_ItemType_GatherSoul, Def_ItemType_GatherSoulCore],
			}

			def GetItemPackType(itemType, defaultPack=IPY_GameWorld.rptItem):
			@@ -422,9 +433,12 @@
			Def_Effect_AddMagicWeaponUpExp = 236 # 增加法宝升星经验 A值法宝ID B值X经验
			Def_Effect_ChatBubbleBox = 237 # 激活聊天气泡框，A值气泡框ID
			Def_Effect_ItemGiveRealmPoint = 238 #使用道具给予修行点
			Def_Effect_ItemGiveSoulDust = 239 # 使用道具给予魂尘
			Def_Effect_ItemGiveSoulSplinters = 240 # 使用道具给予聚魂碎片
			Def_Effect_ItemGiveSoulCore = 241 #使用道具给予核心环
			Def_Effect_ItemGiveHonor = 242 #使用道具给予荣誉
			#----以下未使用或代码依然存在的---
			Def_Effect_ItemGiveGongXun = 1920 #使用道具给予功勋
			Def_Effect_ItemGiveHonorPoint = 1922 #使用道具给予荣誉积分
			Def_Effect_ItemGiveRuneJH = 1925 #使用道具给予符印精华
			Def_Effect_ItemGiveRuneSplinters = 1926 #使用道具给予符印碎片
			Def_Effect_SuiteMark = 2838 #用于标示套装装备，过滤等使用
			@@ -1701,8 +1715,6 @@
			Def_Player_RequestAddFamilyMaxCnt = 200 #玩家申请加入家族的最大数量 (目前无限制配个大的数值)

			#-------------------------------#副本相关#------------------------
			# 跨服中转地图ID
			Def_MergeTransMapID = 12075
			#创角新手村地图ID列表
			Def_CreatRoleMapIDList = [10000]
			#PK周赛
			@@ -1773,6 +1785,10 @@
			Def_FBMapID_XMZZ = 31010
			#神兽副本
			Def_FBMapID_Dogz = 21110
			#聚魂副本
			Def_FBMapID_GatherSoul = 31340
			#跨服竞技场
			Def_FBMapID_CrossRealmPK = 32010
			#副本关闭时未拾取的物品邮件发放给玩家
			#这里只有需要的副本才配置，不做默认逻辑，防止某些副本实际不能给导致刷物品，如麒麟之府
			Def_SendUnPickItemMailMapIDList = [Def_FBMapID_IceLode, Def_FBMapID_PersonalBoss, Def_FBMapID_MunekadoTrial,
			@@ -1784,7 +1800,7 @@
			# 副本中玩家下线就被踢出
			Def_DisconnectExit_FBID = []
			#会有阵营的地图
			Def_MapID_NeedCamp = [Def_FBMapID_FamilyWar]
			Def_MapID_NeedCamp = [Def_FBMapID_FamilyWar, Def_FBMapID_GatherSoul, Def_FBMapID_CrossRealmPK]

			# 进入副本需要根据请求lineID动态分配虚拟分线属性的地图
			Def_MapID_LineIDToPropertyID = [Def_FBMapID_ElderBattlefield]
			@@ -1798,13 +1814,13 @@
			# + Def_FBMapID_ClearDevil

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

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

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

			# 不可切换PK模式的地图
			Def_CanNotChangeAtkModelMap = []
			@@ -1860,6 +1876,8 @@
			'SealDemon':[Def_FBMapID_SealDemon, Def_FBMapID_SealDemonEx], #封魔坛
			'XMZZ':[Def_FBMapID_XMZZ], #仙魔之争
			'Dogz':[Def_FBMapID_Dogz], #神兽副本
			'CrossRealmPK':[Def_FBMapID_CrossRealmPK], #跨服竞技场
			'GatherSoul':[Def_FBMapID_GatherSoul],#聚魂副本
			}

			#特殊副本ID, 由系统分配, 进入时候不验证IsMapCopyFull
			@@ -1873,6 +1891,7 @@
			Def_FB_NotifyFBHelpTick = 'NotifyFBHelpTick' # 广播副本帮助信息tick
			Def_FB_NPCStrengthenAverageLV = 'NPCStrengthenAverageLV' # 当前线路成长NPC平均等级
			Def_FB_NPCStrengthenMaxLV = 'NPCStrengthenMaxLV' # 当前线路成长NPC最大等级
			Def_FB_NPCStrengthenMinLV = 'NPCStrengthenMinLV' # 当前线路成长NPC最小等级
			Def_FB_NPCStrengthenPlayerCnt = 'NPCStrengthenPlayerCnt' # 当前线路成长NPC对应玩家数
			Def_FB_TeamPlayerCount = 'TeamPlayerCount' # 组队副本参与玩家数 - 非实时人数，只是进入时的那个人数
			Def_FB_DropDoCountRate = 'DropDoCountRate' # 怪物掉落执行次数万分率
			@@ -2151,9 +2170,6 @@
			1000 * 60 * 10, #玩家称号时效
			400, #吸血
			400, #吸蓝
			1000 * 5, # 恢复跨服PK连胜次数请求间隔
			1000 * 5, # 跨服PK领奖间隔
			1000 * 5, # 跨服王者争霸竞猜积分领奖间隔
			1000 * 3, # 仓库整理间隔
			1000 * 15, # 渡劫鼓舞间隔
			1000 * 1, # vip体验时效
			@@ -2227,9 +2243,6 @@
			TYPE_Player_Tick_Dienstgrad, #玩家称号时效
			TYPE_Player_Tick_SuckBlood, #吸血
			TYPE_Player_Tick_SuckMagic, #吸蓝
			TYPE_Player_Tick_RecoverMergePKWin, #恢复跨服PK连胜次数请求间隔
			TYPE_Player_Tick_MergePKAward, #跨服PK领奖间隔
			TYPE_Player_Tick_MergeKingSupport, #跨服王者争霸竞猜积分奖励间隔
			TYPE_Player_Tick_WareHouseSort, # 仓库整理间隔
			TYPE_Player_Tick_DuJieInspire, # 渡劫鼓舞间隔
			TYPE_Player_Tick_VIPExperience, #vip体验时效
			@@ -2252,6 +2265,7 @@
			TYPE_Map_Tick_ProcessMinute = 10 #每分钟触发事件
			TYPE_Map_Tick_ProcessFiveMinute = 11 #五分钟触发事件
			TYPE_Map_Tick_BossAITick = 12 #BOSSAI间隔，此处不包含召唤兽，外层控制
			TYPE_Map_Tick_PetAITick = 13 #宠物AI间隔特殊处理

			TYPE_Map_Tick_Time = [
			1000 * 60 * 3 , #0 回报当前地图活跃人数(3分钟一次)
			@@ -2266,7 +2280,8 @@
			1000 * 10 , #9 战盟战10秒刷新排行榜
			1000 * 60 , #10 每分钟触发事件
			1000 * 60 * 5 , #11 五分钟触发事件
			800, #12 BOSS 宠物镖车的AI间隔
			800, #12 BOSS 镖车的AI间隔
			3000, #13 宠物AI特殊处理间隔
			]

			TYPE_Map_Tick_Count = len( TYPE_Map_Tick_Time )
			@@ -2992,6 +3007,7 @@

			#---SetDict 玩家字典KEY，不存于数据库---
			# key的长度不能超过29个字节
			Def_PlayerKey_LockHPSkillID = "LockHPSkillID" # 锁血功能的技能
			Def_PlayerKey_GodWeaponBeforeProDef = "GWBPD" # 神兵护盾被攻击前的值
			Def_PlayerKey_curHurtValue = "curHurtValue" # 计算中的临时伤害值，技能特殊用
			Def_PlayerKey_DefenderObjID = "DefenderObjID" # 后续触发技能需要用到的对象ID，暂用于玩家
			@@ -3187,10 +3203,13 @@

			#功能索引ShareDefine.Def_AttrFruitFuncList
			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_PlayerKey_IsCrossPKMatching = "IsCrossPKMatching" #是否跨服匹配中

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

			@@ -3246,8 +3265,8 @@
			Def_PDictType_Reincarnation, # 转生
			Def_PDictType_GreatMaster, # 大师
			Def_PDictType_BloodElf, # Ѫħ
			Def_PDictType_MergePK, # 跨服匹配PK
			Def_PDictType_MergeKing, # 跨服王者争霸
			Def_PDictType_28,
			Def_PDictType_29,
			Def_PDictType_QQ, # QQ相关
			) = range(31)

			@@ -3264,7 +3283,6 @@
			Def_PDict_OnDayEx = "OnDayEx" # 特殊时间点凌晨X点过天
			Def_PDict_OnWeekEx = "OnWeekEx" # 特殊时间点凌晨X点过周
			Def_PDict_OnMonthEx = "OnMonthEx" # 特殊时间点凌晨X点过月
			Def_Player_Dict_ServerGroupID = "ServerGroupID" # 合服/混服时所属游戏服务器组ID
			Def_Player_Dict_PlayerFromPID = "PlayerFromPID" # pid
			Def_Player_Dict_Account_Type = "account_type" # account_type
			Def_Player_Dict_TencentPF = "tencentPF" # 腾讯平台来源pf
			@@ -3418,6 +3436,7 @@
			Def_PDict_OnlineStartTick = "OnlineStartTime" # 在线计算时间
			Def_PDict_LVAwardGetRecord = "LVAwardGetRecord" # 等级奖励领取信息记录，按二进制位标示
			Def_PDict_LVAwardVIPGetRecord = "LVAwardVIPGetRecord" # 等级奖励vip领取信息记录，按二进制位标示
			Def_PDict_CTGCountResetTime = "CTGCountResetTime" # CTG次数重置时间time值
			Def_PDict_TodayCTGCount = "TodayCTGCount_%s" # 当日充值次数，参数(CTG对应的商品记录ID)
			Def_PDict_CTGGoodsBuyCount = "CTGGoodsBuyCount_%s" # 对应充值商品已购买次数，参数(CTG对应的商品记录ID)
			Def_PDict_GoldGiftGetRecord = "GoldGiftGetRecord" # 充值豪礼领取信息记录，按二进制位标示
			@@ -3605,9 +3624,6 @@
			Def_Player_Dict_ArrestTaskAwardRecord = "ArrestTaskAwardRecord" # 悬赏任务积分奖励领取记录
			Def_Player_Dict_ArrestTaskFinishCnt = "ArrestTaskFinishCnt" # 悬赏任务今日完成个数

			#跨服boss
			Def_PDict_MergeBoss_FirstJoinAwardRecord = "MergeBossFstAward" # 首次参与跨服boss奖励状态 0-不可领；1-可领；2-已领

			#封魔坛
			Def_Player_Dict_FMTDouble = "FMTDouble" # 封魔坛是否双倍
			Def_Player_Dict_FMTOldDouble = "FMTOldDouble" # 封魔坛是否曾经可以双倍
			@@ -3711,6 +3727,9 @@
			Def_PDict_Rune_HoleOpenState = "Rune_HoleOpenState" # 符印解锁状态
			Def_PDict_Rune_Data = "Rune_Data_%s" # 符印镶嵌数据, 参数(第几孔)

			# 聚魂
			Def_PDict_GatherSoulHoleData = "GatherSoulHoleData_%s" # 聚魂镶嵌数据, 参数(第几孔)

			# 副本 Def_PDictType_FB
			Def_PDict_FamilyBossFBAwardState = "FamilyBossFBAwardState_%s" # 家族boss副本领奖状态%s副本id
			Def_PDict_LastEnterFBPropertyID = "LastEnterFBPropertyID_%s" # 上次进入副本的propertyID%s副本id
			@@ -3798,21 +3817,26 @@
			Def_PDict_Master_ExpPoint = "Master_ExpPoint" # 当前大师经验点
			Def_PDict_Master_FreeSkillPoint = "Master_FreeSkillPoint" # 当前剩余大师技能点

			# 跨服匹配PK Def_PDictType_MergePK
			Def_PDict_MergePK_ID = "PD_%s" # 跨服PK玩家ID值, 参数(世界key)
			Def_PDict_MergePK_Cnt = "PD_MergePK_Cnt" # 跨服PK, 今日已PK次数
			Def_PDict_MergePK_BuyCnt = "PD_MergePK_BuyCnt" # 跨服PK, 今日已购买PK次数
			Def_PDict_MergePK_UnUsedBuyCnt = "PD_MergePK_UnUsedBuyCnt" # 跨服PK, 未使用的购买PK次数，永久保存
			Def_PDict_MergePK_WinsReward = "PD_MergePK_WinsReward" # 连胜奖励领取状态
			Def_PDict_MergePK_ScoreReward = "PD_MergePK_ScoreReward" # 积分奖励领取状态
			Def_PDict_MergePK_FirstWinCntReward = "PD_MergePK_FWinCntReward" # 首次胜利奖励领取状态, 领奖状态不重置, 赛季次数重新计算

			# 跨服王者争霸 Def_PDictType_MergeKing
			Def_PDict_MergeKing_ID = "PD_%s" # 跨服王者争霸玩家ID值, 参数(世界key)
			Def_PDict_MergeKing_ServerHonourAward = "PD_MergePK_ServerHonourAward" # 跨服王者争霸玩家全服荣耀奖励领取记录
			Def_PDict_MergeKing_RankAward = "PD_MergePK_RankAward" # 跨服王者争霸玩家晋级排名奖励领取记录
			Def_PDict_MergeKing_SupportAward = "PD_MergePK_SupportAward" # 跨服王者争霸玩家竞猜积分奖励领取记录
			Def_PDict_MergeKing_Worship = "PD_MergePK_Worship" # 跨服王者争霸玩家每日膜拜记录
			# 跨服竞技场
			Def_PDict_CrossPK_TotalScore = "CrossPK_TotalScore" # 当前总积分
			Def_PDict_CrossPK_OnDayScore = "CrossPK_OnDayScore" # 今天过天时的积分
			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_TodayPKCount = "CrossPK_TodayPKCount" # 今日已PK次数
			Def_PDict_CrossPK_TodayWinCount = "CrossPK_TodayWinCount" # 今日已胜利次数
			Def_PDict_CrossPK_TodayBuyCount = "CrossPK_TodayBuyCount" # 今日已购买PK次数
			Def_PDict_CrossPK_DayPKCountAwardState = "CrossPK_DayPKCountAwardState" # 每日匹配次数奖励记录，二进制位存储是否已领取，按匹配次数升序排序索引代表奖励位
			Def_PDict_CrossPK_DayWinCountAwardState = "CrossPK_DayWinCountAwardState" # 每日胜利次数奖励记录，二进制位存储是否已领取，按胜利次数升序排序索引代表奖励位
			Def_PDict_CrossPK_DanLVAwardState = "CrossPK_DanLVAwardState" # 段位达标奖励记录，二进制位存储是否已领取，按段位代表奖励位
			Def_PDict_CrossPK_SeasonAwardState = "CrossPK_SeasonAwardState" # 赛季结算奖励是否已领取，优先排名奖励，未上榜可领段位奖励
			Def_PDict_CrossPK_ZoneID = "CrossPK_ZoneID" # 玩家上次参与的赛区ID
			Def_PDict_CrossPK_SeasonID = "CrossPK_SeasonID" # 玩家上次参与的赛季ID
			Def_PDict_CrossPK_SeasonDanLV = "CrossPK_SeasonDanLV_%s" # 历史赛季段位，参数，赛季ID
			Def_PDict_CrossPK_SeasonScore = "CrossPK_SeasonScore_%s" # 历史赛季积分，参数，赛季ID
			Def_PDict_CrossPK_SeasonOrder = "CrossPK_SeasonOrder_%s" # 历史赛季名次，参数，赛季ID
			Def_PDict_CrossPK_SeasonAwardLV = "CrossPK_SeasonAwardLV_%s" # 历史赛季奖励等级（一般是段位等级，排行奖励的在最高段位等级基础上增加），参数，赛季ID

			#自动战斗设置记录
			Def_PDict_AutoFightSetting = "AFSetting_%s_%s"
			@@ -3843,6 +3867,7 @@
			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_XBXZAwardRecord = "XBXZAwardRecord_%s" #仙宝寻主领奖记录参数ID
			Def_PDict_MagicWeaponLV = "MagicWeaponLV_%s" #法宝等级参数法宝ID
			@@ -4294,11 +4319,13 @@
			Def_CalcAttrFunc_DogzBattleSkill, # 助战神兽技能36
			Def_CalcAttrFunc_DogzEquip, # 神兽装备37
			Def_CalcAttrFunc_DogzEquipPlus, # 神兽装备强化38
			) = range(39)
			Def_CalcAttrFunc_GatherSoul, # 聚魂39
			Def_CalcAttrFunc_MagicWeapon4 # 王者法宝40
			) = range(41)


			# 在此列表中的功能属性，不享受百分比加成，--属性参与战力计算
			CalcAttrExFuncList = [Def_CalcAttrFunc_MagicWeapon1, Def_CalcAttrFunc_MagicWeapon2, Def_CalcAttrFunc_MagicWeapon3,
			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
			]
			@@ -4331,8 +4358,10 @@
			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],
			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_Dogz:[Def_CalcAttrFunc_Dogz, Def_CalcAttrFunc_DogzEquipPlus],
			ShareDefine.Def_MFPType_Other:[Def_CalcAttrFunc_Success, Def_CalcAttrFunc_FamilyTech, Def_CalcAttrFunc_EquipDecompose],
			@@ -4403,7 +4432,10 @@
			TriggerType_SummonDie, #自身召唤兽死亡触发技能 60
			TriggerType_GiftReduceCD, # 天赋用的减CD 61
			TriggerType_ProDefValue, # 神兵护盾值下降时 62
			) = range(1, 63)
			TriggerType_LockHP, # 锁血触发技能 63
			TriggerType_BeLuckyHit, # 被会心一击触发技能 64
			TriggerType_BeLuckyHitSubPer, # 减少受到的会心伤害 65
			) = range(1, 66)


			# NPC功能类型定义
			@@ -4458,50 +4490,6 @@
			ShareDefine.PlayerJob_Max : TYPE_CHAPLAIN, #魔剑对应魔剑系
			}

			#跨服服务器广播类型, 与GameServer一致
			(
			Def_PreeSetPlayer, #添加跨服预选赛参赛人员 0
			Def_PreeSetBattleInfo, #添加跨服预选赛对战表1
			Def_PreeBattleIDOver, #每场跨服预选赛的结果2
			Def_SetPlayer, #添加参赛人员3
			Def_SetBattleInfo, #添加跨服预选赛对战表4
			Def_BattleIDOver, #每场跨服预选赛的结果5
			Def_PlayerChange, #人员表信息变更6
			Def_EliminationReword, #万国淘汰赛参数奖励7
			Def_MergeServerOpenActionDay, #万国开启的活动到现在的天数8
			Def_MergeServerOpenActionState, #万国开启的活动状态9
			Def_MergeWarStartTime, #万国活动激活时间10
			Def_MergeDictKeyValue, #跨服GameWorld字典key值11
			Def_MergeBossKilled, #跨服boss单boss击杀结果12
			Def_MergeBossResult, #跨服boss结果13
			Def_MergePKMatchResult, #跨服PK匹配信息14
			Def_MergePKReadyOKRoomList, #跨服PK已准备好的房间列表15
			Def_MergePKSyncBillboard, #跨服PK同步排行榜16
			Def_MergePKLuckyItem, #跨服PK同步排行榜17
			Def_MergePKActionState, #跨服PK活动状态变更18
			Def_MergePKTopPlayerView, #跨服PK活动高手榜玩家展示信息19
			Def_RecoverMergePKWinCost, #跨服PK恢复连胜扣费信息20
			Def_MergeWorldNotify, #跨服全服广播21
			Def_MergeLoudspeaker, #跨服全服喇叭22
			Def_MergePKKing, #跨服王者争霸23
			Def_MergePKUnNotifyOverInfo, #跨服PK未同步的PK结果24
			Def_MergeOnLinePlayer, #跨服在线玩家25
			Def_Merge26, #26
			Def_MergePlayerEvent, #跨服玩家事件27
			Def_MaxType,
			) = range(29)

			#子服务器发送信息到跨服服务器, 与GameServer一致
			(
			Def_RequestMergePKMatch, #跨服PK匹配请求0
			Def_CancelMergePKMatch, #跨服PK取消匹配1
			Def_MergePKPrepareOK, #跨服PK准备完毕2
			Def_SendGMCMD, #发送GM命令3
			Def_RecoverMergePKWin, #跨服PK恢复连胜4
			Def_SendMergeLoudspeaker, #发送跨服喇叭5
			Def_ClientServerInitOK, #跨服子服启动成功6
			) = range(7)

			#版本修正标记, 使用key格式 Def_Player_Dict_VersionFix
			(
			Def_VerFix_ChatBubbleBox, # 1.2版本购买VIP礼包可获得激活气泡框道具，针对已购买过VIP礼包的老号处理;
			@@ -4509,7 +4497,9 @@
			Def_VerFix_RuneSource, # 修复老号双属性符印的获取途径;
			Def_VerFix_FMTDouble, # 1.3版本VIP特权变更，记录切换版本前的VIP特权(封魔坛双倍挑战);
			Def_VerFix_SuperGift, # 超值礼包开启变更,原领取首充开启，改成等级到开启;
			) = range(5)
			Def_VerFix_Horse, # 坐骑等级上限修改，对应技能触发修改;
			Def_VerFix_Pet, # 灵宠等级上限修改，对应技能触发修改;
			) = range(7)

			##==================================================================================================
			#游戏消费点类型定义
			@@ -4554,6 +4544,8 @@
			Def_Cost_WishingWell, # 许愿池刷新
			Def_Cost_GodWeapon, # 神兵
			Def_Cost_FBHelpBattle, # 副本助战
			Def_Cost_FBGatherSoulBoss, # 聚魂副本BOSS召唤 40
			Def_Cost_CrossRealmPK, # 跨服PK
			#-----------以下为暂时没用的，先不删除，如有新增消费点则放在这些之前------------
			Def_Cost_RefreshArrestTask, # 刷新悬赏任务
			Def_Cost_OffLineExp, # 兑换离线经验
			@@ -4561,10 +4553,6 @@
			Def_Cost_FinishTruck, # 完成镖车
			Def_Cost_RefreshTimeShop, # 刷新神秘商店
			Def_Cost_OpenNoble, # 开通贵族
			Def_Cost_BuyMergePKCnt, # 购买跨服PK次数
			Def_Cost_RecoverMergePKWin, # 恢复跨服PK连胜
			Def_Cost_MergeKingSupport, # Ѻע
			Def_Cost_MergeKingBribe, # 贿赂
			Def_Cost_HighLadder, # 天梯竞技场
			Def_Cost_Reincarnation, # 转生
			Def_Cost_BuyStallItem, # 购买摆摊物品
			@@ -4574,7 +4562,7 @@
			Def_Cost_Trade, # 交易
			Def_Cost_Rename, # 改名
			Def_Cost_SkillLvUp, # 技能升级
			) = range(2000, 2000 + 59)
			) = range(2000, 2000 + 57)

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

			@@ -4620,10 +4608,6 @@
			Def_Cost_RefreshArrestTask:"RefreshArrestTask",
			Def_Cost_RefreshTimeShop:"RefreshTimeShop",
			Def_Cost_ResetGreatMasterSkill:"ResetTalentSkill",
			Def_Cost_BuyMergePKCnt:"BuyMergePKCnt",
			Def_Cost_RecoverMergePKWin:"RecoverMergePKWin",
			Def_Cost_MergeKingSupport:"MergeKingSupport",
			Def_Cost_MergeKingBribe:"MergeKingBribe",
			Def_Cost_GM:"GM",
			Def_Cost_BourseBuy:"BourseBuy",
			Def_Cost_BourseCharge:"BourseCharge",
			@@ -4661,6 +4645,8 @@
			Def_Cost_WishingWell:"WishingWell",
			Def_Cost_GodWeapon:"GodWeapon",
			Def_Cost_FBHelpBattle:"FBHelpBattle",
			Def_Cost_FBGatherSoulBoss:"FBGatherSoulBoss",
			Def_Cost_CrossRealmPK:"CrossRealmPK",
			}
			## -----------------------------------------------------

			@@ -4692,7 +4678,8 @@
			Def_GiveMoney_Truck, # 运镖
			Def_GiveMoney_FreeGoods, # 极品白拿 25
			Def_GiveMoney_BindJadeWheel, # 绑玉转盘
			) = range(1000, 1000 + 26)
			Def_GiveMoney_GatherSoulDecompose, #聚魂分解
			) = range(1000, 1000 + 27)

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

			@@ -4724,6 +4711,7 @@
			Def_GiveMoney_Truck:"Truck",
			Def_GiveMoney_FreeGoods:"FreeGoods",
			Def_GiveMoney_BindJadeWheel:"BindJadeWheel",
			Def_GiveMoney_GatherSoulDecompose:"GatherSoulDecompose",
			}

			##==================================================================================================
			@@ -4813,7 +4801,8 @@
			ItemDel_AddKillBossCnt, # 增加BOSS可击杀次数 32
			ItemDel_DogzEquipPlus, # 神兽装备强化
			ItemDel_ChatBubbleBox, # 激活聊天气泡框
			) = range(2000, 2000 + 35)
			ItemDel_GatherSoul, # 聚魂分解
			) = range(2000, 2000 + 36)

			# 物品扣除类型对应信息 {类型:eventName, ...}
			ItemDelTypeDict = {
			@@ -4953,7 +4942,7 @@
			VIPPrivilege_FamilyGoldPack, #23 仙盟钻石红包
			VIPPrivilege_BoursePwd, #24 集市上架使用密码
			VIPPrivilege_25, #25 封魔坛购买次数 - 副本总表统一处理
			VIPPrivilege_BoursePwd, #26 VIP被动技能孔——VIP4专属被动技能孔
			VIPPrivilege_26, #26 VIP被动技能孔——VIP4专属被动技能孔
			VIPPrivilege_BOSSHomeKillLimit, #27 BOSS之家疲劳值上限
			VIPPrivilege_FMTDouble, #28 封魔坛双倍击杀
			VIPPrivilege_29, #29 娲皇遗迹购买次数 - 副本总表统一处理
			@@ -4985,10 +4974,11 @@
			ntPet,
			ntTouchKill, #触碰后自杀类 17
			ntUndeath, #不死类型 18
			ntRobot, #上古战场机器人类型 19
			ntDestructible, #场景内可破坏的 19
			ntHelpBattleRobot, #助战机器人 20
			ntRobot, #机器人21
			ntMax
			) = range(22)
			) = range(23)


			(Def_SkillFuncType_Common, #0为通用技能
			@@ -5079,8 +5069,10 @@
			tttFBAddTime, # 可挑战下一关倒计时 6
			tttDeadTime, # 死亡倒计时(古神禁地) 7
			tttPickupItem, # 拾取物品倒计时 8
			tttWaitPlayer, # 等待对手倒计时 9
			tttPlayerLeave, # 对手掉线倒计时 10
			tttMax,
			) = range(10)
			) = range(12)

			Def_FBPickupItemTime = 30000

			@@ -5176,7 +5168,8 @@
			PowerDownType_Dogz, #神兽召回
			PowerDownType_ResetPoint, #洗点
			PowerDownType_ResetTalent, #大师天赋重置
			) = range(10)
			PowerDownType_GatherSoul, #聚魂替换
			) = range(11)
			FightPowerDownRecordDict = {
			PowerDownType_Rune:'Rune',
			PowerDownType_LVUP:'LVUP',
			@@ -5188,4 +5181,5 @@
			PowerDownType_Dogz:'DogzState',
			PowerDownType_ResetPoint:'ResetPoint',
			PowerDownType_ResetTalent:'ResetTalent',
			PowerDownType_GatherSoul:'GatherSoul',
			}