Merge branch 'master' into justine_develop

Conflicts:
	Assets/Prefabs.meta

Assets/Animations.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 0be5178eda42c884b910fd35e0bd7ef1
+folderAsset: yes
+timeCreated: 1446671881
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Animations/Idle.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a5953cc6b2350a04aa578af74d1740a3
+timeCreated: 1446674697
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Animations/Jump0.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a078ad8c97314a34d9ecd3e37dae2156
+timeCreated: 1446945210
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Animations/Running.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 90df11971c9d126429f338c1cfc08ac3
+timeCreated: 1446674724
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Animations/Shooting.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1505078d1784bab4d9fbd9ba3eba4009
+timeCreated: 1446690168
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Animations/ShotingWhileRunning.anim.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fa93b95d117b58a43b3a34cc2f860e8b
+timeCreated: 1446687352
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Animations/megaman.controller.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4435a97212c21a447a54fac1ff9a76ed
+timeCreated: 1446674697
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MissileTravel.cs

@@ -0,0 +1,37 @@
+using UnityEngine;
+using System.Collections;
+
+public class MissileTravel : MonoBehaviour {
+    public float missileSpeed;
+    private Transform missilePos;
+    private bool inContact = false;
+
+    // ajouter du damage
+
+	// Use this for initialization
+	void Start () {
+        this.missilePos = this.transform;
+	}
+	
+	// Update is called once per frame
+	void Update () {
+        if (!inContact)
+        {
+            this.missilePos.Translate(new Vector3(missileSpeed, 0, 0) * Time.deltaTime);
+        }
+	}
+
+    void OnCollisionEnter2D(Collision2D other) {
+        print("missile touche");
+        if (other.gameObject.tag == "Ennemy") {
+            // do shits to player
+            print("touchee");
+            Destroy(this.gameObject);
+            Destroy(other.gameObject);
+        }
+        if (other.gameObject.tag == "Floor") {
+            Destroy(this.gameObject);
+        }
+    }
+
+}

Assets/MissileTravel.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: fb20d6c6a0d8d8743a840286880b4b00
+timeCreated: 1447713283
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs.meta

@@ -1,7 +1,7 @@
 fileFormatVersion: 2
-guid: 1c776bc4dc6ca074ea07054b33c57706
+guid: f9204b0ff046b78438022b154aebf1c1
 folderAsset: yes
-timeCreated: 1447945458
+timeCreated: 1447284916
 licenseType: Free
 DefaultImporter:
   userData: 

Assets/Prefabs/Enemy.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bd943a16d07906c4e82954299bcf4dd3
+timeCreated: 1447285149
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Floor.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3d5d4b679380caf4e9eb6959973b5bae
+timeCreated: 1447285157
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Missile.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d7295f14b4e29684f865cdde9266feb0
+timeCreated: 1447715205
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Animations.cs

@@ -0,0 +1,45 @@
+using UnityEngine;
+using System.Collections;
+
+public class Animations : MonoBehaviour {
+
+    private Animator anim;
+
+    private bool isShooting;
+
+
+    // Use this for initialization
+    void Start () {
+
+        anim = GetComponent<Animator>();
+        isShooting = false;
+
+    }
+	
+	// Update is called once per frame
+	void Update () {
+
+        float mouvementX = Input.GetAxis("Horizontal");
+
+
+        if (Input.GetKeyDown(KeyCode.X))
+        {
+            isShooting = true;
+        } // if
+
+        
+        if (Input.GetKeyUp(KeyCode.X))
+        {
+            isShooting = false;
+        } // if
+
+
+
+        anim.SetFloat("SpeedX", Mathf.Abs(mouvementX));
+        anim.SetBool("isShooting", isShooting);
+
+
+    }
+
+
+}

Assets/Scripts/Animations.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 54028f0b56ae6d143b1a877a63b8fef4
+timeCreated: 1446675026
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Class/Character.cs

