# HG changeset patch # User masa # Date 1402064331 -32400 # Node ID 002e557a4611bee795ee5519929a6c70cd9a4271 test unity diff -r 000000000000 -r 002e557a4611 Assets/BallMaterial.physicMaterial --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Assets/BallMaterial.physicMaterial Fri Jun 06 23:18:51 2014 +0900 @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!134 &13400000 +PhysicMaterial: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: BallMaterial + dynamicFriction: .400000006 + staticFriction: .400000006 + bounciness: .899999976 + frictionCombine: 0 + bounceCombine: 0 + frictionDirection2: {x: 0, y: 0, z: 0} + dynamicFriction2: 0 + staticFriction2: 0 diff -r 000000000000 -r 002e557a4611 Assets/BallMaterial.physicMaterial.meta --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Assets/BallMaterial.physicMaterial.meta Fri Jun 06 23:18:51 2014 +0900 @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 44b332a7ce63d4012a89f6a2434c73cf +NativeFormatImporter: + userData: diff -r 000000000000 -r 002e557a4611 Assets/floor.mat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Assets/floor.mat Fri Jun 06 23:18:51 2014 +0900 @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: floor + m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: [] + m_CustomRenderQueue: -1 + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + data: + first: + name: _MainTex + second: + m_Texture: {fileID: 2800000, guid: 73de6342cae2a46cc8b83d8cb33e4558, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + data: + first: + name: _Detail + second: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: {} + m_Colors: + data: + first: + name: _Color + second: {r: 1, g: 0, b: 0, a: 1} diff -r 000000000000 -r 002e557a4611 Assets/floor.mat.meta --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Assets/floor.mat.meta Fri Jun 06 23:18:51 2014 +0900 @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: ad8163d3557a1482cb3ca96c411fd582 +NativeFormatImporter: + userData: diff -r 000000000000 -r 002e557a4611 Assets/futta1910-1920x1200.psd Binary file Assets/futta1910-1920x1200.psd has changed diff -r 000000000000 -r 002e557a4611 Assets/futta1910-1920x1200.psd.meta --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Assets/futta1910-1920x1200.psd.meta Fri Jun 06 23:18:51 2014 +0900 @@ -0,0 +1,46 @@ +fileFormatVersion: 2 +guid: 73de6342cae2a46cc8b83d8cb33e4558 +TextureImporter: + 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: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff -r 000000000000 -r 002e557a4611 Assets/main.unity --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Assets/main.unity Fri Jun 06 23:18:51 2014 +0900 @@ -0,0 +1,314 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +SceneSettings: + m_ObjectHideFlags: 0 + m_PVSData: + m_PVSObjectsArray: [] + m_PVSPortalsArray: [] + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: .25 + backfaceThreshold: 100 +--- !u!104 &2 +RenderSettings: + m_Fog: 0 + m_FogColor: {r: .5, g: .5, b: .5, a: 1} + m_FogMode: 3 + m_FogDensity: .00999999978 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientLight: {r: .200000003, g: .200000003, b: .200000003, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: .5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 0} + m_ObjectHideFlags: 0 +--- !u!127 &3 +LevelGameManager: + m_ObjectHideFlags: 0 +--- !u!157 &4 +LightmapSettings: + m_ObjectHideFlags: 0 + m_LightProbes: {fileID: 0} + m_Lightmaps: [] + m_LightmapsMode: 1 + m_BakedColorSpace: 0 + m_UseDualLightmapsInForward: 0 + m_LightmapEditorSettings: + m_Resolution: 50 + m_LastUsedResolution: 0 + m_TextureWidth: 1024 + m_TextureHeight: 1024 + m_BounceBoost: 1 + m_BounceIntensity: 1 + m_SkyLightColor: {r: .860000014, g: .930000007, b: 1, a: 1} + m_SkyLightIntensity: 0 + m_Quality: 0 + m_Bounces: 1 + m_FinalGatherRays: 1000 + m_FinalGatherContrastThreshold: .0500000007 + m_FinalGatherGradientThreshold: 0 + m_FinalGatherInterpolationPoints: 15 + m_AOAmount: 0 + m_AOMaxDistance: .100000001 + m_AOContrast: 1 + m_LODSurfaceMappingDistance: 1 + m_Padding: 0 + m_TextureCompression: 0 + m_LockAtlas: 0 +--- !u!196 &5 +NavMeshSettings: + m_ObjectHideFlags: 0 + m_BuildSettings: + agentRadius: .5 + agentHeight: 2 + agentSlope: 45 + agentClimb: .400000006 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + accuratePlacement: 0 + minRegionArea: 2 + widthInaccuracy: 16.666666 + heightInaccuracy: 10 + m_NavMesh: {fileID: 0} +--- !u!1 &1230998759 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1230998764} + - 20: {fileID: 1230998763} + - 92: {fileID: 1230998762} + - 124: {fileID: 1230998761} + - 81: {fileID: 1230998760} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &1230998760 +AudioListener: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1230998759} + m_Enabled: 1 +--- !u!124 &1230998761 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1230998759} + m_Enabled: 1 +--- !u!92 &1230998762 +Behaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1230998759} + m_Enabled: 1 +--- !u!20 &1230998763 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1230998759} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: .300000012 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_HDR: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: .0219999999 +--- !u!4 &1230998764 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1230998759} + m_LocalRotation: {x: -.0322003998, y: -.699118972, z: .0313862488, w: -.713590145} + m_LocalPosition: {x: -24.7847233, y: 6.44847393, z: -.139837503} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 +--- !u!1 &1667213951 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1667213956} + - 33: {fileID: 1667213955} + - 135: {fileID: 1667213954} + - 23: {fileID: 1667213953} + - 54: {fileID: 1667213952} + m_Layer: 0 + m_Name: ball + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!54 &1667213952 +Rigidbody: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1667213951} + serializedVersion: 2 + m_Mass: 100 + m_Drag: 0 + m_AngularDrag: .0500000007 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!23 &1667213953 +Renderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1667213951} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_LightmapIndex: 255 + m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} + m_Materials: + - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 0 + m_LightProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_SortingLayerID: 0 + m_SortingOrder: 0 +--- !u!135 &1667213954 +SphereCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1667213951} + m_Material: {fileID: 13400000, guid: 44b332a7ce63d4012a89f6a2434c73cf, type: 2} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: .5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &1667213955 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1667213951} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1667213956 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1667213951} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: .00691575184, y: 10, z: .22276777} + m_LocalScale: {x: 2, y: 2, z: 2} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 +--- !u!1 &2018508230 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 2018508234} + - 33: {fileID: 2018508233} + - 65: {fileID: 2018508232} + - 23: {fileID: 2018508231} + m_Layer: 0 + m_Name: floor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!23 &2018508231 +Renderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2018508230} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_LightmapIndex: 255 + m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} + m_Materials: + - {fileID: 2100000, guid: ad8163d3557a1482cb3ca96c411fd582, type: 2} + m_SubsetIndices: + m_StaticBatchRoot: {fileID: 0} + m_UseLightProbes: 0 + m_LightProbeAnchor: {fileID: 0} + m_ScaleInLightmap: 1 + m_SortingLayerID: 0 + m_SortingOrder: 0 +--- !u!65 &2018508232 +BoxCollider: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2018508230} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &2018508233 +MeshFilter: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2018508230} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &2018508234 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2018508230} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 10, y: 1, z: 10} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 diff -r 000000000000 -r 002e557a4611 Assets/main.unity.meta --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Assets/main.unity.meta Fri Jun 06 23:18:51 2014 +0900 @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 870dfab9f1a504cc99017eb76720e057 +DefaultImporter: + userData: diff -r 000000000000 -r 002e557a4611 Library/AnnotationManager Binary file Library/AnnotationManager has changed diff -r 000000000000 -r 002e557a4611 Library/AssetImportState --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Library/AssetImportState Fri Jun 06 23:18:51 2014 +0900 @@ -0,0 +1,1 @@ +4;0;-1 \ No newline at end of file diff -r 000000000000 -r 002e557a4611 Library/AssetServerCacheV3 Binary file Library/AssetServerCacheV3 has changed diff -r 000000000000 -r 002e557a4611 Library/AssetVersioning.db Binary file Library/AssetVersioning.db has changed diff -r 000000000000 -r 002e557a4611 Library/BuildPlayer.prefs diff -r 000000000000 -r 002e557a4611 Library/BuildSettings.asset Binary file Library/BuildSettings.asset has changed diff -r 000000000000 -r 002e557a4611 Library/CurrentLayout.dwlt Binary file Library/CurrentLayout.dwlt has changed diff -r 000000000000 -r 002e557a4611 Library/EditorUserBuildSettings.asset Binary file Library/EditorUserBuildSettings.asset has changed diff -r 000000000000 -r 002e557a4611 Library/EditorUserSettings.asset Binary file Library/EditorUserSettings.asset has changed diff -r 000000000000 -r 002e557a4611 Library/FailedAssetImports.txt diff -r 000000000000 -r 002e557a4611 Library/InspectorExpandedItems.asset Binary file Library/InspectorExpandedItems.asset has changed diff -r 000000000000 -r 002e557a4611 Library/MonoManager.asset Binary file Library/MonoManager.asset has changed diff -r 000000000000 -r 002e557a4611 Library/ScriptAssemblies/CompilationCompleted.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Library/ScriptAssemblies/CompilationCompleted.txt Fri Jun 06 23:18:51 2014 +0900 @@ -0,0 +1,1 @@ +Completed diff -r 000000000000 -r 002e557a4611 Library/ScriptMapper Binary file Library/ScriptMapper has changed diff -r 000000000000 -r 002e557a4611 Library/ShaderCache.db Binary file Library/ShaderCache.db has changed diff -r 000000000000 -r 002e557a4611 Library/assetDatabase3 Binary file Library/assetDatabase3 has changed diff -r 000000000000 -r 002e557a4611 Library/guidmapper Binary file Library/guidmapper has changed diff -r 000000000000 -r 002e557a4611 Library/metadata/00/00000000000000001000000000000000 Binary file Library/metadata/00/00000000000000001000000000000000 has changed diff -r 000000000000 -r 002e557a4611 Library/metadata/00/00000000000000002000000000000000 Binary file Library/metadata/00/00000000000000002000000000000000 has changed diff -r 000000000000 -r 002e557a4611 Library/metadata/00/00000000000000003000000000000000 Binary file Library/metadata/00/00000000000000003000000000000000 has changed diff -r 000000000000 -r 002e557a4611 Library/metadata/00/00000000000000004000000000000000 Binary file Library/metadata/00/00000000000000004000000000000000 has changed diff -r 000000000000 -r 002e557a4611 Library/metadata/00/00000000000000004100000000000000 Binary file Library/metadata/00/00000000000000004100000000000000 has changed diff -r 000000000000 -r 002e557a4611 Library/metadata/00/00000000000000005000000000000000 Binary file Library/metadata/00/00000000000000005000000000000000 has changed diff -r 000000000000 -r 002e557a4611 Library/metadata/00/00000000000000005100000000000000 Binary file Library/metadata/00/00000000000000005100000000000000 has changed diff -r 000000000000 -r 002e557a4611 Library/metadata/00/00000000000000006000000000000000 Binary file Library/metadata/00/00000000000000006000000000000000 has changed diff -r 000000000000 -r 002e557a4611 Library/metadata/00/00000000000000006100000000000000 Binary file Library/metadata/00/00000000000000006100000000000000 has changed diff -r 000000000000 -r 002e557a4611 Library/metadata/00/00000000000000007000000000000000 Binary file Library/metadata/00/00000000000000007000000000000000 has changed diff -r 000000000000 -r 002e557a4611 Library/metadata/00/00000000000000008000000000000000 Binary file Library/metadata/00/00000000000000008000000000000000 has changed diff -r 000000000000 -r 002e557a4611 Library/metadata/00/00000000000000009000000000000000 Binary file Library/metadata/00/00000000000000009000000000000000 has changed diff -r 000000000000 -r 002e557a4611 Library/metadata/00/0000000000000000a000000000000000 Binary file Library/metadata/00/0000000000000000a000000000000000 has changed diff -r 000000000000 -r 002e557a4611 Library/metadata/00/0000000000000000b000000000000000 Binary file Library/metadata/00/0000000000000000b000000000000000 has changed diff -r 000000000000 -r 002e557a4611 Library/metadata/00/0000000000000000c000000000000000 Binary file Library/metadata/00/0000000000000000c000000000000000 has changed diff -r 000000000000 -r 002e557a4611 Library/metadata/44/44b332a7ce63d4012a89f6a2434c73cf Binary file Library/metadata/44/44b332a7ce63d4012a89f6a2434c73cf has changed diff -r 000000000000 -r 002e557a4611 Library/metadata/73/73de6342cae2a46cc8b83d8cb33e4558 Binary file Library/metadata/73/73de6342cae2a46cc8b83d8cb33e4558 has changed diff -r 000000000000 -r 002e557a4611 Library/metadata/87/870dfab9f1a504cc99017eb76720e057 Binary file Library/metadata/87/870dfab9f1a504cc99017eb76720e057 has changed diff -r 000000000000 -r 002e557a4611 Library/metadata/ad/ad8163d3557a1482cb3ca96c411fd582 Binary file Library/metadata/ad/ad8163d3557a1482cb3ca96c411fd582 has changed diff -r 000000000000 -r 002e557a4611 ProjectSettings/AudioManager.asset --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ProjectSettings/AudioManager.asset Fri Jun 06 23:18:51 2014 +0900 @@ -0,0 +1,12 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!11 &1 +AudioManager: + m_ObjectHideFlags: 0 + m_Volume: 1 + Rolloff Scale: 1 + m_SpeedOfSound: 347 + Doppler Factor: 1 + Default Speaker Mode: 2 + m_DSPBufferSize: 0 + m_DisableAudio: 0 diff -r 000000000000 -r 002e557a4611 ProjectSettings/DynamicsManager.asset --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ProjectSettings/DynamicsManager.asset Fri Jun 06 23:18:51 2014 +0900 @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!55 &1 +PhysicsManager: + m_ObjectHideFlags: 0 + m_Gravity: {x: 0, y: -9.81000042, z: 0} + m_DefaultMaterial: {fileID: 0} + m_BounceThreshold: 2 + m_SleepVelocity: .150000006 + m_SleepAngularVelocity: .140000001 + m_MaxAngularVelocity: 7 + m_MinPenetrationForPenalty: .00999999978 + m_SolverIterationCount: 6 + m_RaycastsHitTriggers: 1 + m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff diff -r 000000000000 -r 002e557a4611 ProjectSettings/EditorBuildSettings.asset --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ProjectSettings/EditorBuildSettings.asset Fri Jun 06 23:18:51 2014 +0900 @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1045 &1 +EditorBuildSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Scenes: [] diff -r 000000000000 -r 002e557a4611 ProjectSettings/EditorSettings.asset --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ProjectSettings/EditorSettings.asset Fri Jun 06 23:18:51 2014 +0900 @@ -0,0 +1,12 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!159 &1 +EditorSettings: + m_ObjectHideFlags: 0 + serializedVersion: 3 + m_ExternalVersionControlSupport: Visible Meta Files + m_SerializationMode: 2 + m_WebSecurityEmulationEnabled: 0 + m_WebSecurityEmulationHostUrl: http://www.mydomain.com/mygame.unity3d + m_DefaultBehaviorMode: 0 + m_SpritePackerMode: 0 diff -r 000000000000 -r 002e557a4611 ProjectSettings/GraphicsSettings.asset --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ProjectSettings/GraphicsSettings.asset Fri Jun 06 23:18:51 2014 +0900 @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!30 &1 +GraphicsSettings: + m_ObjectHideFlags: 0 + m_AlwaysIncludedShaders: + - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} diff -r 000000000000 -r 002e557a4611 ProjectSettings/InputManager.asset --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ProjectSettings/InputManager.asset Fri Jun 06 23:18:51 2014 +0900 @@ -0,0 +1,246 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!13 &1 +InputManager: + m_ObjectHideFlags: 0 + m_Axes: + - serializedVersion: 3 + m_Name: Horizontal + descriptiveName: + descriptiveNegativeName: + negativeButton: left + positiveButton: right + altNegativeButton: a + altPositiveButton: d + gravity: 3 + dead: .00100000005 + sensitivity: 3 + snap: 1 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Vertical + descriptiveName: + descriptiveNegativeName: + negativeButton: down + positiveButton: up + altNegativeButton: s + altPositiveButton: w + gravity: 3 + dead: .00100000005 + sensitivity: 3 + snap: 1 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire1 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left ctrl + altNegativeButton: + altPositiveButton: mouse 0 + gravity: 1000 + dead: .00100000005 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire2 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left alt + altNegativeButton: + altPositiveButton: mouse 1 + gravity: 1000 + dead: .00100000005 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire3 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: left cmd + altNegativeButton: + altPositiveButton: mouse 2 + gravity: 1000 + dead: .00100000005 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Jump + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: space + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: .00100000005 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Mouse X + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: .100000001 + snap: 0 + invert: 0 + type: 1 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Mouse Y + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: .100000001 + snap: 0 + invert: 0 + type: 1 + axis: 1 + joyNum: 0 + - serializedVersion: 3 + m_Name: Mouse ScrollWheel + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: 0 + sensitivity: .100000001 + snap: 0 + invert: 0 + type: 1 + axis: 2 + joyNum: 0 + - serializedVersion: 3 + m_Name: Horizontal + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: .189999998 + sensitivity: 1 + snap: 0 + invert: 0 + type: 2 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Vertical + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: + altNegativeButton: + altPositiveButton: + gravity: 0 + dead: .189999998 + sensitivity: 1 + snap: 0 + invert: 1 + type: 2 + axis: 1 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire1 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 0 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: .00100000005 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire2 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 1 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: .00100000005 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Fire3 + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 2 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: .00100000005 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 + - serializedVersion: 3 + m_Name: Jump + descriptiveName: + descriptiveNegativeName: + negativeButton: + positiveButton: joystick button 3 + altNegativeButton: + altPositiveButton: + gravity: 1000 + dead: .00100000005 + sensitivity: 1000 + snap: 0 + invert: 0 + type: 0 + axis: 0 + joyNum: 0 diff -r 000000000000 -r 002e557a4611 ProjectSettings/NavMeshLayers.asset --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ProjectSettings/NavMeshLayers.asset Fri Jun 06 23:18:51 2014 +0900 @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!126 &1 +NavMeshLayers: + m_ObjectHideFlags: 0 + Built-in Layer 0: + name: Default + cost: 1 + editType: 2 + Built-in Layer 1: + name: Not Walkable + cost: 1 + editType: 0 + Built-in Layer 2: + name: Jump + cost: 2 + editType: 2 + User Layer 0: + name: + cost: 1 + editType: 3 + User Layer 1: + name: + cost: 1 + editType: 3 + User Layer 2: + name: + cost: 1 + editType: 3 + User Layer 3: + name: + cost: 1 + editType: 3 + User Layer 4: + name: + cost: 1 + editType: 3 + User Layer 5: + name: + cost: 1 + editType: 3 + User Layer 6: + name: + cost: 1 + editType: 3 + User Layer 7: + name: + cost: 1 + editType: 3 + User Layer 8: + name: + cost: 1 + editType: 3 + User Layer 9: + name: + cost: 1 + editType: 3 + User Layer 10: + name: + cost: 1 + editType: 3 + User Layer 11: + name: + cost: 1 + editType: 3 + User Layer 12: + name: + cost: 1 + editType: 3 + User Layer 13: + name: + cost: 1 + editType: 3 + User Layer 14: + name: + cost: 1 + editType: 3 + User Layer 15: + name: + cost: 1 + editType: 3 + User Layer 16: + name: + cost: 1 + editType: 3 + User Layer 17: + name: + cost: 1 + editType: 3 + User Layer 18: + name: + cost: 1 + editType: 3 + User Layer 19: + name: + cost: 1 + editType: 3 + User Layer 20: + name: + cost: 1 + editType: 3 + User Layer 21: + name: + cost: 1 + editType: 3 + User Layer 22: + name: + cost: 1 + editType: 3 + User Layer 23: + name: + cost: 1 + editType: 3 + User Layer 24: + name: + cost: 1 + editType: 3 + User Layer 25: + name: + cost: 1 + editType: 3 + User Layer 26: + name: + cost: 1 + editType: 3 + User Layer 27: + name: + cost: 1 + editType: 3 + User Layer 28: + name: + cost: 1 + editType: 3 diff -r 000000000000 -r 002e557a4611 ProjectSettings/NetworkManager.asset --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ProjectSettings/NetworkManager.asset Fri Jun 06 23:18:51 2014 +0900 @@ -0,0 +1,8 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!149 &1 +NetworkManager: + m_ObjectHideFlags: 0 + m_DebugLevel: 0 + m_Sendrate: 15 + m_AssetToPrefab: {} diff -r 000000000000 -r 002e557a4611 ProjectSettings/Physics2DSettings.asset --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ProjectSettings/Physics2DSettings.asset Fri Jun 06 23:18:51 2014 +0900 @@ -0,0 +1,21 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!19 &1 +Physics2DSettings: + m_ObjectHideFlags: 0 + m_Gravity: {x: 0, y: -9.81000042} + m_DefaultMaterial: {fileID: 0} + m_VelocityIterations: 8 + m_PositionIterations: 3 + m_VelocityThreshold: 1 + m_MaxLinearCorrection: .200000003 + m_MaxAngularCorrection: 8 + m_MaxTranslationSpeed: 100 + m_MaxRotationSpeed: 360 + m_BaumgarteScale: .200000003 + m_BaumgarteTimeOfImpactScale: .75 + m_TimeToSleep: .5 + m_LinearSleepTolerance: .00999999978 + m_AngularSleepTolerance: 2 + m_RaycastsHitTriggers: 1 + m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff diff -r 000000000000 -r 002e557a4611 ProjectSettings/ProjectSettings.asset --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ProjectSettings/ProjectSettings.asset Fri Jun 06 23:18:51 2014 +0900 @@ -0,0 +1,226 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!129 &1 +PlayerSettings: + m_ObjectHideFlags: 0 + serializedVersion: 3 + AndroidProfiler: 0 + defaultScreenOrientation: 0 + targetDevice: 2 + targetGlesGraphics: 1 + targetResolution: 0 + accelerometerFrequency: 60 + companyName: DefaultCompany + productName: dotinstall-unity + defaultCursor: {fileID: 0} + cursorHotspot: {x: 0, y: 0} + defaultScreenWidth: 1024 + defaultScreenHeight: 768 + defaultScreenWidthWeb: 960 + defaultScreenHeightWeb: 600 + m_RenderingPath: 1 + m_MobileRenderingPath: 1 + m_ActiveColorSpace: 0 + m_MTRendering: 1 + m_MobileMTRendering: 0 + m_UseDX11: 1 + m_Stereoscopic3D: 0 + iosShowActivityIndicatorOnLoading: -1 + androidShowActivityIndicatorOnLoading: -1 + displayResolutionDialog: 1 + allowedAutorotateToPortrait: 1 + allowedAutorotateToPortraitUpsideDown: 1 + allowedAutorotateToLandscapeRight: 1 + allowedAutorotateToLandscapeLeft: 1 + useOSAutorotation: 1 + use32BitDisplayBuffer: 1 + use24BitDepthBuffer: 1 + defaultIsFullScreen: 1 + defaultIsNativeResolution: 1 + runInBackground: 0 + captureSingleScreen: 0 + Override IPod Music: 0 + Prepare IOS For Recording: 0 + enableHWStatistics: 1 + usePlayerLog: 1 + stripPhysics: 0 + forceSingleInstance: 0 + resizableWindow: 0 + useMacAppStoreValidation: 0 + gpuSkinning: 0 + xboxPIXTextureCapture: 0 + xboxEnableAvatar: 0 + xboxEnableKinect: 0 + xboxEnableKinectAutoTracking: 0 + xboxEnableFitness: 0 + macFullscreenMode: 2 + xboxSpeechDB: 0 + xboxEnableHeadOrientation: 0 + xboxEnableGuest: 0 + videoMemoryForVertexBuffers: 0 + m_SupportedAspectRatios: + 4:3: 1 + 5:4: 1 + 16:10: 1 + 16:9: 1 + Others: 1 + iPhoneBundleIdentifier: com.Company.ProductName + metroEnableIndependentInputSource: 0 + metroEnableLowLatencyPresentationAPI: 0 + productGUID: fc47e3530928d4df4ad6aee49473b93a + iPhoneBundleVersion: 1.0 + AndroidBundleVersionCode: 1 + AndroidMinSdkVersion: 9 + AndroidPreferredInstallLocation: 1 + aotOptions: + apiCompatibilityLevel: 2 + iPhoneStrippingLevel: 0 + iPhoneScriptCallOptimization: 0 + ForceInternetPermission: 0 + ForceSDCardPermission: 0 + CreateWallpaper: 0 + APKExpansionFiles: 0 + StripUnusedMeshComponents: 0 + iPhoneSdkVersion: 988 + iPhoneTargetOSVersion: 16 + uIPrerenderedIcon: 0 + uIRequiresPersistentWiFi: 0 + uIStatusBarHidden: 1 + uIExitOnSuspend: 0 + uIStatusBarStyle: 0 + iPhoneSplashScreen: {fileID: 0} + iPhoneHighResSplashScreen: {fileID: 0} + iPhoneTallHighResSplashScreen: {fileID: 0} + iPadPortraitSplashScreen: {fileID: 0} + iPadHighResPortraitSplashScreen: {fileID: 0} + iPadLandscapeSplashScreen: {fileID: 0} + iPadHighResLandscapeSplashScreen: {fileID: 0} + AndroidTargetDevice: 0 + AndroidSplashScreenScale: 0 + AndroidKeystoreName: + AndroidKeyaliasName: + resolutionDialogBanner: {fileID: 0} + m_BuildTargetIcons: [] + m_BuildTargetBatching: [] + webPlayerTemplate: APPLICATION:Default + m_TemplateCustomTags: {} + XboxTitleId: + XboxImageXexPath: + XboxSpaPath: + XboxGenerateSpa: 0 + XboxDeployKinectResources: 0 + XboxSplashScreen: {fileID: 0} + xboxEnableSpeech: 0 + xboxAdditionalTitleMemorySize: 0 + xboxDeployKinectHeadOrientation: 0 + xboxDeployKinectHeadPosition: 0 + ps3TitleConfigPath: + ps3DLCConfigPath: + ps3ThumbnailPath: + ps3BackgroundPath: + ps3SoundPath: + ps3TrophyCommId: + ps3NpCommunicationPassphrase: + ps3TrophyPackagePath: + ps3BootCheckMaxSaveGameSizeKB: 128 + ps3TrophyCommSig: + ps3SaveGameSlots: 1 + ps3TrialMode: 0 + psp2Splashimage: {fileID: 0} + psp2LiveAreaGate: {fileID: 0} + psp2LiveAreaBackround: {fileID: 0} + psp2NPTrophyPackPath: + psp2NPCommsID: + psp2NPCommsPassphrase: + psp2NPCommsSig: + psp2ParamSfxPath: + psp2PackagePassword: + psp2DLCConfigPath: + psp2ThumbnailPath: + psp2BackgroundPath: + psp2SoundPath: + psp2TrophyCommId: + psp2TrophyPackagePath: + psp2PackagedResourcesPath: + flashStrippingLevel: 2 + spritePackerPolicy: + scriptingDefineSymbols: {} + metroPackageName: dotinstall-unity + metroPackageLogo: + metroPackageLogo140: + metroPackageLogo180: + metroPackageVersion: + metroCertificatePath: + metroCertificatePassword: + metroCertificateSubject: + metroCertificateIssuer: + metroCertificateNotAfter: 0000000000000000 + metroApplicationDescription: dotinstall-unity + metroTileLogo80: + metroTileLogo: + metroTileLogo140: + metroTileLogo180: + metroTileWideLogo80: + metroTileWideLogo: + metroTileWideLogo140: + metroTileWideLogo180: + metroTileSmallLogo80: + metroTileSmallLogo: + metroTileSmallLogo140: + metroTileSmallLogo180: + metroSmallTile80: + metroSmallTile: + metroSmallTile140: + metroSmallTile180: + metroLargeTile80: + metroLargeTile: + metroLargeTile140: + metroLargeTile180: + metroTileShortName: + metroCommandLineArgsFile: + metroTileShowName: 0 + metroMediumTileShowName: 0 + metroLargeTileShowName: 0 + metroWideTileShowName: 0 + metroDefaultTileSize: 1 + metroTileForegroundText: 1 + metroTileBackgroundColor: {r: 0, g: 0, b: 0, a: 1} + metroSplashScreenImage: + metroSplashScreenImage140: + metroSplashScreenImage180: + metroSplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1} + metroSplashScreenUseBackgroundColor: 0 + metroCapabilities: {} + metroUnprocessedPlugins: [] + metroCompilationOverrides: 1 + blackberryDeviceAddress: + blackberryDevicePassword: + blackberryTokenPath: + blackberryTokenExires: + blackberryTokenAuthor: + blackberryTokenAuthorId: + blackberryAuthorId: + blackberryCskPassword: + blackberrySaveLogPath: + blackberryAuthorIdOveride: 0 + blackberrySharedPermissions: 0 + blackberryCameraPermissions: 0 + blackberryGPSPermissions: 0 + blackberryDeviceIDPermissions: 0 + blackberryMicrophonePermissions: 0 + blackberryGamepadSupport: 0 + blackberryBuildId: 0 + blackberryLandscapeSplashScreen: {fileID: 0} + blackberryPortraitSplashScreen: {fileID: 0} + blackberrySquareSplashScreen: {fileID: 0} + tizenProductDescription: + tizenProductURL: + tizenCertificatePath: + tizenCertificatePassword: + tizenGPSPermissions: 0 + tizenMicrophonePermissions: 0 + stvDeviceAddress: + firstStreamedLevelWithResources: 0 + unityRebuildLibraryVersion: 9 + unityForwardCompatibleVersion: 39 + unityStandardAssetsVersion: 0 diff -r 000000000000 -r 002e557a4611 ProjectSettings/QualitySettings.asset --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ProjectSettings/QualitySettings.asset Fri Jun 06 23:18:51 2014 +0900 @@ -0,0 +1,140 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!47 &1 +QualitySettings: + m_ObjectHideFlags: 0 + serializedVersion: 5 + m_CurrentQuality: 3 + m_QualitySettings: + - serializedVersion: 2 + name: Fastest + pixelLightCount: 0 + shadows: 0 + shadowResolution: 0 + shadowProjection: 1 + shadowCascades: 1 + shadowDistance: 15 + blendWeights: 1 + textureQuality: 1 + anisotropicTextures: 0 + antiAliasing: 0 + softParticles: 0 + softVegetation: 0 + vSyncCount: 0 + lodBias: .300000012 + maximumLODLevel: 0 + particleRaycastBudget: 4 + excludedTargetPlatforms: [] + - serializedVersion: 2 + name: Fast + pixelLightCount: 0 + shadows: 0 + shadowResolution: 0 + shadowProjection: 1 + shadowCascades: 1 + shadowDistance: 20 + blendWeights: 2 + textureQuality: 0 + anisotropicTextures: 0 + antiAliasing: 0 + softParticles: 0 + softVegetation: 0 + vSyncCount: 0 + lodBias: .400000006 + maximumLODLevel: 0 + particleRaycastBudget: 16 + excludedTargetPlatforms: [] + - serializedVersion: 2 + name: Simple + pixelLightCount: 1 + shadows: 1 + shadowResolution: 0 + shadowProjection: 1 + shadowCascades: 1 + shadowDistance: 20 + blendWeights: 2 + textureQuality: 0 + anisotropicTextures: 1 + antiAliasing: 0 + softParticles: 0 + softVegetation: 0 + vSyncCount: 0 + lodBias: .699999988 + maximumLODLevel: 0 + particleRaycastBudget: 64 + excludedTargetPlatforms: [] + - serializedVersion: 2 + name: Good + pixelLightCount: 2 + shadows: 2 + shadowResolution: 1 + shadowProjection: 1 + shadowCascades: 2 + shadowDistance: 40 + blendWeights: 2 + textureQuality: 0 + anisotropicTextures: 1 + antiAliasing: 0 + softParticles: 0 + softVegetation: 1 + vSyncCount: 1 + lodBias: 1 + maximumLODLevel: 0 + particleRaycastBudget: 256 + excludedTargetPlatforms: [] + - serializedVersion: 2 + name: Beautiful + pixelLightCount: 3 + shadows: 2 + shadowResolution: 2 + shadowProjection: 1 + shadowCascades: 2 + shadowDistance: 70 + blendWeights: 4 + textureQuality: 0 + anisotropicTextures: 2 + antiAliasing: 2 + softParticles: 1 + softVegetation: 1 + vSyncCount: 1 + lodBias: 1.5 + maximumLODLevel: 0 + particleRaycastBudget: 1024 + excludedTargetPlatforms: [] + - serializedVersion: 2 + name: Fantastic + pixelLightCount: 4 + shadows: 2 + shadowResolution: 2 + shadowProjection: 1 + shadowCascades: 4 + shadowDistance: 150 + blendWeights: 4 + textureQuality: 0 + anisotropicTextures: 2 + antiAliasing: 2 + softParticles: 1 + softVegetation: 1 + vSyncCount: 1 + lodBias: 2 + maximumLODLevel: 0 + particleRaycastBudget: 4096 + excludedTargetPlatforms: [] + m_PerPlatformDefaultQuality: + Android: 2 + BlackBerry: 2 + FlashPlayer: 3 + GLES Emulation: 3 + PS3: 3 + PS4: 3 + PSM: 3 + PSP2: 3 + Samsung TV: 2 + Standalone: 3 + Tizen: 2 + WP8: 3 + Web: 3 + Windows Store Apps: 3 + XBOX360: 3 + XboxOne: 3 + iPhone: 2 diff -r 000000000000 -r 002e557a4611 ProjectSettings/TagManager.asset --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ProjectSettings/TagManager.asset Fri Jun 06 23:18:51 2014 +0900 @@ -0,0 +1,43 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!78 &1 +TagManager: + tags: + - + Builtin Layer 0: Default + Builtin Layer 1: TransparentFX + Builtin Layer 2: Ignore Raycast + Builtin Layer 3: + Builtin Layer 4: Water + Builtin Layer 5: UI + Builtin Layer 6: + Builtin Layer 7: + User Layer 8: + User Layer 9: + User Layer 10: + User Layer 11: + User Layer 12: + User Layer 13: + User Layer 14: + User Layer 15: + User Layer 16: + User Layer 17: + User Layer 18: + User Layer 19: + User Layer 20: + User Layer 21: + User Layer 22: + User Layer 23: + User Layer 24: + User Layer 25: + User Layer 26: + User Layer 27: + User Layer 28: + User Layer 29: + User Layer 30: + User Layer 31: + m_SortingLayers: + - name: Default + userID: 0 + uniqueID: 0 + locked: 0 diff -r 000000000000 -r 002e557a4611 ProjectSettings/TimeManager.asset --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ProjectSettings/TimeManager.asset Fri Jun 06 23:18:51 2014 +0900 @@ -0,0 +1,8 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!5 &1 +TimeManager: + m_ObjectHideFlags: 0 + Fixed Timestep: .0199999996 + Maximum Allowed Timestep: .333333343 + m_TimeScale: 1 diff -r 000000000000 -r 002e557a4611 Temp/UnityLockfile diff -r 000000000000 -r 002e557a4611 Temp/__BuildPlayer Backupscene Binary file Temp/__BuildPlayer Backupscene has changed diff -r 000000000000 -r 002e557a4611 Temp/__EditModeScene Binary file Temp/__EditModeScene has changed