Commit edeecbcf authored by 神楽坂玲奈's avatar 神楽坂玲奈

修复战报窗口错位,Unity升级至2021.2.6f1

parent cb953941
Pipeline #7845 canceled with stages
in 1 minute and 26 seconds
...@@ -107,7 +107,7 @@ public class UITexturePacker ...@@ -107,7 +107,7 @@ public class UITexturePacker
storage[i].paddingY = (yPadding != 0); storage[i].paddingY = (yPadding != 0);
} }
texture.Resize(width, height); texture.Reinitialize(width, height);
texture.SetPixels(new Color[width * height]); texture.SetPixels(new Color[width * height]);
// The returned rects // The returned rects
......
...@@ -47,11 +47,11 @@ public class Book : WindowServant2D ...@@ -47,11 +47,11 @@ public class Book : WindowServant2D
base.preFrameFunction(); base.preFrameFunction();
if (isShowed) if (isShowed)
{ {
gameObject.transform.position = Program.I().camera_main_2d.ScreenToWorldPoint( gameObject.transform.position = Utils.UIToWorldPoint(
new Vector3(Program.I().cardDescription.width / 2, new Vector3(Program.I().cardDescription.width / 2,
(Screen.height - Program.I().cardDescription.cHeight) / 2, 0)); (700 - Program.I().cardDescription.cHeight) / 2, 0));
texts.back.width = (int) Program.I().cardDescription.width; texts.back.width = (int) Program.I().cardDescription.width;
texts.back.height = Screen.height - (int) Program.I().cardDescription.cHeight; texts.back.height = 700 - (int) Program.I().cardDescription.cHeight;
} }
} }
......
{ {
"dependencies": { "dependencies": {
"com.unity.ide.rider": "3.0.7", "com.unity.ide.rider": "3.0.7",
"com.unity.ide.visualstudio": "2.0.11", "com.unity.ide.visualstudio": "2.0.12",
"com.unity.ide.vscode": "1.2.3", "com.unity.ide.vscode": "1.2.4",
"com.unity.test-framework": "1.1.29", "com.unity.test-framework": "1.1.29",
"com.unity.timeline": "1.5.6", "com.unity.timeline": "1.6.2",
"com.unity.ugui": "1.0.0", "com.unity.ugui": "1.0.0",
"com.unity.modules.ai": "1.0.0", "com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0", "com.unity.modules.androidjni": "1.0.0",
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.ide.visualstudio": { "com.unity.ide.visualstudio": {
"version": "2.0.11", "version": "2.0.12",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.ide.vscode": { "com.unity.ide.vscode": {
"version": "1.2.3", "version": "1.2.4",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": {}, "dependencies": {},
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
"url": "https://packages.unity.com" "url": "https://packages.unity.com"
}, },
"com.unity.timeline": { "com.unity.timeline": {
"version": "1.5.6", "version": "1.6.2",
"depth": 0, "depth": 0,
"source": "registry", "source": "registry",
"dependencies": { "dependencies": {
......
m_EditorVersion: 2021.1.19f1 m_EditorVersion: 2021.2.6f1
m_EditorVersionWithRevision: 2021.1.19f1 (5f5eb8bbdc25) m_EditorVersionWithRevision: 2021.2.6f1 (8c4e826ba445)
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