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

Merge pull request #422 from SHADE-DP/PlayerController 

Minor bug fixes and raccoon animation base
This commit is contained in:
XiaoQiDigipen 2023-03-10 20:07:48 +08:00 committed by GitHub
parent c26429f3ef af5268186c
commit 5e4925cf23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 56 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Assets/Scenes/Level1.shade
View File

@ -7668,8 +7668,8 @@
playerJumpStartClip: 223009573 playerJumpStartClip: 223009573
playerJumpLoopClip: 230974023 playerJumpLoopClip: 230974023
playerJumpEndClip: 228134756 playerJumpEndClip: 228134756
silhouettePlayer: 51000 silhouettePlayer: 462
silhouetteBag: 51000 silhouetteBag: 465
- EID: 65733 - EID: 65733
Name: HoldingPoint Name: HoldingPoint
IsActive: true IsActive: true
@ -7753,6 +7753,10 @@
Mesh: 149697411 Mesh: 149697411
Material: 126391182 Material: 126391182
IsActive: true IsActive: true
Animator Component:
Rig: 77816045
AnimationController: 0
IsActive: true
Scripts: ~ Scripts: ~
- EID: 465 - EID: 465
Name: SilouetteBag Name: SilouetteBag
@ -7768,6 +7772,10 @@
Mesh: 144838771 Mesh: 144838771
Material: 126391182 Material: 126391182
IsActive: true IsActive: true
Animator Component:
Rig: 77816045
AnimationController: 0
IsActive: true
Scripts: ~ Scripts: ~
- EID: 65732 - EID: 65732
Name: RespawnPoint Name: RespawnPoint

18
Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerIdleState.cs
View File

@ -16,13 +16,23 @@ public class PlayerIdleState : BaseState
{ {
if (!holdItem) if (!holdItem)
{ {
PlayerAnimations.Instance.playerAnimator.Play(PlayerAnimations.Instance.playerIdleClip); if (PlayerAnimations.Instance.playerIdleClip)
PlayerAnimations.Instance.BagAnimator.Play(PlayerAnimations.Instance.playerIdleClip); {
PlayerAnimations.Instance.playerAnimator.Play(PlayerAnimations.Instance.playerIdleClip);
PlayerAnimations.Instance.BagAnimator.Play(PlayerAnimations.Instance.playerIdleClip);
PlayerAnimations.Instance.silhoPlayerAnimator.Play(PlayerAnimations.Instance.playerIdleClip);
PlayerAnimations.Instance.silhoBagAnimator.Play(PlayerAnimations.Instance.playerIdleClip);
}
} }
else else
{ {
PlayerAnimations.Instance.playerAnimator.Play(PlayerAnimations.Instance.playerCarryIdleClip); if (PlayerAnimations.Instance.playerCarryIdleClip)
PlayerAnimations.Instance.BagAnimator.Play(PlayerAnimations.Instance.playerCarryIdleClip); {
PlayerAnimations.Instance.playerAnimator.Play(PlayerAnimations.Instance.playerCarryIdleClip);
PlayerAnimations.Instance.BagAnimator.Play(PlayerAnimations.Instance.playerCarryIdleClip);
PlayerAnimations.Instance.silhoPlayerAnimator.Play(PlayerAnimations.Instance.playerCarryIdleClip);
PlayerAnimations.Instance.silhoBagAnimator.Play(PlayerAnimations.Instance.playerCarryIdleClip);
}
} }
} }
} }

4
Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerRunState.cs
View File

@ -14,10 +14,12 @@ public class PlayerRunState : BaseState
public override void OnEnter() public override void OnEnter()
{ {
//Debug.Log("WALK ENTER"); //Debug.Log("WALK ENTER");
if (PlayerAnimations.Instance) if (PlayerAnimations.Instance && PlayerAnimations.Instance.playerRunClip)
{ {
PlayerAnimations.Instance.playerAnimator.Play(PlayerAnimations.Instance.playerRunClip); PlayerAnimations.Instance.playerAnimator.Play(PlayerAnimations.Instance.playerRunClip);
PlayerAnimations.Instance.BagAnimator.Play(PlayerAnimations.Instance.playerRunClip); PlayerAnimations.Instance.BagAnimator.Play(PlayerAnimations.Instance.playerRunClip);
PlayerAnimations.Instance.silhoPlayerAnimator.Play(PlayerAnimations.Instance.playerRunClip);
PlayerAnimations.Instance.silhoBagAnimator.Play(PlayerAnimations.Instance.playerRunClip);
} }
} }
public override void update() public override void update()

14
Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerWalkState.cs
View File

