merging解决提交

lua_probject/base_project/Main.lua

@@ -36,17 +36,17 @@ oldGameVersion = 2 --1 原始  2 老游戏新加功能
 
 --主入口函数。从这里开始lua逻辑
 function Main()
-    -- if true then
+    if true then
-    --     local suc = pcall(function()
+        local suc = pcall(function()
-    --         local path = Application.streamingAssetsPath .. "/../../.."
+            local path = Application.streamingAssetsPath .. "/../../.."
-    --         package.cpath = package.cpath .. ";" .. path .. "/?.dll"
+            package.cpath = package.cpath .. ";" .. path .. "/?.dll"
-    --         local dbg = require("emmy_core")
+            local dbg = require("emmy_core")
-    --         dbg.tcpConnect('localhost', 9966)
+            dbg.tcpConnect('localhost', 9966)
-    --     end)
+        end)
-    --     if suc then
+        if suc then
-    --         print("=============================调试连接成功！===========================")
+            print("=============================调试连接成功！===========================")
-    --     end
+        end
-    -- end
+    end
 
     -- PlayerPrefs.DeleteKey('session_id')
     Application.targetFrameRate = 60

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",

wb_unity_pro/Assets/StreamingAssets/Pack.byte.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 5c35cf9d46bc3bf488fc6dbce2ecea57
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

wb_unity_pro/Assets/StreamingAssets/version.txt

@@ -1 +0,0 @@
-1.0.5

wb_unity_pro/Assets/StreamingAssets/version.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: ebbd2128a41d8e5499ded00411131f98
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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'
+  AndroidKeystoreName: '{inproject}: smn.keystore'
-  AndroidKeyaliasName: ch
+  AndroidKeyaliasName: smn
   AndroidBuildApkPerCpuArchitecture: 0
   AndroidTVCompatibility: 1
   AndroidIsGame: 1