diff --git a/pixel/Assembly-CSharp-vs.csproj b/pixel/Assembly-CSharp-vs.csproj index 34bd80a..7c77423 100644 --- a/pixel/Assembly-CSharp-vs.csproj +++ b/pixel/Assembly-CSharp-vs.csproj @@ -49,6 +49,7 @@ + diff --git a/pixel/Assembly-CSharp.csproj b/pixel/Assembly-CSharp.csproj index 34bd80a..7c77423 100644 --- a/pixel/Assembly-CSharp.csproj +++ b/pixel/Assembly-CSharp.csproj @@ -49,6 +49,7 @@ + diff --git a/pixel/Assets/2DPlatformTutorial.unity b/pixel/Assets/2DPlatformTutorial.unity index a672d25..591146e 100644 Binary files a/pixel/Assets/2DPlatformTutorial.unity and b/pixel/Assets/2DPlatformTutorial.unity differ diff --git a/pixel/Assets/Enemy/Characters/enemy1.prefab b/pixel/Assets/Enemy/Characters/enemy1.prefab index 28a6724..f31e36c 100644 Binary files a/pixel/Assets/Enemy/Characters/enemy1.prefab and b/pixel/Assets/Enemy/Characters/enemy1.prefab differ diff --git a/pixel/Assets/Enemy/Characters/enemy2.prefab b/pixel/Assets/Enemy/Characters/enemy2.prefab index f9d9a99..4a0d6e6 100644 Binary files a/pixel/Assets/Enemy/Characters/enemy2.prefab and b/pixel/Assets/Enemy/Characters/enemy2.prefab differ diff --git a/pixel/Assets/Enemy/Characters/hero.prefab b/pixel/Assets/Enemy/Characters/hero.prefab index 2e398f2..dd5976e 100644 Binary files a/pixel/Assets/Enemy/Characters/hero.prefab and b/pixel/Assets/Enemy/Characters/hero.prefab differ diff --git a/pixel/Assets/Fruit.cs b/pixel/Assets/Fruit.cs new file mode 100644 index 0000000..dcc8478 --- /dev/null +++ b/pixel/Assets/Fruit.cs @@ -0,0 +1,19 @@ +using UnityEngine; +using System.Collections; + +public class Fruit : MonoBehaviour { + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + + } + + void OnCollisionEnter2D(Collision2D collisionInfo){ + + } +} diff --git a/pixel/Assets/Fruit.cs.meta b/pixel/Assets/Fruit.cs.meta new file mode 100644 index 0000000..efb81bd --- /dev/null +++ b/pixel/Assets/Fruit.cs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1c2bea2299cad4f6882643554e0b46ff +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: diff --git a/pixel/Assets/Game Items.meta b/pixel/Assets/Game Items.meta new file mode 100644 index 0000000..96da950 --- /dev/null +++ b/pixel/Assets/Game Items.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 502aaadea026143378bbf1866d315a7e +folderAsset: yes +DefaultImporter: + userData: diff --git a/pixel/Assets/Game Items/_Props.meta b/pixel/Assets/Game Items/_Props.meta new file mode 100644 index 0000000..bc8d734 --- /dev/null +++ b/pixel/Assets/Game Items/_Props.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: ea8435d6d0fe44b1ba2b946f7f875bff +folderAsset: yes +DefaultImporter: + userData: diff --git a/pixel/Assets/Game Items/_Props/Bus.png b/pixel/Assets/Game Items/_Props/Bus.png new file mode 100644 index 0000000..291522d Binary files /dev/null and b/pixel/Assets/Game Items/_Props/Bus.png differ diff --git a/pixel/Assets/Game Items/_Props/Bus.png.meta b/pixel/Assets/Game Items/_Props/Bus.png.meta new file mode 100644 index 0000000..c5d1f2d --- /dev/null +++ b/pixel/Assets/Game Items/_Props/Bus.png.meta @@ -0,0 +1,69 @@ +fileFormatVersion: 2 +guid: f66e58b49cbb63741a688917eebb1b1d +TextureImporter: + fileIDToRecycleName: + 21300000: Bus + 21300002: Wheels + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + 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: Bus + rect: + serializedVersion: 2 + x: 2 + y: 136 + width: 507 + height: 346 + alignment: 0 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} + - name: Wheels + rect: + serializedVersion: 2 + x: 70 + y: 7 + width: 359 + height: 62 + alignment: 0 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} + spritePackingTag: + userData: diff --git a/pixel/Assets/Game Items/_Props/Cab.png b/pixel/Assets/Game Items/_Props/Cab.png new file mode 100644 index 0000000..630b577 Binary files /dev/null and b/pixel/Assets/Game Items/_Props/Cab.png differ diff --git a/pixel/Assets/Game Items/_Props/Cab.png.meta b/pixel/Assets/Game Items/_Props/Cab.png.meta new file mode 100644 index 0000000..0f4e3d4 --- /dev/null +++ b/pixel/Assets/Game Items/_Props/Cab.png.meta @@ -0,0 +1,69 @@ +fileFormatVersion: 2 +guid: ca1fe571da9f00d48b0b756eccdfa686 +TextureImporter: + fileIDToRecycleName: + 21300000: Cab + 21300002: Wheels + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + 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: Cab + rect: + serializedVersion: 2 + x: 86 + y: 145 + width: 349 + height: 170 + alignment: 0 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} + - name: Wheels + rect: + serializedVersion: 2 + x: 130 + y: 35 + width: 261 + height: 65 + alignment: 0 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} + spritePackingTag: + userData: diff --git a/pixel/Assets/Game Items/_Props/part_flame.png b/pixel/Assets/Game Items/_Props/part_flame.png new file mode 100644 index 0000000..1093fc6 Binary files /dev/null and b/pixel/Assets/Game Items/_Props/part_flame.png differ diff --git a/pixel/Assets/Game Items/_Props/part_flame.png.meta b/pixel/Assets/Game Items/_Props/part_flame.png.meta new file mode 100644 index 0000000..0f536be --- /dev/null +++ b/pixel/Assets/Game Items/_Props/part_flame.png.meta @@ -0,0 +1,69 @@ +fileFormatVersion: 2 +guid: 505e7d9cb9fd14a45bdd00f6282fa528 +TextureImporter: + fileIDToRecycleName: + 21300000: flame1 + 21300002: flame2 + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 25 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: + - name: flame1 + rect: + serializedVersion: 2 + x: 0 + y: 103 + width: 232 + height: 105 + alignment: 0 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} + - name: flame2 + rect: + serializedVersion: 2 + x: 0 + y: 2 + width: 230 + height: 101 + alignment: 0 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} + spritePackingTag: + userData: diff --git a/pixel/Assets/Game Items/_Props/part_rocket.png b/pixel/Assets/Game Items/_Props/part_rocket.png new file mode 100644 index 0000000..97f4f2e Binary files /dev/null and b/pixel/Assets/Game Items/_Props/part_rocket.png differ diff --git a/pixel/Assets/Game Items/_Props/part_rocket.png.meta b/pixel/Assets/Game Items/_Props/part_rocket.png.meta new file mode 100644 index 0000000..ad9dbdc --- /dev/null +++ b/pixel/Assets/Game Items/_Props/part_rocket.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: bbbe340798352459386a0059f0d14360 +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + 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: + - name: part_rocket + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 647 + height: 310 + alignment: 0 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} + spritePackingTag: + userData: diff --git a/pixel/Assets/Game Items/_Props/prop_bomb.png b/pixel/Assets/Game Items/_Props/prop_bomb.png new file mode 100644 index 0000000..de6e4df Binary files /dev/null and b/pixel/Assets/Game Items/_Props/prop_bomb.png differ diff --git a/pixel/Assets/Game Items/_Props/prop_bomb.png.meta b/pixel/Assets/Game Items/_Props/prop_bomb.png.meta new file mode 100644 index 0000000..8e72fb7 --- /dev/null +++ b/pixel/Assets/Game Items/_Props/prop_bomb.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: c2fc7b356ebe242deaefac9ceb95a7e1 +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 512 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 200 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: + - name: prop_bomb + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 512 + height: 512 + alignment: 0 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} + spritePackingTag: + userData: diff --git a/pixel/Assets/Game Items/_Props/prop_crate_ammo.png b/pixel/Assets/Game Items/_Props/prop_crate_ammo.png new file mode 100644 index 0000000..71cd1f4 Binary files /dev/null and b/pixel/Assets/Game Items/_Props/prop_crate_ammo.png differ diff --git a/pixel/Assets/Game Items/_Props/prop_crate_ammo.png.meta b/pixel/Assets/Game Items/_Props/prop_crate_ammo.png.meta new file mode 100644 index 0000000..de3c8cc --- /dev/null +++ b/pixel/Assets/Game Items/_Props/prop_crate_ammo.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: f28cca3aa9289483b8160967b37ef4c5 +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 125 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: + - name: prop_crate_ammo + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 440 + height: 360 + alignment: 0 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} + spritePackingTag: + userData: diff --git a/pixel/Assets/Game Items/_Props/prop_crate_health.png b/pixel/Assets/Game Items/_Props/prop_crate_health.png new file mode 100644 index 0000000..c7860df Binary files /dev/null and b/pixel/Assets/Game Items/_Props/prop_crate_health.png differ diff --git a/pixel/Assets/Game Items/_Props/prop_crate_health.png.meta b/pixel/Assets/Game Items/_Props/prop_crate_health.png.meta new file mode 100644 index 0000000..3aba742 --- /dev/null +++ b/pixel/Assets/Game Items/_Props/prop_crate_health.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: b126006da8178403dad4a53e28cb67f1 +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + 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: + - name: prop_crate_health + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 544 + height: 360 + alignment: 0 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} + spritePackingTag: + userData: diff --git a/pixel/Assets/Game Items/_Props/prop_parachute.png b/pixel/Assets/Game Items/_Props/prop_parachute.png new file mode 100644 index 0000000..3a5c3a5 Binary files /dev/null and b/pixel/Assets/Game Items/_Props/prop_parachute.png differ diff --git a/pixel/Assets/Game Items/_Props/prop_parachute.png.meta b/pixel/Assets/Game Items/_Props/prop_parachute.png.meta new file mode 100644 index 0000000..6b852d1 --- /dev/null +++ b/pixel/Assets/Game Items/_Props/prop_parachute.png.meta @@ -0,0 +1,57 @@ +fileFormatVersion: 2 +guid: f27a84c9104434a008b15db8e2a8535b +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 7 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: + - name: prop_parachute + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 437 + height: 415 + alignment: 7 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} + spritePackingTag: + userData: diff --git a/pixel/Assets/Game Items/_Props/swan_Sheet.png b/pixel/Assets/Game Items/_Props/swan_Sheet.png new file mode 100644 index 0000000..3f0e528 Binary files /dev/null and b/pixel/Assets/Game Items/_Props/swan_Sheet.png differ diff --git a/pixel/Assets/Game Items/_Props/swan_Sheet.png.meta b/pixel/Assets/Game Items/_Props/swan_Sheet.png.meta new file mode 100644 index 0000000..bcc4235 --- /dev/null +++ b/pixel/Assets/Game Items/_Props/swan_Sheet.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: e50f4af9499e24ac9b08e30acc337ee9 +TextureImporter: + fileIDToRecycleName: + 21300000: Swan_Sheet 1_0 + 21300002: Swan_Sheet 1_1 + 21300004: Swan_Sheet 1_2 + 21300006: Swan_Sheet 1_3 + 21300008: Swan_Sheet 1_4 + 21300010: Swan_Sheet 1_5 + 21300012: Swan_Sheet 1_6 + 21300014: Swan_Sheet 1_7 + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + 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 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + 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: Swan_Sheet 1_0 + rect: + serializedVersion: 2 + x: 285 + y: 219 + width: 231 + height: 101 + alignment: 9 + pivot: {x: .641912043, y: .58738482} + border: {x: 0, y: 0, z: 0, w: 0} + - name: Swan_Sheet 1_1 + rect: + serializedVersion: 2 + x: 38 + y: 252 + width: 230 + height: 76 + alignment: 9 + pivot: {x: .648011208, y: .383870572} + border: {x: 0, y: 0, z: 0, w: 0} + - name: Swan_Sheet 1_2 + rect: + serializedVersion: 2 + x: 36 + y: 427 + width: 241 + height: 125 + alignment: 9 + pivot: {x: .662182271, y: .227659419} + border: {x: 0, y: 0, z: 0, w: 0} + - name: Swan_Sheet 1_3 + rect: + serializedVersion: 2 + x: 284 + y: 427 + width: 236 + height: 166 + alignment: 9 + pivot: {x: .649590552, y: .158207163} + border: {x: 0, y: 0, z: 0, w: 0} + - name: Swan_Sheet 1_4 + rect: + serializedVersion: 2 + x: 540 + y: 427 + width: 236 + height: 121 + alignment: 9 + pivot: {x: .649590433, y: .229076296} + border: {x: 0, y: 0, z: 0, w: 0} + - name: Swan_Sheet 1_5 + rect: + serializedVersion: 2 + x: 43 + y: 607 + width: 230 + height: 153 + alignment: 9 + pivot: {x: .648011029, y: .763703763} + border: {x: 0, y: 0, z: 0, w: 0} + - name: Swan_Sheet 1_6 + rect: + serializedVersion: 2 + x: 285 + y: 663 + width: 235 + height: 97 + alignment: 9 + pivot: {x: .660957754, y: .629982233} + border: {x: 0, y: 0, z: 0, w: 0} + - name: Swan_Sheet 1_7 + rect: + serializedVersion: 2 + x: 540 + y: 692 + width: 240 + height: 80 + alignment: 9 + pivot: {x: .636589825, y: .373915851} + border: {x: 0, y: 0, z: 0, w: 0} + spritePackingTag: + userData: diff --git a/pixel/Assets/My Assets/Animations/Player.controller b/pixel/Assets/My Assets/Animations/Player.controller index a754470..21b6a63 100644 Binary files a/pixel/Assets/My Assets/Animations/Player.controller and b/pixel/Assets/My Assets/Animations/Player.controller differ diff --git a/pixel/Assets/My Assets/Animations/S_N_WalkAnim.anim b/pixel/Assets/My Assets/Animations/S_N_WalkAnim.anim index 7d9c324..4dafce1 100644 Binary files a/pixel/Assets/My Assets/Animations/S_N_WalkAnim.anim and b/pixel/Assets/My Assets/Animations/S_N_WalkAnim.anim differ diff --git a/pixel/Assets/My Assets/Background/fruit.png b/pixel/Assets/My Assets/Background/fruit.png new file mode 100644 index 0000000..3ee8c43 Binary files /dev/null and b/pixel/Assets/My Assets/Background/fruit.png differ diff --git a/pixel/Assets/My Assets/Background/fruit.png.meta b/pixel/Assets/My Assets/Background/fruit.png.meta new file mode 100644 index 0000000..04a139a --- /dev/null +++ b/pixel/Assets/My Assets/Background/fruit.png.meta @@ -0,0 +1,80 @@ +fileFormatVersion: 2 +guid: 9c8b1c4d4c7634d1fa3531aa79d34eab +TextureImporter: + fileIDToRecycleName: + 21300000: fruit_0 + 21300002: fruit_1 + 21300004: fruit_2 + 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 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + 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: fruit_0 + rect: + serializedVersion: 2 + x: 73 + y: 157 + width: 113 + height: 141 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + - name: fruit_1 + rect: + serializedVersion: 2 + x: 226 + y: 151 + width: 108 + height: 169 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + - name: fruit_2 + rect: + serializedVersion: 2 + x: 363 + y: 160 + width: 170 + height: 110 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + spritePackingTag: + userData: diff --git a/pixel/Assets/My Assets/Characters/S_GUN_Jump.anim b/pixel/Assets/My Assets/Characters/S_GUN_Jump.anim new file mode 100644 index 0000000..94b78de Binary files /dev/null and b/pixel/Assets/My Assets/Characters/S_GUN_Jump.anim differ diff --git a/pixel/Assets/My Assets/Characters/S_GUN_Jump.anim.meta b/pixel/Assets/My Assets/Characters/S_GUN_Jump.anim.meta new file mode 100644 index 0000000..f6a50e9 --- /dev/null +++ b/pixel/Assets/My Assets/Characters/S_GUN_Jump.anim.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 00c29dc47d206422cb0a388b686b5737 +NativeFormatImporter: + userData: diff --git a/pixel/Assets/My Assets/Characters/S_GUN_Walk.anim b/pixel/Assets/My Assets/Characters/S_GUN_Walk.anim new file mode 100644 index 0000000..ee84d9d Binary files /dev/null and b/pixel/Assets/My Assets/Characters/S_GUN_Walk.anim differ diff --git a/pixel/Assets/My Assets/Characters/S_GUN_Walk.anim.meta b/pixel/Assets/My Assets/Characters/S_GUN_Walk.anim.meta new file mode 100644 index 0000000..a68d7a9 --- /dev/null +++ b/pixel/Assets/My Assets/Characters/S_GUN_Walk.anim.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 238b542fc09d945c8bc36f8a6ea24cfa +NativeFormatImporter: + userData: diff --git a/pixel/Assets/My Assets/Characters/S_Gun.psd b/pixel/Assets/My Assets/Characters/S_Gun.psd new file mode 100644 index 0000000..d9d69f5 Binary files /dev/null and b/pixel/Assets/My Assets/Characters/S_Gun.psd differ diff --git a/pixel/Assets/My Assets/Characters/S_Gun.psd.meta b/pixel/Assets/My Assets/Characters/S_Gun.psd.meta new file mode 100644 index 0000000..c177195 --- /dev/null +++ b/pixel/Assets/My Assets/Characters/S_Gun.psd.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 486c4e534e70845cfa3871ca53697803 +TextureImporter: + fileIDToRecycleName: + 21300000: S_Gun_0 + 21300002: S_Gun_jump_1 + 21300004: S_Gun_Idle_2 + 21300006: S_Gun_3 + 21300008: S_Gun_4 + 21300010: S_Gun_5 + 21300012: S_Gun_6 + 21300014: S_Gun_7 + 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 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: 0 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 25 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: + - name: S_Gun_0 + rect: + serializedVersion: 2 + x: 51 + y: 198 + width: 43 + height: 41 + alignment: 0 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} + - name: S_Gun_jump_1 + rect: + serializedVersion: 2 + x: 118 + y: 199 + width: 42 + height: 40 + alignment: 0 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} + - name: S_Gun_Idle_2 + rect: + serializedVersion: 2 + x: 180 + y: 199 + width: 42 + height: 40 + alignment: 0 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} + - name: S_Gun_3 + rect: + serializedVersion: 2 + x: 232 + y: 201 + width: 44 + height: 38 + alignment: 0 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} + - name: S_Gun_4 + rect: + serializedVersion: 2 + x: 46 + y: 125 + width: 47 + height: 41 + alignment: 0 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} + - name: S_Gun_5 + rect: + serializedVersion: 2 + x: 110 + y: 126 + width: 46 + height: 41 + alignment: 0 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} + - name: S_Gun_6 + rect: + serializedVersion: 2 + x: 180 + y: 126 + width: 43 + height: 40 + alignment: 0 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} + - name: S_Gun_7 + rect: + serializedVersion: 2 + x: 238 + y: 128 + width: 42 + height: 38 + alignment: 0 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} + spritePackingTag: + userData: diff --git a/pixel/Assets/My Assets/Items.meta b/pixel/Assets/My Assets/Items.meta new file mode 100644 index 0000000..7ecdd64 --- /dev/null +++ b/pixel/Assets/My Assets/Items.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 89a45ee812dfd4679a93b9698f3eef80 +folderAsset: yes +DefaultImporter: + userData: diff --git a/pixel/Assets/My Assets/Items/fruit.png b/pixel/Assets/My Assets/Items/fruit.png new file mode 100644 index 0000000..fc8ebc9 Binary files /dev/null and b/pixel/Assets/My Assets/Items/fruit.png differ diff --git a/pixel/Assets/My Assets/Items/fruit.png.meta b/pixel/Assets/My Assets/Items/fruit.png.meta new file mode 100644 index 0000000..cd4cd9d --- /dev/null +++ b/pixel/Assets/My Assets/Items/fruit.png.meta @@ -0,0 +1,80 @@ +fileFormatVersion: 2 +guid: 3c439a7d3c7d940f9b79122de3c7695a +TextureImporter: + fileIDToRecycleName: + 21300000: fruit_0 + 21300002: fruit_1 + 21300004: fruit_2 + 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 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: 16 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + 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: fruit_0 + rect: + serializedVersion: 2 + x: 24 + y: 52 + width: 39 + height: 47 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + - name: fruit_1 + rect: + serializedVersion: 2 + x: 75 + y: 50 + width: 37 + height: 57 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + - name: fruit_2 + rect: + serializedVersion: 2 + x: 121 + y: 53 + width: 57 + height: 37 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + spritePackingTag: + userData: diff --git a/pixel/Assets/SampleAssets/2D/Sprites/Scripts/PlatformerCharacter2D.cs b/pixel/Assets/SampleAssets/2D/Sprites/Scripts/PlatformerCharacter2D.cs index 4fe504c..e51c93a 100644 --- a/pixel/Assets/SampleAssets/2D/Sprites/Scripts/PlatformerCharacter2D.cs +++ b/pixel/Assets/SampleAssets/2D/Sprites/Scripts/PlatformerCharacter2D.cs @@ -25,8 +25,8 @@ public class PlatformerCharacter2D : MonoBehaviour private float GameOverY = -10; public Transform playerGraphics; private Vector3 groundPosition; - public Sprite []spriteArray = new Sprite[2]; - private bool modeChanged = false; + + public Sprite []spriteArray = new Sprite[3]; int mode = TypeMode.NORMALSPONGE; //this mode is to indicate the character type private void Start(){ @@ -61,25 +61,40 @@ private void Awake() } private void update() { - playerGraphics = transform.FindChild ("Graphics"); - SpriteRenderer q =(SpriteRenderer) playerGraphics.GetComponent("SpriteRenderer"); - if (Input.GetKeyDown (KeyCode.Q)) { - mode = 1-mode; - modeChanged = true; - } - if (mode==TypeMode.NORMALSPONGE && modeChanged) { - q.sprite = spriteArray [TypeMode.NORMALSPONGE]; - } else if(mode==TypeMode.MUSCLESPONGE&&modeChanged){ - q.sprite =spriteArray[TypeMode.MUSCLESPONGE]; - } - modeChanged = false; +// playerGraphics = transform.FindChild ("Graphics"); +// SpriteRenderer q =(SpriteRenderer) playerGraphics.GetComponent("SpriteRenderer"); +// if (Input.GetKeyDown (KeyCode.Q)) { +// mode = 1-mode; +// modeChanged = true; +// } +// if (mode==TypeMode.NORMALSPONGE && modeChanged) { +// q.sprite = spriteArray [TypeMode.NORMALSPONGE]; +// } else if(mode==TypeMode.MUSCLESPONGE&&modeChanged){ +// q.sprite =spriteArray[TypeMode.MUSCLESPONGE]; +// } +// modeChanged = false; + } + void OnCollisionEnter2D(Collision2D collisionInfo){ + string collisionObject = collisionInfo.gameObject.ToString ().ToLower(); + if (collisionObject.IndexOf("fruit")>=0) { //this is fruit that can change player + playerGraphics = transform.FindChild ("Graphics"); + SpriteRenderer q =(SpriteRenderer) playerGraphics.GetComponent("SpriteRenderer"); + if(collisionObject.IndexOf("big")>=0){ + q.sprite =spriteArray[TypeMode.MUSCLESPONGE]; + mode = TypeMode.MUSCLESPONGE; + }else if(collisionObject.IndexOf("small")>=0){ + q.sprite = spriteArray[TypeMode.NORMALSPONGE]; + mode = TypeMode.NORMALSPONGE; + } + collisionInfo.gameObject.SetActive(false); //make the fruit disable + } } - private void FixedUpdate() { update (); // The player is grounded if a circlecast to the groundcheck position hits anything designated as ground grounded = Physics2D.OverlapCircle(groundCheck.position, groundedRadius, whatIsGround); + anim.SetBool("Ground", grounded); if (grounded) { groundPosition = transform.localPosition; @@ -150,5 +165,15 @@ private void Flip() theScale.x *= -1; playerGraphics.localScale = theScale; } + void OnCollisionEnter(Collision collision) + { + //进入碰撞器执行的代码 + Debug.Log ("WTF"); + } + void OnTriggerEnter(Collider collider) + { + //进入触发器执行的代码 + Debug.Log ("qwe"); + } } } \ No newline at end of file diff --git a/pixel/Assets/SampleAssets/2D/Sprites/Scripts/S_GUN_Idle.anim b/pixel/Assets/SampleAssets/2D/Sprites/Scripts/S_GUN_Idle.anim new file mode 100644 index 0000000..1308468 Binary files /dev/null and b/pixel/Assets/SampleAssets/2D/Sprites/Scripts/S_GUN_Idle.anim differ diff --git a/pixel/Assets/SampleAssets/2D/Sprites/Scripts/S_GUN_Idle.anim.meta b/pixel/Assets/SampleAssets/2D/Sprites/Scripts/S_GUN_Idle.anim.meta new file mode 100644 index 0000000..943931d --- /dev/null +++ b/pixel/Assets/SampleAssets/2D/Sprites/Scripts/S_GUN_Idle.anim.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: b0e777fc248014e5a8b0e335d93471f7 +NativeFormatImporter: + userData: diff --git a/pixel/Assets/SampleAssets/2D/Sprites/Scripts/TypeMode.cs b/pixel/Assets/SampleAssets/2D/Sprites/Scripts/TypeMode.cs index e384137..5ade3a5 100644 --- a/pixel/Assets/SampleAssets/2D/Sprites/Scripts/TypeMode.cs +++ b/pixel/Assets/SampleAssets/2D/Sprites/Scripts/TypeMode.cs @@ -5,4 +5,5 @@ public class TypeMode { public static int NORMALSPONGE = 0; public static int MUSCLESPONGE = 1; + public static int GUNSPONGE = 2; } diff --git a/pixel/Library/AssetServerCacheV3 b/pixel/Library/AssetServerCacheV3 index 0834b55..84b4b24 100644 Binary files a/pixel/Library/AssetServerCacheV3 and b/pixel/Library/AssetServerCacheV3 differ diff --git a/pixel/Library/CurrentLayout.dwlt b/pixel/Library/CurrentLayout.dwlt index 0dcbde9..625b713 100644 Binary files a/pixel/Library/CurrentLayout.dwlt and b/pixel/Library/CurrentLayout.dwlt differ diff --git a/pixel/Library/InspectorExpandedItems.asset b/pixel/Library/InspectorExpandedItems.asset index 8709a4a..5ad7ccb 100644 Binary files a/pixel/Library/InspectorExpandedItems.asset and b/pixel/Library/InspectorExpandedItems.asset differ diff --git a/pixel/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/pixel/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll index da3a9f1..7c57e66 100755 Binary files a/pixel/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll and b/pixel/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll differ diff --git a/pixel/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb b/pixel/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb index 6fc8ca1..7a639f2 100644 Binary files a/pixel/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb and b/pixel/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb differ diff --git a/pixel/Library/ScriptAssemblies/Assembly-CSharp.dll b/pixel/Library/ScriptAssemblies/Assembly-CSharp.dll index ebad71c..434848d 100755 Binary files a/pixel/Library/ScriptAssemblies/Assembly-CSharp.dll and b/pixel/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/pixel/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/pixel/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb index 4189d7a..7450ed2 100644 Binary files a/pixel/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb and b/pixel/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb differ diff --git a/pixel/Library/assetDatabase3 b/pixel/Library/assetDatabase3 index f1c3ad9..8501a51 100644 Binary files a/pixel/Library/assetDatabase3 and b/pixel/Library/assetDatabase3 differ diff --git a/pixel/Library/expandedItems b/pixel/Library/expandedItems index c621010..d891eb8 100644 Binary files a/pixel/Library/expandedItems and b/pixel/Library/expandedItems differ diff --git a/pixel/Library/guidmapper b/pixel/Library/guidmapper index c9ce19e..e8e52a0 100644 Binary files a/pixel/Library/guidmapper and b/pixel/Library/guidmapper differ diff --git a/pixel/Library/metadata/00/00c29dc47d206422cb0a388b686b5737 b/pixel/Library/metadata/00/00c29dc47d206422cb0a388b686b5737 new file mode 100644 index 0000000..b01d53a Binary files /dev/null and b/pixel/Library/metadata/00/00c29dc47d206422cb0a388b686b5737 differ diff --git a/pixel/Library/metadata/16/1658d66be430e4c759ac71fae79b9928 b/pixel/Library/metadata/16/1658d66be430e4c759ac71fae79b9928 index c0397fc..eeaf5cb 100644 Binary files a/pixel/Library/metadata/16/1658d66be430e4c759ac71fae79b9928 and b/pixel/Library/metadata/16/1658d66be430e4c759ac71fae79b9928 differ diff --git a/pixel/Library/metadata/1b/1bb69f9242dc33a4ca069410c003d781 b/pixel/Library/metadata/1b/1bb69f9242dc33a4ca069410c003d781 index ad4be5d..c7080ee 100644 Binary files a/pixel/Library/metadata/1b/1bb69f9242dc33a4ca069410c003d781 and b/pixel/Library/metadata/1b/1bb69f9242dc33a4ca069410c003d781 differ diff --git a/pixel/Library/metadata/1c/1c019b6f242e4144fb49a5ab2e5247cf b/pixel/Library/metadata/1c/1c019b6f242e4144fb49a5ab2e5247cf index 5d9fcb6..2c61e80 100644 Binary files a/pixel/Library/metadata/1c/1c019b6f242e4144fb49a5ab2e5247cf and b/pixel/Library/metadata/1c/1c019b6f242e4144fb49a5ab2e5247cf differ diff --git a/pixel/Library/metadata/1c/1c2bea2299cad4f6882643554e0b46ff b/pixel/Library/metadata/1c/1c2bea2299cad4f6882643554e0b46ff new file mode 100644 index 0000000..b531f34 Binary files /dev/null and b/pixel/Library/metadata/1c/1c2bea2299cad4f6882643554e0b46ff differ diff --git a/pixel/Library/metadata/20/200a503b305fe4c97895b92f55b83622 b/pixel/Library/metadata/20/200a503b305fe4c97895b92f55b83622 index d2d604d..4959f98 100644 Binary files a/pixel/Library/metadata/20/200a503b305fe4c97895b92f55b83622 and b/pixel/Library/metadata/20/200a503b305fe4c97895b92f55b83622 differ diff --git a/pixel/Library/metadata/23/238b542fc09d945c8bc36f8a6ea24cfa b/pixel/Library/metadata/23/238b542fc09d945c8bc36f8a6ea24cfa new file mode 100644 index 0000000..603fd20 Binary files /dev/null and b/pixel/Library/metadata/23/238b542fc09d945c8bc36f8a6ea24cfa differ diff --git a/pixel/Library/metadata/23/23e4d316a2e8bcd42991125dfa16a87b b/pixel/Library/metadata/23/23e4d316a2e8bcd42991125dfa16a87b index 4676424..30493b4 100644 Binary files a/pixel/Library/metadata/23/23e4d316a2e8bcd42991125dfa16a87b and b/pixel/Library/metadata/23/23e4d316a2e8bcd42991125dfa16a87b differ diff --git a/pixel/Library/metadata/37/379319e522dc8413fbf21bb2cfbba2f4 b/pixel/Library/metadata/37/379319e522dc8413fbf21bb2cfbba2f4 index 8763e1a..fa10c77 100644 Binary files a/pixel/Library/metadata/37/379319e522dc8413fbf21bb2cfbba2f4 and b/pixel/Library/metadata/37/379319e522dc8413fbf21bb2cfbba2f4 differ diff --git a/pixel/Library/metadata/38/3838f200a8e1e4df787003348900b402 b/pixel/Library/metadata/38/3838f200a8e1e4df787003348900b402 index 482ea6e..4c4ede6 100644 Binary files a/pixel/Library/metadata/38/3838f200a8e1e4df787003348900b402 and b/pixel/Library/metadata/38/3838f200a8e1e4df787003348900b402 differ diff --git a/pixel/Library/metadata/3c/3c439a7d3c7d940f9b79122de3c7695a b/pixel/Library/metadata/3c/3c439a7d3c7d940f9b79122de3c7695a new file mode 100644 index 0000000..6e65818 Binary files /dev/null and b/pixel/Library/metadata/3c/3c439a7d3c7d940f9b79122de3c7695a differ diff --git a/pixel/Library/metadata/46/46c27b4e5447f704ca862ee0b3caeb7b b/pixel/Library/metadata/46/46c27b4e5447f704ca862ee0b3caeb7b index 432cd16..f230b9b 100644 Binary files a/pixel/Library/metadata/46/46c27b4e5447f704ca862ee0b3caeb7b and b/pixel/Library/metadata/46/46c27b4e5447f704ca862ee0b3caeb7b differ diff --git a/pixel/Library/metadata/46/46e9c4e89fbae1c44bdf1a35ba0c8692 b/pixel/Library/metadata/46/46e9c4e89fbae1c44bdf1a35ba0c8692 index 48dc99b..3752049 100644 Binary files a/pixel/Library/metadata/46/46e9c4e89fbae1c44bdf1a35ba0c8692 and b/pixel/Library/metadata/46/46e9c4e89fbae1c44bdf1a35ba0c8692 differ diff --git a/pixel/Library/metadata/48/486c4e534e70845cfa3871ca53697803 b/pixel/Library/metadata/48/486c4e534e70845cfa3871ca53697803 new file mode 100644 index 0000000..b827305 Binary files /dev/null and b/pixel/Library/metadata/48/486c4e534e70845cfa3871ca53697803 differ diff --git a/pixel/Library/metadata/4c/4c5736ea0764d49c3a6adc2250d33f0f b/pixel/Library/metadata/4c/4c5736ea0764d49c3a6adc2250d33f0f index 2bc2153..b250af9 100644 Binary files a/pixel/Library/metadata/4c/4c5736ea0764d49c3a6adc2250d33f0f and b/pixel/Library/metadata/4c/4c5736ea0764d49c3a6adc2250d33f0f differ diff --git a/pixel/Library/metadata/4f/4f3b95efdb35e4657b6e53355967032e b/pixel/Library/metadata/4f/4f3b95efdb35e4657b6e53355967032e index 2fdb6aa..f359c19 100644 Binary files a/pixel/Library/metadata/4f/4f3b95efdb35e4657b6e53355967032e and b/pixel/Library/metadata/4f/4f3b95efdb35e4657b6e53355967032e differ diff --git a/pixel/Library/metadata/50/502aaadea026143378bbf1866d315a7e b/pixel/Library/metadata/50/502aaadea026143378bbf1866d315a7e new file mode 100644 index 0000000..7820d67 Binary files /dev/null and b/pixel/Library/metadata/50/502aaadea026143378bbf1866d315a7e differ diff --git a/pixel/Library/metadata/50/505e7d9cb9fd14a45bdd00f6282fa528 b/pixel/Library/metadata/50/505e7d9cb9fd14a45bdd00f6282fa528 new file mode 100644 index 0000000..413ca4d Binary files /dev/null and b/pixel/Library/metadata/50/505e7d9cb9fd14a45bdd00f6282fa528 differ diff --git a/pixel/Library/metadata/54/543661108c603479fa64b4312ac89ab8 b/pixel/Library/metadata/54/543661108c603479fa64b4312ac89ab8 index 2255a8d..3131499 100644 Binary files a/pixel/Library/metadata/54/543661108c603479fa64b4312ac89ab8 and b/pixel/Library/metadata/54/543661108c603479fa64b4312ac89ab8 differ diff --git a/pixel/Library/metadata/5e/5e11a0f1273162a4d8bd4597487738de b/pixel/Library/metadata/5e/5e11a0f1273162a4d8bd4597487738de index b9afaa2..7f29db7 100644 Binary files a/pixel/Library/metadata/5e/5e11a0f1273162a4d8bd4597487738de and b/pixel/Library/metadata/5e/5e11a0f1273162a4d8bd4597487738de differ diff --git a/pixel/Library/metadata/6a/6aa187bc6339843479c03fdfd71404a3 b/pixel/Library/metadata/6a/6aa187bc6339843479c03fdfd71404a3 index 51c4168..aba63ae 100644 Binary files a/pixel/Library/metadata/6a/6aa187bc6339843479c03fdfd71404a3 and b/pixel/Library/metadata/6a/6aa187bc6339843479c03fdfd71404a3 differ diff --git a/pixel/Library/metadata/7f/7fa81717029ed4c309e1c22ba80693ff b/pixel/Library/metadata/7f/7fa81717029ed4c309e1c22ba80693ff index 54e0df2..6b26e03 100644 Binary files a/pixel/Library/metadata/7f/7fa81717029ed4c309e1c22ba80693ff and b/pixel/Library/metadata/7f/7fa81717029ed4c309e1c22ba80693ff differ diff --git a/pixel/Library/metadata/85/85ef7691d9fbf3a4a96b06334e74bff7 b/pixel/Library/metadata/85/85ef7691d9fbf3a4a96b06334e74bff7 index 737942c..6fd516e 100644 Binary files a/pixel/Library/metadata/85/85ef7691d9fbf3a4a96b06334e74bff7 and b/pixel/Library/metadata/85/85ef7691d9fbf3a4a96b06334e74bff7 differ diff --git a/pixel/Library/metadata/89/89a45ee812dfd4679a93b9698f3eef80 b/pixel/Library/metadata/89/89a45ee812dfd4679a93b9698f3eef80 new file mode 100644 index 0000000..a540625 Binary files /dev/null and b/pixel/Library/metadata/89/89a45ee812dfd4679a93b9698f3eef80 differ diff --git a/pixel/Library/metadata/90/908c39927feda4b5e8f45ea76b592b99 b/pixel/Library/metadata/90/908c39927feda4b5e8f45ea76b592b99 index 3981cf9..e301d3a 100644 Binary files a/pixel/Library/metadata/90/908c39927feda4b5e8f45ea76b592b99 and b/pixel/Library/metadata/90/908c39927feda4b5e8f45ea76b592b99 differ diff --git a/pixel/Library/metadata/9c/9c8b1c4d4c7634d1fa3531aa79d34eab b/pixel/Library/metadata/9c/9c8b1c4d4c7634d1fa3531aa79d34eab new file mode 100644 index 0000000..953d392 Binary files /dev/null and b/pixel/Library/metadata/9c/9c8b1c4d4c7634d1fa3531aa79d34eab differ diff --git a/pixel/Library/metadata/b0/b0e777fc248014e5a8b0e335d93471f7 b/pixel/Library/metadata/b0/b0e777fc248014e5a8b0e335d93471f7 new file mode 100644 index 0000000..9996c44 Binary files /dev/null and b/pixel/Library/metadata/b0/b0e777fc248014e5a8b0e335d93471f7 differ diff --git a/pixel/Library/metadata/b1/b126006da8178403dad4a53e28cb67f1 b/pixel/Library/metadata/b1/b126006da8178403dad4a53e28cb67f1 new file mode 100644 index 0000000..a03d608 Binary files /dev/null and b/pixel/Library/metadata/b1/b126006da8178403dad4a53e28cb67f1 differ diff --git a/pixel/Library/metadata/bb/bbbe340798352459386a0059f0d14360 b/pixel/Library/metadata/bb/bbbe340798352459386a0059f0d14360 new file mode 100644 index 0000000..623b4a8 Binary files /dev/null and b/pixel/Library/metadata/bb/bbbe340798352459386a0059f0d14360 differ diff --git a/pixel/Library/metadata/be/bed67d18fb88e4b1b8ef6c50765a789f b/pixel/Library/metadata/be/bed67d18fb88e4b1b8ef6c50765a789f index b179fbb..67ce4b4 100644 Binary files a/pixel/Library/metadata/be/bed67d18fb88e4b1b8ef6c50765a789f and b/pixel/Library/metadata/be/bed67d18fb88e4b1b8ef6c50765a789f differ diff --git a/pixel/Library/metadata/c2/c2fc7b356ebe242deaefac9ceb95a7e1 b/pixel/Library/metadata/c2/c2fc7b356ebe242deaefac9ceb95a7e1 new file mode 100644 index 0000000..8eafe9c Binary files /dev/null and b/pixel/Library/metadata/c2/c2fc7b356ebe242deaefac9ceb95a7e1 differ diff --git a/pixel/Library/metadata/ca/ca1fe571da9f00d48b0b756eccdfa686 b/pixel/Library/metadata/ca/ca1fe571da9f00d48b0b756eccdfa686 new file mode 100644 index 0000000..761e264 Binary files /dev/null and b/pixel/Library/metadata/ca/ca1fe571da9f00d48b0b756eccdfa686 differ diff --git a/pixel/Library/metadata/d0/d08f91df3bd212f429df17f53ce2f364 b/pixel/Library/metadata/d0/d08f91df3bd212f429df17f53ce2f364 index 6cd4c62..89abc94 100644 Binary files a/pixel/Library/metadata/d0/d08f91df3bd212f429df17f53ce2f364 and b/pixel/Library/metadata/d0/d08f91df3bd212f429df17f53ce2f364 differ diff --git a/pixel/Library/metadata/d6/d6b899062f82d4b118ee17b5e81cbb33 b/pixel/Library/metadata/d6/d6b899062f82d4b118ee17b5e81cbb33 index 52e2efe..36dfad1 100644 Binary files a/pixel/Library/metadata/d6/d6b899062f82d4b118ee17b5e81cbb33 and b/pixel/Library/metadata/d6/d6b899062f82d4b118ee17b5e81cbb33 differ diff --git a/pixel/Library/metadata/e5/e50f4af9499e24ac9b08e30acc337ee9 b/pixel/Library/metadata/e5/e50f4af9499e24ac9b08e30acc337ee9 new file mode 100644 index 0000000..e1034d2 Binary files /dev/null and b/pixel/Library/metadata/e5/e50f4af9499e24ac9b08e30acc337ee9 differ diff --git a/pixel/Library/metadata/e7/e784c54440a4f014baf0f6396ce19e44 b/pixel/Library/metadata/e7/e784c54440a4f014baf0f6396ce19e44 index e950c1c..db73307 100644 Binary files a/pixel/Library/metadata/e7/e784c54440a4f014baf0f6396ce19e44 and b/pixel/Library/metadata/e7/e784c54440a4f014baf0f6396ce19e44 differ diff --git a/pixel/Library/metadata/ea/ea8435d6d0fe44b1ba2b946f7f875bff b/pixel/Library/metadata/ea/ea8435d6d0fe44b1ba2b946f7f875bff new file mode 100644 index 0000000..4801716 Binary files /dev/null and b/pixel/Library/metadata/ea/ea8435d6d0fe44b1ba2b946f7f875bff differ diff --git a/pixel/Library/metadata/f2/f27a84c9104434a008b15db8e2a8535b b/pixel/Library/metadata/f2/f27a84c9104434a008b15db8e2a8535b new file mode 100644 index 0000000..0043551 Binary files /dev/null and b/pixel/Library/metadata/f2/f27a84c9104434a008b15db8e2a8535b differ diff --git a/pixel/Library/metadata/f2/f28cca3aa9289483b8160967b37ef4c5 b/pixel/Library/metadata/f2/f28cca3aa9289483b8160967b37ef4c5 new file mode 100644 index 0000000..9a38b49 Binary files /dev/null and b/pixel/Library/metadata/f2/f28cca3aa9289483b8160967b37ef4c5 differ diff --git a/pixel/Library/metadata/f5/f58280d6cd21e457c9fae47598c44c87 b/pixel/Library/metadata/f5/f58280d6cd21e457c9fae47598c44c87 index a5e9b2e..b6628fc 100644 Binary files a/pixel/Library/metadata/f5/f58280d6cd21e457c9fae47598c44c87 and b/pixel/Library/metadata/f5/f58280d6cd21e457c9fae47598c44c87 differ diff --git a/pixel/Library/metadata/f6/f66e58b49cbb63741a688917eebb1b1d b/pixel/Library/metadata/f6/f66e58b49cbb63741a688917eebb1b1d new file mode 100644 index 0000000..b97f38c Binary files /dev/null and b/pixel/Library/metadata/f6/f66e58b49cbb63741a688917eebb1b1d differ diff --git a/pixel/Library/metadata/f8/f8d1a3fb6c1654108be162b2a30531fc b/pixel/Library/metadata/f8/f8d1a3fb6c1654108be162b2a30531fc index 57b943b..ad415d3 100644 Binary files a/pixel/Library/metadata/f8/f8d1a3fb6c1654108be162b2a30531fc and b/pixel/Library/metadata/f8/f8d1a3fb6c1654108be162b2a30531fc differ diff --git a/pixel/Library/metadata/f9/f9bbdfbcf64d28a4fac191f64f25778d b/pixel/Library/metadata/f9/f9bbdfbcf64d28a4fac191f64f25778d index 76dbcf0..c55deff 100644 Binary files a/pixel/Library/metadata/f9/f9bbdfbcf64d28a4fac191f64f25778d and b/pixel/Library/metadata/f9/f9bbdfbcf64d28a4fac191f64f25778d differ diff --git a/pixel/pixel-csharp.sln b/pixel/pixel-csharp.sln index 4354d5e..92021d3 100644 --- a/pixel/pixel-csharp.sln +++ b/pixel/pixel-csharp.sln @@ -23,7 +23,10 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution + GlobalSection(MonoDevelopProperties) = preSolution +======= + GlobalSection(MonoDevelopProperties) = preSolution +>>>>>>> YiMysty/master ======= GlobalSection(MonoDevelopProperties) = preSolution >>>>>>> Stashed changes diff --git a/pixel/pixel.sln b/pixel/pixel.sln index a010cbd..0c0c74d 100644 --- a/pixel/pixel.sln +++ b/pixel/pixel.sln @@ -23,7 +23,10 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution + GlobalSection(MonoDevelopProperties) = preSolution +======= + GlobalSection(MonoDevelopProperties) = preSolution +>>>>>>> YiMysty/master ======= GlobalSection(MonoDevelopProperties) = preSolution >>>>>>> Stashed changes diff --git a/pixel/pixel.userprefs b/pixel/pixel.userprefs index d4cfd9f..c125e9d 100644 --- a/pixel/pixel.userprefs +++ b/pixel/pixel.userprefs @@ -1,8 +1,10 @@  - + - + + +