Browse Source

本地账号输入去除空格,抗锯齿修改修改

DGJ 1 year ago
parent
commit
fa43b481d8

+ 5 - 5
Assets/Scenes/GameStart3D_beauty.unity

@@ -10587,7 +10587,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
+  m_PresetInfoIsWorld: 1
 --- !u!223 &726179852
 Canvas:
   m_ObjectHideFlags: 0
@@ -13547,22 +13547,22 @@ PrefabInstance:
     - target: {fileID: 8015466720871623674, guid: 8d729329b16bad348b491ca77b4566cf,
         type: 3}
       propertyPath: OpenHead
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8015466720871623674, guid: 8d729329b16bad348b491ca77b4566cf,
         type: 3}
       propertyPath: OpenHandShank
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8112617911424720315, guid: 8d729329b16bad348b491ca77b4566cf,
         type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8112617911682434024, guid: 8d729329b16bad348b491ca77b4566cf,
         type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8d729329b16bad348b491ca77b4566cf, type: 3}

+ 4 - 1
Assets/Scripts/Base/Web/Http/HttpMsg.cs

@@ -52,8 +52,11 @@ namespace Engine.Http
             //创建请求对象 创建后请求已经开始发送
             if (mHttpRequest.httpMethod == HttpMethod.POST)
             {
-               // Debug.Log("mHttpRequest.httpMethod ===>" + mHttpRequest.URL);
+                // Debug.Log("mHttpRequest.httpMethod ===>" + mHttpRequest.URL);
                 //byte[] bytes = ObjectToBytes(mHttpRequest.postData);
+
+                //&format=json
+
                 mHttp3W = new WWW(mHttpRequest.URL, System.Text.UTF8Encoding.UTF8.GetBytes(mHttpRequest.RequestParamContent), MsgHeaders);
             }else
             {

+ 2 - 1
Assets/Scripts/Base/Web/Http/HttpResponse.cs

@@ -46,7 +46,7 @@ namespace Engine.Http
         /// <summary>构造函数</summary>
         public HttpResponse(string responstContent, HttpRequest request)
         {
-            Debug.Log("HttpResponse===>"+responstContent);
+            Debug.Log("request.Code   " + request.Code+"  HttpResponse===>" +responstContent);
 
             nCode = request.Code;
             if(responstContent == "")
@@ -57,6 +57,7 @@ namespace Engine.Http
                 return;
             }
             //创建json对象
+           
             try
             {
                 mJsonData = LitJson.JsonMapper.ToObject(responstContent);

+ 4 - 1
Assets/Scripts/Core/UI/View/Game3DInputField.cs

@@ -1,7 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-
+using UnityEngine.UI;
 
 public class Game3DInputField : MonoBehaviour
 {
@@ -16,6 +16,9 @@ public class Game3DInputField : MonoBehaviour
     [SerializeField]
     public int maxLength;//字符数量
 
+   // public InputField inputFideldType;
+
+
     public string text
     {
         set

+ 1 - 0
Assets/Scripts/Core/UI/View/GameKey3Dboard.cs

@@ -26,6 +26,7 @@ public class GameKey3Dboard : MonoBehaviour {
         str = new List<string>();
         if (value != null)
         {
+           
             for (int i = 0; i < value.Length; i++)
             {
                 str.Add(value[i].ToString());

+ 4 - 0
Assets/Scripts/Core/UI/View/Pop/PopLoginBase.cs

@@ -4,6 +4,7 @@ using UnityEngine;
 using UnityEngine.UI;
 using ShadowKit;
 using Engine.Http;
+using System.Text.RegularExpressions;
 
 public class PopLoginBase : PopBase
 {
@@ -31,6 +32,9 @@ public class PopLoginBase : PopBase
         isLoading = true;
         GameDataSetting.Instance.DefaultUserAccount = AccountText;
         GameDataSetting.Instance.DefaultUserPassword = PasswordText;
+        string pattern = @"\s";
+        AccountText = Regex.Replace(AccountText, pattern, "");
+        PasswordText = Regex.Replace(PasswordText, pattern, "");
         HttpStaticMessage.SendHttpLogin(AccountText, PasswordText, CodeText, HttpDataBackOK);
         HideKeyBoard();
     }

+ 0 - 8
Assets/StreamingAssets/TrackingProfiles.meta

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

+ 1 - 1
Assets/XR/Loaders/Ximmerse XR Loader.asset

@@ -12,4 +12,4 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 44820cf310472441e952b611b9f17c14, type: 3}
   m_Name: Ximmerse XR Loader
   m_EditorClassIdentifier: 
-  settings: {fileID: 0}
+  settings: {fileID: 11400000, guid: dcfe3224640080e4fbec804d72ae83e0, type: 2}

+ 4 - 2
Assets/XR/Settings/Ximmerse XR Settings.asset

@@ -14,8 +14,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   displayReticle: 1
   reticleTexture: {fileID: 0}
-  defaultTrackingProfile: {fileID: 0}
-  defaultGroundPlaneLayoutConfig: {fileID: 0}
+  defaultTrackingProfile: {fileID: 11400000, guid: c641667a0d27d3b4484c44ccba14b111,
+    type: 2}
+  defaultGroundPlaneLayoutConfig: {fileID: 11400000, guid: 6f7a3e78cb3c0364fab924de8d67d3a7,
+    type: 2}
   DrawTrackedMarkerGizmos: 0
   DrawDetailTrackedInfo: 0
   HandTracking: 0

+ 1 - 0
Packages/manifest.json

@@ -12,6 +12,7 @@
     "com.unity.xr.arfoundation": "4.1.13",
     "com.unity.xr.interaction.toolkit": "2.3.2",
     "com.unity.xr.openxr": "1.5.3",
+    "com.ximmerse.xr": "file:C:/UnityProjects/GHZMRClassSDK/package",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

+ 1 - 1
Packages/packages-lock.json

@@ -208,7 +208,7 @@
       "url": "https://packages.unity.cn"
     },
     "com.ximmerse.xr": {
-      "version": "file:D:/JiHe/GHZMRClassSDK/package",
+      "version": "file:C:/UnityProjects/GHZMRClassSDK/package",
       "depth": 0,
       "source": "local",
       "dependencies": {

+ 0 - 2
ProjectSettings/ProjectSettings.asset

@@ -172,8 +172,6 @@ PlayerSettings:
   - {fileID: 0}
   - {fileID: 0}
   - {fileID: 0}
-  - {fileID: -6595999990642320168, guid: 94c55098c8906404085643e00bd3a621, type: 2}
-  - {fileID: -872464290852785836, guid: 7b6dd1aac2a94a04081db99ca3e37ef9, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1

+ 167 - 0
ProjectSettings/SceneTemplateSettings.json

@@ -0,0 +1,167 @@
+{
+    "templatePinStates": [],
+    "dependencyTypeInfos": [
+        {
+            "userAdded": false,
+            "type": "UnityEngine.AnimationClip",
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEditor.Animations.AnimatorController",
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.AnimatorOverrideController",
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEditor.Audio.AudioMixerController",
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.ComputeShader",
+            "ignore": true,
+            "defaultInstantiationMode": 1,
+            "supportsModification": true
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Cubemap",
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.GameObject",
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEditor.LightingDataAsset",
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": false
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.LightingSettings",
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Material",
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEditor.MonoScript",
+            "ignore": true,
+            "defaultInstantiationMode": 1,
+            "supportsModification": true
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.PhysicMaterial",
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.PhysicsMaterial2D",
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile",
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources",
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Rendering.VolumeProfile",
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEditor.SceneAsset",
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": false
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Shader",
+            "ignore": true,
+            "defaultInstantiationMode": 1,
+            "supportsModification": true
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.ShaderVariantCollection",
+            "ignore": true,
+            "defaultInstantiationMode": 1,
+            "supportsModification": true
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Texture",
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Texture2D",
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
+        },
+        {
+            "userAdded": false,
+            "type": "UnityEngine.Timeline.TimelineAsset",
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
+        }
+    ],
+    "defaultDependencyTypeInfo": {
+        "userAdded": false,
+        "type": "<default_scene_template_dependencies>",
+        "ignore": false,
+        "defaultInstantiationMode": 1,
+        "supportsModification": true
+    },
+    "newSceneOverride": 0
+}