加入划线测量
This commit is contained in:
parent
3d80ed9e62
commit
cf881a3448
File diff suppressed because one or more lines are too long
|
|
@ -214,7 +214,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 5
|
||||
value: 6
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
|
@ -867,7 +867,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &296597871
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -881,7 +881,7 @@ Transform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 8
|
||||
m_RootOrder: 9
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &511699527 stripped
|
||||
GameObject:
|
||||
|
|
@ -1211,7 +1211,7 @@ Transform:
|
|||
- {fileID: 536866439}
|
||||
- {fileID: 531917099}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 7
|
||||
m_RootOrder: 8
|
||||
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
|
||||
--- !u!1001 &649240898
|
||||
PrefabInstance:
|
||||
|
|
@ -1268,6 +1268,10 @@ PrefabInstance:
|
|||
propertyPath: m_Name
|
||||
value: "\u6559\u5E08\uFF08\u5F85\u673A\u52A8\u753B\uFF09"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7751996367803956135, guid: 7b9fb3597fb5dc04faa55be08321ef65, type: 3}
|
||||
propertyPath: m_Materials.Array.data[4]
|
||||
value:
|
||||
|
|
@ -1478,7 +1482,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
triggerID: 0
|
||||
triggerName: "NPC\u5BA2\u6237"
|
||||
triggerName: "NPC\u5BA2\u62371"
|
||||
_highlight: {fileID: 649240901}
|
||||
spriteRenderer: {fileID: 0}
|
||||
animator: {fileID: 0}
|
||||
|
|
@ -1717,6 +1721,275 @@ MeshCollider:
|
|||
m_Convex: 0
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: -5782805542738625266, guid: 543377e480fab384db837fbf32857c2e, type: 3}
|
||||
--- !u!1001 &934378349
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 8.09
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 2.1927092
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -139.08707
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: "\u6559\u5E08\uFF08\u5E26\u4F38\u624B\u52A8\u753B\uFF09"
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3}
|
||||
--- !u!1 &934378350 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 61f2e702b0539e24fbb6214a8b00d1c9, type: 3}
|
||||
m_PrefabInstance: {fileID: 934378349}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &934378351
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 934378350}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ba76b9e47a61d284eac9cba888792ed9, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
triggerID: 0
|
||||
triggerName: "NPC\u5BA2\u6237"
|
||||
_highlight: {fileID: 934378352}
|
||||
spriteRenderer: {fileID: 0}
|
||||
animator: {fileID: 0}
|
||||
animatorParameters:
|
||||
target: {fileID: 267617285}
|
||||
minDistance: 2
|
||||
isClose: 0
|
||||
--- !u!114 &934378352
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 934378350}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 888380afc233049ce9e618f9f36c8ba8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
profile: {fileID: 0}
|
||||
profileSync: 0
|
||||
camerasLayerMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
effectGroup: 0
|
||||
effectGroupLayer:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
effectNameFilter:
|
||||
combineMeshes: 0
|
||||
alphaCutOff: 0
|
||||
cullBackFaces: 1
|
||||
ignoreObjectVisibility: 0
|
||||
reflectionProbes: 0
|
||||
GPUInstancing: 1
|
||||
optimizeSkinnedMesh: 1
|
||||
depthClip: 0
|
||||
cameraDistanceFade: 0
|
||||
cameraDistanceFadeNear: 0
|
||||
cameraDistanceFadeFar: 1000
|
||||
normalsOption: 0
|
||||
ignore: 0
|
||||
_highlighted: 0
|
||||
fadeInDuration: 0
|
||||
fadeOutDuration: 0
|
||||
flipY: 0
|
||||
constantWidth: 1
|
||||
subMeshMask: -1
|
||||
overlay: 0
|
||||
overlayMode: 0
|
||||
overlayColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
|
||||
overlayAnimationSpeed: 1
|
||||
overlayMinIntensity: 0.5
|
||||
overlayBlending: 1
|
||||
overlayTexture: {fileID: 0}
|
||||
overlayTextureUVSpace: 0
|
||||
overlayTextureScale: 1
|
||||
overlayVisibility: 0
|
||||
outline: 1
|
||||
outlineColor: {r: 0.36862746, g: 0.7490196, b: 0.16862746, a: 1}
|
||||
outlineColorStyle: 0
|
||||
outlineGradient:
|
||||
serializedVersion: 2
|
||||
key0: {r: 1, g: 1, b: 1, a: 1}
|
||||
key1: {r: 1, g: 1, b: 1, a: 1}
|
||||
key2: {r: 0, g: 0, b: 0, a: 0}
|
||||
key3: {r: 0, g: 0, b: 0, a: 0}
|
||||
key4: {r: 0, g: 0, b: 0, a: 0}
|
||||
key5: {r: 0, g: 0, b: 0, a: 0}
|
||||
key6: {r: 0, g: 0, b: 0, a: 0}
|
||||
key7: {r: 0, g: 0, b: 0, a: 0}
|
||||
ctime0: 0
|
||||
ctime1: 65535
|
||||
ctime2: 0
|
||||
ctime3: 0
|
||||
ctime4: 0
|
||||
ctime5: 0
|
||||
ctime6: 0
|
||||
ctime7: 0
|
||||
atime0: 0
|
||||
atime1: 65535
|
||||
atime2: 0
|
||||
atime3: 0
|
||||
atime4: 0
|
||||
atime5: 0
|
||||
atime6: 0
|
||||
atime7: 0
|
||||
m_Mode: 0
|
||||
m_NumColorKeys: 2
|
||||
m_NumAlphaKeys: 2
|
||||
outlineGradientInLocalSpace: 0
|
||||
outlineWidth: 0.45
|
||||
outlineBlurPasses: 2
|
||||
outlineQuality: 3
|
||||
outlineEdgeMode: 0
|
||||
outlineEdgeThreshold: 0.995
|
||||
outlineDownsampling: 1
|
||||
outlineVisibility: 0
|
||||
glowBlendMode: 0
|
||||
outlineBlitDebug: 0
|
||||
outlineIndependent: 0
|
||||
outlineContourStyle: 0
|
||||
glow: 0
|
||||
glowWidth: 0.4
|
||||
glowQuality: 3
|
||||
glowBlurMethod: 0
|
||||
glowDownsampling: 2
|
||||
glowHQColor: {r: 0.64, g: 1, b: 0, a: 1}
|
||||
glowDithering: 1
|
||||
glowMagicNumber1: 0.75
|
||||
glowMagicNumber2: 0.5
|
||||
glowAnimationSpeed: 1
|
||||
glowVisibility: 0
|
||||
glowBlitDebug: 0
|
||||
glowBlendPasses: 1
|
||||
glowPasses:
|
||||
- offset: 4
|
||||
alpha: 0.1
|
||||
color: {r: 0.64, g: 1, b: 0, a: 1}
|
||||
- offset: 3
|
||||
alpha: 0.2
|
||||
color: {r: 0.64, g: 1, b: 0, a: 1}
|
||||
- offset: 2
|
||||
alpha: 0.3
|
||||
color: {r: 0.64, g: 1, b: 0, a: 1}
|
||||
- offset: 1
|
||||
alpha: 0.4
|
||||
color: {r: 0.64, g: 1, b: 0, a: 1}
|
||||
glowIgnoreMask: 0
|
||||
innerGlow: 0
|
||||
innerGlowWidth: 1
|
||||
innerGlowColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
innerGlowBlendMode: 0
|
||||
innerGlowVisibility: 0
|
||||
targetFX: 0
|
||||
targetFXTexture: {fileID: 0}
|
||||
targetFXColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
targetFXCenter: {fileID: 0}
|
||||
targetFXRotationSpeed: 50
|
||||
targetFXInitialScale: 4
|
||||
targetFXEndScale: 1.5
|
||||
targetFXScaleToRenderBounds: 1
|
||||
targetFXAlignToGround: 0
|
||||
targetFXFadePower: 32
|
||||
targetFXGroundMaxDistance: 10
|
||||
targetFXGroundLayerMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
targetFXTransitionDuration: 0.5
|
||||
targetFXStayDuration: 1.5
|
||||
targetFXVisibility: 1
|
||||
seeThrough: 2
|
||||
seeThroughOccluderMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
seeThroughOccluderThreshold: 0.3
|
||||
seeThroughOccluderMaskAccurate: 0
|
||||
seeThroughOccluderCheckInterval: 1
|
||||
seeThroughOccluderCheckIndividualObjects: 0
|
||||
seeThroughDepthOffset: 0
|
||||
seeThroughMaxDepth: 0
|
||||
seeThroughIntensity: 0.8
|
||||
seeThroughTintAlpha: 0.5
|
||||
seeThroughTintColor: {r: 1, g: 0, b: 0, a: 1}
|
||||
seeThroughNoise: 1
|
||||
seeThroughBorder: 0
|
||||
seeThroughBorderColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
seeThroughBorderOnly: 0
|
||||
seeThroughBorderWidth: 0.45
|
||||
seeThroughOrdered: 0
|
||||
seeThroughTexture: {fileID: 0}
|
||||
seeThroughTextureUVSpace: 0
|
||||
seeThroughTextureScale: 1
|
||||
rmsCount: 1
|
||||
hitFxInitialIntensity: 0
|
||||
hitFxMode: 0
|
||||
hitFxFadeOutDuration: 0.25
|
||||
hitFxColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
hitFxRadius: 0.5
|
||||
--- !u!136 &934378353
|
||||
CapsuleCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 934378350}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
m_Radius: 0.3
|
||||
m_Height: 1.8
|
||||
m_Direction: 1
|
||||
m_Center: {x: 0, y: 0.87, z: 0}
|
||||
--- !u!64 &937563448
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2365,7 +2638,7 @@ PrefabInstance:
|
|||
m_Modifications:
|
||||
- target: {fileID: -8679921383154817045, guid: bb9c532ae1143d34d8245bbea5f5ce9b, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 4
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: bb9c532ae1143d34d8245bbea5f5ce9b, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
|
@ -3342,7 +3615,7 @@ Transform:
|
|||
- {fileID: 1902030985}
|
||||
- {fileID: 1567901898}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 6
|
||||
m_RootOrder: 7
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &1974951224
|
||||
PrefabInstance:
|
||||
|
|
@ -5359,7 +5632,7 @@ PrefabInstance:
|
|||
m_Modifications:
|
||||
- target: {fileID: -8679921383154817045, guid: 543377e480fab384db837fbf32857c2e, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 3
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 543377e480fab384db837fbf32857c2e, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
|
|
|||
|
|
@ -20,35 +20,77 @@ MonoBehaviour:
|
|||
combineMeshes: 0
|
||||
alphaCutOff: 0
|
||||
cullBackFaces: 1
|
||||
depthClip: 0
|
||||
normalsOption: 0
|
||||
fadeInDuration: 0
|
||||
fadeOutDuration: 0
|
||||
cameraDistanceFade: 0
|
||||
cameraDistanceFadeNear: 0
|
||||
cameraDistanceFadeFar: 1000
|
||||
constantWidth: 1
|
||||
overlay: 0
|
||||
overlayMode: 0
|
||||
overlayColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
|
||||
overlayAnimationSpeed: 1
|
||||
overlayMinIntensity: 0.5
|
||||
overlayBlending: 1
|
||||
overlayTexture: {fileID: 0}
|
||||
overlayTextureUVSpace: 0
|
||||
overlayTextureScale: 1
|
||||
overlayVisibility: 0
|
||||
outline: 1
|
||||
outlineColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
outlineColor: {r: 0.69447935, g: 1, b: 0, a: 1}
|
||||
outlineColorStyle: 0
|
||||
outlineGradient:
|
||||
serializedVersion: 2
|
||||
key0: {r: 1, g: 1, b: 1, a: 1}
|
||||
key1: {r: 1, g: 1, b: 1, a: 1}
|
||||
key2: {r: 0, g: 0, b: 0, a: 0}
|
||||
key3: {r: 0, g: 0, b: 0, a: 0}
|
||||
key4: {r: 0, g: 0, b: 0, a: 0}
|
||||
key5: {r: 0, g: 0, b: 0, a: 0}
|
||||
key6: {r: 0, g: 0, b: 0, a: 0}
|
||||
key7: {r: 0, g: 0, b: 0, a: 0}
|
||||
ctime0: 0
|
||||
ctime1: 65535
|
||||
ctime2: 0
|
||||
ctime3: 0
|
||||
ctime4: 0
|
||||
ctime5: 0
|
||||
ctime6: 0
|
||||
ctime7: 0
|
||||
atime0: 0
|
||||
atime1: 65535
|
||||
atime2: 0
|
||||
atime3: 0
|
||||
atime4: 0
|
||||
atime5: 0
|
||||
atime6: 0
|
||||
atime7: 0
|
||||
m_Mode: 0
|
||||
m_NumColorKeys: 2
|
||||
m_NumAlphaKeys: 2
|
||||
outlineGradientInLocalSpace: 0
|
||||
outlineBlurPasses: 2
|
||||
outlineWidth: 1.5
|
||||
outlineQuality: 1
|
||||
outlineEdgeMode: 0
|
||||
outlineEdgeThreshold: 0.995
|
||||
outlineDownsampling: 2
|
||||
outlineOptimalBlit: 1
|
||||
outlineContourStyle: 0
|
||||
outlineVisibility: 0
|
||||
outlineIndependent: 0
|
||||
glow: 1
|
||||
glowWidth: 0.5
|
||||
glowQuality: 1
|
||||
glowBlurMethod: 0
|
||||
glowDownsampling: 2
|
||||
glowHQColor: {r: 0.64, g: 1, b: 0, a: 1}
|
||||
glowDithering: 1
|
||||
glowOptimalBlit: 1
|
||||
glowMagicNumber1: 0.75
|
||||
glowMagicNumber2: 0.5
|
||||
glowAnimationSpeed: 1
|
||||
glowVisibility: 0
|
||||
glowBlendMode: 0
|
||||
glowBlendPasses: 1
|
||||
glowPasses:
|
||||
- offset: 4
|
||||
|
|
@ -63,8 +105,10 @@ MonoBehaviour:
|
|||
- offset: 1
|
||||
alpha: 0.4
|
||||
color: {r: 0.64, g: 1, b: 0, a: 1}
|
||||
glowIgnoreMask: 0
|
||||
innerGlow: 0.5
|
||||
innerGlowWidth: 1
|
||||
innerGlowBlendMode: 0
|
||||
innerGlowColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
innerGlowVisibility: 0
|
||||
targetFX: 0
|
||||
|
|
@ -73,6 +117,13 @@ MonoBehaviour:
|
|||
targetFXRotationSpeed: 50
|
||||
targetFXInitialScale: 4
|
||||
targetFXEndScale: 1.5
|
||||
targetFXScaleToRenderBounds: 0
|
||||
targetFXAlignToGround: 0
|
||||
targetFXGroundMaxDistance: 15
|
||||
targetFXGroundLayerMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
targetFXFadePower: 32
|
||||
targetFXTransitionDuration: 0.5
|
||||
targetFXStayDuration: 1.5
|
||||
targetFXVisibility: 1
|
||||
|
|
@ -80,8 +131,12 @@ MonoBehaviour:
|
|||
seeThroughOccluderMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
seeThroughOccluderMaskAccurate: 0
|
||||
seeThroughOccluderThreshold: 0.4
|
||||
seeThroughOccluderCheckInterval: 1
|
||||
seeThroughOccluderCheckIndividualObjects: 0
|
||||
seeThroughDepthOffset: 0
|
||||
seeThroughMaxDepth: 0
|
||||
seeThroughIntensity: 0.8
|
||||
seeThroughTintAlpha: 0.5
|
||||
seeThroughTintColor: {r: 1, g: 0, b: 0, a: 1}
|
||||
|
|
@ -89,3 +144,13 @@ MonoBehaviour:
|
|||
seeThroughBorder: 0
|
||||
seeThroughBorderColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
seeThroughBorderWidth: 0.45
|
||||
seeThroughBorderOnly: 0
|
||||
seeThroughOrdered: 0
|
||||
seeThroughTexture: {fileID: 0}
|
||||
seeThroughTextureUVSpace: 0
|
||||
seeThroughTextureScale: 1
|
||||
hitFxInitialIntensity: 0
|
||||
hitFxMode: 0
|
||||
hitFxFadeOutDuration: 0.25
|
||||
hitFxColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
hitFxRadius: 0.5
|
||||
|
|
|
|||
|
|
@ -1,5 +1,36 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &65285950724923400
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 869638176128357979}
|
||||
m_Layer: 0
|
||||
m_Name: lowPoint
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &869638176128357979
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 65285950724923400}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -0.13300323}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 963909014448707086}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &963909014448707081
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -32,6 +63,8 @@ Transform:
|
|||
m_Children:
|
||||
- {fileID: 786660271097455140}
|
||||
- {fileID: 786660271681591661}
|
||||
- {fileID: 869638176128357979}
|
||||
- {fileID: 2271436771247917081}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -67,6 +100,37 @@ BoxCollider:
|
|||
serializedVersion: 2
|
||||
m_Size: {x: 0.5, y: 2, z: 0.5}
|
||||
m_Center: {x: 0, y: 1, z: 0}
|
||||
--- !u!1 &5495461739195588011
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2271436771247917081}
|
||||
m_Layer: 0
|
||||
m_Name: highPoint
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &2271436771247917081
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5495461739195588011}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 2.117, z: -0.133}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 963909014448707086}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &963909013790211718
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -741,7 +741,7 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: "\u5DE5\u4F5C\u7968"
|
||||
m_text: "\u6D4B\u91CF"
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 9ea913af302bbdf42a9f003451c70e02, type: 2}
|
||||
m_sharedMaterial: {fileID: 4239875615288461448, guid: 9ea913af302bbdf42a9f003451c70e02, type: 2}
|
||||
|
|
@ -2939,7 +2939,7 @@ MonoBehaviour:
|
|||
TerminalTestFormBtn: {fileID: 0}
|
||||
countDown: 0
|
||||
menuBar: {fileID: 6616835143412438853}
|
||||
workOrderName: "\u5DE5\u4F5C\u7968\u6309\u94AE"
|
||||
workOrderName: "\u6D4B\u91CF\u6309\u94AE"
|
||||
disassemblyAssemblyWorkOrderName: "\u62C6\u88C5\u5DE5\u5355\u6309\u94AE"
|
||||
toolKitName: "\u80CC\u5305\u6309\u94AE"
|
||||
siteName: "\u73B0\u573A\u6309\u94AE"
|
||||
|
|
|
|||
|
|
@ -26,8 +26,7 @@ public class Line : MonoBehaviour
|
|||
[Header("ÏßµÄÑÕÉ«")]
|
||||
public Color LineColor;
|
||||
[Header("³¤¶Èµ¥Î»")]
|
||||
public UnitType unittype;
|
||||
|
||||
public UnitType unittype = UnitType.cm;
|
||||
|
||||
Transform tram;
|
||||
|
||||
|
|
@ -47,8 +46,9 @@ public class Line : MonoBehaviour
|
|||
{
|
||||
tm = new GameObject("tm").AddComponent<TextMesh>();
|
||||
tm.color = Color.white;
|
||||
tm.fontSize = 2;
|
||||
tm.fontSize = 20;
|
||||
tm.transform.SetParent(this.transform);
|
||||
tm.characterSize = 0.1f;
|
||||
//tm.GetComponent<RectTransform>().sizeDelta = new Vector2(2, 1);
|
||||
//tm.alignment = TextAlignmentOptions.Center;
|
||||
}
|
||||
|
|
@ -67,6 +67,7 @@ public class Line : MonoBehaviour
|
|||
line.SetPositions(new Vector3[] { StObj.transform.position, EdObj.transform.position });
|
||||
line.startWidth = LineWidth;
|
||||
line.endWidth = LineWidth;
|
||||
|
||||
LineMat.color = LineColor;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -263,4 +263,4 @@ MonoBehaviour:
|
|||
LineWidth: 0.05
|
||||
LineMat: {fileID: 2100000, guid: d704fb960bf87f043b794a93136b57e2, type: 2}
|
||||
LineColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
unittype: 0
|
||||
unittype: 100
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using Unity.Burst.CompilerServices;
|
||||
using UnityEngine;
|
||||
|
||||
//测量距离
|
||||
|
|
@ -14,61 +15,130 @@ public class RangeFinding : MonoBehaviour
|
|||
public Transform prefabTransform; //测量的预制体
|
||||
private Transform myDistanceObj;
|
||||
public Transform allCLParentTransform; //所有预制体生成的父节点
|
||||
|
||||
protected SorghumController Sorg_posOne;
|
||||
protected SorghumController Sorg_posTwo;
|
||||
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void OnDisable()
|
||||
{
|
||||
while (allCLParentTransform.childCount > 0)
|
||||
{
|
||||
DestroyImmediate(allCLParentTransform.GetChild(0).gameObject);
|
||||
}
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
if (isClbool)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (Input.GetMouseButtonDown(0))
|
||||
{
|
||||
Ray ray1 = Camera.main.ScreenPointToRay(Input.mousePosition);
|
||||
RaycastHit hit1;
|
||||
if (Physics.Raycast(ray1, out hit1, 1000))
|
||||
{
|
||||
if (hit1.collider.gameObject.GetComponent<SorghumController>() == null)
|
||||
return;
|
||||
posOne = Input.mousePosition;
|
||||
|
||||
}
|
||||
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
|
||||
RaycastHit hit;
|
||||
else
|
||||
{
|
||||
return;
|
||||
}
|
||||
}
|
||||
Ray ray2 = Camera.main.ScreenPointToRay(Input.mousePosition);
|
||||
RaycastHit hit2;
|
||||
|
||||
//距离
|
||||
if (isOpenDistance)
|
||||
{
|
||||
if (Input.GetMouseButtonUp(0))
|
||||
{
|
||||
|
||||
posTwo = Input.mousePosition;
|
||||
if (Physics.Raycast(ray, out hit, 1000) && posOne == posTwo)
|
||||
if (Physics.Raycast(ray2, out hit2, 1000) && posOne == posTwo)
|
||||
{
|
||||
if (hit2.collider.gameObject.GetComponent<SorghumController>() == null)
|
||||
return;
|
||||
|
||||
if (distanceInt == 0)
|
||||
{
|
||||
if (allCLParentTransform.childCount > 0)
|
||||
{
|
||||
while (allCLParentTransform.childCount > 0)
|
||||
{
|
||||
DestroyImmediate(allCLParentTransform.GetChild(0).gameObject);
|
||||
}
|
||||
Sorg_posOne = null;
|
||||
Sorg_posTwo = null;
|
||||
}
|
||||
|
||||
Sorg_posOne = hit2.collider.gameObject.GetComponent<SorghumController>();
|
||||
|
||||
distanceInt++;
|
||||
//鼠标点击克隆物体
|
||||
myDistanceObj = Instantiate(prefabTransform, allCLParentTransform);
|
||||
// transform.TransformPoint(Prefab,hit.poit, Quaternion.identity);
|
||||
myDistanceObj.transform.GetChild(0).position = hit.point;
|
||||
myDistanceObj.transform.GetChild(0).position = hit2.point;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
Sorg_posTwo = hit2.collider.gameObject.GetComponent<SorghumController>();
|
||||
|
||||
myDistanceObj.transform.GetChild(1).position = hit.point;
|
||||
if (Sorg_posOne == Sorg_posTwo)
|
||||
{
|
||||
Transform low_P = Sorg_posOne.transform.Find("lowPoint");
|
||||
Transform high_P = Sorg_posOne.transform.Find("highPoint");
|
||||
myDistanceObj.transform.GetChild(0).position = low_P.position;
|
||||
myDistanceObj.transform.GetChild(1).position = high_P.position;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
Transform low_P = Sorg_posTwo.transform.Find("highPoint");
|
||||
Transform high_P = Sorg_posOne.transform.Find("highPoint");
|
||||
myDistanceObj.transform.GetChild(0).position = low_P.position;
|
||||
myDistanceObj.transform.GetChild(1).position = high_P.position;
|
||||
}
|
||||
//isOpenJL = false;
|
||||
distanceInt = 0;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
return ;
|
||||
}
|
||||
}
|
||||
if (distanceInt > 0)
|
||||
{
|
||||
if (Physics.Raycast(ray, out hit, 1000))
|
||||
if (Physics.Raycast(ray2, out hit2, 1000))
|
||||
{
|
||||
|
||||
myDistanceObj.transform.GetChild(1).position = hit.point;
|
||||
myDistanceObj.transform.GetChild(1).position = hit2.point;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (System.Exception e)
|
||||
{
|
||||
Debug.LogException(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -39,6 +39,13 @@ public class SorghumController : PermanentTriggerBase
|
|||
|
||||
protected override void OnMDown()
|
||||
{
|
||||
RangeFinding rf = OfficeManager.Instance.gameObject.GetComponent<RangeFinding>();
|
||||
if (rf != null && rf.enabled)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
GameObject targetObj = GameObject.Find("Split_Obj");
|
||||
|
||||
GameObject targetHD = targetObj.transform.GetChild(0).gameObject;
|
||||
|
|
|
|||
|
|
@ -129,13 +129,13 @@ public class PermanentTriggerBase : MonoBehaviour
|
|||
|
||||
private void OnMouseEnter()
|
||||
{
|
||||
if (!EventSystem.current.IsPointerOverGameObject()) return;
|
||||
if (EventSystem.current.IsPointerOverGameObject()) return;
|
||||
OnMEnter();
|
||||
}
|
||||
|
||||
private void OnMouseDown()
|
||||
{
|
||||
if (!EventSystem.current.IsPointerOverGameObject()) return;
|
||||
if (EventSystem.current.IsPointerOverGameObject()) return;
|
||||
OnMDown();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -266,32 +266,37 @@ public class UI_MenuBar : BasePanel
|
|||
});
|
||||
}
|
||||
break;
|
||||
case "WorkOrderBtn":
|
||||
if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(workOrderName, true) == 0)
|
||||
case "WorkOrderBtn"://工作票按钮代测量按钮
|
||||
RangeFinding rf = OfficeManager.Instance.gameObject.GetComponent<RangeFinding>();
|
||||
if (rf != null)
|
||||
{
|
||||
if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
|
||||
{
|
||||
GameManager.MissionMgr.selectedWorkTicketType = WorkTicketType.无;//学习模式重新选
|
||||
}
|
||||
switch(GameManager.MissionMgr.selectedWorkTicketType)
|
||||
{
|
||||
case WorkTicketType.无:
|
||||
GameManager.UIMgr.ShowPanel<UI_SelectWorkTicketPanel>(E_UI_Layer.Mid, (panel) =>
|
||||
{
|
||||
panel.Init(workOrderName);
|
||||
});
|
||||
break;
|
||||
case WorkTicketType.低压工作票:
|
||||
GameManager.UIMgr.ShowPanel<UI_LowTensionWorkTicketPanel>(E_UI_Layer.Mid);
|
||||
break;
|
||||
case WorkTicketType.配电第一种工作票:
|
||||
GameManager.UIMgr.ShowPanel<UI_PowerDistributionFirstWorkTicketPanel>(E_UI_Layer.Mid);
|
||||
break;
|
||||
case WorkTicketType.配电第二种工作票:
|
||||
GameManager.UIMgr.ShowPanel<UI_PowerDistributionSecondWorkTicketPanel>(E_UI_Layer.Mid);
|
||||
break;
|
||||
}
|
||||
rf.enabled = !rf.enabled;
|
||||
}
|
||||
//if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(workOrderName, true) == 0)
|
||||
//{
|
||||
// if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
|
||||
// {
|
||||
// GameManager.MissionMgr.selectedWorkTicketType = WorkTicketType.无;//学习模式重新选
|
||||
// }
|
||||
// switch(GameManager.MissionMgr.selectedWorkTicketType)
|
||||
// {
|
||||
// case WorkTicketType.无:
|
||||
// GameManager.UIMgr.ShowPanel<UI_SelectWorkTicketPanel>(E_UI_Layer.Mid, (panel) =>
|
||||
// {
|
||||
// panel.Init(workOrderName);
|
||||
// });
|
||||
// break;
|
||||
// case WorkTicketType.低压工作票:
|
||||
// GameManager.UIMgr.ShowPanel<UI_LowTensionWorkTicketPanel>(E_UI_Layer.Mid);
|
||||
// break;
|
||||
// case WorkTicketType.配电第一种工作票:
|
||||
// GameManager.UIMgr.ShowPanel<UI_PowerDistributionFirstWorkTicketPanel>(E_UI_Layer.Mid);
|
||||
// break;
|
||||
// case WorkTicketType.配电第二种工作票:
|
||||
// GameManager.UIMgr.ShowPanel<UI_PowerDistributionSecondWorkTicketPanel>(E_UI_Layer.Mid);
|
||||
// break;
|
||||
// }
|
||||
//}
|
||||
break;
|
||||
case "MissionBtn":
|
||||
GameManager.UIMgr.ShowPanel<UI_CheckTaskPanel>(E_UI_Layer.Mid, (p) =>
|
||||
|
|
|
|||
Loading…
Reference in New Issue