fums/ofb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.nicholasnovak.io/fums/ofb

Browse Source
This commit is contained in:
allylikesfrogs 2023-05-05 16:19:35 -07:00
commit 7e2c255fd5
32 changed files with 24814 additions and 2405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

220
Assets/PlayerControls.inputactions
View File

@ -49,6 +49,15 @@
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "CymbalCrash",
"type": "Button",
"id": "843c8db5-9647-4f02-b522-4d0012340f9e",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
@ -162,6 +171,116 @@
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "Controller Joystick",
"id": "a65818cd-ecbd-4032-b536-9918f4310875",
"path": "2DVector",
"interactions": "",
"processors": "",
"groups": "",
"action": "Move",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "up",
"id": "336b41f5-3458-41ad-8d46-b6737faf5d48",
"path": "<Gamepad>/leftStick/up",
"interactions": "",
"processors": "",
"groups": "",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "1df7dec0-3390-4bba-bb49-f58c3c9d804c",
"path": "<Gamepad>/leftStick/down",
"interactions": "",
"processors": "",
"groups": "",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "5331f356-627c-4f50-b46d-64c9c3e904f2",
"path": "<Gamepad>/leftStick/left",
"interactions": "",
"processors": "",
"groups": "",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "e2b228c4-9dea-4b35-9f3c-89d80f4403c1",
"path": "<Gamepad>/leftStick/right",
"interactions": "",
"processors": "",
"groups": "",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "Controller DPad",
"id": "251f5056-c0e2-4283-9fc4-1def2853c06e",
"path": "2DVector",
"interactions": "",
"processors": "",
"groups": "",
"action": "Move",
"isComposite": true,
"isPartOfComposite": false
},
{
"name": "up",
"id": "6502d829-b468-42dd-8b21-b446d1ee421e",
"path": "<Gamepad>/dpad/up",
"interactions": "",
"processors": "",
"groups": "",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "down",
"id": "c7f002c3-0fce-414d-818b-44774de8c8f9",
"path": "<Gamepad>/dpad/down",
"interactions": "",
"processors": "",
"groups": "",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "left",
"id": "80207e1d-3e64-4dcc-b275-d51b2272ec6f",
"path": "<Gamepad>/dpad/left",
"interactions": "",
"processors": "",
"groups": "",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "right",
"id": "f9194fa1-ab23-4f2e-b66e-9f34e7b93da9",
"path": "<Gamepad>/dpad/right",
"interactions": "",
"processors": "",
"groups": "",
"action": "Move",
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "",
"id": "77fb86b2-c108-4901-9a80-e00c9317d4df",
@ -173,6 +292,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "9a3278a2-fbcc-4c62-86cc-f6a7ba0a9789",
"path": "<Gamepad>/leftTrigger",
"interactions": "",
"processors": "",
"groups": "",
"action": "Grapple",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "f3aa2992-7914-440a-b109-bf84cfa770a3",
@ -184,6 +314,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "e7016a0a-a5f7-4cae-9f61-e1c24389fcee",
"path": "<Gamepad>/buttonWest",
"interactions": "",
"processors": "",
"groups": "",
"action": "ThrowTambourine",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "ad2dbcc6-d98e-4d64-bce9-fb9f8741462e",
@ -206,16 +347,60 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "87596c7d-413a-4c50-bdf0-af2b5ad2ad4a",
"path": "<Gamepad>/buttonSouth",
"interactions": "",
"processors": "",
"groups": "",
"action": "Jump",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "679f7163-1cdf-4ae4-b4f4-133d1b2514a6",
"path": "<Keyboard>/#(J)",
"path": "<Keyboard>/j",
"interactions": "",
"processors": "",
"groups": "",
"action": "ClarinetDive",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "6ae2408a-2d3e-4336-8617-77080f43392c",
"path": "<Gamepad>/buttonEast",
"interactions": "",
"processors": "",
"groups": "",
"action": "ClarinetDive",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "167cc771-c2e4-4ab1-ba58-31e6e6730adf",
"path": "<Keyboard>/i",
"interactions": "",
"processors": "",
"groups": "",
"action": "CymbalCrash",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "abad59d5-e221-4404-8bcf-853b2c27c7c7",
"path": "<Gamepad>/buttonNorth",
"interactions": "",
"processors": "",
"groups": "",
"action": "CymbalCrash",
"isComposite": false,
"isPartOfComposite": false
}
]
},
@ -263,6 +448,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "46f7fb02-e125-4f89-b16d-cccd5f2b8ef8",
"path": "<Gamepad>/start",
"interactions": "",
"processors": "",
"groups": "",
"action": "Pause",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "504af2d0-cca5-428f-8009-de9fcff39bc7",
@ -274,6 +470,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "7f957879-011b-418a-a958-ec1c268993ce",
"path": "<Gamepad>/buttonSouth",
"interactions": "",
"processors": "",
"groups": "",
"action": "AdvanceDialog",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "2044f2bd-2b93-4c90-a43f-a68f845ba04c",
@ -284,6 +491,17 @@
"action": "ToggleDebugMenu",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "f25ba7ac-3413-496c-9d08-b668e53fa368",
"path": "<Gamepad>/select",
"interactions": "",
"processors": "",
"groups": "",
"action": "ToggleDebugMenu",
"isComposite": false,
"isPartOfComposite": false
}
]
}

