Commit fe25df28 authored by hex's avatar hex

Defer system gestures on edges

parent 228e2ce7
Pipeline #39360 failed
...@@ -28,7 +28,7 @@ public class CardDescription : Servant ...@@ -28,7 +28,7 @@ public class CardDescription : Servant
Program.camera_main_2d.ScreenToWorldPoint(new Vector3(-256, Screen.height / 2, 600)), Program.camera_main_2d.ScreenToWorldPoint(new Vector3(-256, Screen.height / 2, 600)),
new Vector3(0, 0, 0), new Vector3(0, 0, 0),
true, true,
Program.I().ui_main_2d Program.I().ui_back_ground_2d
); );
picLoader = gameObject.AddComponent<cardPicLoader>(); picLoader = gameObject.AddComponent<cardPicLoader>();
picLoader.code = 0; picLoader.code = 0;
......
...@@ -1321,8 +1321,7 @@ public class Program : MonoBehaviour ...@@ -1321,8 +1321,7 @@ public class Program : MonoBehaviour
{ {
preWid = Screen.width; preWid = Screen.width;
preheight = Screen.height; preheight = Screen.height;
//if (setting != null)
// setting.setScreenSizeValue();
Program.notGo(fixScreenProblems); Program.notGo(fixScreenProblems);
Program.go(500, fixScreenProblems); Program.go(500, fixScreenProblems);
} }
......
...@@ -109,7 +109,7 @@ public class Servant ...@@ -109,7 +109,7 @@ public class Servant
0 0
); );
Vector3 targetWorldPosition = Program.camera_back_ground_2d.ScreenToWorldPoint(vectorOfShowedBar_Screen); Vector3 targetWorldPosition = Program.camera_main_2d.ScreenToWorldPoint(vectorOfShowedBar_Screen);
toolBar.transform.DOMove(targetWorldPosition, 0.6f); toolBar.transform.DOMove(targetWorldPosition, 0.6f);
toolBar.transform.localScale = new Vector3( toolBar.transform.localScale = new Vector3(
...@@ -131,7 +131,7 @@ public class Servant ...@@ -131,7 +131,7 @@ public class Servant
{ {
Vector3 vectorOfHidedBar_Screen = new Vector3(Screen.width - RightToScreen, -200, 0); Vector3 vectorOfHidedBar_Screen = new Vector3(Screen.width - RightToScreen, -200, 0);
Vector3 targetWorldPosition = Program.camera_back_ground_2d.ScreenToWorldPoint(vectorOfHidedBar_Screen); Vector3 targetWorldPosition = Program.camera_main_2d.ScreenToWorldPoint(vectorOfHidedBar_Screen);
toolBar.transform.DOMove(targetWorldPosition, 0.6f); toolBar.transform.DOMove(targetWorldPosition, 0.6f);
float scaleFactor = Screen.height / 700f; float scaleFactor = Screen.height / 700f;
......
...@@ -13736,10 +13736,9 @@ MonoBehaviour: ...@@ -13736,10 +13736,9 @@ MonoBehaviour:
position: 0 position: 0
alignment: 1 alignment: 1
items: items:
- 10
- 30 - 30
- 50
- 60 - 60
- 90
- 120 - 120
- Auto - Auto
padding: {x: 4, y: 4} padding: {x: 4, y: 4}
......
...@@ -11,7 +11,7 @@ PlayerSettings: ...@@ -11,7 +11,7 @@ PlayerSettings:
defaultScreenOrientation: 4 defaultScreenOrientation: 4
targetDevice: 2 targetDevice: 2
useOnDemandResources: 1 useOnDemandResources: 1
accelerometerFrequency: 60 accelerometerFrequency: 0
companyName: KoishiPro2 companyName: KoishiPro2
productName: KoishiPro2 productName: KoishiPro2
defaultCursor: {fileID: 0} defaultCursor: {fileID: 0}
...@@ -83,7 +83,7 @@ PlayerSettings: ...@@ -83,7 +83,7 @@ PlayerSettings:
muteOtherAudioSources: 0 muteOtherAudioSources: 0
Prepare IOS For Recording: 0 Prepare IOS For Recording: 0
Force IOS Speakers When Recording: 0 Force IOS Speakers When Recording: 0
deferSystemGesturesMode: 0 deferSystemGesturesMode: 15
hideHomeButton: 0 hideHomeButton: 0
submitAnalytics: 0 submitAnalytics: 0
usePlayerLog: 1 usePlayerLog: 1
...@@ -777,7 +777,7 @@ PlayerSettings: ...@@ -777,7 +777,7 @@ PlayerSettings:
WebGL: 1 WebGL: 1
Windows Store Apps: 1 Windows Store Apps: 1
XboxOne: 1 XboxOne: 1
iPhone: 1 iPhone: 2
tvOS: 1 tvOS: 1
incrementalIl2cppBuild: incrementalIl2cppBuild:
iPhone: 0 iPhone: 0
......
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