모바일 버그 수정
This commit is contained in:
parent
cc13baff78
commit
6f72345ad6
|
|
@ -7843,6 +7843,114 @@ CanvasRenderer:
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1567209627}
|
m_GameObject: {fileID: 1567209627}
|
||||||
m_CullTransparentMesh: 1
|
m_CullTransparentMesh: 1
|
||||||
|
--- !u!1 &1611526041
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1611526044}
|
||||||
|
- component: {fileID: 1611526043}
|
||||||
|
- component: {fileID: 1611526042}
|
||||||
|
- component: {fileID: 1611526045}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Reporter
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!114 &1611526042
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1611526041}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 6767a180de870304caa2013b2772dd62, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
--- !u!114 &1611526043
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1611526041}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 600c02144c4813244abd262cbcbe8825, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
show: 0
|
||||||
|
UserData:
|
||||||
|
fps: 0
|
||||||
|
fpsText:
|
||||||
|
images:
|
||||||
|
clearImage: {fileID: 2800000, guid: 112c6fcf56e349449ab2e6ad76b67816, type: 3}
|
||||||
|
collapseImage: {fileID: 2800000, guid: 4623f326a884a2546ab39078bf7822c3, type: 3}
|
||||||
|
clearOnNewSceneImage: {fileID: 2800000, guid: 3a6bc61a8319b1949ab9f1f2db1302b4, type: 3}
|
||||||
|
showTimeImage: {fileID: 2800000, guid: 782e03669fa4a614e89ef56252134250, type: 3}
|
||||||
|
showSceneImage: {fileID: 2800000, guid: ff4dfb29f203a174ab8e4c498afe908a, type: 3}
|
||||||
|
userImage: {fileID: 2800000, guid: 2bcdc012e7356f1449ce7d3a31dc458c, type: 3}
|
||||||
|
showMemoryImage: {fileID: 2800000, guid: f447d62f2dacf9843be7cbf168a3a9d0, type: 3}
|
||||||
|
softwareImage: {fileID: 2800000, guid: 6c91fc88ee6c791468318d85febfb48d, type: 3}
|
||||||
|
dateImage: {fileID: 2800000, guid: a7561cd0a9f62a84e99bff1abce2a222, type: 3}
|
||||||
|
showFpsImage: {fileID: 2800000, guid: 90b2f48155dc0e74f8e428561ac79da5, type: 3}
|
||||||
|
infoImage: {fileID: 2800000, guid: 2954bef266e6d794aba08ceacc887a0f, type: 3}
|
||||||
|
saveLogsImage: {fileID: 2800000, guid: 4a4821d80a1fc774fb76eac6213544e7, type: 3}
|
||||||
|
searchImage: {fileID: 2800000, guid: bfef37b5a26d2264798616d960451329, type: 3}
|
||||||
|
copyImage: {fileID: 2800000, guid: 7f36d71624c630046b855909c497be17, type: 3}
|
||||||
|
closeImage: {fileID: 2800000, guid: b65e9be99974bc94eab5d6698811d0b8, type: 3}
|
||||||
|
buildFromImage: {fileID: 2800000, guid: 8702be598dd9f504ca33be2afee2ca33, type: 3}
|
||||||
|
systemInfoImage: {fileID: 2800000, guid: e9011b1dc9256ad4d9c19a31c595f95f, type: 3}
|
||||||
|
graphicsInfoImage: {fileID: 2800000, guid: 999d31716332cc04eb4abc9c9270b0ca, type: 3}
|
||||||
|
backImage: {fileID: 2800000, guid: a0632a18e7c665641b94fea66506ab50, type: 3}
|
||||||
|
logImage: {fileID: 2800000, guid: e876b803a4dd5c5488078071d15aa9c0, type: 3}
|
||||||
|
warningImage: {fileID: 2800000, guid: 1066be8e7b994b94c8a182b8dbe30705, type: 3}
|
||||||
|
errorImage: {fileID: 2800000, guid: 7640ebf8b3a92124d821d3b4b8b3fd7e, type: 3}
|
||||||
|
barImage: {fileID: 2800000, guid: 8128d4f4c0193e34586f9631ef7d4787, type: 3}
|
||||||
|
button_activeImage: {fileID: 2800000, guid: 2580a2e903691e44282e56ed6e0ff37a, type: 3}
|
||||||
|
even_logImage: {fileID: 2800000, guid: d27aad55b568c6544b0b95a95da44bc7, type: 3}
|
||||||
|
odd_logImage: {fileID: 2800000, guid: 8ffbb44a2c3adae45913474e4fd487f5, type: 3}
|
||||||
|
selectedImage: {fileID: 2800000, guid: 17117a429b08e7e43b0b6c8421de69fe, type: 3}
|
||||||
|
reporterScrollerSkin: {fileID: 11400000, guid: 1cc68832d00d3284a9324a4dc05be753, type: 2}
|
||||||
|
size: {x: 32, y: 32}
|
||||||
|
maxSize: 20
|
||||||
|
numOfCircleToShow: 1
|
||||||
|
Initialized: 0
|
||||||
|
--- !u!4 &1611526044
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1611526041}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!114 &1611526045
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1611526041}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 64a73dd502174854d988918bbdda0330, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
canvas: {fileID: 1137523889}
|
||||||
--- !u!1 &1628350767
|
--- !u!1 &1628350767
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -10120,3 +10228,4 @@ SceneRoots:
|
||||||
- {fileID: 1137523890}
|
- {fileID: 1137523890}
|
||||||
- {fileID: 52538299}
|
- {fileID: 52538299}
|
||||||
- {fileID: 986602854}
|
- {fileID: 986602854}
|
||||||
|
- {fileID: 1611526044}
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,4 @@
|
||||||
using System.Collections;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using Unity.Collections;
|
|
||||||
using UnityEngine;
|
|
||||||
using UnityEngine.SceneManagement;
|
|
||||||
|
|
||||||
public class GameManager : DontDestroy<GameManager>
|
public class GameManager : DontDestroy<GameManager>
|
||||||
{
|
{
|
||||||
#if !UNITY_EDITOR
|
|
||||||
protected override void OnAwake()
|
|
||||||
{
|
|
||||||
WebGLInput.captureAllKeyboardInput = false;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,24 +5,35 @@ using UnityEngine;
|
||||||
|
|
||||||
public class Test : MonoBehaviour
|
public class Test : MonoBehaviour
|
||||||
{
|
{
|
||||||
public TMP_Text text;
|
//public TMP_Text text;
|
||||||
public Canvas canvas;
|
public Canvas canvas;
|
||||||
|
private float time = 0;
|
||||||
|
//ApiResponse apiResponse;
|
||||||
|
|
||||||
ApiResponse apiResponse;
|
//private void Start()
|
||||||
|
//{
|
||||||
private void Start()
|
// NetworkManager.Instance.CreateRequest<ApiResponse>("api/test",new object(),(data) => {
|
||||||
{
|
// apiResponse = data;
|
||||||
NetworkManager.Instance.CreateRequest<ApiResponse>("api/test",new object(),(data) => {
|
// });
|
||||||
apiResponse = data;
|
//}
|
||||||
});
|
//private void Start()
|
||||||
}
|
//{
|
||||||
void Update()
|
// WebGLInput.captureAllKeyboardInput = false;
|
||||||
{
|
//}
|
||||||
text.text = $"x : {canvas.transform.position.x}, y : {canvas.transform.position.y}\nip : {(apiResponse == null ? "null": apiResponse.test)}";
|
//void Update()
|
||||||
}
|
//{
|
||||||
public class ApiResponse
|
// time += Time.deltaTime;
|
||||||
{
|
// if(time > 2.0f)
|
||||||
public string test;
|
// {
|
||||||
}
|
// time = 0;
|
||||||
|
// Debug.Log($"x : {canvas.transform.position.x}, y : {canvas.transform.position.y}");
|
||||||
|
// }
|
||||||
|
// //text.text = $"x : {canvas.transform.position.x}, y : {canvas.transform.position.y}\nip : {(apiResponse == null ? "null": apiResponse.test)}";
|
||||||
|
|
||||||
|
//}
|
||||||
|
//public class ApiResponse
|
||||||
|
//{
|
||||||
|
// public string test;
|
||||||
|
//}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
|
|
@ -170,22 +170,19 @@ namespace WebGLSupport
|
||||||
RectInt GetElemetRect()
|
RectInt GetElemetRect()
|
||||||
{
|
{
|
||||||
var rect = input.GetScreenCoordinates();
|
var rect = input.GetScreenCoordinates();
|
||||||
//// モバイルの場合、強制表示する
|
// モバイルの場合、強制表示する
|
||||||
//if (showHtmlElement || Application.isMobilePlatform)
|
if (showHtmlElement || Application.isMobilePlatform)
|
||||||
//{
|
{
|
||||||
// var x = (int)(rect.x);
|
var x = (int)(rect.x);
|
||||||
// var y = (int)(Screen.height - (rect.y + rect.height));
|
var y = (int)(Screen.height - (rect.y + rect.height));
|
||||||
// return new RectInt(x, y, (int)rect.width, (int)rect.height);
|
return new RectInt(x, y, (int)rect.width, (int)rect.height);
|
||||||
//}
|
}
|
||||||
//else
|
else
|
||||||
//{
|
{
|
||||||
// var x = (int)(rect.x);
|
var x = (int)(rect.x);
|
||||||
// var y = (int)(Screen.height - (rect.y));
|
var y = (int)(Screen.height - (rect.y));
|
||||||
// return new RectInt(x, y, (int)rect.width, (int)1);
|
return new RectInt(x, y, (int)rect.width, (int)1);
|
||||||
//}
|
}
|
||||||
var x = (int)(rect.x);
|
|
||||||
var y = (int)(Screen.height - (rect.y));
|
|
||||||
return new RectInt(x, y, (int)rect.width, (int)1);
|
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 対象が選択されたとき
|
/// 対象が選択されたとき
|
||||||
|
|
@ -201,9 +198,7 @@ namespace WebGLSupport
|
||||||
var fontSize = Mathf.Max(14, input.fontSize); // limit font size : 14 !!
|
var fontSize = Mathf.Max(14, input.fontSize); // limit font size : 14 !!
|
||||||
|
|
||||||
// モバイルの場合、強制表示する
|
// モバイルの場合、強制表示する
|
||||||
var isHidden = !(showHtmlElement || Application.isMobilePlatform);
|
id = WebGLInputPlugin.WebGLInputCreate(WebGLInput.CanvasId, rect.x, rect.y, rect.width, rect.height, fontSize, input.text, input.placeholder, input.lineType != LineType.SingleLine, isPassword, true, Application.isMobilePlatform);
|
||||||
id = WebGLInputPlugin.WebGLInputCreate(WebGLInput.CanvasId, rect.x, rect.y, rect.width, rect.height, fontSize, input.text, input.placeholder, input.lineType != LineType.SingleLine, isPassword, isHidden, Application.isMobilePlatform);
|
|
||||||
|
|
||||||
instances[id] = this;
|
instances[id] = this;
|
||||||
WebGLInputPlugin.WebGLInputEnterSubmit(id, input.lineType != LineType.MultiLineNewline);
|
WebGLInputPlugin.WebGLInputEnterSubmit(id, input.lineType != LineType.MultiLineNewline);
|
||||||
WebGLInputPlugin.WebGLInputOnFocus(id, OnFocus);
|
WebGLInputPlugin.WebGLInputOnFocus(id, OnFocus);
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,7 @@ PlayerSettings:
|
||||||
androidFullscreenMode: 1
|
androidFullscreenMode: 1
|
||||||
defaultIsNativeResolution: 1
|
defaultIsNativeResolution: 1
|
||||||
macRetinaSupport: 1
|
macRetinaSupport: 1
|
||||||
runInBackground: 0
|
runInBackground: 1
|
||||||
captureSingleScreen: 0
|
captureSingleScreen: 0
|
||||||
muteOtherAudioSources: 0
|
muteOtherAudioSources: 0
|
||||||
Prepare IOS For Recording: 0
|
Prepare IOS For Recording: 0
|
||||||
|
|
@ -686,10 +686,12 @@ PlayerSettings:
|
||||||
webGLPowerPreference: 2
|
webGLPowerPreference: 2
|
||||||
scriptingDefineSymbols:
|
scriptingDefineSymbols:
|
||||||
WebGL: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1
|
WebGL: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1
|
||||||
additionalCompilerArguments: {}
|
additionalCompilerArguments:
|
||||||
|
WebGL: []
|
||||||
platformArchitecture: {}
|
platformArchitecture: {}
|
||||||
scriptingBackend: {}
|
scriptingBackend: {}
|
||||||
il2cppCompilerConfiguration: {}
|
il2cppCompilerConfiguration:
|
||||||
|
WebGL: 2
|
||||||
il2cppCodeGeneration: {}
|
il2cppCodeGeneration: {}
|
||||||
managedStrippingLevel:
|
managedStrippingLevel:
|
||||||
EmbeddedLinux: 1
|
EmbeddedLinux: 1
|
||||||
|
|
|
||||||
|
|
@ -13,9 +13,12 @@
|
||||||
overflow: hidden; /* 스크롤 제거 */
|
overflow: hidden; /* 스크롤 제거 */
|
||||||
width: 100vw;
|
width: 100vw;
|
||||||
height: 100vh;
|
height: 100vh;
|
||||||
|
overscroll-behavior: contain; /* 뷰포트 이동 방지 */
|
||||||
|
touch-action: manipulation; /* 터치 동작 최적화 */
|
||||||
|
position: fixed; /* 화면 크기 변경 방지 */
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
<canvas id="unity-canvas" width=960 height=600 tabindex="-1" style="width: 100vw; height: 100vh; background: rgb(255 255 255)"></canvas>
|
<canvas id="unity-canvas" width=960 height=600 tabindex="-1" style="width: 100vw; height: 100vh; background: #FFFFFF"></canvas>
|
||||||
<script src="Build/Build.loader.js"></script>
|
<script src="Build/Build.loader.js"></script>
|
||||||
<script>
|
<script>
|
||||||
if (/iPhone|iPad|iPod|Android/i.test(navigator.userAgent)) {
|
if (/iPhone|iPad|iPod|Android/i.test(navigator.userAgent)) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue