Skip to content
This repository was archived by the owner on Nov 10, 2022. It is now read-only.

Commit c3d8e16

Browse files
trolittrolit
committed
fix & small update!
- fixed win sound(now its playing only once) - added button to reset stats
1 parent 3b7c119 commit c3d8e16

File tree

5 files changed

+325
-17
lines changed

5 files changed

+325
-17
lines changed

‎lasthuman/Assets/Scenes/Menu.unity

+284-2
Original file line numberDiff line numberDiff line change
@@ -707,6 +707,56 @@ Prefab:
707707
propertyPath: m_RootOrder
708708
value: 7
709709
objectReference: {fileID: 0}
710+
- target: {fileID: 224019044021088790, guid: 600ab3a275c496140ae487f4a6ca788b,
711+
type: 2}
712+
propertyPath: m_RootOrder
713+
value: 7
714+
objectReference: {fileID: 0}
715+
- target: {fileID: 224658748670285822, guid: 600ab3a275c496140ae487f4a6ca788b,
716+
type: 2}
717+
propertyPath: m_RootOrder
718+
value: 5
719+
objectReference: {fileID: 0}
720+
- target: {fileID: 224146493420515170, guid: 600ab3a275c496140ae487f4a6ca788b,
721+
type: 2}
722+
propertyPath: m_RootOrder
723+
value: 4
724+
objectReference: {fileID: 0}
725+
- target: {fileID: 224975604695625904, guid: 600ab3a275c496140ae487f4a6ca788b,
726+
type: 2}
727+
propertyPath: m_RootOrder
728+
value: 3
729+
objectReference: {fileID: 0}
730+
- target: {fileID: 224015353259771388, guid: 600ab3a275c496140ae487f4a6ca788b,
731+
type: 2}
732+
propertyPath: m_RootOrder
733+
value: 6
734+
objectReference: {fileID: 0}
735+
- target: {fileID: 224146493420515170, guid: 600ab3a275c496140ae487f4a6ca788b,
736+
type: 2}
737+
propertyPath: m_AnchoredPosition.x
738+
value: 191.70004
739+
objectReference: {fileID: 0}
740+
- target: {fileID: 224975604695625904, guid: 600ab3a275c496140ae487f4a6ca788b,
741+
type: 2}
742+
propertyPath: m_AnchoredPosition.x
743+
value: 35
744+
objectReference: {fileID: 0}
745+
- target: {fileID: 224360891849300992, guid: 600ab3a275c496140ae487f4a6ca788b,
746+
type: 2}
747+
propertyPath: m_AnchoredPosition.x
748+
value: 396.4
749+
objectReference: {fileID: 0}
750+
- target: {fileID: 224975604695625904, guid: 600ab3a275c496140ae487f4a6ca788b,
751+
type: 2}
752+
propertyPath: m_SizeDelta.y
753+
value: 41.9
754+
objectReference: {fileID: 0}
755+
- target: {fileID: 224146493420515170, guid: 600ab3a275c496140ae487f4a6ca788b,
756+
type: 2}
757+
propertyPath: m_SizeDelta.y
758+
value: 41.9
759+
objectReference: {fileID: 0}
710760
m_RemovedComponents: []
711761
m_SourcePrefab: {fileID: 100100000, guid: 600ab3a275c496140ae487f4a6ca788b, type: 2}
712762
m_IsPrefabAsset: 0
@@ -1449,6 +1499,145 @@ CanvasRenderer:
14491499
m_PrefabInternal: {fileID: 0}
14501500
m_GameObject: {fileID: 372619545}
14511501
m_CullTransparentMesh: 0
1502+
--- !u!1 &406069719
1503+
GameObject:
1504+
m_ObjectHideFlags: 0
1505+
m_CorrespondingSourceObject: {fileID: 1217825861410834, guid: 600ab3a275c496140ae487f4a6ca788b,
1506+
type: 2}
1507+
m_PrefabInternal: {fileID: 0}
1508+
serializedVersion: 6
1509+
m_Component:
1510+
- component: {fileID: 406069720}
1511+
- component: {fileID: 406069723}
1512+
- component: {fileID: 406069722}
1513+
- component: {fileID: 406069721}
1514+
m_Layer: 5
1515+
m_Name: Reset_button
1516+
m_TagString: Untagged
1517+
m_Icon: {fileID: 0}
1518+
m_NavMeshLayer: 0
1519+
m_StaticEditorFlags: 4294967295
1520+
m_IsActive: 1
1521+
--- !u!224 &406069720
1522+
RectTransform:
1523+
m_ObjectHideFlags: 0
1524+
m_CorrespondingSourceObject: {fileID: 224975604695625904, guid: 600ab3a275c496140ae487f4a6ca788b,
1525+
type: 2}
1526+
m_PrefabInternal: {fileID: 0}
1527+
m_GameObject: {fileID: 406069719}
1528+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
1529+
m_LocalPosition: {x: 0, y: 0, z: 0}
1530+
m_LocalScale: {x: 1.0000035, y: 1.0000035, z: 1.0000035}
1531+
m_Children:
1532+
- {fileID: 1834171028}
1533+
m_Father: {fileID: 537564224}
1534+
m_RootOrder: 2
1535+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1536+
m_AnchorMin: {x: 0.5, y: 0}
1537+
m_AnchorMax: {x: 0.5, y: 0}
1538+
m_AnchoredPosition: {x: -146.9, y: 29}
1539+
m_SizeDelta: {x: 193.8, y: 41.9}
1540+
m_Pivot: {x: 0.5, y: 0.5}
1541+
--- !u!114 &406069721
1542+
MonoBehaviour:
1543+
m_ObjectHideFlags: 0
1544+
m_CorrespondingSourceObject: {fileID: 114296901795462180, guid: 600ab3a275c496140ae487f4a6ca788b,
1545+
type: 2}
1546+
m_PrefabInternal: {fileID: 0}
1547+
m_GameObject: {fileID: 406069719}
1548+
m_Enabled: 1
1549+
m_EditorHideFlags: 0
1550+
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
1551+
m_Name:
1552+
m_EditorClassIdentifier:
1553+
m_Navigation:
1554+
m_Mode: 0
1555+
m_SelectOnUp: {fileID: 0}
1556+
m_SelectOnDown: {fileID: 0}
1557+
m_SelectOnLeft: {fileID: 0}
1558+
m_SelectOnRight: {fileID: 0}
1559+
m_Transition: 1
1560+
m_Colors:
1561+
m_NormalColor: {r: 1, g: 1, b: 1, a: 0.24313726}
1562+
m_HighlightedColor: {r: 0, g: 0.7058824, b: 1, a: 0.24313726}
1563+
m_PressedColor: {r: 1, g: 0.49694997, b: 0, a: 0.34901962}
1564+
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.3372549}
1565+
m_ColorMultiplier: 1
1566+
m_FadeDuration: 0.1
1567+
m_SpriteState:
1568+
m_HighlightedSprite: {fileID: 0}
1569+
m_PressedSprite: {fileID: 0}
1570+
m_DisabledSprite: {fileID: 0}
1571+
m_AnimationTriggers:
1572+
m_NormalTrigger: Normal
1573+
m_HighlightedTrigger: Highlighted
1574+
m_PressedTrigger: Pressed
1575+
m_DisabledTrigger: Disabled
1576+
m_Interactable: 1
1577+
m_TargetGraphic: {fileID: 406069722}
1578+
m_OnClick:
1579+
m_PersistentCalls:
1580+
m_Calls:
1581+
- m_Target: {fileID: 501535313}
1582+
m_MethodName: ResetStatsAndSaves
1583+
m_Mode: 1
1584+
m_Arguments:
1585+
m_ObjectArgument: {fileID: 0}
1586+
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
1587+
m_IntArgument: 0
1588+
m_FloatArgument: 0
1589+
m_StringArgument:
1590+
m_BoolArgument: 1
1591+
m_CallState: 2
1592+
- m_Target: {fileID: 328248080}
1593+
m_MethodName: LoadData
1594+
m_Mode: 1
1595+
m_Arguments:
1596+
m_ObjectArgument: {fileID: 0}
1597+
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
1598+
m_IntArgument: 0
1599+
m_FloatArgument: 0
1600+
m_StringArgument:
1601+
m_BoolArgument: 1
1602+
m_CallState: 2
1603+
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
1604+
Culture=neutral, PublicKeyToken=null
1605+
--- !u!114 &406069722
1606+
MonoBehaviour:
1607+
m_ObjectHideFlags: 0
1608+
m_CorrespondingSourceObject: {fileID: 114009173835801790, guid: 600ab3a275c496140ae487f4a6ca788b,
1609+
type: 2}
1610+
m_PrefabInternal: {fileID: 0}
1611+
m_GameObject: {fileID: 406069719}
1612+
m_Enabled: 1
1613+
m_EditorHideFlags: 0
1614+
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
1615+
m_Name:
1616+
m_EditorClassIdentifier:
1617+
m_Material: {fileID: 0}
1618+
m_Color: {r: 1, g: 1, b: 1, a: 1}
1619+
m_RaycastTarget: 1
1620+
m_OnCullStateChanged:
1621+
m_PersistentCalls:
1622+
m_Calls: []
1623+
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
1624+
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
1625+
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
1626+
m_Type: 1
1627+
m_PreserveAspect: 0
1628+
m_FillCenter: 1
1629+
m_FillMethod: 4
1630+
m_FillAmount: 1
1631+
m_FillClockwise: 1
1632+
m_FillOrigin: 0
1633+
--- !u!222 &406069723
1634+
CanvasRenderer:
1635+
m_ObjectHideFlags: 0
1636+
m_CorrespondingSourceObject: {fileID: 222196308161582028, guid: 600ab3a275c496140ae487f4a6ca788b,
1637+
type: 2}
1638+
m_PrefabInternal: {fileID: 0}
1639+
m_GameObject: {fileID: 406069719}
1640+
m_CullTransparentMesh: 0
14521641
--- !u!1 &420512367
14531642
GameObject:
14541643
m_ObjectHideFlags: 0
@@ -23817,6 +24006,99 @@ RectTransform:
2381724006
m_CorrespondingSourceObject: {fileID: 224916075544687302, guid: f500d8d86e37c9e47984a3c6f218a908,
2381824007
type: 2}
2381924008
m_PrefabInternal: {fileID: 1817960376}
24009+
--- !u!1 &1834171027
24010+
GameObject:
24011+
m_ObjectHideFlags: 0
24012+
m_CorrespondingSourceObject: {fileID: 1017670113460872, guid: 600ab3a275c496140ae487f4a6ca788b,
24013+
type: 2}
24014+
m_PrefabInternal: {fileID: 0}
24015+
serializedVersion: 6
24016+
m_Component:
24017+
- component: {fileID: 1834171028}
24018+
- component: {fileID: 1834171031}
24019+
- component: {fileID: 1834171030}
24020+
- component: {fileID: 1834171029}
24021+
m_Layer: 5
24022+
m_Name: Text
24023+
m_TagString: Untagged
24024+
m_Icon: {fileID: 0}
24025+
m_NavMeshLayer: 0
24026+
m_StaticEditorFlags: 4294967295
24027+
m_IsActive: 1
24028+
--- !u!224 &1834171028
24029+
RectTransform:
24030+
m_ObjectHideFlags: 0
24031+
m_CorrespondingSourceObject: {fileID: 224393656408937792, guid: 600ab3a275c496140ae487f4a6ca788b,
24032+
type: 2}
24033+
m_PrefabInternal: {fileID: 0}
24034+
m_GameObject: {fileID: 1834171027}
24035+
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
24036+
m_LocalPosition: {x: 0, y: 0, z: 0}
24037+
m_LocalScale: {x: 1, y: 1, z: 1}
24038+
m_Children: []
24039+
m_Father: {fileID: 406069720}
24040+
m_RootOrder: 0
24041+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
24042+
m_AnchorMin: {x: 0, y: 0}
24043+
m_AnchorMax: {x: 1, y: 1}
24044+
m_AnchoredPosition: {x: 0, y: 0}
24045+
m_SizeDelta: {x: 0, y: 0}
24046+
m_Pivot: {x: 0.5, y: 0.5}
24047+
--- !u!114 &1834171029
24048+
MonoBehaviour:
24049+
m_ObjectHideFlags: 0
24050+
m_CorrespondingSourceObject: {fileID: 114313477394179004, guid: 600ab3a275c496140ae487f4a6ca788b,
24051+
type: 2}
24052+
m_PrefabInternal: {fileID: 0}
24053+
m_GameObject: {fileID: 1834171027}
24054+
m_Enabled: 1
24055+
m_EditorHideFlags: 0
24056+
m_Script: {fileID: 11500000, guid: fee7172bebedab34594b337b9dcc4158, type: 3}
24057+
m_Name:
24058+
m_EditorClassIdentifier:
24059+
t: {fileID: 1834171030}
24060+
--- !u!114 &1834171030
24061+
MonoBehaviour:
24062+
m_ObjectHideFlags: 0
24063+
m_CorrespondingSourceObject: {fileID: 114058439963552128, guid: 600ab3a275c496140ae487f4a6ca788b,
24064+
type: 2}
24065+
m_PrefabInternal: {fileID: 0}
24066+
m_GameObject: {fileID: 1834171027}
24067+
m_Enabled: 1
24068+
m_EditorHideFlags: 0
24069+
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
24070+
m_Name:
24071+
m_EditorClassIdentifier:
24072+
m_Material: {fileID: 0}
24073+
m_Color: {r: 1, g: 1, b: 1, a: 1}
24074+
m_RaycastTarget: 1
24075+
m_OnCullStateChanged:
24076+
m_PersistentCalls:
24077+
m_Calls: []
24078+
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
24079+
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
24080+
m_FontData:
24081+
m_Font: {fileID: 12800000, guid: 9a22af4b1e397ac40be674f3eccf6fbe, type: 3}
24082+
m_FontSize: 18
24083+
m_FontStyle: 0
24084+
m_BestFit: 0
24085+
m_MinSize: 1
24086+
m_MaxSize: 40
24087+
m_Alignment: 4
24088+
m_AlignByGeometry: 0
24089+
m_RichText: 1
24090+
m_HorizontalOverflow: 0
24091+
m_VerticalOverflow: 0
24092+
m_LineSpacing: 1
24093+
m_Text: RESET GAME STATS
24094+
--- !u!222 &1834171031
24095+
CanvasRenderer:
24096+
m_ObjectHideFlags: 0
24097+
m_CorrespondingSourceObject: {fileID: 222063547238747382, guid: 600ab3a275c496140ae487f4a6ca788b,
24098+
type: 2}
24099+
m_PrefabInternal: {fileID: 0}
24100+
m_GameObject: {fileID: 1834171027}
24101+
m_CullTransparentMesh: 0
2382024102
--- !u!1 &1854136269
2382124103
GameObject:
2382224104
m_ObjectHideFlags: 0
@@ -23939,8 +24221,8 @@ RectTransform:
2393924221
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2394024222
m_AnchorMin: {x: 0, y: 0}
2394124223
m_AnchorMax: {x: 1, y: 1}
23942-
m_AnchoredPosition: {x: -9, y: 1}
23943-
m_SizeDelta: {x: 931.1, y: 269.5}
24224+
m_AnchoredPosition: {x: 3.0999985, y: -0.5999985}
24225+
m_SizeDelta: {x: 981.1, y: 306.8}
2394424226
m_Pivot: {x: 0.5, y: 0.5}
2394524227
--- !u!114 &1862679407
2394624228
MonoBehaviour:

‎lasthuman/Assets/Scripts/AccomplishLevelStatus.cs

+18-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,22 @@ public class AccomplishLevelStatus : MonoBehaviour {
1717

1818
// Use this for initialization
1919
void Start ()
20+
{
21+
LoadLevelsDone();
22+
}
23+
24+
25+
public void ResetStatsAndSaves()
26+
{
27+
PlayerPrefs.SetInt("level1Finished", 0);
28+
PlayerPrefs.SetInt("warriorKill", 0);
29+
PlayerPrefs.SetInt("ogreKill", 0);
30+
PlayerPrefs.SetInt("zombieKill", 0);
31+
32+
LoadLevelsDone();
33+
}
34+
35+
private void LoadLevelsDone()
2036
{
2137
int level1 = PlayerPrefs.GetInt("level1Finished");
2238

@@ -26,11 +42,11 @@ void Start ()
2642
level2Title.enabled = true;
2743
level2Button.SetActive(true);
2844
}
29-
else if(level1 == 0)
45+
else if (level1 == 0)
3046
{
3147
level1finishedText.enabled = false;
3248
level2Title.enabled = false;
3349
level2Button.SetActive(false);
3450
}
35-
}
51+
}
3652
}

‎lasthuman/Assets/Scripts/KillsSaver.cs

+6-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,12 @@ public class KillsSaver : MonoBehaviour
1919
// Use this for initialization
2020
void Start ()
2121
{
22-
warriorsKilled = PlayerPrefs.GetInt("warriorKill");
22+
LoadData();
23+
}
24+
25+
public void LoadData()
26+
{
27+
warriorsKilled = PlayerPrefs.GetInt("warriorKill");
2328
ogresKilled = PlayerPrefs.GetInt("ogreKill");
2429
zombiesKilled = PlayerPrefs.GetInt("zombieKill");
2530

‎lasthuman/Assets/Scripts/Player.cs

+8-1
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,8 @@ public override bool IsDead
185185

186186
private bool doneQuest = false;
187187

188+
private bool playedSound = false;
189+
188190
// Use this for initialization
189191
public override void Start()
190192
{
@@ -281,7 +283,12 @@ void Update()
281283

282284
if(completedQuests >= 4)
283285
{
284-
audioSrc.PlayOneShot(youwon);
286+
if(!playedSound)
287+
{
288+
audioSrc.PlayOneShot(youwon);
289+
playedSound = true;
290+
}
291+
285292

286293
UnityEngine.Cursor.visible = true;
287294

0 commit comments

Comments
 (0)