Merge branch 'F/20240102_HotUpdate' of https://gogs.ghz-tech.com:8843/GHzGlass/MREdustryXR into F/20240102_HotUpdate

Assets/FrameWork/Edustry_icon.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: b3e3fd6550d0bcc45b07a993a45d63f8
+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: 0
+  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: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/FrameWork/ProjectManager/XunJian/进入任务/进入任务.prefab

@@ -1895,7 +1895,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 385.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 771, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &7307238916267295113
@@ -3295,7 +3295,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 959.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &3001207142907341833
@@ -6610,7 +6610,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 385.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 499, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6636242897306529089
@@ -7992,6 +7992,11 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 7255333946027317694, guid: 4d3636cb3ec3d4b4197477650beeb660, type: 3}
   m_PrefabInstance: {fileID: 6478351553496440801}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &8183282706243599341 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2915911613087114252, guid: 4d3636cb3ec3d4b4197477650beeb660, type: 3}
+  m_PrefabInstance: {fileID: 6478351553496440801}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &8690263258676728082 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 2413293942919352051, guid: 4d3636cb3ec3d4b4197477650beeb660, type: 3}
@@ -8006,10 +8011,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 8690263258676728082}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d1976a6c73df16c4997032b3e989d934, type: 3}
+  m_Script: {fileID: 11500000, guid: 19b3afe210dfd8347b080138335d1faa, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  ap: {fileID: 8127128727990103697}
+  _scanFrequency: 0
 --- !u!114 &8127128727990103697
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -8019,9 +8024,11 @@ MonoBehaviour:
   m_GameObject: {fileID: 8690263258676728082}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: eb94bf957aaed554492064dde1c1775e, type: 3}
+  m_Script: {fileID: 11500000, guid: 6c43c2e969f7c77408b270b6f63e4f09, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  plbt: {fileID: 8183282706243599341}
+  url: 
 --- !u!1001 &7866664744296773037
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/HotUpdate/Scripts/Scripts/JinRuRenwu.cs

@@ -608,6 +608,7 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
 
     public void updateListRef()
     {
+      
         for (int i = updateList.Count-1; i >=0; i--)
         {
             if ((updateList[i].GetComponent<ContentSizeFitter>()))

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/XunJianDataManager.cs

@@ -665,10 +665,10 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
             switch (data[i].regionMapType)
             {
                 case 0:
-                    xj.renwuModelType = RenWuModelType.SaoTu;
+                    xj.renwuModelType = RenWuModelType.None;
                     break;
                 case 1:
-                    xj.renwuModelType = RenWuModelType.SaoTu;
+                    xj.renwuModelType = RenWuModelType.None;
                     break;
                 case 2:
                     xj.renwuModelType = RenWuModelType.DianYun;
@@ -769,6 +769,7 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
 
     public void GotoXunJian(XunJianListData xjld)
     {
+        xjld.projectState = "进行中";
         chooseXunJian = xjld;
         WindowsManager.Instance.show(WindowConfig.windowType.XunJianStart);
         TopManager.Instance.gameObject.SetActive(false);
@@ -803,7 +804,7 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
             backTip.Add(data.ToJson());
             backTip.Add("3");
             WindowsManager.Instance.show(WindowConfig.windowType.Error, false, WindowsManager.Instance.getErrorData("提示", "已经是最后一步了!", Color.gray, "icon", backTip, false, "自动退出", 5,"","退出巡检","返回").ToJson());
-
+            chooseXunJian.projectState = "已完成";
         }
 
         chooseXunJian.nowIndex++;

Assets/HotUpdate/Scripts/Scripts/Project/XunJian/进入任务/RenWuTypeWindow.cs

@@ -95,7 +95,8 @@ public class RenWuTypeWindow : MonoBehaviour
                   {
                       Debug.Log(rfd.url);
                       Debug.Log(rfd.bytes.Length);
-                      StartCoroutine(SaveMp4(Application.persistentDataPath + "/" + data.uuid +".mp4", rfd.bytes));
+                     // gameObject.SetActive(true);
+                     WindowsManager.Instance.StartCoroutine(SaveMp4(Application.persistentDataPath + "/" + data.uuid +".mp4", rfd.bytes));
 
                   });
                 break;
@@ -139,8 +140,8 @@ public class RenWuTypeWindow : MonoBehaviour
                 {
                     Debug.Log(rfd.url);
                     Debug.Log(rfd.bytes.Length);
-
-                    StartCoroutine(SaveModel(Application.persistentDataPath + "/" + data.uuid + ".zip", rfd.bytes));
+                   // gameObject.SetActive(true);
+                    WindowsManager.Instance.StartCoroutine(SaveModel(Application.persistentDataPath + "/" + data.uuid + ".zip", rfd.bytes));
                 });
 
                 break;

Assets/Plugins/Demigiant.meta

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

Assets/Scenes/Edustry.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44402242, g: 0.49316543, b: 0.5722324, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -249,7 +249,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 8240336528491331395, guid: c2bba08c58147f6428b068597dde0286, type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 8240336528491331395, guid: c2bba08c58147f6428b068597dde0286, type: 3}
       propertyPath: m_LocalPosition.x
@@ -566,7 +566,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 0
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
 --- !u!1 &676269397
 GameObject:
@@ -614,7 +614,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 1
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &676269401
 MonoBehaviour:
@@ -878,7 +878,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6007065485426162334, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
       propertyPath: m_RootOrder
-      value: 4
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6007065485426162334, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
       propertyPath: m_LocalPosition.x

Assets/StreamingAssets/old.meta

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