Skip to content

Multiplayer-arena-game / Multiplayer-arena-game-GameObjects

Go to a project
Commit aa32937b by alsunj
Options

Create server authorative rogue enemy

parent 39dc1546
Inline Side-by-side
Showing with 371 additions and 233 deletions
Assets/_Game/Art/Models/Characters/Skeleton_Rogue.fbx.meta
...@@ -591,7 +591,7 @@ ModelImporter: ...@@ -591,7 +591,7 @@ ModelImporter:
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: [] curves: []
events: events:
- time: 0.9712794 - time: 0.28687572
functionName: ReceiveTargetShotEventFromAnimator functionName: ReceiveTargetShotEventFromAnimator
data: data:
objectReferenceParameter: {fileID: 11500000, guid: f756dd42a94556a4489ea5f3fa82f1c2, type: 3} objectReferenceParameter: {fileID: 11500000, guid: f756dd42a94556a4489ea5f3fa82f1c2, type: 3}
......
Assets/_Game/Code/Enemy/Enemy.cs
...@@ -17,12 +17,9 @@ public class Enemy : NetworkBehaviour ...@@ -17,12 +17,9 @@ public class Enemy : NetworkBehaviour
private bool _isAiming; private bool _isAiming;
private Vector3 _lookingDirection; private Vector3 _lookingDirection;
private bool _targetLocked; private bool _targetLocked;
private Collider[] hitColliders;
public void InitializeEnemy()
private Collider[]
hitColliders = new Collider[10]; //TODO: this should be the amount of players connected to the network.
private void Start()
{ {
_enemyManager = GetComponent<EnemyManager>(); _enemyManager = GetComponent<EnemyManager>();
if (_enemyManager != null) if (_enemyManager != null)
...@@ -38,7 +35,7 @@ public class Enemy : NetworkBehaviour ...@@ -38,7 +35,7 @@ public class Enemy : NetworkBehaviour
if (_enemyAnimator != null) if (_enemyAnimator != null)
{ {
_enemyAnimator.InitializeEvents(_enemyManager.enemyEvents); _enemyAnimator.InitializeEvents(_enemyManager.enemyEvents);
_enemyAnimator.receiveTargetShotEventFromAnimator += TargetShotEndEventServerRpc; _enemyAnimator.receiveTargetShotEventFromAnimator += TargetShotAnimationEndEventServerRpc;
_enemyAnimator.receiveTargetAimedEventFromAnimator += ShootTargetServerRpc; _enemyAnimator.receiveTargetAimedEventFromAnimator += ShootTargetServerRpc;
_enemyAnimator.receiveTargetReloadEventFromAnimator += ReloadCrossbowServerRpc; _enemyAnimator.receiveTargetReloadEventFromAnimator += ReloadCrossbowServerRpc;
} }
...@@ -52,32 +49,35 @@ public class Enemy : NetworkBehaviour ...@@ -52,32 +49,35 @@ public class Enemy : NetworkBehaviour
throw new Exception("EnemySettings is not set in the inspector"); throw new Exception("EnemySettings is not set in the inspector");
} }
if (arrow == null)
{
throw new Exception("Arrow is not set in the inspector");
}
if (weapon == null) if (weapon == null)
{ {
throw new Exception("Weapon is not set in the inspector"); throw new Exception("Weapon is not set in the inspector");
} }
_arrowSpawnPoint = weapon.transform.Find("ArrowSpawnPoint"); _arrowSpawnPoint = weapon.transform.Find("Skeleton_Crossbow/ArrowSpawnPoint");
if (_arrowSpawnPoint == null) if (_arrowSpawnPoint == null)
{ {
throw new Exception("ArrowSpawnPoint is not found as a child of Weapon"); throw new Exception("ArrowSpawnPoint is not found as a child of Weapon");
} }
if (arrow == null)
{
throw new Exception("Arrow is not set in the inspector");
}
InstantiateArrowServer(); InstantiateArrowServer();
hitColliders = new Collider[NetworkManager.Singleton.ConnectedClients.Count];
} }
public void InstantiateArrowServer() public void InstantiateArrowServer()
{ {
_instantiatedArrow = Instantiate(arrow, _arrowSpawnPoint.position, _arrowSpawnPoint.rotation) _instantiatedArrow = Instantiate(arrow, _arrowSpawnPoint.position, _arrowSpawnPoint.rotation)
.GetComponent<NetworkObject>(); .GetComponent<NetworkObject>();
_instantiatedArrow.Spawn(); _instantiatedArrow.Spawn();
// _instantiatedArrow.transform.SetParent(weapon.transform); _instantiatedArrow.GetComponent<Arrow>().SetTargetTransform(_arrowSpawnPoint.transform);
_isCrossbowLoaded = true; _isCrossbowLoaded = true;
} }
...@@ -97,35 +97,23 @@ public class Enemy : NetworkBehaviour ...@@ -97,35 +97,23 @@ public class Enemy : NetworkBehaviour
} }
[ServerRpc(RequireOwnership = false)] [ServerRpc]
public void TargetShotEndEventServerRpc() public void TargetShotAnimationEndEventServerRpc()
{
UpdateArrowTransformClientRpc(new NetworkObjectReference(_instantiatedArrow), _arrowSpawnPoint.position,
_arrowSpawnPoint.rotation);
}
[ClientRpc]
private void UpdateArrowTransformClientRpc(NetworkObjectReference arrowReference, Vector3 position,
Quaternion rotation)
{ {
if (arrowReference.TryGet(out NetworkObject arrowObject)) _instantiatedArrow.GetComponent<Arrow>().RemoveTargetTransform();
{ _instantiatedArrow.GetComponent<Rigidbody>().linearVelocity = _lookingDirection * enemySettings.shootingRange;
arrowObject.transform.position = position; //UpdateArrowTransformClientRpc(new NetworkObjectReference(_instantiatedArrow), _arrowSpawnPoint.position,
arrowObject.transform.rotation = rotation; // _arrowSpawnPoint.rotation);
}
_enemyManager.enemyEvents.EnemyReload(); _enemyManager.enemyEvents.EnemyReload();
} }
[ServerRpc(RequireOwnership = false)] [ServerRpc]
private void ReloadCrossbowServerRpc() private void ReloadCrossbowServerRpc()
{ {
//_instantiatedArrow.gameObject.SetActive(false);
// _instantiatedArrow.transform.SetParent(weapon.transform);
_instantiatedArrow.GetComponent<Rigidbody>().linearVelocity = Vector3.zero; _instantiatedArrow.GetComponent<Rigidbody>().linearVelocity = Vector3.zero;
// _instantiatedArrow.gameObject.SetActive(false); _instantiatedArrow.GetComponent<Arrow>().SetTargetTransform(_arrowSpawnPoint.transform);
_instantiatedArrow.transform.position = _arrowSpawnPoint.position;
_instantiatedArrow.transform.rotation = _arrowSpawnPoint.rotation;
// _instantiatedArrow.transform.SetParent(weapon.transform);
_targetLocked = false; _targetLocked = false;
_isCrossbowLoaded = true; _isCrossbowLoaded = true;
} }
...@@ -155,39 +143,23 @@ public class Enemy : NetworkBehaviour ...@@ -155,39 +143,23 @@ public class Enemy : NetworkBehaviour
} }
_targetLocked = true; _targetLocked = true;
// RotateTowardsTargetClientRpc(closestCollider.gameObject.GetComponent<NetworkObject>().NetworkObjectId);
RotateTowardsTargetClientRpc(closestCollider.gameObject.GetComponent<NetworkObject>().NetworkObjectId);
GameObject targetObject = closestCollider.gameObject;
_enemyManager.enemyEvents.EnemyAim();
_lookingDirection = (targetObject.transform.position - transform.position).normalized;
Quaternion lookRotation =
Quaternion.LookRotation(new Vector3(_lookingDirection.x, 0, _lookingDirection.z));
transform.DORotateQuaternion(lookRotation, 0.5f);
} }
} }
} }
[ClientRpc]
private void RotateTowardsTargetClientRpc(ulong targetNetworkObjectId)
{
var targetObject = NetworkManager.Singleton.SpawnManager.SpawnedObjects[targetNetworkObjectId];
if (targetObject != null)
{
_enemyManager.enemyEvents.EnemyAim();
_lookingDirection = (targetObject.transform.position - transform.position).normalized;
Quaternion lookRotation = Quaternion.LookRotation(new Vector3(_lookingDirection.x, 0, _lookingDirection.z));
transform.DORotateQuaternion(lookRotation, 0.5f);
}
}
[ServerRpc] [ServerRpc]
private void ShootTargetServerRpc() private void ShootTargetServerRpc()
{ {
_instantiatedArrow.transform.SetParent(null);
_instantiatedArrow.transform.rotation = weapon.transform.rotation;
_instantiatedArrow.GetComponent<Rigidbody>().linearVelocity = _lookingDirection * enemySettings.shootingRange;
_shootingTimer = enemySettings.shootingDelay; _shootingTimer = enemySettings.shootingDelay;
_isCrossbowLoaded = false; _isCrossbowLoaded = false;
ShootTargetClientRpc();
}
[ClientRpc]
private void ShootTargetClientRpc()
{
_enemyManager.enemyEvents.EnemyAttack(); _enemyManager.enemyEvents.EnemyAttack();
} }
} }
\ No newline at end of file
Assets/_Game/Code/Enemy/EnemySpawner.cs
...@@ -33,8 +33,9 @@ public class EnemySpawner : MonoBehaviour ...@@ -33,8 +33,9 @@ public class EnemySpawner : MonoBehaviour
// Start is called once before the first execution of Update after the MonoBehaviour is created // Start is called once before the first execution of Update after the MonoBehaviour is created
void Start() void Start()
{ {
NetworkManager.Singleton.OnServerStarted += OnServerStartedServerRpc; OnServerStartedServerRpc();
NetworkManager.Singleton.OnServerStopped += OnServerStoppedServerRpc; //NetworkManager.Singleton.OnServerStarted += OnServerStartedServerRpc;
// NetworkManager.Singleton.OnServerStopped += OnServerStoppedServerRpc;
} }
[ServerRpc] [ServerRpc]
...@@ -42,14 +43,15 @@ public class EnemySpawner : MonoBehaviour ...@@ -42,14 +43,15 @@ public class EnemySpawner : MonoBehaviour
{ {
if (!state) if (!state)
{ {
NetworkManager.Singleton.OnServerStarted -= OnServerStartedServerRpc; // NetworkManager.Singleton.OnServerStarted -= OnServerStartedServerRpc;
NetworkManager.Singleton.OnServerStopped -= OnServerStoppedServerRpc; // NetworkManager.Singleton.OnServerStopped -= OnServerStoppedServerRpc;
} }
} }
[ServerRpc] [ServerRpc]
private void OnServerStartedServerRpc() private void OnServerStartedServerRpc()
{ {
Debug.Log("Setting up enemy spawner");
ApplyExistingEnemyArrows(); ApplyExistingEnemyArrows();
FindEnemySpawnPositions(); FindEnemySpawnPositions();
FindEnemyConfig(); FindEnemyConfig();
...@@ -68,7 +70,9 @@ public class EnemySpawner : MonoBehaviour ...@@ -68,7 +70,9 @@ public class EnemySpawner : MonoBehaviour
{ {
if (_RogueEnemySpawnTimer <= 0f) if (_RogueEnemySpawnTimer <= 0f)
{ {
Vector3 spawnPosition = GetSpawnPosition(_spawnedSlimeEnemyCount); var random = new Unity.Mathematics.Random((uint)System.DateTime.Now.Ticks);
Vector3 spawnPosition = GetSpawnPosition(_spawnedRogueEnemyCount);
spawnPosition += new Vector3(random.NextFloat(-5f, 5f), 0, random.NextFloat(-5f, 5f));
SpawnRogueEnemyServerRpc(spawnPosition); SpawnRogueEnemyServerRpc(spawnPosition);
_spawnedRogueEnemyCount++; _spawnedRogueEnemyCount++;
_RogueEnemySpawnTimer = _RogueEnemySpawnCooldown; _RogueEnemySpawnTimer = _RogueEnemySpawnCooldown;
...@@ -85,7 +89,9 @@ public class EnemySpawner : MonoBehaviour ...@@ -85,7 +89,9 @@ public class EnemySpawner : MonoBehaviour
{ {
if (_SlimeEnemySpawnTimer <= 0f) if (_SlimeEnemySpawnTimer <= 0f)
{ {
var random = new Unity.Mathematics.Random((uint)System.DateTime.Now.Ticks);
Vector3 spawnPosition = GetSpawnPosition(_spawnedSlimeEnemyCount); Vector3 spawnPosition = GetSpawnPosition(_spawnedSlimeEnemyCount);
spawnPosition += new Vector3(random.NextFloat(-5f, 5f), 0, random.NextFloat(-5f, 5f));
SpawnSlimeEnemyServerRpc(spawnPosition); SpawnSlimeEnemyServerRpc(spawnPosition);
_spawnedSlimeEnemyCount++; _spawnedSlimeEnemyCount++;
...@@ -105,9 +111,16 @@ public class EnemySpawner : MonoBehaviour ...@@ -105,9 +111,16 @@ public class EnemySpawner : MonoBehaviour
GameObject spawnedEnemy = GameObject spawnedEnemy =
Instantiate(_rogueEnemyPrefab, spawnPosition, Quaternion.identity, gameObject.transform); Instantiate(_rogueEnemyPrefab, spawnPosition, Quaternion.identity, gameObject.transform);
spawnedEnemy.GetComponent<NetworkObject>().Spawn(); spawnedEnemy.GetComponent<NetworkObject>().Spawn();
SpawnEnemyForClientRpc(spawnedEnemy);
} }
} }
[ClientRpc]
private void SpawnEnemyForClientRpc(GameObject spawnedEnemy)
{
spawnedEnemy.GetComponent<Enemy>().InitializeEnemy();
}
[ServerRpc] [ServerRpc]
private void SpawnSlimeEnemyServerRpc(Vector3 spawnPosition) private void SpawnSlimeEnemyServerRpc(Vector3 spawnPosition)
{ {
...@@ -115,6 +128,7 @@ public class EnemySpawner : MonoBehaviour ...@@ -115,6 +128,7 @@ public class EnemySpawner : MonoBehaviour
{ {
GameObject spawnedEnemy = Instantiate(_slimeEnemyPrefab, spawnPosition, Quaternion.identity); GameObject spawnedEnemy = Instantiate(_slimeEnemyPrefab, spawnPosition, Quaternion.identity);
spawnedEnemy.GetComponent<NetworkObject>().Spawn(); spawnedEnemy.GetComponent<NetworkObject>().Spawn();
// spawnedEnemy.GetComponent<Enemy>().InitializeEnemy();
} }
} }
......
Assets/_Game/Code/Pickupable/Weapons/Arrow.cs 0 → 100644
using System;
using UnityEngine;
using UnityEngine.UIElements;
public class Arrow : MonoBehaviour
{
public BoxCollider _boxCollider;
private Transform _targetTransform;
void Start()
{
_boxCollider = GetComponent<BoxCollider>();
}
private void Update()
{
FollowTarget();
}
private void FollowTarget()
{
if (_targetTransform != null)
{
gameObject.transform.position = _targetTransform.position;
gameObject.transform.rotation = _targetTransform.rotation;
}
}
public void SetTargetTransform(Transform targetTransform)
{
_targetTransform = targetTransform;
}
public void RemoveTargetTransform()
{
_targetTransform = null;
}
}
\ No newline at end of file
Assets/_Game/Code/UI/ClientConnectionManager.cs
...@@ -222,11 +222,11 @@ public class ClientConnectionManager : NetworkBehaviour ...@@ -222,11 +222,11 @@ public class ClientConnectionManager : NetworkBehaviour
if (IsServer) if (IsServer)
{ {
Scene gameScene = SceneManager.GetSceneByName(scenename); Scene gameScene = SceneManager.GetSceneByName(scenename);
NetworkManager.Singleton.SceneManager.OnLoadEventCompleted -= OnSceneLoadCompleted;
SceneManager.MoveGameObjectToScene(NetworkManager.Singleton.gameObject, gameScene); SceneManager.MoveGameObjectToScene(NetworkManager.Singleton.gameObject, gameScene);
SceneManager.MoveGameObjectToScene(gameConfigHolder, gameScene); SceneManager.MoveGameObjectToScene(gameConfigHolder, gameScene);
SceneManager.SetActiveScene(gameScene); SceneManager.SetActiveScene(gameScene);
CheckSceneLoadCompletion(connectedClientIds, clientscompleted, clientstimedout); CheckSceneLoadCompletion(connectedClientIds, clientscompleted, clientstimedout);
NetworkManager.Singleton.SceneManager.OnLoadEventCompleted -= OnSceneLoadCompleted;
} }
} }
......
Assets/_Game/Code/Weapons/Arrow.cs deleted 100644 → 0
using UnityEngine;
using UnityEngine.UIElements;
public class Arrow : MonoBehaviour
{
private BoxCollider _boxCollider;
// Start is called once before the first execution of Update after the MonoBehaviour is created
void Start()
{
_boxCollider = GetComponent<BoxCollider>();
}
// Update is called once per frame
void Update()
{
}
}
\ No newline at end of file
Assets/_Game/Prefabs/Enemy/Rogue/Rogue.prefab
...@@ -12,6 +12,7 @@ GameObject: ...@@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 8313319675349312869} - component: {fileID: 8313319675349312869}
- component: {fileID: 4151337880934277662} - component: {fileID: 4151337880934277662}
- component: {fileID: 4208536349724091019} - component: {fileID: 4208536349724091019}
- component: {fileID: 8522094765570665017}
m_Layer: 0 m_Layer: 0
m_Name: Rogue m_Name: Rogue
m_TagString: Untagged m_TagString: Untagged
...@@ -75,7 +76,7 @@ MonoBehaviour: ...@@ -75,7 +76,7 @@ MonoBehaviour:
ShowTopMostFoldoutHeaderGroup: 1 ShowTopMostFoldoutHeaderGroup: 1
enemySettings: {fileID: 11400000, guid: 5b554b15c5ebdf34b851d342d3f332c3, type: 2} enemySettings: {fileID: 11400000, guid: 5b554b15c5ebdf34b851d342d3f332c3, type: 2}
arrow: {fileID: 8885891558877188487, guid: c0cc14b5c48376d43b0421a2762d35cb, type: 3} arrow: {fileID: 8885891558877188487, guid: c0cc14b5c48376d43b0421a2762d35cb, type: 3}
weapon: {fileID: 6430031212675530119} weapon: {fileID: 1827300258577668473}
--- !u!114 &4208536349724091019 --- !u!114 &4208536349724091019
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -88,37 +89,42 @@ MonoBehaviour: ...@@ -88,37 +89,42 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6b51ffc7252b86b43a0b4806229fd39d, type: 3} m_Script: {fileID: 11500000, guid: 6b51ffc7252b86b43a0b4806229fd39d, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!1 &1369079606729036068 --- !u!114 &8522094765570665017
GameObject: MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3797023941742593236}
m_Layer: 0
m_Name: ArrowSpawnPoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3797023941742593236
Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1369079606729036068} m_GameObject: {fileID: 273039182630653378}
serializedVersion: 2 m_Enabled: 1
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_EditorHideFlags: 0
m_LocalPosition: {x: 0.005, y: 0.1774, z: 0.638} m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3}
m_LocalScale: {x: 1, y: 1, z: 1} m_Name:
m_ConstrainProportionsScale: 0 m_EditorClassIdentifier:
m_Children: [] ShowTopMostFoldoutHeaderGroup: 1
m_Father: {fileID: 5942464512878880573} NetworkTransformExpanded: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} AuthorityMode: 0
TickSyncChildren: 0
UseUnreliableDeltas: 0
SyncPositionX: 0
SyncPositionY: 0
SyncPositionZ: 0
SyncRotAngleX: 1
SyncRotAngleY: 1
SyncRotAngleZ: 1
SyncScaleX: 0
SyncScaleY: 0
SyncScaleZ: 0
PositionThreshold: 0.001
RotAngleThreshold: 0.01
ScaleThreshold: 0.01
UseQuaternionSynchronization: 0
UseQuaternionCompression: 0
UseHalfFloatPrecision: 0
InLocalSpace: 0
SwitchTransformSpaceWhenParented: 0
Interpolate: 1
SlerpPosition: 0
--- !u!1 &3920245832294658244 --- !u!1 &3920245832294658244
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -148,7 +154,7 @@ Transform: ...@@ -148,7 +154,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 5942464512878880573} - {fileID: 7423692457291173359}
m_Father: {fileID: 5640393319647876343} m_Father: {fileID: 5640393319647876343}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7826697965444045976 --- !u!1 &7826697965444045976
...@@ -183,76 +189,6 @@ Transform: ...@@ -183,76 +189,6 @@ Transform:
- {fileID: 6632933873018439538} - {fileID: 6632933873018439538}
m_Father: {fileID: 462326326808441748} m_Father: {fileID: 462326326808441748}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &6196221362579685590
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 3849244106864688580}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
propertyPath: m_LocalPosition.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
propertyPath: m_LocalRotation.w
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
propertyPath: m_LocalRotation.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
propertyPath: m_LocalRotation.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
propertyPath: m_LocalRotation.z
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 180
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 90
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
propertyPath: m_Name
value: Skeleton_Crossbow
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
insertIndex: -1
addedObject: {fileID: 3797023941742593236}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
--- !u!4 &5942464512878880573 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
m_PrefabInstance: {fileID: 6196221362579685590}
m_PrefabAsset: {fileID: 0}
--- !u!1 &6430031212675530119 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
m_PrefabInstance: {fileID: 6196221362579685590}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6595050288222494873 --- !u!1001 &6595050288222494873
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -407,3 +343,106 @@ Transform: ...@@ -407,3 +343,106 @@ Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a577d9f96e34b5b4bb53a563b9fcf3e9, type: 3} m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a577d9f96e34b5b4bb53a563b9fcf3e9, type: 3}
m_PrefabInstance: {fileID: 6595050288222494873} m_PrefabInstance: {fileID: 6595050288222494873}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &8736060770442297273
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 3849244106864688580}
m_Modifications:
- target: {fileID: 1876210089091406831, guid: 9180e072eabc06f4c9448c5d26b5425e, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1876210089091406831, guid: 9180e072eabc06f4c9448c5d26b5425e, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1876210089091406831, guid: 9180e072eabc06f4c9448c5d26b5425e, type: 3}
propertyPath: m_LocalRotation.w
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: 1876210089091406831, guid: 9180e072eabc06f4c9448c5d26b5425e, type: 3}
propertyPath: m_LocalRotation.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1876210089091406831, guid: 9180e072eabc06f4c9448c5d26b5425e, type: 3}
propertyPath: m_LocalRotation.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1876210089091406831, guid: 9180e072eabc06f4c9448c5d26b5425e, type: 3}
propertyPath: m_LocalRotation.z
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1876210089091406831, guid: 9180e072eabc06f4c9448c5d26b5425e, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: 1876210089091406831, guid: 9180e072eabc06f4c9448c5d26b5425e, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 180
objectReference: {fileID: 0}
- target: {fileID: 1876210089091406831, guid: 9180e072eabc06f4c9448c5d26b5425e, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 90
objectReference: {fileID: 0}
- target: {fileID: 2178326088145859158, guid: 9180e072eabc06f4c9448c5d26b5425e, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2178326088145859158, guid: 9180e072eabc06f4c9448c5d26b5425e, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2178326088145859158, guid: 9180e072eabc06f4c9448c5d26b5425e, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2178326088145859158, guid: 9180e072eabc06f4c9448c5d26b5425e, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2178326088145859158, guid: 9180e072eabc06f4c9448c5d26b5425e, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2178326088145859158, guid: 9180e072eabc06f4c9448c5d26b5425e, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2178326088145859158, guid: 9180e072eabc06f4c9448c5d26b5425e, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2178326088145859158, guid: 9180e072eabc06f4c9448c5d26b5425e, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2178326088145859158, guid: 9180e072eabc06f4c9448c5d26b5425e, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2178326088145859158, guid: 9180e072eabc06f4c9448c5d26b5425e, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6946634317865969344, guid: 9180e072eabc06f4c9448c5d26b5425e, type: 3}
propertyPath: m_Name
value: Crossbow
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9180e072eabc06f4c9448c5d26b5425e, type: 3}
--- !u!1 &1827300258577668473 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6946634317865969344, guid: 9180e072eabc06f4c9448c5d26b5425e, type: 3}
m_PrefabInstance: {fileID: 8736060770442297273}
m_PrefabAsset: {fileID: 0}
--- !u!4 &7423692457291173359 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2178326088145859158, guid: 9180e072eabc06f4c9448c5d26b5425e, type: 3}
m_PrefabInstance: {fileID: 8736060770442297273}
m_PrefabAsset: {fileID: 0}
Assets/_Game/Prefabs/Weapons/Arrow.prefab
...@@ -46,7 +46,7 @@ Rigidbody: ...@@ -46,7 +46,7 @@ Rigidbody:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8885891558877188487} m_GameObject: {fileID: 8885891558877188487}
serializedVersion: 4 serializedVersion: 4
m_Mass: 100 m_Mass: 2
m_Drag: 0 m_Drag: 0
m_AngularDrag: 0.05 m_AngularDrag: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0} m_CenterOfMass: {x: 0, y: 0, z: 0}
...@@ -60,7 +60,7 @@ Rigidbody: ...@@ -60,7 +60,7 @@ Rigidbody:
m_Bits: 0 m_Bits: 0
m_ImplicitCom: 1 m_ImplicitCom: 1
m_ImplicitTensor: 1 m_ImplicitTensor: 1
m_UseGravity: 0 m_UseGravity: 1
m_IsKinematic: 0 m_IsKinematic: 0
m_Interpolate: 0 m_Interpolate: 0
m_Constraints: 112 m_Constraints: 112
...@@ -77,6 +77,7 @@ MonoBehaviour: ...@@ -77,6 +77,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5029c6c72ae05b4419cabf4c1e96e35f, type: 3} m_Script: {fileID: 11500000, guid: 5029c6c72ae05b4419cabf4c1e96e35f, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_boxCollider: {fileID: 0}
--- !u!65 &8067914320767520699 --- !u!65 &8067914320767520699
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
Assets/_Game/Prefabs/Weapons/Crossbow.prefab 0 → 100644
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6521650389184310774
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8993620249965639686}
m_Layer: 0
m_Name: ArrowSpawnPoint
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8993620249965639686
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6521650389184310774}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.005, y: 0.1774, z: 0.638}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1876210089091406831}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6946634317865969344
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2178326088145859158}
m_Layer: 0
m_Name: Crossbow
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2178326088145859158
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6946634317865969344}
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:
- {fileID: 1876210089091406831}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &2126572447912262660
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 2178326088145859158}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
propertyPath: m_LocalPosition.x
value: 0.71318156
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
propertyPath: m_LocalPosition.y
value: 1.1067611
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
propertyPath: m_LocalRotation.w
value: -0.50000006
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
propertyPath: m_LocalRotation.x
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
propertyPath: m_LocalRotation.y
value: -0.49999994
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
propertyPath: m_LocalRotation.z
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
propertyPath: m_Name
value: Skeleton_Crossbow
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
insertIndex: -1
addedObject: {fileID: 8993620249965639686}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
--- !u!4 &1876210089091406831 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c88a69f7965560c47b6ffa4eed82887f, type: 3}
m_PrefabInstance: {fileID: 2126572447912262660}
m_PrefabAsset: {fileID: 0}
Assets/_Game/Prefabs/Weapons/Crossbow.prefab.meta 0 → 100644
fileFormatVersion: 2
guid: 9180e072eabc06f4c9448c5d26b5425e
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Scenes/ConnectionScene.unity
...@@ -337,7 +337,7 @@ MonoBehaviour: ...@@ -337,7 +337,7 @@ MonoBehaviour:
_slimeSpawnCooldownTime: 0.1 _slimeSpawnCooldownTime: 0.1
_rogueSpawnCooldownTime: 1 _rogueSpawnCooldownTime: 1
playerPrefab: {fileID: 7039287367920326276, guid: 702bb31d143eeaa4792be36b28160445, type: 3} playerPrefab: {fileID: 7039287367920326276, guid: 702bb31d143eeaa4792be36b28160445, type: 3}
_startGameCountdownTimer: 10 _startGameCountdownTimer: 1
--- !u!114 &529219308 --- !u!114 &529219308
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
Assets/_Game/Scenes/SC.unity
...@@ -240,50 +240,6 @@ Transform: ...@@ -240,50 +240,6 @@ Transform:
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1 &863308618
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 863308619}
- component: {fileID: 863308620}
m_Layer: 0
m_Name: Helper
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &863308619
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 863308618}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.057174295, y: 3.4774704, z: -5.9577436}
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 &863308620
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 863308618}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9484dda6623b48b4999b76e13e6dd9cc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &865924115 --- !u!1 &865924115
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -988,4 +944,3 @@ SceneRoots: ...@@ -988,4 +944,3 @@ SceneRoots:
- {fileID: 865924118} - {fileID: 865924118}
- {fileID: 6950935288098905811} - {fileID: 6950935288098905811}
- {fileID: 1817452062} - {fileID: 1817452062}
- {fileID: 863308619}
Assets/_Game/conf/Enemy/RogueSettings.asset
...@@ -12,6 +12,7 @@ MonoBehaviour: ...@@ -12,6 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 616231e36fe89cd42bd7aea67dfa0ace, type: 3} m_Script: {fileID: 11500000, guid: 616231e36fe89cd42bd7aea67dfa0ace, type: 3}
m_Name: RogueSettings m_Name: RogueSettings
m_EditorClassIdentifier: m_EditorClassIdentifier:
WeaponPrefab: {fileID: 6946634317865969344, guid: 9180e072eabc06f4c9448c5d26b5425e, type: 3}
targetLayer: targetLayer:
serializedVersion: 2 serializedVersion: 2
m_Bits: 512 m_Bits: 512
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment