From 23cc872b334310d1a78ed432306827637410f8a6 Mon Sep 17 00:00:00 2001 From: liskiran Date: Tue, 19 Apr 2022 23:11:33 +0700 Subject: [PATCH] added cool things --- Assets/Music.meta | 8 ++ ... 'Hydrogen' [Hotline Miami Soundtrack].mp3 | 3 + ...rogen' [Hotline Miami Soundtrack].mp3.meta | 22 +++ Assets/Scenes/dont touch me plz.unity | 134 +++++++++++++++++- Assets/Scripts/Character/DumbAI.cs | 3 +- Assets/Scripts/Character/NPC.cs | 2 +- Assets/Scripts/Character/Player.cs | 2 +- ProjectSettings/ProjectVersion.txt | 4 +- 8 files changed, 170 insertions(+), 8 deletions(-) create mode 100644 Assets/Music.meta create mode 100644 Assets/Music/M.O.O.N. - 'Hydrogen' [Hotline Miami Soundtrack].mp3 create mode 100644 Assets/Music/M.O.O.N. - 'Hydrogen' [Hotline Miami Soundtrack].mp3.meta diff --git a/Assets/Music.meta b/Assets/Music.meta new file mode 100644 index 0000000..23444b8 --- /dev/null +++ b/Assets/Music.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 41616e5e9f8971942beeb4b8359de549 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Music/M.O.O.N. - 'Hydrogen' [Hotline Miami Soundtrack].mp3 b/Assets/Music/M.O.O.N. - 'Hydrogen' [Hotline Miami Soundtrack].mp3 new file mode 100644 index 0000000..53a5439 --- /dev/null +++ b/Assets/Music/M.O.O.N. - 'Hydrogen' [Hotline Miami Soundtrack].mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0d01dc0f91914b87015604a9560d31bf07dc26dca9e09499795cd36f8495991d +size 4646348 diff --git a/Assets/Music/M.O.O.N. - 'Hydrogen' [Hotline Miami Soundtrack].mp3.meta b/Assets/Music/M.O.O.N. - 'Hydrogen' [Hotline Miami Soundtrack].mp3.meta new file mode 100644 index 0000000..8b36904 --- /dev/null +++ b/Assets/Music/M.O.O.N. - 'Hydrogen' [Hotline Miami Soundtrack].mp3.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 71cf23b79e7bce345b6a7506bd528f49 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/dont touch me plz.unity b/Assets/Scenes/dont touch me plz.unity index 14fd80f..c8189ae 100755 --- a/Assets/Scenes/dont touch me plz.unity +++ b/Assets/Scenes/dont touch me plz.unity @@ -456,15 +456,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400004, guid: d8c41be67f41aa545ae053b0b927f821, type: 3} propertyPath: m_LocalPosition.x - value: 14.244844 + value: 14.604 objectReference: {fileID: 0} - target: {fileID: 400004, guid: d8c41be67f41aa545ae053b0b927f821, type: 3} propertyPath: m_LocalPosition.y - value: 4.470229 + value: 6.56 objectReference: {fileID: 0} - target: {fileID: 400004, guid: d8c41be67f41aa545ae053b0b927f821, type: 3} propertyPath: m_LocalPosition.z - value: 6.848301 + value: 6.8067 objectReference: {fileID: 0} - target: {fileID: 400004, guid: d8c41be67f41aa545ae053b0b927f821, type: 3} propertyPath: m_LocalRotation.w @@ -510,6 +510,134 @@ Transform: type: 3} m_PrefabInstance: {fileID: 697796853} m_PrefabAsset: {fileID: 0} +--- !u!1 &1002225300 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1002225302} + - component: {fileID: 1002225301} + m_Layer: 0 + m_Name: Audio Source + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!82 &1002225301 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1002225300} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 24300001, guid: cc0bf72c5763743468b1ee3d764d3d04, + type: 2} + m_audioClip: {fileID: 8300000, guid: 71cf23b79e7bce345b6a7506bd528f49, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!4 &1002225302 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1002225300} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 30.060135, y: 11.700175, z: 40.315193} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1260474436 stripped Transform: m_CorrespondingSourceObject: {fileID: 8510909888689775087, guid: 80f6c1c85e5daed4c96c70205ed5503d, diff --git a/Assets/Scripts/Character/DumbAI.cs b/Assets/Scripts/Character/DumbAI.cs index 9cb6fd3..540a676 100644 --- a/Assets/Scripts/Character/DumbAI.cs +++ b/Assets/Scripts/Character/DumbAI.cs @@ -4,10 +4,11 @@ using UnityEngine; public class DumbAI : MonoBehaviour { + public Transform feetTransform; // Start is called before the first frame update void Start() { - + var current_position = feetTransform.transform.position; } // Update is called once per frame diff --git a/Assets/Scripts/Character/NPC.cs b/Assets/Scripts/Character/NPC.cs index 6ff8f6d..2bd6e81 100644 --- a/Assets/Scripts/Character/NPC.cs +++ b/Assets/Scripts/Character/NPC.cs @@ -41,7 +41,7 @@ public class NPC : Agent, ICharacter moveController = gameObject.GetComponent(); bufferSensor = gameObject.GetComponent(); - GameManager.OnResetScene += AgentCharacter.ResetCharacter; + //GameManager.OnResetScene += AgentCharacter.ResetCharacter; } public override void OnEpisodeBegin() diff --git a/Assets/Scripts/Character/Player.cs b/Assets/Scripts/Character/Player.cs index 53ddb64..d7c3df2 100644 --- a/Assets/Scripts/Character/Player.cs +++ b/Assets/Scripts/Character/Player.cs @@ -13,7 +13,7 @@ public class Player : MonoBehaviour, ICharacter { PlayerCharacter = new Character(); Condition = PlayerCharacter.Condition; - GameManager.OnResetScene += PlayerCharacter.ResetCharacter; + //ameManager.OnResetScene += PlayerCharacter.ResetCharacter; } public event Action OnKilledEvent; diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index bf8f7eb..89a11d7 100755 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2019.4.36f1 -m_EditorVersionWithRevision: 2019.4.36f1 (660c164b2fc5) +m_EditorVersion: 2019.4.35f1 +m_EditorVersionWithRevision: 2019.4.35f1 (0462406dff2e)