Commit 740d7aa4 authored by SherryChaos's avatar SherryChaos

fix resolution bug

parent d7d444d0
...@@ -20,40 +20,40 @@ ...@@ -20,40 +20,40 @@
0 int size = 2 0 int size = 2
[0] [0]
0 Hash128 data 0 Hash128 data
0 UInt8 bytes[0] = 163 0 UInt8 bytes[0] = 240
0 UInt8 bytes[1] = 253 0 UInt8 bytes[1] = 87
0 UInt8 bytes[2] = 189 0 UInt8 bytes[2] = 79
0 UInt8 bytes[3] = 129 0 UInt8 bytes[3] = 136
0 UInt8 bytes[4] = 219 0 UInt8 bytes[4] = 43
0 UInt8 bytes[5] = 241 0 UInt8 bytes[5] = 183
0 UInt8 bytes[6] = 151 0 UInt8 bytes[6] = 98
0 UInt8 bytes[7] = 182 0 UInt8 bytes[7] = 213
0 UInt8 bytes[8] = 136 0 UInt8 bytes[8] = 195
0 UInt8 bytes[9] = 82 0 UInt8 bytes[9] = 76
0 UInt8 bytes[10] = 255 0 UInt8 bytes[10] = 167
0 UInt8 bytes[11] = 91 0 UInt8 bytes[11] = 228
0 UInt8 bytes[12] = 222 0 UInt8 bytes[12] = 64
0 UInt8 bytes[13] = 0 0 UInt8 bytes[13] = 151
0 UInt8 bytes[14] = 11 0 UInt8 bytes[14] = 145
0 UInt8 bytes[15] = 187 0 UInt8 bytes[15] = 217
[1] [1]
0 Hash128 data 0 Hash128 data
0 UInt8 bytes[0] = 44 0 UInt8 bytes[0] = 198
0 UInt8 bytes[1] = 47 0 UInt8 bytes[1] = 254
0 UInt8 bytes[2] = 168 0 UInt8 bytes[2] = 213
0 UInt8 bytes[3] = 207 0 UInt8 bytes[3] = 166
0 UInt8 bytes[4] = 155 0 UInt8 bytes[4] = 222
0 UInt8 bytes[5] = 20 0 UInt8 bytes[5] = 168
0 UInt8 bytes[6] = 237 0 UInt8 bytes[6] = 105
0 UInt8 bytes[7] = 194 0 UInt8 bytes[7] = 158
0 UInt8 bytes[8] = 0 0 UInt8 bytes[8] = 231
0 UInt8 bytes[9] = 50 0 UInt8 bytes[9] = 162
0 UInt8 bytes[10] = 153 0 UInt8 bytes[10] = 152
0 UInt8 bytes[11] = 54 0 UInt8 bytes[11] = 34
0 UInt8 bytes[12] = 97 0 UInt8 bytes[12] = 211
0 UInt8 bytes[13] = 91 0 UInt8 bytes[13] = 40
0 UInt8 bytes[14] = 70 0 UInt8 bytes[14] = 22
0 UInt8 bytes[15] = 229 0 UInt8 bytes[15] = 217
0 vector m_Platforms 0 vector m_Platforms
1 Array Array (2 items) 1 Array Array (2 items)
0 int size = 2 0 int size = 2
......
...@@ -8,7 +8,7 @@ MDPro3 v1.1.0更新: ...@@ -8,7 +8,7 @@ MDPro3 v1.1.0更新:
6.现在选择卡片框也支持鼠标滚轮翻页了。 6.现在选择卡片框也支持鼠标滚轮翻页了。
7.现在能修改本地人机时的端口了。 7.现在能修改本地人机时的端口了。
8.现在能开关右上角的弹窗消息了。 8.现在能开关右上角的弹窗消息了。
9.新投稿动画:元素英雄 水手侠、元素英雄 永生侠、命运英雄 恐惧人。 9.新投稿动画:元素英雄 水手侠、元素英雄 永生侠、命运英雄 恐惧人、新宇贤者
10.新壁纸:黑魔术少女(Rush Duel)。 10.新壁纸:黑魔术少女(Rush Duel)。
11.连接箭头默认不再显示在立绘之上。 11.连接箭头默认不再显示在立绘之上。
12.修复镜碎特效某些时候特效缺失的错误。 12.修复镜碎特效某些时候特效缺失的错误。
......
...@@ -642,58 +642,64 @@ namespace MDPro3 ...@@ -642,58 +642,64 @@ namespace MDPro3
public void OnResolutionChange() public void OnResolutionChange()
{ {
List<string> selections = new List<string> List<string> selections = new List<string>
{ {
InterString.Get("分辨率") InterString.Get("分辨率")
}; };
foreach (var resolution in Screen.resolutions) foreach (var resolution in Screen.resolutions)
{ {
string selection = Regex.Split(resolution.ToString(), " @ ")[0]; string selection = Regex.Split(resolution.ToString(), " @ ")[0];
#if !UNITY_EDITOR && UNITY_ANDROID #if !UNITY_EDITOR && UNITY_ANDROID
int height = int.Parse(Regex.Split(selection, " x ")[0]); int height = int.Parse(Regex.Split(selection, " x ")[0]);
int width = int.Parse(Regex.Split(selection, " x ")[1]); int width = int.Parse(Regex.Split(selection, " x ")[1]);
if (height > 540) if (height > width)
{ {
string r = (width * 540 / height).ToString() + " x " + 540.ToString(); var cache = height;
if(!selections.Contains(r)) height = width;
selections.Add(r); width = cache;
} }
if(height > 720) if (height > 540)
{ {
string r = (width * 720 / height).ToString() + " x " + 720.ToString(); string r = (width * 540 / height).ToString() + " x " + 540.ToString();
if (!selections.Contains(r)) if(!selections.Contains(r))
selections.Add(r); selections.Add(r);
} }
if (height > 1080) if(height > 720)
{ {
string r = (width * 1080 / height).ToString() + " x " + 1080.ToString(); string r = (width * 720 / height).ToString() + " x " + 720.ToString();
if (!selections.Contains(r)) if (!selections.Contains(r))
selections.Add(r); selections.Add(r);
} }
if (height > 1200) if (height > 1080)
{ {
string r = (width * 1200 / height).ToString() + " x " + 1200.ToString(); string r = (width * 1080 / height).ToString() + " x " + 1080.ToString();
if (!selections.Contains(r)) if (!selections.Contains(r))
selections.Add(r); selections.Add(r);
} }
if (height > 1440) if (height > 1200)
{ {
string r = (width * 1440 / height).ToString() + " x " + 1440.ToString(); string r = (width * 1200 / height).ToString() + " x " + 1200.ToString();
if (!selections.Contains(r)) if (!selections.Contains(r))
selections.Add(r); selections.Add(r);
} }
if (height > 1600) if (height > 1440)
{ {
string r = (width * 1600 / height).ToString() + " x " + 1600.ToString(); string r = (width * 1440 / height).ToString() + " x " + 1440.ToString();
if (!selections.Contains(r)) if (!selections.Contains(r))
selections.Add(r); selections.Add(r);
} }
if (height > 2160) if (height > 1600)
{ {
string r = (width * 2160 / height).ToString() + " x " + 2160.ToString(); string r = (width * 1600 / height).ToString() + " x " + 1600.ToString();
if (!selections.Contains(r)) if (!selections.Contains(r))
selections.Add(r); selections.Add(r);
} }
selection = width.ToString() + " x " + height.ToString(); if (height > 2160)
{
string r = (width * 2160 / height).ToString() + " x " + 2160.ToString();
if (!selections.Contains(r))
selections.Add(r);
}
selection = width.ToString() + " x " + height.ToString();
#endif #endif
if (!selections.Contains(selection)) if (!selections.Contains(selection))
selections.Add(selection); selections.Add(selection);
......
fileFormatVersion: 2 fileFormatVersion: 2
guid: 02cdc0772c502d6468e46569bfeb0cfe guid: d5dd6464ba3b1474e97da38e0b56bf3a
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
......
...@@ -529,7 +529,7 @@ PlayerSettings: ...@@ -529,7 +529,7 @@ PlayerSettings:
m_APIs: 0b000000 m_APIs: 0b000000
m_Automatic: 1 m_Automatic: 1
- m_BuildTarget: WindowsStandaloneSupport - m_BuildTarget: WindowsStandaloneSupport
m_APIs: 0b00000002000000 m_APIs: 020000000b000000
m_Automatic: 0 m_Automatic: 0
m_BuildTargetVRSettings: m_BuildTargetVRSettings:
- m_BuildTarget: Standalone - m_BuildTarget: Standalone
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment