SnxxServerCode.git

			@@ -177,10 +177,55 @@
			Def_Notify_WorldKey_CrossServerConnState = "CrossServerConnState" # 跨服服务器链接状态
			Def_Notify_WorldKey_CrossServerOpen = "CrossServerOpen" # 跨服服务器是否开启中
			Def_Notify_WorldKey_CrossZoneName = "CrossZoneName" # 跨服分区名
			Def_Notify_WorldKey_CrossServerTime = "CrossServerTime" # 跨服时间

			Def_Notify_WorldKey_CrossPKZoneID = "CrossPKZoneID" # 本服跨服PK所属赛区
			Def_Notify_WorldKey_CrossPKSeasonID = "CrossPKSeasonID" # 本服跨服PK当前赛季
			Def_Notify_WorldKey_CrossPKSeasonState = "CrossPKSeasonState" # 本服跨服PK赛季状态 0-关闭，1-开启中

			Def_Notify_WorldKey_LuckyCloudBuyInfo = "LuckyCloudBuyInfo" # 本服幸运云购最新一期信息

			Def_Notify_WorldKey_CrossBattlefieldCallTeamInfo = "CrossBattlefieldCallTeamInfo" # 跨服战场召集队伍信息

			CrossChampionshipState_Guess8 = 80 #8强竞猜
			CrossChampionshipState_Group64 = 641 #64强分组
			CrossChampionshipState_Enter64 = 642 #64强进场
			CrossChampionshipState_Fight64 = 643 #64强战斗
			CrossChampionshipState_Group32 = 321 #32强分组
			CrossChampionshipState_Enter32 = 322 #32强进场
			CrossChampionshipState_Fight32 = 323 #32强战斗
			CrossChampionshipState_Group16 = 161 #16强分组
			CrossChampionshipState_Enter16 = 162 #16强进场
			CrossChampionshipState_Fight16 = 163 #16强战斗
			CrossChampionshipState_Guess4 = 40 #4强竞猜
			CrossChampionshipState_Group8 = 81 #8强分组
			CrossChampionshipState_Enter8 = 82 #8强进场
			CrossChampionshipState_Fight8 = 83 #8强战斗
			CrossChampionshipState_GroupSemi = 41 #半决赛分组
			CrossChampionshipState_EnterSemi = 42 #半决赛进场
			CrossChampionshipState_FightSemi = 43 #半决赛战斗
			CrossChampionshipState_GroupFinal = 21 #决赛分组
			CrossChampionshipState_EnterFinal = 22 #决赛进场
			CrossChampionshipState_FightFinal = 23 #决赛战斗
			#跨服排位争霸赛状态流程列表，必须按顺序，中间不可跳过步骤
			CrossChampionshipStateList = [CrossChampionshipState_Guess8,
			CrossChampionshipState_Group64, CrossChampionshipState_Enter64, CrossChampionshipState_Fight64,
			CrossChampionshipState_Group32, CrossChampionshipState_Enter32, CrossChampionshipState_Fight32,
			CrossChampionshipState_Group16, CrossChampionshipState_Enter16, CrossChampionshipState_Fight16,
			CrossChampionshipState_Guess4,
			CrossChampionshipState_Group8, CrossChampionshipState_Enter8, CrossChampionshipState_Fight8,
			CrossChampionshipState_GroupSemi, CrossChampionshipState_EnterSemi, CrossChampionshipState_FightSemi,
			CrossChampionshipState_GroupFinal, CrossChampionshipState_EnterFinal, CrossChampionshipState_FightFinal
			]

			#跨服排位可进入战斗的状态信息 {状态:对应分组标识, ...}
			CrossChampionshipEnterStateInfo = {CrossChampionshipState_Enter64:64,
			CrossChampionshipState_Enter32:32,
			CrossChampionshipState_Enter16:16,
			CrossChampionshipState_Enter8:8,
			CrossChampionshipState_EnterSemi:4,
			CrossChampionshipState_EnterFinal:2,
			}

			Def_Notify_WorldKey_GameWorldBossRebornCross = 'BossRebornCross_%s_%s' # 跨服世界boss重生, 参数为（zoneID, bossID）
			Def_Notify_WorldKey_GameWorldBossReborn = 'BossReborn_%s' # 世界boss重生, 参数为（bossID）
			@@ -199,6 +244,8 @@
			Def_Notify_WorldKey_FairyDomainLimit = "FairyDomainLimit" # 缥缈仙域限制事件

			Def_Notify_WorldKey_AssistBoss = "AssistBoss" # 协助boss

			Def_Notify_WorldKey_CoupleInfo = "CoupleInfo" # 伴侣信息

			#活动类型定义
			ActTypeList = (
			@@ -238,6 +285,8 @@
			OperationActionName_HorsePetFeast = "ActHorsePetFeast" # 骑宠盛宴活动
			OperationActionName_GarbageSorting = "ActGarbageSorting" # 垃圾分类活动
			OperationActionName_XianXiaMJ = "ActXianXiaMJ" # 仙匣秘境活动
			OperationActionName_GodGift = "ActGodGift" # 天帝礼包活动
			OperationActionName_BuyOne = "ActBuyOne" # 买一送多活动
			#节日活动类型列表 - 该类型无视开服天，日期到了就开启
			FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket,
			OperationActionName_RechargeRebateGold, OperationActionName_GrowupBuy,
			@@ -256,7 +305,8 @@
			OperationActionName_DailyGiftbag, OperationActionName_SingleRecharge,
			OperationActionName_CollectWords, OperationActionName_ManyDayRecharge,
			OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,
			OperationActionName_XianXiaMJ,
			OperationActionName_XianXiaMJ, OperationActionName_GodGift,
			OperationActionName_BuyOne,
			] + FeastOperationActionNameList
			#需要记录开启活动时的世界等级的运营活动
			NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell,
			@@ -270,6 +320,7 @@
			OperationActionName_FeastLogin, OperationActionName_XianXiaMJ,
			OperationActionName_FeastWish, OperationActionName_FeastTravel,
			OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
			OperationActionName_GodGift,
			]

			#支持多活动分组编号的活动名
			@@ -278,14 +329,19 @@
			OperationActionName_SpringSale, OperationActionName_FlashSale,
			OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
			OperationActionName_Turntable, OperationActionName_HorsePetFeast, OperationActionName_GarbageSorting,
			OperationActionName_XianXiaMJ,
			OperationActionName_XianXiaMJ, OperationActionName_GodGift,
			OperationActionName_BuyOne,
			]

			#跨服运营活动表名定义
			CrossActName_CTGBillboard = "CrossActCTGBillboard" # 充值排行榜
			CrossActName_AllRecharge = "CrossActAllRecharge" # 全民充值
			CrossActName_LuckyCloudBuy = "CrossActLuckyCloudBuy" # 幸运云购

			#跨服运营活动列表
			CrossActNameList = [CrossActName_CTGBillboard]
			CrossActNameList = [CrossActName_CTGBillboard, CrossActName_AllRecharge, CrossActName_LuckyCloudBuy]
			#需要锁定活动分区分配直到活动结束的跨服运营活动，即使热更分区配置，也不会改变正在活动中的分区设定，直到活动结束
			CrossActLockServerGroupIDList = [CrossActName_CTGBillboard, CrossActName_AllRecharge]

			#活动信息字典key定义
			ActKey_ID = "ID" # 活动ID，唯一标识的ID，一般是活动开启的time值
			@@ -296,6 +352,7 @@
			ActKey_TemplateID = "TemplateID" # 当前活动模板ID
			ActKey_WorldLV = "WorldLV" # 活动开启时世界等级
			ActKey_WorldLVList = "WorldLVList" # 活动每天的世界等级列表
			ActKey_StartDateSync = "StartDateSync" # 特殊指定同步前端的开始日期

			ActKey_ServerIDRangeList = "ServerIDRangeList" # 活动服务器ID范围信息
			ActKey_IpyDataInfo = "IpyDataInfo" # 活动对应 IpyData 信息
			@@ -617,6 +674,19 @@

			Def_Effect_ReduceSkillCDPer = 149 # 减少技能CD, a值为万分率

			Def_Effect_ZhuXianRate = 150 # 诛仙一击：概率直接减少BOSS当前10%血量
			Def_Effect_ZhuXianReducePer = 151 # 诛仙护体：受到BOSS伤害减免万分率

			Def_Effect_HorseMaxHPPer = 152 # 坐骑生命加成
			Def_Effect_PetAtkPer = 153 # 灵宠攻击加成
			Def_Effect_HorseTrainAttrPer = 154 # 坐骑培养属性加成（攻防血）
			Def_Effect_PetTrainAttrPer = 155 # 灵宠培养属性加成（攻防血）
			Def_Effect_GuardTrainAttrPer = 156 # 守护培养属性加成（攻防血）
			Def_Effect_WingTrainAttrPer = 157 # 翅膀培养属性加成（攻防血）
			Def_Effect_PeerlessWeaponTrainAttrPer = 158 # 灭世培养属性加成（攻防血）
			Def_Effect_PeerlessWeapon2TrainAttrPer = 159 # 弑神培养属性加成（攻防血）
			Def_Effect_LianTiAttrPer = 160 # 炼体属性百分比（攻防血）

			#增加%d物理伤害值,其中a值为伤害值
			Def_Effect_AddAtk = 1005
			#增加%d魔法伤害值,其中a值为伤害值
			@@ -715,9 +785,12 @@
			Def_BT_SkyTower, #天星塔榜
			Def_BT_Arena, #竞技场榜
			Def_BT_Environment, #环保榜 (垃圾分类活动)
			Def_BT_CharmTotal, #魅力总榜 30
			Def_BT_CharmWeek, #魅力周榜
			Def_BT_CharmDay, #魅力日榜

			Def_BT_Max, #排行榜最大类型
			) = range(0, 29 + 2)
			) = range(0, 32 + 2)

			''' 跨服排行榜类型, 从 150 开始
			与本服榜单存储的是不一样的数据库表格，理论上类型可以和本服榜单类型重复，为了做下区分防误导，跨服榜单从 150 开始
			@@ -726,7 +799,12 @@
			'''
			CrossBillboardTypeList = (
			Def_CBT_ActCTG, # 跨服运营活动 - 充值榜 150
			) = range(150, 150 + 1)
			Def_CBT_BattlefieldWJoin, # 跨服战场每周参与榜 151
			Def_CBT_BattlefieldWCall, # 跨服战场每周召集榜 152
			Def_CBT_BattlefieldWScore, # 跨服战场每周积分榜 153
			Def_CBT_BattlefieldWScoreLastWeek, # 跨服战场上周积分榜 154
			Def_CBT_YaomoBossHurt, # 跨服妖魔boss最新一次伤血排名 155
			) = range(150, 155 + 1)

			#职业对应战力排行榜类型
			JobFightPowerBillboardDict = {
			@@ -738,7 +816,7 @@
			#排行榜Value1存储境界信息的榜单列表
			BTValue1_OfficialRankList = [Def_BT_FightPower, Def_BT_FightPower_Warrior, Def_BT_FightPower_Wizard, Def_BT_FightPower_Assassin,
			Def_BT_LV, Def_BT_FightPower_Horse, Def_BT_FightPower_Pet, Def_BT_TrialTower, Def_BT_OffLineEfficient,
			Def_BT_SkyTower,
			Def_BT_SkyTower, Def_BT_CharmTotal, Def_BT_CharmWeek, Def_BT_CharmDay
			]

			##---比率---
			@@ -961,7 +1039,20 @@
			CDBPlayerRefresh_Environment, # 环保值 232
			CDBPlayerRefresh_MoneyMinusGold, # 仙玉 - 负值 233
			CDBPlayerRefresh_MoneyMinusGoldPaper, # 绑玉 - 负值 234
			) = range(146, 235)
			CDBPlayerRefresh_MoneyMinusSilverPaper, # 神玉 - 负值 235
			CDBPlayerRefresh_AllCoinTotal, # 真实充值coin值 236
			CDBPlayerRefresh_ExAttr18, # ExAttr18
			CDBPlayerRefresh_ExAttr19, # ExAttr19
			CDBPlayerRefresh_CharmLV, # 魅力等级 239
			CDBPlayerRefresh_BTGMPoint, # BT版GM令 240
			CDBPlayerRefresh_GuShenMoney, # 古神币 241
			CDBPlayerRefresh_GongdePoint, # 功德点 242
			CDBPlayerRefresh_CashPoint, # 现金点 243
			CDBPlayerRefresh_ExAttr20, # ExAttr20 244
			CDBPlayerRefresh_JiYuan, # 机缘币 245
			CDBPlayerRefresh_BTGMYuE, # BTGM余额 246
			CDBPlayerRefresh_SuccessScore, # 成就积分 247
			) = range(146, 248)

			TYPE_Price_Gold_Paper_Money = 5 # 金钱类型，（先用礼券，再用金子）
			TYPE_Price_Family_Contribution = 6 # 战盟贡献度（活跃度转换得来）
			@@ -982,6 +1073,21 @@
			TYPE_Price_SoulCore = 30 # 核心环
			TYPE_Price_FuncSysPrivilege = 31 # 功能系统特权令
			TYPE_Price_Environment = 32 # 环保值
			TYPE_Price_BTGMPoint = 33 # BT版GM令
			TYPE_Price_GuShenMoney = 34 # 古神币
			TYPE_Price_GongdePoint = 35 # 功德点
			TYPE_Price_CashPoint = 36 # 现金点
			TYPE_Price_JiYuan = 37 # 机缘币
			TYPE_Price_BTGMYuE = 38 # GM余额
			TYPE_Price_SuccessSocre = 39 # 成就积分

			#key可用于遍历所有货币，value仅GM相关会用到
			MoneyNameDict = {
			1:"仙玉", 2:"绑玉", 3:"铜钱", 6:"战盟贡献度", 10:"战盟仓库积分", 13:"境界修行点", 14:"符印融合石", 15:"仙盟活跃令",
			16:"助战积分", 18:"荣誉", 19:"Boss积分", 23:"符印精华", 24:"符印碎片", 25:"寻宝积分", 26:"集市额度", 27:"丹精", 28:"魂尘",
			29:"聚魂碎片", 30:"核心环", 31:"功能特权令", 32:"环保值", 33:"GM令", 34:"古神币", 35:"功德点",
			39:"成就积分"
			}

			#以下是旧的金钱类型
			TYPE_Price_Magic_Integral = 101 # 魔方寻宝积分
			@@ -1007,6 +1113,10 @@
			TYPE_Price_BossActScore:CDBPlayerRefresh_BossActScore,
			TYPE_Price_FuncSysPrivilege:CDBPlayerRefresh_FuncSysPrivilege,
			TYPE_Price_Environment:CDBPlayerRefresh_Environment,
			TYPE_Price_BTGMPoint:CDBPlayerRefresh_BTGMPoint,
			TYPE_Price_GuShenMoney:CDBPlayerRefresh_GuShenMoney,
			TYPE_Price_GongdePoint:CDBPlayerRefresh_GongdePoint,
			TYPE_Price_SuccessSocre:CDBPlayerRefresh_SuccessScore,
			}

			# 支持负值的货币及对应0418刷新类型
			@@ -1050,8 +1160,12 @@
			GameFuncID_LittleHelper = 146 # 小助手
			GameFuncID_TJG = 147 # 脱机挂
			GameFuncID_SuperGift = 150 # 超值礼包
			GameFuncID_PenglaiBoss = 162 # 蓬莱仙境
			GameFuncID_ZhuXianBoss = 163 # 诛仙BOSS
			GameFuncID_Arena = 195 # 竞技场
			GameFuncID_FaQi = 199 # 法器
			GameFuncID_LianTi = 207 # 炼体
			GameFuncID_Championship = 210 # 排位
			# 以下为暂时无用的
			GameFuncID_Truck = 33 # 运镖
			GameFuncID_RunDaily = 34 # 日常跑环
			@@ -1147,9 +1261,9 @@
			Def_UniversalGameRecType_ActWorldLVLimitInfo, # 运营活动世界等级限制开启信息 18
			Def_UniversalGameRecType_19,
			Def_UniversalGameRecType_20,
			Def_UniversalGameRecType_21,
			Def_UniversalGameRecType_22,
			Def_UniversalGameRecType_23,
			Def_UniversalGameRecType_LuckyCloudBuyNum, # 幸运云购购买号码记录 21
			Def_UniversalGameRecType_LuckyCloudBuyLottery, # 幸运云购开奖记录 22
			Def_UniversalGameRecType_CrossBattlefieldBuy, # 玩家购买的跨服战场 23
			Def_UniversalGameRecType_UpdatePlayerName, # 玩家改名正在改名中的信息24
			Def_UniversalGameRecType_BossDropGoodItemInfo, # boss掉落好物品信息记录25
			Def_UniversalGameRecType_26,
			@@ -1158,14 +1272,14 @@
			Def_UniversalGameRecType_BossInfo, # boss信息29
			Def_UniversalGameRecType_CrossBossInfo, # 跨服boss信息 30
			Def_UniversalGameRecType_BossFirstKill, # boss首杀 31
			Def_UniversalGameRecType_32,
			Def_UniversalGameRecType_33,
			Def_UniversalGameRecType_34,
			Def_UniversalGameRecType_35,
			Def_UniversalGameRecType_36,
			Def_UniversalGameRecType_37,
			Def_UniversalGameRecType_38,
			Def_UniversalGameRecType_39,
			Def_UniversalGameRecType_CrossCollect, # 跨服采集记录信息 32
			Def_UniversalGameRecType_CrossChampionshipGroup, # 跨服排位争霸赛分组信息 33
			Def_UniversalGameRecType_CrossChampionshipGuess, # 跨服排位争霸赛竞猜记录信息 34
			Def_UniversalGameRecType_CrossChampionshipOfficial, # 跨服排位争霸赛最终排名官职信息 35
			Def_UniversalGameRecType_CrossChampionshipOffChallenge, # 跨服排位争霸赛官职挑战信息 36
			Def_UniversalGameRecType_CrossActAllRecharge, # 跨服全服充值活动信息 37
			Def_UniversalGameRecType_CrossBattleChampionGroup, # 跨服战场冠军赛分组信息 38
			Def_UniversalGameRecType_CrossYaomoBossHurtInfo, # 跨服妖魔boss伤血信息 39
			Def_UniversalGameRecType_40,
			Def_UniversalGameRecType_RedPacketRecord, # 红包产出结果记录41
			Def_UniversalGameRecType_42,
			@@ -1309,7 +1423,7 @@
			Def_List_EscapeSequence = ['\a', '\b', '\f', '\n', '\r', '\t', '\v', '\\', '\'', '\"', '\0']

			#阵营三种中立正义邪恶
			[
			CampTypeList = [
			CampType_Neutral, #中立
			CampType_Justice, #正义(与 Def_ID1Win 一致)
			CampType_Evil, #邪恶(与 Def_ID2Win 一致)
			@@ -1338,6 +1452,7 @@
			CrossServerMsg_NPCInfoRet = "NPCInfoRet" # 跨服地图NPC信息
			CrossServerMsg_CollectNPCOK = "CollectNPCOK" # 采集NPC完成
			CrossServerMsg_EnterFBRet = "EnterFBRet" # 请求进入跨服副本返回信息
			CrossServerMsg_EnterVSRoomRet = "EnterVSRoomRet" # 请求进入跨服PK房间副本返回信息
			CrossServerMsg_FBEnd = "FBEnd" # 完成跨服副本
			CrossServerMsg_NPCAttackCount = "NPCAttackCount" # 攻击NPC次数记录
			CrossServerMsg_SendMail = "SendMail" # 发送邮件，已知玩家目标服务器，主动发送
			@@ -1345,6 +1460,24 @@
			CrossServerMsg_CrossActInfo = "CrossActInfo" # 跨服运营活动信息
			CrossServerMsg_MailPlayerIDList = "MailPlayerIDList" # 跨服邮件玩家ID通知，玩家目标服务器可能无法知道，被动推送
			CrossServerMsg_MailContent = "MailContent" # 跨服邮件内容通知
			CrossServerMsg_LuckyCloudBuyNum = "LuckyCloudBuyNum" # 幸运云购购买记录通知
			CrossServerMsg_LuckyCloudBuyLottery = "LuckyCloudBuyLottery" # 幸运云购开奖记录通知
			CrossServerMsg_CrossServerTime = "CrossServerTime" # 跨服时间同步
			CrossServerMsg_BattlefieldBuy = "BattlefieldBuy" # 跨服战场购买信息
			CrossServerMsg_BattlefieldState = "BattlefieldState" # 跨服战场状态信息
			CrossServerMsg_BattlefieldOver = "BattlefieldOver" # 跨服战场结算信息
			CrossServerMsg_DebugAnswer = "DebugAnswer" # DebugAnswer
			CrossServerMsg_ActDropSpecItem = "ActDropSpecItem" # 特殊掉落验证返回
			CrossServerMsg_CrossAssist = "CrossAssist" # 跨服协助
			CrossServerMsg_ChampionshipState = "ChampionshipState" # 跨服排位争霸赛状态信息
			CrossServerMsg_ChampionshipPlayer = "ChampionshipPlayer"# 跨服排位争霸赛参赛玩家信息
			CrossServerMsg_ChampionshipGroup = "ChampionshipGroup" # 跨服排位争霸赛分组信息
			CrossServerMsg_ChampionshipGuess = "ChampionshipGuess" # 跨服排位争霸赛竞猜信息
			CrossServerMsg_ChampionshipOfficial = "ChampionshipOfficial" # 跨服排位争霸赛官职信息
			CrossServerMsg_ChampionshipDailyOfficial = "ChampionshipDailyOfficial" # 跨服排位争霸赛每日官职信息
			CrossServerMsg_ActAllRechargeInfo = "ActAllRechargeInfo"# 跨服全民充值信息
			CrossServerMsg_CrossDailyActionState = "CrossDailyActionState" # 跨服日常任务状态信息
			CrossServerMsg_CrossYaomoBossHurtInfo = "CrossYaomoBossHurtInfo" # 跨服妖魔boss玩家伤害信息

			# 子服发送跨服信息定义
			ClientServerMsg_ServerInitOK = "ServerInitOK" # 子服启动成功
			@@ -1365,6 +1498,22 @@
			ClientServerMsg_CollectNPC = "CollectNPC" # 采集NPC
			ClientServerMsg_EnterFB = "EnterFB" # 请求进入跨服副本
			ClientServerMsg_AddBuff = "AddBuff" # 添加BUFF
			ClientServerMsg_LuckyCloudBuy = "LuckyCloudBuy" # 幸运云购
			ClientServerMsg_BattlefieldBuyOpen = "BattlefieldBuyOpen" # 跨服战场购买召集
			ClientServerMsg_BattlefieldCallChange = "BattlefieldCallChange" # 跨服战场召集 - 修改
			ClientServerMsg_BattlefieldCallJoin = "BattlefieldCallJoin" # 跨服战场召集 - 加入
			ClientServerMsg_BattlefieldCallKick = "BattlefieldCallKick" # 跨服战场召集 - 踢出
			ClientServerMsg_ActDropSpecItem = "ActDropSpecItem" # 活动特殊掉落
			ClientServerMsg_CrossAssist = "CrossAssist" # 跨服协助
			ClientServerMsg_ChampionshipOfficialApply = "ChampionshipOfficialApply" # 跨服排位申请官职
			ClientServerMsg_ChampionshipOfficialApplyReply = "ChampionshipOfficialApplyReply" # 跨服排位官职申请回应
			ClientServerMsg_ChampionshipOfficialKick = "ChampionshipOfficialKick" # 跨服排位辞退下级仙官
			ClientServerMsg_ChampionshipOfficialLeave = "ChampionshipOfficialLeave" # 跨服排位主动离任仙官
			ClientServerMsg_ChampionshipOfficialChallenge = "ChampionshipOfficialChallenge" # 跨服排位挑战仙官
			ClientServerMsg_ChampionshipGuess = "ChampionshipGuess" # 跨服排位竞猜
			ClientServerMsg_ChampionshipWorship = "ChampionshipWorship" # 跨服排位膜拜
			ClientServerMsg_ActAllRechargeValue = "ActAllRechargeValue" # 跨服全民充值额度
			ClientServerMsg_CrossYaomoBossHurtAward = "CrossYaomoBossHurtAward" # 跨服妖魔boss玩家伤害领奖

			#跨服广播类型定义
			CrossNotify_CrossAct = "CrossAct"
			@@ -1469,7 +1618,7 @@
			)=range(5)

			# 战斗力模块类型
			Def_MFPType_Max = 26
			Def_MFPType_Max = 32
			ModuleFightPowerTypeList = (
			Def_MFPType_Role, # 角色 0
			Def_MFPType_Equip, # 装备(装备本身) 1
			@@ -1491,11 +1640,17 @@
			Def_MFPType_MagicWeapon3, # 仙族法宝 17
			Def_MFPType_PetSoul, # 灵宠魂石 18
			Def_MFPType_HorseSoul, # 坐骑魂石 19
			Def_MFPType_20,
			Def_MFPType_FaQi, # 法器 20
			Def_MFPType_Dogz, # 神兽 21
			Def_MFPType_GatherSoul, # 聚魂 22
			Def_MFPType_MagicWeapon4, # 王者法宝 23
			Def_MFPType_Coat, # ʱװ 24
			Def_MFPType_Love, # 情缘 25
			Def_MFPType_Charm, # 魅力 26
			Def_MFPType_LianTi, # 炼体 27
			Def_MFPType_Enchant, # 附魔 28
			Def_MFPType_Gubao, # 古宝 29
			Def_MFPType_Shentong, # 神通 30
			Def_MFPType_Other, # 其他
			) = range(Def_MFPType_Max)

			@@ -1600,10 +1755,17 @@
			DailyActionID_CrossPenglai, # 跨服蓬莱仙境Boss 28
			DailyActionID_FamilyChuanGong, # 仙盟传功 29
			DailyActionID_FamilyParty, # 仙盟宴会 30
			) = range(1, 30 + 1)
			DailyActionID_31, # 活跃修炼 31
			DailyActionID_SkyTreasureBox, # 天降宝箱 32
			DailyActionID_Arena, # 竞技场 33
			DailyActionID_CrossDemonLand, # 跨服魔化之地Boss 34
			DailyActionID_CrossBattlefield, # 跨服战场 35
			) = range(1, 35 + 1)



			# 跨服每日活动编号定义，从150开始
			CrossDailyActionIDList = (
			CrossDailyActionID_YaomoBoss, # 妖魔boss 150
			) = range(150, 150 + 1)

			# 成就类型定义
			SuccessTypeList = (
			@@ -1750,7 +1912,40 @@
			SuccType_FeastRedPack_CrossPK, # 节日红包 - 跨服PK x次 141
			SuccType_FeastRedPack_FBSweep, # 节日红包 - 副本扫荡 x次 142
			SuccType_PassSkyTower, #通关天星塔 143
			) = range(1, 144)
			SuccType_Battlefield_Join, # 古神战场 - 参与 x次 144
			SuccType_Battlefield_CallOpen, # 古神战场 - 召集开启 x次 145
			SuccType_Battlefield_Called, # 古神战场 - 当被召集人 x次 146
			SuccType_Battlefield_WinJ, # 古神战场 - 道家获胜 x次 147
			SuccType_Battlefield_WinE, # 古神战场 - 佛家获胜 x次 148
			SuccType_Battlefield_KillCnt, # 古神战场 - 击败玩家 x次 149
			SuccType_Battlefield_CKillCnt, # 古神战场 - 连续击败y玩家 x次 150
			SuccType_Battlefield_KillBoss, # 古神战场 - 阵营击败boss x次 151
			SuccType_Battlefield_KillScoreKing, # 古神战场 - 不同场次击败积分王 x次 152
			SuccType_Battlefield_KillGuard, # 古神战场 - 击败守卫 x次 153
			SuccType_Battlefield_Score, # 古神战场 - 累计获得个人积分 xx 154
			SuccType_Battlefield_ScoreMore, # 古神战场 - 单场个人积分超过yy积分 x次 155
			SuccType_Battlefield_AuraScore, # 古神战场 - 累计在积分光环中获得积分 xx 156
			SuccType_Battlefield_SuperItem, # 古神战场 - 累计获得古神大奖 x次 157
			SuccType_Battlefield_FactionBuff, # 古神战场 - 累计采集阵营buff x次 158
			SuccType_Battlefield_PersonBuff, # 古神战场 - 累计获得个人buff x次 159
			SuccType_Battlefield_Crystal, # 古神战场 - 累计采集占领资源 x次 160
			SuccType_Battlefield_Wall, # 古神战场 - 累计采集积分墙 x次 161
			SuccType_Battlefield_BillFirst, # 古神战场 - 任意周榜榜首 x次 162
			SuccType_Battlefield_BillIn, # 古神战场 - 结算时累计上榜 x次 163
			SuccType_ActivityPlace, # 活跃放置x次 164
			SuccType_UseStoveByType, # 使用丹药X枚 165
			SuccType_Arena, # 参与竞技场x次 166
			SuccType_KillCrossPenglaiBoss, # 击杀蓬莱仙境bossx只 167
			SuccType_KillCrossDemonLandBoss, # 击杀魔化之地bossx只 168
			SuccType_EquipPlusClass, # X阶装备强化总等级X级 169
			SuccType_EquipStarClass, # X阶装备升星总等级X星 170
			SuccType_EquipStoneClass, # X阶装备宝石总等级X级 171
			SuccType_EquipWashClass, # X阶装备洗炼总等级X级 172
			SuccType_EquipPlusTotal, # 全身强化总等级X级 173
			SuccType_EquipStarTotal, # 全身升星总星数X星 174
			SuccType_EquipWashTotal, # 全身洗炼总等级X级 175
			SuccType_CrossPK, # 跨服PK x次 176
			) = range(1, 177)

			# 节日红包成就类型
			FeastRedPackSuccessTypeList = range(SuccType_FeastRedPack_TalkWorld, SuccType_FeastRedPack_FBSweep + 1)
			@@ -1762,7 +1957,7 @@
			UnDownCheckSuccessTypeList = [
			SuccType_GodWeapon,
			SuccType_MainTaskNode,SuccType_PassWagicWeapon,
			SuccType_KillSpecificNPC, SuccType_UseStoveBylv,
			SuccType_KillSpecificNPC, SuccType_UseStoveBylv, SuccType_UseStoveByType,
			SuccType_Pray,SuccType_PetClassLV,
			SuccType_QueenRelics,SuccType_XMZZConWin,
			SuccType_Collect,SuccType_DogzBattle,
			@@ -1780,13 +1975,17 @@
			SuccType_EquipPlus:[0], # 阶不向下适配
			SuccType_EquipWash:[0], # 阶不向下适配
			SuccType_EquipStar:[0], # 阶不向下适配
			SuccType_EquipPlusClass:[0], # 阶不向下适配
			SuccType_EquipStarClass:[0], # 阶不向下适配
			SuccType_EquipStoneClass:[0], # 阶不向下适配
			SuccType_EquipWashClass:[0], # 阶不向下适配
			}

			#传进来的条件满足配置的条件列表中的一个就行的成就类型
			ContainSuccessTypeList = [SuccType_CompoundItemEx, SuccType_PickUpItem, SuccType_MWSkillUp]

			#传进来的条件是配置条件的整数倍的成就类型
			MultipleSuccessTypeList = [SuccType_ElderBattlefieldConKill]
			MultipleSuccessTypeList = [SuccType_ElderBattlefieldConKill, SuccType_Battlefield_CKillCnt]

			#增加进度前需要重置的成就类型
			NeedResetSuccessTypeList = [
			@@ -1894,5 +2093,7 @@
			RedPackType_FeastSucc = 33 # 节日成就红包
			RedPackType_Server = 36 # 全服红包

			# 节日红包类型
			FeastRedPackType = [RedPackType_FeastSysBig, RedPackType_FeastSysSmall, RedPackType_FeastSucc]
			# 红包类型分类定义
			RedPackWayType_Family = "1" # 仙盟红包
			RedPackWayType_Server = "2" # 全服红包
			RedPackWayType_Feast = "3" # 节日红包