From 38baefcf2ded0472e5531341e788bce4d1dfd837 Mon Sep 17 00:00:00 2001 From: Rizvee Date: Fri, 25 Feb 2022 15:06:43 -0600 Subject: [PATCH 1/3] Clouds and Book triggers --- Assets/{ => Art Final}/Fuki + Seiden.meta | 0 .../Fuki + Seiden/emote.controller | 0 .../Fuki + Seiden/emote.controller.meta | 0 .../Fuki + Seiden/fuki-emote-idle.anim | 0 .../Fuki + Seiden/fuki-emote-idle.anim.meta | 0 .../Fuki + Seiden/fuki-emote-spritesheet.png | Bin .../fuki-emote-spritesheet.png.meta | 0 .../Fuki + Seiden/fuki-emote-talk.anim | 0 .../Fuki + Seiden/fuki-emote-talk.anim.meta | 0 .../Fuki + Seiden/fuki-move-airborne.anim | 0 .../fuki-move-airborne.anim.meta | 0 .../Fuki + Seiden/fuki-move-idle.anim | 0 .../Fuki + Seiden/fuki-move-idle.anim.meta | 0 .../Fuki + Seiden/fuki-move-spritesheet.png | Bin .../fuki-move-spritesheet.png.meta | 0 .../Fuki + Seiden/fuki-move-walk.anim | 0 .../Fuki + Seiden/fuki-move-walk.anim.meta | 0 .../Fuki + Seiden/fuki-move.controller | 0 .../Fuki + Seiden/fuki-move.controller.meta | 0 .../seiden-emote-idle-annoyed.anim | 0 .../seiden-emote-idle-annoyed.anim.meta | 0 .../seiden-emote-idle-blush.anim | 0 .../seiden-emote-idle-blush.anim.meta | 0 .../seiden-emote-idle-neutral.anim | 0 .../seiden-emote-idle-neutral.anim.meta | 0 .../seiden-emote-spritesheet.png | Bin .../seiden-emote-spritesheet.png.meta | 0 .../seiden-emote-talk-annoyed.anim | 0 .../seiden-emote-talk-annoyed.anim.meta | 0 .../seiden-emote-talk-blush.anim | 0 .../seiden-emote-talk-blush.anim.meta | 0 .../seiden-emote-talk-neutral.anim | 0 .../seiden-emote-talk-neutral.anim.meta | 0 .../Fuki + Seiden/seiden-move-airborne.anim | 0 .../seiden-move-airborne.anim.meta | 0 .../Fuki + Seiden/seiden-move-idle.anim | 0 .../Fuki + Seiden/seiden-move-idle.anim.meta | 0 .../Fuki + Seiden/seiden-move-walk.anim | 0 .../Fuki + Seiden/seiden-move-walk.anim.meta | 0 .../Fuki + Seiden/seiden-move.controller | 0 .../Fuki + Seiden/seiden-move.controller.meta | 0 .../Fuki + Seiden/seiden-walk.png | Bin .../Fuki + Seiden/seiden-walk.png.meta | 0 Assets/Art Final/cloud1.png | Bin 0 -> 549 bytes Assets/Art Final/cloud1.png.meta | 108 +++ Assets/Art Final/cloud2.png | Bin 0 -> 537 bytes Assets/Art Final/cloud2.png.meta | 108 +++ Assets/Prefabs/Clouds.meta | 8 + .../Prefabs/Clouds/Cloud Base Variant.prefab | 858 ++++++++++++++++++ .../Clouds/Cloud Base Variant.prefab.meta | 7 + .../Clouds/Cloud1 Background Variant.prefab | 97 ++ .../Cloud1 Background Variant.prefab.meta | 7 + Assets/Prefabs/Clouds/Cloud1 Variant.prefab | 99 ++ .../Prefabs/Clouds/Cloud1 Variant.prefab.meta | 7 + .../Clouds/Cloud2 Background Variant.prefab | 97 ++ .../Cloud2 Background Variant.prefab.meta | 7 + Assets/Prefabs/Clouds/Cloud2 Variant.prefab | 87 ++ .../Prefabs/Clouds/Cloud2 Variant.prefab.meta | 7 + Assets/Scene 1 Assets/BookTrigger.cs | 14 + Assets/Scene 1 Assets/BookTrigger.cs.meta | 11 + Assets/Scene 1 Assets/PlayerMovement.cs | 4 +- Assets/Scene 1 Assets/Trigger.cs | 23 +- Assets/Scenes/Acrophobia.unity | 648 +++++++++++++ Assets/Scenes/Acrophobia.unity.meta | 7 + Assets/Scenes/Crowds Test.unity | 7 +- Assets/Scenes/Game Scenes/Real World.unity | 57 +- Assets/TutorialScript.cs | 21 + Assets/TutorialScript.cs.meta | 11 + ProjectSettings/TagManager.asset | 3 + UserSettings/EditorUserSettings.asset | 40 +- 70 files changed, 2302 insertions(+), 41 deletions(-) rename Assets/{ => Art Final}/Fuki + Seiden.meta (100%) rename Assets/{ => Art Final}/Fuki + Seiden/emote.controller (100%) rename Assets/{ => Art Final}/Fuki + Seiden/emote.controller.meta (100%) rename Assets/{ => Art Final}/Fuki + Seiden/fuki-emote-idle.anim (100%) rename Assets/{ => Art Final}/Fuki + Seiden/fuki-emote-idle.anim.meta (100%) rename Assets/{ => Art Final}/Fuki + Seiden/fuki-emote-spritesheet.png (100%) rename Assets/{ => Art Final}/Fuki + Seiden/fuki-emote-spritesheet.png.meta (100%) rename Assets/{ => Art Final}/Fuki + Seiden/fuki-emote-talk.anim (100%) rename Assets/{ => Art Final}/Fuki + Seiden/fuki-emote-talk.anim.meta (100%) rename Assets/{ => Art Final}/Fuki + Seiden/fuki-move-airborne.anim (100%) rename Assets/{ => Art Final}/Fuki + Seiden/fuki-move-airborne.anim.meta (100%) rename Assets/{ => Art Final}/Fuki + Seiden/fuki-move-idle.anim (100%) rename Assets/{ => Art Final}/Fuki + Seiden/fuki-move-idle.anim.meta (100%) rename Assets/{ => Art Final}/Fuki + Seiden/fuki-move-spritesheet.png (100%) rename Assets/{ => Art Final}/Fuki + Seiden/fuki-move-spritesheet.png.meta (100%) rename Assets/{ => Art Final}/Fuki + Seiden/fuki-move-walk.anim (100%) rename Assets/{ => Art Final}/Fuki + Seiden/fuki-move-walk.anim.meta (100%) rename Assets/{ => Art Final}/Fuki + Seiden/fuki-move.controller (100%) rename Assets/{ => Art Final}/Fuki + Seiden/fuki-move.controller.meta (100%) rename Assets/{ => Art Final}/Fuki + Seiden/seiden-emote-idle-annoyed.anim (100%) rename Assets/{ => Art Final}/Fuki + Seiden/seiden-emote-idle-annoyed.anim.meta (100%) rename Assets/{ => Art Final}/Fuki + Seiden/seiden-emote-idle-blush.anim (100%) rename Assets/{ => Art Final}/Fuki + Seiden/seiden-emote-idle-blush.anim.meta (100%) rename Assets/{ => Art Final}/Fuki + Seiden/seiden-emote-idle-neutral.anim (100%) rename Assets/{ => Art Final}/Fuki + Seiden/seiden-emote-idle-neutral.anim.meta (100%) rename Assets/{ => Art Final}/Fuki + Seiden/seiden-emote-spritesheet.png (100%) rename Assets/{ => Art Final}/Fuki + Seiden/seiden-emote-spritesheet.png.meta (100%) rename Assets/{ => Art Final}/Fuki + Seiden/seiden-emote-talk-annoyed.anim (100%) rename Assets/{ => Art Final}/Fuki + Seiden/seiden-emote-talk-annoyed.anim.meta (100%) rename Assets/{ => Art Final}/Fuki + Seiden/seiden-emote-talk-blush.anim (100%) rename Assets/{ => Art Final}/Fuki + Seiden/seiden-emote-talk-blush.anim.meta (100%) rename Assets/{ => Art Final}/Fuki + Seiden/seiden-emote-talk-neutral.anim (100%) rename Assets/{ => Art Final}/Fuki + Seiden/seiden-emote-talk-neutral.anim.meta (100%) rename Assets/{ => Art Final}/Fuki + Seiden/seiden-move-airborne.anim (100%) rename Assets/{ => Art Final}/Fuki + Seiden/seiden-move-airborne.anim.meta (100%) rename Assets/{ => Art Final}/Fuki + Seiden/seiden-move-idle.anim (100%) rename Assets/{ => Art Final}/Fuki + Seiden/seiden-move-idle.anim.meta (100%) rename Assets/{ => Art Final}/Fuki + Seiden/seiden-move-walk.anim (100%) rename Assets/{ => Art Final}/Fuki + Seiden/seiden-move-walk.anim.meta (100%) rename Assets/{ => Art Final}/Fuki + Seiden/seiden-move.controller (100%) rename Assets/{ => Art Final}/Fuki + Seiden/seiden-move.controller.meta (100%) rename Assets/{ => Art Final}/Fuki + Seiden/seiden-walk.png (100%) rename Assets/{ => Art Final}/Fuki + Seiden/seiden-walk.png.meta (100%) create mode 100644 Assets/Art Final/cloud1.png create mode 100644 Assets/Art Final/cloud1.png.meta create mode 100644 Assets/Art Final/cloud2.png create mode 100644 Assets/Art Final/cloud2.png.meta create mode 100644 Assets/Prefabs/Clouds.meta create mode 100644 Assets/Prefabs/Clouds/Cloud Base Variant.prefab create mode 100644 Assets/Prefabs/Clouds/Cloud Base Variant.prefab.meta create mode 100644 Assets/Prefabs/Clouds/Cloud1 Background Variant.prefab create mode 100644 Assets/Prefabs/Clouds/Cloud1 Background Variant.prefab.meta create mode 100644 Assets/Prefabs/Clouds/Cloud1 Variant.prefab create mode 100644 Assets/Prefabs/Clouds/Cloud1 Variant.prefab.meta create mode 100644 Assets/Prefabs/Clouds/Cloud2 Background Variant.prefab create mode 100644 Assets/Prefabs/Clouds/Cloud2 Background Variant.prefab.meta create mode 100644 Assets/Prefabs/Clouds/Cloud2 Variant.prefab create mode 100644 Assets/Prefabs/Clouds/Cloud2 Variant.prefab.meta create mode 100644 Assets/Scene 1 Assets/BookTrigger.cs create mode 100644 Assets/Scene 1 Assets/BookTrigger.cs.meta create mode 100644 Assets/Scenes/Acrophobia.unity create mode 100644 Assets/Scenes/Acrophobia.unity.meta create mode 100644 Assets/TutorialScript.cs create mode 100644 Assets/TutorialScript.cs.meta diff --git a/Assets/Fuki + Seiden.meta b/Assets/Art Final/Fuki + Seiden.meta similarity index 100% rename from Assets/Fuki + Seiden.meta rename to Assets/Art Final/Fuki + Seiden.meta diff --git a/Assets/Fuki + Seiden/emote.controller b/Assets/Art Final/Fuki + Seiden/emote.controller similarity index 100% rename from Assets/Fuki + Seiden/emote.controller rename to Assets/Art Final/Fuki + Seiden/emote.controller diff --git a/Assets/Fuki + Seiden/emote.controller.meta b/Assets/Art Final/Fuki + Seiden/emote.controller.meta similarity index 100% rename from Assets/Fuki + Seiden/emote.controller.meta rename to Assets/Art Final/Fuki + Seiden/emote.controller.meta diff --git a/Assets/Fuki + Seiden/fuki-emote-idle.anim b/Assets/Art Final/Fuki + Seiden/fuki-emote-idle.anim similarity index 100% rename from Assets/Fuki + Seiden/fuki-emote-idle.anim rename to Assets/Art Final/Fuki + Seiden/fuki-emote-idle.anim diff --git a/Assets/Fuki + Seiden/fuki-emote-idle.anim.meta b/Assets/Art Final/Fuki + Seiden/fuki-emote-idle.anim.meta similarity index 100% rename from Assets/Fuki + Seiden/fuki-emote-idle.anim.meta rename to Assets/Art Final/Fuki + Seiden/fuki-emote-idle.anim.meta diff --git a/Assets/Fuki + Seiden/fuki-emote-spritesheet.png b/Assets/Art Final/Fuki + Seiden/fuki-emote-spritesheet.png similarity index 100% rename from Assets/Fuki + Seiden/fuki-emote-spritesheet.png rename to Assets/Art Final/Fuki + Seiden/fuki-emote-spritesheet.png diff --git a/Assets/Fuki + Seiden/fuki-emote-spritesheet.png.meta b/Assets/Art Final/Fuki + Seiden/fuki-emote-spritesheet.png.meta similarity index 100% rename from Assets/Fuki + Seiden/fuki-emote-spritesheet.png.meta rename to Assets/Art Final/Fuki + Seiden/fuki-emote-spritesheet.png.meta diff --git a/Assets/Fuki + Seiden/fuki-emote-talk.anim b/Assets/Art Final/Fuki + Seiden/fuki-emote-talk.anim similarity index 100% rename from Assets/Fuki + Seiden/fuki-emote-talk.anim rename to Assets/Art Final/Fuki + Seiden/fuki-emote-talk.anim diff --git a/Assets/Fuki + Seiden/fuki-emote-talk.anim.meta b/Assets/Art Final/Fuki + Seiden/fuki-emote-talk.anim.meta similarity index 100% rename from Assets/Fuki + Seiden/fuki-emote-talk.anim.meta rename to Assets/Art Final/Fuki + Seiden/fuki-emote-talk.anim.meta diff --git a/Assets/Fuki + Seiden/fuki-move-airborne.anim b/Assets/Art Final/Fuki + Seiden/fuki-move-airborne.anim similarity index 100% rename from Assets/Fuki + Seiden/fuki-move-airborne.anim rename to Assets/Art Final/Fuki + Seiden/fuki-move-airborne.anim diff --git a/Assets/Fuki + Seiden/fuki-move-airborne.anim.meta b/Assets/Art Final/Fuki + Seiden/fuki-move-airborne.anim.meta similarity index 100% rename from Assets/Fuki + Seiden/fuki-move-airborne.anim.meta rename to Assets/Art Final/Fuki + Seiden/fuki-move-airborne.anim.meta diff --git a/Assets/Fuki + Seiden/fuki-move-idle.anim b/Assets/Art Final/Fuki + Seiden/fuki-move-idle.anim similarity index 100% rename from Assets/Fuki + Seiden/fuki-move-idle.anim rename to Assets/Art Final/Fuki + Seiden/fuki-move-idle.anim diff --git a/Assets/Fuki + Seiden/fuki-move-idle.anim.meta b/Assets/Art Final/Fuki + Seiden/fuki-move-idle.anim.meta similarity index 100% rename from Assets/Fuki + Seiden/fuki-move-idle.anim.meta rename to Assets/Art Final/Fuki + Seiden/fuki-move-idle.anim.meta diff --git a/Assets/Fuki + Seiden/fuki-move-spritesheet.png b/Assets/Art Final/Fuki + Seiden/fuki-move-spritesheet.png similarity index 100% rename from Assets/Fuki + Seiden/fuki-move-spritesheet.png rename to Assets/Art Final/Fuki + Seiden/fuki-move-spritesheet.png diff --git a/Assets/Fuki + Seiden/fuki-move-spritesheet.png.meta b/Assets/Art Final/Fuki + Seiden/fuki-move-spritesheet.png.meta similarity index 100% rename from Assets/Fuki + Seiden/fuki-move-spritesheet.png.meta rename to Assets/Art Final/Fuki + Seiden/fuki-move-spritesheet.png.meta diff --git a/Assets/Fuki + Seiden/fuki-move-walk.anim b/Assets/Art Final/Fuki + Seiden/fuki-move-walk.anim similarity index 100% rename from Assets/Fuki + Seiden/fuki-move-walk.anim rename to Assets/Art Final/Fuki + Seiden/fuki-move-walk.anim diff --git a/Assets/Fuki + Seiden/fuki-move-walk.anim.meta b/Assets/Art Final/Fuki + Seiden/fuki-move-walk.anim.meta similarity index 100% rename from Assets/Fuki + Seiden/fuki-move-walk.anim.meta rename to Assets/Art Final/Fuki + Seiden/fuki-move-walk.anim.meta diff --git a/Assets/Fuki + Seiden/fuki-move.controller b/Assets/Art Final/Fuki + Seiden/fuki-move.controller similarity index 100% rename from Assets/Fuki + Seiden/fuki-move.controller rename to Assets/Art Final/Fuki + Seiden/fuki-move.controller diff --git a/Assets/Fuki + Seiden/fuki-move.controller.meta b/Assets/Art Final/Fuki + Seiden/fuki-move.controller.meta similarity index 100% rename from Assets/Fuki + Seiden/fuki-move.controller.meta rename to Assets/Art Final/Fuki + Seiden/fuki-move.controller.meta diff --git a/Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim b/Assets/Art Final/Fuki + Seiden/seiden-emote-idle-annoyed.anim similarity index 100% rename from Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim rename to Assets/Art Final/Fuki + Seiden/seiden-emote-idle-annoyed.anim diff --git a/Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim.meta b/Assets/Art Final/Fuki + Seiden/seiden-emote-idle-annoyed.anim.meta similarity index 100% rename from Assets/Fuki + Seiden/seiden-emote-idle-annoyed.anim.meta rename to Assets/Art Final/Fuki + Seiden/seiden-emote-idle-annoyed.anim.meta diff --git a/Assets/Fuki + Seiden/seiden-emote-idle-blush.anim b/Assets/Art Final/Fuki + Seiden/seiden-emote-idle-blush.anim similarity index 100% rename from Assets/Fuki + Seiden/seiden-emote-idle-blush.anim rename to Assets/Art Final/Fuki + Seiden/seiden-emote-idle-blush.anim diff --git a/Assets/Fuki + Seiden/seiden-emote-idle-blush.anim.meta b/Assets/Art Final/Fuki + Seiden/seiden-emote-idle-blush.anim.meta similarity index 100% rename from Assets/Fuki + Seiden/seiden-emote-idle-blush.anim.meta rename to Assets/Art Final/Fuki + Seiden/seiden-emote-idle-blush.anim.meta diff --git a/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim b/Assets/Art Final/Fuki + Seiden/seiden-emote-idle-neutral.anim similarity index 100% rename from Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim rename to Assets/Art Final/Fuki + Seiden/seiden-emote-idle-neutral.anim diff --git a/Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim.meta b/Assets/Art Final/Fuki + Seiden/seiden-emote-idle-neutral.anim.meta similarity index 100% rename from Assets/Fuki + Seiden/seiden-emote-idle-neutral.anim.meta rename to Assets/Art Final/Fuki + Seiden/seiden-emote-idle-neutral.anim.meta diff --git a/Assets/Fuki + Seiden/seiden-emote-spritesheet.png b/Assets/Art Final/Fuki + Seiden/seiden-emote-spritesheet.png similarity index 100% rename from Assets/Fuki + Seiden/seiden-emote-spritesheet.png rename to Assets/Art Final/Fuki + Seiden/seiden-emote-spritesheet.png diff --git a/Assets/Fuki + Seiden/seiden-emote-spritesheet.png.meta b/Assets/Art Final/Fuki + Seiden/seiden-emote-spritesheet.png.meta similarity index 100% rename from Assets/Fuki + Seiden/seiden-emote-spritesheet.png.meta rename to Assets/Art Final/Fuki + Seiden/seiden-emote-spritesheet.png.meta diff --git a/Assets/Fuki + Seiden/seiden-emote-talk-annoyed.anim b/Assets/Art Final/Fuki + Seiden/seiden-emote-talk-annoyed.anim similarity index 100% rename from Assets/Fuki + Seiden/seiden-emote-talk-annoyed.anim rename to Assets/Art Final/Fuki + Seiden/seiden-emote-talk-annoyed.anim diff --git a/Assets/Fuki + Seiden/seiden-emote-talk-annoyed.anim.meta b/Assets/Art Final/Fuki + Seiden/seiden-emote-talk-annoyed.anim.meta similarity index 100% rename from Assets/Fuki + Seiden/seiden-emote-talk-annoyed.anim.meta rename to Assets/Art Final/Fuki + Seiden/seiden-emote-talk-annoyed.anim.meta diff --git a/Assets/Fuki + Seiden/seiden-emote-talk-blush.anim b/Assets/Art Final/Fuki + Seiden/seiden-emote-talk-blush.anim similarity index 100% rename from Assets/Fuki + Seiden/seiden-emote-talk-blush.anim rename to Assets/Art Final/Fuki + Seiden/seiden-emote-talk-blush.anim diff --git a/Assets/Fuki + Seiden/seiden-emote-talk-blush.anim.meta b/Assets/Art Final/Fuki + Seiden/seiden-emote-talk-blush.anim.meta similarity index 100% rename from Assets/Fuki + Seiden/seiden-emote-talk-blush.anim.meta rename to Assets/Art Final/Fuki + Seiden/seiden-emote-talk-blush.anim.meta diff --git a/Assets/Fuki + Seiden/seiden-emote-talk-neutral.anim b/Assets/Art Final/Fuki + Seiden/seiden-emote-talk-neutral.anim similarity index 100% rename from Assets/Fuki + Seiden/seiden-emote-talk-neutral.anim rename to Assets/Art Final/Fuki + Seiden/seiden-emote-talk-neutral.anim diff --git a/Assets/Fuki + Seiden/seiden-emote-talk-neutral.anim.meta b/Assets/Art Final/Fuki + Seiden/seiden-emote-talk-neutral.anim.meta similarity index 100% rename from Assets/Fuki + Seiden/seiden-emote-talk-neutral.anim.meta rename to Assets/Art Final/Fuki + Seiden/seiden-emote-talk-neutral.anim.meta diff --git a/Assets/Fuki + Seiden/seiden-move-airborne.anim b/Assets/Art Final/Fuki + Seiden/seiden-move-airborne.anim similarity index 100% rename from Assets/Fuki + Seiden/seiden-move-airborne.anim rename to Assets/Art Final/Fuki + Seiden/seiden-move-airborne.anim diff --git a/Assets/Fuki + Seiden/seiden-move-airborne.anim.meta b/Assets/Art Final/Fuki + Seiden/seiden-move-airborne.anim.meta similarity index 100% rename from Assets/Fuki + Seiden/seiden-move-airborne.anim.meta rename to Assets/Art Final/Fuki + Seiden/seiden-move-airborne.anim.meta diff --git a/Assets/Fuki + Seiden/seiden-move-idle.anim b/Assets/Art Final/Fuki + Seiden/seiden-move-idle.anim similarity index 100% rename from Assets/Fuki + Seiden/seiden-move-idle.anim rename to Assets/Art Final/Fuki + Seiden/seiden-move-idle.anim diff --git a/Assets/Fuki + Seiden/seiden-move-idle.anim.meta b/Assets/Art Final/Fuki + Seiden/seiden-move-idle.anim.meta similarity index 100% rename from Assets/Fuki + Seiden/seiden-move-idle.anim.meta rename to Assets/Art Final/Fuki + Seiden/seiden-move-idle.anim.meta diff --git a/Assets/Fuki + Seiden/seiden-move-walk.anim b/Assets/Art Final/Fuki + Seiden/seiden-move-walk.anim similarity index 100% rename from Assets/Fuki + Seiden/seiden-move-walk.anim rename to Assets/Art Final/Fuki + Seiden/seiden-move-walk.anim diff --git a/Assets/Fuki + Seiden/seiden-move-walk.anim.meta b/Assets/Art Final/Fuki + Seiden/seiden-move-walk.anim.meta similarity index 100% rename from Assets/Fuki + Seiden/seiden-move-walk.anim.meta rename to Assets/Art Final/Fuki + Seiden/seiden-move-walk.anim.meta diff --git a/Assets/Fuki + Seiden/seiden-move.controller b/Assets/Art Final/Fuki + Seiden/seiden-move.controller similarity index 100% rename from Assets/Fuki + Seiden/seiden-move.controller rename to Assets/Art Final/Fuki + Seiden/seiden-move.controller diff --git a/Assets/Fuki + Seiden/seiden-move.controller.meta b/Assets/Art Final/Fuki + Seiden/seiden-move.controller.meta similarity index 100% rename from Assets/Fuki + Seiden/seiden-move.controller.meta rename to Assets/Art Final/Fuki + Seiden/seiden-move.controller.meta diff --git a/Assets/Fuki + Seiden/seiden-walk.png b/Assets/Art Final/Fuki + Seiden/seiden-walk.png similarity index 100% rename from Assets/Fuki + Seiden/seiden-walk.png rename to Assets/Art Final/Fuki + Seiden/seiden-walk.png diff --git a/Assets/Fuki + Seiden/seiden-walk.png.meta b/Assets/Art Final/Fuki + Seiden/seiden-walk.png.meta similarity index 100% rename from Assets/Fuki + Seiden/seiden-walk.png.meta rename to Assets/Art Final/Fuki + Seiden/seiden-walk.png.meta diff --git a/Assets/Art Final/cloud1.png b/Assets/Art Final/cloud1.png new file mode 100644 index 0000000000000000000000000000000000000000..167b10950187f6ff208bd4acf5dfe344eeecc425 GIT binary patch literal 549 zcmV+=0^0qFP)Px$-AP12R9Hvtma$62KoExaitBsJB!G~n=s7IOm;VdAtc=;yZ`>*{4>dQTtlu-LpWRuQnw`AMA}43 zD)9LBlxa)Wddq4D{Yh(Chf`CQ5!C3xWoOO{M=LxsW?d>nt`(y-~REUe-B~KFR!zMy={@1Ye_n=5mSx^p@&Px zty!jK0ER+T(E^w#5QK<56yc<*rfPvE>P3M7#Mgq{24yKwvmB=OAYiy`W-JJ8CZK4% zFu{pzZk=Qs!_%mbxdalLh6N#+fO#`#1OQ-TD8&8f)2;Vs^Rv*5)>ffu;5rQs-+%=O znx@3v-J|>`nzJGS2)sB9-^bykSFHxhfeH``(48CjURPHD zBnaBh6r8SwH8Zcje|dsFh|>H}K@ET#3@(nAKEO{eUc4ZX)Yz?k;>$&vQ6YJ_#f$fE nAQEJiPx$(Md!>R9Hvtm%mB`F%ZVHg%2T?T385*g`9hr?tL;f}kMU z*jRX6aVlJ?jUc{&-4!d7bz*j$WM?;llVwxp&&>CmZ<1vbRg;m_ghMqT|INw9ky<X(x00A3 z6sSt8(jXJt2Wqu7SsBK4@V@t{m&(MJI7HnCm<(iUMX9C5 z!lWpy3UL`2*Il#$KnupaYaeBQh!n;vv_H_xqmKs>k6k3+0Vya~%+ck^@2{?bab%;y zZ*RJyHy+~BkQ&Y&Kiwdz3~cHT{uDANhD(aUrNSj*e0e12VGq?Ks;V^jIQKOm Date: Fri, 25 Feb 2022 15:58:48 -0600 Subject: [PATCH 2/3] Worked on Acrophobia level --- Assets/Art Final/textbox_real.png | Bin 0 -> 2256 bytes Assets/Art Final/textbox_real.png.meta | 108 +++++ Assets/Art Final/textbox_thought.png | Bin 0 -> 2415 bytes Assets/Art Final/textbox_thought.png.meta | 108 +++++ .../Clouds/Cloud1 Background Variant.prefab | 4 +- .../Clouds/Cloud2 Background Variant.prefab | 4 +- Assets/Prefabs/Textbox Dream.prefab | 296 +++++++++++++ Assets/Prefabs/Textbox Dream.prefab.meta | 7 + Assets/Prefabs/Textbox Real.prefab | 75 ++++ Assets/Prefabs/Textbox Real.prefab.meta | 7 + Assets/Scenes/Acrophobia.unity | 419 +++++++++++++++++- Assets/Scenes/Game Scenes/Real World.unity | 163 +++---- UserSettings/EditorUserSettings.asset | 12 +- 13 files changed, 1093 insertions(+), 110 deletions(-) create mode 100644 Assets/Art Final/textbox_real.png create mode 100644 Assets/Art Final/textbox_real.png.meta create mode 100644 Assets/Art Final/textbox_thought.png create mode 100644 Assets/Art Final/textbox_thought.png.meta create mode 100644 Assets/Prefabs/Textbox Dream.prefab create mode 100644 Assets/Prefabs/Textbox Dream.prefab.meta create mode 100644 Assets/Prefabs/Textbox Real.prefab create mode 100644 Assets/Prefabs/Textbox Real.prefab.meta diff --git a/Assets/Art Final/textbox_real.png b/Assets/Art Final/textbox_real.png new file mode 100644 index 0000000000000000000000000000000000000000..09f979f071a29d25e7485387725e1b5165642276 GIT binary patch literal 2256 zcmeAS@N?(olHy`uVBq!ia0y~yU~~bpw{frm$%V(iBmgPK;vjb?hIQv;UNSInba=Wr zhE&A8y}Q3JG*pD`!{HY91q#zH3HkE0bzN%;UohcV#EnZoSj@JF9dYA|Yiyd<<>8~S zB|wTx?qJWe7)utO`h906?5w{3zI?V}A#eHm`%#|@-_2_(?iOccV&Qnha;{Lpp@E_C zKMTtuUm)v1He+LkD2IT8g1}n_po)84g9Fc~gGNJWGz|^rT-Mmkb7cL# zKfmVpeSA6TKpo4xeHBF$ZWd1PUEBEM#kJFSm&wHL`;eBrZ*OJY&&S{QPyf0aSlG#n z-Kg`sw*L0(A2(Out&iJVTPWBeoO@oZBU?f)cK1e`y1Lp$m#wuLKeDWg*|lHBe$Vzb z3pE6e&pz+&zlH75FZ0<3b8-s$thXEx>w2xOF4?dLcDCEm`Txm_V@zJNRDk=%_ohV$O~Rcyb^nNz*H_SUWI=P$q9_2Wyq z{G0rl*R79iw>Ns9-H>mu_^)2Z&Z)l2F|c!&R93Zz9f!(&T3*rxKX5c=~X>!Tyw1|<0KqU@t1-l26R zjTRr7dSp6Kya#j`+~=s?<2@qye_<8W%D>KEfo@&l-;u3QB{(Ax7|1=r)wRzi&KFQm zEB%th=-(mC|G&0z$N92%pu|w^-|>4+(|5bx1_ztod-L{}b01lpZ9eVz`StIAn%tXr zAdw?xXGy(fT}A%SZ_j={ec7%4oNw{!^4%6EmR)nGDS7?0sO0A%B@zC@+^;3qn4%@* z?5nrN?5zz{nD>>z?{i(W!n*onQeC&R|IW_+`}Xs%tKAHZ{MaVZA-P-o>mr%## z+;iWepPlS`yMtw!;D?EovjQzOfc3hcTET?!4)w(!Vp%x00E7G+?*)5CrhH&4AQfvX e;D@-ytvy$>moAwCY@jfBy85}Sb4qApU;qHU_(x9w literal 0 HcmV?d00001 diff --git a/Assets/Art Final/textbox_real.png.meta b/Assets/Art Final/textbox_real.png.meta new file mode 100644 index 0000000..afd26b0 --- /dev/null +++ b/Assets/Art Final/textbox_real.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: aabac150ee7f6b54bba51c5e6e1ddb17 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art Final/textbox_thought.png b/Assets/Art Final/textbox_thought.png new file mode 100644 index 0000000000000000000000000000000000000000..833523cc69ea1908cbe873394ed623c351f65807 GIT binary patch literal 2415 zcmeHJ|2LFb7=P#W4ukMEGsGsncC!;%Z8C}pNJ4N2Bk zh=|(VzEF+vWuiicbc~r&>@;a<%9I%2nWixN>YV*$|ARfJU+#TApZk37bMJHRbI+4a z3-mKG_{snP03-jc-oXHX^TzCYf-W{zJe*-*6D~Q}&kMLIu^a{feTu)gXGq!})ysSF zWF}d6uw6lq5xc#k>B)d14J?BpppU}gB5WyZVNkmXKz%c>ACxMvN;)mnJ zu7eR2MdUgV0S+}y9uF9AVSrOclUS5ACB?WQwvk&yT{8S2_k(}nFAbdJ{IwUzU6RAwAYP>5b!lgm@)Yz zYW&f0A44CG%YBVyQ>7VCMJf5dR5obOdIr+h)~~Z?@-AETzE?D&^Pfiax+q5%U;XL1 zJ9B(;Vd1s*V=#{kx&a zEX^c={^3gT>P#(D<0`H0Nwkoby*uinFY2y|CHKChD;;=p3q_Gm5;@k)lW`jT)cOn` z#j109rrtR~y`Z8i=d2X10m=&9P*>{c;m$qfE&h08Zbg9dH#_6`l%1QX^QxgIq0JE= zCp0NilWn6DBr})zgcNCtYL&4!lSi_g4*`Q@+Y^)V_8K9L%p>&!(MBTQ^ofofv~*Bu z5L$zlKF`N1#JblnRvQpR)d$s?xB0q?SCLIgT$y%HVpcaEQYd3CFB))M-cN@1cVe(p zuXcFq4x4~VvqubtUHuIcz^(PL9?I$r!@l6K+@!kfYfz;cW(qYij|&2n7Rx3X zhFIi!-{w?DLAP^TDx?r|?O>)eO%=BbMdHsjX^)?Ff*0i5wE|YwQ$vF2>B_wKrjX)l z$KDMj63ip5l)XK_4)&nDNe4&p#=4c-{=K@JeGmzQ_mlZH6fyQ4kaF-*9yj+mQCn=L z#mX&xXq-5{N*pKXuDaN^S0={? zxI%IG(3qBiU9c~Gwj;-bD%ZOEyFK_elUr+{sVm7IKWoN|o~O?G;T585-+7>e4CJUb zhLtp=eBOTQFR4__pAB<%>T?veF;6D<(+*uIXFH0rrN2}$c_SeIfN(A?ZR7!Es_gZ_ zw4KZNl(C4+h6t{sNT2&Uh~u(vrP^v>z$3%3z3oiAAU%E;x9g<3^kGdTq{z2Dm=n$7 z2$K)6CP#Zu@4Q>E-Uhw&Zwcs(TL&Hps6{gleNsie?YVP;Rw|#VV&#H#^Rasw&B8V z$fjcPRr|A8gFqn_4UJou Date: Fri, 25 Feb 2022 18:46:30 -0600 Subject: [PATCH 3/3] fix triggers --- Assets/Scene 1 Assets/Trigger.cs | 34 +++++++++++++-------------- UserSettings/EditorUserSettings.asset | 8 +++---- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Assets/Scene 1 Assets/Trigger.cs b/Assets/Scene 1 Assets/Trigger.cs index b645b6f..a9ee5d9 100644 --- a/Assets/Scene 1 Assets/Trigger.cs +++ b/Assets/Scene 1 Assets/Trigger.cs @@ -20,31 +20,31 @@ public abstract class Trigger : MonoBehaviour } //checks if player is in range of the trigger - private void OnTriggerEnter2D(Collider2D other) { + private void OnTriggerStay2D(Collider2D other) { if(other.CompareTag("Player")) { Debug.Log("entered"); isActive = true; } - else { + // else { - isActive = false; - Debug.Log("exit"); + // isActive = false; + // Debug.Log("exit"); - if(forceInteract && repeatable) { - hasOccurred = false; - } - } + // if(forceInteract && repeatable) { + // hasOccurred = false; + // } + // } } - // private void OnTriggerExit2D(Collider2D other) { - // if(other.CompareTag("Player")) { - // isActive = false; - // Debug.Log("exit"); - // } - // if(forceInteract && repeatable) { - // hasOccurred = false; - // } - // } + private void OnTriggerExit2D(Collider2D other) { + if(other.CompareTag("Player")) { + isActive = false; + Debug.Log("exit"); + } + if(forceInteract && repeatable) { + hasOccurred = false; + } + } // Update is called once per frame void Update() { diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 7dcc69b..f74de94 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -27,14 +27,14 @@ EditorUserSettings: value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c78111b1258192f2d28353e662f36e3ec740fedf53aeda92f31352d1b - flags: 0 - RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c6d190c011d2f6b3b66032e2c1336acf53a31f6fe flags: 0 - RecentlyUsedScenePath-9: + RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c7e1304180822232a2f31633c133af6f9 flags: 0 + RecentlyUsedScenePath-9: + value: 22424703114646680e0b0227036c78111b1258192f2d28353e662f36e3ec740fedf53aeda92f31352d1b + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0