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

【UI重构】提交部分UI系统代码修改

main
chenyuqi 2024-01-23 13:58:40 +08:00
parent f25ea1b8a4
commit 0e9614bdac
19 changed files with 91 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ProjectNLD/Assets/Audio/Sounds/BtnSoundTest.wav Normal file
View File

Binary file not shown.

23
ProjectNLD/Assets/Audio/Sounds/BtnSoundTest.wav.meta Normal file
View File

@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: 4000a74fee4582d41944a47dd8976e4a
AudioImporter:
externalObjects: {}
serializedVersion: 7
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
ProjectNLD/Assets/Audio/Sounds/BtnSoundTestLong.mp3 (Stored with Git LFS) Normal file
View File

Binary file not shown.

23
ProjectNLD/Assets/Audio/Sounds/BtnSoundTestLong.mp3.meta Normal file
View File

@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: ee858457f2911ff4fb74885a2ebd2c4d
AudioImporter:
externalObjects: {}
serializedVersion: 7
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

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

@ -50,6 +50,7 @@ public partial class UIManager : Singlenton<UIManager>, IInitable
var window = await _LoadWindow(path, true);
if (window)
{
window.PreLoad(data);
window.OpenWindow(data);
}
@ -91,7 +92,8 @@ public partial class UIManager : Singlenton<UIManager>, IInitable
if (mMemoryWindows.ContainsKey(uipath))
{
var window = (T)(mMemoryWindows[uipath]);
return window.gameObject.activeSelf ? window : null;
//return window.gameObject.activeSelf ? window : null;
return window;
}
return default(T);
}

23
ProjectNLD/Assets/Code/Scripts/Framework/UI/UIWindow.cs
View File

@ -35,7 +35,13 @@ public abstract class UIWindow : MonoBehaviour
void Awake()
{
OnInit();
//OnInit();
}
//预加载，可以进行赋值，不能添加监听
public void PreLoad(object data = null)
{
}
protected void OnStart()
@ -111,6 +117,7 @@ public abstract class UIWindow : MonoBehaviour
public void OpenWindow(object data)
{
OnInit();
Show(data);
if (isPlayDefaultOpenAudio)
{
@ -160,19 +167,6 @@ public abstract class UIWindow : MonoBehaviour
return true;
}
public void ReloadWindow()
{
if (isOpen)
{
OnShow();
OnReloadWindow();
return;
}
Show(null);
OnReloadWindow();
}
public void ReloadWindow(object data)
{
if (isOpen)
@ -274,7 +268,6 @@ public abstract class UIWindow : MonoBehaviour
/// 重新加载界面时调用
/// </summary>
protected virtual void OnReloadWindow(object data) { }
protected virtual void OnReloadWindow() { }
/// <summary>
/// 私有Awake方法，会在基类Awake执行后调用
/// </summary>

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

@ -100,13 +100,7 @@ public class UIFightClockController : UIWindow{
InitTimer();
Refresh();
}
//invoke when reload window
protected override void OnReloadWindow()
{
}
//invoke when close window
protected override void OnCloseWindow()
{

8
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightReady/UIPauseController.cs
View File

@ -100,13 +100,7 @@ public class UIPauseController : UIWindow{
{
Refresh();
}
//invoke when reload window
protected override void OnReloadWindow()
{
}
void Close()
{

7
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightReady/UITeamFightController.cs
View File

@ -122,19 +122,12 @@ public class UITeamFightController : UIWindow
protected override void OnOpenWindow(object data = null)
{
Refresh();
// #if UNITY_EDITOR
// //打印选择信息
// #endif
}
//invoke when reload window
protected override void OnReloadWindow()
{
}
//invoke when close window
protected override void OnCloseWindow()
{

6
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/FightSceneUI/UIFightSceneController.cs
View File

@ -282,12 +282,6 @@ public class UIFightSceneController : UIWindow
EventManager.Instance.Register(EventManager.EventName.LevelFightUIHPInit, (Action<GameUnit>)OnHPInit);
}
//invoke when reload window
protected override void OnReloadWindow()
{
}
//invoke when close window
protected override void OnCloseWindow()
{

6
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/UIDefeatGameController.cs
View File

@ -43,12 +43,6 @@ public class UIDefeatGameController : UIWindow{
{
_Refresh();
}
//invoke when reload window
protected override void OnReloadWindow()
{
}
#region RefreshWindow

11
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/UIPassGameController.cs
View File

@ -104,16 +104,13 @@ public class UIPassGameController : UIWindow{
//invoke when open window
protected override void OnOpenWindow(object data)
{
_itemList = data as ItemList;
if (data != null)
{
_itemList = data as ItemList;
}
_levelID = LevelManager.Instance.SettleData.LevelID;
_Refresh();
}
//invoke when reload window
protected override void OnReloadWindow()
{
}
#region RefreshWindow

8
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/LevelFight/UI_StartBtn_CMSBtnController.cs
View File

@ -142,13 +142,7 @@ public class UI_StartBtn_CMSBtnController : UIWindow{
{
//SetStartBtnState(false);
}
//invoke when reload window
protected override void OnReloadWindow()
{
}
//invoke when close window
protected override void OnCloseWindow()
{

2
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Login/UI_LogInController.cs
View File

@ -63,7 +63,7 @@ public class UI_LogInController : UIWindow
agreenToggle = GetComponent<Toggle>("Image_BG/Image_logBG/UI_AL/Button_AccountLog/Toggle_AL");
dropdown = GameObject.Find("Image_BG/Image_logBG/UI_AL/Button_AccountLog/ALDropdown").GetComponent<TMP_Dropdown>();
dropdown = FindObj("Image_BG/Image_logBG/UI_AL/Button_AccountLog/ALDropdown").GetComponent<TMP_Dropdown>();
dropdown.onValueChanged.AddListener(onValueChanged);
IdText = GetComponent<TMP_Text>("Image_BG/ID");
versionText = GetComponent<TMP_Text>("Image_BG/vesion");

8
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Story/UIStoryMainController.cs
View File

@ -153,13 +153,7 @@ public class UIStoryMainController : UIWindow
CloseSelect();
CreateBubbles();
}
//invoke when reload window
protected override void OnReloadWindow()
{
}
//invoke when close window
protected override void OnCloseWindow()
{

8
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_BackReturnController.cs
View File

@ -38,13 +38,7 @@ public class UI_BackReturnController : UIWindow
{
}
//invoke when reload window
protected override void OnReloadWindow()
{
}
//invoke when close window
protected override void OnCloseWindow()
{

8
ProjectNLD/Assets/_Test/Editor.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c1549eb992810bd49b08d5bb3f73a5c8
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

10
ProjectNLD/Assets/_Test/Editor/TestCode.cs Normal file
View File

@ -0,0 +1,10 @@
using UnityEditor;
public class TestCode: Editor
{
[MenuItem("Test/测试")]
public static void Test()
{
}
}

3
ProjectNLD/Assets/_Test/Editor/TestCode.cs.meta Normal file
View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 91e2161c9aac44368f117ba4ed24f858
timeCreated: 1703492823