Compare commits
27 Commits
a71043121f
...
PauseMenu
| Author | SHA1 | Date | |
|---|---|---|---|
| ba8883786b | |||
| 1ed57d5c31 | |||
| 26e2d0d1db | |||
| e0f3c3e580 | |||
| 194574ee65 | |||
| 53893b63a6 | |||
| aaf536d7ec | |||
| 808cbfd033 | |||
| c539311caf | |||
| 5d197d0958 | |||
|
|
0bd4fcc0a0 | ||
|
|
af07a29f40 | ||
|
|
53bd10a13c | ||
|
|
99d412b258 | ||
| fb14e165d4 | |||
|
|
72401758e2 | ||
|
|
06fde8ab2e | ||
|
|
8246a9ef8a | ||
|
|
851b7ae0da | ||
| c23213ad50 | |||
|
|
f0649da5d3 | ||
| f76431d855 | |||
|
|
22e4260521 | ||
|
|
6f8245e798 | ||
|
|
f2c0c3d9a1 | ||
|
|
ec8a34daf5 | ||
|
|
c2767fe0d1 |
@@ -45,7 +45,7 @@ Material:
|
|||||||
m_Scale: {x: 1, y: 1}
|
m_Scale: {x: 1, y: 1}
|
||||||
m_Offset: {x: 0, y: 0}
|
m_Offset: {x: 0, y: 0}
|
||||||
- _MainTex:
|
- _MainTex:
|
||||||
m_Texture: {fileID: 0}
|
m_Texture: {fileID: 2800000, guid: e69c70d80df2ecd4abd2fc7987f311d1, type: 3}
|
||||||
m_Scale: {x: 1, y: 1}
|
m_Scale: {x: 1, y: 1}
|
||||||
m_Offset: {x: 0, y: 0}
|
m_Offset: {x: 0, y: 0}
|
||||||
- _MetallicGlossMap:
|
- _MetallicGlossMap:
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
<<<<<<< HEAD:Assets/LowPolyDungeons/LowPolyDungeons_HDRP_2018.4.unitypackage.meta
|
<<<<<<< HEAD:Assets/LowPolyDungeons/LowPolyDungeons_HDRP_2018.4.unitypackage.meta
|
||||||
guid: c9f42f34fc0706c499aa448484f3db62
|
guid: e57b8538d2f0202469da68a1e5712dd6
|
||||||
=======
|
=======
|
||||||
guid: 20b2cd43130816e429a419c3adf589b0
|
guid: 20b2cd43130816e429a419c3adf589b0
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
|
<<<<<<<< HEAD:Assets/QuickOutline/Samples/Scenes/QuickOutline.unity.meta
|
||||||
|
guid: 96e0f305ff8e6e24fa04570a5e239535
|
||||||
|
timeCreated: 1522615825
|
||||||
|
licenseType: Store
|
||||||
|
========
|
||||||
guid: 3e003a7052336a84388878dca47c8528
|
guid: 3e003a7052336a84388878dca47c8528
|
||||||
|
>>>>>>>> origin/DoorInteration:Assets/LowPolyDungeons/Scenes/LowPolyDungeons_Demo.unity.meta
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
|
|||||||
@@ -1,5 +1,12 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
|
<<<<<<<< HEAD:Assets/QuickOutline/Resources.meta
|
||||||
|
guid: 3e7161d0fb662244a9a6c1e02c2df1d5
|
||||||
|
folderAsset: yes
|
||||||
|
timeCreated: 1522559128
|
||||||
|
licenseType: Store
|
||||||
|
========
|
||||||
guid: f0ea08c3c4ee3b2429e2068231686db1
|
guid: f0ea08c3c4ee3b2429e2068231686db1
|
||||||
|
>>>>>>>> origin/DoorInteration:Assets/LowPolyDungeons/Scenes/LowPolyDungeons_Overview.unity.meta
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
|
|||||||
@@ -22,13 +22,13 @@ Material:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: HandStopParticle
|
m_Name: HandStopParticle
|
||||||
m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3}
|
m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3}
|
||||||
m_ShaderKeywords: _EMISSION
|
m_ShaderKeywords: _ALPHATEST_ON _EMISSION
|
||||||
m_LightmapFlags: 0
|
m_LightmapFlags: 0
|
||||||
m_EnableInstancingVariants: 0
|
m_EnableInstancingVariants: 0
|
||||||
m_DoubleSidedGI: 0
|
m_DoubleSidedGI: 0
|
||||||
m_CustomRenderQueue: -1
|
m_CustomRenderQueue: 2450
|
||||||
stringTagMap:
|
stringTagMap:
|
||||||
RenderType: Opaque
|
RenderType: TransparentCutout
|
||||||
disabledShaderPasses:
|
disabledShaderPasses:
|
||||||
- ALWAYS
|
- ALWAYS
|
||||||
m_SavedProperties:
|
m_SavedProperties:
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -45,7 +45,7 @@ Material:
|
|||||||
m_Scale: {x: 1, y: 1}
|
m_Scale: {x: 1, y: 1}
|
||||||
m_Offset: {x: 0, y: 0}
|
m_Offset: {x: 0, y: 0}
|
||||||
- _MainTex:
|
- _MainTex:
|
||||||
m_Texture: {fileID: 0}
|
m_Texture: {fileID: 2800000, guid: b1f40c50ae24356469c6c6d4bfb2a2d6, type: 3}
|
||||||
m_Scale: {x: 1, y: 1}
|
m_Scale: {x: 1, y: 1}
|
||||||
m_Offset: {x: 0, y: 0}
|
m_Offset: {x: 0, y: 0}
|
||||||
- _MetallicGlossMap:
|
- _MetallicGlossMap:
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ Material:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: OculusTouchForQuestAndRiftS_Material
|
m_Name: OculusTouchForQuestAndRiftS_Material
|
||||||
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
|
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
|
||||||
m_ShaderKeywords: _GLOSSINESS_FROM_BASE_ALPHA _SPECULAR_COLOR
|
m_ShaderKeywords:
|
||||||
m_LightmapFlags: 4
|
m_LightmapFlags: 4
|
||||||
m_EnableInstancingVariants: 0
|
m_EnableInstancingVariants: 0
|
||||||
m_DoubleSidedGI: 0
|
m_DoubleSidedGI: 0
|
||||||
@@ -45,7 +45,7 @@ Material:
|
|||||||
m_Scale: {x: 1, y: 1}
|
m_Scale: {x: 1, y: 1}
|
||||||
m_Offset: {x: 0, y: 0}
|
m_Offset: {x: 0, y: 0}
|
||||||
- _MainTex:
|
- _MainTex:
|
||||||
m_Texture: {fileID: 0}
|
m_Texture: {fileID: 2800000, guid: a53d1d4e8207acf45b310f189c342b70, type: 3}
|
||||||
m_Scale: {x: 1, y: 1}
|
m_Scale: {x: 1, y: 1}
|
||||||
m_Offset: {x: 0, y: 0}
|
m_Offset: {x: 0, y: 0}
|
||||||
- _MetallicGlossMap:
|
- _MetallicGlossMap:
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ Material:
|
|||||||
m_Scale: {x: 1, y: 1}
|
m_Scale: {x: 1, y: 1}
|
||||||
m_Offset: {x: 0, y: 0}
|
m_Offset: {x: 0, y: 0}
|
||||||
- _MainTex:
|
- _MainTex:
|
||||||
m_Texture: {fileID: 0}
|
m_Texture: {fileID: 2800000, guid: 063f7a502a7e06e428090710e8286b2b, type: 3}
|
||||||
m_Scale: {x: 1, y: 1}
|
m_Scale: {x: 1, y: 1}
|
||||||
m_Offset: {x: 0, y: 0}
|
m_Offset: {x: 0, y: 0}
|
||||||
- _MetallicGlossMap:
|
- _MetallicGlossMap:
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 8bc88477f037e96478019bba8de301fd
|
guid: 1b8f142e3f9eef14e971b970e58cb3fe
|
||||||
|
folderAsset: yes
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
199
Assets/Project Files/Animations/Shumpei/DoorClose.anim
Normal file
199
Assets/Project Files/Animations/Shumpei/DoorClose.anim
Normal file
@@ -0,0 +1,199 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!74 &7400000
|
||||||
|
AnimationClip:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: DoorClose
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Legacy: 0
|
||||||
|
m_Compressed: 0
|
||||||
|
m_UseHighQualityCurve: 1
|
||||||
|
m_RotationCurves: []
|
||||||
|
m_CompressedRotationCurves: []
|
||||||
|
m_EulerCurves:
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: {x: 0, y: -90, z: 0}
|
||||||
|
inSlope: {x: 0, y: 0, z: 0}
|
||||||
|
outSlope: {x: 0, y: 0, z: 0}
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 1
|
||||||
|
value: {x: 0, y: 0, z: 0}
|
||||||
|
inSlope: {x: 0, y: 0, z: 0}
|
||||||
|
outSlope: {x: 0, y: 0, z: 0}
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
path:
|
||||||
|
m_PositionCurves: []
|
||||||
|
m_ScaleCurves: []
|
||||||
|
m_FloatCurves: []
|
||||||
|
m_PPtrCurves: []
|
||||||
|
m_SampleRate: 60
|
||||||
|
m_WrapMode: 0
|
||||||
|
m_Bounds:
|
||||||
|
m_Center: {x: 0, y: 0, z: 0}
|
||||||
|
m_Extent: {x: 0, y: 0, z: 0}
|
||||||
|
m_ClipBindingConstant:
|
||||||
|
genericBindings:
|
||||||
|
- serializedVersion: 2
|
||||||
|
path: 0
|
||||||
|
attribute: 4
|
||||||
|
script: {fileID: 0}
|
||||||
|
typeID: 4
|
||||||
|
customType: 4
|
||||||
|
isPPtrCurve: 0
|
||||||
|
pptrCurveMapping: []
|
||||||
|
m_AnimationClipSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||||
|
m_AdditiveReferencePoseTime: 0
|
||||||
|
m_StartTime: 0
|
||||||
|
m_StopTime: 1
|
||||||
|
m_OrientationOffsetY: 0
|
||||||
|
m_Level: 0
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_HasAdditiveReferencePose: 0
|
||||||
|
m_LoopTime: 0
|
||||||
|
m_LoopBlend: 0
|
||||||
|
m_LoopBlendOrientation: 0
|
||||||
|
m_LoopBlendPositionY: 0
|
||||||
|
m_LoopBlendPositionXZ: 0
|
||||||
|
m_KeepOriginalOrientation: 0
|
||||||
|
m_KeepOriginalPositionY: 1
|
||||||
|
m_KeepOriginalPositionXZ: 0
|
||||||
|
m_HeightFromFeet: 0
|
||||||
|
m_Mirror: 0
|
||||||
|
m_EditorCurves:
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 1
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: localEulerAnglesRaw.x
|
||||||
|
path:
|
||||||
|
classID: 4
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: -90
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 1
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: localEulerAnglesRaw.y
|
||||||
|
path:
|
||||||
|
classID: 4
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 1
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: localEulerAnglesRaw.z
|
||||||
|
path:
|
||||||
|
classID: 4
|
||||||
|
script: {fileID: 0}
|
||||||
|
m_EulerEditorCurves:
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve: []
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_LocalEulerAngles.x
|
||||||
|
path:
|
||||||
|
classID: 4
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve: []
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_LocalEulerAngles.y
|
||||||
|
path:
|
||||||
|
classID: 4
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve: []
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_LocalEulerAngles.z
|
||||||
|
path:
|
||||||
|
classID: 4
|
||||||
|
script: {fileID: 0}
|
||||||
|
m_HasGenericRootTransform: 1
|
||||||
|
m_HasMotionFloatCurves: 0
|
||||||
|
m_Events: []
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 8688afcee83ca554eae26cf70f466b63
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 7400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
199
Assets/Project Files/Animations/Shumpei/DoorOpen.anim
Normal file
199
Assets/Project Files/Animations/Shumpei/DoorOpen.anim
Normal file
@@ -0,0 +1,199 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!74 &7400000
|
||||||
|
AnimationClip:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: DoorOpen
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Legacy: 0
|
||||||
|
m_Compressed: 0
|
||||||
|
m_UseHighQualityCurve: 1
|
||||||
|
m_RotationCurves: []
|
||||||
|
m_CompressedRotationCurves: []
|
||||||
|
m_EulerCurves:
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: {x: 0, y: 0, z: 0}
|
||||||
|
inSlope: {x: 0, y: 0, z: 0}
|
||||||
|
outSlope: {x: 0, y: 0, z: 0}
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 1
|
||||||
|
value: {x: 0, y: -90, z: 0}
|
||||||
|
inSlope: {x: 0, y: 0, z: 0}
|
||||||
|
outSlope: {x: 0, y: 0, z: 0}
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
path:
|
||||||
|
m_PositionCurves: []
|
||||||
|
m_ScaleCurves: []
|
||||||
|
m_FloatCurves: []
|
||||||
|
m_PPtrCurves: []
|
||||||
|
m_SampleRate: 60
|
||||||
|
m_WrapMode: 0
|
||||||
|
m_Bounds:
|
||||||
|
m_Center: {x: 0, y: 0, z: 0}
|
||||||
|
m_Extent: {x: 0, y: 0, z: 0}
|
||||||
|
m_ClipBindingConstant:
|
||||||
|
genericBindings:
|
||||||
|
- serializedVersion: 2
|
||||||
|
path: 0
|
||||||
|
attribute: 4
|
||||||
|
script: {fileID: 0}
|
||||||
|
typeID: 4
|
||||||
|
customType: 4
|
||||||
|
isPPtrCurve: 0
|
||||||
|
pptrCurveMapping: []
|
||||||
|
m_AnimationClipSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_AdditiveReferencePoseClip: {fileID: 0}
|
||||||
|
m_AdditiveReferencePoseTime: 0
|
||||||
|
m_StartTime: 0
|
||||||
|
m_StopTime: 1
|
||||||
|
m_OrientationOffsetY: 0
|
||||||
|
m_Level: 0
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_HasAdditiveReferencePose: 0
|
||||||
|
m_LoopTime: 0
|
||||||
|
m_LoopBlend: 0
|
||||||
|
m_LoopBlendOrientation: 0
|
||||||
|
m_LoopBlendPositionY: 0
|
||||||
|
m_LoopBlendPositionXZ: 0
|
||||||
|
m_KeepOriginalOrientation: 0
|
||||||
|
m_KeepOriginalPositionY: 1
|
||||||
|
m_KeepOriginalPositionXZ: 0
|
||||||
|
m_HeightFromFeet: 0
|
||||||
|
m_Mirror: 0
|
||||||
|
m_EditorCurves:
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 1
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: localEulerAnglesRaw.x
|
||||||
|
path:
|
||||||
|
classID: 4
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 1
|
||||||
|
value: -90
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: localEulerAnglesRaw.y
|
||||||
|
path:
|
||||||
|
classID: 4
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 1
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 136
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: localEulerAnglesRaw.z
|
||||||
|
path:
|
||||||
|
classID: 4
|
||||||
|
script: {fileID: 0}
|
||||||
|
m_EulerEditorCurves:
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve: []
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_LocalEulerAngles.x
|
||||||
|
path:
|
||||||
|
classID: 4
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve: []
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_LocalEulerAngles.y
|
||||||
|
path:
|
||||||
|
classID: 4
|
||||||
|
script: {fileID: 0}
|
||||||
|
- curve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve: []
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
attribute: m_LocalEulerAngles.z
|
||||||
|
path:
|
||||||
|
classID: 4
|
||||||
|
script: {fileID: 0}
|
||||||
|
m_HasGenericRootTransform: 1
|
||||||
|
m_HasMotionFloatCurves: 0
|
||||||
|
m_Events: []
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 96ebef2d2f53d3947a0e772b1a4bc07b
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 7400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
130
Assets/Project Files/Animations/Shumpei/Door_03.controller
Normal file
130
Assets/Project Files/Animations/Shumpei/Door_03.controller
Normal file
@@ -0,0 +1,130 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1107 &-3614535681520826729
|
||||||
|
AnimatorStateMachine:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: Base Layer
|
||||||
|
m_ChildStates:
|
||||||
|
- serializedVersion: 1
|
||||||
|
m_State: {fileID: -858948616037680918}
|
||||||
|
m_Position: {x: 360, y: 70, z: 0}
|
||||||
|
- serializedVersion: 1
|
||||||
|
m_State: {fileID: 2821962802209060098}
|
||||||
|
m_Position: {x: 370, y: 140, z: 0}
|
||||||
|
- serializedVersion: 1
|
||||||
|
m_State: {fileID: 3066630817282007297}
|
||||||
|
m_Position: {x: 350, y: 0, z: 0}
|
||||||
|
m_ChildStateMachines: []
|
||||||
|
m_AnyStateTransitions: []
|
||||||
|
m_EntryTransitions: []
|
||||||
|
m_StateMachineTransitions: {}
|
||||||
|
m_StateMachineBehaviours: []
|
||||||
|
m_AnyStatePosition: {x: 50, y: 20, z: 0}
|
||||||
|
m_EntryPosition: {x: 50, y: 120, z: 0}
|
||||||
|
m_ExitPosition: {x: 800, y: 120, z: 0}
|
||||||
|
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
|
||||||
|
m_DefaultState: {fileID: 3066630817282007297}
|
||||||
|
--- !u!1102 &-858948616037680918
|
||||||
|
AnimatorState:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: DoorOpen
|
||||||
|
m_Speed: 1
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_Transitions: []
|
||||||
|
m_StateMachineBehaviours: []
|
||||||
|
m_Position: {x: 50, y: 50, z: 0}
|
||||||
|
m_IKOnFeet: 0
|
||||||
|
m_WriteDefaultValues: 1
|
||||||
|
m_Mirror: 0
|
||||||
|
m_SpeedParameterActive: 0
|
||||||
|
m_MirrorParameterActive: 0
|
||||||
|
m_CycleOffsetParameterActive: 0
|
||||||
|
m_TimeParameterActive: 0
|
||||||
|
m_Motion: {fileID: 7400000, guid: 96ebef2d2f53d3947a0e772b1a4bc07b, type: 2}
|
||||||
|
m_Tag:
|
||||||
|
m_SpeedParameter:
|
||||||
|
m_MirrorParameter:
|
||||||
|
m_CycleOffsetParameter:
|
||||||
|
m_TimeParameter:
|
||||||
|
--- !u!91 &9100000
|
||||||
|
AnimatorController:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: Door_03
|
||||||
|
serializedVersion: 5
|
||||||
|
m_AnimatorParameters: []
|
||||||
|
m_AnimatorLayers:
|
||||||
|
- serializedVersion: 5
|
||||||
|
m_Name: Base Layer
|
||||||
|
m_StateMachine: {fileID: -3614535681520826729}
|
||||||
|
m_Mask: {fileID: 0}
|
||||||
|
m_Motions: []
|
||||||
|
m_Behaviours: []
|
||||||
|
m_BlendingMode: 0
|
||||||
|
m_SyncedLayerIndex: -1
|
||||||
|
m_DefaultWeight: 0
|
||||||
|
m_IKPass: 0
|
||||||
|
m_SyncedLayerAffectsTiming: 0
|
||||||
|
m_Controller: {fileID: 9100000}
|
||||||
|
--- !u!1102 &2821962802209060098
|
||||||
|
AnimatorState:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: DoorClose
|
||||||
|
m_Speed: 1
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_Transitions: []
|
||||||
|
m_StateMachineBehaviours: []
|
||||||
|
m_Position: {x: 50, y: 50, z: 0}
|
||||||
|
m_IKOnFeet: 0
|
||||||
|
m_WriteDefaultValues: 1
|
||||||
|
m_Mirror: 0
|
||||||
|
m_SpeedParameterActive: 0
|
||||||
|
m_MirrorParameterActive: 0
|
||||||
|
m_CycleOffsetParameterActive: 0
|
||||||
|
m_TimeParameterActive: 0
|
||||||
|
m_Motion: {fileID: 7400000, guid: 8688afcee83ca554eae26cf70f466b63, type: 2}
|
||||||
|
m_Tag:
|
||||||
|
m_SpeedParameter:
|
||||||
|
m_MirrorParameter:
|
||||||
|
m_CycleOffsetParameter:
|
||||||
|
m_TimeParameter:
|
||||||
|
--- !u!1102 &3066630817282007297
|
||||||
|
AnimatorState:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: Idol
|
||||||
|
m_Speed: 1
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_Transitions: []
|
||||||
|
m_StateMachineBehaviours: []
|
||||||
|
m_Position: {x: 50, y: 50, z: 0}
|
||||||
|
m_IKOnFeet: 0
|
||||||
|
m_WriteDefaultValues: 1
|
||||||
|
m_Mirror: 0
|
||||||
|
m_SpeedParameterActive: 0
|
||||||
|
m_MirrorParameterActive: 0
|
||||||
|
m_CycleOffsetParameterActive: 0
|
||||||
|
m_TimeParameterActive: 0
|
||||||
|
m_Motion: {fileID: 0}
|
||||||
|
m_Tag:
|
||||||
|
m_SpeedParameter:
|
||||||
|
m_MirrorParameter:
|
||||||
|
m_CycleOffsetParameter:
|
||||||
|
m_TimeParameter:
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 8b71e0ec2e854d84cbec94fe23247aee
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 9100000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
136
Assets/Project Files/Materials/Arlo/Flat.mat
Normal file
136
Assets/Project Files/Materials/Arlo/Flat.mat
Normal file
@@ -0,0 +1,136 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!21 &2100000
|
||||||
|
Material:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: Flat
|
||||||
|
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
|
||||||
|
m_ShaderKeywords:
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap:
|
||||||
|
RenderType: Opaque
|
||||||
|
disabledShaderPasses: []
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs:
|
||||||
|
- _BaseMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _BumpMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _ClearCoatMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailAlbedoMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailMask:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailNormalMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _EmissionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MainTex:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MetallicGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _OcclusionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _ParallaxMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _SpecGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_Lightmaps:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_LightmapsInd:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_ShadowMasks:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Ints: []
|
||||||
|
m_Floats:
|
||||||
|
- _AlphaClip: 0
|
||||||
|
- _Blend: 0
|
||||||
|
- _BlendOp: 0
|
||||||
|
- _BumpScale: 1
|
||||||
|
- _ClearCoat: 0
|
||||||
|
- _ClearCoatMask: 0
|
||||||
|
- _ClearCoatSmoothness: 0
|
||||||
|
- _Cull: 2
|
||||||
|
- _Cutoff: 0.5
|
||||||
|
- _DetailAlbedoMapScale: 1
|
||||||
|
- _DetailNormalMapScale: 1
|
||||||
|
- _DstBlend: 0
|
||||||
|
- _EnvironmentReflections: 1
|
||||||
|
- _GlossMapScale: 0
|
||||||
|
- _Glossiness: 0
|
||||||
|
- _GlossinessSource: 0
|
||||||
|
- _GlossyReflections: 0
|
||||||
|
- _Metallic: 0
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _Parallax: 0.005
|
||||||
|
- _QueueOffset: 0
|
||||||
|
- _ReceiveShadows: 1
|
||||||
|
- _SampleGI: 0
|
||||||
|
- _Shininess: 0
|
||||||
|
- _Smoothness: 0.5
|
||||||
|
- _SmoothnessSource: 0
|
||||||
|
- _SmoothnessTextureChannel: 0
|
||||||
|
- _SpecSource: 0
|
||||||
|
- _SpecularHighlights: 1
|
||||||
|
- _SrcBlend: 1
|
||||||
|
- _Surface: 0
|
||||||
|
- _WorkflowMode: 1
|
||||||
|
- _ZWrite: 1
|
||||||
|
m_Colors:
|
||||||
|
- _BaseColor: {r: 0.5283019, g: 0.5283019, b: 0.5283019, a: 1}
|
||||||
|
- _Color: {r: 0.5283019, g: 0.5283019, b: 0.5283019, a: 1}
|
||||||
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
|
m_BuildTextureStacks: []
|
||||||
|
--- !u!114 &4564609267994535321
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 11
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
version: 5
|
||||||
8
Assets/Project Files/Materials/Arlo/Flat.mat.meta
Normal file
8
Assets/Project Files/Materials/Arlo/Flat.mat.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5d4cdb3f9d3f01147b3e71a7a9ab884c
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 2100000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
137
Assets/Project Files/Materials/Arlo/GrabbableCube.mat
Normal file
137
Assets/Project Files/Materials/Arlo/GrabbableCube.mat
Normal file
@@ -0,0 +1,137 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!21 &2100000
|
||||||
|
Material:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: GrabbableCube
|
||||||
|
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
|
||||||
|
m_ShaderKeywords:
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap:
|
||||||
|
RenderType: Opaque
|
||||||
|
disabledShaderPasses: []
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs:
|
||||||
|
- _BaseMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _BumpMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _ClearCoatMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailAlbedoMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailMask:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailNormalMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _EmissionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MainTex:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MetallicGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _OcclusionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _ParallaxMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _SpecGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_Lightmaps:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_LightmapsInd:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_ShadowMasks:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Ints: []
|
||||||
|
m_Floats:
|
||||||
|
- _AlphaClip: 0
|
||||||
|
- _Blend: 0
|
||||||
|
- _BlendOp: 0
|
||||||
|
- _BumpScale: 1
|
||||||
|
- _ClearCoat: 0
|
||||||
|
- _ClearCoatMask: 0
|
||||||
|
- _ClearCoatSmoothness: 0
|
||||||
|
- _Cull: 2
|
||||||
|
- _Cutoff: 0.5
|
||||||
|
- _DetailAlbedoMapScale: 1
|
||||||
|
- _DetailNormalMapScale: 1
|
||||||
|
- _DstBlend: 0
|
||||||
|
- _EnvironmentReflections: 1
|
||||||
|
- _GlossMapScale: 0
|
||||||
|
- _Glossiness: 0
|
||||||
|
- _GlossinessSource: 0
|
||||||
|
- _GlossyReflections: 0
|
||||||
|
- _Metallic: 0
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _Parallax: 0.005
|
||||||
|
- _QueueControl: 0
|
||||||
|
- _QueueOffset: 0
|
||||||
|
- _ReceiveShadows: 1
|
||||||
|
- _SampleGI: 0
|
||||||
|
- _Shininess: 0
|
||||||
|
- _Smoothness: 0.5
|
||||||
|
- _SmoothnessSource: 0
|
||||||
|
- _SmoothnessTextureChannel: 0
|
||||||
|
- _SpecSource: 0
|
||||||
|
- _SpecularHighlights: 1
|
||||||
|
- _SrcBlend: 1
|
||||||
|
- _Surface: 0
|
||||||
|
- _WorkflowMode: 1
|
||||||
|
- _ZWrite: 1
|
||||||
|
m_Colors:
|
||||||
|
- _BaseColor: {r: 0.5283019, g: 0.5283019, b: 0.5283019, a: 1}
|
||||||
|
- _Color: {r: 0.5283019, g: 0.5283019, b: 0.5283019, a: 1}
|
||||||
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
|
m_BuildTextureStacks: []
|
||||||
|
--- !u!114 &4564609267994535321
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 11
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
version: 5
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 033ccc1e24564204e939d5aebbf2014f
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 2100000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -46,7 +46,7 @@ Material:
|
|||||||
m_Offset: {x: 0, y: 0}
|
m_Offset: {x: 0, y: 0}
|
||||||
- _MainTex:
|
- _MainTex:
|
||||||
m_Texture: {fileID: 0}
|
m_Texture: {fileID: 0}
|
||||||
m_Scale: {x: 1, y: 1}
|
m_Scale: {x: 100, y: 100}
|
||||||
m_Offset: {x: 0, y: 0}
|
m_Offset: {x: 0, y: 0}
|
||||||
- _MetallicGlossMap:
|
- _MetallicGlossMap:
|
||||||
m_Texture: {fileID: 0}
|
m_Texture: {fileID: 0}
|
||||||
@@ -124,7 +124,7 @@ Material:
|
|||||||
m_Colors:
|
m_Colors:
|
||||||
- _BaseColor: {r: 0.41384834, g: 0.5660378, b: 0.41846186, a: 1}
|
- _BaseColor: {r: 0.41384834, g: 0.5660378, b: 0.41846186, a: 1}
|
||||||
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
|
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
|
||||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
- _Color: {r: 0.4138483, g: 0.5660378, b: 0.41846183, a: 1}
|
||||||
- _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
|
- _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
|
||||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
|
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
|
||||||
|
|||||||
125
Assets/Project Files/Materials/JoonasP/EssenceMaterial.mat
Normal file
125
Assets/Project Files/Materials/JoonasP/EssenceMaterial.mat
Normal file
@@ -0,0 +1,125 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!21 &2100000
|
||||||
|
Material:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: EssenceMaterial
|
||||||
|
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
|
||||||
|
m_ShaderKeywords:
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap:
|
||||||
|
RenderType: Opaque
|
||||||
|
disabledShaderPasses: []
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs:
|
||||||
|
- _BaseMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _BumpMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailAlbedoMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailMask:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailNormalMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _EmissionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MainTex:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MetallicGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _OcclusionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _ParallaxMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _SpecGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_Lightmaps:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_LightmapsInd:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- unity_ShadowMasks:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Ints: []
|
||||||
|
m_Floats:
|
||||||
|
- _AlphaClip: 0
|
||||||
|
- _Blend: 0
|
||||||
|
- _BumpScale: 1
|
||||||
|
- _ClearCoatMask: 0
|
||||||
|
- _ClearCoatSmoothness: 0
|
||||||
|
- _Cull: 2
|
||||||
|
- _Cutoff: 0.5
|
||||||
|
- _DetailAlbedoMapScale: 1
|
||||||
|
- _DetailNormalMapScale: 1
|
||||||
|
- _DstBlend: 0
|
||||||
|
- _EnvironmentReflections: 1
|
||||||
|
- _GlossMapScale: 0
|
||||||
|
- _Glossiness: 0
|
||||||
|
- _GlossyReflections: 0
|
||||||
|
- _Metallic: 0
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _Parallax: 0.005
|
||||||
|
- _QueueOffset: 0
|
||||||
|
- _ReceiveShadows: 1
|
||||||
|
- _Smoothness: 0.686
|
||||||
|
- _SmoothnessTextureChannel: 0
|
||||||
|
- _SpecularHighlights: 1
|
||||||
|
- _SrcBlend: 1
|
||||||
|
- _Surface: 0
|
||||||
|
- _WorkflowMode: 1
|
||||||
|
- _ZWrite: 1
|
||||||
|
m_Colors:
|
||||||
|
- _BaseColor: {r: 0.45812565, g: 0.63725996, b: 0.6698113, a: 1}
|
||||||
|
- _Color: {r: 0.45812565, g: 0.63725996, b: 0.6698113, a: 1}
|
||||||
|
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
|
m_BuildTextureStacks: []
|
||||||
|
--- !u!114 &2835973764785027552
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 11
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
version: 5
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6e4bc125435c4e44eb8537c3bef18d67
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 2100000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -7,7 +7,7 @@ Material:
|
|||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: New Material
|
m_Name: HolsterMaterial
|
||||||
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
|
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
|
||||||
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _SURFACE_TYPE_TRANSPARENT
|
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _SURFACE_TYPE_TRANSPARENT
|
||||||
m_LightmapFlags: 4
|
m_LightmapFlags: 4
|
||||||
8
Assets/Project Files/Prefabs/Arlo.meta
Normal file
8
Assets/Project Files/Prefabs/Arlo.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: cf9fd337edc6b034da268d1306e045a9
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
288
Assets/Project Files/Prefabs/Arlo/Cube.prefab
Normal file
288
Assets/Project Files/Prefabs/Arlo/Cube.prefab
Normal file
@@ -0,0 +1,288 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1 &7345399166452899443
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 6028983200900377696}
|
||||||
|
- component: {fileID: 3382281351804343894}
|
||||||
|
- component: {fileID: 9064848381942311599}
|
||||||
|
- component: {fileID: 1644364212353669384}
|
||||||
|
- component: {fileID: 1644364212353669388}
|
||||||
|
- component: {fileID: 1644364212353669389}
|
||||||
|
- component: {fileID: 1644364212353669390}
|
||||||
|
- component: {fileID: -6841179077446505976}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Cube
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &6028983200900377696
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7345399166452899443}
|
||||||
|
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0.602, y: 1.612, z: 3.614}
|
||||||
|
m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
|
||||||
|
m_ConstrainProportionsScale: 1
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!33 &3382281351804343894
|
||||||
|
MeshFilter:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7345399166452899443}
|
||||||
|
m_Mesh: {fileID: -5495902117074765545, guid: 958549cf2faec954e8fecf0903305ea3, type: 3}
|
||||||
|
--- !u!23 &9064848381942311599
|
||||||
|
MeshRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7345399166452899443}
|
||||||
|
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: 2100000, guid: 033ccc1e24564204e939d5aebbf2014f, 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!54 &1644364212353669384
|
||||||
|
Rigidbody:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7345399166452899443}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Mass: 1
|
||||||
|
m_Drag: 0
|
||||||
|
m_AngularDrag: 0.05
|
||||||
|
m_UseGravity: 1
|
||||||
|
m_IsKinematic: 0
|
||||||
|
m_Interpolate: 0
|
||||||
|
m_Constraints: 0
|
||||||
|
m_CollisionDetection: 2
|
||||||
|
--- !u!65 &1644364212353669388
|
||||||
|
BoxCollider:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7345399166452899443}
|
||||||
|
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!114 &1644364212353669389
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7345399166452899443}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_InteractionManager: {fileID: 0}
|
||||||
|
m_Colliders: []
|
||||||
|
m_InteractionLayerMask:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 4294967295
|
||||||
|
m_InteractionLayers:
|
||||||
|
m_Bits: 1
|
||||||
|
m_SelectMode: 0
|
||||||
|
m_CustomReticle: {fileID: 0}
|
||||||
|
m_FirstHoverEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_LastHoverExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_HoverEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls:
|
||||||
|
- m_Target: {fileID: 1644364212353669390}
|
||||||
|
m_TargetAssemblyTypeName: Hover, Assembly-CSharp
|
||||||
|
m_MethodName: HoverStart
|
||||||
|
m_Mode: 1
|
||||||
|
m_Arguments:
|
||||||
|
m_ObjectArgument: {fileID: 0}
|
||||||
|
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||||
|
m_IntArgument: 0
|
||||||
|
m_FloatArgument: 0
|
||||||
|
m_StringArgument:
|
||||||
|
m_BoolArgument: 0
|
||||||
|
m_CallState: 2
|
||||||
|
m_HoverExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls:
|
||||||
|
- m_Target: {fileID: 1644364212353669390}
|
||||||
|
m_TargetAssemblyTypeName: Hover, Assembly-CSharp
|
||||||
|
m_MethodName: HoverEnd
|
||||||
|
m_Mode: 1
|
||||||
|
m_Arguments:
|
||||||
|
m_ObjectArgument: {fileID: 0}
|
||||||
|
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||||
|
m_IntArgument: 0
|
||||||
|
m_FloatArgument: 0
|
||||||
|
m_StringArgument:
|
||||||
|
m_BoolArgument: 0
|
||||||
|
m_CallState: 2
|
||||||
|
m_FirstSelectEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_LastSelectExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_SelectEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_SelectExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_Activated:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_Deactivated:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnFirstHoverEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnLastHoverExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnHoverEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnHoverExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnSelectEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnSelectExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnSelectCanceled:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnActivate:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnDeactivate:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_AttachTransform: {fileID: 0}
|
||||||
|
m_AttachEaseInTime: 0.15
|
||||||
|
m_MovementType: 2
|
||||||
|
m_VelocityDamping: 1
|
||||||
|
m_VelocityScale: 1
|
||||||
|
m_AngularVelocityDamping: 1
|
||||||
|
m_AngularVelocityScale: 1
|
||||||
|
m_TrackPosition: 1
|
||||||
|
m_SmoothPosition: 0
|
||||||
|
m_SmoothPositionAmount: 5
|
||||||
|
m_TightenPosition: 0.5
|
||||||
|
m_TrackRotation: 1
|
||||||
|
m_SmoothRotation: 0
|
||||||
|
m_SmoothRotationAmount: 5
|
||||||
|
m_TightenRotation: 0.5
|
||||||
|
m_ThrowOnDetach: 1
|
||||||
|
m_ThrowSmoothingDuration: 0.25
|
||||||
|
m_ThrowSmoothingCurve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 1
|
||||||
|
value: 1
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
m_ThrowVelocityScale: 1.5
|
||||||
|
m_ThrowAngularVelocityScale: 1
|
||||||
|
m_ForceGravityOnDetach: 0
|
||||||
|
m_RetainTransformParent: 1
|
||||||
|
m_AttachPointCompatibilityMode: 0
|
||||||
|
--- !u!114 &1644364212353669390
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7345399166452899443}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: c93cfeee8cd29624bae7c5203dedb433, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
--- !u!114 &-6841179077446505976
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7345399166452899443}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 5fea29bb7c508c244a1f805a5fd3fc4d, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
outlineMode: 0
|
||||||
|
outlineColor: {r: 0.9245283, g: 0.100302614, b: 0.100302614, a: 1}
|
||||||
|
outlineWidth: 5
|
||||||
|
precomputeOutline: 0
|
||||||
|
bakeKeys: []
|
||||||
|
bakeValues: []
|
||||||
11
Assets/Project Files/Prefabs/Arlo/Cube.prefab.meta
Normal file
11
Assets/Project Files/Prefabs/Arlo/Cube.prefab.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
<<<<<<<< HEAD:Assets/Project Files/Prefabs/Arlo/Cube.prefab.meta
|
||||||
|
guid: c89fd30ca0b56fb41a415d285d87b219
|
||||||
|
========
|
||||||
|
guid: 8f5582064724dbc45bc5c3432899f9c1
|
||||||
|
>>>>>>>> origin/joonasp_Milestone2:Assets/Project Files/Prefabs/JoonasP/Lever.prefab.meta
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -13,6 +13,7 @@ GameObject:
|
|||||||
- component: {fileID: 5155207960822887486}
|
- component: {fileID: 5155207960822887486}
|
||||||
- component: {fileID: 1015801306266775026}
|
- component: {fileID: 1015801306266775026}
|
||||||
- component: {fileID: 1015801306266775027}
|
- component: {fileID: 1015801306266775027}
|
||||||
|
- component: {fileID: 7148710207580294270}
|
||||||
m_Layer: 21
|
m_Layer: 21
|
||||||
m_Name: Holster
|
m_Name: Holster
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -151,3 +152,15 @@ MonoBehaviour:
|
|||||||
m_SocketActive: 1
|
m_SocketActive: 1
|
||||||
m_InteractableHoverScale: 1
|
m_InteractableHoverScale: 1
|
||||||
m_RecycleDelayTime: 1
|
m_RecycleDelayTime: 1
|
||||||
|
--- !u!114 &7148710207580294270
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1015801306266775025}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: aca2b5bf18c279c4cb265c82010714b1, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ GameObject:
|
|||||||
- component: {fileID: 4729065021270817612}
|
- component: {fileID: 4729065021270817612}
|
||||||
- component: {fileID: 5579585539182961868}
|
- component: {fileID: 5579585539182961868}
|
||||||
- component: {fileID: 8105550803505491054}
|
- component: {fileID: 8105550803505491054}
|
||||||
|
- component: {fileID: 4591371125200328589}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: Mushroom_01
|
m_Name: Mushroom_01
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -31,7 +32,7 @@ Transform:
|
|||||||
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}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 1
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
@@ -231,3 +232,19 @@ MonoBehaviour:
|
|||||||
m_ForceGravityOnDetach: 0
|
m_ForceGravityOnDetach: 0
|
||||||
m_RetainTransformParent: 1
|
m_RetainTransformParent: 1
|
||||||
m_AttachPointCompatibilityMode: 0
|
m_AttachPointCompatibilityMode: 0
|
||||||
|
--- !u!114 &4591371125200328589
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 4385080170328260021}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fc417ab3a5b06f04db2149be4cfdf6e4, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
itemId: 1
|
||||||
|
canStack: 1
|
||||||
|
itemName: Red Mushroom
|
||||||
|
itemDescription:
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ GameObject:
|
|||||||
- component: {fileID: 5371485246626056766}
|
- component: {fileID: 5371485246626056766}
|
||||||
- component: {fileID: 5868452619794669030}
|
- component: {fileID: 5868452619794669030}
|
||||||
- component: {fileID: 2669145217468523370}
|
- component: {fileID: 2669145217468523370}
|
||||||
|
- component: {fileID: 8028753017960928093}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: Mushroom_02
|
m_Name: Mushroom_02
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -231,3 +232,19 @@ MonoBehaviour:
|
|||||||
m_ForceGravityOnDetach: 0
|
m_ForceGravityOnDetach: 0
|
||||||
m_RetainTransformParent: 1
|
m_RetainTransformParent: 1
|
||||||
m_AttachPointCompatibilityMode: 0
|
m_AttachPointCompatibilityMode: 0
|
||||||
|
--- !u!114 &8028753017960928093
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5440707293445505367}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fc417ab3a5b06f04db2149be4cfdf6e4, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
itemId: 2
|
||||||
|
canStack: 1
|
||||||
|
itemName: Brown Mushroom
|
||||||
|
itemDescription:
|
||||||
|
|||||||
5115
Assets/Project Files/Prefabs/JoonasP/EssenceNode.prefab
Normal file
5115
Assets/Project Files/Prefabs/JoonasP/EssenceNode.prefab
Normal file
File diff suppressed because it is too large
Load Diff
13
Assets/Project Files/Prefabs/JoonasP/EssenceNode.prefab.meta
Normal file
13
Assets/Project Files/Prefabs/JoonasP/EssenceNode.prefab.meta
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
<<<<<<<< HEAD:Assets/Project Files/Scripts/Helar/Items.meta
|
||||||
|
guid: 215fe2a51d12ecc43ba8f86d3dc3ae54
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
========
|
||||||
|
guid: 1e00d72d45b494a4ea598ff34d46a589
|
||||||
|
PrefabImporter:
|
||||||
|
>>>>>>>> origin/joonasp_Milestone2:Assets/Project Files/Prefabs/JoonasP/EssenceNode.prefab.meta
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
387
Assets/Project Files/Prefabs/JoonasP/FlyingWand.prefab
Normal file
387
Assets/Project Files/Prefabs/JoonasP/FlyingWand.prefab
Normal file
@@ -0,0 +1,387 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1 &3757395766904384524
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 3757395766904384523}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: AttachTransform
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &3757395766904384523
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3757395766904384524}
|
||||||
|
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 3757395767074085960}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
|
||||||
|
--- !u!1 &3757395767074346460
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 3757395767074085960}
|
||||||
|
- component: {fileID: 3757395767077500696}
|
||||||
|
- component: {fileID: 3757395767076336374}
|
||||||
|
- component: {fileID: 3757395767037568668}
|
||||||
|
- component: {fileID: 3757395767037568669}
|
||||||
|
- component: {fileID: 3757395767037568671}
|
||||||
|
- component: {fileID: 3757395767037568670}
|
||||||
|
m_Layer: 10
|
||||||
|
m_Name: FlyingWand
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &3757395767074085960
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3757395767074346460}
|
||||||
|
m_LocalRotation: {x: -0, y: -0.7071068, z: -0.7071068, w: 0}
|
||||||
|
m_LocalPosition: {x: -4.834, y: 1.066, z: -10.143}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 3757395766904384523}
|
||||||
|
- {fileID: 3137265763332852347}
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: -90, y: 0, z: -180}
|
||||||
|
--- !u!33 &3757395767077500696
|
||||||
|
MeshFilter:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3757395767074346460}
|
||||||
|
m_Mesh: {fileID: 4300134, guid: 7374575f12d49ba459e91009f7a9ec62, type: 3}
|
||||||
|
--- !u!23 &3757395767076336374
|
||||||
|
MeshRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3757395767074346460}
|
||||||
|
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: 2100000, guid: b27fa8aa11d99d440bab56b1de24981f, 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!54 &3757395767037568668
|
||||||
|
Rigidbody:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3757395767074346460}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Mass: 1
|
||||||
|
m_Drag: 0
|
||||||
|
m_AngularDrag: 0.05
|
||||||
|
m_UseGravity: 1
|
||||||
|
m_IsKinematic: 0
|
||||||
|
m_Interpolate: 0
|
||||||
|
m_Constraints: 0
|
||||||
|
m_CollisionDetection: 0
|
||||||
|
--- !u!136 &3757395767037568669
|
||||||
|
CapsuleCollider:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3757395767074346460}
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_IsTrigger: 0
|
||||||
|
m_Enabled: 1
|
||||||
|
m_Radius: 0.03857441
|
||||||
|
m_Height: 0.44495377
|
||||||
|
m_Direction: 1
|
||||||
|
m_Center: {x: -0.0026081756, y: 0.15938577, z: -0.0010241088}
|
||||||
|
--- !u!114 &3757395767037568671
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3757395767074346460}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: ee8103568a01d804d89cb1fc1dff91eb, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
particles: {fileID: 8844865646353305354}
|
||||||
|
flySpeed: 10
|
||||||
|
testForce: 1000
|
||||||
|
--- !u!114 &3757395767037568670
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3757395767074346460}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_InteractionManager: {fileID: 0}
|
||||||
|
m_Colliders: []
|
||||||
|
m_InteractionLayerMask:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 4294967295
|
||||||
|
m_InteractionLayers:
|
||||||
|
m_Bits: 1
|
||||||
|
m_SelectMode: 0
|
||||||
|
m_CustomReticle: {fileID: 0}
|
||||||
|
m_FirstHoverEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_LastHoverExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_HoverEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_HoverExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_FirstSelectEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_LastSelectExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_SelectEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_SelectExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_Activated:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls:
|
||||||
|
- m_Target: {fileID: 3757395767037568671}
|
||||||
|
m_TargetAssemblyTypeName: FlyWand, Assembly-CSharp
|
||||||
|
m_MethodName: EnableFly
|
||||||
|
m_Mode: 1
|
||||||
|
m_Arguments:
|
||||||
|
m_ObjectArgument: {fileID: 0}
|
||||||
|
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||||
|
m_IntArgument: 0
|
||||||
|
m_FloatArgument: 0
|
||||||
|
m_StringArgument:
|
||||||
|
m_BoolArgument: 0
|
||||||
|
m_CallState: 2
|
||||||
|
m_Deactivated:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls:
|
||||||
|
- m_Target: {fileID: 3757395767037568671}
|
||||||
|
m_TargetAssemblyTypeName: FlyWand, Assembly-CSharp
|
||||||
|
m_MethodName: DisableFly
|
||||||
|
m_Mode: 1
|
||||||
|
m_Arguments:
|
||||||
|
m_ObjectArgument: {fileID: 0}
|
||||||
|
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||||
|
m_IntArgument: 0
|
||||||
|
m_FloatArgument: 0
|
||||||
|
m_StringArgument:
|
||||||
|
m_BoolArgument: 0
|
||||||
|
m_CallState: 2
|
||||||
|
m_OnFirstHoverEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnLastHoverExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnHoverEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnHoverExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnSelectEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnSelectExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnSelectCanceled:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnActivate:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnDeactivate:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_AttachTransform: {fileID: 3757395766904384523}
|
||||||
|
m_AttachEaseInTime: 0.15
|
||||||
|
m_MovementType: 2
|
||||||
|
m_VelocityDamping: 1
|
||||||
|
m_VelocityScale: 1
|
||||||
|
m_AngularVelocityDamping: 1
|
||||||
|
m_AngularVelocityScale: 1
|
||||||
|
m_TrackPosition: 1
|
||||||
|
m_SmoothPosition: 0
|
||||||
|
m_SmoothPositionAmount: 5
|
||||||
|
m_TightenPosition: 0.5
|
||||||
|
m_TrackRotation: 1
|
||||||
|
m_SmoothRotation: 0
|
||||||
|
m_SmoothRotationAmount: 5
|
||||||
|
m_TightenRotation: 0.5
|
||||||
|
m_ThrowOnDetach: 1
|
||||||
|
m_ThrowSmoothingDuration: 0.25
|
||||||
|
m_ThrowSmoothingCurve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 1
|
||||||
|
value: 1
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0
|
||||||
|
outWeight: 0
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
m_ThrowVelocityScale: 1.5
|
||||||
|
m_ThrowAngularVelocityScale: 1
|
||||||
|
m_ForceGravityOnDetach: 0
|
||||||
|
m_RetainTransformParent: 1
|
||||||
|
m_AttachPointCompatibilityMode: 0
|
||||||
|
--- !u!1001 &6456652935746308080
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
m_TransformParent: {fileID: 3757395767074085960}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_RootOrder
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 0.331
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: -0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: 0.5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: -90
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 90
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 8788993151639831550, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: FlyWandParticles
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: 16595acc1c95e1843870f6d5ed6b3ad8, type: 3}
|
||||||
|
--- !u!4 &3137265763332852347 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 6456652935746308080}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!198 &8844865646353305354 stripped
|
||||||
|
ParticleSystem:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 2532683062447540474, guid: 16595acc1c95e1843870f6d5ed6b3ad8,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 6456652935746308080}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
13
Assets/Project Files/Prefabs/JoonasP/FlyingWand.prefab.meta
Normal file
13
Assets/Project Files/Prefabs/JoonasP/FlyingWand.prefab.meta
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
<<<<<<<< HEAD:Assets/Resources/Helar.meta
|
||||||
|
guid: 551c14077760549478d9927a77d319ee
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
========
|
||||||
|
guid: fdff2f4af2d28524d8668e43fa263730
|
||||||
|
PrefabImporter:
|
||||||
|
>>>>>>>> origin/joonasp_Milestone2:Assets/Project Files/Prefabs/JoonasP/FlyingWand.prefab.meta
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
615
Assets/Project Files/Prefabs/JoonasP/Lever.prefab
Normal file
615
Assets/Project Files/Prefabs/JoonasP/Lever.prefab
Normal file
@@ -0,0 +1,615 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1 &455221332389216938
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 6780915650895061177}
|
||||||
|
- component: {fileID: 6789214051418302579}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: DownAudio
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &6780915650895061177
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 455221332389216938}
|
||||||
|
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: 7553921418231478018}
|
||||||
|
m_RootOrder: 1
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!82 &6789214051418302579
|
||||||
|
AudioSource:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 455221332389216938}
|
||||||
|
m_Enabled: 1
|
||||||
|
serializedVersion: 4
|
||||||
|
OutputAudioMixerGroup: {fileID: 0}
|
||||||
|
m_audioClip: {fileID: 8300000, guid: 3814d9ec985cbd44badc1206d4b1f854, type: 3}
|
||||||
|
m_PlayOnAwake: 0
|
||||||
|
m_Volume: 1
|
||||||
|
m_Pitch: 1
|
||||||
|
Loop: 0
|
||||||
|
Mute: 0
|
||||||
|
Spatialize: 0
|
||||||
|
SpatializePostEffects: 0
|
||||||
|
Priority: 128
|
||||||
|
DopplerLevel: 1
|
||||||
|
MinDistance: 1
|
||||||
|
MaxDistance: 500
|
||||||
|
Pan2D: 0
|
||||||
|
rolloffMode: 0
|
||||||
|
BypassEffects: 0
|
||||||
|
BypassListenerEffects: 0
|
||||||
|
BypassReverbZones: 0
|
||||||
|
rolloffCustomCurve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 1
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 1
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
panLevelCustomCurve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
spreadCustomCurve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
reverbZoneMixCustomCurve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 1
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
--- !u!1 &2157192708967875576
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 3646116853758722162}
|
||||||
|
- component: {fileID: 7884637555489891255}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: UpAudio
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &3646116853758722162
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2157192708967875576}
|
||||||
|
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: 7553921418231478018}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!82 &7884637555489891255
|
||||||
|
AudioSource:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 2157192708967875576}
|
||||||
|
m_Enabled: 1
|
||||||
|
serializedVersion: 4
|
||||||
|
OutputAudioMixerGroup: {fileID: 0}
|
||||||
|
m_audioClip: {fileID: 8300000, guid: 9ce1fb609670559469dfd0fea8e944bd, type: 3}
|
||||||
|
m_PlayOnAwake: 0
|
||||||
|
m_Volume: 1
|
||||||
|
m_Pitch: 1
|
||||||
|
Loop: 0
|
||||||
|
Mute: 0
|
||||||
|
Spatialize: 0
|
||||||
|
SpatializePostEffects: 0
|
||||||
|
Priority: 128
|
||||||
|
DopplerLevel: 1
|
||||||
|
MinDistance: 1
|
||||||
|
MaxDistance: 500
|
||||||
|
Pan2D: 0
|
||||||
|
rolloffMode: 0
|
||||||
|
BypassEffects: 0
|
||||||
|
BypassListenerEffects: 0
|
||||||
|
BypassReverbZones: 0
|
||||||
|
rolloffCustomCurve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 1
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 1
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
panLevelCustomCurve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
spreadCustomCurve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 0
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
reverbZoneMixCustomCurve:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Curve:
|
||||||
|
- serializedVersion: 3
|
||||||
|
time: 0
|
||||||
|
value: 1
|
||||||
|
inSlope: 0
|
||||||
|
outSlope: 0
|
||||||
|
tangentMode: 0
|
||||||
|
weightedMode: 0
|
||||||
|
inWeight: 0.33333334
|
||||||
|
outWeight: 0.33333334
|
||||||
|
m_PreInfinity: 2
|
||||||
|
m_PostInfinity: 2
|
||||||
|
m_RotationOrder: 4
|
||||||
|
--- !u!1 &5511940782738830562
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 7553921418231478018}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: AudioContainer
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &7553921418231478018
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5511940782738830562}
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0.38268343, w: 0.92387956}
|
||||||
|
m_LocalPosition: {x: -0.013503879, y: 1.5912999, z: 0}
|
||||||
|
m_LocalScale: {x: 9.999999, y: 9.999999, z: 10}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 3646116853758722162}
|
||||||
|
- {fileID: 6780915650895061177}
|
||||||
|
m_Father: {fileID: 7543052554475355072}
|
||||||
|
m_RootOrder: 1
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!1 &7543052554475355069
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 7543052554475355072}
|
||||||
|
- component: {fileID: 7543052554475355071}
|
||||||
|
- component: {fileID: 7543052554475355070}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Lever
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &7543052554475355072
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7543052554475355069}
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956}
|
||||||
|
m_LocalPosition: {x: -2.324, y: 1.301, z: -13.649}
|
||||||
|
m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
|
||||||
|
m_ConstrainProportionsScale: 1
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 7543052554459193268}
|
||||||
|
- {fileID: 7553921418231478018}
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 45}
|
||||||
|
--- !u!33 &7543052554475355071
|
||||||
|
MeshFilter:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7543052554475355069}
|
||||||
|
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
--- !u!23 &7543052554475355070
|
||||||
|
MeshRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7543052554475355069}
|
||||||
|
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: 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!1001 &7543052554459070832
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
m_TransformParent: {fileID: 7543052554475355072}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 152040, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: LeverShaft
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3}
|
||||||
|
propertyPath: m_RootOrder
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3}
|
||||||
|
propertyPath: m_LocalScale.x
|
||||||
|
value: 10
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3}
|
||||||
|
propertyPath: m_LocalScale.y
|
||||||
|
value: 10
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3}
|
||||||
|
propertyPath: m_LocalScale.z
|
||||||
|
value: 10
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 0.45
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3}
|
||||||
|
--- !u!1 &7543052554458927256 stripped
|
||||||
|
GameObject:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 152040, guid: 12c69a31240dca742abe09b6c9abc1f0,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 7543052554459070832}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!54 &7543052554150911970
|
||||||
|
Rigidbody:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7543052554458927256}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Mass: 1
|
||||||
|
m_Drag: 0
|
||||||
|
m_AngularDrag: 0.05
|
||||||
|
m_UseGravity: 1
|
||||||
|
m_IsKinematic: 1
|
||||||
|
m_Interpolate: 0
|
||||||
|
m_Constraints: 0
|
||||||
|
m_CollisionDetection: 0
|
||||||
|
--- !u!136 &7543052554150911969
|
||||||
|
CapsuleCollider:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7543052554458927256}
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_IsTrigger: 0
|
||||||
|
m_Enabled: 1
|
||||||
|
m_Radius: 0.039352436
|
||||||
|
m_Height: 0.40530682
|
||||||
|
m_Direction: 1
|
||||||
|
m_Center: {x: -0.002700729, y: 0.13125366, z: 0.0036743917}
|
||||||
|
--- !u!114 &7543052554150911967
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7543052554458927256}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 8a35f6cfbfba9b548aaa00d52cfe8a50, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_InteractionManager: {fileID: 0}
|
||||||
|
m_Colliders: []
|
||||||
|
m_InteractionLayerMask:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 4294967295
|
||||||
|
m_InteractionLayers:
|
||||||
|
m_Bits: 1
|
||||||
|
m_SelectMode: 0
|
||||||
|
m_CustomReticle: {fileID: 0}
|
||||||
|
m_FirstHoverEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_LastHoverExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_HoverEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_HoverExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_FirstSelectEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_LastSelectExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_SelectEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls:
|
||||||
|
- m_Target: {fileID: 7543052554150911968}
|
||||||
|
m_TargetAssemblyTypeName: LeverController, Assembly-CSharp
|
||||||
|
m_MethodName: GrabLever
|
||||||
|
m_Mode: 1
|
||||||
|
m_Arguments:
|
||||||
|
m_ObjectArgument: {fileID: 0}
|
||||||
|
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||||
|
m_IntArgument: 0
|
||||||
|
m_FloatArgument: 0
|
||||||
|
m_StringArgument:
|
||||||
|
m_BoolArgument: 0
|
||||||
|
m_CallState: 2
|
||||||
|
m_SelectExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls:
|
||||||
|
- m_Target: {fileID: 7543052554150911968}
|
||||||
|
m_TargetAssemblyTypeName: LeverController, Assembly-CSharp
|
||||||
|
m_MethodName: GrabLever
|
||||||
|
m_Mode: 1
|
||||||
|
m_Arguments:
|
||||||
|
m_ObjectArgument: {fileID: 0}
|
||||||
|
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||||
|
m_IntArgument: 0
|
||||||
|
m_FloatArgument: 0
|
||||||
|
m_StringArgument:
|
||||||
|
m_BoolArgument: 0
|
||||||
|
m_CallState: 2
|
||||||
|
m_Activated:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_Deactivated:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnFirstHoverEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnLastHoverExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnHoverEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnHoverExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnSelectEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnSelectExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnSelectCanceled:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnActivate:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_OnDeactivate:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
--- !u!114 &7543052554150911968
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 7543052554458927256}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 090ddea5aafb4e945868d2613c3bfbaa, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
onUp:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
onDown:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
minAngle: 35
|
||||||
|
maxAngle: 75
|
||||||
|
hapticAmplitude: 1
|
||||||
|
hapticDuration: 0.1
|
||||||
|
upSound: {fileID: 7884637555489891255}
|
||||||
|
downSound: {fileID: 6789214051418302579}
|
||||||
|
leftHand: {fileID: 0}
|
||||||
|
rightHand: {fileID: 0}
|
||||||
|
--- !u!4 &7543052554459193268 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 7543052554459070832}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
11
Assets/Project Files/Prefabs/JoonasP/Lever.prefab.meta
Normal file
11
Assets/Project Files/Prefabs/JoonasP/Lever.prefab.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
<<<<<<<< HEAD:Assets/Project Files/Prefabs/Arlo/Cube.prefab.meta
|
||||||
|
guid: cb8b19b563b3d224897e3b3d94c353aa
|
||||||
|
========
|
||||||
|
guid: 8f5582064724dbc45bc5c3432899f9c1
|
||||||
|
>>>>>>>> origin/joonasp_Milestone2:Assets/Project Files/Prefabs/JoonasP/Lever.prefab.meta
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -1125,6 +1125,34 @@
|
|||||||
"isPartOfComposite": false
|
"isPartOfComposite": false
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Arlo",
|
||||||
|
"id": "25dc1661-9ce5-4e87-89c0-b3a1cf542d24",
|
||||||
|
"actions": [
|
||||||
|
{
|
||||||
|
"name": "Toggle",
|
||||||
|
"type": "Button",
|
||||||
|
"id": "e8d17945-12eb-403b-b900-eefad26af1e9",
|
||||||
|
"expectedControlType": "Button",
|
||||||
|
"processors": "",
|
||||||
|
"interactions": "",
|
||||||
|
"initialStateCheck": false
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"bindings": [
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "9f1b732b-4735-4961-9648-673618745016",
|
||||||
|
"path": "<OculusTouchController>{LeftHand}/primaryButton",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "",
|
||||||
|
"action": "Toggle",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"controlSchemes": [
|
"controlSchemes": [
|
||||||
|
|||||||
36
Assets/Project Files/Scripts/Arlo/Hover.cs
Normal file
36
Assets/Project Files/Scripts/Arlo/Hover.cs
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class Hover : MonoBehaviour
|
||||||
|
{
|
||||||
|
|
||||||
|
Material material;
|
||||||
|
Color color;
|
||||||
|
Outline outline;
|
||||||
|
|
||||||
|
// Start is called before the first frame update
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
material = GetComponent<Renderer>().material;
|
||||||
|
color = material.color;
|
||||||
|
outline = gameObject.GetComponent<Outline>();
|
||||||
|
outline.enabled = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update is called once per frame
|
||||||
|
void Update()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public void HoverStart()
|
||||||
|
{
|
||||||
|
outline.enabled = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void HoverEnd()
|
||||||
|
{
|
||||||
|
outline.enabled = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Project Files/Scripts/Arlo/Hover.cs.meta
Normal file
11
Assets/Project Files/Scripts/Arlo/Hover.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: c93cfeee8cd29624bae7c5203dedb433
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
33
Assets/Project Files/Scripts/Arlo/Menu.cs
Normal file
33
Assets/Project Files/Scripts/Arlo/Menu.cs
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.InputSystem;
|
||||||
|
|
||||||
|
public class Menu : MonoBehaviour
|
||||||
|
{
|
||||||
|
public InputActionReference toggleReference;
|
||||||
|
|
||||||
|
// Start is called before the first frame update
|
||||||
|
void Awake()
|
||||||
|
{
|
||||||
|
toggleReference.action.started += Toggle;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnDestroy()
|
||||||
|
{
|
||||||
|
toggleReference.action.started -= Toggle;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Toggle(InputAction.CallbackContext context)
|
||||||
|
{
|
||||||
|
bool isActive = gameObject.active;
|
||||||
|
gameObject.SetActive(!isActive);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update is called once per frame
|
||||||
|
void Update()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
11
Assets/Project Files/Scripts/Arlo/Menu.cs.meta
Normal file
11
Assets/Project Files/Scripts/Arlo/Menu.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 41ffdfe527a79fa45b656f44cfa8354c
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -28,4 +28,10 @@ public class NoddingMovement : MonoBehaviour
|
|||||||
transform.Translate(new Vector3(camera.transform.forward.x, 0, camera.transform.forward.z) * speed * Time.deltaTime * (camera.transform.eulerAngles.x-360));
|
transform.Translate(new Vector3(camera.transform.forward.x, 0, camera.transform.forward.z) * speed * Time.deltaTime * (camera.transform.eulerAngles.x-360));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void toggle()
|
||||||
|
{
|
||||||
|
bool isActive = this.enabled;
|
||||||
|
this.enabled = (!isActive);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
21
Assets/Project Files/Scripts/Arlo/TestRotator.cs
Normal file
21
Assets/Project Files/Scripts/Arlo/TestRotator.cs
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class TestRotator : MonoBehaviour
|
||||||
|
{
|
||||||
|
|
||||||
|
private GameObject cube;
|
||||||
|
|
||||||
|
// Start is called before the first frame update
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
cube = GameObject.Find("Cube (1)");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update is called once per frame
|
||||||
|
void Update()
|
||||||
|
{
|
||||||
|
cube.transform.Rotate(0, 1, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Project Files/Scripts/Arlo/TestRotator.cs.meta
Normal file
11
Assets/Project Files/Scripts/Arlo/TestRotator.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: cac7efaf757714d46ab11db403422423
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
30
Assets/Project Files/Scripts/Helar/ConsolePrinter.cs
Normal file
30
Assets/Project Files/Scripts/Helar/ConsolePrinter.cs
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
using System;
|
||||||
|
using TMPro;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class ConsolePrinter : MonoBehaviour
|
||||||
|
{
|
||||||
|
static string historyOutput = "";
|
||||||
|
|
||||||
|
public TMP_Text textBox;
|
||||||
|
void OnEnable()
|
||||||
|
{
|
||||||
|
Application.logMessageReceived += Log;
|
||||||
|
}
|
||||||
|
|
||||||
|
void OnDisable()
|
||||||
|
{
|
||||||
|
Application.logMessageReceived -= Log;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Log(string logString, string stackTrace, LogType type)
|
||||||
|
{
|
||||||
|
historyOutput = Time.fixedTime + ": " + logString + "\n" + historyOutput;
|
||||||
|
if (historyOutput.Length > 5000)
|
||||||
|
{
|
||||||
|
historyOutput = historyOutput[..4000];
|
||||||
|
}
|
||||||
|
|
||||||
|
textBox.text = historyOutput;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: af6659aa65864ce9987c4e88ca2fa878
|
||||||
|
timeCreated: 1648411791
|
||||||
@@ -1,39 +1,77 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.XR.Interaction.Toolkit;
|
|
||||||
|
|
||||||
[Serializable]
|
[Serializable]
|
||||||
[RequireComponent(typeof(XRSocketInteractor))]
|
|
||||||
public class Inventory : MonoBehaviour
|
public class Inventory : MonoBehaviour
|
||||||
{
|
{
|
||||||
public int slots = 1;
|
public List<InventorySlot> additionalSlots;
|
||||||
private List<int> _inv;
|
|
||||||
private XRSocketInteractor xrSocketInteractor;
|
public GameObject itemContainerPrefab;
|
||||||
|
|
||||||
|
private List<InventorySlot> _inventorySlots;
|
||||||
|
|
||||||
private void Awake()
|
private void Awake()
|
||||||
{
|
{
|
||||||
xrSocketInteractor = GetComponent<XRSocketInteractor>();
|
_inventorySlots = new List<InventorySlot>();
|
||||||
_inv = new List<int>(slots);
|
foreach (var inventorySlot in additionalSlots)
|
||||||
var oldestInteractableSelected = xrSocketInteractor.GetOldestInteractableSelected();
|
{
|
||||||
|
inventorySlot.SetParentInventory(this);
|
||||||
|
_inventorySlots.Add(inventorySlot);
|
||||||
xrSocketInteractor.selectEntered.AddListener(Call);
|
}
|
||||||
|
|
||||||
xrSocketInteractor.hoverEntered.AddListener(Call);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Call(HoverEnterEventArgs arg0)
|
private void OnEnable()
|
||||||
{
|
{
|
||||||
Debug.Log("hoverenter "+arg0.interactableObject + " " + xrSocketInteractor.hasHover + " " + xrSocketInteractor.hasSelection);
|
var inventorySlotsInChildren = GetComponentsInChildren<InventorySlot>();
|
||||||
|
foreach (var inventorySlot in inventorySlotsInChildren)
|
||||||
|
{
|
||||||
|
inventorySlot.SetParentInventory(this);
|
||||||
|
_inventorySlots.Add(inventorySlot);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool AddItem(ItemData item)
|
||||||
|
{
|
||||||
|
if (item.canStack)
|
||||||
|
{
|
||||||
|
return AddItem(ConvertToInventoryItem(item));
|
||||||
|
}
|
||||||
|
|
||||||
|
return AddToFirstOpenSlot(item.gameObject);
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool AddItem(InventoryItem item)
|
||||||
|
{
|
||||||
|
//Stacks the item if it already exists in the inventory.
|
||||||
|
foreach (var inventorySlot in _inventorySlots.Where(inventorySlot =>
|
||||||
|
inventorySlot.ContainsItem(item.GetItemid())))
|
||||||
|
{
|
||||||
|
inventorySlot.GetItem().ChangeCount(item.Count);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return AddToFirstOpenSlot(item.gameObject);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Call(SelectEnterEventArgs arg0)
|
private bool AddToFirstOpenSlot(GameObject item)
|
||||||
{
|
{
|
||||||
Debug.Log("selectenter "+arg0.interactableObject);
|
|
||||||
|
foreach (var inventorySlot in _inventorySlots.Where(inventorySlot => !inventorySlot.ContainsItem()))
|
||||||
|
{
|
||||||
|
inventorySlot.AssignItem(item);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private InventoryItem ConvertToInventoryItem(ItemData item)
|
||||||
}
|
{
|
||||||
|
var inventoryItem = Instantiate(itemContainerPrefab, transform);
|
||||||
|
itemContainerPrefab.GetComponent<InventoryItem>().itemPrefab = item.gameObject;
|
||||||
|
|
||||||
|
return inventoryItem.gameObject.GetComponent<InventoryItem>();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,11 +1,3 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: aca2b5bf18c279c4cb265c82010714b1
|
guid: 29f5f8aed8d641c3abc54850a6a876cc
|
||||||
MonoImporter:
|
timeCreated: 1648431912
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 2
|
|
||||||
defaultReferences: []
|
|
||||||
executionOrder: 0
|
|
||||||
icon: {instanceID: 0}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
||||||
172
Assets/Project Files/Scripts/Helar/InventorySlot.cs
Normal file
172
Assets/Project Files/Scripts/Helar/InventorySlot.cs
Normal file
@@ -0,0 +1,172 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.XR.Interaction.Toolkit;
|
||||||
|
|
||||||
|
[Serializable]
|
||||||
|
[RequireComponent(typeof(XRSocketInteractor))]
|
||||||
|
public class InventorySlot : MonoBehaviour
|
||||||
|
{
|
||||||
|
private XRSocketInteractor xrSocketInteractor;
|
||||||
|
|
||||||
|
private GameObject _itemInSlot;
|
||||||
|
|
||||||
|
private Inventory _parentInventory;
|
||||||
|
|
||||||
|
private void Awake()
|
||||||
|
{
|
||||||
|
xrSocketInteractor = GetComponent<XRSocketInteractor>();
|
||||||
|
var oldestInteractableSelected = xrSocketInteractor.GetOldestInteractableSelected();
|
||||||
|
|
||||||
|
|
||||||
|
xrSocketInteractor.selectEntered.AddListener(SelectEnter);
|
||||||
|
xrSocketInteractor.selectExited.AddListener(SelectExit);
|
||||||
|
|
||||||
|
xrSocketInteractor.hoverEntered.AddListener(HoverEnter);
|
||||||
|
xrSocketInteractor.hoverExited.AddListener(HoverExit);
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void HoverEnter(HoverEnterEventArgs args)
|
||||||
|
{
|
||||||
|
if (_itemInSlot == null) return;
|
||||||
|
if (_itemInSlot.GetComponent<InventoryItem>() == null) return;
|
||||||
|
if (_itemInSlot == args.interactableObject.transform.gameObject) return;
|
||||||
|
|
||||||
|
//Debug.Log("hoverenter "+args.interactableObject + " " + xrSocketInteractor.hasHover + " " + xrSocketInteractor.hasSelection);
|
||||||
|
|
||||||
|
var newItem = args.interactableObject.transform.gameObject;
|
||||||
|
|
||||||
|
var itemData = newItem.GetComponentInChildren<ItemData>();
|
||||||
|
Debug.Log("HOVER ENTER: "+itemData);
|
||||||
|
if (itemData.canStack && itemData.itemId == _itemInSlot.GetComponentInChildren<ItemData>().itemId)
|
||||||
|
{
|
||||||
|
var inventoryItem = newItem.GetComponent<InventoryItem>();
|
||||||
|
|
||||||
|
if (inventoryItem != null)
|
||||||
|
{
|
||||||
|
_itemInSlot.GetComponent<InventoryItem>().ChangeCount(inventoryItem.Count);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_itemInSlot.GetComponent<InventoryItem>().ChangeCount(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
args.manager.interactableUnregistered += ManagerOninteractableUnregistered;
|
||||||
|
args.manager.UnregisterInteractable(args.interactableObject);
|
||||||
|
args.manager.interactableUnregistered -= ManagerOninteractableUnregistered;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private void HoverExit(HoverExitEventArgs args)
|
||||||
|
{
|
||||||
|
Debug.Log("hoverexit "+args.interactableObject + " " + xrSocketInteractor.hasHover + " " + xrSocketInteractor.hasSelection);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SelectEnter(SelectEnterEventArgs args)
|
||||||
|
{
|
||||||
|
Debug.Log("Added to slot item " + _itemInSlot);
|
||||||
|
var newItem = args.interactableObject.transform.gameObject;
|
||||||
|
|
||||||
|
|
||||||
|
//Converts the item into a inventory item
|
||||||
|
if (newItem.GetComponent<InventoryItem>() == null && newItem.GetComponent<ItemData>().canStack)
|
||||||
|
{
|
||||||
|
|
||||||
|
var load = Resources.Load("Helar/Item", typeof(GameObject)) as GameObject;
|
||||||
|
|
||||||
|
var instance = Instantiate(load, args.interactorObject.transform);
|
||||||
|
|
||||||
|
instance.GetComponent<InventoryItem>().itemPrefab = newItem.gameObject;
|
||||||
|
|
||||||
|
instance.transform.localScale = Vector3.one;
|
||||||
|
instance.transform.localPosition = Vector3.zero;
|
||||||
|
|
||||||
|
instance.GetComponent<InventoryItem>().enabled = true;
|
||||||
|
|
||||||
|
|
||||||
|
args.manager.interactableUnregistered += ManagerOninteractableUnregistered;
|
||||||
|
args.manager.UnregisterInteractable(args.interactableObject);
|
||||||
|
args.manager.interactableUnregistered -= ManagerOninteractableUnregistered;
|
||||||
|
|
||||||
|
args.interactableObject = instance.GetComponent<XRGrabInteractable>();
|
||||||
|
|
||||||
|
args.interactorObject.interactablesSelected.Add(instance.GetComponent<XRGrabInteractable>());
|
||||||
|
|
||||||
|
Debug.Log("Upgraded item to InventoryItem "+instance);
|
||||||
|
|
||||||
|
|
||||||
|
_itemInSlot = instance;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_itemInSlot = newItem;
|
||||||
|
//xrSocketInteractor.attachTransform = _itemInSlot.transform;
|
||||||
|
Debug.Log("Holstered item" + _itemInSlot.GetComponentInChildren<ItemData>());
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ManagerOninteractableUnregistered(InteractableUnregisteredEventArgs obj)
|
||||||
|
{
|
||||||
|
Debug.Log("Removing object "+ obj);
|
||||||
|
Destroy(obj.interactableObject.transform.gameObject);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SelectExit(SelectExitEventArgs args)
|
||||||
|
{
|
||||||
|
if (_itemInSlot == null) return;
|
||||||
|
if (_itemInSlot.GetComponent<InventoryItem>() == null) return;
|
||||||
|
|
||||||
|
var component = _itemInSlot.GetComponent<Rigidbody>();
|
||||||
|
component.useGravity = true;
|
||||||
|
component.angularDrag = 2f;
|
||||||
|
component.drag = 0.5f;
|
||||||
|
|
||||||
|
if (!_itemInSlot.GetComponentInChildren<ItemData>().canStack ||
|
||||||
|
_itemInSlot.GetComponent<InventoryItem>().Count == 1)
|
||||||
|
{
|
||||||
|
//var transformGameObject = _itemInSlot.GetComponentInChildren<ItemData>().transform.gameObject;
|
||||||
|
//Debug.Log(transformGameObject);
|
||||||
|
//args.interactableObject = transformGameObject.GetComponent<XRGrabInteractable>();
|
||||||
|
//todo change back to regular item
|
||||||
|
}
|
||||||
|
Debug.Log("Removed from slot item " + _itemInSlot);
|
||||||
|
_itemInSlot = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetParentInventory(Inventory inventory)
|
||||||
|
{
|
||||||
|
_parentInventory = inventory;
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool ContainsItem()
|
||||||
|
{
|
||||||
|
return _itemInSlot != null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool ContainsItem(int id)
|
||||||
|
{
|
||||||
|
if (!ContainsItem()) return false;
|
||||||
|
|
||||||
|
|
||||||
|
var inventoryItem = _itemInSlot.GetComponent<InventoryItem>();
|
||||||
|
if (inventoryItem != null) return inventoryItem.GetItemid() == id;
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void AssignItem(GameObject newObject)
|
||||||
|
{
|
||||||
|
_itemInSlot = newObject;
|
||||||
|
}
|
||||||
|
|
||||||
|
public InventoryItem GetItem()
|
||||||
|
{
|
||||||
|
var inventoryItem = _itemInSlot.GetComponent<InventoryItem>();
|
||||||
|
if (inventoryItem == null) Debug.LogError("Item in slot doesn't have InventoryItem component");
|
||||||
|
return inventoryItem;
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Project Files/Scripts/Helar/InventorySlot.cs.meta
Normal file
11
Assets/Project Files/Scripts/Helar/InventorySlot.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: aca2b5bf18c279c4cb265c82010714b1
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -9,6 +9,7 @@ public class ItemSpawner : MonoBehaviour
|
|||||||
public GameObject placeToSpawn;
|
public GameObject placeToSpawn;
|
||||||
public void SpawnItem()
|
public void SpawnItem()
|
||||||
{
|
{
|
||||||
|
//Debug.Log("Spawned " + objectToSpawn);
|
||||||
Instantiate(objectToSpawn, placeToSpawn.transform);
|
Instantiate(objectToSpawn, placeToSpawn.transform);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
13
Assets/Project Files/Scripts/Helar/Items.meta
Normal file
13
Assets/Project Files/Scripts/Helar/Items.meta
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
<<<<<<<< HEAD:Assets/Project Files/Scripts/Helar/Items.meta
|
||||||
|
guid: c509c0c7d8d7f2942a05792798d31fc0
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
========
|
||||||
|
guid: 1e00d72d45b494a4ea598ff34d46a589
|
||||||
|
PrefabImporter:
|
||||||
|
>>>>>>>> origin/joonasp_Milestone2:Assets/Project Files/Prefabs/JoonasP/EssenceNode.prefab.meta
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
115
Assets/Project Files/Scripts/Helar/Items/InventoryItem.cs
Normal file
115
Assets/Project Files/Scripts/Helar/Items/InventoryItem.cs
Normal file
@@ -0,0 +1,115 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using TMPro;
|
||||||
|
using Unity.Mathematics;
|
||||||
|
using Unity.VisualScripting;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.XR.Interaction.Toolkit;
|
||||||
|
|
||||||
|
[ExecuteAlways]
|
||||||
|
public class InventoryItem : MonoBehaviour
|
||||||
|
{
|
||||||
|
|
||||||
|
public GameObject itemPrefab;
|
||||||
|
|
||||||
|
private int _itemId;
|
||||||
|
|
||||||
|
private GameObject _childPrefab;
|
||||||
|
|
||||||
|
public int Count { get; private set; }
|
||||||
|
|
||||||
|
public TMP_Text itemCounterText;
|
||||||
|
|
||||||
|
private ItemData _itemData;
|
||||||
|
|
||||||
|
|
||||||
|
private void OnEnable()
|
||||||
|
{
|
||||||
|
if (itemPrefab == null)
|
||||||
|
{
|
||||||
|
enabled = false;
|
||||||
|
//Debug.LogError("Item has no attached prefab");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
enabled = true;
|
||||||
|
|
||||||
|
if (itemCounterText == null) itemCounterText = GetComponentInChildren<TMP_Text>();
|
||||||
|
|
||||||
|
_childPrefab = GetComponentInChildren<ItemData>()?.gameObject;
|
||||||
|
//Only attaches the prefab if it doesn't already have one ([ExecuteAlways] causes one to be spawned in editor).
|
||||||
|
if (_childPrefab != null) return;
|
||||||
|
|
||||||
|
_childPrefab = Instantiate(itemPrefab, transform);
|
||||||
|
_childPrefab.transform.localPosition = new Vector3(0, -0.45f, 0);
|
||||||
|
_childPrefab.transform.localScale = new Vector3(2, 2, 2);
|
||||||
|
_childPrefab.transform.rotation = quaternion.identity;
|
||||||
|
|
||||||
|
//Disable prefab components that arent relevant.
|
||||||
|
var colliderComponent = _childPrefab.GetComponent<Collider>();
|
||||||
|
if (colliderComponent != null) colliderComponent.enabled = false;
|
||||||
|
|
||||||
|
var rigidbodyComponent = _childPrefab.GetComponent<Rigidbody>();
|
||||||
|
if (rigidbodyComponent != null)
|
||||||
|
{
|
||||||
|
rigidbodyComponent.isKinematic = true;
|
||||||
|
rigidbodyComponent.useGravity = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
var xrGrabInteractableComponent = _childPrefab.GetComponent<XRGrabInteractable>();
|
||||||
|
if (xrGrabInteractableComponent != null) xrGrabInteractableComponent.enabled = false;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Start()
|
||||||
|
{
|
||||||
|
_itemData = _childPrefab.GetComponent<ItemData>();
|
||||||
|
|
||||||
|
if (_itemData == null) Debug.LogError("Item prefab has no attached ItemData", _childPrefab);
|
||||||
|
|
||||||
|
|
||||||
|
_itemId = _itemData.itemId;
|
||||||
|
if (Count == 0) Count = 1;
|
||||||
|
UpdateText();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void UpdateText()
|
||||||
|
{
|
||||||
|
itemCounterText.text = _itemData.canStack ? Count.ToString() : "";
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Changes how many items are in this itemcontainer.
|
||||||
|
* Returns false if attempted to remove more items than exists in the container.
|
||||||
|
*/
|
||||||
|
public bool ChangeCount(int amount)
|
||||||
|
{
|
||||||
|
if (Count + amount < 0) return false;
|
||||||
|
|
||||||
|
Count += amount;
|
||||||
|
|
||||||
|
if (Count == 0)
|
||||||
|
{
|
||||||
|
//Destroys this gameobject if the count is 0 or lower
|
||||||
|
Destroy(this);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
UpdateText();
|
||||||
|
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int GetItemid()
|
||||||
|
{
|
||||||
|
return _itemId;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
return $"{base.ToString()}, Count: {Count}, ItemData: {_itemData}";
|
||||||
|
}
|
||||||
|
}
|
||||||
18
Assets/Project Files/Scripts/Helar/Items/ItemData.cs
Normal file
18
Assets/Project Files/Scripts/Helar/Items/ItemData.cs
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
[Serializable]
|
||||||
|
public class ItemData : MonoBehaviour
|
||||||
|
{
|
||||||
|
public int itemId;
|
||||||
|
public bool canStack;
|
||||||
|
public string itemName;
|
||||||
|
public string itemDescription;
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
return $"{base.ToString()}, itemId: {itemId}, canStack: {canStack}, itemName: {itemName}";
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Project Files/Scripts/Helar/Items/ItemData.cs.meta
Normal file
11
Assets/Project Files/Scripts/Helar/Items/ItemData.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: fc417ab3a5b06f04db2149be4cfdf6e4
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.XR.Interaction.Toolkit;
|
||||||
|
|
||||||
|
public class EssenceNodeController : MonoBehaviour
|
||||||
|
{
|
||||||
|
[SerializeField]
|
||||||
|
private AudioSource chime;
|
||||||
|
|
||||||
|
|
||||||
|
public bool isTouched;
|
||||||
|
private bool followPlayer = false;
|
||||||
|
private Transform player;
|
||||||
|
|
||||||
|
private float timer;
|
||||||
|
private Material nodeMaterial;
|
||||||
|
|
||||||
|
private Coroutine decayCo;
|
||||||
|
|
||||||
|
private void Awake()
|
||||||
|
{
|
||||||
|
nodeMaterial = GetComponent<Renderer>().material;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Touched()
|
||||||
|
{
|
||||||
|
if (!isTouched)
|
||||||
|
{
|
||||||
|
GetComponent<Renderer>().material.color = Color.cyan;
|
||||||
|
chime.Play();
|
||||||
|
isTouched = true;
|
||||||
|
StopCoroutine(decayCo);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void FollowPlayer()
|
||||||
|
{
|
||||||
|
followPlayer = true;
|
||||||
|
player = GameObject.FindGameObjectWithTag("MainCamera").transform;
|
||||||
|
StartCoroutine(Collect());
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetPitch(float value)
|
||||||
|
{
|
||||||
|
chime.pitch = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetTimer(float seconds)
|
||||||
|
{
|
||||||
|
timer = seconds;
|
||||||
|
decayCo = StartCoroutine(Decay());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
IEnumerator Collect()
|
||||||
|
{
|
||||||
|
yield return new WaitForSeconds(2f);
|
||||||
|
//TODO: Update value in player inventory
|
||||||
|
Destroy(gameObject);
|
||||||
|
}
|
||||||
|
|
||||||
|
IEnumerator Decay()
|
||||||
|
{
|
||||||
|
yield return new WaitForSeconds(timer);
|
||||||
|
Destroy(gameObject);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Update()
|
||||||
|
{
|
||||||
|
if (!isTouched)
|
||||||
|
{
|
||||||
|
//A way to either linearly reduce the alpha value of color or fade the color to gray (must react to changing timer values)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (followPlayer)
|
||||||
|
{
|
||||||
|
transform.position = Vector3.Lerp(transform.position, new Vector3(player.position.x,player.position.y - 0.5f, player.position.z), Time.deltaTime);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: c8d18c6d4425a674c921717bf08e59bd
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
102
Assets/Project Files/Scripts/JoonasP/LeverController.cs
Normal file
102
Assets/Project Files/Scripts/JoonasP/LeverController.cs
Normal file
@@ -0,0 +1,102 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.Events;
|
||||||
|
using UnityEngine.XR.Interaction.Toolkit;
|
||||||
|
|
||||||
|
public class LeverController : MonoBehaviour
|
||||||
|
{
|
||||||
|
private Transform pivot; //The lever will use a pivot point
|
||||||
|
private Transform grabHand;
|
||||||
|
private bool leverGrabbed;
|
||||||
|
private bool eventCalled;
|
||||||
|
private bool leverDown;
|
||||||
|
|
||||||
|
private Vector3 handDelta;
|
||||||
|
private Vector3 lastPosition;
|
||||||
|
|
||||||
|
//These UnityEvent objects can be set in the inspector as any public methods from scripts
|
||||||
|
[SerializeField]
|
||||||
|
private UnityEvent onUp;
|
||||||
|
[SerializeField]
|
||||||
|
private UnityEvent onDown;
|
||||||
|
|
||||||
|
public float minAngle = 20f;
|
||||||
|
public float maxAngle = 75f;
|
||||||
|
|
||||||
|
public float hapticAmplitude = 1f;
|
||||||
|
public float hapticDuration = 0.1f;
|
||||||
|
|
||||||
|
public AudioSource upSound;
|
||||||
|
public AudioSource downSound;
|
||||||
|
|
||||||
|
//This script cannot work with multiplayer, see CheckHand() method
|
||||||
|
public Transform leftHand;
|
||||||
|
public Transform rightHand;
|
||||||
|
|
||||||
|
void Awake()
|
||||||
|
{
|
||||||
|
pivot = transform.parent;
|
||||||
|
leverGrabbed = false;
|
||||||
|
leverDown = false;
|
||||||
|
pivot.eulerAngles = new Vector3(pivot.eulerAngles.x, pivot.eulerAngles.y, minAngle);
|
||||||
|
leftHand = GameObject.Find("LeftHand Controller").transform;
|
||||||
|
rightHand = GameObject.Find("RightHand Controller").transform;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Update()
|
||||||
|
{
|
||||||
|
if (leverGrabbed)
|
||||||
|
{
|
||||||
|
handDelta = lastPosition - grabHand.position; //The vector of hand movement between frames
|
||||||
|
pivot.RotateAround(pivot.position, pivot.forward, 200 * handDelta.y); //Is a Time.deltaTime multiplication needed here?
|
||||||
|
|
||||||
|
//Two following if statements set the up and down position angles and call events when angle is met
|
||||||
|
//Only one event is called per grab because the logic is in the update method
|
||||||
|
if(pivot.eulerAngles.z < minAngle)
|
||||||
|
{
|
||||||
|
pivot.eulerAngles = new Vector3(pivot.eulerAngles.x, pivot.eulerAngles.y, minAngle);
|
||||||
|
if (leverDown)
|
||||||
|
{
|
||||||
|
onUp.Invoke();
|
||||||
|
grabHand.gameObject.GetComponent<ActionBasedController>().SendHapticImpulse(hapticAmplitude, hapticDuration);
|
||||||
|
if (upSound != null) upSound.Play();
|
||||||
|
leverDown = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if(pivot.eulerAngles.z > maxAngle)
|
||||||
|
{
|
||||||
|
pivot.eulerAngles = new Vector3(pivot.eulerAngles.x, pivot.eulerAngles.y, maxAngle);
|
||||||
|
if (!leverDown)
|
||||||
|
{
|
||||||
|
onDown.Invoke();
|
||||||
|
grabHand.gameObject.GetComponent<ActionBasedController>().SendHapticImpulse(hapticAmplitude, hapticDuration);
|
||||||
|
if (downSound != null) downSound.Play();
|
||||||
|
leverDown = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
lastPosition = grabHand.position;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void GrabLever()
|
||||||
|
{
|
||||||
|
CheckHand();
|
||||||
|
leverGrabbed = !leverGrabbed;
|
||||||
|
handDelta = Vector3.zero;
|
||||||
|
lastPosition = grabHand.position;
|
||||||
|
eventCalled = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void CheckHand()
|
||||||
|
{
|
||||||
|
float leftDistance = Vector3.Distance(leftHand.position, transform.position);
|
||||||
|
float rightDistance = Vector3.Distance(rightHand.position, transform.position);
|
||||||
|
|
||||||
|
if (leftDistance > rightDistance) grabHand = rightHand;
|
||||||
|
else grabHand = leftHand;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
11
Assets/Project Files/Scripts/JoonasP/LeverController.cs.meta
Normal file
11
Assets/Project Files/Scripts/JoonasP/LeverController.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 090ddea5aafb4e945868d2613c3bfbaa
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
22
Assets/Project Files/Scripts/JoonasP/LeverEventTest.cs
Normal file
22
Assets/Project Files/Scripts/JoonasP/LeverEventTest.cs
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class LeverEventTest : MonoBehaviour
|
||||||
|
{
|
||||||
|
|
||||||
|
private void Awake()
|
||||||
|
{
|
||||||
|
gameObject.GetComponent<Renderer>().material.color = Color.red;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void On()
|
||||||
|
{
|
||||||
|
gameObject.GetComponent<Renderer>().material.color = Color.green;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Off()
|
||||||
|
{
|
||||||
|
gameObject.GetComponent<Renderer>().material.color = Color.red;
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Project Files/Scripts/JoonasP/LeverEventTest.cs.meta
Normal file
11
Assets/Project Files/Scripts/JoonasP/LeverEventTest.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 0a90699fc7b10474aaac51ec87819dc6
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
69
Assets/Project Files/Scripts/JoonasP/WellController.cs
Normal file
69
Assets/Project Files/Scripts/JoonasP/WellController.cs
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class WellController : MonoBehaviour
|
||||||
|
{
|
||||||
|
public GameObject node;
|
||||||
|
public int numberOfNodes = 5;
|
||||||
|
private List<GameObject> nodes = new List<GameObject>();
|
||||||
|
|
||||||
|
public float spawnDelay;
|
||||||
|
public float despawnTime;
|
||||||
|
|
||||||
|
|
||||||
|
private Transform player;
|
||||||
|
|
||||||
|
public float rightDistance = 0.2f; //Distance between spawned nodes
|
||||||
|
public float maxUp = 0.2f; //Maximum up shift between orbs
|
||||||
|
public float minDown = -0.2f; //Same but for down
|
||||||
|
private Vector3 right;
|
||||||
|
private Vector3 up;
|
||||||
|
|
||||||
|
private void Awake()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public void StartMinigame()
|
||||||
|
{
|
||||||
|
player = GameObject.FindGameObjectWithTag("MainCamera").transform;
|
||||||
|
Vector3 nodeSpawn = player.transform.position + (player.forward * 0.5f);
|
||||||
|
nodeSpawn.y = player.transform.position.y;
|
||||||
|
up = player.transform.up;
|
||||||
|
right = player.transform.right;
|
||||||
|
StartCoroutine(SpawnNode(nodeSpawn, 0.5f, 0));
|
||||||
|
}
|
||||||
|
|
||||||
|
IEnumerator SpawnNode(Vector3 nodeSpawn, float pitch, int i)
|
||||||
|
{
|
||||||
|
if(i == numberOfNodes)
|
||||||
|
{
|
||||||
|
yield return new WaitForSeconds((despawnTime - spawnDelay) * 2); //Wait for all of the nodes to despawn
|
||||||
|
foreach(GameObject node in nodes)
|
||||||
|
{
|
||||||
|
node.GetComponent<EssenceNodeController>().FollowPlayer();
|
||||||
|
}
|
||||||
|
nodes.Clear();
|
||||||
|
|
||||||
|
yield break;
|
||||||
|
}
|
||||||
|
|
||||||
|
GameObject tempNode = Instantiate(node, nodeSpawn, Quaternion.identity);
|
||||||
|
tempNode.GetComponent<EssenceNodeController>().SetTimer(2f);
|
||||||
|
tempNode.GetComponent<AudioSource>().pitch = pitch;
|
||||||
|
nodeSpawn = nodeSpawn + right * rightDistance + Random.Range(minDown, maxUp) * up;
|
||||||
|
yield return new WaitForSeconds(spawnDelay);
|
||||||
|
StartCoroutine(SpawnNode(nodeSpawn, pitch, i + 1));
|
||||||
|
yield return new WaitForSeconds(despawnTime - spawnDelay);
|
||||||
|
if (tempNode.GetComponent<EssenceNodeController>().isTouched)
|
||||||
|
{
|
||||||
|
nodes.Add(tempNode);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Update()
|
||||||
|
{
|
||||||
|
transform.Rotate(new Vector3(10f, 10f, 10f) * Time.deltaTime);
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Project Files/Scripts/JoonasP/WellController.cs.meta
Normal file
11
Assets/Project Files/Scripts/JoonasP/WellController.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 580a2bc767950d54d9fdf84752500d7f
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
<<<<<<< HEAD:Assets/LowPolyDungeons/LowPolyDungeons_HDRP_2018.4.unitypackage.meta
|
<<<<<<< HEAD:Assets/LowPolyDungeons/LowPolyDungeons_HDRP_2018.4.unitypackage.meta
|
||||||
guid: c9f42f34fc0706c499aa448484f3db62
|
guid: 756af0be88eb0024a9d659a6afb1bebc
|
||||||
=======
|
=======
|
||||||
guid: 20b2cd43130816e429a419c3adf589b0
|
guid: 20b2cd43130816e429a419c3adf589b0
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ public class ArmSwingLocomotion : MonoBehaviour
|
|||||||
public GameObject RightHand;
|
public GameObject RightHand;
|
||||||
public GameObject CenterEyeCamera;
|
public GameObject CenterEyeCamera;
|
||||||
public GameObject ForwardDirection;
|
public GameObject ForwardDirection;
|
||||||
|
public GameObject Player;
|
||||||
|
|
||||||
private Vector3 PositionPreviousFrameLeftHand;
|
private Vector3 PositionPreviousFrameLeftHand;
|
||||||
private Vector3 PositionPreviousFrameRightHand;
|
private Vector3 PositionPreviousFrameRightHand;
|
||||||
@@ -22,7 +23,7 @@ public class ArmSwingLocomotion : MonoBehaviour
|
|||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
PlayerPositionPreviousFrame = transform.position;
|
PlayerPositionPreviousFrame = Player.transform.position;
|
||||||
PositionPreviousFrameLeftHand = LeftHand.transform.position;
|
PositionPreviousFrameLeftHand = LeftHand.transform.position;
|
||||||
PlayerPositionPreviousFrame = RightHand.transform.position;
|
PlayerPositionPreviousFrame = RightHand.transform.position;
|
||||||
}
|
}
|
||||||
@@ -33,13 +34,13 @@ public class ArmSwingLocomotion : MonoBehaviour
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
float Yrot = CenterEyeCamera.transform.eulerAngles.y;
|
/*float Yrot = CenterEyeCamera.transform.eulerAngles.y;
|
||||||
ForwardDirection.transform.eulerAngles = new Vector3(0, Yrot, 0);
|
ForwardDirection.transform.eulerAngles = new Vector3(0, Yrot, 0);*/
|
||||||
|
|
||||||
PositionCurrentFrameLeftHand = LeftHand.transform.position;
|
PositionCurrentFrameLeftHand = LeftHand.transform.position;
|
||||||
PositionCurrentFrameRightHand = RightHand.transform.position;
|
PositionCurrentFrameRightHand = RightHand.transform.position;
|
||||||
|
|
||||||
PlayerPositionCurrentFrame = transform.position;
|
PlayerPositionCurrentFrame = Player.transform.position;
|
||||||
|
|
||||||
//Debug.Log("Previous" + PositionPreviousFrameLeftHand);
|
//Debug.Log("Previous" + PositionPreviousFrameLeftHand);
|
||||||
//Debug.Log("Current" + PositionCurrentFrameLeftHand);
|
//Debug.Log("Current" + PositionCurrentFrameLeftHand);
|
||||||
@@ -52,7 +53,7 @@ public class ArmSwingLocomotion : MonoBehaviour
|
|||||||
|
|
||||||
if (Time.timeSinceLevelLoad > 1f)
|
if (Time.timeSinceLevelLoad > 1f)
|
||||||
{
|
{
|
||||||
transform.position += ForwardDirection.transform.forward * HandSpeed * Speed * Time.deltaTime;
|
Player.transform.position += ForwardDirection.transform.forward * HandSpeed * Speed * Time.deltaTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
PositionPreviousFrameLeftHand = PositionCurrentFrameLeftHand;
|
PositionPreviousFrameLeftHand = PositionCurrentFrameLeftHand;
|
||||||
|
|||||||
38
Assets/Project Files/Scripts/Shumpei/ChangeButtonColor.cs
Normal file
38
Assets/Project Files/Scripts/Shumpei/ChangeButtonColor.cs
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class ChangeButtonColor : MonoBehaviour
|
||||||
|
{
|
||||||
|
[SerializeField] private Color enterColor = Color.white;
|
||||||
|
[SerializeField] private Color exitColor = Color.white;
|
||||||
|
|
||||||
|
private MeshCollider _collider;
|
||||||
|
private MeshRenderer _renderer;
|
||||||
|
|
||||||
|
// Start is called before the first frame update
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
_collider = GetComponent<MeshCollider>();
|
||||||
|
_renderer = GetComponent<MeshRenderer>();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnTriggerEnter(Collider other)
|
||||||
|
{
|
||||||
|
if (other.tag == "Hand")
|
||||||
|
{
|
||||||
|
_renderer.material.color = enterColor;
|
||||||
|
Debug.Log("Touched!");
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnTriggerExit(Collider other)
|
||||||
|
{
|
||||||
|
if (other.tag == "Hand")
|
||||||
|
{
|
||||||
|
_renderer.material.color = exitColor;
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a16108a6f7081d14f9f5a046ac04b8c2
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class ChangeButtonColorLocomotion : MonoBehaviour
|
||||||
|
{
|
||||||
|
[SerializeField] private Color enterColor = Color.white;
|
||||||
|
[SerializeField] private Color exitColor = Color.white;
|
||||||
|
|
||||||
|
private MeshCollider _collider;
|
||||||
|
private MeshRenderer _renderer;
|
||||||
|
|
||||||
|
// Start is called before the first frame update
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
_collider = GetComponent<MeshCollider>();
|
||||||
|
_renderer = GetComponent<MeshRenderer>();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnTriggerEnter(Collider other)
|
||||||
|
{
|
||||||
|
if (other.tag == "Hand")
|
||||||
|
{
|
||||||
|
if(_renderer.material.color != enterColor)
|
||||||
|
_renderer.material.color = enterColor;
|
||||||
|
else
|
||||||
|
_renderer.material.color = exitColor;
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ae634ea4fe8cb874487372a3d7c595bf
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
22
Assets/Project Files/Scripts/Shumpei/ControllLocomotion.cs
Normal file
22
Assets/Project Files/Scripts/Shumpei/ControllLocomotion.cs
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class ControllLocomotion : MonoBehaviour
|
||||||
|
{
|
||||||
|
public GameObject XRorigin;
|
||||||
|
public GameObject ArmSwingButton;
|
||||||
|
public GameObject JoyStickButton;
|
||||||
|
|
||||||
|
// Start is called before the first frame update
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update is called once per frame
|
||||||
|
void Update()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ca1db91ee57976944aa22ed347811963
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
20
Assets/Project Files/Scripts/Shumpei/DoorController.cs
Normal file
20
Assets/Project Files/Scripts/Shumpei/DoorController.cs
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class DoorController : MonoBehaviour
|
||||||
|
{
|
||||||
|
[SerializeField] private Animator myDoor = null;
|
||||||
|
|
||||||
|
// Start is called before the first frame update
|
||||||
|
|
||||||
|
public void DoorOpen()
|
||||||
|
{
|
||||||
|
myDoor.Play("DoorOpen", 0, 0.0f);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void DoorClose()
|
||||||
|
{
|
||||||
|
myDoor.Play("DoorClose", 0, 0.0f);
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Project Files/Scripts/Shumpei/DoorController.cs.meta
Normal file
11
Assets/Project Files/Scripts/Shumpei/DoorController.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f56717b6302ac07418400cc124cf091e
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
32
Assets/Project Files/Scripts/Shumpei/EnableArmSwing.cs
Normal file
32
Assets/Project Files/Scripts/Shumpei/EnableArmSwing.cs
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class EnableArmSwing : MonoBehaviour
|
||||||
|
{
|
||||||
|
|
||||||
|
private MeshCollider _collider;
|
||||||
|
private MeshRenderer _renderer;
|
||||||
|
|
||||||
|
public GameObject Player;
|
||||||
|
// Start is called before the first frame update
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
_collider = GetComponent<MeshCollider>();
|
||||||
|
_renderer = GetComponent<MeshRenderer>();
|
||||||
|
Player.GetComponent<ArmSwingLocomotion>().enabled = false;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnTriggerEnter(Collider other)
|
||||||
|
{
|
||||||
|
if (other.tag == "Hand")
|
||||||
|
{
|
||||||
|
if(Player.GetComponent<ArmSwingLocomotion>().enabled == true)
|
||||||
|
Player.GetComponent<ArmSwingLocomotion>().enabled = false;
|
||||||
|
else
|
||||||
|
Player.GetComponent<ArmSwingLocomotion>().enabled = true;
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Project Files/Scripts/Shumpei/EnableArmSwing.cs.meta
Normal file
11
Assets/Project Files/Scripts/Shumpei/EnableArmSwing.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 696a55bfea145fa4b9029ff2d359c16d
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
32
Assets/Project Files/Scripts/Shumpei/EnableDash.cs
Normal file
32
Assets/Project Files/Scripts/Shumpei/EnableDash.cs
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class EnableDash : MonoBehaviour
|
||||||
|
{
|
||||||
|
|
||||||
|
private MeshCollider _collider;
|
||||||
|
private MeshRenderer _renderer;
|
||||||
|
|
||||||
|
public GameObject Player;
|
||||||
|
// Start is called before the first frame update
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
_collider = GetComponent<MeshCollider>();
|
||||||
|
_renderer = GetComponent<MeshRenderer>();
|
||||||
|
Player.GetComponent<Dash>().enabled = false;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnTriggerEnter(Collider other)
|
||||||
|
{
|
||||||
|
if (other.tag == "Hand")
|
||||||
|
{
|
||||||
|
if (Player.GetComponent<Dash>().enabled == true)
|
||||||
|
Player.GetComponent<Dash>().enabled = false;
|
||||||
|
else
|
||||||
|
Player.GetComponent<Dash>().enabled = true;
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Project Files/Scripts/Shumpei/EnableDash.cs.meta
Normal file
11
Assets/Project Files/Scripts/Shumpei/EnableDash.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 84e3386cbd3fd2c418ecf357af19ba5f
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
28
Assets/Project Files/Scripts/Shumpei/EnableJoyStick.cs
Normal file
28
Assets/Project Files/Scripts/Shumpei/EnableJoyStick.cs
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class EnableJoyStick : MonoBehaviour
|
||||||
|
{
|
||||||
|
|
||||||
|
private MeshCollider _collider;
|
||||||
|
private MeshRenderer _renderer;
|
||||||
|
|
||||||
|
public GameObject LocomotionSystem;
|
||||||
|
// Start is called before the first frame update
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
_collider = GetComponent<MeshCollider>();
|
||||||
|
_renderer = GetComponent<MeshRenderer>();
|
||||||
|
LocomotionSystem.SetActive(false);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnTriggerEnter(Collider other)
|
||||||
|
{
|
||||||
|
if (other.tag == "Hand")
|
||||||
|
{
|
||||||
|
LocomotionSystem.SetActive(!LocomotionSystem.activeSelf);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Project Files/Scripts/Shumpei/EnableJoyStick.cs.meta
Normal file
11
Assets/Project Files/Scripts/Shumpei/EnableJoyStick.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a63e1d5bde5a60c45aa409546e55b920
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
16
Assets/Project Files/Scripts/Shumpei/EnterGameScene.cs
Normal file
16
Assets/Project Files/Scripts/Shumpei/EnterGameScene.cs
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.SceneManagement;
|
||||||
|
|
||||||
|
public class EnterGameScene : MonoBehaviour
|
||||||
|
{
|
||||||
|
|
||||||
|
private void OnTriggerEnter(Collider other)
|
||||||
|
{
|
||||||
|
if (other.tag == "Player")
|
||||||
|
{
|
||||||
|
SceneManager.LoadScene("GameScene");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Project Files/Scripts/Shumpei/EnterGameScene.cs.meta
Normal file
11
Assets/Project Files/Scripts/Shumpei/EnterGameScene.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f1114a137d02f184db2b6291d9d31cb5
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
20
Assets/Project Files/Scripts/Shumpei/ForwardDirection.cs
Normal file
20
Assets/Project Files/Scripts/Shumpei/ForwardDirection.cs
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class ForwardDirection : MonoBehaviour
|
||||||
|
{
|
||||||
|
public GameObject CenterEyeCamera;
|
||||||
|
// Start is called before the first frame update
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update is called once per frame
|
||||||
|
void Update()
|
||||||
|
{
|
||||||
|
float Yrot = CenterEyeCamera.transform.eulerAngles.y;
|
||||||
|
transform.eulerAngles = new Vector3(0, Yrot, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 01869e86b22555a449cd53043f5c4afa
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class LocomotionSettingButton : MonoBehaviour
|
||||||
|
{
|
||||||
|
|
||||||
|
private MeshCollider _collider;
|
||||||
|
|
||||||
|
public GameObject LocomotionPanel;
|
||||||
|
// Start is called before the first frame update
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
_collider = GetComponent<MeshCollider>();
|
||||||
|
LocomotionPanel.SetActive(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnTriggerEnter(Collider other)
|
||||||
|
{
|
||||||
|
if (other.tag == "Hand")
|
||||||
|
{
|
||||||
|
LocomotionPanel.SetActive(!LocomotionPanel.activeSelf);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 8ac280753a1d95a43a1fbcfd69708d7a
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -2,7 +2,7 @@ using System.Collections;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
public class InventoryItem : MonoBehaviour
|
public class PauseMenu : MonoBehaviour
|
||||||
{
|
{
|
||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
void Start()
|
void Start()
|
||||||
11
Assets/Project Files/Scripts/Shumpei/PauseMenu.cs.meta
Normal file
11
Assets/Project Files/Scripts/Shumpei/PauseMenu.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5a2662b3abecb914cad356619e832f13
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
55
Assets/Project Files/Scripts/Shumpei/PhysicsButton.cs
Normal file
55
Assets/Project Files/Scripts/Shumpei/PhysicsButton.cs
Normal file
@@ -0,0 +1,55 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.Events;
|
||||||
|
|
||||||
|
public class PhysicsButton : MonoBehaviour
|
||||||
|
{
|
||||||
|
[SerializeField] private float threshold = 0.1f;
|
||||||
|
[SerializeField] private float deadzone = 0.025f;
|
||||||
|
|
||||||
|
private bool _isPressed;
|
||||||
|
private Vector3 _startPos;
|
||||||
|
private ConfigurableJoint _joint;
|
||||||
|
|
||||||
|
public UnityEvent onPressed, onReleased;
|
||||||
|
// Start is called before the first frame update
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
_startPos = transform.localPosition;
|
||||||
|
_joint = GetComponent<ConfigurableJoint>();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update is called once per frame
|
||||||
|
void Update()
|
||||||
|
{
|
||||||
|
if (!_isPressed && GetValue() + threshold >= 1)
|
||||||
|
Pressed();
|
||||||
|
if (_isPressed && GetValue() - threshold <= 0)
|
||||||
|
Released();
|
||||||
|
}
|
||||||
|
|
||||||
|
private float GetValue()
|
||||||
|
{
|
||||||
|
var value = Vector3.Distance(_startPos, transform.localPosition) / _joint.linearLimit.limit;
|
||||||
|
|
||||||
|
if (Mathf.Abs(value) < deadzone)
|
||||||
|
value = 0;
|
||||||
|
|
||||||
|
return Mathf.Clamp(value, -1f, 1f);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Pressed()
|
||||||
|
{
|
||||||
|
_isPressed = true;
|
||||||
|
onPressed.Invoke();
|
||||||
|
Debug.Log("Pressed");
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Released()
|
||||||
|
{
|
||||||
|
_isPressed = false;
|
||||||
|
onReleased.Invoke();
|
||||||
|
Debug.Log("Released");
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Project Files/Scripts/Shumpei/PhysicsButton.cs.meta
Normal file
11
Assets/Project Files/Scripts/Shumpei/PhysicsButton.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f3309089836901644bcce7402b672a82
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
24
Assets/Project Files/Scripts/Shumpei/Player.cs
Normal file
24
Assets/Project Files/Scripts/Shumpei/Player.cs
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class Player : MonoBehaviour
|
||||||
|
{
|
||||||
|
/*public int level;
|
||||||
|
public int health;*/
|
||||||
|
public void SavePlayer()
|
||||||
|
{
|
||||||
|
SaveSystem.SavePlayer(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void LoadPlayer()
|
||||||
|
{
|
||||||
|
PlayerData data = SaveSystem.LoadPlayer();
|
||||||
|
|
||||||
|
Vector3 position;
|
||||||
|
position.x = data.position[0];
|
||||||
|
position.y = data.position[1];
|
||||||
|
position.z = data.position[2];
|
||||||
|
transform.position = position;
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Project Files/Scripts/Shumpei/Player.cs.meta
Normal file
11
Assets/Project Files/Scripts/Shumpei/Player.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6ff82a98832d12249b30083bc9ae2dd3
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
22
Assets/Project Files/Scripts/Shumpei/PlayerData.cs
Normal file
22
Assets/Project Files/Scripts/Shumpei/PlayerData.cs
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
[System.Serializable]
|
||||||
|
public class PlayerData
|
||||||
|
{
|
||||||
|
/*public int level;
|
||||||
|
public int health;*/
|
||||||
|
public float[] position;
|
||||||
|
|
||||||
|
public PlayerData(Player player)
|
||||||
|
{
|
||||||
|
/*level = player.level;
|
||||||
|
health = player.health;*/
|
||||||
|
|
||||||
|
position = new float[3];
|
||||||
|
position[0] = player.transform.position.x;
|
||||||
|
position[1] = player.transform.position.y;
|
||||||
|
position[2] = player.transform.position.z;
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Project Files/Scripts/Shumpei/PlayerData.cs.meta
Normal file
11
Assets/Project Files/Scripts/Shumpei/PlayerData.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9cdb4de85d282744083c6d9cee4fef3c
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
42
Assets/Project Files/Scripts/Shumpei/SaveSystem.cs
Normal file
42
Assets/Project Files/Scripts/Shumpei/SaveSystem.cs
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
using System.IO;
|
||||||
|
using System.Runtime.Serialization.Formatters.Binary;
|
||||||
|
|
||||||
|
public static class SaveSystem
|
||||||
|
{
|
||||||
|
public static void SavePlayer(Player player)
|
||||||
|
{
|
||||||
|
BinaryFormatter formatter = new BinaryFormatter();
|
||||||
|
string path = Application.persistentDataPath + "/player.data";
|
||||||
|
FileStream stream = new FileStream(path, FileMode.Create);
|
||||||
|
|
||||||
|
PlayerData data = new PlayerData(player);
|
||||||
|
|
||||||
|
formatter.Serialize(stream, data);
|
||||||
|
stream.Close();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static PlayerData LoadPlayer ()
|
||||||
|
{
|
||||||
|
string path = Application.persistentDataPath + "/player.data";
|
||||||
|
if (File.Exists(path))
|
||||||
|
{
|
||||||
|
BinaryFormatter formatter = new BinaryFormatter();
|
||||||
|
FileStream stream = new FileStream(path, FileMode.Open);
|
||||||
|
|
||||||
|
PlayerData data = formatter.Deserialize(stream) as PlayerData;
|
||||||
|
stream.Close();
|
||||||
|
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Debug.Log("Save File not found in " + path);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
11
Assets/Project Files/Scripts/Shumpei/SaveSystem.cs.meta
Normal file
11
Assets/Project Files/Scripts/Shumpei/SaveSystem.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 49c2ebd233ef7a547b12ce163244e30a
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class TriggerDoorController : MonoBehaviour
|
||||||
|
{
|
||||||
|
[SerializeField] private Animator myDoor = null;
|
||||||
|
|
||||||
|
[SerializeField] private bool Trigger = false;
|
||||||
|
//[SerializeField] private bool closeTrigger = false;
|
||||||
|
|
||||||
|
[SerializeField] private string doorOpen = "DoorOpen";
|
||||||
|
[SerializeField] private string doorClose = "DoorClose";
|
||||||
|
|
||||||
|
// Start is called before the first frame update
|
||||||
|
|
||||||
|
public void OnTriggerEnter(Collider other)
|
||||||
|
{
|
||||||
|
if (other.CompareTag("Player"))
|
||||||
|
{
|
||||||
|
Debug.Log("col");
|
||||||
|
if (Trigger)
|
||||||
|
{
|
||||||
|
Debug.Log("open");
|
||||||
|
myDoor.Play(doorOpen, 0, 0.0f);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*else if (closeTrigger)
|
||||||
|
{
|
||||||
|
myDoor.Play(doorClose, 0, 0.0f);
|
||||||
|
}*/
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnTriggerExit(Collider other)
|
||||||
|
{
|
||||||
|
if (other.CompareTag("Player"))
|
||||||
|
{
|
||||||
|
if (Trigger)
|
||||||
|
{
|
||||||
|
myDoor.Play(doorClose, 0, 0.0f);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 47a5e670191c5504b9c5b97a17d4678f
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user