Add runOnAndroid.py

Author: litefeel

Editor/Script~/runOnAndroid.py

@@ -0,0 +1,90 @@
+import json
+import os
+import shlex
+import subprocess
+import sys
+
+
+def call(cmd: str, printOutput: bool = True) -> tuple[str, bool]:
+    # print(f"{printOutput = }, {cmd = }")
+    if sys.platform == "win32":
+        args = cmd
+    else:
+        # linux must split arguments
+        args = shlex.split(cmd)
+    try:
+        if printOutput:
+            isOk = subprocess.call(args) == 0
+            return "", isOk
+
+        data = subprocess.check_output(args)
+        # python3 output is bytes
+        output = data.decode("utf-8")
+        return output, True
+    except subprocess.CalledProcessError as callerr:
+        print(f"cmd = {cmd}, callerr.output = {callerr.output}", file=sys.stderr)
+        return (callerr.output, False)
+    except IOError as ioerr:
+        print(f"cmd = {cmd}, ioerr = {ioerr}", file=sys.stderr)
+        return "", False
+
+
+def get_project_dir():
+    BASE_DIR = os.path.dirname(__file__)
+    BASE_DIR = os.path.dirname(BASE_DIR)
+    while BASE_DIR:
+        BASE_DIR = os.path.dirname(BASE_DIR)
+        if not BASE_DIR:
+            return None
+        assets_dir = os.path.join(BASE_DIR, "Assets")
+        projectsettings_dir = os.path.join(BASE_DIR, "ProjectSettings")
+        if os.path.exists(assets_dir) and os.path.exists(projectsettings_dir):
+            return BASE_DIR
+    return None
+
+def get_script_file(project_dir):
+    setting_file = os.path.join(project_dir, "UserSettings/LuaInteractive.json")
+    if os.path.exists(setting_file):
+        with open(setting_file, mode='r', encoding='utf-8') as f:
+            setting = json.loads(f.read())
+            script_file = setting.get('scriptPath', '')
+            if script_file:
+                script_file = os.path.join(project_dir, script_file)
+                if os.path.exists(script_file):
+                    return script_file
+
+    return None
+
+def get_package_name(project_dir):
+    import yaml
+    setting_file = os.path.join(project_dir, "ProjectSettings/ProjectSettings.asset")
+    with open(setting_file, mode='r', encoding='utf-8') as f:
+        f.readline()
+        f.readline()
+        f.readline()
+        setting = yaml.load(f, Loader=yaml.CLoader)
+        name = setting.get("PlayerSettings").get("applicationIdentifier").get("Android")
+        return name.strip()
+    return None
+
+def get_real_package_name(project_dir):
+    if len(sys.argv) == 2:
+        return sys.argv[1]
+
+    return get_package_name(project_dir)
+
+
+project_dir = get_project_dir()
+assert project_dir is not None, 'Cannot found unity project folder'
+script_file = get_script_file(project_dir)
+assert script_file is not None, 'Cannot found lua script file'
+package_name = get_real_package_name(project_dir)
+assert package_name is not None, 'Cannot found package name'
+
+print(script_file)
+
+cmd = f'adb push "{script_file}" /sdcard/Android/data/{package_name}/files/_luarunner.lua'
+call(cmd)
+cmd = "adb shell input keyevent KEYCODE_F8"
+call(cmd)
+print("run success")

Editor/Settings.cs

@@ -17,16 +17,29 @@ public class SettingData
     }
     public static class Settings
     {
-        const string SettingPath = "ProjectSettings/LuaInteractive.json";
+        const string OldPath = "ProjectSettings/LuaInteractive.json";
+        const string SettingPath = "UserSettings/LuaInteractive.json";
         private static SettingData settingData;
 
         [InitializeOnLoadMethod]
         private static void Init()
         {
             settingData = new SettingData();
+            MoveSettingFile();
             LoadData();
         }
 
+        private static void MoveSettingFile()
+        {
+            if (File.Exists(OldPath) && !File.Exists(SettingPath))
+            {
+                var dir = Path.GetDirectoryName(SettingPath);
+                if (!Directory.Exists(dir))
+                    Directory.CreateDirectory(dir);
+                File.Move(OldPath, SettingPath);
+            }
+        }
+
         public static ClearLogMode AutoClearLog
         {
             get { return settingData.clearLogMode; }

Runtime/LuaRunner.cs

@@ -1,11 +1,11 @@
+#if UNITY_EDITOR || LUA_RUNNER_RUNTIME
 #if UNITY_EDITOR
 using litefeel.LuaInteractive.Editor;
-
+#endif
 using System;
 using System.Collections;
 using System.IO;
 using System.Reflection;
-using UnityEditor;
 using UnityEngine;
 
 namespace litefeel.LuaInteractive
@@ -34,6 +34,7 @@ private static void Init()
             else if (IsXLua(out GetLuaState, out DoString))
                 luaType = LuaType.XLua;
 
+            //Debug.LogError("LuaRunner.Init");
             var debuger = new GameObject("_LuaRunner");
             debuger.hideFlags = HideFlags.DontSave;
             DontDestroyOnLoad(debuger);
@@ -50,6 +51,7 @@ void Start()
 
         private IEnumerator WaitLuaState()
         {
+            //Debug.LogError("LuaRunner.WaitLuaState");
             if (luaType == LuaType.ToLua)
             {
                 var args = new object[] { IntPtr.Zero };
@@ -62,7 +64,7 @@ private IEnumerator WaitLuaState()
             }
             else if (luaType == LuaType.XLua)
             {
-                var args = new object[] {};
+                var args = new object[] { };
                 while (GetLuaState.Invoke(null, args) == null)
                     yield return null;
 
@@ -74,36 +76,51 @@ private IEnumerator WaitLuaState()
 
         private void Update()
         {
+#if UNITY_EDITOR
             if (Input.GetKeyDown(KeyCode.R) && Input.GetKey(KeyCode.LeftShift) && Input.GetKey(KeyCode.LeftControl))
+#else
+            if (Input.GetKeyDown(KeyCode.F8))
+#endif
             {
+#if UNITY_EDITOR
                 if (Settings.AutoClearLog == ClearLogMode.Previous)
                     ClearLog();
                 var path = Settings.ScriptPath;
+#else
+                var path = Path.Combine(Application.persistentDataPath, "_luarunner.lua");
+#endif
+
+                //Debug.LogError("LuaRunner.Update ");
                 if (luaState != null && !string.IsNullOrEmpty(path) && File.Exists(path))
                 {
+                    
                     var content = File.ReadAllText(path);
-                    switch(luaType)
+                    switch (luaType)
                     {
                         case LuaType.ToLua:
                             DoString.Invoke(luaState, new object[] { content, null });
                             break;
                         case LuaType.XLua:
                             DoString.Invoke(luaState, new object[] { content, null, null });
+                            Debug.LogError("LuaRunner.Update xlua");
                             break;
                     }
                 }
-
+#if UNITY_EDITOR
                 if (Settings.AutoClearLog == ClearLogMode.All)
                     ClearLog();
+#endif
             }
         }
 
         private void ClearLog()
         {
-            Assembly assembly = Assembly.GetAssembly(typeof(SceneView));
+#if UNITY_EDITOR
+            Assembly assembly = Assembly.GetAssembly(typeof(UnityEditor.SceneView));
             Type type = assembly.GetType("UnityEditor.LogEntries");
             MethodInfo method = type.GetMethod("Clear");
             method.Invoke(new object(), null);
+#endif
         }
 
         private static bool IsToLua(out MethodInfo GetLuaState, out MethodInfo DoString)