158
Assets/Prefabs/CanvasObjects/GameUICanvas.prefab
View File

@ -152,6 +152,83 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &2305921245815223353
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5840169765278472452}
- component: {fileID: 6772587764896891210}
- component: {fileID: 3671381468871953629}
m_Layer: 5
m_Name: cymbal_UI_background
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5840169765278472452
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2305921245815223353}
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_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5910219464959875507}
m_Father: {fileID: 1885684100209428912}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -298.1, y: -60}
m_SizeDelta: {x: 65, y: 65}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6772587764896891210
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2305921245815223353}
m_CullTransparentMesh: 1
--- !u!114 &3671381468871953629
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2305921245815223353}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 63a3d46853315bc328c2f7cb7734498c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &3054742311368020042
GameObject:
m_ObjectHideFlags: 0
@ -340,8 +417,9 @@ RectTransform:
- {fileID: 6181971475657436876}
- {fileID: 5229343399574233433}
- {fileID: 1799174769135430456}
- {fileID: 5840169765278472452}
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -426,9 +504,87 @@ MonoBehaviour:
trumpetBackground: {fileID: 7831297615833552022}
tambourineBackground: {fileID: 3054742311368020042}
clarinetBackground: {fileID: 5459305458457057368}
cymbalBackground: {fileID: 2305921245815223353}
trumpetUI: {fileID: 0}
tambourineUI: {fileID: 0}
clarinetUI: {fileID: 0}
cymbalUI: {fileID: 0}
--- !u!1 &5358556914587397967
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5910219464959875507}
- component: {fileID: 589067814855411667}
- component: {fileID: 388723793013215972}
m_Layer: 5
m_Name: cymbal_UI
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5910219464959875507
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5358556914587397967}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5840169765278472452}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -32.5, y: -32.499992}
m_SizeDelta: {x: 61, y: 61}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &589067814855411667
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5358556914587397967}
m_CullTransparentMesh: 1
--- !u!114 &388723793013215972
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5358556914587397967}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 63a3d46853315bc328c2f7cb7734498c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &5459305458457057368
GameObject:
m_ObjectHideFlags: 0

22
Assets/Prefabs/DEBUG/PersistantData/StateController.prefab
View File

@ -9,7 +9,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 5026779833035567294}
- component: {fileID: 3993188859025174202}
- component: {fileID: 4111321198473826588}
- component: {fileID: 5193521544595985828}
m_Layer: 0
@ -32,25 +31,8 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3993188859025174202
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5592250714439549880}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73653b02e42804d288eaaf881c511225, type: 3}
m_Name:
m_EditorClassIdentifier:
canTrumpet: 1
canTambourine: 1
canClarinet: 1
canCymbal: 1
currentState: 0
--- !u!114 &4111321198473826588
MonoBehaviour:
m_ObjectHideFlags: 0
@ -69,6 +51,8 @@ MonoBehaviour:
isPaused: 0
pauseMenuCanvas: {fileID: 0}
inDebugMode: 1
debugCanvas: {fileID: 0}
itemProgression: 0
--- !u!114 &5193521544595985828
MonoBehaviour:
m_ObjectHideFlags: 0

138
Assets/Prefabs/Player.prefab
View File

@ -181,6 +181,134 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &3783570684438687829
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8868692928122851825}
- component: {fileID: 264629194984044240}
m_Layer: 2
m_Name: Cymbal
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8868692928122851825
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3783570684438687829}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5885597207104481986}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &264629194984044240
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3783570684438687829}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: f37bef8154eaa8adcbf8a6527c653b0b, type: 3}
m_PlayOnAwake: 0
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!1 &5885597207104481991
GameObject:
m_ObjectHideFlags: 0
@ -222,6 +350,7 @@ Transform:
- {fileID: 5260309551442468847}
- {fileID: 5885597207531562994}
- {fileID: 5885597208269163161}
- {fileID: 8868692928122851825}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -418,15 +547,14 @@ MonoBehaviour:
playerInput: {fileID: 1407172087}
launcher: {fileID: 6559806128767475056}
hasTambourine: 1
maxDashTime: 3
dashStopSpeed: 0.1
moveDirection: {x: 0, y: 0, z: 0}
dashDistance: 0.2
isDash: 0
bonk: 2
isInWater: 0
dashForce: 1.2
cymbalAudio: {fileID: 264629194984044240}
grapplingGun: {fileID: 3465910379319867675}
grapplingRope: {fileID: 7648135587659148198}
playerController: {fileID: 5559747613460074786}
stateController: {fileID: 0}
playerIsAlive: 1
footstepSound: {fileID: 8300000, guid: 229b1f1bff3f442ef84c0c9b767dda07, type: 3}
deathSound: {fileID: 8300000, guid: 3498b07b14bc248cdbc50aa434f962c2, type: 3}

BIN
Assets/SFX/cymbal.mp3 Normal file
View File

Binary file not shown.

23
Assets/SFX/cymbal.mp3.meta Normal file
View File

@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: f37bef8154eaa8adcbf8a6527c653b0b
AudioImporter:
externalObjects: {}
serializedVersion: 7
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

1902
Assets/Scenes/Brasslands.unity
View File

File diff suppressed because it is too large Load Diff

1013
Assets/Scenes/GameEndScreen.unity Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Scenes/GameEndScreen.unity.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 00a8225591a31417a93122f1eb4e7dff
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2245
Assets/Scenes/GrappleScene.unity
View File

