From 67cb9b5d6e9b2fc01c39c3f3e9755a35234872fb Mon Sep 17 00:00:00 2001 From: Udit Chophla <65323408+uchop@users.noreply.github.com> Date: Sat, 18 Mar 2023 17:29:15 -0700 Subject: [PATCH] Adjusted Point System + End Screen --- .DS_Store | Bin 10244 -> 10244 bytes Assets/.DS_Store | Bin 8196 -> 8196 bytes Assets/DisplayScores.cs | 84 ++++++ Assets/DisplayScores.cs.meta | 11 + Assets/Explosion.cs | 2 +- Assets/FinalDoorKey.cs | 6 + Assets/GunToKill.cs | 2 +- Assets/HammerToInjure.cs | 2 +- Assets/KillGuard.cs | 2 +- Assets/PrisonerShot.cs | 2 +- Assets/Scenes/FinalScreen.unity | 453 +++++++++++++++++++++++++++++++- Assets/UseHammer.cs | 2 +- Assets/hammerPrisoners.cs | 2 +- UserSettings/Search.settings | 3 +- 14 files changed, 550 insertions(+), 21 deletions(-) create mode 100644 Assets/DisplayScores.cs create mode 100644 Assets/DisplayScores.cs.meta diff --git a/.DS_Store b/.DS_Store index 38ea9818dbdfbd2e07b79bf8811b7f8b8c7faacf..0f09acb66724de7e7f8b5dcc68cebec0bc9684c3 100644 GIT binary patch delta 563 zcmZn(XbIS$CJ?JRfq{X6g+Y%YogtHwjwJE?Z-6$hB_;PMD7vB@L*j)6;Hvxvwdrnmzubij6m0KJyWP=M^Uwx+;( xGngH4d4wI<>`;PDYhRQVLV@&y@& z!O8i#1wcIvEZ-S6Hw&y|bQf9zz$+LvAn4g)xnanOM$NK%i!=(n31B68<+Y9rsF71w(1mY<%y=|CWBJ32$zNi)K zdLM>-p#M;;@1b7&sC(i-;^@ird4_2(}{x=(Svi0%Wi0^}X+g whag-YVFxyOWIGrSE|}~iE;~6~lz*~=xCNvCWM6Ta%~Qn{`RQ)!sY94Y92poG*cgHtk{MDN@_@LwAj2>? TIX|}mD9*sZe_-B5c3|06@AG!2kdN diff --git a/Assets/DisplayScores.cs b/Assets/DisplayScores.cs new file mode 100644 index 0000000..bdcb239 --- /dev/null +++ b/Assets/DisplayScores.cs @@ -0,0 +1,84 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using TMPro; + +public class DisplayScores : MonoBehaviour +{ + private int reputation; + public TMP_Text reputationElement; + + private int sanityScore; + public TMP_Text sanityScoreElement; + + public TMP_Text anarchistOrPacifist; + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + reputation = ScoreManager.instance.GetReputationScore(); + reputationElement.text = "Reputation: " + reputation.ToString(); + sanityScore = ScoreManager.instance.GetSanityScore(); + sanityScoreElement.text = "Sanity Score: " + sanityScore.ToString(); + + if (sanityScore <= -40) + { + if (reputation <= -40) + { + //scared + anarchistOrPacifist.text = "Heavy Anarchist"; + } + else + { + //mixed + anarchistOrPacifist.text = "Moderate Anarchist"; + } + } + else if (sanityScore <= -20) + { + if (reputation <= 5) + { + //mixed + anarchistOrPacifist.text = "Moderate Anarchist"; + } + else + { + //neutral + anarchistOrPacifist.text = "Neutral"; + } + } + else if (sanityScore <= 0) + { + if (reputation < 0) + { + //netural + anarchistOrPacifist.text = "Neutral"; + } + else + { + //positive + anarchistOrPacifist.text = "Moderate Pacifist"; + + } + } + else + { + if (reputation <= 20) + { + //positive + anarchistOrPacifist.text = "Moderate Pacifist"; + } + else + { + //very positive + anarchistOrPacifist.text = "Heavy Pacifist"; + } + } + + } +} diff --git a/Assets/DisplayScores.cs.meta b/Assets/DisplayScores.cs.meta new file mode 100644 index 0000000..8bb43c4 --- /dev/null +++ b/Assets/DisplayScores.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: acb52b05eea364f99b067fd002aff8ce +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Explosion.cs b/Assets/Explosion.cs index 0a381f2..87246db 100644 --- a/Assets/Explosion.cs +++ b/Assets/Explosion.cs @@ -61,7 +61,7 @@ void Update() lvl2_npc_dialogue_2.text = selected_dialogue_2; if (!pointsAdded) { - ScoreManager.instance.AdddPoints(-40, -40); + ScoreManager.instance.AdddPoints(-5, -5); pointsAdded = true; } diff --git a/Assets/FinalDoorKey.cs b/Assets/FinalDoorKey.cs index 9f483de..be5542e 100644 --- a/Assets/FinalDoorKey.cs +++ b/Assets/FinalDoorKey.cs @@ -10,6 +10,7 @@ public class FinalDoorKey : MonoBehaviour public Sprite doorOpen; public bool playerIsClose; public AudioSource audioSource_; + private bool pointsAdded = false; // Start is called before the first frame update // void Start() @@ -24,6 +25,11 @@ void Update() { door_.GetComponent().sprite = doorOpen; door_.GetComponent ().enabled = false; + if (!pointsAdded) + { + ScoreManager.instance.AdddPoints(15, 15); + pointsAdded = true; + } audioSource_.Play(); } } diff --git a/Assets/GunToKill.cs b/Assets/GunToKill.cs index e2e5948..1969afa 100644 --- a/Assets/GunToKill.cs +++ b/Assets/GunToKill.cs @@ -27,7 +27,7 @@ void Update() pickUp(); if (!pointsAdded) { - ScoreManager.instance.AdddPoints(-30, -30); + ScoreManager.instance.AdddPoints(-10, -10); pointsAdded = true; } } diff --git a/Assets/HammerToInjure.cs b/Assets/HammerToInjure.cs index a7ffed1..4d6cb98 100644 --- a/Assets/HammerToInjure.cs +++ b/Assets/HammerToInjure.cs @@ -25,7 +25,7 @@ void Update() audioSource_.Play(); if (!pointsAdded) { - ScoreManager.instance.AdddPoints(-20, -20); + ScoreManager.instance.AdddPoints(-5, -5); pointsAdded = true; } } diff --git a/Assets/KillGuard.cs b/Assets/KillGuard.cs index bda3ad1..ad29fe6 100644 --- a/Assets/KillGuard.cs +++ b/Assets/KillGuard.cs @@ -31,7 +31,7 @@ void Update() lvl2_door.GetComponent ().enabled = false; if (!pointsAdded) { - ScoreManager.instance.AdddPoints(20, -20); + ScoreManager.instance.AdddPoints(20, -15); pointsAdded = true; } if(ScoreManager.instance.GetSanityScore() <= 0) { // clean runs are rewarded diff --git a/Assets/PrisonerShot.cs b/Assets/PrisonerShot.cs index 7154f88..6f5fc36 100644 --- a/Assets/PrisonerShot.cs +++ b/Assets/PrisonerShot.cs @@ -25,7 +25,7 @@ void Update() Destroy(gameObject); Destroy(lvl3_npc_dialogue); ScoreManager.instance.PrisonerDestroyed(); - ScoreManager.instance.AdddPoints(-20, -20); + ScoreManager.instance.AdddPoints(-10, -10); } } void OnTriggerEnter2D(Collider2D other){ diff --git a/Assets/Scenes/FinalScreen.unity b/Assets/Scenes/FinalScreen.unity index 2338f30..5de9cca 100644 --- a/Assets/Scenes/FinalScreen.unity +++ b/Assets/Scenes/FinalScreen.unity @@ -123,6 +123,142 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &213301859 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 213301860} + - component: {fileID: 213301862} + - component: {fileID: 213301861} + m_Layer: 5 + m_Name: Sanity Score + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &213301860 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 213301859} + m_LocalRotation: {x: 0, y: 0, z: -2.910383e-11, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.3851806, y: 2.7808194, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 306830067} + m_RootOrder: 4 + 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: 186.99995, y: 136.99997} + m_SizeDelta: {x: 430.6643, y: 23.941} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &213301861 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 213301859} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Sanity Score: ' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: d27445a7b86cf40ebb00f054cd40a838, type: 2} + m_sharedMaterial: {fileID: -5928435995367049608, guid: d27445a7b86cf40ebb00f054cd40a838, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4282025425 + m_fontColor: {r: 0.81960785, g: 0.52172333, b: 0.22745098, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 18 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &213301862 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 213301859} + m_CullTransparentMesh: 1 --- !u!1 &306830066 GameObject: m_ObjectHideFlags: 0 @@ -134,6 +270,7 @@ GameObject: - component: {fileID: 306830067} - component: {fileID: 306830069} - component: {fileID: 306830068} + - component: {fileID: 306830070} m_Layer: 5 m_Name: Panel m_TagString: Untagged @@ -157,6 +294,9 @@ RectTransform: - {fileID: 863985711} - {fileID: 1645207759} - {fileID: 1902839220} + - {fileID: 213301860} + - {fileID: 1858444484} + - {fileID: 2088958590} m_Father: {fileID: 651804257} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -184.288, y: 185.172, z: 0.3860016} @@ -203,6 +343,21 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 306830066} m_CullTransparentMesh: 1 +--- !u!114 &306830070 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 306830066} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: acb52b05eea364f99b067fd002aff8ce, type: 3} + m_Name: + m_EditorClassIdentifier: + reputationElement: {fileID: 1858444485} + sanityScoreElement: {fileID: 213301861} + anarchistOrPacifist: {fileID: 2088958591} --- !u!1 &430085676 GameObject: m_ObjectHideFlags: 0 @@ -468,7 +623,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 863985710} m_LocalRotation: {x: 0.044965174, y: -0.037528902, z: -0.998282, w: -0.0016725431} - m_LocalPosition: {x: 0, y: 0, z: 48.793648} + m_LocalPosition: {x: 0, y: 0, z: 49} m_LocalScale: {x: -0.9553669, y: -2.2720146, z: 0.999909} m_ConstrainProportionsScale: 0 m_Children: @@ -478,7 +633,7 @@ RectTransform: 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: 67.37989, y: -247.4751} + m_AnchoredPosition: {x: 142, y: -249} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &863985712 @@ -614,7 +769,7 @@ RectTransform: m_GameObject: {fileID: 1645207758} m_LocalRotation: {x: 0, y: 0, z: -2.910383e-11, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.3851806, y: 2.7808194, z: 1} + m_LocalScale: {x: 1.3851806, y: 2.5368025, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 306830067} @@ -622,8 +777,8 @@ RectTransform: 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: 73, y: 167} - m_SizeDelta: {x: 200, y: 50} + m_AnchoredPosition: {x: 305, y: 278} + m_SizeDelta: {x: 194.6954, y: 20.4064} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1645207760 MonoBehaviour: @@ -799,9 +954,9 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1688046693} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.00015258789, y: -0.00015258789, z: -10.000004} + m_LocalScale: {x: 1, y: 0.99999994, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} @@ -943,6 +1098,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1857656193} m_CullTransparentMesh: 1 +--- !u!1 &1858444483 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1858444484} + - component: {fileID: 1858444486} + - component: {fileID: 1858444485} + m_Layer: 5 + m_Name: Reputation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1858444484 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1858444483} + m_LocalRotation: {x: 0, y: 0, z: -2.910383e-11, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalScale: {x: 1.3851806, y: 2.7808194, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 306830067} + m_RootOrder: 5 + 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: 183.99995, y: 69.99998} + m_SizeDelta: {x: 424.4784, y: 22.5271} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1858444485 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1858444483} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Reputation: ' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: d27445a7b86cf40ebb00f054cd40a838, type: 2} + m_sharedMaterial: {fileID: -5928435995367049608, guid: d27445a7b86cf40ebb00f054cd40a838, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4282028241 + m_fontColor: {r: 0.81960785, g: 0.5663825, b: 0.22745098, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 18 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1858444486 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1858444483} + m_CullTransparentMesh: 1 --- !u!1 &1902839219 GameObject: m_ObjectHideFlags: 0 @@ -969,7 +1260,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1902839219} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.0000000056435} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.385124, y: 2.9866, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -978,8 +1269,8 @@ RectTransform: 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: 73, y: -127} - m_SizeDelta: {x: 200, y: 50} + m_AnchoredPosition: {x: -254, y: -262} + m_SizeDelta: {x: 181.4377, y: 20.3655} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1902839221 MonoBehaviour: @@ -1107,7 +1398,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1981773881} m_LocalRotation: {x: 0.044965174, y: -0.037528902, z: -0.998282, w: -0.0016725431} - m_LocalPosition: {x: 0, y: 0, z: 26.377953} + m_LocalPosition: {x: 0, y: 0, z: 27} m_LocalScale: {x: -0.7206685, y: -2.5755382, z: 0.9999091} m_ConstrainProportionsScale: 0 m_Children: @@ -1117,7 +1408,7 @@ RectTransform: 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: -177.09785, y: -249.5111} + m_AnchoredPosition: {x: -35, y: -250} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1981773883 @@ -1294,3 +1585,139 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2088958589 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2088958590} + - component: {fileID: 2088958592} + - component: {fileID: 2088958591} + m_Layer: 5 + m_Name: AnarchistOrPacifist + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2088958590 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2088958589} + m_LocalRotation: {x: 0, y: 0, z: -2.910383e-11, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.3851806, y: 2.7808194, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 306830067} + m_RootOrder: 6 + 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: 5, y: -113} + m_SizeDelta: {x: 430.6643, y: 23.941} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2088958591 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2088958589} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'PlaceHolder: ' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: d27445a7b86cf40ebb00f054cd40a838, type: 2} + m_sharedMaterial: {fileID: -5928435995367049608, guid: d27445a7b86cf40ebb00f054cd40a838, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4291001921 + m_fontColor: {r: 0.2559185, g: 0.494405, b: 0.764151, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 18 + m_fontSizeBase: 18 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &2088958592 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2088958589} + m_CullTransparentMesh: 1 diff --git a/Assets/UseHammer.cs b/Assets/UseHammer.cs index c2f52b0..928c0a7 100644 --- a/Assets/UseHammer.cs +++ b/Assets/UseHammer.cs @@ -39,7 +39,7 @@ void Update() lvl2_door.GetComponent ().enabled = false; if (!pointsAdded) { - ScoreManager.instance.AdddPoints(15, -15); + ScoreManager.instance.AdddPoints(15, -10); pointsAdded = true; } if(ScoreManager.instance.GetSanityScore() <= 0) { // clean runs are rewarded diff --git a/Assets/hammerPrisoners.cs b/Assets/hammerPrisoners.cs index 4608f37..ff57b6e 100644 --- a/Assets/hammerPrisoners.cs +++ b/Assets/hammerPrisoners.cs @@ -20,7 +20,7 @@ void Update() audioSource_.Play(); Destroy(gameObject); Destroy(lvl3_npc_dialogue); - ScoreManager.instance.AdddPoints(-10, -10); + ScoreManager.instance.AdddPoints(-5, -5); pointsAdded = true; } } diff --git a/UserSettings/Search.settings b/UserSettings/Search.settings index bd86399..479d759 100644 --- a/UserSettings/Search.settings +++ b/UserSettings/Search.settings @@ -7,7 +7,7 @@ onBoardingDoNotAskAgain = true showPackageIndexes = false showStatusBar = false scopes = { - "last_search.DA949528" = "field" + "last_search.DA949528" = "exitk" "OpenInspectorPreview.DA949528" = "0" "currentGroup.DA949528" = "all" } @@ -56,6 +56,7 @@ providers = { objectSelectors = { } recentSearches = [ + "e" ] searchItemFavorites = [ ]