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
			@@ -276,9 +274,6 @@
			Def_Notify_WorldKey_FamilyKillHorsePetRobBossCnt = 'FamilyKillHorsePetRobBossCnt' # 仙盟击杀骑宠boss数统计
			Def_Notify_WorldKey_HorsePetRobBossPlayerCount = 'HorsePetRobBossPlayerCount' # 骑宠争夺活动有效参考人数

			Def_Notify_WorldKey_FamilyActivityDayState = "FamilyActivityDayState" #战盟相关活动今日开启状态, 按位存储代表今日是否开启过

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

			Def_Notify_WorldKey_AssistBoss = "AssistBoss" # 协助boss
			@@ -308,7 +303,6 @@
			OperationActionName_WeekParty = "ActWeekParty" # 周狂欢活动
			OperationActionName_LoginAward = "ActLoginAward" # 登录奖励活动
			OperationActionName_FeastWeekParty = "ActFeastWeekParty" # 节日巡礼狂欢活动
			OperationActionName_FeastRedPacket = "ActFeastRedPacket" # 节日红包活动
			OperationActionName_CollectWords = "ActCollectWords" # 集字活动
			OperationActionName_LuckyTreasure = "ActLuckyTreasure" # 幸运鉴宝活动
			OperationActionName_RechargePrize = "ActRechargePrize" # 充值返利活动（节日活动）
			@@ -329,7 +323,7 @@
			OperationActionName_Yunshi = "ActYunshi" # 运势活动
			OperationActionName_Lunhuidian = "ActLunhuidian" # 轮回殿活动
			#节日活动类型列表 - 该类型无视开服天，日期到了就开启
			FeastOperationActionNameList = [OperationActionName_FeastWeekParty, OperationActionName_FeastRedPacket,
			FeastOperationActionNameList = [OperationActionName_FeastWeekParty,
			OperationActionName_RechargeRebateGold, OperationActionName_GrowupBuy,
			OperationActionName_FeastLogin,
			OperationActionName_FeastWish, OperationActionName_FeastTravel,
			@@ -622,7 +616,7 @@
			CDBPlayerRefresh_RuneSplinters, # 符印碎片 170
			CDBPlayerRefresh_RealmPoint, # 境界修炼点
			CDBPlayerRefresh_Ysog, # 魔精
			CDBPlayerRefresh_FamilyActivity, # 仙盟活跃令
			CDBPlayerRefresh_FamilyCoin, # 仙盟公会币
			CDBPlayerRefresh_ParryRateDef, # 抗格挡
			CDBPlayerRefresh_PKState, # 战斗状态 175
			CDBPlayerRefresh_BossState, # boss״̬
			@@ -739,11 +733,11 @@
			) = range(146, 287)

			TYPE_Price_Gold_Paper_Money = 5 # 金钱类型，（先用礼券，再用金子）
			TYPE_Price_Family_Contribution = 6 # 战盟贡献度（活跃度转换得来）
			TYPE_Price_FamilyExp = 6 # 战盟经验
			TYPE_Price_FamilyStoreScore = 10 # 战盟仓库积分
			TYPE_Price_RealmPoint = 13 # 境界修炼点
			TYPE_Price_Ysog = 14 # 魔精
			TYPE_Price_FamilyActivity = 15 # 仙盟活跃令
			TYPE_Price_FamilyCoin = 15 # 仙盟公会贡献币
			TYPE_Price_FBHelpPoint = 16 # 副本助战积分, 废弃
			TYPE_Price_Honor = 18 # 荣誉
			TYPE_Price_BossActScore = 19 # boss活动积分，bt版用
			@@ -783,7 +777,7 @@

			#key可用于遍历所有货币，value仅GM相关会用到
			MoneyNameDict = {
			1:"金币", 41:"战锤", 42:"将星玉髓", 51:"招募积分", 52:"淘金令", 53:"挑战券",
			1:"金币", 15:"公会贡献币", 41:"战锤", 42:"将星玉髓", 51:"招募积分", 52:"淘金令", 53:"挑战券",
			98:"代币时效", 99:"代币"
			}
			#MoneyNameDict = {
			@@ -800,7 +794,6 @@

			# 自定义积分及通知字典 {货币类型:通知客户端刷新类型, ...} , 如果不通知的话刷新类型则配置 None
			TYPE_Price_CurrencyDict = {
			TYPE_Price_Family_Contribution:CDBPlayerRefresh_FamilyContribution,
			TYPE_Price_FamilyStoreScore:CDBPlayerRefresh_FamilyStoreScore,
			TYPE_Price_Rune:CDBPlayerRefresh_Rune,
			TYPE_Price_RuneSplinters:CDBPlayerRefresh_RuneSplinters,
			@@ -808,7 +801,7 @@
			TYPE_Price_BourseMoney:None,
			TYPE_Price_RealmPoint:CDBPlayerRefresh_RealmPoint,
			TYPE_Price_Ysog:CDBPlayerRefresh_Ysog,
			TYPE_Price_FamilyActivity:CDBPlayerRefresh_FamilyActivity,
			TYPE_Price_FamilyCoin:CDBPlayerRefresh_FamilyCoin,
			TYPE_Price_Danjing:CDBPlayerRefresh_Danjing,
			TYPE_Price_SoulDust:CDBPlayerRefresh_SoulDust,
			TYPE_Price_SoulSplinters:CDBPlayerRefresh_SoulSplinters,
			@@ -848,10 +841,9 @@
			) = range(1, 4)

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

			# 以下为暂时无用的
			GameFuncID_Wing = -1 # 翅膀 3
			@@ -967,7 +959,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,
			@@ -984,7 +976,7 @@
			Def_UniversalGameRecType_CrossBattleChampionGroup, # 跨服战场冠军赛分组信息 38
			Def_UniversalGameRecType_CrossYaomoBossHurtInfo, # 跨服妖魔boss伤血信息 39
			Def_UniversalGameRecType_40,
			Def_UniversalGameRecType_RedPacketRecord, # 红包产出结果记录41
			Def_UniversalGameRecType_41, # 红包产出结果记录41
			Def_UniversalGameRecType_42,
			Def_UniversalGameRecType_43,
			Def_UniversalGameRecType_44,
			@@ -1000,15 +992,15 @@
			Def_UniversalGameRecType_54,
			Def_UniversalGameRecType_55,
			Def_UniversalGameRecType_56,
			Def_UniversalGameRecType_GrabRedAllRecord, # 抢红包总记录57
			Def_UniversalGameRecType_GrabRedNewRecord, # 抢红包可抢信息记录58
			Def_UniversalGameRecType_GrabRedOldRecord, # 抢红包已抢完信息记录59
			Def_UniversalGameRecType_57, # 抢红包总记录57
			Def_UniversalGameRecType_58, # 抢红包可抢信息记录58
			Def_UniversalGameRecType_59, # 抢红包已抢完信息记录59
			Def_UniversalGameRecType_60,
			Def_UniversalGameRecType_61,
			Def_UniversalGameRecType_62,
			Def_UniversalGameRecType_63,
			Def_UniversalGameRecType_FamilyRedPacketAllRecord, # 仙盟红包总记录64
			Def_UniversalGameRecType_FamilyRedPacketGrabRecord, # 仙盟红包已抢信息记录65
			Def_UniversalGameRecType_64, # 仙盟红包总记录64
			Def_UniversalGameRecType_65, # 仙盟红包已抢信息记录65
			Def_UniversalGameRecType_DujieHelpAllRecord, # 渡劫副本护法总记录66
			Def_UniversalGameRecType_DujieHelpRecord, # 渡劫副本护法详细记录67
			Def_UniversalGameRecType_FamilyWarBattle, # 仙盟联赛对战表68
			@@ -1029,21 +1021,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，最大条数配置决定
			@@ -1051,13 +1043,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, # 记录家族事件
			}

			@@ -1179,7 +1164,6 @@
			CrossServerMsg_ChampionshipOfficial = "ChampionshipOfficial" # 跨服排位争霸赛官职信息
			CrossServerMsg_ChampionshipDailyOfficial = "ChampionshipDailyOfficial" # 跨服排位争霸赛每日官职信息
			CrossServerMsg_ActAllRechargeInfo = "ActAllRechargeInfo"# 跨服全民充值信息
			CrossServerMsg_CrossDailyActionState = "CrossDailyActionState" # 跨服日常任务状态信息
			CrossServerMsg_CrossYaomoBossHurtInfo = "CrossYaomoBossHurtInfo" # 跨服妖魔boss玩家伤害信息
			CrossServerMsg_FamilyFlagwarOver = "FamilyFlagwarOver" # 逐鹿万界结算信息
			CrossServerMsg_Worship = "Worship" # 膜拜信息
			@@ -1471,59 +1455,6 @@
			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 = (
			SuccType_HeroLV, # 等级达到XX级成就1
			@@ -1625,7 +1556,7 @@
			SuccType_XXX97, # 废弃97
			SuccType_XXX98, # 废弃98
			SuccType_XXX99, # 废弃99
			SuccType_FamilyTechLV, # 仙盟X技能X级100
			SuccType_100, # 100
			SuccType_XXX101, # 废弃101
			SuccType_XXX102, # 废弃102
			SuccType_XXX103, # 废弃103
			@@ -1659,15 +1590,15 @@
			SuccType_Collect, #采集X物品X次131
			SuccType_InlayGatherSoul, #镶嵌X枚X品质聚魂（不包含核心）132
			SuccType_GatherSoulLvUp, #累计聚魂总等级XX（不包含核心）133
			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
			SuccType_134, #节日红包 - 世界频道发言 x次 134
			SuccType_135, # 节日红包 - 祈祷x次 135
			SuccType_136, # 节日红包 - 击杀特定NPC x次 136
			SuccType_137, # 节日红包 - 指定类型boss x次 137
			SuccType_138, # 节日红包 - 进入指定地图 x次 138
			SuccType_139, # 节日红包 - 完成x次日常环任务成就 139
			SuccType_140, # 节日红包 - 天机摇骰子x次 140
			SuccType_141, # 节日红包 - 跨服PK x次 141
			SuccType_142, # 节日红包 - 副本扫荡 x次 142
			SuccType_PassSkyTower, #通关天星塔 143
			SuccType_Battlefield_Join, # 古神战场 - 参与 x次 144
			SuccType_Battlefield_CallOpen, # 古神战场 - 召集开启 x次 145
			@@ -1711,9 +1642,6 @@
			SuccType_MineAreaRobCnt, #采集他人福地x次数 183
			) = range(1, 184)

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

			# 连续天规则的成就类型
			ContinueSuccessTypeList = []

			@@ -1725,10 +1653,7 @@
			SuccType_Pray,SuccType_PetClassLV,
			SuccType_QueenRelics,SuccType_XMZZConWin,
			SuccType_Collect,SuccType_DogzBattle,
			SuccType_UseItem,SuccType_FamilyTechLV,
			SuccType_GetSpecialItem,SuccType_GetMagicWeapon,SuccType_XBXZ,
			SuccType_FeastRedPack_KillSpecificNPC,SuccType_FeastRedPack_KillBoss,
			SuccType_FeastRedPack_EnterMap, SuccType_FeastRedPack_FBSweep,
			]

			# 部分参数不向下适配检查的成就类型，此配置的类型不能在 UnDownCheckSuccessTypeList 里 {类型:[不向下适配的参数索引, ...], ...}
			@@ -1842,34 +1767,9 @@
			EntFBAskRet_Max,
			) = range(18)


			#增加仙盟活跃的活动类型
			FamilyActiveIDList = (
			FamilyActive_Task, #仙盟任务
			FamilyActive_Party, #仙盟宴会
			FamilyActive_BOSS, #仙盟BOSS
			FamilyActive_War, #仙盟联赛
			FamilyActive_HelpDujie, #同盟护法
			FamilyActive_SWRH, #守卫人皇
			) = range(1,6+1)


			# BOSS 功能标识区分对应KillBossCntLimit，主要根据击杀类型不同区分
			(
			Def_Boss_Func_World, # 世界BOSS
			Def_Boss_Func_Home, # BOSS之家
			Def_Boss_Func_Dogz, # 神兽功能BOSS
			) = range(3)

			# 红包类型定义
			RedPackType_GoldPacket = 0 # 主动发钻石红包
			RedPackType_OpenServer = 5 # 开服红包
			RedPackType_FeastSysBig = 31 # 节日系统大红包
			RedPackType_FeastSysSmall = 32 # 节日系统小红包
			RedPackType_FeastSucc = 33 # 节日成就红包
			RedPackType_Server = 36 # 全服红包

			# 红包类型分类定义
			RedPackWayType_Family = "1" # 仙盟红包
			RedPackWayType_Server = "2" # 全服红包
			RedPackWayType_Feast = "3" # 节日红包