WangWeiZhi
/
YanCheng_Metrology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://172.16.1.12/liuyu/YanCheng_Metrology

This commit is contained in:
Victor_Wang 2024-08-02 14:18:31 +08:00
parent cac07b00c2 ba3d201909
commit 0b6b6d8517
6 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/ArtRes/Excel/Config.xlsx
View File

Binary file not shown.

18
Assets/Resources/Sprites/UI_LoadingBG/计量装置轮换及现场校验仿真.png.meta
View File

@ -6,7 +6,7 @@ TextureImporter:
serializedVersion: 12 serializedVersion: 12
mipmaps: mipmaps:
mipMapMode: 0 mipMapMode: 0
enableMipMap: 1 enableMipMap: 0
sRGBTexture: 1 sRGBTexture: 1
linearTexture: 0 linearTexture: 0
fadeOut: 0 fadeOut: 0
@ -33,16 +33,16 @@ TextureImporter:
maxTextureSize: 2048 maxTextureSize: 2048
textureSettings: textureSettings:
serializedVersion: 2 serializedVersion: 2
filterMode: 1 filterMode: 0
aniso: 2 aniso: 2
mipBias: 0 mipBias: 0
wrapU: 0 wrapU: 1
wrapV: 0 wrapV: 1
wrapW: 0 wrapW: 0
nPOTScale: 1 nPOTScale: 0
lightmap: 0 lightmap: 0
compressionQuality: 50 compressionQuality: 50
spriteMode: 0 spriteMode: 1
spriteExtrude: 1 spriteExtrude: 1
spriteMeshType: 1 spriteMeshType: 1
alignment: 0 alignment: 0
@ -51,9 +51,9 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1 spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1 alphaUsage: 1
alphaIsTransparency: 0 alphaIsTransparency: 1
spriteTessellationDetail: -1 spriteTessellationDetail: -1
textureType: 0 textureType: 8
textureShape: 1 textureShape: 1
singleChannelComponent: 0 singleChannelComponent: 0
flipbookRows: 1 flipbookRows: 1
@ -143,7 +143,7 @@ TextureImporter:
outline: [] outline: []
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: spriteID: 5e97eb03825dee720800000000000000
internalID: 0 internalID: 0
vertices: [] vertices: []
indices: indices:

2
Assets/Resources/UI/UI_Panel/UI_LoadingPanel.prefab
View File

@ -204,7 +204,7 @@ MonoBehaviour:
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_Sprite: {fileID: 21300000, guid: 54a00bba79cf8b248a00c789d24d6d3f, type: 3} m_Sprite: {fileID: 0}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1

5
Assets/Scripts/Project/Manager/GameManager.cs
View File

@ -103,6 +103,7 @@ public class GameManager : SingletonAutoMono<GameManager>
ReportMgr = ReportManager.Instance; ReportMgr = ReportManager.Instance;
HandsOnTrainingMgr = HandsOnTrainingMgr.Instance; HandsOnTrainingMgr = HandsOnTrainingMgr.Instance;
StudyOrPracticeMgr = StudyOrPracticeMgr.Instance; StudyOrPracticeMgr = StudyOrPracticeMgr.Instance;
DataMgr.Init();
UIMgr.ShowPanel<UI_LoadingPanel>(E_UI_Layer.System, (panel) => UIMgr.ShowPanel<UI_LoadingPanel>(E_UI_Layer.System, (panel) =>
{ {
@ -116,7 +117,6 @@ public class GameManager : SingletonAutoMono<GameManager>
{ {
if (isSuccess) if (isSuccess)
{ {
DataMgr.Init();
//读取成功 获取模式 根据模式显示初始化页面 //读取成功 获取模式 根据模式显示初始化页面
//是否为考试模式 安全员 //是否为考试模式 安全员
if (!true) if (!true)
@ -126,20 +126,17 @@ public class GameManager : SingletonAutoMono<GameManager>
else else
{ {
EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.2f); EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.2f);
UIMgr.ShowPanel<UI_SelectModeOrDeviceTitlePanel>(E_UI_Layer.Bot, panel => UIMgr.ShowPanel<UI_SelectModeOrDeviceTitlePanel>(E_UI_Layer.Bot, panel =>
{ {
EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.1f); EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.1f);
panel.Init(); panel.Init();
}); });
//显示UI菜单列表 //显示UI菜单列表
UIMgr.ShowPanel<UI_SelectModePanel>(E_UI_Layer.Mid, panel => UIMgr.ShowPanel<UI_SelectModePanel>(E_UI_Layer.Mid, panel =>
{ {
EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.1f); EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.1f);
panel.Init(); panel.Init();
}); });
//加载场景 /显示UI //加载场景 /显示UI
ScenesMgr.LoadSceneAsyn("02_MenuScene", () => ScenesMgr.LoadSceneAsyn("02_MenuScene", () =>
{ {

1
Assets/Scripts/Project/UI/UI_Item/UI_DeviceItem.cs
View File

@ -17,6 +17,7 @@ public class UI_DeviceItem : BaseItem
GameManager.StudyOrPracticeMgr.deviceId = deviceId; GameManager.StudyOrPracticeMgr.deviceId = deviceId;
GameManager.UIMgr.ShowPanel<UI_LoadingPanel>(E_UI_Layer.System, (panel) => GameManager.UIMgr.ShowPanel<UI_LoadingPanel>(E_UI_Layer.System, (panel) =>
{ {
panel.Init();
GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.1f); GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.1f);
GameManager.ScenesMgr.LoadSceneAsyn("03_OfficeScene", () => GameManager.ScenesMgr.LoadSceneAsyn("03_OfficeScene", () =>
{ {

3
Assets/Scripts/Project/UI/UI_Panel/UI_LoadingPanel.cs
View File

@ -76,6 +76,9 @@ public class UI_LoadingPanel : BasePanel
targetProgress = 0; targetProgress = 0;
isUpdate = false; isUpdate = false;
TB_System tB_System = GameManager.DataMgr.GetSystemInfo(GameManager.Instance.systemId); TB_System tB_System = GameManager.DataMgr.GetSystemInfo(GameManager.Instance.systemId);
print(tB_System);
if (tB_System == null)
return;
GameManager.ResourcesMgr.LoadAsync<Sprite>(Const.LoadBGPath + tB_System.loadName, (sprite) => GameManager.ResourcesMgr.LoadAsync<Sprite>(Const.LoadBGPath + tB_System.loadName, (sprite) =>
{ {
this.GetComponent<Image>().sprite = sprite; this.GetComponent<Image>().sprite = sprite;