From fe1b2f803672d2900309bbb0866b7f22cca384fb Mon Sep 17 00:00:00 2001 From: liuyu <272912176@qq.com> Date: Fri, 2 Aug 2024 11:26:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ArtRes/Excel/Config.xlsx | Bin 18435 -> 18164 bytes Assets/ArtRes/Excel/~$Config.xlsx.meta | 2 +- ...电能计量装置.png => 计量装置轮换及现场校验仿真.png} | Bin ...装置.png.meta => 计量装置轮换及现场校验仿真.png.meta} | 0 Assets/Resources/UI/Base/Canvas.prefab | 105 +----- Assets/Scenes/01_InitScene.unity | 307 +++++++++++++++++- .../ExcelData/DataClass/TB_DeviceType.cs | 5 + .../ExcelData/DataClass/TB_DeviceType.cs.meta | 11 + .../Scripts/ExcelData/DataClass/TB_Scheme.cs | 4 +- .../Scripts/ExcelData/DataClass/TB_System.cs | 6 + .../ExcelData/DataClass/TB_System.cs.meta | 11 + .../ExcelData/DataClass/TB_ToolAndMaterial.cs | 2 +- .../DataContainer/TB_DeviceTypeContainer.cs | 5 + .../TB_DeviceTypeContainer.cs.meta | 11 + .../DataContainer/TB_SystemContainer.cs | 5 + .../DataContainer/TB_SystemContainer.cs.meta | 11 + Assets/Scripts/Project/Manager/DataManager.cs | 32 ++ Assets/Scripts/Project/Manager/GameManager.cs | 5 + .../Project/UI/UI_Panel/UI_LoadingPanel.cs | 10 + .../BinaryManager/BinaryManager.cs | 3 + Assets/Scripts/ProjectBase/Const/Const.cs | 8 +- .../Scripts/ProjectBase/UIManager/BaseItem.cs | 34 +- .../ProjectBase/UIManager/BasePanel.cs | 5 +- .../BinaryData/TB_DeviceType.binary | Bin 0 -> 88 bytes .../BinaryData/TB_DeviceType.binary.meta | 7 + .../BinaryData/TB_Scheme.binary | Bin 743 -> 743 bytes .../BinaryData/TB_System.binary | Bin 0 -> 940 bytes .../BinaryData/TB_System.binary.meta | 7 + Packages/manifest.json | 1 + Packages/packages-lock.json | 53 +++ 30 files changed, 522 insertions(+), 128 deletions(-) rename Assets/Resources/Sprites/UI_LoadingBG/{经互感器接入式 低压电能计量装置.png => 计量装置轮换及现场校验仿真.png} (100%) rename Assets/Resources/Sprites/UI_LoadingBG/{经互感器接入式 低压电能计量装置.png.meta => 计量装置轮换及现场校验仿真.png.meta} (100%) create mode 100644 Assets/Scripts/ExcelData/DataClass/TB_DeviceType.cs create mode 100644 Assets/Scripts/ExcelData/DataClass/TB_DeviceType.cs.meta create mode 100644 Assets/Scripts/ExcelData/DataClass/TB_System.cs create mode 100644 Assets/Scripts/ExcelData/DataClass/TB_System.cs.meta create mode 100644 Assets/Scripts/ExcelData/DataContainer/TB_DeviceTypeContainer.cs create mode 100644 Assets/Scripts/ExcelData/DataContainer/TB_DeviceTypeContainer.cs.meta create mode 100644 Assets/Scripts/ExcelData/DataContainer/TB_SystemContainer.cs create mode 100644 Assets/Scripts/ExcelData/DataContainer/TB_SystemContainer.cs.meta create mode 100644 Assets/StreamingAssets/BinaryData/TB_DeviceType.binary create mode 100644 Assets/StreamingAssets/BinaryData/TB_DeviceType.binary.meta create mode 100644 Assets/StreamingAssets/BinaryData/TB_System.binary create mode 100644 Assets/StreamingAssets/BinaryData/TB_System.binary.meta diff --git a/Assets/ArtRes/Excel/Config.xlsx b/Assets/ArtRes/Excel/Config.xlsx index 92ce35de05910448742af48eac742807f7405c64..1dbccd5934a72ffbbc91b2dc2816aab5b48e28f1 100644 GIT binary patch delta 12795 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 a*ZGf=4*x$VeTe=-$5I$jY$E@-|NjB^ktc)z delta 13062 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 OD^i$HVq*U&{Qm%F6n*3X diff --git a/Assets/ArtRes/Excel/~$Config.xlsx.meta b/Assets/ArtRes/Excel/~$Config.xlsx.meta index 3cdebed..d8813d6 100644 --- a/Assets/ArtRes/Excel/~$Config.xlsx.meta +++ b/Assets/ArtRes/Excel/~$Config.xlsx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f22545635285b95419d428fc251d0395 +guid: 1350aff3bf5aa4746a58cbd6894397bb DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Sprites/UI_LoadingBG/经互感器接入式 低压电能计量装置.png b/Assets/Resources/Sprites/UI_LoadingBG/计量装置轮换及现场校验仿真.png similarity index 100% rename from Assets/Resources/Sprites/UI_LoadingBG/经互感器接入式 低压电能计量装置.png rename to Assets/Resources/Sprites/UI_LoadingBG/计量装置轮换及现场校验仿真.png diff --git a/Assets/Resources/Sprites/UI_LoadingBG/经互感器接入式 低压电能计量装置.png.meta b/Assets/Resources/Sprites/UI_LoadingBG/计量装置轮换及现场校验仿真.png.meta similarity index 100% rename from Assets/Resources/Sprites/UI_LoadingBG/经互感器接入式 低压电能计量装置.png.meta rename to Assets/Resources/Sprites/UI_LoadingBG/计量装置轮换及现场校验仿真.png.meta diff --git a/Assets/Resources/UI/Base/Canvas.prefab b/Assets/Resources/UI/Base/Canvas.prefab index 979b5fe..a934411 100644 --- a/Assets/Resources/UI/Base/Canvas.prefab +++ b/Assets/Resources/UI/Base/Canvas.prefab @@ -309,8 +309,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5727611685167956682} + m_Children: [] m_Father: {fileID: 8048042365323826983} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -319,105 +318,3 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1001 &1053102348014623454 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8048042366342728953} - m_Modifications: - - target: {fileID: 901144683796615499, guid: c0203dda7880fc04987c6b9f478a6e97, type: 3} - propertyPath: m_Name - value: KLKLU - objectReference: {fileID: 0} - - target: {fileID: 4747303608412444692, guid: c0203dda7880fc04987c6b9f478a6e97, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4747303608412444692, guid: c0203dda7880fc04987c6b9f478a6e97, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 4747303608412444692, guid: c0203dda7880fc04987c6b9f478a6e97, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4747303608412444692, guid: c0203dda7880fc04987c6b9f478a6e97, type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4747303608412444692, guid: c0203dda7880fc04987c6b9f478a6e97, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4747303608412444692, guid: c0203dda7880fc04987c6b9f478a6e97, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4747303608412444692, guid: c0203dda7880fc04987c6b9f478a6e97, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4747303608412444692, guid: c0203dda7880fc04987c6b9f478a6e97, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4747303608412444692, guid: c0203dda7880fc04987c6b9f478a6e97, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4747303608412444692, guid: c0203dda7880fc04987c6b9f478a6e97, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4747303608412444692, guid: c0203dda7880fc04987c6b9f478a6e97, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4747303608412444692, guid: c0203dda7880fc04987c6b9f478a6e97, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4747303608412444692, guid: c0203dda7880fc04987c6b9f478a6e97, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4747303608412444692, guid: c0203dda7880fc04987c6b9f478a6e97, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4747303608412444692, guid: c0203dda7880fc04987c6b9f478a6e97, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4747303608412444692, guid: c0203dda7880fc04987c6b9f478a6e97, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4747303608412444692, guid: c0203dda7880fc04987c6b9f478a6e97, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4747303608412444692, guid: c0203dda7880fc04987c6b9f478a6e97, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4747303608412444692, guid: c0203dda7880fc04987c6b9f478a6e97, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4747303608412444692, guid: c0203dda7880fc04987c6b9f478a6e97, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4747303608412444692, guid: c0203dda7880fc04987c6b9f478a6e97, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: c0203dda7880fc04987c6b9f478a6e97, type: 3} ---- !u!224 &5727611685167956682 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4747303608412444692, guid: c0203dda7880fc04987c6b9f478a6e97, type: 3} - m_PrefabInstance: {fileID: 1053102348014623454} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/01_InitScene.unity b/Assets/Scenes/01_InitScene.unity index a813459..d70fe34 100644 --- a/Assets/Scenes/01_InitScene.unity +++ b/Assets/Scenes/01_InitScene.unity @@ -285,6 +285,311 @@ 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 @@ -392,7 +697,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} m_Name: m_EditorClassIdentifier: - m_Version: 3 + m_Version: 1 m_UsePipelineSettings: 1 m_AdditionalLightsShadowResolutionTier: 2 m_LightLayerMask: 1 diff --git a/Assets/Scripts/ExcelData/DataClass/TB_DeviceType.cs b/Assets/Scripts/ExcelData/DataClass/TB_DeviceType.cs new file mode 100644 index 0000000..d43cc98 --- /dev/null +++ b/Assets/Scripts/ExcelData/DataClass/TB_DeviceType.cs @@ -0,0 +1,5 @@ +public class TB_DeviceType +{ + public int id; + public string deviceTypeName; +} \ No newline at end of file diff --git a/Assets/Scripts/ExcelData/DataClass/TB_DeviceType.cs.meta b/Assets/Scripts/ExcelData/DataClass/TB_DeviceType.cs.meta new file mode 100644 index 0000000..fc583df --- /dev/null +++ b/Assets/Scripts/ExcelData/DataClass/TB_DeviceType.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8ec5c56a4cec13e42a88d0f9ec68a797 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ExcelData/DataClass/TB_Scheme.cs b/Assets/Scripts/ExcelData/DataClass/TB_Scheme.cs index 8a9faa8..5e7029c 100644 --- a/Assets/Scripts/ExcelData/DataClass/TB_Scheme.cs +++ b/Assets/Scripts/ExcelData/DataClass/TB_Scheme.cs @@ -1,8 +1,10 @@ public class TB_Scheme { public int id; + public int systemId; + public int deviceTypeId; public string schemeName; + public string deviceMap; public string titleName; - public string loadName; public string schemeDes; } \ No newline at end of file diff --git a/Assets/Scripts/ExcelData/DataClass/TB_System.cs b/Assets/Scripts/ExcelData/DataClass/TB_System.cs new file mode 100644 index 0000000..2c7e9d3 --- /dev/null +++ b/Assets/Scripts/ExcelData/DataClass/TB_System.cs @@ -0,0 +1,6 @@ +public class TB_System +{ + public int id; + public string systemName; + public string loadName; +} \ No newline at end of file diff --git a/Assets/Scripts/ExcelData/DataClass/TB_System.cs.meta b/Assets/Scripts/ExcelData/DataClass/TB_System.cs.meta new file mode 100644 index 0000000..96daf27 --- /dev/null +++ b/Assets/Scripts/ExcelData/DataClass/TB_System.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: d678f2949505d5843b33a727bc532c73 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ExcelData/DataClass/TB_ToolAndMaterial.cs b/Assets/Scripts/ExcelData/DataClass/TB_ToolAndMaterial.cs index cbbb85c..b452cfb 100644 --- a/Assets/Scripts/ExcelData/DataClass/TB_ToolAndMaterial.cs +++ b/Assets/Scripts/ExcelData/DataClass/TB_ToolAndMaterial.cs @@ -2,5 +2,5 @@ public class TB_ToolAndMaterial { public int id; public string objName; - public string iconName; + public string iconSpriteName; } \ No newline at end of file diff --git a/Assets/Scripts/ExcelData/DataContainer/TB_DeviceTypeContainer.cs b/Assets/Scripts/ExcelData/DataContainer/TB_DeviceTypeContainer.cs new file mode 100644 index 0000000..00c658f --- /dev/null +++ b/Assets/Scripts/ExcelData/DataContainer/TB_DeviceTypeContainer.cs @@ -0,0 +1,5 @@ +using System.Collections.Generic; +public class TB_DeviceTypeContainer +{ + public Dictionary dataDic = new Dictionary(); +} \ No newline at end of file diff --git a/Assets/Scripts/ExcelData/DataContainer/TB_DeviceTypeContainer.cs.meta b/Assets/Scripts/ExcelData/DataContainer/TB_DeviceTypeContainer.cs.meta new file mode 100644 index 0000000..0efc7bc --- /dev/null +++ b/Assets/Scripts/ExcelData/DataContainer/TB_DeviceTypeContainer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f57f49b7e7506884f9b19da1d390984b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ExcelData/DataContainer/TB_SystemContainer.cs b/Assets/Scripts/ExcelData/DataContainer/TB_SystemContainer.cs new file mode 100644 index 0000000..84e886f --- /dev/null +++ b/Assets/Scripts/ExcelData/DataContainer/TB_SystemContainer.cs @@ -0,0 +1,5 @@ +using System.Collections.Generic; +public class TB_SystemContainer +{ + public Dictionary dataDic = new Dictionary(); +} \ No newline at end of file diff --git a/Assets/Scripts/ExcelData/DataContainer/TB_SystemContainer.cs.meta b/Assets/Scripts/ExcelData/DataContainer/TB_SystemContainer.cs.meta new file mode 100644 index 0000000..12e8288 --- /dev/null +++ b/Assets/Scripts/ExcelData/DataContainer/TB_SystemContainer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f821b9b955f88724fa63b0a8ea716fb9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Project/Manager/DataManager.cs b/Assets/Scripts/Project/Manager/DataManager.cs index 126e69f..ccc3a82 100644 --- a/Assets/Scripts/Project/Manager/DataManager.cs +++ b/Assets/Scripts/Project/Manager/DataManager.cs @@ -29,6 +29,21 @@ public class DataManager : BaseManager /// private Dictionary subProcessStepDic = new Dictionary(); + /// + /// 虚拟仿真系统 + /// + private Dictionary systemDic =new Dictionary(); + + /// + /// 设备类型 + /// + private Dictionary deviceTypeDic = new Dictionary(); + + /// + /// 工具材料 + /// + private Dictionary toolAndMaterialDic = new Dictionary(); + /// /// 用户数据 /// @@ -43,6 +58,9 @@ public class DataManager : BaseManager processDic = GameManager.BinaryMgr.GetTable().dataDic; subProcessDic = GameManager.BinaryMgr.GetTable().dataDic; subProcessStepDic = GameManager.BinaryMgr.GetTable().dataDic; + systemDic = GameManager.BinaryMgr.GetTable().dataDic; + deviceTypeDic = GameManager.BinaryMgr.GetTable().dataDic; + toolAndMaterialDic = GameManager.BinaryMgr.GetTable().dataDic; } /// @@ -144,6 +162,20 @@ public class DataManager : BaseManager return d_SubProcessSteps; } + /// + /// 根据系统Id 获取系统信息 + /// + /// + /// + public TB_System GetSystemInfo(int systemId) + { + if (systemDic.ContainsKey(systemId)) + { + return systemDic[systemId]; + } + return null; + } + /// /// 获取报告 /// diff --git a/Assets/Scripts/Project/Manager/GameManager.cs b/Assets/Scripts/Project/Manager/GameManager.cs index 01b766e..bb90337 100644 --- a/Assets/Scripts/Project/Manager/GameManager.cs +++ b/Assets/Scripts/Project/Manager/GameManager.cs @@ -5,6 +5,11 @@ using UnityEngine; /// public class GameManager : SingletonAutoMono { + /// + /// 系统Id + /// + public int systemId = 10001; + #region 底层框架内容 /// /// Ui管理类 diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_LoadingPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_LoadingPanel.cs index 9637bda..f546726 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_LoadingPanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_LoadingPanel.cs @@ -67,11 +67,21 @@ public class UI_LoadingPanel : BasePanel isUpdate = true; } + /// + /// 初始化 + /// public void Init() { currentProgress = 0; targetProgress = 0; isUpdate = false; + TB_System tB_System = GameManager.DataMgr.GetSystemInfo(GameManager.Instance.systemId); + GameManager.ResourcesMgr.LoadAsync(Const.LoadBGPath + tB_System.loadName, (sprite) => + { + this.GetComponent().sprite = sprite; + }); + + } } diff --git a/Assets/Scripts/ProjectBase/BinaryManager/BinaryManager.cs b/Assets/Scripts/ProjectBase/BinaryManager/BinaryManager.cs index 7555a16..b86b6fa 100644 --- a/Assets/Scripts/ProjectBase/BinaryManager/BinaryManager.cs +++ b/Assets/Scripts/ProjectBase/BinaryManager/BinaryManager.cs @@ -40,6 +40,9 @@ public class BinaryManager : BaseManager LoadTable(); LoadTable(); LoadTable(); + LoadTable(); + LoadTable(); + LoadTable(); } /// diff --git a/Assets/Scripts/ProjectBase/Const/Const.cs b/Assets/Scripts/ProjectBase/Const/Const.cs index 3379db7..b7c7225 100644 --- a/Assets/Scripts/ProjectBase/Const/Const.cs +++ b/Assets/Scripts/ProjectBase/Const/Const.cs @@ -1,9 +1,15 @@ public class Const { #region · + /// + /// ϵͳͼ· + /// public const string TitleSpritePath = "Sprites/Title/"; - + /// + /// ϵͳرͼ· + /// + public const string LoadBGPath = "Sprites/UI_LoadingBG/"; #endregion public const string CheckKeyDown = "CheckKeyDown"; diff --git a/Assets/Scripts/ProjectBase/UIManager/BaseItem.cs b/Assets/Scripts/ProjectBase/UIManager/BaseItem.cs index efe97da..5ab5624 100644 --- a/Assets/Scripts/ProjectBase/UIManager/BaseItem.cs +++ b/Assets/Scripts/ProjectBase/UIManager/BaseItem.cs @@ -6,17 +6,17 @@ using UnityEngine.EventSystems; using UnityEngine.UI; /// -/// Item ʹ +/// Item 基类 方便使用组件 /// public class BaseItem : MonoBehaviour { /// - /// 洢пؼ + /// 存储面板上所有控件 /// private readonly Dictionary> controlDic = new Dictionary>(); /// - /// ʼ ҿؼ + /// 初始化 查找控件 /// protected virtual void Awake() { @@ -31,7 +31,7 @@ public class BaseItem : MonoBehaviour } /// - /// õӦƵĿؼ + /// 得到对应名称的控件 /// /// /// @@ -50,7 +50,7 @@ public class BaseItem : MonoBehaviour } /// - /// Ӷ + /// 查找所有子对象 /// /// private void FindChildrenControl() where T : UIBehaviour @@ -101,7 +101,7 @@ public class BaseItem : MonoBehaviour } /// - /// ʾԼ + /// 显示自己 /// public virtual void ShowMe() { @@ -109,7 +109,7 @@ public class BaseItem : MonoBehaviour } /// - /// Լ + /// 隐藏自己 /// public virtual void HideMe() { @@ -117,7 +117,7 @@ public class BaseItem : MonoBehaviour } /// - /// ť¼ + /// 按钮点击事件 /// /// protected virtual void OnClick(string btnName) @@ -126,30 +126,30 @@ public class BaseItem : MonoBehaviour } /// - /// Toogle + /// Toogle点击 /// - /// toogle - /// ״ֵ̬ + /// toogle名称 + /// 状态值 protected virtual void OnChangeToggle(string toogleName, bool isOn) { } /// - /// Slider϶ + /// Slider拖动 /// - /// Slider - /// ֵ + /// Slider组件名称 + /// 数值 protected virtual void OnChangeSlider(string SliderName, float value) { } /// - /// + /// 输入框输入 /// - /// - /// ڵֵ + /// 输入框名称 + /// 输入框内的值 protected virtual void OnChangeInputFile(string inputFileName, string value) { diff --git a/Assets/Scripts/ProjectBase/UIManager/BasePanel.cs b/Assets/Scripts/ProjectBase/UIManager/BasePanel.cs index dcfb829..9aaba43 100644 --- a/Assets/Scripts/ProjectBase/UIManager/BasePanel.cs +++ b/Assets/Scripts/ProjectBase/UIManager/BasePanel.cs @@ -10,7 +10,7 @@ using UnityEngine.UI; public class BasePanel : MonoBehaviour { /// - /// ???????????? + /// ??????????п?? /// private readonly Dictionary> controlDic = new Dictionary>(); @@ -27,6 +27,7 @@ public class BasePanel : MonoBehaviour FindChildrenControl(); FindChildrenControl(); FindChildrenControl(); + FindChildrenControl(); } /// @@ -54,7 +55,7 @@ public class BasePanel : MonoBehaviour /// private void FindChildrenControl() where T : UIBehaviour { - T[] controls = GetComponentsInChildren(true); + T[] controls = GetComponentsInChildren(true); for (int i = 0; i < controls.Length; i++) { diff --git a/Assets/StreamingAssets/BinaryData/TB_DeviceType.binary b/Assets/StreamingAssets/BinaryData/TB_DeviceType.binary new file mode 100644 index 0000000000000000000000000000000000000000..e47d46a253fdd0218ec8ee46708eaf17aec2f1c4 GIT binary patch literal 88 zcmZQ(U|?VZ;>;99KOhAJN?tn%nS^I>I@7@ehdu!K#^xNcfDxd`+Uk)Ao*h93ZMuBP?q7vx`i*> z`(G?>eZF_yi@ocf^)7na-}St2!_zsto-J7Ta#hch-TR-l1Xz0_v?kBq@J!_f&bS62jeuHV^v#pJknD`dS zL^)76?CysfhaMVa1@t>43nXv`G+9Q!M=~1hc1U_ainJ%YdY-LW_;mKX7u(m95rMc8 Y56GwwK+6$;g9X8cu{g1aabXby05EG-CjbBd literal 743 zcmZwEISRsH5QgF3Bx>{+_JZEU-bRanr8khEHl`69E0L6@(k?kpHn+I%+mB^<#t-`+^BA a{WT#nU<#NDrh#R_a$tEd9jpLW1p5I?6FSrY diff --git a/Assets/StreamingAssets/BinaryData/TB_System.binary b/Assets/StreamingAssets/BinaryData/TB_System.binary new file mode 100644 index 0000000000000000000000000000000000000000..a514a186afc4b9f8d8080efe82f6adf1c739576c GIT binary patch literal 940 zcmbVL%}&BV5Z-w7CjNUc@#M+G#8>j-TM)HSgf7H@MkJP68~;MVM4+@ZybLqD`xXw_ zMjJvRG?~3jzMq+Ich?zXYjiHoH;x&jV$ye1u_|3d#J-Guw4R}QBX|#5A+{a$QJF>) z(Xv;7<_LQ@rwo3HEbz_2vaJRGM{JT#j&wvgLCXfSfKN5eUEJLw{K>p8?Gl;dvx^Nw zHCymGV{-NlhqO=;qP({&HIqx