From 1ad03cc2f91d75e80fc3dc42e2ac1fadc9a2bfec Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 11 二月 2026 16:10:43 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/System/Battle/BattleObject/BattleObjectFactory.cs | 146 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 133 insertions(+), 13 deletions(-)
diff --git a/Main/System/Battle/BattleObject/BattleObjectFactory.cs b/Main/System/Battle/BattleObject/BattleObjectFactory.cs
index d298536..dacfe8e 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
{
@@ -25,54 +25,174 @@
// 杩欓噷鎶ラ敊浜嗘鏌ヤ竴涓�
public static BattleObject CreateBattleObject(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;
}
+ // ===== 鐩存帴鍔犺浇璧勬簮锛堥潪棰勫姞杞界殑璧勬簮涓嶈蛋缂撳瓨绯荤粺锛�=====
+ #pragma warning disable CS0618 // Obsolete 鈥� sync legacy fallback, async path exists in CreateBattleObjectAsync
+ SkeletonDataAsset skeletonDataAsset = ResManager.Instance.LoadAsset<SkeletonDataAsset>(
+ "Hero/SpineRes/",
+ skinCfg.SpineRes
+ );
+ #pragma warning restore CS0618
+
+ if (skeletonDataAsset == null)
+ {
+ Debug.LogError($"BattleObjectFactory: Failed to load SkeletonDataAsset for {skinCfg.SpineRes}");
+ return null;
+ }
+
+ // Debug.LogError($"{teamHero.SkinID} : {skinCfg.SpineRes}");
+
+ // ==============================================
+
+ #pragma warning disable CS0618
GameObject battleGO = ResManager.Instance.LoadAsset<GameObject>("Hero/SpineRes", "Hero_001"/*skinCfg.SpineRes*/);
+ #pragma warning restore CS0618
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);
+
+ // HeroBattleObject 鎵嶆湁 GameObject 鍙傛暟鐨� Init 鏂规硶
+ if (battleObject is HeroBattleObject heroBattleObject)
+ {
+ heroBattleObject.Init(realGO, teamHero, _Camp);
+ }
+ // 鍏朵粬绫诲瀷锛堝MinggeBattleObject锛変笉鍦ㄨ繖閲屽垱寤猴紝鏈夊崟鐙殑鍒涘缓閫昏緫
#if UNITY_EDITOR
BattleDebug.LogError(
"鍒濆鍖� 鏈鍔�" +
(battleObject.Camp == BattleCamp.Red ? "銆愮孩鏂广��" : "銆愯摑鏂广�� ") +
- $"姝﹀皢: {battleObject.teamHero.name}\n" +
- $"褰撳墠琛�閲�: {battleObject.teamHero.curHp} -> 鏈�澶ц閲弡battleObject.teamHero.maxHp}\n"
+ $"姝﹀皢: {battleObject.GetName()}\n" +
+ $"褰撳墠琛�閲�: {battleObject.GetCurHp()} -> 鏈�澶ц閲弡battleObject.GetMaxHp()}\n"
);
#endif
return battleObject;
}
+ /// <summary>
+ /// US2: Async version of CreateBattleObject.
+ /// </summary>
+ public static async UniTask<BattleObject> CreateBattleObjectAsync(BattleField _battleField, List<GameObject> posNodeList, TeamHero teamHero, BattleCamp _Camp)
+ {
+ var skinCfg = HeroSkinConfig.Get(teamHero.SkinID);
+ if (skinCfg == null)
+ {
+ Debug.LogError($"BattleObjectFactory: skinCfg is null for SkinID {teamHero.SkinID}");
+ return null;
+ }
+
+ 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 = Produce(teamHero.positionNum, _battleField);
+ battleObject.ObjID = teamHero.ObjID;
+
+ GameObject realGO = GameObject.Instantiate(battleGO, goParent.transform);
+ SkeletonAnimation skeletonAnimation = realGO.GetComponentInChildren<SkeletonAnimation>(true);
+
+ 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;
+
+ 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)
{
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