DGJ 1 year ago
parent
commit
545af764e9

+ 2 - 1
Assets/Game/Blue/RTC/Prefabs/RTCRoomMain.prefab

@@ -354,7 +354,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u8FDC\u7A0B\u534F\u52A9"
+  m_text: "\u8FDC\u7A0B\u534F\u4F5C"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 53b37c1f568195149b410dacded90c09, type: 2}
   m_sharedMaterial: {fileID: 1738077909898060448, guid: 53b37c1f568195149b410dacded90c09, type: 2}
@@ -4670,6 +4670,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 45952f334976d2647ba6af3e2fb5bb0e, type: 3}
   - {fileID: 21300000, guid: 7416d0026c4d26248a5fd85a85becef5, type: 3}
   mImage: {fileID: 8041133824467914880}
+  isRoomMain: 0
 --- !u!1 &5881256750373589777
 GameObject:
   m_ObjectHideFlags: 0

+ 2 - 2
Assets/Game/ShowChoose/ShowChoose.prefab

@@ -942,7 +942,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 8ddf450524845724f9bf13ccf123cc04, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 74d30820cd0b0a54ebd0ed512de048de, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3516,7 +3516,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 817093808, guid: 911b482b131642b4bbd777d2867f4678, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 65dd3fff009a58c4b8fd9285d120282e, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

+ 4 - 2
Assets/Game/ShowLogin/LangChaoLogin.cs

@@ -3,6 +3,7 @@ using Agora.Rtc.LitJson;
 using Blue;
 using Newtonsoft.Json.Linq;
 using SC.XR.Unity;
+using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -10,6 +11,7 @@ namespace GHZLangChao
 {
     public class LangChaoLogin : AbstractController
     {
+        public TMP_Text deviceId;
         private SCInputField mAccount_Input;
         private SCInputField mPassword_Input;
         private Button mLogin_Btn;
@@ -37,7 +39,7 @@ namespace GHZLangChao
             emptypas.onClick.AddListener(() => { mPassword_Input.text = string.Empty; });
             //mAccountStr = "13910723157";
             //mPasswordStr = "1";
-            mAccountStr = "guohaipeng";
+            mAccountStr = "lisongnan";
             mPasswordStr = "13579Wp!#%&(";
 #if UNITY_EDITOR
             // OnClickLogin();
@@ -46,7 +48,7 @@ namespace GHZLangChao
             mAccount_Input.text = mAccountStr;
             mPassword_Input.text = mPasswordStr;
 
-
+            deviceId.text = GetAndroidSNIEMI.GetDeviceUniqueIdMD5();
         }
 
         /// <summary>

+ 139 - 2
Assets/Game/ShowLogin/LoginPanel.prefab

@@ -970,7 +970,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: 1.0.1212.1038
+  m_text: 1.0.24.0116.1348
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -1033,7 +1033,7 @@ MonoBehaviour:
   m_VertexBufferAutoSizeReduction: 0
   m_useMaxVisibleDescender: 1
   m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_margin: {x: 0, y: 0, z: -41.83203, w: 0}
   m_isUsingLegacyAnimationComponent: 0
   m_isVolumetricText: 0
   m_hasFontAssetChanged: 0
@@ -1338,6 +1338,7 @@ RectTransform:
   - {fileID: 1923509390589026844}
   - {fileID: 161529195959648752}
   - {fileID: 2192276576298069465}
+  - {fileID: 4257557653715068313}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1396,6 +1397,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a88615caab821064c9236e27153c1e38, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  deviceId: {fileID: 2269943355458673008}
 --- !u!114 &2911140680020989035
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -3764,6 +3766,141 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: -15.553459}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &6008727803600892235
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4257557653715068313}
+  - component: {fileID: 2383548882715968212}
+  - component: {fileID: 2269943355458673008}
+  m_Layer: 5
+  m_Name: Text (TMP) (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4257557653715068313
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6008727803600892235}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5466424356445212017}
+  m_RootOrder: 10
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 22, y: -365}
+  m_SizeDelta: {x: 411.269, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2383548882715968212
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6008727803600892235}
+  m_CullTransparentMesh: 1
+--- !u!114 &2269943355458673008
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6008727803600892235}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: 
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 3036676095
+  m_fontColor: {r: 1, g: 1, b: 1, a: 0.7058824}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 36
+  m_fontSizeBase: 36
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 1
+  m_VerticalAlignment: 256
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &8236489067048506455
 GameObject:
   m_ObjectHideFlags: 0

