Project_SG_ServerCode.git

			@@ -152,7 +152,15 @@
			AttrID_ShieldPerDef, # 弱化护盾 54
			AttrID_DOTPer, # 持续增伤 55 (中毒、燃烧、流血)
			AttrID_DOTPerDef, # 持续减伤 56
			) = range(1, 1 + 56)
			AttrID_WeiFinalDamPer, # 对魏增伤 57
			AttrID_WeiFinalDamPerDef, # 对魏减伤 58
			AttrID_ShuFinalDamPer, # 对蜀增伤 59
			AttrID_ShuFinalDamPerDef, # 对蜀减伤 60
			AttrID_WuFinalDamPer, # 对吴增伤 61
			AttrID_WuFinalDamPerDef, # 对吴减伤 62
			AttrID_QunFinalDamPer, # 对群增伤 63
			AttrID_QunFinalDamPerDef, # 对群减伤 64
			) = range(1, 1 + 64)

			# 需要计算的武将战斗属性ID列表
			CalcBattleAttrIDList = [AttrID_Atk, AttrID_Def, AttrID_MaxHP, AttrID_StunRate, AttrID_StunRateDef,
			@@ -163,6 +171,8 @@
			AttrID_NormalSkillPer, AttrID_NormalSkillPerDef, AttrID_AngerSkillPer, AttrID_AngerSkillPerDef,
			AttrID_SuperDamPer, AttrID_SuperDamPerDef, AttrID_CurePer, AttrID_CurePerDef,
			AttrID_ShieldPer, AttrID_ShieldPerDef, AttrID_DOTPer, AttrID_DOTPerDef,
			AttrID_WeiFinalDamPer, AttrID_WeiFinalDamPerDef, AttrID_ShuFinalDamPer, AttrID_ShuFinalDamPerDef,
			AttrID_WuFinalDamPer, AttrID_WuFinalDamPerDef, AttrID_QunFinalDamPer, AttrID_QunFinalDamPerDef,
			]

			# 基础三维属性ID列表
			@@ -184,8 +194,6 @@
			}

			# 属性ID对应0418刷新类型 {属性ID:[刷新同步类型, 是否支持超20亿的大数值], ...}
			# 卡牌项目玩家/主公属性仅为中间层属性，并非最终属性，最终属性体现在卡牌上，暂定全部前端自己算
			# 所以仅配置战斗场景需要同步的属性即可
			CDBRefresh_AttrIDDict = {
			AttrID_MaxHP:[IPY_PlayerDefine.CDBPlayerRefresh_MaxHP, 1],
			AttrID_HP:[IPY_PlayerDefine.CDBPlayerRefresh_HP, 1],
			@@ -573,7 +581,7 @@

			def GetItemPackType(itemData, defaultPack=IPY_GameWorld.rptItem):
			## 获取物品对应存放的默认背包类型
			if defaultPack in [ShareDefine.rptTreasure, ShareDefine.rptTempItem]:
			if defaultPack in [ShareDefine.rptTreasure, ShareDefine.rptTempItem, IPY_GameWorld.rptIdentify]:
			#寻宝背包、临时背包不做处理
			return defaultPack
			import IpyGameDataPY
			@@ -924,18 +932,10 @@
			Def_SkillID_HorsePetRobBossKillCntBuff = 21020 # 骑宠的怨念buff
			Def_SkillID_RealmBuff = 6100 # 境界经验buff

			Def_SkillID_FamilyWar_CWinBuff = 22101 # 仙盟联赛 - 连胜buff, 由连胜次数决定等级
			Def_SkillID_FamilyWar_JoinBuff = 22131 # 仙盟联赛 - 参与buff, 由人数决定等级
			Def_SkillID_FamilyWar_ResPointAdd = 22201 # 仙盟联赛 - 随机buff固定加资源点
			Def_SkillID_FamilyWar_ResPointAddPer = 22202 # 仙盟联赛 - 随机buff资源点成长加成
			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,
			Def_SkillID_FamilyWar_JoinBuff, Def_SkillID_FamilyWar_RandBuffAttr]
			ClearBuffOnMapChangeList = [Def_SkillID_DropOwnerBuff]

			#技能ID对应的区域类型
			Def_AreaType_SkillID_Safe = 20011 # 安全区
			@@ -946,8 +946,25 @@

			Def_SkillID_Peace = 23048 # 玩家间和平buff
			#----------------------------------------------------------------------
			#战斗类型
			Def_ChanceDefRate = 2000 # 抵御伤害概率, 目前固定20%概率

			#技能释放后需要额外处理逻辑
			AfterLogic_DelBuff = "DelBuff"
			AfterLogic_AddBuff = "AddBuff"
			AfterLogic_SyncBuff = "SyncBuff"

			#伤害类型
			(
			HurtType_Fail, # 失败 - 如概率没有触发 0
			HurtType_Normal, # 伤害 1
			HurtTYpe_Recovery, # 回血 2
			HurtType_3,
			HurtType_4,
			HurtType_Parry, # 格挡 5
			HurtType_IgnoreDef, # 无视防御 6
			HurtType_SuperHit, # 暴击 7
			HurtType_8,
			HurtType_Miss, # 闪避 9
			) = range(10)

			#伤害类型
			(
			@@ -969,7 +986,7 @@
			Def_HurtType_ThumpHit, # 重击 16
			Def_HurtType_Yinji, # 印记 17
			Def_HurtType_Burn, # 灼烧 18
			) = range(1, 19)
			) = range(1001, 1001 + 18)
			#Def_HurtType_SuckBlood, # 吸血

			(
			@@ -1290,15 +1307,24 @@
			CampType_Justice = ShareDefine.CampType_Justice # 正义
			CampType_Evil = ShareDefine.CampType_Evil # 邪恶

			#buff释放类型
			BuffAtkType_DamageShield = 1003 # 承伤盾

			#计算类型
			Def_CalcTypeList = (
			Def_Calc_Attack, # 攻击 0
			Def_Calc_MaxHP, # 最大生命值 1
			Def_Calc_HurtValue, # 伤害值 2
			Def_Calc_TagMaxHP, # 目标最大生命值 3
			) = range(4)

			#治疗类型（影响公式参数）
			Def_CureTypeList = (
			Def_Cure_Attack, # 攻击 0
			Def_Cure_MaxHP, # 最大生命值 1
			Def_Cure_PNE, # 智力 2
			Def_Cure_PHY, # 敏捷 3
			Def_Cure_HurtValue, # 伤害值 4
			Def_Cure_TagMaxHP, # 目标最大生命值 5
			) = range(6)
			Def_Cure_HurtValue, # 伤害值 2
			Def_Cure_TagMaxHP, # 目标最大生命值 3
			) = range(4)

			#回魔类型（影响公式参数）
			Def_RestoreTypeList = (
			@@ -1319,6 +1345,41 @@
			Def_Skill_HappenState_LuckyHit = 0x0004 # 必会心一击
			Def_Skill_HappenState_ThumpHit = 0x0008 # 必重击

			# 回合战斗行列数
			TurnFightRows = 2
			TurnFightCols = 3

			def GetInColNum(posNum):
			## 获取站位编号所在列编号
			# @param posNum: 在阵容中的站位 1 ~ n
			# @return: 1 ~ 总列数
			return (posNum - 1) % TurnFightCols + 1

			def GetInRowNum(posNum):
			## 获取站位编号所在行编号
			# @param posNum: 在阵容中的站位 1 ~ n
			# @return: 1 ~ 总行数
			return (posNum - 1) / TurnFightCols + 1

			# 技能目标 - 瞄准范围
			(
			SkillTagAim_All, # 全部 0
			SkillTagAim_Relative, # 对位位置 1
			SkillTagAim_FrontRow, # 前排 2
			SkillTagAim_BackRow, # 后排 3
			SkillTagAim_Vertical, # 竖排/纵排 4
			SkillTagAim_Self, # 自己 5
			SkillTagAim_MainSkill, # 继承主技能目标 6
			) = range(7)

			# 技能目标 - 细分
			(
			SkillTagAffect_None, # 无 0
			SkillTagAffect_HPLowest, # 血量最低 1
			SkillTagAffect_HPHighest, # 血量最高 2
			SkillTagAffect_Death, # 死亡单位 3
			SkillTagAffect_UncontrolledPriority, # 未被控制优先 4
			) = range(5)

			#技能施法目标
			Def_UseSkillAim_Type = 3
			@@ -1827,10 +1888,9 @@
			Def_NstNull, Def_NstMoving, Def_NstDead, Def_NstAttack = range(4)

			#-------------------------------#副本相关#------------------------
			# 主线小怪
			Def_FBMapID_Main = 1
			# 主线Boss
			Def_FBMapID_MainBoss = 2

			Def_FBMapID_Main = 1 # 主线小怪
			Def_FBMapID_MainBoss = 2 # 主线Boss

			#创角新手村地图ID列表
			Def_CreatRoleMapIDList = [10000]
			@@ -2049,43 +2109,8 @@
			#副本ID转换
			Def_FB_MapID = {
			'MainLevel':[Def_FBMapID_Main, Def_FBMapID_MainBoss], # 主线关卡
			'FamilyWar':[Def_FBMapID_FamilyWar], # 仙盟联赛
			'FamilyInvade':[Def_FBMapID_FamilyInvade], # 守卫人皇
			'FamilyBoss':[Def_FBMapID_FamilyBossMap], # 战盟boss
			'TrialTower':[Def_FBMapID_TrialTower], # 试炼之塔
			'ClearDevil':[Def_FBMapID_ClearDevil], # 除魔卫道
			'MagicWeapon':[Def_FBMapID_MagicWeapon], # 法宝副本
			'DuJie':[Def_FBMapID_DuJie], #渡劫
			'KirinHome':[Def_FBMapID_KirinHome], #麒麟之府
			'BZZD':[Def_FBMapID_BZZD], # 百战之地(仙界秘境)
			'GodArea':[Def_FBMapID_GodArea],#古神禁地
			'PersonalBoss':[Def_FBMapID_PersonalBoss],#个人BOSS
			'FamilyParty':[Def_FBMapID_FamilyParty],#仙盟宴会
			'MunekadoTrial':[Def_FBMapID_MunekadoTrial],#宗门试炼
			'ChaosDemon':[Def_FBMapID_ChaosDemon], #混乱妖域
			'KillDevil':[Def_FBMapID_KillDevil], #讨伐妖魔
			'QueenRelics':[Def_FBMapID_QueenRelics], #娲皇遗迹
			'ElderBattlefield':[Def_FBMapID_ElderBattlefield], #上古战场
			'Guard':[Def_FBMapID_Guard], #守护副本
			'SealDemon':[Def_FBMapID_SealDemon, Def_FBMapID_SealDemonEx], #封魔坛
			'XMZZ':[Def_FBMapID_XMZZ], #仙魔之争
			#'ArenaBattle':[Def_FBMapID_ArenaBattle],#竞技场战斗
			#'CrossRealmPK':[Def_FBMapID_CrossRealmPK], #跨服竞技场
			#'CrossChampionship':[Def_FBMapID_CrossChampionship], #跨服排位
			'CrossDemonKing':[Def_FBMapID_DemonKing, Def_FBMapID_CrossDemonKing], #妖王
			'CrossGrassland':[Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian], #草园
			'GatherSoul':[Def_FBMapID_GatherSoul],#聚魂副本
			'ZhuXianBoss':[Def_FBMapID_ZhuXianBoss],#诛仙BOSS
			'SkyTower':[Def_FBMapID_SkyTower],#天星塔
			'RealmTower':[Def_FBMapID_RealmTower],#境界塔
			'AllFamilyBoss':[Def_FBMapID_AllFamilyBoss],#多仙盟BOSS
			'HorsePetBoss':[Def_FBMapID_HorsePetBoss],#骑宠BOSS
			'FairyTreasure':[Def_FBMapID_FairyTreasure],#缥缈宝藏
			'Love':[Def_FBMapID_Love],#情缘副本
			'CrossBattlefield':[Def_FBMapID_CrossBattlefield], #跨服战场
			'CrossFamilyFlagwar':[Def_FBMapID_CrossFamilyFlagwar], #跨服仙盟夺旗战/逐鹿万界
			'MineArea':[Def_TFMapID_MineArea], #福地
			'MirrorBattle':MirrorBattleMapIDList, #镜像切磋
			}

			#特殊副本ID, 由系统分配, 进入时候不验证IsMapCopyFull
			@@ -2105,16 +2130,10 @@
			Def_FB_DropDoCountRate = 'DropDoCountRate' # 怪物掉落执行次数万分率
			Def_FB_DropDoCountAdd = 'DropDoCountAdd' # 怪物掉落执行次数加成固定值
			Def_FB_SingleFBPlayerID = 'SingleFBPlayerID' # 个人副本玩家ID
			Def_FB_HelpBattleFBObjID = 'HelpBattleFBObjID_%s' # 助战副本助战NPC机器人/玩家ID对应实例ID, 参数为玩家ID
			Def_FB_HelpBattleGoldCall = 'HelpBattleGoldCall_%s' # 助战机器人是否花费召唤, 参数为玩家ID

			FBPlayerDict_EncourageLV = 'FBPlayerDict_EncourageLV' # 鼓舞等级
			FBPlayerDict_IsDelTicket = 'FBPlayerDict_IsDelTicket' # 是否已扣除入场券/进入次数
			FBPlayerDict_IsHelpFight = 'FBPlayerDict_IsHelpFight' # 是否助战

			FBPD_HelpBattleRefreshCount = 'FBPD_HelpBattleRefreshCount' # 助战已刷新次数
			FBPD_HelpBattleFBFightPower = 'FBPD_HelpBattleFBFightPower' # 副本战力
			FBPD_HelpBattleFBBaseHurt = 'FBPD_HelpBattleFBBaseHurt' # 副本伤害

			#领取奖励标识
			(
			@@ -2278,6 +2297,10 @@
			DropOwnerType_Contend, # 争夺 8 第一个攻击的获得归属，击杀当前归属者的玩家成为新归属者
			DropOwnerType_RankHurtPlayer, # 个人伤血排行奖励归属 9 根据玩家个人伤血排行给奖励，伤血不重置
			) = range(10)

			#阵营
			Def_FactionA = 1
			Def_FactionB = 2

			#------------------------------------------------
			#技能类型
			@@ -3019,10 +3042,13 @@

			# 回合攻击战斗类型
			(
			TurnBattleType_Normal, # 常规攻击
			TurnBattleType_Combo, # 连击
			TurnBattleType_AtkBack, # 反击
			) = range(3)
			TurnBattleType_Normal, # 常规攻击 0
			TurnBattleType_Combo, # 连击 1
			TurnBattleType_AtkBack, # 反击 2
			TurnBattleType_Pursue, # 追击 3
			TurnBattleType_Enhance, # 额外技能 4
			TurnBattleType_Passive, # 被动技能 5
			) = range(6)

			Def_PerTurnTick = 1000 # 每回合等同于常规tick时长

			@@ -3101,6 +3127,26 @@
			Def_NPC_Dict_TimeLostHPPlayerCount = 'TimeLostHPPlayerCount' # 按时间掉血有效人数
			Def_NPC_Dict_TimeLostHPFightPower = 'TimeLostHPFightPower' # 按时间掉血战力
			Def_NPC_Dict_TimeLostHPFightPowerEx = 'TimeLostHPFightPowerEx' # 按时间掉血战力

			#玩家状态定义，不能超过31个，如超过，需扩展多个key支持
			BatObjStateList = (
			BatObjState_Normal, # 无 0
			BatObjState_Frozen, # 冰冻 1
			BatObjState_Cold, # 减速/寒冷 2
			BatObjState_Stun, # 眩晕 3
			BatObjState_Burn, # 灼烧 4
			BatObjState_Poison, # 中毒 5
			BatObjState_Bleeding, # 流血 6
			BatObjState_EasyHurt, # 易伤 7
			BatObjState_Wudi, # 无敌 8
			BatObjState_Sneer, # 嘲讽 9
			BatObjState_LimitSkill, # 沉默 10
			BatObjState_LimitAddHP, # 禁疗 11
			BatObjState_Stone, # 石化 12
			) = range(13)

			# 被控制的状态列表，无法行动，处于某些控制类buff影响状态下，如晕眩，冰冻，石化
			InControlledStateList = [BatObjState_Frozen, BatObjState_Stun, BatObjState_Stone]

			#玩家状态定义，不能超过31个，如超过，需扩展多个key支持
			Def_PlayerStateList = (
			@@ -3426,16 +3472,6 @@

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

			Def_Player_Dict_VipExperienceStartTime = "VipExperienceStartTime" #VIP体验生效开始时间
			Def_Player_Dict_VipExp = "VipExp" #VIP经验
			Def_Player_Dict_VipAwardRecord = "VipAwardRecord" #VIP礼包购买记录 2 进制纪录模式 0 表示未购买，1 表示已经购买
			Def_Player_Dict_VipBuyRecord = "VipBuyRecord" #首次VIP卡类型记录 2 进制纪录模式 0 表示未购买，1 表示已经购买过
			Def_Player_Dict_VIPLastTime = "VIPLastTime" #最后一次获得VIP经验的零点时间
			Def_Player_Dict_VipTimeOutRecord = "VipTimeOutRecord" #VIP过期提醒记录
			Def_Player_Dict_VIPKillLV = "VIPKillLV" #VIP杀怪等级
			Def_Player_Dict_VIPKillLVExp = "VIPKillLVExp" #VIP杀怪等级 - 经验
			Def_Player_Dict_VIPKillLVExpPoint = "VIPKillLVExpPoint" #VIP杀怪等级 - 经验点

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

			Def_PDict_OpenSererDailyAward = "OpenSererDailyAward" # 开服每日奖励记录
			@@ -3542,9 +3578,6 @@

			Def_PDict_IsAddReviveTired = "IsAddReviveTired" # 死亡是否增加复活疲劳

			Def_PDict_ComposeMustSuccess = "ComposeMustSuccess_%s" # 前X次合成必定成功,参数(合成归组)
			Def_PDict_FirstSuccMakeJobItem = "FirstSuccMakeJobItem_%s" # 首次合成成功给本职业物品记录，参数为（合成ID）

			Def_PDict_DownloadAwardState = "DownloadAwardState" # 分包包下载奖励状态 0-未领 >0-已领奖励编号
			Def_PDict_DownloadPatchAward = "DownloadPatchAward" # 更新包下载奖励状态 0-未领 >0-已领奖励编号

			@@ -3580,12 +3613,6 @@
			Def_PDict_LingQiTrainLV = "LingQiTrainLV_%s_%s" # 培养等阶，参数为(place, 培养类型)
			Def_PDict_LingQiTrainItemCount = "LingQiTrainItemCount_%s_%s" # 培养当前阶已吃培养丹个数，参数为(place, 培养类型)

			# 百战之地
			Def_PDict_BZZD_TotalFightExp = "BZZD_TExp" # 最后一次进入副本挑战获得总经验, 领取多倍奖励时用
			Def_PDict_BZZD_TotalFightExpPoint = "BZZD_TExpPoint" # 最后一次进入副本挑战获得总经验点, 领取多倍奖励时用
			Def_PDict_BZZD_HistoryEnterCnt = "BZZD_HistoryEnterCnt" # 历史进入总次数
			Def_PDict_BZZD_NeedReduceExpBuff = "BZZD_NeedReduceExpBuff" # 是否需要扣除层级经验加成buff

			# 公共CD副本扫荡
			Def_PDict_PubCDFBS_Time = "PCDFBS_%s_Time" # 开始扫荡时间, 参数(公共组编号)
			Def_PDict_PubCDFBS_MapID = "PCDFBS_%s_MID" # 扫荡的地图, 参数(公共组编号)
			@@ -3607,27 +3634,6 @@
			#试炼之塔
			Def_Player_Dict_TrialTower_PassLV = "TrialTower_PassLV" # 试炼之塔通关层数
			Def_Player_Dict_TrialTower_LastDayPassLV = "Tower_LastDayPassLV" # 试炼之塔昨日通关层数
			#天星塔
			Def_Player_Dict_SkyTowerFloor = "SkyTowerFloor" # 天星塔已通关层数
			Def_Player_Dict_SkyTowerServerRecord = "SkyTowerServerRecord_%s" # 天星塔全服挑战层领奖记录，参数(层)

			#境界塔
			Def_Player_Dict_RealmTowerFloor = "RealmTowerFloor" # 已通关层数

			#古神禁地
			Def_Player_Dict_GodArea_Anger = "GodArea_Anger" # 古神禁地怒气值
			Def_Player_Dict_GodArea_LastAddAngerTime = "GodArea_LastAddAngerTime" # 古神禁地上一次增加怒气值的时间

			#上古战场
			Def_Player_Dict_ElderBattlefieldStage = "ElderBattlefieldStage" # 本次达到阶段

			#仙盟宴会
			Def_Player_Dict_FamilyPartyJoinSign = "FamilyPartyJoinSign" # 今日参与宴会标记
			Def_Player_Dict_FamilyPartyAnswerCnt = "FamilyPartyAnswerCnt" # 答题数量
			Def_Player_Dict_FamilyPartyCollectState = "FamilyPartyCollectState" # 是否已采集
			Def_Player_Dict_FamilyPartyTotalExp = "FamilyPartyTotalExp" # 获得的总经验
			Def_Player_Dict_FamilyPartyTotalExpPoint = "FamilyPartyTotalExpPoint" # 获得的总经验点
			Def_Player_Dict_FamilyPartyTotalPoint = "FamilyPartyTotalPoint" # 获得的总仙盟贡献值

			#仙盟打坐
			Def_Player_Dict_FamilySitExpRound = "FamilySitExpRound" # 已给经验轮次
			@@ -3731,26 +3737,6 @@
			#Boss首杀
			Def_PDict_BossFirstKillState = "BossFirstKillState_%s" # boss首杀相关状态记录

			#仙界盛典
			Def_PDict_FairyCeremonyID = "FairyCeremonyID" # 玩家身上的仙界盛典活动ID，唯一标识，取活动开始日期time值
			Def_PDict_FCActionWorldLV = "FCActionWorldLV" #玩家身上的仙界盛典时的世界等级
			Def_PDict_FCRechargeState = "FCRechargeState" # 充值大礼状态 0-不可领 1-可领 2-已领取
			Def_PDict_FCPartyCurCnt = "FCPartyCurCnt_%s" #全民来嗨活动当前完成次数参数活动ID
			Def_PDict_FCPartyCurPoint = "FCPartyCurPoint" #全民来嗨活动当前总点数
			Def_PDict_FCPartyAwardRecord = "FCPartyAwardRecord" #全民来嗨活动领奖记录
			Def_PDict_FCCTGRMBTotal = "FCCTGRMBTotal" # 绝版降临总累计充值元
			Def_PDict_FCFireworksBuyCount = "FCFireworksBuyCount" # 高级烟花已购买次数
			Def_PDict_FCFireworksScore = "FCFireworksScore" # 总烟花积分，含普通烟花

			#新仙界盛典
			Def_PDict_NewFairyCeremonyID = "NewFairyCeremonyID" # 玩家身上的仙界盛典活动ID，唯一标识，取活动开始日期time值
			Def_PDict_NewFCActionWorldLV = "NewFCActionWorldLV" #玩家身上的仙界盛典时的世界等级
			Def_PDict_NewFCRechargeState = "NewFCRechargeState" # 充值大礼状态 0-不可领 1-可领 2-已领取
			Def_PDict_NewFCPartyCurCnt = "NewFCPartyCurCnt_%s" #全民来嗨活动当前完成次数参数活动ID
			Def_PDict_NewFCPartyCurPoint = "NewFCPartyCurPoint" #全民来嗨活动当前总点数
			Def_PDict_NewFCPartyAwardRecord = "NewFCPartyAwardRecord" #全民来嗨活动领奖记录
			Def_PDict_NewFCCostGold = "NewFCCostGold" # 绝版降临总累计消费仙玉

			#限时抢购活动
			Def_PDict_FlashSaleID = "FlashSaleID_%s" # 玩家身上的限时抢购活动ID，唯一标识，取活动开始日期time，参数（活动编号）
			Def_PDict_FlashSaleState = "FlashSaleState_%s" # 玩家身上的限时抢购活动state，参数（活动编号）
			@@ -3780,10 +3766,6 @@
			Def_PDict_EmojiPackState = "EmojiPackState_%s" # 表情包状态，参数(key编号)
			Def_PDict_EmojiPackEndTime = "EmojiPackEndTime_%s" # 到期时间戳，0为永久，参数(表情包ID)

			#助战
			Def_PDict_HelpBattleCheckInCount = "HelpBattleCheckInCount" #助战登记次数, 登记次数*10+今日是否登记过
			Def_PDict_FBRealHelpCount = "FBRealHelpCount_%s" #副本真实助战次数，仅针对真实进去打的副本，参数mapID

			#周狂欢
			Def_PDict_WeekPartyActID = "WeekPartyActID" # 玩家身上的活动ID，唯一标识，取活动开始日期time值
			Def_PDict_WeekPartyID = "WeekPartyID" # 玩家身上的活动ID，配置ID，用于补发上次活动用
			@@ -3805,9 +3787,6 @@
			Def_PDict_LoginAwardCurTimes = "LoginAwardCurTimes_%s_%s" #当前完成次数参数(第X天,模板ID)
			Def_PDict_LoginAwardGotTimes = "LoginAwardGotTimes_%s_%s" #当前已领次数参数(第X天,模板ID)
			Def_PDict_LoginAwardWorldLV = "LoginAwardWorldLV%s" #活动开启时世界等级参数(第X天)

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

			#boss历练
			Def_PDict_BossTrialRecycleState = "BossTrialRecycleState" # 活动物品回收状态，该活动所有的本服、跨服活动结束才回收 1-标记等待回收；2-已回收过
			@@ -4003,23 +3982,9 @@
			Def_PDict_Rune_HoleOpenState = "Rune_HoleOpenState" # 符印解锁状态
			Def_PDict_Rune_Data = "Rune_Data_%s" # 符印镶嵌数据, 参数(第几孔)

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

			# 新聚魂
			Def_PDict_GatherTheSoulHoleID = "GatherTheSoulHoleID_%s" # 聚魂镶嵌ID, 参数(孔编号)
			Def_PDict_GatherTheSoulLV = "GatherTheSoulLV_%s" # 聚魂等级, 参数(聚魂ID)

			# 副本 Def_PDictType_FB
			Def_PDict_LastEnterFBPropertyID = "LastEnterFBPropertyID_%s" # 上次进入副本的propertyID%s副本id
			Def_PDict_LastEnterFBTick = "LastEnterFBTick_%s" # 上次进入副本的时间%s副本id

			# 仙盟boss
			Def_PDict_FamilyBossHurtValue = "FamilyBossHurtValue" # 仙盟boss个人总伤血，求余亿部分
			Def_PDict_FamilyBossHurtValuePoint = "FamilyBossHurtValuePoint" # 仙盟boss个人总伤血，整除亿部分
			Def_PDict_FamilyBossFightSeconds = "FamilyBossFightSeconds" # 仙盟boss个人已战斗时长，秒
			Def_PDict_FamilyBossHurtAward = "FamilyBossHurtAward" # 仙盟boss个人总伤血领奖记录
			Def_PDict_FamilyBossHurtAwardFamily = "FamilyBossHurtAwardFamily" # 仙盟boss仙盟总伤血领奖记录

			# 战斗力 Def_PDictType_FightPower
			Def_PDict_FightPower_Highest = "FightPower_Highest" # 历史最高总战斗力
			@@ -4088,11 +4053,6 @@
			Def_PDict_TTL_TaskAwardRecord = "TTL_TaskAwardRecord_%s" # 通天任务领奖记录,参数(key编号),按索引位存储0-未领,1-已领
			Def_PDict_TTL_DailyTaskPointToday = "TTL_DailyTaskPointToday" # 每日通天任务每日可获得积分点上限

			# 大师 Def_PDictType_GreatMaster
			Def_PDict_Master_Exp = "Master_Exp" # 当前大师经验
			Def_PDict_Master_ExpPoint = "Master_ExpPoint" # 当前大师经验点
			Def_PDict_Master_FreeSkillPoint = "Master_FreeSkillPoint" # 当前剩余大师技能点

			# 跨服竞技场
			Def_PDict_CrossPK_TotalScore = "CrossPK_TotalScore" # 当前总积分
			Def_PDict_CrossPK_DanLV = "CrossPK_DanLV" # 当前段位
			@@ -4123,13 +4083,6 @@
			Def_PDict_LuckyCloudBuy_RoundID = "LuckyCloudBuy_RoundID" # 本轮标识ID
			Def_PDict_LuckyCloudBuy_BuyCount = "LuckyCloudBuy_BuyCount" # 本轮已购买份数

			# 跨服战场
			Def_PDict_Battlefield_EnterCountWeek = "CBF_EnterCountWeek" # 进入总次数 - 周
			Def_PDict_Battlefield_BuyOpenCountToday = "CBF_BuyOpenCountToday" # 已购买召集总次数 - 日
			Def_PDict_Battlefield_BuyOpenCountWeek = "CBF_BuyOpenCountWeek" # 已购买召集总次数 - 周
			Def_PDict_Battlefield_HighScoreToday = "CBF_HighScoreToday" # 今日最高积分
			Def_PDict_Battlefield_HighScoreTotalWeek = "CBF_HighScoreTotalWeek" # 每日最高分累加总分 - 周

			#自动战斗设置记录
			Def_PDict_AutoFightSetting = "AFSetting_%s_%s"

			@@ -4157,24 +4110,6 @@
			Def_PDict_RealmTaskAwardState = "RealmTaskAwardState" #境界渡劫条件领奖状态，按二进制位存储是否已领取
			Def_PDict_RealmTaskValue = "RealmTaskValue_%s" #境界渡劫任务需要记录值，参数（任务ID）

			#法宝
			Def_PDict_MagicWeaponIsWear = "MagicWeaponIsWear_%s" #法宝佩戴状态参数法宝ID
			Def_PDict_XBXZAwardRecord = "XBXZAwardRecord_%s" #仙宝寻主领奖记录参数ID
			Def_PDict_MagicWeaponLV = "MagicWeaponLV_%s" #法宝等级参数法宝ID
			Def_PDict_MagicWeaponUpExp = "MagicWeaponUpExp_%s" #法宝升级经验参数法宝ID
			Def_PDict_MWFBPassLevel = "MWFBPassLevel_%s" #法宝副本通关关卡参数(法宝ID)

			#炼丹炉
			Def_PDict_AlchemyLV = "AlchemyLV" #炼丹等级
			Def_PDict_AlchemyExp = "AlchemyExp" #炼丹经验
			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" #炼丹祈福次数

			Def_PDict_GFPassiveIndex = "GFP_%s_%s" # 被动功法页数-索引
			Def_PDict_GFPassivePage = "GFPPage" # 被动功法选中页数

			@@ -4191,9 +4126,6 @@
			Def_PDict_GuajiItemID = "GuajiItemID_%s" # 获得物品ID，参数(索引)
			Def_PDict_GuajiItemCount = "GuajiItemCount_%s" # 获得物品个数，参数(索引)

			#仙魔之争
			Def_PDict_XMZZLastStartTime = "XMZZLastStartTime" #上次开始战斗时间

			#套装
			Def_PDict_EquipPartSuiteLV = "EQPartSuiteLV_%s_%s" #部位套装等级参数部位、套装类型
			Def_PDict_EquipPartSuiteActivate = "EQPartSuiteActivate_%s" #套装激活记录参数 key编号
			@@ -4206,27 +4138,9 @@
			Def_PDict_TotalEquipStar = "TotalEquipStar" #装备部位星数总数
			Def_PDict_EquipPartStar = "EQPartStar_%s" #装备部位星数参数装备背包格子索引

			#缥缈仙域
			Def_PDict_FairyDomainState = "FairyDomainState" #是否寻访中 0未寻访 1寻访中 2任务标记可寻访
			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
			Def_PDict_FairyDomainEventAppearCnt = "FDEventAppearCnt%s" #事件出现次数参数事件ID AAABBB BBB:小时段出现次数 AAA:今日出现次数

			#草园
			Def_PDict_GrasslandNPCCount = "GrasslandNPCCount_%s" #草园NPCID个数，参数NPCID
			Def_PDict_GrasslandDropCount = "GrasslandDropCount_%s" #草园掉落统计，参数编号，记录格式 itemID*100+dropCount

			#五行专精
			Def_PDict_SkillElementID = "SkillElementID%s" #主技能选择的专精技能参数主技能ID
			Def_PDict_SkillElementLV = "SkillElementLV%s" #专精技能技能等级参数技能ID

			#协助
			Def_PDict_GetThanksGiftCount = "GetThanksGiftCount_%s" # 协助方今日接收该感谢礼盒次数，参数(礼盒物品ID)
			Def_PDict_TodayAssistMoney = "TodayAssistMoney" # 今日已获得协助货币奖励
			Def_PDict_TodayAssistMoneySocial = "TodayAssistMoneySocial" # 今日已获得协助货币社交关系额外加成

			#竞技场
			Def_PDict_ArenaOSSeasonState = "ArenaOSSeasonState" # 开服前定制X天赛季状态 0-未比赛过，1-进行中，>1结算时的开服天
			@@ -4292,10 +4206,12 @@
			#武将
			Def_PDict_HeroSkin = "HeroSkin_%s" # 武将皮肤解锁状态，按皮肤索引二进制存储，参数(武将ID)
			Def_PDict_HeroBook = "HeroBook_%s" # 武将图鉴激活等级，参数(武将ID) cccbbba a-初始激活状态1-英雄激活，2-初始图鉴激活； bbb-存星级图鉴激活等级；ccc-存突破图鉴激活等级
			Def_PDict_HeroAwakeRebirthCnt = "HeroAwakeRebirthCnt" # 已觉醒过的武将今日已重生次数，共享次数

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

			#-------------------------------------------------------------------------------
			@@ -4403,6 +4319,26 @@
			) = range(66)

			#-------------------------------------------------------------------------------

			# 被动触发方式
			(
			TriggerWay_FightStart, # 战斗开始时 1
			TriggerWay_BigTurnStart, # 大回合开始时 2
			TriggerWay_BigTurnEnd, # 大回合结束时 3
			TriggerWay_HeroTurnStart, # 武将回合开始时 4
			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_BeAttackedDirect, # 受到直接攻击时（非buff攻击）11
			TriggerWay_ShieldBroken, # 承伤盾被击破时 12
			) = range(1, 1 + 12)

			# 被动触发有效来源
			TriggerSrc_Skill = 1
			TriggerSrc_Buff = 2

			(
			TriggerType_BeSuperHit, # 被暴击触发技能 1
			@@ -5103,6 +5039,16 @@
			) = range(27)


			# 回合卡牌
			(
			Def_SkillFuncType_Common, #0为通用技能
			Def_SkillFuncType_TurnNormaSkill, #1 普攻技能
			Def_SkillFuncType_AngerSkill, #2 怒气技能
			Def_SkillFuncType_PotentialSkill, #3 潜能技能
			Def_SkillFuncType_AtkbackSkill, #4 反击技能
			) = range(5)

			# MMO项目 - 先保留，重新定义从1000开始，后续可陆续删除
			(Def_SkillFuncType_Common, #0为通用技能
			Def_SkillFuncType_FbSkill, #1为法宝功能获得的主动技能
			Def_SkillFuncType_FbPassiveSkill, #2为法宝功能获得的被动技能
			@@ -5126,8 +5072,7 @@
			Def_SkillFuncType_ShentongSkill, #20 神通技能
			Def_SkillFuncType_ElfSkill, #21 精怪技能
			Def_SkillFuncType_GatherTheSoul, #22 聚魂技能
			Def_SkillFuncType_TurnNormaSkill, #23 回合普攻技能
			) = range(24)
			) = range(1000, 1000 + 23)

			# 受技能效果完全影响的怪，对应 Def_BattleRelationType_CommNoBoss
			Def_SkillAttack_NPCIsBoss = [ Def_NPCType_Ogre_Normal , #平凡小怪 0 # c++ 定义为普通NPC视野刷新
			@@ -5155,24 +5100,6 @@
			ExpRateLimitType_Sweep, # 扫荡
			) = range(2)

			# 技能功能类对应战斗力模块
			Def_SkillFuncType_MFPType={
			Def_SkillFuncType_FbSkill:ShareDefine.Def_MFPType_MagicWeapon1,
			Def_SkillFuncType_FbPassiveSkill:ShareDefine.Def_MFPType_MagicWeapon2,
			Def_SkillFuncType_FbSPSkill:ShareDefine.Def_MFPType_MagicWeapon1,
			Def_SkillFuncType_GiftSkill:ShareDefine.Def_MFPType_Role,

			Def_SkillFuncType_HorseSkill:ShareDefine.Def_MFPType_Horse,
			Def_SkillFuncType_PetSkill:ShareDefine.Def_MFPType_Pet,
			Def_SkillFuncType_PetOwnerSkill:ShareDefine.Def_MFPType_Pet,
			Def_SkillFuncType_GWSkill:ShareDefine.Def_MFPType_Prestige,
			Def_SkillFuncType_SuiteSkill:ShareDefine.Def_MFPType_Equip,
			Def_SkillFuncType_TitleSkill:ShareDefine.Def_MFPType_Dienstgrad,
			Def_SkillFuncType_LianTiSkill:ShareDefine.Def_MFPType_LianTi,
			Def_SkillFuncType_ShentongSkill:ShareDefine.Def_MFPType_Shentong,
			}


			# 投资理财类型，和前端对应，从7开始
			InvestTypeList = (
			InvestType_NewMonth, # 至尊月卡投资7
			@@ -5182,11 +5109,6 @@
			InvestType_Boss, # Boss 11
			InvestType_Life, # 终身卡 12
			) = range(7, 7 + 6)


			#前端特殊新手引导存储标记
			GuideState_BZZDShow = 202


			# 法宝特权
			MWPrivilegeList = (