yyl
2026-02-02 0648c3994e75e469ee10ea71ef8f9d0010bb8811
Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
4个文件已修改
49 ■■■■ 已修改文件
Main/System/HeroUI/HeroLVBreakCell.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/HeroUI/HeroTrainWin.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/InternalAffairs/GoldRushWorkCell.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/Login/DisconnectHintWin.cs 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Main/System/HeroUI/HeroLVBreakCell.cs
@@ -75,8 +75,12 @@
    }
    public void RefreshLV()
    public void RefreshLV(HeroInfo _hero = null)
    {
        if (_hero != null)
        {
            hero = _hero;
        }
        breakLVText.text = Language.Get("herocardbreaklv", hero.heroConfig.Name, hero.breakLevel);
        nextBreakLVText.text = Language.Get("herocardbreaklv", hero.heroConfig.Name, hero.breakLevel + 1);
        // lvText.text = hero.qualityBreakConfig.LVMax.ToString();
Main/System/HeroUI/HeroTrainWin.cs
@@ -353,6 +353,7 @@
            return;
        }
        RefreshAttr();
        heroLVBreakCell.RefreshLV(hero);
    }
    void RefreshHeroEvent(HeroInfo hero)
Main/System/InternalAffairs/GoldRushWorkCell.cs
@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
@@ -62,7 +63,7 @@
        {
            if (endTime != 0)
            {
                timeText.text = TimeUtility.SecondsToHMS(endTime - TimeUtility.AllSeconds);
                timeText.text = TimeUtility.SecondsToHMS(Math.Max(0, endTime - TimeUtility.AllSeconds));
                //按原总时长当进度条
                slider.value = (config.NeedSeconds - (endTime - TimeUtility.AllSeconds)) / (float)config.NeedSeconds;
            }
Main/System/Login/DisconnectHintWin.cs
@@ -1,9 +1,4 @@

using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine;
using UnityEngine.UI;
@@ -11,13 +6,11 @@
{
    [SerializeField] Text m_Content;
    [SerializeField] Button m_Confirm;
    [SerializeField] Button m_Cancel;
    #region Built-in
    protected override void InitComponent()
    {
        m_Cancel.AddListener(Cancel);
        m_Confirm.AddListener(Confirm);
    }
@@ -37,32 +30,6 @@
    private void Confirm()
    {
        switch (Application.internetReachability)
        {
            case NetworkReachability.NotReachable:
                GameNetSystem.Instance.LoginOut();
                ServerForceExitHintWin.reason = 111;
                break;
            case NetworkReachability.ReachableViaCarrierDataNetwork:
            case NetworkReachability.ReachableViaLocalAreaNetwork:
                if (StageManager.Instance.currentStage == StageName.Login)
                {
                    LoginManager.Instance.busy = false;
                    LoginManager.Instance.AccountLogin(LoginManager.Instance.accountBuf, LoginManager.Instance.ipBuf,
                    LoginManager.Instance.portBuf, LoginManager.Instance.gamePortBuf);
                }
                else
                {
                    GameNetSystem.Instance.Reconnect();
                }
                break;
        }
        CloseWindow();
    }
    private void Cancel()
    {
        if (!(StageManager.Instance.currentStage == StageName.Login))
        {
            GameNetSystem.Instance.LoginOut();
@@ -71,6 +38,8 @@
        CloseWindow();
    }
}