Prg_ZhangXuheng
/
NLDClient-yudde
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

【UI动静分离】提交动静分离最新改动

main
chenyuqi 2025-04-10 16:35:47 +08:00
parent 3f20bd6779
commit cadaecd4aa
9 changed files with 215 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ProjectNLD/Assets/Art_Out/UI/Prefab/LevelSceneUI/LevelDynamic/UIFightClockDynamic.prefab
View File

@ -503,7 +503,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2049529636994447912
RectTransform:
m_ObjectHideFlags: 0

14
ProjectNLD/Assets/Art_Out/UI/Prefab/LevelSceneUI/UIFightClock.prefab
View File

@ -465,7 +465,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 961024438782306302}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
@ -970,7 +970,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &9195009090466388244
RectTransform:
m_ObjectHideFlags: 0
@ -1166,7 +1166,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &4811113870268271074
RectTransform:
m_ObjectHideFlags: 0
@ -3376,7 +3376,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text:
m_text: FightClock_desc
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: d996718f19de68245bc356be2938e063, type: 2}
m_sharedMaterial: {fileID: -8559898196655864114, guid: d996718f19de68245bc356be2938e063,
@ -3726,7 +3726,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text:
m_text: FightClock_currentmission
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: d996718f19de68245bc356be2938e063, type: 2}
m_sharedMaterial: {fileID: -8559898196655864114, guid: d996718f19de68245bc356be2938e063,
@ -3826,7 +3826,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2132126333075889650
RectTransform:
m_ObjectHideFlags: 0
@ -4097,7 +4097,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7144425388463276693
RectTransform:
m_ObjectHideFlags: 0

2
ProjectNLD/Assets/Code/Scripts/Framework/UI/UIManager.Window.cs
View File

@ -59,6 +59,7 @@ public partial class UIManager
_WindowMeta(UINameConst.UIFightTeamCommandeSkill, UIWindowLayer.Normal, UIOpenType.Pop, true);
_WindowMeta(UINameConst.UIFightInfoTip, UIWindowLayer.ForeGround, UIOpenType.Pop, true);
_WindowMeta(UINameConst.UIFightClock, UIWindowLayer.Normal, UIOpenType.Pop, true);
_WindowMeta(UINameConst.UIFightClockDynamic, UIWindowLayer.Normal, UIOpenType.Pop, true);
_WindowMeta(UINameConst.UIPause, UIWindowLayer.Normal, UIOpenType.FullScreen, false, true);
_WindowMeta(UINameConst.UIDefeatGame, UIWindowLayer.Normal, UIOpenType.FullScreen, false, true);
_WindowMeta(UINameConst.UIPassGame, UIWindowLayer.Normal, UIOpenType.Pop);
@ -283,6 +284,7 @@ public static class UINameConst
public static readonly string UITeamFight = "LevelSceneUI/UITeamFight";
public static readonly string UI_StartBtn_CMSBtn = "LevelSceneUI/UI_StartBtn_CMSBtn";
public static readonly string UIFightClock = "LevelSceneUI/UIFightClock";
public static readonly string UIFightClockDynamic = "LevelSceneUI/LevelDynamic/UIFightClockDynamic";
public static readonly string UIPause = "LevelSceneUI/UIPause";
public static readonly string UIDefeatGame = "LevelSceneUI/LevelSettle/UIDefeatGame";
public static readonly string UIPassGame = "LevelSceneUI/LevelSettle/UIPassGame";

7
ProjectNLD/Assets/Code/Scripts/Gameplay/Team/TeamManager.UI.cs
View File

@ -69,7 +69,9 @@ public partial class TeamManager
UIManager.Instance.PushWindow(window);
window = await UIManager.Instance.LoadWindow(UINameConst.UITeamFight);
UIManager.Instance.PushWindow(window);
window = await UIManager.Instance.LoadWindow(UINameConst.UIFightClock, UIManager.ECanvasRoot.Dynamic0);
window = await UIManager.Instance.LoadWindow(UINameConst.UIFightClock);
UIManager.Instance.PushWindow(window);
window = await UIManager.Instance.LoadWindow(UINameConst.UIFightClockDynamic, UIManager.ECanvasRoot.Dynamic0);
UIManager.Instance.PushWindow(window);
var battleTeamWindow = await UIFightTeamController.Open();
@ -235,7 +237,9 @@ public partial class TeamManager
UIManager.Instance.OpenLoadedNormalUI(UINameConst.UIFightTarget);
UIManager.Instance.OpenLoadedNormalUI(UINameConst.UITeamFight);
UIManager.Instance.OpenLoadedNormalUI(UINameConst.UIFightClock);
UIManager.Instance.OpenLoadedNormalUI(UINameConst.UIFightClockDynamic);
UIManager.Instance.OpenLoadedNormalUI(UINameConst.UIFightScene);
var level = LevelManager.Instance.CurrentLevel;
if (level != null)
@ -257,6 +261,7 @@ public partial class TeamManager
UIManager.Instance.CloseWindow(UINameConst.UISkillPut);
UIManager.Instance.CloseWindow(UINameConst.UITeamFight);
UIManager.Instance.CloseWindow(UINameConst.UIFightClock);
UIManager.Instance.CloseWindow(UINameConst.UIFightClockDynamic);
UIManager.Instance.CloseWindow(UINameConst.UIFightTarget);
UIManager.Instance.CloseWindow(UINameConst.UIFightScene);
UIManager.Instance.CloseWindow(UINameConst.UIFightTeam);

28
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightReady/UIFightClockController.cs
View File

@ -71,11 +71,11 @@ public class UIFightClockController : UIWindow{
Button_SpeedPause = GetComponent<Button>("UISpeedChange/UISpeedChange/Button_SpeedPause");
//Image_Battle_ClockBG = GetComponent<Image>("Image_Battle_ClockBG");
//Image_ClockPause = GetComponent<Image>("Image_Battle_ClockBG/Image_ClockPause");
Image_ClockNum0 = GetComponent<Image>("Image_Battle_ClockBG/Image_ClockNum0");
Image_ClockNum1 = GetComponent<Image>("Image_Battle_ClockBG/Image_ClockNum1");
Image_ClockNum2 = GetComponent<Image>("Image_Battle_ClockBG/Image_ClockNum2");
Image_ClockNum3 = GetComponent<Image>("Image_Battle_ClockBG/Image_ClockNum3");
Text_FightStatus = GetComponent<TMP_Text>("Image_Battle_ClockBG/Text_FightStatus");
// Image_ClockNum0 = GetComponent<Image>("Image_Battle_ClockBG/Image_ClockNum0");
// Image_ClockNum1 = GetComponent<Image>("Image_Battle_ClockBG/Image_ClockNum1");
// Image_ClockNum2 = GetComponent<Image>("Image_Battle_ClockBG/Image_ClockNum2");
// Image_ClockNum3 = GetComponent<Image>("Image_Battle_ClockBG/Image_ClockNum3");
// Text_FightStatus = GetComponent<TMP_Text>("Image_Battle_ClockBG/Text_FightStatus");
Button_SpeedHalfPress = GetComponent<Button>("UISpeedChange/UISpeedChange/UI0.5X_Pressed/Image_SpeedHalfXPress");
GameObj_UI1X = FindObj("UISpeedChange/UISpeedChange/UI1.0X_Pressed");
@ -114,14 +114,14 @@ public class UIFightClockController : UIWindow{
protected override void OnUpdate()
{
if (LevelManager.Instance.CurrentLevel == null)
{
return;
}
if (LevelManager.Instance.CurrentLevel.IsInBattle())
{
UpdateTimerUI();
}
// if (LevelManager.Instance.CurrentLevel == null)
// {
// return;
// }
// if (LevelManager.Instance.CurrentLevel.IsInBattle())
// {
// UpdateTimerUI();
// }
}
public override void OnRelease()
@ -141,7 +141,7 @@ public class UIFightClockController : UIWindow{
{
base.OnShowWindow(data);
InitTimer();
//InitTimer();
Refresh();
}

42
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UIBinder/UIFightClockDynamicBinder.cs Normal file
View File

@ -0,0 +1,42 @@
using System.Collections;
using System.Collections.Generic;
using TMPro;
using Framework;
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.UIElements;
using Button = UnityEngine.UI.Button;
using Image = UnityEngine.UI.Image;
using Toggle = UnityEngine.UI.Toggle;
using ScrollView = PhxhSDK.PhxhScrollView;
public class UIFightClockDynamicBinder
{
public static void GetComponents(UIFightClockDynamicController window)
{
window.Image_Battle_ClockBG = window.GetComponent<Image>("Image_Battle_ClockBG");
window.Image_ClockPause = window.GetComponent<Image>("Image_Battle_ClockBG/Image_ClockPause");
window.Image_ClockNum0 = window.GetComponent<Image>("Image_Battle_ClockBG/Image_ClockNum0");
window.Image_ClockNum1 = window.GetComponent<Image>("Image_Battle_ClockBG/Image_ClockNum1");
window.Image_ClockNum2 = window.GetComponent<Image>("Image_Battle_ClockBG/Image_ClockNum2");
window.Image_ClockNum3 = window.GetComponent<Image>("Image_Battle_ClockBG/Image_ClockNum3");
window.Text_FightStatus = window.GetComponent<TMP_Text>("Image_Battle_ClockBG/Text_FightStatus");
window.Image_Ruler_MM = window.GetComponent<Image>("Image_Battle_ClockBG/Image_Ruler_MM");
window.Image_Ruler_SS = window.GetComponent<Image>("Image_Battle_ClockBG/Image_Ruler_SS");
}
/****** 定义变量语句 ******
public Image Image_Battle_ClockBG;
public Image Image_ClockPause;
public Image Image_ClockNum0;
public Image Image_ClockNum1;
public Image Image_ClockNum2;
public Image Image_ClockNum3;
public TMP_Text Text_FightStatus;
public Image Image_Ruler_MM;
public Image Image_Ruler_SS;
****** End ******/
}

11
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UIBinder/UIFightClockDynamicBinder.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 4c10411b6a26b174e915cc4d048b3457
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

121
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UIFightClockDynamicController.cs Normal file
View File

@ -0,0 +1,121 @@
using System.Collections;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.UIElements;
using Button = UnityEngine.UI.Button;
using Image = UnityEngine.UI.Image;
using Toggle = UnityEngine.UI.Toggle;
using ScrollView = PhxhSDK.PhxhScrollView;
using Framework;
using Gameplay.Level;
using PhxhSDK;
public class UIFightClockDynamicController : UIWindow
{
//UI GameObj
///Auto Gen Start///
public Image Image_Battle_ClockBG;
public Image Image_ClockPause;
public Image Image_ClockNum0;
public Image Image_ClockNum1;
public Image Image_ClockNum2;
public Image Image_ClockNum3;
public TMP_Text Text_FightStatus;
public Image Image_Ruler_MM;
public Image Image_Ruler_SS;
///Auto Gen End///
// deal with input data
public override void PreLoad(object data = null)
{
}
// Use this for initialization
public override void OnInit()
{
//bind UI GameObj
UIFightClockDynamicBinder.GetComponents(this);
}
//invoke when open window
protected override void OnShowWindow(object data = null)
{
InitTimer();
}
//invoke when reload window
protected override void OnReloadWindow(object data = null)
{
}
//invoke when close window
protected override void OnHideWindow()
{
}
//invoke when destroy
public override void OnRelease()
{
base.OnRelease();
}
protected override void OnUpdate(float dt)
{
base.OnUpdate(dt);
if (LevelManager.Instance.CurrentLevel == null)
{
return;
}
if (LevelManager.Instance.CurrentLevel.IsInBattle())
{
UpdateTimerUI();
}
}
private void InitTimer()
{
//TeamManager.Instance.InitFightTime();
UpdateTimerUI();
}
private void UpdateTimerUI()
{
int min = TeamManager.Instance.GetFightPastMinute();
int second = TeamManager.Instance.GetFightPastSecond();
int secTen = GetNumberBit(second, true);
int secBit = GetNumberBit(second);
if (min < 10)
{
string path = LevelUIManager.GetNumberImage(0);
Image_ClockNum0.sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(path);
Image_ClockNum1.sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(LevelUIManager.GetNumberImage(min));
}
else
{
int minTen = GetNumberBit(min, true);
int minBit = GetNumberBit(min);
Image_ClockNum0.sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(LevelUIManager.GetNumberImage(minTen));
Image_ClockNum1.sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(LevelUIManager.GetNumberImage(minBit));
}
Image_ClockNum2.sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(LevelUIManager.GetNumberImage(secTen));
Image_ClockNum3.sprite = AssetManager.Instance.GetPreLoadResult<Sprite>(LevelUIManager.GetNumberImage(secBit));
}
//获取十位或个位
int GetNumberBit(int num, bool isTen = false)
{
if (isTen)
{
return num / 10;
}
return num - num / 10 * 10;
}
}

11
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UIFightClockDynamicController.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 0dd9686019627104eae318048544ab9e
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: