diff --git a/lua_probject/base_project/Main.lua b/lua_probject/base_project/Main.lua index 622be89f..8c38ad83 100644 --- a/lua_probject/base_project/Main.lua +++ b/lua_probject/base_project/Main.lua @@ -36,17 +36,17 @@ oldGameVersion = 2 --1 原始 2 老游戏新加功能 --主入口函数。从这里开始lua逻辑 function Main() - -- if true then - -- local suc = pcall(function() - -- local path = Application.streamingAssetsPath .. "/../../.." - -- package.cpath = package.cpath .. ";" .. path .. "/?.dll" - -- local dbg = require("emmy_core") - -- dbg.tcpConnect('localhost', 9966) - -- end) - -- if suc then - -- print("=============================调试连接成功!===========================") - -- end - -- end + if true then + local suc = pcall(function() + local path = Application.streamingAssetsPath .. "/../../.." + package.cpath = package.cpath .. ";" .. path .. "/?.dll" + local dbg = require("emmy_core") + dbg.tcpConnect('localhost', 9966) + end) + if suc then + print("=============================调试连接成功!===========================") + end + end -- PlayerPrefs.DeleteKey('session_id') Application.targetFrameRate = 60 diff --git a/wb_new_ui/.objs/workspace.json b/wb_new_ui/.objs/workspace.json index 3ec2418b..5bd954dc 100644 --- a/wb_new_ui/.objs/workspace.json +++ b/wb_new_ui/.objs/workspace.json @@ -39,23 +39,21 @@ "test.device": "720p Phone", "canvasColor": 10066329, "auxline2": true, - "doc.activeDoc": "ui://vplxondscioehnx", + "doc.activeDoc": "ui://9n9stu2eprgzf0", "libview.twoColumn": false, "libview.expandedNodes": [ - "442j0uep", - "/", - "442j0uep", - "/component/", "9n9stu2e", "/", "9n9stu2e", "/component/", "9n9stu2e", - "/component/Result/", - "9n9stu2e", "/image/", "9n9stu2e", "/image/btn/", + "vplxonds", + "/", + "vplxonds", + "/invite/", "lkq9ne9s", "/", "lkq9ne9s", diff --git a/wb_unity_pro/Assets/StreamingAssets/Pack.byte b/wb_unity_pro/Assets/StreamingAssets/Pack.byte deleted file mode 100644 index ab1a2bd7..00000000 Binary files a/wb_unity_pro/Assets/StreamingAssets/Pack.byte and /dev/null differ diff --git a/wb_unity_pro/Assets/StreamingAssets/Pack.byte.meta b/wb_unity_pro/Assets/StreamingAssets/Pack.byte.meta deleted file mode 100644 index f94e5c51..00000000 --- a/wb_unity_pro/Assets/StreamingAssets/Pack.byte.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5c35cf9d46bc3bf488fc6dbce2ecea57 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/wb_unity_pro/Assets/StreamingAssets/version.txt b/wb_unity_pro/Assets/StreamingAssets/version.txt deleted file mode 100644 index e4c0d46e..00000000 --- a/wb_unity_pro/Assets/StreamingAssets/version.txt +++ /dev/null @@ -1 +0,0 @@ -1.0.3 \ No newline at end of file diff --git a/wb_unity_pro/Assets/StreamingAssets/version.txt.meta b/wb_unity_pro/Assets/StreamingAssets/version.txt.meta deleted file mode 100644 index bb7a21aa..00000000 --- a/wb_unity_pro/Assets/StreamingAssets/version.txt.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ebbd2128a41d8e5499ded00411131f98 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/wb_unity_pro/ProjectSettings/ProjectSettings.asset b/wb_unity_pro/ProjectSettings/ProjectSettings.asset index c3a4af4b..53573008 100644 --- a/wb_unity_pro/ProjectSettings/ProjectSettings.asset +++ b/wb_unity_pro/ProjectSettings/ProjectSettings.asset @@ -17,7 +17,7 @@ PlayerSettings: defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0, g: 0, b: 0, a: 1} - m_ShowUnitySplashScreen: 0 + m_ShowUnitySplashScreen: 1 m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 0 m_SplashScreenAnimation: 2 @@ -255,8 +255,8 @@ PlayerSettings: AndroidTargetArchitectures: 1 AndroidSplashScreenScale: 2 androidSplashScreen: {fileID: 2800000, guid: 2baa80d4813f638468d8464d3f57c870, type: 3} - AndroidKeystoreName: '{inproject}: ch.keystore' - AndroidKeyaliasName: ch + AndroidKeystoreName: '{inproject}: smn.keystore' + AndroidKeyaliasName: smn AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 1 AndroidIsGame: 1 diff --git a/wb_unity_pro/测试.apk b/wb_unity_pro/测试.apk index daa7088a..0af3be8f 100644 Binary files a/wb_unity_pro/测试.apk and b/wb_unity_pro/测试.apk differ