From 4b411bb19ecb34dacf6792220d5ffb79afb9d022 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 19 四月 2019 17:55:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py | 35 +++++++++++++++--------------------
1 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
index c7ab944..1c96456 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
@@ -37,7 +37,6 @@
import PlayerBillboard
import PlayerExam
import PlayerControl
-import PlayerRecall
import PlayerFamilyAction
import PlayerUniversalGameRec
import PlayerFamily
@@ -513,6 +512,21 @@
PlayerControl.CrossNotify(serverGroupIDList, crossNotifyList)
return
+ if callName == "DynamicLineMapOpen":
+ realMapID, copyMapID = eval(resultName)
+ PlayerFB.OnCrossDynamicLineOpen(realMapID, copyMapID)
+ return
+
+ if callName == "DynamicLineMapClose":
+ realMapID, copyMapID, funcLineDataCache = eval(resultName)
+ PlayerFB.OnCrossDynamicLineClose(realMapID, copyMapID, funcLineDataCache)
+ return
+
+ if callName == "DynamicLineMapInitOK":
+ realMapID, copyMapCount = eval(resultName)
+ PlayerFB.OnCrossDynamicMapReset(realMapID, copyMapCount)
+ return
+
if callName == "CommMapServerInitOK":
dataMapID, lineID, realMapID, copyMapID = eval(resultName)
PyGameData.g_commMapLineInfo[(dataMapID, lineID)] = (realMapID, copyMapID)
@@ -544,11 +558,6 @@
msg, msgList = eval(resultName)
PlayerControl.TeamNotify(teamID, msg, msgList)
- return
-
- if callName == 'ReveiveRecallAward':
- #召回奖励领取情况
- PlayerRecall.ReveiveRecallAwardResult(srcPlayerID, resultName)
return
if callName == "NotifyTruckDestroy":
@@ -699,16 +708,6 @@
# 全局击杀数统计
if callName =="GlobalKillCount":
GameWorldProcess.UpdGlobalKillCount(eval(resultName))
- return
-
- # 新手指导员天数
- if callName =="FreshmanGuiderDay":
- curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
- if not curPlayer:
- return
-
- guiderDay = eval(resultName)[0]
- PlayerControl.SetFreshmanGuiderDay(curPlayer, guiderDay)
return
#生成仙盟红包
@@ -882,10 +881,6 @@
return
resultName = '%s' % ret
- if callName == 'SendInviteCode':
- #邀请码验证回复
- resultName = PlayerRecall.PlayerRecall_InviteCode(srcPlayerID, pack.GetQueryID())
-
if callName == 'OpenServerCampaignAward':
#可否领取开服活动奖励
curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
--
Gitblit v1.8.0