From 0648c3994e75e469ee10ea71ef8f9d0010bb8811 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 02 二月 2026 19:06:27 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Login/DisconnectHintWin.cs | 37 +++----------------------------------
Main/System/HeroUI/HeroLVBreakCell.cs | 6 +++++-
Main/System/InternalAffairs/GoldRushWorkCell.cs | 5 +++--
Main/System/HeroUI/HeroTrainWin.cs | 1 +
4 files changed, 12 insertions(+), 37 deletions(-)
diff --git a/Main/System/HeroUI/HeroLVBreakCell.cs b/Main/System/HeroUI/HeroLVBreakCell.cs
index c19ac3d..78b5b2a 100644
--- a/Main/System/HeroUI/HeroLVBreakCell.cs
+++ b/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();
diff --git a/Main/System/HeroUI/HeroTrainWin.cs b/Main/System/HeroUI/HeroTrainWin.cs
index 6a9f393..07fd7f1 100644
--- a/Main/System/HeroUI/HeroTrainWin.cs
+++ b/Main/System/HeroUI/HeroTrainWin.cs
@@ -353,6 +353,7 @@
return;
}
RefreshAttr();
+ heroLVBreakCell.RefreshLV(hero);
}
void RefreshHeroEvent(HeroInfo hero)
diff --git a/Main/System/InternalAffairs/GoldRushWorkCell.cs b/Main/System/InternalAffairs/GoldRushWorkCell.cs
index 7a5667f..ca2408d 100644
--- a/Main/System/InternalAffairs/GoldRushWorkCell.cs
+++ b/Main/System/InternalAffairs/GoldRushWorkCell.cs
@@ -1,4 +1,5 @@
-锘縰sing System.Collections.Generic;
+锘縰sing 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;
}
diff --git a/Main/System/Login/DisconnectHintWin.cs b/Main/System/Login/DisconnectHintWin.cs
index 93dd432..684a95c 100644
--- a/Main/System/Login/DisconnectHintWin.cs
+++ b/Main/System/Login/DisconnectHintWin.cs
@@ -1,9 +1,4 @@
-锘�
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.SceneManagement;
+锘縰sing 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();
}
+
+
}
--
Gitblit v1.8.0