From 9ae9ab389edfa98afd914be707e525e33da4dd62 Mon Sep 17 00:00:00 2001
From: unknown <clarisa.lia96@gmail.com>
Date: Sun, 10 Apr 2022 10:42:02 +0700
Subject: [PATCH] scoreboard zen mode dah bener
---
Assets/Scenes/Level_01.unity | 47 ++++++-------------
Assets/Scripts/Managers/GameOverZenManager.cs | 17 ++++++-
Assets/Scripts/Managers/ZenScoreboard.cs | 1 -
Assets/Scripts/Player/PlayerZenDetector.cs | 17 +++++++
.../Scripts/Player/PlayerZenDetector.cs.meta | 11 +++++
ProjectSettings/TagManager.asset | 1 +
6 files changed, 59 insertions(+), 35 deletions(-)
create mode 100644 Assets/Scripts/Player/PlayerZenDetector.cs
create mode 100644 Assets/Scripts/Player/PlayerZenDetector.cs.meta
diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity
index 1a8b67c..40a50fa 100644
--- a/Assets/Scenes/Level_01.unity
+++ b/Assets/Scenes/Level_01.unity
@@ -468,6 +468,19 @@ MonoBehaviour:
deathClip: {fileID: 8300000, guid: d36a393bca4582043982db9089e1694f, type: 3}
flashSpeed: 5
flashColour: {r: 1, g: 0, b: 0, a: 0.1}
+--- !u!114 &33458252
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 33458244}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3b809abf7d5135446b42455a00876169, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ gameOverManager: {fileID: 38786131}
--- !u!135 &33458253
SphereCollider:
m_ObjectHideFlags: 0
@@ -481,19 +494,6 @@ SphereCollider:
serializedVersion: 2
m_Radius: 8
m_Center: {x: 0, y: 0, z: 0}
---- !u!114 &33458254
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 33458244}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: ec23ede6cd50b4d469c10465b307f39a, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- gameOverManager: {fileID: 38786130}
--- !u!1 &36326047
GameObject:
m_ObjectHideFlags: 0
@@ -537,7 +537,6 @@ GameObject:
- component: {fileID: 38786126}
- component: {fileID: 38786125}
- component: {fileID: 38786129}
- - component: {fileID: 38786130}
- component: {fileID: 38786131}
m_Layer: 5
m_Name: HUDCanvas
@@ -655,23 +654,6 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
---- !u!114 &38786130
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 38786124}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: d9c9e0011c2ed97428a4efc03b455359, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- warningText: {fileID: 839222784}
- playerHealth: {fileID: 33458251}
- time2:
- restartDelay: 5
- waveScoreboard: {fileID: 0}
--- !u!114 &38786131
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -684,6 +666,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f2d364563eed2da44a17f54847b5a6de, type: 3}
m_Name:
m_EditorClassIdentifier:
+ warningText: {fileID: 0}
playerHealth: {fileID: 33458251}
time2:
restartDelay: 5
@@ -700,7 +683,7 @@ GameObject:
- component: {fileID: 156041722}
m_Layer: 0
m_Name: Scoreboard
- m_TagString: Untagged
+ m_TagString: ScoreboardZen
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
diff --git a/Assets/Scripts/Managers/GameOverZenManager.cs b/Assets/Scripts/Managers/GameOverZenManager.cs
index e45a5ee..7c7dfc2 100644
--- a/Assets/Scripts/Managers/GameOverZenManager.cs
+++ b/Assets/Scripts/Managers/GameOverZenManager.cs
@@ -7,7 +7,7 @@ using UnityEngine.SceneManagement;
public class GameOverZenManager : MonoBehaviour
{
-
+ public Text warningText;
public PlayerHealth playerHealth;
private Transform gameOverText;
private bool isUpdated = false;
@@ -34,7 +34,20 @@ public class GameOverZenManager : MonoBehaviour
string name = PlayerPrefs.GetString("name");
float time = TimerManager.timer;
Debug.Log(time);
-
+
+ if (!isUpdated)
+ {
+ GameObject waveScoreboard = GameObject.FindGameObjectWithTag("ScoreboardZen");
+ ZenScoreboard _waveScoreboard = waveScoreboard.GetComponent<ZenScoreboard>();
+ if (_waveScoreboard == null)
+ {
+ Debug.Log("Null weh waveScoreboard-nya");
+ }
+ _waveScoreboard.AddScoreEntry(time, name);
+ isUpdated = true;
+ }
+
+
anim.SetTrigger("GameOver");
}
}
diff --git a/Assets/Scripts/Managers/ZenScoreboard.cs b/Assets/Scripts/Managers/ZenScoreboard.cs
index 8b8f5ea..b660226 100644
--- a/Assets/Scripts/Managers/ZenScoreboard.cs
+++ b/Assets/Scripts/Managers/ZenScoreboard.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
using UnityEngine.SceneManagement;
-using TMPro;
public class ZenScoreboard : MonoBehaviour
{
diff --git a/Assets/Scripts/Player/PlayerZenDetector.cs b/Assets/Scripts/Player/PlayerZenDetector.cs
new file mode 100644
index 0000000..bcd2367
--- /dev/null
+++ b/Assets/Scripts/Player/PlayerZenDetector.cs
@@ -0,0 +1,17 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class PlayerZenDetector : MonoBehaviour
+{
+ public GameOverZenManager gameOverManager;
+
+ private void OnTriggerEnter(Collider other)
+ {
+ if (other.tag == "Enemy" && other.isTrigger)
+ {
+ float enemyDistance = Vector3.Distance(transform.position, other.transform.position);
+ //gameOverManager.ShowWarning(enemyDistance);
+ }
+ }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Player/PlayerZenDetector.cs.meta b/Assets/Scripts/Player/PlayerZenDetector.cs.meta
new file mode 100644
index 0000000..583aa05
--- /dev/null
+++ b/Assets/Scripts/Player/PlayerZenDetector.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3b809abf7d5135446b42455a00876169
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
index 1366b54..77cc46f 100644
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -7,6 +7,7 @@ TagManager:
- WeaponUpgradeUI
- Enemy
- ScoreboardWave
+ - ScoreboardZen
layers:
- Default
- TransparentFX
--
GitLab