From 1c2392e20b91076d0bc7216cb6048877568b170c Mon Sep 17 00:00:00 2001 From: MindfulMinun Date: Fri, 25 Feb 2022 22:25:25 -0600 Subject: [PATCH] Watersprit, car, lol --- Assets/Art Final/Car.anim | 71 ++++++++ Assets/Art Final/Car.anim.meta | 8 + Assets/Art Final/Car.controller | 72 ++++++++ Assets/Art Final/Car.controller.meta | 8 + Assets/Art Final/Water Spirit.controller | 72 ++++++++ Assets/Art Final/Water Spirit.controller.meta | 8 + Assets/Art Final/car_spritesheet.png | Bin 0 -> 489 bytes Assets/Art Final/car_spritesheet.png.meta | 168 ++++++++++++++++++ Assets/Art Final/waterspirit.anim | 74 ++++++++ Assets/Art Final/waterspirit.anim.meta | 8 + Assets/Prefabs/Water Spirit.prefab | 20 +++ Assets/Scenes/Aquaphobia.unity | 6 +- Assets/Scenes/Benji's Scene.unity | 102 +++++++++++ Assets/WaterSpirit.cs | 2 +- README.md | 4 + UserSettings/EditorUserSettings.asset | 34 ++-- 16 files changed, 636 insertions(+), 21 deletions(-) create mode 100644 Assets/Art Final/Car.anim create mode 100644 Assets/Art Final/Car.anim.meta create mode 100644 Assets/Art Final/Car.controller create mode 100644 Assets/Art Final/Car.controller.meta create mode 100644 Assets/Art Final/Water Spirit.controller create mode 100644 Assets/Art Final/Water Spirit.controller.meta create mode 100644 Assets/Art Final/car_spritesheet.png create mode 100644 Assets/Art Final/car_spritesheet.png.meta create mode 100644 Assets/Art Final/waterspirit.anim create mode 100644 Assets/Art Final/waterspirit.anim.meta diff --git a/Assets/Art Final/Car.anim b/Assets/Art Final/Car.anim new file mode 100644 index 0000000..ed37e8a --- /dev/null +++ b/Assets/Art Final/Car.anim @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Car + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 5495412397436416559, guid: 0cdc3abdc6f7a4e579f51f79d3231808, type: 3} + - time: 0.25 + value: {fileID: -4645061532104564255, guid: 0cdc3abdc6f7a4e579f51f79d3231808, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 4 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 5495412397436416559, guid: 0cdc3abdc6f7a4e579f51f79d3231808, type: 3} + - {fileID: -4645061532104564255, guid: 0cdc3abdc6f7a4e579f51f79d3231808, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5 + 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: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Art Final/Car.anim.meta b/Assets/Art Final/Car.anim.meta new file mode 100644 index 0000000..15d4d6d --- /dev/null +++ b/Assets/Art Final/Car.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 586f5da3f53d6469b8b92dbcd41cfb28 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Final/Car.controller b/Assets/Art Final/Car.controller new file mode 100644 index 0000000..a4b7613 --- /dev/null +++ b/Assets/Art Final/Car.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-5225457057890153107 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Car + 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_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 586f5da3f53d6469b8b92dbcd41cfb28, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-4513366823372732669 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -5225457057890153107} + 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: -5225457057890153107} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Car + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -4513366823372732669} + 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} diff --git a/Assets/Art Final/Car.controller.meta b/Assets/Art Final/Car.controller.meta new file mode 100644 index 0000000..eb4e8fd --- /dev/null +++ b/Assets/Art Final/Car.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0d281a10890e2440ab11c3805ec9165d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Final/Water Spirit.controller b/Assets/Art Final/Water Spirit.controller new file mode 100644 index 0000000..3be77c9 --- /dev/null +++ b/Assets/Art Final/Water Spirit.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-2283212914982673866 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: waterspirit + 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_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 514fb66a291a34aa89f1e05620ed60f1, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-1031630787971129816 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -2283212914982673866} + m_Position: {x: 230, y: 60, 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: -2283212914982673866} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Water Spirit + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -1031630787971129816} + 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} diff --git a/Assets/Art Final/Water Spirit.controller.meta b/Assets/Art Final/Water Spirit.controller.meta new file mode 100644 index 0000000..248aac9 --- /dev/null +++ b/Assets/Art Final/Water Spirit.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 197e268fede3445aa82b6a75189c71d2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Final/car_spritesheet.png b/Assets/Art Final/car_spritesheet.png new file mode 100644 index 0000000000000000000000000000000000000000..3c94847e8e274ee03dd4ad2771888fabe6ed32ce GIT binary patch literal 489 zcmVPx$qDe$SR9HvtmOo1aK@i0!g^h?}Wf?&sR$?P|>9n)7vr*8}#x|v2KwH5t;5X1N zRm8$S)ddtxDF~v7jfL_KCd}>4Ugpj_BgameyqnqId%L&Spqf;pCL9z%{#%kEk&sA5 z4uq{$k+Fr_hC~WmSJ8u}L=IZ5Z|nS%e&5v7+Rv)X9LfNlr5S5KI*Q(?2+VKI@`9l8 zaTLV>y~jIRINTq?Ts?o8!8Ut0e`3~15I}IfZ10!=E?+-QsT4J9ZEhl!d;&zqE7Qme z;?nw3VUQwbxif|!Xe!S_p6#Q>?Ne3Pc`yDE%D14uZ=AZ3~*-A$Yk`3E3S06_u9 zEuTiaM>G%^@v+>dho=Fpybru)X&O9>;#uC;@9x%Ke4Aqks(XEr(poeU-o5m&Ksf_2 zZuvCscF(-5uuy<#5IoSLQ4bgqwO2P{vpDs$^V8INEE@C}%Xg6k!$JX~L9ouE89RtC ft-Qb22IL3F$r*c@)%-#L0000(); boxCollider = this.GetComponent(); - sizeOffset = Random.Range(2f, 10f); + sizeOffset = Random.Range(2f, 3f); player = GameObject.FindWithTag("Player").transform; if (player == null) { Debug.Log("Player not found! Make sure Seiden's Char Movement has a tag of Player!"); diff --git a/README.md b/README.md index fa32a6c..12e3ddd 100644 --- a/README.md +++ b/README.md @@ -37,3 +37,7 @@ 3: Bird red fly 4: Bird blue fly ``` + +## CatGhost + +`animator.SetBool("Shy?", true/false);` diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index d0f0e1d..8ab0e9c 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,35 +6,35 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedScenePath-0: - value: 22424703114646680e0b0227036c7c0219001c396c1c23233967083debf42d - flags: 0 - RecentlyUsedScenePath-1: - value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe - flags: 0 - RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe - flags: 0 - RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c7e1304180822232a2f31633c133af6f9 - flags: 0 - RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367f6d7717e1351027 flags: 0 - RecentlyUsedScenePath-5: + RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367129370bfb25 flags: 0 - RecentlyUsedScenePath-6: + RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367129370bfb25 flags: 0 - RecentlyUsedScenePath-7: + RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c78111b1258192f2d28353e663536ebe73c2cf1a71aecf13f33722c0ce6281d flags: 0 - RecentlyUsedScenePath-8: + RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820 flags: 0 - RecentlyUsedScenePath-9: + RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036c7c0219001c396c1c23233967083debf42d flags: 0 + RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036c6f1c17031e253e256624283a097df7ee3d2cfb + flags: 0 + RecentlyUsedScenePath-7: + value: 22424703114646680e0b0227036c71091503173a242724392c67083debf42d + flags: 0 + RecentlyUsedScenePath-8: + value: 22424703114646680e0b0227036c7e0103160822232a2f31633c133af6f9 + flags: 0 + RecentlyUsedScenePath-9: + value: 22424703114646680e0b0227036c7d15181d116d3f6815332827187df7ee3d2cfb + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0