@@ -28,6 +28,7 @@ public class Character{
     public void setTouchingTheFloor(bool touchFloor){
         this.touchingTheFloor = touchFloor;
     }
+
     public bool isTouchingTheFloor()
     {
         return touchingTheFloor;

Assets/Scripts/Control.cs

@@ -5,22 +5,42 @@ public class Control : MonoBehaviour {
 
 
     public Transform thingsToMove;
-    public int speed;
+
+    public float speed;          
+    
+    private int eulerAngle;     
 
 	// Use this for initialization
 	void Start () {
-	
+
-	}
+        eulerAngle = 0;
+
+    }
 	
 	// Update is called once per frame
 	void Update () {
-
+        
         float mouvement = Input.GetAxis ("Horizontal");
 
-        if ( mouvement!= 0)
+
+        // aller vers la gauche
+        if (mouvement > 0.0)
         {
-            thingsToMove.Translate(new Vector2(mouvement * speed, 0));
+            thingsToMove.Translate(new Vector2(mouvement * speed, 0));      // bouger le player
-        }
+            eulerAngle = 0;
-	
+
-	}
+        } // if
+
+
+        // aller vers la droite
+        if (mouvement < 0.0)
+        {
+
+            thingsToMove.Translate(new Vector2(-(mouvement * speed), 0));   // bouger le player
+            eulerAngle = 180;
+
+        } // if
+
+        transform.eulerAngles = new Vector3(0, eulerAngle, 0);              // gauche = sprite effet miroir, droite = sprite normal
+    }
 }

Assets/Scripts/DirectionChangeTrigger.cs

@@ -0,0 +1,22 @@
+using UnityEngine;
+using System.Collections;
+
+public class DirectionChangeTrigger : MonoBehaviour {
+
+	// Use this for initialization
+	void Start () {
+	
+	}
+	
+	// Update is called once per frame
+	void Update () {
+	
+	}
+
+    void OnTriggerEnter2D(Collider2D other) { 
+        if( other.gameObject.tag == "Ennemy" ){
+            other.gameObject.GetComponent<Patrolling>().setDirection(- other.gameObject.GetComponent<Patrolling>().getDirection());
+            //print("TriggerEnter");
+        }
+    }
+}

Assets/Scripts/DirectionChangeTrigger.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: d4ed5a831e76a9946a2df20bb4fb30f2
+timeCreated: 1447285007
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Gravity.cs

