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

【加载】删除同步加载方法

main
马远征 2024-11-04 18:11:51 +08:00
parent ff2b0b84d5
commit b807a00dba
12 changed files with 39 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ProjectNLD/Assets/Code/Scripts/Framework/Audio/AudioCriwareMgr.cs
View File

@ -1254,13 +1254,6 @@ public void Release()
return acfAsset;
}
private CriAtomAcfAsset LoadAcf(AudioType type, string audioName, bool is3D = false)
{
CriAtomAcfAsset acfAsset = AssetManager.Instance.LoadAsset<CriAtomAcfAsset>(audioName);
acfAsset.Register();
return acfAsset;
}
private bool CheckIsLoadedAcb(string audioName)
{

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

@ -94,11 +94,6 @@ public abstract class UIWindow
return asset;
}
public T LoadAsset<T>(string path) where T : UnityEngine.Object
{
var asset = AssetManager.Instance.LoadAsset<T>(path);
return asset;
}
/// <summary>
/// 异步预加载

13
ProjectNLD/Assets/Code/Scripts/Gameplay/Level/LevelInfo.cs
View File

@ -162,7 +162,7 @@ public class LevelInfo : IRedPointTreeNode
/// </summary>
public MapData MapData
{
get { return mapData ??= MapUtils.LoadMapData(Cfg.MapData); }
get { return mapData; }
}
/// <summary>
@ -170,7 +170,7 @@ public class LevelInfo : IRedPointTreeNode
/// </summary>
public LevelData LevelData
{
get { return levelData ??= LevelUtils.LoadLevelData(Cfg.Id); }
get { return levelData; }
}
/// <summary>
@ -312,11 +312,18 @@ public class LevelInfo : IRedPointTreeNode
public RedPointNode RedPoint { get; private set; }
#endregion
public LevelInfo(DataLevel config)
public LevelInfo(DataLevel config)
{
Cfg = config;
IsLock = true;
RefreshServerData(true);
Load();
}
private async void Load()
{
mapData = await MapUtils.LoadMapData(Cfg.MapData);
levelData = await LevelUtils.LoadLevelData(Cfg.Id);
}
#region API

4
ProjectNLD/Assets/Code/Scripts/Gameplay/Level/LevelUtils.cs
View File

@ -39,10 +39,10 @@ namespace Gameplay.Level
return string.Format(Constants.LEVEL_CONFIG_FORMAT_PATH, cfg.LevelData);
}
public static LevelData LoadLevelData(int id)
public async static UniTask<LevelData> LoadLevelData(int id)
{
string levelFilePath = GetLevelFilePath(id);
LevelData levelData = JsonHelper.LoadFromAddressableSync<LevelData>(levelFilePath);
var levelData = await JsonHelper.LoadFromAddressable<LevelData>(levelFilePath);
if (null == levelData)
DebugUtil.LogError("加载关卡配置失败，路径: {0}", levelFilePath);

4
ProjectNLD/Assets/Code/Scripts/Gameplay/Map/MapUtils.cs
View File

@ -70,12 +70,12 @@ namespace Gameplay
return map;
}
public static MapData LoadMapData(string mapFileName)
public async static UniTask<MapData> LoadMapData(string mapFileName)
{
var mapPath = string.Format(Constants.MAP_CONFIG_FORMAT_PATH, mapFileName);
//var configFilePath = string.Format(Constants.MAP_CONFIG_FORMAT_PATH, mapFileName);
//var mapData = await JsonHelper.LoadFromAddressble<MapData>(mapPath);
var textAsset = AssetManager.Instance.LoadAsset<TextAsset>(mapPath);
var textAsset = await AssetManager.Instance.LoadAssetAsync<TextAsset>(mapPath);
MapData mapData = null;
if (textAsset != null)
{

16
ProjectNLD/Assets/Code/Scripts/Gameplay/Story/Cmp/Timeline/AudioAction/AudioActionTrack.cs
View File

@ -32,21 +32,5 @@ namespace Gameplay.Story.Cmp.Timeline.AudioAction
// //LoadAcb();
// return base.CreateTrackMixer(graph, owner, inputCount);
// }
private void LoadAcb()
{
if (acbAsset)
{
return;
}
var acb = AssetManager.Instance.LoadAsset<CriAtomAcbAsset>("Assets/Audio/Music/CueSheet_ProjNLD.acb");
if (!acbAsset)
{
acb.LoadImmediate();
}
acbAsset = acb;
}
}
}

6
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/Common/UINode.cs
View File

