From 230cf422065ed725a9bc2c966f63c3bdad8e0c6c Mon Sep 17 00:00:00 2001 From: Davetsa Date: Tue, 2 Jun 2026 15:09:30 +0300 Subject: [PATCH 01/16] Added 3 new trap types to Raid --- .../Resources/Prefabs/InventorySlot.prefab | 36 ++++++---- Assets/Raid/Scripts/Raid_InventoryItem.cs | 36 ++++++++-- Assets/Raid/Scripts/Raid_InventoryPage.cs | 66 ++++++++++++++++--- Assets/Raid/Scripts/Raid_LootTracking.cs | 4 +- 4 files changed, 115 insertions(+), 27 deletions(-) diff --git a/Assets/Raid/Resources/Prefabs/InventorySlot.prefab b/Assets/Raid/Resources/Prefabs/InventorySlot.prefab index ea7afecc01..1bb7e330c9 100644 --- a/Assets/Raid/Resources/Prefabs/InventorySlot.prefab +++ b/Assets/Raid/Resources/Prefabs/InventorySlot.prefab @@ -34,7 +34,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2294320647209229214} - 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} @@ -112,15 +111,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -178,6 +179,7 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &6558709874589024160 MonoBehaviour: m_ObjectHideFlags: 0 @@ -234,7 +236,6 @@ RectTransform: - {fileID: 6951559595162726552} - {fileID: 4600655608571120406} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -338,10 +339,24 @@ MonoBehaviour: - {fileID: 21300000, guid: 99c7face32ecb6142980df2783f75d01, type: 3} - {fileID: 21300000, guid: 30a2dc0c5074425489bc16b0a159fc16, type: 3} - {fileID: 21300000, guid: 94fc4eec4309b254f9ded46b451b19e8, type: 3} + raid_References: {fileID: 0} speed: 20 ItemWeightPopUp: {fileID: 6204422605173200407} ItemWeightText: {fileID: 85830848731055992} bomb: 0 + furnitureData: + Id: + Name: + Shape: + Rarity: 0 + FurnitureSize: {x: 0, y: 0, z: 0} + Placement: 0 + Weight: 0 + Value: 0 + Material: + Recycling: + UnityKey: + Filename: pickUp: {fileID: 8300000, guid: 45d122e4b24b9204e9b34f1cdf7b3f98, type: 3} explosion: {fileID: 8300000, guid: a83c17bfa715a8b4d9e7ca3a07b75c99, type: 3} _bombType: 0 @@ -479,6 +494,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9bfc941515091924983eba4f77542200, type: 3} m_Name: m_EditorClassIdentifier: + _useAudioSourceBaseVolume: 1 _soundType: 3 --- !u!1 &4147876186355326194 GameObject: @@ -512,7 +528,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2294320647209229214} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -590,15 +605,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -668,7 +685,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2294320647209229214} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -766,7 +782,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2294320647209229214} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -875,7 +890,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2294320647209229214} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -952,7 +966,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2294320647209229214} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1051,7 +1064,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2294320647209229214} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1078,6 +1090,7 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!222 &3443813914525258214 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1182,7 +1195,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2294320647209229214} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -1217,7 +1229,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 497160379, guid: 49307a2248260be42ae19f7c1c476051, type: 3} + m_Sprite: {fileID: 21300000, guid: 69f9040b67b354347a7cca745d7b5a87, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 diff --git a/Assets/Raid/Scripts/Raid_InventoryItem.cs b/Assets/Raid/Scripts/Raid_InventoryItem.cs index c7e876a508..868cef1bd3 100644 --- a/Assets/Raid/Scripts/Raid_InventoryItem.cs +++ b/Assets/Raid/Scripts/Raid_InventoryItem.cs @@ -101,18 +101,46 @@ public void SetData(GameFurniture gameFurniture) public void RemoveData() { ItemImage.gameObject.SetActive(false); + BombIndicator.SetActive(false); + bomb = false; } public void SetBomb(int bombType) { - _bombType = bombType; + SetTrap(bombType); + } + + public void SetTrap(int trapType) + { + _bombType = trapType; bomb = true; - if (spectator) - BombIndicator.SetActive(true); + BombIndicator.SetActive(true); } public void TriggerBomb() + { + TriggerTrap(); + } + + public void TriggerTrap() { if(!triggered && !timeEnded) { + string trapName; + switch (_bombType) + { + case 0: + trapName = "EndGame"; + break; + case 1: + trapName = "Freeze"; + break; + case 2: + trapName = "DoubleWeight"; + break; + default: + trapName = "Unknown"; + break; + } + Debug.Log($"(RAID) Trap triggered: {trapName} (type {_bombType})"); if(_bombType == 1) { Bomb.transform.localScale = new Vector2(3f, 3f); @@ -121,7 +149,7 @@ public void TriggerBomb() triggered = true; audioSource.PlayOneShot(explosion, SettingsCarrier.Instance.SentVolume(GetComponent()._soundType)); } - //BombIndicator.SetActive(false); + BombIndicator.SetActive(false); } public void LaunchBall() { diff --git a/Assets/Raid/Scripts/Raid_InventoryPage.cs b/Assets/Raid/Scripts/Raid_InventoryPage.cs index 8471e3cf4d..9aa9c3fbbb 100644 --- a/Assets/Raid/Scripts/Raid_InventoryPage.cs +++ b/Assets/Raid/Scripts/Raid_InventoryPage.cs @@ -23,12 +23,15 @@ public class Raid_InventoryPage : MonoBehaviour [SerializeField] private ExitRaid exitraid; [SerializeField] private bool spectator = false; [SerializeField] private bool firstItem = true; + [SerializeField, Min(1)] private int trapAmount = 3; + [SerializeField, Min(0f)] private float freezeDuration = 3f; + [SerializeField, Min(1f)] private float doubleWeightMultiplier = 2f; [System.Serializable] public class BombData { public int bombIndex; - //type 0: default, type 1: lock + //type 0: end game, type 1: freeze, type 2: double weight public int bombType; } [SerializeField] BombData[] Bombs; @@ -36,6 +39,9 @@ public class BombData List ListOfUIItems = new List(); List ListOfFurniture = new List(); + private bool inventoryFrozen; + private bool nextLootWeightDoubled; + private Coroutine freezeRoutine; //public PhotonView _photonView { get; private set; } private void Awake() @@ -96,7 +102,7 @@ public void InitializeInventoryUI(int InventorySize) for (int j = 0; j < Bombs.Length; j++) { Debug.Log("bombIndex: " + Bombs[j].bombIndex + " Bombs.Length: " + Bombs.Length); - ListOfUIItems[Bombs[j].bombIndex].GetComponent().SetBomb(Bombs[j].bombType); + ListOfUIItems[Bombs[j].bombIndex].GetComponent().SetTrap(Bombs[j].bombType); } } @@ -119,6 +125,10 @@ public void HandleItemLootingRPC(int index, float itemWeight) { return; } + if (inventoryFrozen) + { + return; + } if (raid_Timer.CurrentTime <= 0 || LootTracker.CurrentLootWeight > LootTracker.MaxLootWeight || exitraid.raidEnded) { return; @@ -129,10 +139,18 @@ public void HandleItemLootingRPC(int index, float itemWeight) if (item.GetComponent().bomb) { item.RemoveData(); - item.GetComponent().TriggerBomb(); - if (item.GetComponent()._bombType == 1) + item.GetComponent().TriggerTrap(); + switch (item.GetComponent()._bombType) { - LockItems(index); + case 0: + exitraid.EndRaid(); + break; + case 1: + StartFreeze(); + break; + case 2: + nextLootWeightDoubled = true; + break; } return; } @@ -140,7 +158,9 @@ public void HandleItemLootingRPC(int index, float itemWeight) if (itemWeight == item.ItemWeight && itemWeight != 0) { - LootTracker.SetLootCount(item.furnitureData,LootTracker.MaxLootWeight); + float lootWeightMultiplier = nextLootWeightDoubled ? doubleWeightMultiplier : 1f; + LootTracker.SetLootCount(item.furnitureData, LootTracker.MaxLootWeight, lootWeightMultiplier); + nextLootWeightDoubled = false; item.RemoveData(); } else { @@ -213,9 +233,19 @@ public void RandomizeInventoryContent(int InventorySize) } public void RandomizeBombs() { - Bombs[0].bombIndex = Random.Range(0, ListOfUIItems.Count / 3); - Bombs[1].bombIndex = Random.Range((ListOfUIItems.Count / 3) + 1, ListOfUIItems.Count / 3 * 2); - Bombs[2].bombIndex = Random.Range((ListOfUIItems.Count / 3 * 2) + 1, ListOfUIItems.Count); + int amount = Mathf.Clamp(trapAmount, 1, ListOfUIItems.Count); + Bombs = new BombData[amount]; + + List availableIndices = Enumerable.Range(0, ListOfUIItems.Count).OrderBy(_ => Random.value).Take(amount).ToList(); + + for (int i = 0; i < amount; i++) + { + Bombs[i] = new BombData + { + bombIndex = availableIndices[i], + bombType = i < 3 ? i : Random.Range(0, 3) + }; + } } /*[PunRPC]*/ public void SendBombLocationsRPC(string jsonBombs) @@ -246,6 +276,24 @@ public void LockItems(int index) if (ListOfUIItems[index + 4]) ListOfUIItems[index + 4].GetComponent().SetLocked(); } + + private void StartFreeze() + { + if (freezeRoutine != null) + { + StopCoroutine(freezeRoutine); + } + + freezeRoutine = StartCoroutine(FreezeInventoryRoutine()); + } + + private IEnumerator FreezeInventoryRoutine() + { + inventoryFrozen = true; + yield return new WaitForSeconds(freezeDuration); + inventoryFrozen = false; + freezeRoutine = null; + } // Sets the UI slot to a choosen item. public void SetInventorySlotDataRPC(List furnitureSet,int UiIndex, int FurnitureIndex) diff --git a/Assets/Raid/Scripts/Raid_LootTracking.cs b/Assets/Raid/Scripts/Raid_LootTracking.cs index 7d3bf22a4d..dc47987fc8 100644 --- a/Assets/Raid/Scripts/Raid_LootTracking.cs +++ b/Assets/Raid/Scripts/Raid_LootTracking.cs @@ -52,9 +52,9 @@ public void ResetLootCount() MaxLootText.text = MaxLootWeight.ToString() + " kg"; } - public void SetLootCount(GameFurniture furniture, float MaxLootWeight) + public void SetLootCount(GameFurniture furniture, float MaxLootWeight, float lootWeightMultiplier = 1f) { - float AddedLootWeight = (float)furniture.Weight; + float AddedLootWeight = (float)furniture.Weight * lootWeightMultiplier; ListOfCollectedLoot.Add(furniture); float NewLootWeight = CurrentLootWeight + AddedLootWeight; From 1b44d6de8f9ad682623bdd13c7654839011f9e9d Mon Sep 17 00:00:00 2001 From: Davetsa Date: Tue, 2 Jun 2026 15:39:25 +0300 Subject: [PATCH 02/16] Removed Red Screen and its references --- Assets/Raid/Scenes/40-Raid.unity | 99 ++---------------------- Assets/Raid/Scripts/ExitRaid.cs | 2 +- Assets/Raid/Scripts/Raid_LootTracking.cs | 2 +- Assets/Raid/Scripts/Raid_References.cs | 4 +- Assets/Raid/Scripts/Raid_Timer.cs | 2 +- 5 files changed, 11 insertions(+), 98 deletions(-) diff --git a/Assets/Raid/Scenes/40-Raid.unity b/Assets/Raid/Scenes/40-Raid.unity index 0e13d7f2ce..29640aad7d 100644 --- a/Assets/Raid/Scenes/40-Raid.unity +++ b/Assets/Raid/Scenes/40-Raid.unity @@ -2089,32 +2089,32 @@ PrefabInstance: - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_SizeDelta.x - value: 570 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_SizeDelta.y - value: 463 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_AnchoredPosition.x - value: 325 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_AnchoredPosition.y - value: -271.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8100441791961523161, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} @@ -2629,7 +2629,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cc5525cbc59bf5b4784c5ea50b218a1a, type: 3} m_Name: m_EditorClassIdentifier: - RedScreen: {fileID: 1867729179} EndMenu: {fileID: 1629411667} HeartHalves: {fileID: 1513048546} Heart: {fileID: 1264060820} @@ -4612,91 +4611,6 @@ MonoBehaviour: raidEnded: 0 raid_timer: {fileID: 0} raid_References: {fileID: 0} ---- !u!1 &1867729179 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1867729181} - - component: {fileID: 1867729180} - m_Layer: 0 - m_Name: RedScreen - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &1867729180 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1867729179} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, - type: 3} - m_Color: {r: 0.754717, g: 0.13100746, b: 0.13100746, a: 0.49019608} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1867729181 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1867729179} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 121, y: 191, z: 0} - m_LocalScale: {x: 1000, y: 1000, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1871291331 GameObject: m_ObjectHideFlags: 0 @@ -5088,7 +5002,6 @@ SceneRoots: - {fileID: 1918953309} - {fileID: 1271117244} - {fileID: 943703427} - - {fileID: 1867729181} - {fileID: 1644835078} - {fileID: 1871291332} - {fileID: 431680400} diff --git a/Assets/Raid/Scripts/ExitRaid.cs b/Assets/Raid/Scripts/ExitRaid.cs index 80337b5ed8..4799f64be3 100644 --- a/Assets/Raid/Scripts/ExitRaid.cs +++ b/Assets/Raid/Scripts/ExitRaid.cs @@ -18,7 +18,7 @@ public void EndRaid() raidEnded = true; OnEndRaid(); - raid_References.RedScreen.SetActive(true); + raid_References.EndMenu.SetActive(true); if(!raid_References.OutOfSpace.enabled && !raid_References.OutOfTime.enabled) diff --git a/Assets/Raid/Scripts/Raid_LootTracking.cs b/Assets/Raid/Scripts/Raid_LootTracking.cs index dc47987fc8..3076b61fe4 100644 --- a/Assets/Raid/Scripts/Raid_LootTracking.cs +++ b/Assets/Raid/Scripts/Raid_LootTracking.cs @@ -67,7 +67,7 @@ public void SetLootCount(GameFurniture furniture, float MaxLootWeight, float loo if (CurrentLootWeight > MaxLootWeight) { //EndScreen - raid_References.RedScreen.SetActive(true); + raid_References.EndMenu.SetActive(true); raid_References.OutOfSpace.enabled = true; diff --git a/Assets/Raid/Scripts/Raid_References.cs b/Assets/Raid/Scripts/Raid_References.cs index 20326ab223..6f7c116d89 100644 --- a/Assets/Raid/Scripts/Raid_References.cs +++ b/Assets/Raid/Scripts/Raid_References.cs @@ -6,7 +6,7 @@ public class Raid_References : MonoBehaviour { [SerializeField, Header("Reference GameObjects")] - public GameObject RedScreen; + public GameObject EndMenu; public GameObject HeartHalves; public GameObject Heart; @@ -21,7 +21,7 @@ public class Raid_References : MonoBehaviour private void Start() { inventoryHandler = GameObject.Find("ScriptHolder").GetComponent(); - RedScreen.SetActive(false); + EndMenu.SetActive(false); OutOfTime.enabled = false; OutOfSpace.enabled = false; diff --git a/Assets/Raid/Scripts/Raid_Timer.cs b/Assets/Raid/Scripts/Raid_Timer.cs index f213e2a8bc..db3ba99bc9 100644 --- a/Assets/Raid/Scripts/Raid_Timer.cs +++ b/Assets/Raid/Scripts/Raid_Timer.cs @@ -72,7 +72,7 @@ void Update() if (HasLimit && ((CountUp && CurrentTime >= TimerLimit) || (!CountUp && CurrentTime <= TimerLimit))) { OnTimeEnd(); - raid_References.RedScreen.SetActive(true); + raid_References.EndMenu.GetComponent().SetCollectedLoot(raid_References.raid_LootTracking.ListOfCollectedLoot); raid_References.EndMenu.SetActive(true); if (raid_References.OutOfSpace.enabled || raid_References.RaidEndedText.enabled) From 7851dd176e6c334158c1b408792c7594a6997ec2 Mon Sep 17 00:00:00 2001 From: Davetsa Date: Wed, 3 Jun 2026 11:17:55 +0300 Subject: [PATCH 03/16] Added a popup tahat shows Raid events like traps triggring or game ending --- Assets/Raid/Graphics/Shine.png | 3 + Assets/Raid/Graphics/Shine.png.meta | 179 ++ Assets/Raid/Graphics/bomb 1.png | 3 + Assets/Raid/Graphics/bomb 1.png.meta | 179 ++ Assets/Raid/Graphics/clock 1.png | 3 + Assets/Raid/Graphics/clock 1.png.meta | 179 ++ Assets/Raid/Graphics/icecubes2 1.png | 3 + Assets/Raid/Graphics/icecubes2 1.png.meta | 179 ++ Assets/Raid/Graphics/sarkynyt_sydan 1.png | 3 + .../Raid/Graphics/sarkynyt_sydan 1.png.meta | 179 ++ Assets/Raid/Graphics/weights 1.png | 3 + Assets/Raid/Graphics/weights 1.png.meta | 179 ++ Assets/Raid/Resources/Prefabs/EndMenu.prefab | 1359 +++++++++++++ .../Resources/Prefabs/EndMenu.prefab.meta | 7 + .../Resources/Prefabs/RaidEventPopup.prefab | 727 +++++++ .../Prefabs/RaidEventPopup.prefab.meta | 7 + Assets/Raid/Scenes/40-Raid.unity | 1742 +++-------------- Assets/Raid/Scripts/ExitRaid.cs | 54 +- Assets/Raid/Scripts/Raid_EventPopup.cs | 150 ++ Assets/Raid/Scripts/Raid_EventPopup.cs.meta | 11 + Assets/Raid/Scripts/Raid_InventoryPage.cs | 41 +- Assets/Raid/Scripts/Raid_LootTracking.cs | 19 +- Assets/Raid/Scripts/Raid_Timer.cs | 12 +- 23 files changed, 3727 insertions(+), 1494 deletions(-) create mode 100644 Assets/Raid/Graphics/Shine.png create mode 100644 Assets/Raid/Graphics/Shine.png.meta create mode 100644 Assets/Raid/Graphics/bomb 1.png create mode 100644 Assets/Raid/Graphics/bomb 1.png.meta create mode 100644 Assets/Raid/Graphics/clock 1.png create mode 100644 Assets/Raid/Graphics/clock 1.png.meta create mode 100644 Assets/Raid/Graphics/icecubes2 1.png create mode 100644 Assets/Raid/Graphics/icecubes2 1.png.meta create mode 100644 Assets/Raid/Graphics/sarkynyt_sydan 1.png create mode 100644 Assets/Raid/Graphics/sarkynyt_sydan 1.png.meta create mode 100644 Assets/Raid/Graphics/weights 1.png create mode 100644 Assets/Raid/Graphics/weights 1.png.meta create mode 100644 Assets/Raid/Resources/Prefabs/EndMenu.prefab create mode 100644 Assets/Raid/Resources/Prefabs/EndMenu.prefab.meta create mode 100644 Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab create mode 100644 Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab.meta create mode 100644 Assets/Raid/Scripts/Raid_EventPopup.cs create mode 100644 Assets/Raid/Scripts/Raid_EventPopup.cs.meta diff --git a/Assets/Raid/Graphics/Shine.png b/Assets/Raid/Graphics/Shine.png new file mode 100644 index 0000000000..46f800c91a --- /dev/null +++ b/Assets/Raid/Graphics/Shine.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:977f7f15a1bb8a1ab76cf901371845772b1f2b1058959733b5c5df64ec119031 +size 51198 diff --git a/Assets/Raid/Graphics/Shine.png.meta b/Assets/Raid/Graphics/Shine.png.meta new file mode 100644 index 0000000000..f023b3be32 --- /dev/null +++ b/Assets/Raid/Graphics/Shine.png.meta @@ -0,0 +1,179 @@ +fileFormatVersion: 2 +guid: 64b00f4be61371448934c52816bb3079 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 120 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 1 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: 10 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Raid/Graphics/bomb 1.png b/Assets/Raid/Graphics/bomb 1.png new file mode 100644 index 0000000000..8575d11f69 --- /dev/null +++ b/Assets/Raid/Graphics/bomb 1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a6a313064b5b3113dd4504a8b0f3fe63d42df3ccdee316e6d65bd9da943a3274 +size 14031 diff --git a/Assets/Raid/Graphics/bomb 1.png.meta b/Assets/Raid/Graphics/bomb 1.png.meta new file mode 100644 index 0000000000..32a27a50e9 --- /dev/null +++ b/Assets/Raid/Graphics/bomb 1.png.meta @@ -0,0 +1,179 @@ +fileFormatVersion: 2 +guid: 203e9d7fbfc3ab146b3a5efe940bd4fc +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 120 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 1 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: 10 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Raid/Graphics/clock 1.png b/Assets/Raid/Graphics/clock 1.png new file mode 100644 index 0000000000..adfe4f1597 --- /dev/null +++ b/Assets/Raid/Graphics/clock 1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93fdd2f80d1ecbf1e87d07f17187291b097f9a13a2775a99d6cd6f9aaaac94d3 +size 14521 diff --git a/Assets/Raid/Graphics/clock 1.png.meta b/Assets/Raid/Graphics/clock 1.png.meta new file mode 100644 index 0000000000..1596fe4cbf --- /dev/null +++ b/Assets/Raid/Graphics/clock 1.png.meta @@ -0,0 +1,179 @@ +fileFormatVersion: 2 +guid: 334e3eb1b24707a4aa53bab625e40c5b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 120 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 1 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: 10 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Raid/Graphics/icecubes2 1.png b/Assets/Raid/Graphics/icecubes2 1.png new file mode 100644 index 0000000000..20e5ebaaef --- /dev/null +++ b/Assets/Raid/Graphics/icecubes2 1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9de95fe439067b2763ac29b3715bb7d5a3f65253183d302dd919be6c0043f898 +size 29517 diff --git a/Assets/Raid/Graphics/icecubes2 1.png.meta b/Assets/Raid/Graphics/icecubes2 1.png.meta new file mode 100644 index 0000000000..3e18bb31d0 --- /dev/null +++ b/Assets/Raid/Graphics/icecubes2 1.png.meta @@ -0,0 +1,179 @@ +fileFormatVersion: 2 +guid: f3ee01a8f86d9eb4fb65049758f18bc8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 120 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 1 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: 10 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Raid/Graphics/sarkynyt_sydan 1.png b/Assets/Raid/Graphics/sarkynyt_sydan 1.png new file mode 100644 index 0000000000..78bec2c9d5 --- /dev/null +++ b/Assets/Raid/Graphics/sarkynyt_sydan 1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49732d86bdcd6a769ab32a511dc38b625664c66990bcd60a66a8d90a7f814185 +size 56410 diff --git a/Assets/Raid/Graphics/sarkynyt_sydan 1.png.meta b/Assets/Raid/Graphics/sarkynyt_sydan 1.png.meta new file mode 100644 index 0000000000..0baaef0426 --- /dev/null +++ b/Assets/Raid/Graphics/sarkynyt_sydan 1.png.meta @@ -0,0 +1,179 @@ +fileFormatVersion: 2 +guid: e744bbe740a59e147a20e863381e3cbe +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 120 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 1 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: 10 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Raid/Graphics/weights 1.png b/Assets/Raid/Graphics/weights 1.png new file mode 100644 index 0000000000..3ba7cdc465 --- /dev/null +++ b/Assets/Raid/Graphics/weights 1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c51bd5f4a1483aa820f1d5576633c19b1485c77d773738f15b9ba7a04de8a2a +size 21214 diff --git a/Assets/Raid/Graphics/weights 1.png.meta b/Assets/Raid/Graphics/weights 1.png.meta new file mode 100644 index 0000000000..4742246771 --- /dev/null +++ b/Assets/Raid/Graphics/weights 1.png.meta @@ -0,0 +1,179 @@ +fileFormatVersion: 2 +guid: 8cc5377ca2937f7419b6eec45686c507 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 120 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 1 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: 10 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Raid/Resources/Prefabs/EndMenu.prefab b/Assets/Raid/Resources/Prefabs/EndMenu.prefab new file mode 100644 index 0000000000..b799c67fc5 --- /dev/null +++ b/Assets/Raid/Resources/Prefabs/EndMenu.prefab @@ -0,0 +1,1359 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &683399793402178915 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2668198566995541017} + - component: {fileID: 7581730394780298031} + m_Layer: 5 + m_Name: EndMenu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2668198566995541017 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 683399793402178915} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7694085706824424523} + - {fileID: 4955164402522033619} + - {fileID: 2608056757774145037} + - {fileID: 2996294384490658919} + - {fileID: 1067388266668187510} + - {fileID: 7589572620979973684} + - {fileID: 6112746816069853310} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -69.0094, y: 1400} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7581730394780298031 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 683399793402178915} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 74cc78280cfa86f47a5c28ae40868e9c, type: 3} + m_Name: + m_EditorClassIdentifier: + collectedFurniture: {fileID: 6112746816069853310} + content: {fileID: 4296145650629842064} + itemPrefab: {fileID: 7481540141435164365, guid: 59f733f3d92449d4a8da7c84514fdf3b, + type: 3} +--- !u!1 &1381501735683521454 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2608056757774145037} + - component: {fileID: 7697999415421567569} + - component: {fileID: 1488597950548683860} + - component: {fileID: 4251700113119953666} + m_Layer: 5 + m_Name: QuitButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2608056757774145037 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1381501735683521454} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4845991159046646001} + m_Father: {fileID: 2668198566995541017} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 20} + m_SizeDelta: {x: 700, y: 170} + m_Pivot: {x: 0.5, y: 0} +--- !u!222 &7697999415421567569 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1381501735683521454} + m_CullTransparentMesh: 1 +--- !u!114 &1488597950548683860 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1381501735683521454} + m_Enabled: 1 + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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!114 &4251700113119953666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1381501735683521454} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.5471698, g: 0.5471698, b: 0.5471698, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1488597950548683860} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 7581730394780298031} + m_TargetAssemblyTypeName: Raid_EndMenu, Assembly-CSharp + m_MethodName: Restart + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &1714018183284757354 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6112746816069853310} + - component: {fileID: 8212355114958671073} + - component: {fileID: 2803854534454703076} + - component: {fileID: 5217739094710907303} + m_Layer: 5 + m_Name: CollectedFurniture + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6112746816069853310 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1714018183284757354} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1224089430747638059} + m_Father: {fileID: 2668198566995541017} + 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: 0, y: 0} + m_SizeDelta: {x: 1823.4402, y: 361.6519} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8212355114958671073 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1714018183284757354} + m_CullTransparentMesh: 1 +--- !u!114 &2803854534454703076 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1714018183284757354} + m_Enabled: 1 + 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: 0.392} + 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: 21300000, guid: b86df3bf84cd9ac4ebcf2c85a81b4a92, type: 3} + 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!114 &5217739094710907303 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1714018183284757354} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 86a6ac2cbdfc56347bcf51ef5592b643, type: 3} + m_Name: + m_EditorClassIdentifier: + content: {fileID: 4296145650629842064} + horizontallyScrollable: 1 + verticallyScrollable: 1 + scrollingMovementType: 1 + elasticity: 0.1 + inertia: 1 + decelerationRate: 0.135 + scrollSensitivity: 1 + viewportRectTransform: {fileID: 1224089430747638059} + horizontalScrollbar: {fileID: 0} + verticalScrollbar: {fileID: 0} + horizontalScrollbarVisibility: 0 + verticalScrollbarVisibility: 0 + horizontalScrollbarSpacing: 0 + verticalScrollbarSpacing: 0 + forwardUnusedEventsToContainer: 0 + onValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &2517094342130405460 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1067388266668187510} + - component: {fileID: 9118259545824328074} + - component: {fileID: 3800400781748713} + m_Layer: 5 + m_Name: OutOfSpace_Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1067388266668187510 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2517094342130405460} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2668198566995541017} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -161} + m_SizeDelta: {x: 1000, y: 100} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &9118259545824328074 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2517094342130405460} + m_CullTransparentMesh: 1 +--- !u!114 &3800400781748713 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2517094342130405460} + 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: 'Tila loppui kesken! + +' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190335 + m_fontColor: {r: 1, g: 0, b: 0, 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: 100 + m_fontSizeBase: 100 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + 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_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!1 &2776210990938143527 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4845991159046646001} + - component: {fileID: 3249626161825662273} + - component: {fileID: 2609106661338297336} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4845991159046646001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2776210990938143527} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2608056757774145037} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3249626161825662273 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2776210990938143527} + m_CullTransparentMesh: 1 +--- !u!114 &2609106661338297336 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2776210990938143527} + 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: Restart (debug) + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, 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: 100 + m_fontSizeBase: 100 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!1 &4048879783854710204 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2996294384490658919} + - component: {fileID: 2452535595763062689} + - component: {fileID: 6242287567820939983} + m_Layer: 5 + m_Name: OutOfTime_Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2996294384490658919 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4048879783854710204} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2668198566995541017} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -161} + m_SizeDelta: {x: 700, y: 100} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &2452535595763062689 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4048879783854710204} + m_CullTransparentMesh: 1 +--- !u!114 &6242287567820939983 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4048879783854710204} + 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: Aika loppui! + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190335 + m_fontColor: {r: 1, g: 0, b: 0, 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: 100 + m_fontSizeBase: 100 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + 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_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!1 &4231736991773157311 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1224089430747638059} + - component: {fileID: 7378793991001146470} + - component: {fileID: 2762187300279139303} + - component: {fileID: 6304691503544182585} + m_Layer: 5 + m_Name: Viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1224089430747638059 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4231736991773157311} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4296145650629842064} + m_Father: {fileID: 6112746816069853310} + 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: -912, y: 181.00002} + m_SizeDelta: {x: 1824, y: 342} + m_Pivot: {x: 0, y: 1} +--- !u!222 &7378793991001146470 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4231736991773157311} + m_CullTransparentMesh: 1 +--- !u!114 &2762187300279139303 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4231736991773157311} + m_Enabled: 1 + 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: 21300000, guid: 3c1e3b44764eb1644ae2170efb9f8874, type: 3} + 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!114 &6304691503544182585 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4231736991773157311} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShowMaskGraphic: 0 +--- !u!1 &4890914218739329929 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4296145650629842064} + - component: {fileID: 5955692375267767895} + - component: {fileID: 8019064690746453172} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4296145650629842064 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4890914218739329929} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1224089430747638059} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0.27990723, y: -0.16998291} + m_SizeDelta: {x: 0, y: -0.33999634} + m_Pivot: {x: 0, y: 1} +--- !u!114 &5955692375267767895 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4890914218739329929} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &8019064690746453172 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4890914218739329929} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 10 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 1 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!1 &5437918297314473116 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4955164402522033619} + - component: {fileID: 5662510827707541634} + - component: {fileID: 5788018193802634797} + - component: {fileID: 8059078631979693969} + m_Layer: 5 + m_Name: LobbyButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4955164402522033619 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5437918297314473116} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6983392782733801103} + m_Father: {fileID: 2668198566995541017} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 330} + m_SizeDelta: {x: 700, y: 170} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5662510827707541634 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5437918297314473116} + m_CullTransparentMesh: 1 +--- !u!114 &5788018193802634797 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5437918297314473116} + m_Enabled: 1 + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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!114 &8059078631979693969 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5437918297314473116} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.5471698, g: 0.5471698, b: 0.5471698, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 5788018193802634797} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 7581730394780298031} + m_TargetAssemblyTypeName: Raid_EndMenu, Assembly-CSharp + m_MethodName: ReturnToLobby + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1 &5544570916376748332 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7694085706824424523} + - component: {fileID: 3219074811616278404} + - component: {fileID: 486935528496687519} + m_Layer: 5 + m_Name: Backround + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7694085706824424523 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5544570916376748332} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2668198566995541017} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3219074811616278404 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5544570916376748332} + m_CullTransparentMesh: 1 +--- !u!114 &486935528496687519 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5544570916376748332} + m_Enabled: 1 + 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: 21300000, guid: b86df3bf84cd9ac4ebcf2c85a81b4a92, type: 3} + 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!1 &7547142841448891097 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7589572620979973684} + - component: {fileID: 7533135925986325428} + - component: {fileID: 1451048184010493724} + m_Layer: 5 + m_Name: EndedRaid_Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7589572620979973684 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7547142841448891097} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2668198566995541017} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -161} + m_SizeDelta: {x: 1000, y: 100} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &7533135925986325428 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7547142841448891097} + m_CullTransparentMesh: 1 +--- !u!114 &1451048184010493724 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7547142841448891097} + 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: "Lopetit ry\xF6st\xF6n!\n" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190335 + m_fontColor: {r: 1, g: 0, b: 0, 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: 100 + m_fontSizeBase: 100 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + 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_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!1 &7913419182231250056 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6983392782733801103} + - component: {fileID: 42319590731644495} + - component: {fileID: 2533958130996579354} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6983392782733801103 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7913419182231250056} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4955164402522033619} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &42319590731644495 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7913419182231250056} + m_CullTransparentMesh: 1 +--- !u!114 &2533958130996579354 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7913419182231250056} + 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: Lobby + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, 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: 100 + m_fontSizeBase: 100 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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} diff --git a/Assets/Raid/Resources/Prefabs/EndMenu.prefab.meta b/Assets/Raid/Resources/Prefabs/EndMenu.prefab.meta new file mode 100644 index 0000000000..aed5455ffd --- /dev/null +++ b/Assets/Raid/Resources/Prefabs/EndMenu.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b4a44dafffb2c114588e4e643e490678 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab b/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab new file mode 100644 index 0000000000..aa513168d1 --- /dev/null +++ b/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab @@ -0,0 +1,727 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1001} + - component: {fileID: 1002} + - component: {fileID: 1003} + - component: {fileID: 1004} + - component: {fileID: 1005} + m_Layer: 5 + m_Name: RaidEventPopup + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2001} + - {fileID: 8677795790919758679} + - {fileID: 6001} + - {fileID: 3001} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &1002 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 1 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 1000 + m_TargetDisplay: 0 +--- !u!114 &1003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!225 &1004 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000} + m_Enabled: 1 + m_Alpha: 1 + m_Interactable: 0 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 +--- !u!114 &1005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a5a5b5d7d2e4c94a9dd6f1d0f99c2b1, type: 3} + m_Name: + m_EditorClassIdentifier: + canvasGroup: {fileID: 1004} + backgroundImage: {fileID: 4820472504932973940} + image: {fileID: 6003} + titleText: {fileID: 4004} + messageText: {fileID: 5004} + showTime: 1.75 + scenarioVisuals: + - Scenario: 0 + Title: Trap triggered! + Message: The raid is ending. + BackgroundSprite: {fileID: 21300000, guid: 64b00f4be61371448934c52816bb3079, type: 3} + BackgroundColor: {r: 1, g: 1, b: 1, a: 0.55} + TextColor: {r: 1, g: 0.6313726, b: 0, a: 1} + Image: {fileID: 21300000, guid: 203e9d7fbfc3ab146b3a5efe940bd4fc, type: 3} + - Scenario: 1 + Title: Freeze trap! + Message: The inventory is frozen for a moment. + BackgroundSprite: {fileID: 21300000, guid: 64b00f4be61371448934c52816bb3079, type: 3} + BackgroundColor: {r: 1, g: 1, b: 1, a: 0.55} + TextColor: {r: 0, g: 0.76470596, b: 0.81568635, a: 1} + Image: {fileID: 21300000, guid: f3ee01a8f86d9eb4fb65049758f18bc8, type: 3} + - Scenario: 2 + Title: Double weight trap! + Message: This loot weighs double. + BackgroundSprite: {fileID: 21300000, guid: 64b00f4be61371448934c52816bb3079, type: 3} + BackgroundColor: {r: 1, g: 1, b: 1, a: 0.55} + TextColor: {r: 1, g: 0.6313726, b: 0, a: 1} + Image: {fileID: 21300000, guid: 8cc5377ca2937f7419b6eec45686c507, type: 3} + - Scenario: 3 + Title: Time ran out! + Message: The raid is ending. + BackgroundSprite: {fileID: 21300000, guid: 64b00f4be61371448934c52816bb3079, type: 3} + BackgroundColor: {r: 1, g: 1, b: 1, a: 0.55} + TextColor: {r: 1, g: 0.6313726, b: 0, a: 1} + Image: {fileID: 21300000, guid: 334e3eb1b24707a4aa53bab625e40c5b, type: 3} + - Scenario: 4 + Title: Too much loot! + Message: The heart could not carry any more. + BackgroundSprite: {fileID: 21300000, guid: 64b00f4be61371448934c52816bb3079, type: 3} + BackgroundColor: {r: 1, g: 1, b: 1, a: 0.55} + TextColor: {r: 1, g: 0.6313726, b: 0, a: 1} + Image: {fileID: 21300000, guid: e744bbe740a59e147a20e863381e3cbe, type: 3} +--- !u!1 &2000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2001} + - component: {fileID: 2002} + - component: {fileID: 2003} + m_Layer: 5 + m_Name: Overlay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2000} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1001} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2002 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2000} + m_CullTransparentMesh: 1 +--- !u!114 &2003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.55} + 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!1 &3000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3001} + - component: {fileID: 3002} + - component: {fileID: 3003} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3000} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4001} + - {fileID: 5001} + m_Father: {fileID: 1001} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.4, y: 0.4} + m_AnchorMax: {x: 0.6, y: 0.6} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 720, y: 300} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3002 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3000} + m_CullTransparentMesh: 1 +--- !u!114 &3003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3000} + 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: 0.95} + 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!1 &4000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4001} + - component: {fileID: 4002} + - component: {fileID: 4004} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4000} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3001} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.08, y: 0.58} + m_AnchorMax: {x: 0.92, y: 0.86} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4002 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4000} + m_CullTransparentMesh: 1 +--- !u!114 &4004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4000} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Trap triggered! + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: eca1bd84f719d7146a5b636b4f4beff0, type: 2} + m_sharedMaterial: {fileID: -2998110953030337146, guid: eca1bd84f719d7146a5b636b4f4beff0, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278226399 + m_fontColor: {r: 0.8745099, g: 0.5529412, b: 0, 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: 95.5 + m_fontSizeBase: 48 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 0 + m_fontSizeMax: 100 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!1 &5000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5001} + - component: {fileID: 5002} + - component: {fileID: 5004} + m_Layer: 5 + m_Name: Message + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5000} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3001} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.08, y: 0.18} + m_AnchorMax: {x: 0.92, y: 0.54} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5002 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5000} + m_CullTransparentMesh: 1 +--- !u!114 &5004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5000} + 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: 0.92, g: 0.92, b: 0.92, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: The raid is ending. + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: eca1bd84f719d7146a5b636b4f4beff0, type: 2} + m_sharedMaterial: {fileID: -2998110953030337146, guid: eca1bd84f719d7146a5b636b4f4beff0, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278226399 + m_fontColor: {r: 0.8745099, g: 0.5529412, b: 0, 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: 100 + m_fontSizeBase: 35 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 0 + m_fontSizeMax: 100 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!1 &6000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6001} + - component: {fileID: 6002} + - component: {fileID: 6003} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6000} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1001} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.25, y: 0.16} + m_AnchorMax: {x: 0.75, y: 0.4} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6002 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6000} + m_CullTransparentMesh: 1 +--- !u!114 &6003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6000} + m_Enabled: 1 + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 8cc5377ca2937f7419b6eec45686c507, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3371798991561071494 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8677795790919758679} + - component: {fileID: 707624120071196276} + - component: {fileID: 4820472504932973940} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8677795790919758679 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3371798991561071494} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1001} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.1} + m_AnchorMax: {x: 1, y: 0.9} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &707624120071196276 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3371798991561071494} + m_CullTransparentMesh: 1 +--- !u!114 &4820472504932973940 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3371798991561071494} + m_Enabled: 1 + 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: 0.55} + 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: 21300000, guid: 64b00f4be61371448934c52816bb3079, type: 3} + 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 diff --git a/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab.meta b/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab.meta new file mode 100644 index 0000000000..c29e42b8d3 --- /dev/null +++ b/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0f6203bc492f45d19b61a7276e389f6a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Raid/Scenes/40-Raid.unity b/Assets/Raid/Scenes/40-Raid.unity index 29640aad7d..bed058af03 100644 --- a/Assets/Raid/Scenes/40-Raid.unity +++ b/Assets/Raid/Scenes/40-Raid.unity @@ -270,142 +270,18 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!1 &174784408 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 174784409} - - component: {fileID: 174784411} - - component: {fileID: 174784410} - m_Layer: 5 - m_Name: EndedRaid_Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &174784409 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 174784408} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1629411668} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -161} - m_SizeDelta: {x: 1000, y: 100} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &174784410 +--- !u!114 &174784410 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 1451048184010493724, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + m_PrefabInstance: {fileID: 7674508947818206424} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 174784408} + m_GameObject: {fileID: 0} 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: "Lopetit ry\xF6st\xF6n!\n" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190335 - m_fontColor: {r: 1, g: 0, b: 0, 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: 100 - m_fontSizeBase: 100 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - 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_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 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 &174784411 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 174784408} - m_CullTransparentMesh: 1 --- !u!1 &251360812 GameObject: m_ObjectHideFlags: 0 @@ -542,81 +418,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 251360812} m_CullTransparentMesh: 1 ---- !u!1 &284771788 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 284771789} - - component: {fileID: 284771791} - - component: {fileID: 284771790} - m_Layer: 5 - m_Name: Backround - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &284771789 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 284771788} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1629411668} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &284771790 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 284771788} - m_Enabled: 1 - 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: 21300000, guid: b86df3bf84cd9ac4ebcf2c85a81b4a92, type: 3} - 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 &284771791 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 284771788} - m_CullTransparentMesh: 1 --- !u!114 &371317729 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, @@ -1020,7 +821,19 @@ MonoBehaviour: raidEnded: 0 raid_timer: {fileID: 0} raid_References: {fileID: 943703428} ---- !u!1 &526886926 +--- !u!114 &526886928 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3800400781748713, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + m_PrefabInstance: {fileID: 7674508947818206424} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &728986460 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1028,42 +841,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 526886927} - - component: {fileID: 526886929} - - component: {fileID: 526886928} + - component: {fileID: 728986461} + - component: {fileID: 728986463} + - component: {fileID: 728986462} m_Layer: 5 - m_Name: OutOfSpace_Text + m_Name: StartTimerText m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &526886927 +--- !u!224 &728986461 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 526886926} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 728986460} + 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1629411668} + m_Father: {fileID: 883441593} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -161} - m_SizeDelta: {x: 1000, y: 100} + m_AnchoredPosition: {x: 60, y: -50} + m_SizeDelta: {x: 1800, y: 200} m_Pivot: {x: 0.5, y: 1} ---- !u!114 &526886928 +--- !u!114 &728986462 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 526886926} + m_GameObject: {fileID: 728986460} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -1071,15 +884,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'Tila loppui kesken! - -' + m_text: 'Aikaa alkuun: 15' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -1088,8 +899,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190335 - m_fontColor: {r: 1, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1106,15 +917,15 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 100 - m_fontSizeBase: 100 + m_fontSize: 180 + m_fontSizeBase: 180 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 + m_fontStyle: 1 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -1144,371 +955,22 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 56.565186, y: 0, z: 30.021667, 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 &526886929 +--- !u!222 &728986463 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 526886926} + m_GameObject: {fileID: 728986460} m_CullTransparentMesh: 1 ---- !u!1 &542989119 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 542989120} - - component: {fileID: 542989122} - - component: {fileID: 542989121} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &542989120 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542989119} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1314988633} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &542989121 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542989119} - 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: Lobby - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, 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: 100 - m_fontSizeBase: 100 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 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 &542989122 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 542989119} - m_CullTransparentMesh: 1 ---- !u!1 &622636364 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 622636365} - - component: {fileID: 622636367} - - component: {fileID: 622636366} - m_Layer: 5 - m_Name: Content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &622636365 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 622636364} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 980579603} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.27990723, y: -0.16998291} - m_SizeDelta: {x: 0, y: -0.33999634} - m_Pivot: {x: 0, y: 1} ---- !u!114 &622636366 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 622636364} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: 10 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 1 - m_ChildScaleWidth: 1 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!114 &622636367 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 622636364} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 ---- !u!1 &728986460 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 728986461} - - component: {fileID: 728986463} - - component: {fileID: 728986462} - m_Layer: 5 - m_Name: StartTimerText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &728986461 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 728986460} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 883441593} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 60, y: -50} - m_SizeDelta: {x: 1800, y: 200} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &728986462 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 728986460} - 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: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: 'Aikaa alkuun: 15' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, 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: 180 - m_fontSizeBase: 180 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 1 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 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: 56.565186, y: 0, z: 30.021667, 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 &728986463 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 728986460} - m_CullTransparentMesh: 1 ---- !u!1001 &756492962 -PrefabInstance: +--- !u!1001 &756492962 +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: @@ -2089,32 +1551,32 @@ PrefabInstance: - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 570 objectReference: {fileID: 0} - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 463 objectReference: {fileID: 0} - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 325 objectReference: {fileID: 0} - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -271.5 objectReference: {fileID: 0} - target: {fileID: 8100441791961523161, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} @@ -2460,184 +1922,39 @@ MonoBehaviour: MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8100441791181853598, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - m_PrefabInstance: {fileID: 756492962} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!224 &756492966 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - m_PrefabInstance: {fileID: 756492962} - m_PrefabAsset: {fileID: 0} ---- !u!224 &756492967 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8100441791093507177, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - m_PrefabInstance: {fileID: 756492962} - m_PrefabAsset: {fileID: 0} ---- !u!114 &756492972 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7569432504062211167, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - m_PrefabInstance: {fileID: 756492962} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe3f669106d4fb94ebcd61d419d58f24, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &883441592 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 883441593} - - component: {fileID: 883441595} - - component: {fileID: 883441594} - m_Layer: 5 - m_Name: TimerBG - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &883441593 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 883441592} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 728986461} - m_Father: {fileID: 2107529345} - 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: -7, y: -775} - m_SizeDelta: {x: 1700, y: 300} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &883441594 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 883441592} - m_Enabled: 1 - 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: 21300000, guid: b86df3bf84cd9ac4ebcf2c85a81b4a92, type: 3} - 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 &883441595 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 883441592} - m_CullTransparentMesh: 1 ---- !u!1 &943703425 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 943703427} - - component: {fileID: 943703426} - - component: {fileID: 943703428} - m_Layer: 0 - m_Name: ScriptHolder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &943703426 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_PrefabInstance: {fileID: 756492962} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 943703425} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e48d019dae6394391c10f3cb7c8997, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - InventoryUI: {fileID: 371317729} - InventorySize: 20 - MediumItemMaxAmount: 16 - LargeItemMaxAmount: 8 ---- !u!4 &943703427 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} +--- !u!224 &756492966 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, + type: 3} + m_PrefabInstance: {fileID: 756492962} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 943703425} - serializedVersion: 2 - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &943703428 +--- !u!224 &756492967 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8100441791093507177, guid: 1456b9f29a360684da0ae9d727e82bd4, + type: 3} + m_PrefabInstance: {fileID: 756492962} + m_PrefabAsset: {fileID: 0} +--- !u!114 &756492972 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 7569432504062211167, guid: 1456b9f29a360684da0ae9d727e82bd4, + type: 3} + m_PrefabInstance: {fileID: 756492962} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 943703425} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cc5525cbc59bf5b4784c5ea50b218a1a, type: 3} + m_Script: {fileID: 11500000, guid: fe3f669106d4fb94ebcd61d419d58f24, type: 3} m_Name: m_EditorClassIdentifier: - EndMenu: {fileID: 1629411667} - HeartHalves: {fileID: 1513048546} - Heart: {fileID: 1264060820} - OutOfTime: {fileID: 1733482650} - OutOfSpace: {fileID: 526886928} - RaidEndedText: {fileID: 174784410} - inventoryHandler: {fileID: 943703426} - raid_LootTracking: {fileID: 756492972} ---- !u!1 &980579602 +--- !u!1 &883441592 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2645,57 +1962,43 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 980579603} - - component: {fileID: 980579606} - - component: {fileID: 980579605} - - component: {fileID: 980579604} + - component: {fileID: 883441593} + - component: {fileID: 883441595} + - component: {fileID: 883441594} m_Layer: 5 - m_Name: Viewport + m_Name: TimerBG m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &980579603 +--- !u!224 &883441593 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 980579602} + m_GameObject: {fileID: 883441592} 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_ConstrainProportionsScale: 0 m_Children: - - {fileID: 622636365} - m_Father: {fileID: 1121922996} + - {fileID: 728986461} + m_Father: {fileID: 2107529345} 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: -912, y: 181.00002} - m_SizeDelta: {x: 1824, y: 342} - m_Pivot: {x: 0, y: 1} ---- !u!114 &980579604 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 980579602} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!114 &980579605 + m_AnchoredPosition: {x: -7, y: -775} + m_SizeDelta: {x: 1700, y: 300} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &883441594 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 980579602} + m_GameObject: {fileID: 883441592} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -2709,7 +2012,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3c1e3b44764eb1644ae2170efb9f8874, type: 3} + m_Sprite: {fileID: 21300000, guid: b86df3bf84cd9ac4ebcf2c85a81b4a92, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2719,15 +2022,15 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &980579606 +--- !u!222 &883441595 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 980579602} + m_GameObject: {fileID: 883441592} m_CullTransparentMesh: 1 ---- !u!1 &1020350688 +--- !u!1 &943703425 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2735,242 +2038,67 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1020350689} - - component: {fileID: 1020350691} - - component: {fileID: 1020350690} - m_Layer: 5 - m_Name: Text (TMP) + - component: {fileID: 943703427} + - component: {fileID: 943703426} + - component: {fileID: 943703428} + m_Layer: 0 + m_Name: ScriptHolder m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1020350689 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1020350688} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1159371073} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1020350690 +--- !u!114 &943703426 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1020350688} + m_GameObject: {fileID: 943703425} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Script: {fileID: 11500000, guid: 83e48d019dae6394391c10f3cb7c8997, 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: Restart (debug) - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, 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: 100 - m_fontSizeBase: 100 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 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 &1020350691 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1020350688} - m_CullTransparentMesh: 1 ---- !u!1 &1121922995 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1121922996} - - component: {fileID: 1121922999} - - component: {fileID: 1121922998} - - component: {fileID: 1121922997} - m_Layer: 5 - m_Name: CollectedFurniture - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1121922996 -RectTransform: + InventoryUI: {fileID: 371317729} + InventorySize: 20 + MediumItemMaxAmount: 16 + LargeItemMaxAmount: 8 +--- !u!4 &943703427 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1121922995} + m_GameObject: {fileID: 943703425} + serializedVersion: 2 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 980579603} - m_Father: {fileID: 1629411668} - 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: 0, y: 0} - m_SizeDelta: {x: 1823.4402, y: 361.6519} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1121922997 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1121922995} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 86a6ac2cbdfc56347bcf51ef5592b643, type: 3} - m_Name: - m_EditorClassIdentifier: - content: {fileID: 622636365} - horizontallyScrollable: 1 - verticallyScrollable: 1 - scrollingMovementType: 1 - elasticity: 0.1 - inertia: 1 - decelerationRate: 0.135 - scrollSensitivity: 1 - viewportRectTransform: {fileID: 980579603} - horizontalScrollbar: {fileID: 0} - verticalScrollbar: {fileID: 0} - horizontalScrollbarVisibility: 0 - verticalScrollbarVisibility: 0 - horizontalScrollbarSpacing: 0 - verticalScrollbarSpacing: 0 - forwardUnusedEventsToContainer: 0 - onValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1121922998 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1121922995} - m_Enabled: 1 - 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: 0.392} - 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: 21300000, guid: b86df3bf84cd9ac4ebcf2c85a81b4a92, type: 3} - 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 &1121922999 -CanvasRenderer: + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &943703428 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1121922995} - m_CullTransparentMesh: 1 + m_GameObject: {fileID: 943703425} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cc5525cbc59bf5b4784c5ea50b218a1a, type: 3} + m_Name: + m_EditorClassIdentifier: + EndMenu: {fileID: 1629411667} + HeartHalves: {fileID: 1513048546} + Heart: {fileID: 1264060820} + OutOfTime: {fileID: 1733482650} + OutOfSpace: {fileID: 526886928} + RaidEndedText: {fileID: 174784410} + inventoryHandler: {fileID: 943703426} + raid_LootTracking: {fileID: 756492972} --- !u!1 &1128349490 GameObject: m_ObjectHideFlags: 0 @@ -3195,139 +2323,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1145828920} m_CullTransparentMesh: 1 ---- !u!1 &1159371072 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1159371073} - - component: {fileID: 1159371076} - - component: {fileID: 1159371075} - - component: {fileID: 1159371074} - m_Layer: 5 - m_Name: QuitButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1159371073 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1159371072} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1020350689} - m_Father: {fileID: 1629411668} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 20} - m_SizeDelta: {x: 700, y: 170} - m_Pivot: {x: 0.5, y: 0} ---- !u!114 &1159371074 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1159371072} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.5471698, g: 0.5471698, b: 0.5471698, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1159371075} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1629411669} - m_TargetAssemblyTypeName: Raid_EndMenu, Assembly-CSharp - m_MethodName: Restart - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &1159371075 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1159371072} - m_Enabled: 1 - 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: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - 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 &1159371076 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1159371072} - m_CullTransparentMesh: 1 --- !u!1 &1239113689 GameObject: m_ObjectHideFlags: 0 @@ -3523,159 +2518,26 @@ MonoBehaviour: type: 3} m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} - m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_DeselectOnBackgroundClick: 1 - m_PointerBehavior: 0 - m_CursorLockBehavior: 0 - m_ScrollDeltaPerTick: 6 ---- !u!1 &1314988632 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1314988633} - - component: {fileID: 1314988636} - - component: {fileID: 1314988635} - - component: {fileID: 1314988634} - m_Layer: 5 - m_Name: LobbyButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1314988633 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314988632} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 542989120} - m_Father: {fileID: 1629411668} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 330} - m_SizeDelta: {x: 700, y: 170} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1314988634 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314988632} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.5471698, g: 0.5471698, b: 0.5471698, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1314988635} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1629411669} - m_TargetAssemblyTypeName: Raid_EndMenu, Assembly-CSharp - m_MethodName: ReturnToLobby - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &1314988635 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314988632} - m_Enabled: 1 - 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: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - 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 &1314988636 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1314988632} - m_CullTransparentMesh: 1 + m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 + m_CursorLockBehavior: 0 + m_ScrollDeltaPerTick: 6 --- !u!1 &1494835852 GameObject: m_ObjectHideFlags: 0 @@ -3913,54 +2775,23 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1550062016} m_CullTransparentMesh: 1 ---- !u!1 &1629411667 +--- !u!1 &1629411667 stripped GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 683399793402178915, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + m_PrefabInstance: {fileID: 7674508947818206424} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1629411668} - - component: {fileID: 1629411669} - m_Layer: 5 - m_Name: EndMenu - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1629411668 +--- !u!224 &1629411668 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + m_PrefabInstance: {fileID: 7674508947818206424} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1629411667} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 284771789} - - {fileID: 1314988633} - - {fileID: 1159371073} - - {fileID: 1733482649} - - {fileID: 526886927} - - {fileID: 174784409} - - {fileID: 1121922996} - m_Father: {fileID: 1239113693} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -69.0094, y: 1400} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1629411669 +--- !u!114 &1629411669 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 7581730394780298031, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + m_PrefabInstance: {fileID: 7674508947818206424} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1629411667} m_Enabled: 1 @@ -3968,10 +2799,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 74cc78280cfa86f47a5c28ae40868e9c, type: 3} m_Name: m_EditorClassIdentifier: - collectedFurniture: {fileID: 1121922996} - content: {fileID: 622636365} - itemPrefab: {fileID: 7481540141435164365, guid: 59f733f3d92449d4a8da7c84514fdf3b, - type: 3} --- !u!1 &1644835073 GameObject: m_ObjectHideFlags: 0 @@ -4323,142 +3150,18 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1712154933} m_CullTransparentMesh: 1 ---- !u!1 &1733482648 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1733482649} - - component: {fileID: 1733482651} - - component: {fileID: 1733482650} - m_Layer: 5 - m_Name: OutOfTime_Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1733482649 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1733482648} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1629411668} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -161} - m_SizeDelta: {x: 700, y: 100} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &1733482650 +--- !u!114 &1733482650 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 6242287567820939983, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + m_PrefabInstance: {fileID: 7674508947818206424} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1733482648} + m_GameObject: {fileID: 0} 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: Aika loppui! - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190335 - m_fontColor: {r: 1, g: 0, b: 0, 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: 100 - m_fontSizeBase: 100 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - 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_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 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 &1733482651 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1733482648} - m_CullTransparentMesh: 1 --- !u!1 &1857859668 GameObject: m_ObjectHideFlags: 0 @@ -4992,6 +3695,129 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2145355899} m_CullTransparentMesh: 1 +--- !u!1001 &7674508947818206424 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1239113693} + m_Modifications: + - target: {fileID: 683399793402178915, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_Name + value: EndMenu + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_SizeDelta.x + value: -69.0094 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_SizeDelta.y + value: 1400 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4296145650629842064, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b4a44dafffb2c114588e4e643e490678, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Raid/Scripts/ExitRaid.cs b/Assets/Raid/Scripts/ExitRaid.cs index 4799f64be3..b0df5bf287 100644 --- a/Assets/Raid/Scripts/ExitRaid.cs +++ b/Assets/Raid/Scripts/ExitRaid.cs @@ -6,6 +6,12 @@ public class ExitRaid : MonoBehaviour { + public enum RaidEndReason + { + Trap, + OutOfTime, + OutOfSpace + } public event Action ExitedRaid; public bool raidEnded = false; @@ -14,21 +20,55 @@ public class ExitRaid : MonoBehaviour public void EndRaid() { - raid_References.EndMenu.GetComponent().SetCollectedLoot(raid_References.raid_LootTracking.ListOfCollectedLoot); - + EndRaid(RaidEndReason.Trap); + } + + public void EndRaid(RaidEndReason reason) + { + if (raidEnded) + { + return; + } + raidEnded = true; OnEndRaid(); + raid_timer.FinishRaid(); - raid_References.EndMenu.SetActive(true); + StartCoroutine(EndRaidRoutine(reason)); + } - if(!raid_References.OutOfSpace.enabled && !raid_References.OutOfTime.enabled) - raid_References.RaidEndedText.enabled = true; + private IEnumerator EndRaidRoutine(RaidEndReason reason) + { + SetEndReasonText(reason); - raid_timer.FinishRaid(); + yield return Raid_EventPopup.ShowAndWait(this, GetPopupScenario(reason)); + + raid_References.EndMenu.GetComponent().SetCollectedLoot(raid_References.raid_LootTracking.ListOfCollectedLoot); + raid_References.EndMenu.SetActive(true); } + public void OnEndRaid() { ExitedRaid?.Invoke(); } -} + private void SetEndReasonText(RaidEndReason reason) + { + raid_References.OutOfTime.enabled = reason == RaidEndReason.OutOfTime; + raid_References.OutOfSpace.enabled = reason == RaidEndReason.OutOfSpace; + raid_References.RaidEndedText.enabled = reason == RaidEndReason.Trap; + } + + private Raid_EventPopup.Scenario GetPopupScenario(RaidEndReason reason) + { + switch (reason) + { + case RaidEndReason.OutOfTime: + return Raid_EventPopup.Scenario.OutOfTime; + case RaidEndReason.OutOfSpace: + return Raid_EventPopup.Scenario.OutOfSpace; + default: + return Raid_EventPopup.Scenario.EndTrap; + } + } +} diff --git a/Assets/Raid/Scripts/Raid_EventPopup.cs b/Assets/Raid/Scripts/Raid_EventPopup.cs new file mode 100644 index 0000000000..c286179ce4 --- /dev/null +++ b/Assets/Raid/Scripts/Raid_EventPopup.cs @@ -0,0 +1,150 @@ +using System; +using System.Collections; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +public class Raid_EventPopup : MonoBehaviour +{ + public enum Scenario + { + EndTrap, + Freeze, + DoubleWeight, + OutOfTime, + OutOfSpace + } + + [Serializable] + private class ScenarioVisual + { + public Scenario Scenario; + public string Title; + public string Message; + public Sprite BackgroundSprite = null; + public Color BackgroundColor = new Color(0f, 0f, 0f, 0.55f); + public Color TextColor = Color.white; + public Sprite Image = null; + } + + private const string PopupResourcePath = "Prefabs/RaidEventPopup"; + private const float DefaultShowTime = 1.75f; + + private static Raid_EventPopup instance; + + [SerializeField] private CanvasGroup canvasGroup; + [SerializeField] private Image backgroundImage; + [SerializeField] private Image image; + [SerializeField] private TextMeshProUGUI titleText; + [SerializeField] private TextMeshProUGUI messageText; + [SerializeField] private float showTime = DefaultShowTime; + [SerializeField] private ScenarioVisual[] scenarioVisuals; + + public static void Show(MonoBehaviour owner, Scenario scenario) + { + if (owner == null) + { + return; + } + + owner.StartCoroutine(ShowAndWait(owner, scenario)); + } + + public static IEnumerator ShowAndWait(MonoBehaviour owner, Scenario scenario, Action onComplete = null) + { + Raid_EventPopup popup = GetOrCreate(); + if (popup == null) + { + onComplete?.Invoke(); + yield break; + } + + yield return popup.ShowRoutine(scenario); + onComplete?.Invoke(); + } + + private static Raid_EventPopup GetOrCreate() + { + if (instance != null) + { + return instance; + } + + Raid_EventPopup prefab = Resources.Load(PopupResourcePath); + if (prefab == null) + { + Debug.LogError($"Raid event popup prefab was not found at Resources/{PopupResourcePath}."); + return null; + } + + instance = Instantiate(prefab); + instance.name = "Raid Event Popup"; + DontDestroyOnLoad(instance.gameObject); + instance.gameObject.SetActive(false); + return instance; + } + + private IEnumerator ShowRoutine(Scenario scenario) + { + ApplyScenarioVisual(scenario); + + gameObject.SetActive(true); + if (canvasGroup != null) + { + canvasGroup.alpha = 1f; + } + + yield return new WaitForSeconds(showTime); + gameObject.SetActive(false); + } + + private void ApplyScenarioVisual(Scenario scenario) + { + ScenarioVisual visual = GetScenarioVisual(scenario); + + titleText.text = visual.Title; + messageText.text = visual.Message; + titleText.color = visual.TextColor; + messageText.color = visual.TextColor; + + ApplyImage(backgroundImage, visual.BackgroundSprite, visual.BackgroundColor); + + if (image != null) + { + image.sprite = visual.Image; + } + } + + private ScenarioVisual GetScenarioVisual(Scenario scenario) + { + if (scenarioVisuals != null) + { + foreach (ScenarioVisual visual in scenarioVisuals) + { + if (visual != null && visual.Scenario == scenario) + { + return visual; + } + } + } + + return new ScenarioVisual + { + Scenario = scenario, + Title = "Trap triggered!", + Message = "The raid is ending." + }; + } + + private void ApplyImage(Image image, Sprite sprite, Color color) + { + if (image == null) + { + return; + } + + image.sprite = sprite; + image.color = color; + image.type = sprite == null ? Image.Type.Simple : image.type; + } +} diff --git a/Assets/Raid/Scripts/Raid_EventPopup.cs.meta b/Assets/Raid/Scripts/Raid_EventPopup.cs.meta new file mode 100644 index 0000000000..22b4ca843b --- /dev/null +++ b/Assets/Raid/Scripts/Raid_EventPopup.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7a5a5b5d7d2e4c94a9dd6f1d0f99c2b1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Raid/Scripts/Raid_InventoryPage.cs b/Assets/Raid/Scripts/Raid_InventoryPage.cs index 9aa9c3fbbb..d29999bd92 100644 --- a/Assets/Raid/Scripts/Raid_InventoryPage.cs +++ b/Assets/Raid/Scripts/Raid_InventoryPage.cs @@ -138,38 +138,49 @@ public void HandleItemLootingRPC(int index, float itemWeight) Raid_InventoryItem item = ListOfUIItems[index]; if (item.GetComponent().bomb) { - item.RemoveData(); item.GetComponent().TriggerTrap(); + if (item.GetComponent()._bombType == 2) + { + nextLootWeightDoubled = true; + } + LootItem(item, itemWeight); switch (item.GetComponent()._bombType) { case 0: exitraid.EndRaid(); break; case 1: + Raid_EventPopup.Show(this, Raid_EventPopup.Scenario.Freeze); StartFreeze(); break; case 2: - nextLootWeightDoubled = true; + Raid_EventPopup.Show(this, Raid_EventPopup.Scenario.DoubleWeight); break; } + ListOfUIItems[index].ItemWeight = 0; return; } - item.LaunchBall(); - - if (itemWeight == item.ItemWeight && itemWeight != 0) - { - float lootWeightMultiplier = nextLootWeightDoubled ? doubleWeightMultiplier : 1f; - LootTracker.SetLootCount(item.furnitureData, LootTracker.MaxLootWeight, lootWeightMultiplier); - nextLootWeightDoubled = false; - item.RemoveData(); - } else - { - Debug.Log("This inventory slot has already been looted!"); - } + LootItem(item, itemWeight); ListOfUIItems[index].ItemWeight = 0; } } + private void LootItem(Raid_InventoryItem item, float itemWeight) + { + item.LaunchBall(); + + if (itemWeight == item.ItemWeight && itemWeight != 0) + { + float lootWeightMultiplier = nextLootWeightDoubled ? doubleWeightMultiplier : 1f; + LootTracker.SetLootCount(item.furnitureData, LootTracker.MaxLootWeight, lootWeightMultiplier); + nextLootWeightDoubled = false; + item.RemoveData(); + } else + { + Debug.Log("This inventory slot has already been looted!"); + } + } + // Get a list of furniture between LowestWeight and HighestWeight, also it accepts any List to allow for seasonal furniture sets public List WeightQuery(List furnitureList, float LowestWeight, float HighestWeight) { @@ -302,4 +313,4 @@ public void SetInventorySlotDataRPC(List furnitureSet,int UiIndex ListOfUIItems[UiIndex].SetData(furniture); return; } -} \ No newline at end of file +} diff --git a/Assets/Raid/Scripts/Raid_LootTracking.cs b/Assets/Raid/Scripts/Raid_LootTracking.cs index 3076b61fe4..9beeb4cbad 100644 --- a/Assets/Raid/Scripts/Raid_LootTracking.cs +++ b/Assets/Raid/Scripts/Raid_LootTracking.cs @@ -10,6 +10,7 @@ public class Raid_LootTracking : MonoBehaviour//PunCallbacks { [SerializeField, Header("Reference scripts")] private Raid_References raid_References; + [SerializeField] private ExitRaid exitRaid; [SerializeField, Header("Reference game components")] private TMP_Text CurrentLootText; [SerializeField] private TMP_Text OutOfText; @@ -24,6 +25,11 @@ public class Raid_LootTracking : MonoBehaviour//PunCallbacks public void Awake() { + if (exitRaid == null) + { + exitRaid = FindObjectOfType(); + } + /* _photonView = gameObject.AddComponent(); _photonView.ViewID = 3; if (PhotonNetwork.IsMasterClient) @@ -67,9 +73,6 @@ public void SetLootCount(GameFurniture furniture, float MaxLootWeight, float loo if (CurrentLootWeight > MaxLootWeight) { //EndScreen - - raid_References.EndMenu.SetActive(true); - raid_References.OutOfSpace.enabled = true; //HeartBreak animation Color tmp = raid_References.Heart.GetComponent().color; @@ -80,6 +83,16 @@ public void SetLootCount(GameFurniture furniture, float MaxLootWeight, float loo } raid_References.HeartHalves.SetActive(true); raid_References.Heart.GetComponent().enabled = false; + + if (exitRaid != null) + { + exitRaid.EndRaid(ExitRaid.RaidEndReason.OutOfSpace); + } + else + { + raid_References.EndMenu.SetActive(true); + raid_References.OutOfSpace.enabled = true; + } } } diff --git a/Assets/Raid/Scripts/Raid_Timer.cs b/Assets/Raid/Scripts/Raid_Timer.cs index db3ba99bc9..61a0e8154b 100644 --- a/Assets/Raid/Scripts/Raid_Timer.cs +++ b/Assets/Raid/Scripts/Raid_Timer.cs @@ -72,17 +72,7 @@ void Update() if (HasLimit && ((CountUp && CurrentTime >= TimerLimit) || (!CountUp && CurrentTime <= TimerLimit))) { OnTimeEnd(); - - raid_References.EndMenu.GetComponent().SetCollectedLoot(raid_References.raid_LootTracking.ListOfCollectedLoot); - raid_References.EndMenu.SetActive(true); - if (raid_References.OutOfSpace.enabled || raid_References.RaidEndedText.enabled) - { - raid_References.OutOfTime.enabled = false; - } - else if (!raid_References.OutOfSpace.enabled && !raid_References.RaidEndedText.enabled) - { - raid_References.OutOfTime.enabled = true; - } + exitRaid.EndRaid(ExitRaid.RaidEndReason.OutOfTime); CurrentTime = TimerLimit; SetTimerText(); TimerText.color = Color.red; From cbe0653564e93efc0081b1244deab7681ca59e15 Mon Sep 17 00:00:00 2001 From: Davetsa Date: Wed, 3 Jun 2026 13:09:50 +0300 Subject: [PATCH 04/16] Added and adjusted the image and text of double weight trap --- .../Resources/Prefabs/RaidEventPopup.prefab | 254 ++++++++++++++++-- Assets/Raid/Scripts/Raid_EventPopup.cs | 23 +- 2 files changed, 255 insertions(+), 22 deletions(-) diff --git a/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab b/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab index aa513168d1..f0c29e5d35 100644 --- a/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab +++ b/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab @@ -35,7 +35,9 @@ RectTransform: - {fileID: 2001} - {fileID: 8677795790919758679} - {fileID: 6001} + - {fileID: 7001} - {fileID: 3001} + - {fileID: 8001} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -110,45 +112,51 @@ MonoBehaviour: canvasGroup: {fileID: 1004} backgroundImage: {fileID: 4820472504932973940} image: {fileID: 6003} - titleText: {fileID: 4004} + secondaryImage: {fileID: 7003} messageText: {fileID: 5004} + MultText: {fileID: 8004} showTime: 1.75 scenarioVisuals: - Scenario: 0 - Title: Trap triggered! - Message: The raid is ending. + Message: Ansa! Kuolettava pommi BackgroundSprite: {fileID: 21300000, guid: 64b00f4be61371448934c52816bb3079, type: 3} BackgroundColor: {r: 1, g: 1, b: 1, a: 0.55} TextColor: {r: 1, g: 0.6313726, b: 0, a: 1} Image: {fileID: 21300000, guid: 203e9d7fbfc3ab146b3a5efe940bd4fc, type: 3} + SecondaryImage: {fileID: 0} + MultText: - Scenario: 1 - Title: Freeze trap! - Message: The inventory is frozen for a moment. + Message: "Ansa! J\xE4\xE4dyit 10 Sekunniksi" BackgroundSprite: {fileID: 21300000, guid: 64b00f4be61371448934c52816bb3079, type: 3} BackgroundColor: {r: 1, g: 1, b: 1, a: 0.55} TextColor: {r: 0, g: 0.76470596, b: 0.81568635, a: 1} Image: {fileID: 21300000, guid: f3ee01a8f86d9eb4fb65049758f18bc8, type: 3} + SecondaryImage: {fileID: 0} + MultText: - Scenario: 2 - Title: Double weight trap! - Message: This loot weighs double. + Message: Ansa! Esineen paino tuplaantui BackgroundSprite: {fileID: 21300000, guid: 64b00f4be61371448934c52816bb3079, type: 3} BackgroundColor: {r: 1, g: 1, b: 1, a: 0.55} TextColor: {r: 1, g: 0.6313726, b: 0, a: 1} - Image: {fileID: 21300000, guid: 8cc5377ca2937f7419b6eec45686c507, type: 3} + Image: {fileID: 0} + SecondaryImage: {fileID: 21300000, guid: 8cc5377ca2937f7419b6eec45686c507, type: 3} + MultText: x2 - Scenario: 3 - Title: Time ran out! - Message: The raid is ending. + Message: "Aika! Peli P\xE4\xE4ttynyt" BackgroundSprite: {fileID: 21300000, guid: 64b00f4be61371448934c52816bb3079, type: 3} BackgroundColor: {r: 1, g: 1, b: 1, a: 0.55} TextColor: {r: 1, g: 0.6313726, b: 0, a: 1} Image: {fileID: 21300000, guid: 334e3eb1b24707a4aa53bab625e40c5b, type: 3} + SecondaryImage: {fileID: 0} + MultText: - Scenario: 4 - Title: Too much loot! - Message: The heart could not carry any more. + Message: "Syd\xE4men kapasiteetti ylitetty" BackgroundSprite: {fileID: 21300000, guid: 64b00f4be61371448934c52816bb3079, type: 3} BackgroundColor: {r: 1, g: 1, b: 1, a: 0.55} TextColor: {r: 1, g: 0.6313726, b: 0, a: 1} Image: {fileID: 21300000, guid: e744bbe740a59e147a20e863381e3cbe, type: 3} + SecondaryImage: {fileID: 0} + MultText: --- !u!1 &2000 GameObject: m_ObjectHideFlags: 0 @@ -366,7 +374,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Trap triggered! + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: eca1bd84f719d7146a5b636b4f4beff0, type: 2} m_sharedMaterial: {fileID: -2998110953030337146, guid: eca1bd84f719d7146a5b636b4f4beff0, @@ -394,7 +402,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 95.5 + m_fontSize: 48 m_fontSizeBase: 48 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -471,7 +479,7 @@ RectTransform: m_Father: {fileID: 3001} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.08, y: 0.18} - m_AnchorMax: {x: 0.92, y: 0.54} + m_AnchorMax: {x: 0.92, y: 0.85} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -503,7 +511,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: The raid is ending. + m_text: Trap triggered! The raid is ending. m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: eca1bd84f719d7146a5b636b4f4beff0, type: 2} m_sharedMaterial: {fileID: -2998110953030337146, guid: eca1bd84f719d7146a5b636b4f4beff0, @@ -537,7 +545,7 @@ MonoBehaviour: m_enableAutoSizing: 1 m_fontSizeMin: 0 m_fontSizeMax: 100 - m_fontStyle: 0 + m_fontStyle: 1 m_HorizontalAlignment: 2 m_VerticalAlignment: 512 m_textAlignment: 65535 @@ -637,6 +645,81 @@ MonoBehaviour: m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 334e3eb1b24707a4aa53bab625e40c5b, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7001} + - component: {fileID: 7002} + - component: {fileID: 7003} + m_Layer: 5 + m_Name: Secondary Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7000} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1001} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.15, y: 0.28} + m_AnchorMax: {x: 0.85, y: 0.46} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7002 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7000} + m_CullTransparentMesh: 1 +--- !u!114 &7003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7000} + m_Enabled: 1 + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -650,6 +733,143 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8001} + - component: {fileID: 8002} + - component: {fileID: 8004} + m_Layer: 5 + m_Name: MultText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8000} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1001} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.2, y: 0.32} + m_AnchorMax: {x: 0.8, y: 0.43} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8002 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8000} + m_CullTransparentMesh: 1 +--- !u!114 &8004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8000} + 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: 0.6313726, b: 0, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: x2 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: eca1bd84f719d7146a5b636b4f4beff0, type: 2} + m_sharedMaterial: {fileID: -2998110953030337146, guid: eca1bd84f719d7146a5b636b4f4beff0, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 150 + m_fontSizeBase: 28 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 0 + m_fontSizeMax: 150 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!1 &3371798991561071494 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Raid/Scripts/Raid_EventPopup.cs b/Assets/Raid/Scripts/Raid_EventPopup.cs index c286179ce4..b35f7868bd 100644 --- a/Assets/Raid/Scripts/Raid_EventPopup.cs +++ b/Assets/Raid/Scripts/Raid_EventPopup.cs @@ -19,12 +19,13 @@ public enum Scenario private class ScenarioVisual { public Scenario Scenario; - public string Title; public string Message; public Sprite BackgroundSprite = null; public Color BackgroundColor = new Color(0f, 0f, 0f, 0.55f); public Color TextColor = Color.white; public Sprite Image = null; + public Sprite SecondaryImage = null; + public string MultText = ""; } private const string PopupResourcePath = "Prefabs/RaidEventPopup"; @@ -35,8 +36,9 @@ private class ScenarioVisual [SerializeField] private CanvasGroup canvasGroup; [SerializeField] private Image backgroundImage; [SerializeField] private Image image; - [SerializeField] private TextMeshProUGUI titleText; + [SerializeField] private Image secondaryImage; [SerializeField] private TextMeshProUGUI messageText; + [SerializeField] private TextMeshProUGUI MultText; [SerializeField] private float showTime = DefaultShowTime; [SerializeField] private ScenarioVisual[] scenarioVisuals; @@ -102,17 +104,29 @@ private void ApplyScenarioVisual(Scenario scenario) { ScenarioVisual visual = GetScenarioVisual(scenario); - titleText.text = visual.Title; messageText.text = visual.Message; - titleText.color = visual.TextColor; + MultText.text = visual.MultText; messageText.color = visual.TextColor; + MultText.color = visual.TextColor; ApplyImage(backgroundImage, visual.BackgroundSprite, visual.BackgroundColor); if (image != null) { + image.gameObject.SetActive(visual.Image != null); image.sprite = visual.Image; } + + if (secondaryImage != null) + { + secondaryImage.gameObject.SetActive(visual.SecondaryImage != null); + secondaryImage.sprite = visual.SecondaryImage; + } + + if (MultText != null) + { + MultText.gameObject.SetActive(!string.IsNullOrWhiteSpace(visual.MultText)); + } } private ScenarioVisual GetScenarioVisual(Scenario scenario) @@ -131,7 +145,6 @@ private ScenarioVisual GetScenarioVisual(Scenario scenario) return new ScenarioVisual { Scenario = scenario, - Title = "Trap triggered!", Message = "The raid is ending." }; } From d02f397d983afc96730c46f8ce0d4eecfbc989ce Mon Sep 17 00:00:00 2001 From: Davetsa Date: Wed, 3 Jun 2026 14:12:43 +0300 Subject: [PATCH 05/16] fixed timer exit transition and added frot effect to ice trap --- Assets/Raid/Graphics/frosting 1.png | 3 + Assets/Raid/Graphics/frosting 1.png.meta | 179 ++++++++++++++++++ .../Resources/Prefabs/RaidEventPopup.prefab | 87 +++++++++ Assets/Raid/Scripts/ExitRaid.cs | 52 +++++ Assets/Raid/Scripts/Raid_EventPopup.cs | 9 + Assets/Raid/Scripts/Raid_Timer.cs | 34 +++- 6 files changed, 363 insertions(+), 1 deletion(-) create mode 100644 Assets/Raid/Graphics/frosting 1.png create mode 100644 Assets/Raid/Graphics/frosting 1.png.meta diff --git a/Assets/Raid/Graphics/frosting 1.png b/Assets/Raid/Graphics/frosting 1.png new file mode 100644 index 0000000000..3f05b104ae --- /dev/null +++ b/Assets/Raid/Graphics/frosting 1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df4ec0a63c5d4b4fb9bd636bfca0d7401868a569174ca62254ec110070189773 +size 172835 diff --git a/Assets/Raid/Graphics/frosting 1.png.meta b/Assets/Raid/Graphics/frosting 1.png.meta new file mode 100644 index 0000000000..14f3307855 --- /dev/null +++ b/Assets/Raid/Graphics/frosting 1.png.meta @@ -0,0 +1,179 @@ +fileFormatVersion: 2 +guid: c9a331cd52627344d8562ac19ef5c695 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 120 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 1 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: 10 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab b/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab index f0c29e5d35..d3de9ea098 100644 --- a/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab +++ b/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab @@ -34,6 +34,7 @@ RectTransform: m_Children: - {fileID: 2001} - {fileID: 8677795790919758679} + - {fileID: 9001} - {fileID: 6001} - {fileID: 7001} - {fileID: 3001} @@ -111,6 +112,7 @@ MonoBehaviour: m_EditorClassIdentifier: canvasGroup: {fileID: 1004} backgroundImage: {fileID: 4820472504932973940} + effectImage: {fileID: 9003} image: {fileID: 6003} secondaryImage: {fileID: 7003} messageText: {fileID: 5004} @@ -121,6 +123,8 @@ MonoBehaviour: Message: Ansa! Kuolettava pommi BackgroundSprite: {fileID: 21300000, guid: 64b00f4be61371448934c52816bb3079, type: 3} BackgroundColor: {r: 1, g: 1, b: 1, a: 0.55} + Effect: {fileID: 0} + EffectColor: {r: 1, g: 1, b: 1, a: 1} TextColor: {r: 1, g: 0.6313726, b: 0, a: 1} Image: {fileID: 21300000, guid: 203e9d7fbfc3ab146b3a5efe940bd4fc, type: 3} SecondaryImage: {fileID: 0} @@ -129,6 +133,8 @@ MonoBehaviour: Message: "Ansa! J\xE4\xE4dyit 10 Sekunniksi" BackgroundSprite: {fileID: 21300000, guid: 64b00f4be61371448934c52816bb3079, type: 3} BackgroundColor: {r: 1, g: 1, b: 1, a: 0.55} + Effect: {fileID: 21300000, guid: c9a331cd52627344d8562ac19ef5c695, type: 3} + EffectColor: {r: 1, g: 1, b: 1, a: 1} TextColor: {r: 0, g: 0.76470596, b: 0.81568635, a: 1} Image: {fileID: 21300000, guid: f3ee01a8f86d9eb4fb65049758f18bc8, type: 3} SecondaryImage: {fileID: 0} @@ -137,6 +143,8 @@ MonoBehaviour: Message: Ansa! Esineen paino tuplaantui BackgroundSprite: {fileID: 21300000, guid: 64b00f4be61371448934c52816bb3079, type: 3} BackgroundColor: {r: 1, g: 1, b: 1, a: 0.55} + Effect: {fileID: 0} + EffectColor: {r: 1, g: 1, b: 1, a: 1} TextColor: {r: 1, g: 0.6313726, b: 0, a: 1} Image: {fileID: 0} SecondaryImage: {fileID: 21300000, guid: 8cc5377ca2937f7419b6eec45686c507, type: 3} @@ -145,6 +153,8 @@ MonoBehaviour: Message: "Aika! Peli P\xE4\xE4ttynyt" BackgroundSprite: {fileID: 21300000, guid: 64b00f4be61371448934c52816bb3079, type: 3} BackgroundColor: {r: 1, g: 1, b: 1, a: 0.55} + Effect: {fileID: 0} + EffectColor: {r: 1, g: 1, b: 1, a: 1} TextColor: {r: 1, g: 0.6313726, b: 0, a: 1} Image: {fileID: 21300000, guid: 334e3eb1b24707a4aa53bab625e40c5b, type: 3} SecondaryImage: {fileID: 0} @@ -153,6 +163,8 @@ MonoBehaviour: Message: "Syd\xE4men kapasiteetti ylitetty" BackgroundSprite: {fileID: 21300000, guid: 64b00f4be61371448934c52816bb3079, type: 3} BackgroundColor: {r: 1, g: 1, b: 1, a: 0.55} + Effect: {fileID: 0} + EffectColor: {r: 1, g: 1, b: 1, a: 1} TextColor: {r: 1, g: 0.6313726, b: 0, a: 1} Image: {fileID: 21300000, guid: e744bbe740a59e147a20e863381e3cbe, type: 3} SecondaryImage: {fileID: 0} @@ -870,6 +882,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &9000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9001} + - component: {fileID: 9002} + - component: {fileID: 9003} + m_Layer: 5 + m_Name: Effect + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &9001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9000} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1001} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9002 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9000} + m_CullTransparentMesh: 1 +--- !u!114 &9003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9000} + m_Enabled: 1 + 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: 0 + 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!1 &3371798991561071494 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Raid/Scripts/ExitRaid.cs b/Assets/Raid/Scripts/ExitRaid.cs index b0df5bf287..cd4e4c0b6b 100644 --- a/Assets/Raid/Scripts/ExitRaid.cs +++ b/Assets/Raid/Scripts/ExitRaid.cs @@ -18,6 +18,11 @@ public enum RaidEndReason [SerializeField] private Raid_Timer raid_timer; [SerializeField, Header("Reference scripts")] private Raid_References raid_References; + private void Awake() + { + ResolveReferences(); + } + public void EndRaid() { EndRaid(RaidEndReason.Trap); @@ -25,11 +30,31 @@ public void EndRaid() public void EndRaid(RaidEndReason reason) { + if (!gameObject.activeInHierarchy) + { + ExitRaid activeExitRaid = FindActiveExitRaid(); + if (activeExitRaid != null && activeExitRaid != this) + { + activeExitRaid.EndRaid(reason); + return; + } + + Debug.LogError("Cannot end raid from an inactive ExitRaid object."); + return; + } + if (raidEnded) { return; } + ResolveReferences(); + if (raid_timer == null || raid_References == null) + { + Debug.LogError("Cannot end raid because ExitRaid is missing raid references."); + return; + } + raidEnded = true; OnEndRaid(); raid_timer.FinishRaid(); @@ -71,4 +96,31 @@ private Raid_EventPopup.Scenario GetPopupScenario(RaidEndReason reason) return Raid_EventPopup.Scenario.EndTrap; } } + + private void ResolveReferences() + { + if (raid_timer == null) + { + raid_timer = FindObjectOfType(); + } + + if (raid_References == null) + { + raid_References = FindObjectOfType(); + } + } + + private ExitRaid FindActiveExitRaid() + { + ExitRaid[] exitRaids = FindObjectsOfType(); + foreach (ExitRaid exitRaid in exitRaids) + { + if (exitRaid != null && exitRaid.gameObject.activeInHierarchy) + { + return exitRaid; + } + } + + return null; + } } diff --git a/Assets/Raid/Scripts/Raid_EventPopup.cs b/Assets/Raid/Scripts/Raid_EventPopup.cs index b35f7868bd..83b84a212a 100644 --- a/Assets/Raid/Scripts/Raid_EventPopup.cs +++ b/Assets/Raid/Scripts/Raid_EventPopup.cs @@ -22,6 +22,8 @@ private class ScenarioVisual public string Message; public Sprite BackgroundSprite = null; public Color BackgroundColor = new Color(0f, 0f, 0f, 0.55f); + public Sprite Effect = null; + public Color EffectColor = Color.white; public Color TextColor = Color.white; public Sprite Image = null; public Sprite SecondaryImage = null; @@ -35,6 +37,7 @@ private class ScenarioVisual [SerializeField] private CanvasGroup canvasGroup; [SerializeField] private Image backgroundImage; + [SerializeField] private Image effectImage; [SerializeField] private Image image; [SerializeField] private Image secondaryImage; [SerializeField] private TextMeshProUGUI messageText; @@ -110,6 +113,12 @@ private void ApplyScenarioVisual(Scenario scenario) MultText.color = visual.TextColor; ApplyImage(backgroundImage, visual.BackgroundSprite, visual.BackgroundColor); + ApplyImage(effectImage, visual.Effect, visual.EffectColor); + + if (effectImage != null) + { + effectImage.gameObject.SetActive(visual.Effect != null); + } if (image != null) { diff --git a/Assets/Raid/Scripts/Raid_Timer.cs b/Assets/Raid/Scripts/Raid_Timer.cs index 61a0e8154b..20159a0570 100644 --- a/Assets/Raid/Scripts/Raid_Timer.cs +++ b/Assets/Raid/Scripts/Raid_Timer.cs @@ -50,6 +50,11 @@ void Start() TimeFormat.Add(TimerFormat.TenthDecimal, "0.0"); TimeFormat.Add(TimerFormat.HundrethsDecimal, "0.00"); + if (exitRaid == null || !exitRaid.gameObject.activeInHierarchy) + { + exitRaid = FindActiveExitRaid(); + } + if (exitRaid != null) { exitRaid.ExitedRaid += RaidExited; @@ -72,7 +77,19 @@ void Update() if (HasLimit && ((CountUp && CurrentTime >= TimerLimit) || (!CountUp && CurrentTime <= TimerLimit))) { OnTimeEnd(); - exitRaid.EndRaid(ExitRaid.RaidEndReason.OutOfTime); + if (exitRaid == null || !exitRaid.gameObject.activeInHierarchy) + { + exitRaid = FindActiveExitRaid(); + } + + if (exitRaid != null) + { + exitRaid.EndRaid(ExitRaid.RaidEndReason.OutOfTime); + } + else + { + Debug.LogError("Raid timer ended, but no active ExitRaid was found."); + } CurrentTime = TimerLimit; SetTimerText(); TimerText.color = Color.red; @@ -124,6 +141,21 @@ void OnTimeEnd() { TimeEnded?.Invoke(); } + + private ExitRaid FindActiveExitRaid() + { + ExitRaid[] exitRaids = FindObjectsOfType(); + foreach (ExitRaid activeExitRaid in exitRaids) + { + if (activeExitRaid != null && activeExitRaid.gameObject.activeInHierarchy) + { + return activeExitRaid; + } + } + + return null; + } + void RaidExited() { CurrentTime = 0; From 10c0efa58a76e418a4cd8d2fe53c6ad8018ee86c Mon Sep 17 00:00:00 2001 From: Davetsa Date: Thu, 4 Jun 2026 13:20:40 +0300 Subject: [PATCH 06/16] Updated Endmenu to be current --- Assets/Raid/Graphics/Shine.png.meta | 2 +- Assets/Raid/Graphics/exit 1.png | 3 + Assets/Raid/Graphics/exit 1.png.meta | 179 ++ Assets/Raid/Graphics/frosting 1.png.meta | 2 +- Assets/Raid/Graphics/inventaario2.png | 3 + Assets/Raid/Graphics/inventaario2.png.meta | 179 ++ Assets/Raid/Graphics/invetaarioCracked.png | 3 + .../Raid/Graphics/invetaarioCracked.png.meta | 179 ++ Assets/Raid/Graphics/weights 1.png.meta | 2 +- Assets/Raid/Resources/Prefabs/EndMenu.prefab | 461 +-- .../Raid/Resources/Prefabs/Inventory.prefab | 1029 +++++- Assets/Raid/Scenes/40-Raid.unity | 2769 ++++------------- Assets/Raid/Scripts/ExitRaid.cs | 19 +- Assets/Raid/Scripts/Raid_EndMenu.cs | 69 +- Assets/Raid/Scripts/Raid_InventoryItem.cs | 6 +- Assets/Raid/Scripts/Raid_LootTracking.cs | 8 +- Assets/Raid/Scripts/Raid_References.cs | 12 +- 17 files changed, 2343 insertions(+), 2582 deletions(-) create mode 100644 Assets/Raid/Graphics/exit 1.png create mode 100644 Assets/Raid/Graphics/exit 1.png.meta create mode 100644 Assets/Raid/Graphics/inventaario2.png create mode 100644 Assets/Raid/Graphics/inventaario2.png.meta create mode 100644 Assets/Raid/Graphics/invetaarioCracked.png create mode 100644 Assets/Raid/Graphics/invetaarioCracked.png.meta diff --git a/Assets/Raid/Graphics/Shine.png.meta b/Assets/Raid/Graphics/Shine.png.meta index f023b3be32..abc136967c 100644 --- a/Assets/Raid/Graphics/Shine.png.meta +++ b/Assets/Raid/Graphics/Shine.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 256 + maxTextureSize: 1024 resizeAlgorithm: 1 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Raid/Graphics/exit 1.png b/Assets/Raid/Graphics/exit 1.png new file mode 100644 index 0000000000..2f874f4e7d --- /dev/null +++ b/Assets/Raid/Graphics/exit 1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3021c81b85c4874afc064bdc79e242fe4cbfdbe849e1ae7dac4600368dc436b1 +size 11803 diff --git a/Assets/Raid/Graphics/exit 1.png.meta b/Assets/Raid/Graphics/exit 1.png.meta new file mode 100644 index 0000000000..88f8f5d091 --- /dev/null +++ b/Assets/Raid/Graphics/exit 1.png.meta @@ -0,0 +1,179 @@ +fileFormatVersion: 2 +guid: a4bf7994e2e52784aa50ce2534291eba +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 120 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 1 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: 10 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Raid/Graphics/frosting 1.png.meta b/Assets/Raid/Graphics/frosting 1.png.meta index 14f3307855..b26ddaae73 100644 --- a/Assets/Raid/Graphics/frosting 1.png.meta +++ b/Assets/Raid/Graphics/frosting 1.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 256 + maxTextureSize: 512 resizeAlgorithm: 1 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Raid/Graphics/inventaario2.png b/Assets/Raid/Graphics/inventaario2.png new file mode 100644 index 0000000000..f26d91ec04 --- /dev/null +++ b/Assets/Raid/Graphics/inventaario2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34fabdb2be84b01d25db9d6794456802ceece1ddec8b963964582872544b2502 +size 436294 diff --git a/Assets/Raid/Graphics/inventaario2.png.meta b/Assets/Raid/Graphics/inventaario2.png.meta new file mode 100644 index 0000000000..7c1729e59e --- /dev/null +++ b/Assets/Raid/Graphics/inventaario2.png.meta @@ -0,0 +1,179 @@ +fileFormatVersion: 2 +guid: ca292ec662d733746a24248a335eba3a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 120 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 1 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: 10 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Raid/Graphics/invetaarioCracked.png b/Assets/Raid/Graphics/invetaarioCracked.png new file mode 100644 index 0000000000..64ecd0645a --- /dev/null +++ b/Assets/Raid/Graphics/invetaarioCracked.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df36cbee04ba5b9bf2d38695eaefacd09f67c3c395a44f22d4f3be077e3521ef +size 446500 diff --git a/Assets/Raid/Graphics/invetaarioCracked.png.meta b/Assets/Raid/Graphics/invetaarioCracked.png.meta new file mode 100644 index 0000000000..76e8e263cd --- /dev/null +++ b/Assets/Raid/Graphics/invetaarioCracked.png.meta @@ -0,0 +1,179 @@ +fileFormatVersion: 2 +guid: be8eef38109a5d64ba283e4379e2b0bc +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 120 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 1 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: 10 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Raid/Graphics/weights 1.png.meta b/Assets/Raid/Graphics/weights 1.png.meta index 4742246771..c1ce167c76 100644 --- a/Assets/Raid/Graphics/weights 1.png.meta +++ b/Assets/Raid/Graphics/weights 1.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 256 + maxTextureSize: 512 resizeAlgorithm: 1 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Raid/Resources/Prefabs/EndMenu.prefab b/Assets/Raid/Resources/Prefabs/EndMenu.prefab index b799c67fc5..ed73d64185 100644 --- a/Assets/Raid/Resources/Prefabs/EndMenu.prefab +++ b/Assets/Raid/Resources/Prefabs/EndMenu.prefab @@ -16,7 +16,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2668198566995541017 RectTransform: m_ObjectHideFlags: 0 @@ -32,16 +32,15 @@ RectTransform: - {fileID: 7694085706824424523} - {fileID: 4955164402522033619} - {fileID: 2608056757774145037} - - {fileID: 2996294384490658919} - {fileID: 1067388266668187510} - - {fileID: 7589572620979973684} + - {fileID: 9001000000000000002} - {fileID: 6112746816069853310} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -69.0094, y: 1400} + m_SizeDelta: {x: 0, y: 3040} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7581730394780298031 MonoBehaviour: @@ -59,6 +58,14 @@ MonoBehaviour: content: {fileID: 4296145650629842064} itemPrefab: {fileID: 7481540141435164365, guid: 59f733f3d92449d4a8da7c84514fdf3b, type: 3} + backgroundImage: {fileID: 486935528496687519} + normalBackgroundSprite: {fileID: 21300000, guid: ca292ec662d733746a24248a335eba3a, + type: 3} + overweightBackgroundSprite: {fileID: 21300000, guid: be8eef38109a5d64ba283e4379e2b0bc, + type: 3} + normalEndResultText: {fileID: 2517094342130405460} + overweightEndResultText: {fileID: 9001000000000000001} + collectedLootItemScale: {x: 1.25, y: 1.25, z: 1} --- !u!1 &1381501735683521454 GameObject: m_ObjectHideFlags: 0 @@ -226,10 +233,10 @@ RectTransform: - {fileID: 1224089430747638059} m_Father: {fileID: 2668198566995541017} 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_AnchorMin: {x: 0, y: 0.19} + m_AnchorMax: {x: 1, y: 0.79} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1823.4402, y: 361.6519} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8212355114958671073 CanvasRenderer: @@ -246,7 +253,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1714018183284757354} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -278,17 +285,17 @@ MonoBehaviour: m_GameObject: {fileID: 1714018183284757354} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 86a6ac2cbdfc56347bcf51ef5592b643, type: 3} + m_Script: {fileID: 11500000, guid: 1a34f8de8a2e9c847b41b9260030edd2, type: 3} m_Name: m_EditorClassIdentifier: content: {fileID: 4296145650629842064} - horizontallyScrollable: 1 + horizontallyScrollable: 0 verticallyScrollable: 1 scrollingMovementType: 1 elasticity: 0.1 inertia: 1 decelerationRate: 0.135 - scrollSensitivity: 1 + scrollSensitivity: 30 viewportRectTransform: {fileID: 1224089430747638059} horizontalScrollbar: {fileID: 0} verticalScrollbar: {fileID: 0} @@ -311,13 +318,14 @@ GameObject: - component: {fileID: 1067388266668187510} - component: {fileID: 9118259545824328074} - component: {fileID: 3800400781748713} + - component: {fileID: 9002000000000000001} m_Layer: 5 - m_Name: OutOfSpace_Text + m_Name: NormalEndResult_Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1067388266668187510 RectTransform: m_ObjectHideFlags: 0 @@ -332,10 +340,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 2668198566995541017} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -161} - m_SizeDelta: {x: 1000, y: 100} + m_AnchorMin: {x: 0, y: 0.79} + m_AnchorMax: {x: 1, y: 0.93} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &9118259545824328074 CanvasRenderer: @@ -365,19 +373,19 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'Tila loppui kesken! - -' + m_text: "Peli p\xE4\xE4tyi!\n- Huonekalut lis\xE4tty varastoon + -" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: eca1bd84f719d7146a5b636b4f4beff0, type: 2} + m_sharedMaterial: {fileID: -2998110953030337146, guid: eca1bd84f719d7146a5b636b4f4beff0, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190335 - m_fontColor: {r: 1, g: 0, b: 0, a: 1} + rgba: 4294309365 + m_fontColor: {r: 0.9607844, g: 0.9607844, b: 0.9607844, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -394,12 +402,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 100 - m_fontSizeBase: 100 + m_fontSize: 110 + m_fontSizeBase: 48 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 72 + m_fontSizeMax: 110 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 256 @@ -438,6 +446,24 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &9002000000000000001 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2517094342130405460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 220ef737e6ba13e48841e379d56ad79b, type: 3} + m_Name: + m_EditorClassIdentifier: + _finnishText: "Peli p\xE4\xE4tyi!\n- Huonekalut lis\xE4tty varastoon + -" + _englishText: 'Game finished! + + - Furniture added to storage + -' --- !u!1 &2776210990938143527 GameObject: m_ObjectHideFlags: 0 @@ -574,142 +600,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &4048879783854710204 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2996294384490658919} - - component: {fileID: 2452535595763062689} - - component: {fileID: 6242287567820939983} - m_Layer: 5 - m_Name: OutOfTime_Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2996294384490658919 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4048879783854710204} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2668198566995541017} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -161} - m_SizeDelta: {x: 700, y: 100} - m_Pivot: {x: 0.5, y: 1} ---- !u!222 &2452535595763062689 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4048879783854710204} - m_CullTransparentMesh: 1 ---- !u!114 &6242287567820939983 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4048879783854710204} - 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: Aika loppui! - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190335 - m_fontColor: {r: 1, g: 0, b: 0, 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: 100 - m_fontSizeBase: 100 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - 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_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 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!1 &4231736991773157311 GameObject: m_ObjectHideFlags: 0 @@ -744,10 +634,10 @@ RectTransform: - {fileID: 4296145650629842064} m_Father: {fileID: 6112746816069853310} 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: -912, y: 181.00002} - m_SizeDelta: {x: 1824, y: 342} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &7378793991001146470 CanvasRenderer: @@ -832,11 +722,11 @@ RectTransform: m_Children: [] m_Father: {fileID: 1224089430747638059} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0.27990723, y: -0.16998291} - m_SizeDelta: {x: 0, y: -0.33999634} - m_Pivot: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -0.16992188} + m_SizeDelta: {x: -1920, y: 0} + m_Pivot: {x: 0.5, y: 1} --- !u!114 &5955692375267767895 MonoBehaviour: m_ObjectHideFlags: 0 @@ -849,8 +739,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!114 &8019064690746453172 MonoBehaviour: m_ObjectHideFlags: 0 @@ -860,7 +750,7 @@ MonoBehaviour: m_GameObject: {fileID: 4890914218739329929} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3} m_Name: m_EditorClassIdentifier: m_Padding: @@ -868,15 +758,13 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 4 - m_Spacing: 10 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 1 - m_ChildScaleWidth: 1 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 + m_ChildAlignment: 1 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 325, y: 700} + m_Spacing: {x: 300, y: 90} + m_Constraint: 1 + m_ConstraintCount: 3 --- !u!1 &5437918297314473116 GameObject: m_ObjectHideFlags: 0 @@ -907,14 +795,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 6983392782733801103} + m_Children: [] m_Father: {fileID: 2668198566995541017} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 330} - m_SizeDelta: {x: 700, y: 170} + m_AnchorMin: {x: 0.61, y: 0} + m_AnchorMax: {x: 0.91, y: 0.2} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5662510827707541634 CanvasRenderer: @@ -944,9 +831,9 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 + m_Sprite: {fileID: 21300000, guid: a4bf7994e2e52784aa50ce2534291eba, type: 3} + m_Type: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1075,7 +962,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b86df3bf84cd9ac4ebcf2c85a81b4a92, type: 3} + m_Sprite: {fileID: 21300000, guid: ca292ec662d733746a24248a335eba3a, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1085,7 +972,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7547142841448891097 +--- !u!1 &9001000000000000001 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1093,23 +980,24 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7589572620979973684} - - component: {fileID: 7533135925986325428} - - component: {fileID: 1451048184010493724} + - component: {fileID: 9001000000000000002} + - component: {fileID: 9001000000000000003} + - component: {fileID: 9001000000000000004} + - component: {fileID: 9001000000000000005} m_Layer: 5 - m_Name: EndedRaid_Text + m_Name: OverweightEndResult_Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7589572620979973684 +--- !u!224 &9001000000000000002 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7547142841448891097} + m_GameObject: {fileID: 9001000000000000001} 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} @@ -1117,26 +1005,26 @@ RectTransform: m_Children: [] m_Father: {fileID: 2668198566995541017} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -161} - m_SizeDelta: {x: 1000, y: 100} + m_AnchorMin: {x: 0, y: 0.79} + m_AnchorMax: {x: 1, y: 0.93} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} ---- !u!222 &7533135925986325428 +--- !u!222 &9001000000000000003 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7547142841448891097} + m_GameObject: {fileID: 9001000000000000001} m_CullTransparentMesh: 1 ---- !u!114 &1451048184010493724 +--- !u!114 &9001000000000000004 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7547142841448891097} + m_GameObject: {fileID: 9001000000000000001} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -1150,17 +1038,19 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "Lopetit ry\xF6st\xF6n!\n" + m_text: "Saalis menetetty!\n- Syd\xE4men maksimipaino ylitetty + -" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: eca1bd84f719d7146a5b636b4f4beff0, type: 2} + m_sharedMaterial: {fileID: -2998110953030337146, guid: eca1bd84f719d7146a5b636b4f4beff0, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190335 - m_fontColor: {r: 1, g: 0, b: 0, a: 1} + rgba: 4294309365 + m_fontColor: {r: 0.9607844, g: 0.9607844, b: 0.9607844, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -1177,12 +1067,12 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 100 - m_fontSizeBase: 100 + m_fontSize: 110 + m_fontSizeBase: 48 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 18 - m_fontSizeMax: 72 + m_fontSizeMax: 110 m_fontStyle: 0 m_HorizontalAlignment: 2 m_VerticalAlignment: 256 @@ -1221,139 +1111,20 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7913419182231250056 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6983392782733801103} - - component: {fileID: 42319590731644495} - - component: {fileID: 2533958130996579354} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6983392782733801103 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7913419182231250056} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4955164402522033619} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &42319590731644495 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7913419182231250056} - m_CullTransparentMesh: 1 ---- !u!114 &2533958130996579354 +--- !u!114 &9001000000000000005 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7913419182231250056} + m_GameObject: {fileID: 9001000000000000001} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Script: {fileID: 11500000, guid: 220ef737e6ba13e48841e379d56ad79b, 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: Lobby - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, 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: 100 - m_fontSizeBase: 100 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 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} + _finnishText: "Saalis menetetty!\n- Syd\xE4men maksimipaino ylitetty + -" + _englishText: 'Loot lost + + - Hearts maximum weight exceeded-' diff --git a/Assets/Raid/Resources/Prefabs/Inventory.prefab b/Assets/Raid/Resources/Prefabs/Inventory.prefab index 20fe201da7..61cfe9db80 100644 --- a/Assets/Raid/Resources/Prefabs/Inventory.prefab +++ b/Assets/Raid/Resources/Prefabs/Inventory.prefab @@ -1,5 +1,712 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2149347146366020300 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5197663904979067576} + - component: {fileID: 4851181711763750332} + - component: {fileID: 2888320473751758834} + m_Layer: 5 + m_Name: TimerText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5197663904979067576 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2149347146366020300} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6844752908668851494} + 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: 2.4243164, y: 19.865967} + m_SizeDelta: {x: 400, y: 50} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &4851181711763750332 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2149347146366020300} + m_CullTransparentMesh: 1 +--- !u!114 &2888320473751758834 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2149347146366020300} + 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: 10 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 300 + m_fontSizeBase: 300 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 9 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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: -7, 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!1 &3823901948162188606 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5433073301359401586} + - component: {fileID: 8851268139909859147} + m_Layer: 5 + m_Name: HeartHalves + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5433073301359401586 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3823901948162188606} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2439255533668910996} + - {fileID: 8189157535095146162} + m_Father: {fileID: 8100441791909708575} + 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: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!95 &8851268139909859147 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3823901948162188606} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: df3ec66abefb29c41bfbf5b1637fde60, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &4379092815024515770 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3531054082868248669} + - component: {fileID: 8473396750197947585} + - component: {fileID: 9178301089945426792} + - component: {fileID: 2482327229344257677} + - component: {fileID: 1226679771514626003} + m_Layer: 5 + m_Name: ExitRaidButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3531054082868248669 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4379092815024515770} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 520521642498466654} + m_Father: {fileID: 8100441791093507177} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8473396750197947585 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4379092815024515770} + m_CullTransparentMesh: 1 +--- !u!114 &9178301089945426792 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4379092815024515770} + m_Enabled: 1 + 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: 21300000, guid: 006ec4b33b6f550458a02bfe928f68b7, type: 3} + 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!114 &2482327229344257677 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4379092815024515770} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 9178301089945426792} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1226679771514626003} + m_TargetAssemblyTypeName: ExitRaid, Assembly-CSharp + m_MethodName: EndRaid + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1226679771514626003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4379092815024515770} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5d0f6a6f2dc9de54e860ff2356824232, type: 3} + m_Name: + m_EditorClassIdentifier: + raidEnded: 0 + raid_timer: {fileID: 0} + raid_References: {fileID: 0} +--- !u!1 &4489214689121237285 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6844752908668851494} + - component: {fileID: 4158263795064440993} + - component: {fileID: 6229330679097153202} + m_Layer: 5 + m_Name: TimerPanel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6844752908668851494 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4489214689121237285} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5197663904979067576} + m_Father: {fileID: 8100441791093507177} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4158263795064440993 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4489214689121237285} + m_CullTransparentMesh: 1 +--- !u!114 &6229330679097153202 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4489214689121237285} + m_Enabled: 1 + 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: 21300000, guid: 8f9eed5e65331ab4599a9fad22060438, type: 3} + 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!1 &5847977326145358905 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2439255533668910996} + - component: {fileID: 6919326692604671434} + - component: {fileID: 1435607739630070060} + m_Layer: 5 + m_Name: HeartRight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2439255533668910996 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5847977326145358905} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5433073301359401586} + 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: 0, y: 0} + m_SizeDelta: {x: 570, y: 463} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6919326692604671434 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5847977326145358905} + m_CullTransparentMesh: 1 +--- !u!114 &1435607739630070060 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5847977326145358905} + m_Enabled: 1 + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 25d8b513d2a5e3a418ce8bae774ceca6, type: 3} + 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!1 &6569395318403476260 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1275086321493794833} + - component: {fileID: 8088582236978232087} + - component: {fileID: 8795143182936661784} + m_Layer: 5 + m_Name: SpaceRemainingText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1275086321493794833 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6569395318403476260} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8100441791909708575} + 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: 0, y: 78} + m_SizeDelta: {x: 300, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8088582236978232087 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6569395318403476260} + m_CullTransparentMesh: 1 +--- !u!114 &8795143182936661784 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6569395318403476260} + 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: --- + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 31fb2bbeeb88b8f4fa87e595eb13b936, type: 2} + m_sharedMaterial: {fileID: 7919689120557700827, guid: 31fb2bbeeb88b8f4fa87e595eb13b936, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 150 + m_fontSizeBase: 150 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + 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_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!1 &6823344513719035798 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8189157535095146162} + - component: {fileID: 3816498486526100984} + - component: {fileID: 4834222631449755608} + m_Layer: 5 + m_Name: HeartLeft + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8189157535095146162 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6823344513719035798} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5433073301359401586} + 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: 0, y: 0} + m_SizeDelta: {x: 570, y: 463} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3816498486526100984 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6823344513719035798} + m_CullTransparentMesh: 1 +--- !u!114 &4834222631449755608 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6823344513719035798} + m_Enabled: 1 + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: bda0442616d29c64faf1b3b5f6b340cf, type: 3} + 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!1 &8100441790794122375 GameObject: m_ObjectHideFlags: 0 @@ -33,7 +740,6 @@ RectTransform: m_Children: - {fileID: 8100441792720133309} m_Father: {fileID: 8100441792339531714} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -55,7 +761,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8100441790794122375} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -129,12 +835,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8100441791181853596} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 281.48495, y: -312.63397} + m_SizeDelta: {x: 482.9699, y: 109.0536} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8100441790832277364 CanvasRenderer: @@ -208,15 +913,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -268,12 +975,11 @@ RectTransform: m_Children: - {fileID: 8100441790942708954} m_Father: {fileID: 8100441792720133309} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1480, y: 1579.265} + m_AnchoredPosition: {x: 0, y: -25} + m_SizeDelta: {x: 1600, y: 2650.795} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8100441790868650069 CanvasRenderer: @@ -333,7 +1039,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8100441790868650073} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} m_Name: @@ -383,12 +1089,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8100441790868650072} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 740, y: 0} - m_SizeDelta: {x: 1480, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 800, y: -0} + m_SizeDelta: {x: 1600, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &8100441790942708949 MonoBehaviour: @@ -403,15 +1108,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Padding: - m_Left: 150 - m_Right: 150 + m_Left: 50 + m_Right: 50 m_Top: 100 m_Bottom: 100 m_ChildAlignment: 0 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 250, y: 250} - m_Spacing: {x: 50, y: 50} + m_CellSize: {x: 325, y: 325} + m_Spacing: {x: 65, y: 65} m_Constraint: 0 m_ConstraintCount: 2 --- !u!114 &8100441790942708948 @@ -459,12 +1164,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8100441791181853596} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 281.48495, y: -203.58038} + m_SizeDelta: {x: 482.9699, y: 109.0536} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8100441791056074071 CanvasRenderer: @@ -538,15 +1242,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -579,7 +1285,7 @@ GameObject: - component: {fileID: 8100441791093507173} - component: {fileID: 7569432504062211167} m_Layer: 5 - m_Name: LootBag + m_Name: BottomPanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -599,8 +1305,9 @@ RectTransform: m_Children: - {fileID: 8100441792792287935} - {fileID: 8100441791181853596} + - {fileID: 3531054082868248669} + - {fileID: 6844752908668851494} m_Father: {fileID: 8100441792339531714} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -622,7 +1329,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8100441791093507182} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -661,7 +1368,7 @@ MonoBehaviour: m_MinWidth: -1 m_MinHeight: -1 m_PreferredWidth: -1 - m_PreferredHeight: 800 + m_PreferredHeight: 400 m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 @@ -703,10 +1410,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe3f669106d4fb94ebcd61d419d58f24, type: 3} m_Name: m_EditorClassIdentifier: + raid_References: {fileID: 0} + exitRaid: {fileID: 0} CurrentLootText: {fileID: 8100441792127549319} OutOfText: {fileID: 8100441791056074068} MaxLootText: {fileID: 8100441790832277365} + HeartLootText: {fileID: 8795143182936661784} CurrentLootWeight: 0 + MaxLootWeight: 300 + ListOfCollectedLoot: [] --- !u!1 &8100441791181853597 GameObject: m_ObjectHideFlags: 0 @@ -726,7 +1438,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8100441791181853596 RectTransform: m_ObjectHideFlags: 0 @@ -743,12 +1455,11 @@ RectTransform: - {fileID: 8100441791056074069} - {fileID: 8100441790832277370} m_Father: {fileID: 8100441791093507177} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1031.6667, y: -203.5804} + m_SizeDelta: {x: 562.9699, y: 407.1608} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8100441791181853593 CanvasRenderer: @@ -778,7 +1489,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e81cc5ef7a0413142a814da4f203d834, type: 3} + m_Sprite: {fileID: 21300000, guid: 8f9eed5e65331ab4599a9fad22060438, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -845,9 +1556,10 @@ GameObject: - component: {fileID: 8100441791909708575} - component: {fileID: 8100441791909708569} - component: {fileID: 8100441791909708574} + - component: {fileID: 8150628649633318927} m_Layer: 5 - m_Name: LootBagImage - m_TagString: Untagged + m_Name: HeartImage + m_TagString: Heart m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -863,9 +1575,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 5433073301359401586} + - {fileID: 1275086321493794833} m_Father: {fileID: 8100441791961523161} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -894,13 +1607,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 9b6268ccf1cd1684798480f2bb4b4d2c, type: 3} + m_Sprite: {fileID: 21300000, guid: 37b761b0ec3bac94297195740f0f7ca3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -910,6 +1623,21 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!114 &8150628649633318927 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8100441791909708572} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f2a37966639b79041b6786788b6062be, type: 3} + m_Name: + m_EditorClassIdentifier: + raid_LootTracking: {fileID: 7569432504062211167} + white: {r: 1, g: 1, b: 1, a: 1} + black: {r: 0, g: 0, b: 0, a: 1} --- !u!1 &8100441791961523166 GameObject: m_ObjectHideFlags: 0 @@ -939,16 +1667,15 @@ RectTransform: 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_ConstrainProportionsScale: 0 + m_ConstrainProportionsScale: 1 m_Children: - {fileID: 8100441791909708575} m_Father: {fileID: 8100441792792287935} - m_RootOrder: 0 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: 0.000030517578, y: 0} - m_SizeDelta: {x: 700, y: 800} + m_AnchoredPosition: {x: -25, y: 4} + m_SizeDelta: {x: 650, y: 543} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8100441791961523162 CanvasRenderer: @@ -965,7 +1692,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8100441791961523166} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -1045,12 +1772,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8100441791181853596} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 281.48495, y: -94.526794} + m_SizeDelta: {x: 482.9699, y: 109.0536} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8100441792127549318 CanvasRenderer: @@ -1080,7 +1806,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 100 kg + m_text: 0 kg m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 31fb2bbeeb88b8f4fa87e595eb13b936, type: 2} m_sharedMaterial: {fileID: 7919689120557700827, guid: 31fb2bbeeb88b8f4fa87e595eb13b936, @@ -1124,15 +1850,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 00000000 m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -1185,7 +1913,6 @@ RectTransform: - {fileID: 8100441790794122374} - {fileID: 8100441791093507177} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1207,7 +1934,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8100441792339531715} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: @@ -1248,7 +1975,7 @@ MonoBehaviour: m_Top: 20 m_Bottom: 20 m_ChildAlignment: 4 - m_Spacing: 50 + m_Spacing: 0 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 1 @@ -1268,12 +1995,26 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 089ea18713600604eadb6ee65022b544, type: 3} m_Name: m_EditorClassIdentifier: + raid_InventoryHandler: {fileID: 0} + raid_References: {fileID: 0} ItemPrefab: {fileID: 7481540141435164365, guid: 59f733f3d92449d4a8da7c84514fdf3b, type: 3} ContentPanel: {fileID: 8100441790942708954} LootTracker: {fileID: 7569432504062211167} - TestImage: {fileID: 0} - TestItemWeight: 0 + raid_Timer: {fileID: 0} + exitraid: {fileID: 1226679771514626003} + spectator: 0 + firstItem: 1 + trapAmount: 3 + freezeDuration: 3 + doubleWeightMultiplier: 2 + Bombs: + - bombIndex: 1 + bombType: 1 + - bombIndex: 9 + bombType: 0 + - bombIndex: 15 + bombType: 1 --- !u!1 &8100441792720133282 GameObject: m_ObjectHideFlags: 0 @@ -1307,12 +2048,11 @@ RectTransform: m_Children: - {fileID: 8100441790868650072} m_Father: {fileID: 8100441790794122374} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -150, y: 1640.8359} + m_AnchoredPosition: {x: 0, y: -20} + m_SizeDelta: {x: -150, y: 2700} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8100441792720133310 CanvasRenderer: @@ -1342,8 +2082,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: b86df3bf84cd9ac4ebcf2c85a81b4a92, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1395,7 +2135,7 @@ GameObject: - component: {fileID: 8100441792792287934} - component: {fileID: 8100441792792287928} m_Layer: 5 - m_Name: LootBagPanel + m_Name: HeartPanel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1415,7 +2155,6 @@ RectTransform: m_Children: - {fileID: 8100441791961523161} m_Father: {fileID: 8100441791093507177} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1473,10 +2212,162 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_IgnoreLayout: 0 - m_MinWidth: 750 + m_MinWidth: 600 m_MinHeight: -1 m_PreferredWidth: -1 m_PreferredHeight: -1 m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &8607928800518872510 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 520521642498466654} + - component: {fileID: 6099496245047726403} + - component: {fileID: 9191574820958886117} + - component: {fileID: 4318559206568425600} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &520521642498466654 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8607928800518872510} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3531054082868248669} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6099496245047726403 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8607928800518872510} + m_CullTransparentMesh: 1 +--- !u!114 &9191574820958886117 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8607928800518872510} + 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: "Lopeta
Ry\xF6st\xF6" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 90 + m_fontSizeBase: 90 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!114 &4318559206568425600 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8607928800518872510} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5d0f6a6f2dc9de54e860ff2356824232, type: 3} + m_Name: + m_EditorClassIdentifier: + raidEnded: 0 + raid_timer: {fileID: 0} + raid_References: {fileID: 0} diff --git a/Assets/Raid/Scenes/40-Raid.unity b/Assets/Raid/Scenes/40-Raid.unity index bed058af03..c88b43a71c 100644 --- a/Assets/Raid/Scenes/40-Raid.unity +++ b/Assets/Raid/Scenes/40-Raid.unity @@ -270,11 +270,11 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &174784410 stripped +--- !u!114 &251360814 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1451048184010493724, guid: b4a44dafffb2c114588e4e643e490678, + m_CorrespondingSourceObject: {fileID: 2888320473751758834, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - m_PrefabInstance: {fileID: 7674508947818206424} + m_PrefabInstance: {fileID: 756492962} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -282,142 +282,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &251360812 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 251360813} - - component: {fileID: 251360815} - - component: {fileID: 251360814} - m_Layer: 5 - m_Name: TimerText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &251360813 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 251360812} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1712154934} - 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: 2.4243164, y: 19.865967} - m_SizeDelta: {x: 400, y: 50} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &251360814 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 251360812} - 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: 10 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, 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: 300 - m_fontSizeBase: 300 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 9 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 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: -7, 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 &251360815 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 251360812} - m_CullTransparentMesh: 1 --- !u!114 &371317729 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, @@ -821,18 +685,6 @@ MonoBehaviour: raidEnded: 0 raid_timer: {fileID: 0} raid_References: {fileID: 943703428} ---- !u!114 &526886928 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3800400781748713, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - m_PrefabInstance: {fileID: 7674508947818206424} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &728986460 GameObject: m_ObjectHideFlags: 0 @@ -977,922 +829,325 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1550062017} m_Modifications: - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 1226679771514626003, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: Image1 + propertyPath: raid_timer value: - objectReference: {fileID: 21300000, guid: 7885ceb830b5c1e4da9fbbc74d381f44, - type: 3} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: Image2 - value: - objectReference: {fileID: 21300000, guid: 5deb40e35c0016342a4092b45b898f31, - type: 3} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: Image3 - value: - objectReference: {fileID: 21300000, guid: 2690c1905d305284ca175774bf350e4d, - type: 3} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: Image4 - value: - objectReference: {fileID: 21300000, guid: 35ae272a7e0505444bf3d91d6a23decc, - type: 3} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: Image5 - value: - objectReference: {fileID: 21300000, guid: 25953b54e3639574f9d9a214aaf08ab0, - type: 3} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, + objectReference: {fileID: 1918953308} + - target: {fileID: 1226679771514626003, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: Image6 + propertyPath: raid_References value: - objectReference: {fileID: 21300000, guid: 3fb8d28315963994eb0c2b01bba7efad, - type: 3} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, + objectReference: {fileID: 943703428} + - target: {fileID: 3531054082868248669, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: Image7 - value: - objectReference: {fileID: 21300000, guid: a0b6a769f25fb5b4f9ee0405e537c2f7, + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3531054082868248669, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3531054082868248669, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: Image8 - value: - objectReference: {fileID: 21300000, guid: cdd3c365383f3a14baa571b4d8cf0b92, + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3531054082868248669, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3531054082868248669, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: Image9 - value: - objectReference: {fileID: 21300000, guid: 1e746afb7a374b447bba20c290fa1f5c, + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3531054082868248669, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: Image10 + propertyPath: raid_Timer value: - objectReference: {fileID: 21300000, guid: 4e4695800979fdd4c8b9e7f09b27e4e1, - type: 3} + objectReference: {fileID: 1918953308} - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: Image11 + propertyPath: raid_References value: - objectReference: {fileID: 21300000, guid: 8f8f019a8b08e754ab6728c0a22516ab, - type: 3} + objectReference: {fileID: 943703428} - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: Image12 + propertyPath: raid_InventoryHandler value: - objectReference: {fileID: 21300000, guid: cf829e3c91d38fd429a1a2a8c6a9e681, - type: 3} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, + objectReference: {fileID: 943703426} + - target: {fileID: 6844752908668851494, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: exitraid - value: - objectReference: {fileID: 1128349495} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6844752908668851494, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: TestImage - value: - objectReference: {fileID: 21300000, guid: 7885ceb830b5c1e4da9fbbc74d381f44, + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6844752908668851494, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6844752908668851494, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: firstItem - value: 1 + propertyPath: m_SizeDelta.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 6844752908668851494, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: TestImage2 - value: - objectReference: {fileID: 21300000, guid: 5deb40e35c0016342a4092b45b898f31, + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6844752908668851494, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7569432504062211167, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: raid_Timer + propertyPath: raid_References value: - objectReference: {fileID: 1918953308} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, + objectReference: {fileID: 943703428} + - target: {fileID: 8100441790794122374, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: ItemWeight1 - value: 5.2 + propertyPath: m_AnchorMax.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441790794122374, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: ItemWeight2 - value: 27.6 + propertyPath: m_AnchorMin.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441790794122374, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: ItemWeight3 - value: 50 + propertyPath: m_SizeDelta.x + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441790794122374, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: ItemWeight4 - value: 50 + propertyPath: m_SizeDelta.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441790794122374, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: ItemWeight5 - value: 100 + propertyPath: m_AnchoredPosition.x + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441790794122374, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: ItemWeight6 - value: 0.3 + propertyPath: m_AnchoredPosition.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441791093507177, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: ItemWeight7 - value: 0.3 + propertyPath: m_AnchorMax.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441791093507177, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: ItemWeight8 - value: 35 + propertyPath: m_AnchorMin.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441791093507177, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: ItemWeight9 - value: 27.6 + propertyPath: m_SizeDelta.x + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441791093507177, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: ItemWeight10 - value: 2.3 + propertyPath: m_SizeDelta.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441791093507177, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: ItemWeight11 - value: 6.6 - objectReference: {fileID: 0} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: ItemWeight12 - value: 51 - objectReference: {fileID: 0} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: TestItemWeight - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: TestItemWeight2 - value: 25 - objectReference: {fileID: 0} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: raid_References - value: - objectReference: {fileID: 943703428} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: Bombs.Array.size - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: raid_InventoryHandler - value: - objectReference: {fileID: 943703426} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: BombLocations.Array.size - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: BombLocations.Array.data[0] - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: BombLocations.Array.data[1] - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: BombLocations.Array.data[2] - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: Bombs.Array.data[0].bombType - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: Bombs.Array.data[1].bombType + propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: Bombs.Array.data[2].bombType - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: Bombs.Array.data[0].bombIndex - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: Bombs.Array.data[1].bombIndex - value: 9 - objectReference: {fileID: 0} - - target: {fileID: 4440646677521073066, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: Bombs.Array.data[2].bombIndex - value: 15 - objectReference: {fileID: 0} - - target: {fileID: 7569432504062211167, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: endMenu - value: - objectReference: {fileID: 1629411669} - - target: {fileID: 7569432504062211167, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: HeartLootText - value: - objectReference: {fileID: 1707223279} - - target: {fileID: 7569432504062211167, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: MaxLootWeight - value: 300 - objectReference: {fileID: 0} - - target: {fileID: 7569432504062211167, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: raid_References - value: - objectReference: {fileID: 943703428} - - target: {fileID: 8100441790794122368, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441791093507177, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: m_Enabled + propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441790794122369, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8100441790794122374, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441790794122374, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441790794122374, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441790794122374, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441790794122374, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441790794122374, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441790832277370, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8100441790832277370, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8100441790832277370, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 482.9699 - objectReference: {fileID: 0} - - target: {fileID: 8100441790832277370, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 109.0536 - objectReference: {fileID: 0} - - target: {fileID: 8100441790832277370, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: m_AnchoredPosition.x - value: 281.48495 + propertyPath: m_Pivot.x + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8100441790832277370, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: m_AnchoredPosition.y - value: -312.63397 + propertyPath: m_Pivot.y + value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 8100441790868650068, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: m_Enabled + propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441790868650072, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 1600 - objectReference: {fileID: 0} - - target: {fileID: 8100441790868650072, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 2650.795 - objectReference: {fileID: 0} - - target: {fileID: 8100441790868650072, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: m_AnchoredPosition.x + propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441790868650072, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -25 - objectReference: {fileID: 0} - - target: {fileID: 8100441790868650074, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8100441790942708949, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_Spacing.x - value: 65 - objectReference: {fileID: 0} - - target: {fileID: 8100441790942708949, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_Spacing.y - value: 65 - objectReference: {fileID: 0} - - target: {fileID: 8100441790942708949, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_CellSize.x - value: 325 - objectReference: {fileID: 0} - - target: {fileID: 8100441790942708949, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_CellSize.y - value: 325 - objectReference: {fileID: 0} - - target: {fileID: 8100441790942708949, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_Padding.m_Top - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 8100441790942708949, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_Padding.m_Left - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 8100441790942708949, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_Padding.m_Right - value: 50 - objectReference: {fileID: 0} - - target: {fileID: 8100441790942708954, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: m_AnchorMax.y - value: 1 + propertyPath: m_AnchorMin.x + value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441790942708954, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441790942708954, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_SizeDelta.x - value: 1600 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441790942708954, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441790942708954, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: m_AnchoredPosition.x - value: 800 + propertyPath: m_LocalPosition.x + value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441790942708954, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: m_AnchoredPosition.y - value: -0 + propertyPath: m_LocalPosition.y + value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441791056074069, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: m_AnchorMax.y - value: 1 + propertyPath: m_LocalPosition.z + value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441791056074069, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: m_AnchorMin.y + propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 8100441791056074069, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 482.9699 - objectReference: {fileID: 0} - - target: {fileID: 8100441791056074069, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 109.0536 - objectReference: {fileID: 0} - - target: {fileID: 8100441791056074069, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 281.48495 - objectReference: {fileID: 0} - - target: {fileID: 8100441791056074069, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -203.58038 - objectReference: {fileID: 0} - - target: {fileID: 8100441791093507176, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: m_PreferredHeight - value: 400 + propertyPath: m_LocalRotation.x + value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441791093507177, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: m_AnchorMax.y + propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441791093507177, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: m_AnchorMin.y + propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441791093507177, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: m_SizeDelta.x + propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441791093507177, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: m_SizeDelta.y + propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441791093507177, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: m_AnchoredPosition.x + propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441791093507177, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: m_AnchoredPosition.y + propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441791093507179, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: m_Enabled + propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441791093507182, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792339531715, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_Name - value: BottomPanel + value: Inventory objectReference: {fileID: 0} - - target: {fileID: 8100441791181853596, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792792287935, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441791181853596, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792792287935, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441791181853596, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792792287935, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_SizeDelta.x - value: 562.9699 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441791181853596, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792792287935, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_SizeDelta.y - value: 407.1608 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441791181853596, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792792287935, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_AnchoredPosition.x - value: 1031.6667 - objectReference: {fileID: 0} - - target: {fileID: 8100441791181853596, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -203.5804 - objectReference: {fileID: 0} - - target: {fileID: 8100441791181853597, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 8100441791181853598, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 8f9eed5e65331ab4599a9fad22060438, - type: 3} - - target: {fileID: 8100441791909708572, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_Name - value: HeartImage - objectReference: {fileID: 0} - - target: {fileID: 8100441791909708572, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_TagString - value: Heart - objectReference: {fileID: 0} - - target: {fileID: 8100441791909708574, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 37b761b0ec3bac94297195740f0f7ca3, - type: 3} - - target: {fileID: 8100441791909708574, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_Color.b - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8100441791909708574, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_Color.g - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8100441791909708574, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_Color.r - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8100441791909708574, guid: 1456b9f29a360684da0ae9d727e82bd4, + - target: {fileID: 8100441792792287935, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - propertyPath: m_RaycastTarget - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 570 - objectReference: {fileID: 0} - - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 463 - objectReference: {fileID: 0} - - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 325 - objectReference: {fileID: 0} - - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -271.5 - objectReference: {fileID: 0} - - target: {fileID: 8100441791961523161, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 650 - objectReference: {fileID: 0} - - target: {fileID: 8100441791961523161, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 543 - objectReference: {fileID: 0} - - target: {fileID: 8100441791961523161, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -25 - objectReference: {fileID: 0} - - target: {fileID: 8100441791961523161, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 8100441791961523161, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8100441791961523163, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441791961523166, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8100441792127549316, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8100441792127549316, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8100441792127549316, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 482.9699 - objectReference: {fileID: 0} - - target: {fileID: 8100441792127549316, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 109.0536 - objectReference: {fileID: 0} - - target: {fileID: 8100441792127549316, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 281.48495 - objectReference: {fileID: 0} - - target: {fileID: 8100441792127549316, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -94.526794 - objectReference: {fileID: 0} - - target: {fileID: 8100441792127549319, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_text - value: 0 kg - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531715, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_Name - value: Inventory - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531715, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531740, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531741, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_Spacing - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531741, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_Padding.m_Left - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 8100441792339531741, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_Padding.m_Bottom - value: 20 - objectReference: {fileID: 0} - - target: {fileID: 8100441792720133309, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_SizeDelta.x - value: -150 - objectReference: {fileID: 0} - - target: {fileID: 8100441792720133309, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 2700 - objectReference: {fileID: 0} - - target: {fileID: 8100441792720133309, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792720133309, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 8100441792720133311, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_Type - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792720133311, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: b86df3bf84cd9ac4ebcf2c85a81b4a92, - type: 3} - - target: {fileID: 8100441792720133311, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8100441792792287928, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_MinWidth - value: 600 - objectReference: {fileID: 0} - - target: {fileID: 8100441792792287928, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_MinHeight - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 8100441792792287928, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_PreferredHeight - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 8100441792792287932, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_Name - value: HeartPanel - objectReference: {fileID: 0} - - target: {fileID: 8100441792792287935, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792792287935, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792792287935, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792792287935, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792792287935, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8100441792792287935, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - propertyPath: m_AnchoredPosition.y + propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 8100441791093507177, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1128349491} - - targetCorrespondingSourceObject: {fileID: 8100441791093507177, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1712154934} - - targetCorrespondingSourceObject: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1513048547} - - targetCorrespondingSourceObject: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1707223278} - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 8100441791909708572, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1264060823} + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} --- !u!114 &756492963 stripped MonoBehaviour: @@ -1922,623 +1177,27 @@ MonoBehaviour: MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8100441791181853598, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} - m_PrefabInstance: {fileID: 756492962} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!224 &756492966 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - m_PrefabInstance: {fileID: 756492962} - m_PrefabAsset: {fileID: 0} ---- !u!224 &756492967 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8100441791093507177, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - m_PrefabInstance: {fileID: 756492962} - m_PrefabAsset: {fileID: 0} ---- !u!114 &756492972 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7569432504062211167, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - m_PrefabInstance: {fileID: 756492962} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe3f669106d4fb94ebcd61d419d58f24, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &883441592 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 883441593} - - component: {fileID: 883441595} - - component: {fileID: 883441594} - m_Layer: 5 - m_Name: TimerBG - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &883441593 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 883441592} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 728986461} - m_Father: {fileID: 2107529345} - 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: -7, y: -775} - m_SizeDelta: {x: 1700, y: 300} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &883441594 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 883441592} - m_Enabled: 1 - 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: 21300000, guid: b86df3bf84cd9ac4ebcf2c85a81b4a92, type: 3} - 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 &883441595 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 883441592} - m_CullTransparentMesh: 1 ---- !u!1 &943703425 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 943703427} - - component: {fileID: 943703426} - - component: {fileID: 943703428} - m_Layer: 0 - m_Name: ScriptHolder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &943703426 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 943703425} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 83e48d019dae6394391c10f3cb7c8997, type: 3} - m_Name: - m_EditorClassIdentifier: - InventoryUI: {fileID: 371317729} - InventorySize: 20 - MediumItemMaxAmount: 16 - LargeItemMaxAmount: 8 ---- !u!4 &943703427 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 943703425} - serializedVersion: 2 - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &943703428 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 943703425} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cc5525cbc59bf5b4784c5ea50b218a1a, type: 3} - m_Name: - m_EditorClassIdentifier: - EndMenu: {fileID: 1629411667} - HeartHalves: {fileID: 1513048546} - Heart: {fileID: 1264060820} - OutOfTime: {fileID: 1733482650} - OutOfSpace: {fileID: 526886928} - RaidEndedText: {fileID: 174784410} - inventoryHandler: {fileID: 943703426} - raid_LootTracking: {fileID: 756492972} ---- !u!1 &1128349490 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1128349491} - - component: {fileID: 1128349494} - - component: {fileID: 1128349493} - - component: {fileID: 1128349492} - - component: {fileID: 1128349495} - m_Layer: 5 - m_Name: ExitRaidButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1128349491 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1128349490} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1857859669} - m_Father: {fileID: 756492967} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1128349492 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1128349490} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1128349493} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1128349495} - m_TargetAssemblyTypeName: ExitRaid, Assembly-CSharp - m_MethodName: EndRaid - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &1128349493 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1128349490} - m_Enabled: 1 - 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: 21300000, guid: 006ec4b33b6f550458a02bfe928f68b7, type: 3} - 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 &1128349494 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1128349490} - m_CullTransparentMesh: 1 ---- !u!114 &1128349495 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1128349490} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5d0f6a6f2dc9de54e860ff2356824232, type: 3} - m_Name: - m_EditorClassIdentifier: - raidEnded: 0 - raid_timer: {fileID: 1918953308} - raid_References: {fileID: 943703428} ---- !u!1 &1145828920 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1145828921} - - component: {fileID: 1145828923} - - component: {fileID: 1145828922} - m_Layer: 5 - m_Name: HeartLeft - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1145828921 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1145828920} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1513048547} - 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: 0, y: 0} - m_SizeDelta: {x: 570, y: 463} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1145828922 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1145828920} - m_Enabled: 1 - 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: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: bda0442616d29c64faf1b3b5f6b340cf, type: 3} - 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 &1145828923 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1145828920} - m_CullTransparentMesh: 1 ---- !u!1 &1239113689 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1239113693} - - component: {fileID: 1239113692} - - component: {fileID: 1239113691} - - component: {fileID: 1239113690} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1239113690 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1239113689} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1239113691 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1239113689} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &1239113692 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1239113689} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &1239113693 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1239113689} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1550062017} - - {fileID: 1629411668} - - {fileID: 2107529345} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!1 &1264060820 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8100441791909708572, guid: 1456b9f29a360684da0ae9d727e82bd4, - type: 3} - m_PrefabInstance: {fileID: 756492962} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1264060823 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1264060820} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f2a37966639b79041b6786788b6062be, type: 3} - m_Name: - m_EditorClassIdentifier: - raid_LootTracking: {fileID: 756492972} - white: {r: 1, g: 1, b: 1, a: 1} - black: {r: 0, g: 0, b: 0, a: 1} ---- !u!1 &1271117241 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1271117244} - - component: {fileID: 1271117243} - - component: {fileID: 1271117245} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1271117243 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_PrefabInstance: {fileID: 756492962} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1271117241} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!4 &1271117244 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1271117241} - serializedVersion: 2 - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1271117245 +--- !u!114 &756492972 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 7569432504062211167, guid: 1456b9f29a360684da0ae9d727e82bd4, + type: 3} + m_PrefabInstance: {fileID: 756492962} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1271117241} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} + m_Script: {fileID: 11500000, guid: fe3f669106d4fb94ebcd61d419d58f24, type: 3} m_Name: m_EditorClassIdentifier: - m_SendPointerHoverToParent: 1 - m_MoveRepeatDelay: 0.5 - m_MoveRepeatRate: 0.1 - m_XRTrackingOrigin: {fileID: 0} - m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, - type: 3} - m_DeselectOnBackgroundClick: 1 - m_PointerBehavior: 0 - m_CursorLockBehavior: 0 - m_ScrollDeltaPerTick: 6 ---- !u!1 &1494835852 +--- !u!1 &883441592 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2546,42 +1205,43 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1494835853} - - component: {fileID: 1494835855} - - component: {fileID: 1494835854} + - component: {fileID: 883441593} + - component: {fileID: 883441595} + - component: {fileID: 883441594} m_Layer: 5 - m_Name: HeartRight + m_Name: TimerBG m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1494835853 +--- !u!224 &883441593 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1494835852} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 883441592} + 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1513048547} + m_Children: + - {fileID: 728986461} + m_Father: {fileID: 2107529345} 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: 0, y: 0} - m_SizeDelta: {x: 570, y: 463} + m_AnchoredPosition: {x: -7, y: -775} + m_SizeDelta: {x: 1700, y: 300} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1494835854 +--- !u!114 &883441594 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1494835852} + m_GameObject: {fileID: 883441592} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -2589,13 +1249,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + 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: 21300000, guid: 25d8b513d2a5e3a418ce8bae774ceca6, type: 3} + m_Sprite: {fileID: 21300000, guid: b86df3bf84cd9ac4ebcf2c85a81b4a92, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2605,15 +1265,15 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1494835855 +--- !u!222 &883441595 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1494835852} + m_GameObject: {fileID: 883441592} m_CullTransparentMesh: 1 ---- !u!1 &1513048546 +--- !u!1 &943703425 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2621,185 +1281,183 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1513048547} - - component: {fileID: 1513048548} - m_Layer: 5 - m_Name: HeartHalves + - component: {fileID: 943703427} + - component: {fileID: 943703426} + - component: {fileID: 943703428} + m_Layer: 0 + m_Name: ScriptHolder m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &1513048547 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1513048546} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1494835853} - - {fileID: 1145828921} - m_Father: {fileID: 756492966} - 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: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!95 &1513048548 -Animator: - serializedVersion: 5 + m_IsActive: 1 +--- !u!114 &943703426 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1513048546} + m_GameObject: {fileID: 943703425} m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: df3ec66abefb29c41bfbf5b1637fde60, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!1 &1550062016 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1550062017} - - component: {fileID: 1550062020} - - component: {fileID: 1550062019} - - component: {fileID: 1550062018} - m_Layer: 5 - m_Name: InventoryUI - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1550062017 -RectTransform: + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 83e48d019dae6394391c10f3cb7c8997, type: 3} + m_Name: + m_EditorClassIdentifier: + InventoryUI: {fileID: 371317729} + InventorySize: 20 + MediumItemMaxAmount: 16 + LargeItemMaxAmount: 8 +--- !u!4 &943703427 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1550062016} + m_GameObject: {fileID: 943703425} + serializedVersion: 2 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 371317730} - m_Father: {fileID: 1239113693} + m_Children: [] + m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1550062018 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1550062016} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 50 - m_Right: 50 - m_Top: 50 - m_Bottom: 50 - m_ChildAlignment: 0 - m_Spacing: 50 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!114 &1550062019 +--- !u!114 &943703428 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1550062016} + m_GameObject: {fileID: 943703425} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: cc5525cbc59bf5b4784c5ea50b218a1a, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 73c0e1c6cbb72c045aa6f47c58df930c, type: 3} - 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 &1550062020 -CanvasRenderer: + EndMenu: {fileID: 7204274271899433403} + HeartHalves: {fileID: 1513048546} + Heart: {fileID: 1264060820} + inventoryHandler: {fileID: 943703426} + raid_LootTracking: {fileID: 756492972} +--- !u!1001 &1218261552 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1550062016} - m_CullTransparentMesh: 1 ---- !u!1 &1629411667 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 683399793402178915, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - m_PrefabInstance: {fileID: 7674508947818206424} - m_PrefabAsset: {fileID: 0} ---- !u!224 &1629411668 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - m_PrefabInstance: {fileID: 7674508947818206424} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1629411669 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7581730394780298031, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - m_PrefabInstance: {fileID: 7674508947818206424} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1629411667} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 74cc78280cfa86f47a5c28ae40868e9c, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &1644835073 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1239113693} + m_Modifications: + - target: {fileID: 683399793402178915, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_Name + value: EndMenu + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b4a44dafffb2c114588e4e643e490678, type: 3} +--- !u!1 &1239113689 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2807,137 +1465,109 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1644835078} - - component: {fileID: 1644835077} - - component: {fileID: 1644835076} - - component: {fileID: 1644835075} - - component: {fileID: 1644835074} + - component: {fileID: 1239113693} + - component: {fileID: 1239113692} + - component: {fileID: 1239113691} + - component: {fileID: 1239113690} m_Layer: 5 - m_Name: RaidButton + m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &1644835074 + m_IsActive: 1 +--- !u!114 &1239113690 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1644835073} + m_GameObject: {fileID: 1239113689} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 337dca1768bd6a44a9fe3bfb30afa666, type: 3} + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} m_Name: m_EditorClassIdentifier: - _naviTarget: {fileID: 11400000, guid: 0efae5d4b274fae498c862116f9067a9, type: 2} - _useNonDefaultWindow: 0 - _targetWindow: 0 - _isCurrentPopOutWindow: 0 ---- !u!114 &1644835075 + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1239113691 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1644835073} + m_GameObject: {fileID: 1239113689} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1644835076} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1644835076 -MonoBehaviour: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1239113692 +Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1644835073} + m_GameObject: {fileID: 1239113689} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.5198671, g: 0.18431371, b: 0.94509804, 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: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - 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 &1644835077 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1644835073} - m_CullTransparentMesh: 1 ---- !u!224 &1644835078 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1239113693 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1644835073} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 1239113689} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.68625, y: 0.68625, z: 0.68625} + m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2145355900} + - {fileID: 1550062017} + - {fileID: 5730282211844516033} + - {fileID: 2107529345} m_Father: {fileID: 0} 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: 179.6145, y: 206.04999} - m_SizeDelta: {x: 160, y: 32.89} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1707223277 + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!1 &1264060820 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8100441791909708572, guid: 1456b9f29a360684da0ae9d727e82bd4, + type: 3} + m_PrefabInstance: {fileID: 756492962} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1271117241 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2945,136 +1575,95 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1707223278} - - component: {fileID: 1707223280} - - component: {fileID: 1707223279} - m_Layer: 5 - m_Name: SpaceRemainingText + - component: {fileID: 1271117244} + - component: {fileID: 1271117243} + - component: {fileID: 1271117245} + m_Layer: 0 + m_Name: EventSystem m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1707223278 -RectTransform: +--- !u!114 &1271117243 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1271117241} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1271117244 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1707223277} + m_GameObject: {fileID: 1271117241} + serializedVersion: 2 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_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 756492966} + m_Father: {fileID: 0} 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: 0, y: 78} - m_SizeDelta: {x: 300, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1707223279 +--- !u!114 &1271117245 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1707223277} + m_GameObject: {fileID: 1271117241} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, 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: --- - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 31fb2bbeeb88b8f4fa87e595eb13b936, type: 2} - m_sharedMaterial: {fileID: 7919689120557700827, guid: 31fb2bbeeb88b8f4fa87e595eb13b936, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, 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: 150 - m_fontSizeBase: 150 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - 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_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 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 &1707223280 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_SendPointerHoverToParent: 1 + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 + m_CursorLockBehavior: 0 + m_ScrollDeltaPerTick: 6 +--- !u!1 &1513048546 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3823901948162188606, guid: 1456b9f29a360684da0ae9d727e82bd4, + type: 3} + m_PrefabInstance: {fileID: 756492962} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1707223277} - m_CullTransparentMesh: 1 ---- !u!1 &1712154933 +--- !u!1 &1550062016 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3082,43 +1671,70 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1712154934} - - component: {fileID: 1712154936} - - component: {fileID: 1712154935} + - component: {fileID: 1550062017} + - component: {fileID: 1550062020} + - component: {fileID: 1550062019} + - component: {fileID: 1550062018} m_Layer: 5 - m_Name: TimerPanel + m_Name: InventoryUI m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1712154934 +--- !u!224 &1550062017 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1712154933} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 1550062016} + 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_ConstrainProportionsScale: 0 m_Children: - - {fileID: 251360813} - m_Father: {fileID: 756492967} + - {fileID: 371317730} + m_Father: {fileID: 1239113693} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1712154935 +--- !u!114 &1550062018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1550062016} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 50 + m_Right: 50 + m_Top: 50 + m_Bottom: 50 + m_ChildAlignment: 0 + m_Spacing: 50 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &1550062019 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1712154933} + m_GameObject: {fileID: 1550062016} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -3126,13 +1742,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8f9eed5e65331ab4599a9fad22060438, type: 3} + m_Sprite: {fileID: 21300000, guid: 73c0e1c6cbb72c045aa6f47c58df930c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3142,27 +1758,15 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1712154936 +--- !u!222 &1550062020 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1712154933} + m_GameObject: {fileID: 1550062016} m_CullTransparentMesh: 1 ---- !u!114 &1733482650 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6242287567820939983, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - m_PrefabInstance: {fileID: 7674508947818206424} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &1857859668 +--- !u!1 &1644835073 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3170,150 +1774,136 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1857859669} - - component: {fileID: 1857859671} - - component: {fileID: 1857859670} - - component: {fileID: 1857859672} + - component: {fileID: 1644835078} + - component: {fileID: 1644835077} + - component: {fileID: 1644835076} + - component: {fileID: 1644835075} + - component: {fileID: 1644835074} m_Layer: 5 - m_Name: Text (TMP) + m_Name: RaidButton m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1857859669 -RectTransform: + m_IsActive: 0 +--- !u!114 &1644835074 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1857859668} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1128349491} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1857859670 + m_GameObject: {fileID: 1644835073} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 337dca1768bd6a44a9fe3bfb30afa666, type: 3} + m_Name: + m_EditorClassIdentifier: + _naviTarget: {fileID: 11400000, guid: 0efae5d4b274fae498c862116f9067a9, type: 2} + _useNonDefaultWindow: 0 + _targetWindow: 0 + _isCurrentPopOutWindow: 0 +--- !u!114 &1644835075 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1644835073} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1644835076} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1644835076 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1857859668} + m_GameObject: {fileID: 1644835073} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + 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_Color: {r: 0.5198671, g: 0.18431371, b: 0.94509804, 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: "Lopeta
Ry\xF6st\xF6" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 90 - m_fontSizeBase: 90 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 1 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 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 &1857859671 + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &1644835077 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1857859668} + m_GameObject: {fileID: 1644835073} m_CullTransparentMesh: 1 ---- !u!114 &1857859672 -MonoBehaviour: +--- !u!224 &1644835078 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1857859668} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5d0f6a6f2dc9de54e860ff2356824232, type: 3} - m_Name: - m_EditorClassIdentifier: - raidEnded: 0 - raid_timer: {fileID: 0} - raid_References: {fileID: 0} + m_GameObject: {fileID: 1644835073} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.68625, y: 0.68625, z: 0.68625} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2145355900} + m_Father: {fileID: 0} + 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: 179.6145, y: 206.04999} + m_SizeDelta: {x: 160, y: 32.89} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1871291331 GameObject: m_ObjectHideFlags: 0 @@ -3695,129 +2285,18 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2145355899} m_CullTransparentMesh: 1 ---- !u!1001 &7674508947818206424 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1239113693} - m_Modifications: - - target: {fileID: 683399793402178915, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - propertyPath: m_Name - value: EndMenu - objectReference: {fileID: 0} - - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - propertyPath: m_SizeDelta.x - value: -69.0094 - objectReference: {fileID: 0} - - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - propertyPath: m_SizeDelta.y - value: 1400 - objectReference: {fileID: 0} - - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4296145650629842064, guid: b4a44dafffb2c114588e4e643e490678, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b4a44dafffb2c114588e4e643e490678, type: 3} +--- !u!224 &5730282211844516033 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + m_PrefabInstance: {fileID: 1218261552} + m_PrefabAsset: {fileID: 0} +--- !u!1 &7204274271899433403 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 683399793402178915, guid: b4a44dafffb2c114588e4e643e490678, + type: 3} + m_PrefabInstance: {fileID: 1218261552} + m_PrefabAsset: {fileID: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Raid/Scripts/ExitRaid.cs b/Assets/Raid/Scripts/ExitRaid.cs index cd4e4c0b6b..4aefffafa3 100644 --- a/Assets/Raid/Scripts/ExitRaid.cs +++ b/Assets/Raid/Scripts/ExitRaid.cs @@ -1,7 +1,6 @@ using System; using System.Collections; using System.Collections.Generic; -using TMPro; using UnityEngine; public class ExitRaid : MonoBehaviour @@ -68,7 +67,15 @@ private IEnumerator EndRaidRoutine(RaidEndReason reason) yield return Raid_EventPopup.ShowAndWait(this, GetPopupScenario(reason)); - raid_References.EndMenu.GetComponent().SetCollectedLoot(raid_References.raid_LootTracking.ListOfCollectedLoot); + Raid_EndMenu endMenu = raid_References.EndMenu == null ? null : raid_References.EndMenu.GetComponent(); + if (endMenu == null) + { + Debug.LogError("Cannot show raid end menu because the EndMenu reference is missing Raid_EndMenu."); + yield break; + } + + endMenu.SetOverWeightLimitBackground(reason == RaidEndReason.OutOfSpace); + endMenu.SetCollectedLoot(raid_References.raid_LootTracking.ListOfCollectedLoot); raid_References.EndMenu.SetActive(true); } @@ -79,9 +86,11 @@ public void OnEndRaid() private void SetEndReasonText(RaidEndReason reason) { - raid_References.OutOfTime.enabled = reason == RaidEndReason.OutOfTime; - raid_References.OutOfSpace.enabled = reason == RaidEndReason.OutOfSpace; - raid_References.RaidEndedText.enabled = reason == RaidEndReason.Trap; + Raid_EndMenu endMenu = raid_References.EndMenu == null ? null : raid_References.EndMenu.GetComponent(); + if (endMenu != null) + { + endMenu.SetEndReasonText(reason); + } } private Raid_EventPopup.Scenario GetPopupScenario(RaidEndReason reason) diff --git a/Assets/Raid/Scripts/Raid_EndMenu.cs b/Assets/Raid/Scripts/Raid_EndMenu.cs index aa4f1b62bc..75c001ab55 100644 --- a/Assets/Raid/Scripts/Raid_EndMenu.cs +++ b/Assets/Raid/Scripts/Raid_EndMenu.cs @@ -3,6 +3,7 @@ using Altzone.Scripts.Model.Poco.Game; using UnityEngine; using UnityEngine.SceneManagement; +using UnityEngine.UI; public class Raid_EndMenu : MonoBehaviour { @@ -10,19 +11,58 @@ public class Raid_EndMenu : MonoBehaviour public RectTransform collectedFurniture; public RectTransform content; public Raid_InventoryItem itemPrefab; + [SerializeField] private Image backgroundImage; + [SerializeField] private Sprite normalBackgroundSprite; + [SerializeField] private Sprite overweightBackgroundSprite; + [SerializeField] private GameObject normalEndResultText; + [SerializeField] private GameObject overweightEndResultText; + [SerializeField] private Vector3 collectedLootItemScale = Vector3.one; // SetCollectedLoot for display when showing EndMenu public void SetCollectedLoot(List lootList) { - for (int i=0;i(); + itemTransform.anchorMin = new Vector2(0.5f, 0.5f); + itemTransform.anchorMax = new Vector2(0.5f, 0.5f); + itemTransform.anchoredPosition = Vector2.zero; UIItem.SetData(lootList[i]); } } + public void SetOverWeightLimitBackground(bool wentOverWeightLimit) + { + if (backgroundImage != null) + { + Sprite selectedBackground = wentOverWeightLimit ? overweightBackgroundSprite : normalBackgroundSprite; + if (selectedBackground != null) + { + backgroundImage.sprite = selectedBackground; + } + } + } + + public void SetEndReasonText(ExitRaid.RaidEndReason reason) + { + bool wentOverWeightLimit = reason == ExitRaid.RaidEndReason.OutOfSpace; + + if (normalEndResultText != null) + { + normalEndResultText.SetActive(!wentOverWeightLimit); + } + + if (overweightEndResultText != null) + { + overweightEndResultText.SetActive(wentOverWeightLimit); + } + } + public void ReturnToLobby() { SceneManager.LoadScene("10-MenuUI"); @@ -32,4 +72,25 @@ public void Restart() { SceneManager.LoadScene("40-Raid"); } + + private void ClearCollectedLoot() + { + if (content == null) + { + return; + } + + for (int i = content.childCount - 1; i >= 0; i--) + { + Destroy(content.GetChild(i).gameObject); + } + } + + private Transform CreateCollectedLootItemContainer() + { + GameObject itemContainer = new GameObject("CollectedLootItem", typeof(RectTransform)); + RectTransform itemContainerTransform = itemContainer.GetComponent(); + itemContainerTransform.SetParent(content, false); + return itemContainerTransform; + } } diff --git a/Assets/Raid/Scripts/Raid_InventoryItem.cs b/Assets/Raid/Scripts/Raid_InventoryItem.cs index 868cef1bd3..dd334ebc35 100644 --- a/Assets/Raid/Scripts/Raid_InventoryItem.cs +++ b/Assets/Raid/Scripts/Raid_InventoryItem.cs @@ -74,8 +74,10 @@ public void Awake() raidTimer.TimeEnded += OnTimeEnded; } audioSource = GetComponent(); - ItemImage.gameObject.SetActive(false); - empty = true; + if (empty) + { + ItemImage.gameObject.SetActive(false); + } //if ((PlayerRole)PhotonNetwork.LocalPlayer.CustomProperties["Role"] == PlayerRole.Spectator) spectator = false; diff --git a/Assets/Raid/Scripts/Raid_LootTracking.cs b/Assets/Raid/Scripts/Raid_LootTracking.cs index 9beeb4cbad..6f46dc096d 100644 --- a/Assets/Raid/Scripts/Raid_LootTracking.cs +++ b/Assets/Raid/Scripts/Raid_LootTracking.cs @@ -90,8 +90,14 @@ public void SetLootCount(GameFurniture furniture, float MaxLootWeight, float loo } else { + Raid_EndMenu endMenu = raid_References.EndMenu.GetComponent(); + if (endMenu != null) + { + endMenu.SetEndReasonText(ExitRaid.RaidEndReason.OutOfSpace); + endMenu.SetOverWeightLimitBackground(true); + } + raid_References.EndMenu.SetActive(true); - raid_References.OutOfSpace.enabled = true; } } } diff --git a/Assets/Raid/Scripts/Raid_References.cs b/Assets/Raid/Scripts/Raid_References.cs index 6f7c116d89..775874019a 100644 --- a/Assets/Raid/Scripts/Raid_References.cs +++ b/Assets/Raid/Scripts/Raid_References.cs @@ -1,7 +1,6 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -using TMPro; public class Raid_References : MonoBehaviour { @@ -12,9 +11,6 @@ public class Raid_References : MonoBehaviour public GameObject Heart; [SerializeField, Header("Reference game components")] - public TextMeshProUGUI OutOfTime; - public TextMeshProUGUI OutOfSpace; - public TextMeshProUGUI RaidEndedText; public Raid_InventoryHandler inventoryHandler; public Raid_LootTracking raid_LootTracking; @@ -22,9 +18,9 @@ private void Start() { inventoryHandler = GameObject.Find("ScriptHolder").GetComponent(); - EndMenu.SetActive(false); - OutOfTime.enabled = false; - OutOfSpace.enabled = false; - RaidEndedText.enabled = false; + if (EndMenu != null) + { + EndMenu.SetActive(false); + } } } From 55daef139bab26dc62e0ce600a9ed29c76c58182 Mon Sep 17 00:00:00 2001 From: Davetsa Date: Thu, 4 Jun 2026 15:23:56 +0300 Subject: [PATCH 07/16] Added Space remainigntext to EndMenu --- .../Acme/Acme-Regular Outline SDF 1.asset | 4 +- Assets/Raid/Resources/Prefabs/EndMenu.prefab | 143 +++++++++++++++++- .../Raid/Resources/Prefabs/Inventory.prefab | 26 ++-- Assets/Raid/Scenes/40-Raid.unity | 5 + Assets/Raid/Scripts/ExitRaid.cs | 1 + Assets/Raid/Scripts/Raid_EndMenu.cs | 13 ++ Assets/Raid/Scripts/Raid_LootTracking.cs | 11 +- 7 files changed, 185 insertions(+), 18 deletions(-) diff --git a/Assets/Altzone/Fonts/TextMeshPro/Acme/Acme-Regular Outline SDF 1.asset b/Assets/Altzone/Fonts/TextMeshPro/Acme/Acme-Regular Outline SDF 1.asset index 1d330003ce..66b23aa36a 100644 --- a/Assets/Altzone/Fonts/TextMeshPro/Acme/Acme-Regular Outline SDF 1.asset +++ b/Assets/Altzone/Fonts/TextMeshPro/Acme/Acme-Regular Outline SDF 1.asset @@ -5378,9 +5378,9 @@ Material: - _FaceDilate: 0 - _FaceUVSpeedX: 0 - _FaceUVSpeedY: 0 - - _GlowInner: 0.05 + - _GlowInner: 0 - _GlowOffset: 0 - - _GlowOuter: 0.05 + - _GlowOuter: 0.86 - _GlowPower: 0.75 - _GradientScale: 6 - _LightAngle: 3.1416 diff --git a/Assets/Raid/Resources/Prefabs/EndMenu.prefab b/Assets/Raid/Resources/Prefabs/EndMenu.prefab index ed73d64185..9778cff097 100644 --- a/Assets/Raid/Resources/Prefabs/EndMenu.prefab +++ b/Assets/Raid/Resources/Prefabs/EndMenu.prefab @@ -16,7 +16,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2668198566995541017 RectTransform: m_ObjectHideFlags: 0 @@ -34,6 +34,7 @@ RectTransform: - {fileID: 2608056757774145037} - {fileID: 1067388266668187510} - {fileID: 9001000000000000002} + - {fileID: 9102000000000000002} - {fileID: 6112746816069853310} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -65,6 +66,7 @@ MonoBehaviour: type: 3} normalEndResultText: {fileID: 2517094342130405460} overweightEndResultText: {fileID: 9001000000000000001} + spaceRemainingText: {fileID: 9102000000000000004} collectedLootItemScale: {x: 1.25, y: 1.25, z: 1} --- !u!1 &1381501735683521454 GameObject: @@ -1128,3 +1130,142 @@ MonoBehaviour: _englishText: 'Loot lost - Hearts maximum weight exceeded-' +--- !u!1 &9102000000000000001 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9102000000000000002} + - component: {fileID: 9102000000000000003} + - component: {fileID: 9102000000000000004} + m_Layer: 5 + m_Name: SpaceRemainingText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9102000000000000002 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9102000000000000001} + m_LocalRotation: {x: 0, y: 0, z: 0.036643673, w: 0.99932843} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2668198566995541017} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 4.2} + m_AnchorMin: {x: 0, y: 0.01} + m_AnchorMax: {x: 0.4, y: 0.15} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 1, y: 1} +--- !u!222 &9102000000000000003 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9102000000000000001} + m_CullTransparentMesh: 1 +--- !u!114 &9102000000000000004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9102000000000000001} + 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: '--- + + /300' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: dcc089e132356ac4a9eb8090bee5e304, type: 2} + m_sharedMaterial: {fileID: 4752717343592566078, guid: dcc089e132356ac4a9eb8090bee5e304, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 150 + m_fontSizeBase: 100 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 150 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + 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_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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} diff --git a/Assets/Raid/Resources/Prefabs/Inventory.prefab b/Assets/Raid/Resources/Prefabs/Inventory.prefab index 61cfe9db80..ccce204c66 100644 --- a/Assets/Raid/Resources/Prefabs/Inventory.prefab +++ b/Assets/Raid/Resources/Prefabs/Inventory.prefab @@ -520,17 +520,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6569395318403476260} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0.036643673, w: 0.99932843} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 8100441791909708575} - 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: 0, y: 78} - m_SizeDelta: {x: 300, y: 50} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 4.2} + m_AnchorMin: {x: 0, y: 0.3} + m_AnchorMax: {x: 1, y: 0.7} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8088582236978232087 CanvasRenderer: @@ -588,10 +588,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 150 - m_fontSizeBase: 150 + m_fontSize: 72 + m_fontSizeBase: 100 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 @@ -1580,10 +1580,10 @@ RectTransform: - {fileID: 1275086321493794833} m_Father: {fileID: 8100441791961523161} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 325, y: -271.5} + m_SizeDelta: {x: 570, y: 463} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8100441791909708569 CanvasRenderer: diff --git a/Assets/Raid/Scenes/40-Raid.unity b/Assets/Raid/Scenes/40-Raid.unity index c88b43a71c..deaf41a206 100644 --- a/Assets/Raid/Scenes/40-Raid.unity +++ b/Assets/Raid/Scenes/40-Raid.unity @@ -949,6 +949,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8100441790942708954, guid: 1456b9f29a360684da0ae9d727e82bd4, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8100441791093507177, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_AnchorMax.y diff --git a/Assets/Raid/Scripts/ExitRaid.cs b/Assets/Raid/Scripts/ExitRaid.cs index 4aefffafa3..d608f38c61 100644 --- a/Assets/Raid/Scripts/ExitRaid.cs +++ b/Assets/Raid/Scripts/ExitRaid.cs @@ -76,6 +76,7 @@ private IEnumerator EndRaidRoutine(RaidEndReason reason) endMenu.SetOverWeightLimitBackground(reason == RaidEndReason.OutOfSpace); endMenu.SetCollectedLoot(raid_References.raid_LootTracking.ListOfCollectedLoot); + endMenu.SetSpaceRemainingText(raid_References.raid_LootTracking.CurrentLootWeight, raid_References.raid_LootTracking.MaxLootWeight); raid_References.EndMenu.SetActive(true); } diff --git a/Assets/Raid/Scripts/Raid_EndMenu.cs b/Assets/Raid/Scripts/Raid_EndMenu.cs index 75c001ab55..699c955740 100644 --- a/Assets/Raid/Scripts/Raid_EndMenu.cs +++ b/Assets/Raid/Scripts/Raid_EndMenu.cs @@ -4,6 +4,7 @@ using UnityEngine; using UnityEngine.SceneManagement; using UnityEngine.UI; +using TMPro; public class Raid_EndMenu : MonoBehaviour { @@ -16,6 +17,7 @@ public class Raid_EndMenu : MonoBehaviour [SerializeField] private Sprite overweightBackgroundSprite; [SerializeField] private GameObject normalEndResultText; [SerializeField] private GameObject overweightEndResultText; + [SerializeField] private TMP_Text spaceRemainingText; [SerializeField] private Vector3 collectedLootItemScale = Vector3.one; // SetCollectedLoot for display when showing EndMenu @@ -63,6 +65,16 @@ public void SetEndReasonText(ExitRaid.RaidEndReason reason) } } + public void SetSpaceRemainingText(float currentLootWeight, float maxLootWeight) + { + if (spaceRemainingText == null) + { + return; + } + + spaceRemainingText.text = $"{currentLootWeight:F0}kg\n/{maxLootWeight:F0}kg"; + } + public void ReturnToLobby() { SceneManager.LoadScene("10-MenuUI"); @@ -93,4 +105,5 @@ private Transform CreateCollectedLootItemContainer() itemContainerTransform.SetParent(content, false); return itemContainerTransform; } + } diff --git a/Assets/Raid/Scripts/Raid_LootTracking.cs b/Assets/Raid/Scripts/Raid_LootTracking.cs index 6f46dc096d..c41fe8f615 100644 --- a/Assets/Raid/Scripts/Raid_LootTracking.cs +++ b/Assets/Raid/Scripts/Raid_LootTracking.cs @@ -47,6 +47,7 @@ public void SetRandomMaxLootWeightRPC(float maxLootWeight) MaxLootWeight = maxLootWeight; //Debug.Log("maxLootWeight has been set"); this.MaxLootText.text = MaxLootWeight.ToString() + " kg"; + UpdateHeartLootText(); } public void ResetLootCount() @@ -56,6 +57,7 @@ public void ResetLootCount() CurrentLootText.text = CurrentLootWeight.ToString() + " kg"; OutOfText.text = "Out of"; MaxLootText.text = MaxLootWeight.ToString() + " kg"; + UpdateHeartLootText(); } public void SetLootCount(GameFurniture furniture, float MaxLootWeight, float lootWeightMultiplier = 1f) @@ -68,8 +70,7 @@ public void SetLootCount(GameFurniture furniture, float MaxLootWeight, float loo CurrentLootText.text = NewLootWeight.ToString() + " kg"; MaxLootText.text = MaxLootWeight.ToString() + " kg"; - float weightTMP = MaxLootWeight - NewLootWeight; - HeartLootText.text = (MaxLootWeight - NewLootWeight).ToString("F0"); + UpdateHeartLootText(); if (CurrentLootWeight > MaxLootWeight) { //EndScreen @@ -95,11 +96,17 @@ public void SetLootCount(GameFurniture furniture, float MaxLootWeight, float loo { endMenu.SetEndReasonText(ExitRaid.RaidEndReason.OutOfSpace); endMenu.SetOverWeightLimitBackground(true); + endMenu.SetSpaceRemainingText(CurrentLootWeight, MaxLootWeight); } raid_References.EndMenu.SetActive(true); } } } + + private void UpdateHeartLootText() + { + HeartLootText.text = $"{CurrentLootWeight:F0}kg\n/{MaxLootWeight:F0}kg"; + } } From 31825395752beba4e92a040091ec3366e0646d22 Mon Sep 17 00:00:00 2001 From: Davetsa Date: Fri, 5 Jun 2026 12:13:32 +0300 Subject: [PATCH 08/16] Added exit confimation popup and made visual changes --- Assets/Raid/Graphics/flag 1.png | 3 + Assets/Raid/Graphics/flag 1.png.meta | 179 +++ Assets/Raid/Resources/Prefabs/EndMenu.prefab | 18 +- .../Raid/Resources/Prefabs/Inventory.prefab | 185 +-- .../Resources/Prefabs/RaidEventPopup.prefab | 16 +- .../Prefabs/RaidExitConfirmationPopup.prefab | 1052 +++++++++++++++++ .../RaidExitConfirmationPopup.prefab.meta | 7 + Assets/Raid/Scenes/40-Raid.unity | 16 +- Assets/Raid/Scripts/ExitRaid.cs | 15 +- Assets/Raid/Scripts/Raid_EventPopup.cs | 3 +- .../Scripts/Raid_ExitConfirmationPopup.cs | 80 ++ .../Raid_ExitConfirmationPopup.cs.meta | 11 + 12 files changed, 1394 insertions(+), 191 deletions(-) create mode 100644 Assets/Raid/Graphics/flag 1.png create mode 100644 Assets/Raid/Graphics/flag 1.png.meta create mode 100644 Assets/Raid/Resources/Prefabs/RaidExitConfirmationPopup.prefab create mode 100644 Assets/Raid/Resources/Prefabs/RaidExitConfirmationPopup.prefab.meta create mode 100644 Assets/Raid/Scripts/Raid_ExitConfirmationPopup.cs create mode 100644 Assets/Raid/Scripts/Raid_ExitConfirmationPopup.cs.meta diff --git a/Assets/Raid/Graphics/flag 1.png b/Assets/Raid/Graphics/flag 1.png new file mode 100644 index 0000000000..f111f3d015 --- /dev/null +++ b/Assets/Raid/Graphics/flag 1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6634cf67dee0d6f57cee7735010639961b18f357582f829496d7950958a393e3 +size 14898 diff --git a/Assets/Raid/Graphics/flag 1.png.meta b/Assets/Raid/Graphics/flag 1.png.meta new file mode 100644 index 0000000000..d62510b41c --- /dev/null +++ b/Assets/Raid/Graphics/flag 1.png.meta @@ -0,0 +1,179 @@ +fileFormatVersion: 2 +guid: 923ae505b67044f41976afba48d2b2d8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 120 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 1 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: 10 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Raid/Resources/Prefabs/EndMenu.prefab b/Assets/Raid/Resources/Prefabs/EndMenu.prefab index 9778cff097..31628c4291 100644 --- a/Assets/Raid/Resources/Prefabs/EndMenu.prefab +++ b/Assets/Raid/Resources/Prefabs/EndMenu.prefab @@ -16,7 +16,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2668198566995541017 RectTransform: m_ObjectHideFlags: 0 @@ -38,10 +38,10 @@ RectTransform: - {fileID: 6112746816069853310} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 3040} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7581730394780298031 MonoBehaviour: @@ -1069,7 +1069,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 110 + m_fontSize: 18 m_fontSizeBase: 48 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -1197,10 +1197,10 @@ MonoBehaviour: m_Calls: [] m_text: '--- - /300' + /300 kg' m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: dcc089e132356ac4a9eb8090bee5e304, type: 2} - m_sharedMaterial: {fileID: 4752717343592566078, guid: dcc089e132356ac4a9eb8090bee5e304, + m_fontAsset: {fileID: 11400000, guid: eca1bd84f719d7146a5b636b4f4beff0, type: 2} + m_sharedMaterial: {fileID: -2998110953030337146, guid: eca1bd84f719d7146a5b636b4f4beff0, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} @@ -1225,7 +1225,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 150 + m_fontSize: 144.85 m_fontSizeBase: 100 m_fontWeight: 400 m_enableAutoSizing: 1 diff --git a/Assets/Raid/Resources/Prefabs/Inventory.prefab b/Assets/Raid/Resources/Prefabs/Inventory.prefab index ccce204c66..8e8d75ac03 100644 --- a/Assets/Raid/Resources/Prefabs/Inventory.prefab +++ b/Assets/Raid/Resources/Prefabs/Inventory.prefab @@ -226,8 +226,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 520521642498466654} + m_Children: [] m_Father: {fileID: 8100441791093507177} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -263,7 +262,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 006ec4b33b6f550458a02bfe928f68b7, type: 3} + m_Sprite: {fileID: 21300000, guid: 26085e83f87f8494f8563d8f060e2348, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -319,7 +318,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 1226679771514626003} m_TargetAssemblyTypeName: ExitRaid, Assembly-CSharp - m_MethodName: EndRaid + m_MethodName: RequestExitRaid m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -976,10 +975,10 @@ RectTransform: - {fileID: 8100441790942708954} m_Father: {fileID: 8100441792720133309} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -25} - m_SizeDelta: {x: 1600, y: 2650.795} + m_AnchorMin: {x: 0, y: 0.02} + m_AnchorMax: {x: 1, y: 0.98} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &8100441790868650069 CanvasRenderer: @@ -1090,10 +1089,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 8100441790868650072} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 800, y: -0} - m_SizeDelta: {x: 1600, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &8100441790942708949 MonoBehaviour: @@ -1915,7 +1914,7 @@ RectTransform: m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -2049,10 +2048,10 @@ RectTransform: - {fileID: 8100441790868650072} m_Father: {fileID: 8100441790794122374} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: -20} - m_SizeDelta: {x: -150, y: 2700} + m_AnchorMin: {x: 0, y: 0.02} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8100441792720133310 CanvasRenderer: @@ -2219,155 +2218,3 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 ---- !u!1 &8607928800518872510 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 520521642498466654} - - component: {fileID: 6099496245047726403} - - component: {fileID: 9191574820958886117} - - component: {fileID: 4318559206568425600} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &520521642498466654 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8607928800518872510} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 3531054082868248669} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6099496245047726403 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8607928800518872510} - m_CullTransparentMesh: 1 ---- !u!114 &9191574820958886117 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8607928800518872510} - 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: "Lopeta
Ry\xF6st\xF6" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 90 - m_fontSizeBase: 90 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 1 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 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!114 &4318559206568425600 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8607928800518872510} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5d0f6a6f2dc9de54e860ff2356824232, type: 3} - m_Name: - m_EditorClassIdentifier: - raidEnded: 0 - raid_timer: {fileID: 0} - raid_References: {fileID: 0} diff --git a/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab b/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab index d3de9ea098..5e3c14adcf 100644 --- a/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab +++ b/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab @@ -169,6 +169,16 @@ MonoBehaviour: Image: {fileID: 21300000, guid: e744bbe740a59e147a20e863381e3cbe, type: 3} SecondaryImage: {fileID: 0} MultText: + - Scenario: 5 + Message: "Vet\xE4ytyminen! Peli p\xE4\xE4ttynyt" + BackgroundSprite: {fileID: 21300000, guid: 64b00f4be61371448934c52816bb3079, type: 3} + BackgroundColor: {r: 1, g: 1, b: 1, a: 0.55} + Effect: {fileID: 0} + EffectColor: {r: 1, g: 1, b: 1, a: 1} + TextColor: {r: 1, g: 0.6313726, b: 0, a: 1} + Image: {fileID: 21300000, guid: 923ae505b67044f41976afba48d2b2d8, type: 3} + SecondaryImage: {fileID: 0} + MultText: --- !u!1 &2000 GameObject: m_ObjectHideFlags: 0 @@ -278,10 +288,10 @@ RectTransform: - {fileID: 5001} m_Father: {fileID: 1001} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.4, y: 0.4} - m_AnchorMax: {x: 0.6, y: 0.6} + m_AnchorMin: {x: 0.2, y: 0.34} + m_AnchorMax: {x: 0.8, y: 0.66} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 720, y: 300} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3002 CanvasRenderer: diff --git a/Assets/Raid/Resources/Prefabs/RaidExitConfirmationPopup.prefab b/Assets/Raid/Resources/Prefabs/RaidExitConfirmationPopup.prefab new file mode 100644 index 0000000000..e88585a986 --- /dev/null +++ b/Assets/Raid/Resources/Prefabs/RaidExitConfirmationPopup.prefab @@ -0,0 +1,1052 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1001} + - component: {fileID: 1002} + - component: {fileID: 1003} + - component: {fileID: 1004} + - component: {fileID: 1005} + m_Layer: 5 + m_Name: RaidExitConfirmationPopup + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2001} + - {fileID: 3001} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &1002 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 1 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 1100 + m_TargetDisplay: 0 +--- !u!114 &1003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0.5 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &1005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9d7c4a65d9a04c84b9f5e16b3fdf8a21, type: 3} + m_Name: + m_EditorClassIdentifier: + bodyText: {fileID: 4003} + confirmButtonText: {fileID: 8003} + cancelButtonText: {fileID: 6003} + confirmButton: {fileID: 7004} + cancelButton: {fileID: 5004} +--- !u!1 &2000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2001} + - component: {fileID: 2002} + - component: {fileID: 2003} + m_Layer: 5 + m_Name: Overlay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2000} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1001} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2002 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2000} + m_CullTransparentMesh: 1 +--- !u!114 &2003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.65} + 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!1 &3000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3001} + - component: {fileID: 3002} + - component: {fileID: 3003} + m_Layer: 5 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3000} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2000025014021050791} + - {fileID: 4001} + - {fileID: 5001} + - {fileID: 7001} + m_Father: {fileID: 1001} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.12, y: 0.33} + m_AnchorMax: {x: 0.88, y: 0.66} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3002 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3000} + m_CullTransparentMesh: 1 +--- !u!114 &3003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.21568628, g: 0.23137255, b: 0.24313726, a: 0.96} + 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: 21300000, guid: 776df73bddbed9848b7968a02085a428, type: 3} + 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!1 &4000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4001} + - component: {fileID: 4002} + - component: {fileID: 4003} + - component: {fileID: 4004} + m_Layer: 5 + m_Name: Message + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4000} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3001} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.08, y: 0.42} + m_AnchorMax: {x: 0.92, y: 0.88} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4002 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4000} + m_CullTransparentMesh: 1 +--- !u!114 &4003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4000} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "Vet\xE4ydyt\xE4\xE4nk\xF6 pelist\xE4 ja pidet\xE4\xE4n t\xE4h\xE4n asti + ker\xE4tyt tavarat?" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: eca1bd84f719d7146a5b636b4f4beff0, type: 2} + m_sharedMaterial: {fileID: -2998110953030337146, guid: eca1bd84f719d7146a5b636b4f4beff0, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 86.45 + m_fontSizeBase: 34 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 100 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!114 &4004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 220ef737e6ba13e48841e379d56ad79b, type: 3} + m_Name: + m_EditorClassIdentifier: + _finnishText: "Vet\xE4ydyt\xE4\xE4nk\xF6 pelist\xE4 ja pidet\xE4\xE4n t\xE4h\xE4n + asti ker\xE4tyt tavarat?" + _englishText: Leave the raid and keep the items collected so far? +--- !u!1 &5000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5001} + - component: {fileID: 5002} + - component: {fileID: 5003} + - component: {fileID: 5004} + m_Layer: 5 + m_Name: CancelButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5000} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6001} + m_Father: {fileID: 3001} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.1, y: 0.09} + m_AnchorMax: {x: 0.46, y: 0.23} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5002 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5000} + m_CullTransparentMesh: 1 +--- !u!114 &5003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.21960786, b: 0.23529413, 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: 21300000, guid: 47f3804936cb29747bf9619ef5303fec, type: 3} + 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!114 &5004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 5003} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &6000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6001} + - component: {fileID: 6002} + - component: {fileID: 6003} + - component: {fileID: 6004} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6000} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5001} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6002 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6000} + m_CullTransparentMesh: 1 +--- !u!114 &6003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6000} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: peruuta + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: eca1bd84f719d7146a5b636b4f4beff0, type: 2} + m_sharedMaterial: {fileID: -2998110953030337146, guid: eca1bd84f719d7146a5b636b4f4beff0, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 72 + m_fontSizeBase: 28 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!114 &6004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 220ef737e6ba13e48841e379d56ad79b, type: 3} + m_Name: + m_EditorClassIdentifier: + _finnishText: Peruuta + _englishText: Cancel +--- !u!1 &7000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7001} + - component: {fileID: 7002} + - component: {fileID: 7003} + - component: {fileID: 7004} + m_Layer: 5 + m_Name: ConfirmButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7000} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8001} + m_Father: {fileID: 3001} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.54, y: 0.09} + m_AnchorMax: {x: 0.9, y: 0.23} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7002 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7000} + m_CullTransparentMesh: 1 +--- !u!114 &7003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.32941177, g: 0.7843138, b: 0.31764707, 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: 21300000, guid: 47f3804936cb29747bf9619ef5303fec, type: 3} + 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!114 &7004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 7003} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &8000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8001} + - component: {fileID: 8002} + - component: {fileID: 8003} + - component: {fileID: 8004} + m_Layer: 5 + m_Name: Label + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8001 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8000} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7001} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8002 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8000} + m_CullTransparentMesh: 1 +--- !u!114 &8003 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8000} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "kyll\xE4" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: eca1bd84f719d7146a5b636b4f4beff0, type: 2} + m_sharedMaterial: {fileID: -2998110953030337146, guid: eca1bd84f719d7146a5b636b4f4beff0, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 72 + m_fontSizeBase: 28 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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!114 &8004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 220ef737e6ba13e48841e379d56ad79b, type: 3} + m_Name: + m_EditorClassIdentifier: + _finnishText: "Kyll\xE4" + _englishText: Yes +--- !u!1 &3653134169773061798 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2000025014021050791} + - component: {fileID: 8096296418073855257} + - component: {fileID: 3204345166262165810} + m_Layer: 5 + m_Name: Panel (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2000025014021050791 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3653134169773061798} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3001} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8096296418073855257 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3653134169773061798} + m_CullTransparentMesh: 1 +--- !u!114 &3204345166262165810 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3653134169773061798} + m_Enabled: 1 + 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: 0.96} + 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: 21300000, guid: f63e8baef8eddb8458bb5b8d5ed81a40, type: 3} + 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 diff --git a/Assets/Raid/Resources/Prefabs/RaidExitConfirmationPopup.prefab.meta b/Assets/Raid/Resources/Prefabs/RaidExitConfirmationPopup.prefab.meta new file mode 100644 index 0000000000..8f7878096b --- /dev/null +++ b/Assets/Raid/Resources/Prefabs/RaidExitConfirmationPopup.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 95fb5a2be6644fc5a57e9dc9d9e8e931 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Raid/Scenes/40-Raid.unity b/Assets/Raid/Scenes/40-Raid.unity index deaf41a206..70d0703db9 100644 --- a/Assets/Raid/Scenes/40-Raid.unity +++ b/Assets/Raid/Scenes/40-Raid.unity @@ -260,7 +260,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 53865117} m_TargetAssemblyTypeName: ExitRaid, Assembly-CSharp - m_MethodName: EndRaid + m_MethodName: RequestExitRaid m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -660,7 +660,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 500791815} m_TargetAssemblyTypeName: ExitRaid, Assembly-CSharp - m_MethodName: EndRaid + m_MethodName: RequestExitRaid m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -987,32 +987,32 @@ PrefabInstance: - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 570 objectReference: {fileID: 0} - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 463 objectReference: {fileID: 0} - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 325 objectReference: {fileID: 0} - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -271.5 objectReference: {fileID: 0} - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} diff --git a/Assets/Raid/Scripts/ExitRaid.cs b/Assets/Raid/Scripts/ExitRaid.cs index d608f38c61..b5e80bd93a 100644 --- a/Assets/Raid/Scripts/ExitRaid.cs +++ b/Assets/Raid/Scripts/ExitRaid.cs @@ -9,7 +9,8 @@ public enum RaidEndReason { Trap, OutOfTime, - OutOfSpace + OutOfSpace, + PlayerExit } public event Action ExitedRaid; @@ -22,6 +23,16 @@ private void Awake() ResolveReferences(); } + public void RequestExitRaid() + { + if (raidEnded) + { + return; + } + + Raid_ExitConfirmationPopup.Show(() => EndRaid(RaidEndReason.PlayerExit)); + } + public void EndRaid() { EndRaid(RaidEndReason.Trap); @@ -102,6 +113,8 @@ private Raid_EventPopup.Scenario GetPopupScenario(RaidEndReason reason) return Raid_EventPopup.Scenario.OutOfTime; case RaidEndReason.OutOfSpace: return Raid_EventPopup.Scenario.OutOfSpace; + case RaidEndReason.PlayerExit: + return Raid_EventPopup.Scenario.PlayerExit; default: return Raid_EventPopup.Scenario.EndTrap; } diff --git a/Assets/Raid/Scripts/Raid_EventPopup.cs b/Assets/Raid/Scripts/Raid_EventPopup.cs index 83b84a212a..9358c0045b 100644 --- a/Assets/Raid/Scripts/Raid_EventPopup.cs +++ b/Assets/Raid/Scripts/Raid_EventPopup.cs @@ -12,7 +12,8 @@ public enum Scenario Freeze, DoubleWeight, OutOfTime, - OutOfSpace + OutOfSpace, + PlayerExit } [Serializable] diff --git a/Assets/Raid/Scripts/Raid_ExitConfirmationPopup.cs b/Assets/Raid/Scripts/Raid_ExitConfirmationPopup.cs new file mode 100644 index 0000000000..02fc06da28 --- /dev/null +++ b/Assets/Raid/Scripts/Raid_ExitConfirmationPopup.cs @@ -0,0 +1,80 @@ +using System; +using TMPro; +using UnityEngine; +using UnityEngine.UI; + +public class Raid_ExitConfirmationPopup : MonoBehaviour +{ + private const string PopupResourcePath = "Prefabs/RaidExitConfirmationPopup"; + + private static Raid_ExitConfirmationPopup instance; + private Action confirmAction; + + [SerializeField] private TextMeshProUGUI bodyText; + [SerializeField] private TextMeshProUGUI confirmButtonText; + [SerializeField] private TextMeshProUGUI cancelButtonText; + [SerializeField] private Button confirmButton; + [SerializeField] private Button cancelButton; + + private void Awake() + { + if (confirmButton != null) + { + confirmButton.onClick.RemoveListener(Confirm); + confirmButton.onClick.AddListener(Confirm); + } + + if (cancelButton != null) + { + cancelButton.onClick.RemoveListener(Hide); + cancelButton.onClick.AddListener(Hide); + } + } + + public static void Show(Action onConfirm) + { + Raid_ExitConfirmationPopup popup = GetOrCreate(); + if (popup == null) + { + return; + } + + popup.confirmAction = onConfirm; + popup.gameObject.SetActive(true); + popup.transform.SetAsLastSibling(); + } + + private static Raid_ExitConfirmationPopup GetOrCreate() + { + if (instance != null) + { + return instance; + } + + Raid_ExitConfirmationPopup prefab = Resources.Load(PopupResourcePath); + if (prefab == null) + { + Debug.LogError($"Raid exit confirmation popup prefab was not found at Resources/{PopupResourcePath}."); + return null; + } + + instance = Instantiate(prefab); + instance.name = "Raid Exit Confirmation Popup"; + DontDestroyOnLoad(instance.gameObject); + instance.gameObject.SetActive(false); + return instance; + } + + private void Confirm() + { + Action action = confirmAction; + Hide(); + action?.Invoke(); + } + + private void Hide() + { + confirmAction = null; + gameObject.SetActive(false); + } +} diff --git a/Assets/Raid/Scripts/Raid_ExitConfirmationPopup.cs.meta b/Assets/Raid/Scripts/Raid_ExitConfirmationPopup.cs.meta new file mode 100644 index 0000000000..ee64104508 --- /dev/null +++ b/Assets/Raid/Scripts/Raid_ExitConfirmationPopup.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9d7c4a65d9a04c84b9f5e16b3fdf8a21 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 7fb7d426969c9ae1e0a4f99cd9718f400bd79ff7 Mon Sep 17 00:00:00 2001 From: Davetsa Date: Fri, 5 Jun 2026 14:34:32 +0300 Subject: [PATCH 09/16] Localize raid event popup --- .../Acme/Acme-Regular Outline SDF 1.asset | 4 +- .../Resources/Prefabs/RaidEventPopup.prefab | 66 +++++++++++++++---- Assets/Raid/Scripts/Raid_EventPopup.cs | 57 +++++++++++++--- 3 files changed, 105 insertions(+), 22 deletions(-) diff --git a/Assets/Altzone/Fonts/TextMeshPro/Acme/Acme-Regular Outline SDF 1.asset b/Assets/Altzone/Fonts/TextMeshPro/Acme/Acme-Regular Outline SDF 1.asset index 66b23aa36a..1d330003ce 100644 --- a/Assets/Altzone/Fonts/TextMeshPro/Acme/Acme-Regular Outline SDF 1.asset +++ b/Assets/Altzone/Fonts/TextMeshPro/Acme/Acme-Regular Outline SDF 1.asset @@ -5378,9 +5378,9 @@ Material: - _FaceDilate: 0 - _FaceUVSpeedX: 0 - _FaceUVSpeedY: 0 - - _GlowInner: 0 + - _GlowInner: 0.05 - _GlowOffset: 0 - - _GlowOuter: 0.86 + - _GlowOuter: 0.05 - _GlowPower: 0.75 - _GradientScale: 6 - _LightAngle: 3.1416 diff --git a/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab b/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab index 5e3c14adcf..8303c280e3 100644 --- a/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab +++ b/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab @@ -120,7 +120,8 @@ MonoBehaviour: showTime: 1.75 scenarioVisuals: - Scenario: 0 - Message: Ansa! Kuolettava pommi + FinnishMessage: Ansa! Kuolettava pommi + EnglishMessage: Trap! Lethal bomb BackgroundSprite: {fileID: 21300000, guid: 64b00f4be61371448934c52816bb3079, type: 3} BackgroundColor: {r: 1, g: 1, b: 1, a: 0.55} Effect: {fileID: 0} @@ -128,9 +129,11 @@ MonoBehaviour: TextColor: {r: 1, g: 0.6313726, b: 0, a: 1} Image: {fileID: 21300000, guid: 203e9d7fbfc3ab146b3a5efe940bd4fc, type: 3} SecondaryImage: {fileID: 0} - MultText: + FinnishMultText: + EnglishMultText: - Scenario: 1 - Message: "Ansa! J\xE4\xE4dyit 10 Sekunniksi" + FinnishMessage: "Ansa! J\xE4\xE4dyit 10 Sekunniksi" + EnglishMessage: Trap! Frozen for 10 seconds BackgroundSprite: {fileID: 21300000, guid: 64b00f4be61371448934c52816bb3079, type: 3} BackgroundColor: {r: 1, g: 1, b: 1, a: 0.55} Effect: {fileID: 21300000, guid: c9a331cd52627344d8562ac19ef5c695, type: 3} @@ -138,9 +141,11 @@ MonoBehaviour: TextColor: {r: 0, g: 0.76470596, b: 0.81568635, a: 1} Image: {fileID: 21300000, guid: f3ee01a8f86d9eb4fb65049758f18bc8, type: 3} SecondaryImage: {fileID: 0} - MultText: + FinnishMultText: + EnglishMultText: - Scenario: 2 - Message: Ansa! Esineen paino tuplaantui + FinnishMessage: Ansa! Esineen paino tuplaantui + EnglishMessage: Trap! Item weight doubled BackgroundSprite: {fileID: 21300000, guid: 64b00f4be61371448934c52816bb3079, type: 3} BackgroundColor: {r: 1, g: 1, b: 1, a: 0.55} Effect: {fileID: 0} @@ -148,9 +153,11 @@ MonoBehaviour: TextColor: {r: 1, g: 0.6313726, b: 0, a: 1} Image: {fileID: 0} SecondaryImage: {fileID: 21300000, guid: 8cc5377ca2937f7419b6eec45686c507, type: 3} - MultText: x2 + FinnishMultText: x2 + EnglishMultText: x2 - Scenario: 3 - Message: "Aika! Peli P\xE4\xE4ttynyt" + FinnishMessage: "Aika! Peli P\xE4\xE4ttynyt" + EnglishMessage: Time! Game ended BackgroundSprite: {fileID: 21300000, guid: 64b00f4be61371448934c52816bb3079, type: 3} BackgroundColor: {r: 1, g: 1, b: 1, a: 0.55} Effect: {fileID: 0} @@ -158,9 +165,11 @@ MonoBehaviour: TextColor: {r: 1, g: 0.6313726, b: 0, a: 1} Image: {fileID: 21300000, guid: 334e3eb1b24707a4aa53bab625e40c5b, type: 3} SecondaryImage: {fileID: 0} - MultText: + FinnishMultText: + EnglishMultText: - Scenario: 4 - Message: "Syd\xE4men kapasiteetti ylitetty" + FinnishMessage: "Syd\xE4men kapasiteetti ylitetty" + EnglishMessage: Heart capacity exceeded BackgroundSprite: {fileID: 21300000, guid: 64b00f4be61371448934c52816bb3079, type: 3} BackgroundColor: {r: 1, g: 1, b: 1, a: 0.55} Effect: {fileID: 0} @@ -168,9 +177,11 @@ MonoBehaviour: TextColor: {r: 1, g: 0.6313726, b: 0, a: 1} Image: {fileID: 21300000, guid: e744bbe740a59e147a20e863381e3cbe, type: 3} SecondaryImage: {fileID: 0} - MultText: + FinnishMultText: + EnglishMultText: - Scenario: 5 - Message: "Vet\xE4ytyminen! Peli p\xE4\xE4ttynyt" + FinnishMessage: "Vet\xE4ytyminen! Peli p\xE4\xE4ttynyt" + EnglishMessage: Retreat! Game ended BackgroundSprite: {fileID: 21300000, guid: 64b00f4be61371448934c52816bb3079, type: 3} BackgroundColor: {r: 1, g: 1, b: 1, a: 0.55} Effect: {fileID: 0} @@ -178,7 +189,8 @@ MonoBehaviour: TextColor: {r: 1, g: 0.6313726, b: 0, a: 1} Image: {fileID: 21300000, guid: 923ae505b67044f41976afba48d2b2d8, type: 3} SecondaryImage: {fileID: 0} - MultText: + FinnishMultText: + EnglishMultText: --- !u!1 &2000 GameObject: m_ObjectHideFlags: 0 @@ -479,6 +491,7 @@ GameObject: - component: {fileID: 5001} - component: {fileID: 5002} - component: {fileID: 5004} + - component: {fileID: 5005} m_Layer: 5 m_Name: Message m_TagString: Untagged @@ -605,6 +618,20 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &5005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99bef45c2704bb147a99ddcb380f3986, type: 3} + m_Name: + m_EditorClassIdentifier: + _finnishText: + _englishText: --- !u!1 &6000 GameObject: m_ObjectHideFlags: 0 @@ -766,6 +793,7 @@ GameObject: - component: {fileID: 8001} - component: {fileID: 8002} - component: {fileID: 8004} + - component: {fileID: 8005} m_Layer: 5 m_Name: MultText m_TagString: Untagged @@ -892,6 +920,20 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &8005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99bef45c2704bb147a99ddcb380f3986, type: 3} + m_Name: + m_EditorClassIdentifier: + _finnishText: + _englishText: --- !u!1 &9000 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Raid/Scripts/Raid_EventPopup.cs b/Assets/Raid/Scripts/Raid_EventPopup.cs index 9358c0045b..bb044b484d 100644 --- a/Assets/Raid/Scripts/Raid_EventPopup.cs +++ b/Assets/Raid/Scripts/Raid_EventPopup.cs @@ -1,7 +1,9 @@ using System; using System.Collections; +using Altzone.Scripts.Language; using TMPro; using UnityEngine; +using UnityEngine.Serialization; using UnityEngine.UI; public class Raid_EventPopup : MonoBehaviour @@ -20,7 +22,9 @@ public enum Scenario private class ScenarioVisual { public Scenario Scenario; - public string Message; + [FormerlySerializedAs("Message")] + [TextArea(1, 3)] public string FinnishMessage; + [TextArea(1, 3)] public string EnglishMessage; public Sprite BackgroundSprite = null; public Color BackgroundColor = new Color(0f, 0f, 0f, 0.55f); public Sprite Effect = null; @@ -28,7 +32,9 @@ private class ScenarioVisual public Color TextColor = Color.white; public Sprite Image = null; public Sprite SecondaryImage = null; - public string MultText = ""; + [FormerlySerializedAs("MultText")] + [TextArea(1, 3)] public string FinnishMultText = ""; + [TextArea(1, 3)] public string EnglishMultText = ""; } private const string PopupResourcePath = "Prefabs/RaidEventPopup"; @@ -108,10 +114,11 @@ private void ApplyScenarioVisual(Scenario scenario) { ScenarioVisual visual = GetScenarioVisual(scenario); - messageText.text = visual.Message; - MultText.text = visual.MultText; - messageText.color = visual.TextColor; - MultText.color = visual.TextColor; + string message = GetLocalizedText(visual.FinnishMessage, visual.EnglishMessage); + string multText = GetLocalizedText(visual.FinnishMultText, visual.EnglishMultText); + + SetLocalizedText(messageText, message, visual.TextColor); + SetLocalizedText(MultText, multText, visual.TextColor); ApplyImage(backgroundImage, visual.BackgroundSprite, visual.BackgroundColor); ApplyImage(effectImage, visual.Effect, visual.EffectColor); @@ -135,7 +142,7 @@ private void ApplyScenarioVisual(Scenario scenario) if (MultText != null) { - MultText.gameObject.SetActive(!string.IsNullOrWhiteSpace(visual.MultText)); + MultText.gameObject.SetActive(!string.IsNullOrWhiteSpace(multText)); } } @@ -155,10 +162,44 @@ private ScenarioVisual GetScenarioVisual(Scenario scenario) return new ScenarioVisual { Scenario = scenario, - Message = "The raid is ending." + FinnishMessage = "Ry\u00f6st\u00f6 p\u00e4\u00e4ttyy.", + EnglishMessage = "The raid is ending." }; } + private string GetLocalizedText(string finnishText, string englishText) + { + if (SettingsCarrier.Instance.Language is SettingsCarrier.LanguageType.English) + { + return string.IsNullOrWhiteSpace(englishText) ? finnishText : englishText; + } + + return string.IsNullOrWhiteSpace(finnishText) ? englishText : finnishText; + } + + private void SetLocalizedText( + TextMeshProUGUI textField, + string text, + Color textColor) + { + if (textField == null) + { + return; + } + + TextLanguageSelectorCaller textLanguageSelector = textField.GetComponent(); + if (textLanguageSelector != null) + { + textLanguageSelector.SetText(text); + } + else + { + textField.text = text; + } + + textField.color = textColor; + } + private void ApplyImage(Image image, Sprite sprite, Color color) { if (image == null) From 28a330ded97b281e7d01ac638c9afd5080f2ec5c Mon Sep 17 00:00:00 2001 From: Davetsa Date: Mon, 8 Jun 2026 11:59:10 +0300 Subject: [PATCH 10/16] Updated the start timer and increased the timer to 45s --- Assets/Raid/Resources/Prefabs/TimerBG.prefab | 306 ++++++++ .../Resources/Prefabs/TimerBG.prefab.meta | 7 + Assets/Raid/Scenes/40-Raid.unity | 676 ++++-------------- Assets/Raid/Scripts/Raid_Timer.cs | 75 +- 4 files changed, 507 insertions(+), 557 deletions(-) create mode 100644 Assets/Raid/Resources/Prefabs/TimerBG.prefab create mode 100644 Assets/Raid/Resources/Prefabs/TimerBG.prefab.meta diff --git a/Assets/Raid/Resources/Prefabs/TimerBG.prefab b/Assets/Raid/Resources/Prefabs/TimerBG.prefab new file mode 100644 index 0000000000..003f083ce0 --- /dev/null +++ b/Assets/Raid/Resources/Prefabs/TimerBG.prefab @@ -0,0 +1,306 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1209941683545363489 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1301662263517430508} + - component: {fileID: 7416993028651854588} + - component: {fileID: 5161628500243646588} + - component: {fileID: 784276731450001001} + m_Layer: 5 + m_Name: StartTimerText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1301662263517430508 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1209941683545363489} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5998399601359405500} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.25, y: 0} + m_AnchorMax: {x: 0.75, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7416993028651854588 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1209941683545363489} + m_CullTransparentMesh: 1 +--- !u!114 &5161628500243646588 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1209941683545363489} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Aloita! + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: eca1bd84f719d7146a5b636b4f4beff0, type: 2} + m_sharedMaterial: {fileID: -2998110953030337146, guid: eca1bd84f719d7146a5b636b4f4beff0, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278231551 + m_fontColor: {r: 1, g: 0.6313726, b: 0, 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: 180 + m_fontSizeBase: 180 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 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: 56.565186, y: 0, z: 30.021667, 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!114 &784276731450001001 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1209941683545363489} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99bef45c2704bb147a99ddcb380f3986, type: 3} + m_Name: + m_EditorClassIdentifier: + _finnishText: Aloita! + _englishText: Start! +--- !u!1 &5587150347687811960 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 815627615029059468} + - component: {fileID: 1664935917188250085} + - component: {fileID: 4259253933724000818} + m_Layer: 5 + m_Name: Overlay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &815627615029059468 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5587150347687811960} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5998399601359405500} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1664935917188250085 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5587150347687811960} + m_CullTransparentMesh: 1 +--- !u!114 &4259253933724000818 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5587150347687811960} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.55} + 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!1 &6758375346154025262 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5998399601359405500} + - component: {fileID: 1911786068467124466} + - component: {fileID: 9104643138137447524} + m_Layer: 5 + m_Name: TimerBG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5998399601359405500 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6758375346154025262} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 815627615029059468} + - {fileID: 1301662263517430508} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1911786068467124466 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6758375346154025262} + m_CullTransparentMesh: 1 +--- !u!114 &9104643138137447524 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6758375346154025262} + 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: 21300000, guid: 64b00f4be61371448934c52816bb3079, type: 3} + 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 diff --git a/Assets/Raid/Resources/Prefabs/TimerBG.prefab.meta b/Assets/Raid/Resources/Prefabs/TimerBG.prefab.meta new file mode 100644 index 0000000000..3acbe5e0a8 --- /dev/null +++ b/Assets/Raid/Resources/Prefabs/TimerBG.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 90ab3d33fcefbae4682af8beaaf76420 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Raid/Scenes/40-Raid.unity b/Assets/Raid/Scenes/40-Raid.unity index 70d0703db9..06fdd4746f 100644 --- a/Assets/Raid/Scenes/40-Raid.unity +++ b/Assets/Raid/Scenes/40-Raid.unity @@ -122,154 +122,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &53865113 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 53865114} - - component: {fileID: 53865116} - - component: {fileID: 53865115} - - component: {fileID: 53865118} - - component: {fileID: 53865117} - m_Layer: 5 - m_Name: FullLungs - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &53865114 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 53865113} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2107529345} - 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: 0, y: 0} - m_SizeDelta: {x: 500, y: 500} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &53865115 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 53865113} - m_Enabled: 1 - 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: 21300000, guid: 06c85acdedc6b9a429e5e8889a5e9a0d, type: 3} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 1 - m_FillAmount: 0 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &53865116 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 53865113} - m_CullTransparentMesh: 1 ---- !u!114 &53865117 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 53865113} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5d0f6a6f2dc9de54e860ff2356824232, type: 3} - m_Name: - m_EditorClassIdentifier: - raidEnded: 0 - raid_timer: {fileID: 0} - raid_References: {fileID: 943703428} ---- !u!114 &53865118 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 53865113} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 53865115} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 53865117} - m_TargetAssemblyTypeName: ExitRaid, Assembly-CSharp - m_MethodName: RequestExitRaid - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 --- !u!114 &251360814 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2888320473751758834, guid: 1456b9f29a360684da0ae9d727e82bd4, @@ -537,290 +389,18 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!1 &500791810 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 500791811} - - component: {fileID: 500791813} - - component: {fileID: 500791812} - - component: {fileID: 500791814} - - component: {fileID: 500791815} - m_Layer: 5 - m_Name: EmptyLungs - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &500791811 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 500791810} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2107529345} - 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: 0, y: -6} - m_SizeDelta: {x: 500, y: 500} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &500791812 +--- !u!114 &728986462 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 500791810} - m_Enabled: 1 - 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: 21300000, guid: 0069bcc7a637d6c46a60dc360170e416, type: 3} - 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 &500791813 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 500791810} - m_CullTransparentMesh: 1 ---- !u!114 &500791814 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 500791810} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 500791812} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 500791815} - m_TargetAssemblyTypeName: ExitRaid, Assembly-CSharp - m_MethodName: RequestExitRaid - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &500791815 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 500791810} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5d0f6a6f2dc9de54e860ff2356824232, type: 3} - m_Name: - m_EditorClassIdentifier: - raidEnded: 0 - raid_timer: {fileID: 0} - raid_References: {fileID: 943703428} ---- !u!1 &728986460 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 728986461} - - component: {fileID: 728986463} - - component: {fileID: 728986462} - m_Layer: 5 - m_Name: StartTimerText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &728986461 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 728986460} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 883441593} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 60, y: -50} - m_SizeDelta: {x: 1800, y: 200} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &728986462 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 5161628500243646588, guid: 90ab3d33fcefbae4682af8beaaf76420, + type: 3} + m_PrefabInstance: {fileID: 4872571765537467025} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 728986460} + m_GameObject: {fileID: 0} 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: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: 'Aikaa alkuun: 15' - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, 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: 180 - m_fontSizeBase: 180 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 1 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 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: 56.565186, y: 0, z: 30.021667, 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 &728986463 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 728986460} - m_CullTransparentMesh: 1 --- !u!1001 &756492962 PrefabInstance: m_ObjectHideFlags: 0 @@ -1202,82 +782,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe3f669106d4fb94ebcd61d419d58f24, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &883441592 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 883441593} - - component: {fileID: 883441595} - - component: {fileID: 883441594} - m_Layer: 5 - m_Name: TimerBG - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &883441593 +--- !u!224 &883441593 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 883441592} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 728986461} - m_Father: {fileID: 2107529345} - 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: -7, y: -775} - m_SizeDelta: {x: 1700, y: 300} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &883441594 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 883441592} - m_Enabled: 1 - 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: 21300000, guid: b86df3bf84cd9ac4ebcf2c85a81b4a92, type: 3} - 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 &883441595 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 5998399601359405500, guid: 90ab3d33fcefbae4682af8beaaf76420, + type: 3} + m_PrefabInstance: {fileID: 4872571765537467025} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 883441592} - m_CullTransparentMesh: 1 --- !u!1 &943703425 GameObject: m_ObjectHideFlags: 0 @@ -1558,7 +1068,7 @@ RectTransform: m_Children: - {fileID: 1550062017} - {fileID: 5730282211844516033} - - {fileID: 2107529345} + - {fileID: 883441593} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1964,8 +1474,8 @@ MonoBehaviour: BackGround: {fileID: 1550062019} Loot_BackGround: {fileID: 756492964} TextBox: {fileID: 756492965} - LungsEmpty: {fileID: 500791812} - LungsFull: {fileID: 53865115} + LungsEmpty: {fileID: 0} + LungsFull: {fileID: 0} --- !u!1 &1918953307 GameObject: m_ObjectHideFlags: 0 @@ -1998,16 +1508,14 @@ MonoBehaviour: raid_References: {fileID: 943703428} TimerText: {fileID: 251360814} StartTimerText: {fileID: 728986462} - Lungs: {fileID: 53865115} CurrentTime: 10 CountUp: 0 - TimeUntilStart: 15 + TimeUntilStart: 3 HasLimit: 1 TimerLimit: 0 HasFormat: 1 Format: 0 - exitRaid: {fileID: 53865117} - lungsEmpty: {fileID: 500791812} + exitRaid: {fileID: 0} duration: 0.8 --- !u!4 &1918953309 Transform: @@ -2116,44 +1624,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2107529344 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2107529345} - m_Layer: 5 - m_Name: TimerLungs - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2107529345 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2107529344} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 500791811} - - {fileID: 53865114} - - {fileID: 883441593} - m_Father: {fileID: 1239113693} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -224} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2145355899 GameObject: m_ObjectHideFlags: 0 @@ -2290,6 +1760,124 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2145355899} m_CullTransparentMesh: 1 +--- !u!1001 &4872571765537467025 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1239113693} + m_Modifications: + - target: {fileID: 5998399601359405500, guid: 90ab3d33fcefbae4682af8beaaf76420, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5998399601359405500, guid: 90ab3d33fcefbae4682af8beaaf76420, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5998399601359405500, guid: 90ab3d33fcefbae4682af8beaaf76420, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5998399601359405500, guid: 90ab3d33fcefbae4682af8beaaf76420, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5998399601359405500, guid: 90ab3d33fcefbae4682af8beaaf76420, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5998399601359405500, guid: 90ab3d33fcefbae4682af8beaaf76420, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5998399601359405500, guid: 90ab3d33fcefbae4682af8beaaf76420, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5998399601359405500, guid: 90ab3d33fcefbae4682af8beaaf76420, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5998399601359405500, guid: 90ab3d33fcefbae4682af8beaaf76420, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5998399601359405500, guid: 90ab3d33fcefbae4682af8beaaf76420, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5998399601359405500, guid: 90ab3d33fcefbae4682af8beaaf76420, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5998399601359405500, guid: 90ab3d33fcefbae4682af8beaaf76420, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5998399601359405500, guid: 90ab3d33fcefbae4682af8beaaf76420, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5998399601359405500, guid: 90ab3d33fcefbae4682af8beaaf76420, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5998399601359405500, guid: 90ab3d33fcefbae4682af8beaaf76420, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5998399601359405500, guid: 90ab3d33fcefbae4682af8beaaf76420, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5998399601359405500, guid: 90ab3d33fcefbae4682af8beaaf76420, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5998399601359405500, guid: 90ab3d33fcefbae4682af8beaaf76420, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5998399601359405500, guid: 90ab3d33fcefbae4682af8beaaf76420, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5998399601359405500, guid: 90ab3d33fcefbae4682af8beaaf76420, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6758375346154025262, guid: 90ab3d33fcefbae4682af8beaaf76420, + type: 3} + propertyPath: m_Name + value: TimerBG + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 90ab3d33fcefbae4682af8beaaf76420, type: 3} --- !u!224 &5730282211844516033 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2668198566995541017, guid: b4a44dafffb2c114588e4e643e490678, diff --git a/Assets/Raid/Scripts/Raid_Timer.cs b/Assets/Raid/Scripts/Raid_Timer.cs index 20159a0570..a76a17ca59 100644 --- a/Assets/Raid/Scripts/Raid_Timer.cs +++ b/Assets/Raid/Scripts/Raid_Timer.cs @@ -1,9 +1,10 @@ using System.Collections; using System.Collections.Generic; +using Altzone.Scripts.Language; using UnityEngine; -using UnityEngine.UI; using TMPro; using System; +using UnityEngine.UI; public class Raid_Timer : MonoBehaviour { @@ -14,9 +15,6 @@ public class Raid_Timer : MonoBehaviour public TextMeshProUGUI TimerText; public TextMeshProUGUI StartTimerText; - [Header("Timer graphic")] - public Image Lungs; - [Header("Timer settings")] public float CurrentTime; public bool CountUp; @@ -25,6 +23,7 @@ public class Raid_Timer : MonoBehaviour [Header("Start Timer settings")] public float TimeUntilStart; + private bool startTextShown; [Header("Limit settings")] public bool HasLimit; @@ -38,7 +37,6 @@ public class Raid_Timer : MonoBehaviour public event Action TimeEnded; public ExitRaid exitRaid; - public Image lungsEmpty; private Color startColor = Color.white; private Color endColor = Color.red; [SerializeField] @@ -59,6 +57,8 @@ void Start() { exitRaid.ExitedRaid += RaidExited; } + + SetStartTimerVisualState(false); } void Update() @@ -71,7 +71,6 @@ void Update() float t = Mathf.PingPong(Time.time / duration, 1f); Color lerped = Color.Lerp(startColor, endColor, t); - lungsEmpty.color = lerped; TimerText.color = lerped; } if (HasLimit && ((CountUp && CurrentTime >= TimerLimit) || (!CountUp && CurrentTime <= TimerLimit))) @@ -101,16 +100,22 @@ void Update() if (!started) { TimeUntilStart -= Time.deltaTime; - StartTimerText.text = "Aikaa alkuun: " + TimeUntilStart.ToString("F0"); - if (TimeUntilStart <= 0) + if (TimeUntilStart <= -1f) { StartTimer(); } + else if (TimeUntilStart <= 0f) + { + ShowStartText(); + } + else + { + StartTimerText.text = Mathf.CeilToInt(TimeUntilStart).ToString(); + } } } SetTimerText(); - SetTimerGraphic(); } public void StartTimer() { @@ -122,6 +127,54 @@ public void StartTimer() } } + + private void ShowStartText() + { + if (startTextShown) + { + return; + } + + TextLanguageSelectorCaller textLanguageSelector = StartTimerText.GetComponent(); + if (textLanguageSelector != null) + { + textLanguageSelector.SetText(string.Empty); + } + else + { + StartTimerText.text = "Aloita!"; + } + + SetStartTimerVisualState(true); + startTextShown = true; + } + + private void SetStartTimerVisualState(bool showStartText) + { + if (StartTimerText == null) + { + return; + } + + Transform startTimerParent = StartTimerText.transform.parent; + if (startTimerParent == null) + { + return; + } + + Image timerBackgroundImage = startTimerParent.GetComponent(); + if (timerBackgroundImage != null) + { + timerBackgroundImage.enabled = showStartText; + } + + Transform overlay = startTimerParent.Find("Overlay"); + if (overlay != null) + { + overlay.gameObject.SetActive(!showStartText); + } + } + public void FinishRaid() { timerActive = false; @@ -133,10 +186,6 @@ private void SetTimerText() //TimerText.text = HasFormat ? CurrentTime.ToString(TimeFormat[Format]) : CurrentTime.ToString(); TimerText.text = CurrentTime.ToString("F0"); } - private void SetTimerGraphic() - { - Lungs.fillAmount = 1.0f - (10.0f - CurrentTime) * 0.1f; - } void OnTimeEnd() { TimeEnded?.Invoke(); From 212337d734b215cba4e9fa494cbf90a8f5563f93 Mon Sep 17 00:00:00 2001 From: Davetsa Date: Mon, 8 Jun 2026 12:48:19 +0300 Subject: [PATCH 11/16] Fixed a white box showing after trap triggering and tied the Raideventpopup duration for freeze to freeze duration --- .../Resources/Prefabs/InventorySlot.prefab | 8 ++++- Assets/Raid/Scenes/40-Raid.unity | 14 ++++---- Assets/Raid/Scripts/Raid_EventPopup.cs | 21 +++++++++-- Assets/Raid/Scripts/Raid_InventoryItem.cs | 36 +++++++++++++++++++ Assets/Raid/Scripts/Raid_InventoryPage.cs | 4 +-- 5 files changed, 70 insertions(+), 13 deletions(-) diff --git a/Assets/Raid/Resources/Prefabs/InventorySlot.prefab b/Assets/Raid/Resources/Prefabs/InventorySlot.prefab index 1bb7e330c9..a2f831c198 100644 --- a/Assets/Raid/Resources/Prefabs/InventorySlot.prefab +++ b/Assets/Raid/Resources/Prefabs/InventorySlot.prefab @@ -322,6 +322,12 @@ MonoBehaviour: ItemWeight: 0 Lock: {fileID: 8338977754596052433} Bomb: {fileID: 8434505224719341188} + BombImage: {fileID: 8270360087515212976} + BombAnimator: {fileID: 0} + TrapSprites: + - {fileID: 21300000, guid: 203e9d7fbfc3ab146b3a5efe940bd4fc, type: 3} + - {fileID: 21300000, guid: f3ee01a8f86d9eb4fb65049758f18bc8, type: 3} + - {fileID: 21300000, guid: 8cc5377ca2937f7419b6eec45686c507, type: 3} BombIndicator: {fileID: 8745855877302435985} ItemBall: {fileID: 5999612523393728091} Heart: {fileID: 0} @@ -1078,7 +1084,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8434505224719341188} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: ee49418163dfc80449ad5fb579945a39, type: 2} m_CullingMode: 0 diff --git a/Assets/Raid/Scenes/40-Raid.unity b/Assets/Raid/Scenes/40-Raid.unity index 06fdd4746f..44bbf46c0c 100644 --- a/Assets/Raid/Scenes/40-Raid.unity +++ b/Assets/Raid/Scenes/40-Raid.unity @@ -567,32 +567,32 @@ PrefabInstance: - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_SizeDelta.x - value: 570 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_SizeDelta.y - value: 463 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_AnchoredPosition.x - value: 325 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8100441791909708575, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} propertyPath: m_AnchoredPosition.y - value: -271.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8100441792339531714, guid: 1456b9f29a360684da0ae9d727e82bd4, type: 3} @@ -1508,7 +1508,7 @@ MonoBehaviour: raid_References: {fileID: 943703428} TimerText: {fileID: 251360814} StartTimerText: {fileID: 728986462} - CurrentTime: 10 + CurrentTime: 45 CountUp: 0 TimeUntilStart: 3 HasLimit: 1 diff --git a/Assets/Raid/Scripts/Raid_EventPopup.cs b/Assets/Raid/Scripts/Raid_EventPopup.cs index bb044b484d..e331b73937 100644 --- a/Assets/Raid/Scripts/Raid_EventPopup.cs +++ b/Assets/Raid/Scripts/Raid_EventPopup.cs @@ -62,7 +62,22 @@ public static void Show(MonoBehaviour owner, Scenario scenario) owner.StartCoroutine(ShowAndWait(owner, scenario)); } + public static void Show(MonoBehaviour owner, Scenario scenario, float duration) + { + if (owner == null) + { + return; + } + + owner.StartCoroutine(ShowAndWait(owner, scenario, duration)); + } + public static IEnumerator ShowAndWait(MonoBehaviour owner, Scenario scenario, Action onComplete = null) + { + yield return ShowAndWait(owner, scenario, -1f, onComplete); + } + + public static IEnumerator ShowAndWait(MonoBehaviour owner, Scenario scenario, float duration, Action onComplete = null) { Raid_EventPopup popup = GetOrCreate(); if (popup == null) @@ -71,7 +86,7 @@ public static IEnumerator ShowAndWait(MonoBehaviour owner, Scenario scenario, Ac yield break; } - yield return popup.ShowRoutine(scenario); + yield return popup.ShowRoutine(scenario, duration); onComplete?.Invoke(); } @@ -96,7 +111,7 @@ private static Raid_EventPopup GetOrCreate() return instance; } - private IEnumerator ShowRoutine(Scenario scenario) + private IEnumerator ShowRoutine(Scenario scenario, float duration) { ApplyScenarioVisual(scenario); @@ -106,7 +121,7 @@ private IEnumerator ShowRoutine(Scenario scenario) canvasGroup.alpha = 1f; } - yield return new WaitForSeconds(showTime); + yield return new WaitForSeconds(duration >= 0f ? duration : showTime); gameObject.SetActive(false); } diff --git a/Assets/Raid/Scripts/Raid_InventoryItem.cs b/Assets/Raid/Scripts/Raid_InventoryItem.cs index dd334ebc35..e9ffdab1a3 100644 --- a/Assets/Raid/Scripts/Raid_InventoryItem.cs +++ b/Assets/Raid/Scripts/Raid_InventoryItem.cs @@ -15,6 +15,9 @@ public class Raid_InventoryItem : MonoBehaviour, IPointerClickHandler [SerializeField] public float ItemWeight; [SerializeField] private GameObject Lock; [SerializeField] private GameObject Bomb; + [SerializeField] private Image BombImage; + [SerializeField] private Animator BombAnimator; + [SerializeField] private Sprite[] TrapSprites; [SerializeField] private GameObject BombIndicator; [SerializeField] private GameObject ItemBall; [SerializeField] private GameObject Heart; @@ -147,12 +150,45 @@ public void TriggerTrap() { Bomb.transform.localScale = new Vector2(3f, 3f); } + SetTriggeredTrapSprite(); Bomb.SetActive(true); triggered = true; audioSource.PlayOneShot(explosion, SettingsCarrier.Instance.SentVolume(GetComponent()._soundType)); } BombIndicator.SetActive(false); } + + private void SetTriggeredTrapSprite() + { + if (BombAnimator == null && Bomb != null) + { + BombAnimator = Bomb.GetComponent(); + } + + if (BombAnimator != null) + { + BombAnimator.enabled = false; + } + + if (BombImage == null && Bomb != null) + { + BombImage = Bomb.GetComponent(); + } + + if (BombImage == null || TrapSprites == null || _bombType < 0 || _bombType >= TrapSprites.Length) + { + return; + } + + Sprite trapSprite = TrapSprites[_bombType]; + if (trapSprite == null) + { + return; + } + + BombImage.sprite = trapSprite; + BombImage.preserveAspect = true; + } public void LaunchBall() { ItemWeightText.gameObject.SetActive(false); diff --git a/Assets/Raid/Scripts/Raid_InventoryPage.cs b/Assets/Raid/Scripts/Raid_InventoryPage.cs index d29999bd92..1418e56277 100644 --- a/Assets/Raid/Scripts/Raid_InventoryPage.cs +++ b/Assets/Raid/Scripts/Raid_InventoryPage.cs @@ -24,7 +24,7 @@ public class Raid_InventoryPage : MonoBehaviour [SerializeField] private bool spectator = false; [SerializeField] private bool firstItem = true; [SerializeField, Min(1)] private int trapAmount = 3; - [SerializeField, Min(0f)] private float freezeDuration = 3f; + [SerializeField, Min(0f)] private float freezeDuration = 10f; [SerializeField, Min(1f)] private float doubleWeightMultiplier = 2f; [System.Serializable] @@ -150,7 +150,7 @@ public void HandleItemLootingRPC(int index, float itemWeight) exitraid.EndRaid(); break; case 1: - Raid_EventPopup.Show(this, Raid_EventPopup.Scenario.Freeze); + Raid_EventPopup.Show(this, Raid_EventPopup.Scenario.Freeze, freezeDuration); StartFreeze(); break; case 2: From 9f7fbe547325eb92ccf46ba3c35645bd06aa3d04 Mon Sep 17 00:00:00 2001 From: Davetsa Date: Mon, 8 Jun 2026 12:55:20 +0300 Subject: [PATCH 12/16] Updated the ItemWeightText to only show in endmenu --- .../Resources/Prefabs/InventorySlot.prefab | 7 ++++--- Assets/Raid/Scripts/Raid_EndMenu.cs | 1 + Assets/Raid/Scripts/Raid_InventoryItem.cs | 20 ++++++++++++++++++- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/Assets/Raid/Resources/Prefabs/InventorySlot.prefab b/Assets/Raid/Resources/Prefabs/InventorySlot.prefab index a2f831c198..b574784534 100644 --- a/Assets/Raid/Resources/Prefabs/InventorySlot.prefab +++ b/Assets/Raid/Resources/Prefabs/InventorySlot.prefab @@ -349,6 +349,7 @@ MonoBehaviour: speed: 20 ItemWeightPopUp: {fileID: 6204422605173200407} ItemWeightText: {fileID: 85830848731055992} + showItemWeightText: 0 bomb: 0 furnitureData: Id: @@ -520,7 +521,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4600655608571120406 RectTransform: m_ObjectHideFlags: 0 @@ -570,7 +571,7 @@ MonoBehaviour: m_Calls: [] m_text: -- m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: eca1bd84f719d7146a5b636b4f4beff0, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} @@ -636,7 +637,7 @@ MonoBehaviour: m_margin: {x: 0, y: 0, z: 0, w: 60.859375} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 + m_hasFontAssetChanged: 1 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!114 &8820080534472169428 diff --git a/Assets/Raid/Scripts/Raid_EndMenu.cs b/Assets/Raid/Scripts/Raid_EndMenu.cs index 699c955740..d87fef3859 100644 --- a/Assets/Raid/Scripts/Raid_EndMenu.cs +++ b/Assets/Raid/Scripts/Raid_EndMenu.cs @@ -34,6 +34,7 @@ public void SetCollectedLoot(List lootList) itemTransform.anchorMin = new Vector2(0.5f, 0.5f); itemTransform.anchorMax = new Vector2(0.5f, 0.5f); itemTransform.anchoredPosition = Vector2.zero; + UIItem.SetShowItemWeightText(true); UIItem.SetData(lootList[i]); } } diff --git a/Assets/Raid/Scripts/Raid_InventoryItem.cs b/Assets/Raid/Scripts/Raid_InventoryItem.cs index e9ffdab1a3..6acc1c2a1f 100644 --- a/Assets/Raid/Scripts/Raid_InventoryItem.cs +++ b/Assets/Raid/Scripts/Raid_InventoryItem.cs @@ -36,6 +36,7 @@ public class Raid_InventoryItem : MonoBehaviour, IPointerClickHandler [SerializeField] private float speed = 15f; [SerializeField] private TMP_Text ItemWeightPopUp; [SerializeField] private TMP_Text ItemWeightText; + [SerializeField] private bool showItemWeightText = false; public event Action OnItemClicked; @@ -98,11 +99,17 @@ public void SetData(GameFurniture gameFurniture) furnitureData = gameFurniture; ItemImage.gameObject.SetActive(true); ItemImage.sprite = gameFurniture.FurnitureInfo.Image; - ItemWeightText.text = ItemWeight + "kg"; + SetItemWeightTextActive(showItemWeightText); empty = false; SetBGColor(); } + public void SetShowItemWeightText(bool show) + { + showItemWeightText = show; + SetItemWeightTextActive(showItemWeightText); + } + public void RemoveData() { ItemImage.gameObject.SetActive(false); @@ -276,4 +283,15 @@ void SetBGColor() } + + private void SetItemWeightTextActive(bool isActive) + { + if (ItemWeightText == null) + { + return; + } + + ItemWeightText.gameObject.SetActive(isActive); + ItemWeightText.text = ItemWeight + "kg"; + } } From 9cc05c1396fa8988c65565fc840c177bfb261400 Mon Sep 17 00:00:00 2001 From: Davetsa Date: Mon, 8 Jun 2026 13:04:15 +0300 Subject: [PATCH 13/16] Adjusted the range randomInventorySize --- Assets/Raid/Scripts/Raid_InventoryHandler.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Raid/Scripts/Raid_InventoryHandler.cs b/Assets/Raid/Scripts/Raid_InventoryHandler.cs index 35e8392222..a59ffad561 100644 --- a/Assets/Raid/Scripts/Raid_InventoryHandler.cs +++ b/Assets/Raid/Scripts/Raid_InventoryHandler.cs @@ -28,7 +28,7 @@ private void Start() } */ - int randomInventorySize = Random.Range(4, 26); + int randomInventorySize = Random.Range(6, 12); InventorySize = randomInventorySize*4; InventoryUI.InitializeInventoryUI(InventorySize); InventoryUI.RandomizeInventoryContent(InventorySize); From f3c87ff6526c29a03d9a88e941f9d7437d5fa0b4 Mon Sep 17 00:00:00 2001 From: Davetsa Date: Wed, 10 Jun 2026 09:53:57 +0300 Subject: [PATCH 14/16] Refactor raid exit and end menu handling --- Assets/Raid/Resources/Prefabs/EndMenu.prefab | 16 +++- Assets/Raid/Scripts/ExitRaid.cs | 82 ++++++++++++----- Assets/Raid/Scripts/Raid_EndMenu.cs | 97 +++++++++++++++++--- Assets/Raid/Scripts/Raid_EventPopup.cs | 31 +++++-- Assets/Raid/Scripts/Raid_LootTracking.cs | 11 ++- Assets/Raid/Scripts/Raid_References.cs | 53 ++++++++++- Assets/Raid/Scripts/Raid_Timer.cs | 24 +---- 7 files changed, 245 insertions(+), 69 deletions(-) diff --git a/Assets/Raid/Resources/Prefabs/EndMenu.prefab b/Assets/Raid/Resources/Prefabs/EndMenu.prefab index 31628c4291..351e92dad3 100644 --- a/Assets/Raid/Resources/Prefabs/EndMenu.prefab +++ b/Assets/Raid/Resources/Prefabs/EndMenu.prefab @@ -10,13 +10,14 @@ GameObject: m_Component: - component: {fileID: 2668198566995541017} - component: {fileID: 7581730394780298031} + - component: {fileID: 9203000000000000001} m_Layer: 5 m_Name: EndMenu m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2668198566995541017 RectTransform: m_ObjectHideFlags: 0 @@ -59,6 +60,7 @@ MonoBehaviour: content: {fileID: 4296145650629842064} itemPrefab: {fileID: 7481540141435164365, guid: 59f733f3d92449d4a8da7c84514fdf3b, type: 3} + menuRoot: {fileID: 683399793402178915} backgroundImage: {fileID: 486935528496687519} normalBackgroundSprite: {fileID: 21300000, guid: ca292ec662d733746a24248a335eba3a, type: 3} @@ -68,6 +70,18 @@ MonoBehaviour: overweightEndResultText: {fileID: 9001000000000000001} spaceRemainingText: {fileID: 9102000000000000004} collectedLootItemScale: {x: 1.25, y: 1.25, z: 1} +--- !u!225 &9203000000000000001 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 683399793402178915} + m_Enabled: 1 + m_Alpha: 0 + m_Interactable: 0 + m_BlocksRaycasts: 0 + m_IgnoreParentGroups: 0 --- !u!1 &1381501735683521454 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Raid/Scripts/ExitRaid.cs b/Assets/Raid/Scripts/ExitRaid.cs index b5e80bd93a..daa18e4a87 100644 --- a/Assets/Raid/Scripts/ExitRaid.cs +++ b/Assets/Raid/Scripts/ExitRaid.cs @@ -5,6 +5,8 @@ public class ExitRaid : MonoBehaviour { + public static ExitRaid Instance { get; private set; } + public enum RaidEndReason { Trap, @@ -20,11 +22,39 @@ public enum RaidEndReason private void Awake() { + RegisterInstance(); ResolveReferences(); } + private void OnEnable() + { + RegisterInstance(); + } + + private void OnDisable() + { + if (Instance == this) + { + Instance = null; + } + } + + private void OnDestroy() + { + if (Instance == this) + { + Instance = null; + } + } + public void RequestExitRaid() { + if (Instance != null && Instance != this) + { + Instance.RequestExitRaid(); + return; + } + if (raidEnded) { return; @@ -40,15 +70,14 @@ public void EndRaid() public void EndRaid(RaidEndReason reason) { - if (!gameObject.activeInHierarchy) + if (Instance != null && Instance != this) { - ExitRaid activeExitRaid = FindActiveExitRaid(); - if (activeExitRaid != null && activeExitRaid != this) - { - activeExitRaid.EndRaid(reason); - return; - } + Instance.EndRaid(reason); + return; + } + if (!gameObject.activeInHierarchy) + { Debug.LogError("Cannot end raid from an inactive ExitRaid object."); return; } @@ -78,17 +107,17 @@ private IEnumerator EndRaidRoutine(RaidEndReason reason) yield return Raid_EventPopup.ShowAndWait(this, GetPopupScenario(reason)); - Raid_EndMenu endMenu = raid_References.EndMenu == null ? null : raid_References.EndMenu.GetComponent(); + Raid_EndMenu endMenu = raid_References.EndMenuController; if (endMenu == null) { - Debug.LogError("Cannot show raid end menu because the EndMenu reference is missing Raid_EndMenu."); + Debug.LogError("Cannot show raid end menu because the EndMenuController reference is missing."); yield break; } endMenu.SetOverWeightLimitBackground(reason == RaidEndReason.OutOfSpace); endMenu.SetCollectedLoot(raid_References.raid_LootTracking.ListOfCollectedLoot); endMenu.SetSpaceRemainingText(raid_References.raid_LootTracking.CurrentLootWeight, raid_References.raid_LootTracking.MaxLootWeight); - raid_References.EndMenu.SetActive(true); + raid_References.ShowEndMenu(); } public void OnEndRaid() @@ -98,13 +127,30 @@ public void OnEndRaid() private void SetEndReasonText(RaidEndReason reason) { - Raid_EndMenu endMenu = raid_References.EndMenu == null ? null : raid_References.EndMenu.GetComponent(); + Raid_EndMenu endMenu = raid_References.EndMenuController; if (endMenu != null) { endMenu.SetEndReasonText(reason); } } + private void RegisterInstance() + { + if (Instance == null || Instance == this) + { + Instance = this; + return; + } + + if (!Instance.gameObject.activeInHierarchy && gameObject.activeInHierarchy) + { + Instance = this; + return; + } + + Debug.LogWarning("Multiple ExitRaid instances found. Using the first active instance."); + } + private Raid_EventPopup.Scenario GetPopupScenario(RaidEndReason reason) { switch (reason) @@ -132,18 +178,4 @@ private void ResolveReferences() raid_References = FindObjectOfType(); } } - - private ExitRaid FindActiveExitRaid() - { - ExitRaid[] exitRaids = FindObjectsOfType(); - foreach (ExitRaid exitRaid in exitRaids) - { - if (exitRaid != null && exitRaid.gameObject.activeInHierarchy) - { - return exitRaid; - } - } - - return null; - } } diff --git a/Assets/Raid/Scripts/Raid_EndMenu.cs b/Assets/Raid/Scripts/Raid_EndMenu.cs index d87fef3859..8cf7fa2d10 100644 --- a/Assets/Raid/Scripts/Raid_EndMenu.cs +++ b/Assets/Raid/Scripts/Raid_EndMenu.cs @@ -8,10 +8,13 @@ public class Raid_EndMenu : MonoBehaviour { + public static Raid_EndMenu Instance { get; private set; } + [SerializeField] public RectTransform collectedFurniture; public RectTransform content; public Raid_InventoryItem itemPrefab; + [SerializeField] private GameObject menuRoot; [SerializeField] private Image backgroundImage; [SerializeField] private Sprite normalBackgroundSprite; [SerializeField] private Sprite overweightBackgroundSprite; @@ -20,20 +23,57 @@ public class Raid_EndMenu : MonoBehaviour [SerializeField] private TMP_Text spaceRemainingText; [SerializeField] private Vector3 collectedLootItemScale = Vector3.one; + private CanvasGroup canvasGroup; + private bool initialized; + + public GameObject MenuRoot + { + get + { + EnsureInitialized(); + return menuRoot; + } + } + + private void Awake() + { + EnsureInitialized(); + Hide(); + } + + private void OnDestroy() + { + if (Instance == this) + { + Instance = null; + } + } + + public void Show() + { + SetVisible(true); + } + + public void Hide() + { + SetVisible(false); + } + // SetCollectedLoot for display when showing EndMenu public void SetCollectedLoot(List lootList) { ClearCollectedLoot(); + if (content == null || itemPrefab == null) + { + Debug.LogError("Cannot show collected raid loot because content or itemPrefab is missing."); + return; + } + for (int i = 0; i < lootList.Count; i++) { - Transform itemParent = CreateCollectedLootItemContainer(); - Raid_InventoryItem UIItem = Instantiate(itemPrefab, itemParent); + Raid_InventoryItem UIItem = Instantiate(itemPrefab, content); UIItem.transform.localScale = collectedLootItemScale; - RectTransform itemTransform = UIItem.GetComponent(); - itemTransform.anchorMin = new Vector2(0.5f, 0.5f); - itemTransform.anchorMax = new Vector2(0.5f, 0.5f); - itemTransform.anchoredPosition = Vector2.zero; UIItem.SetShowItemWeightText(true); UIItem.SetData(lootList[i]); } @@ -99,12 +139,47 @@ private void ClearCollectedLoot() } } - private Transform CreateCollectedLootItemContainer() + private void SetVisible(bool visible) { - GameObject itemContainer = new GameObject("CollectedLootItem", typeof(RectTransform)); - RectTransform itemContainerTransform = itemContainer.GetComponent(); - itemContainerTransform.SetParent(content, false); - return itemContainerTransform; + EnsureInitialized(); + + if (!menuRoot.activeSelf) + { + menuRoot.SetActive(true); + } + + canvasGroup.alpha = visible ? 1f : 0f; + canvasGroup.interactable = visible; + canvasGroup.blocksRaycasts = visible; } + private void EnsureInitialized() + { + if (initialized) + { + return; + } + + if (Instance != null && Instance != this) + { + Debug.LogWarning("Multiple Raid_EndMenu instances found. Using the first initialized instance."); + } + else + { + Instance = this; + } + + if (menuRoot == null) + { + menuRoot = gameObject; + } + + canvasGroup = menuRoot.GetComponent(); + if (canvasGroup == null) + { + canvasGroup = menuRoot.AddComponent(); + } + + initialized = true; + } } diff --git a/Assets/Raid/Scripts/Raid_EventPopup.cs b/Assets/Raid/Scripts/Raid_EventPopup.cs index e331b73937..d252113bb1 100644 --- a/Assets/Raid/Scripts/Raid_EventPopup.cs +++ b/Assets/Raid/Scripts/Raid_EventPopup.cs @@ -35,6 +35,15 @@ private class ScenarioVisual [FormerlySerializedAs("MultText")] [TextArea(1, 3)] public string FinnishMultText = ""; [TextArea(1, 3)] public string EnglishMultText = ""; + + public string Message { get; private set; } + public string MultText { get; private set; } + + public void SetLocalizedTexts(string message, string multText) + { + Message = message; + MultText = multText; + } } private const string PopupResourcePath = "Prefabs/RaidEventPopup"; @@ -129,11 +138,8 @@ private void ApplyScenarioVisual(Scenario scenario) { ScenarioVisual visual = GetScenarioVisual(scenario); - string message = GetLocalizedText(visual.FinnishMessage, visual.EnglishMessage); - string multText = GetLocalizedText(visual.FinnishMultText, visual.EnglishMultText); - - SetLocalizedText(messageText, message, visual.TextColor); - SetLocalizedText(MultText, multText, visual.TextColor); + SetLocalizedText(messageText, visual.Message, visual.TextColor); + SetLocalizedText(MultText, visual.MultText, visual.TextColor); ApplyImage(backgroundImage, visual.BackgroundSprite, visual.BackgroundColor); ApplyImage(effectImage, visual.Effect, visual.EffectColor); @@ -157,29 +163,38 @@ private void ApplyScenarioVisual(Scenario scenario) if (MultText != null) { - MultText.gameObject.SetActive(!string.IsNullOrWhiteSpace(multText)); + MultText.gameObject.SetActive(!string.IsNullOrWhiteSpace(visual.MultText)); } } private ScenarioVisual GetScenarioVisual(Scenario scenario) { + ScenarioVisual scenarioVisual = null; + if (scenarioVisuals != null) { foreach (ScenarioVisual visual in scenarioVisuals) { if (visual != null && visual.Scenario == scenario) { - return visual; + scenarioVisual = visual; + break; } } } - return new ScenarioVisual + scenarioVisual ??= new ScenarioVisual { Scenario = scenario, FinnishMessage = "Ry\u00f6st\u00f6 p\u00e4\u00e4ttyy.", EnglishMessage = "The raid is ending." }; + + scenarioVisual.SetLocalizedTexts( + GetLocalizedText(scenarioVisual.FinnishMessage, scenarioVisual.EnglishMessage), + GetLocalizedText(scenarioVisual.FinnishMultText, scenarioVisual.EnglishMultText)); + + return scenarioVisual; } private string GetLocalizedText(string finnishText, string englishText) diff --git a/Assets/Raid/Scripts/Raid_LootTracking.cs b/Assets/Raid/Scripts/Raid_LootTracking.cs index c41fe8f615..f73fa52af5 100644 --- a/Assets/Raid/Scripts/Raid_LootTracking.cs +++ b/Assets/Raid/Scripts/Raid_LootTracking.cs @@ -27,7 +27,7 @@ public void Awake() { if (exitRaid == null) { - exitRaid = FindObjectOfType(); + exitRaid = ExitRaid.Instance; } /* _photonView = gameObject.AddComponent(); @@ -85,13 +85,18 @@ public void SetLootCount(GameFurniture furniture, float MaxLootWeight, float loo raid_References.HeartHalves.SetActive(true); raid_References.Heart.GetComponent().enabled = false; + if (exitRaid == null) + { + exitRaid = ExitRaid.Instance; + } + if (exitRaid != null) { exitRaid.EndRaid(ExitRaid.RaidEndReason.OutOfSpace); } else { - Raid_EndMenu endMenu = raid_References.EndMenu.GetComponent(); + Raid_EndMenu endMenu = raid_References.EndMenuController; if (endMenu != null) { endMenu.SetEndReasonText(ExitRaid.RaidEndReason.OutOfSpace); @@ -99,7 +104,7 @@ public void SetLootCount(GameFurniture furniture, float MaxLootWeight, float loo endMenu.SetSpaceRemainingText(CurrentLootWeight, MaxLootWeight); } - raid_References.EndMenu.SetActive(true); + raid_References.ShowEndMenu(); } } } diff --git a/Assets/Raid/Scripts/Raid_References.cs b/Assets/Raid/Scripts/Raid_References.cs index 775874019a..42d5c27509 100644 --- a/Assets/Raid/Scripts/Raid_References.cs +++ b/Assets/Raid/Scripts/Raid_References.cs @@ -13,14 +13,63 @@ public class Raid_References : MonoBehaviour [SerializeField, Header("Reference game components")] public Raid_InventoryHandler inventoryHandler; public Raid_LootTracking raid_LootTracking; + [SerializeField] private Raid_EndMenu endMenuController; + + public Raid_EndMenu EndMenuController + { + get + { + ResolveEndMenuController(); + return endMenuController; + } + } private void Start() { inventoryHandler = GameObject.Find("ScriptHolder").GetComponent(); - - if (EndMenu != null) + + HideEndMenu(); + } + + public void ShowEndMenu() + { + if (EndMenuController != null) + { + EndMenuController.Show(); + } + else if (EndMenu != null) + { + EndMenu.SetActive(true); + } + } + + public void HideEndMenu() + { + if (EndMenuController != null) + { + EndMenuController.Hide(); + } + else if (EndMenu != null) { EndMenu.SetActive(false); } } + + private void ResolveEndMenuController() + { + if (endMenuController == null) + { + endMenuController = Raid_EndMenu.Instance; + } + + if (endMenuController == null && EndMenu != null) + { + endMenuController = EndMenu.GetComponent(); + } + + if (EndMenu == null && endMenuController != null) + { + EndMenu = endMenuController.MenuRoot; + } + } } diff --git a/Assets/Raid/Scripts/Raid_Timer.cs b/Assets/Raid/Scripts/Raid_Timer.cs index a76a17ca59..55d06c1443 100644 --- a/Assets/Raid/Scripts/Raid_Timer.cs +++ b/Assets/Raid/Scripts/Raid_Timer.cs @@ -48,9 +48,9 @@ void Start() TimeFormat.Add(TimerFormat.TenthDecimal, "0.0"); TimeFormat.Add(TimerFormat.HundrethsDecimal, "0.00"); - if (exitRaid == null || !exitRaid.gameObject.activeInHierarchy) + if (exitRaid == null) { - exitRaid = FindActiveExitRaid(); + exitRaid = ExitRaid.Instance; } if (exitRaid != null) @@ -76,9 +76,9 @@ void Update() if (HasLimit && ((CountUp && CurrentTime >= TimerLimit) || (!CountUp && CurrentTime <= TimerLimit))) { OnTimeEnd(); - if (exitRaid == null || !exitRaid.gameObject.activeInHierarchy) + if (exitRaid == null) { - exitRaid = FindActiveExitRaid(); + exitRaid = ExitRaid.Instance; } if (exitRaid != null) @@ -87,7 +87,7 @@ void Update() } else { - Debug.LogError("Raid timer ended, but no active ExitRaid was found."); + Debug.LogError("Raid timer ended, but ExitRaid.Instance was not available."); } CurrentTime = TimerLimit; SetTimerText(); @@ -191,20 +191,6 @@ void OnTimeEnd() TimeEnded?.Invoke(); } - private ExitRaid FindActiveExitRaid() - { - ExitRaid[] exitRaids = FindObjectsOfType(); - foreach (ExitRaid activeExitRaid in exitRaids) - { - if (activeExitRaid != null && activeExitRaid.gameObject.activeInHierarchy) - { - return activeExitRaid; - } - } - - return null; - } - void RaidExited() { CurrentTime = 0; From 80634300b4e67b96fb0a22316a15d1cb2bd80380 Mon Sep 17 00:00:00 2001 From: Davetsa Date: Wed, 10 Jun 2026 10:26:43 +0300 Subject: [PATCH 15/16] Add freeze trap countdown text --- Assets/Raid/Resources/Prefabs/EndMenu.prefab | 2 +- .../Raid/Resources/Prefabs/Inventory.prefab | 2 +- .../Resources/Prefabs/RaidEventPopup.prefab | 4 +- Assets/Raid/Scripts/Raid_EventPopup.cs | 51 +++++++++++++++++-- 4 files changed, 51 insertions(+), 8 deletions(-) diff --git a/Assets/Raid/Resources/Prefabs/EndMenu.prefab b/Assets/Raid/Resources/Prefabs/EndMenu.prefab index 351e92dad3..b832b51181 100644 --- a/Assets/Raid/Resources/Prefabs/EndMenu.prefab +++ b/Assets/Raid/Resources/Prefabs/EndMenu.prefab @@ -777,7 +777,7 @@ MonoBehaviour: m_ChildAlignment: 1 m_StartCorner: 0 m_StartAxis: 0 - m_CellSize: {x: 325, y: 700} + m_CellSize: {x: 325, y: 325} m_Spacing: {x: 300, y: 90} m_Constraint: 1 m_ConstraintCount: 3 diff --git a/Assets/Raid/Resources/Prefabs/Inventory.prefab b/Assets/Raid/Resources/Prefabs/Inventory.prefab index 8e8d75ac03..80c89b3a24 100644 --- a/Assets/Raid/Resources/Prefabs/Inventory.prefab +++ b/Assets/Raid/Resources/Prefabs/Inventory.prefab @@ -2005,7 +2005,7 @@ MonoBehaviour: spectator: 0 firstItem: 1 trapAmount: 3 - freezeDuration: 3 + freezeDuration: 10 doubleWeightMultiplier: 2 Bombs: - bombIndex: 1 diff --git a/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab b/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab index 8303c280e3..c31ba15863 100644 --- a/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab +++ b/Assets/Raid/Resources/Prefabs/RaidEventPopup.prefab @@ -132,8 +132,8 @@ MonoBehaviour: FinnishMultText: EnglishMultText: - Scenario: 1 - FinnishMessage: "Ansa! J\xE4\xE4dyit 10 Sekunniksi" - EnglishMessage: Trap! Frozen for 10 seconds + FinnishMessage: "Ansa! J\xE4\xE4dyit {0} Sekunniksi" + EnglishMessage: Trap! Frozen for {0} seconds BackgroundSprite: {fileID: 21300000, guid: 64b00f4be61371448934c52816bb3079, type: 3} BackgroundColor: {r: 1, g: 1, b: 1, a: 0.55} Effect: {fileID: 21300000, guid: c9a331cd52627344d8562ac19ef5c695, type: 3} diff --git a/Assets/Raid/Scripts/Raid_EventPopup.cs b/Assets/Raid/Scripts/Raid_EventPopup.cs index d252113bb1..85e88840cb 100644 --- a/Assets/Raid/Scripts/Raid_EventPopup.cs +++ b/Assets/Raid/Scripts/Raid_EventPopup.cs @@ -122,7 +122,8 @@ private static Raid_EventPopup GetOrCreate() private IEnumerator ShowRoutine(Scenario scenario, float duration) { - ApplyScenarioVisual(scenario); + ScenarioVisual visual = GetScenarioVisual(scenario); + ApplyScenarioVisual(visual); gameObject.SetActive(true); if (canvasGroup != null) @@ -130,14 +131,56 @@ private IEnumerator ShowRoutine(Scenario scenario, float duration) canvasGroup.alpha = 1f; } - yield return new WaitForSeconds(duration >= 0f ? duration : showTime); + float displayTime = duration >= 0f ? duration : showTime; + if (scenario == Scenario.Freeze && displayTime > 0f) + { + yield return ShowFreezeCountdownRoutine(visual, displayTime); + } + else + { + yield return new WaitForSeconds(displayTime); + } + gameObject.SetActive(false); } - private void ApplyScenarioVisual(Scenario scenario) + private IEnumerator ShowFreezeCountdownRoutine(ScenarioVisual visual, float duration) { - ScenarioVisual visual = GetScenarioVisual(scenario); + float remainingTime = duration; + int lastDisplayedSeconds = -1; + + while (remainingTime > 0f) + { + int secondsRemaining = Mathf.Max(1, Mathf.CeilToInt(remainingTime)); + if (secondsRemaining != lastDisplayedSeconds) + { + SetLocalizedText(messageText, FormatCountdownMessage(visual.Message, secondsRemaining), visual.TextColor); + lastDisplayedSeconds = secondsRemaining; + } + yield return null; + remainingTime -= Time.deltaTime; + } + } + + private string FormatCountdownMessage(string messageTemplate, int secondsRemaining) + { + if (string.IsNullOrWhiteSpace(messageTemplate)) + { + return secondsRemaining.ToString(); + } + + string secondsText = secondsRemaining.ToString(); + if (messageTemplate.Contains("{0}")) + { + return messageTemplate.Replace("{0}", secondsText); + } + + return messageTemplate.Replace("10", secondsText); + } + + private void ApplyScenarioVisual(ScenarioVisual visual) + { SetLocalizedText(messageText, visual.Message, visual.TextColor); SetLocalizedText(MultText, visual.MultText, visual.TextColor); From 9bd0eafc0f0c4f7b0e9badc389aac87813f73812 Mon Sep 17 00:00:00 2001 From: Davetsa Date: Wed, 10 Jun 2026 10:37:43 +0300 Subject: [PATCH 16/16] Add trap indicator toggle to Raid --- .../Raid/Resources/Prefabs/Inventory.prefab | 1 + Assets/Raid/Scripts/Raid_InventoryItem.cs | 25 ++++++++++++++++--- Assets/Raid/Scripts/Raid_InventoryPage.cs | 2 ++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/Assets/Raid/Resources/Prefabs/Inventory.prefab b/Assets/Raid/Resources/Prefabs/Inventory.prefab index 80c89b3a24..1d60723494 100644 --- a/Assets/Raid/Resources/Prefabs/Inventory.prefab +++ b/Assets/Raid/Resources/Prefabs/Inventory.prefab @@ -2007,6 +2007,7 @@ MonoBehaviour: trapAmount: 3 freezeDuration: 10 doubleWeightMultiplier: 2 + showTrapIndicators: 0 Bombs: - bombIndex: 1 bombType: 1 diff --git a/Assets/Raid/Scripts/Raid_InventoryItem.cs b/Assets/Raid/Scripts/Raid_InventoryItem.cs index 6acc1c2a1f..2b41ced724 100644 --- a/Assets/Raid/Scripts/Raid_InventoryItem.cs +++ b/Assets/Raid/Scripts/Raid_InventoryItem.cs @@ -53,6 +53,7 @@ public class Raid_InventoryItem : MonoBehaviour, IPointerClickHandler private bool triggered = false; public bool bomb = false; + private bool showTrapIndicator = true; private bool timeEnded = false; public GameFurniture furnitureData; @@ -82,6 +83,7 @@ public void Awake() { ItemImage.gameObject.SetActive(false); } + RefreshBombIndicator(); //if ((PlayerRole)PhotonNetwork.LocalPlayer.CustomProperties["Role"] == PlayerRole.Spectator) spectator = false; @@ -113,8 +115,8 @@ public void SetShowItemWeightText(bool show) public void RemoveData() { ItemImage.gameObject.SetActive(false); - BombIndicator.SetActive(false); bomb = false; + RefreshBombIndicator(); } public void SetBomb(int bombType) { @@ -125,7 +127,8 @@ public void SetTrap(int trapType) { _bombType = trapType; bomb = true; - BombIndicator.SetActive(true); + triggered = false; + RefreshBombIndicator(); } public void TriggerBomb() { @@ -162,7 +165,23 @@ public void TriggerTrap() triggered = true; audioSource.PlayOneShot(explosion, SettingsCarrier.Instance.SentVolume(GetComponent()._soundType)); } - BombIndicator.SetActive(false); + RefreshBombIndicator(); + } + + public void SetTrapIndicatorVisible(bool visible) + { + showTrapIndicator = visible; + RefreshBombIndicator(); + } + + private void RefreshBombIndicator() + { + if (BombIndicator == null) + { + return; + } + + BombIndicator.SetActive(bomb && !triggered && showTrapIndicator); } private void SetTriggeredTrapSprite() diff --git a/Assets/Raid/Scripts/Raid_InventoryPage.cs b/Assets/Raid/Scripts/Raid_InventoryPage.cs index 1418e56277..4fd8922205 100644 --- a/Assets/Raid/Scripts/Raid_InventoryPage.cs +++ b/Assets/Raid/Scripts/Raid_InventoryPage.cs @@ -26,6 +26,7 @@ public class Raid_InventoryPage : MonoBehaviour [SerializeField, Min(1)] private int trapAmount = 3; [SerializeField, Min(0f)] private float freezeDuration = 10f; [SerializeField, Min(1f)] private float doubleWeightMultiplier = 2f; + [SerializeField, Header("Trap settings")] private bool showTrapIndicators = true; [System.Serializable] public class BombData @@ -82,6 +83,7 @@ public void InitializeInventoryUI(int InventorySize) Raid_InventoryItem UIItem = Instantiate(ItemPrefab, Vector3.zero, Quaternion.identity); UIItem.transform.SetParent(ContentPanel); UIItem.transform.localScale = new Vector3(1, 1, 0); + UIItem.SetTrapIndicatorVisible(showTrapIndicators); ListOfUIItems.Add(UIItem); UIItem.OnItemClicked += HandleItemLooting; }