Project_SG_ServerCode.git

			@@ -47,6 +47,7 @@
			Def_FamilyTransDataTime = 'FamilyTransDataTime' # 本服公会首次跨服互通数据开始传输时间戳，不为0代表传输数据中
			Def_OSAAwardState = 'OSAAwardState' #开服冲榜活动结算状态
			Def_OperationActID = 'OperationActID_%s_%s' # 运营活动ID的标记，参数（运营活动名, actNum）
			Def_OperationActCfgID = 'OperationActCfgID_%s_%s' # 运营活动CfgID的标记，参数（运营活动名, actNum）

			#---奇迹, 职业枚举定义---
			(
			@@ -211,35 +212,24 @@

			#运营活动表名定义
			OperationActionName_Lunhuidian = "ActLunhuidian" # 轮回殿活动
			OperationActionName_HeroAppear = "ActHeroAppear" # 武将登场活动

			#所有的运营活动列表，默认都支持多活动分组编号的活动名
			OperationActionNameList = [OperationActionName_Lunhuidian]
			OperationActionNameList = [OperationActionName_Lunhuidian, OperationActionName_HeroAppear]

			#活动对应活动类型，每种活动如有需要可以设置对应的唯一类型，可与ActNum组合成唯一的记录key {ActionName:ActType, ...}
			#一般用于有需要做记录的通用功能，如签到等
			OperationActTypeDict = {OperationActionName_HeroAppear:1,
			}

			OperationActionName_TotalRecharge = "ActTotalRecharge" # 累计充值活动
			OperationActionName_CollectWords = "ActCollectWords" # 集字活动
			OperationActionName_ManyDayRecharge = "ActManyDayRecharge" # 多日连充活动
			OperationActionName_SingleRecharge = "ActSingleRecharge" # 单笔累充活动
			OperationActionName_BuyOne = "ActBuyOne" # 买一送多活动
			OperationActionName_ActLoginNew = "ActLoginNew" # 登录活动-新
			OperationActionName_ActTask = "ActTask" # 活动任务
			OperationActionName_BuyCountGift = "ActBuyCountGift" # 购买次数礼包活动
			OperationActionName_FamilyCTGAssist = "ActFamilyCTGAssist" # 仙盟充值协助

			##所有的运营活动列表，含节日活动
			#OperationActionNameList = [
			# OperationActionName_TotalRecharge,
			# OperationActionName_SingleRecharge,
			# OperationActionName_CollectWords, OperationActionName_ManyDayRecharge,
			# OperationActionName_BuyOne,
			# OperationActionName_ActLoginNew, OperationActionName_ActTask,
			# OperationActionName_BuyCountGift, OperationActionName_FamilyCTGAssist,
			# OperationActionName_Lunhuidian,
			# ]
			##需要记录开启活动时的世界等级的运营活动
			#NeedWorldLVOperationActNameList = [OperationActionName_TotalRecharge,
			# OperationActionName_CollectWords,
			# OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
			# ]

			#跨服运营活动表名定义
			CrossActName_Lianqi = "CrossActLianqi" # 炼器 - 跨服
			@@ -335,7 +325,8 @@
			Def_BT_OSA_MainLevel, # 开服关卡榜 3
			Def_BT_OSA_HeroCall, # 开服招募榜 4
			Def_BT_Dingjunge, # 定军阁过关榜 5
			) = range(0, 6)
			Def_BT_ActHeroAppear, # 武将登场招募榜 6
			) = range(0, 7)

			''' 跨服排行榜类型, 从 150 开始，最大条数在功能配置表 CrossBillboardSet 配置，没配默认100
			与本服榜单存储的是不一样的数据库表格，理论上类型可以和本服榜单类型重复，为了做下区分防误导，跨服榜单从 150 开始
			@@ -349,7 +340,9 @@
			BillboardTypeAllList = BillboardTypeList + CrossBillboardTypeList

			BillboardNameDict = {Def_BT_MainLevel:"主线过关榜", Def_BT_Arena:"演武场积分周榜", Def_BT_Tianzi:"天子考验伤害榜",
			Def_BT_OSA_MainLevel:"开服关卡榜", Def_BT_OSA_HeroCall:"开服招募榜", Def_BT_Dingjunge:"定军阁过关榜"}
			Def_BT_OSA_MainLevel:"开服关卡榜", Def_BT_OSA_HeroCall:"开服招募榜", Def_BT_Dingjunge:"定军阁过关榜",
			Def_BT_ActHeroAppear:"武将登场招募榜（分组值1-ActNum）"
			}

			#仙盟榜单类型
			FamilyBillboardList = []
			@@ -662,7 +655,7 @@
			# }

			#需要记录累计消耗的货币类型
			UseTotalPriceTypeList = [TYPE_Price_TiandaoFruit]
			UseTotalPriceTypeList = []

			# 自定义积分及通知字典 {货币类型:通知客户端刷新类型, ...} , 如果不通知的话刷新类型则配置 None
			TYPE_Price_CurrencyDict = {
			@@ -687,14 +680,12 @@
			#TYPE_Price_SoulCore:CDBPlayerRefresh_SoulCore,
			#TYPE_Price_Honor:CDBPlayerRefresh_Honor,
			#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_FamilyFlagWarPoint:CDBPlayerRefresh_FamilyFlagWarPoint,
			#TYPE_Price_GatherSoul:CDBPlayerRefresh_GatherSoul,
			#TYPE_Price_TiandaoFruit:CDBPlayerRefresh_TiandaoFruit,
			#TYPE_Price_XianyuanScore:CDBPlayerRefresh_XianyuanScore,
			#TYPE_Price_HuanjinggeScore:CDBPlayerRefresh_HuanjinggeScore,
			}
			@@ -786,7 +777,8 @@
			Def_GameRecType_ArenaRecord, # 演武场玩家挑战记录，playerID 308
			Def_GameRecType_BatPreset, # 战斗方案预设额外存储信息，playerID 309
			Def_GameRecType_Setting, # 前端自定义存储的设置内容，playerID 310
			) = range(300, 1 + 310)
			Def_GameRecType_Treasure, # 寻宝记录，treasureType 311
			) = range(300, 1 + 311)
			#通用信息记录新 - 字典key配置，如果有配置，则可额外按对应记录Value值存储字典，方便快速取值，可配置Value编号 1~8，配空默认 Value1
			Def_GameRecValueKeyDict = {
			Def_GameRecType_Xiangong:[1],
			@@ -1068,7 +1060,6 @@
			CrossServerMsg_CrossAssist = "CrossAssist" # 跨服协助
			CrossServerMsg_FamilyFlagwarOver = "FamilyFlagwarOver" # 逐鹿万界结算信息
			CrossServerMsg_Worship = "Worship" # 膜拜信息
			CrossServerMsg_Xiangong = "Xiangong" # 仙宫信息
			CrossServerMsg_FuncTeamInfo = "FuncTeamInfo" # 功能队伍信息同步
			CrossServerMsg_FuncTeamDel = "FuncTeamDel" # 功能队伍删除同步
			CrossServerMsg_FuncTeamList = "FuncTeamList" # 功能队伍列表同步
			@@ -1106,7 +1097,6 @@
			ClientServerMsg_ChangeFuncTeam = "ChangeFuncTeam" # 修改功能队伍
			ClientServerMsg_FuncTeamMemOP = "FuncTeamMemOP" # 功能队伍成员操作
			ClientServerMsg_QueryFuncTeam = "QueryFuncTeam" # 查询功能队伍
			ClientServerMsg_QueryXiangong = "QueryXiangong" # 查看仙宫仙名录
			ClientServerMsg_LianqiScore = "LianqiScore" # 炼器积分
			ClientServerMsg_SyncFamilyInfo = "SyncFamilyInfo" # 仙盟信息同步
			ClientServerMsg_QueryCrossFamily = "QueryCrossFamily" # 查询跨服仙盟
			@@ -1179,8 +1169,9 @@
			Def_IudetHeroStar = 72 # 英雄星级
			Def_IudetHeroBreakLV = 74 # 英雄突破等级
			Def_IudetHeroAwakeLV = 76 # 英雄觉醒等级
			Def_IudetHeroSkin = 78 # 英雄使用的皮肤索引
			Def_IudetHeroSkin = 78 # 英雄使用的皮肤索引 - 形象
			Def_IudetHeroCardEffective = 80 # 卡牌在主线预设中生效标识，每个武将在某一阵容预设中仅有一张卡牌生效，废弃，使用 Def_IudetHeroEffPresetID 代替
			Def_IudetHeroSkinAttr = 82 # 英雄使用的皮肤索引 - 属性

			# 200~300 宠物数据用
			Def_IudetPet_NPCID = 200 # npcID