diff --git a/Project_Blind/Assets/Resources/Prefabs/fa37f09a250f95a1.png b/Project_Blind/Assets/Resources/Prefabs/fa37f09a250f95a1.png new file mode 100644 index 00000000..c2fbfe98 Binary files /dev/null and b/Project_Blind/Assets/Resources/Prefabs/fa37f09a250f95a1.png differ diff --git a/Project_Blind/Assets/Resources/Prefabs/fa37f09a250f95a1.png.meta b/Project_Blind/Assets/Resources/Prefabs/fa37f09a250f95a1.png.meta new file mode 100644 index 00000000..3904f064 --- /dev/null +++ b/Project_Blind/Assets/Resources/Prefabs/fa37f09a250f95a1.png.meta @@ -0,0 +1,122 @@ +fileFormatVersion: 2 +guid: a0406d281e9797149a7e3b65f868e9b7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 450 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git "a/Project_Blind/Assets/Resources/Prefabs/\353\202\250\353\252\250.png" "b/Project_Blind/Assets/Resources/Prefabs/\353\202\250\353\252\250.png" new file mode 100644 index 00000000..09b9bb66 Binary files /dev/null and "b/Project_Blind/Assets/Resources/Prefabs/\353\202\250\353\252\250.png" differ diff --git "a/Project_Blind/Assets/Resources/Prefabs/\353\202\250\353\252\250.png.meta" "b/Project_Blind/Assets/Resources/Prefabs/\353\202\250\353\252\250.png.meta" new file mode 100644 index 00000000..4f64fdb6 --- /dev/null +++ "b/Project_Blind/Assets/Resources/Prefabs/\353\202\250\353\252\250.png.meta" @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 5cddd1a09318b1f40aff8a77fba50710 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Project_Blind/Assets/Scripts/Core/MonoBehaviour/MeleeAttackable.cs b/Project_Blind/Assets/Scripts/Core/MonoBehaviour/MeleeAttackable.cs index 15d1595a..47bef453 100644 --- a/Project_Blind/Assets/Scripts/Core/MonoBehaviour/MeleeAttackable.cs +++ b/Project_Blind/Assets/Scripts/Core/MonoBehaviour/MeleeAttackable.cs @@ -1,11 +1,12 @@ using System; -using Unity.VisualScripting.YamlDotNet.Core.Tokens; using UnityEngine; namespace Blind { public class MeleeAttackable: MonoBehaviour { + private int x; + private int y; private int _damage = 0; private bool canDamage; private Vector2 size; @@ -17,6 +18,8 @@ public class MeleeAttackable: MonoBehaviour private bool _isSpriteFlip; public void Init(int x = 1, int y = 1, int _damage = 1) { + this.x = x; + this.y = y; this._damage = _damage; size = new Vector2(x, y); _attackcontactfilter.layerMask = hitLayer; @@ -37,6 +40,15 @@ public void DisableDamage() { canDamage = false; } + + public void OnDrawGizmos() + { + Gizmos.color = Color.blue; + if (sprite.flipX) Gizmos.DrawWireCube(new Vector3(gameObject.transform.position.x + 1, gameObject.transform.position.y , gameObject.transform.position.z), new Vector3(x,y,0)); + else Gizmos.DrawWireCube(new Vector3(gameObject.transform.position.x -1, gameObject.transform.position.y , gameObject.transform.position.z), new Vector3(x,y,0)); + + } + private void FixedUpdate() { if (!canDamage) return; diff --git a/Project_Blind/Assets/Scripts/Core/MonoBehaviour/Paringable.cs b/Project_Blind/Assets/Scripts/Core/MonoBehaviour/Paringable.cs new file mode 100644 index 00000000..a1f4c27a --- /dev/null +++ b/Project_Blind/Assets/Scripts/Core/MonoBehaviour/Paringable.cs @@ -0,0 +1,80 @@ +using System; +using UnityEngine; + +namespace Blind +{ + public class Paringable: MonoBehaviour + { + private int x; + private int y; + private Vector2 size; + private SpriteRenderer _sprite; + private Collider2D[] _result = new Collider2D[10]; + private ContactFilter2D _filter; + private Collider2D _hitObj; + private bool _isFlip; + private bool _isParing; + [SerializeField] private LayerMask _hitLayer; + + public void Init(int x = 1, int y = 1) + { + this.x = x; + this.y = y; + size = new Vector2(x, y); + _sprite = GetComponent(); + _filter.layerMask = _hitLayer; + _filter.useLayerMask = true; + if (_sprite != null) + { + _isFlip = _sprite.flipX; + } + } + + public void EnParing() + { + _isParing = true; + } + + public void DisableParing() + { + _isParing = false; + } + + public void OnDrawGizmos() + { + Gizmos.color = Color.red; + if (_sprite.flipX) Gizmos.DrawWireCube(new Vector3(gameObject.transform.position.x + 1, gameObject.transform.position.y , gameObject.transform.position.z), new Vector3(x,y,0)); + else Gizmos.DrawWireCube(new Vector3(gameObject.transform.position.x -1, gameObject.transform.position.y , gameObject.transform.position.z), new Vector3(x,y,0)); + + } + + public void FixedUpdate() + { + if (!_isParing) return; + + int facing = 1; + if (_sprite.flipX != _isFlip) facing = -1; + Vector2 pointA = new Vector2(transform.position.x + facing, transform.position.y); + int hitCount = Physics2D.OverlapArea(pointA, size, _filter, _result); + for (int i = 0; i < hitCount; i++) + { + _hitObj = _result[i]; + if (_hitObj.tag.Equals("Enemy")) + { + if (_hitObj.GetComponent() == null) + { + // 패링했을때 적 오브젝트(화살같은)인 경우 + } + else + { + if (_hitObj.GetComponent().isAttack) + { + gameObject.GetComponent().PlayerInvincibility(); + Debug.Log("패링 성공!"); + } + } + } + } + } + } +} \ No newline at end of file diff --git a/Project_Blind/Assets/Scripts/Core/MonoBehaviour/Paringable.cs.meta b/Project_Blind/Assets/Scripts/Core/MonoBehaviour/Paringable.cs.meta new file mode 100644 index 00000000..d8ddb5fc --- /dev/null +++ b/Project_Blind/Assets/Scripts/Core/MonoBehaviour/Paringable.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 737126f82bed49b8be3f8d02d81cd330 +timeCreated: 1658209275 \ No newline at end of file diff --git a/Project_Blind/Assets/Scripts/Core/MonoBehaviour/PlayerCharacter.cs b/Project_Blind/Assets/Scripts/Core/MonoBehaviour/PlayerCharacter.cs index 96eb258c..9d6f3d25 100644 --- a/Project_Blind/Assets/Scripts/Core/MonoBehaviour/PlayerCharacter.cs +++ b/Project_Blind/Assets/Scripts/Core/MonoBehaviour/PlayerCharacter.cs @@ -20,6 +20,7 @@ public class PlayerCharacter : MonoBehaviour,IGameManagerObj private MeleeAttackable _attack; private Animator _animator; private SpriteRenderer _renderer; + private Paringable _paring; [SerializeField] private float _jumpSpeed = 3f; [SerializeField] private float _jumpAbortSpeedReduction = 100f; @@ -36,8 +37,10 @@ public class PlayerCharacter : MonoBehaviour,IGameManagerObj public float _lastClickTime; public int _clickcount = 0; - [SerializeField] private int x; - [SerializeField] private int y; + [SerializeField] private int attack_x; + [SerializeField] private int attack_y; + [SerializeField] private int paring_x; + [SerializeField] private int paring_y; private float _dashTime; private float _defaultSpeed; @@ -50,6 +53,7 @@ private void Awake() _moveVector = new Vector2(); _characterController2D = GetComponent(); _attack = GetComponent(); + _paring = GetComponent(); _damage = new UnitHP(10); _animator = GetComponent(); _renderer = GetComponent(); @@ -59,7 +63,8 @@ private void Awake() _dashCount = 1; ResourceManager.Instance.Destroy(ResourceManager.Instance.Instantiate("WaveSense").gameObject); - _attack.Init(x,y); + _attack.Init(attack_x,attack_y); + _paring.Init(paring_x, paring_y); } private void Start() @@ -102,8 +107,8 @@ public void Dash() _maxSpeed = _dashSpeed; int Playerflip; - if (_renderer.flipX) Playerflip = -1; - else Playerflip = 1; + if (_renderer.flipX) Playerflip = 1; + else Playerflip = -1; float desiredSpeed = Playerflip * _maxSpeed * 0.1f; _moveVector.x = Mathf.MoveTowards(_moveVector.x, desiredSpeed, 0.5f); @@ -173,37 +178,6 @@ public void CheckForGrounded() bool grounded = _characterController2D.IsGrounded; _animator.SetBool("Grounded",grounded); } - public bool CheckEnemy() - { - bool isEnemy = false; - Collider2D[] _col; - - if (_renderer.flipX) - _col = Physics2D.OverlapBoxAll( - new Vector2(gameObject.transform.position.x - 1, gameObject.transform.position.y), - new Vector2(1f, 3), 0); - else - _col = Physics2D.OverlapBoxAll( - new Vector2(gameObject.transform.position.x + 1, gameObject.transform.position.y), - new Vector2(1f, 3), 0); - - foreach (Collider2D colliders in _col) - { - Debug.Log(colliders.tag); - if (colliders.tag .Equals("Enemy")) - { - _enemyObject = colliders.gameObject; - isEnemy = true; - } - } - - return isEnemy; - } - private void OnDrawGizmos() - { - Gizmos.color = Color.blue; - Gizmos.DrawWireCube(new Vector3(gameObject.transform.position.x + 1, gameObject.transform.position.y , gameObject.transform.position.z), new Vector3(1,3,0)); - } public bool CheckForParing() { @@ -214,17 +188,19 @@ public void Paring() { _animator.SetTrigger("Paring"); } - - public void ParingObjCheck() + + public void EnableParing() { - + _paring.EnParing(); } - public void EnemyStateCheck() + + public void DisableParing() { - if (_enemyObject.GetComponent().isAttack) - { - StartCoroutine(Invincibility()); - } + _paring.DisableParing(); + } + public void PlayerInvincibility() + { + StartCoroutine(Invincibility()); } IEnumerator Invincibility() @@ -244,6 +220,11 @@ public bool CheckForAttackTime() { return Time.time - _lastClickTime > _maxComboDelay; } + + public void ReAttackSize(int x, int y) + { + _attack.Init(x, y); + } public void MeleeAttack() { _animator.SetBool("Attack", true); @@ -323,17 +304,17 @@ public void UpdateFacing() bool faceRight = InputController.Instance.Horizontal.Value > 0f; if (faceLeft) { - _renderer.flipX = true; + _renderer.flipX = false; } else if(faceRight) { - _renderer.flipX = false; + _renderer.flipX = true; } } public int GetFacing() { - return _renderer.flipX ? -1 : 1; + return _renderer.flipX ? 1 : -1; } public void Log() { Debug.Log(_characterController2D.IsGrounded ? "땅" : "공중"); diff --git a/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/MeleeAttackCombo2SMB.cs b/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/MeleeAttackCombo2SMB.cs index d957074e..54c258a2 100644 --- a/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/MeleeAttackCombo2SMB.cs +++ b/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/MeleeAttackCombo2SMB.cs @@ -30,6 +30,7 @@ public override void OnSLStateNoTransitionUpdate(Animator animator, AnimatorStat } public override void OnSLStateExit (Animator animator, AnimatorStateInfo stateInfo, int layerIndex) { + _monoBehaviour.MeleeAttackComoEnd(); _monoBehaviour.DisableAttack(); } } diff --git a/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/MeleeAttackComboSMB.cs b/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/MeleeAttackComboSMB.cs index 305d612e..dfdb583c 100644 --- a/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/MeleeAttackComboSMB.cs +++ b/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/MeleeAttackComboSMB.cs @@ -28,6 +28,8 @@ public override void OnSLStateNoTransitionUpdate(Animator animator, AnimatorStat } public override void OnSLStateExit (Animator animator, AnimatorStateInfo stateInfo, int layerIndex) { + Debug.Log("실행됨"); + _monoBehaviour.MeleeAttackComoEnd(); _monoBehaviour.DisableAttack(); } } diff --git a/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/ParingSMB.cs b/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/ParingSMB.cs index f3e31e65..2a215458 100644 --- a/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/ParingSMB.cs +++ b/Project_Blind/Assets/Scripts/Core/StateMachineBehaviour/Player/ParingSMB.cs @@ -7,15 +7,18 @@ public class ParingSMB: SceneLinkedSMB { public override void OnSLStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex) { - _monoBehaviour.ParingObjCheck(); + _monoBehaviour.EnableParing(); } public override void OnSLStateNoTransitionUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex, AnimatorControllerPlayable controller) { Debug.Log("paring 실행"); - if(_monoBehaviour.CheckEnemy()) - _monoBehaviour.EnemyStateCheck(); + } + + public override void OnSLStateExit (Animator animator, AnimatorStateInfo stateInfo, int layerIndex) + { + _monoBehaviour.DisableParing(); } } } \ No newline at end of file diff --git a/Project_Blind/ProjectSettings/RiderScriptEditorPersistedState.asset b/Project_Blind/ProjectSettings/RiderScriptEditorPersistedState.asset index 1ea82dfe..7948e47e 100644 --- a/Project_Blind/ProjectSettings/RiderScriptEditorPersistedState.asset +++ b/Project_Blind/ProjectSettings/RiderScriptEditorPersistedState.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 0} m_Name: m_EditorClassIdentifier: Unity.Rider.Editor:Packages.Rider.Editor:RiderScriptEditorPersistedState - lastWriteTicks: -8585434642192694578 + lastWriteTicks: -8585431969274930502 diff --git a/Project_Blind/UserSettings/Layouts/default-2021.dwlt b/Project_Blind/UserSettings/Layouts/default-2021.dwlt index cf0661d7..37b46bdf 100644 --- a/Project_Blind/UserSettings/Layouts/default-2021.dwlt +++ b/Project_Blind/UserSettings/Layouts/default-2021.dwlt @@ -17,9 +17,9 @@ MonoBehaviour: x: 8 y: 51 width: 1904 - height: 988 + height: 981 m_ShowMode: 4 - m_Title: Hierarchy + m_Title: Console m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -45,7 +45,7 @@ MonoBehaviour: x: 0 y: 0 width: 1904 - height: 988 + height: 981 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -90,7 +90,7 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 968 + y: 961 width: 1904 height: 20 m_MinSize: {x: 0, y: 0} @@ -114,11 +114,11 @@ MonoBehaviour: x: 0 y: 30 width: 1904 - height: 938 + height: 931 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 1 - controlID: 6433 + controlID: 115 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,11 +139,11 @@ MonoBehaviour: x: 0 y: 0 width: 1904 - height: 938 + height: 931 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 6434 + controlID: 116 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,11 +164,11 @@ MonoBehaviour: x: 0 y: 0 width: 1360 - height: 938 + height: 931 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 6435 + controlID: 103 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -189,11 +189,11 @@ MonoBehaviour: x: 0 y: 0 width: 1360 - height: 600 + height: 596 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 6436 + controlID: 104 --- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 @@ -212,7 +212,7 @@ MonoBehaviour: x: 0 y: 0 width: 293 - height: 600 + height: 596 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} @@ -238,7 +238,7 @@ MonoBehaviour: x: 293 y: 0 width: 1067 - height: 600 + height: 596 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 17} @@ -258,25 +258,25 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 600 + y: 596 width: 1360 - height: 338 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 13} + height: 335 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 18} m_Panes: - {fileID: 13} - {fileID: 18} - {fileID: 19} - {fileID: 20} - m_Selected: 0 - m_LastSelected: 3 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -295,7 +295,7 @@ MonoBehaviour: x: 1360 y: 0 width: 544 - height: 938 + height: 931 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 21} @@ -325,9 +325,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 8 - y: 681 + y: 677 width: 1359 - height: 317 + height: 314 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -358,8 +358,8 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 728a0000 - m_LastClickedID: 35442 + m_SelectedIDs: 7a730000 + m_LastClickedID: 29562 m_ExpandedIDs: 00000000aa710000ac710000ae710000b0710000b2710000b4710000b6710000b8710000ba710000bc71000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 @@ -413,8 +413,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: 5a6f0000 + m_LastClickedInstanceID: 28506 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000 m_RenameOverlay: @@ -467,7 +467,7 @@ MonoBehaviour: x: 8 y: 81 width: 292 - height: 579 + height: 575 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -475,9 +475,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: e2faffff266f0000 + m_SelectedIDs: 5a6f0000 + m_LastClickedID: 28506 + m_ExpandedIDs: e2faffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -524,7 +524,7 @@ MonoBehaviour: x: 301 y: 81 width: 1065 - height: 585 + height: 575 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -572,22 +572,22 @@ MonoBehaviour: x: 0 y: 21 width: 1065 - height: 564 - m_Scale: {x: 0.5222222, y: 0.5222222} - m_Translation: {x: 532.5, y: 282} + height: 554 + m_Scale: {x: 0.51296294, y: 0.51296294} + m_Translation: {x: 532.5, y: 277} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1019.68085 + x: -1038.0867 y: -540 - width: 2039.3617 + width: 2076.1733 height: 1080 m_MinimalGUI: 1 - m_defaultScale: 0.5222222 - m_LastWindowPixelSize: {x: 1065, y: 585} + m_defaultScale: 0.51296294 + m_LastWindowPixelSize: {x: 1065, y: 575} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -608,7 +608,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: BackGround + m_Text: BackGround (nothing loaded) m_Image: {fileID: 2800000, guid: 7129268cf102b2f45809905bcb27ce8b, type: 3} m_Tooltip: m_Pos: @@ -1138,7 +1138,7 @@ MonoBehaviour: x: 301 y: 81 width: 1065 - height: 579 + height: 575 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1362,9 +1362,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -5.960655, y: -6.006927, z: -0.1346523} + m_Target: {x: -6.8507905, y: -3.536796, z: -0.18399213} speed: 2 - m_Value: {x: -5.960655, y: -6.006927, z: -0.1346523} + m_Value: {x: -6.8507905, y: -3.536796, z: -0.18399213} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -1415,9 +1415,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 14.88186 + m_Target: 14.925038 speed: 2 - m_Value: 14.88186 + m_Value: 14.925038 m_Ortho: m_Target: 1 speed: 2 @@ -1463,9 +1463,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 8 - y: 687 + y: 677 width: 1359 - height: 320 + height: 314 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1528,9 +1528,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 8 - y: 687 + y: 677 width: 1359 - height: 320 + height: 314 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1541,14 +1541,14 @@ MonoBehaviour: - {fileID: -6249461530680594348, guid: 269cb10eaf7e55c438dc685ff581a34b, type: 2} - {fileID: -6270613921121612653, guid: 269cb10eaf7e55c438dc685ff581a34b, type: 2} m_ValueSerializationHelper: - - e00: 0.6649233 + - e00: 0.6580648 e01: 0 e02: 0 - e03: 162.28592 + e03: 194.358 e10: 0 - e11: 0.6649233 + e11: 0.6580648 e12: 0 - e13: 26.596931 + e13: 25.593422 e20: 0 e21: 0 e22: 1 @@ -1628,7 +1628,7 @@ MonoBehaviour: x: 1368 y: 81 width: 543 - height: 917 + height: 910 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default