Project_SG_ServerCode.git

			@@ -58,7 +58,6 @@
			import CrossPlayerData
			import ChNetSendPack
			import PlayerState
			import PlayerGubao
			import PlayerOnline
			import PlayerTask
			import PlayerMail
			@@ -1402,7 +1401,7 @@
			#进入副本通用检查
			fbIpyData = FBCommon.GetFBIpyData(mapID)
			fbLineIpyData = FBCommon.GetFBLineIpyData(mapID, lineID)
			sceneMapID = mapID if not fbLineIpyData else fbLineIpyData.GetMapID()
			sceneMapID = mapID #if not fbLineIpyData else fbLineIpyData.GetMapID()
			#过滤封包地图ID
			if not GameWorld.GetMap().IsMapIDExist(sceneMapID):
			GameWorld.ErrLog('###非法地图数据，sceneMapID: %s' % (sceneMapID), curPlayer.GetID())
			@@ -1431,15 +1430,14 @@
			GameWorld.Log("非队长，无法发起进入组队副本请求!", curPlayer.GetPlayerID())
			return
			isSendToGameServer = True
			if isSendToGameServer or mapID in ChConfig.Def_MapID_SendToGameServer \
			or mapID in ReadChConfig.GetEvalChConfig("MapID_SendToGameServer"):
			if isSendToGameServer:
			extendParamList = []
			if mapID in ChConfig.Def_MapID_LineIDToPropertyID:
			enterCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_EnterFbCntDay % mapID)
			enterCnt = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FbEnterCnt % mapID)
			extendParamList = [enterCnt]
			elif mapID in ChConfig.MirrorBattleMapIDList:
			reqInfoEx["sceneMapID"] = sceneMapID
			extendParamList = [reqInfoEx]
			#elif mapID in ChConfig.MirrorBattleMapIDList:
			# reqInfoEx["sceneMapID"] = sceneMapID
			# extendParamList = [reqInfoEx]
			SendToGameServerEnterFB(curPlayer, mapID, lineID, tick, extendParamList)
			return

			@@ -1663,8 +1661,7 @@
			curPlayer.SetDict(ChConfig.Def_PlayerKey_TransTick, tick)

			mapID = FBCommon.GetRecordMapID(mapID)
			fbLineIpyData = FBCommon.GetFBLineIpyData(mapID, funcLineID)
			sceneMapID = mapID if not fbLineIpyData else fbLineIpyData.GetMapID()
			sceneMapID = mapID #if not fbLineIpyData else fbLineIpyData.GetMapID()

			# 地图分流, 减少单地图压力
			FBMapShuntDict = ReadChConfig.GetEvalChConfig("FBMapShunt")
			@@ -1824,8 +1821,8 @@
			return tagLineID
			tagLinePlayerCountDict = PyGameData.g_commMapLinePlayerCountDict[tagMapID] # 此分线包含所有分线，含未开放的及活动分线

			if bossID and tagMapID != ChConfig.Def_FBMapID_BossHome:
			tagLineID = 0 # Boss的话未分流前先强制1线，即为0
			#if bossID and tagMapID != ChConfig.Def_FBMapID_BossHome:
			# tagLineID = 0 # Boss的话未分流前先强制1线，即为0
			playerID = curPlayer.GetPlayerID()
			playChangeLineID = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_PlayChangeLineID)
			funcChangeLineID = curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FuncChangeLineID)
			@@ -2983,6 +2980,9 @@
			GameWorld.SendMsgToClientServer(ShareDefine.CrossServerMsg_GiveMoney, msgInfo, [serverGroupID])
			return True

			if priceType == ShareDefine.TYPE_Price_FamilyExp:
			return PlayerFamily.AddFamilyExp(curPlayer, value)

			befMoney = GetMoney(curPlayer, priceType)
			if priceType == IPY_GameWorld.TYPE_Price_Gold_Money:
			updPlayerGold = GetMoneyReal(curPlayer, priceType) + value
			@@ -3065,6 +3065,9 @@

			PlayerTask.AddTaskValue(curPlayer, ChConfig.TaskType_GetMoney, value, [priceType])

			if priceType == ShareDefine.TYPE_Price_FamilyCoin:
			PlayerFamily.AddFamilyContrib(curPlayer, value) # 公会币同步增加公会贡献

			if priceType not in [IPY_GameWorld.TYPE_Price_Gold_Money, IPY_GameWorld.TYPE_Price_Gold_Paper, ShareDefine.TYPE_Price_PayCoin] \
			and giveType == ChConfig.Def_GiveMoney_Unknown:
			#GameWorld.DebugLog("该货币没有指定来源类型不记录!priceType=%s,giveType=%s" % (priceType, giveType))
			@@ -3516,7 +3519,6 @@

			#if aftFreePoint > befFreePoint:
			# curPlayer.SetFreePoint(aftFreePoint)
			PlayerGubao.DoGubaoAddFreePoint(curPlayer)

			# 升级需要执行的游戏功能处理
			GameFuncComm.DoFuncOpenLogic(curPlayer)
			@@ -4202,8 +4204,8 @@
			if actExpIpyData and curPlayer.GetLV() >= actExpIpyData.GetLVLimit():
			fightExpRate += actExpIpyData.GetAddExpRate()

			if curPlayer.GetMapID() not in [ChConfig.Def_FBMapID_FamilyInvade]: #守卫人皇不加组队加成
			fightExpRate += curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_TeamExpRate) # 组队
			#if curPlayer.GetMapID() not in [ChConfig.Def_FBMapID_FamilyInvade]: #守卫人皇不加组队加成
			# fightExpRate += curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_TeamExpRate) # 组队

			#地图多倍经验加成，默认是1倍不加成
			mapExpAddMultiple = 0
			@@ -4404,6 +4406,13 @@
			wave = value % 100
			return chapterID, levelNum, wave

			## 获取佩戴的称号ID
			def GetTitleID(curPlayer): return curPlayer.GetExAttr3()
			def SetTitleID(curPlayer, titleID):
			curPlayer.SetExAttr3(titleID, False, False)
			PlayerFamily.RefreshFamilyMember(curPlayer)
			return

			## 协助目标玩家ID
			def GetAssistTagPlayerID(curPlayer): return 0

			@@ -4412,12 +4421,9 @@
			def SetTeamCheckState(curPlayer, checkState): return
			## 副本功能线路ID, 这里做db存储，防止在合并地图副本中掉线重上时前端无法加载正确的场景资源，登录加载场景时机为0102包
			def SetFBFuncLineID(curPlayer, mapID, funcLineID):
			value = mapID * 1000 + funcLineID
			if value != curPlayer.GetExAttr3():
			curPlayer.SetExAttr3(value, False, True)
			return
			def GetFBFuncMapID(curPlayer): return curPlayer.GetExAttr3() / 1000
			def GetFBFuncLineID(curPlayer): return curPlayer.GetExAttr3() % 1000
			def GetFBFuncMapID(curPlayer): return 0
			def GetFBFuncLineID(curPlayer): return 0

			## 跨服状态所在地图ID: 0-非跨服状态，非0-跨服状态对应的地图ID
			def GetCrossMapID(curPlayer): return curPlayer.GetExAttr5()
			@@ -4447,8 +4453,8 @@
			def SetVIPLVUpTime(curPlayer, lvUpTime): return

			##聊天气泡框
			def GetChatBubbleBox(curPlayer): return curPlayer.GetExAttr10()
			def SetChatBubbleBox(curPlayer, value): return curPlayer.SetExAttr10(value, False, True)
			def GetChatBox(curPlayer): return curPlayer.GetExAttr10()
			def SetChatBox(curPlayer, value): return curPlayer.SetExAttr10(value, False, True)

			##游戏充值支付代币
			def GetPayCoinTotal(curPlayer): return GetPayCoin(curPlayer) + GetPlayerCurrency(curPlayer, ShareDefine.TYPE_Price_PayCoinDay)
			@@ -4460,11 +4466,6 @@
			if payCoinDay > 0:
			PayMoney(curPlayer, ShareDefine.TYPE_Price_PayCoin, payCoinDay, "PayCoinOnDay")
			return

			## 获取佩戴的称号ID
			def GetTitleID(curPlayer):
			curDienstgradMgr = curPlayer.GetDienstgradManager()
			return curDienstgradMgr.GetCurGradID()

			##伴侣
			def GetCoupleID(curPlayer):
			@@ -4834,10 +4835,6 @@

			# 血瓶恢复效果
			def GetHPCureEnhance(curPlayer): return 0

			# 仙盟徽章ID
			def GetFamilyEmblemID(curPlayer): return curPlayer.NomalDictGetProperty(ChConfig.Def_Player_Dict_FamilyEmblemID)
			def SetFamilyEmblemID(curPlayer, emblemID): NomalDictSetProperty(curPlayer, ChConfig.Def_Player_Dict_FamilyEmblemID, emblemID)

			# 仙盟职位，使用 GetReceivedSalary，因为FamilyMemberLV没有入库
			def GetFamilyMemberLV(curPlayer): return curPlayer.GetReceivedSalary()