From 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 11 五月 2026 16:20:37 +0800
Subject: [PATCH] Merge branch 'master' into h5version

---
 Main/System/Battle/BattleObject/BattleObjectFactory.cs |   88 ++++++++++++++++++++++++++++++++-----------
 1 files changed, 65 insertions(+), 23 deletions(-)

diff --git a/Main/System/Battle/BattleObject/BattleObjectFactory.cs b/Main/System/Battle/BattleObject/BattleObjectFactory.cs
index d298536..229695b 100644
--- a/Main/System/Battle/BattleObject/BattleObjectFactory.cs
+++ b/Main/System/Battle/BattleObject/BattleObjectFactory.cs
@@ -1,8 +1,8 @@
-
 using System.Collections.Generic;
 using System;
 using UnityEngine;
 using Spine.Unity;
+using Cysharp.Threading.Tasks;
 
 public class BattleObjectFactory
 {
@@ -22,52 +22,86 @@
             return m_modelScaleRate;
         }
     }
-    //  杩欓噷鎶ラ敊浜嗘鏌ヤ竴涓�
-    public static BattleObject CreateBattleObject(BattleField _battleField, List<GameObject> posNodeList, TeamHero teamHero, BattleCamp _Camp)
+
+    /// <summary>
+    /// US2: Async version of CreateBattleObject.
+    /// </summary>
+    public static async UniTask<BattleObject> CreateBattleObjectAsync(BattleField _battleField, List<GameObject> posNodeList, TeamHero teamHero, BattleCamp _Camp)
     {
-        HeroSkinConfig skinCfg = teamHero.skinConfig;
+        var skinCfg = HeroSkinConfig.Get(teamHero.SkinID);
         if (skinCfg == null)
         {
-            Debug.LogError(teamHero.heroId + "BattleObjectFactory.CreateBattleObject: skinCfg is null for " + teamHero.SkinID);
+            Debug.LogError($"BattleObjectFactory: skinCfg is null for SkinID {teamHero.SkinID}");
             return null;
         }
 
-        GameObject battleGO = ResManager.Instance.LoadAsset<GameObject>("Hero/SpineRes", "Hero_001"/*skinCfg.SpineRes*/);
+        SkeletonDataAsset skeletonDataAsset = await ResManager.Instance.LoadAssetAsync<SkeletonDataAsset>(
+            "Hero/SpineRes/",
+            skinCfg.SpineRes
+        );
+
+        if (skeletonDataAsset == null)
+        {
+            Debug.LogError($"BattleObjectFactory: Failed to load SkeletonDataAsset for {skinCfg.SpineRes}");
+            return null;
+        }
+
+        GameObject battleGO = await ResManager.Instance.LoadAssetAsync<GameObject>("Hero/SpineRes", "Hero_001");
 
         GameObject goParent = posNodeList[teamHero.positionNum];
-        BattleObject battleObject = new BattleObject(_battleField);
+        BattleObject battleObject = Produce(teamHero.positionNum, _battleField);
         battleObject.ObjID = teamHero.ObjID;
 
         GameObject realGO = GameObject.Instantiate(battleGO, goParent.transform);
         SkeletonAnimation skeletonAnimation = realGO.GetComponentInChildren<SkeletonAnimation>(true);
 
-        var skeletonDataAsset = ResManager.Instance.LoadAsset<SkeletonDataAsset>("Hero/SpineRes/", skinCfg.SpineRes);
-        if (skeletonDataAsset == null)
-        {
-            Debug.LogError("BattleObjectFactory.CreateBattleObject: skeletonDataAsset is null for " + skinCfg.SpineRes);
-            return null;
-        }
-
         float finalScaleRate = modelScaleRate * teamHero.modelScale;
 
+        skeletonAnimation.initialSkinName = skinCfg.InitialSkinName;
         skeletonAnimation.skeletonDataAsset = skeletonDataAsset;
         skeletonAnimation.Initialize(true);
+
+        if (!string.IsNullOrEmpty(skinCfg.InitialSkinName))
+        {
+            var skeleton = skeletonAnimation.Skeleton;
+            skeleton.SetSkin(skinCfg.InitialSkinName);
+            skeleton.SetSlotsToSetupPose();
+            skeletonAnimation.Update(0);
+        }
+
         realGO.name = battleObject.ObjID.ToString();
         realGO.transform.localScale = new Vector3(finalScaleRate, finalScaleRate, finalScaleRate);
         RectTransform rectTrans = realGO.GetComponent<RectTransform>();
         rectTrans.anchoredPosition = Vector2.zero;
-        battleObject.Init(realGO, teamHero, _Camp);
 
-#if UNITY_EDITOR
-        BattleDebug.LogError(
-            "鍒濆鍖� 鏈鍔�" +
-            (battleObject.Camp == BattleCamp.Red ? "銆愮孩鏂广��" : "銆愯摑鏂广�� ") +
-            $"姝﹀皢: {battleObject.teamHero.name}\n" +
-            $"褰撳墠琛�閲�: {battleObject.teamHero.curHp} -> 鏈�澶ц閲弡battleObject.teamHero.maxHp}\n"
-        );
-#endif
+        if (battleObject is HeroBattleObject heroBattleObject)
+        {
+            heroBattleObject.Init(realGO, teamHero, _Camp);
+        }
 
         return battleObject;
+    }
+
+    public static BattleObject Produce(int positionNum, BattleField battleField)
+    {
+        if (positionNum >= 0)
+        {
+            return new HeroBattleObject(battleField);
+        }
+        else if (positionNum == 99)
+        {
+            //  鍛芥牸
+            return new MinggeBattleObject(battleField);
+        }
+        // else if (positionNum >= 101)
+        // {
+        //     //  鐏靛吔
+        //     return new SpiritBeastBattleObject(battleField);
+        // }
+        else
+        {
+            return new HeroBattleObject(battleField);
+        }
     }
 
     public static void DestroyBattleObject(int key, BattleObject battleObj)
@@ -75,4 +109,12 @@
         battleObj.Destroy();
         battleObj = null;
     }
+
+    public static BattleObject CreateMinggeBattleObject(BattleField battleField, TeamBase teamBase, BattleCamp camp)
+    {
+        MinggeBattleObject minggeBattleObject = new MinggeBattleObject(battleField);
+        minggeBattleObject.Init(teamBase, teamBase.teamMingge, camp);
+        minggeBattleObject.ObjID = teamBase.teamMingge.ObjID;
+        return minggeBattleObject;
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0