提交手机端适配

Assets/Samples.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e24245ac890aaa8478afedc30c12f9d8
+guid: a64d904685c0e2e41b2ca9195b435909
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Scripts/Base/Web/Http/HttpMsg.cs

@@ -48,13 +48,16 @@ namespace Engine.Http
             //保存请求参数对象
             mHttpRequest = requestParam;
             this.httpCallBack = httpCallBack;
+          //  Debug.Log("mHttpRequest.httpMethod ===>" + mHttpRequest.httpMethod);
             //创建请求对象 创建后请求已经开始发送
             if (mHttpRequest.httpMethod == HttpMethod.POST)
             {
+               // Debug.Log("mHttpRequest.httpMethod ===>" + mHttpRequest.URL);
                 //byte[] bytes = ObjectToBytes(mHttpRequest.postData);
                 mHttp3W = new WWW(mHttpRequest.URL, System.Text.UTF8Encoding.UTF8.GetBytes(mHttpRequest.RequestParamContent), MsgHeaders);
             }else
             {
+                Debug.Log("mHttpRequest.httpMethod ===>" + mHttpRequest.URLAndParamsForGet);
                 mHttp3W = new WWW(mHttpRequest.URLAndParamsForGet);
             }
             CDebug.Log("http网络请求已发送：" + mHttpRequest.URL  + "?"+ (mHttpRequest.httpMethod == HttpMethod.POST));

Assets/Scripts/Base/Web/Http/HttpResponse.cs

@@ -46,7 +46,7 @@ namespace Engine.Http
         /// <summary>构造函数</summary>
         public HttpResponse(string responstContent, HttpRequest request)
         {
-            CDebug.Log(responstContent);
+            Debug.Log("HttpResponse===>"+responstContent);
 
             nCode = request.Code;
             if(responstContent == "")
@@ -56,14 +56,26 @@ namespace Engine.Http
                 mResponseMsg = "网络连接不可用";
                 return;
             }
+            //创建json对象
+            try
+            {
+                mJsonData = LitJson.JsonMapper.ToObject(responstContent);
+
+            }
+            catch
+            {
+
+                mResponseStatu = -99999;
+                //网络请求相应的状态
+                mResponseMsg = "网络连接不可用";
+                return;
+            }
             //保存响应字符串
             mResponstContent = responstContent;
 
             //byte[] utf8bytes = System.Text.Encoding.Default.GetBytes(mResponstContent);
             //mResponstContent = System.Text.Encoding.UTF8.GetString(utf8bytes);
             
-            //创建json对象
-            mJsonData = LitJson.JsonMapper.ToObject(mResponstContent);
             if(!mJsonData.Keys.Contains(HttpConstConfig.KEY_SERVERTIME))
             {
                 CDebug.Log("这里有错");

Assets/StreamingAssets/HiddenARCore.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 03dbec5b72ef7e44080d2147bcc8d005
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/XR/Loaders/AR Core Loader.asset

@@ -0,0 +1,14 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 06042c85f885b4d1886f3ca5a1074eca, type: 3}
+  m_Name: AR Core Loader
+  m_EditorClassIdentifier: 

Assets/XR/Loaders/AR Core Loader.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e243c2b30848f694394db31692cfa7a9
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/XR/Settings/AR Core Settings.asset

@@ -0,0 +1,17 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9dae4501572e1418791be3e3bf1f7faa, type: 3}
+  m_Name: AR Core Settings
+  m_EditorClassIdentifier: 
+  m_Requirement: 0
+  m_Depth: 0
+  m_IgnoreGradleVersion: 0

Assets/XR/Settings/AR Core Settings.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 07387a4d90deefe47b84a2bf8ceda499
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/XR/XRGeneralSettings.asset

@@ -13,7 +13,7 @@ MonoBehaviour:
   m_Name: Android Settings
   m_EditorClassIdentifier: 
   m_LoaderManagerInstance: {fileID: 4698211674269795769}
-  m_InitManagerOnStart: 0
+  m_InitManagerOnStart: 1
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -44,4 +44,5 @@ MonoBehaviour:
   m_RequiresSettingsUpdate: 0
   m_AutomaticLoading: 0
   m_AutomaticRunning: 0
-  m_Loaders: []
+  m_Loaders:
+  - {fileID: 11400000, guid: e243c2b30848f694394db31692cfa7a9, type: 2}

ProjectSettings/EditorBuildSettings.asset

