Merge branch 'master' of gitlab.huolea.com:shujianhe/tusegamecolor

# Conflicts:
#	Assets/Plugins/Android.meta
#	Assets/Resources/commons.meta
#	Assets/scripts/common/mainGameView.cs

Assets/Plugins/Android/OverrideUnityActivity.java

+package com.company.product;
+
+import android.os.Bundle;
+
+
+import com.unity3d.player.UnityPlayerGameActivity;
+
+public abstract class OverrideUnityActivity extends UnityPlayerGameActivity {
+    public static OverrideUnityActivity instance = null;
+
+    abstract protected void showMainActivity(String setToColor);
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        instance = this;
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        instance = null;
+    }
+
+}

Assets/Plugins/Android/OverrideUnityActivity.java.meta

+fileFormatVersion: 2
+guid: 006cb3777b3e94e70a7dd90cd24c9e16
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/scripts/Views/maingame/Native.cs

+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+using UnityEngine.UI;
+
+public class Native : MonoBehaviour
+{
+    public Text text;
+
+    void appendToText(string line) { text.text += line + "\n"; }
+
+    void Start()
+    {
+        text.text = "test";
+        showHostMainWindow();
+        Debug.Log("UnityStart");
+    }
+    private void OnEnable()
+    {
+        Debug.Log("OnEnable");
+    }
+
+    void Update()
+    {
+        
+    }
+    void showHostMainWindow()
+    {
+#if UNITY_ANDROID
+        try
+        {
+            AndroidJavaClass jc = new AndroidJavaClass("com.company.product.OverrideUnityActivity");
+            AndroidJavaObject overrideActivity = jc.GetStatic<AndroidJavaObject>("instance");
+            overrideActivity.Call("showMainActivity", "red");
+        }
+        catch (Exception e)
+        {
+            appendToText("Exception during showHostMainWindow");
+            appendToText(e.Message);
+        }
+#endif
+    }
+    void onNativeMessage(string json)
+    {
+        Debug.Log("Android调用该方法"+json);
+    }
+    void loadGameScene()
+    {
+        SceneManager.LoadScene("Scenes/gameScene");
+    }
+
+}

Assets/scripts/Views/maingame/Native.cs.meta

+fileFormatVersion: 2
+guid: 3379dc53101c64f99b4fd2a8b4a5e706
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/scripts/common/mainGameView.cs

@@ -8,10 +8,8 @@ using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
 using TMPro;
-using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.UI;
-using static Unity.VisualScripting.Member;
 using System.Threading;
 using System.Collections.Concurrent;