Project_SG_ServerCode.git

			@@ -236,12 +236,8 @@
			Def_Notify_WorldKey_BossShuntPlayer = 'BossShuntPlayer' # boss分流玩家信息
			Def_Notify_WorldKey_BossShuntLineState = 'BossShuntLineState' # boss分流线路对应boss状态
			Def_Notify_WorldKey_BossOnlineHeroCnt = 'BossOnlineHeroCnt_%s' # boss刷新时间用的在线人数, 参数为NPCID
			Def_Notify_WorldKey_FamilyKillHorsePetRobBossCnt = 'FamilyKillHorsePetRobBossCnt' # 仙盟击杀骑宠boss数统计
			Def_Notify_WorldKey_HorsePetRobBossPlayerCount = 'HorsePetRobBossPlayerCount' # 骑宠争夺活动有效参考人数

			Def_Notify_WorldKey_HurtLog = 'HurtLog' # 战斗伤害日志

			Def_Notify_WorldKey_AssistBoss = "AssistBoss" # 协助boss

			Def_Notify_WorldKey_CoupleInfo = "CoupleInfo" # 伴侣信息

			@@ -275,7 +271,6 @@
			OperationActionName_GrowupBuy = "ActGrowupBuy" # 成长必买活动
			OperationActionName_FeastLogin = "ActFeastLogin" # 节日登录活动
			OperationActionName_FeastWish = "ActFeastWish" # 节日祝福活动
			OperationActionName_FeastTravel = "ActFeastTravel" # 节日游历活动
			OperationActionName_ManyDayRecharge = "ActManyDayRecharge" # 多日连充活动
			OperationActionName_SingleRecharge = "ActSingleRecharge" # 单笔累充活动
			OperationActionName_Turntable = "ActTurntable" # 转盘活动
			@@ -291,7 +286,7 @@
			FeastOperationActionNameList = [OperationActionName_FeastWeekParty,
			OperationActionName_RechargeRebateGold, OperationActionName_GrowupBuy,
			OperationActionName_FeastLogin,
			OperationActionName_FeastWish, OperationActionName_FeastTravel,
			OperationActionName_FeastWish,
			OperationActionName_RechargePrize,
			]
			#所有的运营活动列表，含节日活动
			@@ -322,7 +317,7 @@
			OperationActionName_WeekParty, OperationActionName_Turntable,
			OperationActionName_CollectWords,
			OperationActionName_FeastLogin,
			OperationActionName_FeastWish, OperationActionName_FeastTravel,
			OperationActionName_FeastWish,
			OperationActionName_ManyDayRecharge, OperationActionName_SingleRecharge,
			OperationActionName_GodGift,
			]
			@@ -695,7 +690,8 @@
			CDBPlayerRefresh_DOTPerDef, # 持续减伤 284
			CDBPlayerRefresh_GoldRushEnergy, # 淘金令 285
			CDBPlayerRefresh_ArenaTicket, # 挑战券 286
			) = range(146, 287)
			CDBPlayerRefresh_TehuiPoint, # 特惠印绶 287
			) = range(146, 288)

			TYPE_Price_Gold_Paper_Money = 5 # 金钱类型，（先用礼券，再用金子）
			TYPE_Price_FamilyExp = 6 # 战盟经验
			@@ -737,12 +733,13 @@
			TYPE_Price_HeroScore = 51 # 招募积分
			TYPE_Price_GoldRushEnergy = 52 # 淘金令体力
			TYPE_Price_ArenaTicket = 53 # 演武场挑战券
			TYPE_Price_TehuiPoint = 54 # 特惠印绶
			TYPE_Price_PayCoinDay = 98 # 代币时效，每日过天重置
			TYPE_Price_PayCoin = 99 # 代币

			#key可用于遍历所有货币，value仅GM相关会用到
			MoneyNameDict = {
			1:"金币", 15:"公会贡献币", 41:"战锤", 42:"将星玉髓", 43:"将魂", 51:"招募积分", 52:"淘金令", 53:"挑战券",
			1:"金币", 15:"公会贡献币", 41:"战锤", 42:"将星玉髓", 43:"将魂", 51:"招募积分", 52:"淘金令", 53:"挑战券", 54:"特惠印绶",
			98:"代币时效", 99:"代币"
			}
			#MoneyNameDict = {
			@@ -759,36 +756,37 @@

			# 自定义积分及通知字典 {货币类型:通知客户端刷新类型, ...} , 如果不通知的话刷新类型则配置 None
			TYPE_Price_CurrencyDict = {
			TYPE_Price_Rune:CDBPlayerRefresh_Rune,
			TYPE_Price_RuneSplinters:CDBPlayerRefresh_RuneSplinters,
			TYPE_Price_TreasureScore:CDBPlayerRefresh_TreasureScore,
			TYPE_Price_BourseMoney:None,
			TYPE_Price_RealmPoint:CDBPlayerRefresh_RealmPoint,
			TYPE_Price_Ysog:CDBPlayerRefresh_Ysog,
			TYPE_Price_FamilyCoin:CDBPlayerRefresh_FamilyCoin,
			TYPE_Price_Danjing:CDBPlayerRefresh_Danjing,
			TYPE_Price_SoulDust:CDBPlayerRefresh_SoulDust,
			TYPE_Price_SoulSplinters:CDBPlayerRefresh_SoulSplinters,
			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_Xiantao:CDBPlayerRefresh_Xiantao,
			TYPE_Price_Lingyu:CDBPlayerRefresh_Lingyu,
			TYPE_Price_HeroSoul:CDBPlayerRefresh_HeroSoul,
			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,
			TYPE_Price_HeroScore:CDBPlayerRefresh_HeroScore,
			TYPE_Price_GoldRushEnergy:CDBPlayerRefresh_GoldRushEnergy,
			TYPE_Price_ArenaTicket:CDBPlayerRefresh_ArenaTicket,
			TYPE_Price_TehuiPoint:CDBPlayerRefresh_TehuiPoint,
			TYPE_Price_PayCoinDay:CDBPlayerRefresh_PayCoinDay,
			#TYPE_Price_Rune:CDBPlayerRefresh_Rune,
			#TYPE_Price_RuneSplinters:CDBPlayerRefresh_RuneSplinters,
			#TYPE_Price_TreasureScore:CDBPlayerRefresh_TreasureScore,
			#TYPE_Price_BourseMoney:None,
			#TYPE_Price_RealmPoint:CDBPlayerRefresh_RealmPoint,
			#TYPE_Price_Ysog:CDBPlayerRefresh_Ysog,
			#TYPE_Price_Danjing:CDBPlayerRefresh_Danjing,
			#TYPE_Price_SoulDust:CDBPlayerRefresh_SoulDust,
			#TYPE_Price_SoulSplinters:CDBPlayerRefresh_SoulSplinters,
			#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,
			}

			# 支持负值的货币及对应0418刷新类型
			@@ -797,36 +795,16 @@
			2:CDBPlayerRefresh_MoneyMinusGoldPaper,
			}

			# 高效战斗状态
			Def_Battle_Status = (
			Def_Battle_Start, # 激活
			Def_Battle_Stop, # ֹͣ
			Def_Battle_Query # 查询
			) = range(1, 4)

			# 游戏功能ID定义，需确保唯一，与PyGameFuncControl.txt中FuncId一致
			GameFuncID_Official = 10 # 官爵，境界
			GameFuncID_Family = 11 # 战盟，仙盟
			GameFuncID_Shop = 16 # 商城，坊市
			GameFuncID_Arena = 27 # 竞技场
			GameFuncID_Horse = 37 # 坐骑
			GameFuncID_Travel = 44 # 游历

			# 以下为暂时无用的
			GameFuncID_Wing = -1 # 翅膀 3
			GameFuncID_Pet = -1 # 宠物，灵宠 6
			GameFuncID_Horse = -1 # 坐骑 8
			GameFuncID_OSSail = -1 # 开服特惠 132
			GameFuncID_AddPoint = -1 # 加点功能/灵根功能 145

			#家族悬赏任务完成状态记录位标识
			Def_ArrestOverState_BitDic = {
			5000:0,
			5001:1,
			5002:2,
			5003:3,
			5004:4,
			5005:5,
			5006:6,
			}

			#背包类型
			(
			@@ -1059,6 +1037,23 @@
			CampType_Evil, #邪恶(与 Def_ID2Win 一致)
			] = range(3)

			# json里的配表服务器类型（0主服，1子服，2跨服，3战斗服）]
			serverType_Main = 0 # 0主服
			serverType_Child = 1 # 1子服
			serverType_Cross = 2 # 2跨服
			serverType_Battle = 3 # 3战斗服

			# dirType //0全广播，1通知主服务器排除合服子服，2通知服务器包含合服子服， 3通知跨服服务器，4通知战斗服务器
			dirType_All = 0 # 0全广播
			dirType_Main = 1 # 1通知主服务器排除合服子服
			dirType_Child = 2 # 2通知服务器包含合服子服
			dirType_Cross = 3 # 3通知跨服服务器
			dirType_Battle = 4 # 4通知战斗服务器

			# 服务器间的信息定义
			SSMsg_BattleRequest = "SS_BattleRequest"
			SSMsg_BattleResult = "SS_BattleResult"

			# 跨服服务器发送子服信息定义
			CrossServerMsg_CrossServerState = "CrossServerState" # 跨服服务器状态变更
			CrossServerMsg_PlayerLoginout = "PlayerLoginout" # 玩家上下线状态同步
			@@ -1202,8 +1197,6 @@
			Def_IudetBaseAttrID = 21 # 物品基础属性ID列表，适用于随机范围基础属性（非物品表配置的固定属性）
			Def_IudetBaseAttrValue = 23 # 物品基础属性值列表
			Def_IudetPartSuiteLV = 25 # 部位套装等级 [套装类型1等级, 套装类型2等级, ...]
			Def_IudetWingMaterialItemID = 27 # 翅膀精炼材料ID列表
			Def_IudetWingMaterialItemCount = 29 # 翅膀精炼材料个数列表
			Def_IudetDogzEquipPlus = 31 # 神兽装备强化信息列表 [强化等级, 累计总熟练度]
			Def_IudetItemDecompound = 33 # 拆解返还物品列表 [装备ID,材料1ID,个数,是否绑定,材料2ID,个数,是否绑定,...]
			Def_IudetLiantaiItemID = 35 # 合成该莲台的所有莲台ID [itemID, itemID, ...]
			@@ -1232,7 +1225,6 @@
			Def_IudetLastOpenItemLoginDay = 36 # 上一次开启物品时的登录天数
			Def_IudetRuneLV = 38 # 符印等级
			Def_IudetRuneSource = 40 # 符印来源老号0,默认1，合成2(主要用来区分是否合成获得)
			Def_IudetWingProgressValue = 42 #羽翼精炼值
			Def_IudetCreateTime = 44 # 时效物品的创建时间
			Def_IudetGatherSoulLV = 46 # 聚魂等级
			Def_IudetExpireTime = 48 # 时效物品指定有效时间，时间单位由时效类型决定
			@@ -1252,8 +1244,6 @@
			Def_IudetPet_Star = 210 # 星级
			Def_IudetPet_Skill = 201 # 技能列表

			Def_IudetHorsePetSkinIndex = 210 # 骑宠觉醒外观索引

			# 以下为自定义的设置物品属性key
			Def_CItemKey_AppointID = "AppointID"
			# ----------------------------------------------------
			@@ -1263,7 +1253,7 @@
			# 阵容定义
			LineupList = (
			Lineup_Main, # 主阵容 1
			Lineup_Arena, # 竞技场进攻阵容 2
			Lineup_ArenaAtk, # 竞技场进攻阵容 2
			Lineup_ArenaDef, # 竞技场防守阵容 3
			) = range(1, 1 + 3)

			@@ -1376,8 +1366,6 @@
			Def_UserAction_UseNewGuyCard = 5015 # 使用新手卡, 暂写死在代码中

			Def_UserAction_ExMissionLog = "DwzCw4q8cWTB_ex-mission-log" # 扩展任务记录
			Def_UserAction_HorseClass = "DwzCw4q8cWTB_ex-horse-class" # 坐骑进阶记录
			Def_UserAction_WingClass = "DwzCw4q8cWTB_ex-wing-class" # 翅膀进阶记录
			Def_UserAction_PetLV = "DwzCw4q8cWTB_ex-pet-lv" # 宠物升级记录
			Def_UserAction_PetClass = "DwzCw4q8cWTB_ex-pet-class" # 宠物进阶记录
			Def_UserAction_GiveMoney = "DwzCw4q8cWTB_ex-give-money" # 货币产出记录
			@@ -1385,13 +1373,10 @@
			Def_UserAction_EquipItem = "DwzCw4q8cWTB_ex-equip-item" # 玩家装备统计
			Def_UserAction_ItemRecord = 1404 # 物品流水记录
			Def_UserAction_CoinToGold = "DwzCw4q8cWTB_ex-coin-to-gold" # 兑换点券
			Def_UserAction_RuneLV = "DwzCw4q8cWTB_ex-wing-soul-lv" # 符印升级记录
			Def_UserAction_ChangeName = "DwzCw4q8cWTB_ex-change-name" # 改名记录
			Def_UserAction_AddZhenqi = "DwzCw4q8cWTB_ex-add-zhenqi" # 增加真气记录
			Def_UserAction_LostZhenqi = "DwzCw4q8cWTB_ex-lost-zhenqi" # 扣除真气记录
			Def_UserAction_CoatLV = "DwzCw4q8cWTB_ex-coat-lv" # 时装升级记录
			Def_UserAction_WingSkinLV = "DwzCw4q8cWTB_ex-wingskin-lv" # 幻化翅膀升级记录
			Def_UserAction_HorseSkinLV = "DwzCw4q8cWTB_ex-horseskin-lv" # 幻化坐骑升级记录


			Def_UserAction_Money_Use = 0 # 货币消费