From fb68dc481eed53d4e67aecb0a4f95bee0bd3326d Mon Sep 17 00:00:00 2001
From: Adam Elfawal <55642322+AdamElf@users.noreply.github.com>
Date: Tue, 12 Mar 2024 03:53:20 -0400
Subject: [PATCH] tape powerup works functionally
---
...fice Supplies Low Poly Shared Material.mat | 2 +-
Assets/Prefabs/PowerUps.meta | 8 ++
.../PowerUps/Tape dispenser Variant.prefab | 120 ++++++++++++++++++
.../Tape dispenser Variant.prefab.meta | 7 +
Assets/Scenes/TESTBLOCKOUT.unity | 79 +++++++++++-
Assets/Scripts/PowerUps.meta | 8 ++
Assets/Scripts/PowerUps/Tape.cs | 41 ++++++
Assets/Scripts/PowerUps/Tape.cs.meta | 11 ++
8 files changed, 274 insertions(+), 2 deletions(-)
create mode 100644 Assets/Prefabs/PowerUps.meta
create mode 100644 Assets/Prefabs/PowerUps/Tape dispenser Variant.prefab
create mode 100644 Assets/Prefabs/PowerUps/Tape dispenser Variant.prefab.meta
create mode 100644 Assets/Scripts/PowerUps.meta
create mode 100644 Assets/Scripts/PowerUps/Tape.cs
create mode 100644 Assets/Scripts/PowerUps/Tape.cs.meta
diff --git a/Assets/Art/Asset Store Packs/Office Supplies Low Poly/Assets/Materials/Office Supplies Low Poly Shared Material.mat b/Assets/Art/Asset Store Packs/Office Supplies Low Poly/Assets/Materials/Office Supplies Low Poly Shared Material.mat
index 9677934..6628912 100644
--- a/Assets/Art/Asset Store Packs/Office Supplies Low Poly/Assets/Materials/Office Supplies Low Poly Shared Material.mat
+++ b/Assets/Art/Asset Store Packs/Office Supplies Low Poly/Assets/Materials/Office Supplies Low Poly Shared Material.mat
@@ -49,7 +49,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 0}
+ m_Texture: {fileID: 2800000, guid: ceac69e7a89a0406b9cc8306168f4932, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
diff --git a/Assets/Prefabs/PowerUps.meta b/Assets/Prefabs/PowerUps.meta
new file mode 100644
index 0000000..1322852
--- /dev/null
+++ b/Assets/Prefabs/PowerUps.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4bc55d397dc02914ea957313eace68d4
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Prefabs/PowerUps/Tape dispenser Variant.prefab b/Assets/Prefabs/PowerUps/Tape dispenser Variant.prefab
new file mode 100644
index 0000000..5ae5a91
--- /dev/null
+++ b/Assets/Prefabs/PowerUps/Tape dispenser Variant.prefab
@@ -0,0 +1,120 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &4337564008982877764
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 1690718150433878, guid: 99d4c8645da7e43e8ac08906d7ec2948, type: 3}
+ propertyPath: m_Name
+ value: Tape dispenser Variant
+ objectReference: {fileID: 0}
+ - target: {fileID: 4274085853288620, guid: 99d4c8645da7e43e8ac08906d7ec2948, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 4274085853288620, guid: 99d4c8645da7e43e8ac08906d7ec2948, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 4274085853288620, guid: 99d4c8645da7e43e8ac08906d7ec2948, type: 3}
+ propertyPath: m_LocalScale.z
+ value: 10
+ objectReference: {fileID: 0}
+ - target: {fileID: 4274085853288620, guid: 99d4c8645da7e43e8ac08906d7ec2948, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -18.28
+ objectReference: {fileID: 0}
+ - target: {fileID: 4274085853288620, guid: 99d4c8645da7e43e8ac08906d7ec2948, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.884
+ objectReference: {fileID: 0}
+ - target: {fileID: 4274085853288620, guid: 99d4c8645da7e43e8ac08906d7ec2948, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -27.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 4274085853288620, guid: 99d4c8645da7e43e8ac08906d7ec2948, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4274085853288620, guid: 99d4c8645da7e43e8ac08906d7ec2948, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4274085853288620, guid: 99d4c8645da7e43e8ac08906d7ec2948, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4274085853288620, guid: 99d4c8645da7e43e8ac08906d7ec2948, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4274085853288620, guid: 99d4c8645da7e43e8ac08906d7ec2948, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4274085853288620, guid: 99d4c8645da7e43e8ac08906d7ec2948, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4274085853288620, guid: 99d4c8645da7e43e8ac08906d7ec2948, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4274085853288620, guid: 99d4c8645da7e43e8ac08906d7ec2948, type: 3}
+ propertyPath: m_ConstrainProportionsScale
+ value: 1
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents:
+ - targetCorrespondingSourceObject: {fileID: 1690718150433878, guid: 99d4c8645da7e43e8ac08906d7ec2948, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 6183310413827083986}
+ - targetCorrespondingSourceObject: {fileID: 1690718150433878, guid: 99d4c8645da7e43e8ac08906d7ec2948, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 5499231776101232722}
+ m_SourcePrefab: {fileID: 100100000, guid: 99d4c8645da7e43e8ac08906d7ec2948, type: 3}
+--- !u!1 &4338126215055673874 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 1690718150433878, guid: 99d4c8645da7e43e8ac08906d7ec2948, type: 3}
+ m_PrefabInstance: {fileID: 4337564008982877764}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &6183310413827083986
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4338126215055673874}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 31663f50c9e19034eb06eb3b296015de, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ activeTime: 10
+--- !u!65 &5499231776101232722
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4338126215055673874}
+ m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_LayerOverridePriority: 0
+ m_IsTrigger: 1
+ m_ProvidesContacts: 0
+ m_Enabled: 1
+ serializedVersion: 3
+ m_Size: {x: 0.33, y: 0.1, z: 0.12}
+ m_Center: {x: 0, y: 0.09, z: 0}
diff --git a/Assets/Prefabs/PowerUps/Tape dispenser Variant.prefab.meta b/Assets/Prefabs/PowerUps/Tape dispenser Variant.prefab.meta
new file mode 100644
index 0000000..b569456
--- /dev/null
+++ b/Assets/Prefabs/PowerUps/Tape dispenser Variant.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9ca90b3ecceec834086f723c6ea5a3a9
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/TESTBLOCKOUT.unity b/Assets/Scenes/TESTBLOCKOUT.unity
index 0dc3d5a..2951eb0 100644
--- a/Assets/Scenes/TESTBLOCKOUT.unity
+++ b/Assets/Scenes/TESTBLOCKOUT.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 705507994}
- m_IndirectSpecularColor: {r: 0.44893694, g: 0.49900275, b: 0.57570523, a: 1}
+ m_IndirectSpecularColor: {r: 0.44893718, g: 0.4990033, b: 0.5757063, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -421,6 +421,10 @@ PrefabInstance:
propertyPath: m_Name
value: Player
objectReference: {fileID: 0}
+ - target: {fileID: 4099498095617253306, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
+ propertyPath: m_TagString
+ value: Player
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -4434,6 +4438,9 @@ MonoBehaviour:
sprintMulti: 2
maxSprintBonus: 10
sprintDecayTime: 1
+ sprintPercentMin: 0.1
+ sprintTimeTotal: 3
+ sprintRecovery: 1
boostDecayTime: 1
boostDecay: 0
boostBonus: 0
@@ -10026,6 +10033,18 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
+ - target: {fileID: 233963122616429131, guid: 06692ad41b0a861469a27086300d9bd0, type: 3}
+ propertyPath: m_AnchorMax.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 233963122616429131, guid: 06692ad41b0a861469a27086300d9bd0, type: 3}
+ propertyPath: m_AnchorMax.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 233963122616429131, guid: 06692ad41b0a861469a27086300d9bd0, type: 3}
+ propertyPath: m_AnchorMin.x
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 267049304060646192, guid: 06692ad41b0a861469a27086300d9bd0, type: 3}
propertyPath: m_Pivot.x
value: 0
@@ -13103,6 +13122,63 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
generateBasicMaterial: 1
+--- !u!1001 &1484894586436689044
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 4338126215055673874, guid: 9ca90b3ecceec834086f723c6ea5a3a9, type: 3}
+ propertyPath: m_Name
+ value: Tape dispenser
+ objectReference: {fileID: 0}
+ - target: {fileID: 4340678659522678504, guid: 9ca90b3ecceec834086f723c6ea5a3a9, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -18.28
+ objectReference: {fileID: 0}
+ - target: {fileID: 4340678659522678504, guid: 9ca90b3ecceec834086f723c6ea5a3a9, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.884
+ objectReference: {fileID: 0}
+ - target: {fileID: 4340678659522678504, guid: 9ca90b3ecceec834086f723c6ea5a3a9, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -27.5
+ objectReference: {fileID: 0}
+ - target: {fileID: 4340678659522678504, guid: 9ca90b3ecceec834086f723c6ea5a3a9, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4340678659522678504, guid: 9ca90b3ecceec834086f723c6ea5a3a9, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4340678659522678504, guid: 9ca90b3ecceec834086f723c6ea5a3a9, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4340678659522678504, guid: 9ca90b3ecceec834086f723c6ea5a3a9, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4340678659522678504, guid: 9ca90b3ecceec834086f723c6ea5a3a9, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4340678659522678504, guid: 9ca90b3ecceec834086f723c6ea5a3a9, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4340678659522678504, guid: 9ca90b3ecceec834086f723c6ea5a3a9, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 9ca90b3ecceec834086f723c6ea5a3a9, type: 3}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
@@ -13114,3 +13190,4 @@ SceneRoots:
- {fileID: 70730237}
- {fileID: 1615970938}
- {fileID: 1790283309}
+ - {fileID: 1484894586436689044}
diff --git a/Assets/Scripts/PowerUps.meta b/Assets/Scripts/PowerUps.meta
new file mode 100644
index 0000000..0223245
--- /dev/null
+++ b/Assets/Scripts/PowerUps.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b3cd8b8fad8ca6a4982d216005a180b5
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/PowerUps/Tape.cs b/Assets/Scripts/PowerUps/Tape.cs
new file mode 100644
index 0000000..abb5015
--- /dev/null
+++ b/Assets/Scripts/PowerUps/Tape.cs
@@ -0,0 +1,41 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Tape : MonoBehaviour
+{
+ [Range(0, 20)]
+ public int activeTime = 10;
+ private void OnTriggerEnter(Collider other)
+ {
+ if (other.gameObject.CompareTag("Player"))
+ {
+ StartCoroutine(TapeActive(other));
+ gameObject.transform.position = new Vector3(0, -10000, 0);
+
+
+ }
+ }
+
+ public IEnumerator TapeActive(Collider collision)
+ {
+ Rigidbody rb = collision.gameObject.GetComponent<Rigidbody>();
+ GameObject GO = collision.gameObject;
+ float timer = Time.time;
+ float massStorage = rb.mass;
+ Vector3 scaleStorage = GO.transform.localScale;
+ Debug.Log(scaleStorage);
+
+ while (activeTime > Time.time-timer)
+ {
+ collision.gameObject.transform.localScale = new Vector3(scaleStorage.x * (1+(Time.time - timer) / activeTime), scaleStorage.y * (1+(Time.time - timer) / activeTime), scaleStorage.z * (1+(Time.time - timer) / activeTime));
+ collision.gameObject.GetComponent<Rigidbody>().mass = massStorage * (1+(Time.time-timer)/(activeTime/2));
+ Debug.Log(Time.time-timer);
+ yield return new WaitForFixedUpdate();
+ }
+ collision.gameObject.transform.localScale = scaleStorage;
+ collision.gameObject.GetComponent<Rigidbody>().mass = massStorage;
+ Destroy(gameObject);
+ yield return null;
+ }
+}
diff --git a/Assets/Scripts/PowerUps/Tape.cs.meta b/Assets/Scripts/PowerUps/Tape.cs.meta
new file mode 100644
index 0000000..23ad398
--- /dev/null
+++ b/Assets/Scripts/PowerUps/Tape.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 31663f50c9e19034eb06eb3b296015de
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
--
GitLab