SnxxServerCode.git

			@@ -2575,6 +2575,12 @@
			SetFamilyBroadcastCnt(family, 0)
			#清除本周任务已获得资金数量
			SetCurWeekMissionMoney(family, 0)
			for j in xrange(family.GetCount()):
			member = family.GetAt(j)
			#原先是地图玩家上线后重置，导致玩家不上线周贡献显示之前的，固在此重置
			member.SetFamilyActiveValue(0)


			#通知地图服务器刷新家族属性
			SendPack_MapServer_PlayerFamilyRefresh(family)
			#oss记录上周家族信息

			@@ -235,15 +235,16 @@

			# 当前状态处理
			if curState == ShareDefine.Def_PetState_Fight:
			curPet = curPlayer.GetPetMgr().GetFightPet()
			if curPet:
			#已是出战状态, C++召唤坐标和人重叠
			resultPos = GameMap.GetEmptyPlaceInArea(curPlayer.GetPosX(), curPlayer.GetPosY(), ChConfig.Def_SummonAppearDist)
			curPet.ResetPos(resultPos.GetPosX(), resultPos.GetPosY())
			PassiveBuffEffMng.GetPassiveEffManager().RegistPassiveEff(curPet)
			PassiveBuffEffMng.GetPassiveEffManager().RegistPassiveBuff(curPet)
			return
			#PetControl.ReCallFightPet(curPlayer)
			# curPet = curPlayer.GetPetMgr().GetFightPet()
			# if curPet:
			# #已是出战状态, C++召唤坐标和人重叠
			# resultPos = GameMap.GetEmptyPlaceInArea(curPlayer.GetPosX(), curPlayer.GetPosY(), ChConfig.Def_SummonAppearDist)
			# curPet.ResetPos(resultPos.GetPosX(), resultPos.GetPosY())
			# PassiveBuffEffMng.GetPassiveEffManager().RegistPassiveEff(curPet)
			# PassiveBuffEffMng.GetPassiveEffManager().RegistPassiveBuff(curPet)
			# return
			#18/10/15 因为某种未知原因宠物物品的状态是出战（实际场景中未出战），导致该宠物无法出战，故再次发包出战时，此处不拦！
			PetControl.ReCallFightPet(curPlayer)

			else:
			pass

	ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerFamily.py	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerPet.py	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史