Commit 40cba164 authored by 神楽坂玲奈's avatar 神楽坂玲奈

1300*700

parent b15c84b7
Pipeline #5176 failed with stage
in 27 minutes and 4 seconds
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -28,7 +28,7 @@ Transform: ...@@ -28,7 +28,7 @@ Transform:
m_GameObject: {fileID: 115194} m_GameObject: {fileID: 115194}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.0026041667, y: 0.0026041667, z: 0.0026041667} m_LocalScale: {x: 0.0028571428, y: 0.0028571428, z: 0.0028571428}
m_Children: m_Children:
- {fileID: 471862} - {fileID: 471862}
m_Father: {fileID: 0} m_Father: {fileID: 0}
...@@ -47,8 +47,8 @@ MonoBehaviour: ...@@ -47,8 +47,8 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
scalingStyle: 1 scalingStyle: 1
manualWidth: 1366 manualWidth: 1300
manualHeight: 768 manualHeight: 700
minimumHeight: 320 minimumHeight: 320
maximumHeight: 2160 maximumHeight: 2160
fitWidth: 0 fitWidth: 0
......
...@@ -17,9 +17,4 @@ public static class Utils ...@@ -17,9 +17,4 @@ public static class Utils
return Program.I().camera_back_ground_2d return Program.I().camera_back_ground_2d
.ViewportToWorldPoint(new Vector3(point.x / UIWidth(), point.y / UIHeight(), point.z)); .ViewportToWorldPoint(new Vector3(point.x / UIWidth(), point.y / UIHeight(), point.z));
} }
// public static float UIScale()
// {
// return Program.I().ui_back_ground_2d.GetComponent<UIRoot>().activeScaling;
// }
} }
\ No newline at end of file
...@@ -51,6 +51,10 @@ public class Program : MonoBehaviour ...@@ -51,6 +51,10 @@ public class Program : MonoBehaviour
public GameObject new_ui_searchDetailed; public GameObject new_ui_searchDetailed;
public GameObject new_bar_editDeck; public GameObject new_bar_editDeck;
public GameObject new_bar_duel; public GameObject new_bar_duel;
public GameObject new_ui_book;
[Header("其他")]
public GameObject mouseParticle;
[Header("Prefab")] public facer face; [Header("Prefab")] public facer face;
public AudioClip zhankai; public AudioClip zhankai;
...@@ -120,7 +124,6 @@ public class Program : MonoBehaviour ...@@ -120,7 +124,6 @@ public class Program : MonoBehaviour
public GameObject mod_ocgcore_ss_dark_hole; public GameObject mod_ocgcore_ss_dark_hole;
public GameObject mod_ocgcore_ss_link_mark; public GameObject mod_ocgcore_ss_link_mark;
public GameObject new_ui_book;
public GameObject new_ui_cardOnSearchList; public GameObject new_ui_cardOnSearchList;
public GameObject new_bar_changeSide; public GameObject new_bar_changeSide;
public GameObject new_bar_watchDuel; public GameObject new_bar_watchDuel;
...@@ -134,7 +137,6 @@ public class Program : MonoBehaviour ...@@ -134,7 +137,6 @@ public class Program : MonoBehaviour
public GameObject new_ocgcore_field; public GameObject new_ocgcore_field;
public GameObject new_ocgcore_chainCircle; public GameObject new_ocgcore_chainCircle;
public GameObject new_ocgcore_wait; public GameObject new_ocgcore_wait;
public GameObject new_mouse;
public GameObject remaster_tagRoom; public GameObject remaster_tagRoom;
public GameObject remaster_room; public GameObject remaster_room;
public GameObject ES_1; public GameObject ES_1;
...@@ -476,7 +478,7 @@ public class Program : MonoBehaviour ...@@ -476,7 +478,7 @@ public class Program : MonoBehaviour
} }
} }
public GameObject mouseParticle;
private static int lastChargeTime; private static int lastChargeTime;
...@@ -794,7 +796,7 @@ public class Program : MonoBehaviour ...@@ -794,7 +796,7 @@ public class Program : MonoBehaviour
if (Screen.width < 100 || Screen.height < 100) Screen.SetResolution(1366, 768, false); if (Screen.width < 100 || Screen.height < 100) Screen.SetResolution(1366, 768, false);
QualitySettings.vSyncCount = 0; QualitySettings.vSyncCount = 0;
Application.targetFrameRate = 144; Application.targetFrameRate = 144;
mouseParticle = Instantiate(new_mouse); // mouseParticle = Instantiate(new_mouse);
instance = this; instance = this;
initialize(); initialize();
go(500, () => { gameStart(); }); go(500, () => { gameStart(); });
......
This diff is collapsed.
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