From a45cf24853460253cf5cb135506afd51dfcc02bb Mon Sep 17 00:00:00 2001 From: Mihkel Roomet Date: Wed, 10 Apr 2024 05:23:03 +0300 Subject: [PATCH] Created another map BP_Prototype2 along with other asset duplicates to hold my version of the prototype that I made earlier and couldn't commit cause of a merge conflict. Here's what I changed/addded to that version of the prototype: Bubbles will now disappear on pop and reappear after a set time controlled by a var in BP_Bubble. Min and max delay between bubble pop and next bubble getting highlighted can now be controlled using vars in BP_BubbleGrid. There are now materials for bubbles in Content/Materials (default and highlighted). They are a bit transparent and glow slightly (although in the dark you can't see the transparency). The scene is now darker and more simple to see bubbles better. --- Config/DefaultEngine.ini | 4 ++-- Content/Blueprints/BP_Bubble.uasset | 3 --- Content/Blueprints/BP_Bubble1.uasset | 3 +++ Content/Blueprints/BP_Bubble2.uasset | 3 +++ Content/Blueprints/BP_BubbleGrid.uasset | 3 --- Content/Blueprints/BP_BubbleGrid1.uasset | 3 +++ Content/Blueprints/BP_BubbleGrid2.uasset | 4 ++-- Content/Maps/Prototype_BubbleGrid.umap | 4 ++-- Content/Maps/Prototype_BubbleGrid2.umap | 3 +++ Content/Materials/BubbleDefaultMaterial.uasset | 3 +++ Content/Materials/BubbleHighlightedMaterial.uasset | 3 +++ 11 files changed, 24 insertions(+), 12 deletions(-) delete mode 100644 Content/Blueprints/BP_Bubble.uasset create mode 100644 Content/Blueprints/BP_Bubble1.uasset create mode 100644 Content/Blueprints/BP_Bubble2.uasset delete mode 100644 Content/Blueprints/BP_BubbleGrid.uasset create mode 100644 Content/Blueprints/BP_BubbleGrid1.uasset create mode 100644 Content/Maps/Prototype_BubbleGrid2.umap create mode 100644 Content/Materials/BubbleDefaultMaterial.uasset create mode 100644 Content/Materials/BubbleHighlightedMaterial.uasset diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 300b1ad..ae4735a 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -132,7 +132,7 @@ DefaultGraphicsPerformance=Scalable AppliedDefaultGraphicsPerformance=Scalable [/Script/EngineSettings.GameMapsSettings] -EditorStartupMap=/Game/VRTemplate/Maps/VRTemplateMap.VRTemplateMap +EditorStartupMap=/Game/Maps/Prototype_BubbleGrid2.Prototype_BubbleGrid2 LocalMapOptions= TransitionMap=None bUseSplitscreen=False @@ -141,7 +141,7 @@ ThreePlayerSplitscreenLayout=FavorTop FourPlayerSplitscreenLayout=Grid bOffsetPlayerGamepadIds=False GameInstanceClass=/Script/Engine.GameInstance -GameDefaultMap=/Game/VRTemplate/Maps/VRTemplateMap.VRTemplateMap +GameDefaultMap=/Game/Maps/Prototype_BubbleGrid2.Prototype_BubbleGrid2 ServerDefaultMap=/Engine/Maps/Entry.Entry GlobalDefaultGameMode=/Game/VRTemplate/Blueprints/VRGameMode.VRGameMode_C GlobalDefaultServerGameMode=None diff --git a/Content/Blueprints/BP_Bubble.uasset b/Content/Blueprints/BP_Bubble.uasset deleted file mode 100644 index 006627a..0000000 --- a/Content/Blueprints/BP_Bubble.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3def800657cbeea897382ff5e3aa0b14e710a27182359e4c7ad9d62de3558a9e -size 60684 diff --git a/Content/Blueprints/BP_Bubble1.uasset b/Content/Blueprints/BP_Bubble1.uasset new file mode 100644 index 0000000..10e7666 --- /dev/null +++ b/Content/Blueprints/BP_Bubble1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c0e99c03f5da30f8980f21532a85880731c8c88851f9a0d92872a4354af2a15 +size 60709 diff --git a/Content/Blueprints/BP_Bubble2.uasset b/Content/Blueprints/BP_Bubble2.uasset new file mode 100644 index 0000000..bc097b6 --- /dev/null +++ b/Content/Blueprints/BP_Bubble2.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:215658cd7bca1bab14f4599d6e6dce6a678f1a9c6f45f4424e90ec69f13e5c13 +size 122619 diff --git a/Content/Blueprints/BP_BubbleGrid.uasset b/Content/Blueprints/BP_BubbleGrid.uasset deleted file mode 100644 index 5715c47..0000000 --- a/Content/Blueprints/BP_BubbleGrid.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d05c7211ff0d380b55e2d3787194bc4282157e4ff1cae91ec8fa26b14a39d00 -size 504381 diff --git a/Content/Blueprints/BP_BubbleGrid1.uasset b/Content/Blueprints/BP_BubbleGrid1.uasset new file mode 100644 index 0000000..53eead1 --- /dev/null +++ b/Content/Blueprints/BP_BubbleGrid1.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8419621a9cd37f47898a82a72fdf4b3bffae0b929bb887cebb6932e1b8823f0b +size 503030 diff --git a/Content/Blueprints/BP_BubbleGrid2.uasset b/Content/Blueprints/BP_BubbleGrid2.uasset index 7eb34f9..0189bd5 100644 --- a/Content/Blueprints/BP_BubbleGrid2.uasset +++ b/Content/Blueprints/BP_BubbleGrid2.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e5fd0e4ec99241d3ba0fdc753dd1865ad8e29c69578a3cf8ce7f802323a6198c -size 2447 +oid sha256:3cd3899f951c1c0bc3214f424c0b3d90df9632d21d43df990471ce5ed51faa29 +size 260536 diff --git a/Content/Maps/Prototype_BubbleGrid.umap b/Content/Maps/Prototype_BubbleGrid.umap index 3726a2d..64afd26 100644 --- a/Content/Maps/Prototype_BubbleGrid.umap +++ b/Content/Maps/Prototype_BubbleGrid.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a05def1e0344252f7203a925dc560b6b377efc3ba6d3278203106eb9e147fc9 -size 72676 +oid sha256:12cd61bcf7d646f18948746601e968386def48d109693b9b40ae444aec7d1425 +size 73245 diff --git a/Content/Maps/Prototype_BubbleGrid2.umap b/Content/Maps/Prototype_BubbleGrid2.umap new file mode 100644 index 0000000..cb6b29f --- /dev/null +++ b/Content/Maps/Prototype_BubbleGrid2.umap @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a7ea544d18439a347934a550de0facb4d52ce994e99b310c06e8756c4922845 +size 60392 diff --git a/Content/Materials/BubbleDefaultMaterial.uasset b/Content/Materials/BubbleDefaultMaterial.uasset new file mode 100644 index 0000000..ac8d365 --- /dev/null +++ b/Content/Materials/BubbleDefaultMaterial.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92a1ef4694fb7114ebc96715438c3530b3189ba71ef82cf0436b721fc83630f9 +size 10978 diff --git a/Content/Materials/BubbleHighlightedMaterial.uasset b/Content/Materials/BubbleHighlightedMaterial.uasset new file mode 100644 index 0000000..73350e7 --- /dev/null +++ b/Content/Materials/BubbleHighlightedMaterial.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a1490eda196a6f7e94c52646eddbb638c3889a949f912d63898027c3a16e2be0 +size 8950