diff --git a/Prototype/Assets/Animation.meta b/Prototype/Assets/Animation.meta new file mode 100644 index 0000000..a5a9f38 --- /dev/null +++ b/Prototype/Assets/Animation.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 165d6695e7278de429845f6032357b31 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Prototype/Assets/Animation/BlackHole.controller b/Prototype/Assets/Animation/BlackHole.controller new file mode 100644 index 0000000..4179246 --- /dev/null +++ b/Prototype/Assets/Animation/BlackHole.controller @@ -0,0 +1,86 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: BlackHole + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107800983886738192} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &1102488505682959082 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Trans + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 1bfa418ac91a3974baa9125f9f088fdb, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107800983886738192 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102488505682959082} + m_Position: {x: 324, y: 204, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: + - {fileID: 1109480327902700522} + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 48, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102488505682959082} +--- !u!1109 &1109480327902700522 +AnimatorTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102488505682959082} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 1 diff --git a/Prototype/Assets/Animation/BlackHole.controller.meta b/Prototype/Assets/Animation/BlackHole.controller.meta new file mode 100644 index 0000000..f3d5031 --- /dev/null +++ b/Prototype/Assets/Animation/BlackHole.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b5a860a5bcfb68041aeb498ac84373ca +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Prototype/Assets/Animation/New Animation.anim b/Prototype/Assets/Animation/New Animation.anim new file mode 100644 index 0000000..9490ae0 --- /dev/null +++ b/Prototype/Assets/Animation/New Animation.anim @@ -0,0 +1,53 @@ +%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/New Animation.anim.meta b/Prototype/Assets/Animation/New Animation.anim.meta new file mode 100644 index 0000000..7e8fe41 --- /dev/null +++ b/Prototype/Assets/Animation/New Animation.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e512ea916a1f93c47ac7876e967c8459 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Prototype/Assets/Animation/Trans.anim b/Prototype/Assets/Animation/Trans.anim new file mode 100644 index 0000000..cd0f13d --- /dev/null +++ b/Prototype/Assets/Animation/Trans.anim @@ -0,0 +1,377 @@ +%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/Animation/Trans.anim.meta b/Prototype/Assets/Animation/Trans.anim.meta new file mode 100644 index 0000000..26bf348 --- /dev/null +++ b/Prototype/Assets/Animation/Trans.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1bfa418ac91a3974baa9125f9f088fdb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Prototype/Assets/Prefabs/BlackHole.prefab b/Prototype/Assets/Prefabs/BlackHole.prefab new file mode 100644 index 0000000..9d5c2cf --- /dev/null +++ b/Prototype/Assets/Prefabs/BlackHole.prefab @@ -0,0 +1,107 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 0} + m_RootGameObject: {fileID: 1825723940427572} + m_IsPrefabAsset: 1 +--- !u!1 &1825723940427572 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4927523239576160} + - component: {fileID: 212476040648355064} + - component: {fileID: 95489229018453264} + m_Layer: 0 + m_Name: BlackHole + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4927523239576160 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1825723940427572} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 31.9, y: 31.9, z: 63.8} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &95489229018453264 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1825723940427572} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: b5a860a5bcfb68041aeb498ac84373ca, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!212 &212476040648355064 +SpriteRenderer: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1825723940427572} + 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: 6d28ad8e514b7ff4b9159ef2e9577ed2, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.5, y: 2.5} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Prototype/Assets/Prefabs/BlackHole.prefab.meta b/Prototype/Assets/Prefabs/BlackHole.prefab.meta new file mode 100644 index 0000000..e3a9749 --- /dev/null +++ b/Prototype/Assets/Prefabs/BlackHole.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 686e065bf45f45b45b88594546f9ab40 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Prototype/Assets/Scenes/Main menu.unity b/Prototype/Assets/Scenes/Main menu.unity index e120f28..81a12f3 100644 --- a/Prototype/Assets/Scenes/Main menu.unity +++ b/Prototype/Assets/Scenes/Main menu.unity @@ -140,7 +140,7 @@ Transform: m_LocalScale: {x: 7.9998813, y: 7.9998813, z: 0.99974597} m_Children: [] m_Father: {fileID: 1566214680} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &202154161 SpriteRenderer: @@ -176,7 +176,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: 4481b657e1d4b394fa8f8dd5545585b9, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -198,7 +198,7 @@ GameObject: - component: {fileID: 468781620} - component: {fileID: 468781619} m_Layer: 0 - m_Name: 4174 + m_Name: BackGround m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -238,7 +238,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 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 @@ -257,11 +257,11 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 468781618} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -4.0752354, y: 0.015673982, z: 0} - m_LocalScale: {x: 1.35, y: 1.3199999, z: 1} + m_LocalPosition: {x: -260, y: 1, z: 0} + m_LocalScale: {x: 86.13, y: 84.215996, z: 63.8} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 + m_Father: {fileID: 1566214680} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &511442102 GameObject: @@ -290,9 +290,10 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.6, y: -0.6, z: 0} m_LocalScale: {x: 15, y: 15, z: 0.99974597} - m_Children: [] + m_Children: + - {fileID: 975177772} m_Father: {fileID: 1566214680} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &511442104 SpriteRenderer: @@ -328,7 +329,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: 4481b657e1d4b394fa8f8dd5545585b9, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -378,6 +379,93 @@ MonoBehaviour: m_EditorClassIdentifier: SpriteOnMouseUpButton: {fileID: 0} SpriteOnMouseDownButton: {fileID: 0} +--- !u!1 &552923905 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 552923906} + - component: {fileID: 552923908} + - component: {fileID: 552923907} + - component: {fileID: 552923909} + m_Layer: 5 + m_Name: quantity + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &552923906 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 552923905} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.08049854, y: 0.08049854, z: 0.08049854} + m_Children: [] + m_Father: {fileID: 1187406499} + m_RootOrder: 0 + 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: 10.097, y: -0.04} + m_SizeDelta: {x: 172.417, y: 46.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &552923907 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 552923905} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 40 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 0 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 0 +--- !u!222 &552923908 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 552923905} + m_CullTransparentMesh: 0 +--- !u!114 &552923909 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 552923905} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 296082495497b7748aa74239edcb6c12, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &830870780 GameObject: m_ObjectHideFlags: 0 @@ -438,7 +526,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &927701439 GameObject: @@ -467,7 +555,7 @@ Transform: m_LocalScale: {x: 7.9998813, y: 7.9998813, z: 0.99974597} m_Children: [] m_Father: {fileID: 1566214680} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &927701441 SpriteRenderer: @@ -503,7 +591,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: 4481b657e1d4b394fa8f8dd5545585b9, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -515,6 +603,81 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &975177771 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 975177772} + - component: {fileID: 975177773} + m_Layer: 0 + m_Name: PlayIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &975177772 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 975177771} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.06, y: 0.07, z: 0} + m_LocalScale: {x: 1, y: 1, z: 0} + m_Children: [] + m_Father: {fileID: 511442103} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &975177773 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 975177771} + 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: 2 + m_Sprite: {fileID: 21300000, guid: 81a5d6b7c54176b4b8325a30d8e1e04f, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.12, y: 5.12} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1017778124 GameObject: m_ObjectHideFlags: 0 @@ -542,7 +705,7 @@ Transform: m_LocalScale: {x: 8, y: 8, z: 1} m_Children: [] m_Father: {fileID: 1566214680} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1017778126 SpriteRenderer: @@ -578,7 +741,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: 4481b657e1d4b394fa8f8dd5545585b9, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -590,6 +753,158 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1170947644 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1170947645} + - component: {fileID: 1170947646} + m_Layer: 0 + m_Name: Gems + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1170947645 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1170947644} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -31.963799, y: 127.4724, z: 0} + m_LocalScale: {x: 12.498245, y: 12.498245, z: 12.498245} + m_Children: + - {fileID: 1669613469} + m_Father: {fileID: 1566214680} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1170947646 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1170947644} + 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: 21300000, guid: 1b9f0dc52adb0ed448cd5f8b127732d7, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.12, y: 5.12} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1187406497 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1187406499} + - component: {fileID: 1187406498} + m_Layer: 0 + m_Name: Score + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1187406498 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1187406497} + 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: 21300000, guid: aea442802cb7f4644b03104c1a211b7b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.12, y: 5.12} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1187406499 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1187406497} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -31.94466, y: -127.3448, z: 0} + m_LocalScale: {x: 12.419431, y: 12.419431, z: 12.419431} + m_Children: + - {fileID: 552923906} + m_Father: {fileID: 1566214680} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1345157844 GameObject: m_ObjectHideFlags: 0 @@ -694,7 +1009,7 @@ Transform: m_LocalScale: {x: 7.9998813, y: 7.9998813, z: 0.99974597} m_Children: [] m_Father: {fileID: 1566214680} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1439351812 SpriteRenderer: @@ -730,7 +1045,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_Sprite: {fileID: 21300000, guid: 4481b657e1d4b394fa8f8dd5545585b9, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -827,91 +1142,94 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: + - {fileID: 468781620} - {fileID: 1017778125} - {fileID: 1439351811} - {fileID: 511442103} - {fileID: 927701440} - {fileID: 202154160} + - {fileID: 1170947645} + - {fileID: 1187406499} m_Father: {fileID: 0} - m_RootOrder: 2 + 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} ---- !u!1 &2012709290 +--- !u!1 &1669613468 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2012709292} - - component: {fileID: 2012709291} - m_Layer: 0 - m_Name: New Sprite + - component: {fileID: 1669613469} + - component: {fileID: 1669613471} + - component: {fileID: 1669613470} + m_Layer: 5 + m_Name: quantity m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!212 &2012709291 -SpriteRenderer: +--- !u!224 &1669613469 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2012709290} + m_GameObject: {fileID: 1669613468} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.08001124, y: 0.08001124, z: 0.08001124} + m_Children: [] + m_Father: {fileID: 1170947645} + m_RootOrder: 0 + 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: 10.11, y: 0.07} + m_SizeDelta: {x: 171.492, y: 46.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1669613470 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1669613468} 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: 0.16, y: 0.16} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &2012709292 -Transform: + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.99631906, g: 1, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 40 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 0 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 0 +--- !u!222 &1669613471 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 2012709290} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.6291606, y: 0.22863775, z: -5.419922} - m_LocalScale: {x: 3, y: 3, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 1669613468} + m_CullTransparentMesh: 0 diff --git a/Prototype/Assets/Scenes/Play.unity b/Prototype/Assets/Scenes/Play.unity index 6157db8..bc48e80 100644 --- a/Prototype/Assets/Scenes/Play.unity +++ b/Prototype/Assets/Scenes/Play.unity @@ -285,7 +285,7 @@ GameObject: - component: {fileID: 642160016} - component: {fileID: 642160017} m_Layer: 0 - m_Name: 4174 + m_Name: BackGround m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -338,7 +338,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 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 @@ -350,6 +350,52 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &701995165 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 717251630} + m_Modifications: + - target: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1825723940427572, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} + m_IsPrefabAsset: 0 --- !u!1 &705113770 GameObject: m_ObjectHideFlags: 0 @@ -522,6 +568,7 @@ RectTransform: m_Children: - {fileID: 2067009724} - {fileID: 642160016} + - {fileID: 1501846922} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -560,6 +607,7 @@ MonoBehaviour: speed: 1 tilt: 1 goodSmile: {fileID: 1606677245037588, guid: 01264942e63954943ba47aa2d6d52740, type: 2} + blackHole: {fileID: 1501846919} score: {fileID: 2067009725} cntScore: 0 semaphoreForSpawn: 1 @@ -841,6 +889,16 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1501846919 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1825723940427572, guid: 686e065bf45f45b45b88594546f9ab40, + type: 2} + m_PrefabInternal: {fileID: 701995165} +--- !u!4 &1501846922 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, + type: 2} + m_PrefabInternal: {fileID: 701995165} --- !u!1 &2067009723 GameObject: m_ObjectHideFlags: 0 diff --git a/Prototype/Assets/Scripts/CntrlSmile.cs b/Prototype/Assets/Scripts/CntrlSmile.cs index fa6a17f..3e1ba57 100644 --- a/Prototype/Assets/Scripts/CntrlSmile.cs +++ b/Prototype/Assets/Scripts/CntrlSmile.cs @@ -7,6 +7,7 @@ public class CntrlSmile : MonoBehaviour public GameController gameController; public Sprite goodSmile; public Sprite badSmile; + private float speed, tilt; private Vector3 target; private bool anger = false; @@ -104,19 +105,20 @@ private void ChangeTarget()// смена конечной точки { if (gameObject.transform.position.x >= 0 && gameObject.transform.position.y >= 0) { - target = new Vector3(Random.Range(-10, 0) * 100, Random.Range(-10, 0) * 100, 0); + target = new Vector3(Random.Range(-10, 1) * 100, Random.Range(-10, 1) * 100, 0); } else if (gameObject.transform.position.x < 0 && gameObject.transform.position.y >= 0) { - target = new Vector3(Random.Range(0, 10) * 100, Random.Range(-10, 0) * 100, 0); + target = new Vector3(Random.Range(1, 10) * 100, Random.Range(-10, 1) * 100, 0); } else if (gameObject.transform.position.x < 0 && gameObject.transform.position.y < 0) { - target = new Vector3(Random.Range(0, 10) * 100, Random.Range(0, 10) * 100, 0); + target = new Vector3(Random.Range(1, 10) * 100, Random.Range(1, 10) * 100, 0); } else if (gameObject.transform.position.x >= 0 && gameObject.transform.position.y < 0) { - target = new Vector3(Random.Range(-10, 0) * 100, Random.Range(0, 10) * 100, 0); + target = new Vector3(Random.Range(-10, 1) * 100, Random.Range(1, 10) * 100, 0); } } + } diff --git a/Prototype/Assets/Scripts/GameController.cs b/Prototype/Assets/Scripts/GameController.cs index 2efe2e8..d07561e 100644 --- a/Prototype/Assets/Scripts/GameController.cs +++ b/Prototype/Assets/Scripts/GameController.cs @@ -2,11 +2,14 @@ using System.Collections.Generic; using UnityEngine.UI; using UnityEngine; +using UnityEngine.SceneManagement; public class GameController : MonoBehaviour { public float speed, tilt; public GameObject goodSmile; + public GameObject blackHole; + public Text score; public int cntScore = 0; @@ -18,12 +21,20 @@ public class GameController : MonoBehaviour { void Start () { - spawnPosition = new Vector3(Random.Range(-1.5f, 1.5f), Random.Range(-3.5f, 3.5f), 0); AddSmile(); } void Update () { + // Black Hole + blackHole.transform.Rotate(Vector3.back * tilt); + + // Score score.text = cntScore.ToString(); + + if (PlayerPrefs.GetInt("Score") < cntScore) + PlayerPrefs.SetInt("Score", cntScore); + + // Smile Work if (cntScore != 0 && cntScore % 10 == 0 && semaphoreForSpawn == true) { AddSmile(); semaphoreForSpawn = false; @@ -33,12 +44,41 @@ void Update () { speed += 0.5f; semaphoreForSpeed = false; } + if (!GameObject.FindWithTag("Smile")) + { + PlayerLose(); + } } void AddSmile () { + spawnPosition = new Vector3(Random.Range(-1.5f, 1.5f), Random.Range(-3.5f, 3.5f), 0); + BlackHoleAction(); GameObject smile = Instantiate(goodSmile, spawnPosition, Quaternion.identity); smile.GetComponent().gameController = this; smiles.Add(smile); + Debug.Log(smiles.Count); + } + /* + public void DeleteSmile(GameObject smileToDelete) + { + foreach (GameObject smile in smiles) + { + if (smile == smileToDelete) + { + smiles.Remove(smileToDelete); + } + } + } + */ + + private void BlackHoleAction() + { + blackHole.transform.position = spawnPosition; + } + + private void PlayerLose() + { + SceneManager.LoadScene("Main Menu"); } } diff --git a/Prototype/Assets/Scripts/MaxScore.cs b/Prototype/Assets/Scripts/MaxScore.cs new file mode 100644 index 0000000..d60bbdf --- /dev/null +++ b/Prototype/Assets/Scripts/MaxScore.cs @@ -0,0 +1,12 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class MaxScore : MonoBehaviour { + + void Start () { + GetComponent().text = PlayerPrefs.GetInt("Score").ToString(); + } + +} diff --git a/Prototype/Assets/Scripts/MaxScore.cs.meta b/Prototype/Assets/Scripts/MaxScore.cs.meta new file mode 100644 index 0000000..bdb1779 --- /dev/null +++ b/Prototype/Assets/Scripts/MaxScore.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 296082495497b7748aa74239edcb6c12 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Prototype/Assets/Sprite/Black hole.png b/Prototype/Assets/Sprite/Black hole.png new file mode 100644 index 0000000..2bee0d2 Binary files /dev/null and b/Prototype/Assets/Sprite/Black hole.png differ diff --git a/Prototype/Assets/Sprite/Black hole.png.meta b/Prototype/Assets/Sprite/Black hole.png.meta new file mode 100644 index 0000000..245a30b --- /dev/null +++ b/Prototype/Assets/Sprite/Black hole.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 6d28ad8e514b7ff4b9159ef2e9577ed2 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 934f68d54fc4925458211867f4602594 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Prototype/Assets/Sprite/Gems.png b/Prototype/Assets/Sprite/Gems.png new file mode 100644 index 0000000..85c0d96 Binary files /dev/null and b/Prototype/Assets/Sprite/Gems.png differ diff --git a/Prototype/Assets/Sprite/Gems.png.meta b/Prototype/Assets/Sprite/Gems.png.meta new file mode 100644 index 0000000..8a173be --- /dev/null +++ b/Prototype/Assets/Sprite/Gems.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 1b9f0dc52adb0ed448cd5f8b127732d7 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 223290061d702834e99234e2ebf45765 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Prototype/Assets/Sprite/PlayIcon.png b/Prototype/Assets/Sprite/PlayIcon.png new file mode 100644 index 0000000..2cefeec Binary files /dev/null and b/Prototype/Assets/Sprite/PlayIcon.png differ diff --git a/Prototype/Assets/Sprite/PlayIcon.png.meta b/Prototype/Assets/Sprite/PlayIcon.png.meta new file mode 100644 index 0000000..1bdc14c --- /dev/null +++ b/Prototype/Assets/Sprite/PlayIcon.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 81a5d6b7c54176b4b8325a30d8e1e04f +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 6aa6964291aed334b97a7b4d9c4cca59 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Prototype/Assets/Sprite/Score.png b/Prototype/Assets/Sprite/Score.png new file mode 100644 index 0000000..3c4149d Binary files /dev/null and b/Prototype/Assets/Sprite/Score.png differ diff --git a/Prototype/Assets/Sprite/Score.png.meta b/Prototype/Assets/Sprite/Score.png.meta new file mode 100644 index 0000000..43bef95 --- /dev/null +++ b/Prototype/Assets/Sprite/Score.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: aea442802cb7f4644b03104c1a211b7b +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 527bddfdbf38a354dbe1d046f93cdc7f + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Prototype/Assets/Sprite/b7a4ec0d701ec4d.png b/Prototype/Assets/Sprite/b7a4ec0d701ec4d.png new file mode 100644 index 0000000..3b6f403 Binary files /dev/null and b/Prototype/Assets/Sprite/b7a4ec0d701ec4d.png differ diff --git a/Prototype/Assets/Sprite/b7a4ec0d701ec4d.png.meta b/Prototype/Assets/Sprite/b7a4ec0d701ec4d.png.meta new file mode 100644 index 0000000..1539b8a --- /dev/null +++ b/Prototype/Assets/Sprite/b7a4ec0d701ec4d.png.meta @@ -0,0 +1,88 @@ +fileFormatVersion: 2 +guid: 258540675e675114b9fc01811e699905 +TextureImporter: + fileIDToRecycleName: {} + externalObjects: {} + serializedVersion: 7 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: a1f7b87b057ca8140be49aa9d024a273 + vertices: [] + indices: + edges: [] + weights: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Prototype/Assets/Sprite/gem_marquise_icon_160975.ico b/Prototype/Assets/Sprite/gem_marquise_icon_160975.ico new file mode 100644 index 0000000..589c122 Binary files /dev/null and b/Prototype/Assets/Sprite/gem_marquise_icon_160975.ico differ diff --git a/Prototype/Assets/Sprite/gem_marquise_icon_160975.ico.meta b/Prototype/Assets/Sprite/gem_marquise_icon_160975.ico.meta new file mode 100644 index 0000000..61e749a --- /dev/null +++ b/Prototype/Assets/Sprite/gem_marquise_icon_160975.ico.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4b05bbc4b93d80941b7803bb8e52f409 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Prototype/Library/CurrentLayout.dwlt b/Prototype/Library/CurrentLayout.dwlt index ec06d2c..86202a1 100644 --- a/Prototype/Library/CurrentLayout.dwlt +++ b/Prototype/Library/CurrentLayout.dwlt @@ -40,11 +40,11 @@ MonoBehaviour: y: 0 width: 444 height: 676 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 18} + m_MinSize: {x: 204, y: 221} + m_MaxSize: {x: 4004, y: 4021} + m_ActualView: {fileID: 20} m_Panes: - - {fileID: 18} + - {fileID: 20} m_Selected: 0 m_LastSelected: 0 --- !u!114 &3 @@ -67,10 +67,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 885, y: 492} - m_MaxSize: {x: 16010, y: 14042} + m_MinSize: {x: 787, y: 492} + m_MaxSize: {x: 16012, y: 14042} vertical: 0 - controlID: 9 + controlID: 70 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -89,11 +89,11 @@ MonoBehaviour: y: 0 width: 334 height: 947 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 15} + m_MinSize: {x: 277, y: 71} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 17} m_Panes: - - {fileID: 15} + - {fileID: 17} m_Selected: 0 m_LastSelected: 0 --- !u!114 &5 @@ -114,11 +114,11 @@ MonoBehaviour: y: 0 width: 219 height: 676 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 16} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 18} m_Panes: - - {fileID: 16} + - {fileID: 18} m_Selected: 0 m_LastSelected: 0 --- !u!114 &6 @@ -141,10 +141,11 @@ MonoBehaviour: height: 271 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 16} m_Panes: + - {fileID: 16} + - {fileID: 21} - {fileID: 14} - - {fileID: 19} m_Selected: 0 m_LastSelected: 1 --- !u!114 &7 @@ -231,10 +232,10 @@ MonoBehaviour: y: 0 width: 1586 height: 947 - m_MinSize: {x: 610, y: 492} + m_MinSize: {x: 510, y: 492} m_MaxSize: {x: 12010, y: 14042} vertical: 1 - controlID: 10 + controlID: 71 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -256,10 +257,10 @@ MonoBehaviour: y: 0 width: 1586 height: 676 - m_MinSize: {x: 610, y: 221} + m_MinSize: {x: 510, y: 221} m_MaxSize: {x: 12010, y: 4021} vertical: 0 - controlID: 52 + controlID: 72 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -278,15 +279,108 @@ MonoBehaviour: y: 0 width: 923 height: 676 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 17} + m_MinSize: {x: 104, y: 121} + m_MaxSize: {x: 4004, y: 4021} + m_ActualView: {fileID: 13} m_Panes: - - {fileID: 17} + - {fileID: 19} - {fileID: 13} - m_Selected: 0 + - {fileID: 15} + m_Selected: 1 m_LastSelected: 0 --- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animator + m_Image: {fileID: 663490763026382308, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 221 + y: 92 + width: 919 + height: 655 + m_PersistentViewDataDictionary: {fileID: 0} + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: 1107800983886738192, guid: b5a860a5bcfb68041aeb498ac84373ca, type: 2} + m_ValueSerializationHelper: + - e00: 0.760905 + e01: 0 + e02: 0 + e03: 48.15204 + e10: 0 + e11: 0.760905 + e12: 0 + e13: 223.55292 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: b5a860a5bcfb68041aeb498ac84373ca, + type: 2} + m_BreadCrumbs: + - m_Target: {fileID: 1107800983886738192, guid: b5a860a5bcfb68041aeb498ac84373ca, + type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentEditor: 0 + m_LayerEditor: + m_SelectedLayerIndex: 0 +--- !u!114 &14 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animation + m_Image: {fileID: 1561878555887300916, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 768 + width: 1584 + height: 250 + m_PersistentViewDataDictionary: {fileID: 0} + m_AnimEditor: {fileID: 0} + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: 21350 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -306,12 +400,12 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 468 - y: 181 - width: 973 - height: 501 + x: 221 + y: 92 + width: 919 + height: 655 m_PersistentViewDataDictionary: {fileID: 0} ---- !u!114 &14 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -348,31 +442,31 @@ MonoBehaviour: m_ShowAllHits: 0 m_SearchArea: 1 m_Folders: - - Assets/Prefabs + - Assets/Scenes m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Prefabs + - Assets/Scenes m_LastFoldersGridSize: -1 m_LastProjectPath: D:\Documents\Prototype\Prototype m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: f02b0000 - m_LastClickedID: 11248 + m_SelectedIDs: 102a0000 + m_LastClickedID: 10768 m_ExpandedIDs: 00000000e829000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Prefabs - m_OriginalName: Prefabs + m_Name: Scripts + m_OriginalName: Scripts m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 11248 + m_UserData: 11366 m_IsWaitingForDelay: 0 m_IsRenaming: 0 m_OriginalEventType: 0 @@ -416,8 +510,8 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c62300000070020000000000 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c623000000700200000000007c260000448ef7ff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -444,7 +538,7 @@ MonoBehaviour: m_ScrollPosition: {x: 0, y: 0} m_GridSize: 64 m_DirectoriesAreaWidth: 341 ---- !u!114 &15 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -474,11 +568,11 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewResizer: - m_CachedPref: 160 + m_CachedPref: 561 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_PreviewWindow: {fileID: 0} ---- !u!114 &16 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -505,9 +599,9 @@ MonoBehaviour: m_PersistentViewDataDictionary: {fileID: 0} m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: 982a0000 m_LastClickedID: 0 - m_ExpandedIDs: aef1ffff56f7ffffe4fbffff00000000ca2c0000 + m_ExpandedIDs: b22af7ff2a96f8ff1ae6f8ff7056f9ff38d5fbff08ebfbff64f5fbffcaf9fbffe0a2fcff0a67fdff1e5afeffc067ffffaa80ffffbe9cffff76f5ffff5af6ffffe4fbffff00000000942d0000c02d00006c2f000082310000863900008c390000a039000064400000fa4200005c46000036530000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -530,7 +624,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_CurrentSortingName: TransformSorting ---- !u!114 &17 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -556,14 +650,14 @@ MonoBehaviour: height: 655 m_PersistentViewDataDictionary: {fileID: 0} m_SceneLighting: 0 - lastFramingTime: 864.5554596 + lastFramingTime: 21356.4038592 m_2DMode: 1 m_isRotationLocked: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -0.3011157, y: -0.23332176, z: -1.0957031} + m_Target: {x: -2.1565683, y: -0.6349533, z: -0.07578211} speed: 2 - m_Value: {x: -0.3011157, y: -0.23332176, z: -1.0957031} + m_Value: {x: -2.1565683, y: -0.6349533, z: -0.07578211} m_RenderMode: 2 m_CameraMode: drawMode: 2 @@ -595,21 +689,21 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 11.981611 + m_Target: 10.542945 speed: 2 - m_Value: 11.981611 + m_Value: 10.542945 m_Ortho: m_Target: 1 speed: 2 m_Value: 1 m_ShowGlobalGrid: 1 - m_LastSceneViewRotation: {x: 0.22208156, y: 0.089979745, z: -0.020577954, w: 0.9706493} + m_LastSceneViewRotation: {x: 0.19200508, y: 0.27350625, z: -0.055815805, w: 0.9408576} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &18 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -688,7 +782,7 @@ MonoBehaviour: m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000001000100000100 m_XRRenderMode: 0 ---- !u!114 &19 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Prototype/Library/InspectorExpandedItems.asset b/Prototype/Library/InspectorExpandedItems.asset index cf14404..55ff2b2 100644 Binary files a/Prototype/Library/InspectorExpandedItems.asset and b/Prototype/Library/InspectorExpandedItems.asset differ diff --git a/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll b/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll index 2686d4e..bea6755 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 738d46c..718cdd7 100644 Binary files a/Prototype/Library/assetDatabase3 and b/Prototype/Library/assetDatabase3 differ diff --git a/Prototype/Library/metadata/16/165d6695e7278de429845f6032357b31 b/Prototype/Library/metadata/16/165d6695e7278de429845f6032357b31 new file mode 100644 index 0000000..e5475bf Binary files /dev/null and b/Prototype/Library/metadata/16/165d6695e7278de429845f6032357b31 differ diff --git a/Prototype/Library/metadata/16/165d6695e7278de429845f6032357b31.info b/Prototype/Library/metadata/16/165d6695e7278de429845f6032357b31.info new file mode 100644 index 0000000..acda935 Binary files /dev/null and b/Prototype/Library/metadata/16/165d6695e7278de429845f6032357b31.info differ diff --git a/Prototype/Library/metadata/1b/1b9f0dc52adb0ed448cd5f8b127732d7 b/Prototype/Library/metadata/1b/1b9f0dc52adb0ed448cd5f8b127732d7 new file mode 100644 index 0000000..1aa7f64 Binary files /dev/null and b/Prototype/Library/metadata/1b/1b9f0dc52adb0ed448cd5f8b127732d7 differ diff --git a/Prototype/Library/metadata/1b/1b9f0dc52adb0ed448cd5f8b127732d7.info b/Prototype/Library/metadata/1b/1b9f0dc52adb0ed448cd5f8b127732d7.info new file mode 100644 index 0000000..cd50171 Binary files /dev/null and b/Prototype/Library/metadata/1b/1b9f0dc52adb0ed448cd5f8b127732d7.info differ diff --git a/Prototype/Library/metadata/1b/1bfa418ac91a3974baa9125f9f088fdb b/Prototype/Library/metadata/1b/1bfa418ac91a3974baa9125f9f088fdb new file mode 100644 index 0000000..cbffed3 Binary files /dev/null and b/Prototype/Library/metadata/1b/1bfa418ac91a3974baa9125f9f088fdb differ diff --git a/Prototype/Library/metadata/1b/1bfa418ac91a3974baa9125f9f088fdb.info b/Prototype/Library/metadata/1b/1bfa418ac91a3974baa9125f9f088fdb.info new file mode 100644 index 0000000..0ab8ea2 Binary files /dev/null and b/Prototype/Library/metadata/1b/1bfa418ac91a3974baa9125f9f088fdb.info differ diff --git a/Prototype/Library/metadata/25/258540675e675114b9fc01811e699905 b/Prototype/Library/metadata/25/258540675e675114b9fc01811e699905 new file mode 100644 index 0000000..dd79c5a Binary files /dev/null and b/Prototype/Library/metadata/25/258540675e675114b9fc01811e699905 differ diff --git a/Prototype/Library/metadata/25/258540675e675114b9fc01811e699905.info b/Prototype/Library/metadata/25/258540675e675114b9fc01811e699905.info new file mode 100644 index 0000000..c2ac6fd Binary files /dev/null and b/Prototype/Library/metadata/25/258540675e675114b9fc01811e699905.info differ diff --git a/Prototype/Library/metadata/29/296082495497b7748aa74239edcb6c12 b/Prototype/Library/metadata/29/296082495497b7748aa74239edcb6c12 new file mode 100644 index 0000000..1586178 Binary files /dev/null and b/Prototype/Library/metadata/29/296082495497b7748aa74239edcb6c12 differ diff --git a/Prototype/Library/metadata/29/296082495497b7748aa74239edcb6c12.info b/Prototype/Library/metadata/29/296082495497b7748aa74239edcb6c12.info new file mode 100644 index 0000000..e02ecee Binary files /dev/null and b/Prototype/Library/metadata/29/296082495497b7748aa74239edcb6c12.info differ diff --git a/Prototype/Library/metadata/4b/4b05bbc4b93d80941b7803bb8e52f409 b/Prototype/Library/metadata/4b/4b05bbc4b93d80941b7803bb8e52f409 new file mode 100644 index 0000000..c046cc5 Binary files /dev/null and b/Prototype/Library/metadata/4b/4b05bbc4b93d80941b7803bb8e52f409 differ diff --git a/Prototype/Library/metadata/4b/4b05bbc4b93d80941b7803bb8e52f409.info b/Prototype/Library/metadata/4b/4b05bbc4b93d80941b7803bb8e52f409.info new file mode 100644 index 0000000..d15e46b Binary files /dev/null and b/Prototype/Library/metadata/4b/4b05bbc4b93d80941b7803bb8e52f409.info differ diff --git a/Prototype/Library/metadata/68/686e065bf45f45b45b88594546f9ab40 b/Prototype/Library/metadata/68/686e065bf45f45b45b88594546f9ab40 new file mode 100644 index 0000000..b9b847d Binary files /dev/null and b/Prototype/Library/metadata/68/686e065bf45f45b45b88594546f9ab40 differ diff --git a/Prototype/Library/metadata/68/686e065bf45f45b45b88594546f9ab40.info b/Prototype/Library/metadata/68/686e065bf45f45b45b88594546f9ab40.info new file mode 100644 index 0000000..fe6ac35 Binary files /dev/null and b/Prototype/Library/metadata/68/686e065bf45f45b45b88594546f9ab40.info differ diff --git a/Prototype/Library/metadata/6d/6d28ad8e514b7ff4b9159ef2e9577ed2 b/Prototype/Library/metadata/6d/6d28ad8e514b7ff4b9159ef2e9577ed2 new file mode 100644 index 0000000..ec31366 Binary files /dev/null and b/Prototype/Library/metadata/6d/6d28ad8e514b7ff4b9159ef2e9577ed2 differ diff --git a/Prototype/Library/metadata/6d/6d28ad8e514b7ff4b9159ef2e9577ed2.info b/Prototype/Library/metadata/6d/6d28ad8e514b7ff4b9159ef2e9577ed2.info new file mode 100644 index 0000000..1157109 Binary files /dev/null and b/Prototype/Library/metadata/6d/6d28ad8e514b7ff4b9159ef2e9577ed2.info differ diff --git a/Prototype/Library/metadata/81/81a5d6b7c54176b4b8325a30d8e1e04f b/Prototype/Library/metadata/81/81a5d6b7c54176b4b8325a30d8e1e04f new file mode 100644 index 0000000..ed08a94 Binary files /dev/null and b/Prototype/Library/metadata/81/81a5d6b7c54176b4b8325a30d8e1e04f differ diff --git a/Prototype/Library/metadata/81/81a5d6b7c54176b4b8325a30d8e1e04f.info b/Prototype/Library/metadata/81/81a5d6b7c54176b4b8325a30d8e1e04f.info new file mode 100644 index 0000000..2ba449d Binary files /dev/null and b/Prototype/Library/metadata/81/81a5d6b7c54176b4b8325a30d8e1e04f.info differ diff --git a/Prototype/Library/metadata/ac/ace693eafc86fec44abd91b905dcbb1d b/Prototype/Library/metadata/ac/ace693eafc86fec44abd91b905dcbb1d index e617c2a..26acbf0 100644 Binary files a/Prototype/Library/metadata/ac/ace693eafc86fec44abd91b905dcbb1d and b/Prototype/Library/metadata/ac/ace693eafc86fec44abd91b905dcbb1d differ diff --git a/Prototype/Library/metadata/ae/aea442802cb7f4644b03104c1a211b7b b/Prototype/Library/metadata/ae/aea442802cb7f4644b03104c1a211b7b new file mode 100644 index 0000000..4c542f2 Binary files /dev/null and b/Prototype/Library/metadata/ae/aea442802cb7f4644b03104c1a211b7b differ diff --git a/Prototype/Library/metadata/ae/aea442802cb7f4644b03104c1a211b7b.info b/Prototype/Library/metadata/ae/aea442802cb7f4644b03104c1a211b7b.info new file mode 100644 index 0000000..b7ae7c7 Binary files /dev/null and b/Prototype/Library/metadata/ae/aea442802cb7f4644b03104c1a211b7b.info differ diff --git a/Prototype/Library/metadata/b5/b5a860a5bcfb68041aeb498ac84373ca b/Prototype/Library/metadata/b5/b5a860a5bcfb68041aeb498ac84373ca new file mode 100644 index 0000000..fa75ec4 Binary files /dev/null and b/Prototype/Library/metadata/b5/b5a860a5bcfb68041aeb498ac84373ca differ diff --git a/Prototype/Library/metadata/b5/b5a860a5bcfb68041aeb498ac84373ca.info b/Prototype/Library/metadata/b5/b5a860a5bcfb68041aeb498ac84373ca.info new file mode 100644 index 0000000..0f60d02 Binary files /dev/null and b/Prototype/Library/metadata/b5/b5a860a5bcfb68041aeb498ac84373ca.info differ diff --git a/Prototype/Library/metadata/e5/e512ea916a1f93c47ac7876e967c8459 b/Prototype/Library/metadata/e5/e512ea916a1f93c47ac7876e967c8459 new file mode 100644 index 0000000..c62f30f Binary files /dev/null and b/Prototype/Library/metadata/e5/e512ea916a1f93c47ac7876e967c8459 differ diff --git a/Prototype/Library/metadata/e5/e512ea916a1f93c47ac7876e967c8459.info b/Prototype/Library/metadata/e5/e512ea916a1f93c47ac7876e967c8459.info new file mode 100644 index 0000000..d559829 Binary files /dev/null and b/Prototype/Library/metadata/e5/e512ea916a1f93c47ac7876e967c8459.info differ diff --git a/Prototype/Library/metadata/fa/fadd07783bf438e41bd40dc68e79337c b/Prototype/Library/metadata/fa/fadd07783bf438e41bd40dc68e79337c index ce638a6..e5b6dfd 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 6a50af5..76e2dd4 100644 --- a/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log +++ b/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log @@ -7,3 +7,65 @@ 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 +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 diff --git a/Prototype/obj/Debug/Assembly-CSharp.csproj.CoreCompileInputs.cache b/Prototype/obj/Debug/Assembly-CSharp.csproj.CoreCompileInputs.cache index 12769e1..7f3b846 100644 --- a/Prototype/obj/Debug/Assembly-CSharp.csproj.CoreCompileInputs.cache +++ b/Prototype/obj/Debug/Assembly-CSharp.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -50ca1d68117ac668b3acae9ca7bce2e5113951ca +83ae381793e964817a612d9fe3b960a4dc84d8be