Browse Source

修改DreamGlass配置

This reverts commit d95fbe6c582f849774d43252f0272c6404e9ab7f.
DGJ 1 year ago
parent
commit
3173ac8456

+ 1 - 0
Assets/MediaSoup/RemoteRtc.cs

@@ -54,6 +54,7 @@ public class RemoteRtc : SCRtcManager
                 break;
             case "DreamGlass":
                 StartCoroutine(CallCamera());
+                meshRender.transform.localEulerAngles = new Vector3(0, 0, 180);
                 break;
             case "Rhinox":
 #if !UNITY_EDITOR

+ 0 - 0
Assets/Plugins/Android/baseProjectTemplate.gradle.DISABLED → Assets/Plugins/Android/baseProjectTemplate.gradle


+ 0 - 0
Assets/Plugins/Android/baseProjectTemplate.gradle.DISABLED.meta → Assets/Plugins/Android/baseProjectTemplate.gradle.meta


+ 0 - 0
Assets/Plugins/Android/gradleTemplate.properties.DISABLED → Assets/Plugins/Android/gradleTemplate.properties


+ 0 - 0
Assets/Plugins/Android/gradleTemplate.properties.DISABLED.meta → Assets/Plugins/Android/gradleTemplate.properties.meta


+ 59 - 0
Assets/Plugins/Android/launcherTemplate.gradle.DISABLED

@@ -0,0 +1,59 @@
+apply plugin: 'com.android.application'
+
+dependencies {
+    implementation project(':unityLibrary')
+    }
+
+android {
+    compileSdkVersion **APIVERSION**
+    buildToolsVersion '**BUILDTOOLS**'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    defaultConfig {
+        minSdkVersion **MINSDKVERSION**
+        targetSdkVersion **TARGETSDKVERSION**
+        applicationId '**APPLICATIONID**'
+        ndk {
+            abiFilters **ABIFILTERS**
+        }
+        versionCode **VERSIONCODE**
+        versionName '**VERSIONNAME**'
+    }
+
+    aaptOptions {
+        noCompress = **BUILTIN_NOCOMPRESS** + unityStreamingAssets.tokenize(', ')
+        ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~"
+    }**SIGN**
+
+    lintOptions {
+        abortOnError false
+    }
+
+    buildTypes {
+        debug {
+            minifyEnabled **MINIFY_DEBUG**
+            proguardFiles getDefaultProguardFile('proguard-android.txt')**SIGNCONFIG**
+            jniDebuggable true
+        }
+        release {
+            minifyEnabled **MINIFY_RELEASE**
+            proguardFiles getDefaultProguardFile('proguard-android.txt')**SIGNCONFIG**
+        }
+    }**PACKAGING_OPTIONS****PLAY_ASSET_PACKS****SPLITS**
+**BUILT_APK_LOCATION**
+    bundle {
+        language {
+            enableSplit = false
+        }
+        density {
+            enableSplit = false
+        }
+        abi {
+            enableSplit = true
+        }
+    }
+}**SPLITS_VERSION_CODE****LAUNCHER_SOURCE_BUILD_SETUP**

+ 7 - 0
Assets/Plugins/Android/launcherTemplate.gradle.DISABLED.meta

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

+ 4 - 4
Assets/Remote/Scenes/Remote3.0.unity

@@ -359,7 +359,7 @@ PrefabInstance:
     - target: {fileID: 604547952892512393, guid: 1f19c6a2eb9f83340a868c4c9fd2d104,
         type: 3}
       propertyPath: m_TargetDisplay
-      value: 2
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 604547952892512393, guid: 1f19c6a2eb9f83340a868c4c9fd2d104,
         type: 3}
@@ -419,7 +419,7 @@ Camera:
     m_Bits: 256
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 8400000, guid: 2515c6a63a25f954f87089e5f3fc4a59, type: 2}
-  m_TargetDisplay: 2
+  m_TargetDisplay: 0
   m_TargetEye: 3
   m_HDR: 1
   m_AllowMSAA: 1
@@ -1250,7 +1250,7 @@ Camera:
     m_Bits: 1024
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 8400000, guid: b01e94f8329a5ee429717fa81c4d12a0, type: 2}
-  m_TargetDisplay: 2
+  m_TargetDisplay: 0
   m_TargetEye: 3
   m_HDR: 1
   m_AllowMSAA: 1
@@ -1816,7 +1816,7 @@ PrefabInstance:
     - target: {fileID: 2775557577792744613, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}
       propertyPath: m_CullingMask.m_Bits
-      value: 57
+      value: 511
       objectReference: {fileID: 0}
     - target: {fileID: 2834678857674975723, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}

+ 0 - 1
NibiruSDKKey.bin

@@ -1 +0,0 @@
-15B3YESHWbQs6xiaETRLLi3pnWia1n95FQydcHepSChz6V00GeT_AmKL6DNO2TkMDQxG0Cln0lOO0BK5qwWDog..

+ 4 - 4
ProjectSettings/ProjectSettings.asset

@@ -257,8 +257,8 @@ PlayerSettings:
   useCustomLauncherManifest: 0
   useCustomMainGradleTemplate: 0
   useCustomLauncherGradleManifest: 0
-  useCustomBaseGradleTemplate: 0
-  useCustomGradlePropertiesTemplate: 0
+  useCustomBaseGradleTemplate: 1
+  useCustomGradlePropertiesTemplate: 1
   useCustomProguardFile: 0
   AndroidTargetArchitectures: 1
   AndroidTargetDevices: 0
@@ -434,7 +434,7 @@ PlayerSettings:
     m_GraphicsJobMode: -1005666880
   m_BuildTargetGraphicsAPIs:
   - m_BuildTarget: AndroidPlayer
-    m_APIs: 08000000
+    m_APIs: 0b000000
     m_Automatic: 0
   - m_BuildTarget: iOSSupport
     m_APIs: 10000000
@@ -770,7 +770,7 @@ PlayerSettings:
   scriptingDefineSymbols:
     0: NIBIRU_AR
     7: NIBIRU_AR;UNITY_CCU;CURVEDUI_TMP
-    Android: NIBIRU_NONE;UNITY_CCU;CURVEDUI_TMP;ANDROID_REMOTE_NRR
+    Android: NIBIRU_NONE;UNITY_CCU;CURVEDUI_TMP
   additionalCompilerArguments: {}
   platformArchitecture: {}
   scriptingBackend: