修复公告按钮Bug

Assets/Resource/Logo.unity

@@ -613,9 +613,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   AuditEdition: 1
-  DebugMode: 0
+  DebugMode: 1
   CatchException: 1
-  DebugModeGo: {fileID: 0}
+  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
+    type: 2}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -520,7 +520,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1039811972777104
 GameObject:
   m_ObjectHideFlags: 1
@@ -722,7 +722,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!1 &1053465316034782
 GameObject:
   m_ObjectHideFlags: 1
@@ -14667,7 +14667,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1989393021780350
 GameObject:
   m_ObjectHideFlags: 1

Assets/Script/Manage/HttpManager.cs

@@ -117,6 +117,7 @@ public class HttpManager : Regist
     public static float ReconnectTimeTimer;
 
     public static int PraiseAmt;
+    public static int MaxFriend;
 
     public static bool IsRankDataReady;
     public static List<JsonData> RankDatas;
@@ -170,37 +171,15 @@ public class HttpManager : Regist
 
     public void Awake()
     {
-        //URLRequestData urlData = new URLRequestData();
-        //urlData.Add("u", "1709207727231988804");
-        //urlData.Add("p", "0");
-        //urlData.Add("t", CommentType.Garden.GetHashString());
-
-        //URLRequest.CreateURLRequest
-        //(
-        //    true,
-        //    GetCommentURL,
-        //    urlData,
-        //    data =>
-        //    {
-        //        Debug.Log(data.ToJson());
-        //    },
-        //    URLRequest.Method.POST
-        //);
-
-        //SendPrivateMessage("1709207727231988804", "你好", "1709110839194378775");
-        //GetPrivateMessage("1709110839194378775", "1", data => {}, () => {}, "1709207727231988804");
-
-        //URLRequestData requestData = new URLRequestData();
-        //requestData.Add("b", 1709207727231988804);
-        //requestData.Add("u", 1709110837472481803);
-        //URLRequest.CreateStrURLRequest(true, ApplyBuddyURL, requestData, data => Debug.Log("申请好友返回结果 " + data), URLRequest.Method.POST);
-
-        //requestData = new URLRequestData();
-        //requestData.Add("b", 1709207727231988804);
-        //requestData.Add("u", 1709110835209952822);
-        //URLRequest.CreateStrURLRequest(true, ApplyBuddyURL, requestData, data => Debug.Log("申请好友返回结果 " + data), URLRequest.Method.POST);
-
-        //AddComment("1709110839194378775", "1709207727231988804", "你好", CommentType.Garden);
+        //笔记本 1710065808151506837
+        //阔达的网络 1709110751808885702 
+        //SendPrivateMessage("1709110751808885702", "第1条", (str0, str1) => { Debug.Log("s"); }, () => { Debug.Log("f"); }, "1710065808151506837");
+        //SendPrivateMessage("1709110751808885702", "第2条", (str0, str1) => { Debug.Log("s"); }, () => { Debug.Log("f"); }, "1710065808151506837");
+        //SendPrivateMessage("1710065808151506837", "第3条", (str0, str1) => { Debug.Log("s"); }, () => { Debug.Log("f"); }, "1710065808151506837");
+        //SendPrivateMessage("1710065808151506837", "第4条", (str0, str1) => { Debug.Log("s"); }, () => { Debug.Log("f"); }, "1710065808151506837");
+        //GetPrivateMessage("1709110751808885702", "0", (str0, str1, strings) => { Debug.Log(strings.Count); }, () => { Debug.Log("f"); }, "1710065808151506837");
+        //GetPrivateMessage("1710065808151506837", "0", (str0, str1, strings) => { Debug.Log(strings.Count); }, () => { Debug.Log("f"); }, "1709110751808885702");
+        //GetPrivateMessage("1709110836214653948 ", "0", (str0, str1, strings) => { Debug.Log(strings.Count); }, () => { Debug.Log("f"); }, "1709110751808885702");
     }
 
     public void Update()
