Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks

meng_yao/Assets/Config/Android/Clipboard.cs

@@ -2,7 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class Clipboard : MonoBehaviour
+public class Clipboard
 {
 
     // 将文本复制到剪贴板
@@ -10,6 +10,7 @@ public class Clipboard : MonoBehaviour
     {
         if (Application.platform == RuntimePlatform.Android)
         {
+            Debug.Log("进入复制粘贴方法");
             // 获取 Android 的 ClipboardManager 类
             using (AndroidJavaClass unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer"))
             {

meng_yao/Assets/Resources/preform/gui/Hero_Ui.prefab

@@ -1464,12 +1464,12 @@ MonoBehaviour:
     button_1_text: 
   textobj: {fileID: 0}
   promptobj: {fileID: 5616551305478333436}
-  promptobj2: {fileID: 5616551307087571641}
+  promptobj2: {fileID: 5616551305478333436}
   contentobj: {fileID: 0}
   iconobj: {fileID: 2063899790}
   iconobj2: {fileID: 0}
   goldNumerobj: {fileID: 2972162286818260457}
-  nametextobj1: {fileID: 0}
+  nametextobj1: {fileID: 5616551307087571641}
   numbertextobj1: {fileID: 0}
   nametextobj2: {fileID: 0}
   numbertextobj2: {fileID: 0}

meng_yao/Assets/script/TanChuang/Customer_serviceTanchuang.cs

@@ -2,11 +2,13 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityEngine.SceneManagement;
 public class Customer_serviceTanchuang : mount
 {
     public Button Kfbtn;
     public Transform canvas;
     public Button LogoutBtn;
+   
     // Start is called before the first frame update
     void Start()
     {
@@ -20,7 +22,7 @@ public class Customer_serviceTanchuang : mount
         boxTypes.Add(new BoxType { Name = "", prompt = "", Type = 13, content = "횅훰鬧饋" });
         boxTypes.Add(new BoxType { Name = "submit", textName = " 혤句횅땍 ", prompt = "혤句", Type = 2 });
         GameObject gameObject = add_pop_up();
-        List<GameObject> gameObjects = gameObject.GetComponent<input_box_pop_up_window>().updateUI(boxTypes, "实名认证");//测试输入框回调处理
+        List<GameObject> gameObjects = gameObject.GetComponent<input_box_pop_up_window>().updateUI(boxTypes, "注销账号");//测试输入框回调处理
         gameObjects[1].GetComponent<input_box_pop_up_window_item>().register_click(async (BoxType boxType, int type) =>//되쩌횅땍샀혤句
         {
             if (type == 0)//혤句
@@ -32,7 +34,7 @@ public class Customer_serviceTanchuang : mount
                 bool issucceffull = await Scene_main_jiekou.instance.Cancellations();
                 if (issucceffull)
                 {
-                    Application.Quit();
+                    SceneManager.LoadScene(0);
                 }
                 else
                 {

meng_yao/Assets/script/scene_Main/Scene_main_jiekou.cs

@@ -7,7 +7,7 @@ using UnityEngine;
 public class Scene_main_jiekou :MonoBehaviour
 {
     login _Login = new login();
-
+    logout logout = new logout();
     treeInfo TreeInfoss = new treeInfo();
     treeTeamData teamData = new treeTeamData();
     treeFansList treeFansList = new treeFansList(); 
@@ -36,11 +36,14 @@ public class Scene_main_jiekou :MonoBehaviour
         instance=this;
         IsTaskLoging = false;
     }
-    
+
+    public async Task<bool> Logouts()//登录退出
+    {
+        return await logout.Logout();
+    }
 
 
-
-   public async Task<PlayerInfoData> PlayerInfos()
+    public async Task<PlayerInfoData> PlayerInfos()
    {
        /*if (!IsTaskLoging)
        {

meng_yao/Assets/script/scene_Main/ui/GhItem.cs

@@ -0,0 +1,34 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class GhItem : MonoBehaviour
+{
+    public Button WxBtn;
+    public Text WxText;
+    public Button QqBtn;
+    public Text QqText;
+    Clipboard clipboard = new Clipboard();
+    void Start()
+    {
+        WxBtn.onClick.AddListener(WxClick);
+        QqBtn.onClick.AddListener(QqClick);
+    }
+
+    void WxClick()
+    {
+        Clipboard.CopyToClipboard(WxText.text);
+    }
+
+    void QqClick()
+    {
+        Clipboard.CopyToClipboard(QqText.text);
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

meng_yao/Assets/script/scene_Main/ui/GhItem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 279edfd2f5e7dd949af4a5f5e191d85e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

meng_yao/Assets/script/scene_Main/ui/IllustrationsAssetDetails.cs

@@ -1,6 +1,5 @@
 using System.Collections;
 using System.Collections.Generic;
-using Unity.Android.Gradle;
 using UnityEngine;
 using UnityEngine.UI;
 public class IllustrationsAssetDetails : MonoBehaviour

meng_yao/Assets/script/scene_Main/ui/Personal_Copy.cs

@@ -0,0 +1,25 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Personal_Copy : MonoBehaviour
+{
+    public Button CopyBtn;
+    public Text CopyText;
+    Clipboard clipboard =new Clipboard();
+    void Start()
+    {
+        CopyBtn.onClick.AddListener(CopyClick);
+    }
+
+    void CopyClick()
+    {
+        Clipboard.CopyToClipboard(CopyText.text);
+    }
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

meng_yao/Assets/script/scene_Main/ui/Personal_Copy.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 48bb3d83fac3512488ac7acf3e040d0d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

meng_yao/Assets/script/scene_Main/ui/SettingBtnmgr.cs

@@ -0,0 +1,81 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+public class SettingBtnmgr : MonoBehaviour
+{
+
+    public Button MusicOffBtn;
+    public Button MusicOnBtn;
+
+    public Button SoundOffBtn;
+    public Button SoundOnBtn;
+
+    public Button vibrationOffBtn;
+    public Button vibrationOnBtn;
+
+    public Sprite offisp;
+    public Sprite onsp;
+    void Start()
+    {
+        MusicOffBtn.onClick.AddListener(MusicOffClick);
+        MusicOnBtn.onClick.AddListener(MusicOnClick);
+        SoundOffBtn.onClick.AddListener(SoundOffClick);
+        SoundOnBtn.onClick.AddListener(SoundOnClick);
+        vibrationOffBtn.onClick.AddListener(vibrationOffClick);
+        vibrationOnBtn.onClick.AddListener(vibrationOnClick);
+    }
+
+    void MusicOffClick()
+    { 
+         Image Offimage =MusicOffBtn.GetComponent<Image>();
+        Image Onimage   =MusicOnBtn.GetComponent<Image>();
+        Offimage.sprite = onsp;
+        Onimage.sprite = offisp;
+    }
+    void MusicOnClick()
+    {
+        Image Offimage = MusicOffBtn.GetComponent<Image>();
+        Image Onimage = MusicOnBtn.GetComponent<Image>();
+        Offimage.sprite = offisp;
+        Onimage.sprite = onsp;
+    }
+    void SoundOffClick()
+    {
+        Image Offimage = SoundOffBtn.GetComponent<Image>();
+        Image Onimage = SoundOnBtn.GetComponent<Image>();
+        Offimage.sprite = onsp;
+        Onimage.sprite = offisp;
+    }
+    void SoundOnClick()
+    {
+        Image Offimage = SoundOffBtn.GetComponent<Image>();
+        Image Onimage = SoundOnBtn.GetComponent<Image>();
+        Offimage.sprite = offisp;
+        Onimage.sprite = onsp;
+    }
+
+    void vibrationOffClick()
+    {
+        Image Offimage = vibrationOffBtn.GetComponent<Image>();
+        Image Onimage = vibrationOnBtn.GetComponent<Image>();
+        Offimage.sprite = onsp;
+        Onimage.sprite = offisp;
+    }
+    void vibrationOnClick()
+    {
+        Image Offimage = vibrationOffBtn.GetComponent<Image>();
+        Image Onimage = vibrationOnBtn.GetComponent<Image>();
+        Offimage.sprite = offisp;
+        Onimage.sprite = onsp;
+    }
+
+
+
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

meng_yao/Assets/script/scene_Main/ui/SettingBtnmgr.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 50f01097e72bebc40a00a4aa9d31dd6e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

meng_yao/Assets/script/scene_Main/ui/SwitchAccount.cs

@@ -0,0 +1,31 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+using UnityEngine.SceneManagement;
+
+public class SwitchAccount : MonoBehaviour
+{
+    Button AccountBtn;
+    // Start is called before the first frame update
+    void Start()
+    {
+        AccountBtn = GetComponent<Button>();
+        AccountBtn.onClick.AddListener(AccountClick);
+    }
+
+   async void AccountClick()
+    {
+        bool issucceffull = await Scene_main_jiekou.instance.Logouts();
+        if (issucceffull)
+        {
+              SceneManager.LoadScene(0);
+        }
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

meng_yao/Assets/script/scene_Main/ui/SwitchAccount.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 553ed412bceeb714395b747f1dfcafb7
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

meng_yao/Assets/script/scene_jinshakuang/jskPanel.cs

@@ -32,7 +32,7 @@ public class jskPanel : mount
         for (int i = 0; i < 5; i++)
         {
             boxTypes.Add(new BoxType { Name = index.ToString() + "文本", prompt = "第" + ArabicToChineseNumberConverter.ConvertToChineseNumbers(index.ToString()) + "层", Type = 4, is_required = true });
-            boxTypes.Add(new BoxType { Name = "²¶Óã" + index.ToString(), prompt = "²¶Óã" + 1, Type = 3, goldNumerobj = (200 * index).ToString(), icon = iconS[index - 1] });
+            boxTypes.Add(new BoxType { Name = "捕鱼" + index.ToString(), prompt = "挖矿" + 1,prompt2 = "挖矿"+(i+1),nametext1="剩余数量：1", Type = 3, goldNumerobj = (200 * index).ToString(), icon = iconS[index - 1] });
             index++;
         }
 

meng_yao/Assets/script/scene_jishadao/jishadao_buy.cs

@@ -30,7 +30,7 @@ public class jishadao_buy :mount
         for (int i = 0; i < 3; i++)
         {
             boxTypes.Add(new BoxType { Name = index.ToString() + "文本", prompt = "第" + ArabicToChineseNumberConverter.ConvertToChineseNumbers(index.ToString()) + "层", Type = 4, is_required = true });
-            boxTypes.Add(new BoxType { Name = "²¶Óã" + index.ToString(), prompt = "²¶Óã" + 1, Type = 3, goldNumerobj = (200 * index).ToString(), icon = iconS[index - 1] });
+            boxTypes.Add(new BoxType { Name = "捕鱼" + index.ToString(), prompt = "捕鱼" + 1, prompt2 = "捕鱼" + (i + 1), nametext1 = "剩余数量：1",Type = 3, goldNumerobj = (200 * index).ToString(), icon = iconS[index - 1] });
             index++;
         }