SnxxServerCode.git

			@@ -532,8 +532,6 @@
			Def_Item_Effect_MissionMove = 2001
			#鱼竿
			Def_Item_Effect_FishTool = 2000
			#摆摊证
			Def_Item_Effect_ShopItem = 1900
			#坐骑进阶
			Def_Item_Eff_HorseUpdate = 2819
			#官爵进阶
			@@ -688,7 +686,6 @@
			Def_SkillID_Red = 20021 # 红名
			Def_SkillID_ReviveTired = 20030 # 复活疲劳 SkillID
			Def_SkillID_SkillReBorn = -1 # 技能复活ID
			Def_SkillID_ShopItem = -1 # 摆摊技能ID
			Def_SkillID_LimitSuperBuff = 10000 # 有限无敌BUFF SkillID
			Def_SkillID_TJGSuperBuff = 20039 # 脱机挂死亡复活保护
			Def_SkillID_Somersault = 190 # 翻滚快速闪避
			@@ -709,7 +706,6 @@
			Def_SkillID_VipBuff = 11500 # VIPbuff
			Def_SkillID_TeamVIPBuff = 22000 # VIP队伍buff, 攻守同盟
			Def_SkillID_FBEncourageBuff = 20051 # 副本鼓舞buff
			Def_SkillID_FreshmanGuideBuff = 21219 # 新手指导员buff
			Def_SkillID_PoisonAtkBuff = 25180 # 毒攻buff
			Def_SkillID_DropOwnerBuff = 20040 # 掉落归属buff
			Def_SkillID_PetSignDay = 47111 # 灵宠签到属性技能, 单次签到的加成
			@@ -730,12 +726,6 @@
			Def_SkillID_FamilyWar_JoinBuff, Def_SkillID_FamilyWar_RandBuffAttr]
			# 脱机挂状态下不刷新buff时间的
			TJGStateNotRefreshTimeBuff = [Def_SkillID_Red]

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

			#技能ID对应的区域类型
			Def_AreaType_SkillID_Safe = 20011 # 安全区
			@@ -812,8 +802,6 @@
			Def_PlayerTotalMoney_Silver = 2000000000
			#流向记录变更最小金币值(小于该值的暂不记录, 仅限金币)
			Def_DRRecord_Min_Silver = 500000
			#大额度交易记录
			Def_LargeTrade_Gold = 50 * 1000
			Def_LargeTrade_Silver = 1000 * 1000
			#初始化装备背包格子数
			Def_PackCnt_Equip = 130
			@@ -1417,12 +1405,6 @@
			Def_GameEventExpLVDiff = 5
			#组队经验加成
			Def_TeamMemberExp=[1,1,1.1,1.15,1.2,1.25,1.3]

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

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

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

			#麒麟之府
			Def_FBMapID_KirinHome = 31190
			Def_FBMapID_KirinHome = 311900

			#个人BOSS
			Def_FBMapID_PersonalBoss = 31240
			@@ -1795,18 +1772,24 @@
			Def_FBMapID_CrossRealmPK = 32010
			#跨服蓬莱仙境
			Def_FBMapID_CrossPenglai = 32020
			#跨服妖王
			Def_FBMapID_CrossDemonKing = 32030
			#多仙盟Boss
			Def_FBMapID_AllFamilyBoss = 31260
			#骑宠Boss
			Def_FBMapID_HorsePetBoss = 31200
			#缥缈宝藏
			Def_FBMapID_FairyTreasure = 31190

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

			#副本关闭时未拾取的物品邮件发放给玩家
			#这里只有需要的副本才配置，不做默认逻辑，防止某些副本实际不能给导致刷物品，如麒麟之府
			@@ -1895,11 +1878,13 @@
			'SealDemon':[Def_FBMapID_SealDemon, Def_FBMapID_SealDemonEx], #封魔坛
			'XMZZ':[Def_FBMapID_XMZZ], #仙魔之争
			'CrossRealmPK':[Def_FBMapID_CrossRealmPK], #跨服竞技场
			'CrossDemonKing':[Def_FBMapID_CrossDemonKing], #跨服妖王
			'GatherSoul':[Def_FBMapID_GatherSoul],#聚魂副本
			'ZhuXianBoss':[Def_FBMapID_ZhuXianBoss],#诛仙BOSS
			'ZhuXianTower':[Def_FBMapID_ZhuXianTower],#诛仙塔
			'AllFamilyBoss':[Def_FBMapID_AllFamilyBoss],#多仙盟BOSS
			'HorsePetBoss':[Def_FBMapID_HorsePetBoss],#骑宠BOSS
			'FairyTreasure':[Def_FBMapID_FairyTreasure],#缥缈宝藏
			}

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

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

			@@ -3042,7 +3028,6 @@
			Def_PlayerKey_PowerPartCount = "PowerPartCount" # 蓄力技能能量次数
			Def_PlayerKey_ClientMaxHurtValue = "CMaxHValue" # 缓存单次技能攻击的最大伤害, 减少计算量
			Def_Player_RefreshAttr = "Player_RefreshAttr" # 玩家刷新属性标志
			Def_Player_NoSave_Dict_SendInviteCode = "SendInviteCode_0" # 玩家提交邀请码次数验证
			Def_PlayerKey_LoadMapIsLogin = 'LoadMapIsLogin' # 本次进入地图是否是登录的
			Def_PlayerKey_NotifyAllAttrState = 'NotifyAllAttrState' # 是否同步过所有属性，切图时第一次刷属性需要同步
			Def_PlayerKey_LoginTick = 'PlayerKey_LoginTick' # 玩家上线的当前服务器tick
			@@ -3137,6 +3122,7 @@
			Def_PlayerKey_FBCommendFightPower = "FBCommendFightPower" # 副本推荐战斗力
			Def_PlayerKey_RecordXPValue = "RecordXPValue" #临时记录XP值
			Def_PlayerKey_CollectNPCObjID = "CollectNPCObjID" #采集的NPC对象id
			Def_PlayerKey_ContendNPCObjID = "ContendNPCObjID" #竞争归属的NPC实例ID
			Def_PlayerKey_AreaRewardMultiple = "AreaRewardMultiple" #玩家所在区域福利倍值，默认1
			Def_PlayerKey_AttrActivatyNotify = "AttrActivatyNotify" # 属性激活提示类型
			Def_PlayerKey_AttrActivatyRecordStarLV = "AttrActivatyRecordStarLV" # 属性激活记录 - 强化星级
			@@ -3193,7 +3179,6 @@
			Def_PlayerKey_StoneAtkPer = "StoneAtkPer" # 宝石攻击百分比
			Def_PlayerKey_HPCureEnhance = "HPCureEnhance" # 血瓶恢复效果
			Def_PlayerKey_HadInitFruitAttr = "HadInitFruitAttr" # 是否已经刷新过果实属性
			Def_PlayerKey_LastReinTick = 'LastReinTick' #上次转生时间
			Def_PlayerKey_OnlyFinalHurt = "OnlyFinalHurt" # 额外输出伤害
			Def_PlayerKey_PVPAtkBackHP = "PVPAtkBackHP" # PVP攻击回血
			Def_PlayerKey_HitSucessRate = "HitSucessRate" # 命中成功率
			@@ -3249,34 +3234,21 @@
			#玩家存数据库字典类型定义
			(
			Def_PDictType_Default, # 默认
			Def_PDictType_OnlinePrize, # 在线奖励(暂停使用)，领取后重新计时型
			Def_PDictType_FBWipeOut, # fb扫荡
			Def_PDictType_FlashSale, #限时抢购
			Def_PDictType_TJGNotify, # 脱机挂结果通知
			Def_PDictType_LVAward, # 等级奖励领取信息记录5
			Def_PDictType_GoldGift, # 充值豪礼
			Def_PDictType_LVAward, # 等级奖励领取信息记录
			Def_PDictType_OpenServerCampaign, # 开服活动
			Def_PDictType_WeekParty, #周狂欢
			Def_PDictType_FeastWeekParty, # 节日巡礼
			Def_PDictType_LoginAward, # 登录奖励运营活动
			Def_PDictType_OfficialRank, # 官爵
			Def_PDictType_Horse, # 坐骑
			Def_PDictType_Wing, # 翅膀
			Def_PDictType_FB, # 副本相关
			Def_PDictType_FightPower, # 战斗力15
			Def_PDictType_16,
			Def_PDictType_Activity, # 活跃度
			Def_PDictType_FightPower, # 战斗力
			Def_PDictType_GoldInvest, # 投资理财
			Def_PDictType_19,
			Def_PDictType_Success, #成就20
			Def_PDictType_Success, #成就
			Def_PDictType_GFPassive, # 被动功法
			Def_PDictType_Totem, # 图腾
			Def_PDictType_GroupFRecharge, # 首充团购
			Def_PDictType_Element, # 元素
			Def_PDictType_Reincarnation, # 转生
			Def_PDictType_GreatMaster, # 大师
			Def_PDictType_BloodElf, # Ѫħ
			) = range(28)
			) = range(15)

			# 玩家字典key定义规则, key的长度不能超过29个字节, 注意尽量避免命名重复
			# 新增参数TYPE 用于字典分类，默认0
			@@ -3333,9 +3305,6 @@
			Def_Player_Dict_CabinetCount_WeaponCoat = "CabinetCount_WeaponCoat_40" #武器收纳柜
			Def_Player_Dict_CabinetCount_DressCoat = "CabinetCount_DressCoat_41" #时装收纳柜
			Def_Player_Dict_CabinetCount_Horse = "CabinetCount_Horse_42" #马匹收纳柜
			Def_Player_Dict_OffDaysAward = "OffDaysAward_45" #玩家回归奖励
			Def_Player_Dict_CheckInviteCode = "CheckInviteCode_46" #检查玩家发送的邀请码
			Def_Player_Dict_JM_OpenXW = "JM%s_OpenXw_54" # 经脉被开启的穴位数 %s对应经脉类型
			Def_Player_Dict_PackCount_Item = "PackCount_Item_72" #玩家物品背包格子数
			Def_Player_Dict_PackCount_Warehouse = "PackCount_Warehouse_73" #仓库背包格子数
			Def_Player_Dict_PlayerMapSignCnt = "PlayerMapSignCnt_75" # 大地图标记数量
			@@ -3462,8 +3431,6 @@
			Def_PDict_GiveFlowerCntByDay = "GiveFlowerCntByDay" #当日已赠送鲜次数
			Def_PDict_PackCount_FineSoul = "PackCount_FineSoul" # 已购买精魄/符文背包格子数
			Def_PDict_KillPlayerAddActive = "KillPlayerAddActiveByDay" # 杀人每日获得活跃度
			Def_PDict_FreshmanGuideDay = "FreshmanGuideDay" # 玩家新手指导员剩余天数，0为不是
			Def_PDict_FreshmanGuideSpeakerCntToday = "FreshmanGuideSpeakerCntDay" # 新手指导员今日已免费传音次数
			Def_PDict_LoginDayCnt = "PLoginDayCnt" # 累计登陆天数
			Def_PDict_LoginDayAward = "PLoginDayAward" # 累计登陆领取情况
			Def_PDict_CollNpcIDCollTime = "CollNpcIDCollTime_%s" # 采集NPCID对应每日对应采集次数，%sNPCID
			@@ -3472,7 +3439,6 @@
			Def_PDict_MysticalShopGoods = "MysticalShopGoods_%s" # 神秘商店商品ID，索引
			Def_PDict_MysticalShopRefreshCnt = "MysticalShopRefreshCnt" # 神秘商店已手动刷新次数
			Def_PDict_MysticalShopLVRefreshCnt = "MysticalShopLVRefreshCnt" # 神秘商店等级段刷新次数
			Def_PDict_FestivalLoginState = "FestivalLoginState_%s" # 节日登陆奖励状态_%s表示节日类型<按登陆天从低位起0-未领1-可领2-已领>
			Def_PDict_Currency = "PlayerCurrency_%s" # 自定义货币类型, 参数[自定义货币类型]
			Def_PDict_TJGSet = "TJGSet" # 脱机挂系统设定
			Def_PDict_TJGDeadTime = "TJGDeadTime" # 脱机被杀时间
			@@ -3722,11 +3688,6 @@
			Def_PDict_LuckyTreasurePoint = "LuckyTreasurePoint" #幸运值
			Def_PDict_LuckyTreasureCnt = "LuckyTreasureCnt" #鉴宝次数
			#-------------------------------------------------------------------------------
			#类型 Def_PDictType_OnlinePrize
			Def_PDict1_OnlinePrizeCnt = "OnlinePrizeCnt" # 新手在线已领取奖励次数
			Def_PDict1_OnlinePrizeTime = "OnlinePrizeTime" # 新手在线奖励时间总和
			Def_PDict1_DayOnlinePrizeCnt = "DayOnlinePrizeCnt" # 今日在线已领取奖励次数
			Def_PDict1_DayOnlinePrizeTime = "DayOnlinePrizeTime" # 今日在线奖励时间总和

			#开服活动，Def_PDictType_OpenServerCampaign
			#奖励记录 - 从低位到高位，每位表示：0-不可领；1-可领取；2-已领
			@@ -3759,7 +3720,7 @@

			Def_PDict_FightPower_List = [Def_PDict_FightPower_Total, Def_PDict_FightPower_Horse]

			# 每日活跃度 Def_PDictType_Activity
			# 每日活跃度
			Def_PDict_Activity_FinishCnt = "Activity_FinishCnt_%s" # 活跃度类型对应完成次数
			Def_PDict_Activity_TotalPoint = "Activity_TotalPoint" # 当前总活跃值
			Def_PDict_ActivityAwardRecord = "ActivityAwardRecord" # 活跃度奖励领取记录，按二进制位标识
			@@ -3768,6 +3729,8 @@
			Def_PDict_Activity_ExtraRealmPoint = "Activity_ExtraRealmPoint" # 多倍活动额外获得的修行点
			# 每日活动
			Def_PDict_DailyActionDayTimes = "DailyActionDayTimes_%s" # 每日活动今日完成次数参数每日活动ID
			Def_PDict_DailyActionDayBuyTimes = "DADayBuyTimes_%s" # 每日活动今日购买次数参数每日活动ID
			Def_PDict_DailyActionDayItemTimes = "DADayItemTimes_%s" # 每日活动今日物品增加次数参数每日活动ID
			Def_PDict_DailyActionWeekTimes = "DailyActionWeekTimes_%s" # 每日活动本周完成次数参数每日活动ID
			#仙盟活跃
			Def_PDict_FamilyActivityFinishCnt = "FamilyActivityFinishCnt%s" # 已完成次数
			@@ -3785,12 +3748,6 @@
			Def_PDict_Success_CntValue = "Su_%s_%s" # 当前次数值,参数(成就类型、条件)
			Def_PDict_Success_FinishTime = "Succ_FinishTime_%s" # 成就是否已完成,参数(索引)
			Def_PDict_Success_CheckVersion = "Succ_CheckVersion" #老玩家某些功能成就检查版本

			# 转生 Def_PDictType_Reincarnation
			Def_PDict_Reinc_Reiki = "Reinc_Reiki" # 当前转生灵力
			Def_PDict_Reinc_ChangeReikiCnt = "Reinc_ChangeReikiCnt" # 今日已兑换灵力次数
			Def_PDict_Reinc_ChangeReikiAddCnt = "Reinc_ChangeReikiAddCnt" # 今日物品增加的兑换灵力次数
			Def_PDict_Reinc_AwardRecord = "Reinc_AwardRecord" # 转生奖励领取记录

			# 大师 Def_PDictType_GreatMaster
			Def_PDict_Master_Exp = "Master_Exp" # 当前大师经验
			@@ -3895,7 +3852,13 @@
			#装备部位星数
			Def_PDict_EquipPartStar = "EQPartStar_%s" #装备部位星数参数装备背包格子索引


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

			@@ -4180,6 +4143,7 @@
			ShareDefine.Def_Effect_AddAtkByPer:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_SuperHitPer:[[TYPE_Calc_SuperHit], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_SpeedPer:[[TYPE_Calc_AttrSpeed], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_LuckPer:[[TYPE_Calc_Luck], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_IceAtkPer:[[TYPE_Calc_AttrIceAtk], False, TYPE_NoLinear],
			ShareDefine.Def_Effect_IceDefPer:[[TYPE_Calc_AttrIceDef], False, TYPE_NoLinear],
			#ShareDefine.Def_Effect_AddAtkByPer:[[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax], False, TYPE_NoLinear],
			@@ -4276,90 +4240,62 @@
			#刷属性功能分类索引
			CalcAttrFuncList = (
			Def_CalcAttrFunc_RoleBase, # 角色基础 0
			Def_CalcAttrFunc_1,
			Def_CalcAttrFunc_2,
			Def_CalcAttrFunc_LingGenQuailty, # 灵根品质附加属性 3
			Def_CalcAttrFunc_LingGen, # 灵根 4
			Def_CalcAttrFunc_LingGen, # 灵根 1
			Def_CalcAttrFunc_LingGenQuailty, # 灵根品质附加属性 2
			Def_CalcAttrFunc_Equip, # 装备 3
			Def_CalcAttrFunc_Star, # 升星 4
			Def_CalcAttrFunc_Plus, # 装备位强化 5
			Def_CalcAttrFunc_6,
			Def_CalcAttrFunc_Stone, # 装备宝石 7
			Def_CalcAttrFunc_8,
			Def_CalcAttrFunc_Wing, # 翅膀 9
			Def_CalcAttrFunc_Wash, # 洗练 10
			Def_CalcAttrFunc_Pet, # 灵宠 11
			Def_CalcAttrFunc_Horse, # 坐骑 12
			Def_CalcAttrFunc_Prestige, # 境界 13
			Def_CalcAttrFunc_GodWeapon, # 神兵 14
			Def_CalcAttrFunc_Dienstgrad, # 称号 15
			Def_CalcAttrFunc_Rune, # 符印 16
			Def_CalcAttrFunc_17,
			Def_CalcAttrFunc_MagicWeapon1, # 人族法宝属性 18
			Def_CalcAttrFunc_EquipOutOfPrint, # 绝版属性随等级变化 19
			Def_CalcAttrFunc_20,
			Def_CalcAttrFunc_Success, # 成就属性 21
			Def_CalcAttrFunc_VIP, # VIP属性 22
			Def_CalcAttrFunc_Stove, # 炼丹炉 23
			Def_CalcAttrFunc_FamilyTech, # 仙盟心法 24
			Def_CalcAttrFunc_MagicWeapon2, # 魔族法宝属性 25
			Def_CalcAttrFunc_EquipDecompose, # 装备分解属性 26
			Def_CalcAttrFunc_MagicWeapon3, # 仙族法宝属性 27
			Def_CalcAttrFunc_PetSoul, # 宠物魂石 28
			Def_CalcAttrFunc_HorseSoul, # 坐骑魂石 29
			Def_CalcAttrFunc_HorseSkill, # 坐骑技能属性 30
			Def_CalcAttrFunc_PetSkill, # 宠物技能属性 31
			Def_CalcAttrFunc_StoveYao, # 炼丹炉丹药 32
			Def_CalcAttrFunc_PetSign, # 宠物签到 33
			Def_CalcAttrFunc_34,
			Def_CalcAttrFunc_Dogz, # 神兽35
			Def_CalcAttrFunc_DogzBattleSkill, # 助战神兽技能36
			Def_CalcAttrFunc_DogzEquip, # 神兽装备37
			Def_CalcAttrFunc_DogzEquipPlus, # 神兽装备强化38
			Def_CalcAttrFunc_GatherSoul, # 聚魂39
			Def_CalcAttrFunc_MagicWeapon4, # 王者法宝40
			Def_CalcAttrFunc_Coat, # ʱװ41
			Def_CalcAttrFunc_ZXEquip, # 诛仙装备42
			Def_CalcAttrFunc_ZXEquipSuit, # 诛仙装备套装43 - 废弃
			Def_CalcAttrFunc_ZXEquipStone, # 诛仙宝石属性44 - 废弃
			Def_CalcAttrFunc_45,
			Def_CalcAttrFunc_Equip1, # 境界装备1阶 46
			Def_CalcAttrFunc_Equip2, # 境界装备2阶 47
			Def_CalcAttrFunc_Equip3, # 境界装备3阶 48
			Def_CalcAttrFunc_Equip4, # 境界装备4阶 49
			Def_CalcAttrFunc_Equip5, # 境界装备5阶 50
			Def_CalcAttrFunc_Equip6, # 境界装备6阶 51
			Def_CalcAttrFunc_Equip7, # 境界装备7阶 52
			Def_CalcAttrFunc_Equip8, # 境界装备8阶 53
			Def_CalcAttrFunc_Equip9, # 境界装备9阶 54
			Def_CalcAttrFunc_Equip10, # 境界装备10阶 55
			Def_CalcAttrFunc_Equip11, # 境界装备11阶 56
			Def_CalcAttrFunc_Equip12, # 境界装备12阶 57
			Def_CalcAttrFunc_Equip13, # 境界装备13阶 58
			Def_CalcAttrFunc_Equip14, # 境界装备14阶 59
			Def_CalcAttrFunc_Equip15, # 境界装备15阶 60
			) = range(61)
			Def_CalcAttrFunc_Stone, # 装备宝石 6
			Def_CalcAttrFunc_Wash, # 洗练 7
			Def_CalcAttrFunc_Wing, # 翅膀 8
			Def_CalcAttrFunc_Pet, # 灵宠 9
			Def_CalcAttrFunc_Horse, # 坐骑 10
			Def_CalcAttrFunc_Prestige, # 境界 11
			Def_CalcAttrFunc_GodWeapon, # 神兵 12
			Def_CalcAttrFunc_Dienstgrad, # 称号 13
			Def_CalcAttrFunc_Rune, # 符印 14
			Def_CalcAttrFunc_EquipOutOfPrint, # 绝版属性随等级变化 15
			Def_CalcAttrFunc_Success, # 成就属性 16
			Def_CalcAttrFunc_VIP, # VIP属性 17
			Def_CalcAttrFunc_Stove, # 炼丹炉 18
			Def_CalcAttrFunc_FamilyTech, # 仙盟心法 19
			Def_CalcAttrFunc_EquipDecompose, # 装备分解属性 20
			Def_CalcAttrFunc_PetSoul, # 宠物魂石 21
			Def_CalcAttrFunc_HorseSoul, # 坐骑魂石 22
			Def_CalcAttrFunc_HorseSkill, # 坐骑技能属性 23
			Def_CalcAttrFunc_PetSkill, # 宠物技能属性 24
			Def_CalcAttrFunc_StoveYao, # 炼丹炉丹药 25
			Def_CalcAttrFunc_PetSign, # 宠物签到 26
			Def_CalcAttrFunc_Dogz, # 神兽 27
			Def_CalcAttrFunc_DogzBattleSkill, # 助战神兽技能 28
			Def_CalcAttrFunc_DogzEquip, # 神兽装备 29
			Def_CalcAttrFunc_DogzEquipPlus, # 神兽装备强化 30
			Def_CalcAttrFunc_GatherSoul, # 聚魂 31
			Def_CalcAttrFunc_MagicWeapon1, # 人族法宝属性 32
			Def_CalcAttrFunc_MagicWeapon2, # 魔族法宝属性 33
			Def_CalcAttrFunc_MagicWeapon3, # 仙族法宝属性 34
			Def_CalcAttrFunc_MagicWeapon4, # 王者法宝 35
			Def_CalcAttrFunc_Coat, # ʱװ 36
			) = range(37)

			# 在此列表中的功能属性，不享受百分比加成，--属性参与战力计算
			CalcAttrExFuncList = [Def_CalcAttrFunc_MagicWeapon1, Def_CalcAttrFunc_MagicWeapon2, Def_CalcAttrFunc_MagicWeapon3, Def_CalcAttrFunc_MagicWeapon4,
			Def_CalcAttrFunc_Stove, Def_CalcAttrFunc_VIP, Def_CalcAttrFunc_PetSoul, Def_CalcAttrFunc_HorseSoul,
			Def_CalcAttrFunc_StoveYao, Def_CalcAttrFunc_PetSign
			]

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

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

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

			@@ -4574,6 +4493,7 @@
			Def_Cost_LuckyTreasure, #幸运鉴宝
			Def_Cost_MysteryShopRefresh, # 神秘商店刷新
			Def_Cost_AuctionBid, # 拍卖行竞价
			Def_Cost_BuyDailyActionCnt, # 购买活动次数
			#-----------以下为暂时没用的，先不删除，如有新增消费点则放在这些之前------------
			Def_Cost_RefreshArrestTask, # 刷新悬赏任务
			Def_Cost_OffLineExp, # 兑换离线经验
			@@ -4581,14 +4501,12 @@
			Def_Cost_FinishTruck, # 完成镖车
			Def_Cost_RefreshTimeShop, # 刷新神秘商店
			Def_Cost_OpenNoble, # 开通贵族
			Def_Cost_Reincarnation, # 转生
			Def_Cost_BuyStallItem, # 购买摆摊物品
			Def_Cost_Warehouse, # 仓库
			Def_Cost_BuyItemBack, # 回购
			Def_Cost_Trade, # 交易
			Def_Cost_Rename, # 改名
			Def_Cost_SkillLvUp, # 技能升级
			) = range(2000, 2000 + 58)
			) = range(2000, 2000 + 57)

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

			@@ -4648,8 +4566,6 @@
			Def_Cost_Transport:"Transport",
			Def_Cost_OffLineExp:"OffLineExp",
			Def_Cost_GameServer:"GameServer",
			Def_Cost_Reincarnation:"Reincarnation",
			Def_Cost_BuyStallItem:"BuyStallItem",
			Def_Cost_Trade:"Trade",
			Def_Cost_Rename:"Rename",
			Def_Cost_SkillLvUp:"SkillLvUp",
			@@ -4668,6 +4584,7 @@
			Def_Cost_LuckyTreasure:"LuckyTreasure",
			Def_Cost_MysteryShopRefresh:"MysteryShopRefresh",
			Def_Cost_AuctionBid:"AuctionBid",
			Def_Cost_BuyDailyActionCnt:"BuyDailyActionCnt",
			}
			## -----------------------------------------------------

			@@ -4694,7 +4611,7 @@
			Def_GiveMoney_SellPackItem, # 出售背包物品
			Def_GiveMoney_CollectNPC, # 采集NPC
			Def_GiveMoney_20,
			Def_GiveMoney_StallItem, # 摆摊
			Def_GiveMoney_21,
			Def_GiveMoney_Trade, # 交易
			Def_GiveMoney_Truck, # 运镖
			Def_GiveMoney_FreeGoods, # 极品白拿
			@@ -4728,7 +4645,6 @@
			Def_GiveMoney_Warehouse:"Warehouse",
			Def_GiveMoney_SellPackItem:"SellPackItem",
			Def_GiveMoney_CollectNPC:"CollectNPC",
			Def_GiveMoney_StallItem:"StallItem",
			Def_GiveMoney_Trade:"Trade",
			Def_GiveMoney_Truck:"Truck",
			Def_GiveMoney_FreeGoods:"FreeGoods",
			@@ -5153,7 +5069,8 @@
			Def_RewardType_NewFairyCParty, # 新仙界盛典全民来嗨24
			Def_RewardType_FeastWeekPartyAct, # 领取节日巡礼活动奖励25
			Def_RewardType_FeastWeekPartyPoint, # 领取节日巡礼积分奖励26
			)= range(27)
			Def_RewardType_FairyAdventuresAward, #缥缈奇遇领取27
			)= range(28)


			#boss复活相关活动定义