0312 修复觉醒后战力计算错误的问题

hch

2025-12-31 4debfee66e8d8aabd179e2f8a61c7ca5ce62af3d

 Main/System/Battle/BattleObject/BattleObjectFactory.cs

@@ -1,4 +1,3 @@

using System.Collections.Generic;
using System;
using UnityEngine;
@@ -11,7 +10,7 @@

    private static float m_modelScaleRate = 0f;

    private static float modelScaleRate
    public static float modelScaleRate
    {
        get
        {
@@ -25,16 +24,27 @@
    //  这里报错了检查一下
    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;
        }

        // ===== 直接加载资源（非预加载的资源不走缓存系统）=====
        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.positionNum];
        BattleObject battleObject = new BattleObject(_battleField);
@@ -43,24 +53,36 @@
        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

        return battleObject;
    }