From 2638c8b67d1dcac1c774f942ac144579c6f82ec1 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 11 九月 2018 21:41:11 +0800
Subject: [PATCH] 3479 【后端】【主干】【1.0.15】助战发送喊话时新增逻辑（自动加入匹配中的队伍）；
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py | 70 ++++++++++++++++++++++++++++++++++-
1 files changed, 68 insertions(+), 2 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
index 6ed28d3..d7caf38 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.py
@@ -102,11 +102,13 @@
import PlayerTJG
import GameLogic_XMZZ
import GameLogic_SealDemon
+import GameLogic_Dogz
import PlayerFlashGiftbag
import PlayerCostRebate
import PlayerSpringSale
import PlayerFairyCeremony
import ChNetSendPack
+import FamilyRobBoss
import PyGameData
import PlayerCoin
import PlayerGeTui
@@ -427,7 +429,7 @@
# 古神禁地
GameLogic_GodArea.GodAreaOnLogin(curPlayer)
# # 采集NPC次数通知
-# NPCCommon.SyncCollNPCTime(curPlayer)
+ NPCCommon.SyncCollNPCTime(curPlayer)
#
# # 特惠活动
# PlayerTeHui.PlayerLogin_TeHui(curPlayer)
@@ -538,6 +540,11 @@
GameFuncComm.DoFuncOpenLogic(curPlayer)
# 神兽
PlayerDogz.OnPlayerLogin(curPlayer)
+ # 神兽副本
+ GameLogic_Dogz.SyncNPCRefreshTime(curPlayer.GetID())
+ # 骑宠
+ FamilyRobBoss.OnPlayerLogin(curPlayer)
+
# 上线查询一次充值订单
curPlayer.SendDBQueryRecharge()
@@ -1842,6 +1849,7 @@
curMap = GameWorld.GetMap()
#校验客户端时间
if not PlayerControl.PlayerMoveCheckClientWorldTick(curPlayer, clientWorldTick, client_StartX, client_StartY):
+ curPlayer.Sync_ClientTick()
return
#移动点检查
@@ -3475,8 +3483,14 @@
return
mapID = curPlayer.GetMapID()
+
+ activityLineID = 0 # 活动线, 默认1线
+ activityMapLineDict = IpyGameDataPY.GetFuncEvalCfg("MapLine", 2, {})
+ if mapID in activityMapLineDict:
+ activityLineID = max(0, activityMapLineDict[mapID] - 1)
+
mapLineDict = IpyGameDataPY.GetFuncEvalCfg("MapLine", 1)
- if mapID in mapLineDict and changLineID >= mapLineDict[mapID]:
+ if changLineID != activityLineID and mapID in mapLineDict and changLineID >= mapLineDict[mapID]:
GameWorld.ErrLog("该地图没有开放此线路，无法手动切换！mapID=%s,changLineID=%s,maxLine=%s"
% (mapID, changLineID, mapLineDict[mapID]), curPlayer.GetID())
return
@@ -3659,6 +3673,7 @@
rebornTime = GetRebronTime(curPlayer, playerRebornType)
#冷却时间到了
if not CanRebornByTimeOver(curPlayer, rebornTime):
+ PlayerControl.NotifyCode(curPlayer, 'RebornCD')
return False
isFBReborn = False
@@ -5217,6 +5232,56 @@
return
+
+## 地图NPC数量查询封包 A2 27 查询地图NPC数量信息 #tagCMQueryNPCCntInfo
+# @param curPlayer
+# @return None
+def OnQueryMapNPCCntInfo(index, clientData, tick):
+ curPlayer = GameWorld.GetPlayerManager().GetPlayerByIndex(index)
+ if not curPlayer:
+ return
+
+ # 查询间隔控制
+ if not clientData.IsNoTimeLimit:
+ if not GameWorld.CheckPlayerTick(curPlayer, ChConfig.TYPE_Player_Tick_QueryMapNPCInfo, tick):
+ GameWorld.DebugLog("OnQueryMapNPCCntInfo 查询过于频繁！")
+ return
+
+ tagMapID = clientData.MapID
+ tagLineID = clientData.LineID
+ queryNPCStr = clientData.NPCIDList
+ npcIDList = []
+ if queryNPCStr:
+ try:
+ npcIDList = eval(clientData.NPCIDList)
+ except BaseException:
+ GameWorld.ErrLog("OnQueryMapNPCCntInfo, npcIDList=%s" % clientData.NPCIDList)
+ return
+
+ if not isinstance(npcIDList, list):
+ GameWorld.ErrLog("OnQueryMapNPCCntInfo, npcIDList=%s is not list！" % str(npcIDList))
+ return
+
+ GameWorld.DebugLog("OnQueryMapNPCCntInfo tagMapID=%s,tagLineID=%s,npcIDList=%s"
+ % (tagMapID, tagLineID, str(npcIDList)))
+
+ curMapID = GameWorld.GetMap().GetMapID()
+
+ # 如果是同张地图，直接查询通知
+ if curMapID == tagMapID:
+ npcInfoDict = NPCCommon.GetNPCCntInfo(npcIDList, tick)
+
+ GameWorld.DebugLog(" 同地图查询curMapID=%s,tagLineID=%s,npcInfoDict=%s"
+ % (curMapID, tagLineID, str(npcInfoDict)))
+ NPCCommon.SyncNPCCntInfo(curPlayer, tagMapID, npcInfoDict)
+ else:
+ # 请求GameServer目标地图NPC信息
+ sendMsg = "%s" % str([tagMapID, tagLineID, npcIDList])
+ curPlayer.GameServer_QueryPlayerByID(ChConfig.queryType_NPCCnt, 0,
+ 'NPCCnt', sendMsg, len(sendMsg))
+ return
+
+
## 跨服赛报名状态
# @param index 玩家索引
# @param tick 当前时间
@@ -5354,6 +5419,7 @@
#校验客户端时间
if not PlayerControl.PlayerMoveCheckClientWorldTick(curPlayer, sendPack_WorldTick, sendPack_SeverPosX, sendPack_SeverPosY):
+ curPlayer.Sync_ClientTick()
return False
dist = GameWorld.GetDist(curPlayer.GetPosX(), curPlayer.GetPosY(), sendPack_SeverPosX, sendPack_SeverPosY)
--
Gitblit v1.8.0