diff --git a/Assets/ArtRes/Excel/Config.xlsx b/Assets/ArtRes/Excel/Config.xlsx index 92ce35d..1dbccd5 100644 Binary files a/Assets/ArtRes/Excel/Config.xlsx and b/Assets/ArtRes/Excel/Config.xlsx differ 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 0000000..e47d46a Binary files /dev/null and b/Assets/StreamingAssets/BinaryData/TB_DeviceType.binary differ diff --git a/Assets/StreamingAssets/BinaryData/TB_DeviceType.binary.meta b/Assets/StreamingAssets/BinaryData/TB_DeviceType.binary.meta new file mode 100644 index 0000000..fda707a --- /dev/null +++ b/Assets/StreamingAssets/BinaryData/TB_DeviceType.binary.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 018ffb75fb674c64f8471e20123a46f1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/BinaryData/TB_Scheme.binary b/Assets/StreamingAssets/BinaryData/TB_Scheme.binary index 36cd898..7151661 100644 Binary files a/Assets/StreamingAssets/BinaryData/TB_Scheme.binary and b/Assets/StreamingAssets/BinaryData/TB_Scheme.binary differ diff --git a/Assets/StreamingAssets/BinaryData/TB_System.binary b/Assets/StreamingAssets/BinaryData/TB_System.binary new file mode 100644 index 0000000..a514a18 Binary files /dev/null and b/Assets/StreamingAssets/BinaryData/TB_System.binary differ diff --git a/Assets/StreamingAssets/BinaryData/TB_System.binary.meta b/Assets/StreamingAssets/BinaryData/TB_System.binary.meta new file mode 100644 index 0000000..f8f1f14 --- /dev/null +++ b/Assets/StreamingAssets/BinaryData/TB_System.binary.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5f0cf2f09556be549b986dc1efef4f6f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 3789aa6..f3a3ade 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -4,6 +4,7 @@ "com.unity.ide.rider": "3.0.28", "com.unity.ide.visualstudio": "2.0.22", "com.unity.ide.vscode": "1.2.5", + "com.unity.render-pipelines.universal": "12.1.14", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.6.5", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 16ecb89..ff7c83c 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,5 +1,14 @@ { "dependencies": { + "com.unity.burst": { + "version": "1.8.11", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.mathematics": "1.2.1" + }, + "url": "https://packages.unity.cn" + }, "com.unity.collab-proxy": { "version": "2.3.1", "depth": 0, @@ -39,6 +48,50 @@ "dependencies": {}, "url": "https://packages.unity.cn" }, + "com.unity.mathematics": { + "version": "1.2.6", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.cn" + }, + "com.unity.render-pipelines.core": { + "version": "12.1.14", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.render-pipelines.universal": { + "version": "12.1.14", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.mathematics": "1.2.1", + "com.unity.burst": "1.8.9", + "com.unity.render-pipelines.core": "12.1.14", + "com.unity.shadergraph": "12.1.14" + } + }, + "com.unity.searcher": { + "version": "4.9.1", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.cn" + }, + "com.unity.shadergraph": { + "version": "12.1.14", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.render-pipelines.core": "12.1.14", + "com.unity.searcher": "4.9.1" + } + }, "com.unity.test-framework": { "version": "1.1.33", "depth": 0,