Skip to content
Snippets Groups Projects
Commit 2fafebfc authored by Vito Ghifari's avatar Vito Ghifari
Browse files

fix: bug shop fix

parent 5ae4aef1
Branches
Tags
No related merge requests found
......@@ -86,6 +86,7 @@ MonoBehaviour:
petStartingHealth: 100
petHealth: 0
petHealthSlider: {fileID: 0}
petHealthText: {fileID: 0}
anim: {fileID: 2334188962927886170}
hurtSound: {fileID: 8300000, guid: 42690d90a8b89a645afca63d1655bd53, type: 3}
defaultSound: {fileID: 8300000, guid: c5f9af17d899945468ef05e3333ce670, type: 3}
......
......@@ -183,8 +183,8 @@ Rigidbody:
m_GameObject: {fileID: 853683055410104847}
serializedVersion: 2
m_Mass: 0.2
m_Drag: 0
m_AngularDrag: 0
m_Drag: 2
m_AngularDrag: 2
m_UseGravity: 0
m_IsKinematic: 0
m_Interpolate: 0
......
......@@ -597,8 +597,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a91d4c9a478c59c479554b808eb8bf50, type: 3}
m_Name:
m_EditorClassIdentifier:
ItemID: 2
ItemName: {fileID: 81408328}
ItemID: 3
ItemName: {fileID: 1227690308}
ShopManager: {fileID: 324087654}
--- !u!114 &113806041
MonoBehaviour:
......@@ -1876,7 +1876,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2bdbae1d3a1f4e0418dab9b79d34ff59, type: 3}
m_Name:
m_EditorClassIdentifier:
money: 0
money: 500
playerMoneyText: {fileID: 1917952383}
playerWeapon: {fileID: 1921339896}
petManager: {fileID: 1706899489}
......@@ -12360,7 +12360,7 @@ ParticleSystem:
emitterVelocityMode: 1
looping: 1
prewarm: 0
playOnAwake: 1
playOnAwake: 0
useUnscaledTime: 0
autoRandomSeed: 1
startDelay:
......@@ -18412,7 +18412,7 @@ PlayableDirector:
m_InitialState: 0
m_WrapMode: 2
m_DirectorUpdateMode: 1
m_InitialTime: 0
m_InitialTime: 47
m_SceneBindings:
- key: {fileID: 584183535725026357, guid: b0b13c56ed0b59a4c8af6728d87c8007, type: 2}
value: {fileID: 1401580262}
......@@ -19632,7 +19632,7 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 0}
- m_Target: {fileID: 1748350631}
m_TargetAssemblyTypeName: ShopTrigger, Assembly-CSharp
m_MethodName: CloseShop
m_Mode: 1
......
......@@ -82,7 +82,8 @@ public class PlayerHealth : MonoBehaviour
}
healthSlider.value = currentHealth;
StartCoroutine(HealEffect());
if (gameObject.activeSelf) StartCoroutine(HealEffect());
if (healthText != null) healthText.text = currentHealth.ToString() + "/" + startingHealth.ToString();
}
......
......@@ -61,6 +61,8 @@ public class ShopManager : MonoBehaviour {
// Disable
buttonRef.GetComponent<Button>().interactable = false;
buttonRef.GetComponentInChildren<Text>().text = "Sold";
}
}
......@@ -78,6 +80,8 @@ public class ShopManager : MonoBehaviour {
// Disable
buttonRef.GetComponent<Button>().interactable = false;
buttonRef.GetComponentInChildren<Text>().text = "Sold";
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment