From 7adeac5a12801886bc33dc7b08825edc5cc5b5e4 Mon Sep 17 00:00:00 2001 From: KrolMel Date: Thu, 29 Dec 2022 20:02:32 +0100 Subject: [PATCH] Fixes --- .../Monster/Mushroom/Mushroom.prefab | 2 +- .../Monster/SmallEarth/EarthSmall.prefab | 2 +- .../Bartender/PL/BartenderDialPL.asset | 2 +- .../Dialogue/BossThug/PL/BossThugDialPL.asset | 39 + .../BossThug/PL/BossThugDialPL.asset.meta | 8 + .../BossThug/PL/BossThugMultiDialPL.asset | 19 + .../PL/BossThugMultiDialPL.asset.meta | 8 + .../Objects/Board/PL/BoardDialPL.asset | 2 +- .../Objects/Doors/PL/DoorClosedDialPL.asset | 2 +- .../StoneFigures/PL/StoneFigureDialPL.asset | 2 +- .../PL/SandTombstoneDialPL.asset | 2 +- .../Dialogue/Shop/PL/ShopDialPl.asset | 2 +- .../Wizard/PL/WizardFirstDialPL.asset | 29 +- Assets/Resources/Items/AirAmulet.asset | 7 +- Assets/Resources/Items/Axe.asset | 10 +- Assets/Resources/Items/Basic Sword.asset | 14 +- Assets/Resources/Items/BlueFlower.asset | 2 +- Assets/Resources/Items/Chestplate.asset | 11 +- Assets/Resources/Items/EarthAmulet.asset | 9 +- Assets/Resources/Items/EbonyRing.asset | 13 +- Assets/Resources/Items/EmeraldRing.asset | 13 +- Assets/Resources/Items/FireAmulet.asset | 9 +- Assets/Resources/Items/GoldenRing.asset | 13 +- Assets/Resources/Items/GoldenSword.asset | 7 +- Assets/Resources/Items/HealthPotionL.asset | 7 +- Assets/Resources/Items/HealthPotionM.asset | 7 +- Assets/Resources/Items/HealthPotionS.asset | 7 +- Assets/Resources/Items/HeavySword.asset | 9 +- Assets/Resources/Items/LightSword.asset | 11 +- Assets/Resources/Items/NecklaceOfHope.asset | 5 +- Assets/Resources/Items/Pickaxe.asset | 11 +- Assets/Resources/Items/PinkFlower.asset | 2 +- Assets/Resources/Items/Private Helmet.asset | 12 +- Assets/Resources/Items/QuartzRing.asset | 15 +- Assets/Resources/Items/RubyRing.asset | 15 +- Assets/Resources/Items/SilverRing.asset | 15 +- Assets/Resources/Items/SteelHelmet.asset | 7 +- Assets/Resources/Items/TopazRing.asset | 15 +- Assets/Resources/Items/WaterAmulet.asset | 7 +- Assets/Resources/Items/WoodenSword.asset | 9 +- Assets/Scenes/Cementary.unity | 1855 ++++++++++------- Assets/Scenes/InnVillage.unity | 50 +- Assets/Scripts/Player.cs | 1 + 43 files changed, 1372 insertions(+), 915 deletions(-) create mode 100644 Assets/Resources/Dialogue/BossThug/PL/BossThugDialPL.asset create mode 100644 Assets/Resources/Dialogue/BossThug/PL/BossThugDialPL.asset.meta create mode 100644 Assets/Resources/Dialogue/BossThug/PL/BossThugMultiDialPL.asset create mode 100644 Assets/Resources/Dialogue/BossThug/PL/BossThugMultiDialPL.asset.meta diff --git a/Assets/Animations/Monster/Mushroom/Mushroom.prefab b/Assets/Animations/Monster/Mushroom/Mushroom.prefab index 5d241092..b9a25ab7 100644 --- a/Assets/Animations/Monster/Mushroom/Mushroom.prefab +++ b/Assets/Animations/Monster/Mushroom/Mushroom.prefab @@ -75,7 +75,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 3 m_Sprite: {fileID: -4226689414463533042, guid: c501ec6d7371e4941bd626854137afe4, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/Animations/Monster/SmallEarth/EarthSmall.prefab b/Assets/Animations/Monster/SmallEarth/EarthSmall.prefab index 7e0d9d12..a9eee9f4 100644 --- a/Assets/Animations/Monster/SmallEarth/EarthSmall.prefab +++ b/Assets/Animations/Monster/SmallEarth/EarthSmall.prefab @@ -75,7 +75,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 3 m_Sprite: {fileID: 2287037204803831525, guid: 191d3a9d11cf33a4aa5d5137bf353316, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/Resources/Dialogue/Bartender/PL/BartenderDialPL.asset b/Assets/Resources/Dialogue/Bartender/PL/BartenderDialPL.asset index 43466824..b24caaa0 100644 --- a/Assets/Resources/Dialogue/Bartender/PL/BartenderDialPL.asset +++ b/Assets/Resources/Dialogue/Bartender/PL/BartenderDialPL.asset @@ -18,7 +18,7 @@ MonoBehaviour: - Header: Barman WasDisplayed: 0 ListOfSentences: - - Sentence: "Poda\u0107 co\u015B do picia?" + - Sentence: Podac cos do picia? Buttons: [] EndOfDialogueStepAction: m_PersistentCalls: diff --git a/Assets/Resources/Dialogue/BossThug/PL/BossThugDialPL.asset b/Assets/Resources/Dialogue/BossThug/PL/BossThugDialPL.asset new file mode 100644 index 00000000..173bd657 --- /dev/null +++ b/Assets/Resources/Dialogue/BossThug/PL/BossThugDialPL.asset @@ -0,0 +1,39 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 06201cadd951bcc4db5fccaa01783060, type: 3} + m_Name: BossThugDialPL + m_EditorClassIdentifier: + SpeakerName: + CurrentStep: 0 + DialogueSteps: + - Header: + WasDisplayed: 0 + ListOfSentences: + - Sentence: Ktos ty? Jak pokonales moich straznikow?! + Buttons: [] + - Sentence: Nie odpowiadaj. Nie obchodzi mnie to. Juz nie zyjesz. + Buttons: [] + EndOfDialogueStepAction: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 5598884596044988526, guid: df6c42c9616028a4badca81953f003ab, type: 3} + m_TargetAssemblyTypeName: NpcDialogueManager, Assembly-CSharp + m_MethodName: DialogueEndAction + m_Mode: 3 + 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 diff --git a/Assets/Resources/Dialogue/BossThug/PL/BossThugDialPL.asset.meta b/Assets/Resources/Dialogue/BossThug/PL/BossThugDialPL.asset.meta new file mode 100644 index 00000000..8aa0ffc0 --- /dev/null +++ b/Assets/Resources/Dialogue/BossThug/PL/BossThugDialPL.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c3651d436687dfd4e8b122b657c28c85 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Dialogue/BossThug/PL/BossThugMultiDialPL.asset b/Assets/Resources/Dialogue/BossThug/PL/BossThugMultiDialPL.asset new file mode 100644 index 00000000..441b7b37 --- /dev/null +++ b/Assets/Resources/Dialogue/BossThug/PL/BossThugMultiDialPL.asset @@ -0,0 +1,19 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45b41589283138641ba006c2243b0637, type: 3} + m_Name: BossThugMultiDialPL + m_EditorClassIdentifier: + SpeakerName: + CurrentDialogue: 0 + Dialogues: + - Key: 0 + Value: {fileID: 11400000, guid: c3651d436687dfd4e8b122b657c28c85, type: 2} diff --git a/Assets/Resources/Dialogue/BossThug/PL/BossThugMultiDialPL.asset.meta b/Assets/Resources/Dialogue/BossThug/PL/BossThugMultiDialPL.asset.meta new file mode 100644 index 00000000..d1f98bca --- /dev/null +++ b/Assets/Resources/Dialogue/BossThug/PL/BossThugMultiDialPL.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 25d0b8cca6af6ea479a16bced487125d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Dialogue/Objects/Board/PL/BoardDialPL.asset b/Assets/Resources/Dialogue/Objects/Board/PL/BoardDialPL.asset index faf5ac14..feca0d68 100644 --- a/Assets/Resources/Dialogue/Objects/Board/PL/BoardDialPL.asset +++ b/Assets/Resources/Dialogue/Objects/Board/PL/BoardDialPL.asset @@ -18,7 +18,7 @@ MonoBehaviour: - Header: WasDisplayed: 0 ListOfSentences: - - Sentence: "Ku pami\u0119ci poleg\u0142ych" + - Sentence: Ku pamieci poleglych Buttons: [] EndOfDialogueStepAction: m_PersistentCalls: diff --git a/Assets/Resources/Dialogue/Objects/Doors/PL/DoorClosedDialPL.asset b/Assets/Resources/Dialogue/Objects/Doors/PL/DoorClosedDialPL.asset index ee612250..ae39aa17 100644 --- a/Assets/Resources/Dialogue/Objects/Doors/PL/DoorClosedDialPL.asset +++ b/Assets/Resources/Dialogue/Objects/Doors/PL/DoorClosedDialPL.asset @@ -18,7 +18,7 @@ MonoBehaviour: - Header: ThePlayer(Clone) WasDisplayed: 0 ListOfSentences: - - Sentence: "Te drzwi s\u0105 zamkni\u0119te" + - Sentence: Te drzwi sa zamkniete Buttons: [] EndOfDialogueStepAction: m_PersistentCalls: diff --git a/Assets/Resources/Dialogue/Objects/StoneFigures/PL/StoneFigureDialPL.asset b/Assets/Resources/Dialogue/Objects/StoneFigures/PL/StoneFigureDialPL.asset index e4b92ea6..ed5c4205 100644 --- a/Assets/Resources/Dialogue/Objects/StoneFigures/PL/StoneFigureDialPL.asset +++ b/Assets/Resources/Dialogue/Objects/StoneFigures/PL/StoneFigureDialPL.asset @@ -18,7 +18,7 @@ MonoBehaviour: - Header: WasDisplayed: 0 ListOfSentences: - - Sentence: "Gro\u017Anie wygl\u0105daj\u0105cy pos\u0105g..." + - Sentence: Groznie wygladajacy posag... Buttons: [] EndOfDialogueStepAction: m_PersistentCalls: diff --git a/Assets/Resources/Dialogue/Objects/Tombstones/SandTombstone/PL/SandTombstoneDialPL.asset b/Assets/Resources/Dialogue/Objects/Tombstones/SandTombstone/PL/SandTombstoneDialPL.asset index 101a0806..931431e1 100644 --- a/Assets/Resources/Dialogue/Objects/Tombstones/SandTombstone/PL/SandTombstoneDialPL.asset +++ b/Assets/Resources/Dialogue/Objects/Tombstones/SandTombstone/PL/SandTombstoneDialPL.asset @@ -18,7 +18,7 @@ MonoBehaviour: - Header: WasDisplayed: 0 ListOfSentences: - - Sentence: "Jest tak stary, \u017Ce litery s\u0105 nieczytelne" + - Sentence: Jest tak stary, ze litery sa nieczytelne Buttons: [] EndOfDialogueStepAction: m_PersistentCalls: diff --git a/Assets/Resources/Dialogue/Shop/PL/ShopDialPl.asset b/Assets/Resources/Dialogue/Shop/PL/ShopDialPl.asset index 0b27cdf5..e4fe14a1 100644 --- a/Assets/Resources/Dialogue/Shop/PL/ShopDialPl.asset +++ b/Assets/Resources/Dialogue/Shop/PL/ShopDialPl.asset @@ -18,7 +18,7 @@ MonoBehaviour: - Header: WasDisplayed: 0 ListOfSentences: - - Sentence: "Witaj, czy chcia\u0142 by\u015B co\u015B kupi\u0107?" + - Sentence: Witaj, czy chcialbys cos kupic? Buttons: [] EndOfDialogueStepAction: m_PersistentCalls: diff --git a/Assets/Resources/Dialogue/Wizard/PL/WizardFirstDialPL.asset b/Assets/Resources/Dialogue/Wizard/PL/WizardFirstDialPL.asset index 6c36eee0..43613931 100644 --- a/Assets/Resources/Dialogue/Wizard/PL/WizardFirstDialPL.asset +++ b/Assets/Resources/Dialogue/Wizard/PL/WizardFirstDialPL.asset @@ -18,10 +18,9 @@ MonoBehaviour: - Header: Czarodziej WasDisplayed: 0 ListOfSentences: - - Sentence: "Dzie\u0144 dobry! Ciesz\u0119 si\u0119, \u017Ce wreszcie si\u0119 - obudzi\u0142e\u015B. Jak si\u0119 masz?" + - Sentence: Dzien dobry! Ciesze sie, ze wreszcie sie obudziles. Jak sie masz? Buttons: - - ButtonName: "Kim jeste\u015B? Co to za miejsce?" + - ButtonName: Kim jestes? Co to za miejsce? Type: 1 ButtonActions: m_PersistentCalls: @@ -38,10 +37,10 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - Sentence: "Jestem Czarodziejem. Znalaz\u0142em ci\u0119 pobitego w jaskini - i przyprowadzi\u0142em tutaj. Nie by\u0142em pewny czy si\u0119 obudzisz..." + - Sentence: Jestem Czarodziejem. Znalazlem cie pobitego w jaskini i przyprowadzilem + tutaj. Nie bylem pewny czy sie obudzisz... Buttons: - - ButtonName: "Dzi\u0119kuj\u0119 za pomoc, ale powinienem ju\u017C i\u015B\u0107." + - ButtonName: "Dzi\u0119kuje za pomoc, ale powinienem juz isc." Type: 1 ButtonActions: m_PersistentCalls: @@ -58,11 +57,10 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - Sentence: "Nie s\u0105dz\u0119, \u017Ce jeste\u015B wystarczaj\u0105co silny. - A ci bandyci i tak zabrali prawie wszystko co mia\u0142e\u015B. Dam ci zio\u0142a, - jak wr\xF3c\u0119." + - Sentence: Nie sadze, ze jestes wystarczajaco silny. A ci bandyci i tak zabrali + prawie wszystko co miales. Dam ci ziola, jak wroce. Buttons: - - ButtonName: "Czuj\u0119 si\u0119 dobrze. Musz\u0119 i\u015B\u0107." + - ButtonName: Czuje sie dobrze. Musze isc. Type: 1 ButtonActions: m_PersistentCalls: @@ -79,12 +77,11 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - Sentence: "Dobrze. Udowodnij mi, \u017Ce jeste\u015B ju\u017C zdrowy i pozwol\u0119 - ci p\xF3j\u015B\u0107. W lesie na p\xF3\u0142nocny wsch\xF3d od mojego domu - s\u0105 pewne robaki. Potrzebuj\u0119, \u017Ceby\u015B je zabi\u0142 i przyni\xF3s\u0142 - mi ich jad. Przynie\u015B mi go, a pozwol\u0119 ci odej\u015B\u0107." + - Sentence: Dobrze. Udowodnij mi, ze jestes juz zdrowy i pozwole ci pojsc. W + lesie na polnocny wschod od mojego domu sa pewne robaki. Potrzebuje, zebys + je zabil i przyniosl mi ich jad. Przynies mi go, a pozwole ci odejsc. Buttons: - - ButtonName: "W porz\u0105dku." + - ButtonName: W porzadku. Type: 1 ButtonActions: m_PersistentCalls: @@ -101,7 +98,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - - Sentence: "Gdzie\u015B w domu powinienem mie\u0107 miecz. Mo\u017Cesz go zabra\u0107." + - Sentence: Gdzies w domu powinienem miec miecz. Mozesz go zabrac. Buttons: [] EndOfDialogueStepAction: m_PersistentCalls: diff --git a/Assets/Resources/Items/AirAmulet.asset b/Assets/Resources/Items/AirAmulet.asset index dae509ee..6564f05e 100644 --- a/Assets/Resources/Items/AirAmulet.asset +++ b/Assets/Resources/Items/AirAmulet.asset @@ -19,13 +19,14 @@ MonoBehaviour: value: 0 image: {fileID: 7885408681318359695, guid: 866adc2eb813e72438343756fc3b4e01, type: 3} itemModel: {fileID: 2398585647368572567, guid: c2b25eeb1e39e764c98f73310a03cf2b, type: 3} - price: 120 + price: 140 useEffect: m_PersistentCalls: m_Calls: [] StrengthBonus: 0 - AgilityBonus: 0 - InteligenceBonus: 0 + EnduranceBonus: 0 VitalityBonus: 0 + InteligenceBonus: 0 + SpeedBonus: 5 isStackable: 0 EquipmentType: 8 diff --git a/Assets/Resources/Items/Axe.asset b/Assets/Resources/Items/Axe.asset index a448869c..32c86488 100644 --- a/Assets/Resources/Items/Axe.asset +++ b/Assets/Resources/Items/Axe.asset @@ -16,11 +16,17 @@ MonoBehaviour: name: Lumberjac Axe description: Lumberjack axe level: 1 + value: 2 image: {fileID: 21300000, guid: d7a7292796eda0941a6a863b7d66bbcb, type: 3} itemModel: {fileID: 1826809974269949497, guid: 83fa1f81238efb541bd77405dcf33dd1, type: 3} + price: 50 + useEffect: + m_PersistentCalls: + m_Calls: [] StrengthBonus: 1 - AgilityBonus: 0 - InteligenceBonus: 5 + EnduranceBonus: 0 VitalityBonus: 0 + InteligenceBonus: 0 + SpeedBonus: 0 isStackable: 0 EquipmentType: 5 diff --git a/Assets/Resources/Items/Basic Sword.asset b/Assets/Resources/Items/Basic Sword.asset index ac62809a..7b9bb284 100644 --- a/Assets/Resources/Items/Basic Sword.asset +++ b/Assets/Resources/Items/Basic Sword.asset @@ -14,13 +14,19 @@ MonoBehaviour: m_EditorClassIdentifier: id: 0 name: Basic Sword - description: + description: Normal Sword level: 1 + value: 2 image: {fileID: -1424804349743227679, guid: 52aa424fe853b154a95a8f677de1a275, type: 3} itemModel: {fileID: 4126821754175378127, guid: 2e3ad6c46e0901d408ea67ed0c5761cf, type: 3} - StrengthBonus: 15 - AgilityBonus: 0 - InteligenceBonus: 0 + price: 30 + useEffect: + m_PersistentCalls: + m_Calls: [] + StrengthBonus: 0 + EnduranceBonus: 0 VitalityBonus: 0 + InteligenceBonus: 0 + SpeedBonus: 0 isStackable: 0 EquipmentType: 5 diff --git a/Assets/Resources/Items/BlueFlower.asset b/Assets/Resources/Items/BlueFlower.asset index fcf25462..52c9b740 100644 --- a/Assets/Resources/Items/BlueFlower.asset +++ b/Assets/Resources/Items/BlueFlower.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: id: 0 name: Blue Flower - description: + description: Nice flower level: 0 value: 0 image: {fileID: 1933597549513317440, guid: 72c80de1ab089794785daf50f8abf104, type: 3} diff --git a/Assets/Resources/Items/Chestplate.asset b/Assets/Resources/Items/Chestplate.asset index 561f5025..6fd11061 100644 --- a/Assets/Resources/Items/Chestplate.asset +++ b/Assets/Resources/Items/Chestplate.asset @@ -14,18 +14,19 @@ MonoBehaviour: m_EditorClassIdentifier: id: 0 name: Chestplate - description: + description: Normal leather chestplate level: 1 - value: 0 + value: 1 image: {fileID: 4404702397685382865, guid: 52aa424fe853b154a95a8f677de1a275, type: 3} itemModel: {fileID: 8687962458953192462, guid: ae7e7f7d0d926174a8edae16f7f4d305, type: 3} - price: 0 + price: 50 useEffect: m_PersistentCalls: m_Calls: [] StrengthBonus: 0 - AgilityBonus: 0 + EnduranceBonus: 0 + VitalityBonus: 0 InteligenceBonus: 0 - VitalityBonus: 15 + SpeedBonus: 0 isStackable: 0 EquipmentType: 2 diff --git a/Assets/Resources/Items/EarthAmulet.asset b/Assets/Resources/Items/EarthAmulet.asset index 997f8129..0a3fa8ed 100644 --- a/Assets/Resources/Items/EarthAmulet.asset +++ b/Assets/Resources/Items/EarthAmulet.asset @@ -19,13 +19,14 @@ MonoBehaviour: value: 0 image: {fileID: 4249666258807903423, guid: 866adc2eb813e72438343756fc3b4e01, type: 3} itemModel: {fileID: 2641452819628145680, guid: 93bbc3cef1819314082c95895d5e5017, type: 3} - price: 120 + price: 140 useEffect: m_PersistentCalls: m_Calls: [] - StrengthBonus: 5 - AgilityBonus: 0 - InteligenceBonus: 0 + StrengthBonus: 0 + EnduranceBonus: 5 VitalityBonus: 0 + InteligenceBonus: 0 + SpeedBonus: 0 isStackable: 0 EquipmentType: 8 diff --git a/Assets/Resources/Items/EbonyRing.asset b/Assets/Resources/Items/EbonyRing.asset index 618bb62c..1d251a81 100644 --- a/Assets/Resources/Items/EbonyRing.asset +++ b/Assets/Resources/Items/EbonyRing.asset @@ -13,19 +13,20 @@ MonoBehaviour: m_Name: EbonyRing m_EditorClassIdentifier: id: 0 - name: - description: + name: Ebony Ring + description: Ring made out of ebony level: 0 value: 0 image: {fileID: -6657913739729259365, guid: 866adc2eb813e72438343756fc3b4e01, type: 3} itemModel: {fileID: 6931735939571646632, guid: bc24f87c709ae2b458d1808f0e59b2aa, type: 3} - price: 0 + price: 85 useEffect: m_PersistentCalls: m_Calls: [] StrengthBonus: 0 - AgilityBonus: 0 - InteligenceBonus: 0 + EnduranceBonus: 0 VitalityBonus: 0 + InteligenceBonus: 1 + SpeedBonus: 1 isStackable: 0 - EquipmentType: 0 + EquipmentType: 9 diff --git a/Assets/Resources/Items/EmeraldRing.asset b/Assets/Resources/Items/EmeraldRing.asset index 4ec81a50..4b25c129 100644 --- a/Assets/Resources/Items/EmeraldRing.asset +++ b/Assets/Resources/Items/EmeraldRing.asset @@ -13,19 +13,20 @@ MonoBehaviour: m_Name: EmeraldRing m_EditorClassIdentifier: id: 0 - name: - description: + name: Emerald Ring + description: Ring with emerald level: 0 value: 0 image: {fileID: -7652257075970667830, guid: 866adc2eb813e72438343756fc3b4e01, type: 3} itemModel: {fileID: 8585366321171850528, guid: e6bebb8b7d63fdc48aaea6ed5e47fbc1, type: 3} - price: 0 + price: 105 useEffect: m_PersistentCalls: m_Calls: [] StrengthBonus: 0 - AgilityBonus: 0 + EnduranceBonus: 0 + VitalityBonus: 3 InteligenceBonus: 0 - VitalityBonus: 0 + SpeedBonus: 0 isStackable: 0 - EquipmentType: 0 + EquipmentType: 9 diff --git a/Assets/Resources/Items/FireAmulet.asset b/Assets/Resources/Items/FireAmulet.asset index cb3952c2..90f98127 100644 --- a/Assets/Resources/Items/FireAmulet.asset +++ b/Assets/Resources/Items/FireAmulet.asset @@ -19,13 +19,14 @@ MonoBehaviour: value: 0 image: {fileID: -3459497016148413627, guid: 866adc2eb813e72438343756fc3b4e01, type: 3} itemModel: {fileID: 9122857022439842298, guid: 7703bd9c885f5da46acb026f16b1ed82, type: 3} - price: 120 + price: 140 useEffect: m_PersistentCalls: m_Calls: [] - StrengthBonus: 0 - AgilityBonus: 0 - InteligenceBonus: 0 + StrengthBonus: 5 + EnduranceBonus: 0 VitalityBonus: 0 + InteligenceBonus: 0 + SpeedBonus: 0 isStackable: 0 EquipmentType: 8 diff --git a/Assets/Resources/Items/GoldenRing.asset b/Assets/Resources/Items/GoldenRing.asset index 0c08557f..f6c70079 100644 --- a/Assets/Resources/Items/GoldenRing.asset +++ b/Assets/Resources/Items/GoldenRing.asset @@ -13,19 +13,20 @@ MonoBehaviour: m_Name: GoldenRing m_EditorClassIdentifier: id: 0 - name: - description: + name: Golden Ring + description: Gold ring level: 0 value: 0 image: {fileID: -6524714282782223981, guid: 866adc2eb813e72438343756fc3b4e01, type: 3} itemModel: {fileID: 8357185774081028001, guid: f2ccd14c03a2bd5469dae087392a8323, type: 3} - price: 0 + price: 95 useEffect: m_PersistentCalls: m_Calls: [] StrengthBonus: 0 - AgilityBonus: 0 + EnduranceBonus: 1 + VitalityBonus: 1 InteligenceBonus: 0 - VitalityBonus: 0 + SpeedBonus: 0 isStackable: 0 - EquipmentType: 0 + EquipmentType: 9 diff --git a/Assets/Resources/Items/GoldenSword.asset b/Assets/Resources/Items/GoldenSword.asset index 501e96f3..a998aec4 100644 --- a/Assets/Resources/Items/GoldenSword.asset +++ b/Assets/Resources/Items/GoldenSword.asset @@ -23,9 +23,10 @@ MonoBehaviour: useEffect: m_PersistentCalls: m_Calls: [] - StrengthBonus: 15 - AgilityBonus: 0 - InteligenceBonus: 0 + StrengthBonus: 20 + EnduranceBonus: 0 VitalityBonus: 0 + InteligenceBonus: 0 + SpeedBonus: 0 isStackable: 0 EquipmentType: 5 diff --git a/Assets/Resources/Items/HealthPotionL.asset b/Assets/Resources/Items/HealthPotionL.asset index 41be19af..eebf755f 100644 --- a/Assets/Resources/Items/HealthPotionL.asset +++ b/Assets/Resources/Items/HealthPotionL.asset @@ -19,13 +19,14 @@ MonoBehaviour: value: 0 image: {fileID: 2634581254100188468, guid: 866adc2eb813e72438343756fc3b4e01, type: 3} itemModel: {fileID: 8355166867481118729, guid: 1b7014d4d2f7373409be7a5dea208b56, type: 3} - price: 20 + price: 30 useEffect: m_PersistentCalls: m_Calls: [] StrengthBonus: 0 - AgilityBonus: 0 - InteligenceBonus: 0 + EnduranceBonus: 0 VitalityBonus: 0 + InteligenceBonus: 0 + SpeedBonus: 0 isStackable: 0 EquipmentType: 6 diff --git a/Assets/Resources/Items/HealthPotionM.asset b/Assets/Resources/Items/HealthPotionM.asset index dc028c20..1a8c2e68 100644 --- a/Assets/Resources/Items/HealthPotionM.asset +++ b/Assets/Resources/Items/HealthPotionM.asset @@ -19,13 +19,14 @@ MonoBehaviour: value: 0 image: {fileID: 6770572910690203029, guid: 866adc2eb813e72438343756fc3b4e01, type: 3} itemModel: {fileID: 2329240032996401192, guid: 0d90080a8b4085d4dbb1f9fe2404c140, type: 3} - price: 10 + price: 20 useEffect: m_PersistentCalls: m_Calls: [] StrengthBonus: 0 - AgilityBonus: 0 - InteligenceBonus: 0 + EnduranceBonus: 0 VitalityBonus: 0 + InteligenceBonus: 0 + SpeedBonus: 0 isStackable: 0 EquipmentType: 6 diff --git a/Assets/Resources/Items/HealthPotionS.asset b/Assets/Resources/Items/HealthPotionS.asset index 3d58c086..7ad1f2b8 100644 --- a/Assets/Resources/Items/HealthPotionS.asset +++ b/Assets/Resources/Items/HealthPotionS.asset @@ -19,13 +19,14 @@ MonoBehaviour: value: 0 image: {fileID: -5837177561311991975, guid: 866adc2eb813e72438343756fc3b4e01, type: 3} itemModel: {fileID: 2439513124194804271, guid: ba1820e9446462744a4ace2d4df9280b, type: 3} - price: 5 + price: 10 useEffect: m_PersistentCalls: m_Calls: [] StrengthBonus: 0 - AgilityBonus: 0 - InteligenceBonus: 0 + EnduranceBonus: 0 VitalityBonus: 0 + InteligenceBonus: 0 + SpeedBonus: 0 isStackable: 0 EquipmentType: 6 diff --git a/Assets/Resources/Items/HeavySword.asset b/Assets/Resources/Items/HeavySword.asset index e23f5b10..4f680ae0 100644 --- a/Assets/Resources/Items/HeavySword.asset +++ b/Assets/Resources/Items/HeavySword.asset @@ -17,16 +17,17 @@ MonoBehaviour: description: Very heavy sword it gives a lot of damage but will be hard to carry around level: 0 - value: 0 + value: 2 image: {fileID: 444537707431101305, guid: 94f7a1cd00ce2c543af19397b21cfe52, type: 3} itemModel: {fileID: 1233190268391230073, guid: 477c31b83d1b95e448e6406412b02231, type: 3} - price: 12 + price: 80 useEffect: m_PersistentCalls: m_Calls: [] StrengthBonus: 3 - AgilityBonus: 0 - InteligenceBonus: 0 + EnduranceBonus: 0 VitalityBonus: 0 + InteligenceBonus: 0 + SpeedBonus: -1 isStackable: 0 EquipmentType: 5 diff --git a/Assets/Resources/Items/LightSword.asset b/Assets/Resources/Items/LightSword.asset index 24f8dc37..c129ed0c 100644 --- a/Assets/Resources/Items/LightSword.asset +++ b/Assets/Resources/Items/LightSword.asset @@ -16,16 +16,17 @@ MonoBehaviour: name: Light Sword description: Very light sword. Easy to carry level: 0 - value: 0 + value: 3 image: {fileID: 1389849888674057003, guid: 866adc2eb813e72438343756fc3b4e01, type: 3} itemModel: {fileID: 3310224593960103282, guid: a4d5dfca7c95e0242a086b8920a0c550, type: 3} - price: 10 + price: 70 useEffect: m_PersistentCalls: m_Calls: [] - StrengthBonus: 1 - AgilityBonus: 0 - InteligenceBonus: 0 + StrengthBonus: 2 + EnduranceBonus: 0 VitalityBonus: 0 + InteligenceBonus: 0 + SpeedBonus: 1 isStackable: 0 EquipmentType: 5 diff --git a/Assets/Resources/Items/NecklaceOfHope.asset b/Assets/Resources/Items/NecklaceOfHope.asset index 65ee7eb9..daf6208f 100644 --- a/Assets/Resources/Items/NecklaceOfHope.asset +++ b/Assets/Resources/Items/NecklaceOfHope.asset @@ -24,8 +24,9 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] StrengthBonus: 2 - AgilityBonus: 2 - InteligenceBonus: 2 + EnduranceBonus: 2 VitalityBonus: 2 + InteligenceBonus: 2 + SpeedBonus: 2 isStackable: 0 EquipmentType: 8 diff --git a/Assets/Resources/Items/Pickaxe.asset b/Assets/Resources/Items/Pickaxe.asset index 51a40a1a..b5e8b73f 100644 --- a/Assets/Resources/Items/Pickaxe.asset +++ b/Assets/Resources/Items/Pickaxe.asset @@ -16,10 +16,10 @@ MonoBehaviour: name: Pickaxe description: level: 1 - value: 0 + value: 1 image: {fileID: 8959118705387878318, guid: 25e473b59d2d7534e803be0a2825e0f7, type: 3} itemModel: {fileID: 9081071845930167562, guid: 0bccd32818043074d9785f6d90ebdcb3, type: 3} - price: 0 + price: 20 useEffect: m_PersistentCalls: m_Calls: @@ -35,9 +35,10 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 - StrengthBonus: 5 - AgilityBonus: 0 - InteligenceBonus: 0 + StrengthBonus: 0 + EnduranceBonus: 0 VitalityBonus: 0 + InteligenceBonus: 0 + SpeedBonus: 0 isStackable: 0 EquipmentType: 5 diff --git a/Assets/Resources/Items/PinkFlower.asset b/Assets/Resources/Items/PinkFlower.asset index 08b011cb..d30c158c 100644 --- a/Assets/Resources/Items/PinkFlower.asset +++ b/Assets/Resources/Items/PinkFlower.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: id: 0 name: Pink Flower - description: + description: Nice flower level: 0 value: 0 image: {fileID: 8806948917284211570, guid: 72c80de1ab089794785daf50f8abf104, type: 3} diff --git a/Assets/Resources/Items/Private Helmet.asset b/Assets/Resources/Items/Private Helmet.asset index 2b08cad0..e2bfbabf 100644 --- a/Assets/Resources/Items/Private Helmet.asset +++ b/Assets/Resources/Items/Private Helmet.asset @@ -14,13 +14,19 @@ MonoBehaviour: m_EditorClassIdentifier: id: 3 name: Private Helmet - description: + description: Leather helmet level: 0 + value: 1 image: {fileID: -4153561594331974330, guid: 52aa424fe853b154a95a8f677de1a275, type: 3} itemModel: {fileID: 8387239886674690860, guid: 6d1fa1c676de3d248a84064a66916bcd, type: 3} + price: 35 + useEffect: + m_PersistentCalls: + m_Calls: [] StrengthBonus: 0 - AgilityBonus: 0 + EnduranceBonus: 0 + VitalityBonus: 0 InteligenceBonus: 0 - VitalityBonus: 5 + SpeedBonus: 0 isStackable: 0 EquipmentType: 1 diff --git a/Assets/Resources/Items/QuartzRing.asset b/Assets/Resources/Items/QuartzRing.asset index f458214f..5620e591 100644 --- a/Assets/Resources/Items/QuartzRing.asset +++ b/Assets/Resources/Items/QuartzRing.asset @@ -13,19 +13,20 @@ MonoBehaviour: m_Name: QuartzRing m_EditorClassIdentifier: id: 0 - name: - description: + name: Quart Ring + description: Ring with quartz stone level: 0 value: 0 image: {fileID: 6759244946866839360, guid: 866adc2eb813e72438343756fc3b4e01, type: 3} itemModel: {fileID: 7335205385618090110, guid: 14fcd7ab63436604492949d1fd4bc6bf, type: 3} - price: 0 + price: 95 useEffect: m_PersistentCalls: m_Calls: [] StrengthBonus: 0 - AgilityBonus: 0 - InteligenceBonus: 0 - VitalityBonus: 0 + EnduranceBonus: 0 + VitalityBonus: 1 + InteligenceBonus: 2 + SpeedBonus: 0 isStackable: 0 - EquipmentType: 0 + EquipmentType: 9 diff --git a/Assets/Resources/Items/RubyRing.asset b/Assets/Resources/Items/RubyRing.asset index 271ee3d9..d1a95005 100644 --- a/Assets/Resources/Items/RubyRing.asset +++ b/Assets/Resources/Items/RubyRing.asset @@ -13,19 +13,20 @@ MonoBehaviour: m_Name: RubyRing m_EditorClassIdentifier: id: 0 - name: - description: + name: Ruby Ring + description: Ring with ruby level: 0 value: 0 image: {fileID: -847223144147799035, guid: 866adc2eb813e72438343756fc3b4e01, type: 3} itemModel: {fileID: 4342831401918966249, guid: 2917e0f72c8f18b47806c56522cbeb0c, type: 3} - price: 0 + price: 115 useEffect: m_PersistentCalls: m_Calls: [] - StrengthBonus: 0 - AgilityBonus: 0 - InteligenceBonus: 0 + StrengthBonus: 2 + EnduranceBonus: 2 VitalityBonus: 0 + InteligenceBonus: 0 + SpeedBonus: 0 isStackable: 0 - EquipmentType: 0 + EquipmentType: 9 diff --git a/Assets/Resources/Items/SilverRing.asset b/Assets/Resources/Items/SilverRing.asset index 47159c79..fbd60dad 100644 --- a/Assets/Resources/Items/SilverRing.asset +++ b/Assets/Resources/Items/SilverRing.asset @@ -13,19 +13,20 @@ MonoBehaviour: m_Name: SilverRing m_EditorClassIdentifier: id: 0 - name: - description: + name: Silver Ring + description: Normal silver ring level: 0 value: 0 image: {fileID: 7035944541455254544, guid: 866adc2eb813e72438343756fc3b4e01, type: 3} itemModel: {fileID: 3527697885031028648, guid: f4c5ae72e7ed9d24a8f45afe7c62719f, type: 3} - price: 0 + price: 60 useEffect: m_PersistentCalls: m_Calls: [] - StrengthBonus: 0 - AgilityBonus: 0 - InteligenceBonus: 0 + StrengthBonus: 1 + EnduranceBonus: 0 VitalityBonus: 0 + InteligenceBonus: 0 + SpeedBonus: 0 isStackable: 0 - EquipmentType: 0 + EquipmentType: 9 diff --git a/Assets/Resources/Items/SteelHelmet.asset b/Assets/Resources/Items/SteelHelmet.asset index f07d972c..62492f49 100644 --- a/Assets/Resources/Items/SteelHelmet.asset +++ b/Assets/Resources/Items/SteelHelmet.asset @@ -16,7 +16,7 @@ MonoBehaviour: name: Steel Helmet description: Well made helmet. Good protection. level: 0 - value: 0 + value: 2 image: {fileID: 8286571802576935001, guid: 866adc2eb813e72438343756fc3b4e01, type: 3} itemModel: {fileID: 4002461311910610052, guid: 522ac16bac932ff4d93ef9865d137864, type: 3} price: 25 @@ -24,8 +24,9 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] StrengthBonus: 0 - AgilityBonus: 0 + EnduranceBonus: 0 + VitalityBonus: 1 InteligenceBonus: 0 - VitalityBonus: 0 + SpeedBonus: 0 isStackable: 0 EquipmentType: 1 diff --git a/Assets/Resources/Items/TopazRing.asset b/Assets/Resources/Items/TopazRing.asset index af472d89..aa9b3043 100644 --- a/Assets/Resources/Items/TopazRing.asset +++ b/Assets/Resources/Items/TopazRing.asset @@ -13,19 +13,20 @@ MonoBehaviour: m_Name: TopazRing m_EditorClassIdentifier: id: 0 - name: - description: + name: Topaz Ring + description: Ring with a topaz level: 0 value: 0 image: {fileID: -8195587494142681365, guid: 866adc2eb813e72438343756fc3b4e01, type: 3} itemModel: {fileID: 202265579401738656, guid: 116af0fb4d8fe53428ca7f4593fd99ed, type: 3} - price: 0 + price: 100 useEffect: m_PersistentCalls: m_Calls: [] - StrengthBonus: 0 - AgilityBonus: 0 - InteligenceBonus: 0 + StrengthBonus: 1 + EnduranceBonus: 1 VitalityBonus: 0 + InteligenceBonus: 1 + SpeedBonus: 0 isStackable: 0 - EquipmentType: 0 + EquipmentType: 9 diff --git a/Assets/Resources/Items/WaterAmulet.asset b/Assets/Resources/Items/WaterAmulet.asset index cd9d245d..1b00fa04 100644 --- a/Assets/Resources/Items/WaterAmulet.asset +++ b/Assets/Resources/Items/WaterAmulet.asset @@ -19,13 +19,14 @@ MonoBehaviour: value: 0 image: {fileID: 0} itemModel: {fileID: 8077255044395745669, guid: 5746269b822b8754a8ac1a3a41ff324d, type: 3} - price: 120 + price: 140 useEffect: m_PersistentCalls: m_Calls: [] StrengthBonus: 0 - AgilityBonus: 0 - InteligenceBonus: 0 + EnduranceBonus: 0 VitalityBonus: 0 + InteligenceBonus: 5 + SpeedBonus: 0 isStackable: 0 EquipmentType: 8 diff --git a/Assets/Resources/Items/WoodenSword.asset b/Assets/Resources/Items/WoodenSword.asset index e955b149..b33df53a 100644 --- a/Assets/Resources/Items/WoodenSword.asset +++ b/Assets/Resources/Items/WoodenSword.asset @@ -16,16 +16,17 @@ MonoBehaviour: name: Wooden Sword description: Simple Wooden Sword level: 1 - value: 0 + value: 1 image: {fileID: 3009030062900057397, guid: 94f7a1cd00ce2c543af19397b21cfe52, type: 3} itemModel: {fileID: 2946484175895467425, guid: 5bd9c999803793443831053438f30b96, type: 3} - price: 3 + price: 10 useEffect: m_PersistentCalls: m_Calls: [] StrengthBonus: 0 - AgilityBonus: 0 - InteligenceBonus: 0 + EnduranceBonus: 0 VitalityBonus: 0 + InteligenceBonus: 0 + SpeedBonus: 0 isStackable: 0 EquipmentType: 5 diff --git a/Assets/Scenes/Cementary.unity b/Assets/Scenes/Cementary.unity index b7b52073..f9376b5b 100644 --- a/Assets/Scenes/Cementary.unity +++ b/Assets/Scenes/Cementary.unity @@ -523,7 +523,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 266 + m_RootOrder: 257 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &7479186 PolygonCollider2D: @@ -805,7 +805,7 @@ Transform: - {fileID: 764358505} - {fileID: 1653064919} m_Father: {fileID: 0} - m_RootOrder: 42 + m_RootOrder: 44 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &9573292 GameObject: @@ -1214,7 +1214,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 290 + m_RootOrder: 281 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &11678110 BoxCollider2D: @@ -1514,7 +1514,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 295 + m_RootOrder: 286 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &18998956 BoxCollider2D: @@ -1978,7 +1978,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 308 + m_RootOrder: 299 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &34354780 BoxCollider2D: @@ -15446,6 +15446,46 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -21, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -20, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 60 + m_TileSpriteIndex: 52 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -19, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -18, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -17, y: -8, z: 0} second: serializedVersion: 2 @@ -16186,6 +16226,46 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -21, y: -7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -20, y: -7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 60 + m_TileSpriteIndex: 52 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -19, y: -7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -18, y: -7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -17, y: -7, z: 0} second: serializedVersion: 2 @@ -16946,6 +17026,46 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -21, y: -6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -20, y: -6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 60 + m_TileSpriteIndex: 52 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -19, y: -6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 60 + m_TileSpriteIndex: 52 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -18, y: -6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 60 + m_TileSpriteIndex: 52 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -17, y: -6, z: 0} second: serializedVersion: 2 @@ -17726,6 +17846,46 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -21, y: -5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -20, y: -5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -19, y: -5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -18, y: -5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 60 + m_TileSpriteIndex: 52 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -17, y: -5, z: 0} second: serializedVersion: 2 @@ -18676,6 +18836,46 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -21, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -20, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -19, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 60 + m_TileSpriteIndex: 52 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -18, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 60 + m_TileSpriteIndex: 52 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -17, y: -4, z: 0} second: serializedVersion: 2 @@ -19626,6 +19826,46 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -21, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -20, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -19, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -18, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -17, y: -3, z: 0} second: serializedVersion: 2 @@ -20576,6 +20816,46 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -21, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 14 + m_TileSpriteIndex: 14 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -20, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 14 + m_TileSpriteIndex: 14 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -19, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 14 + m_TileSpriteIndex: 14 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -18, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 14 + m_TileSpriteIndex: 14 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -17, y: -2, z: 0} second: serializedVersion: 2 @@ -21526,6 +21806,46 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -21, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 47 + m_TileSpriteIndex: 47 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -20, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 47 + m_TileSpriteIndex: 47 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -19, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 47 + m_TileSpriteIndex: 47 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -18, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 47 + m_TileSpriteIndex: 47 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -17, y: -1, z: 0} second: serializedVersion: 2 @@ -21539,8 +21859,8 @@ Tilemap: - first: {x: -16, y: -1, z: 0} second: serializedVersion: 2 - m_TileIndex: 47 - m_TileSpriteIndex: 47 + m_TileIndex: 56 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -22486,6 +22806,46 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -21, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 10 + m_TileSpriteIndex: 10 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -20, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 10 + m_TileSpriteIndex: 10 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -19, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 10 + m_TileSpriteIndex: 10 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -18, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 10 + m_TileSpriteIndex: 10 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -17, y: 0, z: 0} second: serializedVersion: 2 @@ -23466,6 +23826,46 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -21, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -20, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -19, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -18, y: 1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -17, y: 1, z: 0} second: serializedVersion: 2 @@ -24436,6 +24836,46 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -21, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -20, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -19, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 60 + m_TileSpriteIndex: 52 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -18, y: 2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 60 + m_TileSpriteIndex: 52 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -17, y: 2, z: 0} second: serializedVersion: 2 @@ -25396,6 +25836,46 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -21, y: 3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -20, y: 3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 60 + m_TileSpriteIndex: 52 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -19, y: 3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 60 + m_TileSpriteIndex: 52 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -18, y: 3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -17, y: 3, z: 0} second: serializedVersion: 2 @@ -26336,6 +26816,46 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -21, y: 4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -20, y: 4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 60 + m_TileSpriteIndex: 52 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -19, y: 4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 60 + m_TileSpriteIndex: 52 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -18, y: 4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 60 + m_TileSpriteIndex: 52 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -17, y: 4, z: 0} second: serializedVersion: 2 @@ -27276,6 +27796,46 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -21, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -20, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -19, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -18, y: 5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -17, y: 5, z: 0} second: serializedVersion: 2 @@ -28066,11 +28626,51 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -21, y: 6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -20, y: 6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -19, y: 6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -18, y: 6, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -17, y: 6, z: 0} second: serializedVersion: 2 - m_TileIndex: 54 - m_TileSpriteIndex: 9 + m_TileIndex: 33 + m_TileSpriteIndex: 33 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -28846,6 +29446,46 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -21, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -20, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -19, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 60 + m_TileSpriteIndex: 52 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -18, y: 7, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 60 + m_TileSpriteIndex: 52 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -17, y: 7, z: 0} second: serializedVersion: 2 @@ -29606,6 +30246,46 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -21, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -20, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 60 + m_TileSpriteIndex: 52 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -19, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 60 + m_TileSpriteIndex: 52 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -18, y: 8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 60 + m_TileSpriteIndex: 52 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -17, y: 8, z: 0} second: serializedVersion: 2 @@ -30356,6 +31036,56 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -21, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -20, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -19, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 60 + m_TileSpriteIndex: 52 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -18, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 60 + m_TileSpriteIndex: 52 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -17, y: 9, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 33 + m_TileSpriteIndex: 33 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -2, y: 9, z: 0} second: serializedVersion: 2 @@ -65268,7 +65998,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 8125f2606e3fcaa4d806255493e71fe1, type: 2} - m_RefCount: 5 m_Data: {fileID: 11400000, guid: 2d4b0aeca0a5ac54ab41120301477bce, type: 2} - - m_RefCount: 77 + - m_RefCount: 81 m_Data: {fileID: 11400000, guid: ba30fc82a67f6a341a0ca5634887fd19, type: 2} - m_RefCount: 7 m_Data: {fileID: 11400000, guid: b0b9f16a8b7d3834cb8f44371d2364e4, type: 2} @@ -65276,7 +66006,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 5ee0dffa055caa34db6b278692b1ce45, type: 2} - m_RefCount: 2 m_Data: {fileID: 11400000, guid: c49d74f0d56b59343a988504738a03f4, type: 2} - - m_RefCount: 79 + - m_RefCount: 83 m_Data: {fileID: 11400000, guid: c459ab4b363a4074c919ffb3b3c1a3d5, type: 2} - m_RefCount: 5 m_Data: {fileID: 11400000, guid: 6029c741062eae84abd8f107f583e689, type: 2} @@ -65314,7 +66044,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 7e96f34eac1a96b4893aa952228e0da7, type: 2} - m_RefCount: 126 m_Data: {fileID: 11400000, guid: 23b55f16ec4c8374ca1f21ee8a066504, type: 2} - - m_RefCount: 1333 + - m_RefCount: 1373 m_Data: {fileID: 11400000, guid: d69a66f20aedd474784c9e37f6c00990, type: 2} - m_RefCount: 125 m_Data: {fileID: 11400000, guid: 66d3a18bb874dea4397430a450d2dcd2, type: 2} @@ -65342,7 +66072,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: 42ac661db8d4bbc449dde7eaaa458dde, type: 2} - m_RefCount: 4 m_Data: {fileID: 11400000, guid: a59d14b95a1068243b8875e8194beeb4, type: 2} - - m_RefCount: 140 + - m_RefCount: 143 m_Data: {fileID: 11400000, guid: bd5dab4ccd11ed54ca203ae547d0ba73, type: 2} - m_RefCount: 7 m_Data: {fileID: 11400000, guid: 4d31dc1f4124b3d4da11d9b4ef642105, type: 2} @@ -65356,11 +66086,11 @@ Tilemap: m_Data: {fileID: 11400000, guid: 0e7c1eadb9a6aa442838b3c8d08956e8, type: 2} - m_RefCount: 6 m_Data: {fileID: 11400000, guid: 041e020c25ce08c4ca77f31495a75e88, type: 2} - - m_RefCount: 46 + - m_RefCount: 45 m_Data: {fileID: 11400000, guid: 17ba8c39284dbca46a51b68d987c9ce3, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 73242b479dec661429de761635d62e73, type: 2} - - m_RefCount: 2 + - m_RefCount: 3 m_Data: {fileID: 11400000, guid: 08873b67fdd974d44a7f0d21c9f14929, type: 2} - m_RefCount: 4 m_Data: {fileID: 11400000, guid: 61f9b61a2ad86254e981e2a5aa5b1811, type: 2} @@ -65368,7 +66098,7 @@ Tilemap: m_Data: {fileID: 11400000, guid: f0e82fc80822ebc49bfd895a95eb757a, type: 2} - m_RefCount: 3 m_Data: {fileID: 11400000, guid: 70e0457ab49fb0340abb27d44adfba4b, type: 2} - - m_RefCount: 26 + - m_RefCount: 48 m_Data: {fileID: 11400000, guid: a9ce6ca776bb00842b81932a8cf6ea2e, type: 2} - m_RefCount: 19 m_Data: {fileID: 11400000, guid: 1b2d4fae1e32bc446a0e78f8c092db39, type: 2} @@ -65411,17 +66141,17 @@ Tilemap: m_Data: {fileID: -7394375637179823380, guid: a9c0c772b01d7ad46a8fc890b31f10f3, type: 3} - m_RefCount: 116 m_Data: {fileID: -3546132840812438235, guid: 72c80de1ab089794785daf50f8abf104, type: 3} - - m_RefCount: 46 + - m_RefCount: 45 m_Data: {fileID: -8066270246290050597, guid: 4a3bed56672e38d4ea1a73cb8fb4233b, type: 3} - - m_RefCount: 77 + - m_RefCount: 81 m_Data: {fileID: -8816494724139487580, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} - m_RefCount: 18 m_Data: {fileID: 6262366874383518523, guid: 72c80de1ab089794785daf50f8abf104, type: 3} - - m_RefCount: 2 + - m_RefCount: 3 m_Data: {fileID: 4886624382077268223, guid: 4a3bed56672e38d4ea1a73cb8fb4233b, type: 3} - m_RefCount: 2 m_Data: {fileID: 4759257921745646164, guid: 4a3bed56672e38d4ea1a73cb8fb4233b, type: 3} - - m_RefCount: 79 + - m_RefCount: 83 m_Data: {fileID: 7979533475412647284, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} - m_RefCount: 5 m_Data: {fileID: 4135711781636913447, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} @@ -65459,7 +66189,7 @@ Tilemap: m_Data: {fileID: -7771430562198595225, guid: 4a3bed56672e38d4ea1a73cb8fb4233b, type: 3} - m_RefCount: 126 m_Data: {fileID: 4602480255276263508, guid: 4a3bed56672e38d4ea1a73cb8fb4233b, type: 3} - - m_RefCount: 1333 + - m_RefCount: 1373 m_Data: {fileID: -1355270939746514160, guid: a9c0c772b01d7ad46a8fc890b31f10f3, type: 3} - m_RefCount: 125 m_Data: {fileID: -95218347053548597, guid: 4a3bed56672e38d4ea1a73cb8fb4233b, type: 3} @@ -65487,7 +66217,7 @@ Tilemap: m_Data: {fileID: 7553333444985756381, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} - m_RefCount: 4 m_Data: {fileID: 4279347421722867456, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} - - m_RefCount: 140 + - m_RefCount: 143 m_Data: {fileID: 3392292900778648343, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} - m_RefCount: 7 m_Data: {fileID: 5938177142972023496, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} @@ -65497,7 +66227,7 @@ Tilemap: m_Data: {fileID: 2125776315048595592, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} - m_RefCount: 4 m_Data: {fileID: 541924394634384194, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} - - m_RefCount: 26 + - m_RefCount: 48 m_Data: {fileID: 7681903327190599789, guid: a9c0c772b01d7ad46a8fc890b31f10f3, type: 3} - m_RefCount: 6 m_Data: {fileID: 1667377774786351887, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} @@ -65538,7 +66268,7 @@ Tilemap: - m_RefCount: 4 m_Data: {fileID: -786679429421804572, guid: dffcdb2de1e15614f9ad279af118c62e, type: 3} m_TileMatrixArray: - - m_RefCount: 6310 + - m_RefCount: 6383 m_Data: e00: 1 e01: 0 @@ -65557,7 +66287,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 6310 + - m_RefCount: 6383 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 @@ -66780,7 +67510,7 @@ Transform: - {fileID: 461442619} - {fileID: 804472645} m_Father: {fileID: 0} - m_RootOrder: 49 + m_RootOrder: 51 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &65016750 GameObject: @@ -67450,7 +68180,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 306 + m_RootOrder: 297 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &76352983 BoxCollider2D: @@ -67644,7 +68374,7 @@ Transform: - {fileID: 1451785504} - {fileID: 111383913} m_Father: {fileID: 0} - m_RootOrder: 38 + m_RootOrder: 40 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &79461424 GameObject: @@ -67966,7 +68696,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 268 + m_RootOrder: 259 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &94220930 GameObject: @@ -68462,7 +69192,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 262 + m_RootOrder: 253 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &108832459 PolygonCollider2D: @@ -69181,7 +69911,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 303 + m_RootOrder: 294 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &119165398 BoxCollider2D: @@ -69973,7 +70703,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &132031236 GameObject: @@ -70889,7 +71619,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 311 + m_RootOrder: 302 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &147456186 BoxCollider2D: @@ -71264,7 +71994,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 288 + m_RootOrder: 279 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &157090240 BoxCollider2D: @@ -71819,7 +72549,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 249 + m_RootOrder: 248 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &170959202 PolygonCollider2D: @@ -72720,7 +73450,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 278 + m_RootOrder: 269 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &184433943 PolygonCollider2D: @@ -73360,7 +74090,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &207123323 GameObject: @@ -73972,7 +74702,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 309 + m_RootOrder: 300 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &215276435 BoxCollider2D: @@ -76686,7 +77416,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 302 + m_RootOrder: 293 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &292098703 BoxCollider2D: @@ -78640,7 +79370,7 @@ Transform: - {fileID: 210537224} - {fileID: 917195690} m_Father: {fileID: 0} - m_RootOrder: 46 + m_RootOrder: 48 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &327170583 GameObject: @@ -80186,7 +80916,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 298 + m_RootOrder: 289 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &354581869 BoxCollider2D: @@ -80799,7 +81529,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 31 + m_RootOrder: 33 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &370371251 GameObject: @@ -83272,6 +84002,118 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &419250164 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 419250169} + - component: {fileID: 419250168} + - component: {fileID: 419250167} + - component: {fileID: 419250166} + - component: {fileID: 419250165} + m_Layer: 0 + m_Name: GatewayCatacombs + m_TagString: SceneTransition + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &419250165 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 419250164} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f8dbef2798cc8064f86e56d2bc02d2fa, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &419250166 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 419250164} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 754d016cd82f48f408221e1d4f04a31a, type: 3} + m_Name: + m_EditorClassIdentifier: + SaveController: {fileID: 419250164} + gateway: + id: 0 + currentMapName: + coords: {x: 0, y: 0, z: 0} + nextMapName: Catacombs + respawnCoords: {x: 0, y: -1, z: 0} +--- !u!50 &419250167 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 419250164} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!61 &419250168 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 419250164} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.5, y: 2} + m_EdgeRadius: 0 +--- !u!4 &419250169 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 419250164} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 24.5, y: 35.01, z: 0} + m_LocalScale: {x: 1.975, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 52 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &419616843 GameObject: m_ObjectHideFlags: 0 @@ -83897,7 +84739,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 280 + m_RootOrder: 271 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &427652793 PolygonCollider2D: @@ -84502,88 +85344,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &433949759 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 433949760} - - component: {fileID: 433949761} - m_Layer: 0 - m_Name: Tombstone8 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &433949760 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 433949759} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 11.768, y: 6.016, z: 15.9235325} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 525147508} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &433949761 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 433949759} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - 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: 4 - m_Sprite: {fileID: -7764013511229497059, guid: 3a08fefc7df696140a7a44798f351457, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1.5625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &435019654 GameObject: m_ObjectHideFlags: 0 @@ -85071,7 +85831,7 @@ Transform: - {fileID: 1050578000} - {fileID: 1533450807} m_Father: {fileID: 0} - m_RootOrder: 34 + m_RootOrder: 36 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &449163964 GameObject: @@ -85103,7 +85863,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 289 + m_RootOrder: 280 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &449163966 BoxCollider2D: @@ -85259,7 +86019,7 @@ Transform: - {fileID: 1652951855} - {fileID: 422450866} m_Father: {fileID: 0} - m_RootOrder: 22 + m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &454281237 GameObject: @@ -85500,7 +86260,7 @@ Transform: - {fileID: 1214450873} - {fileID: 775628773} m_Father: {fileID: 0} - m_RootOrder: 26 + m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &458054600 GameObject: @@ -87845,7 +88605,7 @@ GameObject: - component: {fileID: 502298262} - component: {fileID: 502298261} m_Layer: 0 - m_Name: GameObject (19) + m_Name: Tombstone2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -87858,12 +88618,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 502298259} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 9.6, y: 15.79, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -5.222683, y: 2.020195, z: 15.831508} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 744219524} - m_RootOrder: 248 + m_Father: {fileID: 525147508} + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &502298261 PolygonCollider2D: @@ -88659,15 +89419,15 @@ Transform: m_LocalPosition: {x: 45.728523, y: 31.956318, z: -15.9235325} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 2072564671} - - {fileID: 811735174} - - {fileID: 1875231277} - - {fileID: 1631047705} - - {fileID: 1522249889} - - {fileID: 1234103171} - - {fileID: 936434882} - - {fileID: 433949760} - - {fileID: 425706177} + - {fileID: 871165713} + - {fileID: 1697296129} + - {fileID: 1674707995} + - {fileID: 1300921221} + - {fileID: 680287735} + - {fileID: 1830964921} + - {fileID: 502298260} + - {fileID: 816566231} + - {fileID: 1114630285} m_Father: {fileID: 0} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -89182,7 +89942,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 267 + m_RootOrder: 258 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &536812824 PolygonCollider2D: @@ -96644,7 +97404,7 @@ Transform: - {fileID: 1775915248} - {fileID: 1245201750} m_Father: {fileID: 0} - m_RootOrder: 30 + m_RootOrder: 32 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &678971133 GameObject: @@ -96772,7 +97532,7 @@ GameObject: - component: {fileID: 680287737} - component: {fileID: 680287736} m_Layer: 0 - m_Name: GameObject (26) + m_Name: Tombstone9 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -96785,12 +97545,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 680287734} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 22.59, y: 18.81, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 7.7673187, y: 5.0401955, z: 15.831508} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 744219524} - m_RootOrder: 255 + m_Father: {fileID: 525147508} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &680287736 PolygonCollider2D: @@ -97837,7 +98597,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 272 + m_RootOrder: 263 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &719062380 GameObject: @@ -98956,7 +99716,7 @@ Transform: - {fileID: 1021522983} - {fileID: 1210980921} m_Father: {fileID: 0} - m_RootOrder: 33 + m_RootOrder: 35 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &735124023 GameObject: @@ -100126,16 +100886,7 @@ Transform: - {fileID: 1907116649} - {fileID: 534147128} - {fileID: 319231786} - - {fileID: 502298260} - {fileID: 170959201} - - {fileID: 816566231} - - {fileID: 1674707995} - - {fileID: 1697296129} - - {fileID: 1830964921} - - {fileID: 871165713} - - {fileID: 680287735} - - {fileID: 1114630285} - - {fileID: 1300921221} - {fileID: 1498985105} - {fileID: 2010931950} - {fileID: 1104089105} @@ -101922,7 +102673,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileSpriteIndex: 15 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -101962,7 +102713,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 1 - m_TileSpriteIndex: 1 + m_TileSpriteIndex: 3 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -102285,14 +103036,14 @@ Tilemap: - m_RefCount: 1 m_Data: {fileID: 11400000, guid: b1eb69be3ae0e134d8ec4174b689f82d, type: 2} m_TileSpriteArray: - - m_RefCount: 1 - m_Data: {fileID: -6359633799318402674, guid: 3a08fefc7df696140a7a44798f351457, type: 3} - - m_RefCount: 1 - m_Data: {fileID: -1134955505029600300, guid: 3a08fefc7df696140a7a44798f351457, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 1112993272215322910, guid: 3a08fefc7df696140a7a44798f351457, type: 3} - m_RefCount: 0 m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 1112993272215322910, guid: 3a08fefc7df696140a7a44798f351457, type: 3} + - m_RefCount: 1 + m_Data: {fileID: -1134955505029600300, guid: 3a08fefc7df696140a7a44798f351457, type: 3} - m_RefCount: 1 m_Data: {fileID: 5567285495273590506, guid: 3a08fefc7df696140a7a44798f351457, type: 3} - m_RefCount: 1 @@ -102315,8 +103066,8 @@ Tilemap: m_Data: {fileID: 3817688271260093097, guid: 3a08fefc7df696140a7a44798f351457, type: 3} - m_RefCount: 3 m_Data: {fileID: 8845250630893318422, guid: 3a08fefc7df696140a7a44798f351457, type: 3} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: -6359633799318402674, guid: 3a08fefc7df696140a7a44798f351457, type: 3} - m_RefCount: 2 m_Data: {fileID: 7372740540832064316, guid: 3a08fefc7df696140a7a44798f351457, type: 3} - m_RefCount: 2 @@ -102405,7 +103156,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 296 + m_RootOrder: 287 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &763370550 BoxCollider2D: @@ -103079,7 +103830,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 271 + m_RootOrder: 262 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &775546004 GameObject: @@ -103111,7 +103862,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 292 + m_RootOrder: 283 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &775546006 BoxCollider2D: @@ -103570,7 +104321,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 20 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &781968195 GameObject: @@ -104002,7 +104753,7 @@ Transform: - {fileID: 1296673169} - {fileID: 720829855} m_Father: {fileID: 0} - m_RootOrder: 40 + m_RootOrder: 42 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &788634853 GameObject: @@ -105155,88 +105906,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &811735173 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 811735174} - - component: {fileID: 811735175} - m_Layer: 0 - m_Name: Tombstone2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &811735174 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 811735173} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -5.229, y: 2.003, z: 15.9235325} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 525147508} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &811735175 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 811735173} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - 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: 4 - m_Sprite: {fileID: -7764013511229497059, guid: 3a08fefc7df696140a7a44798f351457, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1.5625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &813155530 GameObject: m_ObjectHideFlags: 0 @@ -105519,7 +106188,7 @@ GameObject: - component: {fileID: 816566233} - component: {fileID: 816566232} m_Layer: 0 - m_Name: GameObject (21) + m_Name: Tombstone4 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -105532,12 +106201,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 816566230} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 13.59, y: 15.8, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.2326813, y: 2.0301971, z: 15.831508} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 744219524} - m_RootOrder: 250 + m_Father: {fileID: 525147508} + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &816566232 PolygonCollider2D: @@ -105651,7 +106320,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 285 + m_RootOrder: 276 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &816804119 BoxCollider2D: @@ -106602,7 +107271,7 @@ Transform: - {fileID: 319902972} - {fileID: 1549893147} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &845244046 GameObject: @@ -107738,7 +108407,7 @@ GameObject: - component: {fileID: 871165715} - component: {fileID: 871165714} m_Layer: 0 - m_Name: GameObject (25) + m_Name: Tombstone6 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -107751,12 +108420,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 871165712} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 19.59, y: 16.8, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 4.7673187, y: 3.0301933, z: 15.831508} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 744219524} - m_RootOrder: 254 + m_Father: {fileID: 525147508} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &871165714 PolygonCollider2D: @@ -142748,7 +143417,7 @@ Transform: - {fileID: 2127257895} - {fileID: 1857050809} m_Father: {fileID: 0} - m_RootOrder: 43 + m_RootOrder: 45 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &893679861 GameObject: @@ -143435,7 +144104,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 19 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &897045018 GameObject: @@ -143467,7 +144136,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 304 + m_RootOrder: 295 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &897045020 BoxCollider2D: @@ -145248,7 +145917,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 277 + m_RootOrder: 268 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &927061882 PolygonCollider2D: @@ -145937,88 +146606,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &936434881 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 936434882} - - component: {fileID: 936434883} - m_Layer: 0 - m_Name: Tombstone7 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &936434882 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 936434881} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 9.769, y: 2.018, z: 15.9235325} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 525147508} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &936434883 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 936434881} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - 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: 4 - m_Sprite: {fileID: -7764013511229497059, guid: 3a08fefc7df696140a7a44798f351457, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1.5625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &937751360 GameObject: m_ObjectHideFlags: 0 @@ -146216,7 +146803,7 @@ Transform: - {fileID: 1676959228} - {fileID: 315180664} m_Father: {fileID: 0} - m_RootOrder: 24 + m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &944120566 GameObject: @@ -146325,7 +146912,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &944725150 GameObject: @@ -147736,7 +148323,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 286 + m_RootOrder: 277 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &980334975 BoxCollider2D: @@ -148128,7 +148715,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &983203436 GameObject: @@ -149839,7 +150426,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 305 + m_RootOrder: 296 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1015109001 BoxCollider2D: @@ -150774,7 +151361,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 310 + m_RootOrder: 301 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1025158716 BoxCollider2D: @@ -151924,7 +152511,7 @@ Transform: - {fileID: 1080816074} - {fileID: 1848242533} m_Father: {fileID: 0} - m_RootOrder: 47 + m_RootOrder: 49 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1055265283 GameObject: @@ -152327,7 +152914,7 @@ Transform: - {fileID: 175008561} - {fileID: 708673462} m_Father: {fileID: 0} - m_RootOrder: 37 + m_RootOrder: 39 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1075655937 GameObject: @@ -153938,7 +154525,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 260 + m_RootOrder: 251 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &1104089106 PolygonCollider2D: @@ -154054,7 +154641,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 261 + m_RootOrder: 252 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &1110448393 PolygonCollider2D: @@ -154480,7 +155067,7 @@ GameObject: - component: {fileID: 1114630287} - component: {fileID: 1114630286} m_Layer: 0 - m_Name: GameObject (27) + m_Name: Tombstone8 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -154493,12 +155080,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1114630284} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 26.58, y: 19.79, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 11.757317, y: 6.020199, z: 15.831508} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 744219524} - m_RootOrder: 256 + m_Father: {fileID: 525147508} + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &1114630286 PolygonCollider2D: @@ -154902,7 +155489,7 @@ Transform: - {fileID: 2112975395} - {fileID: 1405984766} m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1131893319 GameObject: @@ -155963,6 +156550,56 @@ Tilemap: m_GameObject: {fileID: 1144572822} m_Enabled: 1 m_Tiles: + - first: {x: 22, y: 37, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 23, y: 37, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 24, y: 37, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: 37, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 3 + m_TileSpriteIndex: 3 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 26, y: 37, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: 19, y: 38, z: 0} second: serializedVersion: 2 @@ -156187,27 +156824,27 @@ Tilemap: m_TileAssetArray: - m_RefCount: 11 m_Data: {fileID: 11400000, guid: d78a51b95d598f84cbfc36be836f6cba, type: 2} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: 0c93c41ced864ac48bda49cf82508f59, type: 2} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: 70d53ee7bfd033b40b9970f93dcc6fc2, type: 2} - - m_RefCount: 7 + - m_RefCount: 10 m_Data: {fileID: 11400000, guid: 6257dd74d85246a439c3ab67aeebc087, type: 2} - m_RefCount: 2 m_Data: {fileID: 11400000, guid: 1d1c5720594bac544ba5738741969a50, type: 2} m_TileSpriteArray: - m_RefCount: 11 m_Data: {fileID: -285418669710031975, guid: 3a08fefc7df696140a7a44798f351457, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: -7065577905438093053, guid: 3a08fefc7df696140a7a44798f351457, type: 3} - - m_RefCount: 1 + - m_RefCount: 2 m_Data: {fileID: -2255439837117920575, guid: 3a08fefc7df696140a7a44798f351457, type: 3} - - m_RefCount: 7 + - m_RefCount: 10 m_Data: {fileID: 8557852599441232377, guid: 3a08fefc7df696140a7a44798f351457, type: 3} - m_RefCount: 2 m_Data: {fileID: 4704662214485630123, guid: 3a08fefc7df696140a7a44798f351457, type: 3} m_TileMatrixArray: - - m_RefCount: 22 + - m_RefCount: 27 m_Data: e00: 1 e01: 0 @@ -156226,7 +156863,7 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 22 + - m_RefCount: 27 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 @@ -156473,7 +157110,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 283 + m_RootOrder: 274 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &1153901942 PolygonCollider2D: @@ -157454,7 +158091,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 293 + m_RootOrder: 284 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1186080811 BoxCollider2D: @@ -157648,7 +158285,7 @@ Transform: - {fileID: 501226246} - {fileID: 397080011} m_Father: {fileID: 0} - m_RootOrder: 48 + m_RootOrder: 50 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1201196632 GameObject: @@ -158337,7 +158974,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 269 + m_RootOrder: 260 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &1209910814 PolygonCollider2D: @@ -160360,88 +160997,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1234103170 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1234103171} - - component: {fileID: 1234103172} - m_Layer: 0 - m_Name: Tombstone6 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1234103171 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1234103170} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 4.77, y: 3.006, z: 15.9235325} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 525147508} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1234103172 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1234103170} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - 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: 4 - m_Sprite: {fileID: -7764013511229497059, guid: 3a08fefc7df696140a7a44798f351457, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1.5625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1234945223 GameObject: m_ObjectHideFlags: 0 @@ -160760,7 +161315,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 279 + m_RootOrder: 270 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &1238766680 PolygonCollider2D: @@ -164562,7 +165117,7 @@ GameObject: - component: {fileID: 1300921223} - component: {fileID: 1300921222} m_Layer: 0 - m_Name: GameObject (28) + m_Name: Tombstone7 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -164575,12 +165130,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1300921220} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 24.59, y: 15.8, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 9.767319, y: 2.0301971, z: 15.831508} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 744219524} - m_RootOrder: 257 + m_Father: {fileID: 525147508} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &1300921222 PolygonCollider2D: @@ -165172,7 +165727,7 @@ Transform: - {fileID: 2035506090} - {fileID: 404552459} m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1310421533 GameObject: @@ -166756,7 +167311,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 294 + m_RootOrder: 285 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1356929036 BoxCollider2D: @@ -166950,7 +167505,7 @@ Transform: - {fileID: 753503837} - {fileID: 1288902010} m_Father: {fileID: 0} - m_RootOrder: 25 + m_RootOrder: 27 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1366471448 GameObject: @@ -167204,7 +167759,7 @@ Transform: - {fileID: 1000171299} - {fileID: 430323203} m_Father: {fileID: 0} - m_RootOrder: 45 + m_RootOrder: 47 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1371764596 GameObject: @@ -168801,7 +169356,7 @@ Transform: - {fileID: 350437814} - {fileID: 879896154} m_Father: {fileID: 0} - m_RootOrder: 39 + m_RootOrder: 41 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1405984765 GameObject: @@ -169585,7 +170140,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 297 + m_RootOrder: 288 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1431644842 BoxCollider2D: @@ -172697,7 +173252,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 258 + m_RootOrder: 249 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &1498985106 PolygonCollider2D: @@ -173899,7 +174454,7 @@ Transform: - {fileID: 643622833} - {fileID: 65366563} m_Father: {fileID: 0} - m_RootOrder: 35 + m_RootOrder: 37 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1518753436 GameObject: @@ -174189,88 +174744,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1522249888 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1522249889} - - component: {fileID: 1522249890} - m_Layer: 0 - m_Name: Tombstone5 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1522249889 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1522249888} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.766, y: 6.009, z: 15.9235325} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 525147508} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1522249890 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1522249888} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - 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: 4 - m_Sprite: {fileID: -7764013511229497059, guid: 3a08fefc7df696140a7a44798f351457, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1.5625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1526778938 GameObject: m_ObjectHideFlags: 0 @@ -175408,7 +175881,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 264 + m_RootOrder: 255 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &1548531791 PolygonCollider2D: @@ -175829,7 +176302,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 282 + m_RootOrder: 273 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &1551253454 PolygonCollider2D: @@ -178069,7 +178542,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 284 + m_RootOrder: 275 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &1581143299 PolygonCollider2D: @@ -178627,7 +179100,7 @@ Transform: - {fileID: 279930425} - {fileID: 1574326935} m_Father: {fileID: 0} - m_RootOrder: 36 + m_RootOrder: 38 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1587854821 GameObject: @@ -180838,88 +181311,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1631047704 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1631047705} - - component: {fileID: 1631047706} - m_Layer: 0 - m_Name: Tombstone4 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1631047705 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1631047704} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.229, y: 2.012, z: 15.9235325} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 525147508} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1631047706 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1631047704} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - 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: 4 - m_Sprite: {fileID: -7764013511229497059, guid: 3a08fefc7df696140a7a44798f351457, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1.5625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1631505075 GameObject: m_ObjectHideFlags: 0 @@ -181074,7 +181465,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 313 + m_RootOrder: 304 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1632308100 BoxCollider2D: @@ -181553,7 +181944,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 265 + m_RootOrder: 256 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &1639391620 PolygonCollider2D: @@ -182053,7 +182444,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 307 + m_RootOrder: 298 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1644510783 BoxCollider2D: @@ -183262,7 +183653,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 300 + m_RootOrder: 291 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1664560451 BoxCollider2D: @@ -183517,7 +183908,7 @@ GameObject: - component: {fileID: 1674707997} - component: {fileID: 1674707996} m_Layer: 0 - m_Name: GameObject (22) + m_Name: Tombstone3 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -183530,12 +183921,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1674707994} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 12.6, y: 18.792, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -2.222683, y: 5.0221977, z: 15.831508} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 744219524} - m_RootOrder: 251 + m_Father: {fileID: 525147508} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &1674707996 PolygonCollider2D: @@ -184034,7 +184425,7 @@ Transform: - {fileID: 872957319} - {fileID: 424521222} m_Father: {fileID: 0} - m_RootOrder: 41 + m_RootOrder: 43 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1682502919 GameObject: @@ -184257,7 +184648,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 287 + m_RootOrder: 278 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1685235157 BoxCollider2D: @@ -184665,7 +185056,7 @@ GameObject: - component: {fileID: 1697296131} - component: {fileID: 1697296130} m_Layer: 0 - m_Name: GameObject (23) + m_Name: Tombstone1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -184678,12 +185069,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1697296128} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 7.593, y: 19.805, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -7.229683, y: 6.035198, z: 15.831508} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 744219524} - m_RootOrder: 252 + m_Father: {fileID: 525147508} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &1697296130 PolygonCollider2D: @@ -184963,7 +185354,7 @@ Transform: - {fileID: 298624787} - {fileID: 134728716} m_Father: {fileID: 0} - m_RootOrder: 32 + m_RootOrder: 34 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1706882652 GameObject: @@ -185174,7 +185565,7 @@ Transform: - {fileID: 1177720532} - {fileID: 602017549} m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1710747807 GameObject: @@ -185288,7 +185679,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 274 + m_RootOrder: 265 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &1714433175 PolygonCollider2D: @@ -185404,7 +185795,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 263 + m_RootOrder: 254 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &1715918687 PolygonCollider2D: @@ -186386,7 +186777,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 312 + m_RootOrder: 303 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1735260961 BoxCollider2D: @@ -191268,7 +191659,7 @@ Transform: - {fileID: 511431448} - {fileID: 948872584} m_Father: {fileID: 0} - m_RootOrder: 29 + m_RootOrder: 31 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1818885372 GameObject: @@ -191570,7 +191961,7 @@ GameObject: - component: {fileID: 1830964923} - component: {fileID: 1830964922} m_Layer: 0 - m_Name: GameObject (24) + m_Name: Tombstone5 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -191583,12 +191974,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1830964920} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 17.59, y: 19.814, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 2.7673187, y: 6.0441933, z: 15.831508} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 744219524} - m_RootOrder: 253 + m_Father: {fileID: 525147508} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &1830964922 PolygonCollider2D: @@ -191893,7 +192284,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 276 + m_RootOrder: 267 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &1835015172 PolygonCollider2D: @@ -193905,7 +194296,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 281 + m_RootOrder: 272 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &1876345896 PolygonCollider2D: @@ -196661,7 +197052,7 @@ Transform: - {fileID: 122657797} - {fileID: 805431861} m_Father: {fileID: 0} - m_RootOrder: 44 + m_RootOrder: 46 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1915090545 GameObject: @@ -197147,7 +197538,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 291 + m_RootOrder: 282 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1922984632 BoxCollider2D: @@ -198460,7 +198851,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 299 + m_RootOrder: 290 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &1952157745 BoxCollider2D: @@ -199177,7 +199568,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1974903883 GameObject: @@ -199209,7 +199600,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 273 + m_RootOrder: 264 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &1974903885 PolygonCollider2D: @@ -200108,7 +200499,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 270 + m_RootOrder: 261 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1995050669 GameObject: @@ -200710,7 +201101,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 259 + m_RootOrder: 250 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &2010931951 PolygonCollider2D: @@ -201471,7 +201862,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 275 + m_RootOrder: 266 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!60 &2032794036 PolygonCollider2D: @@ -202178,7 +202569,7 @@ Transform: - {fileID: 138697469} - {fileID: 305094587} m_Father: {fileID: 0} - m_RootOrder: 23 + m_RootOrder: 25 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2043087487 GameObject: @@ -210297,7 +210688,7 @@ Transform: - {fileID: 849589114} - {fileID: 597319293} m_Father: {fileID: 0} - m_RootOrder: 28 + m_RootOrder: 30 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2061871154 GameObject: @@ -210902,88 +211293,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &2072564670 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2072564671} - - component: {fileID: 2072564672} - m_Layer: 0 - m_Name: Tombstone1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2072564671 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2072564670} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -7.231, y: 6.017, z: 15.9235325} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 525147508} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &2072564672 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2072564670} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - 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: 4 - m_Sprite: {fileID: -7764013511229497059, guid: 3a08fefc7df696140a7a44798f351457, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1.5625} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &2072929292 GameObject: m_ObjectHideFlags: 0 @@ -211304,7 +211613,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2085412803 GameObject: @@ -211421,7 +211730,7 @@ Transform: - {fileID: 2040397526} - {fileID: 1861627003} m_Father: {fileID: 0} - m_RootOrder: 27 + m_RootOrder: 29 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2093651364 GameObject: @@ -211732,7 +212041,7 @@ Transform: - {fileID: 267212193} - {fileID: 465397837} m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2099818097 GameObject: @@ -211764,7 +212073,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 744219524} - m_RootOrder: 301 + m_RootOrder: 292 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!61 &2099818099 BoxCollider2D: diff --git a/Assets/Scenes/InnVillage.unity b/Assets/Scenes/InnVillage.unity index b140cacb..096be46a 100644 --- a/Assets/Scenes/InnVillage.unity +++ b/Assets/Scenes/InnVillage.unity @@ -1195,6 +1195,10 @@ Tilemap: m_Data: {fileID: 11400000, guid: fad62cc28031aa944af59f6aaa657287, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: b779582901a88204db3c9ca2073acf32, type: 2} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} m_TileSpriteArray: - m_RefCount: 1 m_Data: {fileID: 999761995969321364, guid: e7698f36d680635418599dd2745a3e61, type: 3} @@ -1222,6 +1226,10 @@ Tilemap: m_Data: {fileID: -6273525262347030492, guid: e7698f36d680635418599dd2745a3e61, type: 3} - m_RefCount: 1 m_Data: {fileID: -7055040228193979920, guid: e7698f36d680635418599dd2745a3e61, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} m_TileMatrixArray: - m_RefCount: 13 m_Data: @@ -1247,8 +1255,8 @@ Tilemap: m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Origin: {x: -7, y: -2, z: 0} - m_Size: {x: 15, y: 10, z: 1} + m_Origin: {x: -7, y: -4, z: 0} + m_Size: {x: 15, y: 12, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -3287,7 +3295,7 @@ CircleCollider2D: m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} serializedVersion: 2 - m_Radius: 0.875 + m_Radius: 1.5 --- !u!50 &445768722 Rigidbody2D: serializedVersion: 4 @@ -6779,6 +6787,26 @@ Tilemap: m_GameObject: {fileID: 593306681} m_Enabled: 1 m_Tiles: + - first: {x: -1, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 13 + m_TileSpriteIndex: 13 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 12 + m_TileSpriteIndex: 12 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 - first: {x: -8, y: 5, z: 0} second: serializedVersion: 2 @@ -7315,6 +7343,10 @@ Tilemap: m_Data: {fileID: 11400000, guid: 2db94dac4f3f44b44bf8fb0fdf791f6d, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: fab96e837d3731c44be6ac650d882b72, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: da383c2f3c858f648b0ea1978e2e53e5, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 40bafc8b6ed4f47428c81b27da06b80d, type: 2} m_TileSpriteArray: - m_RefCount: 1 m_Data: {fileID: 1977855532099525247, guid: e7698f36d680635418599dd2745a3e61, type: 3} @@ -7340,8 +7372,12 @@ Tilemap: m_Data: {fileID: -939794375167313262, guid: e7698f36d680635418599dd2745a3e61, type: 3} - m_RefCount: 1 m_Data: {fileID: 2686855623640877033, guid: e7698f36d680635418599dd2745a3e61, type: 3} + - m_RefCount: 1 + m_Data: {fileID: -1250751726918572047, guid: 515c814318196a34191ce0fb7e33c9d8, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 5355178473153844191, guid: 515c814318196a34191ce0fb7e33c9d8, type: 3} m_TileMatrixArray: - - m_RefCount: 51 + - m_RefCount: 53 m_Data: e00: 1 e01: 0 @@ -7360,13 +7396,13 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 51 + - m_RefCount: 53 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Origin: {x: -8, y: 0, z: 0} - m_Size: {x: 18, y: 8, z: 1} + m_Origin: {x: -8, y: -4, z: 0} + m_Size: {x: 18, y: 12, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index be70e831..c8c41386 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -163,6 +163,7 @@ public class Player : MonoBehaviour Debug.Log($"Minion Damage: {damage}; \nDefense: {PlayerPrefs.GetFloat("defenseValue")}"); damage = damage - PlayerPrefs.GetFloat("defenseValue"); + damage = damage < 0 ? 0 : damage; Debug.Log($"RealDamage: {damage}");