@ -77,11 +77,7 @@ public class UINode: MonoBehaviour
return asset;
}
protected T LoadAsset<T>(string path) where T : Object
{
return AssetManager.Instance.LoadAsset<T>(path);
}
public virtual void OnAwake()
{

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

@ -483,7 +483,7 @@ public class UIFightSceneController : UIWindow
}
}
void AddDamageGo(uint uid)
async void AddDamageGo(uint uid)
{
if (!GameUnitManager.instance.infightUnits.Contains(uid))
{
@ -501,8 +501,7 @@ public class UIFightSceneController : UIWindow
if (!m_goNumbersMap.ContainsKey(uid))
{
var prefab = AssetManager.Instance.LoadAsset<GameObject>(Constants.UI_DAMAGE_PREFAB_PATH);
var go = Instantiate(prefab);
var go = await AssetManager.Instance.LoadAndInstAsync(Constants.UI_DAMAGE_PREFAB_PATH);
go.transform.SetParent(GoNumbers.transform);
m_goNumbersMap.Add(uid, go);
go.transform.localScale = new Vector3(1, 1, 1);

47
ProjectNLD/Assets/Code/Scripts/Gameplay/UI/UI_Interface/UI_MainPanelController.cs
View File

@ -711,16 +711,9 @@ public class UI_MainPanelController : UIWindow
/// </summary>
private class TabItem : UIGameObjectWrapper
{
private readonly Image imageTab;
/// <summary>
/// 选中状态
/// </summary>
private readonly Sprite spriteSelect;
/// <summary>
/// 普通状态
/// </summary>
private readonly Sprite spriteNormal;
private readonly Image imageSelect;
private readonly Image imageUnSelect;
/// <summary>
/// 选中颜色
/// </summary>
@ -734,38 +727,35 @@ public class UI_MainPanelController : UIWindow
{
set
{
imageSelect?.gameObject.SetActive(value);
imageUnSelect?.gameObject.SetActive(!value);
if (value)
{
imageTab.sprite = spriteSelect;
imageTab.color = colorSelect;
imageSelect.color = colorSelect;
}
else
{
imageTab.sprite = spriteNormal;
imageTab.color = colorNormal;
imageUnSelect.color = colorNormal;
}
imageTab.SetNativeSize();
imageSelect?.SetNativeSize();
imageUnSelect?.SetNativeSize();
}
}
public TabItem(GameObject root, Sprite select, Sprite normal) : base(root, true)
public TabItem(GameObject root) : base(root, true)
{
spriteSelect = select;
spriteNormal = normal;
imageTab = GoRoot.GetComponent<Image>();
imageSelect = GetItem<Image>("");
imageUnSelect = GetItem<Image>("");
IsActive = true;
}
public TabItem(GameObject root, int i, Sprite select, Sprite normal) : base(root, i, true)
public TabItem(GameObject root, int i) : base(root, i, true)
{
spriteSelect = select;
spriteNormal = normal;
imageTab = GoRoot.GetComponent<Image>();
imageSelect = GetItem<Image>("");
imageUnSelect = GetItem<Image>("");
IsActive = true;
}
@ -803,9 +793,6 @@ public class UI_MainPanelController : UIWindow
goBanner = FindObj("BannerView/Cell");
goTab = FindObj("Tabs/Cell");
Sprite tabSelect = LoadAsset<Sprite>("Assets/Art/UI/Texture/UI_Pic_MainPannel/UI_Pic_NewMain/UI_SmallbarY.png");
Sprite tabNormal = LoadAsset<Sprite>("Assets/Art/UI/Texture/UI_Pic_MainPannel/UI_Pic_NewMain/UI_SmallBarW.png");
var listNoticeInfo = AppConfig.Instance.NoticeInfos;
// 真实公告数据
var realNoticeInfo = new Dictionary<int, NoticeInfo>();
@ -824,7 +811,7 @@ public class UI_MainPanelController : UIWindow
if (firstKey >= bannerList.Count) return;
listBanner.Add(new BannerItem(goBanner, bannerList[firstKey].BannerImgPath));
listTab.Add(new TabItem(goTab, tabSelect, tabNormal));
listTab.Add(new TabItem(goTab));
foreach (var notice in realNoticeInfo)
{
@ -833,7 +820,7 @@ public class UI_MainPanelController : UIWindow
if(key>=bannerList.Count) continue;
var path = bannerList[key].BannerImgPath;
listBanner.Add(new BannerItem(goBanner, key, path));
listTab.Add(new TabItem(goTab, key, tabSelect, tabNormal));
listTab.Add(new TabItem(goTab, key));
}
bannerView.Init(OnChangeBanner);

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

@ -527,14 +527,14 @@ public class UI_MusicPannelController : UIWindow
}
#endregion
void CDPagesImage(int index, bool init = false)
async void CDPagesImage(int index, bool init = false)
{
Text_Name.text = CommonUtils.GetLocalizeText(E_LocalizePrefix.AlbumName, index);//AlbumManager.Instance.AlbumsDic[index].Name;
var CDBpath = "Assets/Art/UI/Texture/Icon/MusicBox/" + AlbumManager.Instance.AlbumsDic[index].TapesPath + ".png";
var CDBimg = LoadAsset<Sprite>(CDBpath);
var CDBimg = await AssetManager.Instance.LoadAssetAsync<Sprite>(CDBpath);
var CDpath = "Assets/Art/UI/Texture/Icon/MusicBox/Tapes/" + AlbumManager.Instance.AlbumsDic[index].CoverPath + ".png";
var CDimg = LoadAsset<Sprite>(CDpath);
var CDimg = await AssetManager.Instance.LoadAssetAsync<Sprite>(CDpath);
if (init)
{

8
ProjectNLD/Assets/Editor/Audio/AudioEditorMgr.cs
View File

@ -111,13 +111,7 @@ public class EditorAudio
private PlayState _state;
private int _playerID;
private GameObject _bindObj;
public static CriAtomAcbAsset LoadAcb()
{
var acb = AssetManager.Instance.LoadAsset<CriAtomAcbAsset>("Assets/Audio/Music/CueSheet_ProjNLD.acb");
acb.LoadImmediate();
return acb;
}
public EditorAudio(string audioName, int playerID, GameObject go, bool is3D = false, bool loop = false)
{

2
ProjectNLD/Assets/PhxhSDK

@ -1 +1 @@
Subproject commit 4bffc9a2281dade03f3c60f3ecf312927a56e9a2
Subproject commit cba33da5d8f0a587c694ecd00b8a789997951f63