diff --git a/Prototype/Assets/Animation/New Animation.anim b/Prototype/Assets/Animation/New Animation.anim deleted file mode 100644 index 9490ae0..0000000 --- a/Prototype/Assets/Animation/New Animation.anim +++ /dev/null @@ -1,53 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: New Animation - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: [] - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_GenerateMotionCurves: 0 - m_Events: [] diff --git a/Prototype/Assets/Animation/Trans.anim b/Prototype/Assets/Animation/Trans.anim deleted file mode 100644 index cd0f13d..0000000 --- a/Prototype/Assets/Animation/Trans.anim +++ /dev/null @@ -1,377 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!74 &7400000 -AnimationClip: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_Name: Trans - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.r - path: - classID: 212 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.g - path: - classID: 212 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.b - path: - classID: 212 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.a - path: - classID: 212 - script: {fileID: 0} - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 0 - attribute: 304273561 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 2526845255 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 4215373228 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 2334886179 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 1 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.r - path: - classID: 212 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.g - path: - classID: 212 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.b - path: - classID: 212 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Color.a - path: - classID: 212 - script: {fileID: 0} - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_GenerateMotionCurves: 0 - m_Events: [] diff --git a/Prototype/Assets/Scenes/Ads.unity b/Prototype/Assets/Scenes/Ads.unity new file mode 100644 index 0000000..4d6e646 --- /dev/null +++ b/Prototype/Assets/Scenes/Ads.unity @@ -0,0 +1,192 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 10 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringMode: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &667946872 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 667946875} + - component: {fileID: 667946874} + - component: {fileID: 667946873} + 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 &667946873 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 667946872} + m_Enabled: 1 +--- !u!20 &667946874 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 667946872} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 10 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &667946875 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 667946872} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Prototype/Assets/Animation/New Animation.anim.meta b/Prototype/Assets/Scenes/Ads.unity.meta similarity index 52% rename from Prototype/Assets/Animation/New Animation.anim.meta rename to Prototype/Assets/Scenes/Ads.unity.meta index 7e8fe41..f701852 100644 --- a/Prototype/Assets/Animation/New Animation.anim.meta +++ b/Prototype/Assets/Scenes/Ads.unity.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: e512ea916a1f93c47ac7876e967c8459 -NativeFormatImporter: +guid: 2241f78111b25064e8c9f9b76ad9f089 +DefaultImporter: externalObjects: {} - mainObjectFileID: 7400000 userData: assetBundleName: assetBundleVariant: diff --git a/Prototype/Assets/Scenes/Main menu.unity b/Prototype/Assets/Scenes/Main menu.unity index d871d6a..0df91be 100644 --- a/Prototype/Assets/Scenes/Main menu.unity +++ b/Prototype/Assets/Scenes/Main menu.unity @@ -125,7 +125,7 @@ GameObject: - component: {fileID: 202154162} - component: {fileID: 202154163} m_Layer: 0 - m_Name: ScoreboardButton + m_Name: MarketButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1074,7 +1074,7 @@ GameObject: - component: {fileID: 1439351813} - component: {fileID: 1439351814} m_Layer: 0 - m_Name: MarketButton + m_Name: OptionsButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Prototype/Assets/Scenes/Market.unity b/Prototype/Assets/Scenes/Market.unity new file mode 100644 index 0000000..4d6e646 --- /dev/null +++ b/Prototype/Assets/Scenes/Market.unity @@ -0,0 +1,192 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 10 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringMode: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &667946872 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 667946875} + - component: {fileID: 667946874} + - component: {fileID: 667946873} + 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 &667946873 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 667946872} + m_Enabled: 1 +--- !u!20 &667946874 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 667946872} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 10 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &667946875 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 667946872} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Prototype/Assets/Animation/Trans.anim.meta b/Prototype/Assets/Scenes/Market.unity.meta similarity index 52% rename from Prototype/Assets/Animation/Trans.anim.meta rename to Prototype/Assets/Scenes/Market.unity.meta index 26bf348..ce1f1f1 100644 --- a/Prototype/Assets/Animation/Trans.anim.meta +++ b/Prototype/Assets/Scenes/Market.unity.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 1bfa418ac91a3974baa9125f9f088fdb -NativeFormatImporter: +guid: 5b94b8de61982f648ace45fdef2cc56f +DefaultImporter: externalObjects: {} - mainObjectFileID: 7400000 userData: assetBundleName: assetBundleVariant: diff --git a/Prototype/Assets/Scenes/Options.unity b/Prototype/Assets/Scenes/Options.unity new file mode 100644 index 0000000..4d6e646 --- /dev/null +++ b/Prototype/Assets/Scenes/Options.unity @@ -0,0 +1,192 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_TemporalCoherenceThreshold: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 10 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringMode: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &667946872 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 667946875} + - component: {fileID: 667946874} + - component: {fileID: 667946873} + 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 &667946873 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 667946872} + m_Enabled: 1 +--- !u!20 &667946874 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 667946872} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 10 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &667946875 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 667946872} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Prototype/Assets/Scenes/Options.unity.meta b/Prototype/Assets/Scenes/Options.unity.meta new file mode 100644 index 0000000..f059580 --- /dev/null +++ b/Prototype/Assets/Scenes/Options.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d735cbe00ccc9a946ac08f3266031709 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Prototype/Assets/Scenes/Tutorial.unity b/Prototype/Assets/Scenes/Tutorial.unity index 4d6e646..271c220 100644 --- a/Prototype/Assets/Scenes/Tutorial.unity +++ b/Prototype/Assets/Scenes/Tutorial.unity @@ -113,6 +113,213 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &114265312 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 114265313} + - component: {fileID: 114265316} + - component: {fileID: 114265315} + - component: {fileID: 114265314} + m_Layer: 0 + m_Name: BWall + m_TagString: Wall + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &114265313 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 114265312} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 143.99998, y: 143.99998, z: 143.99998} + m_Children: [] + m_Father: {fileID: 1457788850} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: -44} + m_SizeDelta: {x: 1, y: 1} + m_Pivot: {x: 0.5, y: 0} +--- !u!50 &114265314 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 114265312} + m_BodyType: 2 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 6200000, guid: 4c8a339d423f8664da202e96302f6959, type: 2} + m_Interpolate: 0 + m_SleepingMode: 0 + m_CollisionDetection: 1 + m_Constraints: 0 +--- !u!61 &114265315 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 114265312} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 6200000, guid: 4c8a339d423f8664da202e96302f6959, type: 2} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.004981518, y: 0.15193298} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 10.24, y: 7.68} + newSize: {x: 10.24, y: 7.68} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 20.5, y: 0.3} + m_EdgeRadius: 0 +--- !u!212 &114265316 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 114265312} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 10.24, y: 7.68} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &630878992 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 630878993} + - component: {fileID: 630878994} + m_Layer: 0 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &630878993 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 630878992} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 130, y: 130, z: 142.2472} + m_Children: [] + m_Father: {fileID: 1457788850} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 10.24, y: 7.68} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!212 &630878994 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 630878992} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: -1 + m_Sprite: {fileID: 21300000, guid: 4da8c50f26ec84a4b9e746048dec1a30, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 10.24, y: 7.68} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &667946872 GameObject: m_ObjectHideFlags: 0 @@ -190,3 +397,544 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1006673451 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1006673452} + - component: {fileID: 1006673455} + - component: {fileID: 1006673454} + - component: {fileID: 1006673453} + m_Layer: 0 + m_Name: LWall + m_TagString: Wall + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1006673452 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1006673451} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 143.99998, y: 143.99998, z: 143.99998} + m_Children: [] + m_Father: {fileID: 1457788850} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -38, y: 0} + m_SizeDelta: {x: 1, y: 1} + m_Pivot: {x: 0, y: 0.5} +--- !u!50 &1006673453 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1006673451} + m_BodyType: 2 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 6200000, guid: 4c8a339d423f8664da202e96302f6959, type: 2} + m_Interpolate: 0 + m_SleepingMode: 0 + m_CollisionDetection: 1 + m_Constraints: 0 +--- !u!61 &1006673454 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1006673451} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 6200000, guid: 4c8a339d423f8664da202e96302f6959, type: 2} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.030000001, y: -0.013874531} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 10.24, y: 7.68} + newSize: {x: 10.24, y: 7.68} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.5, y: 19.720936} + m_EdgeRadius: 0 +--- !u!212 &1006673455 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1006673451} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 10.24, y: 7.68} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1253026231 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1253026232} + - component: {fileID: 1253026235} + - component: {fileID: 1253026234} + - component: {fileID: 1253026233} + m_Layer: 0 + m_Name: RWall + m_TagString: Wall + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1253026232 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1253026231} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 143.99998, y: 143.99998, z: 143.99998} + m_Children: [] + m_Father: {fileID: 1457788850} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 32, y: 0} + m_SizeDelta: {x: 1, y: 1} + m_Pivot: {x: 1, y: 0.5} +--- !u!50 &1253026233 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1253026231} + m_BodyType: 2 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 6200000, guid: 4c8a339d423f8664da202e96302f6959, type: 2} + m_Interpolate: 0 + m_SleepingMode: 0 + m_CollisionDetection: 1 + m_Constraints: 0 +--- !u!61 &1253026234 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1253026231} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 6200000, guid: 4c8a339d423f8664da202e96302f6959, type: 2} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.030000001, y: -0.020925045} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 10.24, y: 7.68} + newSize: {x: 10.24, y: 7.68} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.5, y: 19.700874} + m_EdgeRadius: 0 +--- !u!212 &1253026235 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1253026231} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 10.24, y: 7.68} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1257535560 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1257535561} + - component: {fileID: 1257535564} + - component: {fileID: 1257535563} + - component: {fileID: 1257535562} + m_Layer: 0 + m_Name: TWall + m_TagString: Wall + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1257535561 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1257535560} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 143.99998, y: 143.99998, z: 143.99998} + m_Children: [] + m_Father: {fileID: 1457788850} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1, y: 1} + m_Pivot: {x: 0.5, y: 1} +--- !u!50 &1257535562 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1257535560} + m_BodyType: 2 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 6200000, guid: 4c8a339d423f8664da202e96302f6959, type: 2} + m_Interpolate: 0 + m_SleepingMode: 0 + m_CollisionDetection: 1 + m_Constraints: 0 +--- !u!61 &1257535563 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1257535560} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 6200000, guid: 4c8a339d423f8664da202e96302f6959, type: 2} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.004981518, y: 0.15193298} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 10.24, y: 7.68} + newSize: {x: 10.24, y: 7.68} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 20.5, y: 0.3} + m_EdgeRadius: 0 +--- !u!212 &1257535564 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1257535560} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 10.24, y: 7.68} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1350556309 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1350556312} + - component: {fileID: 1350556311} + - component: {fileID: 1350556310} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1350556310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1350556309} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1350556311 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1350556309} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1350556312 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1350556309} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1457788846 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1457788850} + - component: {fileID: 1457788849} + - component: {fileID: 1457788848} + - component: {fileID: 1457788847} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1457788847 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1457788846} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1457788848 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1457788846} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 1 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &1457788849 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1457788846} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 667946874} + m_PlaneDistance: 10 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1457788850 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1457788846} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 114265313} + - {fileID: 1257535561} + - {fileID: 1006673452} + - {fileID: 1253026232} + - {fileID: 630878993} + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} diff --git a/Prototype/Assets/Scripts/CntrlSmile.cs b/Prototype/Assets/Scripts/CntrlSmile.cs index 8965b14..b2ec806 100644 --- a/Prototype/Assets/Scripts/CntrlSmile.cs +++ b/Prototype/Assets/Scripts/CntrlSmile.cs @@ -30,20 +30,17 @@ void Update() { isAnger = true; tilt = Random.Range(-10, 10); - objectGoodSmile.GetComponent().material.SetColor("_Color", Color.red + Color.black); - //GetComponent().sprite = badSmile; + objectGoodSmile.GetComponent().material.SetColor("_Color", Color.red + Color.black); } else if (isAnger == false) { if (isGold) { - objectGoodSmile.GetComponent().material.SetColor("_Color", Color.yellow ); - //GetComponent().sprite = goldSmile; + objectGoodSmile.GetComponent().material.SetColor("_Color", Color.yellow ); } else { objectGoodSmile.GetComponent().material.SetColor("_Color", Color.gray + Color.black); - //GetComponent().sprite = goodSmile; } } diff --git a/Prototype/Assets/Scripts/GameController.cs b/Prototype/Assets/Scripts/GameController.cs index feb40be..e9829b4 100644 --- a/Prototype/Assets/Scripts/GameController.cs +++ b/Prototype/Assets/Scripts/GameController.cs @@ -8,8 +8,7 @@ public class GameController : MonoBehaviour { public float speed, tilt; public GameObject goodSmile; - public GameObject blackHole; - + public Text score; public int cntScore = 0; public int randomGold; @@ -21,15 +20,13 @@ public class GameController : MonoBehaviour { private Vector3 spawnPosition; void Start () { - //randomGold = Random.Range(20, 200); - randomGold = 20; + randomGold = Random.Range(20, 200); AddSmile(); } void Update () { // Score - score.text = cntScore.ToString(); - + score.text = cntScore.ToString(); if (PlayerPrefs.GetInt("Score") < cntScore) PlayerPrefs.SetInt("Score", cntScore); diff --git a/Prototype/Assets/Scripts/MainMenuButton.cs b/Prototype/Assets/Scripts/MainMenuButton.cs index 6d91219..2b9b670 100644 --- a/Prototype/Assets/Scripts/MainMenuButton.cs +++ b/Prototype/Assets/Scripts/MainMenuButton.cs @@ -34,7 +34,7 @@ private void OnMouseUpAsButton() SceneManager.LoadScene("Ads"); break; case "ScoreboardButton": - SceneManager.LoadScene("Scoreboard"); + SceneManager.LoadScene("Options"); break; } } diff --git a/Prototype/Library/CurrentLayout.dwlt b/Prototype/Library/CurrentLayout.dwlt index 3b369de..ee308a8 100644 --- a/Prototype/Library/CurrentLayout.dwlt +++ b/Prototype/Library/CurrentLayout.dwlt @@ -20,7 +20,7 @@ MonoBehaviour: m_ShowMode: 4 m_Title: m_RootView: {fileID: 7} - m_MinSize: {x: 950, y: 542} + m_MinSize: {x: 950, y: 300} m_MaxSize: {x: 10000, y: 10000} --- !u!114 &2 MonoBehaviour: @@ -40,8 +40,8 @@ MonoBehaviour: y: 0 width: 528 height: 607 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 204, y: 221} + m_MaxSize: {x: 4004, y: 4021} m_ActualView: {fileID: 20} m_Panes: - {fileID: 20} @@ -67,10 +67,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 881, y: 492} - m_MaxSize: {x: 16006, y: 14042} + m_MinSize: {x: 887, y: 492} + m_MaxSize: {x: 16012, y: 14042} vertical: 0 - controlID: 74 + controlID: 125 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -89,8 +89,8 @@ MonoBehaviour: y: 0 width: 359 height: 947 - m_MinSize: {x: 277, y: 71} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} @@ -114,8 +114,8 @@ MonoBehaviour: y: 0 width: 253 height: 607 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -232,10 +232,10 @@ MonoBehaviour: y: 0 width: 1561 height: 947 - m_MinSize: {x: 604, y: 492} - m_MaxSize: {x: 12004, y: 14042} + m_MinSize: {x: 610, y: 492} + m_MaxSize: {x: 12010, y: 14042} vertical: 1 - controlID: 75 + controlID: 126 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -257,10 +257,10 @@ MonoBehaviour: y: 0 width: 1561 height: 607 - m_MinSize: {x: 604, y: 221} - m_MaxSize: {x: 12004, y: 4021} + m_MinSize: {x: 610, y: 221} + m_MaxSize: {x: 12010, y: 4021} vertical: 0 - controlID: 76 + controlID: 127 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -442,20 +442,20 @@ MonoBehaviour: m_ShowAllHits: 0 m_SearchArea: 1 m_Folders: - - Assets/Prefabs + - Assets/Scripts m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Prefabs + - Assets/Scripts m_LastFoldersGridSize: -1 m_LastProjectPath: D:\Documents\Prototype\Prototype m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 6} - m_SelectedIDs: 5c2c0000 - m_LastClickedID: 11356 - m_ExpandedIDs: 00000000f2290000ee2b0000282c000000ca9a3b + scrollPos: {x: 0, y: 0} + m_SelectedIDs: e62c0000 + m_LastClickedID: 11494 + m_ExpandedIDs: 00000000f2290000ee2b000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -483,7 +483,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000f2290000 + m_ExpandedIDs: 00000000f2290000ee2b0000282c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -599,9 +599,9 @@ MonoBehaviour: m_PersistentViewDataDictionary: {fileID: 0} m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: c6280000 m_LastClickedID: 0 - m_ExpandedIDs: f650fbff1661fbff7286fbffc4bdfbff64eefbff7e9bfcff28dafcffd273fdffc61effffda20ffffd8e5ffffe4fbffff00000000982d0000 + m_ExpandedIDs: fafffeff6a0affffa23affffd83bffffa44bffff0258ffff1865ffff967bffff2e7fffff7482ffffea84ffff5c88ffff8a89ffff928affff2e8cffff488dffffd496ffff58e1ffffe4fbffff000000004c2e0000aa300000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -650,14 +650,14 @@ MonoBehaviour: height: 586 m_PersistentViewDataDictionary: {fileID: 0} m_SceneLighting: 0 - lastFramingTime: 639.0342762 + lastFramingTime: 627.0658113999999 m_2DMode: 1 m_isRotationLocked: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -1.3314466, y: -2.994093, z: -2.4767282} + m_Target: {x: 0, y: 0, z: -10} speed: 2 - m_Value: {x: -1.3314466, y: -2.994093, z: -2.4767282} + m_Value: {x: 0, y: 0, z: -10} m_RenderMode: 2 m_CameraMode: drawMode: 2 @@ -689,15 +689,15 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 11.590765 + m_Target: 22 speed: 2 - m_Value: 11.590765 + m_Value: 22 m_Ortho: m_Target: 1 speed: 2 m_Value: 1 m_ShowGlobalGrid: 1 - m_LastSceneViewRotation: {x: 0.29981273, y: -0.39445835, z: 0.13789852, w: 0.8576123} + m_LastSceneViewRotation: {x: 0.21178654, y: -0.62391406, z: 0.18097031, w: 0.7301558} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -731,17 +731,17 @@ MonoBehaviour: m_MaximizeOnPlay: 0 m_Gizmos: 0 m_Stats: 0 - m_SelectedSizes: 0000000000000000000000000d000000000000000000000000000000000000000000000000000000 + m_SelectedSizes: 0000000000000000000000000b000000000000000000000000000000000000000000000000000000 m_TargetDisplay: 0 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -160 - m_HBaseRangeMax: 160 - m_VBaseRangeMin: -284.5 - m_VBaseRangeMax: 284.5 + m_HBaseRangeMin: -720 + m_HBaseRangeMax: 720 + m_VBaseRangeMin: -1480 + m_VBaseRangeMax: 1480 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -761,7 +761,7 @@ MonoBehaviour: y: 17 width: 524 height: 569 - m_Scale: {x: 1, y: 1} + m_Scale: {x: 0.19222973, y: 0.19222973} m_Translation: {x: 262, y: 284.5} m_MarginLeft: 0 m_MarginRight: 0 @@ -769,12 +769,12 @@ MonoBehaviour: m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -262 - y: -284.5 - width: 524 - height: 569 + x: -1362.9525 + y: -1480 + width: 2725.905 + height: 2960 m_MinimalGUI: 1 - m_defaultScale: 1 + m_defaultScale: 0.19222973 m_TargetTexture: {fileID: 0} m_CurrentColorSpace: 0 m_LastWindowPixelSize: {x: 524, y: 586} diff --git a/Prototype/Library/LastSceneManagerSetup.txt b/Prototype/Library/LastSceneManagerSetup.txt index 3201e86..2cc3276 100644 --- a/Prototype/Library/LastSceneManagerSetup.txt +++ b/Prototype/Library/LastSceneManagerSetup.txt @@ -1,4 +1,4 @@ sceneSetups: -- path: Assets/Scenes/Play.unity +- path: Assets/Scenes/Tutorial.unity isLoaded: 1 isActive: 1 diff --git a/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll b/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll index 52f769f..ce35ad3 100644 Binary files a/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/Prototype/Library/assetDatabase3 b/Prototype/Library/assetDatabase3 index ddbf125..8a814d2 100644 Binary files a/Prototype/Library/assetDatabase3 and b/Prototype/Library/assetDatabase3 differ diff --git a/Prototype/Library/expandedItems b/Prototype/Library/expandedItems index 1594ca0..0137dc5 100644 Binary files a/Prototype/Library/expandedItems and b/Prototype/Library/expandedItems differ diff --git a/Prototype/Library/metadata/1b/1bfa418ac91a3974baa9125f9f088fdb b/Prototype/Library/metadata/22/2241f78111b25064e8c9f9b76ad9f089 similarity index 54% rename from Prototype/Library/metadata/1b/1bfa418ac91a3974baa9125f9f088fdb rename to Prototype/Library/metadata/22/2241f78111b25064e8c9f9b76ad9f089 index cbffed3..aca0cf9 100644 Binary files a/Prototype/Library/metadata/1b/1bfa418ac91a3974baa9125f9f088fdb and b/Prototype/Library/metadata/22/2241f78111b25064e8c9f9b76ad9f089 differ diff --git a/Prototype/Library/metadata/1b/1bfa418ac91a3974baa9125f9f088fdb.info b/Prototype/Library/metadata/22/2241f78111b25064e8c9f9b76ad9f089.info similarity index 66% rename from Prototype/Library/metadata/1b/1bfa418ac91a3974baa9125f9f088fdb.info rename to Prototype/Library/metadata/22/2241f78111b25064e8c9f9b76ad9f089.info index 0ab8ea2..53a1fe1 100644 Binary files a/Prototype/Library/metadata/1b/1bfa418ac91a3974baa9125f9f088fdb.info and b/Prototype/Library/metadata/22/2241f78111b25064e8c9f9b76ad9f089.info differ diff --git a/Prototype/Library/metadata/e5/e512ea916a1f93c47ac7876e967c8459 b/Prototype/Library/metadata/5b/5b94b8de61982f648ace45fdef2cc56f similarity index 54% rename from Prototype/Library/metadata/e5/e512ea916a1f93c47ac7876e967c8459 rename to Prototype/Library/metadata/5b/5b94b8de61982f648ace45fdef2cc56f index c62f30f..e640b47 100644 Binary files a/Prototype/Library/metadata/e5/e512ea916a1f93c47ac7876e967c8459 and b/Prototype/Library/metadata/5b/5b94b8de61982f648ace45fdef2cc56f differ diff --git a/Prototype/Library/metadata/e5/e512ea916a1f93c47ac7876e967c8459.info b/Prototype/Library/metadata/5b/5b94b8de61982f648ace45fdef2cc56f.info similarity index 65% rename from Prototype/Library/metadata/e5/e512ea916a1f93c47ac7876e967c8459.info rename to Prototype/Library/metadata/5b/5b94b8de61982f648ace45fdef2cc56f.info index d559829..fcc4dba 100644 Binary files a/Prototype/Library/metadata/e5/e512ea916a1f93c47ac7876e967c8459.info and b/Prototype/Library/metadata/5b/5b94b8de61982f648ace45fdef2cc56f.info differ diff --git a/Prototype/Library/metadata/6e/6e92c96e95066574aa3130ef9cde1514 b/Prototype/Library/metadata/6e/6e92c96e95066574aa3130ef9cde1514 index 7c680ea..c823459 100644 Binary files a/Prototype/Library/metadata/6e/6e92c96e95066574aa3130ef9cde1514 and b/Prototype/Library/metadata/6e/6e92c96e95066574aa3130ef9cde1514 differ diff --git a/Prototype/Library/metadata/ac/ace693eafc86fec44abd91b905dcbb1d b/Prototype/Library/metadata/ac/ace693eafc86fec44abd91b905dcbb1d index d7ebaf5..4a63418 100644 Binary files a/Prototype/Library/metadata/ac/ace693eafc86fec44abd91b905dcbb1d and b/Prototype/Library/metadata/ac/ace693eafc86fec44abd91b905dcbb1d differ diff --git a/Prototype/Library/metadata/d7/d735cbe00ccc9a946ac08f3266031709 b/Prototype/Library/metadata/d7/d735cbe00ccc9a946ac08f3266031709 new file mode 100644 index 0000000..e043d73 Binary files /dev/null and b/Prototype/Library/metadata/d7/d735cbe00ccc9a946ac08f3266031709 differ diff --git a/Prototype/Library/metadata/d7/d735cbe00ccc9a946ac08f3266031709.info b/Prototype/Library/metadata/d7/d735cbe00ccc9a946ac08f3266031709.info new file mode 100644 index 0000000..b4bb507 Binary files /dev/null and b/Prototype/Library/metadata/d7/d735cbe00ccc9a946ac08f3266031709.info differ diff --git a/Prototype/Library/metadata/fa/fadd07783bf438e41bd40dc68e79337c b/Prototype/Library/metadata/fa/fadd07783bf438e41bd40dc68e79337c index 52e228d..ca7e6ce 100644 Binary files a/Prototype/Library/metadata/fa/fadd07783bf438e41bd40dc68e79337c and b/Prototype/Library/metadata/fa/fadd07783bf438e41bd40dc68e79337c differ diff --git a/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log b/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log index 5d8b9a3..050c88f 100644 --- a/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log +++ b/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log @@ -3,40 +3,3 @@ Cmd: initializeCompiler Cmd: initializeCompiler Cmd: initializeCompiler Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler -Cmd: initializeCompiler