From 6dc8944e63c691e20f2944a916f1dc45764329d6 Mon Sep 17 00:00:00 2001
From: Stedd <toanpa+git@pm.me>
Date: Sun, 3 Sep 2023 16:47:22 +0200
Subject: [PATCH] Unit movement

---
 Assets/Prefabs/NetworkManager.prefab          | 117 ------------------
 Assets/Prefabs/Player.prefab                  |  76 ++++++++++++
 Assets/Scenes/MainScene.unity                 |   6 +-
 Assets/Scenes/MainScene/NavMesh-World.asset   | Bin 7236 -> 7236 bytes
 .../Scripts/Networking/RTSNetworkManager.cs   |   5 +-
 .../Units.meta}                               |   5 +-
 Assets/Scripts/Units/UnitMovement.cs          |  48 +++++++
 Assets/Scripts/Units/UnitMovement.cs.meta     |  11 ++
 ProjectSettings/NavMeshAreas.asset            |   6 +-
 9 files changed, 145 insertions(+), 129 deletions(-)
 delete mode 100644 Assets/Prefabs/NetworkManager.prefab
 rename Assets/{Prefabs/NetworkManager.prefab.meta => Scripts/Units.meta} (57%)
 create mode 100644 Assets/Scripts/Units/UnitMovement.cs
 create mode 100644 Assets/Scripts/Units/UnitMovement.cs.meta

diff --git a/Assets/Prefabs/NetworkManager.prefab b/Assets/Prefabs/NetworkManager.prefab
deleted file mode 100644
index e3a9d26..0000000
--- a/Assets/Prefabs/NetworkManager.prefab
+++ /dev/null
@@ -1,117 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &1856962702766056601
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5214357893675647508}
-  - component: {fileID: 1383158180383209498}
-  - component: {fileID: 5323256792100004051}
-  - component: {fileID: 2403604765386540949}
-  m_Layer: 0
-  m_Name: NetworkManager
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &5214357893675647508
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1856962702766056601}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1383158180383209498
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1856962702766056601}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3576b25916b37ae4a9d41dda8c36f224, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  dontDestroyOnLoad: 1
-  runInBackground: 1
-  autoStartServerBuild: 1
-  autoConnectClientBuild: 0
-  sendRate: 60
-  offlineScene: 
-  onlineScene: 
-  transport: {fileID: 2403604765386540949}
-  networkAddress: localhost
-  maxConnections: 100
-  disconnectInactiveConnections: 0
-  disconnectInactiveTimeout: 60
-  authenticator: {fileID: 0}
-  playerPrefab: {fileID: 5181188659209802552, guid: 137622a055406ed4f823d72e0ad2fd8a,
-    type: 3}
-  autoCreatePlayer: 1
-  playerSpawnMethod: 1
-  spawnPrefabs: []
-  snapshotSettings:
-    bufferTimeMultiplier: 2
-    bufferLimit: 32
-    catchupNegativeThreshold: -1
-    catchupPositiveThreshold: 1
-    catchupSpeed: 0.019999999552965164
-    slowdownSpeed: 0.03999999910593033
-    driftEmaDuration: 1
-    dynamicAdjustment: 1
-    dynamicAdjustmentTolerance: 1
-    deliveryTimeEmaDuration: 2
-  connectionQualityInterval: 3
-  timeInterpolationGui: 0
---- !u!114 &5323256792100004051
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1856962702766056601}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 6442dc8070ceb41f094e44de0bf87274, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  offsetX: 0
-  offsetY: 0
---- !u!114 &2403604765386540949
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1856962702766056601}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c7424c1070fad4ba2a7a96b02fbeb4bb, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  port: 7777
-  NoDelay: 1
-  SendTimeout: 5000
-  ReceiveTimeout: 30000
-  serverMaxMessageSize: 16384
-  serverMaxReceivesPerTick: 10000
-  serverSendQueueLimitPerConnection: 10000
-  serverReceiveQueueLimitPerConnection: 10000
-  clientMaxMessageSize: 16384
-  clientMaxReceivesPerTick: 1000
-  clientSendQueueLimit: 10000
-  clientReceiveQueueLimit: 10000
diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab
index 7d26b08..08ad757 100644
--- a/Assets/Prefabs/Player.prefab
+++ b/Assets/Prefabs/Player.prefab
@@ -10,6 +10,9 @@ GameObject:
   m_Component:
   - component: {fileID: 2385999535964237451}
   - component: {fileID: 5351038950168726961}
+  - component: {fileID: 2439696136893951540}
+  - component: {fileID: 6123744421715133446}
+  - component: {fileID: 8681090027785358193}
   m_Layer: 0
   m_Name: Player
   m_TagString: Untagged
