diff --git a/meng_yao/Assets/Resources/preform/gui/pop_up_ui.prefab b/meng_yao/Assets/Resources/preform/gui/pop_up_ui.prefab index 29d7d65c7..dda05faeb 100644 --- a/meng_yao/Assets/Resources/preform/gui/pop_up_ui.prefab +++ b/meng_yao/Assets/Resources/preform/gui/pop_up_ui.prefab @@ -438,9 +438,9 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 540, y: 960} - m_SizeDelta: {x: 1080, y: 1920} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9071259163357382586 CanvasRenderer: diff --git a/meng_yao/Assets/Scenes/loading.unity b/meng_yao/Assets/Scenes/loading.unity index 4d9880b71..626bd809a 100644 --- a/meng_yao/Assets/Scenes/loading.unity +++ b/meng_yao/Assets/Scenes/loading.unity @@ -225,6 +225,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 1125018133084166439, guid: 4d328a61046e1d2498391895fd2c11d7, type: 3} + propertyPath: m_UiScaleMode + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5327073757694762713, guid: 4d328a61046e1d2498391895fd2c11d7, type: 3} propertyPath: canvs value: diff --git a/meng_yao/Assets/Scenes/scene_Main.unity b/meng_yao/Assets/Scenes/scene_Main.unity index 0b56fb3ee..8e34f760c 100644 --- a/meng_yao/Assets/Scenes/scene_Main.unity +++ b/meng_yao/Assets/Scenes/scene_Main.unity @@ -29977,7 +29977,7 @@ PrefabInstance: - target: {fileID: 1402318480, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: canvas value: - objectReference: {fileID: 914645750} + objectReference: {fileID: 599549935} - target: {fileID: 2094030769, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: Id value: @@ -52806,6 +52806,10 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName value: UnityEngine.Object, UnityEngine objectReference: {fileID: 0} + - target: {fileID: 7559150912297902898, guid: da36d88841e59564b82d1d3d07b0f5ae, type: 3} + propertyPath: m_Text + value: "\u6218\u961F" + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: da36d88841e59564b82d1d3d07b0f5ae, type: 3} --- !u!224 &626587212 stripped @@ -129380,7 +129384,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8631885452844930977, guid: 638b7f7423db411419568d073208d929, type: 3} propertyPath: m_Name - value: "\u517B\u6210" + value: text + objectReference: {fileID: 0} + - target: {fileID: 8631885452844930979, guid: 638b7f7423db411419568d073208d929, type: 3} + propertyPath: m_Text + value: "\u9501\u5996\u5854" objectReference: {fileID: 0} m_RemovedComponents: - {fileID: 1906224345288813973, guid: 638b7f7423db411419568d073208d929, type: 3} @@ -175061,8 +175069,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 45.169, y: -0.00021076} - m_SizeDelta: {x: 250.34, y: 70.466} + m_AnchoredPosition: {x: 29.944, y: 0.000033381} + m_SizeDelta: {x: 119.64, y: 70.466} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1477323885143245122 MonoBehaviour: @@ -175097,7 +175105,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5317\u4EAC\u5E02 \u6D77\u6DC0\u533A" + m_Text: "\u9668\u661F" --- !u!222 &1477323885143245123 CanvasRenderer: m_ObjectHideFlags: 0 @@ -178100,8 +178108,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 952.1, y: -178} - m_SizeDelta: {x: 340.6767, y: 70.466} + m_AnchoredPosition: {x: 1021, y: -175} + m_SizeDelta: {x: 147.7523, y: 70.466} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1477323886788678490 GameObject: @@ -178253,7 +178261,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 60.7, y: -3.6} + m_AnchoredPosition: {x: 22, y: -3} m_SizeDelta: {x: 44, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1477323886872994829 diff --git a/meng_yao/Assets/script/TanChuang/GgTanchuang.cs b/meng_yao/Assets/script/TanChuang/GgTanchuang.cs index ebfed1c27..5420bc34d 100644 --- a/meng_yao/Assets/script/TanChuang/GgTanchuang.cs +++ b/meng_yao/Assets/script/TanChuang/GgTanchuang.cs @@ -15,7 +15,7 @@ public class GgTanchuang : mount public Sprite GgglDownsp; public Sprite GgglUpsp; - Transform canvas; + public Transform canvas; // Start is called before the first frame update private void Awake() { @@ -27,7 +27,7 @@ public class GgTanchuang : mount { Ggbtn.onClick.AddListener(Display_pop_up_window); - canvas = GameObject.Find("pop").transform; + // canvas = GameObject.Find("MainCanvas").transform; //GgPanel = this.GetComponent(); } @@ -44,8 +44,12 @@ public class GgTanchuang : mount boxTypes.Add(new BoxType { Name = "", prompt = "确认", Type = 11 }); GameObject gameObject = add_pop_up(); gameObject.transform.SetParent(canvas); + gameObject.transform.position = new Vector3(Screen.width/2,Screen.height/2,0); - + RectTransform re = gameObject.GetComponent(); + re.offsetMin = new Vector2(0, 0); + re.offsetMax = new Vector2(0, 0); //设置他的recttransform使他能够完全填满整个屏幕 + gameObject.GetComponent().minHeight = 800;//设置最低高度 gameObject.GetComponent().setScrollMode(0);//设置滚动模式为滚动 //gameObject.GetComponent().setScrollMode(0);//设置滚动模式为自动填充 diff --git a/meng_yao/Assets/script/scene_Main/ui/Personal_Copy.cs b/meng_yao/Assets/script/scene_Main/ui/Personal_Copy.cs index 940280708..9fff6b0e9 100644 --- a/meng_yao/Assets/script/scene_Main/ui/Personal_Copy.cs +++ b/meng_yao/Assets/script/scene_Main/ui/Personal_Copy.cs @@ -16,6 +16,7 @@ public class Personal_Copy : MonoBehaviour void CopyClick() { Clipboard.CopyToClipboard(CopyText.text); + Promptmgr.Instance.PromptBubble("复制成功"); } // Update is called once per frame void Update() diff --git a/meng_yao/Assets/script/scene_jishadao/jishadao_contorl.cs b/meng_yao/Assets/script/scene_jishadao/jishadao_contorl.cs index 5b6db4136..6c6776086 100644 --- a/meng_yao/Assets/script/scene_jishadao/jishadao_contorl.cs +++ b/meng_yao/Assets/script/scene_jishadao/jishadao_contorl.cs @@ -94,20 +94,12 @@ public class jishadao_contorl : MonoBehaviour goldNumerTextPro.text = ActivateValue.ToString(); } public async void OnClick() - { + { - if (!canClick) - { - return; - } - ScaleAni(OnBtnAni); - - if (fishMan == null) - { - // Promptmgr.Instance.PromptBubble("还没有买船了", Color.black, Color.red); - return; - } + //ScaleAni(OnBtnAni); + + } ///