修了不少东西

Assets/playerBagSystem/UI_userBag.prefab

@@ -57642,7 +57642,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4791772059149409634, guid: 58f3bf476bf2f8a44a93e801cd45e726, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4791772059149409634, guid: 58f3bf476bf2f8a44a93e801cd45e726, type: 3}
       propertyPath: m_AnchorMin.x
@@ -57650,15 +57650,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4791772059149409634, guid: 58f3bf476bf2f8a44a93e801cd45e726, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4791772059149409634, guid: 58f3bf476bf2f8a44a93e801cd45e726, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 120
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4791772059149409634, guid: 58f3bf476bf2f8a44a93e801cd45e726, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 120
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4791772059149409634, guid: 58f3bf476bf2f8a44a93e801cd45e726, type: 3}
       propertyPath: m_LocalPosition.x
@@ -57690,11 +57690,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4791772059149409634, guid: 58f3bf476bf2f8a44a93e801cd45e726, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 190
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4791772059149409634, guid: 58f3bf476bf2f8a44a93e801cd45e726, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -65
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4791772059149409634, guid: 58f3bf476bf2f8a44a93e801cd45e726, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -59696,7 +59696,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4791772059149409634, guid: 58f3bf476bf2f8a44a93e801cd45e726, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4791772059149409634, guid: 58f3bf476bf2f8a44a93e801cd45e726, type: 3}
       propertyPath: m_AnchorMin.x
@@ -59704,15 +59704,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4791772059149409634, guid: 58f3bf476bf2f8a44a93e801cd45e726, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4791772059149409634, guid: 58f3bf476bf2f8a44a93e801cd45e726, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 120
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4791772059149409634, guid: 58f3bf476bf2f8a44a93e801cd45e726, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 120
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4791772059149409634, guid: 58f3bf476bf2f8a44a93e801cd45e726, type: 3}
       propertyPath: m_LocalPosition.x
@@ -59744,11 +59744,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4791772059149409634, guid: 58f3bf476bf2f8a44a93e801cd45e726, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 65
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4791772059149409634, guid: 58f3bf476bf2f8a44a93e801cd45e726, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -65
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 4791772059149409634, guid: 58f3bf476bf2f8a44a93e801cd45e726, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x

Assets/playerBagSystem/uBag.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using Bansonic;
 using UnityEngine;
 using UnityEngine.Events;
 using UnityEngine.UI;
@@ -10,6 +11,8 @@ using UnityEditor;
 
 public class uBag : MonoBehaviour
 {
+    private const string MemorySystemComingSoonMessage = "\"记忆\"系统即将上线，敬请期待！";
+
     private enum BagFilterMode
     {
         All,
@@ -366,12 +369,17 @@ public class uBag : MonoBehaviour
 
     private void HandleEquipSystemChanged(bool isOn)
     {
-        SetObjectActive(bagObj, !isOn);
-        SetObjectActive(equipObj, isOn);
+        if (isOn)
+        {
+            ShowMemorySystemComingSoon();
+        }
+
+        ForceBagViewMode();
     }
 
     private void ApplyCategory(BagCategory category)
     {
+        ForceBagViewMode();
         currentCategory = category;
         currentFilterMode = (BagFilterMode)category;
         if (bag_filterDropdown != null)
@@ -408,14 +416,27 @@ public class uBag : MonoBehaviour
         {
             equipSystemToggle.onValueChanged.RemoveListener(HandleEquipSystemChanged);
             equipSystemToggle.onValueChanged.AddListener(HandleEquipSystemChanged);
-            HandleEquipSystemChanged(equipSystemToggle.isOn);
-            return;
+        }
+
+        ForceBagViewMode();
+    }
+
+    private void ForceBagViewMode()
+    {
+        if (equipSystemToggle != null)
+        {
+            equipSystemToggle.SetIsOnWithoutNotify(false);
         }
 
         SetObjectActive(bagObj, true);
         SetObjectActive(equipObj, false);
     }
 
+    private static void ShowMemorySystemComingSoon()
+    {
+        gNotice.error.display(MemorySystemComingSoonMessage);
+    }
+
     private void HandleInventoryChanged(ExpBottleKind _, int __)
     {
         Rebuild();
@@ -674,7 +695,7 @@ public class uBag : MonoBehaviour
                 continue;
             }
 
-            if (story.fatherType == notebook_faterType.notebook_fatherType.content && !story.showInBag)
+            if (!story.showInBag)
             {
                 continue;
             }