@@ -398,6 +377,11 @@ public class HttpManager : Regist
 
             XmlNodeList nodeList = rootNode.SelectNodes(ConfigLabel.ChildNode);
 
+            if (nodeList.Count == 0)
+            {
+                return;
+            }
+
             List<string> urlList = new List<string>();
 
             for (int i = 0; i < nodeList.Count; i++)
@@ -502,6 +486,7 @@ public class HttpManager : Regist
 
         if (Initializer.Inited)
         {
+            ResourceManager.SetActive(ObjectLabel.C_NotifyParent, true);
             ResourceManager.Get(ObjectLabel.C_Notify).TweenForCG();
         }
     }
@@ -946,6 +931,7 @@ public class HttpManager : Regist
             CurrentDateTime = DateUtil.GetTime(jsonData["time"].ToJson());
 
             PraiseAmt = int.Parse(jsonData["p"].ToJson().Trim('"'));
+            MaxFriend = (int) jsonData["b"];
 
             if (ConfigManager.PlayerDocumentDamageFlag)
             {
@@ -1300,64 +1286,67 @@ public class HttpManager : Regist
 
     public static void GetPrivateMessage(string targetSerialNumber, string page, Action<string, string, List<PrivateMessageData>> succeedCallback, Action failedCallback,  string selfSerialNumber = null)
     {
-        DelayCall.Call
-        (
-            1f,
-            () =>
-            {
-                List<PrivateMessageData> accountDatas = new List<PrivateMessageData>();
-                for (int i = 0; i < 20; i++)
-                {
-                    string serialNumber = Random.Range(0f, 1f) < 0.5f ? "1709110839194378775" : SerialNumber;
-                    string nickname = "篮球";
-                    string content = "篮球的留言" + int.Parse(page)*20 + i;
-                    //accountDatas.Add(new PrivateMessageData(serialNumber, nickname, content, DateTime.Parse("4/23/2017 09:30:00 AM")));
-                    accountDatas.Add(new PrivateMessageData(serialNumber, nickname, content, CurrentDateTime));
-                }
-                succeedCallback.Invoke("1709110839194378775", page, accountDatas);
-            }
-        );
-
-        //if (selfSerialNumber == null)
-        //{
-        //    selfSerialNumber = SerialNumber;
-        //}
-
-        //URLRequestData urlData = new URLRequestData();
-        //urlData.Add("u", selfSerialNumber);
-        //urlData.Add("u", TargetURL);
-        //urlData.Add("t", CommentType.PrivateMessage.GetHashString());
-        //urlData.Add("p", page);
-
-        //URLRequest.CreateURLRequest
+        //DelayCall.Call
         //(
-        //    true,
-        //    GetPrivateMessageURL,
-        //    urlData,
-        //    jData =>
+        //    1f,
+        //    () =>
         //    {
-        //        if (jData.Inst_Object.ContainsKey("l"))
+        //        List<PrivateMessageData> accountDatas = new List<PrivateMessageData>();
+        //        for (int i = 0; i < 20; i++)
         //        {
-        //            jData = jData["l"];
-        //            List<PrivateMessageData> privateMessageDatas = new List<PrivateMessageData>();
-        //            for (int i = 0; i < jData.Count; i++)
-        //            {
-        //                string content = (string)jData[i]["c"];
-        //                string nickname = (string)jData[i]["n"];
-        //                string dateString = (string)jData[i]["t"];
-        //                string serialNumber = (string)jData[i]["c"];
-        //                DateTime date = DateTime.Parse(dateString);
-        //                privateMessageDatas.Add(new PrivateMessageData(serialNumber, nickname, content, date));
-        //            }
-        //            succeedCallback.Invoke(targetSerialNumber, page, privateMessageDatas);
+        //            string serialNumber = Random.Range(0f, 1f) < 0.5f ? "1709110839194378775" : SerialNumber;
+        //            string nickname = "篮球";
+        //            string content = "篮球的留言" + int.Parse(page)*20 + i;
+        //            //accountDatas.Add(new PrivateMessageData(serialNumber, nickname, content, DateTime.Parse("4/23/2017 09:30:00 AM")));
+        //            accountDatas.Add(new PrivateMessageData(serialNumber, nickname, content, CurrentDateTime));
         //        }
-        //        else
-        //        {
-        //            failedCallback.Invoke();
-        //        }
-        //    },
-        //    URLRequest.Method.POST
+        //        succeedCallback.Invoke("1709110839194378775", page, accountDatas);
+        //    }
         //);
+
+        if (selfSerialNumber == null)
+        {
+            selfSerialNumber = SerialNumber;
+        }
+
+        URLRequestData urlData = new URLRequestData();
+        urlData.Add("u", selfSerialNumber);
+        urlData.Add("c", targetSerialNumber);
+        urlData.Add("t", CommentType.PrivateMessage.GetHashString());
+        urlData.Add("p", page);
+
+        URLRequest.CreateURLRequest
+        (
+            true,
+            GetPrivateMessageURL,
+            urlData,
+            jData =>
+            {
+                //Debug.Log(selfSerialNumber);
+                //Debug.Log(targetSerialNumber);
+                //Debug.LogWarning(jData.ToJson());
+                if (jData.Inst_Object.ContainsKey("l"))
+                {
+                    jData = jData["l"];
+                    List<PrivateMessageData> privateMessageDatas = new List<PrivateMessageData>();
+                    for (int i = 0; i < jData.Count; i++)
+                    {
+                        string content = (string)jData[i]["c"];
+                        string nickname = (string)jData[i]["n"];
+                        string dateString = (string)jData[i]["t"];
+                        string serialNumber = (string)jData[i]["u"];
+                        DateTime date = DateTime.Parse(dateString);
+                        privateMessageDatas.Add(new PrivateMessageData(serialNumber, nickname, content, date));
+                    }
+                    succeedCallback.Invoke(targetSerialNumber, page, privateMessageDatas);
+                }
+                else
+                {
+                    failedCallback.Invoke();
+                }
+            },
+            URLRequest.Method.POST
+        );
     }
 
     public static void SendPrivateMessage(string targetSerialNumber, string content, Action<string, string> succeedCallback, Action failedCallback, string selfSerialNumber = null)

Assets/Script/Manage/NickNameManager.cs

@@ -97,7 +97,7 @@ public class NickNameManager : Regist
 
     public static void ResetNickName()
 	{
-	    if (NicknameInputField.text == NickName)
+	    if (NicknameInputField.text == NickName && !string.IsNullOrEmpty(NickName))
 	    {
 	        ResetSucceed();
             return;

Assets/Script/Manage/SocialManager.cs

@@ -695,6 +695,9 @@ public class SocialManager : Regist
 
     public static void OnExitVisiteeGarden()
     {
-        ResourceManager.SetActive(ObjectLabel.C_NotifyParent, true);
+        if (ResourceManager.Get(ObjectLabel.C_Notify).gameObject.activeSelf)
+        {
+            ResourceManager.SetActive(ObjectLabel.C_NotifyParent, true);
+        }
     }
 }

Assets/Script/Manage/TutorialManager.cs

@@ -312,7 +312,6 @@ public class TutorialManager : Regist
             () =>
             {
                 AudioManager.PlayClip(AudioLabel.ClickButton);
-                //ResourceManager.Get(ObjectLabel.L_Setting).TweenForCG();
                 ResourceManager.Get(ObjectLabel.La_Info).TweenForCG();
 
                 ResourceManager.Get(ObjectLabel.N_Confirm).TweenBacCG();
@@ -437,6 +436,7 @@ public class TutorialManager : Regist
 
 
                 ResourceManager.Get(ObjectLabel.N_Confirm).TweenBacCG();
+                ResourceManager.Get(ObjectLabel.N_FormerPlayerButton).TweenBacCG();
 
                 TweenRoot tween = ResourceManager.Get(TutorialLabel.Tutorial).TweenBacSr();
 

Assets/Script/Social/FriendPanel.cs

@@ -24,6 +24,7 @@ public class FriendPanel : Regist
     public static Button AddFriendButton;
     public static Button CloseButton;
     public static Toggle ApplicantButton;
+    public static Transform OpenPanelButtonParent;
 	public static Transform FriendGrid;
     public static Transform ApplicantGrid;
 	public static Transform FriendPanelParentMask;
@@ -48,7 +49,7 @@ public class FriendPanel : Regist
     }
     public static int maxFriend = 25;
     private static float RefreshFriendTime = 15f;
-    private static float RefreshFriendTimer = RefreshFriendTime;
+    private static float RefreshFriendTimer;
     public static List<FriendItem> FriendItems = new List<FriendItem>();
     public static List<AccountData> FriendAccountDatas = new List<AccountData>();
 
@@ -99,6 +100,7 @@ public class FriendPanel : Regist
         CloseButton = ResourceManager.Get<Button>(ObjectLabel.AF_CloseButton);
         ApplicantButton = ResourceManager.Get<Toggle>(ObjectLabel.AF_ApplicantButton);
         OpenPanelButton = ResourceManager.Get<Button>(ObjectLabel.C_FriendButton);
+        OpenPanelButtonParent = ResourceManager.Get(ObjectLabel.C_FriendButtonParent);
         FriendGrid = ResourceManager.Get(ObjectLabel.AF_FriendGrid);
         ApplicantGrid = ResourceManager.Get(ObjectLabel.AF_ApplicantGrid);
         FriendPanelParentMask = ResourceManager.Get(ObjectLabel.AF_FriendPanelParent);
@@ -130,12 +132,17 @@ public class FriendPanel : Regist
 
         Manager.OnLevelChange += level =>
         {
-            if (level >= ActivateLevel) OpenPanelButton.TweenForCG();
+            if (level >= ActivateLevel)
+            {
+                OpenPanelButton.TweenForCG();
+                OpenPanelButtonParent.SetActive(true);
+            }
         };
 
         MessagePanel.OnHaveNewMessage += SortFriendItems;
         VisitManager.OnEnterVisteeGarden += OnEnterVisiteeGarden;
         VisitManager.OnExitVisteeGarden += OnExitVisiteeGarden;
+        HttpManager.OnConnect += OnConnect;
     }
 
 
@@ -534,13 +541,18 @@ public class FriendPanel : Regist
     }
 
 
