似乎成功合并了分支

Assets/MySQL/GetSQL.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Threading;
 using MySql.Data.MySqlClient;
 using UnityEngine;
 
@@ -10,6 +11,14 @@ public class GetSQL : MonoBehaviour
     public DataScriptableObject dataScriptableObject;
 
     private string LinkInfo;
+
+    private string SQLstatement;
+
+    private string datalist;
+
+    private List<string> data;
+
+    public bool isLink;
     // Start is called before the first frame update
     void Start()
     {
@@ -22,7 +31,19 @@ public class GetSQL : MonoBehaviour
     }
 
 
-    public List<string> GetSqlData(string SQLstatement, string datalist)
+    public List<string> getdata()
+    {
+        return data;
+    }
+    public void GetSqlData()
+    {
+        Thread thread = new Thread(new ThreadStart(ThreadGetSqlData));//创建网络请求的线程
+        thread.Start();//启动线程
+    }
+
+    public void ThreadGetSqlData()
+    {
+        while (isLink)
         {
             List<string> data = new List<string>();
             data.Clear();
@@ -44,8 +65,8 @@ public class GetSQL : MonoBehaviour
             {
                 data.Add(reader.GetString(datalist).ToString());
             }
+        }
         
-        return data;
     }
 
 }

Assets/Scenes/test.unity

@@ -1463,7 +1463,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!61 &906466580
 BoxCollider2D:
   m_ObjectHideFlags: 0

Assets/Shader/溶解.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b85f4aa6eeaf78745894814c449fba8e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Shader/溶解/Shader Graphs_溶解.mat

@@ -0,0 +1,48 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: "Shader Graphs_\u6EB6\u89E3"
+  m_Shader: {fileID: -6465566751694194690, guid: c697c7d14c1790c4489ce73a3a1e9a83, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Texture2DAsset_0955dc0c42434186ad0d52bd751ef2a5_Out_0:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - Vector1_1e04cf3781c84b43bbb152f7f3df932e: 1
+    - Vector1_66efd17d89444c3e8d4e0fe9f9fe23b8: 1.4
+    - Vector1_abc0e12f459c4084a7b64935c6dc891a: 25
+    - Vector1_eb8859c688724a4d84a10de07df10aad: 0.489
+    m_Colors: []
+  m_BuildTextureStacks: []

Assets/Shader/溶解/Shader Graphs_溶解.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8162c91a824057045908e32b856ff4eb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Shader/溶解/溶解 1.shadergraph.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: c697c7d14c1790c4489ce73a3a1e9a83
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}

Assets/Shader/溶解/溶解.shadergraph.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 85cf3c02f40b12a478c0b8b056b2b36a
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}