From 7299c987b49b9614dd4b4ed10a78a910d98b7852 Mon Sep 17 00:00:00 2001 From: zane-c Date: Tue, 10 Oct 2017 17:58:08 -0700 Subject: [PATCH] Fixed colliders --- Assets/Art/background.png.meta | 74 +++++++++ Assets/Art/black ball sprite.png.meta | 74 +++++++++ Assets/Art/dat | 0 Assets/Art/dat.meta | 8 - Assets/Art/source.png.meta | 74 +++++++++ Assets/Art/white ball sprite.png.meta | 74 +++++++++ .../Prefabs/{Ball.prefab => WhiteBall.prefab} | 13 +- ...Ball.prefab.meta => WhiteBall.prefab.meta} | 0 Assets/Scenes/dat | 0 Assets/Scenes/dat.meta | 8 - Assets/Scenes/level1.unity | 157 +++++++++++++++++- Assets/Scripts/DraggingScript.cs.meta | 12 ++ Assets/Scripts/dat | 0 Assets/Scripts/dat.meta | 8 - ProjectSettings/ProjectVersion.txt | 2 +- 15 files changed, 466 insertions(+), 38 deletions(-) create mode 100644 Assets/Art/background.png.meta create mode 100644 Assets/Art/black ball sprite.png.meta delete mode 100644 Assets/Art/dat delete mode 100644 Assets/Art/dat.meta create mode 100644 Assets/Art/source.png.meta create mode 100644 Assets/Art/white ball sprite.png.meta rename Assets/Prefabs/{Ball.prefab => WhiteBall.prefab} (94%) rename Assets/Prefabs/{Ball.prefab.meta => WhiteBall.prefab.meta} (100%) delete mode 100644 Assets/Scenes/dat delete mode 100644 Assets/Scenes/dat.meta create mode 100644 Assets/Scripts/DraggingScript.cs.meta delete mode 100644 Assets/Scripts/dat delete mode 100644 Assets/Scripts/dat.meta diff --git a/Assets/Art/background.png.meta b/Assets/Art/background.png.meta new file mode 100644 index 0000000..f1de5b8 --- /dev/null +++ b/Assets/Art/background.png.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: 5eb73f93ed838c3438d1bbaa5be0e317 +timeCreated: 1507681185 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/black ball sprite.png.meta b/Assets/Art/black ball sprite.png.meta new file mode 100644 index 0000000..cb38ecb --- /dev/null +++ b/Assets/Art/black ball sprite.png.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: bebb6a35b398ae94e96c3ce3748ee10a +timeCreated: 1507681186 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/dat b/Assets/Art/dat deleted file mode 100644 index e69de29..0000000 diff --git a/Assets/Art/dat.meta b/Assets/Art/dat.meta deleted file mode 100644 index e39bec0..0000000 --- a/Assets/Art/dat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: aff247b5cbdbbf24dac5fe9be73219cd -timeCreated: 1507098977 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Art/source.png.meta b/Assets/Art/source.png.meta new file mode 100644 index 0000000..962a30c --- /dev/null +++ b/Assets/Art/source.png.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: 358f1284953660a45be5619db1bef1e5 +timeCreated: 1507681184 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/white ball sprite.png.meta b/Assets/Art/white ball sprite.png.meta new file mode 100644 index 0000000..c8a95ec --- /dev/null +++ b/Assets/Art/white ball sprite.png.meta @@ -0,0 +1,74 @@ +fileFormatVersion: 2 +guid: 8766d76fa3667e249baf193360a2520a +timeCreated: 1507681185 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 4 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Ball.prefab b/Assets/Prefabs/WhiteBall.prefab similarity index 94% rename from Assets/Prefabs/Ball.prefab rename to Assets/Prefabs/WhiteBall.prefab index 357d4a7..48ad3c1 100644 --- a/Assets/Prefabs/Ball.prefab +++ b/Assets/Prefabs/WhiteBall.prefab @@ -25,7 +25,7 @@ GameObject: - component: {fileID: 61714759324887212} - component: {fileID: 58435505815979986} m_Layer: 0 - m_Name: Ball + m_Name: WhiteBall m_TagString: Ball m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -38,7 +38,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1354772360346746} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.812, y: 0.5127974, z: 0} + m_LocalPosition: {x: -4.6096377, y: 0.7856443, z: 0} m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} m_Children: [] m_Father: {fileID: 0} @@ -78,7 +78,7 @@ CircleCollider2D: m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} serializedVersion: 2 - m_Radius: 0.53 + m_Radius: 0.32 --- !u!61 &61714759324887212 BoxCollider2D: m_ObjectHideFlags: 1 @@ -95,14 +95,14 @@ BoxCollider2D: m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1.36, y: 1.36} + oldSize: {x: 0.71, y: 0.71} newSize: {x: 1.36, y: 1.36} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1.09, y: 1.06} + m_Size: {x: 0.7, y: 0.67} m_EdgeRadius: 0 --- !u!114 &114789573215808828 MonoBehaviour: @@ -115,7 +115,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bddc5a2d02691471bacab127605152e3, type: 3} m_Name: m_EditorClassIdentifier: - ScoreKeeper: {fileID: 0} --- !u!212 &212093048517218706 SpriteRenderer: m_ObjectHideFlags: 1 @@ -148,7 +147,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 876b3d7988bac4391ba3c619c854570e, type: 3} + m_Sprite: {fileID: 21300000, guid: 8766d76fa3667e249baf193360a2520a, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/Assets/Prefabs/Ball.prefab.meta b/Assets/Prefabs/WhiteBall.prefab.meta similarity index 100% rename from Assets/Prefabs/Ball.prefab.meta rename to Assets/Prefabs/WhiteBall.prefab.meta diff --git a/Assets/Scenes/dat b/Assets/Scenes/dat deleted file mode 100644 index e69de29..0000000 diff --git a/Assets/Scenes/dat.meta b/Assets/Scenes/dat.meta deleted file mode 100644 index a4aa05c..0000000 --- a/Assets/Scenes/dat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5e6244efcdb02e34e8bbc1a02d7d8968 -timeCreated: 1507099039 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/level1.unity b/Assets/Scenes/level1.unity index d450394..f5abe85 100644 --- a/Assets/Scenes/level1.unity +++ b/Assets/Scenes/level1.unity @@ -108,6 +108,92 @@ NavMeshSettings: tileSize: 256 accuratePlacement: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &1190058949 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4051657826885860, guid: 8ab42437b2af1cb4eb14f8b48ec93293, type: 2} + propertyPath: m_LocalPosition.x + value: -4.284824 + objectReference: {fileID: 0} + - target: {fileID: 4051657826885860, guid: 8ab42437b2af1cb4eb14f8b48ec93293, type: 2} + propertyPath: m_LocalPosition.y + value: -0.068594456 + objectReference: {fileID: 0} + - target: {fileID: 4051657826885860, guid: 8ab42437b2af1cb4eb14f8b48ec93293, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4051657826885860, guid: 8ab42437b2af1cb4eb14f8b48ec93293, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4051657826885860, guid: 8ab42437b2af1cb4eb14f8b48ec93293, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4051657826885860, guid: 8ab42437b2af1cb4eb14f8b48ec93293, type: 2} + propertyPath: m_LocalRotation.z + value: 0.22969884 + objectReference: {fileID: 0} + - target: {fileID: 4051657826885860, guid: 8ab42437b2af1cb4eb14f8b48ec93293, type: 2} + propertyPath: m_LocalRotation.w + value: 0.9732617 + objectReference: {fileID: 0} + - target: {fileID: 4051657826885860, guid: 8ab42437b2af1cb4eb14f8b48ec93293, type: 2} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4051657826885860, guid: 8ab42437b2af1cb4eb14f8b48ec93293, type: 2} + propertyPath: m_LocalEulerAnglesHint.z + value: 26.559002 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_ParentPrefab: {fileID: 100100000, guid: 8ab42437b2af1cb4eb14f8b48ec93293, type: 2} + m_IsPrefabParent: 0 +--- !u!1 &1696711924 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1696711926} + - component: {fileID: 1696711925} + m_Layer: 0 + m_Name: ScoreKeeper + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1696711925 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1696711924} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e90ffb4979d609f4b849ebae665333fd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1696711926 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1696711924} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -4.6096377, y: 0.7856443, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1717014566 Prefab: m_ObjectHideFlags: 0 @@ -145,11 +231,65 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4735010190345056, guid: 3306f917e9bd84aba9be9cca93ae7d8b, type: 2} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 3306f917e9bd84aba9be9cca93ae7d8b, type: 2} m_IsPrefabParent: 0 +--- !u!1 &1807118238 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1807118240} + - component: {fileID: 1807118239} + m_Layer: 0 + m_Name: BallDeath + m_TagString: BallDeath + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &1807118239 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1807118238} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!4 &1807118240 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1807118238} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.11, y: -11, z: -1.5898438} + m_LocalScale: {x: 83.1875, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1871225389 Prefab: m_ObjectHideFlags: 0 @@ -159,7 +299,7 @@ Prefab: m_Modifications: - target: {fileID: 4362679542213812, guid: 43924b706563444c4b2d4530c8311444, type: 2} propertyPath: m_LocalPosition.x - value: -4.74 + value: -0.55 objectReference: {fileID: 0} - target: {fileID: 4362679542213812, guid: 43924b706563444c4b2d4530c8311444, type: 2} propertyPath: m_LocalPosition.y @@ -171,15 +311,15 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4362679542213812, guid: 43924b706563444c4b2d4530c8311444, type: 2} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4362679542213812, guid: 43924b706563444c4b2d4530c8311444, type: 2} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4362679542213812, guid: 43924b706563444c4b2d4530c8311444, type: 2} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4362679542213812, guid: 43924b706563444c4b2d4530c8311444, type: 2} propertyPath: m_LocalRotation.w @@ -187,7 +327,12 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4362679542213812, guid: 43924b706563444c4b2d4530c8311444, type: 2} propertyPath: m_RootOrder - value: 2 + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 61059385126701892, guid: 43924b706563444c4b2d4530c8311444, + type: 2} + propertyPath: m_IsTrigger + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 43924b706563444c4b2d4530c8311444, type: 2} diff --git a/Assets/Scripts/DraggingScript.cs.meta b/Assets/Scripts/DraggingScript.cs.meta new file mode 100644 index 0000000..208ccae --- /dev/null +++ b/Assets/Scripts/DraggingScript.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 786747358c35d1a4a91b55df6990018f +timeCreated: 1507681180 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/dat b/Assets/Scripts/dat deleted file mode 100644 index e69de29..0000000 diff --git a/Assets/Scripts/dat.meta b/Assets/Scripts/dat.meta deleted file mode 100644 index cb1896b..0000000 --- a/Assets/Scripts/dat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3282ddf42598c2c4f8ee742e84d7d7f8 -timeCreated: 1507099039 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 6e4d03d..ca1aa05 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 5.6.1f1 +m_EditorVersion: 2017.1.0f3