From 148c5bb27c6cd8d70da9933c09c77934bfa16df9 Mon Sep 17 00:00:00 2001 From: Sewmina Date: Tue, 30 Aug 2022 02:37:00 +0530 Subject: [PATCH] Chests began --- Assets/Game/Scenes/GameScene/GameScene.unity | 170 ++++--------------- Assets/Game/Scripts/XpPass.cs | 30 +++- 2 files changed, 63 insertions(+), 137 deletions(-) diff --git a/Assets/Game/Scenes/GameScene/GameScene.unity b/Assets/Game/Scenes/GameScene/GameScene.unity index 65f43e850..9b7164241 100644 --- a/Assets/Game/Scenes/GameScene/GameScene.unity +++ b/Assets/Game/Scenes/GameScene/GameScene.unity @@ -37613,7 +37613,7 @@ RectTransform: - {fileID: 2056354922} - {fileID: 518139987} m_Father: {fileID: 1582299821} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -77897,7 +77897,7 @@ RectTransform: - {fileID: 1196581050} - {fileID: 1846832106} m_Father: {fileID: 1582299821} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -77927,7 +77927,7 @@ MonoBehaviour: rewardType: 0 amount: 5000 - level: 15 - rewardType: 1 + rewardType: 2 amount: 30 - level: 20 rewardType: 0 @@ -77936,8 +77936,8 @@ MonoBehaviour: rewardType: 1 amount: 30 - level: 30 - rewardType: 1 - amount: 30 + rewardType: 2 + amount: 0 - level: 35 rewardType: 0 amount: 10000 @@ -77946,11 +77946,14 @@ MonoBehaviour: amount: 10000 goldRewardIcon: {fileID: 21300000, guid: ffe128a5f047f43d9a494e099634504e, type: 3} gemRewardIcon: {fileID: 21300000, guid: f434a60f1f85c47e085d09cab598d63d, type: 3} + chestRewardIcon: {fileID: 21300000, guid: 209e0eb770bd94bc4ac1cf106de18eb7, type: 3} rewardCardPrefab: {fileID: 1932787894} xpLevelPointPrefab: {fileID: 59720551} disabledXpPointIcon: {fileID: 21300000, guid: 3ead9d80760a040d0b70e86939528e32, type: 3} xpLevelPointsParent: {fileID: 2084639708} rewardCardsParent: {fileID: 1469131955} + chestPrefab: {fileID: 866143676127507940, guid: fb02cbf41b93227d597e97072d759f23, type: 3} + chestSpawnParent: {fileID: 1582299821} --- !u!4 &400927294 stripped Transform: m_CorrespondingSourceObject: {fileID: 4484336936513742, guid: d9fcc61dcdf5a824482ec730ba796b47, type: 3} @@ -126087,108 +126090,6 @@ MonoBehaviour: precomputeOutline: 0 bakeKeys: [] bakeValues: [] ---- !u!1 &625352606 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 625352607} - - component: {fileID: 625352610} - - component: {fileID: 625352609} - - component: {fileID: 625352608} - m_Layer: 5 - m_Name: SubMenu - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &625352607 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 625352606} - 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_Children: - - {fileID: 731542336} - - {fileID: 1132398514} - m_Father: {fileID: 1582299821} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 276, y: -242} - m_SizeDelta: {x: 390.489, y: 141.27759} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &625352608 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 625352606} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 4 - m_StartCorner: 0 - m_StartAxis: 0 - m_CellSize: {x: 100, y: 100} - m_Spacing: {x: 100, y: 50} - m_Constraint: 0 - m_ConstraintCount: 2 ---- !u!114 &625352609 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 625352606} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &625352610 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 625352606} - m_CullTransparentMesh: 1 --- !u!1 &625499098 GameObject: m_ObjectHideFlags: 0 @@ -143700,7 +143601,7 @@ RectTransform: - {fileID: 1494891730} - {fileID: 1513281037} m_Father: {fileID: 1582299821} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -150292,7 +150193,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 625352607} + m_TransformParent: {fileID: 1582299821} m_Modifications: - target: {fileID: 2996527298064719084, guid: aaad26180fe71926d8e68c79e7a16f03, type: 3} propertyPath: m_Pivot.x @@ -150304,7 +150205,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2996527298064719084, guid: aaad26180fe71926d8e68c79e7a16f03, type: 3} propertyPath: m_RootOrder - value: 0 + value: 4 objectReference: {fileID: 0} - target: {fileID: 2996527298064719084, guid: aaad26180fe71926d8e68c79e7a16f03, type: 3} propertyPath: m_AnchorMax.x @@ -150312,7 +150213,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2996527298064719084, guid: aaad26180fe71926d8e68c79e7a16f03, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2996527298064719084, guid: aaad26180fe71926d8e68c79e7a16f03, type: 3} propertyPath: m_AnchorMin.x @@ -150320,15 +150221,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2996527298064719084, guid: aaad26180fe71926d8e68c79e7a16f03, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2996527298064719084, guid: aaad26180fe71926d8e68c79e7a16f03, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 100 objectReference: {fileID: 0} - target: {fileID: 2996527298064719084, guid: aaad26180fe71926d8e68c79e7a16f03, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 100 objectReference: {fileID: 0} - target: {fileID: 2996527298064719084, guid: aaad26180fe71926d8e68c79e7a16f03, type: 3} propertyPath: m_LocalPosition.x @@ -150360,11 +150261,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2996527298064719084, guid: aaad26180fe71926d8e68c79e7a16f03, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 195 objectReference: {fileID: 0} - target: {fileID: 2996527298064719084, guid: aaad26180fe71926d8e68c79e7a16f03, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -229 objectReference: {fileID: 0} - target: {fileID: 2996527298064719084, guid: aaad26180fe71926d8e68c79e7a16f03, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -209701,7 +209602,7 @@ RectTransform: - {fileID: 1963991271} - {fileID: 1284162106} m_Father: {fileID: 1582299821} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -243360,7 +243261,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 625352607} + m_TransformParent: {fileID: 1582299821} m_Modifications: - target: {fileID: 4910625423430463544, guid: 34cd695a79f27f95cbce88b05dcf4f9f, type: 3} propertyPath: m_Pivot.x @@ -243372,7 +243273,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4910625423430463544, guid: 34cd695a79f27f95cbce88b05dcf4f9f, type: 3} propertyPath: m_RootOrder - value: 1 + value: 5 objectReference: {fileID: 0} - target: {fileID: 4910625423430463544, guid: 34cd695a79f27f95cbce88b05dcf4f9f, type: 3} propertyPath: m_AnchorMax.x @@ -243380,7 +243281,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4910625423430463544, guid: 34cd695a79f27f95cbce88b05dcf4f9f, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4910625423430463544, guid: 34cd695a79f27f95cbce88b05dcf4f9f, type: 3} propertyPath: m_AnchorMin.x @@ -243388,15 +243289,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4910625423430463544, guid: 34cd695a79f27f95cbce88b05dcf4f9f, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 4910625423430463544, guid: 34cd695a79f27f95cbce88b05dcf4f9f, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 100 objectReference: {fileID: 0} - target: {fileID: 4910625423430463544, guid: 34cd695a79f27f95cbce88b05dcf4f9f, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 100 objectReference: {fileID: 0} - target: {fileID: 4910625423430463544, guid: 34cd695a79f27f95cbce88b05dcf4f9f, type: 3} propertyPath: m_LocalPosition.x @@ -243416,23 +243317,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4910625423430463544, guid: 34cd695a79f27f95cbce88b05dcf4f9f, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4910625423430463544, guid: 34cd695a79f27f95cbce88b05dcf4f9f, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4910625423430463544, guid: 34cd695a79f27f95cbce88b05dcf4f9f, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4910625423430463544, guid: 34cd695a79f27f95cbce88b05dcf4f9f, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 363 objectReference: {fileID: 0} - target: {fileID: 4910625423430463544, guid: 34cd695a79f27f95cbce88b05dcf4f9f, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -228.99997 objectReference: {fileID: 0} - target: {fileID: 4910625423430463544, guid: 34cd695a79f27f95cbce88b05dcf4f9f, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -354151,7 +354052,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -369, y: 304.8} + m_AnchoredPosition: {x: -287, y: 304.8} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} --- !u!114 &1530377681 @@ -372906,7 +372807,8 @@ RectTransform: - {fileID: 1576503550} - {fileID: 244868436} - {fileID: 1322653406} - - {fileID: 625352607} + - {fileID: 731542336} + - {fileID: 1132398514} - {fileID: 242163561} - {fileID: 720751228} - {fileID: 1748768623} @@ -424884,7 +424786,7 @@ RectTransform: - {fileID: 1681613284} - {fileID: 1157409012} m_Father: {fileID: 1582299821} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -459162,7 +459064,7 @@ RectTransform: - {fileID: 1631320146} - {fileID: 743094784} m_Father: {fileID: 1582299821} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -463861,7 +463763,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0.5892563} - m_SizeDelta: {x: 200, y: 50} + m_SizeDelta: {x: 400, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1878283195 MonoBehaviour: @@ -534031,7 +533933,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 866143676127507939, guid: fb02cbf41b93227d597e97072d759f23, type: 3} propertyPath: m_RootOrder - value: 11 + value: 13 objectReference: {fileID: 0} - target: {fileID: 866143676127507939, guid: fb02cbf41b93227d597e97072d759f23, type: 3} propertyPath: m_AnchorMax.x diff --git a/Assets/Game/Scripts/XpPass.cs b/Assets/Game/Scripts/XpPass.cs index 7cb9aefc0..e1171e9ad 100644 --- a/Assets/Game/Scripts/XpPass.cs +++ b/Assets/Game/Scripts/XpPass.cs @@ -10,11 +10,14 @@ public class XpPass : MonoBehaviour public Slider levelSlider; [SerializeField] public XpPassReward[] rewards; - public Sprite goldRewardIcon, gemRewardIcon; + public Sprite goldRewardIcon, gemRewardIcon, chestRewardIcon; public GameObject rewardCardPrefab; public GameObject xpLevelPointPrefab; public Sprite disabledXpPointIcon; public Transform xpLevelPointsParent, rewardCardsParent; + + public GameObject chestPrefab; + public Transform chestSpawnParent; void Start() { Refresh(); @@ -63,8 +66,21 @@ public class XpPass : MonoBehaviour GameObject xpLevelPoint = Instantiate(xpLevelPointPrefab, xpLevelPointsParent); xpLevelPoint.GetComponentInChildren().text = reward.level.ToString(); - rewardCard.transform.GetChild(1).GetComponent().sprite = (reward.rewardType == XpRewardType.Gold) ? goldRewardIcon : gemRewardIcon; + rewardCard.GetComponentInChildren().text = (reward.amount >=1000) ? reward.amount.ToString("0,000") : reward.amount.ToString(); + switch(reward.rewardType){ + case XpRewardType.Gold: + rewardCard.transform.GetChild(1).GetComponent().sprite = goldRewardIcon; + break; + case XpRewardType.Gems: + rewardCard.transform.GetChild(1).GetComponent().sprite = gemRewardIcon; + break; + case XpRewardType.Chest: + rewardCard.transform.GetChild(1).GetComponent().sprite = chestRewardIcon; + rewardCard.GetComponentInChildren().text = ""; + break; + } + if(reward.level > DBmanager.Level){ xpLevelPoint.GetComponent().sprite = disabledXpPointIcon; rewardCard.GetComponent