From 669ad215fec240afaf92be612f2b0077731c8e0f Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 26 十二月 2018 10:38:46 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发（删除旧跨服代码）
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py | 35 ++++-------------------------------
1 files changed, 4 insertions(+), 31 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
index 16775d0..6287537 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.py
@@ -70,7 +70,6 @@
import PlayerGreatMaster
import ItemControler
import GameFuncComm
-import PlayerMergeEvent
import IpyGameDataPY
import PlayerRune
import GameLogic_DuJie
@@ -231,7 +230,7 @@
# @return 无返回值
def WorldNotify(country, msgMark, msgParamList=[], lineID=0, mergeMinOSD=-1, mergeMaxOSD=-1, mergeMapInfo=[]):
# 如果是跨服服务器，则广播子服
- if GameWorld.IsMergeServer():
+ if GameWorld.IsCrossServer():
sendMsg = str([country, msgMark, msgParamList, lineID, mergeMinOSD, mergeMaxOSD, mergeMapInfo])
GameWorld.GetPlayerManager().GameServer_QueryPlayerResult(0, 0, 0, 'MergeWorldNotify',
sendMsg, len(sendMsg))
@@ -354,7 +353,7 @@
return
# 跨服服务器不允许发送邮件
- if GameWorld.IsMergeServer():
+ if GameWorld.IsCrossServer():
return
itemCountDict = {}
@@ -1650,7 +1649,7 @@
# return
#跨服活动人数分流处理
- if GameWorld.IsMergeServer():
+ if GameWorld.IsCrossServer():
reqMapID = mapID
mapID = __GetMergeFBPlayerMapID(curPlayer, reqMapID)
if not mapID:
@@ -2852,12 +2851,7 @@
SetPlayerCurrency(curPlayer, type_Price, curCurrency - price)
else:
GameWorld.Log("付费金钱异常 type_Price = %s" % (type_Price), curPlayer.GetPlayerID())
- return False
-
- #添加跨服操作事件
- if costType in ChConfig.MergeServerCanCostType:
- eventInfo = [type_Price, price, costType, infoDict, quantity, costVIPGold]
- PlayerMergeEvent.AddMSPlayerEvent(curPlayer.GetPlayerID(), PlayerMergeEvent.Def_MSPEvent_PayMoney, eventInfo)
+ return False
#付款以后后续操作
__PayMoneyAfter(curPlayer, type_Price, price, costType, infoDict, quantity, costVIPGold)
@@ -3658,10 +3652,6 @@
#副本获得经验, 无论获得多少经验均需通知, 有些副本逻辑需要通过获得经验时机处理
if GameWorld.GetMap().GetMapFBType() != IPY_GameWorld.fbtNull:
FBLogic.OnGetExp(curPlayer, finalAddExp, expViewType)
-
- # 跨服中获得经验
- if finalAddExp and GameWorld.IsMergeServer():
- PlayerMergeEvent.AddMSPlayerEvent(curPlayer.GetPlayerID(), PlayerMergeEvent.Def_MSPEvent_AddExp, finalAddExp)
return finalAddExp
@@ -5837,10 +5827,6 @@
SetZhenQi(curPlayer, value)
#EventReport.WriteEvent_add_zhenqi(curPlayer, eventName, eventData, addValue, value)
-
- if GameWorld.IsMergeServer():
- eventInfo = [addValue, eventName, eventData]
- PlayerMergeEvent.AddMSPlayerEvent(curPlayer.GetPlayerID(), PlayerMergeEvent.Def_MSPEvent_AddZhenQi, eventInfo)
return True
@@ -5932,19 +5918,6 @@
def SetLongMaiLV(curPlayer, value):
return
#---------------------------------------------------------------------------
-## 设置玩家跨服预赛排位
-# @param curPlayer: 玩家实例
-# @param value: 威望值
-# @return:
-def SetMergeWarRank(curPlayer, value):
- return
-
-
-## 获取玩家跨服预赛排位
-# @param curPlayer: 玩家实例
-# @return: 威望值
-def GetMergeWarRank(curPlayer):
- return 0
##获取可免费开启的格子数
# @param curPlayer 玩家对象
--
Gitblit v1.8.0