+ 1 - 0
Assets/Game/ShowSupport/SupportControl.cs

@@ -135,6 +135,7 @@ public class SupportControl : AbstractController
 
     public void LeaveRoom()
     {
+        RTCRoomManager.Instance.CancelApply();
         switch (RTCRoomManager.Instance.rtcState)
         {
             case RTCEnum.OFF:

+ 11 - 1
Assets/HttpActionLang.cs

@@ -1,5 +1,6 @@
 using XRTool.Util;
-
+using System.Net;
+using System.Security.Cryptography.X509Certificates;
 public class HttpActionLang : Singleton<HttpActionLang>
 {
 
@@ -17,6 +18,8 @@ public class HttpActionLang : Singleton<HttpActionLang>
 
     public const string apply = "/cmcc-endustry/v1/assistance/apply";
 
+    public const string cancel_Apply = "/cmcc-endustry/v1/assistance/cancel";
+
     public const string inspection_begin = "/cmcc-endustry/v1/inspection/begin"; // 机房巡检开始
 
     public const string inspection_step = "/cmcc-endustry/v1/inspection/step"; // 机房巡检步骤上报
@@ -44,4 +47,11 @@ public class HttpActionLang : Singleton<HttpActionLang>
     public const string updateTag = "/cmcc-endustry/v1/navigation/updateRoomTagData";
 
     public string mqttSocket ="";
+
+    public static void BypassSSLValidation()
+    {
+        System.Net.ServicePointManager.ServerCertificateValidationCallback += (sender, certificate, chain, sslPolicyErrors) => true;
+        // 绕过所有SSL证书验证
+        ServicePointManager.ServerCertificateValidationCallback = (sender, certificate, chain, sslPolicyErrors) => true;
+    }
 }

+ 1 - 0
Assets/LangChaoJiekou.cs

@@ -325,6 +325,7 @@ public class LangChaoJiekou : MonoSingleton<LangChaoJiekou>
         }
 
         webRequest = UnityWebRequest.Get(url);
+       
         Debug.Log("下载==》" + url + "   " + jsonString);
         Debug.Log("下载参数==》" + jsonString  );
         using (webRequest)

+ 5 - 5
Assets/LangChaoRTC/Remote/PopPublic/PDFViewer.prefab

@@ -6239,7 +6239,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0.0069885254}
+  m_AnchoredPosition: {x: 0, y: 0.011169434}
   m_SizeDelta: {x: -20, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &3062369171293304398
@@ -6822,7 +6822,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -0.014831543, y: 0.01121521}
+  m_AnchoredPosition: {x: 0.0017700195, y: 0.0029144287}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3062369171367763196
@@ -7765,7 +7765,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 3062369170313225776}
   m_Direction: 0
   m_Value: 0
-  m_Size: 0.9999884
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -10506,7 +10506,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 3062369170679136092}
   m_Direction: 2
   m_Value: 1
-  m_Size: 0.9999739
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -10833,7 +10833,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 3062369170267795887}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.9999916
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:

+ 20 - 8
Assets/LangChaoRTC/Remote/ShowRoom/RoomInvite/Scripts/PngJpgItem.cs

@@ -48,17 +48,29 @@ public class PngJpgItem : BaseFilePrefabItem
             Debug.Log("rfd==>" + rfd.url);
             Debug.Log("rfd==>" + rfd.bytes.Length);
            string url = rfd.url;
-            NetWorkHeaders.Instance.getNetTexture(url, null, (Texture tex) =>
-            {
-                if (tex)
-                {
-                    Adaption(tex);
-                    mainImage.texture = tex;
-                }
-            });
+
+            mainImage.texture = GetSprite(rfd.bytes).texture;
+            //NetWorkHeaders.Instance.getNetTexture(url, null, (Texture tex) =>
+            //{
+            //    if (tex)
+            //    {
+            //        Adaption(tex);
+            //        mainImage.texture = tex;
+            //    }
+            //});
         });
     }
 