@ -20,17 +20,23 @@ public class PlayerWalkState : BaseState
{ {
if (!holdItem) if (!holdItem)
{ {
if(PlayerAnimations.Instance.playerWalkClip) if (PlayerAnimations.Instance.playerWalkClip)
{
PlayerAnimations.Instance.playerAnimator.Play(PlayerAnimations.Instance.playerWalkClip); PlayerAnimations.Instance.playerAnimator.Play(PlayerAnimations.Instance.playerWalkClip);
if(PlayerAnimations.Instance.playerWalkClip)
PlayerAnimations.Instance.BagAnimator.Play(PlayerAnimations.Instance.playerWalkClip); PlayerAnimations.Instance.BagAnimator.Play(PlayerAnimations.Instance.playerWalkClip);
PlayerAnimations.Instance.silhoPlayerAnimator.Play(PlayerAnimations.Instance.playerWalkClip);
PlayerAnimations.Instance.silhoBagAnimator.Play(PlayerAnimations.Instance.playerWalkClip);
}
} }
else else
{ {
if(PlayerAnimations.Instance.playerCarryWalkClip) if (PlayerAnimations.Instance.playerCarryWalkClip)
{
PlayerAnimations.Instance.playerAnimator.Play(PlayerAnimations.Instance.playerCarryWalkClip); PlayerAnimations.Instance.playerAnimator.Play(PlayerAnimations.Instance.playerCarryWalkClip);
if(PlayerAnimations.Instance.playerCarryWalkClip)
PlayerAnimations.Instance.BagAnimator.Play(PlayerAnimations.Instance.playerCarryWalkClip); PlayerAnimations.Instance.BagAnimator.Play(PlayerAnimations.Instance.playerCarryWalkClip);
PlayerAnimations.Instance.silhoPlayerAnimator.Play(PlayerAnimations.Instance.playerCarryWalkClip);
PlayerAnimations.Instance.silhoBagAnimator.Play(PlayerAnimations.Instance.playerCarryWalkClip);
}
} }
} }
} }

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

@ -57,17 +57,19 @@ public class PlayerAnimations : Script
if (!BagAnimator) if (!BagAnimator)
Debug.LogError("Bag Animator is MISSING!"); Debug.LogError("Bag Animator is MISSING!");
if(!silhouettePlayer) if(silhouettePlayer)
silhoPlayerAnimator = silhouettePlayer.GetComponent<Animator>(); silhoPlayerAnimator = silhouettePlayer.GetComponent<Animator>();
else else
Debug.LogError("Silho Player is MISSING!"); Debug.LogError("Silho Player is MISSING!");
if (!silhoPlayerAnimator) if (!silhoPlayerAnimator)
Debug.LogError("Silho Player Animator is MISSING!"); Debug.LogError("Silho Player Animator is MISSING!");
if(!silhouetteBag) if(silhouetteBag)
silhoBagAnimator = silhouetteBag.GetComponent<Animator>(); silhoBagAnimator = silhouetteBag.GetComponent<Animator>();
else else
Debug.LogError("Silho bag is MISSING!"); Debug.LogError("Silho bag is MISSING!");
if (!silhoBagAnimator) if (!silhoBagAnimator)
Debug.LogError("Silho Player Animator is MISSING!"); Debug.LogError("Silho Player Animator is MISSING!");
} }

21
SHADE_CSharp/premake5.lua
View File

@ -27,23 +27,32 @@ project "SHADE_CSharp"
warnings 'Extra' warnings 'Extra'
postbuildcommands
{
"xcopy /r /y /q \"%{outputdir}\\net5.0\\SHADE_CSharp.xml\" \"%{outputdir}\"",
"xcopy /r /y /q \"%{outputdir}\\net5.0\\SHADE_CSharp.pdb\" \"%{outputdir}\""
}
filter "configurations:Debug" filter "configurations:Debug"
symbols "On" symbols "On"
defines {"_DEBUG"} defines {"_DEBUG"}
postbuildcommands
{
"xcopy /r /y /q \"$(SolutionDir)\\bin\\Debug\\net5.0\\SHADE_CSharp.xml\" \"%{outputdir}\"",
"xcopy /r /y /q \"$(SolutionDir)\\bin\\Debug\\net5.0\\SHADE_CSharp.pdb\" \"%{outputdir}\""
}
filter "configurations:Release" filter "configurations:Release"
optimize "On" optimize "On"
defines{"_RELEASE"} defines{"_RELEASE"}
postbuildcommands
{
"xcopy /r /y /q \"$(SolutionDir)\\bin\\Release\\net5.0\\SHADE_CSharp.xml\" \"%{outputdir}\"",
"xcopy /r /y /q \"$(SolutionDir)\\bin\\Release\\net5.0\\SHADE_CSharp.pdb\" \"%{outputdir}\""
}
filter "configurations:Publish" filter "configurations:Publish"
optimize "On" optimize "On"
defines{"_RELEASE"} defines{"_RELEASE"}
postbuildcommands
{
"xcopy /r /y /q \"$(SolutionDir)\\bin\\Release\\net5.0\\SHADE_CSharp.xml\" \"%{outputdir}\"",
"xcopy /r /y /q \"$(SolutionDir)\\bin\\Release\\net5.0\\SHADE_CSharp.pdb\" \"%{outputdir}\""
}
require "vstudio" require "vstudio"