Live Changes
This commit is contained in:
parent
41f08de7e0
commit
bd37a4c731
@ -2,9 +2,12 @@ using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.SceneManagement;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class MainMenu : MonoBehaviour
|
||||
{
|
||||
private int selectedLevel;
|
||||
|
||||
public void startGame()
|
||||
{
|
||||
Debug.Log("Main Menu: New Game");
|
||||
@ -16,4 +19,50 @@ public class MainMenu : MonoBehaviour
|
||||
Debug.Log("Main Menu: Quit Game");
|
||||
Application.Quit();
|
||||
}
|
||||
|
||||
public void setSelectedLeve(int level)
|
||||
{
|
||||
selectedLevel = level;
|
||||
}
|
||||
|
||||
public void loadScene()
|
||||
{
|
||||
switch (++selectedLevel)
|
||||
{
|
||||
case 5:
|
||||
selectedLevel = 7;
|
||||
break;
|
||||
|
||||
case 6:
|
||||
selectedLevel = 10;
|
||||
break;
|
||||
|
||||
case 7:
|
||||
selectedLevel = 11;
|
||||
break;
|
||||
|
||||
case 8:
|
||||
selectedLevel = 12;
|
||||
break;
|
||||
|
||||
case 9:
|
||||
selectedLevel = 13;
|
||||
break;
|
||||
|
||||
case 10:
|
||||
selectedLevel = 14;
|
||||
break;
|
||||
|
||||
case 11:
|
||||
selectedLevel = 15;
|
||||
break;
|
||||
|
||||
case 12:
|
||||
selectedLevel = 16;
|
||||
break;
|
||||
}
|
||||
|
||||
Debug.Log("Main Menu: Load Level " + selectedLevel);
|
||||
SceneManager.LoadScene(selectedLevel);
|
||||
}
|
||||
}
|
||||
|
2130
Assets/Scenes/ScenesInGame/1MainMenu.unity
generated
2130
Assets/Scenes/ScenesInGame/1MainMenu.unity
generated
File diff suppressed because it is too large
Load Diff
61
Assets/Scenes/ScenesInGame/4DScene.unity
generated
61
Assets/Scenes/ScenesInGame/4DScene.unity
generated
@ -375,63 +375,6 @@ SpriteRenderer:
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1001 &73205718
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 2410396854066836738, guid: 22badd0525f460b4d988841429f6a07e, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Frank
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -36.740005
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 2.17
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -0.022044204
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2410396854066836746, guid: 22badd0525f460b4d988841429f6a07e, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 22badd0525f460b4d988841429f6a07e, type: 3}
|
||||
--- !u!1001 &79266759
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3579,6 +3522,10 @@ PrefabInstance:
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 449610414}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1232413703486290814, guid: 22badd0525f460b4d988841429f6a07e, type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2410396854066836738, guid: 22badd0525f460b4d988841429f6a07e, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Frank
|
||||
|
164
Assets/Scenes/ScenesInGame/5.2.TutorialDimShift.unity
generated
164
Assets/Scenes/ScenesInGame/5.2.TutorialDimShift.unity
generated
@ -172,6 +172,7 @@ Transform:
|
||||
- {fileID: 442553582}
|
||||
- {fileID: 274928893}
|
||||
- {fileID: 1783054734}
|
||||
- {fileID: 80788329}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -259,6 +260,38 @@ SpriteRenderer:
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &80788328
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 80788329}
|
||||
m_Layer: 0
|
||||
m_Name: SoftLockPreventer
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &80788329
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 80788328}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 43.43074, y: 8.334888, z: -1.601774}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 573357931}
|
||||
m_Father: {fileID: 12470872}
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &84681885
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -25580,6 +25613,79 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: a72839b3ed4bd20458a1b530b3f3d5bc, type: 3}
|
||||
--- !u!1 &573357930
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 573357931}
|
||||
- component: {fileID: 573357933}
|
||||
- component: {fileID: 573357932}
|
||||
m_Layer: 0
|
||||
m_Name: Master
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &573357931
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 573357930}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: -1.76, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1040064669}
|
||||
m_Father: {fileID: 80788329}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!61 &573357932
|
||||
BoxCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 573357930}
|
||||
m_Enabled: 1
|
||||
m_Density: 1
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 1
|
||||
m_UsedByEffector: 0
|
||||
m_UsedByComposite: 0
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0, y: 0}
|
||||
oldSize: {x: 0, y: 0}
|
||||
newSize: {x: 0, y: 0}
|
||||
adaptiveTilingThreshold: 0
|
||||
drawMode: 0
|
||||
adaptiveTiling: 0
|
||||
m_AutoTiling: 0
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 1, y: 1}
|
||||
m_EdgeRadius: 0
|
||||
--- !u!114 &573357933
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 573357930}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 14bd808cbf3154cf69653b828def20bb, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
toDeactivate: {fileID: 1040064668}
|
||||
--- !u!1 &605204127
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -49807,6 +49913,64 @@ SpriteRenderer:
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1 &1040064668
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1040064669}
|
||||
- component: {fileID: 1040064670}
|
||||
m_Layer: 0
|
||||
m_Name: Slave
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1040064669
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1040064668}
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 573357931}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!61 &1040064670
|
||||
BoxCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1040064668}
|
||||
m_Enabled: 1
|
||||
m_Density: 1
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_UsedByEffector: 0
|
||||
m_UsedByComposite: 0
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_SpriteTilingProperty:
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
pivot: {x: 0, y: 0}
|
||||
oldSize: {x: 0, y: 0}
|
||||
newSize: {x: 0, y: 0}
|
||||
adaptiveTilingThreshold: 0
|
||||
drawMode: 0
|
||||
adaptiveTiling: 0
|
||||
m_AutoTiling: 0
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 1, y: 1}
|
||||
m_EdgeRadius: 0
|
||||
--- !u!1001 &1044653766
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
18
Assets/Scenes/ScenesInGame/9Catman1.unity
generated
18
Assets/Scenes/ScenesInGame/9Catman1.unity
generated
@ -26204,19 +26204,29 @@ Tilemap:
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
- first: {x: 12, y: -14, z: 0}
|
||||
second:
|
||||
serializedVersion: 2
|
||||
m_TileIndex: 0
|
||||
m_TileSpriteIndex: 0
|
||||
m_TileMatrixIndex: 0
|
||||
m_TileColorIndex: 0
|
||||
m_TileObjectToInstantiateIndex: 65535
|
||||
dummyAlignment: 0
|
||||
m_AllTileFlags: 1073741825
|
||||
m_AnimatedTiles: {}
|
||||
m_TileAssetArray:
|
||||
- m_RefCount: 5
|
||||
- m_RefCount: 6
|
||||
m_Data: {fileID: 11400000, guid: cff643818661dc9479942e3d9748a33d, type: 2}
|
||||
- m_RefCount: 10
|
||||
m_Data: {fileID: 11400000, guid: 6acdb5eaae7117248bd2f7650d01fcf8, type: 2}
|
||||
m_TileSpriteArray:
|
||||
- m_RefCount: 5
|
||||
- m_RefCount: 6
|
||||
m_Data: {fileID: -1965847646, guid: c1e9877098c73364e99051dd6f99ebba, type: 3}
|
||||
- m_RefCount: 10
|
||||
m_Data: {fileID: 55498545, guid: c1e9877098c73364e99051dd6f99ebba, type: 3}
|
||||
m_TileMatrixArray:
|
||||
- m_RefCount: 15
|
||||
- m_RefCount: 16
|
||||
m_Data:
|
||||
e00: 1
|
||||
e01: 0
|
||||
@ -26235,7 +26245,7 @@ Tilemap:
|
||||
e32: 0
|
||||
e33: 1
|
||||
m_TileColorArray:
|
||||
- m_RefCount: 15
|
||||
- m_RefCount: 16
|
||||
m_Data: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_TileObjectToInstantiateArray: []
|
||||
m_AnimationFrameRate: 1
|
||||
|
Loading…
x
Reference in New Issue
Block a user