From 2142bbf1f6962e3f0a104759b58ef6b4b995fd76 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 11 十二月 2025 21:44:29 +0800
Subject: [PATCH] 0312 X秒未点击挑战BOSS引导提醒；loading图文字提醒；登录首次打开武将列表界面显示全体属性提醒；修复非上阵武将吞噬没红点问题
---
Main/System/Launch/LoadingWin.cs | 41 +++++++------
Main/System/GeneralConfig/GeneralDefine.cs | 4 +
Main/System/Main/HeroFightingCardCell.cs | 2
Main/System/Battle/BattleWin.cs | 33 +++++++---
Main/System/HeroUI/HeroListWin.cs | 12 ++++
Main/System/HeroUI/HeroTrainWin.cs | 45 ++++++++------
Main/System/HeroUI/HeroUIManager.cs | 3 +
7 files changed, 91 insertions(+), 49 deletions(-)
diff --git a/Main/System/Battle/BattleWin.cs b/Main/System/Battle/BattleWin.cs
index d6f8fb5..f1c6d26 100644
--- a/Main/System/Battle/BattleWin.cs
+++ b/Main/System/Battle/BattleWin.cs
@@ -48,17 +48,19 @@
protected override void OnPreOpen()
{
- lastClickTime = Time.realtimeSinceStartup;
+ // lastClickTime = Time.realtimeSinceStartup;
needGuide = !MainLevelManager.Instance.IsPassedByMainLevelID(BattleManager.Instance.fightGuideMainLevelLimit);
// SetBattleField(BattleManager.Instance.storyBattleField);
BattleManager.Instance.onBattleFieldCreate += OnCreateBattleField;
+ UIManager.Instance.OnOpenWindow += OnOpenWindow;
}
protected override void OnPreClose()
{
UIManager.Instance.CloseWindow<BattleHUDWin>();
BattleManager.Instance.onBattleFieldCreate -= OnCreateBattleField;
+ UIManager.Instance.OnOpenWindow -= OnOpenWindow;
}
private void OnCreateBattleField(string arg1, BattleField field)
@@ -123,7 +125,13 @@
battleField.UpdateCanvas(canvas);
}
-
+ void OnOpenWindow(UIBase ui)
+ {
+ if (ui is MainBossEnterWin)
+ {
+ lastClickTime = Time.realtimeSinceStartup;
+ }
+ }
// 鏂版墜鏈� 鐜╁鏈仛浠讳綍鎿嶄綔涓嬶紝鍦ㄤ富绾挎垬鏂椾腑鎻愰啋鐐瑰嚮鎴橀敜
void LateUpdate()
@@ -131,18 +139,18 @@
if (!needGuide)
return;
- if (Input.GetMouseButtonDown(0))
- {
- lastClickTime = Time.realtimeSinceStartup;
- }
+ // if (Input.GetMouseButtonDown(0))
+ // {
+ // lastClickTime = Time.realtimeSinceStartup;
+ // }
if (Time.realtimeSinceStartup - lastClickTime > BattleManager.Instance.fightGuideNoClickSeconds)
{
- if (AutoFightModel.Instance.isAutoAttack)
- {
- return;
- }
+ // if (AutoFightModel.Instance.isAutoAttack)
+ // {
+ // return;
+ // }
if (NewBieCenter.Instance.inGuiding)
{
@@ -154,6 +162,11 @@
return;
}
+ if (!MainLevelManager.Instance.CanChallengeBoss())
+ {
+ return;
+ }
+
NewBieCenter.Instance.StartNewBieGuide(BattleManager.Instance.fightGuideID);
needGuide = !MainLevelManager.Instance.IsPassedByMainLevelID(BattleManager.Instance.fightGuideMainLevelLimit);
BattleManager.Instance.storyBattleField.IsPause = false;
diff --git a/Main/System/GeneralConfig/GeneralDefine.cs b/Main/System/GeneralConfig/GeneralDefine.cs
index 1bc4cd7..36843ce 100644
--- a/Main/System/GeneralConfig/GeneralDefine.cs
+++ b/Main/System/GeneralConfig/GeneralDefine.cs
@@ -39,6 +39,7 @@
public static Dictionary<int, string> itemIconDict { get; private set; }
public static int mainRightFuncOpenFuncID { get; private set; }
+ public static string[] loadingTips { get; private set; }
public static void Init()
{
@@ -86,6 +87,9 @@
inGameDownLoadLevelCheckPoints = new List<int>(GetIntArray("InGameDownLoad"));
inGameDownLoadHighLevel = GetInt("InGameDownLoad", 2);
+
+ config = FuncConfigConfig.Get("LoadingTip");
+ loadingTips = JsonMapper.ToObject<string[]>(config.Numerical1);
}
catch (Exception ex)
{
diff --git a/Main/System/HeroUI/HeroListWin.cs b/Main/System/HeroUI/HeroListWin.cs
index 1c8360d..914d0f0 100644
--- a/Main/System/HeroUI/HeroListWin.cs
+++ b/Main/System/HeroUI/HeroListWin.cs
@@ -62,6 +62,7 @@
// CreateScroller();
Refresh();
fiterManager.Display(0, SelectJobCountry);
+
}
protected override void OnPreClose()
@@ -101,6 +102,17 @@
}
}
+
+ protected override void NextFrameAfterOpen()
+ {
+ if (!NewBieCenter.Instance.inGuiding && !HeroUIManager.Instance.isOpenHeroTip && TimeUtility.OpenDay < 3)
+ {
+ attrOnTip.SetActive(true);
+ HeroUIManager.Instance.isOpenHeroTip = true;
+ }
+ }
+
+
int FindJumpIndexByHeroID(int heroID)
{
int index = -1;
diff --git a/Main/System/HeroUI/HeroTrainWin.cs b/Main/System/HeroUI/HeroTrainWin.cs
index fd0dfd3..9a98232 100644
--- a/Main/System/HeroUI/HeroTrainWin.cs
+++ b/Main/System/HeroUI/HeroTrainWin.cs
@@ -238,7 +238,7 @@
jobPosNameText.text = HeroUIManager.Instance.GetJobName(hero.heroConfig.Class);
descText.text = hero.heroConfig.Desc;
fightPowerText.text = UIHelper.ReplaceLargeArtNum(hero.CalculateFightPower());
- PlayerMainDate.Instance.AddPowerNotOnTeam(hero);
+ // PlayerMainDate.Instance.AddPowerNotOnTeam(hero);
lockImg.SetActive(hero.isLock);
unLockImg.SetActive(!hero.isLock);
@@ -805,29 +805,10 @@
redpointAwake.SetActive(false);
redpointGift.SetActive(false);
redpointLVUP.SetActive(false);
- if (!hero.IsInTeamByTeamType(TeamType.Story))
- {
- return;
- }
-
var heroCnt = PackManager.Instance.GetItemCountByID(PackType.Hero, hero.heroId);
var itemPack = PackManager.Instance.GetSinglePack(PackType.Item);
- //5鏄熷悗鎵嶈兘瑙夐啋
- if (hero.heroStar >= HeroUIManager.Instance.starLevelCanAwake)
- {
- //鍒ゆ柇瑙夐啋鏉愭枡鏄惁瓒冲
- var maxAwakeLV = HeroAwakeConfig.GetMaxAwakeLV(hero.heroId);
- if (hero.awakeLevel < maxAwakeLV)
- {
- var config = HeroQualityAwakeConfig.GetQualityAwakeConfig(hero.Quality, hero.awakeLevel);
- if (itemPack.GetCountById(config.UPCostItem[0]) >= config.UPCostItem[1])
- {
- redpointAwake.SetActive(true);
- }
- }
- }
if (heroCnt > 1)
{
@@ -857,5 +838,29 @@
redpointLVUP.SetActive(true);
}
}
+
+
+ if (!hero.IsInTeamByTeamType(TeamType.Story))
+ {
+ return;
+ }
+
+
+ //5鏄熷悗鎵嶈兘瑙夐啋
+ if (hero.heroStar >= HeroUIManager.Instance.starLevelCanAwake)
+ {
+ //鍒ゆ柇瑙夐啋鏉愭枡鏄惁瓒冲
+ var maxAwakeLV = HeroAwakeConfig.GetMaxAwakeLV(hero.heroId);
+ if (hero.awakeLevel < maxAwakeLV)
+ {
+ var config = HeroQualityAwakeConfig.GetQualityAwakeConfig(hero.Quality, hero.awakeLevel);
+ if (itemPack.GetCountById(config.UPCostItem[0]) >= config.UPCostItem[1])
+ {
+ redpointAwake.SetActive(true);
+ }
+ }
+ }
+
+
}
}
\ No newline at end of file
diff --git a/Main/System/HeroUI/HeroUIManager.cs b/Main/System/HeroUI/HeroUIManager.cs
index f877583..50f9e42 100644
--- a/Main/System/HeroUI/HeroUIManager.cs
+++ b/Main/System/HeroUI/HeroUIManager.cs
@@ -32,6 +32,8 @@
public List<int> heroSpecialAttrsForSelect = new List<int>(); //绛涢�夌敤鐨勭壒娈婂睘鎬ф眹鎬�
+ public bool isOpenHeroTip = false;
+
public override void Init()
{
DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitialize;
@@ -94,6 +96,7 @@
heroCollectInfoDic.Clear();
newHeroIDList.Clear();
firstHeroIDBookUpdate = 0;
+ isOpenHeroTip = false;
}
diff --git a/Main/System/Launch/LoadingWin.cs b/Main/System/Launch/LoadingWin.cs
index 07c41b9..6bf68b7 100644
--- a/Main/System/Launch/LoadingWin.cs
+++ b/Main/System/Launch/LoadingWin.cs
@@ -19,7 +19,7 @@
protected List<Sprite> backGrounds = new List<Sprite>();
- protected float backGroundTimer = 0f;
+ protected float backGroundTimer = 10f;
protected int backGroundIndex = 0;
protected override void InitComponent()
@@ -116,31 +116,36 @@
protected void LateUpdate()
{
UpdateProgress();
- // CopiedLogic_LateUpdate();
+ CopiedLogic_LateUpdate();
}
private void CopiedLogic_LateUpdate()
{
- // backGroundTimer += Time.deltaTime;
- // if (backGroundTimer >= 3f)
- // {
- // backGroundTimer -= 3f;
- // if (backGrounds.Count > 1)
- // {
- // m_BackGround.overrideSprite = backGrounds[(++backGroundIndex) % backGrounds.Count];
- // }
+ backGroundTimer += Time.deltaTime;
+ if (backGroundTimer >= 3f)
+ {
+ backGroundTimer = 0f;
+ // if (backGrounds.Count > 1)
+ // {
+ // m_BackGround.overrideSprite = backGrounds[(++backGroundIndex) % backGrounds.Count];
+ // }
- // // 鑰冭檻鍦ㄨ繖閲屽仛杩欎釜鎻忚堪鐨勫垏鎹� 鎴栬�呮牴鎹浘鐗囨潵鍋氭彁绀鸿瘝
- // // m_StageDescription.text = "";
- // }
+ // 鑰冭檻鍦ㄨ繖閲屽仛杩欎釜鎻忚堪鐨勫垏鎹� 鎴栬�呮牴鎹浘鐗囨潵鍋氭彁绀鸿瘝
+ // m_StageDescription.text = "";
+
+ var maxNum = GeneralDefine.loadingTips.Length;
+ //闅忔満涓�涓彁绀鸿瘝
+ var randomIndex = UnityEngine.Random.Range(0, maxNum);
+ m_StageDescription.text = Language.Get(GeneralDefine.loadingTips[randomIndex]);
+ }
}
public void SetData(LaunchWinData _launchWinData)
{
- backGroundTimer = _launchWinData.backGroundTimer;
- backGroundIndex = _launchWinData.backGroundIndex;
- // m_BackGround.overrideSprite = _launchWinData.sprite;
- backGrounds = _launchWinData.sprites;
- m_StageDescription.text = Language.GetFromLocal(44);//鏈�鍚嶤ompleted涓�瀹氭槸杩欎釜 鑰冭檻瑕佷笉瑕佸鍏aunchWinData..
+ // backGroundTimer = _launchWinData.backGroundTimer;
+ // backGroundIndex = _launchWinData.backGroundIndex;
+ // // m_BackGround.overrideSprite = _launchWinData.sprite;
+ // backGrounds = _launchWinData.sprites;
+ // m_StageDescription.text = Language.GetFromLocal(44);//鏈�鍚嶤ompleted涓�瀹氭槸杩欎釜 鑰冭檻瑕佷笉瑕佸鍏aunchWinData..
}
}
\ No newline at end of file
diff --git a/Main/System/Main/HeroFightingCardCell.cs b/Main/System/Main/HeroFightingCardCell.cs
index b5b4d6d..73c1b92 100644
--- a/Main/System/Main/HeroFightingCardCell.cs
+++ b/Main/System/Main/HeroFightingCardCell.cs
@@ -138,7 +138,7 @@
}
return;
}
- UIManager.Instance.OpenWindow<HeroCallWin>();
+ UIManager.Instance.OpenWindow<HeroPosWin>();
}
void OnSkillCast(bool isfighting)
{
--
Gitblit v1.8.0