最新制作提交

Assets/_Scenes/JingLuoXueWei.unity

@@ -10209,7 +10209,7 @@ MonoBehaviour:
   m_Content: {fileID: 1712185491}
   m_Horizontal: 0
   m_Vertical: 1
-  m_MovementType: 1
+  m_MovementType: 2
   m_Elasticity: 0.1
   m_Inertia: 1
   m_DecelerationRate: 0.135
@@ -11170,7 +11170,7 @@ RectTransform:
   m_Father: {fileID: 1986871466}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.16153836}
+  m_AnchorMin: {x: 0, y: 0.16153824}
   m_AnchorMax: {x: 1, y: 0.9999999}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
@@ -40287,7 +40287,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
+  m_HorizontalFit: 0
   m_VerticalFit: 2
 --- !u!114 &1712185493
 MonoBehaviour:
@@ -40308,7 +40308,7 @@ MonoBehaviour:
     m_Bottom: 0
   m_ChildAlignment: 1
   m_Spacing: 10
-  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
   m_ChildControlHeight: 0

Assets/_Scripts/Application/JingLuoXueWei/Other/GameObject_Pool.cs

@@ -20,7 +20,7 @@ public class GameObject_Pool : MonoSingleton<GameObject_Pool>
         {
             GameObject go = poolDic[typeName].Dequeue();
             go.transform.SetParent(parent);
-            this.Log($"取出对象池，现在长度为：{poolDic[typeName].Count}");
+            //this.Log($"取出对象池，现在长度为：{poolDic[typeName].Count}");
             return go;
         }
         else
@@ -38,7 +38,7 @@ public class GameObject_Pool : MonoSingleton<GameObject_Pool>
                 GameObject go = Resources.Load<GameObject>(typeName);
                 GameObject obj = GameObject.Instantiate(go, parent);
                 poolDic[typeName].Enqueue(obj);
-                this.Log($"取出对象池，现在长度为：{poolDic[typeName].Count}");
+                //this.Log($"取出对象池，现在长度为：{poolDic[typeName].Count}");
 
                 return poolDic[typeName].Dequeue();
             }
@@ -46,12 +46,17 @@ public class GameObject_Pool : MonoSingleton<GameObject_Pool>
         }
     }
 
+    /// <summary>
+    /// 存入对象池
+    /// </summary>
+    /// <param name="typeName">存入类型</param>
+    /// <param name="obj">存入的物体</param>
     public void PutInGame(string typeName, GameObject obj)
     {
         if (poolDic[typeName] != null)
         {
             poolDic[typeName].Enqueue(obj);
-            this.Log($"放入对象池，现在长度为：{poolDic[typeName].Count}");
+            //this.Log($"放入对象池，现在长度为：{poolDic[typeName].Count}");
         }
         else
         {

Assets/_Scripts/Application/JingLuoXueWei/UI/LeftBigBtnPanel.cs

@@ -76,6 +76,7 @@ public class LeftBigBtnPanel : UIBase
     /// 搜索按钮
     /// </summary>
     Button souSuo_Btn;
+    Coroutine cor;
     public override void Init(IUIManager uictrl)
     {
         base.Init(uictrl);
@@ -257,6 +258,10 @@ public class LeftBigBtnPanel : UIBase
     /// <param name="btn"></param>
     void BtnAddListener(Button btn)
     {
+        for (int i = 0; i < allBigBtn.Count; i++)
+        {
+            allBigBtn[i].GetComponent<BtnImage>().isOpen = false;
+        }
         if (!btn.GetComponent<BtnImage>().isOpen)//当前按钮处于选中状态
         {
             for (int j = 0; j < allBigBtn.Count; j++)
@@ -295,7 +300,8 @@ public class LeftBigBtnPanel : UIBase
                             item.Value.transform.GetChild(i).GetComponent<BtnImage>().OnExitBtn();
                         }
                     }
-                    LayoutRebuilder.ForceRebuildLayoutImmediate(allBigBtn[j].transform.parent.GetComponent<RectTransform>());
+                    StartCoroutine(UndateScrollView(allBigBtn[j].transform.parent.GetComponent<RectTransform>()));
+                    //LayoutRebuilder.ForceRebuildLayoutImmediate(allBigBtn[j].transform.parent.GetComponent<RectTransform>());
                     //打开提示框
                     uiManager.CloseUI<TipSmallPanel>();
                     gameManager.uiManager.ShowUI<TipBigPanel>(null, btn.GetComponentInChildren<Text>().text);
@@ -303,14 +309,16 @@ public class LeftBigBtnPanel : UIBase
                 else
                 {
                     allBigBtn[j].GetComponent<BtnImage>().OnExitBtn();
-                    btn.GetComponent<BtnImage>().isOpen = false;
+                    allBigBtn[j].GetComponent<BtnImage>().isOpen = false;
                 }
             }
         }
         else///当前按钮处于未选中状态
         {
             JingLuoXueWeiDict[btn].SetActive(false);
-            LayoutRebuilder.ForceRebuildLayoutImmediate(btn.transform.parent.GetComponent<RectTransform>());
+            StartCoroutine(UndateScrollView(btn.transform.parent.GetComponent<RectTransform>()));
+
+            //LayoutRebuilder.ForceRebuildLayoutImmediate(btn.transform.parent.GetComponent<RectTransform>());
             btn.GetComponent<BtnImage>().isOpen = false;
         }
     }
