diff --git a/SXElectricalInspection/Assets/Adam/Prefabs/Item/SmallToolBar.prefab b/SXElectricalInspection/Assets/Adam/Prefabs/Item/SmallToolBar.prefab new file mode 100644 index 00000000..fdf6b6af --- /dev/null +++ b/SXElectricalInspection/Assets/Adam/Prefabs/Item/SmallToolBar.prefab @@ -0,0 +1,531 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7411208556707307167 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7411208556707307166} + - component: {fileID: 7411208556707307163} + - component: {fileID: 7411208556707307164} + - component: {fileID: 7411208556707307165} + m_Layer: 5 + m_Name: content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7411208556707307166 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411208556707307167} + 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: 7411208557801120249} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &7411208556707307163 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411208556707307167} + m_CullTransparentMesh: 1 +--- !u!114 &7411208556707307164 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411208556707307167} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 71 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 30 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &7411208556707307165 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411208556707307167} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!1 &7411208556996469755 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7411208556996469754} + - component: {fileID: 7411208556996469752} + - component: {fileID: 7411208556996469753} + m_Layer: 5 + m_Name: SmallToolBar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7411208556996469754 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411208556996469755} + 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: + - {fileID: 7411208557801120249} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7411208556996469752 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411208556996469755} + m_CullTransparentMesh: 1 +--- !u!114 &7411208556996469753 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411208556996469755} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.19215687} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7411208557801120250 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7411208557801120249} + - component: {fileID: 7411208557801120135} + - component: {fileID: 7411208557801120248} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7411208557801120249 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411208557801120250} + 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: + - {fileID: 7411208556707307166} + - {fileID: 7411208558592266666} + - {fileID: 7411208557957728587} + - {fileID: 7411208558528980666} + m_Father: {fileID: 7411208556996469754} + 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: 0, y: 0} + m_SizeDelta: {x: 784, y: 218} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7411208557801120135 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411208557801120250} + m_CullTransparentMesh: 1 +--- !u!114 &7411208557801120248 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411208557801120250} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 69a4f8cbd386f6d4cbca1fdfa261d3d6, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7411208557957728588 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7411208557957728587} + - component: {fileID: 7411208557957728585} + - component: {fileID: 7411208557957728586} + m_Layer: 5 + m_Name: Left + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7411208557957728587 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411208557957728588} + 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: 7411208557801120249} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 14, y: 0} + m_SizeDelta: {x: 44, y: 44} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &7411208557957728585 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411208557957728588} + m_CullTransparentMesh: 1 +--- !u!114 &7411208557957728586 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411208557957728588} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: eb0d11657e6521a40a0c6a9d5caca771, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7411208558528980667 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7411208558528980666} + - component: {fileID: 7411208558528980664} + - component: {fileID: 7411208558528980665} + m_Layer: 5 + m_Name: Right + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7411208558528980666 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411208558528980667} + 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: 7411208557801120249} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -14, y: 0} + m_SizeDelta: {x: 44, y: 44} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &7411208558528980664 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411208558528980667} + m_CullTransparentMesh: 1 +--- !u!114 &7411208558528980665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411208558528980667} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: d289c836b3b734e49aac15dc4823aebe, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7411208558592266667 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7411208558592266666} + - component: {fileID: 7411208558592266664} + - component: {fileID: 7411208558592266665} + - component: {fileID: 7411208558592266679} + m_Layer: 5 + m_Name: close + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7411208558592266666 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411208558592266667} + 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: 7411208557801120249} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -14, y: -14} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 1, y: 1} +--- !u!222 &7411208558592266664 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411208558592266667} + m_CullTransparentMesh: 1 +--- !u!114 &7411208558592266665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411208558592266667} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 77281b9be0ed9274dbb668dd832aa516, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7411208558592266679 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411208558592266667} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7411208558592266665} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 7411208556996469755} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 diff --git a/SXElectricalInspection/Assets/Adam/Prefabs/Item/SmallToolBar.prefab.meta b/SXElectricalInspection/Assets/Adam/Prefabs/Item/SmallToolBar.prefab.meta new file mode 100644 index 00000000..e5423000 --- /dev/null +++ b/SXElectricalInspection/Assets/Adam/Prefabs/Item/SmallToolBar.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e3445c2e4d88da446847423a724e2bff +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SXElectricalInspection/Assets/Adam/Prefabs/Item/工具Item.prefab b/SXElectricalInspection/Assets/Adam/Prefabs/Item/工具Item.prefab index 1ddefa7c..dd1c1101 100644 --- a/SXElectricalInspection/Assets/Adam/Prefabs/Item/工具Item.prefab +++ b/SXElectricalInspection/Assets/Adam/Prefabs/Item/工具Item.prefab @@ -1,5 +1,85 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1138032081 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1138032082} + - component: {fileID: 1138032084} + - component: {fileID: 1138032083} + m_Layer: 5 + m_Name: count + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1138032082 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1138032081} + 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: 5799929949924204347} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -9.3, y: 4.2141} + m_SizeDelta: {x: 37.55, y: 36} + m_Pivot: {x: 1, y: 0} +--- !u!222 &1138032084 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1138032081} + m_CullTransparentMesh: 1 +--- !u!114 &1138032083 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1138032081} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.06666667, g: 0.31764707, b: 0.6, 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_FontData: + m_Font: {fileID: 12800000, guid: 244e9c25ab24aa94dadbd6fd0dca69ff, type: 3} + m_FontSize: 16 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: --- !u!1 &1747107931532903585 GameObject: m_ObjectHideFlags: 0 @@ -353,6 +433,7 @@ RectTransform: - {fileID: 5799929948531248090} - {fileID: 1747107931532903586} - {fileID: 723533276650895034} + - {fileID: 1138032082} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -421,7 +502,11 @@ MonoBehaviour: originAngle: {x: 0, y: 0, z: 0} prefab: {fileID: 0} attribute: 0 + isRightOrWroing: 0 + countText: {fileID: 1138032083} + count: 1 rightAndWeong: 0 + wearAndUse: 0 --- !u!1 &8865507767033294803 GameObject: m_ObjectHideFlags: 0 diff --git a/SXElectricalInspection/Assets/Adam/Prefabs/Item/工具ParentItem.prefab b/SXElectricalInspection/Assets/Adam/Prefabs/Item/工具ParentItem.prefab new file mode 100644 index 00000000..5dc5bb9d --- /dev/null +++ b/SXElectricalInspection/Assets/Adam/Prefabs/Item/工具ParentItem.prefab @@ -0,0 +1,300 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4415812133224065460 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4415812133224065461} + - component: {fileID: 4415812133224065463} + - component: {fileID: 4415812133224065462} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4415812133224065461 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4415812133224065460} + 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: 4415812133440552276} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -7.4018, y: -8.4282} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4415812133224065463 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4415812133224065460} + m_CullTransparentMesh: 1 +--- !u!114 &4415812133224065462 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4415812133224065460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 3198725705e413b40b7da38d25a649d2, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4415812133440552275 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4415812133440552276} + - component: {fileID: 4415812133440552279} + - component: {fileID: 4415812133440552278} + - component: {fileID: 4415812133440552264} + - component: {fileID: 4415812133440552265} + m_Layer: 5 + m_Name: "\u5DE5\u5177ParentItem" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4415812133440552276 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4415812133440552275} + 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: + - {fileID: 4415812133224065461} + - {fileID: 7869301693511376829} + m_Father: {fileID: 0} + m_RootOrder: 0 + 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.5, y: 0.5} +--- !u!222 &4415812133440552279 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4415812133440552275} + m_CullTransparentMesh: 1 +--- !u!114 &4415812133440552278 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4415812133440552275} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 8e045957cca3cc2479221eabac24b006, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &4415812133440552264 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4415812133440552275} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c7caff4f16c374b40923e7c87dafc592, type: 3} + m_Name: + m_EditorClassIdentifier: + icon: {fileID: 4415812133224065462} + countText: {fileID: 7869301693511376828} + selfBtn: {fileID: 4415812133440552265} + content: {fileID: 0} + smallObjPrefab: {fileID: 7411208556996469755, guid: e3445c2e4d88da446847423a724e2bff, type: 3} + smallToolBar: {fileID: 0} +--- !u!114 &4415812133440552265 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4415812133440552275} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 4415812133440552278} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &7869301693511376830 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7869301693511376829} + - component: {fileID: 7869301693511376827} + - component: {fileID: 7869301693511376828} + m_Layer: 5 + m_Name: count + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7869301693511376829 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7869301693511376830} + 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: 4415812133440552276} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -9.3, y: 4.2141} + m_SizeDelta: {x: 37.55, y: 36} + m_Pivot: {x: 1, y: 0} +--- !u!222 &7869301693511376827 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7869301693511376830} + m_CullTransparentMesh: 1 +--- !u!114 &7869301693511376828 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7869301693511376830} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.06666667, g: 0.31764707, b: 0.6, 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_FontData: + m_Font: {fileID: 12800000, guid: 244e9c25ab24aa94dadbd6fd0dca69ff, type: 3} + m_FontSize: 16 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: diff --git a/SXElectricalInspection/Assets/Adam/Prefabs/Item/工具ParentItem.prefab.meta b/SXElectricalInspection/Assets/Adam/Prefabs/Item/工具ParentItem.prefab.meta new file mode 100644 index 00000000..b6ccd433 --- /dev/null +++ b/SXElectricalInspection/Assets/Adam/Prefabs/Item/工具ParentItem.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1af794b749529df41969870b82801ed8 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SXElectricalInspection/Assets/Adam/Scenes/UI.unity b/SXElectricalInspection/Assets/Adam/Scenes/UI.unity index f400d16e..5aa7c5f3 100644 --- a/SXElectricalInspection/Assets/Adam/Scenes/UI.unity +++ b/SXElectricalInspection/Assets/Adam/Scenes/UI.unity @@ -1983,11 +1983,11 @@ RectTransform: m_Father: {fileID: 1067605740} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1824.1, y: -528.9} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -55.900024, y: 11.099976} m_SizeDelta: {x: 80, y: 80} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 1, y: 0.5} --- !u!114 &161696237 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3086,7 +3086,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 1000244767} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: @@ -6317,7 +6317,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 26.765, y: -120.6} + m_AnchoredPosition: {x: 26.764893, y: -120.6} m_SizeDelta: {x: 299.7542, y: 142.27} m_Pivot: {x: 0, y: 1} --- !u!114 &414392648 @@ -11975,7 +11975,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: c2219efd5433de04b91de04f61a11d39, type: 3} + m_Sprite: {fileID: 21300000, guid: caf5f2223fb132d42a60fee2c9abef3f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -17571,7 +17571,6 @@ MonoBehaviour: m_EditorClassIdentifier: isRun: 0 limitTime: 0 - countTime: 0 guiTimer: {fileID: 963964479} timeOver: m_PersistentCalls: @@ -17955,7 +17954,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1442779148066317741, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} propertyPath: m_Enabled - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1442779148066317741, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} propertyPath: m_RaycastTarget @@ -17964,14 +17963,18 @@ PrefabInstance: - target: {fileID: 1442779148066317741, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 35c12ded57fcce948a60630957cccd15, type: 3} + objectReference: {fileID: 12800000, guid: 8c07bd6e3e50e7f4f8060ddf2f0819aa, type: 3} + - target: {fileID: 1442779148066317741, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} + propertyPath: m_FontData.m_MaxSize + value: 45 + objectReference: {fileID: 0} - target: {fileID: 1442779148066317741, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} propertyPath: m_FontData.m_MinSize value: 2 objectReference: {fileID: 0} - target: {fileID: 1442779148066317741, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} propertyPath: m_FontData.m_FontSize - value: 20 + value: 16 objectReference: {fileID: 0} - target: {fileID: 4932325705355159533, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} propertyPath: m_Pivot.x @@ -17979,7 +17982,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4932325705355159533, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} propertyPath: m_Pivot.y - value: 0 + value: -1.4293524 objectReference: {fileID: 0} - target: {fileID: 4932325705355159533, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} propertyPath: m_RootOrder @@ -18003,11 +18006,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4932325705355159533, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} propertyPath: m_SizeDelta.x - value: 68.3524 + value: 148.8756 objectReference: {fileID: 0} - target: {fileID: 4932325705355159533, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} propertyPath: m_SizeDelta.y - value: 22.4752 + value: 40.8406 objectReference: {fileID: 0} - target: {fileID: 4932325705355159533, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} propertyPath: m_LocalScale.x @@ -18051,11 +18054,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4932325705355159533, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} propertyPath: m_AnchoredPosition.x - value: 10.4348 + value: 386.04053 objectReference: {fileID: 0} - target: {fileID: 4932325705355159533, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} propertyPath: m_AnchoredPosition.y - value: -428.84998 + value: -336.19788 objectReference: {fileID: 0} - target: {fileID: 4932325705355159533, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -18071,19 +18074,31 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6362024693337029893, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} propertyPath: m_SizeDelta.x - value: 114.71 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6362024693337029893, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} propertyPath: m_SizeDelta.y - value: 24.8704 + value: -10.466 + objectReference: {fileID: 0} + - target: {fileID: 6362024693337029893, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6362024693337029893, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6362024693337029893, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} + propertyPath: m_LocalScale.z + value: 1 objectReference: {fileID: 0} - target: {fileID: 6362024693337029893, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} propertyPath: m_AnchoredPosition.x - value: -0.00020217896 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6362024693337029893, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} propertyPath: m_AnchoredPosition.y - value: 2.3986 + value: 5.232994 objectReference: {fileID: 0} - target: {fileID: 7832223162254303372, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} propertyPath: m_Sprite @@ -18091,7 +18106,7 @@ PrefabInstance: objectReference: {fileID: 21300000, guid: 475066b13ee3f9b45bb00d7df087b347, type: 3} - target: {fileID: 7832223162254303372, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} propertyPath: m_Enabled - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7832223162254303372, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} propertyPath: m_RaycastTarget @@ -18099,7 +18114,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8134068106339392507, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8840111611253122608, guid: f8a7b9505ae84b5479d8e906ba48957a, type: 3} propertyPath: m_Name @@ -19783,6 +19798,8 @@ MonoBehaviour: bottomToolToggle: {fileID: 754664720} currentTool: {fileID: 0} ServerRecorderPanel: {fileID: 1102537591} + toolParentItemPrefab: {fileID: 4415812133440552264, guid: 1af794b749529df41969870b82801ed8, type: 3} + smallToolBarParent: {fileID: 38503289} --- !u!114 &1067605744 MonoBehaviour: m_ObjectHideFlags: 0 @@ -19957,7 +19974,6 @@ MonoBehaviour: closeButton: {fileID: 719090947} text_sub: {fileID: 1292970890} num_click: 0 - endTime: --- !u!114 &1067605750 MonoBehaviour: m_ObjectHideFlags: 0 @@ -24045,7 +24061,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 26.765, y: -104.9} + m_AnchoredPosition: {x: 26.764893, y: -104.9} m_SizeDelta: {x: 296.0707, y: 142.27} m_Pivot: {x: 0, y: 1} --- !u!114 &1298844199 @@ -25079,7 +25095,7 @@ RectTransform: 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: -0.0000038146973, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 72, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1359808512 @@ -30800,7 +30816,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -26.099976, y: -23.599976} + m_AnchoredPosition: {x: -26.100098, y: -23.599976} m_SizeDelta: {x: 148, y: 44} m_Pivot: {x: 1, y: 1} --- !u!114 &1602550213 @@ -35827,7 +35843,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -59.9, y: -121.4} + m_AnchoredPosition: {x: -59.899902, y: -121.4} m_SizeDelta: {x: 72, y: 72} m_Pivot: {x: 1, y: 0.5} --- !u!114 &1876085499 diff --git a/SXElectricalInspection/Assets/Adam/Scripts/Components/ToolItem.cs b/SXElectricalInspection/Assets/Adam/Scripts/Components/ToolItem.cs index bf77e54d..c9cb9778 100644 --- a/SXElectricalInspection/Assets/Adam/Scripts/Components/ToolItem.cs +++ b/SXElectricalInspection/Assets/Adam/Scripts/Components/ToolItem.cs @@ -1,3 +1,4 @@ +using Components; using System; using System.Collections; using System.Collections.Generic; @@ -26,6 +27,9 @@ public class ToolItem : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler public GameObject prefab; public Attribute attribute = Attribute.defaultModel; public bool isRightOrWroing = false; + public Text countText; + public int count = 1; + public ToolParentItem toolParentItem; //public float h; public RightAndWrong rightAndWeong = RightAndWrong.defaultModel; @@ -34,18 +38,19 @@ public class ToolItem : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler private float y; + private void Start() { tips = UIManager.Instance.toolsItemManager.toolPanel.transform.Find("Tips").gameObject; showName = tips.transform.GetChild(0).GetComponent(); closeButton.gameObject.SetActive(false); + //countText.gameObject.SetActive(false); } public void SetValue(string name, Transform modelTransform, Vector3 pos, Vector3 Rot) { toolName = name; closeButton.onClick.AddListener(OnClose); - Texture2D icon = Resources.Load("New/UI/" + name); showIcon.sprite = ToSprite(icon); originPos = pos; @@ -57,6 +62,13 @@ public class ToolItem : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler isRightOrWroing = modelTransform.GetComponent().isRight; } + public void SetCount() + { + count++; + countText.text = $"×{count}"; + countText.gameObject.SetActive(true); + } + public void SetState(bool isActive) { //closeButton.gameObject.SetActive(isActive); @@ -107,6 +119,10 @@ public class ToolItem : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler obj.GetComponent().rightAndWrong = rightAndWeong; obj.GetComponent().wearAnduse = wearAndUse; obj.GetComponent().isRight = isRightOrWroing; + if (toolParentItem != null) + { + ToolsItemManager.Instance.RemoveMergedItemsHave(this); + } FractionManager.Instance.RemoveToolByName(obj); Destroy(gameObject); ToolsItemManager.Instance.RemoveNull(); diff --git a/SXElectricalInspection/Assets/Adam/Scripts/Components/ToolParentItem.cs b/SXElectricalInspection/Assets/Adam/Scripts/Components/ToolParentItem.cs new file mode 100644 index 00000000..f337b01a --- /dev/null +++ b/SXElectricalInspection/Assets/Adam/Scripts/Components/ToolParentItem.cs @@ -0,0 +1,49 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +//============================================================ +//支持中文,文件使用UTF-8编码 +//@author Adam +//@create 20240715 +//@company Adam +// +//@description: +//============================================================ +namespace Components +{ + public class ToolParentItem : MonoBehaviour + { + public Image icon; + public Text countText; + public Button selfBtn; + private Button colseBtn; + public RectTransform content; + public GameObject smallObjPrefab; + public GameObject smallToolBar; + public WearAndUse wearAndUse = WearAndUse.defaultModel; + // Use this for initialization + + public void SetCount(Sprite _icon, int _count) + { + countText.text = $"×{_count}"; + icon.sprite = _icon; + } + public void SetIconAndCountText( Transform t) + { + smallToolBar = Instantiate(smallObjPrefab, t); + content = smallToolBar.transform.GetChild(0).Find("content").GetComponent(); + colseBtn = smallToolBar.transform.GetChild(0).Find("close").GetComponent