From 04ffe31b6a2b2fbcfecc83abb44a8aa233f2e53f Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 02 二月 2026 18:45:57 +0800
Subject: [PATCH] 54 【淘金】切后台淘金完成 时间显示负数
---
Main/System/Battle/BattleObject/BattleObjectFactory.cs | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 111 insertions(+), 8 deletions(-)
diff --git a/Main/System/Battle/BattleObject/BattleObjectFactory.cs b/Main/System/Battle/BattleObject/BattleObjectFactory.cs
index f7d9304..7101554 100644
--- a/Main/System/Battle/BattleObject/BattleObjectFactory.cs
+++ b/Main/System/Battle/BattleObject/BattleObjectFactory.cs
@@ -1,23 +1,118 @@
-
using System.Collections.Generic;
using System;
using UnityEngine;
+using Spine.Unity;
public class BattleObjectFactory
{
// 鏈剰鏄鍦ㄨ繖閲屽仛姹犵殑鍐呭鐨� 浣嗘槸鎯充簡涓�涓� 鍒╃敤鏁堢巼鏈夌偣宸� 鏈�澶氬仛涓�涓嬬孩鑹叉柟鐨勭紦瀛� 钃濊壊鏂圭殑鍗虫椂鐢� 鍗虫椂鍒犻櫎 鎴栬�呯紦瀛樹笂涓�娆℃垬鏂楃殑灏辫
- private static int AutoIncrementID = 100000;
+ // private static int AutoIncrementID = 100000;
+ private static float m_modelScaleRate = 0f;
+
+ public static float modelScaleRate
+ {
+ get
+ {
+ if (m_modelScaleRate <= 0f)
+ {
+ m_modelScaleRate = float.Parse(FuncConfigConfig.Get("BattleModelScale").Numerical1);
+ }
+ return m_modelScaleRate;
+ }
+ }
+ // 杩欓噷鎶ラ敊浜嗘鏌ヤ竴涓�
public static BattleObject CreateBattleObject(BattleField _battleField, List<GameObject> posNodeList, TeamHero teamHero, BattleCamp _Camp)
{
- HeroSkinConfig skinCfg = teamHero.heroInfo.skinConfig;
+ var skinCfg = HeroSkinConfig.Get(teamHero.SkinID);
+ if (skinCfg == null)
+ {
+ Debug.LogError($"BattleObjectFactory: skinCfg is null for SkinID {teamHero.SkinID}");
+ return null;
+ }
+
+ // ===== 鐩存帴鍔犺浇璧勬簮锛堥潪棰勫姞杞界殑璧勬簮涓嶈蛋缂撳瓨绯荤粺锛�=====
+ SkeletonDataAsset skeletonDataAsset = ResManager.Instance.LoadAsset<SkeletonDataAsset>(
+ "Hero/SpineRes/",
+ skinCfg.SpineRes
+ );
+
+ if (skeletonDataAsset == null)
+ {
+ Debug.LogError($"BattleObjectFactory: Failed to load SkeletonDataAsset for {skinCfg.SpineRes}");
+ return null;
+ }
+ // ==============================================
+
GameObject battleGO = ResManager.Instance.LoadAsset<GameObject>("Hero/SpineRes", "Hero_001"/*skinCfg.SpineRes*/);
- GameObject goParent = posNodeList[teamHero.heroIndex];
- BattleObject battleObject = new BattleObject(_battleField);
- battleObject.BattleObjectId = AutoIncrementID++;
- battleGO.name = battleObject.BattleObjectId.ToString();
- battleObject.Init(GameObject.Instantiate(battleGO, goParent.transform), teamHero, _Camp);
+
+ 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;
+
+ // HeroBattleObject 鎵嶆湁 GameObject 鍙傛暟鐨� Init 鏂规硶
+ if (battleObject is HeroBattleObject heroBattleObject)
+ {
+ heroBattleObject.Init(realGO, teamHero, _Camp);
+ }
+ // 鍏朵粬绫诲瀷锛堝MinggeBattleObject锛変笉鍦ㄨ繖閲屽垱寤猴紝鏈夊崟鐙殑鍒涘缓閫昏緫
+
+#if UNITY_EDITOR
+ BattleDebug.LogError(
+ "鍒濆鍖� 鏈鍔�" +
+ (battleObject.Camp == BattleCamp.Red ? "銆愮孩鏂广��" : "銆愯摑鏂广�� ") +
+ $"姝﹀皢: {battleObject.GetName()}\n" +
+ $"褰撳墠琛�閲�: {battleObject.GetCurHp()} -> 鏈�澶ц閲弡battleObject.GetMaxHp()}\n"
+ );
+#endif
+
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)
@@ -25,4 +120,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