diff --git a/SXElectricalInspection/Assets/Adam/Scenes/UI.unity b/SXElectricalInspection/Assets/Adam/Scenes/UI.unity index 33be9d7b..e00b8ba6 100644 --- a/SXElectricalInspection/Assets/Adam/Scenes/UI.unity +++ b/SXElectricalInspection/Assets/Adam/Scenes/UI.unity @@ -1064,7 +1064,7 @@ GameObject: m_Component: - component: {fileID: 89677427} - component: {fileID: 89677429} - - component: {fileID: 89677428} + - component: {fileID: 89677430} m_Layer: 5 m_Name: SetSystem m_TagString: Untagged @@ -1092,7 +1092,15 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1050, y: 435} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &89677428 +--- !u!222 &89677429 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 89677426} + m_CullTransparentMesh: 1 +--- !u!114 &89677430 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1101,7 +1109,7 @@ MonoBehaviour: m_GameObject: {fileID: 89677426} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -1112,24 +1120,13 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: fa0c8ad8e6ffc06498c0da332c908fd3, 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!222 &89677429 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 89677426} - m_CullTransparentMesh: 1 + m_Texture: {fileID: 2800000, guid: fa0c8ad8e6ffc06498c0da332c908fd3, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &91025464 GameObject: m_ObjectHideFlags: 0 @@ -4740,6 +4737,86 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 374859221} m_CullTransparentMesh: 1 +--- !u!1 &377429945 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 377429946} + - component: {fileID: 377429948} + - component: {fileID: 377429947} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &377429946 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 377429945} + 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: 2145806250} + 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!114 &377429947 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 377429945} + 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, g: 0.6511247, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 60 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 60 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: < +--- !u!222 &377429948 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 377429945} + m_CullTransparentMesh: 1 --- !u!1 &379354440 GameObject: m_ObjectHideFlags: 0 @@ -5505,6 +5582,86 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 414392646} m_CullTransparentMesh: 1 +--- !u!1 &427238074 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 427238075} + - component: {fileID: 427238077} + - component: {fileID: 427238076} + m_Layer: 5 + m_Name: Tips + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &427238075 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 427238074} + 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: 1361738231} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 313.4176, y: -35.30591} + m_SizeDelta: {x: 547.2349, y: 70.6109} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &427238076 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 427238074} + 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.5896226, g: 0.9458609, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 34 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u4F7F\u7528\u94B3\u5F62\u7535\u6D41\u88681" +--- !u!222 &427238077 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 427238074} + m_CullTransparentMesh: 1 --- !u!1 &431218845 GameObject: m_ObjectHideFlags: 0 @@ -17800,6 +17957,7 @@ GameObject: - component: {fileID: 1067605754} - component: {fileID: 1067605755} - component: {fileID: 1067605756} + - component: {fileID: 1067605757} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -18350,6 +18508,25 @@ MonoBehaviour: StopClick: {fileID: 0} path: MP4Name: +--- !u!114 &1067605757 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1067605736} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e44ac87aada1b644dac8d22a4e7e2a82, type: 3} + m_Name: + m_EditorClassIdentifier: + leftBtn: {fileID: 2145806253} + rightBtn: {fileID: 1707656242} + tips: {fileID: 89677430} + tipText: {fileID: 427238076} + index: 0 + imageCount: 0 + texturesTips: [] --- !u!1 &1091536119 GameObject: m_ObjectHideFlags: 0 @@ -22907,6 +23084,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 790965686} + - {fileID: 427238075} m_Father: {fileID: 1906731478} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -30348,6 +30526,128 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1695943083} m_CullTransparentMesh: 1 +--- !u!1 &1707656238 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1707656239} + - component: {fileID: 1707656241} + - component: {fileID: 1707656240} + - component: {fileID: 1707656242} + m_Layer: 5 + m_Name: RightBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1707656239 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1707656238} + 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: 1787245989} + m_Father: {fileID: 1906731478} + 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: -180, y: 0} + m_SizeDelta: {x: 100, y: 127.7389} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &1707656240 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1707656238} + 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.5120332, b: 1, a: 0.13333334} + 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!222 &1707656241 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1707656238} + m_CullTransparentMesh: 1 +--- !u!114 &1707656242 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1707656238} + 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: 1707656240} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1708161586 GameObject: m_ObjectHideFlags: 0 @@ -31811,6 +32111,86 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1787008123} m_CullTransparentMesh: 1 +--- !u!1 &1787245988 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1787245989} + - component: {fileID: 1787245991} + - component: {fileID: 1787245990} + m_Layer: 5 + m_Name: Text (Legacy) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1787245989 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1787245988} + 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: 1707656239} + 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!114 &1787245990 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1787245988} + 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, g: 0.6511247, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 60 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 60 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: '>' +--- !u!222 &1787245991 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1787245988} + m_CullTransparentMesh: 1 --- !u!1 &1790206773 GameObject: m_ObjectHideFlags: 0 @@ -33273,6 +33653,8 @@ RectTransform: m_Children: - {fileID: 1361738231} - {fileID: 89677427} + - {fileID: 2145806250} + - {fileID: 1707656239} m_Father: {fileID: 277472811} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -38076,6 +38458,128 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2143281895} m_CullTransparentMesh: 1 +--- !u!1 &2145806249 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2145806250} + - component: {fileID: 2145806252} + - component: {fileID: 2145806251} + - component: {fileID: 2145806253} + m_Layer: 5 + m_Name: LeftBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2145806250 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2145806249} + 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: 377429946} + m_Father: {fileID: 1906731478} + 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: 180, y: 0} + m_SizeDelta: {x: 100, y: 127.7389} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &2145806251 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2145806249} + 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.5120332, b: 1, a: 0.13333334} + 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!222 &2145806252 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2145806249} + m_CullTransparentMesh: 1 +--- !u!114 &2145806253 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2145806249} + 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: 2145806251} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &223104166407512384 GameObject: m_ObjectHideFlags: 0 diff --git a/SXElectricalInspection/Assets/Adam/Scripts/Components/NPCWaypoints.cs b/SXElectricalInspection/Assets/Adam/Scripts/Components/NPCWaypoints.cs new file mode 100644 index 00000000..2de1e2a6 --- /dev/null +++ b/SXElectricalInspection/Assets/Adam/Scripts/Components/NPCWaypoints.cs @@ -0,0 +1,78 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +//============================================================ +//支持中文，文件使用UTF-8编码 +//@author Adam +//@create 20240522 +//@company Aadm +// +//@description: +//============================================================ +namespace Components +{ + public class NPCWaypoints : MonoBehaviour + { + public Transform[] waypoints; // 路径点数组 + private int currentWaypoint = 0; // 当前路径点索引 + private float moveSpeed = 1f; // 移动速度 + public Animator npcAnimator; + public bool isMove = false; + public bool isOnce = false; + public bool isLooked = true; + // Use this for initialization + private void Start() + { + for (int i = 0; i < waypoints.Length; i++) + { + waypoints[i].GetComponent().enabled = false; + } + } + private void Update() + { + if (!isMove) return; + if (currentWaypoint < waypoints.Length) + { + float distance = Vector3.Distance(transform.position, waypoints[currentWaypoint].position); + if (distance > 0.1f) + { + if (isLooked) + { + transform.LookAt(waypoints[currentWaypoint]); + isLooked = false; + } + Vector3 direction = waypoints[currentWaypoint].position - transform.position; + transform.Translate(Vector3.forward * moveSpeed * Time.deltaTime); + } + else + { + currentWaypoint++; + isLooked = true; + } + } + else + { + + if (isMove && !isOnce) + { + npcAnimator.SetBool("isWalk", false); + isMove = false; + isOnce = true; + } + } + } + //[ContextMenu("StartMove")] + public void StartMove() + { + StartCoroutine(WaitMove()); + } + + private IEnumerator WaitMove() + { + yield return new WaitForSeconds(3f); + npcAnimator.SetBool("isWalk", true); + isMove = true; + isOnce = false; + } + } +} diff --git a/SXElectricalInspection/Assets/Adam/Scripts/Components/NPCWaypoints.cs.meta b/SXElectricalInspection/Assets/Adam/Scripts/Components/NPCWaypoints.cs.meta new file mode 100644 index 00000000..257427bf --- /dev/null +++ b/SXElectricalInspection/Assets/Adam/Scripts/Components/NPCWaypoints.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 116e73b071222f8499967697228559a1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SXElectricalInspection/Assets/Adam/Scripts/SystemController.cs b/SXElectricalInspection/Assets/Adam/Scripts/SystemController.cs new file mode 100644 index 00000000..0b8abe46 --- /dev/null +++ b/SXElectricalInspection/Assets/Adam/Scripts/SystemController.cs @@ -0,0 +1,84 @@ +using System.Collections; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using UnityEngine; +using UnityEngine.UI; +//============================================================ +//支持中文，文件使用UTF-8编码 +//@author Adam +//@create 20240516 +//@company LG +// +//@description: +//============================================================ + +public class SystemController : MonoBehaviour +{ + public Button leftBtn; + public Button rightBtn; + public RawImage tips; + public Text tipText; + public int index = 0; + public int imageCount; + public Texture2D[] texturesTips; + // Use this for initialization + private void Start() + { + texturesTips = LoadSprite("Tips"); + leftBtn.onClick.AddListener(OnLeft); + rightBtn.onClick.AddListener(OnRight); + imageCount = texturesTips.Length; + tips.texture = texturesTips[index]; + tipText.text = texturesTips[index].name; + } + + + + public void OnRight() + { + index++; + if (index >= imageCount) + { + index = imageCount - 1; + } + tipText.text = texturesTips[index].name; + tips.texture = texturesTips[index]; + } + + public void OnLeft() + { + index--; + if (index < 0) + { + index = 0; + } + tipText.text = texturesTips[index].name; + tips.texture = texturesTips[index]; + } + public Texture2D[] LoadSprite(string name) + { + string fileName_1 = Path.Combine(Application.streamingAssetsPath, name); + Debug.Log(fileName_1); + if (!Directory.Exists(fileName_1)) + { + throw new FileNotFoundException("Could not find file: " + fileName_1); + } + string[] filePaths = Directory.GetFiles(fileName_1, "*.*", SearchOption.AllDirectories) + .Where(s => s.EndsWith(".jpg") || s.EndsWith(".png")) + .ToArray(); + Texture2D[] sprites = new Texture2D[filePaths.Length]; + for (int i = 0; i < filePaths.Length; i++) + { + byte[] bytes = File.ReadAllBytes(filePaths[i]); + Texture2D texture = new Texture2D(2, 2); + texture.LoadImage(bytes); + string tipName = filePaths[i].Substring(filePaths[i].LastIndexOf(@"\") + 1, filePaths[i].LastIndexOf('.') - filePaths[i].LastIndexOf('\\') - 1); + string[] tempNames = tipName.Split("_"); + texture.name = tempNames[2]; + sprites[i] = texture; + } + return sprites; + } + +} diff --git a/SXElectricalInspection/Assets/Adam/Scripts/SystemController.cs.meta b/SXElectricalInspection/Assets/Adam/Scripts/SystemController.cs.meta new file mode 100644 index 00000000..aaf10521 --- /dev/null +++ b/SXElectricalInspection/Assets/Adam/Scripts/SystemController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e44ac87aada1b644dac8d22a4e7e2a82 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SXElectricalInspection/Assets/Art/场景_8.27/women.meta b/SXElectricalInspection/Assets/Art/场景_8.27/women.meta new file mode 100644 index 00000000..e5d6d8ad --- /dev/null +++ b/SXElectricalInspection/Assets/Art/场景_8.27/women.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 53ee37c207e32e14d8a743ae9d9ddb8c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking.meta b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking.meta new file mode 100644 index 00000000..8e8eafaa --- /dev/null +++ b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 91ccc6da58c5c8545ab55312718656c3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Materials.meta b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Materials.meta new file mode 100644 index 00000000..b8c48853 --- /dev/null +++ b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f2ab3149758181f4ca713e1f3489c62f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Materials/3d66Model-9825864-files-1.mat b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Materials/3d66Model-9825864-files-1.mat new file mode 100644 index 00000000..3e5df3df --- /dev/null +++ b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Materials/3d66Model-9825864-files-1.mat @@ -0,0 +1,86 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 3d66Model-9825864-files-1 + m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: + - _EMISSION + - _NORMALMAP + m_InvalidKeywords: [] + m_LightmapFlags: 1 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 46401282a7a59f9469c8ee4f2d61359b, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 88d0414c9e7584441943afc141654c72, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Materials/3d66Model-9825864-files-1.mat.meta b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Materials/3d66Model-9825864-files-1.mat.meta new file mode 100644 index 00000000..521726de --- /dev/null +++ b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Materials/3d66Model-9825864-files-1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9e4f01f5cbefae8439b17d2493397604 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.controller b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.controller new file mode 100644 index 00000000..88ad891f --- /dev/null +++ b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.controller @@ -0,0 +1,159 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-5947397917592710247 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Stand + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -3584095163756711014} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 0 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -203655887218126122, guid: 2acc773208dfe3342a32ea7692436303, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-3584095163756711014 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: isWalk + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 123349700110745945} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.9820574 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Women-01 + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: isWalk + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 5646184920311110848} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &123349700110745945 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Walking + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 2284494380324349274} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 0 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: -203655887218126122, guid: 33c62cb424def044290f5749a3e66d34, type: 3} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &2284494380324349274 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: isWalk + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5947397917592710247} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.7413793 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &5646184920311110848 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -5947397917592710247} + m_Position: {x: 420, y: 230, z: 0} + - serializedVersion: 1 + m_State: {fileID: 123349700110745945} + m_Position: {x: 570, y: 410, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -5947397917592710247} diff --git a/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.controller.meta b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.controller.meta new file mode 100644 index 00000000..015a84c2 --- /dev/null +++ b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 929b30606ed3b3544b3e3c185b9b3053 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.fbm.meta b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.fbm.meta new file mode 100644 index 00000000..c2082d55 --- /dev/null +++ b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.fbm.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c710d43be8dbf074f84302db553c254b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.fbm/3d66Model-9825864-files-1.jpg b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.fbm/3d66Model-9825864-files-1.jpg new file mode 100644 index 00000000..ac01725f Binary files /dev/null and b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.fbm/3d66Model-9825864-files-1.jpg differ diff --git a/SXElectricalInspection/Assets/MainUI/Adam/Use/操作说明.png.meta b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.fbm/3d66Model-9825864-files-1.jpg.meta similarity index 93% rename from SXElectricalInspection/Assets/MainUI/Adam/Use/操作说明.png.meta rename to SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.fbm/3d66Model-9825864-files-1.jpg.meta index e6d6a005..1724cc73 100644 --- a/SXElectricalInspection/Assets/MainUI/Adam/Use/操作说明.png.meta +++ b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.fbm/3d66Model-9825864-files-1.jpg.meta @@ -1,12 +1,12 @@ fileFormatVersion: 2 -guid: fa0c8ad8e6ffc06498c0da332c908fd3 +guid: 88d0414c9e7584441943afc141654c72 TextureImporter: internalIDToNameTable: [] externalObjects: {} serializedVersion: 12 mipmaps: mipMapMode: 0 - enableMipMap: 0 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -36,13 +36,13 @@ TextureImporter: filterMode: 1 aniso: 1 mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 lightmap: 0 compressionQuality: 50 - spriteMode: 1 + spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -51,9 +51,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 1 + alphaIsTransparency: 0 spriteTessellationDetail: -1 - textureType: 8 + textureType: 0 textureShape: 1 singleChannelComponent: 0 flipbookRows: 1 @@ -131,7 +131,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 5e97eb03825dee720800000000000000 + spriteID: internalID: 0 vertices: [] indices: diff --git a/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.fbm/3d66Model-9825864-files-2.jpg b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.fbm/3d66Model-9825864-files-2.jpg new file mode 100644 index 00000000..87296b5a Binary files /dev/null and b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.fbm/3d66Model-9825864-files-2.jpg differ diff --git a/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.fbm/3d66Model-9825864-files-2.jpg.meta b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.fbm/3d66Model-9825864-files-2.jpg.meta new file mode 100644 index 00000000..3b503492 --- /dev/null +++ b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.fbm/3d66Model-9825864-files-2.jpg.meta @@ -0,0 +1,147 @@ +fileFormatVersion: 2 +guid: 46401282a7a59f9469c8ee4f2d61359b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 1 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.fbx b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.fbx new file mode 100644 index 00000000..95fc02b3 Binary files /dev/null and b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.fbx differ diff --git a/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.fbx.meta b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.fbx.meta new file mode 100644 index 00000000..2cce5620 --- /dev/null +++ b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01.fbx.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: ee451e45686549b40aacd5af45fdb233 +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 0 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: + - 2acc773208dfe3342a32ea7692436303 + - 33c62cb424def044290f5749a3e66d34 + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01@Stand.fbx b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01@Stand.fbx new file mode 100644 index 00000000..cec3cf08 Binary files /dev/null and b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01@Stand.fbx differ diff --git a/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01@Stand.fbx.meta b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01@Stand.fbx.meta new file mode 100644 index 00000000..734b0023 --- /dev/null +++ b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01@Stand.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 2acc773208dfe3342a32ea7692436303 +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: + - first: + 74: -203655887218126122 + second: mixamo.com + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01@Walking.fbx b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01@Walking.fbx new file mode 100644 index 00000000..be6b031a Binary files /dev/null and b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01@Walking.fbx differ diff --git a/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01@Walking.fbx.meta b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01@Walking.fbx.meta new file mode 100644 index 00000000..7214d1b3 --- /dev/null +++ b/SXElectricalInspection/Assets/Art/场景_8.27/women/Women-01@Walking/Women-01@Walking.fbx.meta @@ -0,0 +1,138 @@ +fileFormatVersion: 2 +guid: 33c62cb424def044290f5749a3e66d34 +ModelImporter: + serializedVersion: 21300 + internalIDToNameTable: + - first: + 74: -203655887218126122 + second: Walking + externalObjects: {} + materials: + materialImportMode: 2 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 1 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: + - serializedVersion: 16 + name: Walking + takeName: mixamo.com + internalID: 0 + firstFrame: 0 + lastFrame: 29 + wrapMode: 0 + orientationOffsetY: 0 + level: 0 + cycleOffset: 0 + loop: 0 + hasAdditiveReferencePose: 0 + loopTime: 1 + loopBlend: 0 + loopBlendOrientation: 0 + loopBlendPositionY: 0 + loopBlendPositionXZ: 0 + keepOriginalOrientation: 0 + keepOriginalPositionY: 1 + keepOriginalPositionXZ: 0 + heightFromFeet: 0 + mirror: 0 + bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 + curves: [] + events: [] + transformMask: [] + maskType: 3 + maskSource: {instanceID: 0} + additiveReferencePoseFrame: 0 + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 1 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 2 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/SXElectricalInspection/Assets/Editor/TemplateKeyParser.cs b/SXElectricalInspection/Assets/Editor/TemplateKeyParser.cs index 36ff5275..0f9334a8 100644 --- a/SXElectricalInspection/Assets/Editor/TemplateKeyParser.cs +++ b/SXElectricalInspection/Assets/Editor/TemplateKeyParser.cs @@ -4,7 +4,7 @@ using System.IO; //============================================================ //@author YangHua //@create 2016/4/28 -//@company QianHuo +//@company Adam // //@description:把'81-C# Script-NewBehaviourScript.cs.txt'文件， // 修改里面的作者为自己的名字，覆盖到: @@ -17,7 +17,7 @@ namespace AMLab public class TemplateKeyParser : UnityEditor.AssetModificationProcessor { private static string AUTHOR = "YangHua"; - private static string COMPANY = "QianHuo"; + private static string COMPANY = "Adam"; public static void OnWillCreateAsset(string path) { //Debug.Log("TempleteKeyParser=>" + path); diff --git a/SXElectricalInspection/Assets/GuYuan/AmmeterManager/MultimeterRecovery.cs b/SXElectricalInspection/Assets/GuYuan/AmmeterManager/MultimeterRecovery.cs index f76d8036..1d13240a 100644 --- a/SXElectricalInspection/Assets/GuYuan/AmmeterManager/MultimeterRecovery.cs +++ b/SXElectricalInspection/Assets/GuYuan/AmmeterManager/MultimeterRecovery.cs @@ -18,7 +18,7 @@ public class MultimeterRecovery : MonoBehaviour // Start is called before the first frame update void Start() { - + btn = GetComponent