Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_S...

hch

2025-12-17 71c3e459965f5442ca704eec64451316910f1732

Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts

 Main/System/Battle/BattleManager.cs

@@ -346,6 +346,7 @@

                PackageRegedit.Distribute(pack);
            }
            return true;
        }
        catch (Exception ex)
        {
@@ -355,10 +356,8 @@
            {
                packQueue.Dequeue();
            }
            return false;
            return packQueue.Count > 0;
        }

        return packQueue.Count > 0;
    }

    public void OnConnected()

 Main/System/BattleDetail/BattleDetailHeroInfoItem.cs

@@ -61,9 +61,9 @@
        txtLV.text = StringUtility.Concat(Language.Get("L1094"), info.LV.ToString());
        DisplayStars(info.Star);

        DisplaySlider(imgAtkHurt, txtAtkHurt, info.AtkHurt, data.maxAtk);
        DisplaySlider(imgDefHurt, txtDefHurt, info.DefHurt, data.maxDef);
        DisplaySlider(imgCureHP, txtCureHP, info.CureHP, data.maxCure);
        DisplaySlider(imgAtkHurt, txtAtkHurt, (ulong)info.AtkHurt, data.maxAtk);
        DisplaySlider(imgDefHurt, txtDefHurt, (ulong)info.DefHurt, data.maxDef);
        DisplaySlider(imgCureHP, txtCureHP, (ulong)info.CureHP, data.maxCure);
    }



 Main/System/BattleDetail/BattleDetailWin.cs

@@ -75,7 +75,7 @@
        for (int i = 0; i < infos.Count; i++)
        {
            BattleDetailHeroInfo nowInfo = infos[i];
            ulong nowValue = nowInfo.AtkHurt + nowInfo.DefHurt + nowInfo.CureHP;
            ulong nowValue = (ulong)nowInfo.AtkHurt + (ulong)nowInfo.DefHurt + (ulong)nowInfo.CureHP;
            if (nowValue > mvpScore)
            {
                mvpIndex = i;
@@ -96,12 +96,12 @@
        for (int i = 0; i < infos.Count; i++)
        {
            BattleDetailHeroInfo nowInfo = infos[i];
            if (nowInfo.AtkHurt > maxAtk)
                maxAtk = nowInfo.AtkHurt;
            if (nowInfo.DefHurt > maxDef)
                maxDef = nowInfo.DefHurt;
            if (nowInfo.CureHP > maxCure)
                maxCure = nowInfo.CureHP;
            if ((ulong)nowInfo.AtkHurt > maxAtk)
                maxAtk = (ulong)nowInfo.AtkHurt;
            if ((ulong)nowInfo.DefHurt > maxDef)
                maxDef = (ulong)nowInfo.DefHurt;
            if ((ulong)nowInfo.CureHP > maxCure)
                maxCure = (ulong)nowInfo.CureHP;
        }
    }
}

 Main/System/Settlement/BattleSettlementManager.cs

@@ -395,9 +395,9 @@
    public int LV;      // 武将等级
    public int Star;      // 武将星级
    public int Skin;      // 武将皮肤ID
    public ulong DefHurt; // 总承伤
    public ulong CureHP;  // 总治疗
    public ulong AtkHurt; // 总输出
    public long DefHurt; // 总承伤
    public long CureHP;  // 总治疗
    public long AtkHurt; // 总输出
    public int Dead;      // 是否阵亡
}


 Main/System/Settlement/TianziBillboradVictoryWin.cs

@@ -22,6 +22,7 @@
    {
        base.OnPreOpen();
        isSweepVictory = TianziBillboradManager.Instance.isSweepVictory;
        detailBtn.SetActive(!isSweepVictory);
        scroller.OnRefreshCell += OnRefreshCell;
        CreateScroller();
        Display();