From 1cb555c13d566035804ad161776b36c9c416ba49 Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Thu, 16 Dec 2021 16:54:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Prefab/NewRoute/Mobile/Message.prefab | 41 ++++++++---- Assets/Scripts/Scenes/MainController.cs | 65 ++++++++++--------- 2 files changed, 63 insertions(+), 43 deletions(-) diff --git a/Assets/Resources/UI/Prefab/NewRoute/Mobile/Message.prefab b/Assets/Resources/UI/Prefab/NewRoute/Mobile/Message.prefab index ecd2507a..9468b722 100644 --- a/Assets/Resources/UI/Prefab/NewRoute/Mobile/Message.prefab +++ b/Assets/Resources/UI/Prefab/NewRoute/Mobile/Message.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 3342506722007875056} - component: {fileID: 3342506722007875058} - component: {fileID: 3342506722007875061} + - component: {fileID: 965343107992592655} m_Layer: 5 m_Name: Message m_TagString: Untagged @@ -37,11 +38,11 @@ RectTransform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -717, y: -76} - m_SizeDelta: {x: 280, y: 44} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 224, y: 36} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &3342506722007875059 CanvasRenderer: m_ObjectHideFlags: 0 @@ -115,6 +116,18 @@ MonoBehaviour: m_GradientStyle: 0 m_ColorSpace: -1 m_IgnoreAspectRatio: 1 +--- !u!225 &965343107992592655 +CanvasGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3342506722007875022} + m_Enabled: 1 + m_Alpha: 0 + m_Interactable: 1 + m_BlocksRaycasts: 1 + m_IgnoreParentGroups: 0 --- !u!1 &3342506722835179387 GameObject: m_ObjectHideFlags: 0 @@ -149,8 +162,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 9, y: -24} - m_SizeDelta: {x: -62, y: 14} + m_AnchoredPosition: {x: 12, y: -18} + m_SizeDelta: {x: -44, y: 12} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3342506722835179388 CanvasRenderer: @@ -181,7 +194,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 12 + m_FontSize: 10 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -227,8 +240,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 9, y: -10} - m_SizeDelta: {x: -62, y: 14} + m_AnchoredPosition: {x: 12, y: -4} + m_SizeDelta: {x: -44, y: 12} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3342506723743580664 CanvasRenderer: @@ -259,12 +272,12 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 12 + m_FontSize: 10 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -307,7 +320,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} m_AnchoredPosition: {x: 8, y: 0} - m_SizeDelta: {x: 26, y: 26} + m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0, y: 0.5} --- !u!222 &3342506723879539846 CanvasRenderer: @@ -355,4 +368,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} m_Name: m_EditorClassIdentifier: - radius: 13 + radius: 10 diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index ffec6bc5..3e13cf38 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -60,14 +60,7 @@ public class MainController : BaseScene private void OnIsHomeChanged(object sender, EventArgs e) { DOTween.KillAll(); - if ((bool)sender) - { - FinishMessageRight(); - } - else - { - FinishMessageLeft(); - } + FinishMessage(sender); } CanvasGroup[] msgs; @@ -76,6 +69,7 @@ public class MainController : BaseScene CanvasGroup rightMessage; private void InitialMessage() { +#if UNITY_STANDALONE_WIN msgLocation = 1 * msg.transform.localPosition; var msg2 = Instantiate(msg); var msg3 = Instantiate(msg); @@ -88,10 +82,23 @@ public class MainController : BaseScene msg3.transform.localScale = Vector3.one; msg3.alpha = 0; msgs = new CanvasGroup[] { msg, msg2, msg3 }; - rightMessage = transform.Find("GameObject/MessageRight").GetComponent(); -#if !UNITY_STANDALONE_WIN +#else + var go = transform.Find("GameObject"); + go.GetComponent().anchorMin = Vector2.zero; + go.GetComponent().anchorMax = Vector2.one; + go.GetComponent().offsetMax = Vector2.zero; + go.GetComponent().offsetMin = Vector2.zero; + DestroyImmediate(transform.Find("GameObject/Message").gameObject); + DestroyImmediate(transform.Find("GameObject/MessageRight").gameObject); + var m = Resources.Load("UI/Prefab/NewRoute/Mobile/Message"); + rightMessage = Instantiate(m).GetComponent(); + rightMessage.transform.SetParent(go); + rightMessage.transform.localScale = Vector3.one; + rightMessage.transform.localPosition = new Vector3(-112, 164, 0); + Debug.Log(rightMessage.GetComponent().localPosition); + //rightMessage.transform.SetParent(transform.Find("GameObject")); #endif } @@ -110,23 +117,16 @@ public class MainController : BaseScene DoMessageRight(e); } #else - + if (App.currentPageIsHome) + { + DoMessageRight(e); + } #endif } private void DoMessageRight(LinkedMessageEvent e) { SetMessage(rightMessage, e); - rightMessage.DOFade(1, 0.5f).onComplete = () => - { - if (App.currentPageIsHome) - { - foreach (var item in msgs) - { - item.alpha = 0; - } - } - Invoke("fade0", 0.8f); - }; + rightMessage.DOFade(1, 0.5f).onComplete = () => Invoke("fade0", 0.8f); } private void DoMessage(LinkedMessageEvent e) { @@ -155,16 +155,23 @@ public class MainController : BaseScene } msgIndex++; } - void FinishMessage() + void FinishMessage(object sender) { - if (App.currentPageIsHome) - { - FinishMessageLeft(); - } - else +#if UNITY_STANDALONE_WIN + if ((bool)sender) { FinishMessageRight(); } + else + { + FinishMessageLeft(); + } +#else + if (!(bool)sender) + { + FinishMessageRight(); + } +#endif } void FinishMessageLeft() { @@ -289,7 +296,7 @@ public class MainController : BaseScene if (emptyt >= 10) { emptyt = 0; - FinishMessage(); + FinishMessage(App.currentPageIsHome); } if (scanTicks == 10) {