Project_SG_ServerCode.git

			@@ -187,8 +187,6 @@
			Def_Notify_WorldKey_OperationActionInfo = "OperationActionInfo_%s" # 运营活动信息，参数为运营活动名
			Def_Notify_WorldKey_CrossActInfo = "CrossActInfo_%s" # 跨服运营活动信息，参数为运营活动名
			Def_Notify_WorldKey_ActionBossRebornSign = "ActBossSign_%s" # 活动boss重生标记，参数为日常活动ID 或运营活动名
			Def_Notify_WorldKey_DailyActionState = "DailyActionState_%s" # 日常活动状态，参数为日常活动ID
			Def_Notify_WorldKey_CrossDailyActionState = "CrossDailyActionState_%s" # 跨服日常活动状态，参数为日常活动ID
			Def_Notify_WorldKey_FBEnterTimeLimiitMapID = "FBEnterTimeLimiitMapID" # 进入副本有时间限制的地图ID列表
			Def_Notify_WorldKey_FBCanEnter = "FBCanEnter_%s" # 副本是否可进入，参数为副本DataMapID
			Def_Notify_WorldKey_FBFuncState = "FBFuncState_%s" # 副本状态，参数为副本DataMapID
			@@ -845,9 +843,9 @@
			) = range(1, 4)

			# 游戏功能ID定义，需确保唯一，与PyGameFuncControl.txt中FuncId一致
			GameFuncID_Official = 12 # 官爵，境界
			GameFuncID_Family = 15 # 战盟，仙盟
			GameFuncID_Arena = 195 # 竞技场
			GameFuncID_Official = 10 # 官爵，境界
			GameFuncID_Family = 11 # 战盟，仙盟
			GameFuncID_Arena = 27 # 竞技场

			# 以下为暂时无用的
			GameFuncID_Wing = -1 # 翅膀 3
			@@ -963,7 +961,7 @@
			Def_UniversalGameRecType_LuckyCloudBuyNum, # 幸运云购购买号码记录 21
			Def_UniversalGameRecType_LuckyCloudBuyLottery, # 幸运云购开奖记录 22
			Def_UniversalGameRecType_CrossBattlefieldBuy, # 玩家购买的跨服战场 23
			Def_UniversalGameRecType_UpdatePlayerName, # 玩家改名正在改名中的信息24
			Def_UniversalGameRecType_24,
			Def_UniversalGameRecType_BossDropGoodItemInfo, # boss掉落好物品信息记录25
			Def_UniversalGameRecType_26,
			Def_UniversalGameRecType_27,
			@@ -1025,21 +1023,21 @@

			#家族行为类型在GameServer.ChConfig.ActionTypeSaveCnt 中配置最高存储条数
			Def_ActionTypeList = (
			Def_ActionType_FamilyPray, #家族祈福0
			Def_ActionType_1, #1
			Def_ActionType_FamilyArrest, #家族悬赏完成情况2
			Def_ActionType_FamilyData, #仙盟额外记录信息0
			Def_ActionType_1,
			Def_ActionType_2,
			Def_ActionType_FamilyAdd, #申请进入家族3
			Def_ActionType_FamilyMember, #记录家族成员信息4(以前开服活动用，暂废弃)
			Def_ActionType_LeaderImpeachTime, # 族长下线了多久5
			Def_ActionType_FamilyBossFB, #记录家族boss副本信息6
			Def_ActionType_FamilyStore, #记录战盟仓库操作记录7
			Def_ActionType_4,
			Def_ActionType_5,
			Def_ActionType_6,
			Def_ActionType_7,
			Def_ActionType_FamilyZhenfa, #仙盟阵法8
			Def_ActionType_XXX9, #9
			Def_ActionType_XXX10, #10
			Def_ActionType_OfficerModelEquip, #记录家族有职位的成员模型装备信息11
			Def_ActionType_9,
			Def_ActionType_10,
			Def_ActionType_11,
			Def_ActionType_FamilyEvent, #记录家族事件12
			Def_ActionType_13, #boss凭证提交 13
			Def_ActionType_FamilyCTGAssist, #仙盟充值协助活动 14
			Def_ActionType_13,
			Def_ActionType_14,
			Def_ActionType_FamilyEmblem, #仙盟时效徽章信息 15
			Def_ActionType_Zhenbaoge, #珍宝阁 16
			Def_ActionType_TalkCache, #聊天缓存 17，最大条数配置决定
			@@ -1047,13 +1045,6 @@

			#家族某行为类型保存的条数
			ActionTypeSaveCnt = {
			Def_ActionType_FamilyPray:10 , #家族祈福
			Def_ActionType_FamilyArrest:7, #家族悬赏
			Def_ActionType_FamilyMember:1, #记录家族成员信息
			Def_ActionType_LeaderImpeachTime:1, # 族长下线了多久
			Def_ActionType_FamilyBossFB:1, # 记录家族boss副本信息
			Def_ActionType_FamilyStore:30, #仓库操作记录
			Def_ActionType_OfficerModelEquip:10, # 记录家族有职位的成员模型装备信息(盟主+副盟主2+战斗队长5)
			Def_ActionType_FamilyEvent:50, # 记录家族事件
			}

			@@ -1175,7 +1166,6 @@
			CrossServerMsg_ChampionshipOfficial = "ChampionshipOfficial" # 跨服排位争霸赛官职信息
			CrossServerMsg_ChampionshipDailyOfficial = "ChampionshipDailyOfficial" # 跨服排位争霸赛每日官职信息
			CrossServerMsg_ActAllRechargeInfo = "ActAllRechargeInfo"# 跨服全民充值信息
			CrossServerMsg_CrossDailyActionState = "CrossDailyActionState" # 跨服日常任务状态信息
			CrossServerMsg_CrossYaomoBossHurtInfo = "CrossYaomoBossHurtInfo" # 跨服妖魔boss玩家伤害信息
			CrossServerMsg_FamilyFlagwarOver = "FamilyFlagwarOver" # 逐鹿万界结算信息
			CrossServerMsg_Worship = "Worship" # 膜拜信息
			@@ -1466,59 +1456,6 @@
			Def_UserAction_Money_Use = 0 # 货币消费
			Def_UserAction_Money_Get = 1 # 货币产出
			#------------------------------------------------------------------------

			# 难度定义
			DifficultyList = (
			Difficulty_Common, # 普通
			Difficulty_Elite, # 精英
			Difficulty_Hero, # 英雄
			) = range(3)

			# 每日活动编号定义
			DailyActionIDList = (
			DailyActionID_DailyRunMission, # 赏金跑环任务
			DailyActionID_FamilyRunMission, # 战盟跑环任务
			DailyActionID_EquipPlus, # 强化
			DailyActionID_FieldFight, # 野外挂机
			DailyActionID_OfflineFight, # 脱机挂机
			DailyActionID_RefineStove, # 炼丹材料消耗 6(废弃)
			DailyActionID_Dice, # 我要太极
			DailyActionID_Pray, # 祈愿
			DailyActionID_WorldBOSS, # 世界BOSS
			DailyActionID_SealDemon, # 封魔坛 10
			DailyActionID_TowerSD, # 符印塔扫荡
			DailyActionID_XXX12, # 废弃12
			DailyActionID_Tower, # 符印塔
			DailyActionID_MagicWeapon, # 法宝集魂
			DailyActionID_FBHelp, # 助战副本 15
			DailyActionID_BOSSHome, # BOSS之家
			DailyActionID_FamilyRobBoss, # 仙盟抢boss
			DailyActionID_KillNPC, # 野外怪物
			DailyActionID_IceLode, # 冰晶矿脉
			DailyActionID_HelpBattleCheckIn, # 助战登记 20
			DailyActionID_CrossReamPK, # 跨服PK 21
			DailyActionID_FamilyBoss1, # 仙盟BOSS 22
			DailyActionID_SkyTower, # 天星塔 23
			DailyActionID_HorsePetBoss, # 骑宠BOSS 24
			DailyActionID_FairyDomain, # 缥缈仙域 25
			DailyActionID_AuctionItem, # 拍卖行上架/竞拍 26
			DailyActionID_LeiFaBoss, # 雷罚boss 27
			DailyActionID_CrossPenglai, # 跨服蓬莱仙境Boss 28
			DailyActionID_FamilyChuanGong, # 仙盟传功 29
			DailyActionID_FamilyParty, # 仙盟宴会 30
			DailyActionID_31, # 活跃修炼 31
			DailyActionID_SkyTreasureBox, # 天降宝箱 32
			DailyActionID_Arena, # 竞技场 33
			DailyActionID_CrossDemonLand, # 跨服魔化之地Boss 34
			DailyActionID_CrossBattlefield, # 跨服战场 35
			DailyActionID_FamilySit, # 跨服战场 36
			) = range(1, 36 + 1)

			# 跨服每日活动编号定义，从150开始
			CrossDailyActionIDList = (
			CrossDailyActionID_YaomoBoss, # 妖魔boss 150
			CrossDailyActionID_FamilyWarFlag, # 跨服仙盟夺旗战/逐鹿万界 151
			) = range(150, 150 + 2)

			# 成就类型定义
			SuccessTypeList = (