Skip to content

Commit b131ec8

Browse files
kisence-miankisence-mian
committed
完善了ApplicationStatus和ReusingScrollRect
1 parent c7340d3 commit b131ec8

113 files changed

Lines changed: 2350 additions & 1260 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Assets/Resources/Data/item.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
id asdasd tt
1+
id asdasd tt
22
type Color Vector2|AnimParamType
3-
note 颜色 枚举测试
3+
note 棰滆壊 鏋氫妇娴嬭瘯
44
default 1|1|1|1 8.881112|0
55
asdasdads
66
111 0.7279412|0.4496107|0.4496107|1 0.1111|0

‎Assets/Resources/Data/testData.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ID name pos age
1+
ID name pos age
22
type Vector2 Vector3 Int
33
default 0|0 333|333.333|0 23232323
44
1111

‎Assets/Resources/Version.json.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Script/Core/Application/ApplicationStatusManager.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public static void EnterStatus(string l_statusName)
3131
{
3232
if (s_currentAppStatus != null)
3333
{
34+
s_currentAppStatus.CloseAllUI();
3435
s_currentAppStatus.OnExitStatus();
3536
}
3637

@@ -86,6 +87,7 @@ public static void EnterTestModel(string l_statusName)
8687
{
8788
if (s_currentAppStatus != null)
8889
{
90+
s_currentAppStatus.CloseAllUI();
8991
s_currentAppStatus.OnExitStatus();
9092
}
9193

‎Assets/Script/Core/Application/GameStatus.meta‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Script/Core/Application/IApplicationStatus.cs‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,35 @@
11
using UnityEngine;
22
using System.Collections;
33
using System;
4+
using System.Collections.Generic;
45

56
public abstract class IApplicationStatus
67
{
8+
List<UIWindowBase> m_uiList = new List<UIWindowBase>();
9+
10+
public void OpenUI<T>() where T: UIWindowBase
11+
{
12+
UIWindowBase ui = UIManager.OpenUIWindow<T>();
13+
14+
m_uiList.Add(ui);
15+
}
16+
17+
public void CloseUI<T>() where T:UIWindowBase
18+
{
19+
UIWindowBase ui = UIManager.GetUI<T>();
20+
m_uiList.Remove(ui);
21+
UIManager.CloseUIWindow(ui);
22+
}
23+
24+
public void CloseAllUI()
25+
{
26+
for (int i = 0; i < m_uiList.Count; i++)
27+
{
28+
UIManager.CloseUIWindow(m_uiList[i]);
29+
}
30+
m_uiList.Clear();
31+
}
32+
733
/// <summary>
834
/// 测试使用，直接进入游戏某个流程时，这里可以初始化测试数据
935
/// </summary>

‎Assets/Script/Core/Editor/Font/BFImporter.cs.meta‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Script/Core/Editor/Font/BFMenuTool.cs.meta‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Script/Core/Editor/Font/FntParse.cs.meta‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Script/Core/Editor/Lua/Res.meta‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)