@@ -20,6 +20,8 @@ EditorBuildSettings:
   m_configObjects:
     Unity.XR.PXR.Settings: {fileID: 11400000, guid: 8d937503d15abf240afec10b462d762c,
       type: 2}
+    UnityEditor.XR.ARCore.ARCoreSettings: {fileID: 11400000, guid: 07387a4d90deefe47b84a2bf8ceda499,
+      type: 2}
     com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 7b6dd1aac2a94a04081db99ca3e37ef9,
       type: 2}
     com.unity.xr.openxr.settings4: {fileID: 11400000, guid: 94c55098c8906404085643e00bd3a621,

ProjectSettings/ProjectSettings.asset

@@ -12,8 +12,8 @@ PlayerSettings:
   targetDevice: 2
   useOnDemandResources: 0
   accelerometerFrequency: 60
-  companyName: BellCat
-  productName: MrClass
+  companyName: BellCat2
+  productName: MrClass2
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@@ -102,7 +102,7 @@ PlayerSettings:
   resizableWindow: 0
   useMacAppStoreValidation: 0
   macAppStoreCategory: public.app-category.games
-  gpuSkinning: 1
+  gpuSkinning: 0
   xboxPIXTextureCapture: 0
   xboxEnableAvatar: 0
   xboxEnableKinect: 0
@@ -171,8 +171,10 @@ PlayerSettings:
   - {fileID: 0}
   - {fileID: 0}
   - {fileID: 0}
-  - {fileID: -6595999990642320168, guid: 94c55098c8906404085643e00bd3a621, type: 2}
   - {fileID: 0}
+  - {fileID: 4800000, guid: c9f956787b1d945e7b36e0516201fc76, type: 3}
+  - {fileID: -6595999990642320168, guid: 94c55098c8906404085643e00bd3a621, type: 2}
+  - {fileID: -872464290852785836, guid: 7b6dd1aac2a94a04081db99ca3e37ef9, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -191,14 +193,15 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: com.ghz.xr
+    Android: com.ghz.xr2
+    Standalone: com.BellCat2.MrClass2
   buildNumber:
     Standalone: 0
     iPhone: 0
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
   AndroidBundleVersionCode: 1
-  AndroidMinSdkVersion: 27
+  AndroidMinSdkVersion: 26
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1
   aotOptions: 
@@ -273,14 +276,14 @@ PlayerSettings:
   clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea
   templatePackageId: com.unity.template.3d@2.3.3
   templateDefaultScene: Assets/Scenes/SampleScene.unity
-  useCustomMainManifest: 1
+  useCustomMainManifest: 0
   useCustomLauncherManifest: 0
   useCustomMainGradleTemplate: 0
   useCustomLauncherGradleManifest: 0
   useCustomBaseGradleTemplate: 0
   useCustomGradlePropertiesTemplate: 0
   useCustomProguardFile: 0
-  AndroidTargetArchitectures: 1
+  AndroidTargetArchitectures: 2
   AndroidTargetDevices: 0
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
@@ -474,9 +477,11 @@ PlayerSettings:
     m_GraphicsJobMode: 0
   - m_BuildTarget: XboxOnePlayer
     m_GraphicsJobMode: 0
+  - m_BuildTarget: AndroidPlayer
+    m_GraphicsJobMode: 1
   m_BuildTargetGraphicsAPIs:
   - m_BuildTarget: AndroidPlayer
-    m_APIs: 08000000
+    m_APIs: 0b000000
     m_Automatic: 0
   - m_BuildTarget: iOSSupport
     m_APIs: 10000000
@@ -493,7 +498,7 @@ PlayerSettings:
     m_Devices:
     - Oculus
     - OpenVR
-  openGLRequireES31: 0
+  openGLRequireES31: 1
   openGLRequireES31AEP: 0
   openGLRequireES32: 0
   m_TemplateCustomTags: {}
@@ -755,7 +760,7 @@ PlayerSettings:
   webGLDecompressionFallback: 0
   scriptingDefineSymbols:
     1: UNITY_POST_PROCESSING_STACK_V2
-    7: NIBIRU_AR
+    7: 
     13: UNITY_POST_PROCESSING_STACK_V2
     14: UNITY_POST_PROCESSING_STACK_V2
     19: UNITY_POST_PROCESSING_STACK_V2
@@ -771,7 +776,7 @@ PlayerSettings:
   additionalCompilerArguments: {}
   platformArchitecture: {}
   scriptingBackend:
-    Android: 0
+    Android: 1
     Standalone: 1
   il2cppCompilerConfiguration: {}
   managedStrippingLevel: {}