Permalink
Browse files

fixxed shit

  • Loading branch information...
1 parent 93ca1ae commit fbc65d662c048117dec74e0a8f9a26b80d964174 @troynegus committed Feb 16, 2017
@@ -0,0 +1,168 @@
+%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_ParentPrefab: {fileID: 0}
+ m_RootGameObject: {fileID: 1938825972753412}
+ m_IsPrefabParent: 1
+--- !u!1 &1042612776445786
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 4495899773639454}
+ - component: {fileID: 61814707986717140}
+ m_Layer: 0
+ m_Name: ShiboExitCol
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!1 &1938825972753412
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 4108533347936304}
+ - component: {fileID: 212524311138558134}
+ - component: {fileID: 95849856601685494}
+ - component: {fileID: 114789607786078014}
+ - component: {fileID: 61735695512511416}
+ m_Layer: 0
+ m_Name: Doors
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &4108533347936304
+Transform:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1938825972753412}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1.4, y: 1.4, z: 1}
+ m_Children:
+ - {fileID: 4495899773639454}
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!4 &4495899773639454
+Transform:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1042612776445786}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -0.07, y: -0.54, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 4108533347936304}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!61 &61735695512511416
+BoxCollider2D:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1938825972753412}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IsTrigger: 1
+ m_UsedByEffector: 0
+ m_Offset: {x: 0, y: 2}
+ serializedVersion: 2
+ m_Size: {x: 4, y: 1}
+--- !u!61 &61814707986717140
+BoxCollider2D:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1042612776445786}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_UsedByEffector: 0
+ m_Offset: {x: -0.0000044277735, y: -0.033967834}
+ serializedVersion: 2
+ m_Size: {x: 6.7971973, y: 0.93206435}
+--- !u!95 &95849856601685494
+Animator:
+ serializedVersion: 3
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1938825972753412}
+ m_Enabled: 1
+ m_Avatar: {fileID: 0}
+ m_Controller: {fileID: 9100000, guid: 4a765d74279474315adda9a83b85ba6c, type: 2}
+ m_CullingMode: 0
+ m_UpdateMode: 0
+ m_ApplyRootMotion: 0
+ m_LinearVelocityBlending: 0
+ m_WarningMessage:
+ m_HasTransformHierarchy: 1
+ m_AllowConstantClipSamplingOptimization: 1
+--- !u!114 &114789607786078014
+MonoBehaviour:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1938825972753412}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 25d1d98bbacf842e4b64e2e0017e9735, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ level: LVL2-Anteroom
+ blockExitCollider: {fileID: 61814707986717140}
+--- !u!212 &212524311138558134
+SpriteRenderer:
+ m_ObjectHideFlags: 1
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 100100000}
+ m_GameObject: {fileID: 1938825972753412}
+ m_Enabled: 1
+ m_CastShadows: 0
+ m_ReceiveShadows: 0
+ m_MotionVectors: 1
+ m_LightProbeUsage: 0
+ m_ReflectionProbeUsage: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 2bd0c1ad15ca54615989616772054476, type: 2}
+ 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_SelectedEditorRenderState: 0
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingOrder: 0
+ m_Sprite: {fileID: 21300000, guid: 1e48c44670e1d40d0bbc1a0f08682e26, type: 3}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_FlipX: 0
+ m_FlipY: 0
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d40c7a923fcb57d48ac6889311fcd2d9
+timeCreated: 1487287209
+licenseType: Free
+NativeFormatImporter:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
@@ -1695,9 +1695,10 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1389769658}
m_LocalRotation: {x: 0, y: 0, z: -0.258819, w: 0.9659259}
- m_LocalPosition: {x: -6.92, y: -7.62, z: 0}
+ m_LocalPosition: {x: -7.55, y: -7.91, z: 0}
m_LocalScale: {x: 1, y: 1.4, z: 1}
- m_Children: []
+ m_Children:
+ - {fileID: 2127920968}
m_Father: {fileID: 1156691599}
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -30}
@@ -1727,7 +1728,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
level: LVL5-Balcony
- blockExitCollider: {fileID: 0}
+ blockExitCollider: {fileID: 2127920969}
--- !u!95 &1389769662
Animator:
serializedVersion: 3
@@ -2925,6 +2926,49 @@ BoxCollider2D:
m_Offset: {x: 0, y: 0}
serializedVersion: 2
m_Size: {x: 1, y: 1}
+--- !u!1 &2127920967
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 2127920968}
+ - component: {fileID: 2127920969}
+ m_Layer: 0
+ m_Name: Doors Block
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 4294967295
+ m_IsActive: 1
+--- !u!4 &2127920968
+Transform:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 2127920967}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0.31, y: 0.41, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1389769659}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: -30}
+--- !u!61 &2127920969
+BoxCollider2D:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 2127920967}
+ m_Enabled: 1
+ m_Density: 1
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_UsedByEffector: 0
+ m_Offset: {x: 0, y: 2}
+ serializedVersion: 2
+ m_Size: {x: 4, y: 1}
--- !u!1001 &2142359287
Prefab:
m_ObjectHideFlags: 0
@@ -1949,7 +1949,7 @@ BoxCollider2D:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 865305946}
- m_Enabled: 1
+ m_Enabled: 0
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
@@ -13,8 +13,8 @@ public class GameMaster : MonoBehaviour {
bool combo;
private Rect PauseMenu;
public Texture Background;
- private float posX = (Screen.width /2) - ((Screen.width * .3f) / 2);
- private float posY = (Screen.height /2) - ((Screen.height * .7f) / 2);
+ private float posX = (Screen.width / 2) - ((Screen.width * .3f) / 2);
+ private float posY = (Screen.height / 2) - ((Screen.height * .7f) / 2);
private float width = (Screen.width * .3f);
private float height = (Screen.height * .7f);
private float exitsY;
@@ -25,7 +25,8 @@ public class GameMaster : MonoBehaviour {
- void Start () {
+ void Start()
+ {
characterActions = new PlayerAction();
pause = false;
combo = false;
@@ -75,7 +76,7 @@ void OnGUI()
{
//GUI.Window(0, PauseMenu, ThePauseMenu, "Main menu");
GUI.DrawTexture(PauseMenu, Background);
- ThePauseMenu();
+ ThePauseMenu();
}
}
@@ -86,7 +87,7 @@ void ThePauseMenu()
style.fontSize = 18;
styleButton.fontSize = 22;
styleButton.font = font;
- if (GUI.Button(new Rect(posX + (width * .15f), posY + (height * .22f), width *.7f, 20), "Resume", styleButton))
+ if (GUI.Button(new Rect(posX + (width * .15f), posY + (height * .22f), width * .7f, 20), "Resume", styleButton))
{
pause = false;
Time.timeScale = 1;
@@ -99,8 +100,7 @@ void ThePauseMenu()
{
exitsY = posY + (height * .70f);
//PauseMenu.size = new Vector2(360, 290);
- }
- else
+ } else
{
exitsY = posY + (height * .34f);
//PauseMenu.size = new Vector2(360, 110);
@@ -114,7 +114,7 @@ void ThePauseMenu()
if (combo)
{
- if (GUI.Button(new Rect(posX + (width * .15f), posY + (height * .34f), width * .34f , 20), "Controller", styleButton))
+ if (GUI.Button(new Rect(posX + (width * .15f), posY + (height * .34f), width * .34f, 20), "Controller", styleButton))
{
keyboard = false;
}
@@ -125,14 +125,13 @@ void ThePauseMenu()
}
if (keyboard)
- {
+ {
GUI.Label(new Rect(posX + (width * .15f), posY + (height * .40f), width * .7f, 20), "Kick X", style);
GUI.Label(new Rect(posX + (width * .15f), posY + (height * .46f), width * .7f, 20), "Punch Z", style);
GUI.Label(new Rect(posX + (width * .15f), posY + (height * .52f), width * .7f, 20), "Upper Cut Z Z X", style);
GUI.Label(new Rect(posX + (width * .15f), posY + (height * .58f), width * .7f, 20), "Hurricane Kick X X Z", style);
GUI.Label(new Rect(posX + (width * .15f), posY + (height * .64f), width * .7f, 20), "Surasshu Slash X Z Z X", style);
- }
- else
+ } else
{
GUI.Label(new Rect(posX + (width * .15f), posY + (height * .40f), width * .7f, 20), "Kick B", style);
GUI.Label(new Rect(posX + (width * .15f), posY + (height * .46f), width * .7f, 20), "Punch A", style);
@@ -141,7 +140,7 @@ void ThePauseMenu()
GUI.Label(new Rect(posX + (width * .15f), posY + (height * .64f), width * .7f, 20), "Surasshu Slash B A A B", style);
}
}
-
+
}
@@ -160,10 +159,21 @@ public static void HardReset()
{
Score.scoreReset();
MusicPlayer.destroyMusic();
- //Loading.loadLevel("Start Menu");
- //SceneManager.LoadScene("Start Menu");
pause = false;
Time.timeScale = 1;
Loading.loadLevel("Start Menu");
}
+
+ public static void setHighScore()
+ {
+ if (!PlayerPrefs.HasKey("Score"))
+ PlayerPrefs.SetInt("Score", Score.getScore());
+ else
+ {
+ if (PlayerPrefs.GetInt("Score") < Score.getScore())
+ {
+ PlayerPrefs.SetInt("Score", Score.getScore());
+ }
+ }
+ }
}
@@ -6,8 +6,6 @@ EditorBuildSettings:
serializedVersion: 2
m_Scenes:
- enabled: 1
- path: Assets/Scenes/Loading.unity
- - enabled: 1
path: Assets/Scenes/TeamGold.unity
- enabled: 1
path: Assets/Scenes/Intro.unity
@@ -31,3 +29,5 @@ EditorBuildSettings:
path: Assets/Scenes/LVL8-FinalBoss.unity
- enabled: 1
path: Assets/Scenes/finalQTE.unity
+ - enabled: 1
+ path: Assets/Scenes/Loading.unity
@@ -1 +1 @@
-m_EditorVersion: 5.5.1f1
+m_EditorVersion: 5.5.0f3

0 comments on commit fbc65d6

Please sign in to comment.