改细节
This commit is contained in:
parent
f80a72846c
commit
3982ab5723
|
|
@ -25563,7 +25563,7 @@ MonoBehaviour:
|
|||
m_Elasticity: 0.1
|
||||
m_Inertia: 1
|
||||
m_DecelerationRate: 0.135
|
||||
m_ScrollSensitivity: 1
|
||||
m_ScrollSensitivity: 8
|
||||
m_Viewport: {fileID: 5092569755324715940}
|
||||
m_HorizontalScrollbar: {fileID: 0}
|
||||
m_VerticalScrollbar: {fileID: 5092569753790709666}
|
||||
|
|
|
|||
|
|
@ -1828,14 +1828,14 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 656227129}
|
||||
m_LocalRotation: {x: -0.5, y: 0.5, z: -0.5, w: 0.5}
|
||||
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
|
||||
m_LocalPosition: {x: 0, y: 0.28839114, z: 0.000022858381}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 891256520}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
|
||||
--- !u!1 &680750128
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2361,8 +2361,8 @@ Transform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 7265198625074547822}
|
||||
- {fileID: 1001054410}
|
||||
- {fileID: 7265198625074547822}
|
||||
m_Father: {fileID: 6919098457600344112}
|
||||
m_RootOrder: 25
|
||||
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
|
||||
|
|
@ -4516,14 +4516,14 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1001054409}
|
||||
m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: 0.7071068}
|
||||
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
|
||||
m_LocalPosition: {x: 0, y: -0.000022888184, z: 0.2883911}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 752555938}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
|
||||
--- !u!1 &1044951649
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -6066,6 +6066,37 @@ MonoBehaviour:
|
|||
- {fileID: 1312474541}
|
||||
- {fileID: 1312474542}
|
||||
InstallPosY: 142.2929
|
||||
--- !u!1 &1190396737
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1190396738}
|
||||
m_Layer: 0
|
||||
m_Name: MainTarget
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1190396738
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1190396737}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1501092962}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1198127453
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -7795,14 +7826,14 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1526406926}
|
||||
m_LocalRotation: {x: -0.5, y: 0.5, z: -0.5, w: 0.5}
|
||||
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
|
||||
m_LocalPosition: {x: 0, y: 0.28839114, z: 0.00008389354}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1841239319}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
|
||||
--- !u!1001 &1552128832
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -8466,6 +8497,37 @@ Transform:
|
|||
m_Father: {fileID: 4789080832422718167}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1722647149
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1722647150}
|
||||
m_Layer: 0
|
||||
m_Name: New Game Object
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1722647150
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1722647149}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 20
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1805837998
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -14564,7 +14626,7 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3088115523008045053}
|
||||
m_LocalRotation: {x: 0.7071068, y: 0, z: -0, w: 0.7071067}
|
||||
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
|
||||
m_LocalPosition: {x: -0.04769516, y: 0.076171875, z: -1.0060272}
|
||||
m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
|
||||
m_ConstrainProportionsScale: 0
|
||||
|
|
@ -14599,7 +14661,7 @@ Transform:
|
|||
- {fileID: 891256520}
|
||||
m_Father: {fileID: 543450653314515341}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
|
||||
--- !u!23 &6939770098881280481
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -15115,7 +15177,7 @@ Transform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 752555938}
|
||||
m_RootOrder: 0
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!4 &7267900521168441839
|
||||
Transform:
|
||||
|
|
|
|||
|
|
@ -216,7 +216,7 @@ Transform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
|
||||
--- !u!114 &28351941
|
||||
MonoBehaviour:
|
||||
|
|
@ -258,7 +258,7 @@ PrefabInstance:
|
|||
m_Modifications:
|
||||
- target: {fileID: -8679921383154817045, guid: 92b1a298e95fb664cb2aa2aff35920e0, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 2
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 92b1a298e95fb664cb2aa2aff35920e0, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
|
@ -1378,6 +1378,200 @@ MonoBehaviour:
|
|||
hitFxFadeOutDuration: 0.25
|
||||
hitFxColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
hitFxRadius: 0.5
|
||||
--- !u!1 &326403514
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 326403518}
|
||||
- component: {fileID: 326403517}
|
||||
- component: {fileID: 326403516}
|
||||
- component: {fileID: 326403515}
|
||||
m_Layer: 0
|
||||
m_Name: "\u7A7A\u6C14\u5899 (2)"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!65 &326403515
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 326403514}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 1, y: 1, z: 1}
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!23 &326403516
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 326403514}
|
||||
m_Enabled: 0
|
||||
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: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, 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!33 &326403517
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 326403514}
|
||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!4 &326403518
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 326403514}
|
||||
m_LocalRotation: {x: -0, y: -0.7119194, z: -0, w: 0.70226115}
|
||||
m_LocalPosition: {x: -173.9, y: 1.6, z: -39.9}
|
||||
m_LocalScale: {x: 1, y: 5.1228123, z: 47.191967}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1380979186}
|
||||
m_RootOrder: 7
|
||||
m_LocalEulerAnglesHint: {x: 0, y: -90.783, z: 0}
|
||||
--- !u!1 &368580462
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 368580466}
|
||||
- component: {fileID: 368580465}
|
||||
- component: {fileID: 368580464}
|
||||
- component: {fileID: 368580463}
|
||||
m_Layer: 0
|
||||
m_Name: "\u7A7A\u6C14\u5899 (3)"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!65 &368580463
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 368580462}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 1, y: 1, z: 1}
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!23 &368580464
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 368580462}
|
||||
m_Enabled: 0
|
||||
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: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, 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!33 &368580465
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 368580462}
|
||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!4 &368580466
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 368580462}
|
||||
m_LocalRotation: {x: -0, y: -0.7119194, z: -0, w: 0.70226115}
|
||||
m_LocalPosition: {x: -173.5, y: 1.6, z: -70.2}
|
||||
m_LocalScale: {x: 1, y: 5.1228123, z: 47.191967}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1380979186}
|
||||
m_RootOrder: 8
|
||||
m_LocalEulerAnglesHint: {x: 0, y: -90.783, z: 0}
|
||||
--- !u!114 &375930021 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 2576541080876693594, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
|
||||
|
|
@ -1502,7 +1696,7 @@ Transform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 8
|
||||
m_RootOrder: 7
|
||||
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
|
||||
--- !u!114 &429549660 stripped
|
||||
MonoBehaviour:
|
||||
|
|
@ -1959,7 +2153,7 @@ Transform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 7
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
|
||||
--- !u!1 &700892454 stripped
|
||||
GameObject:
|
||||
|
|
@ -2250,6 +2444,103 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 97d1fee3926f6b74dba1fe23cdd84263, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &782274683
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 782274687}
|
||||
- component: {fileID: 782274686}
|
||||
- component: {fileID: 782274685}
|
||||
- component: {fileID: 782274684}
|
||||
m_Layer: 0
|
||||
m_Name: "\u7A7A\u6C14\u5899"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!65 &782274684
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 782274683}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 1, y: 1, z: 1}
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!23 &782274685
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 782274683}
|
||||
m_Enabled: 0
|
||||
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: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, 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!33 &782274686
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 782274683}
|
||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!4 &782274687
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 782274683}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -156.43, y: 1.6, z: -54.44}
|
||||
m_LocalScale: {x: 1, y: 5.1228123, z: 30.957731}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1380979186}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &821960849
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2373,7 +2664,7 @@ Transform:
|
|||
- {fileID: 1417925981}
|
||||
- {fileID: 543450652139532038}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 9
|
||||
m_RootOrder: 8
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &890581129
|
||||
MonoBehaviour:
|
||||
|
|
@ -3443,13 +3734,13 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1044951649}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -174.03, y: 2.2225, z: -52.0243}
|
||||
m_LocalScale: {x: 0.09559214, y: 4.099373, z: 1.0994881}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 15
|
||||
m_Father: {fileID: 1380979186}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1049046496
|
||||
GameObject:
|
||||
|
|
@ -3540,13 +3831,13 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1049046496}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -176.391, y: 2.2225, z: -60.218}
|
||||
m_LocalScale: {x: 4.8945975, y: 4.099373, z: 0.21191}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 12
|
||||
m_Father: {fileID: 1380979186}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1065811548
|
||||
GameObject:
|
||||
|
|
@ -4059,13 +4350,13 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1168595947}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -176.391, y: 2.2225, z: -51.508}
|
||||
m_LocalScale: {x: 4.8945975, y: 4.099373, z: 0.21191}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 11
|
||||
m_Father: {fileID: 1380979186}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1180096482
|
||||
GameObject:
|
||||
|
|
@ -4341,7 +4632,7 @@ Transform:
|
|||
- {fileID: 821960850}
|
||||
- {fileID: 834722527}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 10
|
||||
m_RootOrder: 9
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 125.04, z: 0}
|
||||
--- !u!320 &1198127458
|
||||
PlayableDirector:
|
||||
|
|
@ -4792,6 +5083,46 @@ MonoBehaviour:
|
|||
hitFxFadeOutDuration: 0.25
|
||||
hitFxColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
hitFxRadius: 0.5
|
||||
--- !u!1 &1380979185
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1380979186}
|
||||
m_Layer: 0
|
||||
m_Name: "\u78B0\u649E\u5899"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1380979186
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1380979185}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1168595951}
|
||||
- {fileID: 1049046500}
|
||||
- {fileID: 1816500443}
|
||||
- {fileID: 2057848313}
|
||||
- {fileID: 1044951653}
|
||||
- {fileID: 782274687}
|
||||
- {fileID: 1663465220}
|
||||
- {fileID: 326403518}
|
||||
- {fileID: 368580466}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 10
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1417925980
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -5093,7 +5424,7 @@ PrefabInstance:
|
|||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 4
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2399593117452945566, guid: 86a8666f9623b6b46b8f4b860a11546f, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
|
@ -5431,51 +5762,6 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 6692d9c5c4f07d74cb7699776e6f2601, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &1574251728
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1574251729}
|
||||
- component: {fileID: 1574251730}
|
||||
m_Layer: 0
|
||||
m_Name: SiteManager
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1574251729
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1574251728}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -176.10237, y: 1.6078001, z: -56.25631}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1574251730
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1574251728}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6589deeaefa4a17428d6c3ce0d699c77, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
device_Control: {fileID: 1723332379}
|
||||
--- !u!114 &1577392988 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 5948617165317844720, guid: c80ccdb516dbab94083bd57fa1650eda, type: 3}
|
||||
|
|
@ -5603,6 +5889,103 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 97d1fee3926f6b74dba1fe23cdd84263, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &1663465216
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1663465220}
|
||||
- component: {fileID: 1663465219}
|
||||
- component: {fileID: 1663465218}
|
||||
- component: {fileID: 1663465217}
|
||||
m_Layer: 0
|
||||
m_Name: "\u7A7A\u6C14\u5899 (1)"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!65 &1663465217
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1663465216}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 1, y: 1, z: 1}
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!23 &1663465218
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1663465216}
|
||||
m_Enabled: 0
|
||||
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: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, 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!33 &1663465219
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1663465216}
|
||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||
--- !u!4 &1663465220
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1663465216}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -189.8, y: 1.6, z: -54.44}
|
||||
m_LocalScale: {x: 1, y: 5.1228123, z: 30.957731}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1380979186}
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &1688058782 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 2576541080563400545, guid: 10f4454f32eb20e4298912d896f6020e, type: 3}
|
||||
|
|
@ -5803,7 +6186,7 @@ Transform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 6
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
|
||||
--- !u!1 &1816500439
|
||||
GameObject:
|
||||
|
|
@ -5894,13 +6277,13 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1816500439}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -178.8316, y: 2.2225, z: -55.864}
|
||||
m_LocalScale: {x: 0.09559214, y: 4.099373, z: 8.787996}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 13
|
||||
m_Father: {fileID: 1380979186}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1843008147
|
||||
GameObject:
|
||||
|
|
@ -6328,13 +6711,13 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2057848309}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -174.03, y: 2.2225, z: -57.2426}
|
||||
m_LocalScale: {x: 0.09559214, y: 4.099373, z: 6.031202}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 14
|
||||
m_Father: {fileID: 1380979186}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &2074447472 stripped
|
||||
MonoBehaviour:
|
||||
|
|
@ -6386,6 +6769,7 @@ MonoBehaviour:
|
|||
spawnToolPos: {fileID: 1927580343}
|
||||
tMDTips: {fileID: 1180096483}
|
||||
triggerName: "\u6536\u56DE\u5DE5\u5177"
|
||||
device_Control: {fileID: 1723332379}
|
||||
--- !u!4 &2109812127
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -6399,7 +6783,7 @@ Transform:
|
|||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &9171101143762452
|
||||
GameObject:
|
||||
|
|
@ -6638,7 +7022,7 @@ Transform:
|
|||
- {fileID: 478648693}
|
||||
- {fileID: 950850338}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 5
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!4 &543450652554360468 stripped
|
||||
Transform:
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ public abstract class ScoreBase : MonoBehaviour
|
|||
/// <returns></returns>
|
||||
public Dictionary<int, ScoreSubjectStep> GetStepScore()
|
||||
{
|
||||
Debug.LogError(JsonConvert.SerializeObject(steps));
|
||||
//Debug.LogError(JsonConvert.SerializeObject(steps));
|
||||
return steps;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
using Newtonsoft.Json;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
|
@ -18,6 +19,7 @@ public class ScoreManager : MonoBehaviour
|
|||
/// </summary>
|
||||
public void ReInit()
|
||||
{
|
||||
Debug.Log("重置计分脚本");
|
||||
scoreSubjectList.ForEach(a =>
|
||||
{
|
||||
a.Init();
|
||||
|
|
@ -69,6 +71,7 @@ public class ScoreManager : MonoBehaviour
|
|||
scoreModel.pointList.Add(scoreInfo);
|
||||
}
|
||||
|
||||
Debug.Log(JsonConvert.SerializeObject(scoreModel));
|
||||
return scoreModel;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
using Cysharp.Threading.Tasks.Triggers;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using UnityEngine;
|
||||
|
||||
/// <summary>
|
||||
/// 现场控制脚本
|
||||
/// </summary>
|
||||
public class SiteManager : MonoBehaviour
|
||||
{
|
||||
|
||||
public static SiteManager instance;
|
||||
|
||||
//场景中设备控制脚本
|
||||
public Device_Control device_Control;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
instance = this;
|
||||
//基类全部初始化
|
||||
device_Control.transform.GetComponentsInChildren<PermanentTriggerBase>(true).ToList().ForEach(a=>a.Awake());
|
||||
}
|
||||
}
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6589deeaefa4a17428d6c3ce0d699c77
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -107,6 +107,10 @@ public class StepState_1002 : StepState
|
|||
//场景首个步骤
|
||||
//与客户沟通
|
||||
|
||||
|
||||
//移动任务位置
|
||||
LiveSceneManager.Instance.transform.position = new Vector3(-166.3514f, 0.8813821f, -53.70396f);
|
||||
LiveSceneManager.Instance.transform.eulerAngles = new Vector3(0, -97.211f, 0);
|
||||
//完成第一步点击去工具间
|
||||
if (num == lastNum)
|
||||
{
|
||||
|
|
@ -161,6 +165,9 @@ public class StepState_1002 : StepState
|
|||
{
|
||||
//接线检查
|
||||
|
||||
//移动任务位置
|
||||
LiveSceneManager.Instance.transform.position = new Vector3(-174.7603f, 0.8813825f, -56.58477f);
|
||||
LiveSceneManager.Instance.transform.eulerAngles = new Vector3(0, -94.411f, 0);
|
||||
//还原npc负责人
|
||||
GameObject.FindObjectsOfType<NPCController>().ToList().ForEach(a =>
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ public class Tool_Spanner : Tool_Base
|
|||
Debug.Log("开始拧紧螺丝");
|
||||
hand_out_action?.Invoke();
|
||||
//螺丝刀移到螺丝上
|
||||
transform.parent = null;
|
||||
transform.parent = screw.transform;
|
||||
transform.DOLocalRotate(screw.installPos.localEulerAngles, 0.5f);
|
||||
transform.DOMove(screw.installPos.position, 1).OnComplete(() =>
|
||||
{
|
||||
|
|
@ -43,11 +43,11 @@ public class Tool_Spanner : Tool_Base
|
|||
Debug.Log("开始卸螺丝");
|
||||
hand_out_action?.Invoke();
|
||||
//螺丝刀移到螺丝处
|
||||
transform.parent = null;
|
||||
transform.parent = screw.transform;
|
||||
transform.DOLocalRotate(screw.installPos.localEulerAngles, 0.5f);
|
||||
transform.DOMove(screw.installPos.position, 1).OnComplete(() =>
|
||||
transform.DOLocalMove(screw.installPos.localPosition, 1).OnComplete(() =>
|
||||
{
|
||||
//screw.BeUnInstalled(this);
|
||||
screw.BeUnInstalled(this);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -76,13 +76,12 @@ public class Tool_SpannerScrew : Tool_Base
|
|||
transform.DOLocalMoveY(initPostionY, 1)
|
||||
.OnUpdate(() =>
|
||||
{
|
||||
transform.RotateAroundLocal(Vector3.up, 1);
|
||||
screwdriver.transform.position = installPos.position;
|
||||
screwdriver.transform.RotateAroundLocal(Vector3.right, 10);
|
||||
transform.RotateAroundLocal(Vector3.up, 10);
|
||||
})
|
||||
.OnComplete(() =>
|
||||
{
|
||||
Debug.Log("ÂÝË¿ÒÑÅ¡½ô");
|
||||
screwdriver.transform.parent = null;
|
||||
isInstall = true;
|
||||
isMoving = false;
|
||||
screwdriver.isMoving = false;
|
||||
|
|
@ -102,13 +101,12 @@ public class Tool_SpannerScrew : Tool_Base
|
|||
transform.DOLocalMoveY(initPostionY - 0.02f, 1)
|
||||
.OnUpdate(() =>
|
||||
{
|
||||
transform.RotateAroundLocal(Vector3.up, 1);
|
||||
screwdriver.transform.position = installPos.position;
|
||||
screwdriver.transform.RotateAroundLocal(Vector3.right, 10);
|
||||
transform.RotateAroundLocal(Vector3.up, 10);
|
||||
})
|
||||
.OnComplete(() =>
|
||||
{
|
||||
Debug.Log("ÂÝË¿ÒÑÅ¡ËÉ");
|
||||
screwdriver.transform.parent = null;
|
||||
isInstall = false;
|
||||
isMoving = false;
|
||||
screwdriver.isMoving = false;
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
using System;
|
||||
using System.Runtime.InteropServices.ComTypes;
|
||||
using UnityEngine;
|
||||
|
||||
|
|
@ -211,6 +212,9 @@ public class GameManager : SingletonAutoMono<GameManager>
|
|||
UIMgr.HidePanel<UI_SelectDevicePanel>();
|
||||
UIMgr.HidePanel<UI_BGPanel>();
|
||||
EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.9f);
|
||||
Debug.Log("重置开始时间");
|
||||
GameManager.RunModelMgr.startTime = DateTime.Now;
|
||||
ScoreManager.instance.ReInit();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using UnityEngine;
|
||||
|
||||
public class LiveSceneManager : SingletonMono<LiveSceneManager>
|
||||
|
|
@ -12,6 +13,9 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
|
|||
public Transform tMDTips;
|
||||
public string triggerName;
|
||||
|
||||
//场景中设备控制脚本
|
||||
public Device_Control device_Control;
|
||||
|
||||
protected override void Awake()
|
||||
{
|
||||
base.Awake();
|
||||
|
|
@ -19,6 +23,9 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
|
|||
tMDTips.gameObject.SetActive(false);
|
||||
GameManager.EventMgr.AddEventListener<GameObject>(Enum_EventType.TakeOutAndRetrievingTheTools, SetSpawnToolInfo);
|
||||
firstPersonController.zoomAction += OnZoom;
|
||||
|
||||
//基类全部初始化
|
||||
device_Control.transform.GetComponentsInChildren<PermanentTriggerBase>(true).ToList().ForEach(a => a.Awake());
|
||||
}
|
||||
|
||||
private void OnZoom(float value)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
|
@ -24,6 +25,11 @@ public class RunModelMgr : BaseManager<RunModelMgr>
|
|||
|
||||
public bool isOnceOfficeAni = false;
|
||||
|
||||
/// <summary>
|
||||
/// 练习和考试开始时间
|
||||
/// </summary>
|
||||
public DateTime startTime;
|
||||
|
||||
public E_ModeType ModeType
|
||||
{
|
||||
get => modeType;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ using System.Collections;
|
|||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using TMPro;
|
||||
using System;
|
||||
|
||||
public class UI_PracticeCompletedPanel : BasePanel
|
||||
{
|
||||
|
|
@ -20,7 +21,8 @@ public class UI_PracticeCompletedPanel : BasePanel
|
|||
}
|
||||
|
||||
GetControl<TextMeshProUGUI>("ScoreRes").text = scoreModel.score.ToString();
|
||||
GetControl<TextMeshProUGUI>("UsedTimesRes").text = "00:555";
|
||||
GetControl<TextMeshProUGUI>("UsedTimesRes").text = (DateTime.Now - GameManager.RunModelMgr.startTime).ToString(@"hh\:mm\:ss");
|
||||
Debug.Log("开始时间：" + GameManager.RunModelMgr.startTime.ToString() + " 结束时间：" + DateTime.Now.ToString());
|
||||
}
|
||||
|
||||
protected override void OnClick(string btnName)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using DG.Tweening;
|
||||
|
|
@ -84,6 +85,11 @@ public class UI_SelectDevicePanel : BasePanel
|
|||
GameManager.UIMgr.HidePanel<UI_SelectDevicePanel>();
|
||||
GameManager.UIMgr.HidePanel<UI_BGPanel>();
|
||||
GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.9f);
|
||||
if (GameManager.RunModelMgr.ModeType != E_ModeType.Study)
|
||||
{
|
||||
GameManager.RunModelMgr.startTime = DateTime.Now;
|
||||
Debug.Log("开始记时：" + GameManager.RunModelMgr.startTime.ToString());
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -18,14 +18,14 @@
|
|||
{
|
||||
"index": 3,
|
||||
"subProcessId": 3,
|
||||
"currentScore": 0.0,
|
||||
"isDone": false
|
||||
"currentScore": 5.0,
|
||||
"isDone": true
|
||||
},
|
||||
{
|
||||
"index": 4,
|
||||
"subProcessId": 4,
|
||||
"currentScore": 0.0,
|
||||
"isDone": false
|
||||
"currentScore": 5.0,
|
||||
"isDone": true
|
||||
},
|
||||
{
|
||||
"index": 5,
|
||||
|
|
|
|||
Loading…
Reference in New Issue