diff --git a/Assets/ArtRes/Excel/Config.xlsx b/Assets/ArtRes/Excel/Config.xlsx index 1dbccd5..2a294e9 100644 Binary files a/Assets/ArtRes/Excel/Config.xlsx and b/Assets/ArtRes/Excel/Config.xlsx differ diff --git a/Assets/Resources/Sprites/UI_LoadingBG/计量装置轮换及现场校验仿真.png.meta b/Assets/Resources/Sprites/UI_LoadingBG/计量装置轮换及现场校验仿真.png.meta index 2af5613..ddd88ac 100644 --- a/Assets/Resources/Sprites/UI_LoadingBG/计量装置轮换及现场校验仿真.png.meta +++ b/Assets/Resources/Sprites/UI_LoadingBG/计量装置轮换及现场校验仿真.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -33,16 +33,16 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 2 mipBias: 0 - wrapU: 0 - wrapV: 0 + wrapU: 1 + wrapV: 1 wrapW: 0 - nPOTScale: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -51,9 +51,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -143,7 +143,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/Assets/Resources/UI/UI_Panel/UI_LoadingPanel.prefab b/Assets/Resources/UI/UI_Panel/UI_LoadingPanel.prefab index c72bae8..66dd59d 100644 --- a/Assets/Resources/UI/UI_Panel/UI_LoadingPanel.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_LoadingPanel.prefab @@ -204,7 +204,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 54a00bba79cf8b248a00c789d24d6d3f, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Scripts/Project/Manager/GameManager.cs b/Assets/Scripts/Project/Manager/GameManager.cs index bb90337..d5615cd 100644 --- a/Assets/Scripts/Project/Manager/GameManager.cs +++ b/Assets/Scripts/Project/Manager/GameManager.cs @@ -103,6 +103,7 @@ public class GameManager : SingletonAutoMono ReportMgr = ReportManager.Instance; HandsOnTrainingMgr = HandsOnTrainingMgr.Instance; StudyOrPracticeMgr = StudyOrPracticeMgr.Instance; + DataMgr.Init(); UIMgr.ShowPanel(E_UI_Layer.System, (panel) => { @@ -116,7 +117,6 @@ public class GameManager : SingletonAutoMono { if (isSuccess) { - DataMgr.Init(); //读取成功 获取模式 根据模式显示初始化页面 //是否为考试模式 安全员 if (!true) @@ -126,20 +126,17 @@ public class GameManager : SingletonAutoMono else { EventMgr.EventTrigger(Enum_EventType.UpdateProgress, 0.2f); - UIMgr.ShowPanel(E_UI_Layer.Bot, panel => { EventMgr.EventTrigger(Enum_EventType.UpdateProgress, 0.1f); panel.Init(); }); - //显示UI菜单列表 UIMgr.ShowPanel(E_UI_Layer.Mid, panel => { EventMgr.EventTrigger(Enum_EventType.UpdateProgress, 0.1f); panel.Init(); }); - //加载场景 /显示UI ScenesMgr.LoadSceneAsyn("02_MenuScene", () => { diff --git a/Assets/Scripts/Project/UI/UI_Item/UI_DeviceItem.cs b/Assets/Scripts/Project/UI/UI_Item/UI_DeviceItem.cs index 3af7665..8b6f3df 100644 --- a/Assets/Scripts/Project/UI/UI_Item/UI_DeviceItem.cs +++ b/Assets/Scripts/Project/UI/UI_Item/UI_DeviceItem.cs @@ -17,6 +17,7 @@ public class UI_DeviceItem : BaseItem GameManager.StudyOrPracticeMgr.deviceId = deviceId; GameManager.UIMgr.ShowPanel(E_UI_Layer.System, (panel) => { + panel.Init(); GameManager.EventMgr.EventTrigger(Enum_EventType.UpdateProgress, 0.1f); GameManager.ScenesMgr.LoadSceneAsyn("03_OfficeScene", () => { diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_LoadingPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_LoadingPanel.cs index f546726..4aac90e 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_LoadingPanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_LoadingPanel.cs @@ -76,6 +76,9 @@ public class UI_LoadingPanel : BasePanel targetProgress = 0; isUpdate = false; TB_System tB_System = GameManager.DataMgr.GetSystemInfo(GameManager.Instance.systemId); + print(tB_System); + if (tB_System == null) + return; GameManager.ResourcesMgr.LoadAsync(Const.LoadBGPath + tB_System.loadName, (sprite) => { this.GetComponent().sprite = sprite;