+    public Sprite GetSprite(Byte[] bytes)
+    {
+        //先创建一个Texture2D对象,用于把流数据转成Texture2D
+        Texture2D texture = new Texture2D(10, 10);
+        texture.LoadImage(bytes);//流数据转换成Texture2D
+        //创建一个Sprite,以Texture2D对象为基础
+        Sprite sp = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), Vector2.zero);
+        return sp;
+    }
+
     public void Adaption(Texture tex)
     {
         float standard_width = 150f;

+ 1 - 1
Assets/LangChaoRTC/Remote/ShowRoom/RoomMain.prefab

@@ -354,7 +354,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\u8FDC\u7A0B\u534F\u52A9"
+  m_text: "\u8FDC\u7A0B\u534F\u4F5C"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 53b37c1f568195149b410dacded90c09, type: 2}
   m_sharedMaterial: {fileID: 1738077909898060448, guid: 53b37c1f568195149b410dacded90c09, type: 2}

+ 30 - 1
Assets/LangChaoRTC/Remote/Z_Blend/PdfManager.cs

@@ -1,6 +1,7 @@
 using Paroxe.PdfRenderer;
 using System.Collections;
 using System.Collections.Generic;
+using System.IO;
 using UnityEngine;
 using UnityEngine.UI;
 using static LangChaoRommMinIo;
@@ -20,12 +21,15 @@ public class PdfManager : BaseFilePrefabItem
             {
                 url = "https://" + fileConfig.Url;
             }
+            showPDF(url);
             LangChaoRommMinIo.Instance.getFile(MQTTManager.Instance.roomId, fileConfig.Bucket, fileConfig.ObjectName, (RoomFileData rfd) => {
 
                 Debug.Log("rfd==>" + rfd.url);
                 Debug.Log("rfd==>" + rfd.bytes.Length);
                 string url = rfd.url;
-                showPDF(url);
+
+             //   StartCoroutine(SavePDF(Application.persistentDataPath + "/" + fileConfig.UUid + Path.GetExtension(fileConfig.FileName), rfd.bytes));
+              
 
             });
           
@@ -35,6 +39,31 @@ public class PdfManager : BaseFilePrefabItem
        
     }
 
+    private IEnumerator SavePDF(string path, byte[] bytes)
+    {
+        Debug.Log(" Path  ==> " + path);
+        FileInfo file = new FileInfo(path);
+        if (file.Exists)
+        {
+            // file.Delete();
+            yield return new WaitForSeconds(0.02f);
+            showPDF(path);
+
+        }
+        else
+        {
+            Stream sw = File.Create(path);
+            // FileStream sw = new FileStream(path);
+
+            sw.Write(bytes, 0, bytes.Length);
+
+            sw.Close();
+            sw.Dispose();
+            yield return new WaitForSeconds(0.02f);
+            showPDF(path);
+        }
+
+    }
     public void showPDF(string url)
     {
         //this.transform.localPosition = new Vector3(0,0,0.69f);

+ 4 - 5
Assets/Scenes/LangChaoDemo2.unity

@@ -3861,7 +3861,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 062fe91f7f40e2842b56a188ab73f67d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  trackID: 15
+  trackID: 19
   trackingIsLost: 0
   m_debugView: 0
   m_size: 0.17
@@ -18039,7 +18039,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 062fe91f7f40e2842b56a188ab73f67d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  trackID: 26
+  trackID: 22
   trackingIsLost: 0
   m_debugView: 0
   m_size: 0.17
@@ -18587,7 +18587,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 062fe91f7f40e2842b56a188ab73f67d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  trackID: 6
+  trackID: 18
   trackingIsLost: 0
   m_debugView: 0
   m_size: 0.17
@@ -20714,7 +20714,6 @@ MonoBehaviour:
   email: 
   phone: 
   roleId: 
-  resourcePool: 
   resourcePoolId: 0
   expertType: 
   _username: 
@@ -28564,7 +28563,7 @@ MonoBehaviour:
     host: 
   question: 0
   rtcState: 0
-  controlPhone: 
+  controlId: 
   isRTCreate: 0
   audio1: {fileID: 0}
   audio2: {fileID: 0}

+ 3 - 3
Assets/Scripts/MQTT/MQTTClient.cs

@@ -119,14 +119,14 @@ public class MQTTClient : MonoSingleton<MQTTClient>
 
         DisConnect();
         qt = new QTTManager(MQTTManager.Instance.clientId, MQTTManager.Instance.username , MQTTManager.certification, HttpActionLang.Instance.mqttSocket, "1883");
-        qt.Connect();
-        StartCoroutine(Reconnection());
+      
         qt.ConnectionFailed += onFaild;
         qt.ConnectionSucceeded += onSucceed;
         qt.OnConnecting += OnConnecting;
         qt.OnReceived += OnReceived;
         qt.OnClose += OnClose;
-
+        qt.Connect();
+        StartCoroutine(Reconnection());
         //  StartSendCameraPos();
     }
 

+ 22 - 1
Assets/Scripts/RTC/RTCRoomManager.cs

@@ -39,6 +39,8 @@ public class RTCRoomManager : MonoSingleton<RTCRoomManager>, IController
     /// 是否申请协助
     /// </summary>
     public bool isApply = false;
+
+    private int assistanceId = -1;
     private void Start()
     {
         this.RegisterEvent<RTCCreatRoomSuccessEvent>(CreatRoomSuccess).UnRegisterWhenGameObjectDestroyed(gameObject);
@@ -133,7 +135,9 @@ public class RTCRoomManager : MonoSingleton<RTCRoomManager>, IController
                 JObject jobject = JObject.Parse(message);
                 if (jobject["code"].ToString() == "200" && !string.IsNullOrWhiteSpace(jobject["data"].ToString()))
                 {
-                    Debug.Log("DGJ ===>   "+ transform.position.sqrMagnitude+ transform.CompareTag(""));
+                    assistanceId = int.Parse(jobject["data"]["assistanceId"].ToString());
+                    Debug.Log("DGJ ===> " + assistanceId);
+                  //  Debug.Log("DGJ ===>   "+ transform.position.sqrMagnitude+ transform.CompareTag(""));
                     // ScenesManager.Instance.showWindow(ScenesManager.SceneType.ShowRoom); // 等待收到专家入场
                  
                 }
@@ -141,6 +145,23 @@ public class RTCRoomManager : MonoSingleton<RTCRoomManager>, IController
         }
 
     }
+
+    public void CancelApply()
+    {
+        if(assistanceId!=-1)
+        {
+            JsonData data = new JsonData();
+            data["assistanceId"] = assistanceId;
+            StartCoroutine(HttpTool.Instance.SendHttp(HttpActionLang.cancel_Apply, data.ToJson(), message =>
+           {
+               Debug.Log("DGJ ===>  HttpActionLang.cancel_Apply   " + HttpActionLang.cancel_Apply + "   " + message);
+
+           }));
+
+            assistanceId = -1;
+        }
+    }
+
     public void ExpertJonin(string identity)
     {
         

BIN
Assets/UI/mipmap-xxxhdpi/xeizuo.png


+ 147 - 0
Assets/UI/mipmap-xxxhdpi/xeizuo.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 74d30820cd0b0a54ebd0ed512de048de
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/UI/mipmap-xxxhdpi/xiezuo2.png


+ 147 - 0
Assets/UI/mipmap-xxxhdpi/xiezuo2.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: 65dd3fff009a58c4b8fd9285d120282e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 4
ProjectSettings/ProjectSettings.asset

@@ -146,9 +146,7 @@ PlayerSettings:
     16:9: 1
     Others: 1
   bundleVersion: 1.0.0
-  preloadedAssets:
-  - {fileID: -3507145773158424512, guid: 3df6047a2585e9a4b87f07c19a70fec7, type: 2}
-  - {fileID: -6724271008176559649, guid: aba1d4d6205d4914784889e2d8ed78c4, type: 2}
+  preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -183,7 +181,7 @@ PlayerSettings:
   iPhoneStrippingLevel: 0
   iPhoneScriptCallOptimization: 0
   ForceInternetPermission: 0
-  ForceSDCardPermission: 0
+  ForceSDCardPermission: 1
   CreateWallpaper: 0
   APKExpansionFiles: 0
   keepLoadedShadersAlive: 0