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 0000000..3c94847 Binary files /dev/null and b/Assets/Art Final/car_spritesheet.png differ diff --git a/Assets/Art Final/car_spritesheet.png.meta b/Assets/Art Final/car_spritesheet.png.meta new file mode 100644 index 0000000..4448188 --- /dev/null +++ b/Assets/Art Final/car_spritesheet.png.meta @@ -0,0 +1,168 @@ +fileFormatVersion: 2 +guid: 0cdc3abdc6f7a4e579f51f79d3231808 +TextureImporter: + internalIDToNameTable: + - first: + 213: 5495412397436416559 + second: car_spritesheet_0 + - first: + 213: -4645061532104564255 + second: car_spritesheet_1 + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: car_spritesheet_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 25 + height: 26 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: f22b973a570a34c40800000000000000 + internalID: 5495412397436416559 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: car_spritesheet_1 + rect: + serializedVersion: 2 + x: 25 + y: 0 + width: 25 + height: 26 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 1e1631ba52d698fb0800000000000000 + internalID: -4645061532104564255 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Final/waterspirit.anim b/Assets/Art Final/waterspirit.anim new file mode 100644 index 0000000..f47ea00 --- /dev/null +++ b/Assets/Art Final/waterspirit.anim @@ -0,0 +1,74 @@ +%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: waterspirit + 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: -5029764186598712489, guid: 1a0db7ae73c9e43ac856b25d6ad47dbc, type: 3} + - time: 0.25 + value: {fileID: -3022340133225536526, guid: 1a0db7ae73c9e43ac856b25d6ad47dbc, type: 3} + - time: 0.5 + value: {fileID: -2944302567237882039, guid: 1a0db7ae73c9e43ac856b25d6ad47dbc, 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: -5029764186598712489, guid: 1a0db7ae73c9e43ac856b25d6ad47dbc, type: 3} + - {fileID: -3022340133225536526, guid: 1a0db7ae73c9e43ac856b25d6ad47dbc, type: 3} + - {fileID: -2944302567237882039, guid: 1a0db7ae73c9e43ac856b25d6ad47dbc, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.75 + 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/waterspirit.anim.meta b/Assets/Art Final/waterspirit.anim.meta new file mode 100644 index 0000000..a1fac7e --- /dev/null +++ b/Assets/Art Final/waterspirit.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 514fb66a291a34aa89f1e05620ed60f1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Water Spirit.prefab b/Assets/Prefabs/Water Spirit.prefab index 32efde0..02bee18 100644 --- a/Assets/Prefabs/Water Spirit.prefab +++ b/Assets/Prefabs/Water Spirit.prefab @@ -69,6 +69,7 @@ GameObject: - component: {fileID: 7026014451242677586} - component: {fileID: 7026014451242677584} - component: {fileID: 7026014451242677591} + - component: {fileID: 3877986937207771447} m_Layer: 0 m_Name: Water Spirit m_TagString: Untagged @@ -177,3 +178,22 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!95 &3877986937207771447 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7026014451242677587} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 197e268fede3445aa82b6a75189c71d2, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 diff --git a/Assets/Scenes/Aquaphobia.unity b/Assets/Scenes/Aquaphobia.unity index dd251dd..3bba852 100644 --- a/Assets/Scenes/Aquaphobia.unity +++ b/Assets/Scenes/Aquaphobia.unity @@ -206,8 +206,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 128127586} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1004, y: 598, z: -10} - m_LocalScale: {x: 128, y: 128, z: 1} + m_LocalPosition: {x: -311, y: 187, z: 0} + m_LocalScale: {x: 32, y: 32, z: 1} m_Children: [] m_Father: {fileID: 1841208421} m_RootOrder: 0 @@ -250,7 +250,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 1458967083 - m_SortingLayer: 3 + m_SortingLayer: 4 m_SortingOrder: 4 m_Sprite: {fileID: -6711491167571722007, guid: 625c08abc063d4901bee582e190d865f, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Scenes/Benji's Scene.unity b/Assets/Scenes/Benji's Scene.unity index 5e8782a..2e654c0 100644 --- a/Assets/Scenes/Benji's Scene.unity +++ b/Assets/Scenes/Benji's Scene.unity @@ -787,6 +787,108 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: faf72c53445dba543b9e5a89dc76b3e1, type: 3} +--- !u!1 &2032234245 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2032234248} + - component: {fileID: 2032234247} + - component: {fileID: 2032234246} + m_Layer: 0 + m_Name: Car + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!95 &2032234246 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2032234245} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 0d281a10890e2440ab11c3805ec9165d, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!212 &2032234247 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2032234245} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 5495412397436416559, guid: 0cdc3abdc6f7a4e579f51f79d3231808, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.5625, y: 1.625} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &2032234248 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2032234245} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.144, y: -0.259, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1517753708608174288 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/WaterSpirit.cs b/Assets/WaterSpirit.cs index 93fba2c..347abf1 100644 --- a/Assets/WaterSpirit.cs +++ b/Assets/WaterSpirit.cs @@ -13,7 +13,7 @@ public class WaterSpirit : MonoBehaviour { void Start() { rb = this.GetComponent(); 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