SnxxServerCode.git

			@@ -132,6 +132,7 @@
			Def_Notify_WorldKey_IsMixServer = 'IsMixServer' # 是否合服服务器
			Def_Notify_WorldKey_MixServerDay = 'MixServerDay' # 合服天数
			Def_Notify_WorldKey_LastMixServerDay = 'LastMixServerDay' # 上次合服时的开服天数
			Def_Notify_WorldKey_LastMixServerWorldLV = 'LastMixServerWorldLV' # 上次合服时的世界等级
			Def_Notify_WorldKey_OnDayEx = 'OnDayEx' # 特殊时间点凌晨X点过天
			Def_Notify_WorldKey_OnWeekEx = 'OnWeekEx' # 特殊时间点凌晨X点过周
			Def_Notify_WorldKey_OnMonthEx = 'OnMonthEx' # 特殊时间点凌晨X点过月
			@@ -167,29 +168,16 @@

			Def_Notify_WorldKey_FamilyPartyInfo = "FamilyPartyInfo" # 仙盟宴会数据

			Def_Notify_WorldKey_MergeBoss = "Merge_Boss" # 跨服boss
			Def_Notify_WorldKey_CrossServerConnState = "CrossServerConnState" # 跨服服务器链接状态
			Def_Notify_WorldKey_CrossServerOpen = "CrossServerOpen" # 跨服服务器是否开启中
			Def_Notify_WorldKey_CrossZoneName = "CrossZoneName" # 跨服分区名

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

			Def_Notify_WorldKey_Merge_PK = "Merge_PK" # 跨服PK, 仅跨服服务器有用，做为触发PKState用
			Def_Notify_WorldKey_MergePKState = "MergePK_State" # 由跨服服务器控制的跨服PK活动状态
			Def_Notify_WorldKey_MergePKDayID = "MergePK_DayID" # 跨服PK活动日ID
			Def_Notify_WorldKey_MergePKWeekID = "MergePK_WeekID" # 跨服PK活动周ID
			Def_Notify_WorldKey_MergePKSeasonID = "MergePK_SeasonID" # 跨服PK活动赛季ID
			Def_Notify_WorldKey_MergePKSeasonStartTime = "MergePK_SeasonStartTime" # 跨服PK活动当前赛季开始时间
			Def_Notify_WorldKey_IsSeasonEnd = "MergePK_IsSeasonEnd" # 跨服PK活动当前赛季是否结束

			Def_Notify_WorldKey_Merge_King = "Merge_King" # 由跨服服务器控制的跨服王者争霸活动状态
			Def_Notify_WorldKey_Merge_KingStartID = "Merge_KingStartID" # 王者争霸开始活动ID, 用于奖励状态重置
			Def_Notify_WorldKey_Merge_KingOverID = "Merge_KingOverID" # 王者争霸结束活动ID, 用于奖励状态重置
			Def_Notify_WorldKey_Merge_KingServerHonour = "Merge_KingServerHonour" # 王者争霸本服荣耀排位

			Def_Notify_WorldKey_MixServerCampaignSaveData = "MixServerCampaignSaveData_%s" # 合服活动记录数据时机0-否 1-是
			Def_Notify_WorldKey_MixServerCampaignGetAward = "MixServerCampaignGetAward_%s" # 合服活动可领奖时机0-否 1-是

			Def_Notify_WorldKey_GameWorldBossReborn = 'GameWorldBossReborn_%s' # 世界boss重生, %s为标识点28,29
			Def_Notify_WorldKey_GameWorldBossRebornCross = 'BossRebornCross_%s_%s' # 跨服世界boss重生, 参数为（zoneID, bossID）
			Def_Notify_WorldKey_GameWorldBossReborn = 'BossReborn_%s' # 世界boss重生, 参数为（bossID）
			Def_Notify_WorldKey_BossKilledCnt = 'BossKilledCnt_%s' # boss击杀次数, 参数为NPCID
			Def_Notify_WorldKey_GameWorldBossOnlineCnt = "GameWorldBossOnlineCnt_%s" #世界boss重生时间计算在线人数统计 %s为bossid
			Def_Notify_WorldKey_BossShuntPlayer = 'BossShuntPlayer' # boss分流玩家信息
			@@ -225,9 +213,8 @@
			Def_Notify_WorldKey_LoginAwardStartDate = 'LoginAwardStartDate_%s' # 登录领取奖励开始时间，参数为活动类型
			Def_Notify_WorldKey_LoginAwardEndDate = 'LoginAwardEndDate_%s' # 登录领取奖励结束时间，参数为活动类型

			Def_Notify_WorldKey_ClearBillboardSign = 'ClearBillboardSign' # 清除排行榜标记

			Def_Notify_WorldKey_RedPacketOutput = 'RedPacketOutput' # 红包产出信息
			Def_Notify_WorldKey_HurtLog = 'HurtLog' # 战斗伤害日志

			#运营活动表名定义
			OperationActionName_ExpRate = "ActExpRate" # 多倍经验活动
			@@ -236,17 +223,34 @@
			OperationActionName_BossReborn = "ActBossReborn" # BOSS复活活动
			OperationActionName_FlashGiftbag = "ActFlashGiftbag" # 限时礼包活动
			OperationActionName_FairyCeremony = "ActFairyCeremony" # 仙界盛典活动
			OperationActionName_NewFairyCeremony = "ActNewFairyCeremony" # 仙界盛典活动
			OperationActionName_RealmPoint = "ActRealmPoint" # 多倍修行点活动
			OperationActionName_FlashSale = "ActFlashSale" # 限时抢购活动
			OperationActionName_WishingWell = "ActWishingWell" # 许愿池活动
			OperationActionName_TotalRecharge = "ActTotalRecharge" # 累计充值活动
			OperationActionName_WeekParty = "ActWeekParty" # 周狂欢活动
			OperationActionName_LoginAward = "ActLoginAward" # 登录奖励活动
			OperationActionName_FeastWeekParty = "ActFeastWeekParty" # 节日巡礼狂欢活动
			OperationActionName_FeastRedPacket = "ActFeastRedPacket" # 节日红包活动
			OperationActionName_FeastCollectWords = "ActFeastCollectWords" # 节日集字活动
			OperationActionName_LuckyTreasure = "ActLuckyTreasure" # 幸运鉴宝活动
			#节日活动类型列表 - 该类型无视开服天，日期到了就开启
			FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket, OperationActionName_FeastCollectWords]
			#所有的运营活动列表，含节日活动
			OperationActionNameList = [OperationActionName_ExpRate, OperationActionName_CostRebate,
			OperationActionName_BossReborn,OperationActionName_SpringSale,
			OperationActionName_FlashGiftbag, OperationActionName_FairyCeremony,
			OperationActionName_RealmPoint, OperationActionName_FlashSale,
			OperationActionName_WishingWell, OperationActionName_TotalRecharge]
			OperationActionName_WishingWell, OperationActionName_TotalRecharge,
			OperationActionName_WeekParty, OperationActionName_LoginAward,
			OperationActionName_NewFairyCeremony, OperationActionName_LuckyTreasure] \
			+ FeastOperationActionNameList
			#需要记录开启活动时的世界等级的运营活动
			NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell]
			NeedWorldLVOperationActNameList = [OperationActionName_FairyCeremony, OperationActionName_WishingWell,
			OperationActionName_NewFairyCeremony, OperationActionName_FlashSale,
			OperationActionName_BossReborn, OperationActionName_TotalRecharge,
			OperationActionName_CostRebate, OperationActionName_FlashGiftbag,
			OperationActionName_SpringSale, OperationActionName_LuckyTreasure]

			#活动信息字典key定义
			ActKey_ID = "ID" # 活动ID，唯一标识的ID，一般是活动开启的time值
			@@ -254,6 +258,7 @@
			ActKey_CfgID = "CfgID" # 活动表配置ID
			ActKey_DayIndex = "DayIndex" # 活动表配置ID
			ActKey_WorldLV = "WorldLV" # 活动开启时世界等级
			ActKey_WorldLVList = "WorldLVList" # 活动每天的世界等级列表

			#答题类型枚举
			Def_Game_ExamTypeList = range(1, 4 + 1)
			@@ -290,7 +295,8 @@
			Def_ViewExpType_Sit , #打坐获取经验 3
			Def_ViewExpType_KillNPCSuper, #杀怪获得经验暴击 4
			Def_ViewExpType_Sys , #系统给经验-需要展示倍率，实际不享受 5
			) = range(0, 6)
			Def_ViewExpType_RealmBuff, #境界全服福利经验(玄女天花) 6
			) = range(0, 7)


			#物品相关操作类型
			@@ -302,7 +308,7 @@
			Def_mitProduceResult, # 生产采集结果回应
			Def_mitPetEquipMerge, # 宠物装备合成回应
			Def_mitEquipInherit, # 装备继承
			Def_mitEquipPlus, # 装备加强
			Def_mitEquipStarUp, # 装备升星
			Def_mitEquipMayaPlus, # 装备玛雅加强
			Def_mitEquipAddAttr, # 装备追加
			Def_mitEquipSlotting, # 装备打孔
			@@ -415,8 +421,6 @@
			Def_Effect_MissRate = 45 #20026
			#杀怪经验百分比, 百分比增加基础杀怪经验(a值为万分率，直接加上)
			Def_Effect_FightExpRate = 46
			#魂器基础属性百分比
			Def_Effect_HorcruxBasePer = 48
			Def_Effect_SkillAtkRateReduce = 49 #20032
			#增加HP(A值填万分率)
			Def_Effect_MaxHPPer = 50 #20023
			@@ -438,20 +442,45 @@
			Def_Effect_StoneMaxHPPer = 58
			#宝石攻击百分比
			Def_Effect_StoneAtkPer = 59
			#装备基础百分比
			#装备基础百分比 - 含特殊装备位
			Def_Effect_EquipBaseAddPer = 60
			#基础装备百分比
			Def_Effect_BaseEquipAddPer = 64
			#冰攻百分比(A值为万分率)
			Def_Effect_IceAtkPer = 61
			#冰防百分比(A值为万分率)
			Def_Effect_IceDefPer = 62
			#防具生命百分比
			Def_Effect_ArmorMaxHPAddPer = 63
			#圣器攻击百分比
			Def_Effect_RelicsAtkAddPer = 64
			#武器攻击百分比
			Def_Effect_WeaponAtkAddPer = 65
			#防具防御百分比
			#基础装备生命百分比
			Def_Effect_BaseEquipMaxHPAddPer = 63
			#基础装备攻击百分比
			Def_Effect_BaseEquipAtkAddPer = 65
			#防具防御百分比 - 废弃
			Def_Effect_ArmorDefAddPer = 66
			#主手基础属性值百分比
			Def_Effect_WeaponAddPer = 121
			#副手基础属性值百分比
			Def_Effect_Weapon2AddPer = 122
			#腰带基础属性值百分比
			Def_Effect_BeltAddPer = 123
			#手套基础属性值百分比
			Def_Effect_GloveAddPer = 124
			#衣袍基础属性值百分比
			Def_Effect_ClothesAddPer = 125
			#帽子基础属性值百分比
			Def_Effect_HatAddPer = 126
			#下装基础属性值百分比
			Def_Effect_TrousersAddPer = 127
			#鞋履基础属性值百分比
			Def_Effect_ShoesAddPer = 128
			#仙器A基础属性值百分比
			Def_Effect_FairyCanAddPer = 129
			#仙器B基础属性值百分比
			Def_Effect_FairyCan2AddPer = 130
			#仙绳基础属性值百分比
			Def_Effect_NeckAddPer = 131
			#莲台基础属性值百分比
			Def_Effect_JadeAddPer = 132

			Def_Effect_MinAtk = 67 # 最小攻击
			Def_Effect_MaxAtk = 68 # 最大攻击

			@@ -485,6 +514,41 @@
			Def_Effect_PlusBaseAtkPer = 88 # 强化基础攻击百分比

			Def_Effect_NPCHurtAddPer = 89 # 对怪物伤害加成

			Def_Effect_JobAHurtAddPer = 90 # 对目标战士伤害加成
			Def_Effect_JobBHurtAddPer = 91 # 对目标法师伤害加成
			Def_Effect_JobCHurtAddPer = 92 # 对目标弓箭伤害加成
			Def_Effect_JobAAtkReducePer = 93 # 战士攻击伤害减免
			Def_Effect_JobBAtkReducePer = 94 # 法师攻击伤害减免
			Def_Effect_JobCAtkReducePer = 95 # 弓箭攻击伤害减免

			Def_Effect_ZXCloakAttrPer = 96 # 诛仙披风属性加成百分比
			Def_Effect_ZXMaskAttrPer = 97 # 诛仙面具属性加成百分比
			Def_Effect_ZXGloveAttrPer = 98 # 诛仙手套属性加成百分比
			Def_Effect_ZXRuyiAttrPer = 99 # 诛仙如意属性加成百分比
			Def_Effect_ZXPendantAttrPer = 100 # 诛仙吊坠属性加成百分比
			Def_Effect_ZXRingAttrPer = 101 # 诛仙戒指属性加成百分比

			Def_Effect_SkillAddPer1 = 102 # 技能伤害增强1
			Def_Effect_SkillAddPer2 = 103 # 技能伤害增强2
			Def_Effect_SkillAddPer3 = 104 # 技能伤害增强3
			Def_Effect_SkillAddPer4 = 105 # 技能伤害增强4
			Def_Effect_SkillAddPer5 = 106 # 技能伤害增强5
			Def_Effect_SkillAddPer6 = 107 # 技能伤害增强6
			Def_Effect_SkillAddPer7 = 108 # 技能伤害增强7

			Def_Effect_SkillReducePer1 = 109 # 受到技能伤害减少1
			Def_Effect_SkillReducePer2 = 110 # 受到技能伤害减少2
			Def_Effect_SkillReducePer3 = 111 # 受到技能伤害减少3
			Def_Effect_SkillReducePer4 = 112 # 受到技能伤害减少4
			Def_Effect_SkillReducePer5 = 113 # 受到技能伤害减少5
			Def_Effect_SkillReducePer6 = 114 # 受到技能伤害减少6
			Def_Effect_SkillReducePer7 = 115 # 受到技能伤害减少7

			Def_Effect_ZXWeaponAttrPer = 116 # 诛仙剑1属性加成百分比
			Def_Effect_LXWeaponAttrPer = 117 # 诛仙剑2属性加成百分比
			Def_Effect_XXWeaponAttrPer = 118 # 诛仙剑3属性加成百分比
			Def_Effect_JXWeaponAttrPer = 119 # 诛仙剑4属性加成百分比

			#增加%d物理伤害值,其中a值为伤害值
			Def_Effect_AddAtk = 1005
			@@ -578,23 +642,19 @@
			Def_BT_Campaign_Recharge, #累计充值(开服活动榜)
			Def_BT_Campaign_PetLV, #灵宠等级(开服活动榜)

			Def_BT_ZhuXianTower, #诛仙塔榜
			Def_BT_NewFCCostGold, #消费排行榜(新仙界盛典)

			Def_BT_HighLadder, #天梯竞技场排行
			Def_BT_HighLadder_Yester, #天梯竞技场昨日排行
			Def_BT_RechargeTeHuiLast, #充值特惠活动排行榜-上一期记录
			Def_BT_RechargeTeHui, #充值特惠活动排行榜-当前期记录

			Def_BT_MixCampaign_PlayerBattle, #总战斗力(合服活动)
			Def_BT_MixCampaign_Recharge, #累计充值(合服活动)
			Def_BT_MixCampaign_WinFamilyMember, #获胜战盟成员,按职位排(合服活动)
			Def_BT_MixCampaign_FamilyKillBoss, #战盟击杀boss(合服活动)

			Def_BT_CostTeHui, #消费特惠排行榜
			Def_BT_CostTeHuiLast, #消费特惠排行榜上一期
			Def_BT_MergePKDay, #跨服PK日积分榜
			Def_BT_MergePKWeek, #跨服PK周积分榜

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

			#职业对应战力排行榜类型
			JobFightPowerBillboardDict = {
			@@ -606,7 +666,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_FBHelpBattle,
			Def_BT_FBHelpBattle, Def_BT_ZhuXianTower,
			]

			##---比率---
			@@ -796,7 +856,10 @@
			CDBPlayerRefresh_SoulDust, # 魂尘 196
			CDBPlayerRefresh_SoulSplinters, # 聚魂碎片 197
			CDBPlayerRefresh_SoulCore, # 核心环 198
			) = range(146, 199)
			CDBPlayerRefresh_Honor, # 荣誉 199
			CDBPlayerRefresh_ZhuxianRate, # 诛仙一击概率 200
			CDBPlayerRefresh_ZhuxianHurtPer, # 诛仙一击伤害百分比 201
			) = range(146, 202)

			TYPE_Price_Gold_Paper_Money = 5 # 金钱类型，（先用礼券，再用金子）
			TYPE_Price_Family_Contribution = 6 # 战盟贡献度（活跃度转换得来）
			@@ -806,6 +869,7 @@
			TYPE_Price_FamilyActivity = 15 # 仙盟活跃令
			TYPE_Price_FBHelpPoint = 16 # 副本助战积分, 废弃
			TYPE_Price_XianyuanCoin = 17 # 仙缘币
			TYPE_Price_Honor = 18 # 荣誉
			TYPE_Price_Rune = 23 # 符印精华点
			TYPE_Price_RuneSplinters = 24 # 符印碎片
			TYPE_Price_TreasureScore = 25 # 寻宝积分
			@@ -821,7 +885,6 @@
			TYPE_Price_HighLadder_Currency = 102 # 天梯竞技场积分
			TYPE_Price_HighLadder_Signet = 103 # 物品兑换(圣光晶石)
			TYPE_Price_GongXun = 105 # 功勋点
			TYPE_Price_Honor = 108 # 荣誉商店积分
			TYPE_Price_ArrestPoint = 110 # 悬赏积分

			# 物品兑换
			@@ -844,6 +907,7 @@
			TYPE_Price_SoulDust:CDBPlayerRefresh_SoulDust,
			TYPE_Price_SoulSplinters:CDBPlayerRefresh_SoulSplinters,
			TYPE_Price_SoulCore:CDBPlayerRefresh_SoulCore,
			TYPE_Price_Honor:CDBPlayerRefresh_Honor,
			}

			# 高效战斗状态
			@@ -886,6 +950,7 @@
			GameFuncID_LittleHelper = 146 # 小助手
			GameFuncID_TJG = 147 # 脱机挂
			GameFuncID_SuperGift = 150 # 超值礼包
			GameFuncID_ZhuXianBoss = 163 # 诛仙BOSS
			# 以下为暂时无用的
			GameFuncID_Truck = 33 # 运镖
			GameFuncID_RunDaily = 34 # 日常跑环
			@@ -909,7 +974,9 @@
			Def_TalkExtraValue_Bit_GM, #GM
			Def_TalkExtraValue_Bit_JOB, #job
			Def_TalkExtraValue_Bit_BubbleBox, #气泡框
			) = range(0, 4)
			Def_TalkExtraValue_Bit_ServerGroupID, #服务器组ID
			Def_TalkExtraValue_Bit_LV, #等级
			) = range(0, 6)

			#聊天信息附加值中某信息数据所占位置
			#{聊天信息附加值类型:[起始位置(从左往右), 结束位置(不包含)]}
			@@ -918,6 +985,8 @@
			Def_TalkExtraValue_Bit_GM:[2, 3], # GM
			Def_TalkExtraValue_Bit_JOB:[3, 4], # job
			Def_TalkExtraValue_Bit_BubbleBox:[4, 6], # 气泡框
			Def_TalkExtraValue_Bit_ServerGroupID:[6, 13], # 服务器组ID
			Def_TalkExtraValue_Bit_LV:[13, 17], # 等级
			}

			# 聊天频道暂用语音
			@@ -936,8 +1005,10 @@
			rptPet, # 宠物背包(用物品存储宠物的数据) 31
			rptDogzItem, # 神兽物品背包 32
			rptDogzEquip, # 神兽装备背包 33
			rptZhuXianItem, # 诛仙物品背包 34
			rptZhuXianEquip, # 诛仙装备背包 35
			rptMax, # 最大背包类型数量，放在最后一个
			) = range(28, 28 + 7) #C++定义的枚举到２７
			) = range(28, 28 + 9) #C++定义的枚举到２７

			#虚拟背包类型, 从255递减
			Def_VPack_TypeList = (
			@@ -966,8 +1037,8 @@
			Def_UniversalGameRecType_StoreServerCntRecord, #商店全服购买记录 8,
			Def_UniversalGameRecType_FBHelpBattleCheckInPlayer, #助战玩家登记记录9
			Def_UniversalGameRecType_FBHelpBattleRecord, #助战未同步记录10
			Def_UniversalGameRecType_11,
			Def_UniversalGameRecType_MergeRegister, # 上传数据报名信息12
			Def_UniversalGameRecType_ZhuXianBossRecord, #诛仙BOSS结算记录11
			Def_UniversalGameRecType_LuckyTreasure, #幸运鉴宝大奖记录12
			Def_UniversalGameRecType_13,
			Def_UniversalGameRecType_Reward, # 通用奖励表(TopBar)14
			Def_UniversalGameRecType_15,
			@@ -985,7 +1056,7 @@
			Def_UniversalGameRecType_27,
			Def_UniversalGameRecType_28,
			Def_UniversalGameRecType_BossInfo, # boss信息29
			Def_UniversalGameRecType_30,
			Def_UniversalGameRecType_CrossBossInfo, # 跨服boss信息
			Def_UniversalGameRecType_31,
			Def_UniversalGameRecType_32,
			Def_UniversalGameRecType_ManorWarInfo, # 领地争夺战占领结果33
			@@ -998,15 +1069,15 @@
			Def_UniversalGameRecType_40,
			Def_UniversalGameRecType_RedPacketRecord, # 红包产出结果记录41
			Def_UniversalGameRecType_42,
			Def_UniversalGameRecType_MergeEvent, # 跨服玩家数据变更事件信息43
			Def_UniversalGameRecType_MergePKAwardRecord, # 跨服PK奖励领取记录44
			Def_UniversalGameRecType_MergePKTopPlayerEquip, # 跨服PK赛高手玩家装备预览信息45
			Def_UniversalGameRecType_MergePKScoreAward, # 跨服PK积分领奖记录46
			Def_UniversalGameRecType_MergeKingBattleRecord, # 跨服王者争霸对战信息47
			Def_UniversalGameRecType_MergeKingBattleRecordLast, # 跨服王者争霸上一期对战信息48
			Def_UniversalGameRecType_MergeKingSupportRecord, # 跨服王者争霸支持押注信息49
			Def_UniversalGameRecType_MergeKingTopPlayerEquip, # 跨服王者争霸高手玩家装备预览信息50
			Def_UniversalGameRecType_MergePKUnNotifyOver, # 跨服PK未同步的PK结果51
			Def_UniversalGameRecType_43,
			Def_UniversalGameRecType_44,
			Def_UniversalGameRecType_45,
			Def_UniversalGameRecType_46,
			Def_UniversalGameRecType_47,
			Def_UniversalGameRecType_48,
			Def_UniversalGameRecType_49,
			Def_UniversalGameRecType_50,
			Def_UniversalGameRecType_51,
			Def_UniversalGameRecType_52,
			Def_UniversalGameRecType_53,
			Def_UniversalGameRecType_54,
			@@ -1033,13 +1104,10 @@

			# 客户端不可查看的自定义表类型
			Def_Confidential_UniversalRecList = (
			Def_UniversalGameRecType_MergeRegister, # 上传数据报名信息12
			Def_UniversalGameRecType_FamilyWarMember, # 盟联赛参赛人员记录70
			)
			# 只同步自身数据的类型 {类型:自身数据最大条数, ...} , 自身数据最大条数-1时代表自身全部数据; 这里的数据Value1固定为playerID
			Def_Sync_UniversalRecSelfDict = {
			Def_UniversalGameRecType_MergePKAwardRecord:1,
			Def_UniversalGameRecType_MergeKingSupportRecord:-1,
			}

			#家族行为类型在GameServer.ChConfig.ActionTypeSaveCnt 中配置最高存储条数
			@@ -1107,9 +1175,6 @@
			Def_Enter_Truck, #进入骠车
			) = range(1, 3)

			Def_OSC_ValidDay = 6 # 开服活动有效活动天
			Def_MSC_ValidDay = 5 # 合服活动有效活动天

			# 开服活动类型标识, 不可超过32
			Def_Campaign_Type_List = (
			Def_Campaign_Type_PlusLV, # 强化等级排行 1
			@@ -1152,40 +1217,6 @@
			Def_CampaignAwardState_Over, # 领奖结束
			) = range(3)

			#合服活动类型标识
			Def_MixCampaign_Type_List = (
			Def_MixCampaign_Type_PlayerBattle, # 总战斗力0
			Def_MixCampaign_Type_RechargeFirst, # 首充奖励1
			Def_MixCampaign_Type_RechargeRank, # 累计充值排行奖励2
			Def_MixCampaign_Type_RechargeCnt, # 累计充值保底奖励3
			Def_MixCampaign_Type_FamilyWar, # 冰封王座家族战获胜家族成员奖励4
			Def_MixCampaign_Type_FamilyWarEnter, # 冰封王座参与奖5
			Def_MixCampaign_Type_FamilyKillBoss, # 战盟击杀boss排行
			Def_MixCampaign_Type_PlayerKillBoss, # 个人击杀boss
			) = range(8)

			#合服活动类型对应的奖励排行榜
			Def_MixCampaign_Billboard_Dict = {
			Def_MixCampaign_Type_PlayerBattle:Def_BT_MixCampaign_PlayerBattle, # 总战斗力
			Def_MixCampaign_Type_RechargeRank:Def_BT_MixCampaign_Recharge, # 累计充值排行
			Def_MixCampaign_Type_FamilyWar:Def_BT_MixCampaign_WinFamilyMember, # 获胜战盟成员
			Def_MixCampaign_Type_FamilyKillBoss:Def_BT_MixCampaign_FamilyKillBoss, # 战盟击杀boss排行
			}

			# 直接在MapServer中处理的合服活动类型
			DoOnMapServerMixCampaignTypeList = [
			Def_MixCampaign_Type_RechargeFirst,
			Def_MixCampaign_Type_RechargeCnt,
			Def_MixCampaign_Type_FamilyWarEnter,
			Def_MixCampaign_Type_PlayerKillBoss,
			]
			# 合服活动请求GameServer操作类型定义
			(
			Def_MSCGameServerQuery_QueryAward, # 查询
			Def_MSCGameServerQuery_GetAward, # 领奖
			Def_MSCGameServerQuery_MailAward, # 邮件发送奖励
			) = range(3)

			#队伍最大人数
			Def_Team_MaxPlayerCount = 4

			@@ -1200,8 +1231,11 @@
			] = range(3)

			# 跨服服务器发送子服信息定义
			CrossServerMsg_CrossServerState = "CrossServerState" # 跨服服务器状态变更
			CrossServerMsg_ExitCrossServer = "ExitCrossServer" # 退出跨服服务器
			CrossServerMsg_Notify = "Notify" # 提示信息
			CrossServerMsg_ChatCrossWorld = "ChatCrossWorld" # 跨服世界聊天
			CrossServerMsg_ViewPlayerCacheRet = "ViewPlayerCacheRet"# 查看跨服玩家信息结果
			CrossServerMsg_PKMatchReqRet = "PKMatchReqRet" # 跨服PK匹配请求结果
			CrossServerMsg_PKMatchResult = "PKMatchResult" # 跨服PK匹配结果
			CrossServerMsg_PKReadyOKRoomList = "PKReadyOKRoomList" # 跨服PK已准备好的房间列表
			@@ -1209,51 +1243,32 @@
			CrossServerMsg_PKOverInfo = "PKOverInfo" # 跨服PK结果
			CrossServerMsg_PKSeasonInfo = "PKSeasonInfo" # 跨服PK赛季信息
			CrossServerMsg_PKSyncBillboard = "PKSyncBillboard" # 跨服PK同步排行榜
			CrossServerMsg_CrossBossInfo = "CrossBossInfo" # 跨服Boss信息
			CrossServerMsg_CrossBossState = "CrossBossState" # 跨服Boss状态
			CrossServerMsg_PutInItem = "PutInItem" # 获得物品
			CrossServerMsg_GiveMoney = "GiveMoney" # 获得货币
			CrossServerMsg_DropGoodItem = "DropGoodItem" # 掉落好物品
			CrossServerMsg_RebornRet = "RebornRet" # 复活结果
			CrossServerMsg_NPCInfoRet = "NPCInfoRet" # 跨服地图NPC信息
			CrossServerMsg_CollectNPCOK = "CollectNPCOK" # 采集NPC完成

			# 子服发送跨服信息定义
			ClientServerMsg_ServerInitOK = "ServerInitOK" # 子服启动成功
			ClientServerMsg_ChatCrossWorld = "ChatCrossWorld" # 跨服世界聊天
			ClientServerMsg_GMCMD = "GMCMD" # GM命令
			ClientServerMsg_ViewPlayerCache = "ViewPlayerCache" # 查看跨服玩家信息
			ClientServerMsg_PKMatch = "PKMatch" # 跨服PK匹配
			ClientServerMsg_PKCancel = "PKCancel" # 跨服PK取消匹配
			ClientServerMsg_PKPrepareOK = "PKPrepareOK" # 跨服PK准备完毕
			ClientServerMsg_PKBillboard = "PKBillboard" # 跨服PK排行榜
			ClientServerMsg_Reborn = "Reborn" # 复活
			ClientServerMsg_QueryNPCInfo = "QueryNPCInfo" # 查询跨服地图NPC信息
			ClientServerMsg_SetPlayerAttrValue = "SetPlayerAttrValue" # 玩家属性数值更新
			ClientServerMsg_CollectNPC = "CollectNPC" # 采集NPC

			#跨服匹配PK奖励类型
			Def_MergePKAwardTypeList = (
			Def_MergePKAward_DayPKCnt, # 0 每日挑战次数奖励
			Def_MergePKAward_DayWinCnt, # 1 每日胜利次数奖励
			Def_MergePKAward_SeasonGrade, # 2 赛季晋级奖励
			Def_MergePKAward_SeasonRank, # 3 赛季排名奖励
			Def_MergePKAward_FirstWinCnt, # 4 首次胜利次数奖励
			) = range(5)

			#跨服战战斗状态
			(
			Def_NotBegin, #还没开始
			Def_ID1Win, #第一个玩家胜利(与CampType_Justice一致)
			Def_ID2Win, #第二个玩家胜利(与CampType_Evil一致)
			Def_Battling, #正在战斗中
			Def_BattleReady, #押注中
			) = range(5)

			# 跨服赛(跨服服务器)上传数据状态
			(
			Def_MergeRegisterState_None, #空闲
			Def_MergeRegisterState_Start, #开始上传
			Def_MergeRegisterState_Err, # 上传出错
			Def_MergeRegisterState_Success, #上传成功
			Def_MergeRegisterState_Request, #请求跨服, 比开始上传还早的一步，先通过请求，才开始上传
			) = range(5)

			# 跨服活动类型
			(
			Def_MergeAction_MergeWar, # 万国战
			Def_MergeAction_WarOfHonour, # 荣耀之战(跨服混战)
			Def_MergeAction_Boss, # 跨服boss
			Def_MergeAction_MergePK, # 跨服匹配PK
			Def_MergeAction_MergeKing, # 跨服王者争霸
			Def_MergeAction_TypeMax, # 类型数
			) = range(6)
			#跨服广播类型定义
			CrossNotify_World = "World"
			CrossNotify_Family = "Family"

			#角色改名结果
			(
			@@ -1303,6 +1318,9 @@
			Def_IudetWingProgressValue = 42 #羽翼精炼值
			Def_IudetCreateTime = 44 # 时效物品的创建时间
			Def_IudetGatherSoulLV = 46 # 聚魂等级
			Def_IudetExpireTime = 48 # 时效物品指定有效时间，时间单位由时效类型决定
			Def_IudetAuctionItemCreateTime = 50 # 拍品创建时间

			# 200~300 宠物数据用
			Def_IudetPet_NPCID = 200 # npcID
			Def_IudetPet_ClassLV = 202 # 阶级
			@@ -1345,9 +1363,7 @@
			ScoreType_NewGuySuperShow, # 击杀怪物统计
			ScoreType_GetItem, # 获得物品奖励统计
			ScoreType_RedFortReward, # 打开客户端frmRedFortReward
			ScoreType_MergeBoss, # 跨服boss界面
			ScoreType_MergePK, # 跨服匹配PK结算
			)=range(7)
			)=range(5)

			ScoreTypeName = "TScore"

			@@ -1366,13 +1382,13 @@
			)=range(5)

			# 战斗力模块类型
			Def_MFPType_Max = 27
			Def_MFPType_Max = 44
			ModuleFightPowerTypeList = (
			Def_MFPType_Role, # 角色 0
			Def_MFPType_Equip, # 装备(基本装备位) 1
			Def_MFPType_Equip, # 装备(基本装备位) 1 - 废弃
			Def_MFPType_Plus, # 强化 2
			Def_MFPType_Stone, # 宝石 3
			Def_MFPType_Suit, # 套装 4
			Def_MFPType_Suit, # 套装 4 - 废弃
			Def_MFPType_Wing, # 翅膀 5
			Def_MFPType_Wash, # 洗练 6
			Def_MFPType_Pet, # 灵宠 7
			@@ -1381,17 +1397,34 @@
			Def_MFPType_GodWeapon, # 神兵 10
			Def_MFPType_Dienstgrad, #称号 11
			Def_MFPType_Rune, # 符印 12
			Def_MFPType_Horcrux, # 魂器 13
			Def_MFPType_13, #
			Def_MFPType_MagicWeapon1, # 人族法宝 14
			Def_MFPType_StoveYao, # 炼丹炉丹药 15
			Def_MFPType_MagicWeapon2, # 魔族法宝 16
			Def_MFPType_MagicWeapon3, # 仙族法宝 17
			Def_MFPType_PetSoul, # 灵宠魂石 18
			Def_MFPType_HorseSoul, # 坐骑魂石 19
			Def_MFPType_MagicWeaponSoul, # 法宝之魂 20
			Def_MFPType_MagicWeaponSoul, # 法宝之魂 20 - 废弃
			Def_MFPType_Dogz, # 神兽 21
			Def_MFPType_GatherSoul, # 聚魂 22
			Def_MFPType_MagicWeapon4, # 王者法宝 23
			Def_MFPType_Coat, # ʱװ 24
			Def_MFPType_ZhuXian, # 诛仙 25 - 废弃
			Def_MFPType_Equip1, # 境界装备1阶 26
			Def_MFPType_Equip2, # 境界装备2阶 27
			Def_MFPType_Equip3, # 境界装备3阶 28
			Def_MFPType_Equip4, # 境界装备4阶 29
			Def_MFPType_Equip5, # 境界装备5阶 30
			Def_MFPType_Equip6, # 境界装备6阶 31
			Def_MFPType_Equip7, # 境界装备7阶 32
			Def_MFPType_Equip8, # 境界装备8阶 33
			Def_MFPType_Equip9, # 境界装备9阶 34
			Def_MFPType_Equip10, # 境界装备10阶 35
			Def_MFPType_Equip11, # 境界装备11阶 36
			Def_MFPType_Equip12, # 境界装备12阶 37
			Def_MFPType_Equip13, # 境界装备13阶 38
			Def_MFPType_Equip14, # 境界装备14阶 39
			Def_MFPType_Equip15, # 境界装备15阶 40
			Def_MFPType_Other, # 其他

			#以下暂时没用到，改时再处理
			@@ -1544,7 +1577,9 @@
			DailyActionID_IceLode, # 冰晶矿脉
			DailyActionID_HelpBattleCheckIn, # 助战登记 20
			DailyActionID_CrossReamPK, # 跨服PK 21
			) = range(1, 21 + 1)
			DailyActionID_FamilyBoss1, # 仙盟BOSS第一场 22
			DailyActionID_FamilyBoss2, # 仙盟BOSS第二场 23
			) = range(1, 23 + 1)



			@@ -1684,10 +1719,19 @@
			SuccType_Collect, #采集X物品X次131
			SuccType_InlayGatherSoul, #镶嵌X枚X品质聚魂（不包含核心）132
			SuccType_GatherSoulLvUp, #累计聚魂总等级XX（不包含核心）133
			) = range(1, 134)
			SuccType_FeastRedPack_TalkWorld, #节日红包 - 世界频道发言 x次 134
			SuccType_FeastRedPack_Pray, # 节日红包 - 祈祷x次 135
			SuccType_FeastRedPack_KillSpecificNPC, # 节日红包 - 击杀特定NPC x次 136
			SuccType_FeastRedPack_KillBoss, # 节日红包 - 指定类型boss x次 137
			SuccType_FeastRedPack_EnterMap, # 节日红包 - 进入指定地图 x次 138
			SuccType_FeastRedPack_TaskCRun, # 节日红包 - 完成x次日常环任务成就 139
			SuccType_FeastRedPack_Dice, # 节日红包 - 天机摇骰子x次 140
			SuccType_FeastRedPack_CrossPK, # 节日红包 - 跨服PK x次 141
			SuccType_FeastRedPack_FBSweep, # 节日红包 - 副本扫荡 x次 142
			) = range(1, 143)



			# 节日红包成就类型
			FeastRedPackSuccessTypeList = range(SuccType_FeastRedPack_TalkWorld, SuccType_FeastRedPack_FBSweep + 1)

			# 连续天规则的成就类型
			ContinueSuccessTypeList = []
			@@ -1702,6 +1746,8 @@
			SuccType_EquipSuit,SuccType_Collect,SuccType_DogzBattle,
			SuccType_UseItem,SuccType_FamilyTechLV,
			SuccType_GetSpecialItem,SuccType_GetMagicWeapon,SuccType_FBEncourage,SuccType_XBXZ,
			SuccType_FeastRedPack_KillSpecificNPC,SuccType_FeastRedPack_KillBoss,
			SuccType_FeastRedPack_EnterMap, SuccType_FeastRedPack_FBSweep,
			]
			#传进来的条件满足配置的条件列表中的一个就行的成就类型
			ContainSuccessTypeList = [SuccType_CompoundItemEx, SuccType_PickUpItem, SuccType_MWSkillUp]
			@@ -1729,27 +1775,32 @@
			# 手游不使用C++定义 enum RoleEquipType
			# 装备位定义
			RoleEquipType = (
			retWeapon, #1 主手
			retWeapon2, #2 副手
			retHat, #3 帽子
			retClothes, #4 衣服
			retBelt, #5 腰带
			retTrousers, #6 裤子
			retShoes, #7 鞋子
			retNeck, #8 项链
			retFairyCan, #9 仙器
			retFairyCan2, #10 仙器
			retWing, #11 翅膀
			retGuard, #12 守护
			retBaldric1, #13 佩饰
			retBaldric2, #14 佩饰
			retBaldric3, #15 佩饰
			retBaldric4, #16 佩饰
			retBaldric5, #17 佩饰
			retBaldric6, #18 佩饰
			retHorse, #19 坐骑
			retWeapon, #1 主手
			retWeapon2, #2 副手
			retHat, #3 帽子
			retClothes, #4 衣服
			retBelt, #5 腰带
			retTrousers, #6 裤子
			retShoes, #7 鞋子
			retGlove, #8 手套
			retNeck, #9 项链
			retFairyCan, #10 仙器1
			retFairyCan2, #11 仙器2
			retJade, #12 玉佩
			retWing, #13 翅膀
			retGuard1, #14 守护1
			retGuard2, #15 守护2
			retPeerlessWeapon, #16 绝世武器
			retPeerlessWeapon2, #17 绝世副手
			retXXX18, #18 暂无
			retHorse, #19 坐骑
			retWeaponSkin, #20 时装武器
			retClothesSkin, #21 时装衣服
			retWeapon2Skin, #22 时装副手
			retMax,
			) = range(1, 21)
			) = range(1, 24)




			# 神兽装备位定义
			@@ -1761,6 +1812,27 @@
			dogzetScute, # 神兽鳞甲
			) = range(101, 101 + 5)

			# 诛仙装备位定义
			ZhuXianEquipPlace = (
			zxetCloak, # 诛仙披风 121
			zxetMask, # 诛仙面具 122
			zxetGlove, # 诛仙手套 123
			zxetGlove2, # 诛仙手套 124
			zxetRuyi, # 诛仙如意 125
			zxetPendant, # 诛仙吊坠 126
			zxetRing, # 诛仙戒指 127
			zxetRing2, # 诛仙戒指 128
			zxetWeapon1, # 诛仙剑1 129
			zxetWeapon2, # 诛仙剑2 130
			zxetWeapon3, # 诛仙剑3 131
			zxetWeapon4, # 诛仙剑4 132
			) = range(121, 121 + 12)

			# 共享通用装备位，可装备同一类型装备
			ShareEquipPlace = [
			[zxetGlove, zxetGlove2],
			[zxetRing, zxetRing2],
			]

			# 请求进入副本通用检查结果，优先提示的放前面(即索引越大，提示优先级越低)
			EnterFBAskResult = (
			@@ -1778,9 +1850,11 @@
			EntFBAskRet_InFB, # 11 副本中
			EntFBAskRet_TJG, # 12 脱机挂中
			EntFBAskRet_Sit, # 13 打坐中
			EntFBAskRet_CrossPKMatching,# 14 跨服匹配中
			EntFBAskRet_InCrossMap, # 15 跨服地图中
			EntFBAskRet_Other, # xx 其他限制
			EntFBAskRet_Max,
			) = range(16)
			) = range(18)


			#增加仙盟活跃的活动类型
			@@ -1801,3 +1875,16 @@
			Def_Boss_Func_Dogz, # 神兽功能BOSS
			) = range(3)

			# 红包类型定义
			RedPackType_GoldPacket = 0 # 主动发钻石红包
			RedPackType_OpenServer = 5 # 开服红包
			RedPackType_FeastSysBig = 31 # 节日系统大红包
			RedPackType_FeastSysSmall = 32 # 节日系统小红包
			RedPackType_FeastSucc = 33 # 节日成就红包
			# 节日红包类型
			FeastRedPackType = [RedPackType_FeastSysBig, RedPackType_FeastSysSmall, RedPackType_FeastSucc]
			# 需要限制服务器最大红包数的红包类型 {统计个数编号:[红包类型, ...], ...}
			RedPackMaxCountDict = {1:[RedPackType_OpenServer],
			2:[RedPackType_FeastSucc],
			}