@@ -540,7 +540,7 @@ serializedVersion: 3
   m_TransitionDuration: 0.25
   m_TransitionOffset: 0
   m_ExitTime: 0.9013158
-  m_HasExitTime: 1
+  m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_OrderedInterruption: 1

@@ -525,7 +525,7 @@ serializedVersion: 3
   m_TransitionDuration: 0.25
   m_TransitionOffset: 0
   m_ExitTime: 0.9013158
-  m_HasExitTime: 1
+  m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_OrderedInterruption: 1

@@ -540,7 +540,7 @@ serializedVersion: 3
   m_TransitionDuration: 0.25
   m_TransitionOffset: 0
   m_ExitTime: 0.9013158
-  m_HasExitTime: 1
+  m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_OrderedInterruption: 1

@@ -3426,7 +3426,7 @@ m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "This game was developed by Marco Andronaco for the Digital Games Development
     (DGD) class in UniCT.\n\nMixamo \t\t   Models, animations\nSketchFab\t\t\t\t\t
-    \  Models\nCkwnce\t\t\t\t\t\t\t Music\nNintendo\t\t\t\t\t\t Music\nBartolomeo
+    \  Models\nCkwnce\t\t\t\t\t\t\t Music\nGabriel Ardini\t\t\t  Game Icon\nBartolomeo
     Caruso\t\t  Testing"
 --- !u!222 &1829720840
 CanvasRenderer:

@@ -8,7 +8,7 @@ {
     [SerializeField] private AudioClip[] buttonSounds = null;
     private AudioSource audioSource;
 
-    public void playButtonSound(int index){
+    public void playButtonSound(int index) {
         if(index <= buttonSounds.Length)
             audioSource.PlayOneShot(buttonSounds[index]);
     }

@@ -28,7 +28,7 @@ #endregion
     #region Private
     private float timer;
     private BattleManager battle;
-    private GameObject player;
+    private Transform player;
     private List<string> killedEnemies = new List<string>();
     private string fighting = "";
     private bool loaded = false;
@@ -64,9 +64,9 @@ public void EnterBattle(string enemyName, string enemyType)
     {
         fighting = enemyName;
         this.enemyType = enemyType;
-        player = GameObject.Find("Player");
-        lastPosition = player.transform.position;
-        lastRotation = player.transform.rotation;
+        player = FindObjectOfType<NoJumpController>().transform;
+        lastPosition = player.position;
+        lastRotation = player.rotation;
         
         SceneManager.LoadScene("Battle");
     }
@@ -95,11 +95,14 @@ killedEnemies.Add(fighting);
 
             if(bossNames.Contains(fighting)){
                 currentLevel++;
-                fighting = "";
                 killedEnemies = new List<string>();
             }
-            Debug.Log("battle ended. fighting=" + fighting + ", currentLevel: " + currentLevel + ", killedEnemies:");
-            killedEnemies.ForEach(Console.WriteLine);
+            Debug.Log("battle ended. fighting=" + fighting + ", currentLevel: " + currentLevel + ", loaded:" + loaded);
+            Debug.Log("killed enemies:");
+            foreach (string str in killedEnemies)
+            {
+                Debug.Log(str);
+            }
             SceneManager.LoadScene("Level" + currentLevel);
         } else //Lost Battle
         {
@@ -121,10 +124,10 @@
             #region Battaglia vinta o ritorno all'overworld
             case "Level0":
             case "Level1":
-                player = FindObjectOfType<NoJumpController>().gameObject;
+                player = FindObjectOfType<NoJumpController>().transform;
 
                 if(loaded || fighting != ""){
-                    player.transform.SetPositionAndRotation(lastPosition, lastRotation);
+                    player.SetPositionAndRotation(lastPosition, lastRotation);
                     loaded = false;
                 }
                 foreach (string enemy in killedEnemies)

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:79eb0837517387f57b3c1df08ebf39f98abb96c36ae175bb1ac14949d6f61bc3
-size 66110

@@ -1,12 +1,12 @@
 fileFormatVersion: 2
-guid: 76b0e7f282fe0314f8b4e19469c289fc
+guid: 48a572811883421429a743e71b281bb2
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
   serializedVersion: 10
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 0
+    enableMipMap: 1
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -34,13 +34,13 @@ serializedVersion: 2
     filterMode: -1
     aniso: -1
     mipBias: -100
-    wrapU: 1
-    wrapV: 1
+    wrapU: -1
+    wrapV: -1
     wrapW: -1
-  nPOTScale: 0
+  nPOTScale: 1
   lightmap: 0
   compressionQuality: 50
-  spriteMode: 1
+  spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -49,9 +49,9 @@ spritePixelsToUnits: 100
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 1
+  alphaIsTransparency: 0
   spriteTessellationDetail: -1
-  textureType: 8
+  textureType: 0
   textureShape: 1
   singleChannelComponent: 0
   maxTextureSizeSet: 0
@@ -60,18 +60,6 @@ textureFormatSet: 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

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:50a03f59a5b4234591150059fb0f9deb7e33aa07bad10b0a1fed5dd15cf33532
+size 304181

@@ -279,7 +279,7 @@ m_BuildTargetIcons:
   - m_BuildTarget: Standalone
     m_Icons:
     - serializedVersion: 2
-      m_Icon: {fileID: 2800000, guid: 76b0e7f282fe0314f8b4e19469c289fc, type: 3}
+      m_Icon: {fileID: 2800000, guid: 48a572811883421429a743e71b281bb2, type: 3}
       m_Width: 1024
       m_Height: 1024
       m_Kind: 0