Merge remote-tracking branch 'origin/develop' into feature/movement
# Conflicts: # Assets/NetworkLib/Debug/netstandard2.1/CSNetwork.dll # Assets/Scripts/Move/EC_Player.cs # Assets/Scripts/PlayerVisual.cs
This commit is contained in:
@@ -20,13 +20,13 @@ public class PlayerVisual : MonoBehaviour
|
||||
namedAnimancer = GetComponentInChildren<NamedAnimancerComponent>();
|
||||
if(namedAnimancer == null)
|
||||
{
|
||||
BrewMonster.Logger.LogError("animancer == null");
|
||||
BrewMonster.BMLogger.LogError("animancer == null");
|
||||
return;
|
||||
}
|
||||
var player = GetComponentInParent<EC_Player>();
|
||||
if(player == null)
|
||||
{
|
||||
BrewMonster.Logger.LogError("player == null");
|
||||
BrewMonster.BMLogger.LogError("player == null");
|
||||
return;
|
||||
}
|
||||
_playerInfo = player.GetPlayInfo();
|
||||
|
||||
Reference in New Issue
Block a user