Merge branch 'master' of https://github.com/Suprcode/Emerald

qq317423892 · Feb 11, 2021 · be78a9d · be78a9d
2 parents 791bb18 + f6e2071
commit be78a9d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Emerald/Assets/Prefab/Player/Player.prefab b/Emerald/Assets/Prefab/Player/Player.prefab
@@ -464,7 +464,7 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8447126569678902544}
   m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_Enabled: 0
   serializedVersion: 2
   m_Size: {x: 1, y: 1, z: 1}

diff --git a/Emerald/Assets/Scripts/PlayerObject.cs b/Emerald/Assets/Scripts/PlayerObject.cs
@@ -199,7 +199,7 @@ public void UpdateCamera(float delta)
 
     public override void SetAction()
     {        
-        if (this == GameManager.User.Player && GameScene.QueuedAction != null)
+        if (this == GameManager.User.Player && Time.time > GameManager.NextAction && GameScene.QueuedAction != null)
         {
             ActionFeed.Clear();
             ActionFeed.Add(GameScene.QueuedAction);