@@ -4,6 +4,7 @@ using System.Collections;
 public class Gravity : MonoBehaviour {
 
     public Character player;
+
     void Start()
     {
         player = new Character(1, 10, 10, false);

Assets/Scripts/Jump.cs

@@ -3,34 +3,58 @@ using System.Collections;
 
 public class Jump : MonoBehaviour {
 
-    public int timeJump;
+    public Rigidbody2D player;      // le player
+
+    public float playerSpeedY;      // la vitesse de saut
+
+    private bool isOnGround;        // somme nous sur le sol?
 
-    public Transform player;
 
-    private bool isJumping;
 	// Use this for initialization
 	void Start () {
-        isJumping = false;
+        isOnGround = false;
-        timeJump = 0;
 	}
 	
 	// Update is called once per frame
 	void Update () {
 
-        if (Input.GetButton("Fire1") && isJumping == false)
+        if (Input.GetKeyUp(KeyCode.Space) && isOnGround == true)
         {
-            timeJump = 50;
+            player.velocity = new Vector2(player.velocity.x, playerSpeedY);
-            isJumping = true;
         }
 
-        if (timeJump > 0) {
-            player.Translate(0, 0.5f, 0);
-            timeJump--;      
-        }
-        else
-        {
-            isJumping = false;
-        }
-	
 	}
+
+
+    void OnTriggerStay2D(Collider2D other)
+    {
+        if (other.gameObject.tag == "Floor")
+        {
+            isOnGround = true;
+        }
+
+    }
+
+
+    void OnTriggerEnter2D(Collider2D other)
+    {
+        if (other.gameObject.tag == "Floor")
+        {
+            isOnGround = true;
+        }
+    }
+
+
+    void OnTriggerExit2D(Collider2D other)
+    {
+        if (other.gameObject.tag == "Floor")
+        {
+
+            isOnGround = false;
+        }
+
+    }
+
+
+
 }

Assets/Scripts/MainCamera.cs

@@ -0,0 +1,29 @@
+using UnityEngine;
+using System.Collections;
+
+public class MainCamera : MonoBehaviour {
+
+    // le player
+    public Rigidbody2D player;
+
+    private float positionPlayerX;      // position du player en X
+    private float positionPlayerY;      // // position du player en Y
+
+
+    // Use this for initialization
+    void Start () {
+        
+	}
+	
+	// Update is called once per frame
+	void Update () {
+
+        // definir la position du player
+        positionPlayerX = player.GetComponent<Rigidbody2D>().position.x;
+        positionPlayerY = player.GetComponent<Rigidbody2D>().position.y;
+
+        // ajuster la camera selon la position du player
+        transform.position = new Vector3(positionPlayerX, positionPlayerY + 3.5F, -10);
+
+    }
+}

Assets/Scripts/MainCamera.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: c729e4edf3bf65d4fa14333e02f090e0
+timeCreated: 1446932586
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Patrolling.cs

@@ -0,0 +1,30 @@
+using UnityEngine;
+using System.Collections;
+
+public class Patrolling : MonoBehaviour {
+
+    
+    public float speed;
+
+	// Use this for initialization
+	void Start () {
+        
+	}
+	
+	// Update is called once per frame
+	void Update () {
+        this.transform.Translate(new Vector3(speed, 0, 0) * Time.deltaTime);
+	}
+
+    void FixedUpdate() {
+    }
+
+    public void setDirection(float value) {
+        speed = value;
+    }
+
+    public float getDirection() {
+        return speed;
+    }
+
+}

Assets/Scripts/Patrolling.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: be63d981612586b44828f7fac8c05892
+timeCreated: 1447284995
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ShootingScript.cs

@@ -0,0 +1,22 @@
+using UnityEngine;
+using System.Collections;
+
+public class ShootingScript : MonoBehaviour {
+
+    public float attackSpeed;
+    private float nextShootTime = 0.0f;
+    public GameObject Missile;
+	// Use this for initialization
+	void Start () {
+	}
+	
+	// Update is called once per frame
+	void Update () {
+	    if(Input.GetButton("Fire1") && Time.time > nextShootTime){
+            print("pewpew");
+            nextShootTime = Time.time + attackSpeed;
+            //avancer le missile au depart quand il va apparaitre (quand je vais avoir anim de combat)
+            GameObject clone = Instantiate( Missile,transform.position,transform.rotation) as GameObject;
+        }
+	}
+}

Assets/ShootingScript.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 86aea67c20f4c264393299ede07339a3
+timeCreated: 1447714560
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/enemySprite.png.meta

@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: 9cfe065510073d349b298b7fb7ea20dc
+timeCreated: 1447285180
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  allowsAlphaSplitting: 0
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/missile (1).gif.meta

@@ -0,0 +1,56 @@
+fileFormatVersion: 2
+guid: 51a9c79b88f593f4aa24a058515df7f1
+timeCreated: 1447713192
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  allowsAlphaSplitting: 0
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/mm.png.meta

@@ -0,0 +1,195 @@
+fileFormatVersion: 2
+guid: 14370da66867eeb479e470bd4bb068f7
+timeCreated: 1446945412
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName:
+    21300000: Player
+    21300002: Running0
+    21300004: Running1
+    21300006: Running2
+    21300008: Idle0
+    21300010: Idle1
+    21300012: Jump0
+    21300014: Jump1
+    21300016: Jump2
+    21300018: RunNShot0
+    21300020: RunNShot1
+    21300022: RunNShot2
+    21300024: Jumping0
+    21300026: Jumping1
+    21300028: Jumping2
+    21300030: Jumping3
+    21300032: Jumping4
+    21300034: Shooting
+    21300036: Jump3
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: 16
+    mipBias: -1
+    wrapMode: 1
+  nPOTScale: 0
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  allowsAlphaSplitting: 0
+  spriteMode: 2
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 1
+  textureType: 8
+  buildTargetSettings: []
+  spriteSheet:
+    sprites:
+    - name: Player
+      rect:
+        serializedVersion: 2
+        x: 8
+        y: 313
+        width: 21
+        height: 24
+      alignment: 0
+      pivot: {x: .5, y: .5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: Running0
+      rect:
+        serializedVersion: 2
+        x: 156
+        y: 313
+        width: 24
+        height: 22
+      alignment: 0
+      pivot: {x: .5, y: .5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: Running1
+      rect:
+        serializedVersion: 2
+        x: 209
+        y: 313
+        width: 16
+        height: 24
+      alignment: 0
+      pivot: {x: .5, y: .5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: Running2
+      rect:
+        serializedVersion: 2
+        x: 255
+        y: 313
+        width: 21
+        height: 22
+      alignment: 0
+      pivot: {x: .5, y: .5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: Idle0
+      rect:
+        serializedVersion: 2
+        x: 58
+        y: 313
+        width: 21
+        height: 24
+      alignment: 0
+      pivot: {x: .5, y: .5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: RunNShot0
+      rect:
+        serializedVersion: 2
+        x: 156
+        y: 263
+        width: 29
+        height: 22
+      alignment: 0
+      pivot: {x: .5, y: .5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: RunNShot1
+      rect:
+        serializedVersion: 2
+        x: 209
+        y: 263
+        width: 26
+        height: 24
+      alignment: 0
+      pivot: {x: .5, y: .5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: RunNShot2
+      rect:
+        serializedVersion: 2
+        x: 255
+        y: 263
+        width: 30
+        height: 22
+      alignment: 0
+      pivot: {x: .5, y: .5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: Shooting
+      rect:
+        serializedVersion: 2
+        x: 108
+        y: 263
+        width: 31
+        height: 24
+      alignment: 0
+      pivot: {x: .5, y: .5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: Jump0
+      rect:
+        serializedVersion: 2
+        x: 357
+        y: 107
+        width: 25
+        height: 30
+      alignment: 0
+      pivot: {x: .5, y: .5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: Jump1
+      rect:
+        serializedVersion: 2
+        x: 412
+        y: 123
+        width: 16
+        height: 17
+      alignment: 0
+      pivot: {x: .5, y: .5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: Jump3
+      rect:
+        serializedVersion: 2
+        x: 461
+        y: 112
+        width: 16
+        height: 22
+      alignment: 0
+      pivot: {x: .5, y: .5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/mm1cuttiles.gif.meta

@@ -1,9 +1,43 @@
 fileFormatVersion: 2
 guid: 8f99e95040eb0224da6a48b1c6cbe457
-timeCreated: 1446084884
+timeCreated: 1447285243
 licenseType: Free
 TextureImporter:
-  fileIDToRecycleName: {}
+  fileIDToRecycleName:
+    21300000: mm1cuttiles_0
+    21300002: mm1cuttiles_1
+    21300004: mm1cuttiles_2
+    21300006: mm1cuttiles_3
+    21300008: mm1cuttiles_4
+    21300010: mm1cuttiles_5
+    21300012: mm1cuttiles_6
+    21300014: mm1cuttiles_7
+    21300016: mm1cuttiles_8
+    21300018: mm1cuttiles_9
+    21300020: mm1cuttiles_10
+    21300022: mm1cuttiles_11
+    21300024: mm1cuttiles_12
+    21300026: mm1cuttiles_13
+    21300028: mm1cuttiles_14
+    21300030: mm1cuttiles_15
+    21300032: mm1cuttiles_16
+    21300034: mm1cuttiles_17
+    21300036: mm1cuttiles_18
+    21300038: mm1cuttiles_19
+    21300040: mm1cuttiles_20
+    21300042: mm1cuttiles_21
+    21300044: mm1cuttiles_22
+    21300046: mm1cuttiles_23
+    21300048: mm1cuttiles_24
+    21300050: mm1cuttiles_25
+    21300052: mm1cuttiles_26
+    21300054: mm1cuttiles_27
+    21300056: mm1cuttiles_28
+    21300058: mm1cuttiles_29
+    21300060: mm1cuttiles_30
+    21300062: mm1cuttiles_31
+    21300064: mm1cuttiles_32
+    21300066: mm1cuttiles_33
   serializedVersion: 2
   mipmaps:
     mipMapMode: 0
@@ -30,7 +64,7 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     filterMode: -1
-    aniso: -1
+    aniso: 16
     mipBias: -1
     wrapMode: 1
   nPOTScale: 0
@@ -38,7 +72,7 @@ TextureImporter:
   rGBM: 0
   compressionQuality: 50
   allowsAlphaSplitting: 0
-  spriteMode: 1
+  spriteMode: 2
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
@@ -49,7 +83,347 @@ TextureImporter:
   textureType: 8
   buildTargetSettings: []
   spriteSheet:
-    sprites: []
+    sprites:
+    - name: mm1cuttiles_0
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 52
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_1
+      rect:
+        serializedVersion: 2
+        x: 18
+        y: 52
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_2
+      rect:
+        serializedVersion: 2
+        x: 35
+        y: 52
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_3
+      rect:
+        serializedVersion: 2
+        x: 52
+        y: 52
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_4
+      rect:
+        serializedVersion: 2
+        x: 69
+        y: 52
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_5
+      rect:
+        serializedVersion: 2
+        x: 86
+        y: 52
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_6
+      rect:
+        serializedVersion: 2
+        x: 103
+        y: 52
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_7
+      rect:
+        serializedVersion: 2
+        x: 120
+        y: 52
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_8
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 35
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_9
+      rect:
+        serializedVersion: 2
+        x: 18
+        y: 35
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_10
+      rect:
+        serializedVersion: 2
+        x: 35
+        y: 35
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_11
+      rect:
+        serializedVersion: 2
+        x: 52
+        y: 35
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_12
+      rect:
+        serializedVersion: 2
+        x: 69
+        y: 35
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_13
+      rect:
+        serializedVersion: 2
+        x: 86
+        y: 35
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_14
+      rect:
+        serializedVersion: 2
+        x: 103
+        y: 35
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_15
+      rect:
+        serializedVersion: 2
+        x: 120
+        y: 35
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_16
+      rect:
+        serializedVersion: 2
+        x: 137
+        y: 35
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_17
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 18
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_18
+      rect:
+        serializedVersion: 2
+        x: 18
+        y: 18
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_19
+      rect:
+        serializedVersion: 2
+        x: 35
+        y: 18
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_20
+      rect:
+        serializedVersion: 2
+        x: 52
+        y: 18
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_21
+      rect:
+        serializedVersion: 2
+        x: 69
+        y: 18
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_22
+      rect:
+        serializedVersion: 2
+        x: 86
+        y: 18
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_23
+      rect:
+        serializedVersion: 2
+        x: 103
+        y: 18
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_24
+      rect:
+        serializedVersion: 2
+        x: 120
+        y: 18
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_25
+      rect:
+        serializedVersion: 2
+        x: 137
+        y: 1
+        width: 16
+        height: 33
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_26
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 1
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_27
+      rect:
+        serializedVersion: 2
+        x: 18
+        y: 1
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_28
+      rect:
+        serializedVersion: 2
+        x: 35
+        y: 1
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_29
+      rect:
+        serializedVersion: 2
+        x: 52
+        y: 1
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_30
+      rect:
+        serializedVersion: 2
+        x: 69
+        y: 1
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_31
+      rect:
+        serializedVersion: 2
+        x: 86
+        y: 1
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_32
+      rect:
+        serializedVersion: 2
+        x: 103
+        y: 1
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+    - name: mm1cuttiles_33
+      rect:
+        serializedVersion: 2
+        x: 120
+        y: 1
+        width: 16
+        height: 16
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
   spritePackingTag: 
   userData: 
   assetBundleName: