xiaoqi
/
SHADE_Y3
1
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases 9 Wiki Activity

Updates for presentation build #399

Merged
glencelow merged 9 commits from PlayerController into main 2023-03-05 15:41:22 +08:00
Conversation 0 Commits 9 Files Changed 56 +4 -4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 81da3e501d - Show all commits

6
Assets/Scripts/Gameplay/Player/SC_PlayerController.cs
View File

@ -22,7 +22,7 @@ public class PlayerController : Script
public Camera cam { get; set; }
public CameraArm camArm { get; set; }
private PickAndThrow pat;
public StateMachine stateMachine;
public StateMachine stateMachine { get; set; }
public bool holdItem { get; set; }
public bool isAiming { get; set; }
@ -78,9 +78,9 @@ public class PlayerController : Script
//silhouette=====================================================================
public GameObject silhouettePlayer;
public Renderable silhouettePlayerRend;
private Renderable silhouettePlayerRend;
public GameObject silhouetteBag;
public Renderable silhouetteBagRend;
private Renderable silhouetteBagRend;
protected override void awake()
{

2
Assets/Scripts/Gameplay/SC_PreviewLevel.cs
View File

@ -56,7 +56,7 @@ namespace SHADE_Scripting.UI
return;
}
if (Input.GetKeyUp(Input.KeyCode.Space))
if (Input.GetKeyUp(Input.KeyCode.Space) && !point3Done)
{
skip = true;
point1Done = true;