From 3f8e2442835f1bbafec2a9a70e0de1c9cdde7482 Mon Sep 17 00:00:00 2001 From: liuyu <272912176@qq.com> Date: Fri, 2 Aug 2024 13:35:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=95=B0=E6=8D=AE=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ArtRes/Excel/Config.xlsx | Bin 18164 -> 18175 bytes Assets/ArtRes/Excel/~$Config.xlsx.meta | 7 - .../计量装置轮换及现场校验仿真.png.meta | 18 +- .../UI/UI_Panel/UI_LoadingPanel.prefab | 2 +- Assets/Scenes/01_InitScene.unity | 305 ------------------ Assets/Scripts/Project/Manager/GameManager.cs | 5 +- .../Project/UI/UI_Item/UI_DeviceItem.cs | 1 + .../Project/UI/UI_Panel/UI_LoadingPanel.cs | 3 + 8 files changed, 15 insertions(+), 326 deletions(-) delete mode 100644 Assets/ArtRes/Excel/~$Config.xlsx.meta diff --git a/Assets/ArtRes/Excel/Config.xlsx b/Assets/ArtRes/Excel/Config.xlsx index 1dbccd5934a72ffbbc91b2dc2816aab5b48e28f1..2a294e9f7fe4582b9b12ba85915e6235f27101ad 100644 GIT binary patch delta 8689 zcmZWvRX`leww*y|u;5N$fZzlR?(XgoBoN$#1cD6iKDZMg!7aEG+}#Oo!6m`vk#p|5 z=iU4Iqd%%vuT{2dSMA-uqJU3Pz{)-#Vx{sIab?&r@Fi4Ksf!g;@=9hIaxPQ_tEthE zWe}agON^C4G_hEi;-Yk-T#CI!s(d$sh&9(CyBLeo{o($p<%Z+Kn z&Q-C_8Ve}dWcYy^-tfGdony~6&Jq9v)YySYNR#re0obIeEPz`=DN>D1n+h%Sc`}!V)&4;c?xnI%j`~jd7L@=$<$!ZkgSf))`wh}$>DfW^M?Xg z{f2M6jN>34t9tQ!yiqEF!t|wWh4cc!3qE+KT4i-1BjL7{Rmyw)svNG5((vo^)HOri z8pmA+9!(;$BL3sAaOTJh-iwKgfjw-IvVU<8G=*%iK0-J8U#TY}&=XBLDm)AU&p1|~71iWco zj{l;FtA^J!Q(nWUS<))dY>chZ!Q>`(cf}vzXAJw?hQRLZ#UsRlwzATS-{@*m+wV?< zIp!ADGnhiF+xVjY#3)9)z8gC}2|VI40C(Pt(75FNSYzk@K#374i%KYm6&sK+)9WPR zWsHc&RiOh;O@PiJCZ5)>@P95QQe2djJiab({(zE}D8XjCALDrXX2j&OW7D)#u1Ll@ zNgaIK11XUhyG-*6Wht_P_dNO?Ni9@3+_B3{dmGMF-ndp&V`|7Fx9E~=V^MbWEtFP* zV3@)3;X`S;Z-f7cpoIs`>f+I*e~Q4x8%0y@#LCTTbv7t_f3s6cWVG1%hM%0A+fp5z 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 RCI1VwAccn{B>G3{e*h(F6u|%h delta 8633 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 R@g(@*eMt;NHjzJ?{U6||E*1a) diff --git a/Assets/ArtRes/Excel/~$Config.xlsx.meta b/Assets/ArtRes/Excel/~$Config.xlsx.meta deleted file mode 100644 index d8813d6..0000000 --- a/Assets/ArtRes/Excel/~$Config.xlsx.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 1350aff3bf5aa4746a58cbd6894397bb -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: 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/Scenes/01_InitScene.unity b/Assets/Scenes/01_InitScene.unity index d70fe34..82244f6 100644 --- a/Assets/Scenes/01_InitScene.unity +++ b/Assets/Scenes/01_InitScene.unity @@ -285,311 +285,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d175d4b181be89546abe91f03f9dc60e, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1199009562 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1199009563} - - component: {fileID: 1199009565} - - component: {fileID: 1199009564} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1199009563 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1199009562} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1372655023} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -137.94153, y: 15.720581} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1199009564 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1199009562} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: New Text - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1199009565 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1199009562} - m_CullTransparentMesh: 1 ---- !u!1 &1219112861 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1219112864} - - component: {fileID: 1219112863} - - component: {fileID: 1219112862} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1219112862 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1219112861} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SendPointerHoverToParent: 1 - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 ---- !u!114 &1219112863 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1219112861} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!4 &1219112864 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1219112861} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1372655019 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1372655023} - - component: {fileID: 1372655022} - - component: {fileID: 1372655021} - - component: {fileID: 1372655020} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1372655020 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1372655019} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1372655021 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1372655019} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &1372655022 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1372655019} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &1372655023 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1372655019} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1199009563} - m_Father: {fileID: 0} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} --- !u!1 &1406672269 GameObject: m_ObjectHideFlags: 0 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;