@@ -50,6 +53,79 @@ MonoBehaviour:
   serverOnly: 0
   visible: 0
   hasSpawned: 0
+--- !u!114 &2439696136893951540
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5181188659209802552}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8ff3ba0becae47b8b9381191598957c8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0
+  target: {fileID: 2385999535964237451}
+  clientAuthority: 0
+  syncPosition: 1
+  syncRotation: 1
+  syncScale: 0
+  interpolatePosition: 1
+  interpolateRotation: 1
+  interpolateScale: 1
+  coordinateSpace: 0
+  sendIntervalMultiplier: 1
+  timelineOffset: 0
+  showGizmos: 0
+  showOverlay: 0
+  overlayColor: {r: 0, g: 0, b: 0, a: 0.5}
+  onlySyncOnChange: 1
+  onlySyncOnChangeCorrectionMultiplier: 2
+  rotationSensitivity: 0.01
+  compressRotation: 0
+  positionPrecision: 0.01
+  scalePrecision: 0.01
+--- !u!195 &6123744421715133446
+NavMeshAgent:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5181188659209802552}
+  m_Enabled: 1
+  m_AgentTypeID: 1479372276
+  m_Radius: 2.13
+  m_Speed: 2.2
+  m_Acceleration: 2
+  avoidancePriority: 50
+  m_AngularSpeed: 90
+  m_StoppingDistance: 1
+  m_AutoTraverseOffMeshLink: 1
+  m_AutoBraking: 1
+  m_AutoRepath: 1
+  m_Height: 2.28
+  m_BaseOffset: 0
+  m_WalkableMask: 4294967295
+  m_ObstacleAvoidanceType: 4
+--- !u!114 &8681090027785358193
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5181188659209802552}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc5d69536d0782647a3de12f2d524c45, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  syncDirection: 0
+  syncMode: 0
+  syncInterval: 0
+  _navMeshAgent: {fileID: 6123744421715133446}
 --- !u!1001 &4315183336175566048
 PrefabInstance:
   m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity
index 83df5a1..6b14a2d 100644
--- a/Assets/Scenes/MainScene.unity
+++ b/Assets/Scenes/MainScene.unity
@@ -539,7 +539,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 7a5ac11cc976e418e8d13136b07e1f52, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_AgentTypeID: 0
+  m_AgentTypeID: 1479372276
   m_CollectObjects: 0
   m_Size: {x: 10, y: 10, z: 10}
   m_Center: {x: 0, y: 2, z: 0}
@@ -554,7 +554,7 @@ MonoBehaviour:
   m_OverrideTileSize: 0
   m_TileSize: 256
   m_OverrideVoxelSize: 0
-  m_VoxelSize: 0.16666667
+  m_VoxelSize: 0.71000004
   m_MinRegionArea: 2
   m_NavMeshData: {fileID: 23800000, guid: 484f98bbc6c0d2545ba1ca067ab3a2e2, type: 2}
   m_BuildHeightMesh: 0
