6.21中午提交
This commit is contained in:
parent
6a40240939
commit
e03bf24ded
|
|
@ -116,6 +116,6 @@ Material:
|
|||
m_Colors:
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _Int_E: {r: 1, g: 0, b: 0, a: 0}
|
||||
- _Int_E: {r: 0, g: 0, b: 0, a: 0}
|
||||
- _MainCol: {r: 1, g: 1, b: 1, a: 0}
|
||||
m_BuildTextureStacks: []
|
||||
|
|
|
|||
|
|
@ -4209,6 +4209,108 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 203057146}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &213721310
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 213721311}
|
||||
- component: {fileID: 213721314}
|
||||
- component: {fileID: 213721313}
|
||||
- component: {fileID: 213721312}
|
||||
m_Layer: 5
|
||||
m_Name: Canvas
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &213721311
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 213721310}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1667333432}
|
||||
m_Father: {fileID: 1641925553}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
--- !u!114 &213721312
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 213721310}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreReversedGraphics: 1
|
||||
m_BlockingObjects: 0
|
||||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
--- !u!114 &213721313
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 213721310}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_UiScaleMode: 0
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 800, y: 600}
|
||||
m_ScreenMatchMode: 0
|
||||
m_MatchWidthOrHeight: 0
|
||||
m_PhysicalUnit: 3
|
||||
m_FallbackScreenDPI: 96
|
||||
m_DefaultSpriteDPI: 96
|
||||
m_DynamicPixelsPerUnit: 1
|
||||
m_PresetInfoIsWorld: 0
|
||||
--- !u!223 &213721314
|
||||
Canvas:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 213721310}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_RenderMode: 0
|
||||
m_Camera: {fileID: 0}
|
||||
m_PlaneDistance: 100
|
||||
m_PixelPerfect: 0
|
||||
m_ReceivesEvents: 1
|
||||
m_OverrideSorting: 0
|
||||
m_OverridePixelPerfect: 0
|
||||
m_SortingBucketNormalizedSize: 0
|
||||
m_VertexColorAlwaysGammaSpace: 0
|
||||
m_AdditionalShaderChannelsFlag: 0
|
||||
m_UpdateRectTransformForStandalone: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingOrder: 0
|
||||
m_TargetDisplay: 0
|
||||
--- !u!1 &214295990
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -26723,12 +26825,8 @@ MonoBehaviour:
|
|||
returnButton: {fileID: 148255496}
|
||||
originalPosition: {x: 0, y: 0, z: 0}
|
||||
originalRotation: {x: 0, y: 0, z: 0, w: 0}
|
||||
- toolObject: {fileID: 0}
|
||||
returnButton: {fileID: 0}
|
||||
originalPosition: {x: 0, y: 0, z: 0}
|
||||
originalRotation: {x: 0, y: 0, z: 0, w: 0}
|
||||
- toolObject: {fileID: 0}
|
||||
returnButton: {fileID: 0}
|
||||
- toolObject: {fileID: 1641925554}
|
||||
returnButton: {fileID: 1667333433}
|
||||
originalPosition: {x: 0, y: 0, z: 0}
|
||||
originalRotation: {x: 0, y: 0, z: 0, w: 0}
|
||||
- toolObject: {fileID: 1112936940}
|
||||
|
|
@ -29249,6 +29347,107 @@ MeshFilter:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1631356736}
|
||||
m_Mesh: {fileID: 4300000, guid: fd764d7ff467f8a47bf0105bd3bdb236, type: 3}
|
||||
--- !u!1001 &1641925552
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 6121626523118833240}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1245463814537934017, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0.3846
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1245463814537934017, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -0.2823
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1245463814537934017, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0.5921
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1245463814537934017, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1245463814537934017, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1245463814537934017, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.8233841
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1245463814537934017, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.56748456
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1245463814537934017, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 69.15
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1245463814537934017, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: -180
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1245463814537934017, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1874366132397452923, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: "\u9A8C\u7535\u7B14"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1874366132397452923, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6531800841171930545, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7308894285963904777, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects:
|
||||
- {fileID: 2637669136938480617, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
|
||||
m_AddedGameObjects:
|
||||
- targetCorrespondingSourceObject: {fileID: 1245463814537934017, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 213721311}
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 1874366132397452923, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 1641925555}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
|
||||
--- !u!4 &1641925553 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1245463814537934017, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
|
||||
m_PrefabInstance: {fileID: 1641925552}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1641925554 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1874366132397452923, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
|
||||
m_PrefabInstance: {fileID: 1641925552}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1641925555
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1641925554}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: e7e0e7630b9f8594b89a4a19d0288949, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
ElectricCheckPenOBJ: {fileID: 1641925554}
|
||||
ElectricCheckPenMater: {fileID: 2100000, guid: a09bcf13701d86049ac4e1219d051234, type: 2}
|
||||
ElectricalInspectionOfficeTrans: {fileID: 707065182}
|
||||
--- !u!1 &1642999859
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -29671,6 +29870,127 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1665602697}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1667333431
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1667333432}
|
||||
- component: {fileID: 1667333435}
|
||||
- component: {fileID: 1667333434}
|
||||
- component: {fileID: 1667333433}
|
||||
m_Layer: 5
|
||||
m_Name: "\u6536\u56DE\u5DE5\u5177Btn"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &1667333432
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1667333431}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -0.000039062514}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1728420852}
|
||||
m_Father: {fileID: 213721311}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: -50, y: 175}
|
||||
m_SizeDelta: {x: 72, y: 72}
|
||||
m_Pivot: {x: 1, y: 0}
|
||||
--- !u!114 &1667333433
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1667333431}
|
||||
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: 1667333434}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!114 &1667333434
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1667333431}
|
||||
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: 04b39ad12990ffa4d84537b19ed62db4, 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 &1667333435
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1667333431}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!137 &1667639329 stripped
|
||||
SkinnedMeshRenderer:
|
||||
m_CorrespondingSourceObject: {fileID: 2173401333977064291, guid: 8a244cdd2f00e534aadd2512c3bbfda1, type: 3}
|
||||
|
|
@ -30950,6 +31270,85 @@ CanvasRenderer:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1726098491}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1728420851
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1728420852}
|
||||
- component: {fileID: 1728420854}
|
||||
- component: {fileID: 1728420853}
|
||||
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 &1728420852
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1728420851}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0.000039062514}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1667333432}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: -8}
|
||||
m_SizeDelta: {x: 72, y: 27}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &1728420853
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1728420851}
|
||||
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: 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_FontData:
|
||||
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_FontSize: 18
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 1
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: "\u6536\u56DE\u5DE5\u5177"
|
||||
--- !u!222 &1728420854
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1728420851}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1733212811
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -32895,18 +33294,18 @@ MonoBehaviour:
|
|||
- {fileID: 1422411946}
|
||||
- {fileID: 895989071}
|
||||
- {fileID: 4441233656616589336}
|
||||
- {fileID: 0}
|
||||
- {fileID: 1641925554}
|
||||
- {fileID: 1112936940}
|
||||
- {fileID: 588400109}
|
||||
- {fileID: 1485260145}
|
||||
- {fileID: 2018635915}
|
||||
RetractBtn:
|
||||
- {fileID: 148255496}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 0}
|
||||
- {fileID: 1667333433}
|
||||
- {fileID: 398533227}
|
||||
- {fileID: 1869768458}
|
||||
- {fileID: 156402808}
|
||||
- {fileID: 587729411}
|
||||
--- !u!114 &1810323354
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -229739,6 +230138,7 @@ Transform:
|
|||
- {fileID: 2121596293}
|
||||
- {fileID: 1146142254}
|
||||
- {fileID: 1469111733}
|
||||
- {fileID: 1641925553}
|
||||
- {fileID: 4441233656616589335}
|
||||
- {fileID: 895989075}
|
||||
- {fileID: 1112936941}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,9 @@ using DefaultNamespace.ProcessMode;
|
|||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
/// <summary>
|
||||
/// 点击背包中的工具场景出现
|
||||
/// </summary>
|
||||
public class ToolManager : MonoBehaviour
|
||||
{
|
||||
//public GameObject toolPrefab; // 要生成的工具预制体
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@ public class ElectricCheckPen : MonoBehaviour
|
|||
public GameObject ElectricCheckPenOBJ;
|
||||
|
||||
/// <summary>
|
||||
/// ŃéľçąĘąíĂć
|
||||
/// ŃéľçąĘąíĂć˛ÄÖĘ
|
||||
/// </summary>
|
||||
public SpriteRenderer ElectricCheckPenSpr;
|
||||
public Material ElectricCheckPenMater;
|
||||
|
||||
/// <summary>
|
||||
/// 是否在手上
|
||||
|
|
@ -39,7 +39,7 @@ public class ElectricCheckPen : MonoBehaviour
|
|||
//public GameObject PlayerCamera;
|
||||
void Start()
|
||||
{
|
||||
|
||||
ElectricCheckPenMater.SetColor("Int_E", Color.red);
|
||||
}
|
||||
/// <summary>
|
||||
/// 插座带电，电箱不带电
|
||||
|
|
@ -87,11 +87,11 @@ public class ElectricCheckPen : MonoBehaviour
|
|||
{
|
||||
ElectricCheckPenOBJ.gameObject.transform.DOLocalMove(ElectricalInspectionOfficeTrans.gameObject.transform.localPosition, 1f).OnComplete(() =>
|
||||
{
|
||||
ElectricCheckPenOBJ.gameObject.transform.DOLocalRotate(new Vector3(20.78f, 72.47f, 171.503f), 1.5f).OnComplete(() =>
|
||||
{
|
||||
//ElectricCheckPenOBJ.gameObject.transform.DOLocalRotate(new Vector3(20.78f, 72.47f, 171.503f), 1.5f).OnComplete(() =>
|
||||
//{
|
||||
Debug.Log("123");
|
||||
Warninglight();
|
||||
});
|
||||
//});
|
||||
});
|
||||
yield return null;
|
||||
}
|
||||
|
|
@ -102,12 +102,16 @@ public class ElectricCheckPen : MonoBehaviour
|
|||
/// <returns></returns>
|
||||
async void Warninglight()
|
||||
{
|
||||
ElectricCheckPenSpr.color = new Color(255, 0, 0);
|
||||
ElectricCheckPenMater.SetColor("Int_E",Color.red);
|
||||
//ElectricCheckPenSpr.color = new Color(255, 0, 0);
|
||||
await Task.Delay(TimeSpan.FromSeconds(0.5f));
|
||||
ElectricCheckPenSpr.color = new Color(166, 183, 213);
|
||||
ElectricCheckPenMater.SetColor("Int_E", Color.white);
|
||||
//ElectricCheckPenSpr.color = new Color(166, 183, 213);
|
||||
await Task.Delay(TimeSpan.FromSeconds(0.5f));
|
||||
ElectricCheckPenSpr.color = new Color(255, 0, 0);
|
||||
ElectricCheckPenMater.SetColor("Int_E", Color.red);
|
||||
//ElectricCheckPenSpr.color = new Color(255, 0, 0);
|
||||
await Task.Delay(TimeSpan.FromSeconds(0.5f));
|
||||
ElectricCheckPenSpr.color = new Color(166, 183, 213);
|
||||
ElectricCheckPenMater.SetColor("Int_E", Color.white);
|
||||
//ElectricCheckPenSpr.color = new Color(166, 183, 213);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ public class TooslManager : MonoBehaviour
|
|||
// 保存每个工具的原始位置和旋转
|
||||
tool.originalPosition = tool.toolObject.transform.localPosition;
|
||||
tool.originalRotation = tool.toolObject.transform.localRotation;
|
||||
|
||||
Debug.Log("第一个位置："+ tool.originalPosition);
|
||||
// 为每个按钮添加点击事件
|
||||
tool.returnButton.onClick.AddListener(ResetAllTools);
|
||||
}
|
||||
|
|
@ -52,10 +52,11 @@ public class TooslManager : MonoBehaviour
|
|||
{
|
||||
foreach (var tool in tools)
|
||||
{
|
||||
tool.toolObject.transform.SetParent(PlayercameraTrans.transform);
|
||||
tool.toolObject.transform.localPosition = tool.originalPosition;
|
||||
tool.toolObject.transform.localRotation = tool.originalRotation;
|
||||
tool.toolObject.SetActive(false);
|
||||
tool.toolObject.transform.SetParent(PlayercameraTrans.transform);
|
||||
Debug.Log("第二个位置：" + tool.originalPosition);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue