From 2ac6dd577df9af7e27002728f82f415b4a28a554 Mon Sep 17 00:00:00 2001
From: Firerise9402 <90978630+Firerise9402@users.noreply.github.com>
Date: Tue, 8 Aug 2023 16:37:00 -0400
Subject: [PATCH] fixed again

---
 Assets/Scenes/Editor.unity            | 12 ++++++------
 Assets/Scripts/AppInfo.cs             |  4 ++--
 Assets/Scripts/WindowController.cs    |  8 +++++---
 ProjectSettings/ProjectSettings.asset |  6 +++---
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity
index e4e267fe2..0e057f818 100644
--- a/Assets/Scenes/Editor.unity
+++ b/Assets/Scenes/Editor.unity
@@ -12210,7 +12210,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -50.000015}
+  m_AnchoredPosition: {x: 0, y: -50}
   m_SizeDelta: {x: -48, y: -148}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &572765323
@@ -23600,7 +23600,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -408.9796, y: -17}
+  m_AnchoredPosition: {x: -408.97955, y: -17}
   m_SizeDelta: {x: -817.96, y: -46.29}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1121370303
@@ -24767,7 +24767,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 108.299774}
+  m_AnchoredPosition: {x: 0, y: 109.16112}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &1154875944
@@ -31599,7 +31599,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: -42.49511}
+  m_AnchoredPosition: {x: 0, y: -42.495117}
   m_SizeDelta: {x: 1440.022, y: -84.99}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &1527251881
@@ -36933,7 +36933,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: -84.989975}
+  m_AnchoredPosition: {x: 0, y: -84.98996}
   m_SizeDelta: {x: 320, y: -84.99}
   m_Pivot: {x: 0, y: 1}
 --- !u!1 &1852819572
@@ -41005,7 +41005,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: -42.49511}
+  m_AnchoredPosition: {x: 0, y: -42.495117}
   m_SizeDelta: {x: 1054, y: -84.99}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &2066632681
diff --git a/Assets/Scripts/AppInfo.cs b/Assets/Scripts/AppInfo.cs
index 06365ddec..11b10da41 100644
--- a/Assets/Scripts/AppInfo.cs
+++ b/Assets/Scripts/AppInfo.cs
@@ -1,8 +1,8 @@
 using System;
 
 public static class AppInfo {
-    public const string Version = "0.0.1021";
-    public static readonly DateTime Date = new DateTime(2023, 08, 08, 19, 52, 59, 622, DateTimeKind.Utc);
+    public const string Version = "0.0.1025";
+    public static readonly DateTime Date = new DateTime(2023, 08, 08, 20, 32, 36, 921, DateTimeKind.Utc);
 }
 
 
diff --git a/Assets/Scripts/WindowController.cs b/Assets/Scripts/WindowController.cs
index 4a109e7d6..3c96ec3bf 100644
--- a/Assets/Scripts/WindowController.cs
+++ b/Assets/Scripts/WindowController.cs
@@ -77,7 +77,7 @@ namespace HeavenStudio
 
         public void SetPosition(System.IntPtr ptr, short x, short y, short resX, short resY)
         {
-            if(Application.isEditor) return;
+            if(Application.isEditor || !Editor.Editor.instance.fullscreen) return;
             SetWindowPos(ptr, HWND_NOTOPMOST, x, y, resX, resY, SWP_SHOWWINDOW);
         }
 
@@ -139,7 +139,8 @@ namespace HeavenStudio
             //SetShakeIntensity();
             
             
-            SetPosition(hWnd, Convert.ToInt16(pan.x + shakeResult.x), Convert.ToInt16(pan.y + shakeResult.y), Convert.ToInt16(scale.x), Convert.ToInt16(scale.y));
+            SetPosition(hWnd, Convert.ToInt16(pan.x), Convert.ToInt16(pan.y), Convert.ToInt16(scale.x), Convert.ToInt16(scale.y));
+            //SetPosition(hWnd, Convert.ToInt16(pan.x + shakeResult.x), Convert.ToInt16(pan.y + shakeResult.y), Convert.ToInt16(scale.x), Convert.ToInt16(scale.y));
         }
 
         private void UpdatePan()
@@ -243,11 +244,12 @@ namespace HeavenStudio
             }
         }*/
 
-        public static void Reset()
+        public void Reset()
         {
             pan = defaultPan;
             scale = defaultScale;
             shakeResult = defaultShake;
+            SetWindowPos(hWnd, HWND_NOTOPMOST, Convert.ToInt16(pan.x), Convert.ToInt16(pan.y), Convert.ToInt16(scale.x), Convert.ToInt16(scale.y), SWP_SHOWWINDOW);
         }
     }
 }
\ No newline at end of file
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 972eb408c..4eb05f093 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -134,7 +134,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.0.1021
+  bundleVersion: 0.0.1025
   preloadedAssets:
   - {fileID: 102900000, guid: 5348c08b82446e0478cee8bda6c02cfc, type: 3}
   metroInputSource: 0
@@ -158,11 +158,11 @@ PlayerSettings:
   applicationIdentifier:
     Standalone: com.RHeavenStudio.Heaven-Studio
   buildNumber:
-    Standalone: 1021
+    Standalone: 1025
     iPhone: 0
     tvOS: 0
   overrideDefaultApplicationIdentifier: 0
-  AndroidBundleVersionCode: 1021
+  AndroidBundleVersionCode: 1025
   AndroidMinSdkVersion: 22
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1