diff --git a/Assets/BingoBrain/BingoScene.cs b/Assets/BingoBrain/BingoScene.cs index 035ab77..e15c6dd 100644 --- a/Assets/BingoBrain/BingoScene.cs +++ b/Assets/BingoBrain/BingoScene.cs @@ -85,8 +85,8 @@ namespace BingoBrain int flyswitch = ConfigSystem.GetConfig().flyswitch; int propswitch = ConfigSystem.GetConfig().propswitch; - int offset_y = 0; - int offset_y1 = 0; + int offset_y = ConfigSystem.GetConfig().WVOffset[0]; + int offset_y1 = ConfigSystem.GetConfig().WVOffset[1]; Debug.Log("barry offset_y: " + offset_y + " offset_y1: " + offset_y1); float top_offset = 0;//fgui中的顶部信息的高度 float buttom_offset = 157; @@ -102,7 +102,7 @@ namespace BingoBrain // Debug.Log($"propswitch==1 ------ {propswitch == 1}"); WebviewManager.Instance.setFlyBtnTag(flyswitch == 1); WebviewManager.Instance.setRewardBtnTag(propswitch == 1); - WebviewManager.Instance.SetDarkThough(false); + WebviewManager.Instance.SetDarkThough(true); WebviewManager.Instance.ShowH5View(false); WebviewManager.Instance.SetBtn(ConfigSystem.GetConfig().propCoord[0], ConfigSystem.GetConfig().propCoord[1], 60, 60); } diff --git a/Assets/BingoSun/Scripts/WebviewManager.cs b/Assets/BingoSun/Scripts/WebviewManager.cs index eed067b..19cede6 100644 --- a/Assets/BingoSun/Scripts/WebviewManager.cs +++ b/Assets/BingoSun/Scripts/WebviewManager.cs @@ -523,18 +523,18 @@ namespace DontConfuse } EndLoop: Debug.Log(""); - if (click_card) - { - if (orthoCamera == null) orthoCamera = GameObject.Find("GameCamera").GetComponent(); - Ray ray = orthoCamera.ScreenPointToRay(new Vector2(float.Parse(a[0]) * Screen.width, (1 - float.Parse(a[1])) * Screen.height)); - RaycastHit hit; - int layerMask = 1 << 6; + // if (click_card) + // { + // if (orthoCamera == null) orthoCamera = GameObject.Find("GameCamera").GetComponent(); + // Ray ray = orthoCamera.ScreenPointToRay(new Vector2(float.Parse(a[0]) * Screen.width, (1 - float.Parse(a[1])) * Screen.height)); + // RaycastHit hit; + // int layerMask = 1 << 6; - if (Physics.Raycast(ray, out hit, Mathf.Infinity, layerMask)) - { - // GameDispatcher.Instance.Dispatch(GameMsg.card_click, hit.collider.gameObject.name); - } - } + // if (Physics.Raycast(ray, out hit, Mathf.Infinity, layerMask)) + // { + // // GameDispatcher.Instance.Dispatch(GameMsg.card_click, hit.collider.gameObject.name); + // } + // } } } @@ -683,11 +683,11 @@ namespace DontConfuse if (i != 0) darkWVRefreshtime_str += "|"; darkWVRefreshtime_str += ConfigSystem.GetConfig().darkWVRefreshtime[i].ToString(); } - // for (int i = 0; i < ConfigSystem.GetConfig().darkWVRefreshtime2.Length; i++) - // { - // darkWVRefreshtime_str += "|"; - // darkWVRefreshtime_str += ConfigSystem.GetConfig().darkWVRefreshtime2[i].ToString(); - // } + for (int i = 0; i < ConfigSystem.GetConfig().darkWVRefreshtime2.Length; i++) + { + darkWVRefreshtime_str += "|"; + darkWVRefreshtime_str += ConfigSystem.GetConfig().darkWVRefreshtime2[i].ToString(); + } Debug.Log("--------------------------------"); diff --git a/Assets/Reserved/Scene/BingoScene.unity b/Assets/Reserved/Scene/BingoScene.unity index 86d4746..948a806 100644 --- a/Assets/Reserved/Scene/BingoScene.unity +++ b/Assets/Reserved/Scene/BingoScene.unity @@ -138,7 +138,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &137049539 MonoBehaviour: m_ObjectHideFlags: 0