Merge remote-tracking branch 'origin/dev' into dev

moved reveries window down because i don't want to search for a gameobject that blocks the reveries window at that specific point.

IngameReveries/IngameReveries.cs

@@ -1,7 +1,9 @@
 using System.IO;
 using System.Linq;
+using TMPro;
 using UnityEngine;
 using UnityEngine.SceneManagement;
+using UnityEngine.UI;
 
 
 namespace IngameReveries
@@ -11,14 +13,14 @@ namespace IngameReveries
     public class IngameReveries : ModBehaviour
     {
         private GameObject _ingameReveriesUI;
-        
+
         private AssetBundle _reveriesBundle;
         private GameObject _reveriesPrefab;
 
         private void Awake()
         {
             // Metadata of your mod is stored in this.about
-            Debug.Log("Hola! I'm loaded! " + mod.metadata.id);
+            Debug.Log("Hello! I'm loaded! " + mod.metadata.id);
 
             // If you need to patch with Harmony, you can use this.harmony to access the Harmony instance for your mod.
             // It will be created with your mod's id automatically, the first time you access the property.
@@ -28,34 +30,8 @@ namespace IngameReveries
         private void Start()
         {
             InitializeAssets();
-            
-            SceneManager.sceneLoaded += (scene, mode) =>
-            {
-                // Check if UI already instantiated
-                if (_ingameReveriesUI != null)
-                {
-                    return;
-                }
 
-                string gameSceneDir = "Assets/Dew/Zones/";
+            SceneManager.sceneLoaded += OnSceneLoaded;
-                string relativeToScene = Path.GetRelativePath(gameSceneDir, scene.path);
-
-                if (!relativeToScene.StartsWith(".."))
-                {
-                    Debug.Log($"[IngameReveries] Switched to scene inside {gameSceneDir}");
-                    
-                    GameObject menuViewGO = GameObject.Find("GameLogicPackage/UI/InGame/UI_Common_MenuView");
-                    if (menuViewGO == null)
-                    {
-                        Debug.Log("Couldn't find menu view");
-                        return;
-                    }
-
-                    _ingameReveriesUI = new GameObject("IngameReveriesUI");
-                    _ingameReveriesUI.transform.parent = menuViewGO.transform;
-                    Instantiate(DewGUI.widgetWindow, _ingameReveriesUI.transform);
-                }
-            };
         }
 
         private void OnDestroy()
@@ -63,12 +39,60 @@ namespace IngameReveries
             // Make sure you clean up properly to support Live Reload.
             Debug.Log("Good bye! " + mod.metadata.id);
             harmony.UnpatchAll();
+            
+            SceneManager.sceneLoaded -= OnSceneLoaded;
+        }
+        
+        private void OnSceneLoaded(Scene scene, LoadSceneMode mode)
+        {
+            // Check if UI already instantiated
+            if (_ingameReveriesUI != null)
+            {
+                return;
+            }
+
+            string gameSceneDir = "Assets/Dew/Zones/";
+            string relativeToScene = Path.GetRelativePath(gameSceneDir, scene.path);
+
+            if (!relativeToScene.StartsWith(".."))
+            {
+                Debug.Log($"[IngameReveries] Switched to scene inside {gameSceneDir}");
+
+                GameObject menuViewGO = GameObject.Find("GameLogicPackage/UI/InGame/UI_Common_MenuView");
+                if (menuViewGO == null)
+                {
+                    Debug.Log("Couldn't find menu view");
+                    return;
+                }
+
+                _ingameReveriesUI = Instantiate(_reveriesPrefab, menuViewGO.transform);
+                _ingameReveriesUI.SetActive(true);
+                _ingameReveriesUI.name = "IngameReveriesUI";
+                _ingameReveriesUI.transform.SetSiblingIndex(1);
+
+                var reveries = _ingameReveriesUI.GetComponent<UI_Reveries>();
+
+                // Show reveries window
+                var canvasGroup = _ingameReveriesUI.GetComponent<CanvasGroup>();
+                canvasGroup.alpha = 1f;
+                canvasGroup.interactable = true;
+                canvasGroup.blocksRaycasts = true;
+                    
+                // Position reveries window top left
+                var rect = _ingameReveriesUI.GetComponent<RectTransform>();
+                rect.anchorMin = new Vector2(0f, 1f);
+                rect.anchorMax = new Vector2(0f, 1f);
+                rect.pivot = new Vector2(0f, 1f);
+                rect.anchoredPosition = new Vector2(+70f, -400f);
+                    
+                FixFonts();
+            }
         }
 
         private void InitializeAssets()
         {
             string bundlePath = Path.Combine(mod.path, "assets", "bundle");
-            
+
             if (!File.Exists(bundlePath))
             {
                 Debug.LogError($"[IngameReveries] Bundle not found at: {bundlePath}");
@@ -76,7 +100,7 @@ namespace IngameReveries
             }
 
             _reveriesBundle = AssetBundle.GetAllLoadedAssetBundles()
-                .FirstOrDefault(b => b.name == "logosteal" || b.mainAsset != null);
+                .FirstOrDefault(b => b.name == "bundle" || b.mainAsset != null);
 
             if (_reveriesBundle == null)
             {
@@ -102,7 +126,7 @@ namespace IngameReveries
             if (_reveriesPrefab == null)
             {
                 Debug.LogError("[IngameReveries] Failed to load prefab!");
-                
+
                 // List what's in the bundle for debugging
                 string[] assetNames = _reveriesBundle.GetAllAssetNames();
                 Debug.Log("[IngameReveries] Assets in bundle:");
@@ -110,10 +134,41 @@ namespace IngameReveries
                 {
                     Debug.Log($"  - {name}");
                 }
+
                 return;
             }
 
             Debug.Log("[IngameReveries] Successfully loaded prefab!");
         }
+
+        private void FixFonts()
+        {
+            // Get all fonts
+            TMP_FontAsset[] loadedFonts = Resources.FindObjectsOfTypeAll<TMP_FontAsset>();
+
+            // Get all text from the reveries window
+            TMP_Text[] textComponents = _ingameReveriesUI.GetComponentsInChildren<TMP_Text>(true);
+            foreach (TMP_Text textComp in textComponents)
+            {
+                if (textComp.font == null) continue;
+
+                string originalFontName = textComp.font.name;
+
+                // Match the font by name, ensuring we don't pick the dead assetbundle version
+                foreach (TMP_FontAsset loadedFont in loadedFonts)
+                {
+                    // Pick a matching font that has an active atlas/material
+                    if (loadedFont.name == originalFontName && loadedFont.atlasTexture != null)
+                    {
+                        textComp.font = loadedFont;
+                
+                        // Force TMP to update its internal mesh and material reference
+                        textComp.ForceMeshUpdate();
+                        textComp.SetAllDirty();
+                        break;
+                    }
+                }
+            }
+        }
     }
 }

IngameReveries/IngameReveries.csproj

@@ -235,6 +235,10 @@
             <HintPath>$(GameManagedDir)\UnityEngine.UI.dll</HintPath>
             <Private>False</Private>
         </Reference>
+        <Reference Include="UnityEngine.UIModule">
+            <HintPath>$(GameManagedDir)\UnityEngine.UIModule.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
         <Reference Include="UnityEngine.XR.LegacyInputHelpers">
             <HintPath>$(GameManagedDir)\UnityEngine.XR.LegacyInputHelpers.dll</HintPath>
             <Private>False</Private>

IngameReveries/about/description.txt

@@ -1,3 +1,4 @@
-[h1]Hello World![/h1]
+[h1]Ingame Reveries[/h1]
-This description will be shown on the mod manager, and be uploaded to Steam Workshop.
+Displays the daily reveries from the title screen in the ingame pause menu.
-Note some tags like tables, links and images are not supported in the in-game mod manager and will be either omitted / shown as plain-text.
+[h2]Note[/h2]
+Current progress won't be displayed until you go back to the title screen and save the game.

README.md

@@ -2,6 +2,10 @@
 
 joa coole mod die in einem run ermöglicht, daily quests (Reveries) anzuschauen.
 
+## Current Behaiviour
+
+Progress lässt sich erst nach dem Rausgehen eines Spiels aktuallisieren. Reroll und claim gehen denoch.
+
 ## Links
 
 - [Shape of Dreams Docs](https://github.com/LizardSmoothie/ShapeOfDreamsModDocs)