Bug Fixes from v1.0
- Fix lighting on desert - Move dialogue radius to correct spot - Disable movement while talking to NPCs - Move desert spawn point a little bit
This commit is contained in:
8
Assets/Scenes/Airship.meta
Normal file
8
Assets/Scenes/Airship.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 015eaf7503a4c8441a198bd2ba9ca929
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -97,7 +97,7 @@ LightmapSettings:
|
|||||||
m_ExportTrainingData: 0
|
m_ExportTrainingData: 0
|
||||||
m_TrainingDataDestination: TrainingData
|
m_TrainingDataDestination: TrainingData
|
||||||
m_LightProbeSampleCountMultiplier: 4
|
m_LightProbeSampleCountMultiplier: 4
|
||||||
m_LightingDataAsset: {fileID: 0}
|
m_LightingDataAsset: {fileID: 112000000, guid: 6864b4eb1e1acbf40a57a1a506e1e3ee, type: 2}
|
||||||
m_LightingSettings: {fileID: 0}
|
m_LightingSettings: {fileID: 0}
|
||||||
--- !u!196 &4
|
--- !u!196 &4
|
||||||
NavMeshSettings:
|
NavMeshSettings:
|
||||||
@@ -226,6 +226,11 @@ Transform:
|
|||||||
m_Father: {fileID: 178155227}
|
m_Father: {fileID: 178155227}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 4
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!4 &138018146 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 1361982760}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1 &148242351
|
--- !u!1 &148242351
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -832,7 +837,7 @@ MonoBehaviour:
|
|||||||
m_PrefabInstance: {fileID: 338826489}
|
m_PrefabInstance: {fileID: 338826489}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 0}
|
m_GameObject: {fileID: 0}
|
||||||
m_Enabled: 0
|
m_Enabled: 1
|
||||||
m_EditorHideFlags: 0
|
m_EditorHideFlags: 0
|
||||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
@@ -1102,6 +1107,103 @@ MeshFilter:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 382428140}
|
m_GameObject: {fileID: 382428140}
|
||||||
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
--- !u!1 &400394926
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 400394927}
|
||||||
|
- component: {fileID: 400394930}
|
||||||
|
- component: {fileID: 400394929}
|
||||||
|
- component: {fileID: 400394928}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Cube (2)
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &400394927
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 400394926}
|
||||||
|
m_LocalRotation: {x: -0, y: 0.49368256, z: -0, w: 0.86964214}
|
||||||
|
m_LocalPosition: {x: -66.2, y: 5.3, z: -244}
|
||||||
|
m_LocalScale: {x: 13.314615, y: 26.726276, z: 164.55}
|
||||||
|
m_ConstrainProportionsScale: 1
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 1378396660}
|
||||||
|
m_RootOrder: 7
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 59.166, z: 0}
|
||||||
|
--- !u!65 &400394928
|
||||||
|
BoxCollider:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 400394926}
|
||||||
|
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 &400394929
|
||||||
|
MeshRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 400394926}
|
||||||
|
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: 10303, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
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 &400394930
|
||||||
|
MeshFilter:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 400394926}
|
||||||
|
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
--- !u!1 &418943754
|
--- !u!1 &418943754
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -2147,6 +2249,103 @@ MonoBehaviour:
|
|||||||
_scene: WorldMap
|
_scene: WorldMap
|
||||||
_promptToEnter: 0
|
_promptToEnter: 0
|
||||||
_promptText: {fileID: 0}
|
_promptText: {fileID: 0}
|
||||||
|
--- !u!1 &1007946222
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1007946223}
|
||||||
|
- component: {fileID: 1007946226}
|
||||||
|
- component: {fileID: 1007946225}
|
||||||
|
- component: {fileID: 1007946224}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Cube
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &1007946223
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1007946222}
|
||||||
|
m_LocalRotation: {x: -0, y: -0.25153917, z: -0, w: 0.96784717}
|
||||||
|
m_LocalPosition: {x: -106.2, y: -11, z: -202.8}
|
||||||
|
m_LocalScale: {x: 13.314615, y: 26.726276, z: 164.55}
|
||||||
|
m_ConstrainProportionsScale: 1
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 1378396660}
|
||||||
|
m_RootOrder: 5
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: -29.137, z: 0}
|
||||||
|
--- !u!65 &1007946224
|
||||||
|
BoxCollider:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1007946222}
|
||||||
|
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 &1007946225
|
||||||
|
MeshRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1007946222}
|
||||||
|
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: 10303, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
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 &1007946226
|
||||||
|
MeshFilter:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1007946222}
|
||||||
|
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
--- !u!20 &1051381684 stripped
|
--- !u!20 &1051381684 stripped
|
||||||
Camera:
|
Camera:
|
||||||
m_CorrespondingSourceObject: {fileID: -1853094968961178454, guid: 2aea073605c49c44183ba251f4d708b3, type: 3}
|
m_CorrespondingSourceObject: {fileID: -1853094968961178454, guid: 2aea073605c49c44183ba251f4d708b3, type: 3}
|
||||||
@@ -2252,7 +2451,7 @@ Transform:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1075144244}
|
m_GameObject: {fileID: 1075144244}
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
m_LocalPosition: {x: 702.3, y: 256.52673, z: 2627.1}
|
m_LocalPosition: {x: 687.3, y: 256.52673, z: 2638.7}
|
||||||
m_LocalScale: {x: 34.02, y: 7.38, z: 34.02}
|
m_LocalScale: {x: 34.02, y: 7.38, z: 34.02}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
@@ -2603,7 +2802,7 @@ Transform:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1163178682}
|
m_GameObject: {fileID: 1163178682}
|
||||||
m_LocalRotation: {x: 0, y: 0.5, z: 0, w: 0.8660254}
|
m_LocalRotation: {x: 0, y: 0.5, z: 0, w: 0.8660254}
|
||||||
m_LocalPosition: {x: 3.2516403, y: 26.956305, z: -27.744102}
|
m_LocalPosition: {x: 3.2516403, y: -129, z: -27.744102}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
@@ -2613,6 +2812,7 @@ Transform:
|
|||||||
- {fileID: 183386901}
|
- {fileID: 183386901}
|
||||||
- {fileID: 1458446960}
|
- {fileID: 1458446960}
|
||||||
- {fileID: 1075144245}
|
- {fileID: 1075144245}
|
||||||
|
- {fileID: 138018146}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 3
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 60, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 60, z: 0}
|
||||||
@@ -2761,6 +2961,127 @@ MeshCollider:
|
|||||||
m_Convex: 0
|
m_Convex: 0
|
||||||
m_CookingOptions: 30
|
m_CookingOptions: 30
|
||||||
m_Mesh: {fileID: -1550514412580984892, guid: 150291eb022c5b24cae3bc1f64f43aae, type: 3}
|
m_Mesh: {fileID: -1550514412580984892, guid: 150291eb022c5b24cae3bc1f64f43aae, type: 3}
|
||||||
|
--- !u!1001 &1361982760
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
m_TransformParent: {fileID: 1163178683}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_RootOrder
|
||||||
|
value: 6
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_LocalScale.x
|
||||||
|
value: 6.2178373
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_LocalScale.y
|
||||||
|
value: 6.2178383
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_LocalScale.z
|
||||||
|
value: 6.2178373
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 729
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 243.9
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 2641.8
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 0.45041186
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: 0.050598767
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: -0.8735228
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: 0.17755802
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 20.841
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: -124.638
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 4.391
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_ConstrainProportionsScale
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -5824510187379060028, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_Layer
|
||||||
|
value: 3
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -3215555783603854218, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_Layer
|
||||||
|
value: 3
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -1018664272722485354, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_Layer
|
||||||
|
value: 3
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -391268320553695201, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_Layer
|
||||||
|
value: 3
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 919132149155446097, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: desert
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 919132149155446097, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_Layer
|
||||||
|
value: 3
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 919132149155446097, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_TagString
|
||||||
|
value: MainCamera
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 1365132098506396400, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_Layer
|
||||||
|
value: 3
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 3735102090226358198, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_Layer
|
||||||
|
value: 3
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4424396828587804706, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_Layer
|
||||||
|
value: 3
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 6809363509681133152, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_Layer
|
||||||
|
value: 3
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 7861854473326295642, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_Layer
|
||||||
|
value: 3
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8208229975827745842, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
|
propertyPath: m_Layer
|
||||||
|
value: 3
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
|
||||||
--- !u!1 &1378396659
|
--- !u!1 &1378396659
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -2794,6 +3115,9 @@ Transform:
|
|||||||
- {fileID: 200011757}
|
- {fileID: 200011757}
|
||||||
- {fileID: 1430509576}
|
- {fileID: 1430509576}
|
||||||
- {fileID: 427392945}
|
- {fileID: 427392945}
|
||||||
|
- {fileID: 1007946223}
|
||||||
|
- {fileID: 1815534398}
|
||||||
|
- {fileID: 400394927}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0}
|
||||||
@@ -2848,6 +3172,10 @@ PrefabInstance:
|
|||||||
propertyPath: m_LocalEulerAnglesHint.z
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
value: 0
|
value: 0
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: -1853094968961178454, guid: c6aa81c7b978a9641944a93cf80b7b52, type: 3}
|
||||||
|
propertyPath: m_Enabled
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: -1853094968961178454, guid: c6aa81c7b978a9641944a93cf80b7b52, type: 3}
|
- target: {fileID: -1853094968961178454, guid: c6aa81c7b978a9641944a93cf80b7b52, type: 3}
|
||||||
propertyPath: m_ClearFlags
|
propertyPath: m_ClearFlags
|
||||||
value: 3
|
value: 3
|
||||||
@@ -3635,6 +3963,103 @@ MeshCollider:
|
|||||||
m_Convex: 0
|
m_Convex: 0
|
||||||
m_CookingOptions: 30
|
m_CookingOptions: 30
|
||||||
m_Mesh: {fileID: 3447038591770236762, guid: c6aa81c7b978a9641944a93cf80b7b52, type: 3}
|
m_Mesh: {fileID: 3447038591770236762, guid: c6aa81c7b978a9641944a93cf80b7b52, type: 3}
|
||||||
|
--- !u!1 &1815534397
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1815534398}
|
||||||
|
- component: {fileID: 1815534401}
|
||||||
|
- component: {fileID: 1815534400}
|
||||||
|
- component: {fileID: 1815534399}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Cube (1)
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &1815534398
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1815534397}
|
||||||
|
m_LocalRotation: {x: -0, y: -0.49486074, z: -0, w: 0.8689723}
|
||||||
|
m_LocalPosition: {x: -91.5, y: -11, z: -178}
|
||||||
|
m_LocalScale: {x: 13.314615, y: 26.726276, z: 164.55}
|
||||||
|
m_ConstrainProportionsScale: 1
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 1378396660}
|
||||||
|
m_RootOrder: 6
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: -59.321, z: 0}
|
||||||
|
--- !u!65 &1815534399
|
||||||
|
BoxCollider:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1815534397}
|
||||||
|
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 &1815534400
|
||||||
|
MeshRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1815534397}
|
||||||
|
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: 10303, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
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 &1815534401
|
||||||
|
MeshFilter:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1815534397}
|
||||||
|
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
--- !u!1 &1863585018
|
--- !u!1 &1863585018
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -4427,15 +4852,15 @@ PrefabInstance:
|
|||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 4102339165664243601, guid: f9a0ded25c3cfb34ba4a1da1528edaa4, type: 3}
|
- target: {fileID: 4102339165664243601, guid: f9a0ded25c3cfb34ba4a1da1528edaa4, type: 3}
|
||||||
propertyPath: m_LocalPosition.x
|
propertyPath: m_LocalPosition.x
|
||||||
value: -9.8
|
value: -13.61
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 4102339165664243601, guid: f9a0ded25c3cfb34ba4a1da1528edaa4, type: 3}
|
- target: {fileID: 4102339165664243601, guid: f9a0ded25c3cfb34ba4a1da1528edaa4, type: 3}
|
||||||
propertyPath: m_LocalPosition.y
|
propertyPath: m_LocalPosition.y
|
||||||
value: 2.6
|
value: 1.27
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 4102339165664243601, guid: f9a0ded25c3cfb34ba4a1da1528edaa4, type: 3}
|
- target: {fileID: 4102339165664243601, guid: f9a0ded25c3cfb34ba4a1da1528edaa4, type: 3}
|
||||||
propertyPath: m_LocalPosition.z
|
propertyPath: m_LocalPosition.z
|
||||||
value: 39.9
|
value: 40.47
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 4102339165664243601, guid: f9a0ded25c3cfb34ba4a1da1528edaa4, type: 3}
|
- target: {fileID: 4102339165664243601, guid: f9a0ded25c3cfb34ba4a1da1528edaa4, type: 3}
|
||||||
propertyPath: m_LocalRotation.w
|
propertyPath: m_LocalRotation.w
|
||||||
|
|||||||
BIN
Assets/Scenes/Airship/LightingData.asset
Normal file
BIN
Assets/Scenes/Airship/LightingData.asset
Normal file
Binary file not shown.
8
Assets/Scenes/Airship/LightingData.asset.meta
Normal file
8
Assets/Scenes/Airship/LightingData.asset.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6864b4eb1e1acbf40a57a1a506e1e3ee
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 112000000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Scenes/Airship/ReflectionProbe-0.exr
(Stored with Git LFS)
Normal file
BIN
Assets/Scenes/Airship/ReflectionProbe-0.exr
(Stored with Git LFS)
Normal file
Binary file not shown.
98
Assets/Scenes/Airship/ReflectionProbe-0.exr.meta
Normal file
98
Assets/Scenes/Airship/ReflectionProbe-0.exr.meta
Normal file
@@ -0,0 +1,98 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5295fc07f28e0434a9ee6296b7502c9a
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 11
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 1
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMasterTextureLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 1
|
||||||
|
seamlessCubemap: 1
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 2
|
||||||
|
aniso: 0
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: 1
|
||||||
|
nPOTScale: 1
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 0
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 0
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 0
|
||||||
|
textureShape: 2
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 100
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -1014,7 +1014,7 @@ Transform:
|
|||||||
m_GameObject: {fileID: 434372711}
|
m_GameObject: {fileID: 434372711}
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
m_LocalPosition: {x: 0, y: 0, z: -0.97}
|
m_LocalPosition: {x: 0, y: 0, z: -0.97}
|
||||||
m_LocalScale: {x: 0, y: 0, z: 1}
|
m_LocalScale: {x: 52, y: 52, z: 52}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 1026745489}
|
m_Father: {fileID: 1026745489}
|
||||||
@@ -1044,10 +1044,10 @@ Camera:
|
|||||||
width: 1
|
width: 1
|
||||||
height: 1
|
height: 1
|
||||||
near clip plane: 0.3
|
near clip plane: 0.3
|
||||||
far clip plane: 10
|
far clip plane: 500
|
||||||
field of view: 60
|
field of view: 60
|
||||||
orthographic: 1
|
orthographic: 1
|
||||||
orthographic size: 4.469144
|
orthographic size: 233.80328
|
||||||
m_Depth: -1
|
m_Depth: -1
|
||||||
m_CullingMask:
|
m_CullingMask:
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
@@ -1220,16 +1220,16 @@ Transform:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 547860442}
|
m_GameObject: {fileID: 547860442}
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
m_LocalRotation: {x: -0, y: 0.17839941, z: -0, w: 0.98395824}
|
||||||
m_LocalPosition: {x: -1454.3607, y: -105.02883, z: -3120.1443}
|
m_LocalPosition: {x: -379.8931, y: 1003.1914, z: -3185.8276}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 52, y: 52, z: 52}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 1
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 939848616}
|
- {fileID: 939848616}
|
||||||
- {fileID: 1733846367}
|
- {fileID: 1733846367}
|
||||||
m_Father: {fileID: 324165025}
|
m_Father: {fileID: 324165025}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 20.553, z: 0}
|
||||||
--- !u!1 &550186600
|
--- !u!1 &550186600
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -1256,14 +1256,14 @@ Transform:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 550186600}
|
m_GameObject: {fileID: 550186600}
|
||||||
m_LocalRotation: {x: -0.38426408, y: 0.15527062, z: 0.07130489, w: 0.9072749}
|
m_LocalRotation: {x: 0.054631226, y: -0.8413812, z: 0.47694758, w: 0.24822205}
|
||||||
m_LocalPosition: {x: -182.06, y: 1975.69, z: -2623.2}
|
m_LocalPosition: {x: -188.40002, y: 1952.6998, z: -2641.7007}
|
||||||
m_LocalScale: {x: 2.6279, y: 2.6279, z: 2.6279}
|
m_LocalScale: {x: 2.6279, y: 2.6279, z: 2.6279}
|
||||||
m_ConstrainProportionsScale: 1
|
m_ConstrainProportionsScale: 1
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 415365761}
|
m_Father: {fileID: 415365761}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: -46.006, y: 19.071, z: 0.83}
|
m_LocalEulerAnglesHint: {x: 56.069, y: -139.084, z: 15.04}
|
||||||
--- !u!65 &550186602
|
--- !u!65 &550186602
|
||||||
BoxCollider:
|
BoxCollider:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -1833,7 +1833,7 @@ Transform:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 848458273}
|
m_GameObject: {fileID: 848458273}
|
||||||
m_LocalRotation: {x: 0.41734633, y: 0.18772355, z: -0.08855367, w: 0.8847261}
|
m_LocalRotation: {x: 0.41734633, y: 0.18772355, z: -0.08855367, w: 0.8847261}
|
||||||
m_LocalPosition: {x: -207.45, y: 1887.5, z: -2672.4}
|
m_LocalPosition: {x: -207.2, y: 1888, z: -2671.8}
|
||||||
m_LocalScale: {x: 4.458758, y: 4.458758, z: 4.458758}
|
m_LocalScale: {x: 4.458758, y: 4.458758, z: 4.458758}
|
||||||
m_ConstrainProportionsScale: 1
|
m_ConstrainProportionsScale: 1
|
||||||
m_Children: []
|
m_Children: []
|
||||||
@@ -2022,14 +2022,14 @@ Transform:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 909201194}
|
m_GameObject: {fileID: 909201194}
|
||||||
m_LocalRotation: {x: -0, y: -0.35973576, z: -0, w: 0.93305427}
|
m_LocalRotation: {x: -0, y: -0.37143126, z: -0, w: 0.9284605}
|
||||||
m_LocalPosition: {x: -1359.4, y: -104.134674, z: -3273.3}
|
m_LocalPosition: {x: -1362, y: -104.134674, z: -3275.7}
|
||||||
m_LocalScale: {x: 10.02, y: 75.8934, z: 133.91023}
|
m_LocalScale: {x: 10.02, y: 75.8934, z: 133.91023}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 2077331998}
|
m_Father: {fileID: 2077331998}
|
||||||
m_RootOrder: 9
|
m_RootOrder: 9
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: -42.168, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: -43.608, z: 0}
|
||||||
--- !u!65 &909201196
|
--- !u!65 &909201196
|
||||||
BoxCollider:
|
BoxCollider:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -2366,7 +2366,7 @@ Transform:
|
|||||||
m_GameObject: {fileID: 1026745488}
|
m_GameObject: {fileID: 1026745488}
|
||||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
m_LocalPosition: {x: 500, y: 0, z: 0}
|
m_LocalPosition: {x: 500, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 52, y: 52, z: 52}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 434372712}
|
- {fileID: 434372712}
|
||||||
@@ -3265,14 +3265,14 @@ Transform:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1620235925}
|
m_GameObject: {fileID: 1620235925}
|
||||||
m_LocalRotation: {x: -0.7057846, y: 0.14371932, z: 0.14975522, w: 0.6773376}
|
m_LocalRotation: {x: -0.8522976, y: 0.10187135, z: 0.18084274, w: 0.48011136}
|
||||||
m_LocalPosition: {x: -180.2, y: 1986, z: -2607.3}
|
m_LocalPosition: {x: -192.6, y: 1969.5, z: -2640.5}
|
||||||
m_LocalScale: {x: 4.458758, y: 4.458758, z: 4.458758}
|
m_LocalScale: {x: 4.458758, y: 4.458758, z: 4.458758}
|
||||||
m_ConstrainProportionsScale: 1
|
m_ConstrainProportionsScale: 1
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 2091755361}
|
m_Father: {fileID: 2091755361}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: -92.356, y: 23.959, z: 0}
|
m_LocalEulerAnglesHint: {x: -121.214005, y: 23.959, z: 0}
|
||||||
--- !u!114 &1620235927
|
--- !u!114 &1620235927
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -3454,7 +3454,7 @@ MonoBehaviour:
|
|||||||
m_PrefabInstance: {fileID: 1631886793}
|
m_PrefabInstance: {fileID: 1631886793}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 0}
|
m_GameObject: {fileID: 0}
|
||||||
m_Enabled: 0
|
m_Enabled: 1
|
||||||
m_EditorHideFlags: 0
|
m_EditorHideFlags: 0
|
||||||
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
|
|||||||
@@ -10299,6 +10299,104 @@ Transform:
|
|||||||
m_Father: {fileID: 1310276638}
|
m_Father: {fileID: 1310276638}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!1 &2125507035
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 2125507036}
|
||||||
|
- component: {fileID: 2125507039}
|
||||||
|
- component: {fileID: 2125507038}
|
||||||
|
- component: {fileID: 2125507037}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Cylinder
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &2125507036
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2125507035}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: -29.6, y: 12.6, z: -1.2}
|
||||||
|
m_LocalScale: {x: 16.66, y: 16.66, z: 16.66}
|
||||||
|
m_ConstrainProportionsScale: 1
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 1572351517}
|
||||||
|
m_RootOrder: 12
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!136 &2125507037
|
||||||
|
CapsuleCollider:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2125507035}
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_IsTrigger: 0
|
||||||
|
m_Enabled: 1
|
||||||
|
m_Radius: 0.5000001
|
||||||
|
m_Height: 2
|
||||||
|
m_Direction: 1
|
||||||
|
m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
|
||||||
|
--- !u!23 &2125507038
|
||||||
|
MeshRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2125507035}
|
||||||
|
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: 10303, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
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 &2125507039
|
||||||
|
MeshFilter:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2125507035}
|
||||||
|
m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
--- !u!1 &2134677752 stripped
|
--- !u!1 &2134677752 stripped
|
||||||
GameObject:
|
GameObject:
|
||||||
m_CorrespondingSourceObject: {fileID: 868982310190702839, guid: 51f29eb6c8a88234f818b1d46a1616c5, type: 3}
|
m_CorrespondingSourceObject: {fileID: 868982310190702839, guid: 51f29eb6c8a88234f818b1d46a1616c5, type: 3}
|
||||||
|
|||||||
@@ -136,7 +136,6 @@ GameObject:
|
|||||||
- component: {fileID: 82478}
|
- component: {fileID: 82478}
|
||||||
- component: {fileID: 82482}
|
- component: {fileID: 82482}
|
||||||
- component: {fileID: 82477}
|
- component: {fileID: 82477}
|
||||||
- component: {fileID: 82481}
|
|
||||||
m_Layer: 5
|
m_Layer: 5
|
||||||
m_Name: Canvas
|
m_Name: Canvas
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -227,18 +226,6 @@ RectTransform:
|
|||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0, y: 0}
|
m_Pivot: {x: 0, y: 0}
|
||||||
--- !u!114 &82481
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 82476}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 2044eafc47036a6459f95752a0b147d8, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
--- !u!114 &82482
|
--- !u!114 &82482
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -426,6 +413,50 @@ MeshCollider:
|
|||||||
m_Convex: 0
|
m_Convex: 0
|
||||||
m_CookingOptions: 30
|
m_CookingOptions: 30
|
||||||
m_Mesh: {fileID: -7453770956514601984, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3}
|
m_Mesh: {fileID: -7453770956514601984, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3}
|
||||||
|
--- !u!1 &420132726
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 420132728}
|
||||||
|
- component: {fileID: 420132727}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: TitleScreen
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!114 &420132727
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 420132726}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 2044eafc47036a6459f95752a0b147d8, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
--- !u!4 &420132728
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 420132726}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: -541.1698, y: -25.461891, z: 40.570076}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_RootOrder: 5
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1 &506946345 stripped
|
--- !u!1 &506946345 stripped
|
||||||
GameObject:
|
GameObject:
|
||||||
m_CorrespondingSourceObject: {fileID: -7146521406498821007, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3}
|
m_CorrespondingSourceObject: {fileID: -7146521406498821007, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3}
|
||||||
@@ -1300,6 +1331,74 @@ MeshCollider:
|
|||||||
m_Convex: 0
|
m_Convex: 0
|
||||||
m_CookingOptions: 30
|
m_CookingOptions: 30
|
||||||
m_Mesh: {fileID: -5495902117074765545, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3}
|
m_Mesh: {fileID: -5495902117074765545, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3}
|
||||||
|
--- !u!1 &1483447512
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1483447515}
|
||||||
|
- component: {fileID: 1483447514}
|
||||||
|
- component: {fileID: 1483447513}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: EventSystem
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!114 &1483447513
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1483447512}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_SendPointerHoverToParent: 1
|
||||||
|
m_HorizontalAxis: Horizontal
|
||||||
|
m_VerticalAxis: Vertical
|
||||||
|
m_SubmitButton: Submit
|
||||||
|
m_CancelButton: Cancel
|
||||||
|
m_InputActionsPerSecond: 10
|
||||||
|
m_RepeatDelay: 0.5
|
||||||
|
m_ForceModuleActive: 0
|
||||||
|
--- !u!114 &1483447514
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1483447512}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_FirstSelected: {fileID: 0}
|
||||||
|
m_sendNavigationEvents: 1
|
||||||
|
m_DragThreshold: 10
|
||||||
|
--- !u!4 &1483447515
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1483447512}
|
||||||
|
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: 6
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1 &1497123222 stripped
|
--- !u!1 &1497123222 stripped
|
||||||
GameObject:
|
GameObject:
|
||||||
m_CorrespondingSourceObject: {fileID: 2800250516343163423, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3}
|
m_CorrespondingSourceObject: {fileID: 2800250516343163423, guid: 0a9a3f5c4de4a4f47b63545c21814d72, type: 3}
|
||||||
|
|||||||
@@ -3069,7 +3069,7 @@ MonoBehaviour:
|
|||||||
TalkedToFrog: 0
|
TalkedToFrog: 0
|
||||||
TalkedToIceGuy: 0
|
TalkedToIceGuy: 0
|
||||||
TalkedToAirshipGuy: 0
|
TalkedToAirshipGuy: 0
|
||||||
SanctumUnlocked: 0
|
SanctumUnlocked: 1
|
||||||
VoidOpened: 0
|
VoidOpened: 0
|
||||||
--- !u!4 &1925236433
|
--- !u!4 &1925236433
|
||||||
Transform:
|
Transform:
|
||||||
|
|||||||
@@ -7,6 +7,18 @@ namespace Scampz.GameJam
|
|||||||
[SerializeField]
|
[SerializeField]
|
||||||
private Animator animator;
|
private Animator animator;
|
||||||
|
|
||||||
|
public static LevelChanger Instance;
|
||||||
|
|
||||||
|
private void Awake()
|
||||||
|
{
|
||||||
|
if (Instance != null && Instance != this)
|
||||||
|
{
|
||||||
|
DestroyImmediate(this);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Instance = this;
|
||||||
|
}
|
||||||
|
|
||||||
public void FadeAnimation()
|
public void FadeAnimation()
|
||||||
{
|
{
|
||||||
animator.SetTrigger("Start");
|
animator.SetTrigger("Start");
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using Scampz.GameJam.Assets.Scripts;
|
||||||
using Scampz.GameJam.Assets.Scripts.Audio;
|
using Scampz.GameJam.Assets.Scripts.Audio;
|
||||||
using Scampz.GameJam.Assets.Scripts.Utilities;
|
using Scampz.GameJam.Assets.Scripts.Utilities;
|
||||||
using TMPro;
|
using TMPro;
|
||||||
@@ -120,6 +121,9 @@ namespace Scampz.GameJam
|
|||||||
_dialogueTextGUI.text = string.Empty;
|
_dialogueTextGUI.text = string.Empty;
|
||||||
IsTalking = false;
|
IsTalking = false;
|
||||||
SFXManager.Instance.StopSoundEffect();
|
SFXManager.Instance.StopSoundEffect();
|
||||||
|
var player = GameObject.FindGameObjectWithTag("Player");
|
||||||
|
var inputController = player.GetComponent<CharacterInputController>();
|
||||||
|
inputController.EnableActions();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using Scampz.GameJam.Assets.Scripts;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.InputSystem;
|
using UnityEngine.InputSystem;
|
||||||
|
|
||||||
@@ -33,7 +34,9 @@ namespace Scampz.GameJam
|
|||||||
private void OnTriggerExit(Collider other)
|
private void OnTriggerExit(Collider other)
|
||||||
{
|
{
|
||||||
if (other.CompareTag("Player"))
|
if (other.CompareTag("Player"))
|
||||||
|
{
|
||||||
_isWithinRange = false;
|
_isWithinRange = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Update()
|
private void Update()
|
||||||
@@ -41,10 +44,9 @@ namespace Scampz.GameJam
|
|||||||
if (_isWithinRange && confirmAction.triggered && !DialogueManager.Instance.IsTalking)
|
if (_isWithinRange && confirmAction.triggered && !DialogueManager.Instance.IsTalking)
|
||||||
{
|
{
|
||||||
var player = GameObject.FindGameObjectWithTag("Player");
|
var player = GameObject.FindGameObjectWithTag("Player");
|
||||||
var cc = player.GetComponent<CharacterController>();
|
var inputController = player.GetComponent<CharacterInputController>();
|
||||||
cc.enabled = false;
|
inputController.DisableActions();
|
||||||
_dialogueTrigger.TriggerDialogue();
|
_dialogueTrigger.TriggerDialogue();
|
||||||
cc.enabled = true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ namespace Scampz.GameJam
|
|||||||
{
|
{
|
||||||
if (Instance != null && Instance != this)
|
if (Instance != null && Instance != this)
|
||||||
{
|
{
|
||||||
Destroy(this);
|
DestroyImmediate(this);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Instance = this;
|
Instance = this;
|
||||||
@@ -28,8 +28,7 @@ namespace Scampz.GameJam
|
|||||||
{
|
{
|
||||||
yield return null;
|
yield return null;
|
||||||
var player = GameObject.FindGameObjectWithTag("Player");
|
var player = GameObject.FindGameObjectWithTag("Player");
|
||||||
var levelChanger = GetComponentInChildren<LevelChanger>();
|
LevelChanger.Instance.FadeAnimation();
|
||||||
levelChanger.FadeAnimation();
|
|
||||||
yield return null;
|
yield return null;
|
||||||
var loadSceneOperation = SceneManager.LoadSceneAsync(sceneName, loadSceneMode);
|
var loadSceneOperation = SceneManager.LoadSceneAsync(sceneName, loadSceneMode);
|
||||||
yield return new WaitForSeconds(3f);
|
yield return new WaitForSeconds(3f);
|
||||||
|
|||||||
@@ -15,6 +15,16 @@ namespace Scampz.GameJam.Assets.Scripts
|
|||||||
private InputAction move;
|
private InputAction move;
|
||||||
private InputAction sprint;
|
private InputAction sprint;
|
||||||
|
|
||||||
|
public void EnableActions()
|
||||||
|
{
|
||||||
|
move.Enable();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void DisableActions()
|
||||||
|
{
|
||||||
|
move.Disable();
|
||||||
|
}
|
||||||
|
|
||||||
private void Awake()
|
private void Awake()
|
||||||
{
|
{
|
||||||
playerControls = new PlayerControls();
|
playerControls = new PlayerControls();
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ namespace Scampz.GameJam.Assets.Scripts.Player
|
|||||||
|
|
||||||
public void OnTriggerStay(Collider other)
|
public void OnTriggerStay(Collider other)
|
||||||
{
|
{
|
||||||
if (confirmAction.triggered)
|
if (other.CompareTag("Player") && confirmAction.triggered)
|
||||||
UnlockSanctumState.Instance.VoidOpened = true;
|
UnlockSanctumState.Instance.VoidOpened = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using Scampz.GameJam.Assets.Scripts;
|
using Scampz.GameJam.Assets.Scripts;
|
||||||
|
using TMPro;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.InputSystem;
|
using UnityEngine.InputSystem;
|
||||||
using UnityEngine.SceneManagement;
|
using UnityEngine.SceneManagement;
|
||||||
@@ -16,10 +17,18 @@ namespace Scampz.GameJam
|
|||||||
confirmAction.Enable();
|
confirmAction.Enable();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void OnDisable()
|
||||||
|
{
|
||||||
|
confirmAction.Disable();
|
||||||
|
}
|
||||||
|
|
||||||
void Update()
|
void Update()
|
||||||
{
|
{
|
||||||
if (confirmAction.triggered)
|
var uiText = GetComponentInChildren<TextMeshProUGUI>();
|
||||||
|
if (confirmAction.inProgress)
|
||||||
|
{
|
||||||
GameManager.Instance.LoadScene(SceneNames.WorldMap, LoadSceneMode.Single);
|
GameManager.Instance.LoadScene(SceneNames.WorldMap, LoadSceneMode.Single);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1064,7 +1064,7 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0.5}
|
m_AnchorMin: {x: 0, y: 0.5}
|
||||||
m_AnchorMax: {x: 1, y: 0.5}
|
m_AnchorMax: {x: 1, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 230, y: -250}
|
m_AnchoredPosition: {x: 230, y: -233}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &4906054560261868901
|
--- !u!222 &4906054560261868901
|
||||||
@@ -1272,7 +1272,7 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0.5}
|
m_AnchorMin: {x: 0, y: 0.5}
|
||||||
m_AnchorMax: {x: 1, y: 0.5}
|
m_AnchorMax: {x: 1, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 230, y: -250}
|
m_AnchoredPosition: {x: 230, y: -244}
|
||||||
m_SizeDelta: {x: 0, y: 0}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &7154132065920303895
|
--- !u!222 &7154132065920303895
|
||||||
|
|||||||
@@ -811,7 +811,7 @@ PlayerSettings:
|
|||||||
m_VersionCode: 1
|
m_VersionCode: 1
|
||||||
m_VersionName:
|
m_VersionName:
|
||||||
apiCompatibilityLevel: 6
|
apiCompatibilityLevel: 6
|
||||||
activeInputHandler: 1
|
activeInputHandler: 2
|
||||||
cloudProjectId:
|
cloudProjectId:
|
||||||
framebufferDepthMemorylessMode: 0
|
framebufferDepthMemorylessMode: 0
|
||||||
qualitySettingsNames: []
|
qualitySettingsNames: []
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ TagManager:
|
|||||||
- PromptToEnter
|
- PromptToEnter
|
||||||
- Void Text
|
- Void Text
|
||||||
- VoidBarrier
|
- VoidBarrier
|
||||||
|
- Input
|
||||||
layers:
|
layers:
|
||||||
- Default
|
- Default
|
||||||
- TransparentFX
|
- TransparentFX
|
||||||
|
|||||||
Reference in New Issue
Block a user