+    public static void OnConnect()
+    {
+        MaxFriend = HttpManager.MaxFriend;
+    }
+
     public static void OnEnterVisiteeGarden()
     {
-        ResourceManager.SetActive(ObjectLabel.C_FriendButtonParent, false);
+        OpenPanelButtonParent.SetActive(false);
     }
 
     public static void OnExitVisiteeGarden()
     {
-        ResourceManager.SetActive(ObjectLabel.C_FriendButtonParent, true);
+        OpenPanelButtonParent.SetActive(true);
     }
 }

Assets/Script/Social/MessagePanel.cs

@@ -62,6 +62,8 @@ public class MessagePanel : Regist
     public static InputField InputField;
     public static VirtualScrollRectPlus ScrollRect;
 
+    private static Coroutine LoadingTitleFadeOut;
+
     private static int MaxRollAmount = 4;
     private static int MaxChildAmount = 10;
     private static bool DownloadingPrivateMessageFlag;
@@ -150,6 +152,7 @@ public class MessagePanel : Regist
         if (dataStash.PrivateMessageDatas.Count > dataIndex)
         {
             PrivateMessageData data = dataStash.PrivateMessageDatas[dataIndex];
+            data.Nickname = AccountData.Nickname;
             PrivateMessageItem item = GetItem(data);
             PrivateMessageItems.Add(item);
             return item;
@@ -159,6 +162,10 @@ public class MessagePanel : Regist
             if (!DownloadingPrivateMessageFlag)
             {
                 DownloadingPrivateMessageFlag = true;
+                if (LoadingTitleFadeOut!=null)
+                {
+                    DelayCall.stopCoroutine(LoadingTitleFadeOut);
+                }
                 LoadingTitle.text = Language.GetStr(LanguageLabel.UI__AH_Loading);
                 LoadingTitle.TweenForCG();
                 HttpManager.GetPrivateMessage(AccountData.SerialNumber, dataStash.GetNextPageIndex().ToString(), DownloadPrivateMessageSucceedCallback, DownloadPrivateMessageFailedCallback);
@@ -176,6 +183,7 @@ public class MessagePanel : Regist
 
         PrivateMessageDataStash dataStash = PrivateMessageDataDictionary[AccountData.SerialNumber];
         PrivateMessageData data = dataStash.PrivateMessageDatas[dataIndex];
+        data.Nickname = AccountData.Nickname;
         PrivateMessageItem item = GetItem(data);
         PrivateMessageItems.Insert(0, item);
         return item;
@@ -231,14 +239,14 @@ public class MessagePanel : Regist
     {
         DownloadingPrivateMessageFlag = false;
         LoadingTitle.text = Language.GetStr(LanguageLabel.UI__AH_LoadFailed);
-        DelayCall.Call(1f, () => LoadingTitle.TweenBacCG());
+        LoadingTitleFadeOut = DelayCall.Call(1f, () => LoadingTitle.TweenBacCG());
     }
 
     public static void DownloadPrivateMessageSucceedCallback(string targetSerialNumber, string page, List<PrivateMessageData> datas)
     {
         DownloadingPrivateMessageFlag = false;
         LoadingTitle.text = Language.GetStr(LanguageLabel.UI__AH_LoadSucceed);
-        DelayCall.Call(1f, () => LoadingTitle.TweenBacCG());
+        LoadingTitleFadeOut = DelayCall.Call(1f, () => LoadingTitle.TweenBacCG());
 
         TryCreateNewPrivateMessageDataStash(targetSerialNumber);
         PrivateMessageDataStash dataStash = PrivateMessageDataDictionary[targetSerialNumber];

Assets/Script/Tool/Auxiliary.cs

@@ -136,25 +136,25 @@ public class Auxiliary : Regist
     {
         #region 调试
 
-        //if (Input.GetKeyDown(KeyCode.Escape))
-        //{
-        //    SFSManager.GardenSmartFox.SmartFox.Disconnect();
-        //    RobotManager.DeactivateAllRobots(false);
-        //}
+        if (Input.GetKeyDown(KeyCode.Escape))
+        {
+            SFSManager.GardenSmartFox.SmartFox.Disconnect();
+            RobotManager.DeactivateAllRobots(false);
+        }
 
 
-        //if (Input.GetKeyDown(KeyCode.Space))
-        //{
-        //    Debug.Log(ConfigManager.ConfigRootNode.OuterXml);
-        //    //DebugManager.ResetGardenLevel(7);
-        //    //DebugManager.ResetVisitTutorial();
-        //    //HttpManager.GetThanksGiftInfo(RechargeGiftManager.Init, () => Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)));
-        //}
+        if (Input.GetKeyDown(KeyCode.Space))
+        {
+            //Debug.Log(ConfigManager.ConfigRootNode.OuterXml);
+            DebugManager.ResetGardenLevel(7);
+            //DebugManager.ResetVisitTutorial();
+            //HttpManager.GetThanksGiftInfo(RechargeGiftManager.Init, () => Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)));
+        }
 
-        //if (Input.GetKeyDown(KeyCode.A))
-        //{
-        //    DebugManager.ResetGardenLevel(30);
-        //}
+        if (Input.GetKeyDown(KeyCode.A))
+        {
+            DebugManager.ResetGardenLevel(30);
+        }
 
         //if (Input.GetKeyDown(KeyCode.S))
         //{
@@ -173,10 +173,10 @@ public class Auxiliary : Regist
         //    Manager.MinigameCDTimer = 0;
         //}
 
-        //if (Input.GetKeyDown(KeyCode.X))
-        //{
-        //    MiniGameManager.GameTimer = 45;
-        //}
+        if (Input.GetKeyDown(KeyCode.X))
+        {
+            MiniGameManager.GameTimer = 45;
+        }
 
         //if (Input.GetKeyDown(KeyCode.C))
         //{