diff --git a/Assets/Animations/Test/Arrow.anim b/Assets/Animations/Test/Arrow.anim index 7d0f3c0..3f4fbf3 100644 --- a/Assets/Animations/Test/Arrow.anim +++ b/Assets/Animations/Test/Arrow.anim @@ -19,13 +19,13 @@ AnimationClip: m_Curve: - serializedVersion: 2 time: 0 - value: {x: -0.3420651, y: 4.8, z: 9.078042} + value: {x: 0, y: 6.51, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 - serializedVersion: 2 time: 1 - value: {x: -0.3420651, y: 1.13, z: 9.078042} + value: {x: 0, y: 1.07, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -76,13 +76,13 @@ AnimationClip: m_Curve: - serializedVersion: 2 time: 0 - value: -0.3420651 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 - serializedVersion: 2 time: 1 - value: -0.3420651 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -98,13 +98,13 @@ AnimationClip: m_Curve: - serializedVersion: 2 time: 0 - value: 4.8 + value: 6.51 inSlope: 0 outSlope: 0 tangentMode: 136 - serializedVersion: 2 time: 1 - value: 1.13 + value: 1.07 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -120,13 +120,13 @@ AnimationClip: m_Curve: - serializedVersion: 2 time: 0 - value: 9.078042 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 - serializedVersion: 2 time: 1 - value: 9.078042 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Materials/Material_001.mat b/Assets/Materials/Material_001.mat index 030b555..d716b9b 100644 --- a/Assets/Materials/Material_001.mat +++ b/Assets/Materials/Material_001.mat @@ -8,8 +8,8 @@ Material: m_PrefabInternal: {fileID: 0} m_Name: Material_001 m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 5 + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 m_CustomRenderQueue: -1 stringTagMap: {} m_SavedProperties: diff --git a/Assets/Models/Dog/V4/Materials/Material.001.mat b/Assets/Models/Dog/V4/Materials/Material.001.mat new file mode 100644 index 0000000..c6bbfed --- /dev/null +++ b/Assets/Models/Dog/V4/Materials/Material.001.mat @@ -0,0 +1,127 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Material.001 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 5 + m_CustomRenderQueue: -1 + stringTagMap: {} + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + - first: + name: _BumpMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _DetailAlbedoMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _DetailMask + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _DetailNormalMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _EmissionMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _MainTex + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _MetallicGlossMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _OcclusionMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _ParallaxMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - first: + name: _BumpScale + second: 1 + - first: + name: _Cutoff + second: 0.5 + - first: + name: _DetailNormalMapScale + second: 1 + - first: + name: _DstBlend + second: 0 + - first: + name: _GlossMapScale + second: 1 + - first: + name: _Glossiness + second: 0.5 + - first: + name: _GlossyReflections + second: 1 + - first: + name: _Metallic + second: 0 + - first: + name: _Mode + second: 0 + - first: + name: _OcclusionStrength + second: 1 + - first: + name: _Parallax + second: 0.02 + - first: + name: _SmoothnessTextureChannel + second: 0 + - first: + name: _SpecularHighlights + second: 1 + - first: + name: _SrcBlend + second: 1 + - first: + name: _UVSec + second: 0 + - first: + name: _ZWrite + second: 1 + m_Colors: + - first: + name: _Color + second: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - first: + name: _EmissionColor + second: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Models/Dog/V4/Materials/Material.001.mat.meta b/Assets/Models/Dog/V4/Materials/Material.001.mat.meta new file mode 100644 index 0000000..8e63c79 --- /dev/null +++ b/Assets/Models/Dog/V4/Materials/Material.001.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a240ee075c678974daaec7901f64d759 +timeCreated: 1489791073 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Ground Characters/Test Dog.prefab b/Assets/Prefabs/Ground Characters/Test Dog.prefab index dacd744..eee6680 100644 --- a/Assets/Prefabs/Ground Characters/Test Dog.prefab +++ b/Assets/Prefabs/Ground Characters/Test Dog.prefab @@ -1765,7 +1765,7 @@ Camera: m_Depth: 0 m_CullingMask: serializedVersion: 2 - m_Bits: 4294949887 + m_Bits: 4294687743 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 1 @@ -2006,6 +2006,7 @@ MonoBehaviour: tiltRightAnimSpeed: 1 speed: 10 enableTilt: 1 + disableStrafe: 0 gravity: 10 maxVelocityChange: 10 canJump: 1 diff --git a/Assets/Prefabs/Models/Materials/Material_001.mat b/Assets/Prefabs/Models/Materials/Material_001.mat index 6848510..d51fa06 100644 --- a/Assets/Prefabs/Models/Materials/Material_001.mat +++ b/Assets/Prefabs/Models/Materials/Material_001.mat @@ -8,8 +8,8 @@ Material: m_PrefabInternal: {fileID: 0} m_Name: Material_001 m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 5 + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 m_CustomRenderQueue: -1 stringTagMap: {} m_SavedProperties: diff --git a/Assets/Prefabs/Networking/Arrow.prefab b/Assets/Prefabs/Networking/Arrow.prefab index ce53c0a..5953b00 100644 --- a/Assets/Prefabs/Networking/Arrow.prefab +++ b/Assets/Prefabs/Networking/Arrow.prefab @@ -11,26 +11,6 @@ Prefab: m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 1166831496739124} m_IsPrefabParent: 1 ---- !u!1 &1015885096985198 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4466509129557824} - - component: {fileID: 33969993779698564} - - component: {fileID: 65489110232567572} - - component: {fileID: 23561469801771766} - - component: {fileID: 54456028777961198} - - component: {fileID: 114092118542950002} - m_Layer: 25 - m_Name: BoxCollider - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 --- !u!1 &1166831496739124 GameObject: m_ObjectHideFlags: 0 @@ -43,521 +23,64 @@ GameObject: - component: {fileID: 114439400493581264} - component: {fileID: 54761637945005388} - component: {fileID: 65245917376367308} - m_Layer: 25 + m_Layer: 18 m_Name: Arrow m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1388551923210124 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4444553957499688} - - component: {fileID: 33975904661697060} - - component: {fileID: 65844474842062452} - - component: {fileID: 23420953330847862} - - component: {fileID: 114476052548708218} - m_Layer: 25 - m_Name: Cube (4) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1489835815015090 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4826855914429796} - m_Layer: 25 - m_Name: Unlit - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1494914180351024 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4732316082163586} - m_Layer: 25 - m_Name: ArrowWrapper - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1541529611371606 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4971106223326202} - - component: {fileID: 33219743114111384} - - component: {fileID: 65004425756612794} - - component: {fileID: 23167433742149800} - - component: {fileID: 114105778118679784} - m_Layer: 25 - m_Name: Cube (6) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1644226651981052 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4525933815042656} - - component: {fileID: 33248572086621954} - - component: {fileID: 65156559588965946} - - component: {fileID: 23610257060657442} - - component: {fileID: 114185258003354290} - m_Layer: 25 - m_Name: Cube (5) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1760379421797224 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4033381776749664} - - component: {fileID: 33185584010819432} - - component: {fileID: 65094176916118366} - - component: {fileID: 23294930605393934} - - component: {fileID: 114930577376137608} - m_Layer: 25 - m_Name: Cube (9) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1771649839641926 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4755336546798020} - - component: {fileID: 33216530128118924} - - component: {fileID: 65475614730611942} - - component: {fileID: 23627438414978170} - - component: {fileID: 114809749855473194} - m_Layer: 25 - m_Name: Cube (7) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1774353634647786 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4111098706070898} - - component: {fileID: 33643554953494106} - - component: {fileID: 65744273778777804} - - component: {fileID: 23592878481063438} - - component: {fileID: 114830349849391192} - m_Layer: 25 - m_Name: Cube (8) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1960419639055392 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4680998009117434} - - component: {fileID: 114977662502901678} - - component: {fileID: 95744645274962312} - - component: {fileID: 114686908955056482} - - component: {fileID: 114210224786363254} - m_Layer: 25 - m_Name: Lit - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &4033381776749664 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1760379421797224} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.66033196, y: 2.5981984, z: 0.54533184} - m_LocalScale: {x: 0.51234, y: 3.45595, z: 1} - m_Children: [] - m_Father: {fileID: 4826855914429796} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4062715202900884 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1166831496739124} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 2.46, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4466509129557824} - - {fileID: 4680998009117434} - - {fileID: 4826855914429796} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4111098706070898 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1774353634647786} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.66033196, y: 0.8881985, z: 0.54533184} - m_LocalScale: {x: 1.40376, y: 0.42815, z: 1} - m_Children: [] - m_Father: {fileID: 4826855914429796} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4444553957499688 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1388551923210124} - m_LocalRotation: {x: -0, y: -0, z: 0.38268343, w: 0.92387956} - m_LocalPosition: {x: 1.0023971, y: -0.67847764, z: -8.53271} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4732316082163586} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 45} ---- !u!4 &4466509129557824 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1015885096985198} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.5237795, y: 4.48118, z: 1.3391176} - m_Children: [] - m_Father: {fileID: 4062715202900884} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4525933815042656 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1644226651981052} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.0023971, y: 1.2255223, z: -8.53271} - m_LocalScale: {x: 0.51233995, y: 3.4559522, z: 1} - m_Children: [] - m_Father: {fileID: 4732316082163586} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4680998009117434 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1960419639055392} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.66033196, y: -2.0141983, z: -0.54533195} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4732316082163586} - m_Father: {fileID: 4062715202900884} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4732316082163586 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1494914180351024} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.3420651, y: 1.3726761, z: 9.078042} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4444553957499688} - - {fileID: 4525933815042656} - - {fileID: 4971106223326202} - m_Father: {fileID: 4680998009117434} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4755336546798020 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1771649839641926} - m_LocalRotation: {x: -0, y: -0, z: 0.38268343, w: 0.92387956} - m_LocalPosition: {x: 0.66033196, y: 0.6941985, z: 0.54533184} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4826855914429796} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 45} ---- !u!4 &4826855914429796 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1489835815015090} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.66033196, y: -2.0141983, z: -0.54533195} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4755336546798020} - - {fileID: 4111098706070898} - - {fileID: 4033381776749664} - m_Father: {fileID: 4062715202900884} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4971106223326202 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1541529611371606} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.0023971, y: -0.48447764, z: -8.53271} - m_LocalScale: {x: 1.403763, y: 0.428145, z: 1} - m_Children: [] - m_Father: {fileID: 4732316082163586} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &23167433742149800 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1541529611371606} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 7927fc1ca4e84e142a6f8a9bf2ed3e7f, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!23 &23294930605393934 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1760379421797224} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 7927fc1ca4e84e142a6f8a9bf2ed3e7f, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!23 &23420953330847862 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1388551923210124} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 7927fc1ca4e84e142a6f8a9bf2ed3e7f, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!23 &23561469801771766 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1015885096985198} - m_Enabled: 0 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 7927fc1ca4e84e142a6f8a9bf2ed3e7f, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!23 &23592878481063438 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1774353634647786} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 7927fc1ca4e84e142a6f8a9bf2ed3e7f, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!23 &23610257060657442 -MeshRenderer: + m_IsActive: 1 +--- !u!1 &1769974360580864 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4711639473138958} + - component: {fileID: 33285804286973062} + - component: {fileID: 23039109990022398} + - component: {fileID: 95421485995713244} + m_Layer: 18 + m_Name: arrow (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4062715202900884 +Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1644226651981052} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 7927fc1ca4e84e142a6f8a9bf2ed3e7f, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!23 &23627438414978170 + m_GameObject: {fileID: 1166831496739124} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 2.46, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4711639473138958} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4711639473138958 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1769974360580864} + m_LocalRotation: {x: -0.5, y: 0.5, z: 0.5, w: 0.5} + m_LocalPosition: {x: 0, y: 5, z: -0} + m_LocalScale: {x: 0.23308, y: 0.74356043, z: 1} + m_Children: [] + m_Father: {fileID: 4062715202900884} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -90.00001, y: 90, z: 0} +--- !u!23 &23039109990022398 MeshRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1771649839641926} + m_GameObject: {fileID: 1769974360580864} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -565,7 +88,8 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 2100000, guid: 7927fc1ca4e84e142a6f8a9bf2ed3e7f, type: 2} + - {fileID: 2100000, guid: 0381cf39e70d7fa41a597390181578cf, type: 2} + - {fileID: 2100000, guid: 32e2f5ea9bf5e5148b3e0c9fa7b97d3a, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -573,7 +97,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_PreserveUVs: 1 + m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 m_SelectedEditorRenderState: 3 @@ -583,70 +107,13 @@ MeshRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingOrder: 0 ---- !u!33 &33185584010819432 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1760379421797224} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33216530128118924 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1771649839641926} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33219743114111384 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1541529611371606} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33248572086621954 +--- !u!33 &33285804286973062 MeshFilter: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1644226651981052} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33643554953494106 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1774353634647786} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33969993779698564 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1015885096985198} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33975904661697060 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1388551923210124} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!54 &54456028777961198 -Rigidbody: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1015885096985198} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 1 + m_GameObject: {fileID: 1769974360580864} + m_Mesh: {fileID: 4300000, guid: 7dec0de86554e8e4aa513236e47debfe, type: 3} --- !u!54 &54761637945005388 Rigidbody: m_ObjectHideFlags: 1 @@ -662,42 +129,6 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 116 m_CollisionDetection: 2 ---- !u!65 &65004425756612794 -BoxCollider: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1541529611371606} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!65 &65094176916118366 -BoxCollider: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1760379421797224} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!65 &65156559588965946 -BoxCollider: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1644226651981052} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} --- !u!65 &65245917376367308 BoxCollider: m_ObjectHideFlags: 1 @@ -705,69 +136,21 @@ BoxCollider: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1166831496739124} m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 4.39, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!65 &65475614730611942 -BoxCollider: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1771649839641926} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!65 &65489110232567572 -BoxCollider: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1015885096985198} - m_Material: {fileID: 0} m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!65 &65744273778777804 -BoxCollider: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1774353634647786} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!65 &65844474842062452 -BoxCollider: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1388551923210124} - m_Material: {fileID: 0} - m_IsTrigger: 0 m_Enabled: 0 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} + m_Size: {x: 1, y: 4.39, z: 1} m_Center: {x: 0, y: 0, z: 0} ---- !u!95 &95744645274962312 +--- !u!95 &95421485995713244 Animator: serializedVersion: 3 m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1960419639055392} + m_GameObject: {fileID: 1769974360580864} m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 808f8e60b4e192a4193e2aaeca4dd884, type: 2} + m_Avatar: {fileID: 9000000, guid: 7dec0de86554e8e4aa513236e47debfe, type: 3} + m_Controller: {fileID: 0} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 @@ -775,65 +158,6 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 ---- !u!114 &114092118542950002 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1015885096985198} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f8ec0fb3ff2a5454e8863609a58514d0, type: 3} - m_Name: - m_EditorClassIdentifier: - GlowColor: {r: 1, g: 0, b: 0, a: 1} - LerpFactor: 10 ---- !u!114 &114105778118679784 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1541529611371606} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f8ec0fb3ff2a5454e8863609a58514d0, type: 3} - m_Name: - m_EditorClassIdentifier: - GlowColor: {r: 1, g: 0, b: 0, a: 1} - LerpFactor: 10 ---- !u!114 &114185258003354290 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1644226651981052} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f8ec0fb3ff2a5454e8863609a58514d0, type: 3} - m_Name: - m_EditorClassIdentifier: - GlowColor: {r: 1, g: 0, b: 0, a: 1} - LerpFactor: 10 ---- !u!114 &114210224786363254 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1960419639055392} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1768714887, guid: dc443db3e92b4983b9738c1131f555cb, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TransformSyncMode: 1 - m_SendInterval: 0.1 - m_SyncRotationAxis: 7 - m_RotationSyncCompression: 0 - m_SyncSpin: 0 - m_MovementTheshold: 0.001 - m_SnapThreshold: 5 - m_InterpolateRotation: 1 - m_InterpolateMovement: 1 --- !u!114 &114417069065412072 MonoBehaviour: m_ObjectHideFlags: 1 @@ -886,99 +210,3 @@ MonoBehaviour: m_SnapThreshold: 5 m_InterpolateRotation: 1 m_InterpolateMovement: 1 ---- !u!114 &114476052548708218 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1388551923210124} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f8ec0fb3ff2a5454e8863609a58514d0, type: 3} - m_Name: - m_EditorClassIdentifier: - GlowColor: {r: 1, g: 0, b: 0, a: 1} - LerpFactor: 10 ---- !u!114 &114686908955056482 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1960419639055392} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 372142912, guid: dc443db3e92b4983b9738c1131f555cb, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SceneId: - m_Value: 0 - m_AssetId: - i0: 145 - i1: 179 - i2: 164 - i3: 137 - i4: 210 - i5: 92 - i6: 178 - i7: 148 - i8: 104 - i9: 157 - i10: 164 - i11: 160 - i12: 45 - i13: 179 - i14: 224 - i15: 99 - m_ServerOnly: 0 - m_LocalPlayerAuthority: 0 ---- !u!114 &114809749855473194 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1771649839641926} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f8ec0fb3ff2a5454e8863609a58514d0, type: 3} - m_Name: - m_EditorClassIdentifier: - GlowColor: {r: 1, g: 0, b: 0, a: 1} - LerpFactor: 10 ---- !u!114 &114830349849391192 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1774353634647786} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f8ec0fb3ff2a5454e8863609a58514d0, type: 3} - m_Name: - m_EditorClassIdentifier: - GlowColor: {r: 1, g: 0, b: 0, a: 1} - LerpFactor: 10 ---- !u!114 &114930577376137608 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1760379421797224} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f8ec0fb3ff2a5454e8863609a58514d0, type: 3} - m_Name: - m_EditorClassIdentifier: - GlowColor: {r: 1, g: 0, b: 0, a: 1} - LerpFactor: 10 ---- !u!114 &114977662502901678 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1960419639055392} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e48be4658df94a54491635450e232985, type: 3} - m_Name: - m_EditorClassIdentifier: - maxTimeAlive: 5 diff --git a/Assets/Prefabs/Overseer/Lit.prefab b/Assets/Prefabs/Overseer/Lit.prefab index 7de0f04..17cb372 100644 --- a/Assets/Prefabs/Overseer/Lit.prefab +++ b/Assets/Prefabs/Overseer/Lit.prefab @@ -11,24 +11,6 @@ Prefab: m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 1627837743720578} m_IsPrefabParent: 1 ---- !u!1 &1068047953419316 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4575356013677658} - - component: {fileID: 33618983154545442} - - component: {fileID: 65147427897783756} - - component: {fileID: 23188273747308688} - m_Layer: 11 - m_Name: Cube (4) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!1 &1161244278440492 GameObject: m_ObjectHideFlags: 1 @@ -46,19 +28,19 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1369590218000568 +--- !u!1 &1561135843313512 GameObject: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 4267469527883294} - - component: {fileID: 33039718211061516} - - component: {fileID: 65204010823949260} - - component: {fileID: 23831617615925306} - m_Layer: 11 - m_Name: Cube (6) + - component: {fileID: 4417474005440260} + - component: {fileID: 33160659555714410} + - component: {fileID: 23698507707628850} + - component: {fileID: 95936417191698368} + m_Layer: 0 + m_Name: arrow m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -76,6 +58,7 @@ GameObject: - component: {fileID: 199850151432548132} - component: {fileID: 114502209633078634} - component: {fileID: 114470290365634832} + - component: {fileID: 95342985773525316} m_Layer: 0 m_Name: Sonar m_TagString: Untagged @@ -111,56 +94,28 @@ GameObject: serializedVersion: 5 m_Component: - component: {fileID: 4933915891949540} + - component: {fileID: 65513898819817666} + - component: {fileID: 114504147761751074} + - component: {fileID: 54259505038340178} m_Layer: 11 m_Name: ArrowWrapper - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1730134919679314 -GameObject: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4460270334807108} - - component: {fileID: 33713852228888602} - - component: {fileID: 65077436395572098} - - component: {fileID: 23575673178188060} - m_Layer: 11 - m_Name: Cube (5) - m_TagString: Untagged + m_TagString: SpawnedArrow m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4267469527883294 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1369590218000568} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.0023971, y: -0.48447764, z: -8.53271} - m_LocalScale: {x: 1.403763, y: 0.428145, z: 1} - m_Children: [] - m_Father: {fileID: 4933915891949540} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4460270334807108 +--- !u!4 &4417474005440260 Transform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1730134919679314} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.0023971, y: 1.2255223, z: -8.53271} - m_LocalScale: {x: 0.51233995, y: 3.4559522, z: 1} + m_GameObject: {fileID: 1561135843313512} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -0, y: 3.5, z: -0} + m_LocalScale: {x: 0.23308228, y: 0.74355906, z: 1} m_Children: [] m_Father: {fileID: 4933915891949540} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4528026369275918 Transform: @@ -191,19 +146,6 @@ Transform: m_Father: {fileID: 4528026369275918} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4575356013677658 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1068047953419316} - m_LocalRotation: {x: -0, y: -0, z: 0.38268343, w: 0.92387956} - m_LocalPosition: {x: 1.0023971, y: -0.67847764, z: -8.53271} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4933915891949540} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 45} --- !u!4 &4581914251456938 Transform: m_ObjectHideFlags: 1 @@ -224,83 +166,19 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1657253442066960} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.3420651, y: 1.3726761, z: 9.078042} + m_LocalPosition: {x: 0, y: 4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4575356013677658} - - {fileID: 4460270334807108} - - {fileID: 4267469527883294} + - {fileID: 4417474005440260} m_Father: {fileID: 4528026369275918} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!23 &23188273747308688 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1068047953419316} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 73e5c583a42f9594babb78649d068b57, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!23 &23575673178188060 -MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1730134919679314} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_Materials: - - {fileID: 2100000, guid: 73e5c583a42f9594babb78649d068b57, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 1 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingOrder: 0 ---- !u!23 &23831617615925306 +--- !u!23 &23698507707628850 MeshRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1369590218000568} + m_GameObject: {fileID: 1561135843313512} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -308,7 +186,8 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 2100000, guid: 73e5c583a42f9594babb78649d068b57, type: 2} + - {fileID: 2100000, guid: 0381cf39e70d7fa41a597390181578cf, type: 2} + - {fileID: 2100000, guid: 32e2f5ea9bf5e5148b3e0c9fa7b97d3a, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -316,7 +195,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 - m_PreserveUVs: 1 + m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 m_SelectedEditorRenderState: 3 @@ -326,63 +205,40 @@ MeshRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingOrder: 0 ---- !u!33 &33039718211061516 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1369590218000568} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33618983154545442 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1068047953419316} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!33 &33713852228888602 +--- !u!33 &33160659555714410 MeshFilter: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1730134919679314} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!65 &65077436395572098 -BoxCollider: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1730134919679314} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!65 &65147427897783756 -BoxCollider: + m_GameObject: {fileID: 1561135843313512} + m_Mesh: {fileID: 4300000, guid: 7dec0de86554e8e4aa513236e47debfe, type: 3} +--- !u!54 &54259505038340178 +Rigidbody: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1068047953419316} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 0 + m_GameObject: {fileID: 1657253442066960} serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!65 &65204010823949260 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!65 &65513898819817666 BoxCollider: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1369590218000568} + m_GameObject: {fileID: 1657253442066960} m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 0 + m_IsTrigger: 1 + m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} + m_Size: {x: 2, y: 8, z: 2} + m_Center: {x: 0, y: 2, z: 0} --- !u!82 &82655741533510368 AudioSource: m_ObjectHideFlags: 1 @@ -463,6 +319,23 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 0 +--- !u!95 &95342985773525316 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1610631623280160} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 808f8e60b4e192a4193e2aaeca4dd884, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 --- !u!95 &95505109485149776 Animator: serializedVersion: 3 @@ -480,6 +353,23 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 +--- !u!95 &95936417191698368 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1561135843313512} + m_Enabled: 1 + m_Avatar: {fileID: 9000000, guid: 7dec0de86554e8e4aa513236e47debfe, type: 3} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 --- !u!108 &108710701523344604 Light: m_ObjectHideFlags: 1 @@ -591,6 +481,17 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: OnlyDeactivate: 0 +--- !u!114 &114504147761751074 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1657253442066960} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c3b2a69010a9ada418d9bb749d3b69d0, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &114898585285612640 MonoBehaviour: m_ObjectHideFlags: 1 @@ -673,7 +574,7 @@ ParticleSystem: moveWithTransform: 0 moveWithCustomTransform: {fileID: 0} scalingMode: 2 - randomSeed: -1603232433 + randomSeed: -226890855 InitialModule: serializedVersion: 3 enabled: 1 diff --git a/Assets/Prefabs/Overseer/Materials.meta b/Assets/Prefabs/Overseer/Materials.meta new file mode 100644 index 0000000..13e43f0 --- /dev/null +++ b/Assets/Prefabs/Overseer/Materials.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 949098a2b59c36e4287b5a5be6b05ee5 +folderAsset: yes +timeCreated: 1489792383 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Overseer/Materials/Material.mat b/Assets/Prefabs/Overseer/Materials/Material.mat new file mode 100644 index 0000000..284e4e2 --- /dev/null +++ b/Assets/Prefabs/Overseer/Materials/Material.mat @@ -0,0 +1,127 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Material + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 1 + m_CustomRenderQueue: -1 + stringTagMap: {} + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + - first: + name: _BumpMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _DetailAlbedoMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _DetailMask + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _DetailNormalMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _EmissionMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _MainTex + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _MetallicGlossMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _OcclusionMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - first: + name: _ParallaxMap + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - first: + name: _BumpScale + second: 1 + - first: + name: _Cutoff + second: 0.5 + - first: + name: _DetailNormalMapScale + second: 1 + - first: + name: _DstBlend + second: 0 + - first: + name: _GlossMapScale + second: 1 + - first: + name: _Glossiness + second: 0.5 + - first: + name: _GlossyReflections + second: 1 + - first: + name: _Metallic + second: 0 + - first: + name: _Mode + second: 0 + - first: + name: _OcclusionStrength + second: 1 + - first: + name: _Parallax + second: 0.02 + - first: + name: _SmoothnessTextureChannel + second: 0 + - first: + name: _SpecularHighlights + second: 1 + - first: + name: _SrcBlend + second: 1 + - first: + name: _UVSec + second: 0 + - first: + name: _ZWrite + second: 1 + m_Colors: + - first: + name: _Color + second: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - first: + name: _EmissionColor + second: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Prefabs/Overseer/Materials/Material.mat.meta b/Assets/Prefabs/Overseer/Materials/Material.mat.meta new file mode 100644 index 0000000..ab29868 --- /dev/null +++ b/Assets/Prefabs/Overseer/Materials/Material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0381cf39e70d7fa41a597390181578cf +timeCreated: 1489792383 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Overseer/Overseer Camera.prefab b/Assets/Prefabs/Overseer/Overseer Camera.prefab index d239025..cecdda1 100644 --- a/Assets/Prefabs/Overseer/Overseer Camera.prefab +++ b/Assets/Prefabs/Overseer/Overseer Camera.prefab @@ -50,6 +50,7 @@ GameObject: - component: {fileID: 114900340473879266} - component: {fileID: 114911498961015104} - component: {fileID: 114557778174852100} + - component: {fileID: 114113419325129914} m_Layer: 0 m_Name: Overseer Camera m_TagString: MainCamera @@ -191,6 +192,20 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a8d6d491c430e2d4ea283009ec2f2794, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &114113419325129914 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1743480622849158} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cd732fb44d34b94499d898ade1175074, type: 3} + m_Name: + m_EditorClassIdentifier: + shader: {fileID: 4800000, guid: ce9a06ac4ede6f84ab1865b7d32f204c, type: 3} + VHS: {fileID: 15200000, guid: 324a486eb541aa848884bad1ebd7b5e6, type: 3} + intensity: 1 --- !u!114 &114141115246894026 MonoBehaviour: m_ObjectHideFlags: 1 @@ -375,7 +390,7 @@ MonoBehaviour: verticalAxis: Vertical Right Stick Overseer beaconButton: Overseer Beacon autoHidePointer: 0 - pointerInstantiateOffset: {x: 0, y: 3, z: 0} + pointerInstantiateOffset: {x: 0, y: 0, z: 0} beaconContainerPrefab: {fileID: 1166831496739124, guid: 91b3a489d25cb294689da4a02db3e063, type: 2} beaconPrefab: {fileID: 1627837743720578, guid: 43877f32af5efef4b84770a02b17302b, diff --git a/Assets/Prefabs/Overseer/arrow.blend b/Assets/Prefabs/Overseer/arrow.blend new file mode 100644 index 0000000..e699e0e Binary files /dev/null and b/Assets/Prefabs/Overseer/arrow.blend differ diff --git a/Assets/Prefabs/Overseer/arrow.blend.meta b/Assets/Prefabs/Overseer/arrow.blend.meta new file mode 100644 index 0000000..a2c3d17 --- /dev/null +++ b/Assets/Prefabs/Overseer/arrow.blend.meta @@ -0,0 +1,82 @@ +fileFormatVersion: 2 +guid: 7dec0de86554e8e4aa513236e47debfe +timeCreated: 1489792383 +licenseType: Free +ModelImporter: + serializedVersion: 19 + fileIDToRecycleName: + 100000: //RootNode + 400000: //RootNode + 2300000: //RootNode + 3300000: //RootNode + 4300000: Cube + 7400000: Default Take + 9500000: //RootNode + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + importBlendShapes: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + serializedVersion: 2 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + rootMotionBoneName: + rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1} + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 2 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Controls/OverSeer/ArrowKillerTrigger.cs b/Assets/Scripts/Controls/OverSeer/ArrowKillerTrigger.cs new file mode 100644 index 0000000..4b1af10 --- /dev/null +++ b/Assets/Scripts/Controls/OverSeer/ArrowKillerTrigger.cs @@ -0,0 +1,14 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ArrowKillerTrigger : MonoBehaviour { + void OnTriggerEnter(Collider other) + { + if (other.tag == "SpawnedArrow" && + other.GetComponentInParent().currentTimeAlive > GetComponentInParent().currentTimeAlive) + { + Destroy(other.transform.parent.gameObject); + } + } +} diff --git a/Assets/Scripts/Controls/OverSeer/ArrowKillerTrigger.cs.meta b/Assets/Scripts/Controls/OverSeer/ArrowKillerTrigger.cs.meta new file mode 100644 index 0000000..0ea5f76 --- /dev/null +++ b/Assets/Scripts/Controls/OverSeer/ArrowKillerTrigger.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: c3b2a69010a9ada418d9bb749d3b69d0 +timeCreated: 1489795046 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Controls/OverSeer/OSPointer.cs b/Assets/Scripts/Controls/OverSeer/OSPointer.cs index b9b5d9f..05529e5 100644 --- a/Assets/Scripts/Controls/OverSeer/OSPointer.cs +++ b/Assets/Scripts/Controls/OverSeer/OSPointer.cs @@ -24,7 +24,7 @@ public class OSPointer : MonoBehaviour private float currentTimeToDissapear; private bool teleportPointer; public bool enableMovement; - private float arrowCooldown = 1f; + private float arrowCooldown = 3f; private float currentCooldown; void Start() @@ -39,6 +39,7 @@ void Start() public void updateTarget(bool setActive) { if (!RTSCamera.startingTargetAssigned) cam.Start(); + currentCooldown = 0; pointer.transform.position = cam.followTarget.transform.position + pointerInstantiateOffset; pointer.gameObject.SetActive(setActive); } @@ -50,10 +51,10 @@ void Update() if (Input.GetAxis(beaconButton) > 0) { - if (!beaconInUse && currentCooldown < 0) + if (currentCooldown < 0) { - SpawnBeacon(); currentCooldown = arrowCooldown; + SpawnBeacon(); } } else if (Input.GetAxisRaw(beaconButton) == 0) diff --git a/Assets/Scripts/General/Destroy/DestroyAfterTime.cs b/Assets/Scripts/General/Destroy/DestroyAfterTime.cs index c74cfec..3d5c881 100644 --- a/Assets/Scripts/General/Destroy/DestroyAfterTime.cs +++ b/Assets/Scripts/General/Destroy/DestroyAfterTime.cs @@ -3,7 +3,7 @@ public class DestroyAfterTime : MonoBehaviour { - private float currentTimeAlive; + public float currentTimeAlive; public float maxTimeAlive = 2.0f; void Update() diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 26a274a..47f70c2 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -30,6 +30,7 @@ TagManager: - Tutorial Canvas Overseer - Tutorial Canvas Ground Player - Time Manager + - SpawnedArrow layers: - Default - TransparentFX