Merge branch 'master' of https://git.lgzn.space/zhuyayu/E_ElecCompetition
This commit is contained in:
commit
0266651c75
|
|
@ -6248,7 +6248,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &465806889
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -71,7 +71,7 @@ Material:
|
|||
- _GlossMapScale: 1
|
||||
- _Glossiness: 1
|
||||
- _GlossyReflections: 1
|
||||
- _Metallic: 0
|
||||
- _Metallic: 0.5
|
||||
- _Mode: 0
|
||||
- _OcclusionStrength: 1
|
||||
- _Parallax: 0.02
|
||||
|
|
|
|||
|
|
@ -10,14 +10,14 @@ Material:
|
|||
m_Name: LOGO
|
||||
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_ValidKeywords:
|
||||
- _ALPHABLEND_ON
|
||||
- _ALPHATEST_ON
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: 3000
|
||||
m_CustomRenderQueue: 2450
|
||||
stringTagMap:
|
||||
RenderType: Transparent
|
||||
RenderType: TransparentCutout
|
||||
disabledShaderPasses: []
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
|
|
@ -61,21 +61,21 @@ Material:
|
|||
m_Ints: []
|
||||
m_Floats:
|
||||
- _BumpScale: 1
|
||||
- _Cutoff: 0.5
|
||||
- _Cutoff: 0.618
|
||||
- _DetailNormalMapScale: 1
|
||||
- _DstBlend: 10
|
||||
- _DstBlend: 0
|
||||
- _GlossMapScale: 1
|
||||
- _Glossiness: 0.14142135
|
||||
- _GlossyReflections: 1
|
||||
- _Metallic: 0
|
||||
- _Mode: 2
|
||||
- _Mode: 1
|
||||
- _OcclusionStrength: 1
|
||||
- _Parallax: 0.02
|
||||
- _SmoothnessTextureChannel: 0
|
||||
- _SpecularHighlights: 1
|
||||
- _SrcBlend: 5
|
||||
- _SrcBlend: 1
|
||||
- _UVSec: 0
|
||||
- _ZWrite: 0
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
|
|
|
|||
|
|
@ -502,7 +502,7 @@ MonoBehaviour:
|
|||
m_EditorClassIdentifier:
|
||||
isInteractive: 0
|
||||
g1: {fileID: 6323416925032525140}
|
||||
name:
|
||||
name: "\u7528\u7535_BA2"
|
||||
linearMeasure: 0
|
||||
floats: []
|
||||
Fuan: 0
|
||||
|
|
@ -6687,6 +6687,8 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
clampAmmetersInteractives: []
|
||||
Multimeter: []
|
||||
Three: {fileID: 0}
|
||||
--- !u!1 &5972927993521893981
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -10193,8 +10195,8 @@ BoxCollider:
|
|||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 0.017715812, y: 0.7307945, z: 0.95005375}
|
||||
m_Center: {x: 0.027794212, y: -0.3566327, z: 0.0007122159}
|
||||
m_Size: {x: 0.008652419, y: 0.7307945, z: 0.95005375}
|
||||
m_Center: {x: 0.023262516, y: -0.3566327, z: 0.0007122159}
|
||||
--- !u!114 &4094150410768700923
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -372,6 +372,7 @@ public class FirstPersonController : MonoBehaviour
|
|||
|
||||
|
||||
|
||||
|
||||
if (enableHeadBob)
|
||||
{
|
||||
HeadBob();
|
||||
|
|
|
|||
|
|
@ -648,7 +648,6 @@ MonoBehaviour:
|
|||
line: {fileID: 7094745485471664169}
|
||||
Higth: {fileID: 0}
|
||||
selfHighlighter: {fileID: 0}
|
||||
tipPrefab: {fileID: 3004857750428858783, guid: 5cb5fabd80716b64b88f3517ee4bbbc3, type: 3}
|
||||
--- !u!114 &8256763883766496110
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1033,109 +1032,173 @@ MeshRenderer:
|
|||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!1001 &7977265530582431096
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 2131893628021589511}
|
||||
m_Modifications:
|
||||
- target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -0.0937
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: -0.2268
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -0.0853
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -6980580695861291056, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -5199085484305155300, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: RedWanYon
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -5199085484305155300, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: "\u4E07\u7528\u8868\u7535\u538B\u6D4B\u91CF"
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_TagString
|
||||
value: Line
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2517699313204552174, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: BlackWanYon
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2517699313204552174, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5772668992839476294, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 7
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
--- !u!4 &3988769801855775873 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6480123220174193145, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
m_PrefabInstance: {fileID: 7977265530582431096}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &5495617035047539862 stripped
|
||||
--- !u!1 &4514950303074652478
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2517699313204552174, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
m_PrefabInstance: {fileID: 7977265530582431096}
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7715750418364421036}
|
||||
- component: {fileID: 3059428695271397638}
|
||||
- component: {fileID: 2568701473469145960}
|
||||
m_Layer: 7
|
||||
m_Name: "\u4E07\u7528\u8868\u7535\u538B\u6D4B\u91CF03"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7715750418364421036
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4514950303074652478}
|
||||
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0.10630798, y: 0.16882324, z: 0.12330794}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7583579917626380947}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &3059428695271397638
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4514950303074652478}
|
||||
m_Mesh: {fileID: -4189706640963767879, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
--- !u!23 &2568701473469145960
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4514950303074652478}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
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: 8420556671751318103, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
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!1 &5495617035047539862
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8868651887891220814}
|
||||
- component: {fileID: 5805159065386198747}
|
||||
- component: {fileID: 1440140695464012828}
|
||||
- component: {fileID: 7660596071481276608}
|
||||
m_Layer: 7
|
||||
m_Name: BlackWanYon
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &8868651887891220814
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5495617035047539862}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -0.10578924, y: 0.22393799, z: 0.11220816}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7583579917626380947}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &5805159065386198747
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5495617035047539862}
|
||||
m_Mesh: {fileID: 2345608640363211689, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
--- !u!23 &1440140695464012828
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5495617035047539862}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
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: 8420556671751318103, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
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 &7660596071481276608
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1150,11 +1213,90 @@ MeshCollider:
|
|||
m_Convex: 1
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: 2345608640363211689, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
--- !u!1 &6444039670963408484 stripped
|
||||
--- !u!1 &6444039670963408484
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: -5199085484305155300, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
m_PrefabInstance: {fileID: 7977265530582431096}
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3988769801855775873}
|
||||
- component: {fileID: 1250084940839689348}
|
||||
- component: {fileID: 7806420585310816576}
|
||||
- component: {fileID: 7038635384121928425}
|
||||
m_Layer: 7
|
||||
m_Name: RedWanYon
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &3988769801855775873
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6444039670963408484}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -0.038024954, y: 0.22393799, z: 0.11220816}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7583579917626380947}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &1250084940839689348
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6444039670963408484}
|
||||
m_Mesh: {fileID: -6918181131899466164, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
--- !u!23 &7806420585310816576
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6444039670963408484}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
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: 8420556671751318103, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
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 &7038635384121928425
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -1169,18 +1311,121 @@ MeshCollider:
|
|||
m_Convex: 1
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: -6918181131899466164, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
--- !u!1 &7094745485471664169 stripped
|
||||
--- !u!1 &7094745485471664169
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
m_PrefabInstance: {fileID: 7977265530582431096}
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &7583579917626380947 stripped
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7583579917626380947}
|
||||
m_Layer: 7
|
||||
m_Name: "\u4E07\u7528\u8868\u7535\u538B\u6D4B\u91CF"
|
||||
m_TagString: Line
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7583579917626380947
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
m_PrefabInstance: {fileID: 7977265530582431096}
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &8868651887891220814 stripped
|
||||
m_GameObject: {fileID: 7094745485471664169}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -0.0937, y: -0.2268, z: -0.0853}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 7544377102779913609}
|
||||
- {fileID: 7715750418364421036}
|
||||
- {fileID: 8868651887891220814}
|
||||
- {fileID: 3988769801855775873}
|
||||
m_Father: {fileID: 2131893628021589511}
|
||||
m_RootOrder: 7
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &8190656202517537448
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7544377102779913609}
|
||||
- component: {fileID: 1390955141036317076}
|
||||
- component: {fileID: 6007683287941016964}
|
||||
m_Layer: 7
|
||||
m_Name: "\u4E07\u7528\u8868\u7535\u538B\u6D4B\u91CF02"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &7544377102779913609
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1560276661819145270, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
m_PrefabInstance: {fileID: 7977265530582431096}
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8190656202517537448}
|
||||
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0.10630798, y: 0.16882324, z: 0.12330794}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7583579917626380947}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &1390955141036317076
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8190656202517537448}
|
||||
m_Mesh: {fileID: -2495079305668151455, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
--- !u!23 &6007683287941016964
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8190656202517537448}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
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: 8420556671751318103, guid: 3f50ac0d0b1b1604bb023538d43e1c8c, type: 3}
|
||||
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}
|
||||
|
|
|
|||
|
|
@ -2962,6 +2962,20 @@ GameObject:
|
|||
m_CorrespondingSourceObject: {fileID: 322936463316669892, guid: e6024f57cedac6a40be3574b2630b881, type: 3}
|
||||
m_PrefabInstance: {fileID: 63043090}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!64 &64371149
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 538720368}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
m_Convex: 1
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: 7748153485848579490, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
--- !u!1 &69821958
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -8271,6 +8285,20 @@ MeshFilter:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 240386980}
|
||||
m_Mesh: {fileID: -6233374297163755596, guid: d6187d5c5284e6241bed7be6c0b0f50d, type: 3}
|
||||
--- !u!64 &240681992
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 538720363}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
m_Convex: 1
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: -598941293045984150, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
--- !u!114 &241422259
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -11571,6 +11599,19 @@ MeshFilter:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 346999589}
|
||||
m_Mesh: {fileID: 7513932590641533987, guid: d6187d5c5284e6241bed7be6c0b0f50d, type: 3}
|
||||
--- !u!65 &348036455
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 538720362}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 19.360292, y: 7.971414, z: 7.0737906}
|
||||
m_Center: {x: 0.000015258787, y: -0.000009536743, z: -0.00000011920929}
|
||||
--- !u!1001 &348078865
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -19000,6 +19041,20 @@ Transform:
|
|||
m_Father: {fileID: 647771132}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!64 &536233978
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 538720365}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
m_Convex: 1
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: 7825003527710353973, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
--- !u!1001 &538717554
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -19238,6 +19293,10 @@ PrefabInstance:
|
|||
propertyPath: m_StaticEditorFlags
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -7252984113429599143, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -7252984113429599143, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
propertyPath: m_StaticEditorFlags
|
||||
value: 0
|
||||
|
|
@ -19590,6 +19649,10 @@ PrefabInstance:
|
|||
propertyPath: m_StaticEditorFlags
|
||||
value: 18
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -2099253951683324792, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -2099253951683324792, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
propertyPath: m_StaticEditorFlags
|
||||
value: 0
|
||||
|
|
@ -19698,6 +19761,10 @@ PrefabInstance:
|
|||
propertyPath: m_StaticEditorFlags
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -304876638058187421, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -304876638058187421, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
propertyPath: m_StaticEditorFlags
|
||||
value: 0
|
||||
|
|
@ -19870,6 +19937,10 @@ PrefabInstance:
|
|||
propertyPath: m_StaticEditorFlags
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1894029799878150883, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1894029799878150883, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
propertyPath: m_StaticEditorFlags
|
||||
value: 0
|
||||
|
|
@ -20078,6 +20149,10 @@ PrefabInstance:
|
|||
propertyPath: m_StaticEditorFlags
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6005652620711740599, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6005652620711740599, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
propertyPath: m_StaticEditorFlags
|
||||
value: 0
|
||||
|
|
@ -20336,6 +20411,144 @@ MeshCollider:
|
|||
m_Convex: 0
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: -6728982132790891716, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
--- !u!1 &538720362 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: -2311735511310139658, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
m_PrefabInstance: {fileID: 538720358}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &538720363 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 8391514969557081066, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
m_PrefabInstance: {fileID: 538720358}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &538720364 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: -6491028119049784639, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
m_PrefabInstance: {fileID: 538720358}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &538720365 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4856312353940520525, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
m_PrefabInstance: {fileID: 538720358}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &538720366 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: -6825309513462761424, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
m_PrefabInstance: {fileID: 538720358}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &538720367 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: -3182797009945855797, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
m_PrefabInstance: {fileID: 538720358}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &538720368 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 2688327174255660275, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
m_PrefabInstance: {fileID: 538720358}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &538720369 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: -6136491150099065454, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
m_PrefabInstance: {fileID: 538720358}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &538720370 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 3177676906395613278, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
m_PrefabInstance: {fileID: 538720358}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &538720371 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1180863410084015532, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
m_PrefabInstance: {fileID: 538720358}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &538720372 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 6900065131349530212, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
m_PrefabInstance: {fileID: 538720358}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &538720373 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1295647244915940989, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
m_PrefabInstance: {fileID: 538720358}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &538720374 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1081304167194498590, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
m_PrefabInstance: {fileID: 538720358}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &538720375 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: -7252984113429599143, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
m_PrefabInstance: {fileID: 538720358}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!64 &538720376
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 538720371}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
m_Convex: 1
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: 875684015541860908, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
--- !u!65 &538720377
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 538720372}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 20.501282, y: 7.4813514, z: 3.0611467}
|
||||
m_Center: {x: 0.01943779, y: -0.0000023836064, z: -0.0000005364418}
|
||||
--- !u!65 &538720378
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 538720373}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 0.017846553, y: 0.042929336, z: 0.01199293}
|
||||
m_Center: {x: 0.000000001396633, y: 0.000011772849, z: 0.008053278}
|
||||
--- !u!64 &538720379
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 538720374}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
m_Convex: 1
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: -2467101229604563246, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
--- !u!64 &538720380
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 538720375}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
m_Convex: 1
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: 6693000068959362022, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
--- !u!1 &539975123
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -23012,8 +23225,8 @@ MonoBehaviour:
|
|||
RedTrans: {fileID: 0}
|
||||
BlackTrans: {fileID: 0}
|
||||
trans: {fileID: 2401820165377604994}
|
||||
Redpos: {x: -0.038, y: 0.223, z: 0.111}
|
||||
Blackpos: {x: -0.1, y: 0.223, z: 0.111}
|
||||
Redpos: {x: -0.13, y: 0, z: 0.02}
|
||||
Blackpos: {x: -0.19, y: 0, z: 0.02}
|
||||
Multimeter: 0
|
||||
MultimeterV:
|
||||
--- !u!1001 &618341781
|
||||
|
|
@ -26836,7 +27049,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6755863427580837633, guid: 7632f60f8b4d7e5498cf37829513abe7, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 1.515
|
||||
value: 1.13
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6755863427580837633, guid: 7632f60f8b4d7e5498cf37829513abe7, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
|
|
@ -29603,6 +29816,20 @@ Canvas:
|
|||
m_SortingLayerID: 0
|
||||
m_SortingOrder: 1
|
||||
m_TargetDisplay: 0
|
||||
--- !u!64 &775055322
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 538720369}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
m_Convex: 1
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: 612439612021548650, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
--- !u!1 &780357899
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -34471,6 +34698,20 @@ GameObject:
|
|||
m_CorrespondingSourceObject: {fileID: 322936463316669892, guid: e6024f57cedac6a40be3574b2630b881, type: 3}
|
||||
m_PrefabInstance: {fileID: 901287841}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!64 &904988658
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 538720367}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
m_Convex: 1
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: -3649035327923395803, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
--- !u!1 &905697361
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -34510,7 +34751,7 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 905697361}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 108.991, y: 0.557, z: 322.2779}
|
||||
m_LocalPosition: {x: 109.09, y: 0.557, z: 322.2779}
|
||||
m_LocalScale: {x: 1, y: 1, z: 3.4345794}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
|
|
@ -38209,8 +38450,8 @@ BoxCollider:
|
|||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 1, y: 1, z: 1}
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
m_Size: {x: 1, y: 0.55770916, z: 1}
|
||||
m_Center: {x: 0, y: -0.22114542, z: 0}
|
||||
--- !u!23 &976792125
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -38269,7 +38510,7 @@ Transform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 976792123}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 110.523, y: 0.5003009, z: 322.256}
|
||||
m_LocalPosition: {x: 110.53, y: 0.5003009, z: 322.256}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
|
|
@ -49302,6 +49543,19 @@ GameObject:
|
|||
m_CorrespondingSourceObject: {fileID: 322936463316669892, guid: e6024f57cedac6a40be3574b2630b881, type: 3}
|
||||
m_PrefabInstance: {fileID: 1269524962}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!65 &1278546766
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 538720370}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 0.58452183, y: 6.628678, z: 1.0301971}
|
||||
m_Center: {x: -0.0000076293945, y: 0.000007390976, z: 0.0000009834766}
|
||||
--- !u!1 &1283641336
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -72650,6 +72904,10 @@ PrefabInstance:
|
|||
propertyPath: m_StaticEditorFlags
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6005652620711740599, guid: 48e36ea59837ea244852e73183f1a373, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6005652620711740599, guid: 48e36ea59837ea244852e73183f1a373, type: 3}
|
||||
propertyPath: m_StaticEditorFlags
|
||||
value: 0
|
||||
|
|
@ -75135,7 +75393,9 @@ MonoBehaviour:
|
|||
temp: {fileID: 0}
|
||||
interactive: []
|
||||
RedWanYon: {fileID: 0}
|
||||
RedWanYonPos: {x: 0, y: 0, z: 0}
|
||||
BlackWanYon: {fileID: 0}
|
||||
BlackWanYonPos: {x: 0, y: 0, z: 0}
|
||||
FuAnBiao: {fileID: 0}
|
||||
interactiveEnum: 0
|
||||
biaojiPos: {fileID: 696870980}
|
||||
|
|
@ -75528,6 +75788,20 @@ MeshFilter:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1968359458}
|
||||
m_Mesh: {fileID: -4668275258704282929, guid: d6187d5c5284e6241bed7be6c0b0f50d, type: 3}
|
||||
--- !u!64 &1968732472
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 538720364}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
m_Convex: 1
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: -5723618795727218169, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
--- !u!1 &1977894792
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -81203,6 +81477,20 @@ Transform:
|
|||
m_Father: {fileID: 1149883207}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!64 &2143528134
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 538720366}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 4
|
||||
m_Convex: 1
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: -5374883800896729798, guid: 83c032d0039839e438b2991cdf46adca, type: 3}
|
||||
--- !u!1 &2143994190
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 804b3b098e8650c4aa916fdb31f0a8e9
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -5192,6 +5192,29 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 5a7d7e9bd76f93b418b1f916781feb6a, type: 3}
|
||||
--- !u!1 &1039716618 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 3350233854110697404, guid: 5a7d7e9bd76f93b418b1f916781feb6a, type: 3}
|
||||
m_PrefabInstance: {fileID: 1039716617}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &1039716619
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1039716618}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5eb279537374e4e4d8f1ad4cf74d2b06, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
playerCamera: {fileID: 1039716620}
|
||||
--- !u!20 &1039716620 stripped
|
||||
Camera:
|
||||
m_CorrespondingSourceObject: {fileID: 3350233855506296104, guid: 5a7d7e9bd76f93b418b1f916781feb6a, type: 3}
|
||||
m_PrefabInstance: {fileID: 1039716617}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &1064116793
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -8,10 +8,11 @@ public class Multimeter : MonoBehaviour
|
|||
[Header("ÊÇ·ñ´øµç")]
|
||||
public bool electricity = false;
|
||||
[Header("µçÁ÷")]
|
||||
public float activation;
|
||||
public string activation;
|
||||
public string name;
|
||||
public bool isBlack;
|
||||
public string VV;
|
||||
public bool isok = false;
|
||||
|
||||
private void OnMouseDown()
|
||||
{
|
||||
|
|
@ -20,24 +21,24 @@ public class Multimeter : MonoBehaviour
|
|||
GameManager.ins.BlackWanYon.transform.parent = transform;
|
||||
GameManager.ins.BlackWanYon.transform.DOLocalRotate(new Vector3(56, 0, 0), 0.25f);
|
||||
GameManager.ins.BlackWanYon.transform.DOScale(new Vector3(200,200,200), 0.25f);
|
||||
GameManager.ins.BlackWanYon.transform.DOLocalMove(new Vector3(0,0,-2), 0.25f);
|
||||
GameManager.ins.BlackWanYon.transform.DOLocalMove(new Vector3(-0.14f, -0.08f, 0.11f), 0.25f);
|
||||
GameManager.ins.BlackWanYon.layer = 0;
|
||||
GameManager.ins.MultimeterIm.gameObject.SetActive(true);
|
||||
|
||||
isok = true;
|
||||
}
|
||||
if (GameManager.ins.RedWanYon != null&&!isBlack)
|
||||
{
|
||||
GameManager.ins.RedWanYon.transform.parent = transform;
|
||||
GameManager.ins.RedWanYon.transform.DOLocalRotate(new Vector3(56, 0, 0), 0.25f);
|
||||
GameManager.ins.RedWanYon.transform.DOScale(new Vector3(200,200,200), 0.25f);
|
||||
GameManager.ins.RedWanYon.transform.DOLocalMove(new Vector3(0,0, -2f), 0.25f);
|
||||
GameManager.ins.RedWanYon.transform.DOLocalMove(new Vector3(-0.08f,0.08f,0.11f), 0.25f);
|
||||
GameManager.ins.RedWanYon.layer = 0;
|
||||
GameManager.ins.MultimeterIm.gameObject.SetActive(true);
|
||||
if (electricity)
|
||||
{
|
||||
GameManager.ins.DianFuIm.gameObject.SetActive(true);
|
||||
GameManager.ins.DianFuTex.text = activation + VV;
|
||||
}
|
||||
}
|
||||
if (isok)
|
||||
{
|
||||
GameManager.ins.DianFuIm.gameObject.SetActive(true);
|
||||
GameManager.ins.DianFuTex.text = activation + VV;
|
||||
}
|
||||
Debug.Log("³É¹¦");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ using UnityEngine.EventSystems;
|
|||
|
||||
public class MultimeterManager : MonoBehaviour
|
||||
{
|
||||
[SerializeField] Transform blackXian;
|
||||
[SerializeField] Transform RedXian;
|
||||
public Transform blackXian;
|
||||
public Transform RedXian;
|
||||
private Multimeter multimeter;
|
||||
public Camera Camera;
|
||||
public List<Multimeter> Multimeter;
|
||||
|
|
@ -40,11 +40,13 @@ public class MultimeterManager : MonoBehaviour
|
|||
{
|
||||
//GameManager.ins.BlackWanYon = null;
|
||||
GameManager.ins.RedWanYon = RedXian.gameObject;
|
||||
//GameManager.ins.RedWanYonPos = GameManager.ins.RedWanYon.transform.localPosition;
|
||||
}
|
||||
if (hit.collider.name.Equals("BlackWanYon"))
|
||||
{
|
||||
//GameManager.ins.RedWanYon = null;
|
||||
GameManager.ins.BlackWanYon = blackXian.gameObject;
|
||||
//GameManager.ins.BlackWanYonPos = GameManager.ins.BlackWanYon.transform.localPosition;
|
||||
}
|
||||
Debug.Log(hit.collider.name);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,24 +12,27 @@ public class CameraControl : MonoBehaviour
|
|||
fieldView -= Input.GetAxis("Mouse ScrollWheel") * 10f;
|
||||
fieldView = Mathf.Clamp(fieldView, 30, 60);
|
||||
playerCamera.fieldOfView = fieldView;
|
||||
if (GameManager.ins.temp&& !GameManager.ins.temp.name.Equals("ǯÐεçÁ÷±í(Clone)"))
|
||||
if (GameManager.ins.interactiveEnum != Interactive.YanDian)
|
||||
{
|
||||
switch (fieldView / 10)
|
||||
if (GameManager.ins.temp && !GameManager.ins.temp.name.Equals("ǯÐεçÁ÷±í(Clone)"))
|
||||
{
|
||||
case 3:
|
||||
GameManager.ins.temp.transform.localPosition = new Vector3(0, 0.53f, 1.10f);
|
||||
break;
|
||||
case 4:
|
||||
GameManager.ins.temp.transform.localPosition = new Vector3(0, 0.63f, 0.82f);
|
||||
break;
|
||||
case 5:
|
||||
GameManager.ins.temp.transform.localPosition = new Vector3(0.04f, 0.55f, 0.81f);
|
||||
break;
|
||||
case 6:
|
||||
GameManager.ins.temp.transform.localPosition = new Vector3(0.12f, 0.46f, 0.81f);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
switch (fieldView / 10)
|
||||
{
|
||||
case 3:
|
||||
GameManager.ins.temp.transform.localPosition = new Vector3(0, 0.53f, 1.10f);
|
||||
break;
|
||||
case 4:
|
||||
GameManager.ins.temp.transform.localPosition = new Vector3(0, 0.63f, 0.82f);
|
||||
break;
|
||||
case 5:
|
||||
GameManager.ins.temp.transform.localPosition = new Vector3(0.04f, 0.55f, 0.81f);
|
||||
break;
|
||||
case 6:
|
||||
GameManager.ins.temp.transform.localPosition = new Vector3(0.12f, 0.46f, 0.81f);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,169 +8,14 @@ using TMPro;
|
|||
|
||||
public class CameraControl1 : MonoBehaviour
|
||||
{
|
||||
|
||||
public static CameraControl1 ins;
|
||||
[Header("设置参数")]
|
||||
[SerializeField] float minDis = 2;
|
||||
[SerializeField] float maxDis ;
|
||||
[SerializeField] float mouseRotSpeed = 8;
|
||||
[SerializeField] float touchZoomSpeed = 0.1f;
|
||||
[SerializeField] float touchRotateSpeed = 0.3f;
|
||||
[SerializeField] float mouseMoveSpeed = 1;
|
||||
[SerializeField] float mouseZoomSpeed = 10;
|
||||
[SerializeField] float rSmoothTime = 0.3f;
|
||||
[SerializeField] float sSmoothTime = 0.3f;
|
||||
[SerializeField] float mSmoothTime = 0.3f;
|
||||
[SerializeField] float minVerticalAngle = 0;
|
||||
[SerializeField] float maxVerticalAngle = 60;
|
||||
[Header("用于展示数据")]
|
||||
[SerializeField] float horizontalAngle = 0;
|
||||
[SerializeField] float verticalAngle = 0;
|
||||
[SerializeField] float currentDis = 80;
|
||||
[SerializeField] Vector3 originPosition;
|
||||
[SerializeField] Vector3 targetPosition;
|
||||
//[HideInInspector] public bool isrotateend;
|
||||
bool isrotateable;
|
||||
bool isscaleable;
|
||||
float _targetDis;
|
||||
private Touch oldTouch1;
|
||||
private Touch oldTouch2;
|
||||
//
|
||||
public bool UPDOWN = false;
|
||||
|
||||
|
||||
float targetDis
|
||||
{
|
||||
set
|
||||
{
|
||||
_targetDis = value > maxDis ? maxDis : value < minDis ? minDis : value;
|
||||
}
|
||||
get { return _targetDis; }
|
||||
}
|
||||
Vector3 rVelocity = Vector3.zero;
|
||||
float sVelocity = 0;
|
||||
Vector3 mVelocity = Vector3.zero;
|
||||
Vector3 dampRotation;
|
||||
Transform targetTrans;
|
||||
bool m_IsSingleFinger;
|
||||
private void Awake()
|
||||
{
|
||||
ins = this;
|
||||
targetDis = currentDis;
|
||||
targetPosition = originPosition;
|
||||
}
|
||||
|
||||
[ContextMenu("设置相机位置")]
|
||||
private void SetCameraTrans()
|
||||
{
|
||||
transform.eulerAngles = new Vector3(verticalAngle, horizontalAngle, 0);
|
||||
var offset = transform.forward * -currentDis;
|
||||
transform.position = originPosition + offset;
|
||||
}
|
||||
public void SetTarget(Transform target, float distance = 4)
|
||||
{
|
||||
targetDis = distance;
|
||||
targetTrans = target;
|
||||
}
|
||||
public void SetCenterPoint(Vector3 target, float distance = 4)
|
||||
{
|
||||
targetDis = distance;
|
||||
targetPosition = target;
|
||||
}
|
||||
public void Recover(float max, float min)
|
||||
{
|
||||
|
||||
// targetPosition = originPosition = Vector3.zero;
|
||||
horizontalAngle -= horizontalAngle % 360;
|
||||
verticalAngle = 0;
|
||||
maxDis = max;
|
||||
minDis = min;
|
||||
targetDis = maxDis;
|
||||
// targetTrans = null;
|
||||
}
|
||||
public void RecoverTwo()
|
||||
{
|
||||
horizontalAngle -= horizontalAngle % 360;
|
||||
verticalAngle = 0;
|
||||
targetDis = maxDis;
|
||||
}
|
||||
|
||||
|
||||
float fieldView;
|
||||
public Camera playerCamera;
|
||||
private void Update()
|
||||
{
|
||||
//限制视角上下
|
||||
if (UPDOWN)
|
||||
{
|
||||
if (verticalAngle < -15)
|
||||
{
|
||||
verticalAngle = -15;
|
||||
}
|
||||
}
|
||||
|
||||
if (Input.touchCount == 0)
|
||||
{
|
||||
// isscaleable = true;
|
||||
isrotateable = true;
|
||||
if (Input.GetMouseButton(0))
|
||||
{
|
||||
horizontalAngle += Input.GetAxis("Mouse X") * mouseRotSpeed;
|
||||
verticalAngle -= Input.GetAxis("Mouse Y") * mouseRotSpeed;
|
||||
|
||||
verticalAngle = Mathf.Clamp(verticalAngle, minVerticalAngle, maxVerticalAngle);
|
||||
}
|
||||
targetDis = targetDis - Input.GetAxis("Mouse ScrollWheel") * mouseZoomSpeed;
|
||||
}
|
||||
|
||||
if (Input.touchCount == 1)
|
||||
{
|
||||
if (isrotateable)
|
||||
{
|
||||
if (Input.touches[0].phase == TouchPhase.Began)
|
||||
{
|
||||
oldTouch1 = Input.touches[0];
|
||||
}
|
||||
var deltaPos = Input.touches[0].position - oldTouch1.position;
|
||||
horizontalAngle += deltaPos.x * touchRotateSpeed*3f ;
|
||||
verticalAngle -= deltaPos.y * touchRotateSpeed;
|
||||
verticalAngle = Mathf.Clamp(verticalAngle, minVerticalAngle, maxVerticalAngle);
|
||||
oldTouch1 = Input.touches[0];
|
||||
}
|
||||
}
|
||||
if (Input.touchCount == 2)
|
||||
{
|
||||
isrotateable = false ;
|
||||
if (Input.touches[1].phase == TouchPhase.Began)
|
||||
{
|
||||
oldTouch1 = Input.touches[0];
|
||||
oldTouch2 = Input.touches[1];
|
||||
}
|
||||
float currentTouchDistance = Vector2.Distance(Input.touches[0].position, Input.touches[1].position);
|
||||
float lastTouchDistance = Vector2.Distance(oldTouch1.position, oldTouch2.position);
|
||||
if (Input.touches[0].phase != TouchPhase.Ended && Input.touches[1].phase != TouchPhase.Ended)
|
||||
{
|
||||
//计算上次和这次双指触摸之间的距离差距
|
||||
//然后去更改摄像机的距离
|
||||
targetDis -= (currentTouchDistance - lastTouchDistance) * touchZoomSpeed;
|
||||
oldTouch1 = Input.touches[0];
|
||||
oldTouch2 = Input.touches[1];
|
||||
}
|
||||
}
|
||||
|
||||
currentDis = Mathf.SmoothDamp(currentDis, targetDis, ref sVelocity, rSmoothTime);
|
||||
dampRotation = Vector3.SmoothDamp(dampRotation, new Vector3(verticalAngle, horizontalAngle), ref rVelocity, rSmoothTime);
|
||||
transform.rotation = Quaternion.Euler(dampRotation);
|
||||
if (targetTrans != null)
|
||||
{
|
||||
if (originPosition != targetTrans.position)
|
||||
originPosition = Vector3.SmoothDamp(originPosition, targetTrans.position, ref mVelocity, mSmoothTime);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (originPosition != targetPosition)
|
||||
originPosition = Vector3.SmoothDamp(originPosition, targetPosition, ref mVelocity, mSmoothTime);
|
||||
}
|
||||
var offset = transform.forward * -currentDis;
|
||||
transform.position = originPosition + offset;
|
||||
fieldView = playerCamera.fieldOfView;
|
||||
fieldView -= Input.GetAxis("Mouse ScrollWheel") * 10f;
|
||||
fieldView = Mathf.Clamp(fieldView, 30, 60);
|
||||
playerCamera.fieldOfView = fieldView;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -31,7 +31,9 @@ public class GameManager : MonoBehaviour
|
|||
public GameObject temp;
|
||||
public List<GameObject> interactive;
|
||||
public GameObject RedWanYon;
|
||||
public Vector3 RedWanYonPos;
|
||||
public GameObject BlackWanYon;
|
||||
public Vector3 BlackWanYonPos;
|
||||
public GameObject FuAnBiao;
|
||||
public Interactive interactiveEnum = Interactive.none;
|
||||
public Transform biaojiPos;
|
||||
|
|
@ -144,6 +146,8 @@ public class GameManager : MonoBehaviour
|
|||
QianStopValve.gameObject.SetActive(false);
|
||||
GameObject t2 = GameObject.FindGameObjectWithTag("Ðýת");
|
||||
WanStopValve.trans = t2.transform;
|
||||
BlackWanYonPos = temp.GetComponent<MultimeterManager>().blackXian.localPosition;
|
||||
RedWanYonPos = temp.GetComponent<MultimeterManager>().RedXian.localPosition;
|
||||
temp.GetComponent<MultimeterManager>();
|
||||
temp.GetComponent<MultimeterManager>().Camera = toolsCam;
|
||||
temp.GetComponent<ToolModelClick>().line.SetActive(true);
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ public class ClampAmmetersInteractive : MonoBehaviour
|
|||
public string name;
|
||||
public float linearMeasure;//默认的大小
|
||||
public List<float> floats;
|
||||
public float Fuan;
|
||||
public string Fuan;
|
||||
public string unit;
|
||||
private void Start()
|
||||
{
|
||||
|
|
@ -46,4 +46,11 @@ public class ClampAmmetersInteractive : MonoBehaviour
|
|||
}
|
||||
}
|
||||
}
|
||||
private void Update()
|
||||
{
|
||||
if (Input.GetKeyDown("t"))
|
||||
{
|
||||
Debug.Log(GameManager.ins.DianFuTex.text + "==== GameManager.ins.DianFuTex.text");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,11 +2,14 @@ using System.Collections;
|
|||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using UnityEngine;
|
||||
using Views;
|
||||
|
||||
public class ClampAmmetersManager : MonoBehaviour
|
||||
{
|
||||
[SerializeField] List<ClampAmmetersInteractive> clampAmmetersInteractives= new List<ClampAmmetersInteractive>();
|
||||
public Dictionary<int,float> data = new Dictionary<int,float>();
|
||||
[SerializeField] List<ClampAmmetersInteractive> clampAmmetersInteractives = new List<ClampAmmetersInteractive>();
|
||||
[SerializeField] List<Multimeter> Multimeter = new List<Multimeter>();
|
||||
public Dictionary<int, float> data = new Dictionary<int, float>();
|
||||
public ThreeTransformerPhotovoltaicView Three;
|
||||
private void Awake()
|
||||
{
|
||||
run();
|
||||
|
|
@ -14,7 +17,13 @@ public class ClampAmmetersManager : MonoBehaviour
|
|||
// Start is called before the first frame update
|
||||
void Start()
|
||||
{
|
||||
|
||||
//init();
|
||||
StartCoroutine(QiDon());
|
||||
}
|
||||
IEnumerator QiDon()
|
||||
{
|
||||
yield return new WaitForSeconds(5f);
|
||||
init();
|
||||
}
|
||||
/// <summary>
|
||||
/// 获取低下预设数据
|
||||
|
|
@ -22,12 +31,53 @@ public class ClampAmmetersManager : MonoBehaviour
|
|||
void run()
|
||||
{
|
||||
clampAmmetersInteractives = GetComponentsInChildren<ClampAmmetersInteractive>().ToList();
|
||||
Multimeter = GetComponentsInChildren<Multimeter>().ToList();
|
||||
Three = GetComponentInChildren<ThreeTransformerPhotovoltaicView>();
|
||||
}
|
||||
void init()
|
||||
{
|
||||
for (int i = 0; i < data.Count; i++)
|
||||
for (int i = 0; i < clampAmmetersInteractives.Count; i++)
|
||||
{
|
||||
clampAmmetersInteractives[i].Fuan = data[i];
|
||||
if (clampAmmetersInteractives[i].name.Equals("用电_AA2"))
|
||||
{
|
||||
clampAmmetersInteractives[i].Fuan = Three.ttpData.data.qxA;
|
||||
Debug.Log(Three.ttpData.data.qxA + "====Three.ttpData.data.qxA");
|
||||
}
|
||||
if (clampAmmetersInteractives[i].name.Equals("用电_BA2"))
|
||||
{
|
||||
clampAmmetersInteractives[i].Fuan = Three.ttpData.data.qxB;
|
||||
}
|
||||
if (clampAmmetersInteractives[i].name.Equals("用电_CA2"))
|
||||
{
|
||||
clampAmmetersInteractives[i].Fuan = Three.ttpData.data.qxC;
|
||||
}
|
||||
}
|
||||
for (int i = 0; i < Multimeter.Count; i++)
|
||||
{
|
||||
if (Multimeter[i].name.Equals("用电_AV1"))
|
||||
{
|
||||
Multimeter[i].activation = Three.ttpData.data.dyA;
|
||||
}
|
||||
if (Multimeter[i].name.Equals("用电_BV1"))
|
||||
{
|
||||
Multimeter[i].activation = Three.ttpData.data.dyB;
|
||||
}
|
||||
if (Multimeter[i].name.Equals("用电_CV1"))
|
||||
{
|
||||
Multimeter[i].activation = Three.ttpData.data.dyC;
|
||||
}
|
||||
//if (Multimeter[i].name.Equals("用电_N"))
|
||||
//{
|
||||
// Multimeter[i].activation = Three.ttpData.data.dyC;
|
||||
//}
|
||||
}
|
||||
}
|
||||
|
||||
private void Update()
|
||||
{
|
||||
if (Input.GetKeyDown("q"))
|
||||
{
|
||||
Debug.Log(Three.ttpData.data.qxA + "====Three.ttpData.data.qxA");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,12 +35,12 @@
|
|||
"source": "builtin",
|
||||
"dependencies": {
|
||||
"com.unity.ide.visualstudio": "2.0.16",
|
||||
"com.unity.ide.rider": "3.0.15",
|
||||
"com.unity.ide.rider": "3.0.16",
|
||||
"com.unity.ide.vscode": "1.2.5",
|
||||
"com.unity.editorcoroutines": "1.0.0",
|
||||
"com.unity.performance.profile-analyzer": "1.1.1",
|
||||
"com.unity.test-framework": "1.1.31",
|
||||
"com.unity.testtools.codecoverage": "1.0.1"
|
||||
"com.unity.testtools.codecoverage": "1.2.2"
|
||||
}
|
||||
},
|
||||
"com.unity.ide.rider": {
|
||||
|
|
@ -92,7 +92,7 @@
|
|||
"url": "https://packages.unity.cn"
|
||||
},
|
||||
"com.unity.services.core": {
|
||||
"version": "1.4.2",
|
||||
"version": "1.6.0",
|
||||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
|
|
@ -121,7 +121,7 @@
|
|||
"url": "https://packages.unity.cn"
|
||||
},
|
||||
"com.unity.testtools.codecoverage": {
|
||||
"version": "1.0.1",
|
||||
"version": "1.2.2",
|
||||
"depth": 1,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
|
|
|
|||
Loading…
Reference in New Issue