Merge pull request #15 from shnok/dev

charselect walk animation

Author: shnok

l2-unity/Assets/Scripts/Game/Character/CharacterSelector.cs

@@ -52,6 +52,7 @@ public void SetCharacterList(List<CharSelectionInfoPackage> characters) {
     public void SpawnCharacterSlot(int id) {
         GameObject pawnObject = CharacterCreator.Instance.CreatePawn(_characters[id].CharacterRaceAnimation, _characters[id].PlayerAppearance);
         pawnObject.GetComponent<SelectableCharacterEntity>().CharacterInfo = _characters[id];
+        pawnObject.GetComponent<SelectableCharacterEntity>().WeaponAnim = pawnObject.GetComponent<UserGear>().WeaponAnim;
         CharacterCreator.Instance.PlacePawn(pawnObject, _pawnData[id], _characters[id].Name, _container);
         _characterGameObjects.Add(pawnObject);
     }
@@ -63,10 +64,10 @@ public void SelectCharacter(int slot) {
             }
 
             if(_selectedCharacterSlot != -1) {
-                CharacterCreator.Instance.UpdatePawnPosAndRot(_characterGameObjects[_selectedCharacterSlot], _pawnData[_selectedCharacterSlot]);
+                _characterGameObjects[_selectedCharacterSlot].GetComponent<SelectableCharacterEntity>().SetDestination(_pawnData[_selectedCharacterSlot]);
             }
 
-            CharacterCreator.Instance.UpdatePawnPosAndRot(_characterGameObjects[slot], _pawnData[7]);
+            _characterGameObjects[slot].GetComponent<SelectableCharacterEntity>().SetDestination(_pawnData[7]);
 
             _selectedCharacterSlot = slot;
             _selectedCharacter = _characters[slot];

l2-unity/Assets/Scripts/Game/Character/SelectableCharacterEntity.cs

@@ -4,7 +4,56 @@
 
 public class SelectableCharacterEntity : MonoBehaviour
 {
+    [SerializeField] private float _walkSpeed = 1;
+    [SerializeField] private string _weaponAnim;
+    [SerializeField] private Vector3 _destination;
+    [SerializeField] private Vector3 _destEulerAngles;
     [SerializeField] private CharSelectionInfoPackage _characterInfo;
+    [SerializeField] private bool _walking = false;
 
-    public CharSelectionInfoPackage CharacterInfo { get { return _characterInfo; } set { _characterInfo = value; } }
+    private CharacterController _characterController;
+    private BaseAnimationController _baseAnimationController;
+
+    public CharSelectionInfoPackage CharacterInfo {  get { return _characterInfo; } set {  _characterInfo = value; }  }
+
+    public string WeaponAnim { get { return _weaponAnim; } set { _weaponAnim = value; } }
+
+    private void Awake() {
+        _characterController = GetComponent<CharacterController>();
+        _baseAnimationController = GetComponent<BaseAnimationController>();
+        _destination = transform.position;
+    }
+
+    private void Update() {
+        float ditanceToDestination = Vector3.Distance(_destination, transform.position);
+        if(ditanceToDestination > 0.05f) {
+            if(!_walking) {
+                StartWalking();
+            }
+
+            transform.LookAt(new Vector3(_destination.x, transform.position.y, _destination.z));
+            _characterController.Move(transform.forward.normalized * Time.deltaTime * _walkSpeed);
+        } else if(_walking) {
+            StopWalking();
+        }
+    }
+
+    private void StartWalking() {
+        _walking = true;
+        _baseAnimationController.SetBool("wait_" + WeaponAnim, false);
+        _baseAnimationController.SetBool("walk_" + WeaponAnim, true);
+    }
+
+    private void StopWalking() {
+        _walking = false;
+        _baseAnimationController.SetBool("walk_" + WeaponAnim, false);
+        _baseAnimationController.SetBool("wait_" + WeaponAnim, true);
+        transform.eulerAngles = _destEulerAngles;
+    }
+
+    public void SetDestination(Logongrp destination) {
+        Vector3 pawnPosition = new Vector3(destination.X, destination.Y, destination.Z);
+        _destination = VectorUtils.ConvertPosToUnity(pawnPosition);
+        _destEulerAngles = new Vector3(0, 360.00f * destination.Yaw / 65536, 0);
+    }
 }

l2-unity/Assets/Scripts/UI/Nameplate/LobbyNameplatesManager.cs

@@ -107,7 +107,7 @@ private void CreateNameplate(SelectableCharacterEntity entity) {
             entity.transform,
             "",
             "9CE8A9FF",
-            1f, //height
+            0.92f, //height
             entity.CharacterInfo.Name,
             entity.CharacterInfo.Id,
             true