소스 검색

修改bug

lzx 19 시간 전
부모
커밋
80633767f6

+ 13 - 3
Assets/Res/UI/SettingPanel/SettingPanel.prefab

@@ -373,7 +373,7 @@ GameObject:
   - component: {fileID: 783049085354423036}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Btn_googledenglu
+  m_Name: Btn_BindGoogle
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1127,7 +1127,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5220\u9664\u8D26\u53F7"
+  m_Text: "\u7ED1\u5B9AGoogle"
 --- !u!1 &2321818779751378156
 GameObject:
   m_ObjectHideFlags: 0
@@ -1635,7 +1635,7 @@ GameObject:
   - component: {fileID: 3505351788308317489}
   m_Layer: 5
   m_HasEditorInfo: 1
-  m_Name: Btn_YinXiao (1)
+  m_Name: Btn_ID
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -4168,6 +4168,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: Btn_BindGoogle
+    gameObject: {fileID: 783049085354423036}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_ID
+    gameObject: {fileID: 3505351788308317489}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
 --- !u!114 &3362496358548609416
 MonoBehaviour:

+ 14 - 1
Assets/Scripts/GameUI/UI/SettingPanel/SettingPanel.cs

@@ -1,5 +1,6 @@
 using Core.Audio;
 using Fort23.Core;
+using UnityEngine;
 
 namespace Fort23.Mono
 {
@@ -45,6 +46,12 @@ namespace Fort23.Mono
                 Toggle_YinYue.ChangeState(0);
             }
 
+#if Google
+            Btn_BindGoogle.gameObject.SetActive(true);
+#else
+            Btn_BindGoogle.gameObject.SetActive(false);
+#endif
+
             return base.AsyncInit(uiData);
         }
 
@@ -97,9 +104,15 @@ namespace Fort23.Mono
                     TipMessagePanel.OpenTipMessagePanel("上传失败!");
                 }
             });
+
+            Btn_ID.onClick.AddListener(() =>
+            {
+                GUIUtility.systemCopyBuffer = AccountFileInfo.Instance.playerData.playerId;
+                TipMessagePanel.OpenTipMessagePanel("已复制");
+            });
         }
 
-        public async static CTask OpenPanel( UILayer layer = UILayer.Top)
+        public async static CTask OpenPanel(UILayer layer = UILayer.Top)
         {
             await UIManager.Instance.LoadAndOpenPanel<SettingPanel>(null, layer, isShowBG: true);
         }

+ 22 - 0
Assets/Scripts/GameUI/UI/SettingPanel/SettingPanelData.cs

@@ -129,6 +129,28 @@ namespace Fort23.Mono
 	      return _Btn_DownloadArchive;
 	     }
 	   }
+	  private Button _Btn_BindGoogle;
+	  public Button Btn_BindGoogle
+	   {
+	   get{
+	      if (_Btn_BindGoogle == null)
+	       {
+	         _Btn_BindGoogle  = GetUIUnit<Button>("Btn_BindGoogle"); 
+	       }
+	      return _Btn_BindGoogle;
+	     }
+	   }
+	  private Button _Btn_ID;
+	  public Button Btn_ID
+	   {
+	   get{
+	      if (_Btn_ID == null)
+	       {
+	         _Btn_ID  = GetUIUnit<Button>("Btn_ID"); 
+	       }
+	      return _Btn_ID;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

+ 2 - 2
Assets/Scripts/GameUI/UI/ShopPanel/ShopBoxWidget.cs

@@ -82,7 +82,7 @@ namespace Fort23.Mono
         {
             if (summonData.isSummonSocre)
             {
-                TipMessagePanelType2.OpenTipMessagePanel("已经开启300抽挑战,不能进行单抽了");
+                TipMessagePanelType2.OpenTipMessagePanel("已经开启200抽挑战,不能进行单抽了");
                 return;
             }
 
@@ -94,7 +94,7 @@ namespace Fort23.Mono
 
             if (PlayerManager.Instance.serverTime < summonData.nextOneFreeTime)
             {
-                TipMessagePanelType2.OpenTipMessagePanel("还未到达免费时间!请稍再试");
+                TipMessagePanelType2.OpenTipMessagePanel("还未到达免费时间!请稍再试");
                 return;
             }