@@ -328,6 +336,8 @@ public class LeftBigBtnPanel : UIBase
                 allBigBtn[i].onClick.Invoke();
             }
         }
+        //LayoutRebuilder.ForceRebuildLayoutImmediate(transform.FindFirst<RectTransform>("Content"));
+
     }
 
     /// <summary>
@@ -343,6 +353,7 @@ public class LeftBigBtnPanel : UIBase
                 allSmallBtn[i].onClick.Invoke();
             }
         }
+        //LayoutRebuilder.ForceRebuildLayoutImmediate(transform.FindFirst<RectTransform>("Content"));
     }
 
     /// <summary>
@@ -383,6 +394,8 @@ public class LeftBigBtnPanel : UIBase
 
                         //穴位和文字变色
                         ChangeXueWeiAndTxt(creatBtn.GetComponentInChildren<Text>().text);
+                        //LayoutRebuilder.ForceRebuildLayoutImmediate(JingLuoXueWeiDict[btn].transform.GetComponent<RectTransform>());
+                        //LayoutRebuilder.ForceRebuildLayoutImmediate(btn.transform.parent.GetComponent<RectTransform>());
 
                         uiManager.CloseUI<TipBigPanel>();
                         uiManager.ShowUI<TipSmallPanel>(null, creatBtn.GetComponentInChildren<Text>().text);
@@ -390,6 +403,10 @@ public class LeftBigBtnPanel : UIBase
                     allSmallBtn.Add(creatBtn);
                 }
             }
+            cor = StartCoroutine(UndateScrollView(JingLuoXueWeiDict[btn].transform.GetComponent<RectTransform>()));
+            //LayoutRebuilder.ForceRebuildLayoutImmediate(JingLuoXueWeiDict[btn].transform.GetComponent<RectTransform>());
+
+            //LayoutRebuilder.ForceRebuildLayoutImmediate(btn.transform.parent.GetComponent<RectTransform>());
             isCreateBtnLst.Add(btn.GetComponentInChildren<Text>().text);
         }
     }
@@ -489,5 +506,9 @@ public class LeftBigBtnPanel : UIBase
         }
     }
 
-
+    IEnumerator  UndateScrollView(RectTransform rect)
+    {
+        yield return new WaitForSeconds(0.04f);
+        LayoutRebuilder.ForceRebuildLayoutImmediate(rect);
+    }
 }

Assets/_Scripts/Application/JingLuoXueWei/UI/RuntimeLogVisualizer.cs

@@ -29,10 +29,9 @@ public class RuntimeLogVisualizer : MonoBehaviour
 
     private void OnDestroy()
     {
-        //Canvas.willRenderCanvases -= UpdateTextSafely;
         Application.logMessageReceived -= AddLog;
     }
-
+    int num = 0;
     private void AddLog(string log, string stack, LogType type)
     {
         // 按日志类型着色
@@ -49,40 +48,34 @@ public class RuntimeLogVisualizer : MonoBehaviour
 
         // 控制日志数量（超出则移除最早的）
         logQueue.Enqueue(formattedLog);
-        if (logQueue.Count > maxLines)
+        if (logQueue.Count > 1000)
         {
             logQueue.Dequeue();
         }
-
-        //Canvas.willRenderCanvases += UpdateTextSafely;
         // 更新UI文本
         //logText.text = string.Join("", logQueue);
         GameObject go = GameObject_Pool.Instance.TakeOutGame("log_Txt", transform);
+        go.SetActive(true);
+        num++;
+        go.name = num.ToString();
+        go.GetComponent<Text>().text = logQueue.Dequeue();
+        go.transform.SetAsLastSibling();
         log_TxtQue.Enqueue(go);
+
         //GameObject go = Resources.Load<GameObject>("log_Txt");
         //GameObject obj = GameObject.Instantiate(go, transform);
-        go.GetComponent<Text>().text = logQueue.Dequeue();
-        if (log_TxtQue.Count > 200)
+        if (log_TxtQue.Count >= 200)
         {
-            int num = log_TxtQue.Count - 200;
+            int num = log_TxtQue.Count - 199;
             for (int i = 0; i < num; i++)
             {
                 GameObject g = log_TxtQue.Dequeue();
+                g.SetActive(false);
                 GameObject_Pool.Instance.PutInGame("log_Txt", g);
             }
         }
     }
 