File diff suppressed because it is too large Load Diff

8490
Assets/Scenes/GrenouilleVillage.unity
View File

File diff suppressed because it is too large Load Diff

2
Assets/Scenes/MainMenu.unity
View File

@ -914,7 +914,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 2527389465697474493, guid: ff99a7d0beeca415e911378b9b377de4, type: 3}
propertyPath: showDropdown
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3422388587178177106, guid: ff99a7d0beeca415e911378b9b377de4, type: 3}
propertyPath: m_Pivot.x

11174
Assets/Scenes/MushroomForest.unity
View File

File diff suppressed because it is too large Load Diff

25
Assets/Scripts/Bouncepad.cs Normal file
View File

@ -0,0 +1,25 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Bouncepad : MonoBehaviour
{
public enum Facing
{
Left,
Right,
}
[SerializeField]
Facing bounceDirection = Facing.Left;
[SerializeField]
public float bounceForce = 20f;
[SerializeField]
public float verticalModifier = 1.0f;
public Facing Direction()
{
return this.bounceDirection;
}
}

11
Assets/Scripts/Bouncepad.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 1f75445772cf608f6a46acd7fd8dd323
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Scripts/DebugSceneSwitcher.cs
View File

@ -6,10 +6,18 @@ using TMPro;
public class DebugSceneSwitcher : MonoBehaviour
{
public static DebugSceneSwitcher Instance = null;
public bool showDropdown;
void Awake()
{
if (Instance == null) {
Instance = this;
} else {
Destroy(this.gameObject);
return;
}
// Keep the object around when we switch scenes
DontDestroyOnLoad(this.gameObject);
CreateDropdownOptions();

7
Assets/Scripts/DialogBoxes.cs
View File

@ -17,6 +17,9 @@ public class DialogBoxes : MonoBehaviour
[SerializeField] Image backgroundImageObject;
[SerializeField] Sprite[] images;
[Header("Buttons:")]
[SerializeField] GameObject backToMenuButton;
// Start is called before the first frame update
void Start()
@ -37,9 +40,13 @@ public class DialogBoxes : MonoBehaviour
}
else
{ // no more dialog messages, advance the scene
if (backToMenuButton != null) {
backToMenuButton.SetActive(true);
} else {
SceneController.Instance.NextScene();
}
}
}
void ReconfigureSpriteArray()
{

3
Assets/Scripts/EnemyPatrol.cs
View File

@ -23,6 +23,7 @@ public class EnemyPatrol : MonoBehaviour {
[Header("General")]
public float moveSpeed;
Animator animator;
public bool isPlayingDefeatAnimation = false;
void Awake() {
animator = GetComponent<Animator>();
@ -73,11 +74,13 @@ public class EnemyPatrol : MonoBehaviour {
}
IEnumerator Defeat() {
isPlayingDefeatAnimation = true;
this.gameObject.GetComponent<BoxCollider2D>().enabled = false;
animator.Play("Explosion");
this.gameObject.GetComponent<AudioSource>().Play();
yield return new WaitForSeconds(animator.GetCurrentAnimatorStateInfo(0).length);
this.gameObject.GetComponent<BoxCollider2D>().enabled = true;
isPlayingDefeatAnimation = false;
this.gameObject.SetActive(false);
}

17
Assets/Scripts/GameUIController.cs
View File

@ -10,21 +10,26 @@ public class GameUIController : MonoBehaviour
public GameObject trumpetBackground;
public GameObject tambourineBackground;
public GameObject clarinetBackground;
public GameObject cymbalBackground;
[HideInInspector] public GameObject trumpetUI;
[HideInInspector] public GameObject tambourineUI;
[HideInInspector] public GameObject clarinetUI;
[HideInInspector] public GameObject cymbalUI;
void Awake()
{
this.trumpetUI = trumpetBackground.transform.GetChild(0).gameObject;
this.tambourineUI = tambourineBackground.transform.GetChild(0).gameObject;
this.clarinetUI = clarinetBackground.transform.GetChild(0).gameObject;
this.cymbalUI = this.cymbalBackground.transform.GetChild(0).gameObject;
}
void Start() {
void Start()
{
this.trumpetBackground.SetActive(StateController.Instance.HasTrumpet());
this.tambourineBackground.SetActive(StateController.Instance.HasTambourine());
this.clarinetBackground.SetActive(StateController.Instance.HasClarinet());
this.cymbalBackground.SetActive(StateController.Instance.HasCymbal());
}
public void ToggleTrumpet(bool toggleState)
@ -54,10 +59,20 @@ public class GameUIController : MonoBehaviour
}
}
public void ToggleCymbal(bool toggleState)
{
bool curEnabled = cymbalUI.GetComponent<Image>().enabled;
if (curEnabled != toggleState)
{
cymbalUI.GetComponent<Image>().enabled = toggleState;
}
}
public void UpdateInstrumentUI()
{
this.ToggleTrumpet(StateController.Instance.HasTrumpet());
this.ToggleTambourine(StateController.Instance.HasTambourine());
this.ToggleClarinet(StateController.Instance.HasClarinet());
this.ToggleCymbal(StateController.Instance.HasCymbal());
}
}

70
Assets/Scripts/PlayerBehavior.cs
View File

@ -31,6 +31,10 @@ public class PlayerBehavior : MonoBehaviour
Vector2 dashVec;
private bool lowSpeed = false;
[Header("Cymbals:")]
private float cymbalActiveTime = 0f;
[SerializeField] AudioSource cymbalAudio;
[Header("Grappling:")]
[SerializeField] public Tutorial_GrapplingGun grapplingGun;
[SerializeField] public Tutorial_GrapplingRope grapplingRope;
@ -72,6 +76,12 @@ public class PlayerBehavior : MonoBehaviour
void Update()
{
if (this.cymbalActiveTime < 0)
{
this.gameUI.ToggleCymbal(true);
}
this.cymbalActiveTime -= Time.deltaTime;
unlockedTambourine = StateController.Instance.HasTambourine();
if (playerIsAlive)
{
@ -123,6 +133,7 @@ public class PlayerBehavior : MonoBehaviour
else if (!isInWater)
{
isDash = false;
currentDash = 0.0f;
_rb.AddForce(-(dashVec), ForceMode2D.Impulse);
dashVec = Vector2.zero;
@ -134,6 +145,22 @@ public class PlayerBehavior : MonoBehaviour
dashVec = Vector2.zero;
}
}
if (StateController.Instance.HasCymbal())
{
if (this.playerInput.actions["CymbalCrash"].WasPressedThisFrame())
{
// Play the sound
this.gameUI.ToggleCymbal(false);
// this.audioSource.clip = cymbalSound;
// this.audioSource.loop = false;
// this.audioSource.Play();
cymbalAudio.Play();
// Set the cymbal active for the equivalent of one second
this.cymbalActiveTime = 1;
}
}
}
void Animate()
@ -239,13 +266,13 @@ public class PlayerBehavior : MonoBehaviour
void Bounce()
{
Vector2 reflect;
if(lowSpeed)
if (lowSpeed)
{
reflect = new Vector2(saveVelocity.x,-(saveVelocity.y) * 0.75f);
reflect = new Vector2(saveVelocity.x, -(saveVelocity.y) * 0.75f);
}
else
{
reflect = new Vector2(saveVelocity.x,-(saveVelocity.y) * bonk);
reflect = new Vector2(saveVelocity.x, -(saveVelocity.y) * bonk);
}
_rb.AddForce(reflect, ForceMode2D.Impulse);
reflect = Vector2.zero;
@ -291,6 +318,28 @@ public class PlayerBehavior : MonoBehaviour
isInWater = true;
Water();
}
else if (col.tag == "bouncePad")
{
// Assign the player's velocity to zero so that the player can
// bounce on the same jump pad
this.playerController.RB.velocity = Vector2.zero;
Bouncepad pad = col.GetComponent<Bouncepad>();
switch (pad.Direction())
{
case Bouncepad.Facing.Left:
this.playerController.RB.AddForce(
new Vector2(-pad.bounceForce, pad.verticalModifier * pad.bounceForce),
ForceMode2D.Impulse
);
break;
case Bouncepad.Facing.Right:
this.playerController.RB.AddForce(
new Vector2(pad.bounceForce, pad.verticalModifier * pad.bounceForce),
ForceMode2D.Impulse
);
break;
}
}
}
void OnTriggerExit2D(Collider2D col)
@ -331,8 +380,20 @@ public class PlayerBehavior : MonoBehaviour
else if (collision.gameObject.tag == "Projectile")
{
Destroy(collision.gameObject);
if (this.cymbalActiveTime > 0)
{
Vector2 projVel = collision.gameObject.GetComponent<Rigidbody2D>().velocity;
collision.gameObject.GetComponent<Rigidbody2D>().velocity =
new Vector2(
-projVel.x,
-projVel.y
);
}
else
{
StartCoroutine(DestroyPlayer());
}
}
//stupid stuff for claude's house
else if (collision.gameObject.tag == "SirJacques")
{
@ -366,7 +427,8 @@ public class PlayerBehavior : MonoBehaviour
// this.stateController.SetDeathCanvasActive(true);
if (grapplingRope.isGrappling) {
if (grapplingRope.isGrappling)
{
LetGoOfGrapple();
}

18
Assets/Scripts/SceneController.cs
View File

@ -16,6 +16,11 @@ public class SceneController : MonoBehaviour
{
Instance = this;
}
else
{
Destroy(this.gameObject);
return;
}
// Make this object stay around when switching scenes
DontDestroyOnLoad(this.gameObject);
SceneManager.sceneLoaded += OnSceneLoaded;
@ -26,13 +31,22 @@ public class SceneController : MonoBehaviour
GameObject pauseMenu = GameObject.Find("PauseMenuCanvas");
if (pauseMenu != null)
{
Button quitButton = GameObject.Find("QuitButton").GetComponent<Button>();
quitButton.onClick.AddListener(BackToMainMenu);
// Button quitButton = GameObject.Find("QuitButton").GetComponent<Button>();
// quitButton.onClick.AddListener(BackToMainMenu);
}
if (scene.buildIndex == 0)
{ // if this is the menu
GameObject.Find("NewGameButton").GetComponent<Button>().onClick.AddListener(NextScene);
}
// if this is the last scene
if (scene.buildIndex == (SceneManager.sceneCountInBuildSettings - 1)) {
GameObject backToMenuButton = GameObject.Find("BackToMenuButton");
if (backToMenuButton != null) {
backToMenuButton.GetComponent<Button>().onClick.AddListener(delegate{LoadChosenScene(0);});
backToMenuButton.SetActive(false);
}
}
}
public void NextScene()

10
Assets/Scripts/StateController.cs
View File

@ -46,6 +46,9 @@ public class StateController : MonoBehaviour
if (Instance == null)
{
Instance = this;
} else {
Destroy(this.gameObject);
return;
}
DontDestroyOnLoad(this.gameObject);
SceneManager.sceneLoaded += OnSceneLoaded;
@ -102,6 +105,8 @@ public class StateController : MonoBehaviour
{
Button resumeButton = GameObject.Find("ResumeButton").GetComponent<Button>();
resumeButton.onClick.AddListener(Unpause);
Button quitButton = GameObject.Find("QuitButton").GetComponent<Button>();
quitButton.onClick.AddListener(SceneController.Instance.BackToMainMenu);
TogglePauseMenu(false);
}
@ -180,8 +185,10 @@ public class StateController : MonoBehaviour
void TogglePauseMenu(bool showPauseMenu)
{
if (pauseMenuCanvas != null) {
pauseMenuCanvas.SetActive(showPauseMenu);
}
}
public void RespawnPlayer()
{
@ -196,6 +203,9 @@ public class StateController : MonoBehaviour
{
foreach (GameObject enemy in enemiesInScene)
{
if (enemy.GetComponent<EnemyPatrol>().isPlayingDefeatAnimation) {
enemy.SetActive(false);
}
enemy.SetActive(true);
}
}

BIN
Assets/Sprites/Items/cymbals.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 554 B

124
Assets/Sprites/Items/cymbals.png.meta Normal file
View File

@ -0,0 +1,124 @@
fileFormatVersion: 2
guid: 63a3d46853315bc328c2f7cb7734498c
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
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
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
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: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

514
Assets/Sprites/Tilesets/Cave0/Cave0.prefab
View File

@ -87,6 +87,146 @@ Tilemap:
m_GameObject: {fileID: 6993224976757945982}
m_Enabled: 1
m_Tiles:
- first: {x: -9, y: -14, z: 0}
second:
serializedVersion: 2
m_TileIndex: 98
m_TileSpriteIndex: 98
m_TileMatrixIndex: 7
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -8, y: -14, z: 0}
second:
serializedVersion: 2
m_TileIndex: 99
m_TileSpriteIndex: 99
m_TileMatrixIndex: 6
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -7, y: -14, z: 0}
second:
serializedVersion: 2
m_TileIndex: 100
m_TileSpriteIndex: 100
m_TileMatrixIndex: 8
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 8, y: -14, z: 0}
second:
serializedVersion: 2
m_TileIndex: 101
m_TileSpriteIndex: 101
m_TileMatrixIndex: 11
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 9, y: -14, z: 0}
second:
serializedVersion: 2
m_TileIndex: 104
m_TileSpriteIndex: 104
m_TileMatrixIndex: 11
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 11, y: -14, z: 0}
second:
serializedVersion: 2
m_TileIndex: 103
m_TileSpriteIndex: 103
m_TileMatrixIndex: 12
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -8, y: -13, z: 0}
second:
serializedVersion: 2
m_TileIndex: 90
m_TileSpriteIndex: 90
m_TileMatrixIndex: 5
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 16, y: -13, z: 0}
second:
serializedVersion: 2
m_TileIndex: 102
m_TileSpriteIndex: 102
m_TileMatrixIndex: 9
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 17, y: -13, z: 0}
second:
serializedVersion: 2
m_TileIndex: 102
m_TileSpriteIndex: 102
m_TileMatrixIndex: 10
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 5, y: -12, z: 0}
second:
serializedVersion: 2
m_TileIndex: 101
m_TileSpriteIndex: 101
m_TileMatrixIndex: 3
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 6, y: -12, z: 0}
second:
serializedVersion: 2
m_TileIndex: 102
m_TileSpriteIndex: 102
m_TileMatrixIndex: 3
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 7, y: -12, z: 0}
second:
serializedVersion: 2
m_TileIndex: 103
m_TileSpriteIndex: 103
m_TileMatrixIndex: 3
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 8, y: -12, z: 0}
second:
serializedVersion: 2
m_TileIndex: 104
m_TileSpriteIndex: 104
m_TileMatrixIndex: 3
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 12, y: -12, z: 0}
second:
serializedVersion: 2
m_TileIndex: 102
m_TileSpriteIndex: 102
m_TileMatrixIndex: 4
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -2, y: -11, z: 0}
second:
serializedVersion: 2
@ -237,6 +377,16 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1
- first: {x: 17, y: -10, z: 0}
second:
serializedVersion: 2
m_TileIndex: 103
m_TileSpriteIndex: 103
m_TileMatrixIndex: 2
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -1, y: -9, z: 0}
second:
serializedVersion: 2
@ -327,6 +477,16 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 12, y: -9, z: 0}
second:
serializedVersion: 2
m_TileIndex: 94
m_TileSpriteIndex: 94
m_TileMatrixIndex: 1
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1
- first: {x: -2, y: -8, z: 0}
second:
serializedVersion: 2
@ -856,7 +1016,7 @@ Tilemap:
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
m_AllTileFlags: 1
- first: {x: 3, y: -3, z: 0}
second:
serializedVersion: 2
@ -897,6 +1057,26 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 9, y: -3, z: 0}
second:
serializedVersion: 2
m_TileIndex: 31
m_TileSpriteIndex: 30
m_TileMatrixIndex: 13
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 11, y: -3, z: 0}
second:
serializedVersion: 2
m_TileIndex: 31
m_TileSpriteIndex: 30
m_TileMatrixIndex: 14
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -2, y: -2, z: 0}
second:
serializedVersion: 2
@ -1157,6 +1337,16 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: 8, y: 0, z: 0}
second:
serializedVersion: 2
m_TileIndex: 5
m_TileSpriteIndex: 4
m_TileMatrixIndex: 15
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
m_AnimatedTiles: {}
m_TileAssetArray:
- m_RefCount: 1
@ -1169,7 +1359,7 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 487b4c68865494181a9cf68b45678aae, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 7e3b9064e952f46a4a81339bcf9f89aa, type: 2}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: 93374a9d5f8754018a338da47b787806, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 54c5b834288f24a89b7e35e0ef9f7c93, type: 2}
@ -1221,7 +1411,7 @@ Tilemap:
m_Data: {fileID: 11400000, guid: cddf3522697e845a48f0ffeafffedceb, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: b1f47d51e82694d2b872b9d60ccb996e, type: 2}
- m_RefCount: 1
- m_RefCount: 3
m_Data: {fileID: 11400000, guid: 29e553bfab9e34539a66977e1b1f8daa, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 7834f7b1366284e9b889a252e33f6df0, type: 2}
@ -1339,7 +1529,7 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 10abe908d0b2d4a639f006605667de35, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 731fb66d1a264459abcbbf8952ddc76c, type: 2}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: 3d4b06bf9cd254a5e864cc57c6080384, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: d3309547bd7154e2ab3957fc802ddee9, type: 2}
@ -1347,7 +1537,7 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 46a7d9ba61d7941f780082f1fcd95a48, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: b36f78d48523449de83bf0c68026a91b, type: 2}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: 56c0705e362d74fefa0d3e4efbbcca70, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: e50a97847d96647ba89e55eb235c9841, type: 2}
@ -1355,19 +1545,19 @@ Tilemap:
m_Data: {fileID: 11400000, guid: db381af5bd75b4f909d3c46f4deafd2e, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: d86b2ce3cdf1a41aa962546e83de876a, type: 2}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: 6a7d26053056640d5882f1b25993eb4a, type: 2}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: 5d144f009a024412a93884e12adf45c3, type: 2}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: 646755cc3df9c46ddbf0e236a3439913, type: 2}
- m_RefCount: 1
- m_RefCount: 3
m_Data: {fileID: 11400000, guid: 4941b5c865c424caab7d9f221bd82c33, type: 2}
- m_RefCount: 1
- m_RefCount: 5
m_Data: {fileID: 11400000, guid: 5ad1bac2ca22b410fb4f12781c35e0d5, type: 2}
- m_RefCount: 1
- m_RefCount: 4
m_Data: {fileID: 11400000, guid: fd05a048e46df42f0841aedc5c26e033, type: 2}
- m_RefCount: 1
- m_RefCount: 3
m_Data: {fileID: 11400000, guid: f395a2524c46040d2bd365b8c63d6ddd, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 605c24591df054320be61ee96783195e, type: 2}
@ -1380,7 +1570,7 @@ Tilemap:
m_Data: {fileID: 816183649, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
- m_RefCount: 1
m_Data: {fileID: 1941844380, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: -1806684432, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
- m_RefCount: 1
m_Data: {fileID: -1680641961, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
@ -1432,7 +1622,7 @@ Tilemap:
m_Data: {fileID: -1332320381, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
- m_RefCount: 1
m_Data: {fileID: -1331211415, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
- m_RefCount: 1
- m_RefCount: 3
m_Data: {fileID: 300324828, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
- m_RefCount: 1
m_Data: {fileID: 554307562, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
@ -1552,7 +1742,7 @@ Tilemap:
m_Data: {fileID: -2099172758, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
- m_RefCount: 1
m_Data: {fileID: -1907997159, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 1436478779, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
- m_RefCount: 1
m_Data: {fileID: 596793319, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
@ -1560,7 +1750,7 @@ Tilemap:
m_Data: {fileID: 1336928453, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
- m_RefCount: 1
m_Data: {fileID: 1191579864, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 1096025109, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
- m_RefCount: 1
m_Data: {fileID: -809172117, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
@ -1568,19 +1758,19 @@ Tilemap:
m_Data: {fileID: 232799033, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
- m_RefCount: 1
m_Data: {fileID: 1725201896, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 186572125, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 30499823, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 157912657, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
- m_RefCount: 1
- m_RefCount: 3
m_Data: {fileID: -240375783, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
- m_RefCount: 1
- m_RefCount: 5
m_Data: {fileID: 418300172, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
- m_RefCount: 1
- m_RefCount: 4
m_Data: {fileID: 284850178, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
- m_RefCount: 1
- m_RefCount: 3
m_Data: {fileID: 2054305501, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
- m_RefCount: 1
m_Data: {fileID: 208169506, guid: 2097266264e574d71a38da279b45c7c0, type: 3}
@ -1603,14 +1793,284 @@ Tilemap:
e31: 0
e32: 0
e33: 1
- m_RefCount: 1
m_Data:
e00: -1
e01: 0.00000008742278
e02: 0
e03: 0
e10: -0.00000008742278
e11: -1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
- m_RefCount: 1
m_Data:
e00: 4
e01: 0
e02: 0
e03: 0.5
e10: 0
e11: 4
e12: 0
e13: 1.5
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
- m_RefCount: 4
m_Data:
e00: -1
e01: 0
e02: 0
e03: 0
e10: -0
e11: 1
e12: 0
e13: 0
e20: -0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
- m_RefCount: 1
m_Data:
e00: -2
e01: 0
e02: -0.00000008742278
e03: 0
e10: 0
e11: 2
e12: 0
e13: 0.5
e20: 0.00000017484555
e21: 0
e22: -1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
- m_RefCount: 1
m_Data:
e00: 2
e01: 0
e02: 0
e03: 0
e10: 0
e11: 2
e12: 0
e13: 0.5
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
- m_RefCount: 1
m_Data:
e00: 2
e01: 0
e02: 0
e03: 0
e10: 0
e11: 2
e12: 0
e13: -0.5
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
- m_RefCount: 1
m_Data:
e00: 2
e01: 0
e02: 0
e03: -1
e10: 0
e11: 2
e12: 0
e13: -0.5
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
- m_RefCount: 1
m_Data:
e00: 2
e01: 0
e02: 0
e03: 1
e10: 0
e11: 2
e12: 0
e13: -0.5
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
- m_RefCount: 1
m_Data:
e00: 2
e01: -0.00000017484555
e02: -0.00000008742278
e03: 0
e10: -0.00000017484555
e11: -2
e12: 0
e13: -0.28
e20: -0.00000017484555
e21: 1.5285484e-14
e22: -1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
- m_RefCount: 1
m_Data:
e00: 1.8911506
e01: 0.65080667
e02: -0.00000008742278
e03: -0.09
e10: 0.65080667
e11: -1.8911507
e12: 0
e13: 0.1
e20: -0.00000016532965
e21: -0.000000056895324
e22: -1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
- m_RefCount: 2
m_Data:
e00: -0.70710695
e01: 0.7071067
e02: 0
e03: 0.09
e10: -0.7071067
e11: -0.70710695
e12: 0
e13: -0.5
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
- m_RefCount: 1
m_Data:
e00: -0.9063078
e01: -0.42261833
e02: 0
e03: -0
e10: 0.42261833
e11: -0.9063078
e12: 0
e13: 0.25
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
- m_RefCount: 1
m_Data:
e00: 0.7071067
e01: 1.4142137
e02: 0
e03: 0.25
e10: -0.7071068
e11: 1.4142134
e12: 0
e13: -0.25
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
- m_RefCount: 1
m_Data:
e00: 0.7071067
e01: -1.4142137
e02: 0
e03: 0.25
e10: 0.7071068
e11: 1.4142134
e12: 0
e13: 0.25
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
- m_RefCount: 1
m_Data:
e00: -1
e01: 0
e02: -0.00000008742278
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0.00000008742278
e21: 0
e22: -1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_TileColorArray:
- m_RefCount: 107
- m_RefCount: 126
m_Data: {r: 1, g: 1, b: 1, a: 1}
m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Origin: {x: -2, y: -11, z: 0}
m_Size: {x: 11, y: 12, z: 1}
m_Origin: {x: -9, y: -14, z: 0}
m_Size: {x: 27, y: 15, z: 1}
m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
m_TileOrientation: 0
m_TileOrientationMatrix:
@ -1679,7 +2139,7 @@ TilemapRenderer:
m_Mode: 0
m_DetectChunkCullingBounds: 0
m_MaskInteraction: 0
--- !u!114 &6961927599988224370
--- !u!114 &9164215483743694638
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}

84
Assets/Sprites/Tilesets/Mushrooms/Mushrooms.prefab
View File

@ -2142,6 +2142,26 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -7, y: -1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 16
m_TileSpriteIndex: 17
m_TileMatrixIndex: 2
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -6, y: -1, z: 0}
second:
serializedVersion: 2
m_TileIndex: 17
m_TileSpriteIndex: 16
m_TileMatrixIndex: 2
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -5, y: -1, z: 0}
second:
serializedVersion: 2
@ -2302,6 +2322,26 @@ Tilemap:
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -7, y: 0, z: 0}
second:
serializedVersion: 2
m_TileIndex: 28
m_TileSpriteIndex: 28
m_TileMatrixIndex: 2
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -6, y: 0, z: 0}
second:
serializedVersion: 2
m_TileIndex: 29
m_TileSpriteIndex: 29
m_TileMatrixIndex: 2
m_TileColorIndex: 0
m_TileObjectToInstantiateIndex: 65535
dummyAlignment: 0
m_AllTileFlags: 1073741825
- first: {x: -2, y: 0, z: 0}
second:
serializedVersion: 2
@ -2606,9 +2646,9 @@ Tilemap:
m_Data: {fileID: 11400000, guid: 2b480e4f3cf59c64f9f7f3eb2ae32a43, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: fb5e78b3e23ccbf1782b4944bdf250e9, type: 2}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: 2a6878e04a2be83d1bbb2faa1f90f7cb, type: 2}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: 29eb8338dc97002f5971ed102ab579dd, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: fd746402750f60e8983e77edfcbbb8fa, type: 2}
@ -2630,9 +2670,9 @@ Tilemap:
m_Data: {fileID: 11400000, guid: a06c7232d556c906f83884df6d40e109, type: 2}
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: 29d5dd975f4e7a027b8dfc0440618bc5, type: 2}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: 180d8d893c440c261a1ef4d801707bcd, type: 2}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: 11400000, guid: 2c74b192dbfb7f32ca36fd822a329b7c, type: 2}
- m_RefCount: 1
m_Data: {fileID: 11400000, guid: 8aeb41697f5624d9da439dbaf9134e7d, type: 2}
@ -3105,9 +3145,9 @@ Tilemap:
m_Data: {fileID: 1509828166, guid: 577ba1ea470cbfb068f24f10dcee1629, type: 3}
- m_RefCount: 1
m_Data: {fileID: 18313309, guid: 577ba1ea470cbfb068f24f10dcee1629, type: 3}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: -351428361, guid: 577ba1ea470cbfb068f24f10dcee1629, type: 3}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: -1622023099, guid: 577ba1ea470cbfb068f24f10dcee1629, type: 3}
- m_RefCount: 1
m_Data: {fileID: -1014787237, guid: 577ba1ea470cbfb068f24f10dcee1629, type: 3}
@ -3129,9 +3169,9 @@ Tilemap:
m_Data: {fileID: 870125656, guid: 577ba1ea470cbfb068f24f10dcee1629, type: 3}
- m_RefCount: 2
m_Data: {fileID: -1104956726, guid: 577ba1ea470cbfb068f24f10dcee1629, type: 3}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: -35684010, guid: 577ba1ea470cbfb068f24f10dcee1629, type: 3}
- m_RefCount: 1
- m_RefCount: 2
m_Data: {fileID: -721828406, guid: 577ba1ea470cbfb068f24f10dcee1629, type: 3}
- m_RefCount: 1
m_Data: {fileID: 1362856338, guid: 577ba1ea470cbfb068f24f10dcee1629, type: 3}
@ -3608,32 +3648,32 @@ Tilemap:
e31: 0
e32: 0
e33: 1
- m_RefCount: 0
- m_RefCount: 4
m_Data:
e00: 1.7399998
e01: 0.00000008742278
e02: 0
e00: 1
e01: -0.00000008742278
e02: -0.00000008742278
e03: 0
e10: -0
e11: 0.000000059604645
e12: 0.99999994
e10: -0.00000008742278
e11: -1
e12: 0
e13: 0
e20: -0.00000015211563
e21: 0.99999994
e22: 0.000000059604645
e20: -0.00000008742278
e21: 7.642742e-15
e22: -1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_TileColorArray:
- m_RefCount: 253
- m_RefCount: 257
m_Data: {r: 1, g: 1, b: 1, a: 1}
m_TileObjectToInstantiateArray: []
m_AnimationFrameRate: 1
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Origin: {x: -5, y: -16, z: 0}
m_Size: {x: 24, y: 18, z: 1}
m_Origin: {x: -7, y: -16, z: 0}
m_Size: {x: 26, y: 18, z: 1}
m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
m_TileOrientation: 0
m_TileOrientationMatrix:
@ -3747,7 +3787,7 @@ Grid:
m_CellGap: {x: 0, y: 0, z: 0}
m_CellLayout: 0
m_CellSwizzle: 0
--- !u!114 &5206389324278009406
--- !u!114 &5221619334121491998
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}

794
Assets/Sprites/UI/Fonts/fibberish SDF.asset
View File

File diff suppressed because one or more lines are too long

BIN
Assets/Sprites/UI/star.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 162 KiB

124
Assets/Sprites/UI/star.png.meta Normal file
View File

@ -0,0 +1,124 @@
fileFormatVersion: 2
guid: 733f090fd96b8349b9c4c48ba17882b6
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
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
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
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: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

3
ProjectSettings/EditorBuildSettings.asset
View File

@ -38,4 +38,7 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/MushroomForest.unity
guid: 90db41d80d66232b2b12ed7ee3e19718
- enabled: 1
path: Assets/Scenes/GameEndScreen.unity
guid: 00a8225591a31417a93122f1eb4e7dff
m_configObjects: {}

6
ProjectSettings/ProjectSettings.asset
View File

@ -19,7 +19,7 @@ PlayerSettings:
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
m_ShowUnitySplashScreen: 1
m_ShowUnitySplashLogo: 1
m_SplashScreenOverlayOpacity: 1
m_SplashScreenOverlayOpacity: 0.5
m_SplashScreenAnimation: 1
m_SplashScreenLogoStyle: 1
m_SplashScreenDrawMode: 0
@ -39,7 +39,9 @@ PlayerSettings:
y: 0
width: 1
height: 1
m_SplashScreenLogos: []
m_SplashScreenLogos:
- logo: {fileID: 21300000, guid: f68d19bd1241e4d3ca2ba6c23803fdb2, type: 3}
duration: 2
m_VirtualRealitySplashScreen: {fileID: 0}
m_HolographicTrackingLossScreen: {fileID: 0}
defaultScreenWidth: 1920

1
ProjectSettings/TagManager.asset
View File

@ -23,6 +23,7 @@ TagManager:
- GameUICanvas
- bouncy
- water
- bouncePad
layers:
- Default
- TransparentFX