Merge branch 'bugfix/合并后测试' into 'develop'

合并

See merge request aibis-dream/aibis-dream!454

Assets/RawResources/Art/大脑维修.psb.meta

@@ -1271,7 +1271,7 @@ ScriptedImporter:
     maxTextureSize: 16384
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 2
+    textureCompression: 0
     compressionQuality: 50
     forceMaximumCompressionQuality_BC6H_BC7: 0
     crunchedCompression: 0
@@ -1986,7 +1986,7 @@ ScriptedImporter:
   sharedRigPSDLayers: []
   pSDLayerImportSetting: []
   importFileNodeState: 1
-  platformSettingsDirtyTick: 638827587414253419
+  platformSettingsDirtyTick: 638855330835942087
   spriteSizeExpandChanged: 0
   generateGOHierarchy: 1
   textureAssetName: 

Assets/Resources/Yarn/FP_Day1_mid/Day1_mid.yarn

@@ -262,7 +262,7 @@ me: “火山：-老地方。” #line:03c8dd1
     <<load_scene Clinic 1>>  
     <<set_time_of_day EnvironmentManager "night">>
     <<fade_out 1>>
-    感谢游玩 爱与机器人维修技术 ，本次demo的体验流程已结束。
+    感谢游玩 爱与机器人维修技术 ，本次demo的体验流程已结束。 #line:0cd82d0 
     <<OpenEndMenu>>
     // <<NextYarn>>
 ===

Assets/Scenes/Persistence.unity

@@ -8361,7 +8361,7 @@ Transform:
   m_GameObject: {fileID: 519420028}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -10}
+  m_LocalPosition: {x: -30.29, y: 0, z: -10}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs

@@ -68,17 +68,6 @@ namespace AibisDream.FixSystem
                 heatMapController = transform.Find("HeatMapController").GetComponent<HeatMapController>();
             }
 
-            // 初始化 BodyModules 列表
-            BodyModules = new List<BodyModule>();
-            if (_bodyModuleGroup != null)
-            {
-                BodyModules.AddRange(_bodyModuleGroup.GetComponentsInChildren<BodyModule>());
-            }
-            if (_headModuleGroup != null)
-            {
-                BodyModules.AddRange(_headModuleGroup.GetComponentsInChildren<BodyModule>());
-            }
-
             FixSystemCenter.SystemDic.Register(this);
 
             // 注册Camera
@@ -118,7 +107,7 @@ namespace AibisDream.FixSystem
                 {
                     continue; // 跳过不可用的模块
                 }
-
+                
                 float tempDistance = Vector3.Distance(sourcePos, bodyModule.GetSocketPos());
 
                 if (tempDistance < closestDistance)

Assets/Scripts/FixSystemNew/Screen System/ScreenSystem.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using AibisDream.Framework;
 using AibisDream.Kit;
 using AibisDream.Utility;
+using DG.Tweening;
 using Febucci.UI;
 using TMPro;
 using UnityEngine;
@@ -75,6 +76,11 @@ namespace AibisDream.FixSystem
             ShowTitle(string.Empty);
         }
 
+        public void ShowTaskPanel()
+        {
+            TaskScreen.transform.DOLocalMoveY(3.85f, 1f);
+        }
+
         #endregion
 
         #region 对话框功能实现

Assets/Scripts/FixSystemNew/Screen System/ScreenYarnCommand.cs

@@ -28,17 +28,21 @@ namespace AibisDream
         }
 
         [YarnCommand("task_moveIn")]
-        public static IEnumerator ShowTask()
+        public static void ShowTask()
         {
             Debug.LogWarning("task_moveIn 已废弃，请尽快删除");
-            yield break;
         }
 
         [YarnCommand("task_moveOut")]
-        public static IEnumerator HideTask()
+        public static void HideTask()
         {
             Debug.LogWarning("task_moveOut 已废弃，请尽快删除");
-            yield break;
+        }
+        
+        [YarnCommand("task_moveOut")]
+        public static void ShowTaskPanel()
+        {
+            ScreenSystem.ShowTaskPanel();
         }
     }
 }