This commit is contained in:
parent
3b8e990f59
commit
b20fab1d5c
|
@ -0,0 +1,132 @@
|
|||
%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: "\u9A8C\u7535\u7B14\u5C4F\u5E55"
|
||||
m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
|
||||
m_ValidKeywords: []
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap:
|
||||
RenderType: Opaque
|
||||
disabledShaderPasses: []
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs:
|
||||
- _BaseMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _BumpMap:
|
||||
m_Texture: {fileID: 0}
|
||||
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: 0}
|
||||
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}
|
||||
- unity_Lightmaps:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- unity_LightmapsInd:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- unity_ShadowMasks:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Ints: []
|
||||
m_Floats:
|
||||
- _AlphaClip: 0
|
||||
- _Blend: 0
|
||||
- _BlendOp: 0
|
||||
- _BumpScale: 1
|
||||
- _ClearCoatMask: 0
|
||||
- _ClearCoatSmoothness: 0
|
||||
- _Cull: 2
|
||||
- _Cutoff: 0.5
|
||||
- _DetailAlbedoMapScale: 1
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 0
|
||||
- _EnvironmentReflections: 1
|
||||
- _GlossMapScale: 0
|
||||
- _Glossiness: 0
|
||||
- _GlossinessSource: 0
|
||||
- _GlossyReflections: 0
|
||||
- _Metallic: 0
|
||||
- _OcclusionStrength: 1
|
||||
- _Parallax: 0.005
|
||||
- _QueueOffset: 0
|
||||
- _ReceiveShadows: 0
|
||||
- _SampleGI: 0
|
||||
- _Shininess: 0
|
||||
- _Smoothness: 0
|
||||
- _SmoothnessSource: 0
|
||||
- _SmoothnessTextureChannel: 0
|
||||
- _SpecSource: 0
|
||||
- _SpecularHighlights: 1
|
||||
- _SrcBlend: 1
|
||||
- _Surface: 0
|
||||
- _WorkflowMode: 1
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 1367.1202, g: 1367.1202, b: 1367.1202, a: 1}
|
||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||
m_BuildTextureStacks: []
|
||||
--- !u!114 &7252601533216176598
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 11
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
version: 5
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f580bf4bce995264b8f780f3a239d3d1
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -203,7 +203,7 @@ Material:
|
|||
- _UVSec: 0
|
||||
- _UseAoMap: 0
|
||||
- _UseColorMap: 1
|
||||
- _UseEmissiveMap: 0
|
||||
- _UseEmissiveMap: 1
|
||||
- _UseMetallicMap: 0
|
||||
- _UseNormalMap: 0
|
||||
- _UseRoughnessMap: 0
|
||||
|
@ -211,7 +211,7 @@ Material:
|
|||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _Color: {r: 0.8679245, g: 0.8679245, b: 0.8679245, a: 1}
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _Flip: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _HueVariation: {r: 1, g: 0.5, b: 0, a: 0.1}
|
||||
|
|
|
@ -235,7 +235,7 @@ MonoBehaviour:
|
|||
seeThroughTexture: {fileID: 0}
|
||||
seeThroughTextureUVSpace: 0
|
||||
seeThroughTextureScale: 1
|
||||
rmsCount: 1
|
||||
rmsCount: 2
|
||||
hitFxInitialIntensity: 0
|
||||
hitFxMode: 0
|
||||
hitFxFadeOutDuration: 0.25
|
||||
|
@ -254,6 +254,105 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
toolType: 3
|
||||
screem: {fileID: 2465643204263011842}
|
||||
--- !u!1 &6963989103699611485
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 369494497360900419}
|
||||
- component: {fileID: 7907263493084928653}
|
||||
- component: {fileID: 2465643204263011842}
|
||||
- component: {fileID: 5202113740305358043}
|
||||
m_Layer: 0
|
||||
m_Name: screem
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &369494497360900419
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6963989103699611485}
|
||||
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
|
||||
m_LocalPosition: {x: 0.00005, y: 0.00779, z: -0.015628}
|
||||
m_LocalScale: {x: 0.013402447, y: 0.036170427, z: 0.22218}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 2284156411273685982}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
|
||||
--- !u!33 &7907263493084928653
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6963989103699611485}
|
||||
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!23 &2465643204263011842
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6963989103699611485}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 0
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: f580bf4bce995264b8f780f3a239d3d1, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!64 &5202113740305358043
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6963989103699611485}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
m_Convex: 0
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!1001 &1745229904814492725
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -4,6 +4,7 @@ using UnityEngine;
|
|||
|
||||
public class Device_Base : MonoBehaviour
|
||||
{
|
||||
public int triggerId;
|
||||
/// <summary>
|
||||
/// 设备类型
|
||||
/// </summary>
|
||||
|
|
|
@ -16,9 +16,14 @@ public class Device_CabinetDoor : Device_Base
|
|||
/// ·âÓ¡
|
||||
/// </summary>
|
||||
public Device_Seal seal;
|
||||
|
||||
/// <summary>
|
||||
/// 是否打开
|
||||
/// </summary>
|
||||
public bool isOpen;
|
||||
|
||||
/// <summary>
|
||||
/// 是否带点
|
||||
/// </summary>
|
||||
public bool hasElectricity;
|
||||
public void Open()
|
||||
{
|
||||
Debug.Log("¿ªÃÅ");
|
||||
|
|
|
@ -11,4 +11,9 @@ public class Device_Socket : Device_Base
|
|||
/// ÑéµçλÖÃ
|
||||
/// </summary>
|
||||
public Transform testPosAndRot;
|
||||
/// <summary>
|
||||
/// 是否带电
|
||||
/// </summary>
|
||||
|
||||
public bool hasElectricity;
|
||||
}
|
||||
|
|
|
@ -7,6 +7,7 @@ using UnityEngine;
|
|||
/// </summary>
|
||||
public class Tool_Base : MonoBehaviour
|
||||
{
|
||||
public int triggerId;
|
||||
/// <summary>
|
||||
/// 묏야잚謹
|
||||
/// </summary>
|
||||
|
|
|
@ -21,7 +21,10 @@ public class Tool_Screw : Tool_Base
|
|||
/// 上螺丝位置
|
||||
/// </summary>
|
||||
public Transform installPos;
|
||||
|
||||
/// <summary>
|
||||
/// 是否带点
|
||||
/// </summary>
|
||||
public bool hasElectricity;
|
||||
|
||||
/// <summary>
|
||||
/// 螺丝拧紧时的位置
|
||||
|
@ -33,6 +36,10 @@ public class Tool_Screw : Tool_Base
|
|||
private float localYUnInstallValue;
|
||||
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
id = gameObject.name;
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
|
@ -49,6 +56,7 @@ public class Tool_Screw : Tool_Base
|
|||
{
|
||||
transform.RotateAroundLocal(Vector3.up, 1);
|
||||
screwdriver.transform.position = installPos.position;
|
||||
screwdriver.transform.eulerAngles = transform.eulerAngles;
|
||||
})
|
||||
.OnComplete(() =>
|
||||
{
|
||||
|
|
|
@ -7,6 +7,12 @@ using UnityEngine;
|
|||
/// </summary>
|
||||
public class Tool_TestPen : Tool_Base
|
||||
{
|
||||
public MeshRenderer screem;
|
||||
/// <summary>
|
||||
/// ÊÇ·ñÉÁ˸
|
||||
/// </summary>
|
||||
private bool isFlicker;
|
||||
private float time;
|
||||
|
||||
private void Update()
|
||||
{
|
||||
|
@ -33,6 +39,23 @@ public class Tool_TestPen : Tool_Base
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(isFlicker)
|
||||
{
|
||||
time += Time.deltaTime;
|
||||
if (time < 1)
|
||||
{
|
||||
screem.materials[0].color = Color.red;
|
||||
}
|
||||
else if(time>1 && time<2)
|
||||
{
|
||||
screem.materials[0].color = Color.white;
|
||||
}
|
||||
else
|
||||
{
|
||||
time = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 执行验电操作
|
||||
|
@ -47,6 +70,7 @@ public class Tool_TestPen : Tool_Base
|
|||
transform.position = tmp.testPosAndRot.position;
|
||||
transform.eulerAngles = tmp.testPosAndRot.eulerAngles;
|
||||
Debug.Log("计量柜_插座 已验电");
|
||||
isFlicker = tmp.hasElectricity;
|
||||
}
|
||||
else if(device_base.deviceType == DeviceType.计量柜_柜门)
|
||||
{
|
||||
|
@ -55,6 +79,7 @@ public class Tool_TestPen : Tool_Base
|
|||
transform.position = tmp.testPosAndRot.position;
|
||||
transform.eulerAngles = tmp.testPosAndRot.eulerAngles;
|
||||
Debug.Log("计量柜_柜门 已验电");
|
||||
isFlicker = tmp.hasElectricity;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -71,6 +96,9 @@ public class Tool_TestPen : Tool_Base
|
|||
transform.position = tmp.installPos.position;
|
||||
transform.eulerAngles = tmp.installPos.eulerAngles;
|
||||
Debug.Log("螺丝 已验电");
|
||||
isFlicker = tmp.hasElectricity;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue