Project_SG_ServerCode.git

			@@ -1912,152 +1912,41 @@
			Def_FBMapID_MainBoss = 2 # 主线Boss
			Def_FBMapID_ArenaBattle = 3 # 演武场

			#创角新手村地图ID列表
			Def_CreatRoleMapIDList = [10000]
			#PK周赛
			Def_FBMapID_WeedPK = 12040
			#战盟副本-异界入侵、守卫人皇
			Def_FBMapID_FamilyInvade = 31170
			Def_FBMapID_Zhanchui = 30010 # 白骨盈野/战锤秘境
			Def_FBMapID_Tianzi = 30020 # 天子考验

			# 战盟boss副本
			Def_FBMapID_FamilyBossMap = 31210
			# 仙盟联赛
			Def_FBMapID_FamilyWar = 31220

			# 百战之地
			Def_FBMapID_BZZD = 31080

			#试炼之塔(符印塔)
			Def_FBMapID_TrialTower = 31130

			#除魔卫道
			Def_FBMapID_ClearDevil = 31040
			#新手副本
			#Def_FBMapID_ClearDevil2 = 31090
			#法宝副本
			Def_FBMapID_MagicWeapon = 41110

			#BOSS之家
			Def_FBMapID_BossHome = 31270 #31020地图ID修改，不使用副本类型

			#古神禁地
			Def_FBMapID_GodArea = 31150

			#冰晶矿脉
			Def_FBMapID_IceLode = 31140

			#渡劫副本
			Def_FBMapID_DuJie = 31110

			#麒麟之府
			Def_FBMapID_KirinHome = 311900

			#个人BOSS
			Def_FBMapID_PersonalBoss = 31240

			#仙盟宴会
			Def_FBMapID_FamilyParty = 31230

			#宗门试炼
			Def_FBMapID_MunekadoTrial = 60010

			#混乱妖域
			Def_FBMapID_ChaosDemon = 31180

			#讨伐妖魔
			Def_FBMapID_KillDevil = 31280

			#娲皇遗迹
			Def_FBMapID_QueenRelics = 51010

			#上古战场
			Def_FBMapID_ElderBattlefield = 31160

			#守护副本
			Def_FBMapID_Guard = 31250

			#封魔坛
			Def_FBMapID_SealDemon = 52010
			#单人封魔坛
			Def_FBMapID_SealDemonEx = 52020
			#诛仙BOSS/雷罚BOSS
			Def_FBMapID_ZhuXianBoss = 31380
			#天星塔/丹塔
			Def_FBMapID_SkyTower = 31370
			#境界塔
			Def_FBMapID_RealmTower = 31310
			#仙魔之争
			Def_FBMapID_XMZZ = 31010
			#神兽副本
			Def_FBMapID_Dogz = 21110
			#聚魂副本
			Def_FBMapID_GatherSoul = 31340
			#跨服竞技场
			Def_FBMapID_CrossRealmPK = 32010
			#跨服排位
			Def_FBMapID_CrossChampionship = 32070
			#跨服蓬莱仙境
			Def_FBMapID_CrossPenglai = 32020
			#跨服魔化之地
			Def_FBMapID_CrossDemonLand = 32080
			#跨服妖王
			Def_FBMapID_CrossDemonKing = 32030
			#本服妖王
			Def_FBMapID_DemonKing = 22030
			#多仙盟Boss
			Def_FBMapID_AllFamilyBoss = 31260
			#骑宠Boss
			Def_FBMapID_HorsePetBoss = 31200
			#缥缈宝藏
			Def_FBMapID_FairyTreasure = 31190
			#跨服灵草园
			Def_FBMapID_CrossGrasslandLing = 32040
			#跨服仙草园
			Def_FBMapID_CrossGrasslandXian = 32050
			#跨服战场
			Def_FBMapID_CrossBattlefield = 32060
			#跨服仙盟夺旗战/逐鹿万界
			Def_FBMapID_CrossFamilyFlagwar = 32090
			#情缘副本
			Def_FBMapID_Love = 31300
			#镜像切磋
			Def_FBMapID_MirrorBattle = 100

			#镜像PK的地图ID列表
			MirrorBattleMapIDList = []
			#线路未过关时免费的地图
			UnPassFreeMapIDList = [Def_FBMapID_ArenaBattle]
			#按星级记录过关的地图
			PassByStarMapIDList = []

			#注册上传跨服服务器数据后直接进入跨服服务器的地图
			RegisterEnter_CrossServerMapIDList = [Def_FBMapID_CrossPenglai, Def_FBMapID_CrossDemonLand, Def_FBMapID_CrossDemonKing,
			Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian, Def_FBMapID_CrossBattlefield,
			Def_FBMapID_CrossChampionship, Def_FBMapID_CrossFamilyFlagwar,
			]
			RegisterEnter_CrossServerMapIDList = []
			#跨服地图
			Def_CrossMapIDList = RegisterEnter_CrossServerMapIDList + [Def_FBMapID_CrossRealmPK]
			Def_CrossMapIDList = RegisterEnter_CrossServerMapIDList + []
			#跨服分区类型配置, 没配置的默认 CrossZoneComm
			Def_CrossZoneTypeName = {0:"CrossZoneComm", # 特殊0，默认常规分区
			Def_FBMapID_CrossPenglai:"CrossZoneComm",
			Def_FBMapID_CrossDemonLand:"CrossZoneComm",
			Def_FBMapID_CrossRealmPK:"CrossZonePK",
			Def_FBMapID_CrossDemonKing:"CrossZonePK",
			Def_FBMapID_CrossGrasslandLing:"CrossZonePK",
			Def_FBMapID_CrossGrasslandXian:"CrossZonePK",
			Def_FBMapID_CrossBattlefield:"CrossZoneBattlefield",
			Def_FBMapID_CrossChampionship:"CrossZonePK",
			Def_FBMapID_CrossFamilyFlagwar:"CrossZoneComm",
			# Def_FBMapID_CrossPenglai:"CrossZoneComm",
			# Def_FBMapID_CrossDemonLand:"CrossZoneComm",
			# Def_FBMapID_CrossDemonKing:"CrossZonePK",
			# Def_FBMapID_CrossGrasslandLing:"CrossZonePK",
			# Def_FBMapID_CrossGrasslandXian:"CrossZonePK",
			# Def_FBMapID_CrossBattlefield:"CrossZoneBattlefield",
			# Def_FBMapID_CrossChampionship:"CrossZonePK",
			# Def_FBMapID_CrossFamilyFlagwar:"CrossZoneComm",
			}
			#跨服分区对应地图配置表名 - 仅适用于固定地图及虚拟分线的跨服玩法
			Def_CrossZoneMapTableName = {Def_FBMapID_CrossPenglai:"CrossPenglaiZoneMap",
			Def_FBMapID_CrossDemonLand:"CrossDemonLandZoneMap",
			Def_FBMapID_CrossFamilyFlagwar:"CrossFamilyFlagwarZoneMap",
			Def_CrossZoneMapTableName = {
			#Def_FBMapID_CrossPenglai:"CrossPenglaiZoneMap",
			#Def_FBMapID_CrossDemonLand:"CrossDemonLandZoneMap",
			#Def_FBMapID_CrossFamilyFlagwar:"CrossFamilyFlagwarZoneMap",
			}
			#需要动态分配线路的跨服地图
			Def_CrossDynamicLineMap = [Def_FBMapID_CrossDemonKing, Def_FBMapID_CrossGrasslandLing, Def_FBMapID_CrossGrasslandXian, Def_FBMapID_CrossBattlefield, Def_FBMapID_CrossChampionship]
			Def_CrossDynamicLineMap = []

			#副本关闭时未拾取的物品邮件发放给玩家
			#这里只有需要的副本才配置，不做默认逻辑，防止某些副本实际不能给导致刷物品，如麒麟之府
			Def_SendUnPickItemMailMapIDList = [Def_FBMapID_IceLode, Def_FBMapID_PersonalBoss, Def_FBMapID_MunekadoTrial,
			Def_FBMapID_SealDemon, Def_FBMapID_SealDemonEx, Def_FBMapID_ZhuXianBoss,
			Def_FBMapID_DemonKing, Def_FBMapID_CrossDemonKing, Def_FBMapID_KillDevil]
			Def_SendUnPickItemMailMapIDList = []

			#金钱不掉物品直接给玩家的地图
			Def_GiveMoneyMapIDList = []
			@@ -2065,29 +1954,15 @@
			# 副本中玩家下线就被踢出
			Def_DisconnectExit_FBID = []
			#会有阵营的地图
			Def_MapID_NeedCamp = [Def_FBMapID_FamilyWar, Def_FBMapID_GatherSoul, Def_FBMapID_CrossBattlefield] + MirrorBattleMapIDList
			Def_MapID_NeedCamp = []

			# 进入副本需要根据请求lineID动态分配虚拟分线属性的地图
			Def_MapID_LineIDToPropertyID = [Def_FBMapID_ElderBattlefield]

			# 进入副本需要发送到GameServer的地图
			Def_MapID_SendToGameServer = [Def_FBMapID_HorsePetBoss, Def_FBMapID_FamilyInvade, Def_FBMapID_SealDemon, Def_FBMapID_DemonKing,
			Def_FBMapID_FamilyWar, Def_FBMapID_ZhuXianBoss, Def_FBMapID_AllFamilyBoss] + \
			Def_MapID_LineIDToPropertyID + [Def_FBMapID_CrossChampionship] + MirrorBattleMapIDList

			# 刷新标识点在无玩家的情况下也需要刷新的地图
			Def_NoPlayerNeedProcessRefreshPointMap = [Def_FBMapID_HorsePetBoss, Def_FBMapID_SealDemon, Def_FBMapID_GodArea, Def_FBMapID_BossHome, Def_FBMapID_GatherSoul, Def_FBMapID_ZhuXianBoss, Def_FBMapID_AllFamilyBoss]

			# 可重复进的副本
			Def_NoLimitEnterCntMap = [Def_FBMapID_AllFamilyBoss, Def_FBMapID_FamilyParty, Def_FBMapID_FamilyWar, Def_FBMapID_FamilyInvade, Def_FBMapID_ElderBattlefield, Def_FBMapID_SealDemon]
			Def_MapID_LineIDToPropertyID = []

			# 无玩家时不自动关闭的自伸缩副本
			Def_NoPlayerNotCloseAutoSizeMap = [Def_FBMapID_FamilyInvade, Def_FBMapID_GatherSoul]
			Def_NoPlayerNotCloseAutoSizeMap = []
			# 无玩家时自动关闭的非自伸缩副本
			Def_NoPlayerCloseNotAutoSizeMap = [Def_FBMapID_ZhuXianBoss]

			# 不可切换PK模式的地图
			Def_CanNotChangeAtkModelMap = []
			Def_NoPlayerCloseNotAutoSizeMap = []

			# 从副本退出时，可以返回进入前的副本ID
			Def_CanBackFBMap = []
			@@ -2115,6 +1990,8 @@
			'MainLevel':[Def_FBMapID_Main], # 主线关卡
			'MainLevelBoss':[Def_FBMapID_MainBoss], # 主线关卡boss
			'Arena':[Def_FBMapID_ArenaBattle],
			'Zhanchui':[Def_FBMapID_Zhanchui],
			'Tianzi':[Def_FBMapID_Tianzi],
			}

			#特殊副本ID, 由系统分配, 进入时候不验证IsMapCopyFull
			@@ -3402,16 +3279,12 @@
			Def_Player_Dict_TeamFBPlayerCnt = "TeamFBPlayerCnt" # 请求进入的组队副本玩家个数, 临时用，进入副本设置完后删除
			Def_Player_Dict_ReqFBMissionID = "ReqFBMissionID" # 请求进入副本的任务ID
			Def_Player_Dict_ReqFBMissionType = "ReqFBMissionType" # 请求进入副本的任务类型
			Def_Player_Dict_PlayerFBStar_MapId = "FBStar_%s_%s" # 副本星级星级信息, 参数为[mapID, key编号], 按位存储每个lineID对应的星级
			Def_Player_Dict_FBStar = "FBStar_%s_%s" # 副本星级星级信息, 参数为[mapID, key编号], 按位存储每个lineID对应的星级
			Def_Player_Dict_FBPassLineID = "FBPassLineID_%s" # 副本已过关到的lineID, 参数为副本ID
			Def_Player_Dict_EnterFbCntTotal = "EnterFbCntTotal_%s" # 进入副本总累计次数, 参数为副本ID
			Def_Player_Dict_EnterFbCntDay = "EnterFbCntDay_%s" # 今日进入副本次数, 参数为副本ID
			Def_Player_Dict_BuyFbCntDay = "BuyFbCntDay_%s" # 今日购买副本进入次数, 参数为副本ID
			Def_Player_Dict_ItemAddFbCnt = "ItemAddFbCnt_%s" # 使用物品增加的副本次数, 参数为副本ID
			Def_Player_Dict_EnterFbCntWeek = "EnterFbCntWeek_%s" # 本周进入副本次数, 参数为副本ID
			Def_Player_Dict_FBHistoryMaxLine = "FBHistoryMaxLine_%s" # 副本历史最高通关, 参数为副本ID
			Def_Player_Dict_IceLoadLineID = "IceLoadLineID_%s" # 副本星级星级信息, 参数为[key编号], 按位存储每个lineID是否选中
			Def_Player_Dict_RefurbishGoodBookPlayerLv = "RefurbishGoodBookPlayerLv_97" # 刷新天书任务时的玩家等级
			Def_Player_Dict_FbEnterCnt = "FbEnterCnt_%s" # 今日进入副本次数（获得奖励次数）, 参数为副本ID
			Def_Player_Dict_FBBuyCnt = "FBBuyCnt_%s" # 今日购买副本进入次数, 参数为副本ID
			Def_Player_Dict_FBItemCnt = "FBItemCnt_%s" # 今日使用物品增加的副本次数, 参数为副本ID
			Def_Player_Dict_FBADCnt = "FBADCnt_%s" # 今日已通过广告获得的次数, 参数为副本ID
			Def_Player_Dict_GameFuncFirstTouch = "GameFuncFirstTouch_%s" # 服务端功能首次触发开启状态; 参数, key编号
			Def_Player_Dict_GameFuncAwardState = "GameFuncAwardState_%s" # 服务端功能开启领奖状态; 参数, key编号
			Def_Player_Dict_MissionFinish = "MissionFinish_%s" # 任务是否完成; 参数, 任务ID, 只会记录部分需要记录的任务ID
			@@ -3483,6 +3356,7 @@
			Def_PDict_GoodGameAwardState = "GoodGameAwardState" # 游戏好评领奖记录
			Def_PDict_LikeGameAwardState = "LikeGameAwardState" # 游戏点赞领奖记录
			Def_PDict_RechargeDayAward = "RechargeDayAward" # 累充每日奖励
			Def_PDict_ADCnt = "ADCnt_%s" # 今日已领取广告奖励次数，参数（广告ID）
			Def_PDict_EquipViewCacheState = "EquipViewCacheState" # 本次上线是否同步过装备缓存
			Def_PDict_PackDataSyncState = "PackDataSyncState" # 本次上线打包数据同步状态，按位存储是否同步 0-本服，1-跨服
			Def_PDict_PackDataSyncFightPower = "PackDataSyncFightPower" # 本次上线打包数据同步时的战力，用于对比，只对比求余亿部分即可
			@@ -4147,12 +4021,7 @@
			FuncNoLinearAttrDict = {}

			# 指定地图生效的非线性属性配置
			MapAttrInfoDict_Noline = {
			Def_FBMapID_FamilyWar:{
			TYPE_Calc_FamilyWarAtkPer:[TYPE_Calc_AttrATKMin, TYPE_Calc_AttrATKMax],
			TYPE_Calc_FamilyWarHPPer:[TYPE_Calc_AttrMaxHP],
			}
			}
			MapAttrInfoDict_Noline = {}

			#属性线性索引
			CalcAttrIndexList = (