commit cdd71543e0c8a0c1d6d7a7f5ce008e74f6611a56 parent 3c4a86455d33e59fdee5c6273d28b5c32a39b00a Author: PlutoTank <qwolkensperg@gmail.com> Date: Thu, 6 Feb 2020 17:52:54 -0500 SSM and CC Diffstat:
44 files changed, 1242 insertions(+), 238 deletions(-)
diff --git a/Assets/InputSystem.inputsettings.asset b/Assets/InputSystem.inputsettings.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c46f07b5ed07e4e92aa78254188d3d10, type: 3} + m_Name: InputSystem.inputsettings + m_EditorClassIdentifier: + m_SupportedDevices: [] + m_UpdateMode: 1 + m_CompensateForScreenOrientation: 1 + m_FilterNoiseOnCurrent: 0 + m_DefaultDeadzoneMin: 0.125 + m_DefaultDeadzoneMax: 0.925 + m_DefaultButtonPressPoint: 0.5 + m_DefaultTapTime: 0.2 + m_DefaultSlowTapTime: 0.5 + m_DefaultHoldTime: 0.4 + m_TapRadius: 5 + m_MultiTapDelayTime: 0.75 diff --git a/Assets/InputSystem.inputsettings.asset.meta b/Assets/InputSystem.inputsettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ce1ba5e1a303b424ab184a808a473b43 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Slimes/Slime.prefab b/Assets/Prefabs/Slimes/Slime.prefab @@ -1,5 +1,256 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &139575883 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 139575884} + - component: {fileID: 139575885} + m_Layer: 9 + m_Name: StateMachine + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &139575884 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 139575883} + 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: 1346574270} + - {fileID: 2105505490} + - {fileID: 1833990616} + - {fileID: 1310556698} + m_Father: {fileID: 1537802816993234539} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &139575885 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 139575883} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8ae4a744704e0d44d85b6eaf97077aaa, type: 3} + m_Name: + m_EditorClassIdentifier: + startingState: {fileID: 1346574271} +--- !u!1 &1310556697 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1310556698} + - component: {fileID: 1310556699} + m_Layer: 9 + m_Name: UsingAbility + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1310556698 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1310556697} + 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: [] + m_Father: {fileID: 139575884} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1310556699 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1310556697} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 64fcd96337fe06b48a7da473de233ed7, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1346574269 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1346574270} + - component: {fileID: 1346574271} + m_Layer: 9 + m_Name: Idle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1346574270 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1346574269} + 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: [] + m_Father: {fileID: 139575884} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1346574271 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1346574269} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 64fcd96337fe06b48a7da473de233ed7, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1833990615 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1833990616} + - component: {fileID: 1833990617} + m_Layer: 9 + m_Name: Hit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1833990616 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1833990615} + 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: [] + m_Father: {fileID: 139575884} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1833990617 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1833990615} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 64fcd96337fe06b48a7da473de233ed7, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &2105505489 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2105505490} + - component: {fileID: 2105505491} + m_Layer: 9 + m_Name: Moving + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2105505490 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2105505489} + 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: [] + m_Father: {fileID: 139575884} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2105505491 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2105505489} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 64fcd96337fe06b48a7da473de233ed7, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &449381425311164905 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6661563594765758090} + m_Layer: 9 + m_Name: Model + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6661563594765758090 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 449381425311164905} + 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: 1537675343940739017} + m_Father: {fileID: 1537802816993234539} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1531250509630459587 GameObject: m_ObjectHideFlags: 0 @@ -582,6 +833,8 @@ GameObject: - component: {fileID: 1963935554026983} - component: {fileID: 8860697156266351435} - component: {fileID: 478784418} + - component: {fileID: 5435084252436152422} + - component: {fileID: 1450437300} m_Layer: 9 m_Name: Slime m_TagString: Slime @@ -600,9 +853,10 @@ Transform: m_LocalPosition: {x: 0, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1537675343940739017} - {fileID: 1533826743992105241} - - {fileID: 8544065502898943263} + - {fileID: 139575884} + - {fileID: 8729308460022697609} + - {fileID: 6661563594765758090} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} @@ -748,6 +1002,64 @@ MonoBehaviour: m_EditorClassIdentifier: onSlimeColliderEnter: {fileID: 11400000, guid: 4f27798f9855ca943b97fde93e8a1d27, type: 2} +--- !u!114 &5435084252436152422 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1531394410883810673} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2ddc0d843b029bb449045e8243184f97, type: 3} + m_Name: + m_EditorClassIdentifier: + onThingAppear: {fileID: 11400000, guid: 08cea5bd86af3294baed5c8f7308ae0f, type: 2} + onThingDisappear: {fileID: 11400000, guid: 35a079d68f29c7d4f9b18d8f39634803, type: 2} +--- !u!114 &1450437300 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1531394410883810673} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: e5353b3c2a300ce458b25d1e62215e9c, + type: 3} + m_NotificationBehavior: 2 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.InputSystem.PlayerInput+DeviceLostEvent, Unity.InputSystem, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.InputSystem.PlayerInput+DeviceRegainedEvent, Unity.InputSystem, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_ActionEvents: + - m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.InputSystem.PlayerInput+ActionEvent, Unity.InputSystem, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_ActionId: 550962d9-e533-414f-aa32-f29e5dfa9019 + m_ActionName: VSGameplay/Horizontal[/Keyboard/a,/Keyboard/d,/XInputControllerWindows/leftStick/left,/XInputControllerWindows/leftStick/right] + - m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.InputSystem.PlayerInput+ActionEvent, Unity.InputSystem, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_ActionId: e4869e00-a1d9-457d-98b7-3520944918a3 + m_ActionName: VSGameplay/Vertical[/Keyboard/s,/Keyboard/w,/XInputControllerWindows/leftStick/down,/XInputControllerWindows/leftStick/up] + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: VSGameplay + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} --- !u!1 &1531415707048473787 GameObject: m_ObjectHideFlags: 0 @@ -872,7 +1184,7 @@ Transform: m_LocalScale: {x: 3, y: 1, z: 3} m_Children: [] m_Father: {fileID: 1537802816993234539} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1527788343211080261 MeshFilter: @@ -951,14 +1263,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1531792989181397923} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1533840626033177331} - {fileID: 1533635989313484873} - {fileID: 1533904405968247479} - m_Father: {fileID: 1537802816993234539} + m_Father: {fileID: 6661563594765758090} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &1446834639784680087 @@ -2901,6 +3213,37 @@ Transform: m_Father: {fileID: 1533838536480388787} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7084267140620327289 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8729308460022697609} + m_Layer: 9 + m_Name: Effects + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8729308460022697609 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7084267140620327289} + 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: 8544065502898943263} + m_Father: {fileID: 1537802816993234539} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8540263170632017633 GameObject: m_ObjectHideFlags: 0 @@ -2926,13 +3269,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8540263170632017633} - m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8542402127693143929} - m_Father: {fileID: 1537802816993234539} - m_RootOrder: 2 + m_Father: {fileID: 8729308460022697609} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!198 &8377438845730142059 ParticleSystem: @@ -3017,7 +3360,7 @@ ParticleSystem: startLifetime: serializedVersion: 2 minMaxState: 0 - scalar: 10 + scalar: 1 minScalar: 5 maxCurve: serializedVersion: 2 diff --git a/Assets/Samples/Input System/1.0.0-preview.4.meta b/Assets/Samples/Input System/1.0.0-preview.4.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 219d26b5d17af07468d2b2b46ee27726 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/Input System/1.0.0-preview.4/InputDeviceTester.meta b/Assets/Samples/Input System/1.0.0-preview.4/InputDeviceTester.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dedac5bd5f23bc3499880595b6ee6843 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Samples/Input System/1.0.0-preview.4/InputDeviceTester/.sample.json b/Assets/Samples/Input System/1.0.0-preview.4/InputDeviceTester/.sample.json @@ -0,0 +1,4 @@ +{ + "displayName": "InputDeviceTester", + "description": "A scene containing UI to visualize the controls on various supported input devices." +} diff --git a/Assets/Samples/Input System/1.0.0-preview.4/InputDeviceTester/.sample.json.meta b/Assets/Samples/Input System/1.0.0-preview.4/InputDeviceTester/.sample.json.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3d9c0d91f50349d29637153ddec7f1d9 +timeCreated: 1565354374+ \ No newline at end of file diff --git a/Assets/Samples/Input System/1.0.0-preview.4/InputDeviceTester/InputDeviceTester.asset b/Assets/Samples/Input System/1.0.0-preview.4/InputDeviceTester/InputDeviceTester.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9858d4c8055fd45539a2e86388f7c5ba, type: 3} + m_Name: InputDeviceTester + m_EditorClassIdentifier: + url: https://github.com/Unity-Technologies/InputSystem/releases/download/%VERSION%/InputDeviceTester-%VERSION%.unitypackage + packageDeps: + - com.unity.inputsystem diff --git a/Assets/Samples/Input System/1.0.0-preview.4/InputDeviceTester/InputDeviceTester.asset.meta b/Assets/Samples/Input System/1.0.0-preview.4/InputDeviceTester/InputDeviceTester.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5c4222eac5d064f888b070a9269a9150 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/Camera.meta b/Assets/Scripts/Slimecing/Camera.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b6a069add56bbbc4cacefb131ecfdad7 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/Camera/CameraControllerNew.cs b/Assets/Scripts/Slimecing/Camera/CameraControllerNew.cs @@ -0,0 +1,84 @@ +using System.Collections.Generic; +using UnityEngine; + +namespace Slimecing.Camera +{ + public class CameraControllerNew : MonoBehaviour { + + public float dampTime = 0.2f; + public float zoomLimit = 50f; + public float minZoom = 40f; + public float maxZoom = 10f; + + public float maxDistanceFromOtherPlayers = 70; + [HideInInspector] public List<Transform> visibleThings = new List<Transform>(); + //private List<Transform> unSeenPlayers = new List<Transform>(); + //private List<float> localDistances = new List<float>(); + + private UnityEngine.Camera _cCamera; + private Vector3 _cameraVelocity; + + private int _numberPlayers; + + public Vector3 offset; + private void Awake() + { + _cCamera = GetComponent<UnityEngine.Camera>(); + } + + private void FixedUpdate() + { + Vector3 centerPoint = GetCenterPoint(); + Vector3 desPos = centerPoint + offset; + transform.position = Vector3.SmoothDamp(transform.position, desPos, ref _cameraVelocity, dampTime); + + float theZoom = Mathf.Lerp(maxZoom, minZoom, FindSize() / zoomLimit); + _cCamera.fieldOfView = Mathf.Lerp(_cCamera.fieldOfView, theZoom, Time.deltaTime); + } + + private Vector3 GetCenterPoint() + { + switch (visibleThings.Count) + { + case 0: + return Vector3.zero; + case 1: + return visibleThings[0].position; + default: + return FindBoundsAndSetBounds().center; + } + } + + private float FindSize() + { + return FindBoundsAndSetBounds().size.x; + } + + private Bounds FindBoundsAndSetBounds() + { + if (visibleThings.Count == 0) + { + Bounds zeroBounds = new Bounds(Vector3.zero, Vector3.zero); + return zeroBounds; + + } + Bounds playerBounds = new Bounds(visibleThings[0].position, Vector3.zero); + foreach (var thing in visibleThings) + { + playerBounds.Encapsulate(thing.position); + } + return playerBounds; + } + + public void AddToCameraList(GameObject thing) + { + Debug.Log("added"); + visibleThings.Add(thing.transform); + } + public void RemoveFromCameraList(GameObject thing) + { + Debug.Log("removed"); + visibleThings.Remove(thing.transform); + } + } +} diff --git a/Assets/Scripts/Slimecing/MainScripts(old)/CameraController.cs.meta b/Assets/Scripts/Slimecing/Camera/CameraControllerNew.cs.meta diff --git a/Assets/Scripts/Slimecing/Characters/SlimeMovementController.cs b/Assets/Scripts/Slimecing/Characters/SlimeMovementController.cs @@ -21,7 +21,8 @@ namespace Slimecing.Character { if (!_rotatable.StoppedAngVel) { - _rotatable.StopAngularVelocity(); + //_rotatable.StopAngularVelocity(); + //Debug.Log("Stopping angular vel"); } } else diff --git a/Assets/Scripts/Slimecing/Dependency.meta b/Assets/Scripts/Slimecing/Dependency.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a3f68b680b247a14ca04f5040eb8023c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/Dependency/Timer.cs b/Assets/Scripts/Slimecing/Dependency/Timer.cs @@ -0,0 +1,62 @@ +using System; + +namespace Slimecing.Dependency +{ + public class Timer + { + public float RemainingSec { get; private set; } + public float TrueDuration { get; private set; } + public float RemainingLoop { get; private set; } + public bool LoopInf { get; private set; } + + public event Action OnTimerEnd; + + public Timer(float duration) + { + RemainingSec = duration; + } + + public Timer(float duration, float loopfor, bool li) + { + RemainingSec = duration; + TrueDuration = duration; + RemainingLoop = loopfor; + LoopInf = li; + } + + + public void Tick(float deltaTime) + { + if (RemainingSec == 0f) + { + return; + + } + + RemainingSec -= deltaTime; + + CheckForEnd(); + } + + private void CheckForEnd() + { + if (RemainingSec > 0f) + { + return; + } + + RemainingSec = 0f; + + if (RemainingLoop > 0) + { + RemainingSec = TrueDuration; + } + else if (LoopInf) + { + RemainingSec = TrueDuration; + } + + OnTimerEnd?.Invoke(); + } + } +}+ \ No newline at end of file diff --git a/Assets/Scripts/Slimecing/Dependency/Timer.cs.meta b/Assets/Scripts/Slimecing/Dependency/Timer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2a2319ddb1561004c92be706f4f3a813 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/InputSystem/SlimeControls.cs b/Assets/Scripts/Slimecing/InputSystem/SlimeControls.cs @@ -10,7 +10,7 @@ namespace Slimecing.InputSystem { public class @SlimeControls : IInputActionCollection, IDisposable { - private InputActionAsset asset; + public InputActionAsset asset { get; } public @SlimeControls() { asset = InputActionAsset.FromJson(@"{ diff --git a/Assets/Scripts/Slimecing/MainScripts(old)/CameraController.cs b/Assets/Scripts/Slimecing/MainScripts(old)/CameraController.cs @@ -1,52 +1,50 @@ -using System.Collections; -using System.Collections.Generic; +using System.Collections.Generic; using UnityEngine; - public class CameraController : MonoBehaviour { - public float dampTime = 0.2f; - public float zoomLimit = 50f; - public float minZoom = 40f; - public float maxZoom = 10f; + public float dampTime = 0.2f; + public float zoomLimit = 50f; + public float minZoom = 40f; + public float maxZoom = 10f; - [SerializeField] private bool newCamera; + [SerializeField] private bool newCamera; - public float maxDistanceFromOtherPlayers = 70; - /*[HideInInspector]*/ public List<Transform> players = new List<Transform>(); - //private List<Transform> unSeenPlayers = new List<Transform>(); - //private List<float> localDistances = new List<float>(); + public float maxDistanceFromOtherPlayers = 70; + [HideInInspector] public List<Transform> players = new List<Transform>(); + //private List<Transform> unSeenPlayers = new List<Transform>(); + //private List<float> localDistances = new List<float>(); - private Camera cCamera; - private Vector3 cameraVelocity; + private UnityEngine.Camera cCamera; + private Vector3 cameraVelocity; - SpawnManagerV2 spawnManager; + SpawnManagerV2 spawnManager; - //public bool CameraOn; + //public bool CameraOn; - private int numberPlayers; + private int numberPlayers; - public Vector3 offset; - private void Awake() - { - if (!newCamera) + public Vector3 offset; + private void Awake() { - Debug.Log("CameraStart!!!"); - spawnManager = GameObject.Find("SpawnManager").GetComponent<SpawnManagerV2>(); - numberPlayers = PublicStatHandler.GetInstance().amountOfPlayers; - } + if (!newCamera) + { + Debug.Log("CameraStart!!!"); + spawnManager = GameObject.Find("SpawnManager").GetComponent<SpawnManagerV2>(); + numberPlayers = PublicStatHandler.GetInstance().amountOfPlayers; + } - cCamera = GetComponentInChildren<Camera>(); + cCamera = GetComponentInChildren<UnityEngine.Camera>(); - for (int i = 0; i < numberPlayers; i++) - { - Debug.Log(spawnManager.spawnedPlayers[i].transform); - players.Add(spawnManager.spawnedPlayers[i].gameObject.transform); + for (int i = 0; i < numberPlayers; i++) + { + Debug.Log(spawnManager.spawnedPlayers[i].transform); + players.Add(spawnManager.spawnedPlayers[i].gameObject.transform); + } } - } - private void FixedUpdate() - { - /*foreach (Transform slimesTransform in players) + private void FixedUpdate() + { + /*foreach (Transform slimesTransform in players) { foreach (Transform slimesTransform2 in players) { @@ -67,50 +65,50 @@ public class CameraController : MonoBehaviour { } distances.Clear();*/ - Vector3 centerPoint = GetCenterPoint(); - Vector3 desPos = centerPoint + offset; - transform.position = Vector3.SmoothDamp(transform.position, desPos, ref cameraVelocity, dampTime); + Vector3 centerPoint = GetCenterPoint(); + Vector3 desPos = centerPoint + offset; + transform.position = Vector3.SmoothDamp(transform.position, desPos, ref cameraVelocity, dampTime); - float theZoom = Mathf.Lerp(maxZoom, minZoom, FindSize() / zoomLimit); - cCamera.fieldOfView = Mathf.Lerp(cCamera.fieldOfView, theZoom, Time.deltaTime); - } + float theZoom = Mathf.Lerp(maxZoom, minZoom, FindSize() / zoomLimit); + cCamera.fieldOfView = Mathf.Lerp(cCamera.fieldOfView, theZoom, Time.deltaTime); + } - private Vector3 GetCenterPoint() - { - switch (players.Count) + private Vector3 GetCenterPoint() { - case 0: - return Vector3.zero; - case 1: - return players[0].position; - default: - return FindBoundsAndSetBounds().center; + switch (players.Count) + { + case 0: + return Vector3.zero; + case 1: + return players[0].position; + default: + return FindBoundsAndSetBounds().center; + } } - } - private float FindSize() - { - return FindBoundsAndSetBounds().size.x; - } + private float FindSize() + { + return FindBoundsAndSetBounds().size.x; + } - private Bounds FindBoundsAndSetBounds() - { - if (players.Count == 0) + private Bounds FindBoundsAndSetBounds() { - Bounds zeroBounds = new Bounds(Vector3.zero, Vector3.zero); - return zeroBounds; + if (players.Count == 0) + { + Bounds zeroBounds = new Bounds(Vector3.zero, Vector3.zero); + return zeroBounds; + } + Bounds playerBounds = new Bounds(players[0].position, Vector3.zero); + foreach (var slimes in players) + { + playerBounds.Encapsulate(slimes.position); + } + return playerBounds; } - Bounds playerBounds = new Bounds(players[0].position, Vector3.zero); - foreach (var slimes in players) + + public void AddPlayerToPlayerToCameraList(GameObject player) { - playerBounds.Encapsulate(slimes.position); + players.Add(player.transform); } - return playerBounds; - } - - public void AddPlayerToPlayerToCameraList(GameObject player) - { - - } -} + }+ \ No newline at end of file diff --git a/Assets/Scripts/Slimecing/MainScripts(old)/CameraController.cs.meta b/Assets/Scripts/Slimecing/MainScripts(old)/CameraController.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: cca7ae2341115644498aa9f5d6ba049d +guid: c6e3a8209e5ecfe4abd0ac4c7459ff82 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/Slimecing/SOEventSystem/SOEvents/GameEvent_OnThingAppear.asset b/Assets/Scripts/Slimecing/SOEventSystem/SOEvents/GameEvent_OnThingAppear.asset @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 00209251ddb44e60b1e5818f1a1681f2, type: 3} + m_Name: GameEvent_OnThingAppear + m_EditorClassIdentifier: diff --git a/Assets/Scripts/Slimecing/SOEventSystem/SOEvents/GameEvent_OnThingAppear.asset.meta b/Assets/Scripts/Slimecing/SOEventSystem/SOEvents/GameEvent_OnThingAppear.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 08cea5bd86af3294baed5c8f7308ae0f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/SOEventSystem/SOEvents/GameEvent_OnThingDisappear.asset b/Assets/Scripts/Slimecing/SOEventSystem/SOEvents/GameEvent_OnThingDisappear.asset @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 00209251ddb44e60b1e5818f1a1681f2, type: 3} + m_Name: GameEvent_OnThingDisappear + m_EditorClassIdentifier: diff --git a/Assets/Scripts/Slimecing/SOEventSystem/SOEvents/GameEvent_OnThingDisappear.asset.meta b/Assets/Scripts/Slimecing/SOEventSystem/SOEvents/GameEvent_OnThingDisappear.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 35a079d68f29c7d4f9b18d8f39634803 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/SimpleComponents/Movement/RbRotatable.cs b/Assets/Scripts/Slimecing/SimpleComponents/Movement/RbRotatable.cs @@ -44,7 +44,8 @@ namespace Slimecing.SimpleComponents.Movement Quaternion deltaRotation = Quaternion.Inverse(transform.rotation) * targetRotation; Vector3 deltaAngles = GetRelativeAngles(deltaRotation.eulerAngles); Vector3 spaceDeltaAngles = transform.TransformDirection(deltaAngles); - rb.AddTorque(rotSpeed * spaceDeltaAngles - alignmentDamping * rb.angularVelocity); + Vector3 rotationVelocity = spaceDeltaAngles * rotSpeed * Time.deltaTime; + rb.AddTorque(rotationVelocity - rb.angularVelocity, ForceMode.Impulse); } private Vector3 GetRelativeAngles(Vector3 angles) diff --git a/Assets/Scripts/Slimecing/SimpleComponents/TimerBehaviour.cs b/Assets/Scripts/Slimecing/SimpleComponents/TimerBehaviour.cs @@ -0,0 +1,46 @@ +using System; +using Slimecing.Dependency; +using UnityEngine; +using UnityEngine.Events; + +namespace Slimecing.SimpleComponents +{ + public class TimerBehaviour : MonoBehaviour + { + [SerializeField] private float durationOfTick = 1f; + [SerializeField] private float loopFor = 0f; + [SerializeField] private bool loopInfinite = false; + [SerializeField] private UnityEvent onTimerEnd = null; + + private Timer _timer; + + private Timer Timer + { + get + { + if (_timer != null) + { + return _timer; + } + _timer = new Timer(durationOfTick, loopFor, loopInfinite); + return _timer; + } + } + + private void Start() + { + Timer.OnTimerEnd += WhenTimerEnd; + } + + private void Update() + { + Timer.Tick(Time.deltaTime); + } + + private void WhenTimerEnd() + { + onTimerEnd.Invoke(); + } + + } +} diff --git a/Assets/Scripts/Slimecing/SimpleComponents/TimerBehaviour.cs.meta b/Assets/Scripts/Slimecing/SimpleComponents/TimerBehaviour.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b311a64b2a5334e44a3c37626adeb013 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/SimpleComponents/Visible.cs b/Assets/Scripts/Slimecing/SimpleComponents/Visible.cs @@ -0,0 +1,28 @@ +using System.Collections; +using Slimecing.SOEventSystem.Events; +using UnityEngine; + +namespace Slimecing.SimpleComponents +{ + public class Visible : MonoBehaviour + { + [SerializeField] private GameObjectEvent onThingAppear; + [SerializeField] private GameObjectEvent onThingDisappear; + + private void OnEnable() + { + Debug.Log("gamer"); + StartCoroutine(ShowObject()); + } + + private IEnumerator ShowObject() { + yield return new WaitForSeconds(0.05f); + onThingAppear.Raise(gameObject); + } + private void OnDisable() + { + Debug.Log("ungamer"); + onThingDisappear.Raise(gameObject); + } + } +} diff --git a/Assets/Scripts/Slimecing/SimpleComponents/Visible.cs.meta b/Assets/Scripts/Slimecing/SimpleComponents/Visible.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2ddc0d843b029bb449045e8243184f97 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/StateMachine.meta b/Assets/Scripts/Slimecing/StateMachine.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 90b92d43e210e654591d20cfa842238e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/StateMachine/IState.cs b/Assets/Scripts/Slimecing/StateMachine/IState.cs @@ -0,0 +1,9 @@ +namespace Slimecing.StateMachine +{ + public interface IState + { + IState CheckTransition(); + void Enter(); + void Exit(); + } +} diff --git a/Assets/Scripts/Slimecing/StateMachine/IState.cs.meta b/Assets/Scripts/Slimecing/StateMachine/IState.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ad0453d7a887c8f4fa559fa0c60922b7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/StateMachine/State.cs b/Assets/Scripts/Slimecing/StateMachine/State.cs @@ -0,0 +1,27 @@ +using System.Collections.Generic; +using UnityEngine; + +namespace Slimecing.StateMachine +{ + public class State : MonoBehaviour, IState + { + [SerializeField] private List<StateChanger> changes = new List<StateChanger>(); + + public IState CheckTransition() + { + foreach (var change in changes) + { + if (change.ShouldChange()) + { + return change.NextState; + } + } + + return null; + } + + public void Enter() => gameObject.SetActive(true); + + public void Exit() => gameObject.SetActive(false); + } +} diff --git a/Assets/Scripts/Slimecing/StateMachine/State.cs.meta b/Assets/Scripts/Slimecing/StateMachine/State.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 64fcd96337fe06b48a7da473de233ed7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/StateMachine/StateChanger.cs b/Assets/Scripts/Slimecing/StateMachine/StateChanger.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using UnityEngine; + +namespace Slimecing.StateMachine +{ + public class StateChanger + { + [SerializeField] private State nextState = null; + [SerializeField] private List<StateChangerCondition> conditions = new List<StateChangerCondition>(); + + public State NextState => nextState; + + public bool ShouldChange() + { + foreach (var condition in conditions) + { + if (!condition.IsMet()) + { + return false; + } + } + + return true; + } + } +} diff --git a/Assets/Scripts/Slimecing/StateMachine/StateChanger.cs.meta b/Assets/Scripts/Slimecing/StateMachine/StateChanger.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5fff3ad19b64f524781c5aa0f730c7f6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/StateMachine/StateChangerCondition.cs b/Assets/Scripts/Slimecing/StateMachine/StateChangerCondition.cs @@ -0,0 +1,8 @@ +using UnityEngine; +namespace Slimecing.StateMachine +{ + public abstract class StateChangerCondition : MonoBehaviour + { + public abstract bool IsMet(); + } +} diff --git a/Assets/Scripts/Slimecing/StateMachine/StateChangerCondition.cs.meta b/Assets/Scripts/Slimecing/StateMachine/StateChangerCondition.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6b72a12553755d7439e647ec0ca1c448 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/StateMachine/StateMachine.cs b/Assets/Scripts/Slimecing/StateMachine/StateMachine.cs @@ -0,0 +1,28 @@ +namespace Slimecing.StateMachine +{ + public class StateMachine + { + public StateMachine(IState startingState) => ChangeState(startingState); + + public IState CurrState { get; private set; } + + public void ChangeState(IState state) + { + CurrState?.Exit(); + + CurrState = state; + + CurrState?.Enter(); + } + + public void Tick() + { + IState nextState = CurrState.CheckTransition(); + + if (nextState != null) + { + ChangeState(nextState); + } + } + } +} diff --git a/Assets/Scripts/Slimecing/StateMachine/StateMachine.cs.meta b/Assets/Scripts/Slimecing/StateMachine/StateMachine.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c28f8db1dd3d3c3419e2fdaa831ff6b2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/StateMachine/StateMachineComponent.cs b/Assets/Scripts/Slimecing/StateMachine/StateMachineComponent.cs @@ -0,0 +1,29 @@ +using UnityEngine; + +namespace Slimecing.StateMachine +{ + public class StateMachineComponent : MonoBehaviour + { + [SerializeField] private State startingState = null; + + private StateMachine _stateMachine; + + public StateMachine StateMachine + { + get + { + if (_stateMachine != null) + { + return _stateMachine; + } + + _stateMachine = new StateMachine(startingState); + return _stateMachine; + } + } + + private void Update() => StateMachine.Tick(); + + public void ChangeState(State state) => StateMachine.ChangeState(state); + } +} diff --git a/Assets/Scripts/Slimecing/StateMachine/StateMachineComponent.cs.meta b/Assets/Scripts/Slimecing/StateMachine/StateMachineComponent.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8ae4a744704e0d44d85b6eaf97077aaa +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Scenes/TestScene.unity b/Assets/_Scenes/TestScene.unity @@ -138,7 +138,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &28711378 MonoBehaviour: m_ObjectHideFlags: 0 @@ -192,7 +192,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &28711381 MonoBehaviour: @@ -223,6 +223,104 @@ MonoBehaviour: m_CallState: 0 m_TypeName: Slimecing.SOEventSystem.UnityEvents.UnityCollisionEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1001 &165370663 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1531394410883810673, guid: e4b1cb76851c2d54eaa71187b01811dd, + type: 3} + propertyPath: m_Name + value: Slime (1) + objectReference: {fileID: 0} + - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.9 + objectReference: {fileID: 0} + - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, + type: 3} + propertyPath: m_LocalPosition.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1079583451375536456, guid: e4b1cb76851c2d54eaa71187b01811dd, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1450437300, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} + propertyPath: m_Camera + value: + objectReference: {fileID: 619456896} + - target: {fileID: 1551138524290547143, guid: e4b1cb76851c2d54eaa71187b01811dd, + type: 3} + propertyPath: m_Interpolate + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4936583700566548586, guid: e4b1cb76851c2d54eaa71187b01811dd, + type: 3} + propertyPath: rotSpeed + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 4936583700566548586, guid: e4b1cb76851c2d54eaa71187b01811dd, + type: 3} + propertyPath: alignmentDamping + value: 0.2 + objectReference: {fileID: 0} + - target: {fileID: 4936583700566548586, guid: e4b1cb76851c2d54eaa71187b01811dd, + type: 3} + propertyPath: maxAngularVelocity + value: 14 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} --- !u!1 &364079739 GameObject: m_ObjectHideFlags: 0 @@ -346,7 +444,7 @@ Transform: m_LocalScale: {x: 10, y: 10, z: 10} m_Children: [] m_Father: {fileID: 697181799} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &472638077 BoxCollider: @@ -438,7 +536,7 @@ Transform: m_LocalScale: {x: 70, y: 0.5, z: 79.674} m_Children: [] m_Father: {fileID: 697181799} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 90, y: 180, z: 0} --- !u!65 &479781849 BoxCollider: @@ -589,8 +687,90 @@ Transform: m_LocalScale: {x: 9.0905, y: 0.3, z: 25} m_Children: [] m_Father: {fileID: 697181799} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: -24.590002, y: 0, z: 0} +--- !u!1 &619456891 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1915431236944600, guid: 527f194984da0eb4082c0dca4748d5aa, + type: 3} + m_PrefabInstance: {fileID: 2051942237} + m_PrefabAsset: {fileID: 0} +--- !u!114 &619456892 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 114368316905943310, guid: 527f194984da0eb4082c0dca4748d5aa, + type: 3} + m_PrefabInstance: {fileID: 2051942237} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 619456891} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cca7ae2341115644498aa9f5d6ba049d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &619456893 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 619456891} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f7862acd69d43259782a7a9472c703f, type: 3} + m_Name: + m_EditorClassIdentifier: + gameEvent: {fileID: 11400000, guid: 08cea5bd86af3294baed5c8f7308ae0f, type: 2} + unityEventResponse: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 619456892} + m_MethodName: AddToCameraList + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: Slimecing.SOEventSystem.UnityEvents.UnityGameObjectEvent, Assembly-CSharp, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!114 &619456894 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 619456891} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f7862acd69d43259782a7a9472c703f, type: 3} + m_Name: + m_EditorClassIdentifier: + gameEvent: {fileID: 11400000, guid: 35a079d68f29c7d4f9b18d8f39634803, type: 2} + unityEventResponse: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 619456892} + m_MethodName: RemoveFromCameraList + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: Slimecing.SOEventSystem.UnityEvents.UnityGameObjectEvent, Assembly-CSharp, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!20 &619456896 stripped +Camera: + m_CorrespondingSourceObject: {fileID: 20959982129881372, guid: 527f194984da0eb4082c0dca4748d5aa, + type: 3} + m_PrefabInstance: {fileID: 2051942237} + m_PrefabAsset: {fileID: 0} --- !u!1 &621633812 GameObject: m_ObjectHideFlags: 0 @@ -772,7 +952,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &697181798 GameObject: @@ -804,17 +984,17 @@ Transform: - {fileID: 621633816} - {fileID: 1313295119} - {fileID: 364079740} - - {fileID: 733502430} - {fileID: 1633152653} - {fileID: 472638076} - {fileID: 613119397} - {fileID: 1420198634} - {fileID: 479781848} + - {fileID: 733502430} - {fileID: 1387618670} - {fileID: 1320625961} - {fileID: 1285390735} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &733502429 GameObject: @@ -847,7 +1027,7 @@ Transform: m_LocalScale: {x: 2.5, y: 2.5, z: 2.5} m_Children: [] m_Father: {fileID: 697181799} - m_RootOrder: 3 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &733502431 BoxCollider: @@ -1007,6 +1187,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 697181799} m_Modifications: + - target: {fileID: 4917678568368033409, guid: 9f43c038616794d4499e7810e8b5a1cf, + type: 3} + propertyPath: m_Name + value: LevelBounds + objectReference: {fileID: 0} + - target: {fileID: 4917678568368033409, guid: 9f43c038616794d4499e7810e8b5a1cf, + type: 3} + propertyPath: m_TagString + value: LevelBounds + objectReference: {fileID: 0} - target: {fileID: 7980371264099518278, guid: 9f43c038616794d4499e7810e8b5a1cf, type: 3} propertyPath: m_LocalPosition.x @@ -1062,16 +1252,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4917678568368033409, guid: 9f43c038616794d4499e7810e8b5a1cf, - type: 3} - propertyPath: m_Name - value: LevelBounds - objectReference: {fileID: 0} - - target: {fileID: 4917678568368033409, guid: 9f43c038616794d4499e7810e8b5a1cf, - type: 3} - propertyPath: m_TagString - value: LevelBounds - objectReference: {fileID: 0} - target: {fileID: 4085933206505632715, guid: 9f43c038616794d4499e7810e8b5a1cf, type: 3} propertyPath: m_Size.y @@ -1362,7 +1542,7 @@ Transform: m_LocalScale: {x: 49.953644, y: 98.01205, z: 61.4} m_Children: [] m_Father: {fileID: 697181799} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1420198635 BoxCollider: @@ -1423,43 +1603,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1420198633} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1450437290 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1531394410883810673, guid: e4b1cb76851c2d54eaa71187b01811dd, - type: 3} - m_PrefabInstance: {fileID: 1533019557234522260} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1450437300 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1450437290} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Actions: {fileID: 0} - m_NotificationBehavior: 0 - m_UIInputModule: {fileID: 0} - m_DeviceLostEvent: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.InputSystem.PlayerInput+DeviceLostEvent, Unity.InputSystem, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_DeviceRegainedEvent: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.InputSystem.PlayerInput+DeviceRegainedEvent, Unity.InputSystem, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_ActionEvents: [] - m_NeverAutoSwitchControlSchemes: 0 - m_DefaultControlScheme: - m_DefaultActionMap: - m_SplitScreenIndex: -1 - m_Camera: {fileID: 0} --- !u!1 &1633152652 GameObject: m_ObjectHideFlags: 0 @@ -1491,7 +1634,7 @@ Transform: m_LocalScale: {x: 2, y: 8, z: 2} m_Children: [] m_Father: {fileID: 697181799} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &1633152654 BoxCollider: @@ -1592,7 +1735,7 @@ MonoBehaviour: m_MethodName: Raise m_Mode: 2 m_Arguments: - m_ObjectArgument: {fileID: 1450437290} + m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 @@ -1628,7 +1771,7 @@ MonoBehaviour: m_Interactions: m_SingletonActionBindings: [] m_Reference: {fileID: 0} - m_PlayerPrefab: {fileID: 1450437290} + m_PlayerPrefab: {fileID: 0} m_SplitScreen: 0 m_MaintainAspectRatioInSplitScreen: 0 m_FixedNumberOfSplitScreens: -1 @@ -1650,7 +1793,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2051942237 PrefabInstance: @@ -1663,6 +1806,11 @@ PrefabInstance: propertyPath: m_Name value: Camera objectReference: {fileID: 0} + - target: {fileID: 114368316905943310, guid: 527f194984da0eb4082c0dca4748d5aa, + type: 3} + propertyPath: players.Array.data[0] + value: + objectReference: {fileID: 0} - target: {fileID: 4234973402822312, guid: 527f194984da0eb4082c0dca4748d5aa, type: 3} propertyPath: m_LocalPosition.x value: 5.34 @@ -1693,7 +1841,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4234973402822312, guid: 527f194984da0eb4082c0dca4748d5aa, type: 3} propertyPath: m_RootOrder - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4234973402822312, guid: 527f194984da0eb4082c0dca4748d5aa, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1707,95 +1855,5 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 114368316905943310, guid: 527f194984da0eb4082c0dca4748d5aa, - type: 3} - propertyPath: newCamera - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 114368316905943310, guid: 527f194984da0eb4082c0dca4748d5aa, - type: 3} - propertyPath: maxZoom - value: 15 - objectReference: {fileID: 0} - - target: {fileID: 114368316905943310, guid: 527f194984da0eb4082c0dca4748d5aa, - type: 3} - propertyPath: players.Array.data[0] - value: - objectReference: {fileID: 4853972586903295} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 527f194984da0eb4082c0dca4748d5aa, type: 3} ---- !u!4 &4853972586903295 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, - type: 3} - m_PrefabInstance: {fileID: 1533019557234522260} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1533019557234522260 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1531394410883810673, guid: e4b1cb76851c2d54eaa71187b01811dd, - type: 3} - propertyPath: m_Name - value: Slime - objectReference: {fileID: 0} - - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.9 - objectReference: {fileID: 0} - - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, - type: 3} - propertyPath: m_LocalPosition.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 1537802816993234539, guid: e4b1cb76851c2d54eaa71187b01811dd, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e4b1cb76851c2d54eaa71187b01811dd, type: 3} diff --git a/Packages/manifest.json b/Packages/manifest.json @@ -4,14 +4,15 @@ "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", "com.unity.ads": "2.0.8", - "com.unity.analytics": "3.3.2", + "com.unity.analytics": "3.3.4", "com.unity.collab-proxy": "1.2.16", "com.unity.entities": "0.1.1-preview", "com.unity.ext.nunit": "1.0.0", "com.unity.ide.rider": "1.1.4", "com.unity.ide.vscode": "1.1.3", - "com.unity.inputsystem": "1.0.0-preview.3", + "com.unity.inputsystem": "1.0.0-preview.4", "com.unity.multiplayer-hlapi": "1.0.4", + "com.unity.package-manager-ui": "2.2.0", "com.unity.purchasing": "2.0.6", "com.unity.test-framework": "1.1.8", "com.unity.textmeshpro": "2.0.1", diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset @@ -23,4 +23,6 @@ EditorBuildSettings: - enabled: 0 path: Assets/_Scenes/Island Rock.unity guid: 6e6f37bdf8daaad44b018f096e8551dd - m_configObjects: {} + m_configObjects: + com.unity.input.settings: {fileID: 11400000, guid: ce1ba5e1a303b424ab184a808a473b43, + type: 2}