diff --git a/Assets/Animations/Test/Arrow.anim b/Assets/Animations/Test/Arrow.anim new file mode 100644 index 0000000..7d0f3c0 --- /dev/null +++ b/Assets/Animations/Test/Arrow.anim @@ -0,0 +1,145 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Arrow + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: {x: -0.3420651, y: 4.8, z: 9.078042} + 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} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: ArrowWrapper + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - path: 1009465259 + attribute: 1 + script: {fileID: 0} + classID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: -0.3420651 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 1 + value: -0.3420651 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: ArrowWrapper + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 4.8 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 1 + value: 1.13 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: ArrowWrapper + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 2 + time: 0 + value: 9.078042 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + - serializedVersion: 2 + time: 1 + value: 9.078042 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: ArrowWrapper + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_GenerateMotionCurves: 0 + m_IsEmpty: 0 + m_Events: [] diff --git a/Assets/Animations/Test/Arrow.anim.meta b/Assets/Animations/Test/Arrow.anim.meta new file mode 100644 index 0000000..88a2ce3 --- /dev/null +++ b/Assets/Animations/Test/Arrow.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f380ea1c637b5044f971ccdd521fccc5 +timeCreated: 1486890603 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Test/Lit.controller b/Assets/Animations/Test/Lit.controller new file mode 100644 index 0000000..1a71e4f --- /dev/null +++ b/Assets/Animations/Test/Lit.controller @@ -0,0 +1,67 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Lit + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107391753703322120} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &1102824474710820346 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Arrow + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_Motion: {fileID: 7400000, guid: f380ea1c637b5044f971ccdd521fccc5, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: +--- !u!1107 &1107391753703322120 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102824474710820346} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102824474710820346} diff --git a/Assets/Animations/Test/Lit.controller.meta b/Assets/Animations/Test/Lit.controller.meta new file mode 100644 index 0000000..f86c7f2 --- /dev/null +++ b/Assets/Animations/Test/Lit.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 808f8e60b4e192a4193e2aaeca4dd884 +timeCreated: 1486890604 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Red Transparent.mat b/Assets/Materials/Red Transparent.mat new file mode 100644 index 0000000..b658e44 --- /dev/null +++ b/Assets/Materials/Red Transparent.mat @@ -0,0 +1,128 @@ +%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: Red Transparent + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION + m_LightmapFlags: 1 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + 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: 10 + - 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: 3 + - 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: 0 + m_Colors: + - first: + name: _Color + second: {r: 1, g: 0, b: 0, a: 0.547} + - first: + name: _EmissionColor + second: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/Red Transparent.mat.meta b/Assets/Materials/Red Transparent.mat.meta new file mode 100644 index 0000000..67c2e4b --- /dev/null +++ b/Assets/Materials/Red Transparent.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 413aaf8862ab277449100e1c50db6a12 +timeCreated: 1486695407 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Overseer.meta b/Assets/Prefabs/Overseer.meta new file mode 100644 index 0000000..89d3362 --- /dev/null +++ b/Assets/Prefabs/Overseer.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 9ff07aa1bbd320e4e83f92d603080b37 +folderAsset: yes +timeCreated: 1486886261 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Overseer/Lit.prefab b/Assets/Prefabs/Overseer/Lit.prefab new file mode 100644 index 0000000..5377ba1 --- /dev/null +++ b/Assets/Prefabs/Overseer/Lit.prefab @@ -0,0 +1,347 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + 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: 0 + m_Name: Cube (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1369590218000568 +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: 0 + m_Name: Cube (6) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1627837743720578 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4528026369275918} + - component: {fileID: 114898585285612640} + - component: {fileID: 95505109485149776} + m_Layer: 0 + m_Name: Lit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1657253442066960 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 4933915891949540} + m_Layer: 0 + 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: 0 + m_Name: Cube (5) + m_TagString: Untagged + 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 +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_Children: [] + m_Father: {fileID: 4933915891949540} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4528026369275918 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1627837743720578} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4933915891949540} + m_Father: {fileID: 0} + m_RootOrder: 0 + 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 &4933915891949540 +Transform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + 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_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4575356013677658} + - {fileID: 4460270334807108} + - {fileID: 4267469527883294} + 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 +MeshRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1369590218000568} + 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!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 +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: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!65 &65147427897783756 +BoxCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1068047953419316} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!65 &65204010823949260 +BoxCollider: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1369590218000568} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!95 &95505109485149776 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1627837743720578} + 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!114 &114898585285612640 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1627837743720578} + 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.meta b/Assets/Prefabs/Overseer/Lit.prefab.meta new file mode 100644 index 0000000..89915e0 --- /dev/null +++ b/Assets/Prefabs/Overseer/Lit.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 43877f32af5efef4b84770a02b17302b +timeCreated: 1486886273 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/OverSeer.prefab b/Assets/Prefabs/Overseer/OverSeer.prefab similarity index 97% rename from Assets/Prefabs/OverSeer.prefab rename to Assets/Prefabs/Overseer/OverSeer.prefab index d8e4b07..7ffcdd4 100644 --- a/Assets/Prefabs/OverSeer.prefab +++ b/Assets/Prefabs/Overseer/OverSeer.prefab @@ -54,7 +54,10 @@ MonoBehaviour: m_EditorClassIdentifier: horizontalAxis: verticalAxis: + beaconButton: + beaconPrefab: {fileID: 0} pointer: {fileID: 0} + speed: 0.1 --- !u!114 &114974002050963904 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/OverSeer.prefab.meta b/Assets/Prefabs/Overseer/OverSeer.prefab.meta similarity index 100% rename from Assets/Prefabs/OverSeer.prefab.meta rename to Assets/Prefabs/Overseer/OverSeer.prefab.meta diff --git a/Assets/Scene/Test Scenes/OverLord Test Vladimir.unity b/Assets/Scene/Test Scenes/OverLord Test Vladimir.unity index 0780204..b855b9e 100644 --- a/Assets/Scene/Test Scenes/OverLord Test Vladimir.unity +++ b/Assets/Scene/Test Scenes/OverLord Test Vladimir.unity @@ -540,30 +540,43 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 304202735} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &369089915 +--- !u!1 &339925090 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 369089919} - - component: {fileID: 369089918} - - component: {fileID: 369089917} - - component: {fileID: 369089916} + - component: {fileID: 339925091} + - component: {fileID: 339925094} + - component: {fileID: 339925093} + - component: {fileID: 339925092} m_Layer: 0 - m_Name: Cube (4) + m_Name: Cube (8) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!23 &369089916 +--- !u!4 &339925091 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 339925090} + 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: 1776133151} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &339925092 MeshRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 369089915} + m_GameObject: {fileID: 339925090} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -571,7 +584,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_Materials: - - {fileID: 2100000, guid: 73e5c583a42f9594babb78649d068b57, type: 2} + - {fileID: 2100000, guid: 413aaf8862ab277449100e1c50db6a12, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -589,38 +602,25 @@ MeshRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingOrder: 0 ---- !u!65 &369089917 +--- !u!65 &339925093 BoxCollider: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 369089915} + m_GameObject: {fileID: 339925090} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &369089918 +--- !u!33 &339925094 MeshFilter: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 369089915} + m_GameObject: {fileID: 339925090} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &369089919 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 369089915} - 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: 751973868} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 45} --- !u!1 &421965463 GameObject: m_ObjectHideFlags: 0 @@ -1255,7 +1255,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &751973868 Transform: m_ObjectHideFlags: 0 @@ -1266,12 +1266,57 @@ Transform: m_LocalPosition: {x: -0.750332, y: 0.4458015, z: 1.7646681} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 369089919} - - {fileID: 1678790879} - - {fileID: 1472041048} + - {fileID: 1462993862} + - {fileID: 1776133151} m_Father: {fileID: 0} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &752013373 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 751973868} + m_Modifications: + - target: {fileID: 4528026369275918, guid: 43877f32af5efef4b84770a02b17302b, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4528026369275918, guid: 43877f32af5efef4b84770a02b17302b, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4528026369275918, guid: 43877f32af5efef4b84770a02b17302b, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4528026369275918, guid: 43877f32af5efef4b84770a02b17302b, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4528026369275918, guid: 43877f32af5efef4b84770a02b17302b, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4528026369275918, guid: 43877f32af5efef4b84770a02b17302b, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4528026369275918, guid: 43877f32af5efef4b84770a02b17302b, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4528026369275918, guid: 43877f32af5efef4b84770a02b17302b, type: 2} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1627837743720578, guid: 43877f32af5efef4b84770a02b17302b, type: 2} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 43877f32af5efef4b84770a02b17302b, type: 2} + m_IsPrefabParent: 0 --- !u!1 &799120914 GameObject: m_ObjectHideFlags: 0 @@ -1502,7 +1547,6 @@ MonoBehaviour: currentDelayTime: 0 horizontalAxis: Horizontal Dpad Overseer verticalAxis: Vertical Dpad Overseer - pointer: {fileID: 751973868} speed: 0.1 --- !u!114 &799120922 MonoBehaviour: @@ -1510,15 +1554,19 @@ MonoBehaviour: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 799120914} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 688bca87ee342a0479e6b66dcb776ffe, type: 3} m_Name: m_EditorClassIdentifier: horizontalAxis: Horizontal Dpad Overseer verticalAxis: Vertical Dpad Overseer + beaconButton: Overseer Beacon + beaconPrefab: {fileID: 1627837743720578, guid: 43877f32af5efef4b84770a02b17302b, + type: 2} pointer: {fileID: 751973868} speed: 0.1 + timeToDissapear: 1 --- !u!1 &800169583 GameObject: m_ObjectHideFlags: 0 @@ -1892,6 +1940,87 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1063355021} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1065363994 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1065363995} + - component: {fileID: 1065363998} + - component: {fileID: 1065363997} + - component: {fileID: 1065363996} + m_Layer: 0 + m_Name: Cube (9) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1065363995 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1065363994} + 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: 1776133151} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1065363996 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1065363994} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: 413aaf8862ab277449100e1c50db6a12, 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!65 &1065363997 +BoxCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1065363994} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &1065363998 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1065363994} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1101738751 GameObject: m_ObjectHideFlags: 0 @@ -2265,6 +2394,87 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1236949929} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1257532736 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1257532737} + - component: {fileID: 1257532740} + - component: {fileID: 1257532739} + - component: {fileID: 1257532738} + m_Layer: 0 + m_Name: Cube (7) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1257532737 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1257532736} + 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: 1776133151} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 45} +--- !u!23 &1257532738 +MeshRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1257532736} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_Materials: + - {fileID: 2100000, guid: 413aaf8862ab277449100e1c50db6a12, 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!65 &1257532739 +BoxCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1257532736} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &1257532740 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1257532736} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1336819450 GameObject: m_ObjectHideFlags: 0 @@ -2393,87 +2603,11 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1389993461} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1472041044 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1472041048} - - component: {fileID: 1472041047} - - component: {fileID: 1472041046} - - component: {fileID: 1472041045} - m_Layer: 0 - m_Name: Cube (6) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!23 &1472041045 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1472041044} - 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!65 &1472041046 -BoxCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1472041044} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &1472041047 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1472041044} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1472041048 +--- !u!4 &1462993862 stripped Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1472041044} - 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.403763, y: 0.428145, z: 1} - m_Children: [] - m_Father: {fileID: 751973868} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_PrefabParentObject: {fileID: 4528026369275918, guid: 43877f32af5efef4b84770a02b17302b, + type: 2} + m_PrefabInternal: {fileID: 752013373} --- !u!1 &1542782280 GameObject: m_ObjectHideFlags: 0 @@ -2555,87 +2689,6 @@ Transform: m_Father: {fileID: 514581906} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1678790875 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 1678790879} - - component: {fileID: 1678790878} - - component: {fileID: 1678790877} - - component: {fileID: 1678790876} - m_Layer: 0 - m_Name: Cube (5) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!23 &1678790876 -MeshRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1678790875} - 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!65 &1678790877 -BoxCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1678790875} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!33 &1678790878 -MeshFilter: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1678790875} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!4 &1678790879 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1678790875} - 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.51233995, y: 3.4559522, z: 1} - m_Children: [] - m_Father: {fileID: 751973868} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1737758947 GameObject: m_ObjectHideFlags: 0 @@ -2776,6 +2829,37 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1742660549} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1776133150 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1776133151} + m_Layer: 0 + m_Name: Unlit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1776133151 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1776133150} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1257532737} + - {fileID: 339925091} + - {fileID: 1065363995} + m_Father: {fileID: 751973868} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1792684406 Prefab: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Camera/Overseer/OverseerCamera.cs b/Assets/Scripts/Camera/Overseer/OverseerCamera.cs index 681859f..02b8128 100644 --- a/Assets/Scripts/Camera/Overseer/OverseerCamera.cs +++ b/Assets/Scripts/Camera/Overseer/OverseerCamera.cs @@ -14,7 +14,6 @@ public class OverseerCamera : MonoBehaviour { public string horizontalAxis; public string verticalAxis; - public Transform pointer; public float speed = 0.1f; void Start() @@ -51,50 +50,7 @@ void Update () { } } - float directionx = (transform.position.x < target.transform.position.x) ? 1 : -1; - float directionz = (transform.position.z < target.transform.position.z) ? 1 : -1; - currentDelayTime -= Time.deltaTime; - Debug.Log(transform.rotation.y); - //Arrow Targeting - if ((transform.rotation.y > 0.25) && (transform.rotation.y < 0.75)) - { - pointer.position = new Vector3(pointer.position.x + (speed * Input.GetAxisRaw(verticalAxis) * directionx), pointer.position.y, pointer.position.z); - // pointer.position = new Vector3(pointer.position.x, pointer.position.y, pointer.position.z - (speed * Input.GetAxisRaw(horizontalAxis) * directionz)); - } - else - { - // pointer.position = new Vector3(pointer.position.x - (speed * Input.GetAxisRaw(horizontalAxis) * directionz), pointer.position.y, pointer.position.z); - pointer.position = new Vector3(pointer.position.x, pointer.position.y, pointer.position.z - (speed * Input.GetAxisRaw(verticalAxis) * directionx)); - } - /*else if ((transform.rotation.y < -0.25 && transform.rotation.y < 0.75)) - { - pointer.position = new Vector3(pointer.position.x + - (speed * Input.GetAxisRaw(verticalAxis)), pointer.position.y, pointer.position.z); - }*/ - /*else - { - pointer.position = new Vector3(pointer.position.x, pointer.position.y, pointer.position.z + (speed * Input.GetAxis(verticalAxis))); - }*/ - /*else if ((transform.rotation.y > -0.25f && transform.rotation.y < -0.75)) - { - pointer.position = new Vector3(pointer.position.x - (speed * Input.GetAxis(verticalAxis)), pointer.position.y, pointer.position.z); - }*/ - - - /*else { - pointer.position = new Vector3(pointer.position.x, pointer.position.y, pointer.position.z + (speed * Input.GetAxis(verticalAxis))); - }*/ - - /*if (Input.GetAxis(verticalAxis) > 0 && transform.rotation.y > invDegree || Input.GetAxis(verticalAxis) < 0 && transform.rotation.y < invDegree) - { - pointer.position = new Vector3(pointer.position.x, pointer.position.y, pointer.position.z - speed); - } - if (Input.GetAxis(verticalAxis) < 0 && transform.rotation.y > invDegree || Input.GetAxis(verticalAxis) > 0 && transform.rotation.y < invDegree) - { - pointer.position = new Vector3(pointer.position.x, pointer.position.y, pointer.position.z + speed); - }*/ - } void startCooldown() diff --git a/Assets/Scripts/Controls/OverSeer/Controllables/OSAnimatorControl.cs b/Assets/Scripts/Controls/OverSeer/Controllables/OSAnimatorControl.cs index 79878b8..17923c9 100644 --- a/Assets/Scripts/Controls/OverSeer/Controllables/OSAnimatorControl.cs +++ b/Assets/Scripts/Controls/OverSeer/Controllables/OSAnimatorControl.cs @@ -7,12 +7,6 @@ public class OSAnimatorControl : MonoBehaviour, OSControllable { void OSControllable.triggerAction() { - Debug.Log("A"); GetComponent().SetTrigger("toggleObject"); } - - // Update is called once per frame - void Update () { - - } } diff --git a/Assets/Scripts/Controls/OverSeer/OSPointer.cs b/Assets/Scripts/Controls/OverSeer/OSPointer.cs index ce022ed..6b8c80e 100644 --- a/Assets/Scripts/Controls/OverSeer/OSPointer.cs +++ b/Assets/Scripts/Controls/OverSeer/OSPointer.cs @@ -5,27 +5,70 @@ public class OSPointer : MonoBehaviour { public string horizontalAxis; public string verticalAxis; + public string beaconButton; + public GameObject beaconPrefab; public Transform pointer; public float speed = 0.1f; + private RTSCamera cam; + private bool beaconInUse; + public float timeToDissapear = 3; + private float currentTimeToDissapear; + private bool teleportPointer; - // Update is called once per frame - void Update () { - if (Input.GetAxis(horizontalAxis) > 0) + void Start() + { + cam = GetComponent(); + } + + // Update is called once per frame + void Update () { + if (Input.GetAxisRaw(verticalAxis) + Input.GetAxisRaw(horizontalAxis) == 0) + { + if((currentTimeToDissapear -= Time.deltaTime) < 0) + { + pointer.gameObject.SetActive(false); + teleportPointer = true; + } + return; + } + + if (teleportPointer) + { + pointer.position = new Vector3(cam.followTarget.position.x, pointer.position.y, cam.followTarget.position.z); + teleportPointer = false; + } + + currentTimeToDissapear = timeToDissapear; + pointer.gameObject.SetActive(true); + + float directionx = (transform.position.x < cam.followTarget.transform.position.x) ? 1 : -1; + float directionz = (transform.position.z < cam.followTarget.transform.position.z) ? 1 : -1; + + //Arrow Targeting + if ((transform.rotation.y > 0.30) && (transform.rotation.y < 0.85)) { - pointer.position = new Vector3(pointer.position.x+speed, pointer.position.y, pointer.position.z); + pointer.position = new Vector3(pointer.position.x + (speed * Input.GetAxisRaw(verticalAxis) * directionx), pointer.position.y, pointer.position.z); + pointer.position = new Vector3(pointer.position.x, pointer.position.y, pointer.position.z - (speed * Input.GetAxisRaw(horizontalAxis) * directionx)); } - if (Input.GetAxis(horizontalAxis) < 0) + else { - pointer.position = new Vector3(pointer.position.x - speed, pointer.position.y, pointer.position.z); + pointer.position = new Vector3(pointer.position.x + (speed * Input.GetAxisRaw(horizontalAxis) * directionz), pointer.position.y, pointer.position.z); + pointer.position = new Vector3(pointer.position.x, pointer.position.y, pointer.position.z + (speed * Input.GetAxisRaw(verticalAxis) * directionz)); } - if (Input.GetAxis(verticalAxis) > 0) + + if(Input.GetAxis(beaconButton) > 0) { - pointer.position = new Vector3(pointer.position.x, pointer.position.y, pointer.position.z + speed); + if (!beaconInUse) + { + Instantiate(beaconPrefab, pointer.position, Quaternion.identity); + beaconInUse = true; + } + } - if (Input.GetAxis(verticalAxis) < 0) + else if (Input.GetAxisRaw(beaconButton) == 0) { - pointer.position = new Vector3(pointer.position.x, pointer.position.y, pointer.position.z - speed); + beaconInUse = false; } } } diff --git a/Assets/Scripts/General.meta b/Assets/Scripts/General.meta new file mode 100644 index 0000000..980d33f --- /dev/null +++ b/Assets/Scripts/General.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 6adfafd725c34c04d808eeefaadfb1e6 +folderAsset: yes +timeCreated: 1486890138 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/General/Destroy.meta b/Assets/Scripts/General/Destroy.meta new file mode 100644 index 0000000..a98db85 --- /dev/null +++ b/Assets/Scripts/General/Destroy.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 245a727aed9defd4fab5b50fa7b6aeff +folderAsset: yes +timeCreated: 1486890176 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/General/Destroy/DestroyAfterTime.cs b/Assets/Scripts/General/Destroy/DestroyAfterTime.cs new file mode 100644 index 0000000..c74cfec --- /dev/null +++ b/Assets/Scripts/General/Destroy/DestroyAfterTime.cs @@ -0,0 +1,18 @@ +using UnityEngine; +using System.Collections; + +public class DestroyAfterTime : MonoBehaviour +{ + private float currentTimeAlive; + public float maxTimeAlive = 2.0f; + + void Update() + { + currentTimeAlive += Time.deltaTime; + + if (currentTimeAlive > maxTimeAlive) + { + Destroy(gameObject); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/General/Destroy/DestroyAfterTime.cs.meta b/Assets/Scripts/General/Destroy/DestroyAfterTime.cs.meta new file mode 100644 index 0000000..f142710 --- /dev/null +++ b/Assets/Scripts/General/Destroy/DestroyAfterTime.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: e48be4658df94a54491635450e232985 +timeCreated: 1486890152 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index e8cb1c7..1abd059 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -373,6 +373,22 @@ InputManager: type: 2 axis: 4 joyNum: 0 + - serializedVersion: 3 + m_Name: Overseer Beacon + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0.2 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 8 + joyNum: 0 - serializedVersion: 3 m_Name: Vertical Dpad Overseer descriptiveName: