Project_SG_ServerCode.git

			@@ -160,7 +160,13 @@
			AttrID_WuFinalDamPerDef, # 对吴减伤 62
			AttrID_QunFinalDamPer, # 对群增伤 63
			AttrID_QunFinalDamPerDef, # 对群减伤 64
			) = range(1, 1 + 64)
			AttrID_SkillPer, # 技能增伤 65
			AttrID_SkillPerDef, # 技能减伤 66
			AttrID_PursueDamPer, # 追击增伤 67
			AttrID_PursueDamPerDef, # 追击减伤 68
			AttrID_ComboDamPer, # 连击增伤 69
			AttrID_ComboDamPerDef, # 连击减伤 70
			) = range(1, 1 + 70)

			# 需要计算的武将战斗属性ID列表
			CalcBattleAttrIDList = [AttrID_Atk, AttrID_Def, AttrID_MaxHP, AttrID_StunRate, AttrID_StunRateDef,
			@@ -173,6 +179,8 @@
			AttrID_ShieldPer, AttrID_ShieldPerDef, AttrID_DOTPer, AttrID_DOTPerDef,
			AttrID_WeiFinalDamPer, AttrID_WeiFinalDamPerDef, AttrID_ShuFinalDamPer, AttrID_ShuFinalDamPerDef,
			AttrID_WuFinalDamPer, AttrID_WuFinalDamPerDef, AttrID_QunFinalDamPer, AttrID_QunFinalDamPerDef,
			AttrID_SkillPer, AttrID_SkillPerDef, AttrID_PursueDamPer, AttrID_PursueDamPerDef,
			AttrID_ComboDamPer, AttrID_ComboDamPerDef,
			]

			# 基础三维属性ID列表
			@@ -205,12 +213,14 @@
			Def_CalcAttr_LV, # 主公等级 0
			Def_CalcAttr_MainEquip, # 主装备 1
			Def_CalcAttr_HeroBook, # 武将图鉴 2
			) = range(3)
			Def_CalcAttr_Realm, # 官职 3
			) = range(4)

			CalcAttrName = {
			Def_CalcAttr_LV:"主公等级",
			Def_CalcAttr_MainEquip:"主装备",
			Def_CalcAttr_HeroBook:"武将图鉴",
			Def_CalcAttr_Realm:"官职",
			}

			##-----------------------------------------------------------------------------------------------
			@@ -444,7 +454,6 @@
			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_RealmPoint = 24 # 直接给修行点
			@@ -462,7 +471,7 @@
			Def_ItemID_FamilyFlagWarPoint = 540 # 直接给万界积分
			Def_ItemID_TongTianPoint = 720 # 直接给通天令经验点
			Def_ItemID_SuccessScore = 590 # 直接给成就积分
			Def_TransformItemIDList = [Def_ItemID_FamilyContribution, Def_ItemID_FamilyActive, Def_ItemID_SP, Def_ItemID_GoldPaper,
			Def_TransformItemIDList = [Def_ItemID_FamilyContribution, 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_GoldMoney,
			Def_ItemID_FuncSysPrivilege, Def_ItemID_FCPartyPoint, Def_ItemID_BTGMPoint, Def_ItemID_GuShenMoney,
			@@ -621,7 +630,6 @@
			Def_Effect_GivePlayerMoneyGold = 203 #给人物金钱仙玉道具效果ID
			Def_Effect_AddDienstgrad = 204 #使用物品获得称号
			Def_Effect_UseItemGiveZhenQi = 205 #使用道具给予真气
			Def_Effect_ItemGiveFamilyActivity = 208 #使用道具给予仙盟活跃令
			Def_Effect_ItemGiveFamilyContribution = 209 #使用道具给予仙盟贡献
			Def_Effect_ItemAddExp = 213 #给经验道具
			Def_Effect_ItemAddLV = 214 #直接升级道具
			@@ -923,7 +931,6 @@
			Def_SkillID_Teleport = 1400 #瞬间移动用于不影响攻击间隔
			Def_SkillID_VipBuff = 11500 # VIPbuff
			Def_SkillID_TeamVIPBuff = 22000 # VIP队伍buff, 攻守同盟
			Def_SkillID_FBEncourageBuff = 20051 # 副本鼓舞buff
			Def_SkillID_PoisonAtkBuff = 25180 # 毒攻buff
			Def_SkillID_DropOwnerBuff = 20040 # 掉落归属buff
			Def_SkillID_TianxuanBuff = 5100 # 天玄丹特殊掉落buff
			@@ -958,13 +965,15 @@
			HurtType_Normal, # 伤害 1
			HurtTYpe_Recovery, # 回血 2
			HurtType_3,
			HurtType_4,
			HurtType_Immune, # 免疫 4
			HurtType_Parry, # 格挡 5
			HurtType_IgnoreDef, # 无视防御 6
			HurtType_IgnoreDef, # 无视防御/真实伤害 6
			HurtType_SuperHit, # 暴击 7
			HurtType_8,
			HurtType_Stun, # 击晕 8 仅算概率触发的击晕，技能额外击晕效果的不算
			HurtType_Miss, # 闪避 9
			) = range(10)
			HurtType_PoisonCureHurt, # 伤害毒奶 10
			HurtType_PoisonCureSuck, # 吸血毒奶 11
			) = range(12)

			#伤害类型
			(
			@@ -1059,6 +1068,9 @@

			Def_Player_InitMapSignPointCount = 1 # 玩家初始化地图标记点数量
			Def_Player_MapSignPointMaxCount = 10 # 地图标记点最大数量

			#初始境界
			Def_InitOfficialRank = 0

			#玩家性别
			Def_PlayerSex_Type = 3
			@@ -1314,9 +1326,11 @@
			Def_CalcTypeList = (
			Def_Calc_Attack, # 攻击 0
			Def_Calc_MaxHP, # 最大生命值 1
			Def_Calc_HurtValue, # 伤害值 2
			Def_Calc_LastHurt, # 最后一次伤害值 2
			Def_Calc_TagMaxHP, # 目标最大生命值 3
			) = range(4)
			Def_Calc_ByBuffValue, # 触发buff的buff值 4
			Def_Calc_TagLostHP, # 目标已损失生命 5
			) = range(6)

			#治疗类型（影响公式参数）
			Def_CureTypeList = (
			@@ -1379,7 +1393,10 @@
			SkillTagAffect_HPHighest, # 血量最高 2
			SkillTagAffect_Death, # 死亡单位 3
			SkillTagAffect_UncontrolledPriority, # 未被控制优先 4
			) = range(5)
			SkillTagAffect_AtkHighest, # 攻击力最高 5
			SkillTagAffect_Burn, # 灼烧/玄火目标优先 6
			SkillTagAffect_PoisonCure, # 仅焚血（毒奶）目标 7
			) = range(8)

			#技能施法目标
			Def_UseSkillAim_Type = 3
			@@ -1891,163 +1908,45 @@

			Def_FBMapID_Main = 1 # 主线小怪
			Def_FBMapID_MainBoss = 2 # 主线Boss
			Def_FBMapID_ArenaBattle = 3 # 演武场

			#创角新手村地图ID列表
			Def_CreatRoleMapIDList = [10000]
			#PK周赛
			Def_FBMapID_WeedPK = 12040
			#战盟副本-异界入侵、守卫人皇
			Def_FBMapID_FamilyInvade = 31170
			Def_FBMapID_Zhanchui = 30010 # 白骨盈野/战锤秘境
			Def_FBMapID_Tianzi = 30020 # 天子考验

			# 战盟boss副本
			Def_FBMapID_FamilyBossMap = 31210
			# 仙盟联赛
			Def_FBMapID_FamilyWar = 31220

			# 百战之地
			Def_FBMapID_BZZD = 31080

			#试炼之塔(符印塔)
			Def_FBMapID_TrialTower = 31130

			#除魔卫道
			Def_FBMapID_ClearDevil = 31040
			#新手副本
			#Def_FBMapID_ClearDevil2 = 31090
			#法宝副本
			Def_FBMapID_MagicWeapon = 41110

			#BOSS之家
			Def_FBMapID_BossHome = 31270 #31020地图ID修改，不使用副本类型

			#古神禁地
			Def_FBMapID_GodArea = 31150

			#冰晶矿脉
			Def_FBMapID_IceLode = 31140

			#渡劫副本
			Def_FBMapID_DuJie = 31110

			#麒麟之府
			Def_FBMapID_KirinHome = 311900

			#个人BOSS
			Def_FBMapID_PersonalBoss = 31240

			#仙盟宴会
			Def_FBMapID_FamilyParty = 31230

			#宗门试炼
			Def_FBMapID_MunekadoTrial = 60010

			#混乱妖域
			Def_FBMapID_ChaosDemon = 31180

			#讨伐妖魔
			Def_FBMapID_KillDevil = 31280

			#娲皇遗迹
			Def_FBMapID_QueenRelics = 51010

			#上古战场
			Def_FBMapID_ElderBattlefield = 31160

			#守护副本
			Def_FBMapID_Guard = 31250

			#封魔坛
			Def_FBMapID_SealDemon = 52010
			#单人封魔坛
			Def_FBMapID_SealDemonEx = 52020
			#诛仙BOSS/雷罚BOSS
			Def_FBMapID_ZhuXianBoss = 31380
			#天星塔/丹塔
			Def_FBMapID_SkyTower = 31370
			#境界塔
			Def_FBMapID_RealmTower = 31310
			#仙魔之争
			Def_FBMapID_XMZZ = 31010
			#神兽副本
			Def_FBMapID_Dogz = 21110
			#聚魂副本
			Def_FBMapID_GatherSoul = 31340
			#跨服竞技场
			Def_FBMapID_CrossRealmPK = 32010
			#跨服排位
			Def_FBMapID_CrossChampionship = 32070
			#跨服蓬莱仙境
			Def_FBMapID_CrossPenglai = 32020
			#跨服魔化之地
			Def_FBMapID_CrossDemonLand = 32080
			#跨服妖王
			Def_FBMapID_CrossDemonKing = 32030
			#本服妖王
			Def_FBMapID_DemonKing = 22030
			#多仙盟Boss
			Def_FBMapID_AllFamilyBoss = 31260
			#骑宠Boss
			Def_FBMapID_HorsePetBoss = 31200
			#缥缈宝藏
			Def_FBMapID_FairyTreasure = 31190
			#跨服灵草园
			Def_FBMapID_CrossGrasslandLing = 32040
			#跨服仙草园
			Def_FBMapID_CrossGrasslandXian = 32050
			#跨服战场
			Def_FBMapID_CrossBattlefield = 32060
			#跨服仙盟夺旗战/逐鹿万界
			Def_FBMapID_CrossFamilyFlagwar = 32090
			#竞技场战斗
			Def_FBMapID_ArenaBattle = 31290
			#情缘副本
			Def_FBMapID_Love = 31300
			#镜像切磋
			Def_FBMapID_MirrorBattle = 100

			#回合战斗自定义地图ID
			TurnFightMapIDList = (
			Def_TFMapID_MineArea, # 福地 1
			) = range(1, 1 + 1)

			#前端自定义场景地图
			ClientCustomSceneList = [Def_FBMapID_PersonalBoss, Def_FBMapID_ArenaBattle, Def_FBMapID_MirrorBattle]

			#镜像PK的地图ID列表
			MirrorBattleMapIDList = [Def_FBMapID_MirrorBattle, Def_FBMapID_ArenaBattle, Def_FBMapID_CrossRealmPK, Def_FBMapID_CrossChampionship]
			#线路未过关时免费的地图
			UnPassFreeMapIDList = [Def_FBMapID_Zhanchui]
			#按星级记录过关的地图
			PassByStarMapIDList = []
			#扫荡不需要检查是否已过关的地图
			SweepUnCheckPassMapIDList = [Def_FBMapID_Tianzi]

			#注册上传跨服服务器数据后直接进入跨服服务器的地图
			RegisterEnter_CrossServerMapIDList = [Def_FBMapID_CrossPenglai, Def_FBMapID_CrossDemonLand, Def_FBMapID_CrossDemonKing,
			Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian, Def_FBMapID_CrossBattlefield,
			Def_FBMapID_CrossChampionship, Def_FBMapID_CrossFamilyFlagwar,
			]
			RegisterEnter_CrossServerMapIDList = []
			#跨服地图
			Def_CrossMapIDList = RegisterEnter_CrossServerMapIDList + [Def_FBMapID_CrossRealmPK]
			Def_CrossMapIDList = RegisterEnter_CrossServerMapIDList + []
			#跨服分区类型配置, 没配置的默认 CrossZoneComm
			Def_CrossZoneTypeName = {0:"CrossZoneComm", # 特殊0，默认常规分区
			Def_FBMapID_CrossPenglai:"CrossZoneComm",
			Def_FBMapID_CrossDemonLand:"CrossZoneComm",
			Def_FBMapID_CrossRealmPK:"CrossZonePK",
			Def_FBMapID_CrossDemonKing:"CrossZonePK",
			Def_FBMapID_CrossGrasslandLing:"CrossZonePK",
			Def_FBMapID_CrossGrasslandXian:"CrossZonePK",
			Def_FBMapID_CrossBattlefield:"CrossZoneBattlefield",
			Def_FBMapID_CrossChampionship:"CrossZonePK",
			Def_FBMapID_CrossFamilyFlagwar:"CrossZoneComm",
			# Def_FBMapID_CrossPenglai:"CrossZoneComm",
			# Def_FBMapID_CrossDemonLand:"CrossZoneComm",
			# Def_FBMapID_CrossDemonKing:"CrossZonePK",
			# Def_FBMapID_CrossGrasslandLing:"CrossZonePK",
			# Def_FBMapID_CrossGrasslandXian:"CrossZonePK",
			# Def_FBMapID_CrossBattlefield:"CrossZoneBattlefield",
			# Def_FBMapID_CrossChampionship:"CrossZonePK",
			# Def_FBMapID_CrossFamilyFlagwar:"CrossZoneComm",
			}
			#跨服分区对应地图配置表名 - 仅适用于固定地图及虚拟分线的跨服玩法
			Def_CrossZoneMapTableName = {Def_FBMapID_CrossPenglai:"CrossPenglaiZoneMap",
			Def_FBMapID_CrossDemonLand:"CrossDemonLandZoneMap",
			Def_FBMapID_CrossFamilyFlagwar:"CrossFamilyFlagwarZoneMap",
			Def_CrossZoneMapTableName = {
			#Def_FBMapID_CrossPenglai:"CrossPenglaiZoneMap",
			#Def_FBMapID_CrossDemonLand:"CrossDemonLandZoneMap",
			#Def_FBMapID_CrossFamilyFlagwar:"CrossFamilyFlagwarZoneMap",
			}
			#需要动态分配线路的跨服地图
			Def_CrossDynamicLineMap = [Def_FBMapID_CrossDemonKing, Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian, Def_FBMapID_CrossBattlefield, Def_FBMapID_CrossChampionship]
			Def_CrossDynamicLineMap = []

			#副本关闭时未拾取的物品邮件发放给玩家
			#这里只有需要的副本才配置，不做默认逻辑，防止某些副本实际不能给导致刷物品，如麒麟之府
			Def_SendUnPickItemMailMapIDList = [Def_FBMapID_IceLode, Def_FBMapID_PersonalBoss, Def_FBMapID_MunekadoTrial,
			Def_FBMapID_SealDemon, Def_FBMapID_SealDemonEx, Def_FBMapID_ZhuXianBoss,
			Def_FBMapID_DemonKing, Def_FBMapID_CrossDemonKing, Def_FBMapID_KillDevil]
			Def_SendUnPickItemMailMapIDList = []

			#金钱不掉物品直接给玩家的地图
			Def_GiveMoneyMapIDList = []
			@@ -2055,38 +1954,18 @@
			# 副本中玩家下线就被踢出
			Def_DisconnectExit_FBID = []
			#会有阵营的地图
			Def_MapID_NeedCamp = [Def_FBMapID_FamilyWar, Def_FBMapID_GatherSoul, Def_FBMapID_CrossBattlefield] + MirrorBattleMapIDList
			Def_MapID_NeedCamp = []

			# 进入副本需要根据请求lineID动态分配虚拟分线属性的地图
			Def_MapID_LineIDToPropertyID = [Def_FBMapID_ElderBattlefield]

			# 进入副本需要发送到GameServer的地图
			Def_MapID_SendToGameServer = [Def_FBMapID_HorsePetBoss, Def_FBMapID_FamilyInvade, Def_FBMapID_SealDemon, Def_FBMapID_DemonKing,
			Def_FBMapID_FamilyWar, Def_FBMapID_ZhuXianBoss, Def_FBMapID_AllFamilyBoss] + \
			Def_MapID_LineIDToPropertyID + [Def_FBMapID_CrossChampionship] + MirrorBattleMapIDList

			# 刷新标识点在无玩家的情况下也需要刷新的地图
			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_SealDemon]
			Def_MapID_LineIDToPropertyID = []

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

			# 不可切换PK模式的地图
			Def_CanNotChangeAtkModelMap = []
			Def_NoPlayerCloseNotAutoSizeMap = []

			# 从副本退出时，可以返回进入前的副本ID
			Def_CanBackFBMap = []

			#答题触发地图
			Def_Subject_Map = [
			]
			#没通关过不可资源找回的地图
			Def_UnRecoverNoPassMap = [Def_FBMapID_KirinHome, Def_FBMapID_MunekadoTrial, Def_FBMapID_QueenRelics]

			#副本延时踢出玩家的时间
			Def_FBKickPlayerTime = 5000 #5秒
			@@ -2108,9 +1987,11 @@

			#副本ID转换
			Def_FB_MapID = {
			'MainLevel':[Def_FBMapID_Main, Def_FBMapID_MainBoss], # 主线关卡
			'CrossFamilyFlagwar':[Def_FBMapID_CrossFamilyFlagwar], #跨服仙盟夺旗战/逐鹿万界
			'MineArea':[Def_TFMapID_MineArea], #福地
			'MainLevel':[Def_FBMapID_Main], # 主线关卡
			'MainLevelBoss':[Def_FBMapID_MainBoss], # 主线关卡boss
			'Arena':[Def_FBMapID_ArenaBattle],
			'Zhanchui':[Def_FBMapID_Zhanchui],
			'Tianzi':[Def_FBMapID_Tianzi],
			}

			#特殊副本ID, 由系统分配, 进入时候不验证IsMapCopyFull
			@@ -3046,8 +2927,8 @@
			TurnBattleType_Combo, # 连击 1
			TurnBattleType_AtkBack, # 反击 2
			TurnBattleType_Pursue, # 追击 3
			TurnBattleType_Enhance, # 额外技能 4
			TurnBattleType_Passive, # 被动技能 5
			TurnBattleType_Enhance, # 额外技能（一般是主技能拆分为多个效果的技能） 4
			TurnBattleType_Passive, # 被动触发的技能 5
			) = range(6)

			Def_PerTurnTick = 1000 # 每回合等同于常规tick时长
			@@ -3064,9 +2945,6 @@
			Def_Obj_Dict_SkinID = 'SkinID' # 该战斗NPC所绑定的武将皮肤ID，一般仅玩家阵容有
			Def_Obj_Dict_TurnFightPosInfo = 'TurnFightPosInfo' # 回合制站位：阵营编号*100+阵型站位，阵型站位为0时代表非主战单位
			Def_Obj_Dict_TurnFightTimeline = 'TurnFightTimeline' # 回合制战斗时间线: 回合数*100+行动编号节点
			Def_Obj_Dict_TurnComboNum = 'TurnComboNum' # 单次累计连击次数
			Def_Obj_Dict_TurnAtkBackNum = 'TurnAtkBackNum' # 单次累计反击次数
			Def_Obj_Dict_TurnParryNum = 'TurnParryNum' # 单次累计格挡次数
			Def_Obj_Dict_TurnMissNum = 'TurnMissNum' # 单次累计闪避次数
			Def_Obj_Dict_TurnBattleType = 'TurnBattleType' # 本次攻击战斗类型：TurnBattleType_xxx

			@@ -3138,15 +3016,24 @@
			BatObjState_Poison, # 中毒 5
			BatObjState_Bleeding, # 流血 6
			BatObjState_EasyHurt, # 易伤 7
			BatObjState_Wudi, # 无敌 8
			BatObjState_Wudi, # 无敌( 受任意伤害、控制类、dot效果，全部飘“免疫”) 8
			BatObjState_Sneer, # 嘲讽 9
			BatObjState_LimitSkill, # 沉默 10
			BatObjState_LimitAddHP, # 禁疗 11
			BatObjState_Stone, # 石化 12
			) = range(13)

			# 被控制的状态列表，无法行动，处于某些控制类buff影响状态下，如晕眩，冰冻，石化
			InControlledStateList = [BatObjState_Frozen, BatObjState_Stun, BatObjState_Stone]
			BatObjState_Disarm, # 缴械 13
			BatObjState_ParryYJ, # 格挡印记 14
			BatObjState_Weak, # 虚弱 15
			BatObjState_Charm, # 魅惑 16
			BatObjState_Chaos, # 混乱 17
			BatObjState_18, # Ȩı 18
			BatObjState_FocusFire, # 军令/集火 19
			BatObjState_20, # 贯龙枪 20
			BatObjState_DamShield, # 承伤盾 21
			BatObjState_DamBackShield, # 荆棘盾 22
			BatObjState_BurnPlus, # 玄火(灼烧2) 23
			BatObjState_PoisonCure, # 焚血(毒奶) 24
			) = range(1 + 24)

			#玩家状态定义，不能超过31个，如超过，需扩展多个key支持
			Def_PlayerStateList = (
			@@ -3201,9 +3088,6 @@
			Def_PlayerKey_SomersaultTime = "Somersault" # 翻滚一定时间内无敌，表现为MISS
			Def_Player_RefreshAttrByBuff = "PlayerAttrByBuff" # 玩家属性刷新功能属性缓存，便于buff刷新计算, 间隔刷新
			Def_Player_HadRefreshAttr = "HadRefreshAttr" # 玩家在本地图是否刷新过属性
			Def_PlayerKey_ClientCustomScene = "ClientCustomScene" # 客户端自定义场景状态
			Def_PlayerKey_ClientCustomSceneStepTick = "ClientCustomSceneStepTick" # 客户端自定义场景tick
			Def_PlayerKey_ClientCustomSceneGrade = "ClientCustomSceneGrade" # 客户端自定义场景评级
			Def_PlayerKey_ChangeMapID = "ChangeMapID" # 请求切换的地图ID
			Def_PlayerKey_ChangeLineID = "ChangeLineID" # 请求切换的线路ID
			Def_PlayerKey_ResetFBLinePosX = "ResetFBLinePosX" # 请求切换副本多合一地图功能线路ID
			@@ -3371,7 +3255,6 @@

			Def_PlayerKey_CrossRegisterMap = "CrossRegisterMap" #跨服注册活动地图, dataMapID

			Def_Player_Dict_FamilyTechLV = "FamilyTechLV_%s" #家族科技等级, 参数(科技ID)
			Def_Player_Dict_RouteServerInitOK = "RouteServerInitOK_33" #RouteServer初始化成功(仅登陆一次)
			Def_Player_Dict_Wallow_LV = "GameWallowLV_34" #防沉迷等级
			Def_Player_Dict_Wallow_OfflineTime = "GameWallowOfflineTime_35" #防沉迷离线累积时间
			@@ -3395,21 +3278,12 @@
			Def_Player_Dict_TeamFBPlayerCnt = "TeamFBPlayerCnt" # 请求进入的组队副本玩家个数, 临时用，进入副本设置完后删除
			Def_Player_Dict_ReqFBMissionID = "ReqFBMissionID" # 请求进入副本的任务ID
			Def_Player_Dict_ReqFBMissionType = "ReqFBMissionType" # 请求进入副本的任务类型
			Def_Player_Dict_PlayerFBStar_MapId = "FBStar_%s_%s" # 副本星级星级信息, 参数为[mapID, key编号], 按位存储每个lineID对应的星级
			Def_Player_Dict_CustomMapStep = "CustomMapStep_%s_%s" # 前端自定义场景阶段, 参数(mapID, lineID)，对应 CustomMapStep_Fight ...
			Def_Player_Dict_FBStar = "FBStar_%s_%s" # 副本星级星级信息, 参数为[mapID, key编号], 按位存储每个lineID对应的星级
			Def_Player_Dict_FBPassLineID = "FBPassLineID_%s" # 副本已过关到的lineID, 参数为副本ID
			Def_Player_Dict_EnterFbCntTotal = "EnterFbCntTotal_%s" # 进入副本总累计次数, 参数为副本ID
			Def_Player_Dict_EnterFbCntDay = "EnterFbCntDay_%s" # 今日进入副本次数, 参数为副本ID
			Def_Player_Dict_BuyFbCntDay = "BuyFbCntDay_%s" # 今日购买副本进入次数, 参数为副本ID
			Def_Player_Dict_RecoverFbCnt = "RecoverFbCnt_%s" # 今日找回的副本次数, 参数为副本ID
			Def_Player_Dict_ItemAddFbCnt = "ItemAddFbCnt_%s" # 使用物品增加的副本次数, 参数为副本ID
			Def_Player_Dict_RegainFbCnt = "RegainFbCnt_%s" # 时间恢复增加的副本次数, 参数为副本ID
			Def_Player_Dict_EnterFbCntWeek = "EnterFbCntWeek_%s" # 本周进入副本次数, 参数为副本ID
			Def_Player_Dict_FbCntRegainStartTime = "FbCntRegainStartTime_%s" # 副本次数恢复开始时间, 参数为副本ID
			Def_Player_Dict_FbCntRegainTotalTime = "FbCntRegainTotalTime_%s" # 副本次数恢复还需时间, 参数为副本ID
			Def_Player_Dict_FBHistoryMaxLine = "FBHistoryMaxLine_%s" # 副本历史最高通关, 参数为副本ID
			Def_Player_Dict_IceLoadLineID = "IceLoadLineID_%s" # 副本星级星级信息, 参数为[key编号], 按位存储每个lineID是否选中
			Def_Player_Dict_RefurbishGoodBookPlayerLv = "RefurbishGoodBookPlayerLv_97" # 刷新天书任务时的玩家等级
			Def_Player_Dict_FbEnterCnt = "FbEnterCnt_%s" # 今日进入副本次数（获得奖励次数）, 参数为副本ID
			Def_Player_Dict_FBBuyCnt = "FBBuyCnt_%s" # 今日购买副本进入次数, 参数为副本ID
			Def_Player_Dict_FBItemCnt = "FBItemCnt_%s" # 今日使用物品增加的副本次数, 参数为副本ID
			Def_Player_Dict_FBADCnt = "FBADCnt_%s" # 今日已通过广告获得的次数, 参数为副本ID
			Def_Player_Dict_GameFuncFirstTouch = "GameFuncFirstTouch_%s" # 服务端功能首次触发开启状态; 参数, key编号
			Def_Player_Dict_GameFuncAwardState = "GameFuncAwardState_%s" # 服务端功能开启领奖状态; 参数, key编号
			Def_Player_Dict_MissionFinish = "MissionFinish_%s" # 任务是否完成; 参数, 任务ID, 只会记录部分需要记录的任务ID
			@@ -3443,16 +3317,9 @@
			Def_Player_Dict_UpdatePlayerName = "UpdatePlayerName_199" # 改名锁
			Def_Player_Dict_UpdateFamilyNameItemIndex = "UpdateFamilyNameItemIndex" # 改名物品在背包的位置
			Def_Player_Dict_UpdateFamilyName = "UpdateFamilyName" # 改名锁
			Def_Player_Dict_FamilyDayAward = "FamilyDayAward" # 仙盟每日奖励领奖记录
			Def_Player_Dict_FamilyDonateRecord = "FamilyDonateRecord" # 仙盟今日捐献记录，按位存储每种类型今日已捐献次数
			Def_Player_Dict_FamilyEmblemID = "FamilyEmblemID" # 仙盟徽章ID
			Def_Player_Dict_FamilyZhenbaogeCut = "FamilyZhenbaogeCut" #珍宝阁今日是否已砍过价
			Def_Player_Dict_FamilyZhenbaogeBuy = "FamilyZhenbaogeBuy" #珍宝阁今日是否已购买过

			# 仙盟事务
			Def_Player_Dict_FamilyAffairRefreshFree = "FamilyAffairRefreshFree" # 今日已免费刷新事务次数
			Def_Player_Dict_FamilyAffairInfo = "FamilyAffairStar_%s" # 事务信息，星级*10+状态（0-无；1-进行中；2-已完成）；参数（事务编号ID）
			Def_Player_Dict_FamilyAffairStartTime = "FamilyAffairStartTime_%s" # 事务开始时间戳，参数（事务编号ID）
			Def_Player_Dict_FamilyDonateCnt = "FamilyDonateCnt_%s" # 仙盟今日捐献次数，参数（捐献类型）

			Def_Player_Dict_DelPackIndex = "DelPackIndex215" # 装备回购不重排，只记录最旧的一个物品

			@@ -3472,8 +3339,6 @@

			Def_Player_Dict_LastAutoOpenPackTick = "LastAutoOpenPackTick219_%s" #上一次自动购买的tick<背包类型>

			Def_PDict_OnlinePrizeNote = "OnlinePrizeNote" # 当日在线奖励领取信息

			Def_PDict_OpenSererDailyAward = "OpenSererDailyAward" # 开服每日奖励记录
			Def_PDict_CreateRoleAwardState = "CreateRoleAwardState" # 创角奖励领取记录
			Def_PDict_GameNoticeAwardState = "GameNoticeAwardState" # 玩法前瞻游戏领奖记录
			@@ -3481,6 +3346,7 @@
			Def_PDict_GoodGameAwardState = "GoodGameAwardState" # 游戏好评领奖记录
			Def_PDict_LikeGameAwardState = "LikeGameAwardState" # 游戏点赞领奖记录
			Def_PDict_RechargeDayAward = "RechargeDayAward" # 累充每日奖励
			Def_PDict_ADCnt = "ADCnt_%s" # 今日已领取广告奖励次数，参数（广告ID）
			Def_PDict_EquipViewCacheState = "EquipViewCacheState" # 本次上线是否同步过装备缓存
			Def_PDict_PackDataSyncState = "PackDataSyncState" # 本次上线打包数据同步状态，按位存储是否同步 0-本服，1-跨服
			Def_PDict_PackDataSyncFightPower = "PackDataSyncFightPower" # 本次上线打包数据同步时的战力，用于对比，只对比求余亿部分即可
			@@ -3501,17 +3367,9 @@
			Def_PDict_CTGSelectItemValue = "CTGSelectItemValue_%s" # 充值自选选择记录，参数(CTG对应的商品记录ID) 每两位存储每个自选索引对应选择的物品索引+1，存储位值为0代表未选择，最多支持选择4种物品
			Def_PDict_OnlineRechargeTHAward = "OnlineRechargeTHAward" # 在线特惠充值额外奖励 - 是否已领取奖励
			Def_PDict_DayFreeGoldGiftState = "DayFreeGoldGiftState" # 每日免费直购礼包领取记录
			Def_PDict_GoldGiftFirstRecord = "GoldGiftFirstRecord" # 首充领取记录，按位记录首充第x天是否已领取
			Def_PDict_FirstGoldServerDay = "FirstGoldServerDay" # 首充时的开服天
			Def_PDict_FirstGoldRemainTime = "FirstGoldRemainTime" # 首充提示剩余时间
			Def_PDict_FirstGoldTipStartTime = "FirstGoldTipStartTime" # 首充提示开始时间
			Def_PDict_FirstGoldTry = "FirstGoldTry" # 首充试用状态 0-不可试用 1-可试用 2-已试用
			Def_PDict_SuperGiftStartTime = "SuperGiftStartTime" # 超值礼包开始时间
			Def_PDict_FirstChargeRecord = "FirstChargeRecord_%s" # 首充领取记录，按位记录首充第x天是否已领取，参数（首充ID）
			Def_PDict_FirstChargeTime = "FirstChargeTime_%s" # 首充充值时间戳，参数（首充ID）
			Def_PDict_IsReBorn = "Def_PDict_IsReBorn" # 是否回城复活
			Def_PDict_FamilyWarDailyReward = "FamilyWarDailyReward" # 王者仙盟每日俸禄领取状态
			Def_PDict_Family_Contribution = "FamilyContribution" #战盟贡献度
			Def_PDict_HasChange_FamilyActiveToContribution = "HasChangeContribution" #战盟活跃度已转化过贡献度
			Def_PDict_KillPlayerAddActive = "KillPlayerAddActiveByDay" # 杀人每日获得活跃度
			Def_PDict_LoginDayCnt = "PLoginDayCnt" # 累计登陆天数
			Def_PDict_LoginDayAward = "PLoginDayAward" # 累计登陆领取情况
			Def_PDict_CollNpcIDCollTime = "NPCIDCollTime_%s" # 采集NPCID对应每日对应采集次数，%sNPCID
			@@ -3540,17 +3398,6 @@
			Def_PDict_NobleEndTime = "NobleEndTime_%s" # 贵族到期结束时间<单位s>, 参数为贵族等级, 从1开始
			Def_PDict_NobleExperState = "NobleExperState" # 体验贵族状态； 0-无效；1-有效; 2-可体验

			Def_PDict_RecoverFBCommonCnt = "RecoverFBCommonCnt_%s" # 资源找回副本普通次数 <%s-找回项索引>
			Def_PDict_RecoverFBRegainCnt = "RecoverFBRegainCnt_%s" # 资源找回副本时间恢复次数 <%s-找回项索引>
			Def_PDict_RecoverFBExtraCnt = "RecoverFBExtraCnt_%s" # 资源找回副本VIP额外次数 <%s-找回项索引>
			Def_PDict_RecoverFBBuyCnt = "RecoverFBBuyCnt_%s" # 资源找回副本购买次数 <%s-找回项索引>
			Def_PDict_RecoverFBItemAddCnt = "RecoverFBItemAddCnt_%s" # 资源找回副本物品增加次数 <%s-找回项索引>
			Def_PDict_RecoverFBNoBuyCnt = "RecoverFBNoBuyCnt_%s" # 资源找回副本未购买次数 <%s-找回项索引>
			Def_PDict_RecoverGainData = "RecoverGainData_%s" # 资源找回额外数据<%s-找回项索引>
			Def_PDict_RecoverGainDataEx = "RecoverGainDataEx_%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存储私有次数
			Def_PDict_NPCAttackCount = "NPCAttackCount_%s" # NPC已攻击次数, 参数(NPCID)

			@@ -3559,12 +3406,6 @@
			Def_PDict_RedPacketGrabCnt = "RedPacketGrabCnt" # 抢红包次数

			Def_PDict_ItemUseCntToday = "ItemUseCntToday_%s" # 物品今日使用次数, 参数为物品ID

			Def_PDict_DayLoginSignIsMulti = "SignIsMulti" # 是否第二月以后
			Def_PDict_DayLoginSignNum = "DayLoginSignNum" # 本轮已签到次数
			Def_PDict_TotalSignNum = "TotalSignNum" # 累计已签到次数
			Def_PDict_DayLoginSignState = "DayLoginSignState" # 当天登陆签到状态
			Def_PDict_DayLoginSignStartTime = "SignStartTime" # 本轮签到开始时间

			Def_PDict_GodWeaponLV = "GodWeaponLV_%s" # 神器等级, 参数神器索引
			Def_PDict_GodWeaponExp = "GodWeaponExp_%s" # 神器等级对应祝福值经验, 参数神器索引
			@@ -3585,6 +3426,10 @@

			Def_PDict_DropCountToday = "DropCountToday_%s" # 今日物品已掉落次数，参数(物品ID)
			Def_PDict_DropColorToday = "DropColorToday_%s" # 今日装备品质已掉落次数，参数(装备品质)

			# 签到
			Def_PDict_SignInState = "SignInState_%s" # 按位记录每日签到状态，参数（key编号），状态：0-不可签到；1-已签到；2-可补签；3-已领取
			Def_PDict_SignInLastDay = "SignInLastDay" # 最后一次签到是第x天

			# 跑环
			Def_PDict_RunTaskAwardState = "RunTaskAwardState_%s" # 是否已领取跑环本轮结束奖励参数任务类型
			@@ -3613,23 +3458,10 @@
			Def_PDict_LingQiTrainLV = "LingQiTrainLV_%s_%s" # 培养等阶，参数为(place, 培养类型)
			Def_PDict_LingQiTrainItemCount = "LingQiTrainItemCount_%s_%s" # 培养当前阶已吃培养丹个数，参数为(place, 培养类型)

			# 公共CD副本扫荡
			Def_PDict_PubCDFBS_Time = "PCDFBS_%s_Time" # 开始扫荡时间, 参数(公共组编号)
			Def_PDict_PubCDFBS_MapID = "PCDFBS_%s_MID" # 扫荡的地图, 参数(公共组编号)
			Def_PDict_PubCDFBS_LineID = "PCDFBS_%s_LID" # 扫荡的线路, 参数(公共组编号)
			Def_PDict_PubCDFBS_Cnt = "PCDFBS_%s_Cnt" # 扫荡次数, 参数(公共组编号)
			Def_PDict_PubCDFBS_DataEx = "PCDFBS_%s_DEx" # 扫荡次数, 参数(公共组编号)

			# 宠物
			Def_PDict_FightPetIndex = "FightPetIndex" # 出战的宠物索引
			Def_PDict_PetTrainLV = "PetTrainLV_%s" # 灵宠培养等阶，参数（培养类型）
			Def_PDict_PetTrainItemCount = "PetTrainItemCount_%s" # 灵宠培养当前阶已吃培养丹个数，参数（培养类型）

			#装备分解
			Def_PDict_EquipDecomposeLV = "EquipDecomposeLV" #等级
			Def_PDict_EquipDecomposeExp = "EquipDecomposeExp" #经验
			Def_PDict_EquipDecomposeSeting = "EquipDecomposeSeting" #设置数据
			Def_PDict_EquipDecomposeCnt = "EquipDecomposeCnt" #已分解件数

			#试炼之塔
			Def_Player_Dict_TrialTower_PassLV = "TrialTower_PassLV" # 试炼之塔通关层数
			@@ -3788,14 +3620,6 @@
			Def_PDict_LoginAwardGotTimes = "LoginAwardGotTimes_%s_%s" #当前已领次数参数(第X天,模板ID)
			Def_PDict_LoginAwardWorldLV = "LoginAwardWorldLV%s" #活动开启时世界等级参数(第X天)

			#boss历练
			Def_PDict_BossTrialRecycleState = "BossTrialRecycleState" # 活动物品回收状态，该活动所有的本服、跨服活动结束才回收 1-标记等待回收；2-已回收过
			Def_PDict_CA_BossTrialID = "CA_BossTrialID" # 玩家身上的活动ID，唯一标识，取活动开始日期time值
			Def_PDict_BossTrialID = "BossTrialID_%s" # 玩家身上的活动ID，唯一标识，取活动开始日期time，参数（活动编号）
			Def_PDict_BossTrialSubmitCount = "BossTrialSubmitCount_%s" # 提交凭证物品个数，参数（活动编号）
			Def_PDict_BossTrialSubmitAwardCount = "BossTrialAwardCount_%s" # 关联提交凭证奖励提交物品个数，参数（活动编号）
			Def_PDict_BossTrialSubmitAward = "BossTrialSubmitAward_%s" # 提交凭证奖励状态，参数（活动编号）

			#幸运鉴宝
			Def_PDict_LuckyTreasureID = "LuckyTreasureID" # 玩家身上的活动ID，唯一标识，取活动开始日期time值
			Def_PDict_LuckyTreasureFree = "LuckyTreasureFree" #是否免费过
			@@ -3843,34 +3667,6 @@
			Def_PDict_TurntableItemID = "TurntableItemID_%s_%s" # 转盘物品ID*10+物品库类型，参数：(活动编号, 物品编号)
			Def_PDict_TurntableItemCount = "TurntableCount_%s_%s" # 转盘物品个数，参数：(活动编号, 物品编号)
			Def_PDict_TurntableItemState = "TurntableItemState_%s" # 转盘物品是否已抽中，按物品编号二进制位代表是否已抽中，参数：(活动编号)

			#垃圾分类活动
			Def_PDict_GarbageSortingID = "ActGSID_%s" # 玩家身上的活动ID，唯一标识，取活动开始日期time值，参数：(活动编号)
			Def_PDict_GarbageSortingWorldLV = "ActGSWorldLV_%s" #玩家身上的活动世界等级，参数：(活动编号)
			Def_PDict_GarbageTaskValue = "ActGSTaskValue_%s_%s" # 任务总进度值，参数(活动编号, 任务ID)
			Def_PDict_GarbageTaskFinishCount = "ActGSTaskFinishCount_%s_%s" # 任务已完成次数，参数(活动编号, 任务ID)
			Def_PDict_GarbageEnvironmentValue = "ActGSEnvValue_%s" # 活动累计获得环保值，参数(活动编号)
			Def_PDict_GarbageGJSeconds = "ActGSGJSeconds_%s" # 挂机未处理收益的秒数，参数(活动编号)

			#仙匣秘境活动
			Def_PDict_CA_XianXiaMJID = "CA_XianXiaMJID" # 玩家身上的活动ID，唯一标识，取活动开始日期time值
			Def_PDict_XianXiaMJID = "ActXXMJID_%s" # 玩家身上的活动ID，唯一标识，取活动开始日期time值，参数：(活动编号)
			Def_PDict_XianXiaMJWorldLV = "ActXXMJWorldLV_%s" #玩家身上的活动世界等级，参数：(活动编号)
			Def_PDict_XianXiaMJLayerNum = "ActXianXiaMJLayerNum_%s" # 当前层数，参数：(活动编号)
			Def_PDict_XianXiaMJPlayCount = "ActXianXiaMJPlayCount_%s" # 当前层累计抽奖次数，参数：(活动编号)
			Def_PDict_XianXiaMJAwardItemInfo = "ActXXMJItemInfo_%s_%s_%s" # 奖池物品ID*100+抽中位置编号，参数：(活动编号, 库类型, 物品编号)
			Def_PDict_XianXiaMJAwardItemTimes = "ActXXMJItemTimes_%s_%s_%s" # 奖池物品累计产出次数，有限制次数的才记录，参数：(活动编号, 库类型, 物品ID)
			Def_PDict_XianXiaMJScore = "XianXiaMJScore_%s" # 抽奖积分，参数：(活动编号)

			#古宝养成活动
			Def_PDict_CA_GubaoID = "CA_GubaoID" # 玩家身上的活动ID，唯一标识，取活动开始日期time值
			Def_PDict_ActGubaoID = "ActGubaoID_%s" # 玩家身上的活动ID，唯一标识，取活动开始日期time值，参数：(活动编号)
			Def_PDict_ActGubaoScore = "ActGubaoScore_%s" # 养成积分，参数：(活动编号)

			#骑宠养成活动
			Def_PDict_CA_HorsePetTrainID = "CA_HorsePetTrainID" # 玩家身上的活动ID，唯一标识，取活动开始日期time值
			Def_PDict_ActHorsePetTrainID = "ActHorsePetTrainID_%s" # 玩家身上的活动ID，唯一标识，取活动开始日期time值，参数：(活动编号)
			Def_PDict_ActHorsePetTrainScore = "ActHorsePetTrainScore_%s" # 累计获得活动养成积分，参数：(活动编号)

			#炼器活动
			Def_PDict_CA_LianqiID = "CA_LianqiID" # 玩家身上的活动ID，唯一标识，取活动开始日期time值
			@@ -4023,9 +3819,6 @@
			Def_PDict_DailyActionDayBuyTimes = "DADayBuyTimes_%s" # 每日活动今日购买次数参数每日活动ID
			Def_PDict_DailyActionDayItemTimes = "DADayItemTimes_%s" # 每日活动今日物品增加次数参数每日活动ID
			Def_PDict_DailyActionWeekTimes = "DailyActionWeekTimes_%s" # 每日活动本周完成次数参数每日活动ID
			#仙盟活跃
			Def_PDict_FamilyActivityFinishCnt = "FamilyActivityFinishCnt%s" # 已完成次数
			Def_PDict_FamilyActivityAwardRecord = "FamilyActivityAwardRecord" # 活跃度奖励领取记录，按二进制位标识

			# 投资理财
			Def_PDict_InvestTime = "InvestTime_%s" # 投资时的时间，参数为投资类型
			@@ -4113,19 +3906,6 @@
			Def_PDict_GFPassiveIndex = "GFP_%s_%s" # 被动功法页数-索引
			Def_PDict_GFPassivePage = "GFPPage" # 被动功法选中页数

			# 挂机收益
			Def_PDict_GuajiCalcTime = "GuajiCalcTime" # 上次统计收益时间戳
			Def_PDict_GuajiAwardSeconds = "GuajiAwardSeconds" # 已累计收益时长，秒
			Def_PDict_GuajiQuickCount = "GuajiQuickCount" # 今日已快速收益次数
			Def_PDict_GuajiExp = "GuajiExp" # 经验
			Def_PDict_GuajiExpPoint = "GuajiExpPoint" # 经验超过E部分
			Def_PDict_GuajiMoneyType = "GuajiMoneyType_%s" # 获得货币类型，参数(索引)
			Def_PDict_GuajiMoneyValue = "GuajiMoneyValue_%s" # 获得货币值，参数(索引)
			Def_PDict_GuajiMoneyUnSeconds = "GuajiMoneyUnSeconds_%s" # 计算获得货币值时未处理收益的累计时长，秒，参数(货币类型)
			Def_PDict_GuajiItemUnSeconds = "GuajiItemUnSeconds" # 计算获得物品次数时未处理收益的累计时长，秒
			Def_PDict_GuajiItemID = "GuajiItemID_%s" # 获得物品ID，参数(索引)
			Def_PDict_GuajiItemCount = "GuajiItemCount_%s" # 获得物品个数，参数(索引)

			#套装
			Def_PDict_EquipPartSuiteLV = "EQPartSuiteLV_%s_%s" #部位套装等级参数部位、套装类型
			Def_PDict_EquipPartSuiteActivate = "EQPartSuiteActivate_%s" #套装激活记录参数 key编号
			@@ -4143,13 +3923,7 @@
			Def_PDict_SkillElementLV = "SkillElementLV%s" #专精技能技能等级参数技能ID

			#竞技场
			Def_PDict_ArenaOSSeasonState = "ArenaOSSeasonState" # 开服前定制X天赛季状态 0-未比赛过，1-进行中，>1结算时的开服天
			Def_PDict_ArenaScore = "ArenaScore" # 当前积分
			Def_PDict_ArenaHighestScore = "ArenaHighestScore" # 历史最高积分
			Def_PDict_ArenaBattleCountDay = "ArenaBattleCountDay" # 今日已战斗次数
			Def_PDict_ArenaMatchRefreshCount = "ArenaMatchRefreshCount" # 匹配刷新列表次数
			Def_PDict_ArenaItemAddCount = "ArenaItemAddCount" # 今日已使用物品增加次数
			Def_PDict_ArenaBattleTagID = "ArenaBattleTagID" # 当前对战的对手ID

			#功能系统特权
			Def_PDict_FuncSysPrivilegeActTime = "FuncSysPrivilegeActTime_%s" # 系统功能特权激活时间戳，参数(系统功能ID)
			@@ -4181,6 +3955,8 @@
			Def_PDict_TreeLVUPState = "TreeLVUPState" # 仙树升级状态；0-未升级；1-升级中
			Def_PDict_TreeLVUPRemainTime = "TreeLVUPRemainTime" # 仙树升级剩余时间，秒
			Def_PDict_TreeLVUPRefreshTime = "TreeLVUPRefreshTime" # 仙树升级上次刷新时间戳
			Def_PDict_TreeFreeTimeCnt = "TreeFreeTimeCnt" # 今日已领取免费减时次数，过天重置
			Def_PDict_TreeFreeTimeLast = "TreeFreeTimeLast" # 今日上次领取免费减时时间戳，过天重置

			#任务，每个任务组有且仅有一个进行中的任务
			Def_PDict_TaskIDLast = "TaskIDLast_%s" # 上一次完成的任务ID，参数(任务组)
			@@ -4188,15 +3964,15 @@
			Def_PDict_TaskValue = "TaskValue_%s" # 当前进行中的任务进度，参数(任务组)
			Def_PDict_TaskState = "TaskState_%s" # 当前进行中的任务状态 0-无；1-进行中；2-已完成，参数(任务组)

			#福地
			Def_PDict_MineWorkerCount = "MineWorkerCount" # 已雇佣工人数
			Def_PDict_MineWorkerEnergyUsed = "MineWorkerEnergyUsed" # 今日已消耗体力
			Def_PDict_MineHousekeeperEndTime = "MineHousekeeperEndTime" # 自动管家到期时间戳
			Def_PDict_MineHelpAwardCount = "MineHelpAwardCount" # 今日已帮助别人奖励次数
			Def_PDict_MineRefreshCount = "MineRefreshCount_%s" # 今日已刷新次数，参数(刷新类型)
			Def_PDict_MineTreasureState = "MineTreasureState" # 聚宝盆激活状态，按类型位运算记录是否已激活
			Def_PDict_MineTreasureAward = "MineTreasureAward" # 聚宝盆奖励状态，按类型位运算记录是否已领取
			Def_PDict_MineTreasureProgess = "MineTreasureProgess_%s" # 聚宝盆进度值，参数(聚宝盆类型)
			#淘金
			Def_PDict_GoldRushCampState = "GoldRushCampState" # 已解锁营地状态，按营地ID二进制位运算判断是否已解锁
			Def_PDict_GoldRushWorkerState = "GoldRushWorkerState" # 已雇佣工人数状态，按监工ID二进制位运算判断是否已解锁
			Def_PDict_GoldRushCnt = "GoldRushCnt" # 已淘金次数
			Def_PDict_GoldRushCampInfo = "GoldRushCampInfo_%s" # 营地当前淘金信息: 已刷新次数1000+淘金ID10+派遣工人数，0时代表当前营地为空，参数(营地ID)
			Def_PDict_GoldRushCampEndTime = "GoldRushCampEndTime_%s" # 营地淘金结束时间戳，为0时代表未开始淘金，参数(营地ID)
			Def_PDict_GoldRushWarehouse = "GoldRushWarehouse_%s" # 仓库完成淘金ID，参数(仓库位置索引)
			Def_PDict_GoldRushRecoverTime = "GoldRushRecoverTime" # 上次恢复淘金令时间戳
			Def_PDict_GoldRushAutoEndTime = "GoldRushAutoEndTime" # 自动淘金到期时间戳

			#仙宫
			Def_PDict_XiangongLikeState = "XiangongLikeState_%s" # 指定仙宫今日是否已点赞，参数(仙宫ID)，仙宫ID为0时代表每日的仙宫功能点赞
			@@ -4206,14 +3982,20 @@
			#武将
			Def_PDict_HeroSkin = "HeroSkin_%s" # 武将皮肤解锁状态，按皮肤索引二进制存储，参数(武将ID)
			Def_PDict_HeroBook = "HeroBook_%s" # 武将图鉴激活等级，参数(武将ID) cccbbba a-初始激活状态1-英雄激活，2-初始图鉴激活； bbb-存星级图鉴激活等级；ccc-存突破图鉴激活等级
			Def_PDict_HeroBookH = "HeroBookH_%s" # 武将图鉴历史最高等级，参数(武将ID) cccbbba: bbb-存星级图鉴最高等级；ccc-存突破图鉴最高等级
			Def_PDict_HeroAwakeRebirthCnt = "HeroAwakeRebirthCnt" # 已觉醒过的武将今日已重生次数，共享次数

			#主线
			Def_PDict_UnXiantaoCntExp = "UnXiantaoCntExp" # 累计未结算经验的战锤数
			Def_PDict_UnXiantaoCntEquip = "UnXiantaoCntEquip" # 累计未结算装备掉落的战锤数
			Def_PDict_UnXiantaoCntEquip = "UnXiantaoCntEquip" # 累计未结算装备掉落的战锤数，有3位小数，即 1234 实际为 1.234
			Def_PDict_UnXiantaoCntBooty = "UnXiantaoCntBooty_%s" # 累计未结算战利品掉落的战锤数，参数(itemID)
			Def_PDict_BootyDropToday = "BootyDropToday_%s" # 今日已累计掉落战利品数量，参数(itemID)

			#天子考验
			Def_PDict_TianziHisHurt = "TianziHisHurt_%s" # 历史最高伤害，求余亿部分，参数（bossID）
			Def_PDict_TianziHisHurtEx = "TianziHisHurtEx_%s" # 历史最高伤害，整除亿部分，参数（bossID）
			Def_PDict_TianziTodayHurt = "TianziTodayHurt" # 今日最高伤害，求余亿部分
			Def_PDict_TianziTodayHurtEx = "TianziTodayHurtEx" # 今日最高伤害，整除亿部分
			#-------------------------------------------------------------------------------

			#物品效果(ID或指定类型)对应的属性计算信息 {效果（ID/指定类型）:[[属性索引, ...], 是否基础属性，(非)线性]}
			@@ -4225,12 +4007,7 @@
			FuncNoLinearAttrDict = {}

			# 指定地图生效的非线性属性配置
			MapAttrInfoDict_Noline = {
			Def_FBMapID_FamilyWar:{
			TYPE_Calc_FamilyWarAtkPer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax],
			TYPE_Calc_FamilyWarHPPer:[TYPE_Calc_AttrMaxHP],
			}
			}
			MapAttrInfoDict_Noline = {}

			#属性线性索引
			CalcAttrIndexList = (
			@@ -4329,16 +4106,59 @@
			TriggerWay_HeroTurnEnd, # 武将回合开始时 5
			TriggerWay_HeroActionStart, # 武将行动前 6
			TriggerWay_HeroActionEnd, # 武将行动后 7
			TriggerWay_CalcTagInState, # 攻击计算时对方处于xx状态时（参数：状态1\|2\|...）一般用于攻击时属性计算 8
			TriggerWay_AttackOverTagInState, # 攻击计算后对方处于xx状态时（参数：状态1\|2\|...）一般用于攻击后触发效果 9
			TriggerWay_AttackOverDirect, # 直接攻击后（非buff攻击）10
			TriggerWay_CalcEffValue, # 统计计算效果值时 8
			TriggerWay_UseSkillOver, # 使用技能后（每个目标触发一次）9
			TriggerWay_AttackOverDirect, # 直接攻击后（除dot或buff外的攻击，每个目标触发一次）10
			TriggerWay_BeAttackedDirect, # 受到直接攻击时（非buff攻击）11
			TriggerWay_ShieldBroken, # 承伤盾被击破时 12
			) = range(1, 1 + 12)
			TriggerWay_CurSkillEff, # 本技能/buff释放后，一般用于本技能/buff释放后触发，仅该技能释放后有效 13
			TriggerWay_CurSkillEffLst, # 本持续buff结算后额外触发效果，仅该持续buff结算后有效 14
			TriggerWay_KillOneObj, # 击杀目标后（单次击杀多目标只触发一次） 15
			TriggerWay_KillTagObj, # 击杀每目标后（单次击杀多目标每个目标触发一次） 16
			TriggerWay_BuffDel, # buff消失后 17
			TriggerWay_BeCombo, # 被连击时 18
			TriggerWay_BePursue, # 被追击时 19
			TriggerWay_UseSkillOverOne, # 使用技能后（多目标仅触发一次）20
			TriggerWay_AttackOverDirectOne, # 直接攻击后（除dot或buff外的攻击，多目标仅触发一次）21
			TriggerWay_BeAnyEffect, # 受到任意效果时（除直接攻击外的任意效果，如buff、dot、治疗、额外怒技）22
			) = range(1, 1 + 22)

			# 不加载的被动触发方式，一般用于本技能固定触发逻辑用的
			TriggerWayNoLoadList = [TriggerWay_CurSkillEff, TriggerWay_CurSkillEffLst]

			# 被动触发有效来源
			TriggerSrc_Skill = 1
			TriggerSrc_Buff = 2
			TriggerSrc_Skill = 1 # 身上技能有效
			TriggerSrc_Buff = 2 # 身上buff有效
			TriggerSrc_SkillSelf = 3 # 本技能有效
			TriggerSrc_BuffSelf = 4 # 本buff有效

			# 被动效果ID，属性类的直接使用属性ID当做效果ID
			PassiveEff_AddBuffLayerByWeight = 6001 # 根据权重随机添加buff层数数值1-[[权重,层级], ...]
			PassiveEff_ChangeHurtType = 6002 # 变更本次伤害类型
			PassiveEff_ChangeHurtMulti = 6003 # 变更伤害倍值（可增可减）
			PassiveEff_AddSkillPer = 6004 # 增加本次技能万分比（验证目标状态）
			PassiveEff_AddSkillPerByJob = 6006 # 增加本次技能万分比（验证目标职业）
			# 6005 增加本次技能万分比（按buff状态层数算）
			PassiveEff_AddSkillTagCnt = 6007 # 增加技能目标数
			PassiveEff_ImmuneControlBuff = 6008 # 生命值低于x%时免疫控制效果
			PassiveEff_MustSuperHit = 6009 # 生命值低于x%时必定暴击
			PassiveEff_AddSkillPerByHP = 6010 # 增加本次技能万分比（验证当前生命）
			PassiveEff_AddSkillPerByBuffLayer = 6011 # 增加本次技能万分比（根据buff层级）
			PassiveEff_AddBuffLayerMax = 6012 # 添加buff层级上限: 数值1-增加层级上限
			PassiveEff_AddFinalDamPer = 6013 # 增加最终增伤（根据属性转化）
			PassiveEff_AddSkillRate = 6014 # 增加技能概率

			# 被动效果ID有触发值时就返回的
			PassiveEffHappenValueList = [PassiveEff_ChangeHurtType, PassiveEff_ImmuneControlBuff, PassiveEff_MustSuperHit]
			# 被动效果ID触发值取最大值的
			PassiveEffValueMaxList = [PassiveEff_ChangeHurtMulti]
			# 被动效果ID触发值取最小值的
			PassiveEffValueMinList = []

			# 技能效果 - 不需要配置触发方式的
			SkillEff_CureWayEx = 7001 # 额外治疗值计算（对CalcType、SkillPer治疗计算方式扩展）: 值1-计算方式；值2-万分比
			SkillEff_HurtShare = 7002 # 均摊伤害
			SkillEff_ChangeTag = 7003 # 修改技能目标

			(
			TriggerType_BeSuperHit, # 被暴击触发技能 1
			@@ -4431,7 +4251,7 @@
			TriggerType_ThumpSkillValue, # 重击增加技能固定值伤害 88
			TriggerType_HitValue, # 记录命中个数 89
			TriggerType_ChangeSkillEff, # 改变技能特效广播 90
			) = range(1, 91)
			) = range(1001, 1091)


			#不可以佩戴翅膀的地图
			@@ -4496,10 +4316,10 @@
			Def_Cost_BuyPack, # 购买背包格子
			Def_Cost_UseSpeaker, # 喇叭发言
			Def_Cost_Revive, # 复活
			Def_Cost_FBEncourage, # 副本鼓舞 5
			Def_Cost_5, # 副本鼓舞 5
			Def_Cost_GoldInvest, # 理财投资
			Def_Cost_Pray, # 祈祷
			Def_Cost_RecoverGain, # 资源找回
			Def_Cost_8, # 资源找回
			Def_Cost_BuyVIPItem, # 购买VIP礼包
			Def_Cost_GM, # GM 10
			Def_Cost_BourseBuy, # 交易所购买
			@@ -4537,7 +4357,7 @@
			Def_Cost_MysteryShopRefresh, # 神秘商店刷新
			Def_Cost_AuctionBid, # 拍卖行竞价
			Def_Cost_BuyDailyActionCnt, # 购买活动次数 45
			Def_Cost_FBBuyBuff, # 副本买buff
			Def_Cost_46, # 副本买buff
			Def_Cost_CreatFamily, # 创建仙盟
			Def_Cost_BuyKillBossCnt, #购买boss次数
			Def_Cost_EquipStar, #装备升星
			@@ -4568,7 +4388,7 @@
			Def_Cost_Unknown, "GMSetMoney", "Warehouse", Def_Cost_AuctionBid]

			# 可在跨服中消费的类型列表
			MergeServerCanCostType = [Def_Cost_UseSpeaker, Def_Cost_Revive, Def_Cost_FBEncourage]
			MergeServerCanCostType = [Def_Cost_UseSpeaker, Def_Cost_Revive]
			#内部仙玉不能用的消费类型列表
			UnUseInner_CostType = [Def_Cost_BourseBuy, Def_Cost_FamilyRedPacket, Def_Cost_AuctionBid]
			# 消费类型对应信息字典{消费类型:[eventName, 中文说明reason_name, 发送给9377的数据是否分消费子类], }
			@@ -4586,14 +4406,12 @@
			Def_Cost_Pray:"Pray",
			Def_Cost_Treasure:"Treasure",
			Def_Cost_OpenNoble:"OpenNoble",
			Def_Cost_RecoverGain:"RecoverGain",
			Def_Cost_EnterFB:"EnterFB",

			# 无消费对象子类的
			Def_Cost_BuyPack:"BuyPack",
			Def_Cost_UseSpeaker:"UseSpeaker",
			Def_Cost_Revive:"Revive",
			Def_Cost_FBEncourage:"FBEncourage",
			Def_Cost_RefreshArrestTask:"RefreshArrestTask",
			Def_Cost_RefreshTimeShop:"RefreshTimeShop",
			Def_Cost_ResetGreatMasterSkill:"ResetTalentSkill",
			@@ -4636,7 +4454,6 @@
			Def_Cost_MysteryShopRefresh:"MysteryShopRefresh",
			Def_Cost_AuctionBid:"AuctionBid",
			Def_Cost_BuyDailyActionCnt:"BuyDailyActionCnt",
			Def_Cost_FBBuyBuff:"FBBuyBuff",
			Def_Cost_CreatFamily:"CreatFamily",
			Def_Cost_BuyKillBossCnt:"BuyKillBossCnt",
			Def_Cost_EquipStar:"EquipStar",
			@@ -4665,7 +4482,7 @@
			Def_GiveMoney_Pickup, # ʰȡ
			Def_GiveMoney_Bourse, # 交易所 10
			Def_GiveMoney_GoldInvest, # 绑钻投资
			Def_GiveMoney_Recover, # 资源找回
			Def_GiveMoney_12, # 资源找回
			Def_GiveMoney_RedPacket, # 红包
			Def_GiveMoney_RefineGift, # 炼制奖励
			Def_GiveMoney_Mail, # 邮件（补偿） 15
			@@ -4703,7 +4520,6 @@
			Def_GiveMoney_Pickup:"Pickup",
			Def_GiveMoney_Bourse:"Bourse",
			Def_GiveMoney_GoldInvest:"GoldInvest",
			Def_GiveMoney_Recover:"Recover",
			Def_GiveMoney_RedPacket:"RedPacket",
			Def_GiveMoney_RefineGift:"RefineGift",
			Def_GiveMoney_Mail:"Mail",
			@@ -4881,10 +4697,6 @@

			##==================================================================================================

			# 前端自定义场景状态
			CustomMapStep_Over = 0 # 没有或已结束
			CustomMapStep_Fight = 1 # 战斗进行中

			# 副本参与类型
			FB_JoinType = (
			FB_JoinType_None, # 默认无
			@@ -4936,12 +4748,6 @@
			CME_FB_RunDaily:"日常跑环",
			CME_FB_RunFamily:"战盟跑环",
			}

			# 功能对应的事件记录类型
			FuncCMEDict = {
			ShareDefine.GameFuncID_RunDaily:CME_FB_RunDaily,
			ShareDefine.GameFuncID_RunFamily:CME_FB_RunFamily,
			}

			# 需要发送到任务事件扩展记录的类型 ShareDefine.Def_UserAction_ExMissionLog
			CME_Ex_Log_List = [CME_Class_Horse, CME_Class_Wing, CME_Class_Official]
			@@ -5045,8 +4851,7 @@
			Def_SkillFuncType_TurnNormaSkill, #1 普攻技能
			Def_SkillFuncType_AngerSkill, #2 怒气技能
			Def_SkillFuncType_PotentialSkill, #3 潜能技能
			Def_SkillFuncType_AtkbackSkill, #4 反击技能
			) = range(5)
			) = range(4)

			# MMO项目 - 先保留，重新定义从1000开始，后续可陆续删除
			(Def_SkillFuncType_Common, #0为通用技能
			@@ -5093,6 +4898,16 @@
			AtkDistType_Short, # 近战
			AtkDistType_Long, # 远程
			) = range(1, 1 + 2)

			# 武将特长
			HeroSpecialtyList = (
			HeroSpecialty_Stun, # 击晕 1
			HeroSpecialty_SuperHit, # 暴击 2
			HeroSpecialty_Combo, # 连击 3
			HeroSpecialty_Miss, # 闪避 4
			HeroSpecialty_Parry, # 格挡 5
			HeroSpecialty_SuckHP, # 吸血 6
			) = range(1, 1 + 6)

			# 经验倍率限制类型
			(
			@@ -5152,14 +4967,14 @@
			# 游戏功能奖励定义
			(
			Def_RewardType_Activity, # 活跃度奖励 0
			Def_RewardType_FamilyActivity, # 仙盟活跃度奖励 1
			Def_RewardType_1, # 1
			Def_RewardType_ChampionFamilyDailyReward, # 仙盟联赛冠军仙盟每日俸禄奖励 2
			Def_RewardType_XMZZWinCnt, # 仙魔之争胜利场数奖励 3
			Def_RewardType_FamilyDayAward, # 仙盟每日福利奖励 4
			Def_RewardType_LVAward, # 玩家等级奖励5
			Def_RewardType_XBXZ, # 仙宝寻主奖励6
			Def_RewardType_DayRealmPoint, # 每日任务修行点奖励7
			Def_RewardType_GoldGiftFirst, # 首充礼包奖励8
			Def_RewardType_FirstCharge, # 首充礼包奖励8
			Def_RewardType_MWSoulAward, # 法宝之魂奖励9 -废弃
			Def_RewardType_FreeGoods, # 极品白拿10
			Def_RewardType_CostRebate, # 消费返利11
			@@ -5232,7 +5047,9 @@
			Def_RewardType_LunhuidianAward, # 轮回殿奖励 78
			Def_RewardType_RechargeDayAward, # 累充每日奖励 79
			Def_RewardType_FamilyGCZ, # 仙盟攻城战 80
			)= range(81)
			Def_RewardType_ADAward, # 广告奖励 81
			Def_RewardType_TreeFreeTime, # 仙树免费减时 82
			)= range(83)

			#boss复活相关活动定义
			BossRebornActIDList = (
			@@ -5383,8 +5200,8 @@
			ActTaskType_Activity, # 累计获得活跃度 3
			ActTaskType_CrossPenglaiBoss, # 击杀蓬莱boss 4
			ActTaskType_CrossDemonLandBoss, # 击杀魔化之地boss 5
			ActTaskType_XianXiaMJLottery, # 仙匣秘境寻宝x次 6
			ActTaskType_XianXiaMJLayer, # 仙匣秘境达到x层 7
			ActTaskType_6, # 仙匣秘境寻宝x次 6
			ActTaskType_7, # 仙匣秘境达到x层 7
			ActTaskType_TreasureGubao, # 古宝寻宝x次 8
			ActTaskType_HorseUpItem, # 消耗X个坐骑经验丹 9
			ActTaskType_PetUpItem, # 消耗X个灵宠经验丹 10
			@@ -5484,7 +5301,7 @@

			# 任务类型定义
			TaskTypeList = (
			TaskType_FBPass, # 副本过关到xxx 1
			TaskType_MainLevel, # 主线过关到xxx 1
			TaskType_TreeLV, # 仙树达到X级 2
			TaskType_EquipDecompose, # 分解装备x次 3
			TaskType_CutTree, # 消耗X个战锤 4
			@@ -5492,7 +5309,8 @@
			TaskType_RealmLV, # 境界达到X级 6
			TaskType_KillNPC, # 击败X只怪物 7
			TaskType_GetMoney, # 累计获得xx货币 8
			) = range(1, 1 + 8)
			TaskType_EquipColor, # 穿戴x件x品质及以上装备 9
			) = range(1, 1 + 9)

			# 任务分组
			TaskGroupList = (