@@ -768,7 +768,7 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: -0.5, z: 0}
-  m_LocalScale: {x: 20, y: 1, z: 20}
+  m_LocalScale: {x: 30, y: 1, z: 30}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 578241694}
diff --git a/Assets/Scenes/MainScene/NavMesh-World.asset b/Assets/Scenes/MainScene/NavMesh-World.asset
index 79101b2fa53a888a1058183c84945186a3d23b8b..413c08a3ac7c5040e2e68e240ee8f069a3708e3c 100644
GIT binary patch
delta 605
zcmX?Nal~SSi3H1+T-}Jt3X&4uZLcd2GB7mkhtLcRZvrPcFaUv!#}@lXRXzs~$hF#n
z_#lAJ2Fb(J0O`rICG0sF8CV#^7?>EuCSMd6)i9Xb9dd5Hvy_VBR<@%X7!s}kO$l@K
za}fZW$H4F(2%t_;a0WR6h#irgfNU+$3P+d|U~G`}Ff|}2G)qF9AOv%Qzz)CHhNax+
z`|tbahfkRIW6I<Yk|LPihq?#seUKYK-bXUm5yl45AUl!V0cL~j&Xxk%%>eek5ZL=_
z9}@na@{~x7<mlbNI(gelbnk;q1AG62l!`UX>)5OZ8V~k5h=#F2nn3{Ql*#_m&S0xS
z-UeH3_rmn|iwgdqt4_WZKb)ez#{*=|n?MeS*4Kg#3=AetXV3J2JqR{}fdMGSz%b#E
iDMXAB=z3Md{UEWkX9^t8p5d_v(I7qoG$88-djkN??z*@D

delta 599
zcmX?Nal~SSi3AG+5KLB(l=4(K$iUFBpMe2HGcXt%H#>l628II;p`oG&H>_G^3*j>`
zptC{pFf~AW@@xrvPBsP>1{($*2Ajzj#YHueBVSJcR`^Eo?|R*DJZnG3Tmc#t=IG}l
z05$SI5P+DIKS(J#f*hdWi0lB66v9#oM|3vGa+n&B1DYiv4zPqdK;Z4I+euEP``?7G
z57vu%w07m>50WC7UI&>0^SXi~$m<|J#5M^aAI4^2fO!`rhG0uf&Xxk%%mDVfCD`kR
zDwpyebCj=7H2*9u@#=~?y4OJ_fB?|zD%J>(W3wLSagbABY=~x{6DRviJA<tTc^YiB
zot(2vyvlU7Zli$J6FeqVe}<@Kum{o(3=AetKnlc$0S6Fc^(rkpumB^_^{R%z^uWMy
W_Kbq#*)u%$AQ~(OCmN9TgGB*vW{@ZV

diff --git a/Assets/Scripts/Networking/RTSNetworkManager.cs b/Assets/Scripts/Networking/RTSNetworkManager.cs
index a31b09d..c2ccda3 100644
--- a/Assets/Scripts/Networking/RTSNetworkManager.cs
+++ b/Assets/Scripts/Networking/RTSNetworkManager.cs
@@ -1,9 +1,6 @@
-using System.Collections;
-using System.Collections.Generic;
 using Mirror;
-using UnityEngine;
 
 public class RtsNetworkManager : NetworkManager
 {
-
+    
 }
\ No newline at end of file
diff --git a/Assets/Prefabs/NetworkManager.prefab.meta b/Assets/Scripts/Units.meta
similarity index 57%
rename from Assets/Prefabs/NetworkManager.prefab.meta
rename to Assets/Scripts/Units.meta
index bb92c29..0d13135 100644
--- a/Assets/Prefabs/NetworkManager.prefab.meta
+++ b/Assets/Scripts/Units.meta
@@ -1,6 +1,7 @@
 fileFormatVersion: 2
-guid: dce2bed696544cc42818b18b7e98f840
-PrefabImporter:
+guid: 77bc0eda61472c04b807f23c440ef0bc
+folderAsset: yes
+DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 
diff --git a/Assets/Scripts/Units/UnitMovement.cs b/Assets/Scripts/Units/UnitMovement.cs
new file mode 100644
index 0000000..60daac1
--- /dev/null
+++ b/Assets/Scripts/Units/UnitMovement.cs
@@ -0,0 +1,48 @@
+using Mirror;
+using UnityEngine;
+using UnityEngine.AI;
+using UnityEngine.InputSystem;
+
+public class UnitMovement : NetworkBehaviour
+{
+    [SerializeField] private NavMeshAgent _navMeshAgent;
+
+    private Camera _camera;
+    private Mouse _mouse;
+
+    #region Server
+
+    [Command] private void CmdMove(Vector3 destination)
+    {
+        if (NavMesh.SamplePosition(destination, out NavMeshHit hit, 1f, NavMesh.AllAreas))
+        {
+            _navMeshAgent.SetDestination(hit.position);
+        }
+    }
+
+    #endregion
+
+    #region Client
+
+    public override void OnStartAuthority()
+    {
+        base.OnStartAuthority();
+        _camera = Camera.main;
+        _mouse = Mouse.current;
+    }
+
+    [ClientCallback]
+    private void Update()
+    {
+        if (!isOwned) return;
+        if (!_mouse.rightButton.wasPressedThisFrame) return;
+        Ray ray = _camera.ScreenPointToRay(_mouse.position.ReadValue());
+
+        if (Physics.Raycast(ray, out RaycastHit hit, Mathf.Infinity))
+        {
+            CmdMove(hit.point);
+        }
+    }
+
+    #endregion
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Units/UnitMovement.cs.meta b/Assets/Scripts/Units/UnitMovement.cs.meta
new file mode 100644
index 0000000..937f6ca
--- /dev/null
+++ b/Assets/Scripts/Units/UnitMovement.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: dc5d69536d0782647a3de12f2d524c45
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/ProjectSettings/NavMeshAreas.asset b/ProjectSettings/NavMeshAreas.asset
index 45aa702..816d78d 100644
--- a/ProjectSettings/NavMeshAreas.asset
+++ b/ProjectSettings/NavMeshAreas.asset
@@ -127,10 +127,10 @@ NavMeshProjectSettings:
       m_Flags: 0
   - serializedVersion: 3
     agentTypeID: 1479372276
-    agentRadius: 0.5
-    agentHeight: 2
+    agentRadius: 2.13
+    agentHeight: 2.28
     agentSlope: 45
-    agentClimb: 0.4
+    agentClimb: 1.1
     ledgeDropHeight: 0
     maxJumpAcrossDistance: 0
     minRegionArea: 2