From fd42cfd11d6205a75fa7c8bf16e6284d54aaf3a3 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 24 八月 2018 16:41:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/FriendSystem/New/FriendTips.cs | 3 +
System/KnapSack/Logic/PackSendQuestMgr.cs | 5 +
System/Chat/ChatRecently.cs | 13 ++++
System/FriendSystem/New/FriendsModel.cs | 1
System/Chat/ChatCtrl.cs | 42 ++++++++++++++
Utility/OperationLogCollect.cs | 25 ++++++++
Utility/DeviceUtility.cs | 36 +++++++----
7 files changed, 111 insertions(+), 14 deletions(-)
diff --git a/System/Chat/ChatCtrl.cs b/System/Chat/ChatCtrl.cs
index 61b6bcc..9f86009 100644
--- a/System/Chat/ChatCtrl.cs
+++ b/System/Chat/ChatCtrl.cs
@@ -206,9 +206,51 @@
ClearAllChatInfo();
}
+ void ChatReport(ChatInfoType chatType, string content, string toPlayer)
+ {
+ try
+ {
+ var channelName = string.Empty;
+ switch (chatType)
+ {
+ case ChatInfoType.World:
+ channelName = Language.Get("ChatType_World");
+ break;
+ case ChatInfoType.Area:
+ channelName = Language.Get("ChatType_Area");
+ break;
+ case ChatInfoType.Team:
+ channelName = Language.Get("ChatType_Team");
+ break;
+ case ChatInfoType.Invite:
+ channelName = Language.Get("ChatType_Invite");
+ break;
+ case ChatInfoType.Trumpet:
+ channelName = Language.Get("ChatType_Trumpet");
+ break;
+ case ChatInfoType.Fairy:
+ channelName = Language.Get("ChatType_Fairy");
+ break;
+ case ChatInfoType.Friend:
+ channelName = Language.Get("PlayerDetail_PrivateChat");
+ break;
+ default:
+ return;
+ }
+ OperationLogCollect.Instance.ChatReport(content, channelName, toPlayer);
+ }
+ catch (Exception e)
+ {
+ DebugEx.Log(e.Message);
+ }
+ }
+
public void SendChatInfo(ChatInfoType type, string msg, ChatExtraData? info = null)
{
bool _dirty = false;
+
+ ChatReport(type, msg, PteChatName);
+
if (!ChatCenter.s_VoiceRegex.IsMatch(msg))
{
_dirty = DirtyWordConfig.IsDirtWord(msg);
diff --git a/System/Chat/ChatRecently.cs b/System/Chat/ChatRecently.cs
index 096ddc8..ac23508 100644
--- a/System/Chat/ChatRecently.cs
+++ b/System/Chat/ChatRecently.cs
@@ -59,6 +59,17 @@
if(_cell.index!= ChatCtrl.Inst.PteChatID)
{
ChatCtrl.Inst.PteChatID = _cell.index;
+ var _dict = friendModel.GetFriendInfoDict((byte)GroupType.RecentContact);
+ if (friendModel.tempFriendData != null
+ && ChatCtrl.Inst.PteChatID == friendModel.tempFriendData.PlayerID)
+ {
+ ChatCtrl.Inst.PteChatName = friendModel.tempFriendData.PlayerName;
+ }
+ else
+ {
+ ChatCtrl.Inst.PteChatName = _dict != null && _dict.ContainsKey((uint)ChatCtrl.Inst.PteChatID) ?
+ _dict[(uint)ChatCtrl.Inst.PteChatID].PlayerName : string.Empty;
+ }
ChatCtrl.Inst.SelectRecentlyChat(ChatCtrl.Inst.PteChatID);
m_RecentlyControl.m_Scorller.RefreshActiveCellViews();
}
@@ -77,6 +88,7 @@
if (friendModel.tempFriendData != null)
{
ChatCtrl.Inst.PteChatID = (int)friendModel.tempFriendData.PlayerID;
+ ChatCtrl.Inst.PteChatName = friendModel.tempFriendData.PlayerName;
ChatCtrl.Inst.SelectRecentlyChat(ChatCtrl.Inst.PteChatID);
return;
}
@@ -84,6 +96,7 @@
if (_dict != null && _dict.Count > 0)
{
ChatCtrl.Inst.PteChatID = (int)_dict.Keys.First();
+ ChatCtrl.Inst.PteChatName = _dict[(uint)ChatCtrl.Inst.PteChatID].PlayerName;
ChatCtrl.Inst.SelectRecentlyChat(ChatCtrl.Inst.PteChatID);
}
}
diff --git a/System/FriendSystem/New/FriendTips.cs b/System/FriendSystem/New/FriendTips.cs
index 631cc17..5d20392 100644
--- a/System/FriendSystem/New/FriendTips.cs
+++ b/System/FriendSystem/New/FriendTips.cs
@@ -116,6 +116,7 @@
selectFriendObj.SetActive(false);
unSelectFriendObj.SetActive(true);
ChatCtrl.Inst.PteChatID = 0;
+ ChatCtrl.Inst.PteChatName = string.Empty;
}
}
@@ -167,6 +168,7 @@
selectPlayerId = playerId;
typeCtrl.m_Scorller.RefreshActiveCellViews();
ChatCtrl.Inst.PteChatID = playerId;
+ ChatCtrl.Inst.PteChatName = playerName;
speakOtherNameText.text = Language.Get("Friend107", UIHelper.ServerStringTrim(playerName));
friendsModel.RemoveFriendRed(lookGroupType,playerId);
@@ -237,6 +239,7 @@
selectFriendObj.SetActive(true);
unSelectFriendObj.SetActive(false);
ChatCtrl.Inst.PteChatID = playerId;
+ ChatCtrl.Inst.PteChatName = playerName;
playerInfoCell.Init(playerId, groupType,playerId);
speakOtherNameText.text = Language.Get("Friend107", UIHelper.ServerStringTrim(playerName));
});
diff --git a/System/FriendSystem/New/FriendsModel.cs b/System/FriendSystem/New/FriendsModel.cs
index 22fed92..62256fb 100644
--- a/System/FriendSystem/New/FriendsModel.cs
+++ b/System/FriendSystem/New/FriendsModel.cs
@@ -130,6 +130,7 @@
ChatCtrl.Inst.PteChatID = (int)id;
+ ChatCtrl.Inst.PteChatName = name;
MapConfig mapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);
string msg = StringUtility.Contact(Language.Get("KillOthersDes", mapConfig.Name, UIHelper.ServerStringTrim(PlayerDatas.Instance.baseData.PlayerName)),ChatCtrl.KILL_IDENTIFY);
ChatCtrl.Inst.SendChatInfo(ChatInfoType.Friend,msg);
diff --git a/System/KnapSack/Logic/PackSendQuestMgr.cs b/System/KnapSack/Logic/PackSendQuestMgr.cs
index 321d934..e0df85e 100644
--- a/System/KnapSack/Logic/PackSendQuestMgr.cs
+++ b/System/KnapSack/Logic/PackSendQuestMgr.cs
@@ -381,7 +381,10 @@
});
break;
default:
- ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("KnapS142", needRealmImgStr.ToString(), curRealmImgStr.ToString()));
+ ConfirmCancel.ShowRealmPopConfirm(Language.Get("Mail101"), Language.Get("KnapS142", needRealmImgStr.ToString(), curRealmImgStr.ToString()), Language.Get("PopConfirmWin_Promote"), () =>
+ {
+ WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.RealmFunc1);
+ });
break;
}
return false;
diff --git a/Utility/DeviceUtility.cs b/Utility/DeviceUtility.cs
index 1b759a6..b1822c9 100644
--- a/Utility/DeviceUtility.cs
+++ b/Utility/DeviceUtility.cs
@@ -145,22 +145,32 @@
public static void GetCpuAndMemory(out int _cpu, out int _memory)//鍐呭瓨鍗曚綅鏄疢B
{
- _cpu = Environment.ProcessorCount;
- switch (Application.platform)
+ try
{
- case RuntimePlatform.Android:
- _memory = SDKUtility.Instance.Device.totalMemory;
- break;
- case RuntimePlatform.IPhonePlayer:
- _memory = IsLowMemory() ? 1 : 2 * 1024;
- break;
- default:
- _memory = 4 * 1024;
- break;
+ _cpu = Environment.ProcessorCount;
+ switch (Application.platform)
+ {
+ case RuntimePlatform.Android:
+ _memory = SDKUtility.Instance.Device.totalMemory;
+ break;
+ case RuntimePlatform.IPhonePlayer:
+ _memory = IsLowMemory() ? 1 : 2 * 1024;
+ break;
+ default:
+ _memory = 4 * 1024;
+ break;
+ }
+
+ cpu = _cpu;
+ memory = _memory;
+ }
+ catch (Exception ex)
+ {
+ Debug.Log(ex);
+ _cpu = 2;
+ _memory = 2 * 1024;
}
- cpu = _cpu;
- memory = _memory;
}
}
diff --git a/Utility/OperationLogCollect.cs b/Utility/OperationLogCollect.cs
index 6504ef8..cdb0ba1 100644
--- a/Utility/OperationLogCollect.cs
+++ b/Utility/OperationLogCollect.cs
@@ -130,4 +130,29 @@
}
+ const string chatReportUrl = "http://monitor.secondworld.net.cn:12000/chat_receiver";
+ public void ChatReport(string content, string channelName, string toPlayer)
+ {
+#if !UNITY_EDITOR
+ var tables = new Dictionary<string, string>();
+ tables["ProductID"] = "snxxz";
+ tables["OperatorID"] = VersionConfig.Get().appId;
+ tables["OperatorName"] = string.Empty;
+ tables["RegionName"] = StringUtility.Contact("s", ServerListCenter.Instance.currentServer.region_flag);
+ tables["RegionID"] = ServerListCenter.Instance.currentServer.region_flag.ToString();
+ tables["EventID"] = 9003.ToString();
+ tables["Time"] = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ tables["IP"] = DeviceUtility.GetIp();
+ tables["ChatChannel"] = channelName;
+ tables["AccountID"] = ModelCenter.Instance.GetModel<LoginModel>().sdkLoginResult.account;
+ tables["RoleID"] = PlayerDatas.Instance.baseData.PlayerName;
+ tables["ToRoleID"] = toPlayer;
+ tables["Level"] = PlayerDatas.Instance.baseData.LV.ToString();
+ tables["VIPLevel"] = PlayerDatas.Instance.baseData.VIPLv.ToString();
+ tables["Content"] = content;
+
+ HttpRequest.Instance.RequestHttpGet(StringUtility.Contact(chatReportUrl, HttpRequest.HashtablaToString(tables)), HttpRequest.defaultHttpContentType);
+#endif
+ }
+
}
--
Gitblit v1.8.0