diff --git a/Platformer/Assets/Bee_Enemy.cs b/Platformer/Assets/Enemy1.cs similarity index 87% rename from Platformer/Assets/Bee_Enemy.cs rename to Platformer/Assets/Enemy1.cs index 9399bc7..c86e05e 100644 --- a/Platformer/Assets/Bee_Enemy.cs +++ b/Platformer/Assets/Enemy1.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; -public class Bee_Enemy : MonoBehaviour +public class Enemy1 : MonoBehaviour { public Animator animator; @@ -50,13 +50,11 @@ public class Bee_Enemy : MonoBehaviour slider.value = CalculateHealth(); //Hurt Animation - SoundManagerScript.PlaySound("GhostHurt"); - animator.SetTrigger("Hurt"); + SoundManagerScript.PlaySound("BeeHit"); if (currentHealth <= 0) { Instantiate(score, new Vector3(ghost.position.x, ghost.position.y, ghost.position.z), Quaternion.identity); - animator.SetBool("IsDead", true); Die(); } } @@ -75,7 +73,7 @@ public class Bee_Enemy : MonoBehaviour TakeDamage(Shurikendamage); healthBarUI.SetActive(true); slider.value = CalculateHealth(); - SoundManagerScript.PlaySound("GhostHurt"); + SoundManagerScript.PlaySound("BeeHit"); } } diff --git a/Platformer/Assets/Bee_Enemy.cs.meta b/Platformer/Assets/Enemy1.cs.meta similarity index 83% rename from Platformer/Assets/Bee_Enemy.cs.meta rename to Platformer/Assets/Enemy1.cs.meta index 968c5f7..edd190a 100644 --- a/Platformer/Assets/Bee_Enemy.cs.meta +++ b/Platformer/Assets/Enemy1.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f44ee1a21b2fd0240858d7f7c375f231 +guid: 9657cc9d41c150d4aaa7464b0f0c1f71 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Platformer/Assets/Prefabs/Bee.prefab b/Platformer/Assets/Prefabs/Bee.prefab index 4693e52..c463785 100644 --- a/Platformer/Assets/Prefabs/Bee.prefab +++ b/Platformer/Assets/Prefabs/Bee.prefab @@ -36,7 +36,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -6.38, y: 9.179993} + m_AnchoredPosition: {x: -6.38, y: 8.846} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0, y: 0} --- !u!114 &6746244900469705723 @@ -144,7 +144,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.17372729, g: 0.6037736, b: 0.22807202, a: 1} + m_Color: {r: 1, g: 0.8000001, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -279,11 +279,11 @@ GameObject: - component: {fileID: 6134100177009422160} - component: {fileID: 6134100177009422162} - component: {fileID: 7922802657477513153} - - component: {fileID: 5684347372251890869} - component: {fileID: 6134100177009422175} + - component: {fileID: 1130337972426661562} m_Layer: 11 - m_Name: Bee 1 - m_TagString: Enemy + m_Name: Bee + m_TagString: Bee m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -385,7 +385,7 @@ BoxCollider2D: m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: -0.009844661, y: 0.013730824} + m_Offset: {x: -0.009844661, y: -0.0030899048} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} @@ -396,7 +396,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 0.5493791, y: 0.75746167} + m_Size: {x: 0.5493791, y: 0.5402832} m_EdgeRadius: 0 --- !u!114 &7922802657477513153 MonoBehaviour: @@ -412,27 +412,7 @@ MonoBehaviour: m_EditorClassIdentifier: moveRight: 1 Ghost: {fileID: 6134100177009422172} ---- !u!114 &5684347372251890869 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6134100177009422172} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f44ee1a21b2fd0240858d7f7c375f231, type: 3} - m_Name: - m_EditorClassIdentifier: - animator: {fileID: 6134100177009422175} - maxHealth: 20 - currentHealth: 0 - healthBarUI: {fileID: 8924187236842143802} - slider: {fileID: 6746244900469705723} - enemie: {fileID: 6134100177009422172} - ghost: {fileID: 6134100177009422167} - Shurikendamage: 10 - score: {fileID: 6831754131110099708, guid: e170a43bc37e278468fc83ed09f780c2, type: 3} + mySpriteRenderer: {fileID: 6134100177009422160} --- !u!95 &6134100177009422175 Animator: serializedVersion: 3 @@ -452,6 +432,27 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &1130337972426661562 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6134100177009422172} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9657cc9d41c150d4aaa7464b0f0c1f71, type: 3} + m_Name: + m_EditorClassIdentifier: + animator: {fileID: 6134100177009422175} + maxHealth: 24 + currentHealth: 0 + healthBarUI: {fileID: 8924187236842143802} + slider: {fileID: 6746244900469705723} + enemie: {fileID: 6134100177009422172} + ghost: {fileID: 6134100177009422167} + Shurikendamage: 10 + score: {fileID: 6831754131110099708, guid: e170a43bc37e278468fc83ed09f780c2, type: 3} --- !u!1 &6804663626293780139 GameObject: m_ObjectHideFlags: 0 diff --git a/Platformer/Assets/Prefabs/ghost_normal 1.prefab b/Platformer/Assets/Prefabs/ghost_normal 1.prefab index f02b76c..558ce7e 100644 --- a/Platformer/Assets/Prefabs/ghost_normal 1.prefab +++ b/Platformer/Assets/Prefabs/ghost_normal 1.prefab @@ -255,9 +255,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: feb60d963acb6e74db4f39b374c55970, type: 3} m_Name: m_EditorClassIdentifier: - speed: 1 moveRight: 1 Ghost: {fileID: 2000275865591280230} + mySpriteRenderer: {fileID: 2000275865591280234} --- !u!1 &3835886914462375168 GameObject: m_ObjectHideFlags: 0 diff --git a/Platformer/Assets/Resources/BeeHit.wav b/Platformer/Assets/Resources/BeeHit.wav new file mode 100644 index 0000000..33c874b Binary files /dev/null and b/Platformer/Assets/Resources/BeeHit.wav differ diff --git a/Platformer/Assets/Resources/BeeHit.wav.meta b/Platformer/Assets/Resources/BeeHit.wav.meta new file mode 100644 index 0000000..3fdb11c --- /dev/null +++ b/Platformer/Assets/Resources/BeeHit.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: f3739be8d12fc36409ecfe0c1b81bff5 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Platformer/Assets/EnemyPatrol.cs b/Platformer/Assets/Scripts/EnemyPatrol.cs similarity index 75% rename from Platformer/Assets/EnemyPatrol.cs rename to Platformer/Assets/Scripts/EnemyPatrol.cs index 70a6c82..23cee55 100644 --- a/Platformer/Assets/EnemyPatrol.cs +++ b/Platformer/Assets/Scripts/EnemyPatrol.cs @@ -7,12 +7,14 @@ public class EnemyPatrol : MonoBehaviour public bool moveRight; public static float speed; public GameObject Ghost; + public SpriteRenderer mySpriteRenderer; void Start() { speed = (Random.Range(1f, 1.5f)); Rigidbody2D rigidbody = GetComponent(); rigidbody.velocity = transform.right * speed; + mySpriteRenderer = GetComponent(); } void Update() @@ -20,15 +22,19 @@ public class EnemyPatrol : MonoBehaviour if (moveRight) { transform.Translate(2 * Time.deltaTime * speed, 0, 0); - transform.localScale =new Vector3(-1, 1,1); + if (mySpriteRenderer != null) + { + // flip the sprite + mySpriteRenderer.flipX = true; + } } if (moveRight == false) { transform.Translate(2 * Time.deltaTime * -(speed*2), 0, 0); - transform.localScale = new Vector3(1, 1,1); - + mySpriteRenderer.flipX = false; + } } diff --git a/Platformer/Assets/EnemyPatrol.cs.meta b/Platformer/Assets/Scripts/EnemyPatrol.cs.meta similarity index 100% rename from Platformer/Assets/EnemyPatrol.cs.meta rename to Platformer/Assets/Scripts/EnemyPatrol.cs.meta diff --git a/Platformer/Assets/Scripts/Player&Enemy/Bullet.cs b/Platformer/Assets/Scripts/Player&Enemy/Bullet.cs index 2866342..ae336b2 100644 --- a/Platformer/Assets/Scripts/Player&Enemy/Bullet.cs +++ b/Platformer/Assets/Scripts/Player&Enemy/Bullet.cs @@ -39,6 +39,14 @@ public class Bullet : MonoBehaviour { Destroy(gameObject); + } + + if (other.gameObject.CompareTag("Bee")) + { + Destroy(gameObject); + SoundManagerScript.PlaySound("BeeHit"); + + } if (other.gameObject.CompareTag("Wall")) { diff --git a/Platformer/Assets/Scripts/Player&Enemy/Player.cs b/Platformer/Assets/Scripts/Player&Enemy/Player.cs index 3fa4d79..029df79 100644 --- a/Platformer/Assets/Scripts/Player&Enemy/Player.cs +++ b/Platformer/Assets/Scripts/Player&Enemy/Player.cs @@ -262,12 +262,21 @@ public class Player : MonoBehaviour if (other.gameObject.CompareTag("Enemy")) //take damage { + TakeDamage(20); score = score - 10; } + if (other.gameObject.CompareTag("Bee")) //take damage + { + + TakeDamage(10); + score = score - 10; + } + if (other.gameObject.CompareTag("Spikes")) //take damage { + TakeDamage(10); score = score - 10; @@ -322,7 +331,7 @@ public class Player : MonoBehaviour dialogText.text = "The Katana is very powerful\n" +"The Shurikens are very fast\n"+"Be wise with what you use"; } - if (other.gameObject.CompareTag("Sign")) + if (other.gameObject.CompareTag("Sign4")) { dialogBox.SetActive(true); dialogText.text = "These forests are infested\n" + "Clear it to keep your village safe\n" + "Almost Home.."; diff --git a/Platformer/Assets/Scripts/Player&Enemy/PlayerInput.cs b/Platformer/Assets/Scripts/Player&Enemy/PlayerInput.cs index de45b98..1bc6863 100644 --- a/Platformer/Assets/Scripts/Player&Enemy/PlayerInput.cs +++ b/Platformer/Assets/Scripts/Player&Enemy/PlayerInput.cs @@ -46,6 +46,7 @@ public class PlayerInput : MonoBehaviour Vector2 directionalInput = new Vector2(Input.GetAxisRaw("Horizontal"), Input.GetAxisRaw("Vertical")); // player.SetDirectionalInput(directionalInput); //pass in directional input + //set up attack positions so on turn the sword circle was in correct position attackPoint.position = new Vector3(attackPoint.position.x, attackPoint.position.y, attackPoint.position.z); leftattackPoint.position = new Vector3(leftattackPoint.position.x, leftattackPoint.position.y, attackPoint.position.z); rightattackPoint.position = new Vector3(rightattackPoint.position.x, rightattackPoint.position.y, attackPoint.position.z); @@ -75,7 +76,7 @@ public class PlayerInput : MonoBehaviour } - if (Input.GetKeyDown(KeyCode.Space) || Input.GetKeyDown(KeyCode.W)) //space down + if (Input.GetKeyDown(KeyCode.Space)) //space down { SoundManagerScript.PlaySound("Jump"); diff --git a/Platformer/Assets/Scripts/Player&Enemy/Weapon.cs b/Platformer/Assets/Scripts/Player&Enemy/Weapon.cs index 912f1af..4e71ee6 100644 --- a/Platformer/Assets/Scripts/Player&Enemy/Weapon.cs +++ b/Platformer/Assets/Scripts/Player&Enemy/Weapon.cs @@ -79,7 +79,13 @@ public class Weapon : MonoBehaviour Collider2D[] hitEnemies = Physics2D.OverlapCircleAll(attackPoint.position, attackRange, enemyLayers ); foreach(Collider2D enemy in hitEnemies) { + //was getting errors until this, helped recognize layers or something idk + if(enemy.CompareTag("Bee")) + { + enemy.GetComponent().TakeDamage(attackDamage); + } enemy.GetComponent().TakeDamage(attackDamage); + Debug.Log("We hit" + enemy.name); } } diff --git a/Platformer/Assets/SoundManagerScript.cs b/Platformer/Assets/Scripts/SoundManagerScript.cs similarity index 93% rename from Platformer/Assets/SoundManagerScript.cs rename to Platformer/Assets/Scripts/SoundManagerScript.cs index 8a9fce1..8e9cee2 100644 --- a/Platformer/Assets/SoundManagerScript.cs +++ b/Platformer/Assets/Scripts/SoundManagerScript.cs @@ -4,7 +4,7 @@ using UnityEngine; public class SoundManagerScript : MonoBehaviour { - public static AudioClip Collectsound, Jumpsound, Swordsound, Diesound, Throwsound, Hurtsound, Heartsound, GhsotHurtSound, Keysound, teleportSound, evilLaughSound; + public static AudioClip Collectsound, Jumpsound, Swordsound, Diesound, Throwsound, Hurtsound, Heartsound, GhsotHurtSound, Keysound, teleportSound, evilLaughSound, BeeHitSound; static AudioSource audioSrc; public AudioClip otherClip; @@ -24,6 +24,8 @@ public class SoundManagerScript : MonoBehaviour Keysound = Resources.Load("Key"); teleportSound = Resources.Load("teleport"); evilLaughSound = Resources.Load("Evil Laugh"); + BeeHitSound = Resources.Load("BeeHit"); + audioSrc = GetComponent(); @@ -70,9 +72,8 @@ public class SoundManagerScript : MonoBehaviour case "teleport": audioSrc.PlayOneShot(teleportSound); break; - - case "Evil Laugh": - audioSrc.PlayOneShot(evilLaughSound); + case "BeeHit": + audioSrc.PlayOneShot(BeeHitSound); break; } diff --git a/Platformer/Assets/SoundManagerScript.cs.meta b/Platformer/Assets/Scripts/SoundManagerScript.cs.meta similarity index 100% rename from Platformer/Assets/SoundManagerScript.cs.meta rename to Platformer/Assets/Scripts/SoundManagerScript.cs.meta diff --git a/Platformer/Assets/World Build/Enemies/Enemy sprites/bee.png.meta b/Platformer/Assets/World Build/Enemies/Enemy sprites/bee.png.meta index c00b640..05717a9 100644 --- a/Platformer/Assets/World Build/Enemies/Enemy sprites/bee.png.meta +++ b/Platformer/Assets/World Build/Enemies/Enemy sprites/bee.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 0 aniso: -1 mipBias: -100 wrapU: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Platformer/Assets/_Scenes/Level1.unity b/Platformer/Assets/_Scenes/Level1.unity index 0c3f202..5d39fc0 100644 --- a/Platformer/Assets/_Scenes/Level1.unity +++ b/Platformer/Assets/_Scenes/Level1.unity @@ -1055,8 +1055,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1134,8 +1134,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1710,8 +1710,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -2303,8 +2303,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -2511,8 +2511,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -475010,8 +475010,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -475785,8 +475785,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -476258,8 +476258,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -476888,8 +476888,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -477926,8 +477926,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -478005,8 +478005,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -478528,8 +478528,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -479821,8 +479821,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -480256,8 +480256,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -480472,8 +480472,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -480551,8 +480551,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -481046,8 +481046,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -481478,6 +481478,86 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &484445260 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 307627533080266736, guid: 35cce8937177fbb4c9c0920eb2bf29ee, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 307627533080266736, guid: 35cce8937177fbb4c9c0920eb2bf29ee, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6134100177009422167, guid: 35cce8937177fbb4c9c0920eb2bf29ee, + type: 3} + propertyPath: m_LocalPosition.x + value: 389.98 + objectReference: {fileID: 0} + - target: {fileID: 6134100177009422167, guid: 35cce8937177fbb4c9c0920eb2bf29ee, + type: 3} + propertyPath: m_LocalPosition.y + value: 75 + objectReference: {fileID: 0} + - target: {fileID: 6134100177009422167, guid: 35cce8937177fbb4c9c0920eb2bf29ee, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6134100177009422167, guid: 35cce8937177fbb4c9c0920eb2bf29ee, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6134100177009422167, guid: 35cce8937177fbb4c9c0920eb2bf29ee, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6134100177009422167, guid: 35cce8937177fbb4c9c0920eb2bf29ee, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6134100177009422167, guid: 35cce8937177fbb4c9c0920eb2bf29ee, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6134100177009422167, guid: 35cce8937177fbb4c9c0920eb2bf29ee, + type: 3} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 6134100177009422167, guid: 35cce8937177fbb4c9c0920eb2bf29ee, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6134100177009422167, guid: 35cce8937177fbb4c9c0920eb2bf29ee, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6134100177009422167, guid: 35cce8937177fbb4c9c0920eb2bf29ee, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6134100177009422172, guid: 35cce8937177fbb4c9c0920eb2bf29ee, + type: 3} + propertyPath: m_Name + value: Bee + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 7922802657477513153, guid: 35cce8937177fbb4c9c0920eb2bf29ee, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 35cce8937177fbb4c9c0920eb2bf29ee, type: 3} --- !u!1 &484897305 GameObject: m_ObjectHideFlags: 0 @@ -482798,8 +482878,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -483190,8 +483270,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -483346,8 +483426,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -483482,8 +483562,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -483689,8 +483769,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -483768,8 +483848,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -484220,8 +484300,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -485868,8 +485948,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -486396,8 +486476,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -486475,8 +486555,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -487261,8 +487341,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -488586,8 +488666,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -488850,8 +488930,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -489001,8 +489081,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -489116,8 +489196,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -489479,8 +489559,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -489875,8 +489955,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -490648,8 +490728,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -490727,8 +490807,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -490934,8 +491014,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -491090,8 +491170,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -491645,8 +491725,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -493131,8 +493211,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -999827,8 +999907,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1000441,8 +1000521,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1000699,8 +1000779,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1001385,8 +1001465,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1001788,8 +1001868,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1002082,8 +1002162,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1002161,8 +1002241,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1002632,8 +1002712,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1003003,8 +1003083,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1003139,8 +1003219,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1004171,8 +1004251,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1004250,8 +1004330,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1005453,8 +1005533,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1005703,8 +1005783,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1006598,6 +1006678,85 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &1382978007 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2000275865591280230, guid: 750daf85a03c2b94ca1c0ba4516e8b1c, + type: 3} + propertyPath: m_Name + value: ghost_normal 1 + objectReference: {fileID: 0} + - target: {fileID: 2000275865591280237, guid: 750daf85a03c2b94ca1c0ba4516e8b1c, + type: 3} + propertyPath: m_LocalPosition.x + value: 386.46 + objectReference: {fileID: 0} + - target: {fileID: 2000275865591280237, guid: 750daf85a03c2b94ca1c0ba4516e8b1c, + type: 3} + propertyPath: m_LocalPosition.y + value: 75.29 + objectReference: {fileID: 0} + - target: {fileID: 2000275865591280237, guid: 750daf85a03c2b94ca1c0ba4516e8b1c, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2000275865591280237, guid: 750daf85a03c2b94ca1c0ba4516e8b1c, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2000275865591280237, guid: 750daf85a03c2b94ca1c0ba4516e8b1c, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2000275865591280237, guid: 750daf85a03c2b94ca1c0ba4516e8b1c, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2000275865591280237, guid: 750daf85a03c2b94ca1c0ba4516e8b1c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2000275865591280237, guid: 750daf85a03c2b94ca1c0ba4516e8b1c, + type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 2000275865591280237, guid: 750daf85a03c2b94ca1c0ba4516e8b1c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2000275865591280237, guid: 750daf85a03c2b94ca1c0ba4516e8b1c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2000275865591280237, guid: 750daf85a03c2b94ca1c0ba4516e8b1c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5379042114429868746, guid: 750daf85a03c2b94ca1c0ba4516e8b1c, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5379042114429868746, guid: 750daf85a03c2b94ca1c0ba4516e8b1c, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 750daf85a03c2b94ca1c0ba4516e8b1c, type: 3} --- !u!1 &1386281582 GameObject: m_ObjectHideFlags: 0 @@ -1006848,8 +1007007,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1007437,7 +1007596,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1426939345} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 16.83, y: 0.15, z: -0.00055995584} + m_LocalPosition: {x: 16.83, y: 0.15, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1509931430} @@ -1007667,8 +1007826,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1007803,8 +1007962,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1008750,8 +1008909,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1009695,8 +1009854,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1010012,8 +1010171,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1010474,8 +1010633,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1011363,8 +1011522,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1012326,8 +1012485,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1013076,8 +1013235,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1013155,8 +1013314,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1013362,8 +1013521,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1013599,8 +1013758,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1014501,8 +1014660,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1014580,8 +1014739,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1016163,8 +1016322,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1016356,8 +1016515,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1017085,7 +1017244,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1919620925} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -16.9, y: 34.5, z: 0} + m_LocalPosition: {x: 389, y: 79, z: 0} m_LocalScale: {x: 0.67200005, y: 0.75, z: 1} m_Children: - {fileID: 1729492402} @@ -1017157,7 +1017316,7 @@ MonoBehaviour: firePoint: {fileID: 1729492402} bulletPrefab: {fileID: 8433151850351439283, guid: 8db08d1742a9c9845b440e2adcab3ca0, type: 3} - shots: 0 + shots: 5 shurikenDamage: 5 animator: {fileID: 1919620935} attackPoint: {fileID: 1551727507} @@ -1018142,7 +1018301,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1962584253} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 5.47, y: 1.25, z: -0.00055995584} + m_LocalPosition: {x: 5.47, y: 1.25, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 29554985} @@ -1018576,8 +1018735,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1018691,8 +1018850,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1019043,7 +1019202,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2016044656} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.1, y: 0.4, z: -0.00055995584} + m_LocalPosition: {x: -3.1, y: 0.4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 328630597} @@ -1020269,8 +1020428,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1020510,8 +1020669,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1021039,8 +1021198,8 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1143351675 - m_SortingLayer: 3 + m_SortingLayerID: 1914031289 + m_SortingLayer: 2 m_SortingOrder: 0 m_Sprite: {fileID: 21300000, guid: f7187675ec12e4aacaeb0e97ad31230a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} diff --git a/Platformer/ProjectSettings/TagManager.asset b/Platformer/ProjectSettings/TagManager.asset index 361f0b4..1ea7a9c 100644 --- a/Platformer/ProjectSettings/TagManager.asset +++ b/Platformer/ProjectSettings/TagManager.asset @@ -37,6 +37,7 @@ TagManager: - turn - turnback - Sign4 + - Bee layers: - Default - TransparentFX