-    //private void UpdateTextSafely()
-    //{
-    //    Canvas.willRenderCanvases -= UpdateTextSafely;
-    //    if (logText != null)
-    //    {
-
-    //        logText.text = logQueue.Dequeue();
-    //    }
-    //}
-
     // 可选：添加清空日志的方法（绑定到UI按钮）
     public void ClearLogs()
     {

Assets/_Scripts/Application/JingLuoXueWei/UI/SouSuoPanel.cs

@@ -83,44 +83,65 @@ public class SouSuoPanel : UIBase
                 });
             }
         }
+        LayoutRebuilder.ForceRebuildLayoutImmediate(transform.FindFirst("souSuoBtnContent").GetComponent<RectTransform>());
+
     }
 
     public override void Show()
     {
         base.Show();
-        InputSubmit("Óá");
-        Game.Instance.IEnumeratorManager.Run(7.0f, () =>
-        {
-            InputSubmit("Òõ");
-        });
-        Game.Instance.IEnumeratorManager.Run(15.0f, () =>
-        {
-            InputSubmit("Óá");
-        });
-        Game.Instance.IEnumeratorManager.Run(22.0f, () =>
-        {
-            InputSubmit("Èé");
-        });
-        Game.Instance.IEnumeratorManager.Run(30.0f, () =>
-        {
-            InputSubmit("Óá");
-        });
-        Game.Instance.IEnumeratorManager.Run(37.0f, () =>
-        {
-            InputSubmit("Ñô");
-        });
-        Game.Instance.IEnumeratorManager.Run(45.0f, () =>
-        {
-            InputSubmit("Óá");
-        });
-        Game.Instance.IEnumeratorManager.Run(52.0f, () =>
-        {
-            InputSubmit("Æø");
-        });
-        Game.Instance.IEnumeratorManager.Run(60.0f, () =>
-        {
-            InputSubmit("Óá");
-        });
+        InputSubmit("·ç");
+        #region ²âÊÔ´úÂë
+        //InputSubmit("Óá");
+        //Game.Instance.IEnumeratorManager.Run(7.0f, () =>
+        //{
+        //    InputSubmit("Òõ");
+        //});
+        //Game.Instance.IEnumeratorManager.Run(15.0f, () =>
+        //{
+        //    InputSubmit("Óá");
+        //});
+        //Game.Instance.IEnumeratorManager.Run(22.0f, () =>
+        //{
+        //    InputSubmit("Èé");
+        //});
+        //Game.Instance.IEnumeratorManager.Run(30.0f, () =>
+        //{
+        //    InputSubmit("Óá");
+        //});
+        //Game.Instance.IEnumeratorManager.Run(37.0f, () =>
+        //{
+        //    InputSubmit("Ñô");
+        //});
+        //Game.Instance.IEnumeratorManager.Run(45.0f, () =>
+        //{
+        //    InputSubmit("Óá");
+        //});
+        //Game.Instance.IEnumeratorManager.Run(52.0f, () =>
+        //{
+        //    InputSubmit("Æø");
+        //});
+        //Game.Instance.IEnumeratorManager.Run(60.0f, () =>
+        //{
+        //    InputSubmit("Óá");
+        //});
+        //Game.Instance.IEnumeratorManager.Run(66.0f, () =>
+        //{
+        //    InputSubmit("Èý");
+        //});
+        //Game.Instance.IEnumeratorManager.Run(72.0f, () =>
+        //{
+        //    InputSubmit("Ì«");
+        //});
+        //Game.Instance.IEnumeratorManager.Run(78.0f, () =>
+        //{
+        //    InputSubmit("Ô¨");
+        //});
+        //Game.Instance.IEnumeratorManager.Run(85.0f, () =>
+        //{
+        //    InputSubmit("Óá");
+        //});
+        #endregion
     }
 
     private void InputValueChanged(string arg0)