commit a44a99066ca3aad65eb410a5a336581a71319125 parent 5319c1b9cd18fb2ce12df80910f6ca7d44d80894 Author: PlutoTank <qwolkensperg@gmail.com> Date: Thu, 16 Apr 2020 03:03:37 -0400 Added Orbitals Diffstat:
27 files changed, 291 insertions(+), 240 deletions(-)
diff --git a/Assets/Prefabs/Slimes/Slime.prefab b/Assets/Prefabs/Slimes/Slime.prefab @@ -1205,8 +1205,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6f7780a3c04e17841825f68a82642af4, type: 3} m_Name: m_EditorClassIdentifier: + defaultOrbitalLogic: {fileID: 11400000, guid: f604a09f73d9b3e4a8d515810e94c6d9, + type: 2} orbitals: - - {fileID: 457903427708918534, guid: 4e346bd7fa8310847b295522d78bb540, type: 3} + - orbital: {fileID: 2311679785310360297, guid: 4e346bd7fa8310847b295522d78bb540, + type: 3} + orbitalLogic: {fileID: 11400000, guid: f604a09f73d9b3e4a8d515810e94c6d9, type: 2} + sticky: 0 --- !u!82 &1545482344972484104 AudioSource: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Swords/TesterSword1.prefab b/Assets/Prefabs/Swords/TesterSword1.prefab @@ -13,7 +13,6 @@ GameObject: - component: {fileID: 2364959692505286347} - component: {fileID: 7899141307266342912} - component: {fileID: 1642684556973010571} - - component: {fileID: 457903427708918534} m_Layer: 10 m_Name: TesterSword1 m_TagString: Sword @@ -112,20 +111,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!114 &457903427708918534 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2311679785310360297} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 92a7b5a849928064d9d98e0ddef187ce, type: 3} - m_Name: - m_EditorClassIdentifier: - bodyCollider: {fileID: 2375074089273406019} - stats: {fileID: 11400000, guid: 44e3e2a9360e3f245b69bd99ec898212, type: 2} --- !u!1 &2311745251963663901 GameObject: m_ObjectHideFlags: 0 @@ -168,9 +153,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 1 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 1 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 4300000, guid: 8d27435e73833654db7504d72c3ee2d4, type: 3} --- !u!1 &2312406836008797191 GameObject: diff --git a/Assets/Scripts/Slimecing/Abilities/Ability.cs b/Assets/Scripts/Slimecing/Abilities/Ability.cs @@ -13,7 +13,7 @@ namespace Slimecing.Abilities [SerializeField] protected float abilityCooldown = 1f; [SerializeField] protected AudioClip abilitySound; [SerializeField] private Trigger abilityTrigger = null; - public virtual void CheckActivation(AbilityUser aUser, InputTriggerPackage abilityTriggerPackage) + public virtual void CheckActivation(AbilityUser aUser, TriggerPackage abilityTriggerPackage) { if (!abilityTriggerPackage.user.Equals(aUser.gameObject)) return; if (AbilityTrigger == null) return; diff --git a/Assets/Scripts/Slimecing/Abilities/UseAbilities/JumpAbility.cs b/Assets/Scripts/Slimecing/Abilities/UseAbilities/JumpAbility.cs @@ -49,7 +49,7 @@ namespace Slimecing.Abilities.UseAbilities } } - public override void CheckActivation(AbilityUser aUser, InputTriggerPackage abilityTriggerPackage) + public override void CheckActivation(AbilityUser aUser, TriggerPackage abilityTriggerPackage) { if (AbilityTrigger == null) return; if (!abilityTriggerPackage.user.Equals(aUser.gameObject)) return; diff --git a/Assets/Scripts/Slimecing/Dependency/OnStart.cs b/Assets/Scripts/Slimecing/Dependency/OnStart.cs @@ -17,7 +17,7 @@ public class OnStart : MonoBehaviour timer = new Timer(duration, loops); // Listen to events created by Timer - timer.OnTimerEnd += HandleTimerEnd; + timer.OnTimerEnd += ctx => HandleTimerEnd(); } private void HandleTimerEnd() diff --git a/Assets/Scripts/Slimecing/Dependency/Timer.cs b/Assets/Scripts/Slimecing/Dependency/Timer.cs @@ -26,7 +26,7 @@ namespace Slimecing.Dependency initialRemainingSeconds = remainingSeconds = duration; } - public event Action OnTimerEnd; + public event Action<Type> OnTimerEnd; // Handles update that will happen every gametick public void Tick(float deltaTime) @@ -45,7 +45,7 @@ namespace Slimecing.Dependency // Will restart timer if the current 'loops' is 1 or greater remainingSeconds = loopCount-- > 0?initialRemainingSeconds:0f; - OnTimerEnd?.Invoke(); + OnTimerEnd?.Invoke(null); } } } \ No newline at end of file diff --git a/Assets/Scripts/Slimecing/SimpleComponents/TimerBehaviour.cs.meta b/Assets/Scripts/Slimecing/SimpleComponents/TimerBehaviour.cs.meta @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b311a64b2a5334e44a3c37626adeb013 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/Swords/Orbitals/Orbital.cs b/Assets/Scripts/Slimecing/Swords/Orbitals/Orbital.cs @@ -1,63 +0,0 @@ -using System; -using UnityEngine; - -namespace Slimecing.Swords.Orbitals -{ - public abstract class Orbital : MonoBehaviour - { - [SerializeField] private Collider bodyCollider; - [SerializeField] private OrbitalStats stats; - - public Collider BodyCollider => bodyCollider; - public OrbitalStats Stats - { - get => stats; - set => stats = value; - } - public GameObject owner { get; set; } - - protected bool IsownerNull; - protected bool IsstatsNull; - private void Start() - { - IsstatsNull = Stats == null; - IsownerNull = owner == null; - } - - public Orbital SpawnOrbital(TakesOrbitals own) - { - var ownerTransform = own.transform; - Orbital spawnedOrbital = Instantiate(this, ownerTransform.position, Quaternion.identity, ownerTransform); - return StartOrbital(spawnedOrbital, own); - } - - public Orbital StartOrbital(Orbital orb, TakesOrbitals own) - { - orb.owner = own.gameObject; - Physics.IgnoreCollision(own.GetComponent<Collider>(), orb.BodyCollider); - foreach (var orbital in own.spawnedOrbitals) - { - Physics.IgnoreCollision(orbital.BodyCollider, orb.BodyCollider); - } - return orb; - } - - private void Update() - { - if (!IsownerNull) - { - UpdateSword(); - } - } - - protected virtual void UpdateSword() - { - Rotate(); - SetLook(); - } - - protected abstract void Rotate(); - - protected abstract void SetLook(); - } -} diff --git a/Assets/Scripts/Slimecing/Swords/Orbitals/Orbital.cs.meta b/Assets/Scripts/Slimecing/Swords/Orbitals/Orbital.cs.meta @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b233ddc6a1d5f5e4cb8ca9386250abb9 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/Swords/Orbitals/OrbitalLogic.cs b/Assets/Scripts/Slimecing/Swords/Orbitals/OrbitalLogic.cs @@ -1,9 +1,41 @@ -using UnityEngine; +using Slimecing.Triggers; +using UnityEngine; namespace Slimecing.Swords.Orbitals { public abstract class OrbitalLogic : ScriptableObject { - public abstract void Tick(); + [SerializeField] private float rotSpeed; + [SerializeField] private float yOffset; + [SerializeField] private float xAxis = 5f; + [SerializeField] private float zAxis = 5f; + + public float RotSpeed + { + get => rotSpeed; + set => rotSpeed = value; + } + + public float YOffset + { + get => yOffset; + set => yOffset = value; + } + + public float XAxis + { + get => xAxis; + set => xAxis = value; + } + + public float ZAxis + { + get => zAxis; + set => zAxis = value; + } + + public abstract void Initialize(GameObject owner, GameObject orbital); + + public virtual void Tick(GameObject owner, GameObject orbital) { } } } diff --git a/Assets/Scripts/Slimecing/Swords/Orbitals/OrbitalLogicScripts.meta b/Assets/Scripts/Slimecing/Swords/Orbitals/OrbitalLogicScripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2596c437058eb1a4d9f0f6e9b708ebde +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/Swords/Orbitals/OrbitalPackage.cs.meta b/Assets/Scripts/Slimecing/Swords/Orbitals/OrbitalPackage.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9a7d83bd9d2ec714ca732a376bb878d6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/Swords/Orbitals/TakesOrbitals.cs b/Assets/Scripts/Slimecing/Swords/Orbitals/TakesOrbitals.cs @@ -1,28 +1,37 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Collections.Specialized; using System.Linq; +using Slimecing.Swords.Orbitals.OrbitalLogicScripts; using UnityEngine; namespace Slimecing.Swords.Orbitals { public class TakesOrbitals : MonoBehaviour { - [SerializeField] private List<Orbital> orbitals; + [SerializeField] private OrbitalLogic defaultOrbitalLogic; + [SerializeField] private List<OrbitalPackage> orbitals; - private List<Orbital> _spawnedOrbitals = new List<Orbital>(); - - public List<Orbital> spawnedOrbitals => _spawnedOrbitals; + private Collider _collider; + + private List<GameObject> _spawnedOrbitalObjects = new List<GameObject>(); + private int _currentListCount = 0; private void OnEnable() { + _collider = GetComponent<Collider>(); SpawnAllOrbitals(); } private void SpawnAllOrbitals() { - foreach (var orbital in orbitals) + for (int i = 0; i < orbitals.Count; i++) { - orbital.SpawnOrbital(this); + var thisTransform = transform; + GameObject spawnedOrbital = Instantiate(orbitals[i].orbitalObject, thisTransform.position, + Quaternion.identity, thisTransform); + orbitals[i] = new OrbitalPackage(spawnedOrbital, orbitals[i].OrbitalLogic); + InitializeOrbital(orbitals[i]); } } @@ -33,30 +42,91 @@ namespace Slimecing.Swords.Orbitals private void RemoveAllOrbitals() { - foreach (var orbital in _spawnedOrbitals) + foreach (var orbital in orbitals) { - Destroy(orbital); + Destroy(orbital.orbitalObject); } } - public void AddOrbital(Orbital orbital) + public void InitializeOrbital(OrbitalPackage orbital) + { + Debug.Log("started"); + AddCollisions(orbital.orbitalObject); + orbital.OrbitalLogic = Instantiate(orbital.OrbitalLogic); + orbital.OrbitalLogic.Initialize(gameObject, orbital.orbitalObject); + _currentListCount = orbitals.Count; + ResetSpawnedOrbitalObjects(); + } + + private void ResetSpawnedOrbitalObjects() + { + _spawnedOrbitalObjects = new List<GameObject>(); + foreach (var t in orbitals) + { + _spawnedOrbitalObjects.Add(t.orbitalObject); + } + } + + public void AddOrbital(GameObject orbital, OrbitalLogic orbitalLogic, bool stick) + { + ActuallyAddOrbital(new OrbitalPackage(orbital, orbitalLogic, stick)); + } + + public void AddOrbital(GameObject orbital, bool stick) + { + ActuallyAddOrbital(new OrbitalPackage(orbital, defaultOrbitalLogic, stick)); + } + + private void ActuallyAddOrbital(OrbitalPackage orbitalPackage) + { + InitializeOrbital(orbitalPackage); + orbitals.Add(orbitalPackage); + } + + private void AddCollisions(GameObject orbital) { - _spawnedOrbitals.Add( orbital.StartOrbital(orbital,this)); + Collider orbitalCollider = orbital.GetComponent<Collider>(); + if (_collider != null && orbitalCollider != null) + { + Physics.IgnoreCollision(_collider, orbitalCollider); + foreach (var spawnedOrbital in orbitals) + { + Collider spawnedOrbitalCollider = spawnedOrbital.orbitalObject.GetComponent<Collider>(); + if (spawnedOrbitalCollider == null) continue; + Physics.IgnoreCollision(orbitalCollider, spawnedOrbitalCollider); + } + } } - private void RemoveOrbital(Orbital orbital) + private void RemoveOrbital(OrbitalPackage orbital) { - _spawnedOrbitals.Remove(orbital); - Destroy(orbital); + orbitals.Remove(orbital); } public void Update() { - if (orbitals == spawnedOrbitals) return; - foreach (var orbital in from orbital in orbitals from spawnedOrbital in spawnedOrbitals where spawnedOrbital != orbital select orbital) + ValidateOrbitals(); + + foreach (var orbital in orbitals) + { + orbital.OrbitalLogic.Tick(gameObject, orbital.orbitalObject); + } + } + + private void ValidateOrbitals() + { + for (int i = 0; i < _spawnedOrbitalObjects.Count; i++) + { + if (orbitals[i].orbitalObject != _spawnedOrbitalObjects[i]) + { + InitializeOrbital(orbitals[i]); + } + } + + if (orbitals.Count > _currentListCount) { - AddOrbital(orbital); + ResetSpawnedOrbitalObjects(); } } } -} +}+ \ No newline at end of file diff --git a/Assets/Scripts/Slimecing/Swords/Orbitals/TimerOrbital.cs b/Assets/Scripts/Slimecing/Swords/Orbitals/TimerOrbital.cs @@ -1,33 +0,0 @@ -using UnityEngine; - -namespace Slimecing.Swords.Orbitals -{ - public class TimerOrbital : Orbital - { - private float _timer; - protected override void UpdateSword() - { - _timer += Time.deltaTime; - Rotate(); - SetLook(); - } - - protected override void SetLook() - { - Vector3 position = transform.position; - Vector3 ownerPos = owner.transform.position; - transform.LookAt(2 * position - new Vector3(ownerPos.x, position.y, ownerPos.z)); - } - - protected override void Rotate() - { - if (IsownerNull || IsstatsNull) return; - float x = -Mathf.Cos(_timer * Stats.RotSpeed) * Stats.XAxis; - float z = Mathf.Sin(_timer * Stats.RotSpeed) * Stats.ZAxis; - - Vector3 ownerPosition = owner.transform.position; - Vector3 pos = new Vector3(x, Stats.YOffset, z); - transform.position = pos + ownerPosition; - } - } -} diff --git a/Assets/Scripts/Slimecing/Swords/Orbitals/TimerOrbital.cs.meta b/Assets/Scripts/Slimecing/Swords/Orbitals/TimerOrbital.cs.meta @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 92a7b5a849928064d9d98e0ddef187ce -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/Triggers/InputTriggerPackage.cs.meta b/Assets/Scripts/Slimecing/Triggers/InputTriggerPackage.cs.meta @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7ccb55568d3d58f4ca5ad86a2724e932 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/Triggers/SimpleTrigger.cs.meta b/Assets/Scripts/Slimecing/Triggers/SimpleTrigger.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 107c17fc89417ce438df6293b59d2e78 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Slimecing/Triggers/TimerTrigger.cs b/Assets/Scripts/Slimecing/Triggers/TimerTrigger.cs @@ -1,17 +0,0 @@ -namespace Slimecing.Triggers -{ - public class TimerTrigger : Trigger - { - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } - } -} diff --git a/Assets/Scripts/Slimecing/Triggers/Trigger.cs b/Assets/Scripts/Slimecing/Triggers/Trigger.cs @@ -7,9 +7,9 @@ namespace Slimecing.Triggers { public TriggerState currentTriggerState { get; set; } - public event Action<InputTriggerPackage> TriggerStateChange; + public event Action<TriggerPackage> TriggerStateChange; - protected virtual void OnTriggerStateChange(InputTriggerPackage itp) + protected virtual void OnTriggerStateChange(TriggerPackage itp) { TriggerStateChange?.Invoke(itp); } diff --git a/Assets/Scripts/Slimecing/Triggers/TriggerLogic/HoldButtonInputTrigger.cs b/Assets/Scripts/Slimecing/Triggers/TriggerLogic/HoldButtonInputTrigger.cs @@ -4,25 +4,25 @@ using UnityEngine; namespace Slimecing.Triggers.TriggerLogic { - [CreateAssetMenu(fileName = "HoldButtonInputTrigger", menuName = "Abilities/AbilityTriggers/HoldButtonInputTrigger")] + [CreateAssetMenu(fileName = "HoldButtonInputTrigger", menuName = "Triggers/InputTriggers/HoldButtonInputTrigger")] public class HoldButtonInputTrigger : TriggerInput { protected override void TriggerStarted(GameObject player) { currentTriggerState = TriggerState.Started; - OnTriggerStateChange(new InputTriggerPackage(TriggerState.Started, player)); + OnTriggerStateChange(new TriggerPackage(TriggerState.Started, player)); } protected override void TriggerPerformed(GameObject player) { currentTriggerState = TriggerState.Performed; - OnTriggerStateChange(new InputTriggerPackage(TriggerState.Performed, player)); + OnTriggerStateChange(new TriggerPackage(TriggerState.Performed, player)); } protected override void TriggerCanceled(GameObject player) { currentTriggerState = TriggerState.Canceled; - OnTriggerStateChange(new InputTriggerPackage(TriggerState.Canceled, player)); + OnTriggerStateChange(new TriggerPackage(TriggerState.Canceled, player)); } } } diff --git a/Assets/Scripts/Slimecing/Triggers/TriggerLogic/SimpleButtonInputTrigger.cs b/Assets/Scripts/Slimecing/Triggers/TriggerLogic/SimpleButtonInputTrigger.cs @@ -4,13 +4,13 @@ using UnityEngine; namespace Slimecing.Triggers.TriggerLogic { - [CreateAssetMenu(fileName = "SimpleButtonInputTrigger", menuName = "Abilities/AbilityTriggers/SimpleButtonInputTrigger")] + [CreateAssetMenu(fileName = "SimpleButtonInputTrigger", menuName = "Triggers/InputTriggers/SimpleButtonInputTrigger")] public class SimpleButtonInputTrigger : TriggerInput { protected override void TriggerStarted(GameObject player) { currentTriggerState = TriggerState.Performed; - OnTriggerStateChange(new InputTriggerPackage(TriggerState.Performed, player)); + OnTriggerStateChange(new TriggerPackage(TriggerState.Performed, player)); } protected override void TriggerPerformed(GameObject player) { } @@ -18,7 +18,7 @@ namespace Slimecing.Triggers.TriggerLogic protected override void TriggerCanceled(GameObject player) { currentTriggerState = TriggerState.Canceled; - OnTriggerStateChange(new InputTriggerPackage(TriggerState.Canceled, player)); + OnTriggerStateChange(new TriggerPackage(TriggerState.Canceled, player)); } } } diff --git a/Assets/Scripts/Slimecing/Triggers/TriggerLogic/TimerTrigger.cs b/Assets/Scripts/Slimecing/Triggers/TriggerLogic/TimerTrigger.cs @@ -0,0 +1,45 @@ +using Slimecing.Dependency; +using UnityEngine; +using UnityEngine.Serialization; + +namespace Slimecing.Triggers.TriggerLogic +{ + [CreateAssetMenu(fileName = "TimerTrigger", menuName = "Triggers/SimpleTriggers/TimerTrigger")] + public class TimerTrigger : SimpleTrigger + { + [SerializeField] private float timerDuration = 0.1f; + [SerializeField] private int timerLoops = 0; + + private Timer _timer; + + public Timer timer + { + get => _timer; + set => _timer = value; + } + + public float duration + { + get => timerDuration; + set => timerDuration = value; + } + + public int loops + { + get => timerLoops; + set => timerLoops = value; + } + + public override void InitializeTrigger(GameObject target) + { + _timer = new Timer(duration, loops); + _timer.OnTimerEnd += ctx => TriggerPerformed(target); + } + + protected override void TriggerPerformed(GameObject target) + { + currentTriggerState = TriggerState.Performed; + OnTriggerStateChange(new TriggerPackage(TriggerState.Performed, target)); + } + } +} diff --git a/Assets/Scripts/Slimecing/Triggers/TimerTrigger.cs.meta b/Assets/Scripts/Slimecing/Triggers/TriggerLogic/TimerTrigger.cs.meta diff --git a/Assets/Scripts/Slimecing/Triggers/InputTriggerPackage.cs b/Assets/Scripts/Slimecing/Triggers/TriggerPackage.cs diff --git a/Assets/Scripts/Slimecing/Triggers/TriggerStatus.cs b/Assets/Scripts/Slimecing/Triggers/TriggerStatus.cs @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class TriggerActuator : MonoBehaviour -{ - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } -} diff --git a/Assets/Scripts/Slimecing/Triggers/TriggerStatus.cs.meta b/Assets/Scripts/Slimecing/Triggers/TriggerStatus.cs.meta @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b6611370699d9934eafde19886485d68 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/_Scenes/Testing/SLope.unity b/Assets/_Scenes/Testing/SLope.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 1988967242} - m_IndirectSpecularColor: {r: 0.26770124, g: 0.5719273, b: 0.89702165, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -2069,6 +2069,75 @@ Transform: m_Father: {fileID: 1651529366} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1031493766 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2311679785310360297, guid: 4e346bd7fa8310847b295522d78bb540, + type: 3} + propertyPath: m_Name + value: TesterSword1 + objectReference: {fileID: 0} + - target: {fileID: 2314149755559057351, guid: 4e346bd7fa8310847b295522d78bb540, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2314149755559057351, guid: 4e346bd7fa8310847b295522d78bb540, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2314149755559057351, guid: 4e346bd7fa8310847b295522d78bb540, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2314149755559057351, guid: 4e346bd7fa8310847b295522d78bb540, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2314149755559057351, guid: 4e346bd7fa8310847b295522d78bb540, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2314149755559057351, guid: 4e346bd7fa8310847b295522d78bb540, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2314149755559057351, guid: 4e346bd7fa8310847b295522d78bb540, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2314149755559057351, guid: 4e346bd7fa8310847b295522d78bb540, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2314149755559057351, guid: 4e346bd7fa8310847b295522d78bb540, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2314149755559057351, guid: 4e346bd7fa8310847b295522d78bb540, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2314149755559057351, guid: 4e346bd7fa8310847b295522d78bb540, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4e346bd7fa8310847b295522d78bb540, type: 3} --- !u!1 &1087962991 GameObject: m_ObjectHideFlags: 0