Skip to content

Commit 0334231

Browse files
MarksonthegamerMarksonthegamer
committed
Move to Main Monitor Implements
1 parent db811ef commit 0334231

12 files changed

Lines changed: 2945 additions & 2550 deletions

File tree

‎Assets/AddressableAssetsData/Linux/addressables_content_state.bin‎

0 Bytes
Binary file not shown.

‎Assets/AddressableAssetsData/link.xml.meta‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/ChineseCharacters.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
动画变化时间转场开始舞蹈音量角色置顶会跳头部望向鼠标指针大小保存重总计面数骨骼上限设宠物默认效果菜单质极致非常高中低花圈添加移除语言载模组实验性功能坐在窗口和任务栏此可导带有反作弊的游戏被封号简体繁體文欢迎使用这是一个仍处发阶段应程序如何快速手只要右键点击打选项你以更改或关闭特将让入白名块与自定义型件接下来我介绍若需从等网站得到后并按钮资源管理器择候失败通不问题而因为出了错误着架遇种情况请查看官方说明档些试图修复损坏但未也确確正户责过完成嘿主人样子爱吗嗎放公抱啦啊呀好喂求轻别那把举起尴尬新灯光颜饱度强全局启氛围环境闹钟测制进行垃圾回收于调知道其际屏幕护经桌闲直蔽多逆运学脚适合获取女风格目跟踪灵敏传缺缩略随脊椎步返停心嘻现台偶像哦对决才输呢休息终歇儿就嗯地舒服工喵里安静待约忙碌油很辛苦陪嘘充电扰马卡龙午睡吧枕股甜味做梦软绵感觉掉太去樱古基事提示信渡系统词删聊天历史级級～！…（）—｛｝【】「」［］；：‘’“”《》，。？
1+
动画变化时间转场开始舞蹈音量角色置顶会跳头部望向鼠标指针大小保存重总计面数骨骼上限设宠物默认效果菜单质极致非常高中低花圈添加移除语言载模组实验性功能坐在窗口和任务栏此可导带有反作弊的游戏被封号禁简体繁體文欢迎使用这是一个仍处发阶段应程序如何快速手只要右键点击打选项你以更改或关闭特将让入白名块与自定义型件接下来我介绍若需从等网站得到后并按钮资源管理器择候失败通不问题而因为出了错误着架遇种情况请查看官方说明档些试图修复损坏但未也确確正户责过完成嘿主人样子爱吗嗎放公抱啦啊呀好喂求轻别那把举起尴尬新灯光颜饱度强全局启氛围环境闹钟测制进行垃圾回收于调知道其际屏幕护经桌闲直蔽多逆运学脚适合获取女风格目跟踪灵敏传缺缩略随脊椎步返停心嘻现台偶像哦对决才输呢休息终歇儿就嗯地舒服工喵里安静待约忙碌油很辛苦陪嘘充电扰马卡龙午睡吧枕股甜味做梦软绵感觉掉太去樱古基事提示信渡系统词删聊天历史级級～！…（）—｛｝【】「」［］；：‘’“”《》，。？

‎Assets/MATE ENGINE - Fonts/Asia Fonts/ChineseSimplified.asset‎

Lines changed: 2885 additions & 2514 deletions
Large diffs are not rendered by default.

‎Assets/MATE ENGINE - Scenes/Mate Engine Main.unity‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11895,7 +11895,7 @@ Light:
1189511895
serializedVersion: 11
1189611896
m_Type: 2
1189711897
m_Color: {r: 1, g: 0.26999998, b: 0.96203995, a: 1}
11898-
m_Intensity: 1.1635721e-15
11898+
m_Intensity: 1.0879185e-15
1189911899
m_Range: 0.5
1190011900
m_SpotAngle: 30
1190111901
m_InnerSpotAngle: 21.80208
@@ -45156,7 +45156,7 @@ Light:
4515645156
serializedVersion: 11
4515745157
m_Type: 2
4515845158
m_Color: {r: 0, g: 0.44799995, b: 1, a: 1}
45159-
m_Intensity: 2.3271442e-15
45159+
m_Intensity: 2.175837e-15
4516045160
m_Range: 1
4516145161
m_SpotAngle: 30
4516245162
m_InnerSpotAngle: 21.80208
@@ -54453,7 +54453,7 @@ Light:
5445354453
serializedVersion: 11
5445454454
m_Type: 2
5445554455
m_Color: {r: 0, g: 0.44799995, b: 1, a: 1}
54456-
m_Intensity: 1.7453582e-15
54456+
m_Intensity: 1.6318778e-15
5445754457
m_Range: 1
5445854458
m_SpotAngle: 30
5445954459
m_InnerSpotAngle: 21.80208
@@ -56225,6 +56225,7 @@ GameObject:
5622556225
- component: {fileID: 1520083671}
5622656226
- component: {fileID: 1520083672}
5622756227
- component: {fileID: 1520083673}
56228+
- component: {fileID: 1520083674}
5622856229
m_Layer: 0
5622956230
m_Name: EventSystem
5623056231
m_TagString: Untagged
@@ -56298,9 +56299,9 @@ MonoBehaviour:
5629856299
actions:
5629956300
- label: Move To Main Monitor
5630056301
type: 2
56301-
handlerObject: {fileID: 0}
56302+
handlerObject: {fileID: 1520083667}
5630256303
toggleField: enableWindowSittingToggle
56303-
methodName: MoveToPrimary
56304+
methodName: Action
5630456305
- label: Enable Dancing
5630556306
type: 0
5630656307
handlerObject: {fileID: 8199926937260908627}
@@ -56375,6 +56376,18 @@ MonoBehaviour:
5637556376
m_Script: {fileID: 11500000, guid: 498b9399151c1e99fb6dfab00b5fa900, type: 3}
5637656377
m_Name:
5637756378
m_EditorClassIdentifier: Assembly-CSharp::TrayIndicator
56379+
--- !u!114 &1520083674
56380+
MonoBehaviour:
56381+
m_ObjectHideFlags: 0
56382+
m_CorrespondingSourceObject: {fileID: 0}
56383+
m_PrefabInstance: {fileID: 0}
56384+
m_PrefabAsset: {fileID: 0}
56385+
m_GameObject: {fileID: 1520083667}
56386+
m_Enabled: 1
56387+
m_EditorHideFlags: 0
56388+
m_Script: {fileID: 11500000, guid: 7a308ed2892fe6669b596aa4f44cffa9, type: 3}
56389+
m_Name:
56390+
m_EditorClassIdentifier: Assembly-CSharp::MoveToMainMonitor
5637856391
--- !u!1 &1554093025
5637956392
GameObject:
5638056393
m_ObjectHideFlags: 0
@@ -167417,7 +167430,7 @@ MonoBehaviour:
167417167430
groupID: ambi_lights
167418167431
exclusiveTags:
167419167432
- lights
167420-
fadeCurrentValue: 5.8178606e-16
167433+
fadeCurrentValue: 5.4395926e-16
167421167434
fadeTarget: 0
167422167435
isFading: 1
167423167436
hasYSet: 0
@@ -167441,7 +167454,7 @@ MonoBehaviour:
167441167454
groupID: ambi_lights
167442167455
exclusiveTags:
167443167456
- lights
167444-
fadeCurrentValue: 5.8178606e-16
167457+
fadeCurrentValue: 5.4395926e-16
167445167458
fadeTarget: 0
167446167459
isFading: 1
167447167460
hasYSet: 0
@@ -167465,7 +167478,7 @@ MonoBehaviour:
167465167478
groupID: ambi_lights
167466167479
exclusiveTags:
167467167480
- lights
167468-
fadeCurrentValue: 5.8178606e-16
167481+
fadeCurrentValue: 5.4395926e-16
167469167482
fadeTarget: 0
167470167483
isFading: 1
167471167484
hasYSet: 0

‎Assets/MATE ENGINE - Scripts/AvatarHandlers/AvatarWindowHandler.cs‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public class AvatarWindowHandler : MonoBehaviour
2020
public float windowSitYOffset;
2121

2222
IntPtr _snappedHwnd = IntPtr.Zero;
23+
Rect _snappedRect;
2324
IntPtr _unityHwnd = IntPtr.Zero;
2425
Vector2 lastDesktopPosition;
2526
readonly List<WindowEntry> cachedWindows = new();
@@ -55,16 +56,23 @@ void Update()
5556

5657
Vector2 unityPos = GetUnityWindowPosition();
5758

58-
if (controller.isDragging && !animator.GetBool(IsSitting))
59+
if (controller.isDragging)
5960
{
60-
if (_snappedHwnd == IntPtr.Zero)
61-
TrySnap(unityPos);
62-
else if (!IsStillNearSnappedWindow(unityPos))
61+
if (!animator.GetBool(IsSitting))
6362
{
64-
ExitWindowSitting();
63+
if (_snappedHwnd == IntPtr.Zero)
64+
TrySnap(unityPos);
65+
else if (!IsStillNearSnappedWindow(unityPos))
66+
{
67+
ExitWindowSitting();
68+
}
69+
}
70+
else
71+
{
72+
horizontalOffset = unityPos.x - _snappedRect.x;
6573
}
6674
}
67-
else if (!controller.isDragging && _snappedHwnd != IntPtr.Zero)
75+
else if (_snappedHwnd != IntPtr.Zero)
6876
{
6977
FollowSnappedWindow();
7078
}
@@ -95,14 +103,14 @@ void TrySnap(Vector2 unityPos)
95103
{
96104
if (entry.Hwnd == _unityHwnd) continue;
97105

98-
WindowManager.Instance.GetWindowRect(entry.Hwnd, out Rect winRect);
99-
Rect topBar = new Rect(winRect.x, winRect.y, winRect.width, 5 * desktopScale);
106+
Rect topBar = new Rect(entry.Rect.x, entry.Rect.y, entry.Rect.width, 5 * desktopScale);
100107
Rect snapRect = new Rect(unityRect.x, unityRect.y + unityRect.height, unityRect.width, snapThreshold * desktopScale);
101108
if (!snapRect.Overlaps(topBar)) continue;
102109
_snappedHwnd = entry.Hwnd;
110+
_snappedRect = entry.Rect;
103111
animator.SetBool(IsWindowSit, true);
104112
lastDesktopPosition = unityPos;
105-
horizontalOffset = unityPos.x - winRect.x;
113+
horizontalOffset = unityPos.x - entry.Rect.x;
106114
}
107115
}
108116

‎Assets/MATE ENGINE - Scripts/Lang/Localization/Localization/Languages (UI)_zh-Hans.asset‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ MonoBehaviour:
3939
m_Metadata:
4040
m_Items: []
4141
- m_Id: 11243918188544
42-
m_Localized: "\u89D2\u8272\u4F1A\u8DF3\u821E"
42+
m_Localized: "\u542F\u7528\u89D2\u8272\u7684\u821E\u8E48\u529F\u80FD"
4343
m_Metadata:
4444
m_Items: []
4545
- m_Id: 11244643803136
46-
m_Localized: "\u5934\u90E8\u4F1A\u671B\u5411\u9F20\u6807\u6307\u9488"
46+
m_Localized: "\u5934\u90E8\u671B\u5411\u9F20\u6807\u6307\u9488"
4747
m_Metadata:
4848
m_Items: []
4949
- m_Id: 11245205839872
@@ -143,7 +143,7 @@ MonoBehaviour:
143143
m_Metadata:
144144
m_Items: []
145145
- m_Id: 1494416451690496
146-
m_Localized: "\u6B64\u529F\u80FD\u53EF\u80FD\u5BFC\u81F4\u5728\u5E26\u6709\u53CD\u4F5C\u5F0A\u7684\u6E38\u620F\u4E2D\u88AB\u5C01\u53F7\u3002"
146+
m_Localized: "\u6B64\u529F\u80FD\u53EF\u80FD\u5BFC\u81F4\u5728\u5E26\u6709\u53CD\u4F5C\u5F0A\u7684\u6E38\u620F\u4E2D\u88AB\u5C01\u7981\u3002"
147147
m_Metadata:
148148
m_Items: []
149149
- m_Id: 1971210921435136

‎Assets/MATE ENGINE - System Tray/MoveToMainMonitor.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
using UnityEngine;
2+
using System.Collections.Generic;
3+
4+
public class MoveToMainMonitor : MonoBehaviour
5+
{
6+
public void Action()
7+
{
8+
var displays = new List<DisplayInfo>();
9+
Screen.GetDisplayLayout(displays);
10+
var targetDisplay = displays[0];
11+
var centerPosition = new Vector2Int((targetDisplay.width - Screen.width) / 2, (targetDisplay.height - Screen.height) / 2);
12+
Screen.MoveMainWindowTo(targetDisplay, centerPosition);
13+
}
14+
}

‎Assets/MATE ENGINE - System Tray/MoveToMainMonitor.cs.meta‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/StreamingAssets/LLMManager.json‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)