Compare commits
26 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4df9180db1 | |||
| 7926bcdef4 | |||
| be8b9a987d | |||
|
|
5f55b04eba | ||
|
|
fd4432fc6d | ||
|
|
029c6cf7ba | ||
|
|
ca41eda129 | ||
|
|
ec2dd764d4 | ||
|
|
cd1633af54 | ||
| 82b7e7fbb2 | |||
|
|
f032bb323a | ||
| ba8883786b | |||
| 1ed57d5c31 | |||
|
|
f7734432cc | ||
| 6f7c3eaa9b | |||
| 26e2d0d1db | |||
| 1f2af9127e | |||
| 9b4be15690 | |||
|
|
09e7e26cbb | ||
|
|
037432c393 | ||
|
|
9eaa6517c3 | ||
| 8727b6d949 | |||
|
|
c13d671975 | ||
| e0f3c3e580 | |||
| 194574ee65 | |||
|
|
e671f77c77 |
@@ -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: b883faee006af594480a183e2c37d229, 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:
|
||||||
@@ -108,7 +108,7 @@ Material:
|
|||||||
- _ZWrite: 1
|
- _ZWrite: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _BaseColor: {r: 0.8018868, g: 0.8018868, b: 0.8018868, a: 1}
|
- _BaseColor: {r: 0.8018868, g: 0.8018868, b: 0.8018868, a: 1}
|
||||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
- _Color: {r: 0.8018868, g: 0.8018868, b: 0.8018868, a: 1}
|
||||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ Material:
|
|||||||
- _ZWrite: 1
|
- _ZWrite: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _BaseColor: {r: 0, g: 0, b: 0, a: 1}
|
- _BaseColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
- _Color: {r: 0, g: 0, b: 0, a: 1}
|
||||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
|
||||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
|||||||
@@ -474,7 +474,7 @@ GameObject:
|
|||||||
- component: {fileID: 13646088}
|
- component: {fileID: 13646088}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: hands_coll:b_r_index3
|
m_Name: hands_coll:b_r_index3
|
||||||
m_TagString: Untagged
|
m_TagString: Hand
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
@@ -502,8 +502,8 @@ CapsuleCollider:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 157110}
|
m_GameObject: {fileID: 157110}
|
||||||
m_Material: {fileID: 0}
|
m_Material: {fileID: 0}
|
||||||
m_IsTrigger: 0
|
m_IsTrigger: 1
|
||||||
m_Enabled: 0
|
m_Enabled: 1
|
||||||
m_Radius: 0.01
|
m_Radius: 0.01
|
||||||
m_Height: 0.05
|
m_Height: 0.05
|
||||||
m_Direction: 2
|
m_Direction: 2
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ Material:
|
|||||||
RenderType: Transparent
|
RenderType: Transparent
|
||||||
disabledShaderPasses:
|
disabledShaderPasses:
|
||||||
- DepthOnly
|
- DepthOnly
|
||||||
|
- SHADOWCASTER
|
||||||
m_SavedProperties:
|
m_SavedProperties:
|
||||||
serializedVersion: 3
|
serializedVersion: 3
|
||||||
m_TexEnvs:
|
m_TexEnvs:
|
||||||
@@ -109,7 +110,7 @@ Material:
|
|||||||
- _ZWrite: 0
|
- _ZWrite: 0
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _BaseColor: {r: 0.90344834, g: 1, b: 0, a: 0.78431374}
|
- _BaseColor: {r: 0.90344834, g: 1, b: 0, a: 0.78431374}
|
||||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
- _Color: {r: 0.90344834, g: 1, b: 0, a: 0.78431374}
|
||||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ Material:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: PBR
|
m_Name: PBR
|
||||||
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
|
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
|
||||||
m_ShaderKeywords: _EMISSION _METALLICSPECGLOSSMAP _NORMALMAP _OCCLUSIONMAP
|
m_ShaderKeywords: _EMISSION
|
||||||
m_LightmapFlags: 1
|
m_LightmapFlags: 1
|
||||||
m_EnableInstancingVariants: 0
|
m_EnableInstancingVariants: 0
|
||||||
m_DoubleSidedGI: 0
|
m_DoubleSidedGI: 0
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ Material:
|
|||||||
- _ZWrite: 1
|
- _ZWrite: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _BaseColor: {r: 0.5612491, g: 0.61764705, b: 0.18620238, a: 1}
|
- _BaseColor: {r: 0.5612491, g: 0.61764705, b: 0.18620238, a: 1}
|
||||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
- _Color: {r: 0.5612491, g: 0.61764705, b: 0.18620235, a: 1}
|
||||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ Material:
|
|||||||
- _ZWrite: 1
|
- _ZWrite: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _BaseColor: {r: 0.45882356, g: 0.517647, b: 0.07058821, a: 1}
|
- _BaseColor: {r: 0.45882356, g: 0.517647, b: 0.07058821, a: 1}
|
||||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
- _Color: {r: 0.45882356, g: 0.517647, b: 0.07058818, a: 1}
|
||||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ Material:
|
|||||||
- _ZWrite: 1
|
- _ZWrite: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _BaseColor: {r: 0.828, g: 0.197287, b: 0, a: 1}
|
- _BaseColor: {r: 0.828, g: 0.197287, b: 0, a: 1}
|
||||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
- _Color: {r: 0.828, g: 0.19728696, b: 0, a: 1}
|
||||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ Material:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: Red Beam
|
m_Name: Red Beam
|
||||||
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
|
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
|
||||||
m_ShaderKeywords: _EMISSION _GLOSSINESS_FROM_BASE_ALPHA _SPECULAR_COLOR
|
m_ShaderKeywords: _EMISSION
|
||||||
m_LightmapFlags: 1
|
m_LightmapFlags: 1
|
||||||
m_EnableInstancingVariants: 0
|
m_EnableInstancingVariants: 0
|
||||||
m_DoubleSidedGI: 0
|
m_DoubleSidedGI: 0
|
||||||
@@ -78,7 +78,7 @@ Material:
|
|||||||
- _ZWrite: 1
|
- _ZWrite: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _BaseColor: {r: 1, g: 0, b: 0, a: 1}
|
- _BaseColor: {r: 1, g: 0, b: 0, a: 1}
|
||||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
- _Color: {r: 1, g: 0, b: 0, a: 1}
|
||||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
|
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
|||||||
@@ -122,7 +122,7 @@ Material:
|
|||||||
- _WavingTint: {r: 1, g: 1, b: 1, a: 1}
|
- _WavingTint: {r: 1, g: 1, b: 1, a: 1}
|
||||||
- _Wind: {r: 1, g: 1, b: 4, a: 8}
|
- _Wind: {r: 1, g: 1, b: 4, a: 8}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
--- !u!114 &1222479040574472917
|
--- !u!114 &3157072690679539847
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 11
|
m_ObjectHideFlags: 11
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
%YAML 1.1
|
%YAML 1.1
|
||||||
%TAG !u! tag:unity3d.com,2011:
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
--- !u!114 &-7458032677251445808
|
--- !u!114 &-5181856834859275866
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 11
|
m_ObjectHideFlags: 11
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
|||||||
@@ -1,18 +1,5 @@
|
|||||||
%YAML 1.1
|
%YAML 1.1
|
||||||
%TAG !u! tag:unity3d.com,2011:
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
--- !u!114 &-2762967392186058974
|
|
||||||
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
|
|
||||||
--- !u!21 &2100000
|
--- !u!21 &2100000
|
||||||
Material:
|
Material:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
@@ -95,3 +82,16 @@ Material:
|
|||||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
--- !u!114 &5603016075464539001
|
||||||
|
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
|
||||||
|
|||||||
@@ -1,18 +1,5 @@
|
|||||||
%YAML 1.1
|
%YAML 1.1
|
||||||
%TAG !u! tag:unity3d.com,2011:
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
--- !u!114 &-8230533163155615457
|
|
||||||
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
|
|
||||||
--- !u!21 &2100000
|
--- !u!21 &2100000
|
||||||
Material:
|
Material:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
@@ -178,3 +165,16 @@ Material:
|
|||||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
|
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
--- !u!114 &2903791061945988491
|
||||||
|
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
|
||||||
|
|||||||
@@ -1,18 +1,5 @@
|
|||||||
%YAML 1.1
|
%YAML 1.1
|
||||||
%TAG !u! tag:unity3d.com,2011:
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
--- !u!114 &-5131249115176342388
|
|
||||||
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
|
|
||||||
--- !u!21 &2100000
|
--- !u!21 &2100000
|
||||||
Material:
|
Material:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
@@ -194,3 +181,16 @@ Material:
|
|||||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
|
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
--- !u!114 &6902619616048362596
|
||||||
|
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
|
||||||
|
|||||||
@@ -1,18 +1,5 @@
|
|||||||
%YAML 1.1
|
%YAML 1.1
|
||||||
%TAG !u! tag:unity3d.com,2011:
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
--- !u!114 &-8379489665063475036
|
|
||||||
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
|
|
||||||
--- !u!21 &2100000
|
--- !u!21 &2100000
|
||||||
Material:
|
Material:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
@@ -186,3 +173,16 @@ Material:
|
|||||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
|
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
--- !u!114 &379573167805043484
|
||||||
|
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
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
%YAML 1.1
|
%YAML 1.1
|
||||||
%TAG !u! tag:unity3d.com,2011:
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
--- !u!114 &-7685960129097434148
|
--- !u!114 &-5269009578845786356
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 11
|
m_ObjectHideFlags: 11
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
%YAML 1.1
|
%YAML 1.1
|
||||||
%TAG !u! tag:unity3d.com,2011:
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
--- !u!114 &-732951968300167532
|
--- !u!114 &-1803904315105783093
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 11
|
m_ObjectHideFlags: 11
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
|||||||
12
Assets/PortalInteractor.cs
Normal file
12
Assets/PortalInteractor.cs
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.XR.Interaction.Toolkit;
|
||||||
|
|
||||||
|
[Serializable]
|
||||||
|
[RequireComponent(typeof(XRSocketInteractor))]
|
||||||
|
public class PortalInteractor : MonoBehaviour
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
11
Assets/PortalInteractor.cs.meta
Normal file
11
Assets/PortalInteractor.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 064df851dbd93e34297cae798293e121
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -1,6 +1,10 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
|
<<<<<<<< HEAD:Assets/Scenes/Shumpei/MenuScene.unity.meta
|
||||||
|
guid: 8eb805c8ac3b6ff41a6002372d160f1f
|
||||||
|
========
|
||||||
guid: 7132a8e595d20114aa50d2f143f253d0
|
guid: 7132a8e595d20114aa50d2f143f253d0
|
||||||
folderAsset: yes
|
folderAsset: yes
|
||||||
|
>>>>>>>> origin/slimeAI:Assets/Project Files/Animations/Arlo.meta
|
||||||
DefaultImporter:
|
DefaultImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ AnimatorStateTransition:
|
|||||||
m_TransitionDuration: 0.25
|
m_TransitionDuration: 0.25
|
||||||
m_TransitionOffset: 0
|
m_TransitionOffset: 0
|
||||||
m_ExitTime: 0.85
|
m_ExitTime: 0.85
|
||||||
m_HasExitTime: 1
|
m_HasExitTime: 0
|
||||||
m_HasFixedDuration: 1
|
m_HasFixedDuration: 1
|
||||||
m_InterruptionSource: 0
|
m_InterruptionSource: 0
|
||||||
m_OrderedInterruption: 1
|
m_OrderedInterruption: 1
|
||||||
@@ -49,6 +49,7 @@ AnimatorState:
|
|||||||
m_CycleOffset: 0
|
m_CycleOffset: 0
|
||||||
m_Transitions:
|
m_Transitions:
|
||||||
- {fileID: -5558417074028381841}
|
- {fileID: -5558417074028381841}
|
||||||
|
- {fileID: -1268510201227337377}
|
||||||
m_StateMachineBehaviours: []
|
m_StateMachineBehaviours: []
|
||||||
m_Position: {x: 50, y: 50, z: 0}
|
m_Position: {x: 50, y: 50, z: 0}
|
||||||
m_IKOnFeet: 0
|
m_IKOnFeet: 0
|
||||||
@@ -58,7 +59,7 @@ AnimatorState:
|
|||||||
m_MirrorParameterActive: 0
|
m_MirrorParameterActive: 0
|
||||||
m_CycleOffsetParameterActive: 0
|
m_CycleOffsetParameterActive: 0
|
||||||
m_TimeParameterActive: 0
|
m_TimeParameterActive: 0
|
||||||
m_Motion: {fileID: 7400000, guid: dbf4e442d523220489ca9531ab20161f, type: 3}
|
m_Motion: {fileID: 7400000, guid: f5d4d1a7dadc5a84d910c492d947ca4f, type: 3}
|
||||||
m_Tag:
|
m_Tag:
|
||||||
m_SpeedParameter:
|
m_SpeedParameter:
|
||||||
m_MirrorParameter:
|
m_MirrorParameter:
|
||||||
@@ -84,7 +85,32 @@ AnimatorStateTransition:
|
|||||||
m_TransitionDuration: 0.25
|
m_TransitionDuration: 0.25
|
||||||
m_TransitionOffset: 0
|
m_TransitionOffset: 0
|
||||||
m_ExitTime: 0.6875
|
m_ExitTime: 0.6875
|
||||||
m_HasExitTime: 1
|
m_HasExitTime: 0
|
||||||
|
m_HasFixedDuration: 1
|
||||||
|
m_InterruptionSource: 0
|
||||||
|
m_OrderedInterruption: 1
|
||||||
|
m_CanTransitionToSelf: 1
|
||||||
|
--- !u!1101 &-5660328294272393165
|
||||||
|
AnimatorStateTransition:
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name:
|
||||||
|
m_Conditions:
|
||||||
|
- m_ConditionMode: 2
|
||||||
|
m_ConditionEvent: EnemyInAttackRange
|
||||||
|
m_EventTreshold: 0
|
||||||
|
m_DstStateMachine: {fileID: 0}
|
||||||
|
m_DstState: {fileID: -6878085496064969341}
|
||||||
|
m_Solo: 0
|
||||||
|
m_Mute: 0
|
||||||
|
m_IsExit: 0
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TransitionDuration: 0.25
|
||||||
|
m_TransitionOffset: 0
|
||||||
|
m_ExitTime: 0.70000005
|
||||||
|
m_HasExitTime: 0
|
||||||
m_HasFixedDuration: 1
|
m_HasFixedDuration: 1
|
||||||
m_InterruptionSource: 0
|
m_InterruptionSource: 0
|
||||||
m_OrderedInterruption: 1
|
m_OrderedInterruption: 1
|
||||||
@@ -109,7 +135,7 @@ AnimatorStateTransition:
|
|||||||
m_TransitionDuration: 0.25
|
m_TransitionDuration: 0.25
|
||||||
m_TransitionOffset: 0
|
m_TransitionOffset: 0
|
||||||
m_ExitTime: 0.625
|
m_ExitTime: 0.625
|
||||||
m_HasExitTime: 1
|
m_HasExitTime: 0
|
||||||
m_HasFixedDuration: 1
|
m_HasFixedDuration: 1
|
||||||
m_InterruptionSource: 0
|
m_InterruptionSource: 0
|
||||||
m_OrderedInterruption: 1
|
m_OrderedInterruption: 1
|
||||||
@@ -124,7 +150,8 @@ AnimatorState:
|
|||||||
m_Name: EnemyAttack
|
m_Name: EnemyAttack
|
||||||
m_Speed: 1
|
m_Speed: 1
|
||||||
m_CycleOffset: 0
|
m_CycleOffset: 0
|
||||||
m_Transitions: []
|
m_Transitions:
|
||||||
|
- {fileID: -5660328294272393165}
|
||||||
m_StateMachineBehaviours: []
|
m_StateMachineBehaviours: []
|
||||||
m_Position: {x: 50, y: 50, z: 0}
|
m_Position: {x: 50, y: 50, z: 0}
|
||||||
m_IKOnFeet: 0
|
m_IKOnFeet: 0
|
||||||
@@ -140,6 +167,56 @@ AnimatorState:
|
|||||||
m_MirrorParameter:
|
m_MirrorParameter:
|
||||||
m_CycleOffsetParameter:
|
m_CycleOffsetParameter:
|
||||||
m_TimeParameter:
|
m_TimeParameter:
|
||||||
|
--- !u!1101 &-1918993004881361147
|
||||||
|
AnimatorStateTransition:
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name:
|
||||||
|
m_Conditions:
|
||||||
|
- m_ConditionMode: 2
|
||||||
|
m_ConditionEvent: EnemyInVisionRange
|
||||||
|
m_EventTreshold: 0
|
||||||
|
m_DstStateMachine: {fileID: 0}
|
||||||
|
m_DstState: {fileID: 1102546605246812244}
|
||||||
|
m_Solo: 0
|
||||||
|
m_Mute: 0
|
||||||
|
m_IsExit: 0
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TransitionDuration: 0.25
|
||||||
|
m_TransitionOffset: 0
|
||||||
|
m_ExitTime: 0.6875
|
||||||
|
m_HasExitTime: 0
|
||||||
|
m_HasFixedDuration: 1
|
||||||
|
m_InterruptionSource: 0
|
||||||
|
m_OrderedInterruption: 1
|
||||||
|
m_CanTransitionToSelf: 1
|
||||||
|
--- !u!1101 &-1268510201227337377
|
||||||
|
AnimatorStateTransition:
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name:
|
||||||
|
m_Conditions:
|
||||||
|
- m_ConditionMode: 2
|
||||||
|
m_ConditionEvent: EnemyInAggroRange
|
||||||
|
m_EventTreshold: 0
|
||||||
|
m_DstStateMachine: {fileID: 0}
|
||||||
|
m_DstState: {fileID: 8194647877007136643}
|
||||||
|
m_Solo: 0
|
||||||
|
m_Mute: 0
|
||||||
|
m_IsExit: 0
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TransitionDuration: 0.25
|
||||||
|
m_TransitionOffset: 0
|
||||||
|
m_ExitTime: 0.625
|
||||||
|
m_HasExitTime: 0
|
||||||
|
m_HasFixedDuration: 1
|
||||||
|
m_InterruptionSource: 0
|
||||||
|
m_OrderedInterruption: 1
|
||||||
|
m_CanTransitionToSelf: 1
|
||||||
--- !u!91 &9100000
|
--- !u!91 &9100000
|
||||||
AnimatorController:
|
AnimatorController:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -400,28 +477,6 @@ AnimatorStateTransition:
|
|||||||
m_InterruptionSource: 0
|
m_InterruptionSource: 0
|
||||||
m_OrderedInterruption: 1
|
m_OrderedInterruption: 1
|
||||||
m_CanTransitionToSelf: 1
|
m_CanTransitionToSelf: 1
|
||||||
--- !u!1101 &1101549165158824158
|
|
||||||
AnimatorStateTransition:
|
|
||||||
m_ObjectHideFlags: 1
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_Name:
|
|
||||||
m_Conditions: []
|
|
||||||
m_DstStateMachine: {fileID: 0}
|
|
||||||
m_DstState: {fileID: 1102835054974116572}
|
|
||||||
m_Solo: 0
|
|
||||||
m_Mute: 0
|
|
||||||
m_IsExit: 0
|
|
||||||
serializedVersion: 3
|
|
||||||
m_TransitionDuration: 0.25
|
|
||||||
m_TransitionOffset: 0
|
|
||||||
m_ExitTime: 4
|
|
||||||
m_HasExitTime: 1
|
|
||||||
m_HasFixedDuration: 1
|
|
||||||
m_InterruptionSource: 0
|
|
||||||
m_OrderedInterruption: 1
|
|
||||||
m_CanTransitionToSelf: 1
|
|
||||||
--- !u!1101 &1101571659118250030
|
--- !u!1101 &1101571659118250030
|
||||||
AnimatorStateTransition:
|
AnimatorStateTransition:
|
||||||
m_ObjectHideFlags: 1
|
m_ObjectHideFlags: 1
|
||||||
@@ -520,8 +575,7 @@ AnimatorState:
|
|||||||
m_Name: Dizzy
|
m_Name: Dizzy
|
||||||
m_Speed: 1
|
m_Speed: 1
|
||||||
m_CycleOffset: 0
|
m_CycleOffset: 0
|
||||||
m_Transitions:
|
m_Transitions: []
|
||||||
- {fileID: 1101549165158824158}
|
|
||||||
m_StateMachineBehaviours: []
|
m_StateMachineBehaviours: []
|
||||||
m_Position: {x: 50, y: 50, z: 0}
|
m_Position: {x: 50, y: 50, z: 0}
|
||||||
m_IKOnFeet: 0
|
m_IKOnFeet: 0
|
||||||
@@ -979,74 +1033,74 @@ AnimatorStateMachine:
|
|||||||
m_ChildStates:
|
m_ChildStates:
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 1102546605246812244}
|
m_State: {fileID: 1102546605246812244}
|
||||||
m_Position: {x: 340, y: 30, z: 0}
|
m_Position: {x: 300, y: 140, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 1102428608990248820}
|
m_State: {fileID: 1102428608990248820}
|
||||||
m_Position: {x: 1400, y: 60, z: 0}
|
m_Position: {x: 650, y: 120, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 1102941443349979230}
|
m_State: {fileID: 1102941443349979230}
|
||||||
m_Position: {x: 1400, y: 140, z: 0}
|
m_Position: {x: 650, y: 200, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 1102311292720249994}
|
m_State: {fileID: 1102311292720249994}
|
||||||
m_Position: {x: 1400, y: 220, z: 0}
|
m_Position: {x: 650, y: 280, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 1102508070621265122}
|
m_State: {fileID: 1102508070621265122}
|
||||||
m_Position: {x: 1650, y: -30, z: 0}
|
m_Position: {x: 900, y: 30, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 1102615628393760256}
|
m_State: {fileID: 1102615628393760256}
|
||||||
m_Position: {x: 1650, y: 60, z: 0}
|
m_Position: {x: 900, y: 120, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 1102840220384220776}
|
m_State: {fileID: 1102840220384220776}
|
||||||
m_Position: {x: 1650, y: 140, z: 0}
|
m_Position: {x: 900, y: 200, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 1102224988525881432}
|
m_State: {fileID: 1102224988525881432}
|
||||||
m_Position: {x: 1650, y: 220, z: 0}
|
m_Position: {x: 900, y: 280, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 1102906356952716468}
|
m_State: {fileID: 1102906356952716468}
|
||||||
m_Position: {x: 1650, y: 310, z: 0}
|
m_Position: {x: 900, y: 370, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 1102275823511186668}
|
m_State: {fileID: 1102275823511186668}
|
||||||
m_Position: {x: 1910, y: -30, z: 0}
|
m_Position: {x: 1160, y: 30, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 1102272222388203014}
|
m_State: {fileID: 1102272222388203014}
|
||||||
m_Position: {x: 1910, y: 60, z: 0}
|
m_Position: {x: 1160, y: 120, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 1102080339498404604}
|
m_State: {fileID: 1102080339498404604}
|
||||||
m_Position: {x: 1910, y: 140, z: 0}
|
m_Position: {x: 1160, y: 200, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 1102049015754028010}
|
m_State: {fileID: 1102049015754028010}
|
||||||
m_Position: {x: 1910, y: 220, z: 0}
|
m_Position: {x: 1160, y: 280, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 1102486251471425260}
|
m_State: {fileID: 1102486251471425260}
|
||||||
m_Position: {x: 1910, y: 310, z: 0}
|
m_Position: {x: 1160, y: 370, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 1102960180878307256}
|
m_State: {fileID: 1102960180878307256}
|
||||||
m_Position: {x: 1840, y: 390, z: 0}
|
m_Position: {x: 670, y: 480, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 1102022585587399682}
|
m_State: {fileID: 1102022585587399682}
|
||||||
m_Position: {x: 1650, y: 480, z: 0}
|
m_Position: {x: 670, y: 550, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 1102835054974116572}
|
m_State: {fileID: 1102835054974116572}
|
||||||
m_Position: {x: 1270, y: 370, z: 0}
|
m_Position: {x: 280, y: 510, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: 8194647877007136643}
|
m_State: {fileID: 8194647877007136643}
|
||||||
m_Position: {x: 730, y: 20, z: 0}
|
m_Position: {x: 300, y: 220, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: -1989803667490188130}
|
m_State: {fileID: -1989803667490188130}
|
||||||
m_Position: {x: 760, y: 340, z: 0}
|
m_Position: {x: 300, y: 380, z: 0}
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: -6878085496064969341}
|
m_State: {fileID: -6878085496064969341}
|
||||||
m_Position: {x: 910, y: 170, z: 0}
|
m_Position: {x: 300, y: 300, z: 0}
|
||||||
m_ChildStateMachines: []
|
m_ChildStateMachines: []
|
||||||
m_AnyStateTransitions: []
|
m_AnyStateTransitions: []
|
||||||
m_EntryTransitions: []
|
m_EntryTransitions: []
|
||||||
m_StateMachineTransitions: {}
|
m_StateMachineTransitions: {}
|
||||||
m_StateMachineBehaviours: []
|
m_StateMachineBehaviours: []
|
||||||
m_AnyStatePosition: {x: 50, y: 20, z: 0}
|
m_AnyStatePosition: {x: 50, y: 20, z: 0}
|
||||||
m_EntryPosition: {x: 50, y: 120, z: 0}
|
m_EntryPosition: {x: 100, y: 150, z: 0}
|
||||||
m_ExitPosition: {x: 48, y: 228, z: 0}
|
m_ExitPosition: {x: 90, y: 510, z: 0}
|
||||||
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
|
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
|
||||||
m_DefaultState: {fileID: -1989803667490188130}
|
m_DefaultState: {fileID: 1102546605246812244}
|
||||||
--- !u!1102 &8194647877007136643
|
--- !u!1102 &8194647877007136643
|
||||||
AnimatorState:
|
AnimatorState:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
@@ -1059,6 +1113,7 @@ AnimatorState:
|
|||||||
m_CycleOffset: 0
|
m_CycleOffset: 0
|
||||||
m_Transitions:
|
m_Transitions:
|
||||||
- {fileID: -5882858675207143937}
|
- {fileID: -5882858675207143937}
|
||||||
|
- {fileID: -1918993004881361147}
|
||||||
m_StateMachineBehaviours: []
|
m_StateMachineBehaviours: []
|
||||||
m_Position: {x: 50, y: 50, z: 0}
|
m_Position: {x: 50, y: 50, z: 0}
|
||||||
m_IKOnFeet: 0
|
m_IKOnFeet: 0
|
||||||
|
|||||||
@@ -16,9 +16,10 @@ GameObject:
|
|||||||
- component: {fileID: -728432962252772913}
|
- component: {fileID: -728432962252772913}
|
||||||
- component: {fileID: 1264022012566418942}
|
- component: {fileID: 1264022012566418942}
|
||||||
- component: {fileID: 759522315152862422}
|
- component: {fileID: 759522315152862422}
|
||||||
m_Layer: 0
|
- component: {fileID: 7019801789685915322}
|
||||||
|
m_Layer: 10
|
||||||
m_Name: Log
|
m_Name: Log
|
||||||
m_TagString: Untagged
|
m_TagString: Throwable
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
@@ -287,3 +288,19 @@ MonoBehaviour:
|
|||||||
precomputeOutline: 0
|
precomputeOutline: 0
|
||||||
bakeKeys: []
|
bakeKeys: []
|
||||||
bakeValues: []
|
bakeValues: []
|
||||||
|
--- !u!114 &7019801789685915322
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3057085693074020240}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fc417ab3a5b06f04db2149be4cfdf6e4, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
itemId: 5
|
||||||
|
canStack: 1
|
||||||
|
itemName: Wood Log
|
||||||
|
itemDescription: A simple wooden log. A key ingredient for many things.
|
||||||
|
|||||||
@@ -1,6 +1,12 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
|
<<<<<<<< HEAD:Assets/RECURSOS YOS UNITY.meta
|
||||||
|
guid: 28785ec045ec00946ab767b14c8f4c6d
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
========
|
||||||
guid: 288eb0a3190dc75419059ff7b4b70aa0
|
guid: 288eb0a3190dc75419059ff7b4b70aa0
|
||||||
PrefabImporter:
|
PrefabImporter:
|
||||||
|
>>>>>>>> origin/slimeAI:Assets/Project Files/Prefabs/Arlo/SlimePBR.prefab.meta
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
assetBundleName:
|
assetBundleName:
|
||||||
|
|||||||
@@ -15,9 +15,9 @@ GameObject:
|
|||||||
- component: {fileID: 5579585539182961868}
|
- component: {fileID: 5579585539182961868}
|
||||||
- component: {fileID: 8105550803505491054}
|
- component: {fileID: 8105550803505491054}
|
||||||
- component: {fileID: 4591371125200328589}
|
- component: {fileID: 4591371125200328589}
|
||||||
m_Layer: 0
|
m_Layer: 10
|
||||||
m_Name: Mushroom_01
|
m_Name: Mushroom_01
|
||||||
m_TagString: Untagged
|
m_TagString: Throwable
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
@@ -248,3 +248,4 @@ MonoBehaviour:
|
|||||||
canStack: 1
|
canStack: 1
|
||||||
itemName: Red Mushroom
|
itemName: Red Mushroom
|
||||||
itemDescription:
|
itemDescription:
|
||||||
|
prefab: {fileID: 4385080170328260021}
|
||||||
|
|||||||
@@ -15,9 +15,9 @@ GameObject:
|
|||||||
- component: {fileID: 5868452619794669030}
|
- component: {fileID: 5868452619794669030}
|
||||||
- component: {fileID: 2669145217468523370}
|
- component: {fileID: 2669145217468523370}
|
||||||
- component: {fileID: 8028753017960928093}
|
- component: {fileID: 8028753017960928093}
|
||||||
m_Layer: 0
|
m_Layer: 10
|
||||||
m_Name: Mushroom_02
|
m_Name: Mushroom_02
|
||||||
m_TagString: Untagged
|
m_TagString: Throwable
|
||||||
m_Icon: {fileID: 0}
|
m_Icon: {fileID: 0}
|
||||||
m_NavMeshLayer: 0
|
m_NavMeshLayer: 0
|
||||||
m_StaticEditorFlags: 0
|
m_StaticEditorFlags: 0
|
||||||
@@ -248,3 +248,4 @@ MonoBehaviour:
|
|||||||
canStack: 1
|
canStack: 1
|
||||||
itemName: Brown Mushroom
|
itemName: Brown Mushroom
|
||||||
itemDescription:
|
itemDescription:
|
||||||
|
prefab: {fileID: 5440707293445505367}
|
||||||
|
|||||||
@@ -4835,6 +4835,8 @@ GameObject:
|
|||||||
- component: {fileID: 824121554007831541}
|
- component: {fileID: 824121554007831541}
|
||||||
- component: {fileID: 3271421586109646936}
|
- component: {fileID: 3271421586109646936}
|
||||||
- component: {fileID: 6090694805862981561}
|
- component: {fileID: 6090694805862981561}
|
||||||
|
- component: {fileID: 6268334591715512481}
|
||||||
|
- component: {fileID: 7195648623186244198}
|
||||||
m_Layer: 10
|
m_Layer: 10
|
||||||
m_Name: IceBolt
|
m_Name: IceBolt
|
||||||
m_TagString: IceBolt
|
m_TagString: IceBolt
|
||||||
@@ -4897,7 +4899,7 @@ SphereCollider:
|
|||||||
m_IsTrigger: 0
|
m_IsTrigger: 0
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Radius: 1
|
m_Radius: 0.5
|
||||||
m_Center: {x: 0, y: 0, z: 0}
|
m_Center: {x: 0, y: 0, z: 0}
|
||||||
--- !u!135 &6090694805862981561
|
--- !u!135 &6090694805862981561
|
||||||
SphereCollider:
|
SphereCollider:
|
||||||
@@ -4910,8 +4912,58 @@ SphereCollider:
|
|||||||
m_IsTrigger: 1
|
m_IsTrigger: 1
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Radius: 1
|
m_Radius: 0.5
|
||||||
m_Center: {x: 0, y: 0, z: 0}
|
m_Center: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!33 &6268334591715512481
|
||||||
|
MeshFilter:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3928666337405863711}
|
||||||
|
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
--- !u!23 &7195648623186244198
|
||||||
|
MeshRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3928666337405863711}
|
||||||
|
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: bd0bb729cb6159b4ab21c5f62cad24ee, type: 3}
|
||||||
|
m_StaticBatchInfo:
|
||||||
|
firstSubMesh: 0
|
||||||
|
subMeshCount: 0
|
||||||
|
m_StaticBatchRoot: {fileID: 0}
|
||||||
|
m_ProbeAnchor: {fileID: 0}
|
||||||
|
m_LightProbeVolumeOverride: {fileID: 0}
|
||||||
|
m_ScaleInLightmap: 1
|
||||||
|
m_ReceiveGI: 1
|
||||||
|
m_PreserveUVs: 0
|
||||||
|
m_IgnoreNormalsForChartDetection: 0
|
||||||
|
m_ImportantGI: 0
|
||||||
|
m_StitchLightmapSeams: 1
|
||||||
|
m_SelectedEditorRenderState: 3
|
||||||
|
m_MinimumChartSize: 4
|
||||||
|
m_AutoUVMaxDistance: 0.5
|
||||||
|
m_AutoUVMaxAngle: 89
|
||||||
|
m_LightmapParameters: {fileID: 0}
|
||||||
|
m_SortingLayerID: 0
|
||||||
|
m_SortingLayer: 0
|
||||||
|
m_SortingOrder: 0
|
||||||
|
m_AdditionalVertexStreams: {fileID: 0}
|
||||||
--- !u!1 &4403856838497526616
|
--- !u!1 &4403856838497526616
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
153
Assets/Project Files/Prefabs/JonasB/PortalActivator.prefab
Normal file
153
Assets/Project Files/Prefabs/JonasB/PortalActivator.prefab
Normal file
@@ -0,0 +1,153 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1 &5902822188982115047
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 5902822188982115046}
|
||||||
|
- component: {fileID: 7607271486909413448}
|
||||||
|
- component: {fileID: 1763487140054237992}
|
||||||
|
- component: {fileID: 5902822188982115044}
|
||||||
|
- component: {fileID: 5902822188982115045}
|
||||||
|
m_Layer: 21
|
||||||
|
m_Name: PortalActivator
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &5902822188982115046
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5902822188982115047}
|
||||||
|
m_LocalRotation: {x: -0, y: 0.69779044, z: -0, w: 0.7163019}
|
||||||
|
m_LocalPosition: {x: 1.96, y: 1.43, z: -1.149}
|
||||||
|
m_LocalScale: {x: 0.40000004, y: 0.4, z: 0.40000004}
|
||||||
|
m_ConstrainProportionsScale: 1
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!33 &7607271486909413448
|
||||||
|
MeshFilter:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5902822188982115047}
|
||||||
|
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
--- !u!23 &1763487140054237992
|
||||||
|
MeshRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5902822188982115047}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_CastShadows: 0
|
||||||
|
m_ReceiveShadows: 0
|
||||||
|
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: bcd4c7c7522235044b0026229d01d661, 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!135 &5902822188982115044
|
||||||
|
SphereCollider:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5902822188982115047}
|
||||||
|
m_Material: {fileID: 0}
|
||||||
|
m_IsTrigger: 1
|
||||||
|
m_Enabled: 1
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Radius: 1
|
||||||
|
m_Center: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!114 &5902822188982115045
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 5902822188982115047}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 60523e0647cc6ab43acc73cb266a32a7, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_InteractionManager: {fileID: 0}
|
||||||
|
m_InteractionLayerMask:
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Bits: 4294967295
|
||||||
|
m_InteractionLayers:
|
||||||
|
m_Bits: 4294967295
|
||||||
|
m_AttachTransform: {fileID: 0}
|
||||||
|
m_KeepSelectedTargetValid: 1
|
||||||
|
m_StartingSelectedInteractable: {fileID: 0}
|
||||||
|
m_HoverEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_HoverExited:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_SelectEntered:
|
||||||
|
m_PersistentCalls:
|
||||||
|
m_Calls: []
|
||||||
|
m_SelectExited:
|
||||||
|
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_ShowInteractableHoverMeshes: 1
|
||||||
|
m_InteractableHoverMeshMaterial: {fileID: 2100000, guid: e944091e9e7c68f438499bc41f182b6d,
|
||||||
|
type: 2}
|
||||||
|
m_InteractableCantHoverMeshMaterial: {fileID: 2100000, guid: 4cf3d6647a5c3ef4da704441f4015387,
|
||||||
|
type: 2}
|
||||||
|
m_SocketActive: 1
|
||||||
|
m_InteractableHoverScale: 1
|
||||||
|
m_RecycleDelayTime: 1
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: ef2ea3e86cf37844f9ab6a9093d855b7
|
guid: ae879abf9b2ef5849ae218d5c4de4945
|
||||||
PrefabImporter:
|
PrefabImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
@@ -15,6 +15,7 @@ GameObject:
|
|||||||
- component: {fileID: 364742329878811599}
|
- component: {fileID: 364742329878811599}
|
||||||
- component: {fileID: 3113279289267004298}
|
- component: {fileID: 3113279289267004298}
|
||||||
- component: {fileID: 965315076614651339}
|
- component: {fileID: 965315076614651339}
|
||||||
|
- component: {fileID: 4869442126406565975}
|
||||||
m_Layer: 10
|
m_Layer: 10
|
||||||
m_Name: EssenceNode
|
m_Name: EssenceNode
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -301,6 +302,23 @@ AudioSource:
|
|||||||
m_PreInfinity: 2
|
m_PreInfinity: 2
|
||||||
m_PostInfinity: 2
|
m_PostInfinity: 2
|
||||||
m_RotationOrder: 4
|
m_RotationOrder: 4
|
||||||
|
--- !u!114 &4869442126406565975
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3467985268477833302}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: fc417ab3a5b06f04db2149be4cfdf6e4, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
itemId: 10
|
||||||
|
canStack: 1
|
||||||
|
itemName: Magic essence
|
||||||
|
itemDescription:
|
||||||
|
prefab: {fileID: 3467985268477833302}
|
||||||
--- !u!1 &5463776654730074005
|
--- !u!1 &5463776654730074005
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
105
Assets/Project Files/Prefabs/JoonasP/EssenceWell.prefab
Normal file
105
Assets/Project Files/Prefabs/JoonasP/EssenceWell.prefab
Normal file
@@ -0,0 +1,105 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1 &8183020133482818824
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 8183020133482637934}
|
||||||
|
- component: {fileID: 8183020133483952674}
|
||||||
|
- component: {fileID: 8183020133484680894}
|
||||||
|
- component: {fileID: 8183020133918107436}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: EssenceWell
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &8183020133482637934
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8183020133482818824}
|
||||||
|
m_LocalRotation: {x: 0.000000115202326, y: 0.7071068, z: 0.7071068, w: -0.000000115202326}
|
||||||
|
m_LocalPosition: {x: -10.25, y: 1.47, z: -12.115}
|
||||||
|
m_LocalScale: {x: 10, y: 10, z: 10}
|
||||||
|
m_ConstrainProportionsScale: 1
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_RootOrder: 0
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!33 &8183020133483952674
|
||||||
|
MeshFilter:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8183020133482818824}
|
||||||
|
m_Mesh: {fileID: 4300122, guid: 7374575f12d49ba459e91009f7a9ec62, type: 3}
|
||||||
|
--- !u!23 &8183020133484680894
|
||||||
|
MeshRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8183020133482818824}
|
||||||
|
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!114 &8183020133918107436
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8183020133482818824}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 580a2bc767950d54d9fdf84752500d7f, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
node: {fileID: 3467985268477833302, guid: 215fe2a51d12ecc43ba8f86d3dc3ae54, type: 3}
|
||||||
|
numberOfNodes: 5
|
||||||
|
spawnDelay: 1
|
||||||
|
despawnTime: 2
|
||||||
|
rightDistance: 0.1
|
||||||
|
maxUp: 0.2
|
||||||
|
minDown: -0.2
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: c5d51a2f14dbd754986192f475aa6719
|
guid: c52ee40e56d869645af73fd6f39c1323
|
||||||
PrefabImporter:
|
PrefabImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
@@ -157,12 +157,12 @@ MonoBehaviour:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 3757395767074346460}
|
m_GameObject: {fileID: 3757395767074346460}
|
||||||
m_Enabled: 1
|
m_Enabled: 0
|
||||||
m_EditorHideFlags: 0
|
m_EditorHideFlags: 0
|
||||||
m_Script: {fileID: 11500000, guid: ee8103568a01d804d89cb1fc1dff91eb, type: 3}
|
m_Script: {fileID: 11500000, guid: ee8103568a01d804d89cb1fc1dff91eb, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
particles: {fileID: 8844865646353305354}
|
particles: {fileID: 0}
|
||||||
flySpeed: 10
|
flySpeed: 10
|
||||||
testForce: 1000
|
testForce: 1000
|
||||||
--- !u!114 &3757395767037568670
|
--- !u!114 &3757395767037568670
|
||||||
@@ -379,9 +379,3 @@ Transform:
|
|||||||
type: 3}
|
type: 3}
|
||||||
m_PrefabInstance: {fileID: 6456652935746308080}
|
m_PrefabInstance: {fileID: 6456652935746308080}
|
||||||
m_PrefabAsset: {fileID: 0}
|
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}
|
|
||||||
|
|||||||
11012
Assets/Project Files/Prefabs/Portals/MainBaseGreen.prefab
Normal file
11012
Assets/Project Files/Prefabs/Portals/MainBaseGreen.prefab
Normal file
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,5 @@
|
|||||||
fileFormatVersion: 2
|
fileFormatVersion: 2
|
||||||
guid: 76e270eb5751f7e4ea45ed3b158d050f
|
guid: ae343c9db3f764a4fb226d043e7a4743
|
||||||
PrefabImporter:
|
PrefabImporter:
|
||||||
externalObjects: {}
|
externalObjects: {}
|
||||||
userData:
|
userData:
|
||||||
11992
Assets/Project Files/Prefabs/Portals/MainBasePurple.prefab
Normal file
11992
Assets/Project Files/Prefabs/Portals/MainBasePurple.prefab
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: a72fc9de03049aa4c886d2034bf938aa
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
11011
Assets/Project Files/Prefabs/Portals/MainBaseRed.prefab
Normal file
11011
Assets/Project Files/Prefabs/Portals/MainBaseRed.prefab
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 2f6b9693c8108f24db357c4f551127af
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f2183625589431345976ac92219b2b97
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -1,91 +0,0 @@
|
|||||||
%YAML 1.1
|
|
||||||
%TAG !u! tag:unity3d.com,2011:
|
|
||||||
--- !u!1001 &257613199430467881
|
|
||||||
PrefabInstance:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Modification:
|
|
||||||
m_TransformParent: {fileID: 0}
|
|
||||||
m_Modifications:
|
|
||||||
- target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_RootOrder
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalPosition.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalPosition.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalPosition.z
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalRotation.w
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalRotation.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalRotation.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalRotation.z
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalEulerAnglesHint.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalEulerAnglesHint.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2664851654700168788, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalEulerAnglesHint.z
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2664851654700168790, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: Portal_Purple
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2664851655031599332, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: player
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2664851655031599332, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: linkedPortal
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 2664851655392724835, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Materials.Array.data[0]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 2100000, guid: fec29ec9aeff5d148ae4ce39ab5981f0, type: 2}
|
|
||||||
- target: {fileID: 2664851656537753515, guid: ef2ea3e86cf37844f9ab6a9093d855b7,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_InteractionManager
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: ef2ea3e86cf37844f9ab6a9093d855b7, type: 3}
|
|
||||||
@@ -1,121 +0,0 @@
|
|||||||
%YAML 1.1
|
|
||||||
%TAG !u! tag:unity3d.com,2011:
|
|
||||||
--- !u!1001 &3086217307916794381
|
|
||||||
PrefabInstance:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Modification:
|
|
||||||
m_TransformParent: {fileID: 0}
|
|
||||||
m_Modifications:
|
|
||||||
- target: {fileID: 1022042495959285158, guid: c5d51a2f14dbd754986192f475aa6719,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_InteractionManager
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_RootOrder
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalPosition.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalPosition.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalPosition.z
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalRotation.w
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalRotation.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalRotation.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalRotation.z
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalEulerAnglesHint.x
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalEulerAnglesHint.y
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1022042496337251417, guid: c5d51a2f14dbd754986192f475aa6719,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_LocalEulerAnglesHint.z
|
|
||||||
value: 0
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1022042496337251419, guid: c5d51a2f14dbd754986192f475aa6719,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Name
|
|
||||||
value: Portal_Red
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1022042496669043433, guid: c5d51a2f14dbd754986192f475aa6719,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: player
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1022042496669043433, guid: c5d51a2f14dbd754986192f475aa6719,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: linkedPortal
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1022042496961707374, guid: c5d51a2f14dbd754986192f475aa6719,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: m_Materials.Array.data[0]
|
|
||||||
value:
|
|
||||||
objectReference: {fileID: 2100000, guid: bf0da4907b1b1174d82fea8c818ebf1e, type: 2}
|
|
||||||
- target: {fileID: 1022042497026309397, guid: c5d51a2f14dbd754986192f475aa6719,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: InitialModule.startColor.maxColor.b
|
|
||||||
value: 0.17647058
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1022042497026309397, guid: c5d51a2f14dbd754986192f475aa6719,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: InitialModule.startColor.maxColor.g
|
|
||||||
value: 0.3111662
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1022042497026309397, guid: c5d51a2f14dbd754986192f475aa6719,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: InitialModule.startColor.maxColor.r
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1022042497026309397, guid: c5d51a2f14dbd754986192f475aa6719,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: InitialModule.startColor.minColor.b
|
|
||||||
value: 0.32549024
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1022042497026309397, guid: c5d51a2f14dbd754986192f475aa6719,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: InitialModule.startColor.minColor.g
|
|
||||||
value: 0.7882222
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
- target: {fileID: 1022042497026309397, guid: c5d51a2f14dbd754986192f475aa6719,
|
|
||||||
type: 3}
|
|
||||||
propertyPath: InitialModule.startColor.minColor.r
|
|
||||||
value: 1
|
|
||||||
objectReference: {fileID: 0}
|
|
||||||
m_RemovedComponents: []
|
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: c5d51a2f14dbd754986192f475aa6719, type: 3}
|
|
||||||
@@ -15,13 +15,13 @@ public class CuttableTree : MonoBehaviour
|
|||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update is called once per frame
|
// Update is called once per frame
|
||||||
void Update()
|
void Update()
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void OnTriggerEnter(Collider other)
|
void OnTriggerEnter(Collider other)
|
||||||
@@ -31,9 +31,22 @@ public class CuttableTree : MonoBehaviour
|
|||||||
rotation = transform.rotation;
|
rotation = transform.rotation;
|
||||||
rotation *= Quaternion.AngleAxis(20, Vector3.up);
|
rotation *= Quaternion.AngleAxis(20, Vector3.up);
|
||||||
Instantiate(stumpPrefab, transform.position, rotation);
|
Instantiate(stumpPrefab, transform.position, rotation);
|
||||||
Instantiate(logPrefab, transform.position+new Vector3(0, 1, 0), rotation);
|
Instantiate(logPrefab, transform.position + new Vector3(0, 1, 0), rotation);
|
||||||
|
onCut.Invoke();
|
||||||
|
Destroy(gameObject);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
void OnCollisionEnter(Collision collision)
|
||||||
|
{
|
||||||
|
if (collision.gameObject.tag == "Cutter")
|
||||||
|
{
|
||||||
|
rotation = transform.rotation;
|
||||||
|
rotation *= Quaternion.AngleAxis(20, Vector3.up);
|
||||||
|
Instantiate(stumpPrefab, transform.position, rotation);
|
||||||
|
Instantiate(logPrefab, transform.position + new Vector3(0, 1, 0), rotation);
|
||||||
onCut.Invoke();
|
onCut.Invoke();
|
||||||
Destroy(gameObject);
|
Destroy(gameObject);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,21 +1,84 @@
|
|||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using UnityEngine.Events;
|
||||||
|
|
||||||
public class SlimeAI : MonoBehaviour
|
public class SlimeAI : MonoBehaviour
|
||||||
{
|
{
|
||||||
|
|
||||||
Animator animator;
|
Animator animator;
|
||||||
float playerDistance;
|
float playerDistance;
|
||||||
|
GameObject player;
|
||||||
|
int HP;
|
||||||
|
|
||||||
|
//[SerializeField]
|
||||||
|
//private UnityEvent onAttack;
|
||||||
|
|
||||||
// Start is called before the first frame update
|
// Start is called before the first frame update
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
animator = GetComponent<Animator>();
|
animator = GetComponent<Animator>();
|
||||||
|
player = GameObject.FindWithTag("Player");
|
||||||
|
HP = 10;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update is called once per frame
|
// Update is called once per frame
|
||||||
void Update()
|
void Update()
|
||||||
{
|
{
|
||||||
|
playerDistance = Vector3.Distance(player.transform.position, transform.position);
|
||||||
|
if (playerDistance < 1.5) //Attack
|
||||||
|
{
|
||||||
|
animator.SetBool("EnemyInAttackRange", true);
|
||||||
|
animator.SetBool("EnemyInAggroRange", true);
|
||||||
|
animator.SetBool("EnemyInVisionRange", true);
|
||||||
|
Rotate();
|
||||||
|
}
|
||||||
|
else if (playerDistance < 5) //Chase
|
||||||
|
{
|
||||||
|
animator.SetBool("EnemyInAttackRange", false);
|
||||||
|
animator.SetBool("EnemyInAggroRange", true);
|
||||||
|
animator.SetBool("EnemyInVisionRange", true);
|
||||||
|
Rotate();
|
||||||
|
Move();
|
||||||
|
}
|
||||||
|
else if (playerDistance < 8) //Stare
|
||||||
|
{
|
||||||
|
animator.SetBool("EnemyInAttackRange", false);
|
||||||
|
animator.SetBool("EnemyInAggroRange", false);
|
||||||
|
animator.SetBool("EnemyInVisionRange", true);
|
||||||
|
Rotate();
|
||||||
|
}
|
||||||
|
else //Idle
|
||||||
|
{
|
||||||
|
animator.SetBool("EnemyInAttackRange", false);
|
||||||
|
animator.SetBool("EnemyInAggroRange", false);
|
||||||
|
animator.SetBool("EnemyInVisionRange", false);
|
||||||
|
}
|
||||||
|
if (HP <= 0)
|
||||||
|
{
|
||||||
|
animator.SetBool("Dead", true);
|
||||||
|
}
|
||||||
|
if (animator.GetBool("DeathComplete"))
|
||||||
|
{
|
||||||
|
print("asd");
|
||||||
|
Destroy(this.gameObject);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
void Rotate()
|
||||||
|
{
|
||||||
|
// Rotate the forward vector towards the target direction by one step
|
||||||
|
Vector3 newDirection = Vector3.RotateTowards(transform.forward, player.transform.position - transform.position, 1.0f * Time.deltaTime, 0.0f);
|
||||||
|
|
||||||
|
// Calculate a rotation a step closer to the target and applies rotation to this object
|
||||||
|
transform.rotation = Quaternion.LookRotation(newDirection);
|
||||||
|
}
|
||||||
|
void Move()
|
||||||
|
{
|
||||||
|
transform.position += transform.forward * Time.deltaTime * 1.0f;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void GetHit(int dmg)
|
||||||
|
{
|
||||||
|
HP -= dmg;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
36
Assets/Project Files/Scripts/Arlo/SlimeDeath.cs
Normal file
36
Assets/Project Files/Scripts/Arlo/SlimeDeath.cs
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class death : StateMachineBehaviour
|
||||||
|
{
|
||||||
|
// OnStateEnter is called when a transition starts and the state machine starts to evaluate this state
|
||||||
|
//override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
|
||||||
|
//{
|
||||||
|
//
|
||||||
|
//}
|
||||||
|
|
||||||
|
// OnStateUpdate is called on each Update frame between OnStateEnter and OnStateExit callbacks
|
||||||
|
//override public void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
|
||||||
|
//{
|
||||||
|
//
|
||||||
|
//}
|
||||||
|
|
||||||
|
// OnStateExit is called when a transition ends and the state machine finishes evaluating this state
|
||||||
|
//override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
|
||||||
|
//{
|
||||||
|
//
|
||||||
|
//}
|
||||||
|
|
||||||
|
// OnStateMove is called right after Animator.OnAnimatorMove()
|
||||||
|
//override public void OnStateMove(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
|
||||||
|
//{
|
||||||
|
// // Implement code that processes and affects root motion
|
||||||
|
//}
|
||||||
|
|
||||||
|
// OnStateIK is called right after Animator.OnAnimatorIK()
|
||||||
|
//override public void OnStateIK(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
|
||||||
|
//{
|
||||||
|
// // Implement code that sets up animation IK (inverse kinematics)
|
||||||
|
//}
|
||||||
|
}
|
||||||
11
Assets/Project Files/Scripts/Arlo/SlimeDeath.cs.meta
Normal file
11
Assets/Project Files/Scripts/Arlo/SlimeDeath.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6c7f89faf36f41b418e5105a12c34cdb
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
111
Assets/Project Files/Scripts/HandAnim.cs
Normal file
111
Assets/Project Files/Scripts/HandAnim.cs
Normal file
@@ -0,0 +1,111 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.XR;
|
||||||
|
using UnityEngine.XR.Interaction.Toolkit;
|
||||||
|
using TMPro; // Add the TextMesh Pro namespace to access the various functions.
|
||||||
|
using System.Linq;
|
||||||
|
using UnityEngine.InputSystem;
|
||||||
|
using System;
|
||||||
|
|
||||||
|
public class HandAnim : MonoBehaviour
|
||||||
|
{
|
||||||
|
public Animator m_animator = null;
|
||||||
|
[Header("Input")]
|
||||||
|
[SerializeField] public InputActionProperty GripAction;
|
||||||
|
[SerializeField] public InputActionProperty TriggerAction;
|
||||||
|
[SerializeField] public InputActionProperty IndexAction;
|
||||||
|
[SerializeField] public InputActionProperty ThumbAction;
|
||||||
|
|
||||||
|
|
||||||
|
public const string ANIM_LAYER_NAME_POINT = "Point Layer";
|
||||||
|
public const string ANIM_LAYER_NAME_THUMB = "Thumb Layer";
|
||||||
|
public const string ANIM_PARAM_NAME_FLEX = "Flex";
|
||||||
|
public const string ANIM_PARAM_NAME_POSE = "Pose";
|
||||||
|
|
||||||
|
private int m_animLayerIndexThumb = -1;
|
||||||
|
private int m_animLayerIndexPoint = -1;
|
||||||
|
private int m_animParamIndexFlex = -1;
|
||||||
|
private int m_animParamIndexPose = -1;
|
||||||
|
private Collider[] m_colliders = null;
|
||||||
|
|
||||||
|
public float anim_frames = 4f;
|
||||||
|
private float grip_state = 0f;
|
||||||
|
private float trigger_state = 0f;
|
||||||
|
private float triggerCap_state = 0f;
|
||||||
|
private float thumbCap_state = 0f;
|
||||||
|
|
||||||
|
private void Reset()
|
||||||
|
{
|
||||||
|
m_animator = GetComponentInChildren<Animator>();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Awake()
|
||||||
|
{
|
||||||
|
GripAction.action.performed += GripActionPerformed;
|
||||||
|
TriggerAction.action.performed += TriggerActionPerformed;
|
||||||
|
IndexAction.action.performed += IndexActionPerformed;
|
||||||
|
ThumbAction.action.performed += ThumbActionPerformed;
|
||||||
|
GripAction.action.Enable();
|
||||||
|
TriggerAction.action.Enable();
|
||||||
|
IndexAction.action.Enable();
|
||||||
|
ThumbAction.action.Enable();
|
||||||
|
}
|
||||||
|
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
m_colliders = this.GetComponentsInChildren<Collider>().Where(childCollider => !childCollider.isTrigger).ToArray();
|
||||||
|
for (int i = 0; i < m_colliders.Length; ++i)
|
||||||
|
{
|
||||||
|
Collider collider = m_colliders[i];
|
||||||
|
// collider.transform.localScale = new Vector3(COLLIDER_SCALE_MIN, COLLIDER_SCALE_MIN, COLLIDER_SCALE_MIN);
|
||||||
|
collider.enabled = true;
|
||||||
|
}
|
||||||
|
m_animLayerIndexPoint = m_animator.GetLayerIndex(ANIM_LAYER_NAME_POINT);
|
||||||
|
m_animLayerIndexThumb = m_animator.GetLayerIndex(ANIM_LAYER_NAME_THUMB);
|
||||||
|
m_animParamIndexFlex = Animator.StringToHash(ANIM_PARAM_NAME_FLEX);
|
||||||
|
m_animParamIndexPose = Animator.StringToHash(ANIM_PARAM_NAME_POSE);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ThumbActionPerformed(InputAction.CallbackContext obj)
|
||||||
|
{
|
||||||
|
CalculateState(obj.ReadValue<float>(), ref thumbCap_state);
|
||||||
|
m_animator.SetLayerWeight(m_animLayerIndexThumb, 1f - thumbCap_state);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void IndexActionPerformed(InputAction.CallbackContext obj)
|
||||||
|
{
|
||||||
|
CalculateState(obj.ReadValue<float>(), ref triggerCap_state);
|
||||||
|
m_animator.SetLayerWeight(m_animLayerIndexPoint, 1f - triggerCap_state);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void TriggerActionPerformed(InputAction.CallbackContext obj)
|
||||||
|
{
|
||||||
|
CalculateState(obj.ReadValue<float>(), ref trigger_state);
|
||||||
|
m_animator.SetFloat("Pinch", trigger_state);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void GripActionPerformed(InputAction.CallbackContext obj)
|
||||||
|
{
|
||||||
|
Debug.Log("grip");
|
||||||
|
CalculateState(obj.ReadValue<float>(), ref grip_state);
|
||||||
|
m_animator.SetFloat(m_animParamIndexFlex, grip_state);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void CalculateState(float value, ref float state)
|
||||||
|
{
|
||||||
|
var delta = value - state;
|
||||||
|
if (delta > 0f)
|
||||||
|
{
|
||||||
|
state = Mathf.Clamp(state + 1 / anim_frames, 0f, value);
|
||||||
|
}
|
||||||
|
else if (delta < 0f)
|
||||||
|
{
|
||||||
|
state = Mathf.Clamp(state - 1 / anim_frames, value, 1f);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
state = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Project Files/Scripts/HandAnim.cs.meta
Normal file
11
Assets/Project Files/Scripts/HandAnim.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 158ebba8614f70a47b5379affd3d7b17
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -92,7 +92,7 @@ public class InventoryItem : MonoBehaviour
|
|||||||
if (Count == 0)
|
if (Count == 0)
|
||||||
{
|
{
|
||||||
//Destroys this gameobject if the count is 0 or lower
|
//Destroys this gameobject if the count is 0 or lower
|
||||||
Destroy(this);
|
Destroy(gameObject);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
UpdateText();
|
UpdateText();
|
||||||
@@ -101,6 +101,30 @@ public class InventoryItem : MonoBehaviour
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void PopItem()
|
||||||
|
{
|
||||||
|
GameObject item = Instantiate(_itemData.prefab, transform.position + transform.forward, Quaternion.identity);
|
||||||
|
|
||||||
|
item.transform.localScale = Vector3.one;
|
||||||
|
item.transform.name = _itemData.name;
|
||||||
|
|
||||||
|
var colliderComponent = item.GetComponent<Collider>();
|
||||||
|
if (colliderComponent != null) colliderComponent.enabled = true;
|
||||||
|
|
||||||
|
var rigidbodyComponent = item.GetComponent<Rigidbody>();
|
||||||
|
if (rigidbodyComponent != null)
|
||||||
|
{
|
||||||
|
rigidbodyComponent.isKinematic = false;
|
||||||
|
rigidbodyComponent.useGravity = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
var xrGrabInteractableComponent = item.GetComponent<XRGrabInteractable>();
|
||||||
|
if (xrGrabInteractableComponent != null) xrGrabInteractableComponent.enabled = true;
|
||||||
|
|
||||||
|
|
||||||
|
ChangeCount(-1);
|
||||||
|
}
|
||||||
|
|
||||||
public int GetItemid()
|
public int GetItemid()
|
||||||
{
|
{
|
||||||
return _itemId;
|
return _itemId;
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ public class ItemData : MonoBehaviour
|
|||||||
public bool canStack;
|
public bool canStack;
|
||||||
public string itemName;
|
public string itemName;
|
||||||
public string itemDescription;
|
public string itemDescription;
|
||||||
|
public GameObject prefab;
|
||||||
|
|
||||||
public override string ToString()
|
public override string ToString()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -12,6 +12,8 @@ public class ActionGestureInteraction : MonoBehaviour
|
|||||||
private GameObject player;
|
private GameObject player;
|
||||||
public float projectileSpeed = 30;
|
public float projectileSpeed = 30;
|
||||||
|
|
||||||
|
private bool holdingWand;
|
||||||
|
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
player = gameObject;
|
player = gameObject;
|
||||||
@@ -19,8 +21,67 @@ public class ActionGestureInteraction : MonoBehaviour
|
|||||||
|
|
||||||
public void PerformAction(string action)
|
public void PerformAction(string action)
|
||||||
{
|
{
|
||||||
Debug.Log(action);
|
Debug.LogWarning(action);
|
||||||
if (action == "Portal")
|
|
||||||
|
|
||||||
|
/* todo: playerinfo doesnt have these methods?
|
||||||
|
if (player.GetComponent<PlayerInfo>().GetRightHand() != null)
|
||||||
|
{
|
||||||
|
Debug.LogWarning(player.GetComponent<PlayerInfo>().GetRightHand().name);
|
||||||
|
if (player.GetComponent<PlayerInfo>().GetRightHand().name.Equals("wand")) holdingWand = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
else holdingWand = false;
|
||||||
|
*/
|
||||||
|
|
||||||
|
switch (action)
|
||||||
|
{
|
||||||
|
case "HorizontalLine":
|
||||||
|
if (holdingWand)
|
||||||
|
{
|
||||||
|
Debug.LogWarning("CAST BOLT");
|
||||||
|
ShootProjectile();
|
||||||
|
InstantiateIceBolt(objects[0]);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Debug.LogWarning("WOODCUTTING ACTION");
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
case "VerticalLine":
|
||||||
|
if (holdingWand)
|
||||||
|
{
|
||||||
|
Debug.LogWarning("WAND VERTICAL");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Debug.LogWarning("VERTICAL");
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
case "Circle":
|
||||||
|
if (holdingWand)
|
||||||
|
{
|
||||||
|
Debug.LogWarning("Arcing fireball");
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Debug.LogWarning("CIRCLE");
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
case "Triangle":
|
||||||
|
if (holdingWand)
|
||||||
|
{
|
||||||
|
Debug.LogWarning("WAND TRIANGLE");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Debug.LogWarning("WOODCUTTING ACTION");
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*if (action == "Portal")
|
||||||
{
|
{
|
||||||
// Raycast to find portal were looking at.
|
// Raycast to find portal were looking at.
|
||||||
var nearestPortal = FindPortalInFront();
|
var nearestPortal = FindPortalInFront();
|
||||||
@@ -41,9 +102,9 @@ public class ActionGestureInteraction : MonoBehaviour
|
|||||||
// Make ice wall appear from below to block incoming projectiles
|
// Make ice wall appear from below to block incoming projectiles
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
} */
|
||||||
}
|
}
|
||||||
void EnableDisablePortal(GameObject portal)
|
void MinigameEnable(GameObject portal)
|
||||||
{
|
{
|
||||||
// Did the raycast catch a portal in front of us?
|
// Did the raycast catch a portal in front of us?
|
||||||
if (portal != null)
|
if (portal != null)
|
||||||
@@ -70,7 +131,7 @@ public class ActionGestureInteraction : MonoBehaviour
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
GameObject FindPortalInFront()
|
GameObject FindMinigame()
|
||||||
{
|
{
|
||||||
Ray ray = playerCamera.ViewportPointToRay(new Vector3(0.5f, 0.5f, 0));
|
Ray ray = playerCamera.ViewportPointToRay(new Vector3(0.5f, 0.5f, 0));
|
||||||
RaycastHit hit;
|
RaycastHit hit;
|
||||||
@@ -104,6 +165,7 @@ public class ActionGestureInteraction : MonoBehaviour
|
|||||||
|
|
||||||
void InstantiateIceBolt(GameObject item)
|
void InstantiateIceBolt(GameObject item)
|
||||||
{
|
{
|
||||||
|
Debug.LogWarning("INSTANTIATE BOLT");
|
||||||
var projectileObj = Instantiate(item, rightHandTransform.position, playerCamera.transform.rotation) as GameObject;
|
var projectileObj = Instantiate(item, rightHandTransform.position, playerCamera.transform.rotation) as GameObject;
|
||||||
projectileObj.GetComponent<Rigidbody>().velocity = (destination - rightHandTransform.position).normalized * projectileSpeed;
|
projectileObj.GetComponent<Rigidbody>().velocity = (destination - rightHandTransform.position).normalized * projectileSpeed;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,30 +9,53 @@ public class PortalTeleporter : MonoBehaviour
|
|||||||
private Transform linkedPortalTransform;
|
private Transform linkedPortalTransform;
|
||||||
private float _portalCooldown = 2.5f;
|
private float _portalCooldown = 2.5f;
|
||||||
private bool _travellerIsOverlapping = false;
|
private bool _travellerIsOverlapping = false;
|
||||||
private bool _portalIsEnabled;
|
private bool _portalCanBeUsed;
|
||||||
|
private bool _enabled;
|
||||||
private float _lastUsed;
|
private float _lastUsed;
|
||||||
private bool _justUsed;
|
private bool _justUsed;
|
||||||
private Transform traveller;
|
private Transform traveller;
|
||||||
public AudioClip TeleportSound;
|
public AudioClip TeleportSound;
|
||||||
|
// poopy code, can be done much more efficient if this class is rewritten and attached to Portal parent object
|
||||||
|
private AudioSource audioSource;
|
||||||
|
private GameObject vfx_gameobject;
|
||||||
|
|
||||||
private void Start()
|
private void Start()
|
||||||
{
|
{
|
||||||
linkedPortalTransform = linkedPortal.transform;
|
if (linkedPortal == null)
|
||||||
_portalIsEnabled = true;
|
{
|
||||||
|
DisablePortal();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
linkedPortalTransform = linkedPortal.transform;
|
||||||
|
_portalCanBeUsed = true;
|
||||||
|
vfx_gameobject = transform.parent.Find("PortalFX").gameObject;
|
||||||
|
audioSource = transform.parent.GetComponent<AudioSource>();
|
||||||
|
audioSource.mute = true;
|
||||||
|
if (_enabled)
|
||||||
|
{
|
||||||
|
vfx_gameobject.SetActive(true);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
vfx_gameobject.SetActive(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void OnTriggerEnter(Collider other)
|
void OnTriggerEnter(Collider other)
|
||||||
{
|
{
|
||||||
traveller = other.gameObject.transform;
|
traveller = other.gameObject.transform;
|
||||||
if (_portalIsEnabled && !_justUsed)
|
Debug.Log(_enabled);
|
||||||
|
if (_portalCanBeUsed && !_justUsed && _enabled)
|
||||||
{
|
{
|
||||||
if (other.name.StartsWith("Holster"))
|
if (other.name.StartsWith("Holster") || other.tag.Contains("Holster"))
|
||||||
{
|
{
|
||||||
Debug.Log("holster");
|
Debug.Log("holster");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
linkedPortal._portalIsEnabled = false;
|
linkedPortal._portalCanBeUsed = false;
|
||||||
_travellerIsOverlapping = true;
|
_travellerIsOverlapping = true;
|
||||||
if (other.tag == "Throwable")
|
if (other.tag == "Throwable")
|
||||||
{
|
{
|
||||||
@@ -47,6 +70,28 @@ public class PortalTeleporter : MonoBehaviour
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Enable/Disable portal if selected item is in a socket.
|
||||||
|
public void EnablePortal()
|
||||||
|
{
|
||||||
|
Debug.Log("enabled");
|
||||||
|
_enabled = true;
|
||||||
|
linkedPortal._enabled = true;
|
||||||
|
vfx_gameobject.SetActive(true);
|
||||||
|
linkedPortal.vfx_gameobject.SetActive(true);
|
||||||
|
audioSource.mute = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void DisablePortal()
|
||||||
|
{
|
||||||
|
Debug.Log("disabled");
|
||||||
|
_enabled = false;
|
||||||
|
linkedPortal._enabled = false;
|
||||||
|
vfx_gameobject.SetActive(false);
|
||||||
|
linkedPortal.vfx_gameobject.SetActive(false);
|
||||||
|
audioSource.mute = true;
|
||||||
|
}
|
||||||
|
|
||||||
private void HandlePlayer()
|
private void HandlePlayer()
|
||||||
{
|
{
|
||||||
Vector3 portalToTraveller = traveller.position - transform.position;
|
Vector3 portalToTraveller = traveller.position - transform.position;
|
||||||
@@ -65,7 +110,7 @@ public class PortalTeleporter : MonoBehaviour
|
|||||||
|
|
||||||
AudioSource.PlayClipAtPoint(TeleportSound, traveller.position, 1);
|
AudioSource.PlayClipAtPoint(TeleportSound, traveller.position, 1);
|
||||||
_travellerIsOverlapping = false;
|
_travellerIsOverlapping = false;
|
||||||
_portalIsEnabled = false;
|
_portalCanBeUsed = false;
|
||||||
_lastUsed = Time.time;
|
_lastUsed = Time.time;
|
||||||
_justUsed = true;
|
_justUsed = true;
|
||||||
}
|
}
|
||||||
@@ -86,7 +131,7 @@ public class PortalTeleporter : MonoBehaviour
|
|||||||
Vector3 positionOffset = Quaternion.Euler(0f, rotationDiff, 0f) * portalToTraveller;
|
Vector3 positionOffset = Quaternion.Euler(0f, rotationDiff, 0f) * portalToTraveller;
|
||||||
traveller.position = linkedPortalTransform.position + positionOffset;
|
traveller.position = linkedPortalTransform.position + positionOffset;
|
||||||
_travellerIsOverlapping = false;
|
_travellerIsOverlapping = false;
|
||||||
_portalIsEnabled = false;
|
_portalCanBeUsed = false;
|
||||||
_lastUsed = Time.time;
|
_lastUsed = Time.time;
|
||||||
_justUsed = true;
|
_justUsed = true;
|
||||||
}
|
}
|
||||||
@@ -108,8 +153,8 @@ public class PortalTeleporter : MonoBehaviour
|
|||||||
if (_lastUsed + _portalCooldown < Time.time)
|
if (_lastUsed + _portalCooldown < Time.time)
|
||||||
{
|
{
|
||||||
_justUsed = false;
|
_justUsed = false;
|
||||||
_portalIsEnabled = true;
|
_portalCanBeUsed = true;
|
||||||
linkedPortal._portalIsEnabled = true;
|
linkedPortal._portalCanBeUsed = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,11 +7,15 @@ public class EssenceNodeController : MonoBehaviour
|
|||||||
{
|
{
|
||||||
[SerializeField]
|
[SerializeField]
|
||||||
private AudioSource chime;
|
private AudioSource chime;
|
||||||
|
|
||||||
|
private Inventory playerInventory;
|
||||||
|
|
||||||
public bool isTouched;
|
public bool isTouched;
|
||||||
private bool followPlayer = false;
|
private bool followPlayer = false;
|
||||||
private Transform player;
|
private Transform playerCamera;
|
||||||
|
|
||||||
|
[SerializeField]
|
||||||
|
private PlayerInfo playerInfo;
|
||||||
|
|
||||||
private float timer;
|
private float timer;
|
||||||
private Material nodeMaterial;
|
private Material nodeMaterial;
|
||||||
@@ -21,6 +25,8 @@ public class EssenceNodeController : MonoBehaviour
|
|||||||
private void Awake()
|
private void Awake()
|
||||||
{
|
{
|
||||||
nodeMaterial = GetComponent<Renderer>().material;
|
nodeMaterial = GetComponent<Renderer>().material;
|
||||||
|
//playerInfo = PlayerInfo.Instance;
|
||||||
|
playerInventory = GameObject.Find("Inventory").GetComponent<Inventory>();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Touched()
|
public void Touched()
|
||||||
@@ -37,7 +43,7 @@ public class EssenceNodeController : MonoBehaviour
|
|||||||
public void FollowPlayer()
|
public void FollowPlayer()
|
||||||
{
|
{
|
||||||
followPlayer = true;
|
followPlayer = true;
|
||||||
player = GameObject.FindGameObjectWithTag("MainCamera").transform;
|
playerCamera = GameObject.FindGameObjectWithTag("MainCamera").transform;
|
||||||
StartCoroutine(Collect());
|
StartCoroutine(Collect());
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -56,8 +62,10 @@ public class EssenceNodeController : MonoBehaviour
|
|||||||
|
|
||||||
IEnumerator Collect()
|
IEnumerator Collect()
|
||||||
{
|
{
|
||||||
|
playerInfo.AddEssenceBasic(1);
|
||||||
yield return new WaitForSeconds(2f);
|
yield return new WaitForSeconds(2f);
|
||||||
//TODO: Update value in player inventory
|
//TODO: Update value in player inventory
|
||||||
|
playerInventory.AddItem(GetComponent<ItemData>());
|
||||||
Destroy(gameObject);
|
Destroy(gameObject);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -76,7 +84,7 @@ public class EssenceNodeController : MonoBehaviour
|
|||||||
|
|
||||||
if (followPlayer)
|
if (followPlayer)
|
||||||
{
|
{
|
||||||
transform.position = Vector3.Lerp(transform.position, new Vector3(player.position.x,player.position.y - 0.5f, player.position.z), Time.deltaTime);
|
transform.position = Vector3.Lerp(transform.position, new Vector3(playerCamera.position.x, playerCamera.position.y - 0.5f, playerCamera.position.z), Time.deltaTime);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
35
Assets/Project Files/Scripts/JoonasP/PlayerInfo.cs
Normal file
35
Assets/Project Files/Scripts/JoonasP/PlayerInfo.cs
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class PlayerInfo : MonoBehaviour
|
||||||
|
{
|
||||||
|
private int health;
|
||||||
|
|
||||||
|
private int essence_basic;
|
||||||
|
//Add elemental essences?
|
||||||
|
|
||||||
|
private void Awake()
|
||||||
|
{
|
||||||
|
health = 5;
|
||||||
|
essence_basic = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void AddHealth(int value)
|
||||||
|
{
|
||||||
|
health += value;
|
||||||
|
if (health <= 0)
|
||||||
|
{
|
||||||
|
Debug.Log("NO HEALTH REMAINING");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void AddEssenceBasic(int value)
|
||||||
|
{
|
||||||
|
if (essence_basic + value < 0)
|
||||||
|
{
|
||||||
|
Debug.LogError("NOT ENOUGH ESSENCE");
|
||||||
|
}
|
||||||
|
else essence_basic += value;
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Project Files/Scripts/JoonasP/PlayerInfo.cs.meta
Normal file
11
Assets/Project Files/Scripts/JoonasP/PlayerInfo.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 08f72f5d017837743b67d344a6a7ed52
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -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:
|
||||||
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:
|
||||||
18
Assets/Project Files/Scripts/Shumpei/PauseMenu.cs
Normal file
18
Assets/Project Files/Scripts/Shumpei/PauseMenu.cs
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class PauseMenu : MonoBehaviour
|
||||||
|
{
|
||||||
|
// Start is called before the first frame update
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update is called once per frame
|
||||||
|
void Update()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
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:
|
||||||
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:
|
||||||
@@ -6,8 +6,8 @@ public class TriggerDoorController : MonoBehaviour
|
|||||||
{
|
{
|
||||||
[SerializeField] private Animator myDoor = null;
|
[SerializeField] private Animator myDoor = null;
|
||||||
|
|
||||||
[SerializeField] private bool openTrigger = false;
|
[SerializeField] private bool Trigger = false;
|
||||||
[SerializeField] private bool closeTrigger = false;
|
//[SerializeField] private bool closeTrigger = false;
|
||||||
|
|
||||||
[SerializeField] private string doorOpen = "DoorOpen";
|
[SerializeField] private string doorOpen = "DoorOpen";
|
||||||
[SerializeField] private string doorClose = "DoorClose";
|
[SerializeField] private string doorClose = "DoorClose";
|
||||||
@@ -19,17 +19,26 @@ public class TriggerDoorController : MonoBehaviour
|
|||||||
if (other.CompareTag("Player"))
|
if (other.CompareTag("Player"))
|
||||||
{
|
{
|
||||||
Debug.Log("col");
|
Debug.Log("col");
|
||||||
if (openTrigger)
|
if (Trigger)
|
||||||
{
|
{
|
||||||
Debug.Log("open");
|
Debug.Log("open");
|
||||||
myDoor.Play(doorOpen, 0, 0.0f);
|
myDoor.Play(doorOpen, 0, 0.0f);
|
||||||
gameObject.SetActive(false);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (closeTrigger)
|
/*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);
|
myDoor.Play(doorClose, 0, 0.0f);
|
||||||
gameObject.SetActive(false);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
45
Assets/Project Files/Scripts/Shumpei/XRGUI.cs
Normal file
45
Assets/Project Files/Scripts/Shumpei/XRGUI.cs
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
using TMPro;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
|
||||||
|
public class XRGUI : MonoBehaviour
|
||||||
|
{
|
||||||
|
[SerializeField]
|
||||||
|
private Button SettingsButton;
|
||||||
|
|
||||||
|
[SerializeField]
|
||||||
|
private Button LoadButton;
|
||||||
|
|
||||||
|
[SerializeField]
|
||||||
|
private Button ExitButton;
|
||||||
|
|
||||||
|
// Start is called before the first frame update
|
||||||
|
void Start()
|
||||||
|
{
|
||||||
|
SettingsButton.onClick.AddListener(() =>
|
||||||
|
{
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
LoadButton.onClick.AddListener(() =>
|
||||||
|
{
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
ExitButton.onClick.AddListener(() =>
|
||||||
|
{
|
||||||
|
Debug.Log("Clicked");
|
||||||
|
UnityEditor.EditorApplication.isPlaying = false;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// Update is called once per frame
|
||||||
|
void Update()
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/Project Files/Scripts/Shumpei/XRGUI.cs.meta
Normal file
11
Assets/Project Files/Scripts/Shumpei/XRGUI.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 37cfb6899ccd00b4280ac4eb92f84851
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -35,7 +35,7 @@ Material:
|
|||||||
m_Ints: []
|
m_Ints: []
|
||||||
m_Floats:
|
m_Floats:
|
||||||
- _Electricity_Amount: 5
|
- _Electricity_Amount: 5
|
||||||
- _Electricity_Scale: 20
|
- _Electricity_Scale: 4
|
||||||
- _Electricity_Thickness: 1
|
- _Electricity_Thickness: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
|||||||
127
Assets/Project Files/Shaders/Green_Glow.mat
Normal file
127
Assets/Project Files/Shaders/Green_Glow.mat
Normal file
@@ -0,0 +1,127 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &-1478561429412322476
|
||||||
|
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
|
||||||
|
--- !u!21 &2100000
|
||||||
|
Material:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: Green_Glow
|
||||||
|
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
|
||||||
|
m_ShaderKeywords: _SPECULAR_SETUP _SURFACE_TYPE_TRANSPARENT
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: 3000
|
||||||
|
stringTagMap:
|
||||||
|
RenderType: Transparent
|
||||||
|
disabledShaderPasses:
|
||||||
|
- DepthOnly
|
||||||
|
- SHADOWCASTER
|
||||||
|
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: 10
|
||||||
|
- _EnvironmentReflections: 1
|
||||||
|
- _GlossMapScale: 0
|
||||||
|
- _Glossiness: 0
|
||||||
|
- _GlossyReflections: 0
|
||||||
|
- _Metallic: 0
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _Parallax: 0.005
|
||||||
|
- _QueueOffset: 0
|
||||||
|
- _ReceiveShadows: 1
|
||||||
|
- _Smoothness: 0.614
|
||||||
|
- _SmoothnessTextureChannel: 0
|
||||||
|
- _SpecularHighlights: 1
|
||||||
|
- _SrcBlend: 5
|
||||||
|
- _Surface: 1
|
||||||
|
- _WorkflowMode: 0
|
||||||
|
- _ZWrite: 0
|
||||||
|
m_Colors:
|
||||||
|
- _BaseColor: {r: 0.19944271, g: 0.6862745, b: 0.113725476, a: 0.105882354}
|
||||||
|
- _Color: {r: 0.19944268, g: 0.68627447, b: 0.113725446, a: 0.105882354}
|
||||||
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
- _SpecColor: {r: 0.09411766, g: 0.8784314, b: 0.36514217, a: 1}
|
||||||
|
m_BuildTextureStacks: []
|
||||||
8
Assets/Project Files/Shaders/Green_Glow.mat.meta
Normal file
8
Assets/Project Files/Shaders/Green_Glow.mat.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 964ed250374e2b34aa04c6ecbf41404d
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 2100000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
16766
Assets/Project Files/Shaders/Portal.vfx
Normal file
16766
Assets/Project Files/Shaders/Portal.vfx
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/Project Files/Shaders/Portal.vfx.meta
Normal file
7
Assets/Project Files/Shaders/Portal.vfx.meta
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 544268b6f9cec2c4781017e5cfe72a4b
|
||||||
|
VisualEffectImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -353,8 +353,8 @@
|
|||||||
],
|
],
|
||||||
"m_VertexContext": {
|
"m_VertexContext": {
|
||||||
"m_Position": {
|
"m_Position": {
|
||||||
"x": 627.0000610351563,
|
"x": 632.0,
|
||||||
"y": -144.99998474121095
|
"y": -153.0
|
||||||
},
|
},
|
||||||
"m_Blocks": [
|
"m_Blocks": [
|
||||||
{
|
{
|
||||||
|
|||||||
127
Assets/Project Files/Shaders/Purple_Glow.mat
Normal file
127
Assets/Project Files/Shaders/Purple_Glow.mat
Normal file
@@ -0,0 +1,127 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &-1478561429412322476
|
||||||
|
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
|
||||||
|
--- !u!21 &2100000
|
||||||
|
Material:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: Purple_Glow
|
||||||
|
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
|
||||||
|
m_ShaderKeywords: _SPECULAR_SETUP _SURFACE_TYPE_TRANSPARENT
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: 3000
|
||||||
|
stringTagMap:
|
||||||
|
RenderType: Transparent
|
||||||
|
disabledShaderPasses:
|
||||||
|
- DepthOnly
|
||||||
|
- SHADOWCASTER
|
||||||
|
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: 10
|
||||||
|
- _EnvironmentReflections: 1
|
||||||
|
- _GlossMapScale: 0
|
||||||
|
- _Glossiness: 0
|
||||||
|
- _GlossyReflections: 0
|
||||||
|
- _Metallic: 0
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _Parallax: 0.005
|
||||||
|
- _QueueOffset: 0
|
||||||
|
- _ReceiveShadows: 1
|
||||||
|
- _Smoothness: 0.614
|
||||||
|
- _SmoothnessTextureChannel: 0
|
||||||
|
- _SpecularHighlights: 1
|
||||||
|
- _SrcBlend: 5
|
||||||
|
- _Surface: 1
|
||||||
|
- _WorkflowMode: 0
|
||||||
|
- _ZWrite: 0
|
||||||
|
m_Colors:
|
||||||
|
- _BaseColor: {r: 0.41912836, g: 0.113725476, b: 0.6862745, a: 0.105882354}
|
||||||
|
- _Color: {r: 0.41912833, g: 0.113725446, b: 0.68627447, a: 0.105882354}
|
||||||
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
- _SpecColor: {r: 0.4459281, g: 0.09411766, b: 0.8784314, a: 1}
|
||||||
|
m_BuildTextureStacks: []
|
||||||
8
Assets/Project Files/Shaders/Purple_Glow.mat.meta
Normal file
8
Assets/Project Files/Shaders/Purple_Glow.mat.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 04dda9fe96108674eb123db24ae1a6d9
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 2100000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
127
Assets/Project Files/Shaders/Red_Glow.mat
Normal file
127
Assets/Project Files/Shaders/Red_Glow.mat
Normal file
@@ -0,0 +1,127 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &-1478561429412322476
|
||||||
|
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
|
||||||
|
--- !u!21 &2100000
|
||||||
|
Material:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: Red_Glow
|
||||||
|
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
|
||||||
|
m_ShaderKeywords: _SPECULAR_SETUP _SURFACE_TYPE_TRANSPARENT
|
||||||
|
m_LightmapFlags: 4
|
||||||
|
m_EnableInstancingVariants: 0
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: 3000
|
||||||
|
stringTagMap:
|
||||||
|
RenderType: Transparent
|
||||||
|
disabledShaderPasses:
|
||||||
|
- DepthOnly
|
||||||
|
- SHADOWCASTER
|
||||||
|
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: 10
|
||||||
|
- _EnvironmentReflections: 1
|
||||||
|
- _GlossMapScale: 0
|
||||||
|
- _Glossiness: 0
|
||||||
|
- _GlossyReflections: 0
|
||||||
|
- _Metallic: 0
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _Parallax: 0.005
|
||||||
|
- _QueueOffset: 0
|
||||||
|
- _ReceiveShadows: 1
|
||||||
|
- _Smoothness: 0.614
|
||||||
|
- _SmoothnessTextureChannel: 0
|
||||||
|
- _SpecularHighlights: 1
|
||||||
|
- _SrcBlend: 5
|
||||||
|
- _Surface: 1
|
||||||
|
- _WorkflowMode: 0
|
||||||
|
- _ZWrite: 0
|
||||||
|
m_Colors:
|
||||||
|
- _BaseColor: {r: 0.6862745, g: 0.15593119, b: 0.113725476, a: 0.105882354}
|
||||||
|
- _Color: {r: 0.68627447, g: 0.15593114, b: 0.113725446, a: 0.105882354}
|
||||||
|
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
- _SpecColor: {r: 0.8784314, g: 0.09411766, b: 0.24839823, a: 1}
|
||||||
|
m_BuildTextureStacks: []
|
||||||
8
Assets/Project Files/Shaders/Red_Glow.mat.meta
Normal file
8
Assets/Project Files/Shaders/Red_Glow.mat.meta
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: f2699f7f9e5d7d44183ca407e543d398
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 2100000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
2707
Assets/Project Files/Shaders/VFXGraphPortalEffect.shadergraph
Normal file
2707
Assets/Project Files/Shaders/VFXGraphPortalEffect.shadergraph
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,10 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: fd2a036a5543bae4aa06c6400342d93d
|
||||||
|
ScriptedImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}
|
||||||
BIN
Assets/Project Files/Shaders/circleglowing.png
Normal file
BIN
Assets/Project Files/Shaders/circleglowing.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 123 KiB |
98
Assets/Project Files/Shaders/circleglowing.png.meta
Normal file
98
Assets/Project Files/Shaders/circleglowing.png.meta
Normal file
@@ -0,0 +1,98 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 6b9302700f9561d469192f47e33f4860
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 11
|
||||||
|
mipmaps:
|
||||||
|
mipMapMode: 0
|
||||||
|
enableMipMap: 1
|
||||||
|
sRGBTexture: 1
|
||||||
|
linearTexture: 0
|
||||||
|
fadeOut: 0
|
||||||
|
borderMipMap: 0
|
||||||
|
mipMapsPreserveCoverage: 0
|
||||||
|
alphaTestReferenceValue: 0.5
|
||||||
|
mipMapFadeDistanceStart: 1
|
||||||
|
mipMapFadeDistanceEnd: 3
|
||||||
|
bumpmap:
|
||||||
|
convertToNormalMap: 0
|
||||||
|
externalNormalMap: 0
|
||||||
|
heightScale: 0.25
|
||||||
|
normalMapFilter: 0
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
vTOnly: 0
|
||||||
|
ignoreMasterTextureLimit: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: 1
|
||||||
|
aniso: 1
|
||||||
|
mipBias: 0
|
||||||
|
wrapU: 0
|
||||||
|
wrapV: 0
|
||||||
|
wrapW: 0
|
||||||
|
nPOTScale: 1
|
||||||
|
lightmap: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
spriteMode: 0
|
||||||
|
spriteExtrude: 1
|
||||||
|
spriteMeshType: 1
|
||||||
|
alignment: 0
|
||||||
|
spritePivot: {x: 0.5, y: 0.5}
|
||||||
|
spritePixelsToUnits: 100
|
||||||
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||||
|
spriteGenerateFallbackPhysicsShape: 1
|
||||||
|
alphaUsage: 1
|
||||||
|
alphaIsTransparency: 0
|
||||||
|
spriteTessellationDetail: -1
|
||||||
|
textureType: 0
|
||||||
|
textureShape: 1
|
||||||
|
singleChannelComponent: 0
|
||||||
|
flipbookRows: 1
|
||||||
|
flipbookColumns: 1
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
ignorePngGamma: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 1
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID:
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
nameFileIdTable: {}
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
BIN
Assets/Project Files/Shaders/circleglowing2.png
Normal file
BIN
Assets/Project Files/Shaders/circleglowing2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 98 KiB |
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user