修复若干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/XML/SensitiveWord.txt

@@ -16253,9 +16253,6 @@ SF
 真n善n忍
 真枪
 真枪
-真
-善
-忍
 真空度测试仪
 真名三退
 真枪

Assets/Script/Manage/ConfigManager.cs

@@ -261,7 +261,7 @@ public class ConfigManager : Regist
         TextAsset textAsset = ResourceManager.Load<TextAsset>(ResourceLabel.PlayerConfig, Folder.Config);
 
         DefaultConfigDocument.LoadXml(textAsset.text);
-
+        //Debug.Log(jsonData.ToJson());
         if (jsonData.Inst_Object.Keys.Contains("l"))
         {
             configDocument = new XmlDocument();

Assets/Script/Manage/HttpManager.cs

@@ -928,7 +928,7 @@ public class HttpManager : Regist
         {
             IsConnect = true;
             LoginCallbackData = jsonData;
-
+            //Debug.Log("connect");
             CurrentDateTime = DateUtil.GetTime(jsonData["time"].ToJson());
 
             PraiseAmt = int.Parse(jsonData["p"].ToJson().Trim('"'));
@@ -995,8 +995,9 @@ public class HttpManager : Regist
         ConfigManager.SaveConfigDocument();
 
         urlData.Add("l", ConfigManager.ConfigDocument.OuterXml);
-
+        
         URLRequest.CreateURLRequest(false, SaveURL, urlData, data => { }, URLRequest.Method.POST);
+        //URLRequest.CreateStrURLRequest(false, SaveURL, urlData, data => { Debug.LogWarning(data); }, URLRequest.Method.POST);
     }
 
 
@@ -1077,7 +1078,6 @@ public class HttpManager : Regist
             requestData,
             jData =>
             {
-                //Debug.Log(jData.ToJson());
                 if (jData.Inst_Object.ContainsKey("l"))
                 {
                     jData = jData["l"];
@@ -1085,9 +1085,12 @@ public class HttpManager : Regist
                     for (int i = 0; i < jData.Count; i++)
                     {
                         string serialNumber = (string)jData[i]["i"];
-                        string nickname = (string)jData[i]["n"];
                         string dateString = (string)jData[i]["t"];
-                        accountDatas.Add(new AccountData(nickname, serialNumber, dateString));
+                        string nickname = jData[i]["n"] != null ? (string) jData[i]["n"] : Language.GetStr(LanguageLabel.UI__Unnamed);
+                        if (!accountDatas.MyContains((accountData => accountData.SerialNumber == serialNumber)))
+                        {
+                            accountDatas.Add(new AccountData(nickname, serialNumber, dateString));
+                        }
                     }
                     succeedCallback.Invoke(accountDatas);
                 }

Assets/Script/Object/Player.cs

@@ -1206,6 +1206,13 @@ public class Player : Regist , IPointerClickHandler
 
         List<string> currentDerssData = new List<string>() { Head, Dress, Shoe, HeadWear, Top, Wing };
 
+        if (currentDerssData[0] != PlayerManager.DressDatas[0]) allSave = false;
+        if (currentDerssData[1] != PlayerManager.DressDatas[1]) allSave = false;
+        if (currentDerssData[2] != PlayerManager.DressDatas[2]) allSave = false;
+        if (currentDerssData[3] != PlayerManager.DressDatas[3]) allSave = false;
+        if (currentDerssData[4] != PlayerManager.DressDatas[4]) allSave = false;
+        if (currentDerssData[5] != PlayerManager.DressDatas[7]) allSave = false;
+
         for (int i = 0; i < currentDerssData.Count; i++)
         {
             if (!PlayerManager.CloseIDDictionary.ContainsKey(currentDerssData[i]))
@@ -1217,9 +1224,11 @@ public class Player : Regist , IPointerClickHandler
 
             allBought = allBought && PlayerManager.CloseItemDictionary[id].IsBought;
             //Debug.Log(ManaPlayer.CloseUnitDic[id].Name + "    " + ManaPlayer.CloseUnitDic[id].Bought);
-            allSave = allSave && currentDerssData[i] == PlayerManager.DressDatas[i];
+            //allSave = allSave && currentDerssData[i] == PlayerManager.DressDatas[i];
+            //Debug.Log(currentDerssData[i] + "  " + PlayerManager.DressDatas[i]);
         }
-
+        //Debug.Log(allBought);
+        //Debug.Log(allSave);
         if (allBought)
         {
             if (allSave)

Assets/Script/Social/AddFriendPanel.cs

@@ -104,6 +104,7 @@ public class AddFriendPanel : Regist
     private static void RefreshRecommendSucceedCallback(List<AccountData> accountDatas)
     {
         RecommendDatas = accountDatas;
+        TipText.text = Language.GetStr(LanguageLabel.UI__AG_TipTitle0);
     }
 
 
@@ -125,6 +126,8 @@ public class AddFriendPanel : Regist
     {
         AudioManager.PlayClip(ResourceLabel.CloseClip);
         AddFriendPanelMask.TweenBacCG();
+        RefreshRecommendBuddyList();
+        InputField.text = "";
     }
 
 
@@ -139,7 +142,7 @@ public class AddFriendPanel : Regist
         AudioManager.PlayClip(ResourceLabel.BtnClip);
         ApplyButton.interactable = false;
         HttpManager.SearchBuddyByNickname(InputField.text, OnSearchSucceed, OnSearchFailed);
-        InputField.text = "";
+        //InputField.text = "";
     }
 
     private static void OnSearchFailed()
@@ -155,7 +158,14 @@ public class AddFriendPanel : Regist
         {
             ApplyButton.interactable = true;
             TipText.text = Language.GetStr(LanguageLabel.UI__AG_TipTitle2);
-            CurrentRecommendData = accountDatas[0];
+            //Debug.Log(accountDatas.Count);
+            //for (int i = 0; i < accountDatas.Count; i++)
+            //{
+            //    Debug.Log(accountDatas[i].Nickname);
+            //    RecommendDatas.Insert(0, accountDatas[i]);
+            //}
+            RecommendDatas = accountDatas;
+            CurrentRecommendData = RecommendDatas[0];
             NicknameText.text = CurrentRecommendData.Nickname;
             ChangeButton.interactable = true;
         }
@@ -200,7 +210,7 @@ public class AddFriendPanel : Regist
     private void OnChangeButtonClick()
     {
         AudioManager.PlayClip(ResourceLabel.BtnClip);
-        TipText.text = Language.GetStr(LanguageLabel.UI__AG_TipTitle0);
+        //TipText.text = Language.GetStr(LanguageLabel.UI__AG_TipTitle0);
         CurrentRecommendData = RecommendDatas.Roll();
         NicknameText.text = CurrentRecommendData.Nickname;
     }

Assets/Script/Social/FashionShowEditPage.cs

@@ -650,16 +650,19 @@ public class FashionShowEditPage : Regist
 
     private static void OnLevelChange(int level)
     {
-        if (level >= UnlockLevel)
-        {
-            GardenFashionShowButtonParent.SetActive(true);
-            DressroomFashionShowButton.SetActive(true);
-        }
-        else
-        {
-            GardenFashionShowButtonParent.SetActive(false);
-            DressroomFashionShowButton.SetActive(false);
-        }
+        GardenFashionShowButtonParent.SetActive(false); //todo 暂时关闭
+        DressroomFashionShowButton.SetActive(false); //todo 暂时关闭
+
+        //if (level >= UnlockLevel)
+        //{
+        //    GardenFashionShowButtonParent.SetActive(true); 
+        //    DressroomFashionShowButton.SetActive(true); 
+        //}
+        //else
+        //{
+        //    GardenFashionShowButtonParent.SetActive(false);
+        //    DressroomFashionShowButton.SetActive(false);
+        //}
     }
 
     private static void OnDressroomFashionShowButtonClick()

Assets/Script/Tool/Auxiliary.cs

@@ -156,8 +156,11 @@ public class Auxiliary : Regist
 
         if (Input.GetKeyDown(KeyCode.A))
         {
+            StringFilter.ContainSensitiveWord("真");
+            //Manager.GardenLevel = 50;
+            //Manager.Diamond = 1000;
             //PlayerManager.Player.ChangeClose(BodyPart.Eye, "眼睛3");
-            FashionShowEditPage.DisplayPlayer.ChangeClose(BodyPart.Eye, "眼睛3");
+            //FashionShowEditPage.DisplayPlayer.ChangeClose(BodyPart.Eye, "眼睛3");
         }
 
         if (Input.GetKeyDown(KeyCode.S))