Compare commits

..

No commits in common. "master" and "Over" have entirely different histories.
master ... Over

16 changed files with 177 additions and 161368 deletions

View File

@ -424,7 +424,3 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ca616a2edfacfd54fb236cd92b9e2dea, type: 3} m_Script: {fileID: 11500000, guid: ca616a2edfacfd54fb236cd92b9e2dea, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
FixedResolutionX: 426
FixedResolutionY: 240
FollowResolutionX: 384
FollowResolutionY: 216

View File

@ -74,7 +74,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: -10 m_SortingOrder: 0
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
m_Color: {r: 1, g: 0.4009434, b: 0.4009434, a: 1} m_Color: {r: 1, g: 0.4009434, b: 0.4009434, a: 1}
m_FlipX: 0 m_FlipX: 0

View File

@ -178,7 +178,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0 m_SortingLayerID: 0
m_SortingLayer: 0 m_SortingLayer: 0
m_SortingOrder: -10 m_SortingOrder: 0
m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3}
m_Color: {r: 0, g: 0.47058824, b: 1, a: 1} m_Color: {r: 0, g: 0.47058824, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0

View File

@ -192818,7 +192818,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1204334895034878381, guid: 8317c6de9f7b2f14f87cd8c0a0131c3c, type: 3} - target: {fileID: 1204334895034878381, guid: 8317c6de9f7b2f14f87cd8c0a0131c3c, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 5 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1204334895034878381, guid: 8317c6de9f7b2f14f87cd8c0a0131c3c, type: 3} - target: {fileID: 1204334895034878381, guid: 8317c6de9f7b2f14f87cd8c0a0131c3c, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w

View File

@ -18496,7 +18496,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1204334895034878381, guid: 8317c6de9f7b2f14f87cd8c0a0131c3c, type: 3} - target: {fileID: 1204334895034878381, guid: 8317c6de9f7b2f14f87cd8c0a0131c3c, type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 5 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1204334895034878381, guid: 8317c6de9f7b2f14f87cd8c0a0131c3c, type: 3} - target: {fileID: 1204334895034878381, guid: 8317c6de9f7b2f14f87cd8c0a0131c3c, type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,59 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &4473284981331788
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 876909381589830974, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_Name
value: LevelTemplate (5)
objectReference: {fileID: 0}
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e701662714d893b4283e4c7e15f945f2, type: 3}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 57928f8e94aa19a48bba044599ccf77a
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,59 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &979139980619723140
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 876909381589830974, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_Name
value: LevelTemplate (6)
objectReference: {fileID: 0}
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7358600700238641017, guid: e701662714d893b4283e4c7e15f945f2, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e701662714d893b4283e4c7e15f945f2, type: 3}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 85d7e932b50cbec44b2c205134aab2dc
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -6,14 +6,9 @@ namespace UI
public class PauseMenu : MonoBehaviour public class PauseMenu : MonoBehaviour
{ {
public void Resume() => UIManager.Instance.Pauser.TogglePause(); public void Resume() => UIManager.Instance.Pauser.TogglePause();
public void Restart() public void Restart() => LevelManager.Instance.CurrentLevel.Restart();
{
LevelManager.Instance.CurrentLevel.Restart();
Resume();
}
public void MainMenu() public void MainMenu()
{ {
Resume();
LevelManager.Instance.DisableAllLevels(); LevelManager.Instance.DisableAllLevels();
UIManager.Instance.SwitchToCanvas("Main Menu"); UIManager.Instance.SwitchToCanvas("Main Menu");
} }

File diff suppressed because one or more lines are too long

View File

@ -1,17 +0,0 @@
{
"MonoBehaviour": {
"Version": 4,
"EnableBurstCompilation": true,
"EnableOptimisations": true,
"EnableSafetyChecks": false,
"EnableDebugInAllBuilds": false,
"UsePlatformSDKLinker": false,
"CpuMinTargetX32": 0,
"CpuMaxTargetX32": 0,
"CpuMinTargetX64": 0,
"CpuMaxTargetX64": 0,
"CpuTargetsX32": 6,
"CpuTargetsX64": 72,
"OptimizeFor": 0
}
}

View File

@ -1,6 +0,0 @@
{
"MonoBehaviour": {
"Version": 4,
"DisabledWarnings": ""
}
}

View File

@ -6,6 +6,6 @@ EditorBuildSettings:
serializedVersion: 2 serializedVersion: 2
m_Scenes: m_Scenes:
- enabled: 1 - enabled: 1
path: Assets/Scenes/BuiltScene.unity path: Assets/Scenes/SampleScene.unity
guid: b2607c958166b9440b8d13b6549111ac guid: 2cda990e2423bbf4892e6590ba056729
m_configObjects: {} m_configObjects: {}

View File

@ -12,13 +12,10 @@ EditorUserSettings:
value: 500707545356080f555c582343705c44474e1c7c7e7974672b7d4935e1e36561 value: 500707545356080f555c582343705c44474e1c7c7e7974672b7d4935e1e36561
flags: 0 flags: 0
RecentlyUsedSceneGuid-2: RecentlyUsedSceneGuid-2:
value: 06550c57540350025c0b0f2747220a44174f4b73297070642b714465b0e6366e
flags: 0
RecentlyUsedSceneGuid-3:
value: 5002060403010b5f0f560e7a47260a444f4f1e2e2f2e27312f7f4536e0b6633d value: 5002060403010b5f0f560e7a47260a444f4f1e2e2f2e27312f7f4536e0b6633d
flags: 0 flags: 0
RecentlyUsedSceneGuid-4: RecentlyUsedSceneGuid-3:
value: 010302565256500e555f5a74127a0b444615402e7d7b2466787d4462b3b1353b value: 06550c57540350025c0b0f2747220a44174f4b73297070642b714465b0e6366e
flags: 0 flags: 0
vcSharedLogLevel: vcSharedLogLevel:
value: 0d5e400f0650 value: 0d5e400f0650