Author SHA1 Message Date
hz fd0c6fea0c Merge branch 'trick-enhancements' into trick-basket-blocking 2026-02-01 15:48:56 -06:00
hz 6e43949591 Merge branch 'main' into trick-enhancements 2026-02-01 15:44:48 -06:00
hz cb176962a9 Adding basket blocking feature 2026-02-01 15:41:21 -06:00
Ramdar dfd4014286 Merge pull request 'Upload files to "Assets/Art"' (#49) from reinholzj-patch-7 into main
Reviewed-on: admin/GGJ2026#49
Reviewed-by: Ramdar <[email protected]>
2026-02-01 15:39:04 -06:00
Ramdar 706c128369 Merge pull request 'Upload files to "Assets/Art"' (#47) from reinholzj-patch-6 into main
Reviewed-on: admin/GGJ2026#47
Reviewed-by: Ramdar <[email protected]>
2026-02-01 15:38:37 -06:00
Ramdar 14c99f1b7d Merge pull request 'Upload files to "Assets/Art"' (#46) from reinholzj-patch-5 into main
Reviewed-on: admin/GGJ2026#46
Reviewed-by: Ramdar <[email protected]>
2026-02-01 15:38:12 -06:00
Ramdar cb335c78ec Merge pull request 'destory bad things' (#45) from destroyTricks into main
Reviewed-on: admin/GGJ2026#45
Reviewed-by: Ramdar <[email protected]>
2026-02-01 15:37:46 -06:00
reinholzj d557e098b8 Merge pull request 'Healing' (#50) from Healing into main
Reviewed-on: admin/GGJ2026#50
Reviewed-by: reinholzj <[email protected]>
2026-02-01 15:35:37 -06:00
Walter 1a498ce99d Player Animations 2026-02-01 15:34:36 -06:00
reinholzj b78957739c Upload files to "Assets/Art" 2026-02-01 15:28:16 -06:00
hz 2d38838efd Tricks can now occupy baskets and block scoring 2026-02-01 15:13:20 -06:00
hz b09362917a Trick ehancements 2026-02-01 14:51:50 -06:00
reinholzj 5c158aed5e Upload files to "Assets/Art" 2026-02-01 14:36:33 -06:00
Walter 7362c7f57e Merge remote-tracking branch 'origin/LosersCreditsSFX' into Healing 2026-02-01 14:29:59 -06:00
reinholzj b57c4f8202 Upload files to "Assets/Art" 2026-02-01 14:27:53 -06:00
Walter f57c7313c6 added self heal 2026-02-01 14:27:47 -06:00
Josiah 2aca024b1c destory bad things 2026-02-01 14:19:40 -06:00
Roegner65 8293002400 Fixed 2026-02-01 14:16:31 -06:00
Roegner65 47887a3f10 Credits Menu Added 2026-02-01 14:08:33 -06:00
reinholzj 86381e4067 Merge pull request 'Losers' (#42) from Losers into main
Reviewed-on: admin/GGJ2026#42
Reviewed-by: reinholzj <[email protected]>
2026-02-01 13:43:20 -06:00
Walter 659a0ffd23 No More Player Pickup 2026-02-01 13:41:09 -06:00
Walter 64a9edf527 Merge remote-tracking branch 'origin/LosersCreditsSFX' into Losers 2026-02-01 13:25:23 -06:00
Walter efbad01d46 Merge remote-tracking branch 'origin/Losers' into Losers 2026-02-01 13:23:04 -06:00
Walter 2814b6c7a2 Some Nice UI 2026-02-01 13:21:59 -06:00
Roegner65 e5b046f4e6 Added Music to Experiment 2026-02-01 13:06:09 -06:00
DesignJiggles 98a9d31c66 trick animations that work
Trick animations that work
2026-02-01 12:11:19 -06:00
DesignJiggles 882768caad saved changes in Unity 2026-02-01 11:44:07 -06:00
DesignJiggles 44179071da Trick animations 2026-02-01 11:43:03 -06:00
Walter 095296d5c2 Merge remote-tracking branch 'origin/loseScreen' into Losers 2026-02-01 10:04:12 -06:00
66 changed files with 2993 additions and 336 deletions
+9 -1
View File
@@ -55,7 +55,6 @@
<UnityVersion>6000.3.6f1</UnityVersion>
</PropertyGroup>
<ItemGroup>
<Analyzer Include="C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\Extensions\Microsoft\Visual Studio Tools for Unity\Analyzers\Microsoft.Unity.Analyzers.dll" />
<Analyzer Include="C:\Program Files\Unity\Hub\Editor\6000.3.6f1\Editor\Data\Tools\BuildPipeline\Unity.SourceGenerators\Unity.SourceGenerators.dll" />
<Analyzer Include="C:\Program Files\Unity\Hub\Editor\6000.3.6f1\Editor\Data\Tools\BuildPipeline\Unity.SourceGenerators\Unity.Properties.SourceGenerator.dll" />
<Analyzer Include="C:\Program Files\Unity\Hub\Editor\6000.3.6f1\Editor\Data\Tools\BuildPipeline\Unity.SourceGenerators\Unity.UIToolkit.SourceGenerator.dll" />
@@ -64,6 +63,7 @@
<Compile Include="Assets\Scripts\PlayerPlatformerController.cs" />
<Compile Include="Assets\Scripts\AutoSquareSprite.cs" />
<Compile Include="Assets\Scripts\ScoreManager.cs" />
<Compile Include="Assets\Scripts\LoseScreenController.cs" />
<Compile Include="Assets\Scripts\BasketController.cs" />
<Compile Include="Assets\Scripts\TrickCollisionManager.cs" />
<Compile Include="Assets\Scripts\Spawner.cs" />
@@ -74,10 +74,18 @@
<Compile Include="Assets\Scripts\TrickSpawnKeeper.cs" />
<Compile Include="Assets\Scripts\WinScreenController.cs" />
<Compile Include="Assets\Scripts\MainMenuController.cs" />
<Compile Include="Assets\Scripts\CreditsInputHandler.cs" />
<Compile Include="Assets\Scripts\LoseGuiController.cs" />
<Compile Include="Assets\Scripts\HealthGUIController.cs" />
<Compile Include="Assets\Scripts\PlayerAnimationController.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Assets\UI Toolkit\CreditsGUI.uxml" />
<None Include="Assets\ProgressBar.uss" />
<None Include="Assets\UI Toolkit\LoseScreen.uxml" />
<None Include="Assets\UI Toolkit\MainMenu.uxml" />
<None Include="Assets\UI Toolkit\WinScreenMenu.uxml" />
<None Include="Assets\UI Toolkit\progressBar.uss" />
<None Include="Assets\UI Toolkit\GameGUI.uxml" />
</ItemGroup>
<ItemGroup>
+27 -30
View File
@@ -135,6 +135,31 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-6621590539747483612
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: isCollapsed
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -1210443090960147805}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.7692308
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-6059084907828803585
AnimatorStateTransition:
m_ObjectHideFlags: 1
@@ -172,6 +197,7 @@ AnimatorState:
m_CycleOffset: 0
m_Transitions:
- {fileID: 3261478500395500566}
- {fileID: -6621590539747483612}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -251,9 +277,6 @@ AnimatorStateTransition:
- m_ConditionMode: 1
m_ConditionEvent: isJumping
m_EventTreshold: 0
- m_ConditionMode: 2
m_ConditionEvent: isRunning
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -5449330869365902308}
m_Solo: 0
@@ -303,8 +326,7 @@ AnimatorState:
m_Name: playerCollapse
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 7973517625427532113}
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@@ -758,28 +780,3 @@ AnimatorStateTransition:
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &7973517625427532113
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: isCollapsed
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 7407206800022927606}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.8148148
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
+507
View File
@@ -0,0 +1,507 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-7176864768252628929
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: 3924682234278278169}
m_Position: {x: 200, y: -100, z: 0}
- serializedVersion: 1
m_State: {fileID: 3116222879869427221}
m_Position: {x: 520, y: 180, z: 0}
- serializedVersion: 1
m_State: {fileID: 1594917217244520357}
m_Position: {x: 840, y: -90, z: 0}
- serializedVersion: 1
m_State: {fileID: 3768504715810617268}
m_Position: {x: 540, y: 10, 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: 840, y: 230, z: 0}
m_ParentStateMachinePosition: {x: 800, y: -10, z: 0}
m_DefaultState: {fileID: 3116222879869427221}
--- !u!1101 &-4504108645586745059
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: isOffGround
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 3768504715810617268}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-3643263675046006987
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: isOffGround
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 3116222879869427221}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-1921967270038087610
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: isEating
m_EventTreshold: 0
- m_ConditionMode: 1
m_ConditionEvent: isOffGround
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 3768504715810617268}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.8148148
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-1409712780965858046
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: isOffGround
m_EventTreshold: 0
- m_ConditionMode: 1
m_ConditionEvent: isEating
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1594917217244520357}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-519609199104655863
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: isRunning
m_EventTreshold: 0
- m_ConditionMode: 2
m_ConditionEvent: isEating
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 3924682234278278169}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.8148148
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-506803619347261511
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: isRunning
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 3924682234278278169}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Trick_Run01
serializedVersion: 5
m_AnimatorParameters:
- m_Name: isRunning
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: isEating
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- m_Name: isOffGround
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -7176864768252628929}
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}
--- !u!1102 &1594917217244520357
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: trickEat
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -519609199104655863}
- {fileID: 6349420664763589543}
- {fileID: -1921967270038087610}
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: a930c8538cf1c7b4bbd47edf4f9bb8d3, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &2531030499419578449
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: isEating
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1594917217244520357}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &3049280553798573243
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: isRunning
m_EventTreshold: 0
- m_ConditionMode: 1
m_ConditionEvent: isOffGround
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 3768504715810617268}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.25
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &3116222879869427221
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: trickIdle
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -506803619347261511}
- {fileID: 2531030499419578449}
- {fileID: -4504108645586745059}
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: e861fd09ae76e444f8ebbbba1d6ab5d2, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &3358836869250302114
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: isRunning
m_EventTreshold: 0
- m_ConditionMode: 2
m_ConditionEvent: isOffGround
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 3924682234278278169}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &3768504715810617268
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: trickLift
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -1409712780965858046}
- {fileID: 3358836869250302114}
- {fileID: -3643263675046006987}
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: d223f9c5556116945b032748b53bcd6d, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &3924682234278278169
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: trickRun
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 6866521670202303979}
- {fileID: 8154385789598599672}
- {fileID: 3049280553798573243}
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: ff7569c23aa5cef4b824a93bcea8697b, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &6349420664763589543
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: isEating
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 3116222879869427221}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.8148148
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &6866521670202303979
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: isRunning
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 3116222879869427221}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.25
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &8154385789598599672
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: isRunning
m_EventTreshold: 0
- m_ConditionMode: 1
m_ConditionEvent: isEating
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 1594917217244520357}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.25
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c4f171c0550c83640bad4a8bc02f1c73
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
+78
View File
@@ -0,0 +1,78 @@
%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: trickEat
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- serializedVersion: 2
curve:
- time: 0
value: {fileID: 21300000, guid: 17be6e62466f0724b94183c0a0c08c98, type: 3}
- time: 0.6666667
value: {fileID: 21300000, guid: 7bc3979f174775d48a870cd92d248c8a, type: 3}
- time: 1.3333334
value: {fileID: 21300000, guid: 7bc3979f174775d48a870cd92d248c8a, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
flags: 2
m_SampleRate: 60
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
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping:
- {fileID: 21300000, guid: 17be6e62466f0724b94183c0a0c08c98, type: 3}
- {fileID: 21300000, guid: 7bc3979f174775d48a870cd92d248c8a, type: 3}
- {fileID: 21300000, guid: 7bc3979f174775d48a870cd92d248c8a, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 1.35
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: []
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a930c8538cf1c7b4bbd47edf4f9bb8d3
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
+72
View File
@@ -0,0 +1,72 @@
%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: trickIdle
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- serializedVersion: 2
curve:
- time: 0
value: {fileID: 21300000, guid: 08c7a9f2d0233f54486212c4e188a636, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
flags: 2
m_SampleRate: 60
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
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping:
- {fileID: 21300000, guid: 08c7a9f2d0233f54486212c4e188a636, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.016666668
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: []
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e861fd09ae76e444f8ebbbba1d6ab5d2
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
+72
View File
@@ -0,0 +1,72 @@
%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: trickLift
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- serializedVersion: 2
curve:
- time: 0
value: {fileID: 21300000, guid: 4dfe135634e5a4c4abf33d465068efae, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
flags: 2
m_SampleRate: 60
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
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping:
- {fileID: 21300000, guid: 4dfe135634e5a4c4abf33d465068efae, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.016666668
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: []
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d223f9c5556116945b032748b53bcd6d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
+81
View File
@@ -0,0 +1,81 @@
%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: trickRun
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- serializedVersion: 2
curve:
- time: 0
value: {fileID: 21300000, guid: 9c5273d0f7687334ba77aa78d87131b9, type: 3}
- time: 0.083333336
value: {fileID: 21300000, guid: 7bdf67b11ab7f2140ab5a7254793f2a5, type: 3}
- time: 0.16666667
value: {fileID: 21300000, guid: 44140bf05832a3b48963f8ed4ef678af, type: 3}
- time: 0.25
value: {fileID: 21300000, guid: b5efff30f64bb4547bbaad03839b7a77, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
flags: 2
m_SampleRate: 12
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
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping:
- {fileID: 21300000, guid: 9c5273d0f7687334ba77aa78d87131b9, type: 3}
- {fileID: 21300000, guid: 7bdf67b11ab7f2140ab5a7254793f2a5, type: 3}
- {fileID: 21300000, guid: 44140bf05832a3b48963f8ed4ef678af, type: 3}
- {fileID: 21300000, guid: b5efff30f64bb4547bbaad03839b7a77, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.33333334
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: []
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ff7569c23aa5cef4b824a93bcea8697b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
Binary file not shown.

After

Width:  |  Height:  |  Size: 298 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 129 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 88 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 306 KiB

Binary file not shown.
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 MiB

+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 52e39c8db46e1704bb265f0e6a06cca0
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Binary file not shown.
+21
View File
@@ -0,0 +1,21 @@
fileFormatVersion: 2
guid: 23a53ce4db6308e4aa6b88d805455d1c
TrueTypeFontImporter:
externalObjects: {}
serializedVersion: 4
fontSize: 16
forceTextureCase: -2
characterSpacing: 0
characterPadding: 1
includeFontData: 1
fontNames:
- Press Start 2P
fallbackFontReferences: []
customCharacters:
fontRenderingMode: 0
ascentCalculationMode: 1
useLegacyBoundsCalculation: 0
shouldRoundAdvanceValue: 1
userData:
assetBundleName:
assetBundleVariant:
+81 -1
View File
@@ -32,6 +32,15 @@
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Heal",
"type": "Button",
"id": "96a3c855-05a0-4431-961e-d2552c539bf0",
"expectedControlType": "",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
@@ -221,6 +230,17 @@
"action": "Interact",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "95d44eae-cbf8-4ad2-9dc3-9e8524118e9f",
"path": "<Gamepad>/buttonNorth",
"interactions": "",
"processors": "",
"groups": ";Gamepad",
"action": "Heal",
"isComposite": false,
"isPartOfComposite": false
}
]
},
@@ -254,6 +274,15 @@
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Heal",
"type": "Button",
"id": "d384b3b4-cc86-4a73-a97f-0d04e31417a8",
"expectedControlType": "",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
@@ -268,6 +297,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "d952c2fd-e0f5-4ab9-bbbd-2af129855725",
"path": "<Gamepad>/buttonNorth",
"interactions": "",
"processors": "",
"groups": ";Gamepad",
"action": "Heal",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "0bb7b65d-0e9d-4a2a-8bd4-35a4d9f5b7a2",
@@ -322,6 +362,15 @@
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Heal",
"type": "Button",
"id": "56e697eb-9ef8-4e3d-9671-74da02a08793",
"expectedControlType": "",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
@@ -336,6 +385,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "bcba7833-70cc-40cf-aa96-a824333c9112",
"path": "<Gamepad>/buttonNorth",
"interactions": "",
"processors": "",
"groups": ";Gamepad",
"action": "Heal",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "a91fe28e-bdb1-4a19-b09b-9bb52dc0940c",
@@ -390,6 +450,15 @@
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Heal",
"type": "Button",
"id": "7eee99e7-4426-4f8f-812f-0562adbbbbd3",
"expectedControlType": "",
"processors": "",
"interactions": "",
"initialStateCheck": false
}
],
"bindings": [
@@ -404,6 +473,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "f5d22357-bf6c-456d-95bb-057bd7d482f9",
"path": "<Gamepad>/buttonNorth",
"interactions": "",
"processors": "",
"groups": ";Gamepad",
"action": "Heal",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "0f15df45-ecb7-4a35-8e06-293d50b89001",
@@ -1007,4 +1087,4 @@
]
}
]
}
}
Binary file not shown.
+23
View File
@@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: 97e042eab07ce4b42ab1cde5b30df526
AudioImporter:
externalObjects: {}
serializedVersion: 8
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:
+55
View File
@@ -0,0 +1,55 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8062391313330381747
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 191492520573121038}
- component: {fileID: 2630265126968092202}
m_Layer: 0
m_Name: EnemyBarrier
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &191492520573121038
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8062391313330381747}
serializedVersion: 2
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: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &2630265126968092202
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8062391313330381747}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1.6092091, y: 10.161938, z: 1}
m_Center: {x: 7.4978, y: -0.040241957, z: 0}
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: dd978b6bbfaf7864dbb3a6ec7b2851ba
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
+44 -2
View File
@@ -16,6 +16,8 @@ GameObject:
- component: {fileID: 7763498473808654306}
- component: {fileID: 3659140714710275197}
- component: {fileID: 9133098163257611752}
- component: {fileID: 4619270190355407300}
- component: {fileID: 72138333084358172}
m_Layer: 6
m_Name: Player
m_TagString: Untagged
@@ -199,6 +201,7 @@ MonoBehaviour:
actionMapName: Player
moveActionName: Move
jumpActionName: Jump
healActionName: Heal
controlSchemeName: Gamepad
gamepadIndex: 0
moveSpeed: 6
@@ -229,8 +232,10 @@ MonoBehaviour:
throwChargeTime: 0.75
throwUpwardForce: 0
throwTriggerThreshold: 0.6
dropClearance: 0.2
holdPoint: {fileID: 5569302833446856119}
pickupRange: 1
heldObject: {fileID: 0}
--- !u!114 &9133098163257611752
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -243,9 +248,46 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: b88e05c37f07ccf48bcc436a9d7def5d, type: 3}
m_Name:
m_EditorClassIdentifier: '::'
pickupController: {fileID: 0}
pickupController: {fileID: 3659140714710275197}
currentStress: 0
maxStress: 100
isPanicking: 0
isParalyzed: 0
paralyseDuration: 1.2
--- !u!95 &4619270190355407300
Animator:
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3937090937419967315}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 86632cb6b3835a44e87fb6f039478d61, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_AnimatePhysics: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &72138333084358172
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3937090937419967315}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fdb391b004c27a64da8f6922aab5512e, type: 3}
m_Name:
m_EditorClassIdentifier: '::'
--- !u!1 &6898135930931977916
GameObject:
m_ObjectHideFlags: 0
@@ -272,7 +314,7 @@ Transform:
m_GameObject: {fileID: 6898135930931977916}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.18, y: 1.58, z: 0}
m_LocalPosition: {x: -0.18, y: 1.95, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
+3
View File
@@ -0,0 +1,3 @@
:root {
}
+12
View File
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 71c3121e1dfba1d4996a4dbee8b00bf3
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
disableValidation: 0
unsupportedSelectorAction: 0
+336
View File
@@ -0,0 +1,336 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
OcclusionCullingSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: 0.25
backfaceThreshold: 100
m_SceneGUID: 00000000000000000000000000000000
m_OcclusionCullingData: {fileID: 0}
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 10
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
m_FogDensity: 0.01
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 3
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
m_DefaultReflectionMode: 0
m_DefaultReflectionResolution: 128
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 13
m_BakeOnSceneLoad: 0
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
m_IndirectOutputScale: 1
m_AlbedoBoost: 1
m_EnvironmentLightingMode: 0
m_EnableBakedLightmaps: 0
m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings:
serializedVersion: 12
m_Resolution: 2
m_BakeResolution: 40
m_AtlasSize: 1024
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAmbientOcclusion: 0
m_Padding: 2
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 1
m_ReflectionCompression: 2
m_MixedBakeMode: 2
m_BakeBackend: 2
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 512
m_PVRBounces: 2
m_PVREnvironmentSampleCount: 256
m_PVREnvironmentReferencePointCount: 2048
m_PVRFilteringMode: 1
m_PVRDenoiserTypeDirect: 1
m_PVRDenoiserTypeIndirect: 1
m_PVRDenoiserTypeAO: 1
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVREnvironmentMIS: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 1
m_PVRFilteringGaussRadiusAO: 1
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0}
m_LightingSettings: {fileID: 0}
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 3
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
agentSlope: 45
agentClimb: 0.4
ledgeDropHeight: 0
maxJumpAcrossDistance: 0
minRegionArea: 2
manualCellSize: 0
cellSize: 0.16666667
manualTileSize: 0
tileSize: 256
buildHeightMesh: 0
maxJobWorkers: 0
preserveTilesOutsideBounds: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &461397040
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 461397041}
- component: {fileID: 461397042}
- component: {fileID: 461397043}
m_Layer: 5
m_Name: Credits UI
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &461397041
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 461397040}
serializedVersion: 2
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: 1773484769}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &461397042
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 461397040}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier: UnityEngine.dll::UnityEngine.UIElements.UIDocument
m_PanelSettings: {fileID: 11400000, guid: 850db338bdc23ce4bb011b1e30c2d7fb, type: 2}
m_ParentUI: {fileID: 0}
sourceAsset: {fileID: 9197481963319205126, guid: b0e6461d318f32d4fac4a5ef05bb6015, type: 3}
m_SortingOrder: 0
m_Position: 0
m_WorldSpaceSizeMode: 1
m_WorldSpaceWidth: 1920
m_WorldSpaceHeight: 1080
m_PivotReferenceSize: 0
m_Pivot: 0
m_WorldSpaceCollider: {fileID: 0}
--- !u!114 &461397043
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 461397040}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: df3455d232d364f4b809e3308d7b42b2, type: 3}
m_Name:
m_EditorClassIdentifier: '::'
buttonNames:
- Back
sceneNames:
- MainMenu
--- !u!1 &1773484766
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1773484769}
- component: {fileID: 1773484768}
- component: {fileID: 1773484767}
- component: {fileID: 1773484770}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!81 &1773484767
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1773484766}
m_Enabled: 1
--- !u!20 &1773484768
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1773484766}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 4
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_Iso: 200
m_ShutterSpeed: 0.005
m_Aperture: 16
m_FocusDistance: 10
m_FocalLength: 50
m_BladeCount: 5
m_Curvature: {x: 2, y: 11}
m_BarrelClipping: 0.25
m_Anamorphism: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!4 &1773484769
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1773484766}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 461397041}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1773484770
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1773484766}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData
m_RenderShadows: 1
m_RequiresDepthTextureOption: 2
m_RequiresOpaqueTextureOption: 2
m_CameraType: 0
m_Cameras: []
m_RendererIndex: -1
m_VolumeLayerMask:
serializedVersion: 2
m_Bits: 1
m_VolumeTrigger: {fileID: 0}
m_VolumeFrameworkUpdateModeOption: 2
m_RenderPostProcessing: 0
m_Antialiasing: 0
m_AntialiasingQuality: 2
m_StopNaN: 0
m_Dithering: 0
m_ClearDepth: 1
m_AllowXRRendering: 1
m_AllowHDROutput: 1
m_UseScreenCoordOverride: 0
m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
m_RequiresDepthTexture: 0
m_RequiresColorTexture: 0
m_TaaSettings:
m_Quality: 3
m_FrameInfluence: 0.1
m_JitterScale: 1
m_MipBias: 0
m_VarianceClampScale: 0.9
m_ContrastAdaptiveSharpening: 0
m_Version: 2
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
m_Roots:
- {fileID: 1773484769}
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 08e6b38f452419e4480fc1510dc9a2de
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
+290 -220
View File
@@ -185,7 +185,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3937090937419967315, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
propertyPath: m_Name
value: Player (4)
value: Player3 (4)
objectReference: {fileID: 0}
- target: {fileID: 7763498473808654306, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
propertyPath: moveSpeed
@@ -203,6 +203,10 @@ PrefabInstance:
propertyPath: actionMapName
value: Player2
objectReference: {fileID: 0}
- target: {fileID: 7763498473808654306, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
propertyPath: healActionName
value: Heal
objectReference: {fileID: 0}
- target: {fileID: 7763498473808654306, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
propertyPath: controlSchemeName
value: Gamepad
@@ -211,6 +215,18 @@ PrefabInstance:
propertyPath: m_GravityScale
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8870760143677714522, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
propertyPath: m_Color.b
value: 0.5896226
objectReference: {fileID: 0}
- target: {fileID: 8870760143677714522, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
propertyPath: m_Color.g
value: 0.99573493
objectReference: {fileID: 0}
- target: {fileID: 8870760143677714522, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
propertyPath: m_Color.r
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -227,6 +243,7 @@ GameObject:
- component: {fileID: 375061916}
- component: {fileID: 375061915}
- component: {fileID: 375061917}
- component: {fileID: 375061918}
m_Layer: 5
m_Name: GameGUI
m_TagString: Untagged
@@ -285,6 +302,24 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::ScoreManager
Score: 0
--- !u!114 &375061918
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 375061914}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 09397b12132be4248998c82e96a8b7c4, type: 3}
m_Name:
m_EditorClassIdentifier: '::'
images:
- {fileID: 21300000, guid: 03a067405c8cfa945a9ed2e8ff6a71dd, type: 3}
- {fileID: 21300000, guid: 4dca6d41e377b4b47ab35b821674514c, type: 3}
- {fileID: 21300000, guid: 8abb37071992fbc449fda9db6b2d86f4, type: 3}
- {fileID: 21300000, guid: 4b346aed0900f3c469fd51c6fa693e49, type: 3}
- {fileID: 21300000, guid: 33f209566f1f6ca44a4c7ae3f01d9bf5, type: 3}
--- !u!1001 &377513953
PrefabInstance:
m_ObjectHideFlags: 0
@@ -369,6 +404,14 @@ PrefabInstance:
propertyPath: actionMapName
value: Player2
objectReference: {fileID: 0}
- target: {fileID: 7763498473808654306, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
propertyPath: healActionName
value: Heal
objectReference: {fileID: 0}
- target: {fileID: 7763498473808654306, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
propertyPath: jumpActionName
value: Jump
objectReference: {fileID: 0}
- target: {fileID: 7763498473808654306, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
propertyPath: controlSchemeName
value: Gamepad
@@ -377,6 +420,18 @@ PrefabInstance:
propertyPath: m_GravityScale
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8870760143677714522, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
propertyPath: m_Color.b
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8870760143677714522, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
propertyPath: m_Color.g
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8870760143677714522, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
propertyPath: m_Color.r
value: 0.654902
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -722,8 +777,8 @@ Camera:
m_GameObject: {fileID: 486463122}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_ClearFlags: 2
m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
@@ -833,8 +888,9 @@ GameObject:
m_Component:
- component: {fileID: 491328828}
- component: {fileID: 491328827}
- component: {fileID: 491328829}
m_Layer: 0
m_Name: WinManager
m_Name: GameManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -868,6 +924,18 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &491328829
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 491328826}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f5cdb566677d77e438cdf195197a5b85, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::LoseScreenController
--- !u!1 &495541363
GameObject:
m_ObjectHideFlags: 0
@@ -1144,6 +1212,135 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &738367606
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 738367608}
- component: {fileID: 738367607}
m_Layer: 0
m_Name: GameMusic
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!82 &738367607
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 738367606}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_Resource: {fileID: 8300000, guid: 97e042eab07ce4b42ab1cde5b30df526, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 1
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 &738367608
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 738367606}
serializedVersion: 2
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: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &792686806
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1196,6 +1393,22 @@ PrefabInstance:
propertyPath: m_Name
value: Player (1)
objectReference: {fileID: 0}
- target: {fileID: 7763498473808654306, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
propertyPath: healActionName
value: Heal
objectReference: {fileID: 0}
- target: {fileID: 8870760143677714522, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
propertyPath: m_Color.b
value: 0.6462264
objectReference: {fileID: 0}
- target: {fileID: 8870760143677714522, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
propertyPath: m_Color.g
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8870760143677714522, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
propertyPath: m_Color.r
value: 0.71244085
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -1477,58 +1690,6 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &908853548
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 908853550}
- component: {fileID: 908853549}
m_Layer: 0
m_Name: Treat Spawner BL
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &908853549
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 908853548}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 14b0bf07aa1abc44a8ebd00cecacd6f4, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Spawner
objectToSpawn: {fileID: 262983251238298495, guid: 80c527a86ad6fc34dbc73ee80c1f2951, type: 3}
spawnInterval: 5
maxAlive: 0
spawnOnStart: 1
repeatSpawns: 1
launchForce: 0
launchRandomAngle: 0
spinSpeed: 0
--- !u!4 &908853550
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 908853548}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -4.5, y: -2, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1063739947
GameObject:
m_ObjectHideFlags: 0
@@ -1637,7 +1798,59 @@ Transform:
m_GameObject: {fileID: 1063739947}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 8.13, y: 0.17, z: 0}
m_LocalPosition: {x: 8.13, y: 2.32, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &908853548
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 908853550}
- component: {fileID: 908853549}
m_Layer: 0
m_Name: Treat Spawner BL
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &908853549
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 908853548}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 14b0bf07aa1abc44a8ebd00cecacd6f4, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Spawner
objectToSpawn: {fileID: 262983251238298495, guid: 80c527a86ad6fc34dbc73ee80c1f2951, type: 3}
spawnInterval: 5
maxAlive: 0
spawnOnStart: 1
repeatSpawns: 1
launchForce: 0
launchRandomAngle: 0
spinSpeed: 0
--- !u!4 &908853550
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 908853548}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -4.5, y: -2, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -1679,6 +1892,7 @@ MonoBehaviour:
actionMapName: Player
moveActionName: Move
jumpActionName: Jump
healActionName: Heal
controlSchemeName:
gamepadIndex: -1
moveSpeed: 6
@@ -1980,58 +2194,6 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 99cce68fc82caea44b5a140697be00a8, type: 3}
--- !u!1 &1466477811
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1466477813}
- component: {fileID: 1466477812}
m_Layer: 0
m_Name: Treat Spawner TL
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1466477812
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1466477811}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 14b0bf07aa1abc44a8ebd00cecacd6f4, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Spawner
objectToSpawn: {fileID: 262983251238298495, guid: 80c527a86ad6fc34dbc73ee80c1f2951, type: 3}
spawnInterval: 5
maxAlive: 0
spawnOnStart: 1
repeatSpawns: 1
launchForce: 0
launchRandomAngle: 0
spinSpeed: 0
--- !u!4 &1466477813
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1466477811}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2.42, y: 2.93, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1654086541
GameObject:
m_ObjectHideFlags: 0
@@ -2254,6 +2416,10 @@ PrefabInstance:
propertyPath: actionMapName
value: Player2
objectReference: {fileID: 0}
- target: {fileID: 7763498473808654306, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
propertyPath: healActionName
value: Heal
objectReference: {fileID: 0}
- target: {fileID: 7763498473808654306, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
propertyPath: controlSchemeName
value: Gamepad
@@ -2262,115 +2428,23 @@ PrefabInstance:
propertyPath: m_GravityScale
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8870760143677714522, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
propertyPath: m_Color.b
value: 0.7791217
objectReference: {fileID: 0}
- target: {fileID: 8870760143677714522, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
propertyPath: m_Color.g
value: 0.69411767
objectReference: {fileID: 0}
- target: {fileID: 8870760143677714522, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
propertyPath: m_Color.r
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
--- !u!1 &1759124602
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1759124604}
- component: {fileID: 1759124603}
m_Layer: 0
m_Name: Treat Spawner TR
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1759124603
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1759124602}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 14b0bf07aa1abc44a8ebd00cecacd6f4, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Spawner
objectToSpawn: {fileID: 262983251238298495, guid: 80c527a86ad6fc34dbc73ee80c1f2951, type: 3}
spawnInterval: 5
maxAlive: 0
spawnOnStart: 1
repeatSpawns: 1
launchForce: 0
launchRandomAngle: 0
spinSpeed: 0
--- !u!4 &1759124604
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1759124602}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2.88, y: 2.69, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1830238251
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1830238253}
- component: {fileID: 1830238252}
m_Layer: 0
m_Name: Treat Spawner BR
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1830238252
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1830238251}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 14b0bf07aa1abc44a8ebd00cecacd6f4, type: 3}
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Spawner
objectToSpawn: {fileID: 262983251238298495, guid: 80c527a86ad6fc34dbc73ee80c1f2951, type: 3}
spawnInterval: 5
maxAlive: 0
spawnOnStart: 1
repeatSpawns: 1
launchForce: 0
launchRandomAngle: 0
spinSpeed: 0
--- !u!4 &1830238253
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1830238251}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 4.5, y: -2, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2057686360
GameObject:
m_ObjectHideFlags: 0
@@ -2806,13 +2880,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier: Assembly-CSharp::Spawner
objectToSpawn: {fileID: 262983251238298495, guid: 80c527a86ad6fc34dbc73ee80c1f2951, type: 3}
spawnInterval: 5
spawnInterval: 1.5
maxAlive: 0
spawnOnStart: 1
repeatSpawns: 1
launchForce: 4
launchRandomAngle: 360
spinSpeed: 180
spinSpeed: 100
--- !u!1001 &1760117322204329348
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2904,10 +2978,6 @@ SceneRoots:
- {fileID: 1760117322204329348}
- {fileID: 1277412258}
- {fileID: 1227312797}
- {fileID: 1830238253}
- {fileID: 908853550}
- {fileID: 1466477813}
- {fileID: 1759124604}
- {fileID: 792686806}
- {fileID: 1685410085}
- {fileID: 377513953}
@@ -2916,5 +2986,5 @@ SceneRoots:
- {fileID: 2100000001}
- {fileID: 2100000101}
- {fileID: 2200000001}
- {fileID: 1063739950}
- {fileID: 491328828}
- {fileID: 738367608}
+58
View File
@@ -129,6 +129,7 @@ GameObject:
m_Component:
- component: {fileID: 159786491}
- component: {fileID: 159786490}
- component: {fileID: 159786492}
m_Layer: 5
m_Name: UIdocument
m_TagString: Untagged
@@ -174,6 +175,18 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &159786492
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 159786489}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9c38ae32eef77b54bb36b487e11c7422, type: 3}
m_Name:
m_EditorClassIdentifier: '::'
--- !u!1 &168139977
GameObject:
m_ObjectHideFlags: 0
@@ -185,6 +198,7 @@ GameObject:
- component: {fileID: 168139980}
- component: {fileID: 168139979}
- component: {fileID: 168139978}
- component: {fileID: 168139981}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
@@ -266,6 +280,50 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &168139981
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 168139977}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData
m_RenderShadows: 1
m_RequiresDepthTextureOption: 2
m_RequiresOpaqueTextureOption: 2
m_CameraType: 0
m_Cameras: []
m_RendererIndex: -1
m_VolumeLayerMask:
serializedVersion: 2
m_Bits: 1
m_VolumeTrigger: {fileID: 0}
m_VolumeFrameworkUpdateModeOption: 2
m_RenderPostProcessing: 0
m_Antialiasing: 0
m_AntialiasingQuality: 2
m_StopNaN: 0
m_Dithering: 0
m_ClearDepth: 1
m_AllowXRRendering: 1
m_AllowHDROutput: 1
m_UseScreenCoordOverride: 0
m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
m_RequiresDepthTexture: 0
m_RequiresColorTexture: 0
m_TaaSettings:
m_Quality: 3
m_FrameInfluence: 0.1
m_JitterScale: 1
m_MipBias: 0
m_VarianceClampScale: 0.9
m_ContrastAdaptiveSharpening: 0
m_Version: 2
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
+2
View File
@@ -191,10 +191,12 @@ MonoBehaviour:
- Start
- Experiment
- Level2
- Credits
sceneNames:
- Level1
- Experiment
- Level2
- Credits
--- !u!1 &519420028
GameObject:
m_ObjectHideFlags: 0
+200
View File
@@ -1,8 +1,27 @@
using System.Collections.Generic;
using UnityEngine;
public class BasketController : MonoBehaviour
{
public ScoreManager scoreManager;
[SerializeField] private Transform basketHoldPoint;
[SerializeField] private LayerMask trickDetectMask = ~0;
[SerializeField] private float basketSpawnInterval = 3f;
private readonly Collider2D[] overlapHits = new Collider2D[8];
private BoxCollider2D basketCollider;
private TrickController currentTrick;
private float nextBasketSpawnTime;
private void Awake()
{
basketCollider = GetComponent<BoxCollider2D>();
}
private void FixedUpdate()
{
RefreshTricksInBasket();
TryBasketSpawn();
}
private void OnCollisionEnter2D(Collision2D collision)
{
@@ -12,12 +31,193 @@ public class BasketController : MonoBehaviour
{
if (collision.gameObject.GetComponent<TrickController>() != null)
{
RegisterTrick(collision.gameObject);
return;
}
RefreshTricksInBasket();
if (currentTrick != null)
{
return;
}
scoreManager.AddPoints(1);
GameObject.Destroy(collision.gameObject);
}
}
private void OnCollisionExit2D(Collision2D collision)
{
UnregisterTrick(collision.gameObject);
}
private void OnTriggerEnter2D(Collider2D other)
{
if (!other.CompareTag("Interactable"))
{
return;
}
if (other.GetComponent<TrickController>() != null)
{
RegisterTrick(other.gameObject);
}
}
private void OnTriggerExit2D(Collider2D other)
{
UnregisterTrick(other.gameObject);
}
private void RegisterTrick(GameObject obj)
{
if (obj.TryGetComponent<TrickController>(out var trick))
{
if (currentTrick != null && currentTrick != trick)
{
return;
}
currentTrick = trick;
trick.SetBasketed(true, GetBasketAnchorPosition(trick));
nextBasketSpawnTime = Time.time + basketSpawnInterval;
}
}
private void UnregisterTrick(GameObject obj)
{
if (obj == null)
{
return;
}
if (obj.TryGetComponent<TrickController>(out var trick))
{
if (currentTrick == trick)
{
currentTrick = null;
trick.SetBasketed(false);
nextBasketSpawnTime = 0f;
}
}
}
private void RefreshTricksInBasket()
{
if (basketCollider == null)
{
return;
}
var filter = new ContactFilter2D();
filter.SetLayerMask(trickDetectMask);
filter.useTriggers = true;
var hitCount = basketCollider.Overlap(filter, overlapHits);
for (var i = 0; i < hitCount; i++)
{
var hit = overlapHits[i];
if (hit == null || !hit.CompareTag("Interactable"))
{
continue;
}
if (hit.TryGetComponent<TrickController>(out var trick))
{
if (currentTrick == null)
{
currentTrick = trick;
trick.SetBasketed(true, GetBasketAnchorPosition(trick));
nextBasketSpawnTime = Time.time + basketSpawnInterval;
}
break;
}
}
if (currentTrick == null)
{
return;
}
if (currentTrick.IsCarried)
{
currentTrick.SetBasketed(false);
currentTrick = null;
nextBasketSpawnTime = 0f;
return;
}
var stillInside = false;
for (var i = 0; i < hitCount; i++)
{
var hit = overlapHits[i];
if (hit == null || !hit.CompareTag("Interactable"))
{
continue;
}
if (hit.TryGetComponent<TrickController>(out var trick) && trick == currentTrick)
{
stillInside = true;
break;
}
}
if (!stillInside)
{
currentTrick.SetBasketed(false);
currentTrick = null;
nextBasketSpawnTime = 0f;
}
}
private void TryBasketSpawn()
{
if (currentTrick == null || basketSpawnInterval <= 0f)
{
return;
}
if (Time.time < nextBasketSpawnTime)
{
return;
}
TrickController.TrySpawnAt(currentTrick.transform.position);
nextBasketSpawnTime = Time.time + basketSpawnInterval;
}
private Vector2? GetBasketAnchorPosition(TrickController trick)
{
if (basketHoldPoint != null)
{
return OffsetForTrickHeight(basketHoldPoint.position, trick);
}
if (basketCollider != null)
{
return OffsetForTrickHeight(basketCollider.bounds.center, trick);
}
return null;
}
private Vector2 OffsetForTrickHeight(Vector2 anchor, TrickController trick)
{
if (trick == null)
{
return anchor;
}
var renderer = trick.GetComponent<SpriteRenderer>();
if (renderer == null)
{
return anchor;
}
anchor.y += renderer.bounds.size.y * 0.5f;
return anchor;
}
}
+63
View File
@@ -0,0 +1,63 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UIElements;
public class CreditsInputHandler : MonoBehaviour
{
[SerializeField] private List<string> buttonNames = new List<string> { "Back" };
[SerializeField] private List<string> sceneNames = new List<string> { "MainMenu" };
private UIDocument uiDocument;
private List<Button> buttons;
private void OnEnable()
{
uiDocument ??= GetComponent<UIDocument>();
if (uiDocument == null)
{
return;
}
var root = uiDocument.rootVisualElement;
if (root == null)
{
return;
}
buttons = new List<Button> { new Button() };
for (int i = 0; i < buttons.Count; i++)
{
int buttonIndex = i;
buttons[i] = root.Q<Button>(buttonNames[i]);
if (buttons[i] == null)
{
continue;
}
buttons[i].clicked += () => HandleStartClicked(sceneNames[buttonIndex]);
}
}
private void OnDisable()
{
for (int i = 0; i < buttons.Count; i++)
{
if (buttons[i] == null)
{
continue;
}
buttons[i].clicked -= () => HandleStartClicked(buttonNames[i]);
}
}
private void HandleStartClicked(string sceneName)
{
if (!string.IsNullOrWhiteSpace(sceneName))
{
SceneManager.LoadScene(sceneName);
}
}
}
@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: df3455d232d364f4b809e3308d7b42b2
+84
View File
@@ -0,0 +1,84 @@
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using UnityEngine.UIElements;
using static UnityEditor.Experimental.GraphView.GraphView;
public class HealthGUIController : MonoBehaviour
{
private List<PlayerStressController> players;
public List<Sprite> images;
private UIDocument uiDocument;
private List<Image> playerLifeList;
private List<ProgressBar> playerStressBarList;
void Awake()
{
players = Object.FindObjectsByType<PlayerStressController>(FindObjectsSortMode.InstanceID).ToList();
uiDocument ??= GetComponent<UIDocument>();
if (uiDocument == null)
{
return;
}
var root = uiDocument.rootVisualElement;
if (root == null)
{
return;
}
playerLifeList = new List<Image>() { new Image(), new Image(), new Image(), new Image() };
playerStressBarList = new List<ProgressBar>() { new ProgressBar(), new ProgressBar(), new ProgressBar(), new ProgressBar() };
playerLifeList[0] = root.Q<Image>("Player1Life");
playerLifeList[1] = root.Q<Image>("Player2Life");
playerLifeList[2] = root.Q<Image>("Player3Life");
playerLifeList[3] = root.Q<Image>("Player4Life");
playerLifeList[0].tintColor = players[0].gameObject.GetComponent<SpriteRenderer>() ? players[0].gameObject.GetComponent<SpriteRenderer>().color : Color.white;
playerLifeList[1].tintColor = players[1].gameObject.GetComponent<SpriteRenderer>() ? players[1].gameObject.GetComponent<SpriteRenderer>().color : Color.white;
playerLifeList[2].tintColor = players[2].gameObject.GetComponent<SpriteRenderer>() ? players[2].gameObject.GetComponent<SpriteRenderer>().color : Color.white;
playerLifeList[3].tintColor = players[3].gameObject.GetComponent<SpriteRenderer>() ? players[3].gameObject.GetComponent<SpriteRenderer>().color : Color.white;
playerStressBarList[0] = root.Q<ProgressBar>("Player1StressBar");
playerStressBarList[1] = root.Q<ProgressBar>("Player2StressBar");
playerStressBarList[2] = root.Q<ProgressBar>("Player3StressBar");
playerStressBarList[3] = root.Q<ProgressBar>("Player4StressBar");
}
// Update is called once per frame
void Update()
{
for (int i = 0; i < players.Count; i++)
{
//update stress bar
float ratio = Mathf.Clamp01(players[i].currentStress / players[i].maxStress);
// Update the bar's value (0-100)
playerStressBarList[i].value = ratio * 100f;
//update sprite
playerLifeList[i].sprite = players[i].currentStress switch
{
>= 0 and <= 33 => images[0],
> 33 and <= 66 => images[1],
> 66 and <= 99 => images[2],
_ => images[0]
};
if (players[i].isParalyzed)
{
playerLifeList[i].sprite = images[3];
}
else if (players[i].isPanicking)
{
playerLifeList[i].sprite = images[4];
}
}
}
}
@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 09397b12132be4248998c82e96a8b7c4
+37
View File
@@ -0,0 +1,37 @@
using UnityEngine;
using UnityEngine.SceneManagement;
using UnityEngine.UIElements;
public class LoseGuiController : MonoBehaviour
{
private UIDocument uiDocument;
private Button button;
// Start is called once before the first execution of Update after the MonoBehaviour is created
private void OnEnable()
{
uiDocument ??= GetComponent<UIDocument>();
if (uiDocument == null)
{
return;
}
var root = uiDocument.rootVisualElement;
if (root == null)
{
return;
}
button = root.Q<Button>("Button");
button.clicked += () => HandleClick("MainMenu");
}
private void HandleClick(string sceneName)
{
if (!string.IsNullOrWhiteSpace(sceneName))
{
SceneManager.LoadScene(sceneName);
}
}
}
+2
View File
@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 9c38ae32eef77b54bb36b487e11c7422
+3 -5
View File
@@ -8,19 +8,18 @@ public class LoseScreenController : MonoBehaviour
[SerializeField]private const string LoseSceneName = "Lose";
private List<PlayerStressController> players;
private bool hasLost = false;
void Awake()
{
players = FindObjectsOfType<PlayerStressController>().ToList();
players = Object.FindObjectsByType<PlayerStressController>(FindObjectsSortMode.None).ToList();
}
void Update()
{
if (hasLost || players.Count == 0)
if (players.Count == 0)
return;
if (players.All(p => p.IsPanicking))
if (players.All(p => p.isPanicking))
{
TriggerLose();
}
@@ -28,7 +27,6 @@ public class LoseScreenController : MonoBehaviour
void TriggerLose()
{
hasLost = true;
SceneManager.LoadScene(LoseSceneName);
}
}
+3 -3
View File
@@ -5,8 +5,8 @@ using UnityEngine.UIElements;
public class MainMenuController : MonoBehaviour
{
[SerializeField] private List<string> buttonNames = new List<string> { "Start", "Experiment", "Level2" };
[SerializeField] private List<string> sceneNames = new List<string> { "Level1", "Experiment", "Level2" };
[SerializeField] private List<string> buttonNames = new List<string> { "Start", "Experiment", "Level2", "Credits" };
[SerializeField] private List<string> sceneNames = new List<string> { "Level1", "Experiment", "Level2", "Credits" };
private UIDocument uiDocument;
private List<Button> buttons;
@@ -24,7 +24,7 @@ public class MainMenuController : MonoBehaviour
return;
}
buttons = new List<Button> { new Button(), new Button(), new Button() };
buttons = new List<Button> { new Button(), new Button(), new Button(), new Button() };
for (int i = 0; i < buttons.Count; i++)
{
int buttonIndex = i;
@@ -0,0 +1,10 @@
using UnityEngine;
public class PlayerAnimationController : MonoBehaviour
{
// Update is called once per frame
void Update()
{
}
}
@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: fdb391b004c27a64da8f6922aab5512e
+77 -21
View File
@@ -18,19 +18,31 @@ public class PlayerPickupController : MonoBehaviour
[SerializeField] private float throwUpwardForce = 0f;
[SerializeField] private float throwTriggerThreshold = 0.6f;
[SerializeField] private float dropClearance = 0.2f;
[SerializeField] private float holdToSpawnTime = 3f;
[Header("Setup")]
public Transform holdPoint; // Empty GameObject above head
public float pickupRange = 2.0f;
private GameObject heldObject;
public GameObject heldObject;
private Rigidbody2D heldBody;
private float heldBodyMass;
private float heldBodyGravity;
private RigidbodyType2D heldBodyType;
private bool heldBodySimulated;
private PlayerPlatformerController platformerController;
private PlayerStressController playerStressController;
private bool isChargingThrow;
private float throwChargeStartTime;
private float holdStartTime;
private bool spawnedDuringHold;
private float nextHoldSpawnTime;
private void OnEnable()
{
platformerController = GetComponent<PlayerPlatformerController>();
playerStressController = GetComponent<PlayerStressController>();
if (inputActions == null)
{
Debug.LogError("PlayerPickupController missing InputActionAsset reference.", this);
@@ -76,10 +88,10 @@ public class PlayerPickupController : MonoBehaviour
private void OnInteractPerformed(InputAction.CallbackContext context)
{
Debug.Log("Interact action performed");
if(heldObject != null)
if (playerStressController.isPanicking) return;
if (heldObject != null)
{
Debug.Log("Dropping held object");
DropObject(false);
return;
}
@@ -94,11 +106,32 @@ public class PlayerPickupController : MonoBehaviour
return;
}
if(playerStressController.isPanicking)
{
DropObject(false);
return;
}
if (!heldObject.TryGetComponent<TrickController>(out _))
{
return;
}
if (Time.time >= nextHoldSpawnTime)
{
if (heldObject == null)
{
return;
}
if (!TrickController.TrySpawnFromPrefabAt(heldObject.transform.position))
{
TrickController.TrySpawnAt(heldObject.transform.position);
}
spawnedDuringHold = true;
nextHoldSpawnTime = Time.time + holdToSpawnTime;
}
var gamepad = GetGamepad();
if (gamepad == null)
{
@@ -118,13 +151,15 @@ public class PlayerPickupController : MonoBehaviour
{
DropObject(true);
}
}
void TryPickUp()
{
// Find all colliders within range
Collider2D[] colliders = Physics2D.OverlapCircleAll(transform.position, pickupRange);
Debug.Log(colliders.Length + " colliders found in range");
foreach (var col in colliders)
{
if (col.gameObject == gameObject)
@@ -134,31 +169,45 @@ public class PlayerPickupController : MonoBehaviour
var hasTrick = col.TryGetComponent<TrickController>(out var trick);
var hasPlayer = col.TryGetComponent<PlayerPlatformerController>(out var playerController);
if (hasPlayer) continue;
if (!hasTrick && !hasPlayer && !col.CompareTag("Interactable"))
{
continue;
}
heldObject = col.gameObject;
holdStartTime = Time.time;
spawnedDuringHold = false;
nextHoldSpawnTime = holdStartTime + holdToSpawnTime;
// Parent the object to the HoldPoint and reset its local position
heldObject.transform.SetParent(holdPoint);
heldObject.transform.localPosition = Vector3.zero;
heldObject.transform.localRotation = Quaternion.identity;
// Disable physics so it doesn't fall or collide with the player
if (heldObject.TryGetComponent<Rigidbody2D>(out Rigidbody2D rb))
{
rb.bodyType = RigidbodyType2D.Kinematic;
rb.gravityScale = 0;
rb.mass = 0;
}
if (trick != null)
{
trick.SetCarried(true);
}
// Disable physics so it doesn't fall or collide with the player
if (heldObject.TryGetComponent<Rigidbody2D>(out Rigidbody2D rb))
{
heldBody = rb;
heldBodyMass = rb.mass;
heldBodyGravity = rb.gravityScale;
heldBodyType = rb.bodyType;
heldBodySimulated = rb.simulated;
rb.simulated = false;
rb.bodyType = RigidbodyType2D.Kinematic;
rb.gravityScale = 0f;
rb.linearVelocity = Vector2.zero;
rb.angularVelocity = 0f;
}
if (playerController != null)
{
playerController.enabled = false;
@@ -178,14 +227,17 @@ public class PlayerPickupController : MonoBehaviour
}
}
void DropObject(bool applyThrow)
public void DropObject(bool applyThrow)
{
// Re-enable physics
if (heldObject.TryGetComponent<Rigidbody2D>(out Rigidbody2D rb))
if (heldBody != null)
{
rb.bodyType = RigidbodyType2D.Dynamic;
rb.gravityScale = 1;
rb.linearVelocity = Vector2.zero;
heldBody.simulated = heldBodySimulated;
heldBody.bodyType = heldBodyType;
heldBody.gravityScale = heldBodyGravity;
heldBody.mass = heldBodyMass;
heldBody.linearVelocity = Vector2.zero;
heldBody.angularVelocity = 0f;
}
if (heldObject.TryGetComponent<TrickController>(out var trick))
{
@@ -203,7 +255,7 @@ public class PlayerPickupController : MonoBehaviour
heldPickup.enabled = true;
}
}
if (applyThrow && heldObject.TryGetComponent<Rigidbody2D>(out Rigidbody2D throwBody))
if (applyThrow && heldBody != null)
{
var direction = 1f;
if (platformerController != null && Mathf.Abs(platformerController.LastMoveX) > 0.01f)
@@ -217,8 +269,9 @@ public class PlayerPickupController : MonoBehaviour
charge01 = Mathf.Clamp01(heldTime / Mathf.Max(0.01f, throwChargeTime));
}
var throwSpeed = Mathf.Lerp(minThrowSpeed, maxThrowSpeed, charge01);
throwBody.linearVelocity = new Vector2(direction * throwSpeed, 0f);
throwBody.angularVelocity = 0f;
var upwardSpeed = throwUpwardForce * charge01;
heldBody.linearVelocity = new Vector2(direction * throwSpeed, upwardSpeed);
heldBody.angularVelocity = 0f;
}
heldObject.transform.position += Vector3.up * dropClearance;
Collider2D col = heldObject.GetComponent<Collider2D>();
@@ -227,7 +280,10 @@ public class PlayerPickupController : MonoBehaviour
// Unparent
heldObject.transform.SetParent(null);
heldObject = null;
heldBody = null;
isChargingThrow = false;
spawnedDuringHold = false;
nextHoldSpawnTime = 0f;
}
private Gamepad GetGamepad()
+93 -2
View File
@@ -10,6 +10,7 @@ public class PlayerPlatformerController : MonoBehaviour
[SerializeField] private string actionMapName = "Player";
[SerializeField] private string moveActionName = "Move";
[SerializeField] private string jumpActionName = "Jump";
[SerializeField] private string healActionName = "Heal";
[SerializeField] private string controlSchemeName = "";
[SerializeField] private int gamepadIndex = -1;
[SerializeField] private float moveSpeed = 6f;
@@ -17,18 +18,29 @@ public class PlayerPlatformerController : MonoBehaviour
[SerializeField] private LayerMask groundMask = ~0;
[SerializeField] private float groundCheckDistance = 0.05f;
private PlayerStressController playerStressController;
private PlayerPickupController playerPickupController;
private Animator animator;
private Rigidbody2D body;
private BoxCollider2D bodyCollider;
private InputActionAsset runtimeActions;
private InputAction moveAction;
private InputAction jumpAction;
private InputAction healAction;
public float LastMoveX { get; private set; }
private bool deviceFilterEnabled;
private int healCoolDownTicks = 15;
private int currentHealCoolDown = 0;
private bool canHeal = true;
private void Awake()
{
body = GetComponent<Rigidbody2D>();
bodyCollider = GetComponent<BoxCollider2D>();
playerStressController = GetComponent<PlayerStressController>();
playerPickupController = GetComponent<PlayerPickupController>();
animator = GetComponent<Animator>();
}
private void OnEnable()
@@ -51,10 +63,12 @@ public class PlayerPlatformerController : MonoBehaviour
var map = runtimeActions.FindActionMap(actionMapName, true);
moveAction = map.FindAction(moveActionName, true);
jumpAction = map.FindAction(jumpActionName, true);
healAction = map.FindAction(healActionName, true);
moveAction.Enable();
jumpAction.Enable();
jumpAction.performed += OnJumpPerformed;
healAction.Enable();
}
private void OnDisable()
@@ -70,6 +84,11 @@ public class PlayerPlatformerController : MonoBehaviour
moveAction.Disable();
}
if (healAction != null)
{
healAction.Disable();
}
if (runtimeActions != null)
{
runtimeActions.Disable();
@@ -81,11 +100,50 @@ public class PlayerPlatformerController : MonoBehaviour
private void FixedUpdate()
{
if(IsGrounded())
{
animator.SetBool("isJumping", false);
}
if (healAction == null) return;
currentHealCoolDown++;
if (currentHealCoolDown >= healCoolDownTicks)
{
currentHealCoolDown = 0;
canHeal = true;
}
if (moveAction == null)
{
return;
}
if (playerStressController.isPanicking) return;
if (healAction.IsPressed())
{
animator.SetBool("isBreathing", true);
if (playerPickupController.heldObject != null)
{
playerPickupController.DropObject(false);
}
if (canHeal)
{
playerStressController.ReduceStress(3f);
canHeal = false;
}
return;
}
else
{
animator.SetBool("isBreathing", false);
}
var input = moveAction.ReadValue<Vector2>();
if (Mathf.Abs(input.x) > 0.01f)
{
@@ -94,10 +152,29 @@ public class PlayerPlatformerController : MonoBehaviour
var velocity = body.linearVelocity;
velocity.x = input.x * moveSpeed;
body.linearVelocity = velocity;
if(velocity.x != 0)
{
animator.SetBool("isRunning", true);
if (velocity.x > 0 && IsGrounded())
{
transform.localScale = new Vector3(.25f, .25f, .25f);
}
else
{
transform.localScale = new Vector3(-.25f, .25f, .25f);
}
}
else
{
animator.SetBool("isRunning", false);
}
}
private void OnJumpPerformed(InputAction.CallbackContext context)
{
if (playerStressController.isPanicking || healAction.IsPressed()) return;
if (!IsGrounded())
{
return;
@@ -107,6 +184,8 @@ public class PlayerPlatformerController : MonoBehaviour
velocity.y = 0f;
body.linearVelocity = velocity;
body.AddForce(Vector2.up * jumpImpulse, ForceMode2D.Impulse);
animator.SetBool("isJumping", true);
}
private bool ShouldFilterDevices()
@@ -196,10 +275,22 @@ public class PlayerPlatformerController : MonoBehaviour
for (var i = 0; i < hits.Length; i++)
{
var hit = hits[i];
if (hit != null && hit != bodyCollider)
if (hit == null || hit == bodyCollider || hit.isTrigger)
{
return true;
continue;
}
if (hit.GetComponent<PlayerPlatformerController>() != null)
{
continue;
}
if (hit.GetComponent<TrickController>() != null)
{
continue;
}
return true;
}
return false;
+58 -13
View File
@@ -1,3 +1,4 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
@@ -6,19 +7,26 @@ using UnityEngine;
public class PlayerStressController : MonoBehaviour
{
public PlayerPickupController pickupController;
private Animator animator;
[Header("Stress Settings")]
public float currentStress = 0f;
public float maxStress = 100f;
public bool isPanicking = false;
public bool isParalyzed = false;
// Define the event
public static event Action OnPlayerPanic;
public static event Action OnPlayerCalm;
[Header("Panic Settings")]
[SerializeField] private float panicDuration = 1.2f;
private float panicEndTime;
[SerializeField] private float paralyseDuration = 5f;
public bool IsPanicking => Time.time < panicEndTime;
void Start()
{
animator = GetComponent<Animator>();
// Start the repeating loop
StartCoroutine(StressCheckLoop());
}
@@ -27,35 +35,61 @@ public class PlayerStressController : MonoBehaviour
{
while (true) // Runs for the lifetime of the object
{
ApplyStressLogic();
yield return ApplyStressLogic();
// Wait for exactly 1 second before running again
yield return new WaitForSeconds(1.0f);
}
}
void ApplyStressLogic()
IEnumerator ApplyStressLogic()
{
if (isParalyzed) yield break;
// Find all objects tagged as "Enemy"
List<GameObject> enemies = GameObject.FindGameObjectsWithTag("Interactable").Where(enemy => enemy.GetComponent<TrickController>() != null).ToList();
// Keep stress within 0 and Max
currentStress = Mathf.Clamp(currentStress, 0, maxStress);
currentStress += enemies.Count; // Increase stress based on number of enemies nearby
Debug.Log($"Current Stress: {currentStress}");
if (currentStress >= maxStress)
if (pickupController.heldObject != null && pickupController.heldObject.TryGetComponent<TrickController>(out _))
{
HandlePanic();
currentStress += 5; // Increase stress based on number of carried tricks
}
currentStress = Mathf.Clamp(currentStress, 0, maxStress);
if (!isPanicking && currentStress >= maxStress)
{
Debug.Log($"{currentStress}, {isPanicking}, {isParalyzed}");
yield return HandlePanic();
}
else if(isPanicking && currentStress < maxStress)
{
isPanicking = false;
HandleCalm();
Debug.Log("Player has calmed down.");
}
}
void HandlePanic()
IEnumerator HandlePanic()
{
panicEndTime = Time.time + panicDuration;
isPanicking = true;
animator.SetBool("isCollapsed", true);
Debug.Log("Player is freaking out man!");
// Add effects like screen shake or slowing down the player here
OnPlayerPanic?.Invoke(); // Trigger the panic event
yield return StartCoroutine(HandleParalyze());
}
void HandleCalm()
{
Debug.Log("Player is feeling better now!");
OnPlayerCalm?.Invoke(); // Trigger the calm event
}
public void ReduceStress(float amount)
@@ -64,4 +98,15 @@ public class PlayerStressController : MonoBehaviour
currentStress = Mathf.Clamp(currentStress, 0, maxStress);
Debug.Log($"Stress reduced by {amount}. Current Stress: {currentStress}");
}
IEnumerator HandleParalyze()
{
isParalyzed = true;
Debug.Log("Player is paralyzed.");
yield return new WaitForSecondsRealtime(paralyseDuration);
Debug.Log("Player has recovered from paralysis.");
isParalyzed = false;
}
}
+8
View File
@@ -5,6 +5,8 @@ public class TrickCollisionManager : MonoBehaviour
[SerializeField] private string trickLayerName = "Trick";
[SerializeField] private string playerLayerName = "Player";
[SerializeField] private string treatLayerName = "Treat";
[SerializeField] private string destroyTag = "Destroy";
private bool initialized;
private void Awake()
@@ -43,4 +45,10 @@ public class TrickCollisionManager : MonoBehaviour
Physics2D.IgnoreLayerCollision(trickLayer, otherLayer, true);
}
private void onTriggerEnter2D(Collider2D destroy){
if (destroy.CompareTag(destroyTag))
{
Destroy(gameObject);
}
}
}
+424 -22
View File
@@ -11,6 +11,8 @@ public class TrickController : MonoBehaviour
private static readonly List<TrickController> ActiveTricks = new List<TrickController>();
private static PlayerPlatformerController[] cachedPlayers = Array.Empty<PlayerPlatformerController>();
private static float nextPlayerCacheTime;
private static bool hasCanonicalScale;
private static Vector3 canonicalScale;
public static int ActiveCount => ActiveTricks.Count;
[SerializeField] private string treatTag = "Interactable";
@@ -25,25 +27,60 @@ public class TrickController : MonoBehaviour
[SerializeField] private float wanderWeight = 0.4f;
[SerializeField] private int maxTricks = 50;
[SerializeField] private float jumpImpulse = 6f;
[SerializeField] private float jumpImpulseVariance = 0.25f;
[SerializeField] private float jumpCooldown = 1f;
[SerializeField] private float jumpChancePerSecond = 0.5f;
[SerializeField] private float jumpArcChance = 0.5f;
[SerializeField] private float jumpArcHorizontalImpulse = 2f;
[SerializeField] private float basketSeekRadius = 8f;
[SerializeField] private float basketSeekWeight = 0.9f;
[SerializeField] private float basketMinHeight = 0.5f;
[SerializeField] private float basketRefreshInterval = 0.6f;
[SerializeField] private float basketJumpChance = 0.35f;
[SerializeField] private float basketJumpHorizontalRange = 0.8f;
[SerializeField] private LayerMask groundMask = ~0;
[SerializeField] private float groundCheckDistance = 0.05f;
[SerializeField] private float despawnMinX = -12f;
[SerializeField] private float despawnMaxX = 12f;
[SerializeField] private float despawnMinY = -10f;
[SerializeField] private float despawnMaxY = 20f;
[SerializeField] private float throwControlLockTime = 0.35f;
[SerializeField] private float wallCheckDistance = 0.1f;
[SerializeField] private float wallAvoidDuration = 0.6f;
[SerializeField] private float wallAvoidCooldown = 0.2f;
private Rigidbody2D body;
private Transform target;
private float nextTargetTime;
private Transform basketTarget;
private float nextBasketTime;
private Vector2 wanderDirection;
private float nextWanderTime;
private bool isCarried;
private bool isBasketed;
private float nextConsumeTime;
private float desiredXVelocity;
private float nextJumpTime;
private float movementLockUntil;
private readonly RaycastHit2D[] groundHits = new RaycastHit2D[4];
private readonly RaycastHit2D[] wallHits = new RaycastHit2D[4];
private float wallAvoidUntil;
private float wallAvoidDirection;
private float nextWallAvoidTime;
private RigidbodyType2D basketBodyType;
private float basketGravityScale;
private bool basketSimulated;
private bool hasBasketAnchor;
private Vector2 basketAnchorPosition;
[SerializeField] private string basketSortingLayer = "";
[SerializeField] private int basketSortingOrder = -10;
private SpriteRenderer cachedRenderer;
private string originalSortingLayer;
private int originalSortingOrder;
private Vector3 originalLocalScale;
public bool IsCarried => isCarried;
public bool IsBasketed => isBasketed;
private void Awake()
{
@@ -53,6 +90,13 @@ public class TrickController : MonoBehaviour
body.freezeRotation = true;
body.collisionDetectionMode = CollisionDetectionMode2D.Continuous;
body.interpolation = RigidbodyInterpolation2D.Interpolate;
cachedRenderer = GetComponent<SpriteRenderer>();
originalLocalScale = transform.localScale;
if (!hasCanonicalScale)
{
canonicalScale = transform.localScale;
hasCanonicalScale = true;
}
}
private void OnEnable()
@@ -78,8 +122,13 @@ public class TrickController : MonoBehaviour
return;
}
if (isBasketed)
{
return;
}
var position = transform.position;
if (position.x < despawnMinX || position.x > despawnMaxX || position.y < despawnMinY)
if (position.x < despawnMinX || position.x > despawnMaxX || position.y < despawnMinY || position.y > despawnMaxY)
{
Destroy(gameObject);
return;
@@ -101,6 +150,12 @@ public class TrickController : MonoBehaviour
nextTargetTime = Time.time + targetRefreshInterval;
}
if (Time.time >= nextBasketTime)
{
basketTarget = FindNearestBasketAbove();
nextBasketTime = Time.time + basketRefreshInterval;
}
if (Time.time >= nextWanderTime)
{
wanderDirection = Random.insideUnitCircle.normalized;
@@ -121,6 +176,19 @@ public class TrickController : MonoBehaviour
return;
}
if (isBasketed)
{
if (hasBasketAnchor)
{
transform.position = basketAnchorPosition;
}
var held = body.linearVelocity;
held.x = 0f;
held.y = 0f;
body.linearVelocity = held;
return;
}
if (Time.time < movementLockUntil)
{
return;
@@ -128,9 +196,6 @@ public class TrickController : MonoBehaviour
if (!IsGrounded())
{
var airborne = body.linearVelocity;
airborne.x = 0f;
body.linearVelocity = airborne;
return;
}
@@ -149,6 +214,15 @@ public class TrickController : MonoBehaviour
desiredX += wanderDirection.x * wanderWeight;
}
if (!hasTarget && basketTarget != null)
{
var basketDelta = (Vector2)basketTarget.position - (Vector2)transform.position;
if (basketDelta.y >= basketMinHeight && basketDelta.magnitude <= basketSeekRadius)
{
desiredX += Mathf.Sign(basketDelta.x) * basketSeekWeight;
}
}
// No trick-avoidance bias.
if (Mathf.Abs(desiredX) < 0.01f)
@@ -156,6 +230,22 @@ public class TrickController : MonoBehaviour
desiredX = wanderDirection.x * 0.2f;
}
if (Time.time >= nextWallAvoidTime)
{
var wallDirection = GetWallAvoidDirection(desiredX);
if (wallDirection != 0f)
{
wallAvoidDirection = wallDirection;
wallAvoidUntil = Time.time + wallAvoidDuration;
nextWallAvoidTime = Time.time + wallAvoidDuration + wallAvoidCooldown;
}
}
if (Time.time < wallAvoidUntil && Mathf.Abs(wallAvoidDirection) > 0.01f)
{
desiredX = wallAvoidDirection;
}
desiredVelocity = new Vector2(Mathf.Clamp(desiredX, -1f, 1f) * moveSpeed, 0f);
var velocity = body.linearVelocity;
@@ -189,6 +279,14 @@ public class TrickController : MonoBehaviour
{
continue;
}
if (candidate.GetComponent<TrickController>() != null)
{
continue;
}
if (candidate.GetComponent<PlayerPlatformerController>() != null)
{
continue;
}
if (!candidate.TryGetComponent<Collider2D>(out var collider) || !collider.enabled)
{
@@ -206,6 +304,48 @@ public class TrickController : MonoBehaviour
return best;
}
private Transform FindNearestBasketAbove()
{
var baskets = FindObjectsByType<BasketController>(FindObjectsSortMode.None);
if (baskets == null || baskets.Length == 0)
{
return null;
}
Transform best = null;
var bestDistance = float.MaxValue;
var origin = transform.position;
for (var i = 0; i < baskets.Length; i++)
{
var basket = baskets[i];
if (basket == null || !basket.gameObject.activeInHierarchy)
{
continue;
}
var basketPos = basket.transform.position;
var delta = (Vector2)basketPos - (Vector2)origin;
if (delta.y < basketMinHeight)
{
continue;
}
var distance = delta.magnitude;
if (distance > basketSeekRadius)
{
continue;
}
if (distance < bestDistance)
{
bestDistance = distance;
best = basket.transform;
}
}
return best;
}
private void TryConsumeTreat()
{
if (isCarried)
@@ -241,22 +381,130 @@ public class TrickController : MonoBehaviour
}
}
private void SpawnTrick(Vector3 position)
private bool SpawnTrick(Vector3 position)
{
if (maxTricks > 0 && ActiveTricks.Count >= maxTricks)
{
return;
return false;
}
if (trickPrefab != null)
{
Instantiate(trickPrefab, position, Quaternion.identity);
return;
var instance = Instantiate(trickPrefab, position, Quaternion.identity);
if (instance != null)
{
instance.ResetRuntimeState(canonicalScale);
}
return true;
}
Instantiate(gameObject, position, Quaternion.identity);
var clone = Instantiate(gameObject, position, Quaternion.identity);
if (clone.TryGetComponent<TrickController>(out var spawned))
{
spawned.ResetRuntimeState(canonicalScale);
}
return true;
}
private void ResetRuntimeState(Vector3? forcedScale = null)
{
isCarried = false;
isBasketed = false;
hasBasketAnchor = false;
movementLockUntil = 0f;
wallAvoidUntil = 0f;
wallAvoidDirection = 0f;
if (forcedScale.HasValue)
{
transform.localScale = forcedScale.Value;
}
if (cachedRenderer != null)
{
if (!string.IsNullOrWhiteSpace(basketSortingLayer))
{
cachedRenderer.sortingLayerName = originalSortingLayer;
}
cachedRenderer.sortingOrder = originalSortingOrder;
}
body.simulated = true;
body.bodyType = RigidbodyType2D.Dynamic;
body.gravityScale = 1f;
body.linearVelocity = Vector2.zero;
body.angularVelocity = 0f;
if (TryGetComponent<Collider2D>(out var collider))
{
collider.enabled = true;
}
}
public static bool TrySpawnAt(Vector3 position)
{
if (ActiveTricks.Count == 0)
{
return false;
}
TrickController candidate = null;
TrickController fallback = null;
for (var i = 0; i < ActiveTricks.Count; i++)
{
var trick = ActiveTricks[i];
if (trick == null)
{
continue;
}
if (fallback == null)
{
fallback = trick;
}
if (!trick.isCarried && !trick.isBasketed)
{
if (trick.TryGetComponent<Collider2D>(out var collider) && collider.enabled)
{
candidate = trick;
break;
}
}
}
if (candidate == null)
{
candidate = fallback;
}
return candidate != null && candidate.SpawnTrick(position);
}
public static bool TrySpawnFromPrefabAt(Vector3 position)
{
if (ActiveTricks.Count == 0)
{
return false;
}
for (var i = 0; i < ActiveTricks.Count; i++)
{
var trick = ActiveTricks[i];
if (trick == null)
{
continue;
}
if (trick.trickPrefab == null)
{
continue;
}
return trick.SpawnTrick(position);
}
return false;
}
private float GetAvoidPlayerDirection()
{
if (Time.time >= nextPlayerCacheTime)
@@ -301,7 +549,7 @@ public class TrickController : MonoBehaviour
private void TryJump(bool isMoving, float jumpDirection)
{
if (!isMoving || Time.time < nextJumpTime)
if (Time.time < nextJumpTime)
{
return;
}
@@ -311,22 +559,60 @@ public class TrickController : MonoBehaviour
return;
}
var chance = jumpChancePerSecond * Time.fixedDeltaTime;
if (Random.value > chance)
var wantsBasketJump = false;
var basketDir = 0f;
if (basketTarget != null)
{
var delta = (Vector2)basketTarget.position - (Vector2)transform.position;
if (delta.y >= basketMinHeight && Mathf.Abs(delta.x) <= basketJumpHorizontalRange)
{
if (Random.value < basketJumpChance)
{
wantsBasketJump = true;
basketDir = Mathf.Sign(delta.x);
}
}
}
if (!wantsBasketJump)
{
if (!isMoving)
{
return;
}
var chance = jumpChancePerSecond * Time.fixedDeltaTime;
if (Random.value > chance)
{
return;
}
}
if (body.linearVelocity.y > 0.01f)
{
return;
}
var velocity = body.linearVelocity;
velocity.y = 0f;
var jumpDir = Mathf.Sign(jumpDirection);
var jumpDir = wantsBasketJump ? basketDir : Mathf.Sign(jumpDirection);
if (jumpDir == 0f)
{
jumpDir = Random.value < 0.5f ? -1f : 1f;
}
velocity.x = jumpDir * moveSpeed;
body.linearVelocity = velocity;
body.AddForce(Vector2.up * jumpImpulse, ForceMode2D.Impulse);
var minImpulse = Mathf.Max(0f, jumpImpulse * (1f - jumpImpulseVariance));
var maxImpulse = Mathf.Max(minImpulse, jumpImpulse * (1f + jumpImpulseVariance));
var jumpImpulseActual = Random.Range(minImpulse, maxImpulse);
body.AddForce(Vector2.up * jumpImpulseActual, ForceMode2D.Impulse);
if (Random.value < jumpArcChance && jumpArcHorizontalImpulse > 0f)
{
var arcDir = Random.value < 0.5f ? -1f : 1f;
body.AddForce(Vector2.right * arcDir * jumpArcHorizontalImpulse, ForceMode2D.Impulse);
}
nextJumpTime = Time.time + jumpCooldown;
}
@@ -338,26 +624,86 @@ public class TrickController : MonoBehaviour
return false;
}
var bounds = collider.bounds;
var checkSize = new Vector2(bounds.size.x * 0.9f, groundCheckDistance * 2f);
var checkCenter = new Vector2(bounds.center.x, bounds.min.y - groundCheckDistance);
var hits = Physics2D.OverlapBoxAll(checkCenter, checkSize, 0f, groundMask);
for (var i = 0; i < hits.Length; i++)
var filter = new ContactFilter2D();
filter.SetLayerMask(groundMask);
filter.useTriggers = false;
var hitCount = collider.Cast(Vector2.down, filter, groundHits, groundCheckDistance);
for (var i = 0; i < hitCount; i++)
{
var hit = hits[i];
if (hit != null && hit != collider)
var hitCollider = groundHits[i].collider;
if (hitCollider == null || hitCollider == collider)
{
return true;
continue;
}
if (hitCollider.GetComponent<TrickController>() != null)
{
continue;
}
if (hitCollider.GetComponent<PlayerPlatformerController>() != null)
{
continue;
}
return true;
}
return false;
}
private float GetWallAvoidDirection(float desiredX)
{
if (Mathf.Abs(desiredX) < 0.01f)
{
return 0f;
}
var collider = GetComponent<Collider2D>();
if (collider == null)
{
return 0f;
}
var filter = new ContactFilter2D();
filter.SetLayerMask(groundMask);
filter.useTriggers = false;
var dir = Mathf.Sign(desiredX);
var hitCount = collider.Cast(Vector2.right * dir, filter, wallHits, wallCheckDistance);
for (var i = 0; i < hitCount; i++)
{
var hitCollider = wallHits[i].collider;
if (hitCollider == null || hitCollider == collider)
{
continue;
}
if (hitCollider.GetComponent<TrickController>() != null)
{
continue;
}
if (hitCollider.GetComponent<PlayerPlatformerController>() != null)
{
continue;
}
return -dir;
}
return 0f;
}
public void SetCarried(bool carried)
{
isCarried = carried;
if (carried && isBasketed)
{
SetBasketed(false);
}
if (carried)
{
target = null;
@@ -385,6 +731,62 @@ public class TrickController : MonoBehaviour
}
}
public void SetBasketed(bool basketed, Vector2? anchorPosition = null)
{
if (isBasketed == basketed)
{
return;
}
isBasketed = basketed;
if (basketed)
{
if (cachedRenderer != null)
{
originalSortingLayer = cachedRenderer.sortingLayerName;
originalSortingOrder = cachedRenderer.sortingOrder;
if (!string.IsNullOrWhiteSpace(basketSortingLayer))
{
cachedRenderer.sortingLayerName = basketSortingLayer;
}
cachedRenderer.sortingOrder = basketSortingOrder;
}
if (anchorPosition.HasValue)
{
hasBasketAnchor = true;
basketAnchorPosition = anchorPosition.Value;
}
else
{
hasBasketAnchor = false;
}
basketBodyType = body.bodyType;
basketGravityScale = body.gravityScale;
basketSimulated = body.simulated;
body.simulated = true;
body.bodyType = RigidbodyType2D.Kinematic;
body.gravityScale = 0f;
body.linearVelocity = Vector2.zero;
body.angularVelocity = 0f;
nextJumpTime = Time.time + 0.1f;
}
else
{
if (cachedRenderer != null)
{
if (!string.IsNullOrWhiteSpace(basketSortingLayer))
{
cachedRenderer.sortingLayerName = originalSortingLayer;
}
cachedRenderer.sortingOrder = originalSortingOrder;
}
hasBasketAnchor = false;
body.simulated = basketSimulated;
body.bodyType = basketBodyType;
body.gravityScale = basketGravityScale;
}
}
public void OnThrown()
{
movementLockUntil = Time.time + throwControlLockTime;
+2 -2
View File
@@ -25,10 +25,10 @@ public class WinSceneController : MonoBehaviour
button = root.Q<Button>("Button");
button.clicked += () => HandleStartClicked("MainMenu");
button.clicked += () => HandleClick("MainMenu");
}
private void HandleStartClicked(string sceneName)
private void HandleClick(string sceneName)
{
if (!string.IsNullOrWhiteSpace(sceneName))
{
+14
View File
@@ -0,0 +1,14 @@
<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
<ui:VisualElement style="flex-grow: 1; background-color: rgb(0, 0, 0); justify-content: center;">
<ui:Label text="Credits&#10;" name="Label" style="height: 88px; -unity-text-align: upper-center; font-size: 80%; -unity-font-definition: url(&quot;project://database/Assets/Fonts/PressStart2P-vaV7.ttf?fileID=12800000&amp;guid=23a53ce4db6308e4aa6b88d805455d1c&amp;type=3#PressStart2P-vaV7&quot;); -unity-font-style: bold; color: rgb(255, 255, 255);"/>
<ui:Label text="Programming&#10;" name="ProgrammingTitle" style="height: 53px; -unity-text-align: upper-center; font-size: 40%; -unity-font-definition: url(&quot;project://database/Assets/Fonts/PressStart2P-vaV7.ttf?fileID=12800000&amp;guid=23a53ce4db6308e4aa6b88d805455d1c&amp;type=3#PressStart2P-vaV7&quot;); -unity-font-style: bold; color: rgb(255, 255, 255);"/>
<ui:Label text="Josiah Reinholz &#10;Connor Manke&#10;Walter Abbott&#10;Zeeshaun Masood&#10;" name="ProgrammingBody" style="height: 178px; -unity-text-align: upper-center; font-size: 40%; -unity-font-definition: url(&quot;project://database/Assets/Fonts/PressStart2P-vaV7.ttf?fileID=12800000&amp;guid=23a53ce4db6308e4aa6b88d805455d1c&amp;type=3#PressStart2P-vaV7&quot;); -unity-font-style: normal; color: rgb(205, 205, 205);"/>
<ui:Label text="Art" name="ArtTitle" style="height: 50px; -unity-text-align: upper-center; font-size: 40%; -unity-font-definition: url(&quot;project://database/Assets/Fonts/PressStart2P-vaV7.ttf?fileID=12800000&amp;guid=23a53ce4db6308e4aa6b88d805455d1c&amp;type=3#PressStart2P-vaV7&quot;); -unity-font-style: bold; color: rgb(255, 255, 255);"/>
<ui:Label text="Kevin Ryan&#10;Josiah Reinholz" name="ArtBody" style="height: 96px; -unity-text-align: upper-center; font-size: 40%; -unity-font-definition: url(&quot;project://database/Assets/Fonts/PressStart2P-vaV7.ttf?fileID=12800000&amp;guid=23a53ce4db6308e4aa6b88d805455d1c&amp;type=3#PressStart2P-vaV7&quot;); -unity-font-style: normal; color: rgb(205, 205, 205);"/>
<ui:Label text="Music" name="MusicTitle" style="height: 56px; -unity-text-align: upper-center; font-size: 40%; -unity-font-definition: url(&quot;project://database/Assets/Fonts/PressStart2P-vaV7.ttf?fileID=12800000&amp;guid=23a53ce4db6308e4aa6b88d805455d1c&amp;type=3#PressStart2P-vaV7&quot;); -unity-font-style: bold; color: rgb(255, 255, 255);"/>
<ui:Label text="Evan Roegner" name="MusicBody" style="height: 63px; -unity-text-align: upper-center; font-size: 40%; -unity-font-definition: url(&quot;project://database/Assets/Fonts/PressStart2P-vaV7.ttf?fileID=12800000&amp;guid=23a53ce4db6308e4aa6b88d805455d1c&amp;type=3#PressStart2P-vaV7&quot;); -unity-font-style: normal; color: rgb(205, 205, 205);"/>
<ui:Label text="Voice Acting" name="VoiceActingTitle" style="height: 56px; -unity-text-align: upper-center; font-size: 40%; -unity-font-definition: url(&quot;project://database/Assets/Fonts/PressStart2P-vaV7.ttf?fileID=12800000&amp;guid=23a53ce4db6308e4aa6b88d805455d1c&amp;type=3#PressStart2P-vaV7&quot;); -unity-font-style: bold; color: rgb(255, 255, 255);"/>
<ui:Label text="Robbie Thao&#10;Walter Abbott&#10;Connor Manke&#10;Evan Roegner" name="VoiceActingBody" style="height: 181px; -unity-text-align: upper-center; font-size: 40%; -unity-font-definition: url(&quot;project://database/Assets/Fonts/PressStart2P-vaV7.ttf?fileID=12800000&amp;guid=23a53ce4db6308e4aa6b88d805455d1c&amp;type=3#PressStart2P-vaV7&quot;); -unity-font-style: normal; color: rgb(205, 205, 205);"/>
<ui:Button text="Back&#10;" name="Back" style="width: 664px; white-space: pre; background-color: rgb(70, 70, 70); color: rgb(255, 255, 255); background-size: 100% 100%; scale: 1 1; -unity-text-auto-size: none; -unity-font-style: bold; bottom: auto; left: auto; right: auto; aspect-ratio: auto; max-width: initial; height: 128px; align-items: stretch; align-self: center; -unity-font-definition: url(&quot;project://database/Assets/Fonts/PressStart2P-vaV7.ttf?fileID=12800000&amp;guid=23a53ce4db6308e4aa6b88d805455d1c&amp;type=3#PressStart2P-vaV7&quot;); font-size: 40px;"/>
</ui:VisualElement>
</ui:UXML>
+10
View File
@@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: b0e6461d318f32d4fac4a5ef05bb6015
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 13804, guid: 0000000000000000e000000000000000, type: 0}
+18 -5
View File
@@ -1,18 +1,31 @@
<ui:UXML xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
<Style src="project://database/Assets/UI%20Toolkit/progressBar.uss?fileID=7433441132597879392&amp;guid=2c3cb808f8496d4438df1bd06428d6f1&amp;type=3#progressBar"/>
<ui:VisualElement style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); height: 20%;">
<ui:Label text="Score: 0" name="Score" style="font-size: 40px; height: 10%;"/>
<ui:Label text="Score: 0" name="Score" style="font-size: 40px; height: auto; background-color: rgb(0, 0, 0); color: rgb(255, 255, 255);"/>
</ui:VisualElement>
<ui:VisualElement style="flex-grow: 1; align-self: auto; align-items: flex-start; align-content: auto; height: 80%; flex-direction: row;">
<ui:VisualElement style="flex-grow: 1; height: 100%; width: 10%; background-size: 100% 100%;">
<ui:Image name="Player1Life" style="background-image: url(&quot;project://database/Assets/Art/Final%20Sprites/P_Health01.png?fileID=2800000&amp;guid=03a067405c8cfa945a9ed2e8ff6a71dd&amp;type=3#P_Health01&quot;); height: 50%;"/>
<ui:VisualElement style="flex-grow: 1;">
<ui:Image name="Player1Life" source="project://database/Assets/Art/Final%20Sprites/P_Health01.png?fileID=21300000&amp;guid=03a067405c8cfa945a9ed2e8ff6a71dd&amp;type=3#P_Health01" style="background-image: none; height: 85%; -unity-background-image-tint-color: rgb(182, 255, 165);"/>
<ui:ProgressBar value="23" title="" name="Player1StressBar" style="background-color: rgb(255, 255, 255); -unity-background-image-tint-color: rgb(255, 255, 255);"/>
</ui:VisualElement>
<ui:VisualElement style="flex-grow: 1; height: 50%;"/>
<ui:Image name="Player2Life" style="background-image: url(&quot;project://database/Assets/Art/Final%20Sprites/P_Health01.png?fileID=2800000&amp;guid=03a067405c8cfa945a9ed2e8ff6a71dd&amp;type=3#P_Health01&quot;); height: 50%;"/>
<ui:VisualElement style="flex-grow: 1;">
<ui:Image name="Player2Life" source="project://database/Assets/Art/Final%20Sprites/P_Health01.png?fileID=21300000&amp;guid=03a067405c8cfa945a9ed2e8ff6a71dd&amp;type=3#P_Health01" style="background-image: none; height: 85%; -unity-background-image-tint-color: rgb(182, 255, 165);"/>
<ui:ProgressBar value="23" title="" name="Player2StressBar" style="background-color: rgb(255, 255, 255); -unity-background-image-tint-color: rgb(255, 255, 255);"/>
</ui:VisualElement>
</ui:VisualElement>
<ui:VisualElement style="flex-grow: 1; width: 80%; height: 100%;"/>
<ui:VisualElement style="flex-grow: 1; width: 10%; height: 100%;">
<ui:Image name="Player3Life" style="background-image: url(&quot;project://database/Assets/Art/Final%20Sprites/P_Health01.png?fileID=2800000&amp;guid=03a067405c8cfa945a9ed2e8ff6a71dd&amp;type=3#P_Health01&quot;); height: 50%;"/>
<ui:VisualElement name="VisualElement" style="flex-grow: 1;">
<ui:Image name="Player3Life" source="project://database/Assets/Art/Final%20Sprites/P_Health01.png?fileID=21300000&amp;guid=03a067405c8cfa945a9ed2e8ff6a71dd&amp;type=3#P_Health01" style="background-image: none; height: 85%; -unity-background-image-tint-color: rgb(182, 255, 165);"/>
<ui:ProgressBar value="23" title="" name="Player3StressBar" style="background-color: rgb(255, 255, 255); -unity-background-image-tint-color: rgb(255, 255, 255);"/>
</ui:VisualElement>
<ui:VisualElement style="flex-grow: 1; height: 50%;"/>
<ui:Image name="Player4Life" style="background-image: url(&quot;project://database/Assets/Art/Final%20Sprites/P_Health01.png?fileID=2800000&amp;guid=03a067405c8cfa945a9ed2e8ff6a71dd&amp;type=3#P_Health01&quot;); height: 50%;"/>
<ui:VisualElement name="VisualElement" style="flex-grow: 1;">
<ui:Image name="Player4Life" source="project://database/Assets/Art/Final%20Sprites/P_Health01.png?fileID=21300000&amp;guid=03a067405c8cfa945a9ed2e8ff6a71dd&amp;type=3#P_Health01" style="background-image: none; height: 85%; -unity-background-image-tint-color: rgb(182, 255, 165);"/>
<ui:ProgressBar value="23" title="" name="Player4StressBar" style="background-color: rgb(255, 255, 255); -unity-background-image-tint-color: rgb(255, 255, 255);"/>
</ui:VisualElement>
</ui:VisualElement>
</ui:VisualElement>
</ui:UXML>
+2 -1
View File
@@ -1,3 +1,4 @@
<ui:UXML xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
<ui:Label text="Loser"/>
<ui:Label text="Loser... Gross" style="font-size: 50px;"/>
<ui:Button text="Just... *sigh* Whatever" name="Button" style="font-size: 50px;"/>
</ui:UXML>
+8 -5
View File
@@ -1,8 +1,11 @@
<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
<ui:Label text="Fun Fun Happy Time Game" name="Title" style="color: rgb(255, 255, 255); font-size: 25px; align-self: center; background-color: rgb(10, 10, 10); -unity-text-align: lower-left; top: auto;"/>
<ui:VisualElement style="flex-grow: 1; justify-content: center; align-self: auto; align-content: auto; background-color: rgb(17, 17, 17);">
<ui:Button text="Start" name="Start" emoji-fallback-support="true" style="background-color: rgb(101, 24, 101); color: rgb(255, 255, 255); font-size: 30px; width: 75%; align-self: center;"/>
<ui:Button text="Experiment" name="Experiment" emoji-fallback-support="true" style="background-color: rgb(101, 24, 101); color: rgb(255, 255, 255); font-size: 30px; width: 75%; align-self: center;"/>
<ui:Button text="Level 2" name="Level2" emoji-fallback-support="true" style="background-color: rgb(101, 24, 101); color: rgb(255, 255, 255); font-size: 30px; width: 75%; align-self: center;"/>
<ui:VisualElement style="flex-grow: 1; justify-content: center; background-color: rgb(0, 0, 0);">
<ui:Label text="Candy Crashout" name="Title" style="color: rgb(255, 255, 255); font-size: 60px; align-self: center; background-color: rgb(10, 10, 10); -unity-text-align: lower-left; top: auto;"/>
</ui:VisualElement>
<ui:VisualElement style="flex-grow: 1; justify-content: center; align-self: auto; align-content: auto; background-color: rgb(0, 0, 0);">
<ui:Button text="Start" name="Start" emoji-fallback-support="true" enabled="false" style="background-color: rgb(101, 24, 101); color: rgb(255, 255, 255); font-size: 30px; width: 75%; align-self: center;"/>
<ui:Button text="Experiment" name="Experiment" emoji-fallback-support="true" enabled="true" style="background-color: rgb(101, 24, 101); color: rgb(255, 255, 255); font-size: 30px; width: 75%; align-self: center;"/>
<ui:Button text="Level 2" name="Level2" emoji-fallback-support="true" enabled="false" style="background-color: rgb(101, 24, 101); color: rgb(255, 255, 255); font-size: 30px; width: 75%; align-self: center;"/>
<ui:Button text="Credits&#10;" name="Credits" emoji-fallback-support="true" style="background-color: rgb(101, 24, 101); color: rgb(255, 255, 255); font-size: 30px; width: 75%; align-self: center;"/>
</ui:VisualElement>
</ui:UXML>
+1 -1
View File
@@ -39,7 +39,7 @@ MonoBehaviour:
m_MinAtlasSize: 64
m_MaxAtlasSize: 4096
m_MaxSubTextureSize: 64
m_ActiveFilters: 31
m_ActiveFilters: -1
m_AtlasBlitShader: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0}
m_DefaultShader: {fileID: 9100, guid: 0000000000000000f000000000000000, type: 0}
m_RuntimeGaussianBlurShader: {fileID: 20300, guid: 0000000000000000f000000000000000, type: 0}
+2 -2
View File
@@ -1,4 +1,4 @@
<ui:UXML xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
<ui:Label text="Win"/>
<ui:Button text="Dun"/>
<ui:Label text="Win" style="font-size: 50px;"/>
<ui:Button text="Dun" name="Button" style="font-size: 50px;"/>
</ui:UXML>
+14
View File
@@ -0,0 +1,14 @@
:root {
}
unityprogressbar__progress {
background-color: rgb(0, 197, 10);
}
.unity-progress-bar__progress {
background-color: rgb(243, 0, 40);
}
.unity-progress-bar__background {
background-color: rgb(70, 0, 11);
}
+12
View File
@@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 2c3cb808f8496d4438df1bd06428d6f1
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
disableValidation: 0
unsupportedSelectorAction: 0
+3
View File
@@ -0,0 +1,3 @@
<Solution>
<Project Path="Assembly-CSharp.csproj" />
</Solution>
@@ -17,6 +17,12 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/Win.unity
guid: 4130885cdd041af4c8b7861d46bbcf11
- enabled: 1
path: Assets/Scenes/Credits.unity
guid: 08e6b38f452419e4480fc1510dc9a2de
- enabled: 1
path: Assets/Scenes/Lose.unity
guid: d554758d849cd094e9fe7db190ef082e
m_configObjects:
com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3}
m_UseUCBPForAssetBundles: 0