Merge branch 'bugfix/actor' into 'develop'

actormanager修改

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

Assets/Scenes/SubWay.unity

@@ -756,6 +756,103 @@ MonoBehaviour:
         m_Calls: []
   m_LegacyBlendHint: 0
   m_ComponentOwner: {fileID: 511564811}
+--- !u!1 &252705163
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 252705164}
+  - component: {fileID: 252705166}
+  - component: {fileID: 252705165}
+  m_Layer: 0
+  m_Name: "\u5730\u94C1\u706B\u5C71"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &252705164
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 252705163}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 6.1, y: -5, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 463340591}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &252705165
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 252705163}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e6bb1b847b634daca8351126b7e717d6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!212 &252705166
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 252705163}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 1560193523
+  m_SortingLayer: -1
+  m_SortingOrder: 180
+  m_Sprite: {fileID: 2360064117228472837, guid: 4bfb621754a0d6245a2b83a2010c29f2, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 6.139535, y: 6.4651165}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 1
 --- !u!1 &253395608
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scripts/Framework/ResourceKit/ResourceKit.cs

@@ -3,6 +3,7 @@ using System.Linq;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.AddressableAssets;
+using UnityEngine.ResourceManagement.AsyncOperations;
 
 namespace AibisDream.Framework
 {
@@ -61,7 +62,15 @@ namespace AibisDream.Framework
 
             operation.WaitForCompletion();
 
-            return operation.Result;
+            if (operation.Status == AsyncOperationStatus.Succeeded)
+            {
+                return operation.Result;
+            }
+            else
+            {
+                Debug.Log($"资源{key}不存在");
+                return default;
+            }
         }
     }
 }

Assets/Scripts/SceneManagement/ActorKit/ActorManager.cs

@@ -40,6 +40,8 @@ namespace AibisDream
 #endif
                 Destroy(child.gameObject);
             }
+            
+            _actorDict.Clear();
         }
 
         private void InitDefaultActor()
@@ -70,8 +72,15 @@ namespace AibisDream
             DestroyEditorTemp();
             foreach (var slot in _slotDict.Values)
             {
-                var actor = InitActor(slot.defaultActorName, slot.slotName, slot.defaultActorType);
-                actor.Show();
+                if (!string.IsNullOrEmpty(slot.defaultActorName))
+                {
+                    var actor = InitActor(slot.defaultActorName, slot.slotName, slot.defaultActorType);
+                    actor.Show();
+                }
+                else
+                {
+                    Debug.Log($"slot {slot.slotName} 没有默认角色");
+                }
             }
         }
 #endif