From a2f87f461d84e8ba4c287abdc17b75d13a409aa4 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期一, 07 一月 2019 14:15:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/PlayerBuffDatas.cs | 8 ++++----
Utility/StageLoadTimeOutCatcher.cs | 5 +++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/System/MainInterfacePanel/PlayerBuffDatas.cs b/System/MainInterfacePanel/PlayerBuffDatas.cs
index 8cafd51..8864411 100644
--- a/System/MainInterfacePanel/PlayerBuffDatas.cs
+++ b/System/MainInterfacePanel/PlayerBuffDatas.cs
@@ -285,14 +285,14 @@
public void ObjDelBuff(int playerId, int _BuffID)//buff鍑忓皯
{
- if (playerId != PlayerDatas.Instance.baseData.PlayerID)
- {
- return;
- }
if (BuffUpdateEvent != null)
{
BuffUpdateEvent(playerId);
}
+ if (playerId != PlayerDatas.Instance.baseData.PlayerID)
+ {
+ return;
+ }
if (_BuffDic.ContainsKey(_BuffID))
{
_BuffDic.Remove(_BuffID);
diff --git a/Utility/StageLoadTimeOutCatcher.cs b/Utility/StageLoadTimeOutCatcher.cs
index 5233a56..1652b5c 100644
--- a/Utility/StageLoadTimeOutCatcher.cs
+++ b/Utility/StageLoadTimeOutCatcher.cs
@@ -63,8 +63,9 @@
{
try
{
- var title = StringUtility.Contact("鍦板浘鍔犺浇璁板綍-->鐜╁鍚嶇О锛�", PlayerDatas.Instance.baseData.PlayerName);
- var description = StringUtility.Contact("鏈嶅姟鍣�:", socketType, ";", "鍗忚缂栧彿:", protocol, ";", "鏃堕棿:", time.ToString("HH:mm:ss"));
+ var title = StringUtility.Contact("鍦板浘鍔犺浇璁板綍-->鍗忚缂栧彿锛�", protocol);
+ var description = StringUtility.Contact("鏈嶅姟鍣�:", socketType, ";",
+ "鍗忚缂栧彿:", protocol, ";", "鏃堕棿:", time.ToString("HH:mm:ss"), "鐜╁:", PlayerDatas.Instance.baseData.PlayerName);
ExceptionCatcher.ReportException(title, description);
}
--
Gitblit v1.8.0