hz/ggj2026
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some Nice UI

Browse Source
This commit is contained in:
Walter
2026-02-01 13:21:59 -06:00
parent 095296d5c2
commit 2814b6c7a2
22 changed files with 433 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assembly-CSharp.csproj
+6
View File
@@ -64,6 +64,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 +75,15 @@
<Compile Include="Assets\Scripts\TrickSpawnKeeper.cs" />
<Compile Include="Assets\Scripts\WinScreenController.cs" />
<Compile Include="Assets\Scripts\MainMenuController.cs" />
<Compile Include="Assets\Scripts\LoseGuiController.cs" />
<Compile Include="Assets\Scripts\HealthGUIController.cs" />
</ItemGroup>
<ItemGroup>
<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>
Assets/Prefabs/Player.prefab
+7 -2
View File
@@ -229,8 +229,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 +245,12 @@ 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!1 &6898135930931977916
GameObject:
m_ObjectHideFlags: 0
@@ -272,7 +277,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: []
Assets/ProgressBar.uss
+3
View File
@@ -0,0 +1,3 @@
:root {
}
Assets/ProgressBar.uss.meta
+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
Assets/Scenes/Experiment.unity
+84 -119
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
@@ -211,6 +211,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 +239,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 +298,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
@@ -377,6 +408,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 +765,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 +876,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 +912,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
@@ -1196,6 +1252,18 @@ PrefabInstance:
propertyPath: m_Name
value: Player (1)
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: []
@@ -1529,120 +1597,6 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1063739947
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1063739950}
- component: {fileID: 1063739949}
- component: {fileID: 1063739948}
m_Layer: 0
m_Name: P_Run01
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!95 &1063739948
Animator:
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1063739947}
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!212 &1063739949
SpriteRenderer:
serializedVersion: 2
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1063739947}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_MaskInteraction: 0
m_Sprite: {fileID: 21300000, guid: c28a83d936216af40976803e59feffac, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 2.87, y: 3.58}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_SpriteSortPoint: 0
--- !u!4 &1063739950
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
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_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 &1118230342
GameObject:
m_ObjectHideFlags: 0
@@ -2262,6 +2216,18 @@ 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: []
@@ -2916,5 +2882,4 @@ SceneRoots:
- {fileID: 2100000001}
- {fileID: 2100000101}
- {fileID: 2200000001}
- {fileID: 1063739950}
- {fileID: 491328828}
Assets/Scenes/Lose.unity
+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
Assets/Scripts/HealthGUIController.cs
+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];
}
}
}
}
Assets/Scripts/HealthGUIController.cs.meta
+2
View File
@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 09397b12132be4248998c82e96a8b7c4
Assets/Scripts/LoseGuiController.cs
+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);
}
}
}
Assets/Scripts/LoseGuiController.cs.meta
+2
View File
@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 9c38ae32eef77b54bb36b487e11c7422
Assets/Scripts/LoseScreenController.cs
+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);
}
}
Assets/Scripts/PlayerPickupController.cs
+16 -5
View File
@@ -23,14 +23,17 @@ public class PlayerPickupController : MonoBehaviour
public Transform holdPoint; // Empty GameObject above head
public float pickupRange = 2.0f;
private GameObject heldObject;
public GameObject heldObject;
private PlayerPlatformerController platformerController;
private PlayerStressController playerStressController;
private bool isChargingThrow;
private float throwChargeStartTime;
private void OnEnable()
{
platformerController = GetComponent<PlayerPlatformerController>();
playerStressController = GetComponent<PlayerStressController>();
if (inputActions == null)
{
Debug.LogError("PlayerPickupController missing InputActionAsset reference.", this);
@@ -76,10 +79,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,6 +97,12 @@ public class PlayerPickupController : MonoBehaviour
return;
}
if(playerStressController.isPanicking)
{
DropObject(false);
return;
}
if (!heldObject.TryGetComponent<TrickController>(out _))
{
return;
@@ -118,13 +127,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)
Assets/Scripts/PlayerPlatformerController.cs
+7
View File
@@ -17,6 +17,8 @@ public class PlayerPlatformerController : MonoBehaviour
[SerializeField] private LayerMask groundMask = ~0;
[SerializeField] private float groundCheckDistance = 0.05f;
private PlayerStressController playerStressController;
private Rigidbody2D body;
private BoxCollider2D bodyCollider;
private InputActionAsset runtimeActions;
@@ -29,6 +31,7 @@ public class PlayerPlatformerController : MonoBehaviour
{
body = GetComponent<Rigidbody2D>();
bodyCollider = GetComponent<BoxCollider2D>();
playerStressController = GetComponent<PlayerStressController>();
}
private void OnEnable()
@@ -86,6 +89,8 @@ public class PlayerPlatformerController : MonoBehaviour
return;
}
if (playerStressController.isPanicking) return;
var input = moveAction.ReadValue<Vector2>();
if (Mathf.Abs(input.x) > 0.01f)
{
@@ -98,6 +103,8 @@ public class PlayerPlatformerController : MonoBehaviour
private void OnJumpPerformed(InputAction.CallbackContext context)
{
if (playerStressController.isPanicking) return;
if (!IsGrounded())
{
return;
Assets/Scripts/PlayerStressController.cs
+54 -13
View File
@@ -1,3 +1,4 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
@@ -11,11 +12,16 @@ public class PlayerStressController : MonoBehaviour
public float currentStress = 0f;
public float maxStress = 100f;
[Header("Panic Settings")]
[SerializeField] private float panicDuration = 1.2f;
private float panicEndTime;
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 paralyseDuration = 5f;
public bool IsPanicking => Time.time < panicEndTime;
void Start()
{
@@ -27,35 +33,59 @@ 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;
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 +94,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;
}
}
Assets/Scripts/WinSceneController.cs
+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))
{
Assets/UI Toolkit/GameGUI.uxml
+17 -4
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: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>
Assets/UI Toolkit/LoseScreen.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>
Assets/UI Toolkit/MainMenu.uxml
+7 -5
View File
@@ -1,8 +1,10 @@
<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:VisualElement>
</ui:UXML>
Assets/UI Toolkit/WinScreenMenu.uxml
+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>
Assets/UI Toolkit/progressBar.uss
+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);
}
Assets/UI Toolkit/progressBar.uss.meta
+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
ProjectSettings/EditorBuildSettings.asset
+3
View File
@@ -17,6 +17,9 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/Win.unity
guid: 4130885cdd041af4c8b7861d46bbcf11
- 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