there is a new test-map and working on level1

2016-01-30 22:41:39 -05:00 · 2016-01-30 22:41:39 -05:00 · 772f047e0e
commit 772f047e0e
parent 2988856d38
22 changed files with 54 additions and 14 deletions
--- a/Assets/GUI/mGUI.cs.meta
+++ b/Assets/GUI/mGUI.cs.meta
@ -1,11 +1,10 @@
 fileFormatVersion: 2
 guid: 648f4d518e7553e43bfc19b27ce55c9b
-timeCreated: 1454186720
+timeCreated: 1454210291
 licenseType: Free
 MonoImporter:
  serializedVersion: 2
-  defaultReferences:
-  - mySkin: {fileID: 11400000, guid: 35ff26cd2821a324b9bfa066cd48b571, type: 2}
+  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
--- a/Assets/Resources/Scenes/Level1.unity
+++ b/Assets/Resources/Scenes/Level1.unity
--- a/Assets/Resources/Scenes/animtest.unity
+++ b/Assets/Resources/Scenes/animtest.unity
--- a/Assets/Resources/Scenes/animtest.unity.meta
+++ b/Assets/Resources/Scenes/animtest.unity.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 502574e954331324a92753e60137be88
+timeCreated: 1454208873
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/Blocks/Block1-Mid1.png.meta
+++ b/Assets/Sprites/Blocks/Block1-Mid1.png.meta
@ -30,7 +30,7 @@ TextureImporter:
  maxTextureSize: 2048
  textureSettings:
    filterMode: -1
-    aniso: -1
+    aniso: 16
    mipBias: -1
    wrapMode: 1
  nPOTScale: 0
--- a/Assets/Sprites/Blocks/Block1-Mid2.png.meta
+++ b/Assets/Sprites/Blocks/Block1-Mid2.png.meta
@ -30,7 +30,7 @@ TextureImporter:
  maxTextureSize: 2048
  textureSettings:
    filterMode: -1
-    aniso: -1
+    aniso: 16
    mipBias: -1
    wrapMode: 1
  nPOTScale: 0
--- a/Assets/Sprites/Blocks/Block1.png.meta
+++ b/Assets/Sprites/Blocks/Block1.png.meta
@ -30,7 +30,7 @@ TextureImporter:
  maxTextureSize: 2048
  textureSettings:
    filterMode: -1
-    aniso: -1
+    aniso: 16
    mipBias: -1
    wrapMode: 1
  nPOTScale: 0
--- a/Assets/Sprites/Blocks/Block2-Mid1.png.meta
+++ b/Assets/Sprites/Blocks/Block2-Mid1.png.meta
@ -30,7 +30,7 @@ TextureImporter:
  maxTextureSize: 2048
  textureSettings:
    filterMode: -1
-    aniso: -1
+    aniso: 16
    mipBias: -1
    wrapMode: 1
  nPOTScale: 0
--- a/Assets/Sprites/Blocks/Block2-Mid2.png.meta
+++ b/Assets/Sprites/Blocks/Block2-Mid2.png.meta
@ -30,7 +30,7 @@ TextureImporter:
  maxTextureSize: 2048
  textureSettings:
    filterMode: -1
-    aniso: -1
+    aniso: 16
    mipBias: -1
    wrapMode: 1
  nPOTScale: 0
--- a/Assets/Sprites/Blocks/Block2.png.meta
+++ b/Assets/Sprites/Blocks/Block2.png.meta
@ -30,7 +30,7 @@ TextureImporter:
  maxTextureSize: 2048
  textureSettings:
    filterMode: -1
-    aniso: -1
+    aniso: 16
    mipBias: -1
    wrapMode: 1
  nPOTScale: 0
--- a/Assets/Sprites/Blocks/CornerBlock1-v1.png.meta
+++ b/Assets/Sprites/Blocks/CornerBlock1-v1.png.meta
@ -30,7 +30,7 @@ TextureImporter:
  maxTextureSize: 2048
  textureSettings:
    filterMode: -1
-    aniso: -1
+    aniso: 16
    mipBias: -1
    wrapMode: 1
  nPOTScale: 0
--- a/Assets/Sprites/Blocks/CornerBlock1.png.meta
+++ b/Assets/Sprites/Blocks/CornerBlock1.png.meta
@ -30,7 +30,7 @@ TextureImporter:
  maxTextureSize: 2048
  textureSettings:
    filterMode: -1
-    aniso: -1
+    aniso: 16
    mipBias: -1
    wrapMode: 1
  nPOTScale: 0
--- a/Assets/Sprites/Blocks/CornerBlock2-v2.png.meta
+++ b/Assets/Sprites/Blocks/CornerBlock2-v2.png.meta
@ -30,7 +30,7 @@ TextureImporter:
  maxTextureSize: 2048
  textureSettings:
    filterMode: -1
-    aniso: -1
+    aniso: 16
    mipBias: -1
    wrapMode: 1
  nPOTScale: 0
--- a/Assets/Sprites/Blocks/CornerBlock2.png.meta
+++ b/Assets/Sprites/Blocks/CornerBlock2.png.meta
@ -30,7 +30,7 @@ TextureImporter:
  maxTextureSize: 2048
  textureSettings:
    filterMode: -1
-    aniso: -1
+    aniso: 16
    mipBias: -1
    wrapMode: 1
  nPOTScale: 0
--- a/Assets/Sprites/Blocks/background.png.meta
+++ b/Assets/Sprites/Blocks/background.png.meta
@ -30,7 +30,7 @@ TextureImporter:
  maxTextureSize: 2048
  textureSettings:
    filterMode: -1
-    aniso: -1
+    aniso: 16
    mipBias: -1
    wrapMode: 1
  nPOTScale: 0
--- a/Assets/Sprites/PaperClip.meta
+++ b/Assets/Sprites/PaperClip.meta
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 33ca814167e485245a5e9585bc238160
+folderAsset: yes
+timeCreated: 1454208238
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/PaperClip/PapeStationary_1.controller
+++ b/Assets/Sprites/PaperClip/PapeStationary_1.controller
--- a/Assets/Sprites/PaperClip/PapeStationary_1.controller.meta
+++ b/Assets/Sprites/PaperClip/PapeStationary_1.controller.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6157bab7270dcc2488bc8bb482d02d27
+timeCreated: 1454208516
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/PaperClip/PapeStationary_2.controller
+++ b/Assets/Sprites/PaperClip/PapeStationary_2.controller
--- a/Assets/Sprites/PaperClip/PapeStationary_2.controller.meta
+++ b/Assets/Sprites/PaperClip/PapeStationary_2.controller.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3002e62c8375dae43995f7b2b0b701ff
+timeCreated: 1454208843
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/PaperClip/walking.anim
+++ b/Assets/Sprites/PaperClip/walking.anim
--- a/Assets/Sprites/PaperClip/walking.anim.meta
+++ b/Assets/Sprites/PaperClip/walking.anim.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 44882a79f22024e4498b649d6b76c44c
+timeCreated: 1454208516
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: