From 7fc14311b1a05376ffb63c6ddb8ccbfda6ee0456 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 11 一月 2019 21:59:21 +0800
Subject: [PATCH] 5722 【后端】【1.5】跨服BOSS开发（增加回本服时如果本服角色死亡则直接复活、回本服刷新本服队伍信息）
---
ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.py | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.py
index 81f0048..b824568 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerCompensation.py
@@ -22,7 +22,7 @@
#------------------------------------------------------------------------------
import GameWorld
import ChConfig
-#import ShareDefine
+import ShareDefine
import IPY_GameServer
import ChGameToMapPyPack
import NetPackCommon
@@ -121,6 +121,8 @@
return
def SendMailByKey(mailTypeKey, playerIDList, addItemList, paramList=[], gold=0, goldPaper=0, silver=0, detail=""):
+ if not mailTypeKey:
+ mailTypeKey = ShareDefine.DefaultLackSpaceMailType
GameWorld.DebugLog("SendMailByKey %s, playerIDList=%s, addItemList=%s, paramList=%s, gold=%s, goldPaper=%s, silver=%s"
% (mailTypeKey, playerIDList, addItemList, paramList, gold, goldPaper, silver))
title = ""
@@ -179,7 +181,7 @@
# @param sourceType 查看 Mail_Type_Default 相关定义
# @return None
def SendPersonalAsTextMail(PlayerID, title, content, limitTime, sourceType = ChConfig.Mail_Type_Default):
- if GameWorld.IsMergeServer():
+ if GameWorld.IsCrossServer():
return
GUID = str(uuid.uuid1())
PyAddPersonalCompensation(GUID, PlayerID, GameWorld.GetCurrentDataTimeStr(), limitTime,
@@ -332,7 +334,7 @@
'''
@param mailInfo: GetEntireCompensationInfo 的返回值, 目前暂存字段 PlayerLV 中
'''
- if GameWorld.IsMergeServer():
+ if GameWorld.IsCrossServer():
return
#GameWorld.DebugLog("Compensation### AddEntireItem GUID:%s ItemDict:\n%s "%(GUID, addItemDictList))
@@ -416,7 +418,7 @@
# @return None
def AddPersonalItem(GUID, addItemDictList, PlayerIDList, LimitTime, Text,
gold = 0, goldPaper = 0, silver = 0, sourceType = ChConfig.Mail_Type_Default, detail=""):
- if GameWorld.IsMergeServer():
+ if GameWorld.IsCrossServer():
return
GameWorld.DebugLog("Compensation### AddPersonalItem GUID:%s ItemDict:\n%s "%(GUID, addItemDictList))
--
Gitblit v1.8.0