Merge branch 'temp827'

Client/Assets/Scripts/Map/Dimension.cs

@@ -17,6 +17,8 @@ namespace Map
         [SerializeField] public MapGenerator mapGenerator;
 
         public Vector3 cameraPosition;
+
+        public Entity.Entity focusEntity;
         /// <summary>
         /// 获取此维度的唯一标识符。
         /// </summary>
@@ -42,39 +44,27 @@ namespace Map
 
         private void Awake()
         {
-
             // 1. 确保 DimensionId 已初始化，这会触发 DimensionId 属性的 getter 逻辑
             var id = DimensionId;
             // 2. 创建一个用于存放此维度下所有实体的根GameObject，方便管理
             var rootObj = new GameObject($"_Entities_{id}");
             rootObj.transform.SetParent(this.transform); // 将其作为Dimension对象的子对象
             DimensionRoot = rootObj.transform;
-            // 3. 注册此维度到 Program
-            if (Program.Instance != null) // 检查单例是否仍然存在
-            {
-                Program.Instance.RegisterDimension(this);
-            }
-            else
-            {
-                Debug.LogError(
-                    "[Dimension] Program.Instance is null during Dimension Awake. Cannot register dimension.", this);
-            }
-
+            Program.Instance.RegisterDimension(this);
+            
+            mapGenerator.Init();
+            var size = mapGenerator.baseMap.GetSize();
+            cameraPosition = new Vector3(size.x / 2f, size.y / 2f, -10)+transform.position;
 
             // 5. 处理 defaultOpen 逻辑，设置Program的焦点维度
             // 确保在自身注册到 Program 之后再设置焦点，这样 Program 内部才能找到它
-            if (defaultOpen && Program.Instance != null)
+            if (defaultOpen)
             {
                 Program.Instance.SetFocusedDimension(_dimensionId);
             }
 
         }
-
-        private void Start()
-        {
-            var size = mapGenerator.baseMap.GetSize();
-            cameraPosition = new Vector3(size.x / 2f, size.y / 2f, -10) + transform.position;
-        }
+        
 
         private void OnDestroy()
         {