修复一些BUG

Assets/BlurScreen/GaussianBlur/Example/BlurHQ 1.mat

@@ -0,0 +1,85 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: BlurHQ 1
+  m_Shader: {fileID: 4800000, guid: 54d0ad70cd0c44037ad52d9697449988, type: 3}
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 5
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _Glossiness: 0.5
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _Size: 1.7
+    - _SrcBlend: 1
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UVSec: 0
+    - _Vibrance: 0
+    - _Vibrancy: 0.38
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _TintColor: {r: 0.2735849, g: 0.2735849, b: 0.2735849, a: 0.7058824}
+  m_BuildTextureStacks: []

Assets/BlurScreen/GaussianBlur/Example/BlurHQ 1.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 449a7c3ed18da4943810c98693180525
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/BlurScreen/GaussianBlur/Example/BuKa.mat

@@ -0,0 +1,80 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: BuKa
+  m_Shader: {fileID: 15300, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []

Assets/BlurScreen/GaussianBlur/Example/BuKa.mat.meta

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

Assets/BlurScreen/GaussianBlur/Example/Floor.mat

@@ -8,10 +8,10 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Floor
-  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
-  m_ValidKeywords:
+  m_Shader: {fileID: 10766, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
   - _EMISSION
-  m_InvalidKeywords: []
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -29,6 +29,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _DetailBump:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _DetailMask:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -37,10 +41,18 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _DetailTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _EmissionMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _MainBump:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _MainTex:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -60,6 +72,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _BumpScale: 1
+    - _ColorMask: 15
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
@@ -70,12 +83,21 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _Shininess: 0.2
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _Strength: 0.2
     - _UVSec: 0
+    - _UseUIAlphaClip: 0
     - _ZWrite: 1
     m_Colors:
     - _Color: {r: 0.74264705, g: 0.546064, b: 0.60707253, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _Specular: {r: 0, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []

Assets/DownLoadXR/Packages/Minio.6.0.1/lib/netstandard2.0/Minio.dll.meta

@@ -18,6 +18,18 @@ PluginImporter:
     second:
       enabled: 1
       settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/DownLoadXR/Packages/System.Runtime.CompilerServices.Unsafe.6.0.0/lib/netstandard2.0/System.Runtime.CompilerServices.Unsafe.dll.meta

@@ -18,6 +18,18 @@ PluginImporter:
     second:
       enabled: 1
       settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Editor/ModifierUtility.cs

@@ -1,47 +0,0 @@
-using System;
-using System.Reflection;
-using System.Collections.Generic;
-
-namespace UnityEngine.UI{
-	/// <summary>
-	/// Helps with getting ModifierID Attributes etc.
-	/// </summary>
-	public static class ModifierUtility {
-		/// <summary>
-		/// Gets the instance with identifier specified in a ModifierID Attribute.
-		/// </summary>
-		/// <returns>The instance with identifier.</returns>
-		/// <param name="id">Identifier.</param>
-		public static ProceduralImageModifier GetInstanceWithId(string id){
-			return (ProceduralImageModifier)Activator.CreateInstance(GetTypeWithId(id));
-		}
-		/// <summary>
-		/// Gets the type with specified in a ModifierID Attribute.
-		/// </summary>
-		/// <returns>The type with identifier.</returns>
-		/// <param name="id">Identifier.</param>
-		public static Type GetTypeWithId(string id){
-			foreach(Type type in Assembly.GetAssembly(typeof(ProceduralImageModifier)).GetTypes()) {
-				if (type.IsSubclassOf(typeof(ProceduralImageModifier))){
-					if(((ModifierID[])type.GetCustomAttributes(typeof(ModifierID),false))[0].Name == id){
-						return type;
-					}
-				}
-			}
-			return null;
-		}
-		/// <summary>
-		/// Gets a list of Attributes of type ModifierID.
-		/// </summary>
-		/// <returns>The attribute list.</returns>
-		public static List<ModifierID> GetAttributeList(){
-			List<ModifierID> l = new List<ModifierID> ();
-			foreach(Type type in Assembly.GetAssembly(typeof(ProceduralImageModifier)).GetTypes()) {
-				if (type.IsSubclassOf(typeof(ProceduralImageModifier))){
-					l.Add (((ModifierID[])type.GetCustomAttributes(typeof(ModifierID),false))[0]);
-				}
-			}
-			return l;
-		}
-	}
-}

Assets/Editor/ModifierUtility.cs.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: e79fcbba9d695e540aca7087556cc6a1
-timeCreated: 1447713277
-licenseType: Store
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Editor/ProceduralImageEditorUtility.cs

@@ -1,44 +0,0 @@
-using UnityEngine;
-using System.Collections;
-using UnityEditor;
-using UnityEngine.UI;
-
-namespace UnityEditor.UI {
-	/// <summary>
-	/// This class adds a Menu Item "GameObject/UI/Procedural Image"
-	/// Bahviour of this command is the same as with regular Images
-	/// </summary>
-	public class ProceduralImageEditorUtility {
-		[MenuItem("GameObject/UI/Procedural Image")]
-		public static void AddProceduralImage(){
-			GameObject o = new GameObject ();
-			o.AddComponent<ProceduralImage> ();
-			o.name = "Procedural Image";
-			if (Selection.activeGameObject != null && Selection.activeGameObject.GetComponentInParent<Canvas> () != null) {
-				o.transform.SetParent (Selection.activeGameObject.transform, false);
-				Selection.activeGameObject = o;
-			}
-			/*else if (Selection.activeGameObject != null) {
-				//selected GameObject is not child of canvas:
-			}*/
-			else {
-				if(GameObject.FindObjectOfType<Canvas>()==null)	{
-					EditorApplication.ExecuteMenuItem("GameObject/UI/Canvas");
-				}
-				Canvas c = GameObject.FindObjectOfType<Canvas>();
-				o.transform.SetParent (c.transform, false);
-				Selection.activeGameObject = o;
-			}
-		}
-		/// <summary>
-		/// Replaces an Image Component with a Procedural Image Component.
-		/// </summary>
-		[MenuItem("CONTEXT/Image/Replace with Procedural Image")]
-		public static void ReplaceWithProceduralImage(MenuCommand command){
-			Image image = (Image)command.context;
-			GameObject obj = image.gameObject;
-			GameObject.DestroyImmediate (image);
-			obj.AddComponent<ProceduralImage> ();
-		}
-	}
-}

Assets/Editor/ProceduralImageEditorUtility.cs.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: ab56b8af7b7e66441b56118cb2d5bc4e
-timeCreated: 1447959405
-licenseType: Store
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/FrameWork/2D.spriteatlasv2

@@ -0,0 +1,52 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!612988286 &1
+SpriteAtlasAsset:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_MasterAtlas: {fileID: 0}
+  m_ImporterData:
+    serializedVersion: 2
+    textureSettings:
+      serializedVersion: 2
+      anisoLevel: 1
+      compressionQuality: 50
+      maxTextureSize: 2048
+      textureCompression: 0
+      filterMode: 1
+      generateMipMaps: 1
+      readable: 1
+      crunchedCompression: 0
+      sRGB: 1
+    platformSettings:
+    - serializedVersion: 3
+      m_BuildTarget: Android
+      m_MaxTextureSize: 2048
+      m_ResizeAlgorithm: 0
+      m_TextureFormat: 50
+      m_TextureCompression: 1
+      m_CompressionQuality: 50
+      m_CrunchedCompression: 0
+      m_AllowsAlphaSplitting: 0
+      m_Overridden: 0
+      m_AndroidETC2FallbackOverride: 0
+      m_ForceMaximumCompressionQuality_BC6H_BC7: 0
+    packingSettings:
+      serializedVersion: 2
+      padding: 4
+      blockOffset: 1
+      allowAlphaSplitting: 0
+      enableRotation: 1
+      enableTightPacking: 1
+      enableAlphaDilation: 0
+    secondaryTextureSettings: {}
+    variantMultiplier: 1
+    packables:
+    - {fileID: 102900000, guid: 7f9935435f9840842a7dfce87578b09d, type: 3}
+    bindAsDefault: 1
+    isAtlasV2: 1
+    cachedData: {fileID: 0}
+  m_IsVariant: 0

Assets/FrameWork/2D.spriteatlasv2.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 78cff99328ff6124f856d072075586eb
+SpriteAtlasImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/FrameWork/AR.prefab

@@ -334,7 +334,7 @@ MonoBehaviour:
   CameraSize: {x: 1280, y: 960}
   CameraOpenMethod: 1
   CameraType: 1
-  CameraIndex: 2
+  CameraIndex: 0
   cameraPreference: 0
 --- !u!1 &2351110680108509795
 GameObject:

Assets/BlurScreen/GaussianBlur/Example/BlurHQ.mat → Assets/FrameWork/BlurHQ.mat

@@ -8,13 +8,13 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: BlurHQ
-  m_Shader: {fileID: 4800000, guid: 54d0ad70cd0c44037ad52d9697449988, type: 3}
+  m_Shader: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
   m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 5
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3000
+  m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
   m_SavedProperties:
@@ -59,6 +59,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _BumpScale: 1
+    - _ColorMask: 15
     - _Cutoff: 0.5
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
@@ -75,11 +76,12 @@ Material:
     - _StencilReadMask: 255
     - _StencilWriteMask: 255
     - _UVSec: 0
+    - _UseUIAlphaClip: 0
     - _Vibrance: 0
     - _Vibrancy: 0.38
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 0.5188679, g: 0.5188679, b: 0.5188679, a: 0.62352943}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _TintColor: {r: 0.2735849, g: 0.2735849, b: 0.2735849, a: 0.5882353}
+    - _TintColor: {r: 0.2735849, g: 0.2735849, b: 0.2735849, a: 0.7058824}
   m_BuildTextureStacks: []

Assets/FrameWork/JianTou.prefab

@@ -85,7 +85,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
+  m_PresetInfoIsWorld: 1
 --- !u!114 &1909995360214599718
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/FrameWork/Login/SmallIconItem.prefab

@@ -101,7 +101,6 @@ GameObject:
   - component: {fileID: 3176420488534560842}
   - component: {fileID: 5745037088995240394}
   - component: {fileID: 2378118562381520559}
-  - component: {fileID: 5003701075152160832}
   m_Layer: 5
   m_Name: SmallIconItem
   m_TagString: Untagged
@@ -237,19 +236,6 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
---- !u!114 &5003701075152160832
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2484990173723969103}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 35172762ec0d5c649988b493bae6ac42, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  msg: "\u8BF7\u9009\u62E9\u8D26\u53F7"
 --- !u!1 &6485174692968104930
 GameObject:
   m_ObjectHideFlags: 0

Assets/FrameWork/ProjectManager/Main.prefab

@@ -450,7 +450,6 @@ RectTransform:
   - {fileID: 5352705607961661000}
   - {fileID: 5105696921889325718}
   - {fileID: 5668674593017090216}
-  - {fileID: 2141298237888788900}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1509,81 +1508,3 @@ MonoBehaviour:
     y: 0
     width: 1
     height: 1
---- !u!1001 &2141298237888389928
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 4259667480389853181}
-    m_Modifications:
-    - target: {fileID: 100012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
-      propertyPath: m_Name
-      value: dianchang
-      objectReference: {fileID: 0}
-    - target: {fileID: 100012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
-      propertyPath: m_RootOrder
-      value: 4
-      objectReference: {fileID: 0}
-    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
-      propertyPath: m_LocalScale.x
-      value: 800
-      objectReference: {fileID: 0}
-    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
-      propertyPath: m_LocalScale.y
-      value: 800
-      objectReference: {fileID: 0}
-    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
-      propertyPath: m_LocalScale.z
-      value: 800
-      objectReference: {fileID: 0}
-    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -8360
-      objectReference: {fileID: 0}
-    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 18040
-      objectReference: {fileID: 0}
-    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 180
-      objectReference: {fileID: 0}
-    - target: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
---- !u!4 &2141298237888788900 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 400012, guid: 37b6e61bc39c60d478d8375280da0b22, type: 3}
-  m_PrefabInstance: {fileID: 2141298237888389928}
-  m_PrefabAsset: {fileID: 0}

Assets/FrameWork/ProjectManager/Text.prefab

@@ -134,6 +134,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b9df92cc077b8924abbbb78762154fe0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  info: {fileID: 0}
 --- !u!114 &-1221202283288059475
 MonoBehaviour:
   m_ObjectHideFlags: 0

Assets/FrameWork/ProjectManager/Top.prefab

@@ -358,7 +358,7 @@ RectTransform:
   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: 0, y: 407}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &5056930649974736067

Assets/FrameWork/ProjectManager/XunJian/列表模块/列表模块.prefab

@@ -5015,7 +5015,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: 85, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &4594328452210515319
@@ -9369,7 +9369,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5757031169473047620, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6412704287067267521, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
       propertyPath: m_Pivot.x

Assets/FrameWork/ProjectManager/项目.prefab

@@ -30,7 +30,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 2187299309793202119}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -77,3 +78,105 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   global: 1
   timestamp: -1
+--- !u!1001 &5090292093732695558
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 2012759580409433135}
+    m_Modifications:
+    - target: {fileID: 5757031169473047620, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
+      propertyPath: m_Name
+      value: Top
+      objectReference: {fileID: 0}
+    - target: {fileID: 6412704287067267521, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6412704287067267521, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6412704287067267521, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6412704287067267521, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6412704287067267521, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6412704287067267521, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6412704287067267521, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 6412704287067267521, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 6412704287067267521, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 60
+      objectReference: {fileID: 0}
+    - target: {fileID: 6412704287067267521, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6412704287067267521, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6412704287067267521, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6412704287067267521, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6412704287067267521, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6412704287067267521, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6412704287067267521, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6412704287067267521, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6412704287067267521, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6412704287067267521, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6412704287067267521, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6412704287067267521, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
+--- !u!224 &2187299309793202119 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 6412704287067267521, guid: a871cc89457f22b45b3f0a58a4c22f85, type: 3}
+  m_PrefabInstance: {fileID: 5090292093732695558}
+  m_PrefabAsset: {fileID: 0}

Assets/FrameWork/Textchinese.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 3db13b94179424d4f9154017d8ff3157
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/FrameWork/WR SDF.asset.meta

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

Assets/FrameWork/YaHei SDF.asset.meta

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

Assets/FrameWork/YaHei.ttf.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 89b51f2085dc2874f82f53b325a7ec4a
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 64
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontName: Microsoft YaHei UI
+  fontNames:
+  - Microsoft YaHei
+  fallbackFontReferences:
+  - {fileID: 12800000, guid: daef366694e895d4db0d2f1d5b423e27, type: 3}
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/HotUpdate/DownLoadXRManager.cs

@@ -30,7 +30,7 @@ public class DownLoadXRManager
         }
         else
         {
-
+            Debug.Log("111111111111111111111111111111111");
             DownLoadUrlConfig config = new DownLoadUrlConfig();
             config.url = data["url"].ToString();
             config.bytes = bytes;
@@ -39,9 +39,10 @@ public class DownLoadXRManager
 #if ISLOCAL
             GameObject go = GameObject.Instantiate(Resources.Load<GameObject>("DownLoadURLXRingItem"));
 #else
-            GameObject go = GameInit.ablist.LoadAsset<GameObject>("DownLoadURLXRingItem");
+            GameObject go = GameObject.Instantiate(GameInit.ablist.LoadAsset<GameObject>("DownLoadURLXRingItem"));
 #endif
 
+            Debug.Log("2222222222222222222222222222222222222222222");
 
 
             DownLoadURLXRItem dlitem = go.GetComponent<DownLoadURLXRItem>();

Assets/HotUpdate/GameInit.cs

@@ -83,8 +83,8 @@ public class GameInit : MonoBehaviour
         }
         slider.gameObject.SetActive(true);
 
-        AssetBundleRequest abr = acr.assetBundle.LoadAssetAsync<GameObject>("MREduastryStart");
         ablist = acr.assetBundle;
+        AssetBundleRequest abr = acr.assetBundle.LoadAssetAsync<GameObject>("MREduastryStart");
         text.text = "ÕýÔÚ¼ÓÔØÅäÖÃ";
         while (!abr.isDone)
         {

Assets/HotUpdate/HotUpdate.asmdef

@@ -15,7 +15,8 @@
         "GUID:fde3589a8929c6443a611ee759211109",
         "GUID:fe18191c7a759a941bc257d5713eac02",
         "GUID:34bafec5a04de4be0a18e0e772415a38",
-        "GUID:1c608a86fd899fc488a1c538152b8d71"
+        "GUID:1c608a86fd899fc488a1c538152b8d71",
+        "GUID:f51ebe6a0ceec4240a699833d6309b23"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Assets/HotUpdate/Scripts/LoginDataManager.cs

@@ -87,7 +87,16 @@ public class LoginDataManager:Singleton<LoginDataManager>
                     adata.avatar = new AccountAvatar();
                 }
                 if(data[i].Keys.Contains("avatar"))
-                 adata.avatar.path = data[i]["avatar"].ToString();
+                {
+                    Debug.Log(data[i]["avatar"].ToString());
+                    JsonData avatardata = JsonMapper.ToObject(data[i]["avatar"].ToString());
+                    if (avatardata.Keys.Contains("path"))
+                    {
+                        adata.avatar.path = avatardata["path"].ToString();
+                        adata.avatar.host = avatardata["host"].ToString();
+
+                    }
+                }
                 adata.phone = data[i]["phone"].ToString();
                 OftenUseldata.Add(adata);
             }

Assets/HotUpdate/Scripts/Scripts/JinRuRenwu.cs

@@ -245,6 +245,16 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
         //} 
         #endregion
 
+        if(rwitem.description!="")
+        {
+            MinioResources rym = new MinioResources();
+            rym.info = rwitem.description;
+            rym.id = 11111;//rwitem.description;
+            rym.loadingMethod = 11111;
+            rwitem.resources.Add(rym);
+            Text.GetComponent<RenWuTypeWindow>().updateData(rym);
+            TextBT.SetActive(true);
+        }
 
         if (rwitem.resources.Count > 0)
         {
@@ -271,10 +281,6 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
                         ModelBT.SetActive(true);
                         Model.GetComponent<RenWuTypeWindow>().updateData(rwitem.resources[i]);
                         break;
-                    case -1:
-                        TextBT.SetActive(true);
-                        Text.GetComponent<RenWuTypeWindow>().updateData(rwitem.resources[i]);
-                        break;
                     case 3:
                         VideoBT.SetActive(true);
                         Video.GetComponent<RenWuTypeWindow>().updateData(rwitem.resources[i]);
@@ -286,7 +292,8 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
             //{
             //    AllBT.SetActive(false);
             //}
-            if (rwitem.resources.Count < 2)
+
+            if ((rwitem.resources.Count) < 2)
             {
                 AllBT.SetActive(false);
             }
@@ -356,7 +363,7 @@ public class JinRuRenwu : WindowSingleton<JinRuRenwu>
                 case 2:
                     list.Add(Model);
                     break;
-                case -1:
+                case 11111:
                     list.Add(Text);
                     break;
                 case 3:

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

@@ -488,72 +488,72 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
                 //           //                   .ThenBy(XunJianData => XunJianData.projectState)
                 //           //                   .ThenBy(XunJianData => XunJianData.projectTime);
 
-                //           for (int i = 0; i < data.Count; i++)
-                //           {
-                //               int sortStatus = 10;
-                //               switch (data[i].status)
-                //               {
-                //                   case 1:
-                //                       sortStatus = 3;
-                //                       break;
-                //                   case 2:
-                //                       sortStatus = 2;
-                //                       break;
-                //                   case 3:
-                //                       sortStatus = 1;
-                //                       break;
-                //                   case 4:
-                //                       sortStatus = 4;
-                //                       break;
-                //                   case 5:
-                //                       sortStatus = 5;
-                //                       break;
-                //                   default:
-                //                       break;
-                //               }
-
-                //               int sortType = 10;
-                //               if(data[i].publishTime == data[i].firstPublishTime)
-                //               {
-                //                   DateTime publishTime = UnixTimeStampToDateTime(data[i].publishTime);
-                //                   DateTime nowTime = UnixTimeStampToDateTime(GetHttpTimer.Instance.timestamp);
-
-                //                   if (IsWithin24Hours(publishTime, nowTime))
-                //                   {
-                //                       sortType = 1;
-                //                   }
-                //                   else
-                //                   {
-                //                       sortType = 3;
-                //                   }
-                //               }
-                //               else
-                //               {
-                //                   sortType = 2;
-                //               }
-                //               data[i].sort_projectStatus = sortStatus;
-                //               data[i].sort_status = sortStatus;
-
-
-
-                //           }
-
-                //           var data2 = data.OrderByDescending(XunJianData => XunJianData.type)
-                //                           .ThenBy(XunJianData => XunJianData.sort_status)
-                //                           .ThenBy(XunJianData => XunJianData.sort_projectStatus)
-                //                           .ThenByDescending(XunJianData => XunJianData.publishTime);
-
-                //           List<XunJianData> data3 = new List<XunJianData>();
-                //           foreach (XunJianData item in data2)
-                //           {
-                //               data3.Add(item);
-                //           }
-
-                //           Debug.Log("DGJ  ===>  排序后   " + JsonConvert.SerializeObject(data3));
-
-                //           xjDataList.AddRange(XunJianDataParetListData(data3)); 
-                #endregion
-                xjDataList.AddRange(XunJianDataParetListData(data));
+                //for (int i = 0; i < data.Count; i++)
+                //{
+                //    int sortStatus = 10;
+                //    switch (data[i].status)
+                //    {
+                //        case 1:
+                //            sortStatus = 3;
+                //            break;
+                //        case 2:
+                //            sortStatus = 2;
+                //            break;
+                //        case 3:
+                //            sortStatus = 1;
+                //            break;
+                //        case 4:
+                //            sortStatus = 4;
+                //            break;
+                //        case 5:
+                //            sortStatus = 5;
+                //            break;
+                //        default:
+                //            break;
+                //    }
+
+                //    int sortType = 10;
+                //    if (data[i].publishTime == data[i].firstPublishTime)
+                //    {
+                //        DateTime publishTime = UnixTimeStampToDateTime(data[i].publishTime);
+                //        DateTime nowTime = UnixTimeStampToDateTime(GetHttpTimer.Instance.timestamp);
+
+                //        if (IsWithin24Hours(publishTime, nowTime))
+                //        {
+                //            sortType = 1;
+                //        }
+                //        else
+                //        {
+                //            sortType = 3;
+                //        }
+                //    }
+                //    else
+                //    {
+                //        sortType = 2;
+                //    }
+                //    data[i].sort_projectStatus = sortStatus;
+                //    data[i].sort_status = sortStatus;
+                //}
+
+
+                    //           }
+
+                    //           var data2 = data.OrderByDescending(XunJianData => XunJianData.type)
+                    //                           .ThenBy(XunJianData => XunJianData.sort_status)
+                    //                           .ThenBy(XunJianData => XunJianData.sort_projectStatus)
+                    //                           .ThenByDescending(XunJianData => XunJianData.publishTime);
+
+                    //           List<XunJianData> data3 = new List<XunJianData>();
+                    //           foreach (XunJianData item in data2)
+                    //           {
+                    //               data3.Add(item);
+                    //           }
+
+                    //           Debug.Log("DGJ  ===>  排序后   " + JsonConvert.SerializeObject(data3));
+
+                    //           xjDataList.AddRange(XunJianDataParetListData(data3)); 
+                    #endregion
+                    xjDataList.AddRange(XunJianDataParetListData(data));
                 
                 peopleList = new Dictionary<string, List<XunJianListData>>();
                 areaList = new Dictionary<string, List<XunJianListData>>();
@@ -620,26 +620,44 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
             xj.projectState = ((ProjectStatus)data[i].status).ToString();
             xj.projectType = ((ProjectType)data[i].type).ToString();
             DateTime dateTimes = UnixTimeStampToDateTime(data[i].inspectionTime);
+            long notime = GetHttpTimer.Instance.timestamp;
+
+            if (PlayerPrefs.HasKey("project_" + data[i].id))
+            {
+                long projectOld = long.Parse(PlayerPrefs.GetString("project_" + data[i].id));
+                float chaju = projectOld - data[i].inspectionTime;
+                xj.updateState =  chaju < 86400 ? "已更新" : "---";
+
+            }
+            else
+            {
+                xj.updateState = "新项目";// chaju < 86400 ? "已更新" : "新项目";
+                PlayerPrefs.SetString("project_" + data[i].id, notime.ToString());
+
+            }
+
+
+
             xj.projectTime = dateTimes.Year.ToString() + "/" + dateTimes.Month.ToString() + "/" + dateTimes.Day.ToString() + " " + dateTimes.Hour.ToString() + ":" + dateTimes.Minute.ToString();
-            xj.updateState = data[i].status > 3 ? "已更新" : "新项目";
+            
             xj.listWall = data[i].listWall;
 
             switch (data[i].status)
             {
                 case 1:
-                    xj.updateState = "已完成";
+                    xj.projectState = "已完成";
                     break;
                 case 2:
-                    xj.updateState = "进行中";
+                    xj.projectState = "进行中";
                     break;
                 case 3:
-                    xj.updateState = "未开始";
+                    xj.projectState = "未开始";
                     break;
                 case 4:
-                    xj.updateState = "即将开始";
+                    xj.projectState = "即将开始";
                     break;
                 case 5:
-                    xj.updateState = "已逾期";
+                    xj.projectState = "已逾期";
                     break;
                 default:
                     break;
@@ -647,7 +665,7 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
             switch (data[i].regionMapType)
             {
                 case 0:
-                    xj.renwuModelType = RenWuModelType.None;
+                    xj.renwuModelType = RenWuModelType.SaoTu;
                     break;
                 case 1:
                     xj.renwuModelType = RenWuModelType.SaoTu;
@@ -748,6 +766,7 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
     {
         chooseXunJian = xjld;
         WindowsManager.Instance.show(WindowConfig.windowType.XunJianStart);
+        TopManager.Instance.gameObject.SetActive(false);
         JinRuRenwu.Instance.initStart();
     }
 
@@ -767,7 +786,7 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
                 RenWuListWindow.Instance.UpdateData();
             }
             if (CaoZuoLanManager.Instance)
-                CaoZuoLanManager.Instance.nextInteractable(chooseXunJian.tasksList[chooseXunJian.nowIndex].confirmNormal);
+                CaoZuoLanManager.Instance.nextInteractable(!chooseXunJian.tasksList[chooseXunJian.nowIndex].confirmNormal);
         }
         else
         {
@@ -898,6 +917,8 @@ public class XunJianDataManager : Singleton<XunJianDataManager>
 
         public int loadingMethod { get; set; }
      //   public string name { get; set; }
+
+        public string info { get; set; }
     }
 
 

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

@@ -40,21 +40,6 @@ public class CaoZuoLanManager : MonoSingleton<CaoZuoLanManager>
         //    }
         //}
 
-        if (XunJianDataManager.Instance.chooseXunJian.tasksList.Count > (XunJianDataManager.Instance.chooseXunJian.nowIndex + 1))
-        {
-            switch (XunJianDataManager.Instance.chooseXunJian.renwuModelType)
-            {
-                case RenWuModelType.SaoTu:
-                    ChangeCameraSaoMiao.Instance.showsaomiao(XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex + 1]);
-                    break;
-                case RenWuModelType.DianYun:
-                    LineManager.Instance.setRoad(XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex + 1].roadList);
-                    break;
-                case RenWuModelType.DingWeiBan:
-                    ChangeCameraSaoMiao.Instance.showsaomiao(XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex + 1]);
-                    break;
-            }
-        }
     }
     public void failItem()
     {
@@ -87,12 +72,16 @@ public class CaoZuoLanManager : MonoSingleton<CaoZuoLanManager>
 
         //}
 
+    }
+    public void gotoNextItem()
+    {
         if (XunJianDataManager.Instance.chooseXunJian.tasksList.Count > (XunJianDataManager.Instance.chooseXunJian.nowIndex + 1))
         {
 
             switch (XunJianDataManager.Instance.chooseXunJian.renwuModelType)
             {
                 case RenWuModelType.SaoTu:
+                    JinRuRenwu.Instance.closeAll();
                     ChangeCameraSaoMiao.Instance.showsaomiao(XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex + 1]);
                     break;
                 case RenWuModelType.DianYun:
@@ -101,16 +90,17 @@ public class CaoZuoLanManager : MonoSingleton<CaoZuoLanManager>
                 case RenWuModelType.DingWeiBan:
                     ChangeCameraSaoMiao.Instance.showsaomiao(XunJianDataManager.Instance.chooseXunJian.tasksList[XunJianDataManager.Instance.chooseXunJian.nowIndex + 1]);
                     break;
+                case RenWuModelType.None:
+                    JinRuRenwu.Instance.gotoNextItem();
+                    break;
             }
 
         }
-    }
-    public void gotoNextItem()
-    {
-        JinRuRenwu.Instance.gotoNextItem();
+       //
     }
     public void GotoLieBiao()
     {
+        TopManager.Instance.gameObject.SetActive(true);
         JinRuRenwu.Instance.GotoLieBiao();
     }
 

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

@@ -77,7 +77,7 @@ public class RenWuListItemWindow : WindowSingleton<RenWuListItemWindow>
                 break;
 
         }
-        if (XunJianDataManager.Instance.chooseXunJian.nowIndex == data.sort)
+        if (XunJianDataManager.Instance.chooseXunJian.nowIndex+1 == data.sort)
         {
 
             info.color = Color.yellow;

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

@@ -63,6 +63,13 @@ public class RenWuTypeWindow : MonoBehaviour
         }
     }
 
+    private void OnEnable()
+    {
+
+        this.transform.GetComponent<RectTransform>().anchoredPosition3D = Vector3.zero;
+        this.transform.GetComponent<RectTransform>().localEulerAngles = Vector3.zero;
+    }
+
     public void updateData(MinioResources data)
     {
         if (tex != null)
@@ -74,6 +81,9 @@ public class RenWuTypeWindow : MonoBehaviour
         // Minio  下载对应资源 处理
         switch (data.loadingMethod)
         {
+            case 11111:
+                this.gameObject.GetComponentInChildren<TextMeshProUGUI>().text = data.info;
+                break;
             case 3:
                 //DownLoadXRManager.DownLoadForFilePath(DownLoadXRManager.getTestData(data.url), (string bytes) => {
                 //    this.GetComponent<ShowVideoManager>().url = bytes;
@@ -104,9 +114,12 @@ public class RenWuTypeWindow : MonoBehaviour
                 //    //  info.text = "图片加载中" + f.ToString("F2") + "%";
                 //});
 
+                Debug.Log("RoomFileMinio.Instance.bucket====>" + RoomFileMinio.Instance.bucket);
+                Debug.Log("RoomFileMinio.Instance.bucket=data.path===>" + data.path);
                 RoomFileMinio.Instance.getFile(RoomFileMinio.Instance.bucket, data.path, rfd =>
-                  {
-                      Debug.Log(rfd.url);
+                {
+                    Debug.Log("RoomFileMinio.Instance.bucket=End===>" );
+                    Debug.Log(rfd.url);
                       Debug.Log(rfd.bytes.Length);
 
                       this.GetComponent<RawImage>().texture = GetSprite(rfd.bytes).texture;

Assets/HotUpdate/Scripts/Scripts/Project/XunJianLieBiaoItem.cs

@@ -23,7 +23,7 @@ public class XunJianLieBiaoItem : MonoBehaviour
         this.data = data;
         pName.text = data.projectname;
         inarea.text = data.inarea;
-        updateState.text = data.updateState;
+        updateState.text = data.updateState;// data.updateState;
         pType.text = data.projectType;
         XunJianState.text = data.projectState;
         XunTime.text = data.projectTime;

Assets/HotUpdate/Scripts/Scripts/Project/XunJianLieBiaoWindow.cs

@@ -22,6 +22,7 @@ public class XunJianLieBiaoWindow : WindowSingleton<XunJianLieBiaoWindow>
             for (int i = 0; i < MaxLiebiao; i++)
             {
                 GameObject itemGo = GameObject.Instantiate(liebiao, parentGo.transform);
+                itemGo.SetActive(false);
                 itemList.Add(itemGo);
             }
             uiScroll.Init();
@@ -30,8 +31,15 @@ public class XunJianLieBiaoWindow : WindowSingleton<XunJianLieBiaoWindow>
             {
                 for (int i = 0; i < MaxLiebiao; i++)
                 {
-                    XunJianLieBiaoItem item = itemList[i].GetComponent<XunJianLieBiaoItem>();
-                    item.updateData(data[i]);
+                    if(data.Count> i)
+                    {
+                        XunJianLieBiaoItem item = itemList[i].GetComponent<XunJianLieBiaoItem>();
+                        itemList[i].SetActive(true);
+                        item.updateData(data[i]);
+                    }else
+                    {
+                        itemList[i].SetActive(false);
+                    }
                 }
                 /*
                 chooseArea.options = new List<TMP_Dropdown.OptionData>();

Assets/HotUpdate/Scripts/Scripts/RoomFileMinio.cs

@@ -42,23 +42,7 @@ public class RoomFileMinio : MonoSingleton<RoomFileMinio>
     {
         while (true)
         {
-            if (minio == null)
-            {
-            }
-            else
-            {
-                if (Nowfd != null && !isUpdate)
-                {
-                    isUpdate = true;
-                    Run().Wait();
-                }
-
-                if(NowPfd!=null && !isUpload)
-                {
-                    isUpload = true;
-                    UploadFile().Wait();
-                }
-            }
+            Debug.Log(" DGJ  getFile DoSomeWork Update");
             Thread.Sleep(1000);
         }
     }
@@ -71,8 +55,9 @@ public class RoomFileMinio : MonoSingleton<RoomFileMinio>
     }
     Queue<RoomFileDataBack> backQueue = new Queue<RoomFileDataBack>();
     // File uploader task.
-    private async Task Run()
+    private IEnumerator Run()
     {
+        Debug.Log(" DGJ  getFile DoSomeWork Run");
         /*
         StatObjectArgs statObjectArgs = new StatObjectArgs()
                                           .WithBucket(Nowfd.bucket)
@@ -89,44 +74,60 @@ public class RoomFileMinio : MonoSingleton<RoomFileMinio>
         rfdb.rfd = rfd;
         rfdb.Nowfd = Nowfd;
         backQueue.Enqueue(rfdb);*/
+        RoomFileData rfd = new RoomFileData();
         StatObjectArgs statObjectArgs = new StatObjectArgs()
                                               .WithBucket(Nowfd.bucket)
                                               .WithObject(Nowfd.objectName);
-        await minio.StatObjectAsync(statObjectArgs);
+        yield return minio.StatObjectAsync(statObjectArgs);
 
+        Debug.Log(" miniominiominiominiominiominiominiominiominiominio");
         // Get input stream to have content of 'my-objectname' from 'my-bucketname'
         GetObjectArgs getObjectArgs = new GetObjectArgs()
                                           .WithBucket(Nowfd.bucket)
                                           .WithObject(Nowfd.objectName)
-                                          .WithCallbackStream(async (stream) =>
+                                          .WithCallbackStream((stream) =>
                                           {
-                                              PresignedGetObjectArgs args = new PresignedGetObjectArgs()
-                                                                                .WithBucket(Nowfd.bucket)
-                                                                                .WithObject(Nowfd.objectName)
-                                                                                .WithExpiry(60 * 60 * 24);
+                                              Debug.Log(" WithCallbackStreamWithCallbackStreamWithCallbackStreamWithCallbackStreamWithCallbackStream");
+                                              rfd.bytes= StreamToBytes(stream);
+                                              /**/
 
+                                            //  rfd.url = Application.persistentDataPath + "/" + Path.GetFileName(url);
 
-                                              string url = await minio.PresignedGetObjectAsync(args);
-                                              RoomFileData rfd = new RoomFileData();
-                                              rfd.url = url;
-                                              rfd.bytes = StreamToBytes(stream);
 
+                                          });
 
-                                              RoomFileDataBack rfdb = new RoomFileDataBack();
-                                              rfdb.rfd = rfd;
-                                              rfdb.Nowfd = Nowfd;
-                                              backQueue.Enqueue(rfdb);
+        yield return minio.GetObjectAsync(getObjectArgs);
 
-                                            //  rfd.url = Application.persistentDataPath + "/" + Path.GetFileName(url);
 
 
-                                          });
+        Debug.Log(" DGJ  getFile DoSomeWork RunBack");
+        PresignedGetObjectArgs args = new PresignedGetObjectArgs()
+                                          .WithBucket(Nowfd.bucket)
+                                          .WithObject(Nowfd.objectName)
+                                          .WithExpiry(60 * 60 * 24);
+        Task<string> tk = minio.PresignedGetObjectAsync(args);
+
+        Debug.Log(" DGJ  getFile DoSomeWork RunBack");
+        while (tk.Result == null || tk.Result == ""|| rfd.bytes==null)
+        {
+            yield return null;
+        }
+
+        Debug.Log(" DGJ  getFile DoSomeWork rfdb" + tk.Result);
+        string url = tk.Result;
+        rfd.url = url;
+
+        Debug.Log(" DGJ  getFile DoSomeWork rfdb");
+
+        RoomFileDataBack rfdb = new RoomFileDataBack();
+        rfdb.rfd = rfd;
+        rfdb.Nowfd = Nowfd;
+        backQueue.Enqueue(rfdb);
 
-        await minio.GetObjectAsync(getObjectArgs);
     }
 
 
-    private async Task UploadFile()
+        private IEnumerator UploadFile()
     {
 
        // await minio.ListBucketsAsync().ConfigureAwait(false);
@@ -140,9 +141,9 @@ public class RoomFileMinio : MonoSingleton<RoomFileMinio>
                                         .WithContentType("application/octet-stream")
                                         .WithObjectSize(NowPfd.fileSize)
                                         .WithHeaders(dicheaders);
-       
 
-        await minio.PutObjectAsync(putObjectArgs).ConfigureAwait(false);
+
+        yield return minio.PutObjectAsync(putObjectArgs).ConfigureAwait(false);
 
 
         NowPfd.callBack?.Invoke(NowPfd.objectName);
@@ -163,9 +164,10 @@ public class RoomFileMinio : MonoSingleton<RoomFileMinio>
 
     void initMinIo(Action<bool> callBack)
     {
-       
+
+        Debug.Log("DGJ ===> initMinIo ");
         //获取上传凭证， 根据上传凭证获取的数据初始化 MInio
-        StartCoroutine(HttpTool.Instance.SendHttp(HttpEdustryAction.storage_projectCredential, "", async (string str) =>
+        StartCoroutine(HttpTool.Instance.SendHttp(HttpEdustryAction.storage_projectCredential, "",  (string str) =>
         {
             Debug.Log("DGJ ===> initMinIo " + str);
             try
@@ -185,6 +187,7 @@ public class RoomFileMinio : MonoSingleton<RoomFileMinio>
                 var secretKey = tmpSecretKey;// "aVOYdXLnX4MCiKbit8aomZNWvAx8YSpzhiwzFhrI";
                 Debug.Log("endpoint===>" + endpoint + "    isHttps==>" + isHttps);
                 
+                
                 if (d["data"]["region"] != null && !string.IsNullOrEmpty(d["data"]["region"].ToString()) && d["data"]["region"].ToString() != "null")
                 {
                     region = d["data"]["region"].ToString();
@@ -282,6 +285,8 @@ public class RoomFileMinio : MonoSingleton<RoomFileMinio>
         {
             NowPfd = pdQueue.Dequeue();
         }
+
+
         if (minio == null)
         {
             if (islogin&&!isminioUpdate)
@@ -294,6 +299,20 @@ public class RoomFileMinio : MonoSingleton<RoomFileMinio>
 
             }
         }
+        else
+        {
+            if (Nowfd != null && !isUpdate)
+            {
+                isUpdate = true;
+               StartCoroutine( Run());
+            }
+
+            if (NowPfd != null && !isUpload)
+            {
+                isUpload = true;
+                StartCoroutine(UploadFile());
+            }
+        }
         if (backQueue.Count > 0)
         {
             RoomFileDataBack rfdb = backQueue.Dequeue();

Assets/HotUpdate/Scripts/SmallLoginItem.cs

@@ -2,10 +2,11 @@ using System.Collections;
 using System.Collections.Generic;
 using TMPro;
 using UnityEngine;
+using UnityEngine.EventSystems;
 using UnityEngine.Networking;
 using UnityEngine.UI;
 
-public class SmallLoginItem : MonoBehaviour
+public class SmallLoginItem : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
 {
     bool isChooseBig;
     public RawImage iconImg;
@@ -17,20 +18,23 @@ public class SmallLoginItem : MonoBehaviour
         this.ad = ad;
         textName.text = ad.name;
 
-        if(ad.avatar==null)
+        if(ad.avatar==null|| ad.avatar.host=="")
         {
             ad.avatar.path = Application.streamingAssetsPath + "/icon/1.png";
+            DownLoadXRManager.DownLoadForTexture(DownLoadXRManager.getTestData((ad.avatar.host + "/" + ad.avatar.path)), (Texture2D tex) => {
+                texture = tex;
+                iconImg.texture = tex;
+            }, null);
         }
+        else
+        {
 
-        //if(ad.avatar.path!=null)
-        //{
-        //    RoomFileMinio.Instance.getFile()
-        //}
-
-        DownLoadXRManager.DownLoadForTexture(DownLoadXRManager.getTestData((ad.avatar.host+"/"+ ad.avatar.path)), (Texture2D tex) => {
-            texture = tex;
-            iconImg.texture = tex;
-        }, null);
+            Debug.Log(ad.avatar.host + "/" + ad.avatar.path);
+            DownLoadXRManager.DownLoadForTexture(DownLoadXRManager.getTestData((ad.avatar.host + "/" + ad.avatar.path)), (Texture2D tex) => {
+                texture = tex;
+                iconImg.texture = tex;
+            }, null);
+        }
        // StartCoroutine(UnityWebRequestGetData(Application.streamingAssetsPath+ad.iconUrl));
     }
     Texture2D texture;
@@ -45,5 +49,17 @@ public class SmallLoginItem : MonoBehaviour
         UserManager.Instance.setNowUser(this.ad, this.transform, iconImg.texture);
         LoginDataManager.Instance.setOftenUseAcc(this.ad);
         LoginWindowsManager.Instance.gotologinPassWord();
+        ShowInfoTipManager.Instance.closeTip();
+
+    }
+
+    public void OnPointerEnter(PointerEventData eventData)
+    {
+        ShowInfoTipManager.Instance.showTip(ad.name);
+    }
+
+    public void OnPointerExit(PointerEventData eventData)
+    {
+        ShowInfoTipManager.Instance.closeTip();
     }
 }

Assets/HybridCLRGenerate/AOTGenericReferences.cs

@@ -240,22 +240,16 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour
 		// System.Collections.Generic.List<object> System.Collections.Generic.List<object>.ConvertAll<object>(System.Converter<object,object>)
 		// System.Collections.Generic.IEnumerable<Loom.DelayedQueueItem> System.Linq.Enumerable.Where<Loom.DelayedQueueItem>(System.Collections.Generic.IEnumerable<Loom.DelayedQueueItem>,System.Func<Loom.DelayedQueueItem,bool>)
 		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter<object>,MinIoXR.<Run>d__23>(System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter<object>&,MinIoXR.<Run>d__23&)
-		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter<object>,RoomFileMinio.<UploadFile>d__19>(System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter<object>&,RoomFileMinio.<UploadFile>d__19&)
+		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter<object>,RoomFileMinio.<UploadFile>d__20>(System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter<object>&,RoomFileMinio.<UploadFile>d__20&)
 		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.TaskAwaiter<object>,MinIoXR.<RunFile>d__20>(System.Runtime.CompilerServices.TaskAwaiter<object>&,MinIoXR.<RunFile>d__20&)
-		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.TaskAwaiter<object>,RoomFileMinio.<Run>d__18>(System.Runtime.CompilerServices.TaskAwaiter<object>&,RoomFileMinio.<Run>d__18&)
 		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder<System.Threading.Tasks.VoidTaskResult>.AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter<object>,MinIoXR.<Run>d__23>(System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter<object>&,MinIoXR.<Run>d__23&)
-		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder<System.Threading.Tasks.VoidTaskResult>.AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter<object>,RoomFileMinio.<UploadFile>d__19>(System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter<object>&,RoomFileMinio.<UploadFile>d__19&)
+		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder<System.Threading.Tasks.VoidTaskResult>.AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter<object>,RoomFileMinio.<UploadFile>d__20>(System.Runtime.CompilerServices.ConfiguredTaskAwaitable.ConfiguredTaskAwaiter<object>&,RoomFileMinio.<UploadFile>d__20&)
 		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder<System.Threading.Tasks.VoidTaskResult>.AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.TaskAwaiter<object>,MinIoXR.<RunFile>d__20>(System.Runtime.CompilerServices.TaskAwaiter<object>&,MinIoXR.<RunFile>d__20&)
-		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder<System.Threading.Tasks.VoidTaskResult>.AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.TaskAwaiter<object>,RoomFileMinio.<Run>d__18>(System.Runtime.CompilerServices.TaskAwaiter<object>&,RoomFileMinio.<Run>d__18&)
 		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.Start<MinIoXR.<Run>d__23>(MinIoXR.<Run>d__23&)
 		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.Start<MinIoXR.<RunFile>d__20>(MinIoXR.<RunFile>d__20&)
-		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.Start<RoomFileMinio.<Run>d__18>(RoomFileMinio.<Run>d__18&)
-		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.Start<RoomFileMinio.<UploadFile>d__19>(RoomFileMinio.<UploadFile>d__19&)
-		// System.Void System.Runtime.CompilerServices.AsyncVoidMethodBuilder.AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.TaskAwaiter<object>,RoomFileMinio.<<Run>b__18_0>d>(System.Runtime.CompilerServices.TaskAwaiter<object>&,RoomFileMinio.<<Run>b__18_0>d&)
+		// System.Void System.Runtime.CompilerServices.AsyncTaskMethodBuilder.Start<RoomFileMinio.<UploadFile>d__20>(RoomFileMinio.<UploadFile>d__20&)
 		// System.Void System.Runtime.CompilerServices.AsyncVoidMethodBuilder.Start<MinIoXR.<<RunFile>b__20_0>d>(MinIoXR.<<RunFile>b__20_0>d&)
 		// System.Void System.Runtime.CompilerServices.AsyncVoidMethodBuilder.Start<PaiZhaoDataManager.GetUploadObject.<>c__DisplayClass0_0.<<start>b__0>d>(PaiZhaoDataManager.GetUploadObject.<>c__DisplayClass0_0.<<start>b__0>d&)
-		// System.Void System.Runtime.CompilerServices.AsyncVoidMethodBuilder.Start<RoomFileMinio.<<Run>b__18_0>d>(RoomFileMinio.<<Run>b__18_0>d&)
-		// System.Void System.Runtime.CompilerServices.AsyncVoidMethodBuilder.Start<RoomFileMinio.<>c__DisplayClass20_0.<<initMinIo>b__0>d>(RoomFileMinio.<>c__DisplayClass20_0.<<initMinIo>b__0>d&)
 		// object& System.Runtime.CompilerServices.Unsafe.As<object,object>(object&)
 		// System.Void* System.Runtime.CompilerServices.Unsafe.AsPointer<object>(object&)
 		// object System.Threading.Interlocked.CompareExchange<object>(object&,object,object)

Assets/Main/LoadDll.cs

@@ -26,7 +26,7 @@ public class LoadDll : MonoBehaviour
         this.transform.SetParent(OpenXRCamera.Instance.head.transform);
         this.transform.localPosition = Vector3.zero;
         this.transform.localEulerAngles = Vector3.zero;
-
+        //PlayerPrefs.DeleteAll();
 #if ISLOCAL
         EditorGame.SetActive(true);
         this.gameObject.SetActive(false);
@@ -58,6 +58,15 @@ public class LoadDll : MonoBehaviour
         "mscorlib.dll.bytes",
         "System.dll.bytes",
         "System.Core.dll.bytes",
+        "UniTask.dll.bytes",
+        "Minio.dll.bytes",
+        "System.Runtime.CompilerServices.Unsafe.dll.bytes",
+        "netstandard.dll.bytes",
+        "COSXML.dll.bytes",
+        "UniTask.Addressables.dll.bytes",
+        "UniTask.DOTween.dll.bytes",
+        "UniTask.Linq.dll.bytes",
+        "UniTask.TextMeshPro.dll.bytes",
     };
 
     public Text text;
@@ -72,10 +81,11 @@ public class LoadDll : MonoBehaviour
     {
         text.text = "正在获取网关数据";
 
+        for (int i = 0; i < AOTMetaAssemblyFiles.Count; i++)
+        {
+            yield return DownLoadLocal(AOTMetaAssemblyFiles[i]);
 
-        yield return DownLoadLocal("mscorlib.dll.bytes");
-        yield return DownLoadLocal("System.dll.bytes");
-        yield return DownLoadLocal("System.Core.dll.bytes");
+        }
         slider.gameObject.SetActive(false);
         while (HttpSDKAction.Instance.jsonData==null || HttpSDKAction.Instance.jsonData=="")
         {
@@ -202,7 +212,7 @@ public class LoadDll : MonoBehaviour
 
         HomologousImageMode mode = HomologousImageMode.SuperSet;
         LoadImageErrorCode err = RuntimeApi.LoadMetadataForAOTAssembly(www.downloadHandler.data, mode);
-
+        Debug.Log($"LoadMetadataForAOTAssembly:{name}. mode:{mode} ret:{err}");
     }
 
      public IEnumerator DownLoadAssets(string dllPath,string name,bool isRemote=true)

Assets/NuGet.config.meta

@@ -15,6 +15,17 @@ PluginImporter:
   platformData:
   - first:
       Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
     second:
       enabled: 1
       settings: {}

Assets/Editor/Editor.meta → Assets/StreamingAssets/COSXML.dll.bytes.meta

@@ -1,6 +1,5 @@
 fileFormatVersion: 2
-guid: 3aa34ce7f46afc14ebad54f9de108d31
-folderAsset: yes
+guid: f74dc5aadcb31ab4da2eba252b19f5ac
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/StreamingAssets/Minio.dll.bytes.meta

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

Assets/StreamingAssets/System.Runtime.CompilerServices.Unsafe.dll.bytes.meta

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

Assets/StreamingAssets/UniTask.Addressables.dll.bytes.meta

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

Assets/StreamingAssets/UniTask.DOTween.dll.bytes.meta

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

Assets/StreamingAssets/UniTask.Linq.dll.bytes.meta

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

Assets/StreamingAssets/UniTask.TextMeshPro.dll.bytes.meta

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

Assets/StreamingAssets/UniTask.dll.bytes.meta

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

Assets/StreamingAssets/netstandard.dll.bytes.meta

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

Assets/Unity中文字库7000.txt

@@ -0,0 +1,155 @@
+1234567890-=！@#￥%……&*()~:"{}[]|\?/<>,.;'+abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
+
+〔〕一丨丿丶乛
+
+一
+乙
+
+二十丁厂七
+卜
+八人入儿九匕几
+了乃刀力又乜
+
+三干亍于亏士土工才下寸丈大兀与万弋
+上小口山巾
+千乞川亿彳个么久勺丸夕凡及
+广亡门丫义之
+尸已巳弓己卫孑子孓也女飞刃习叉马乡幺
+
+丰王井开亓夫天元无韦云专丐扎廿艺木五支厅卅不仄太犬区历友歹尤匹厄车巨牙屯戈比互切瓦
+止少曰日中贝内水冈见
+手午牛毛气壬升夭长仁仃什片仆仉化仇币仂仍仅斤爪反兮刈介父爻从仑今凶分乏公仓月氏勿风欠丹匀乌勾殳凤
+卞六文亢方闩火为斗忆计订户讣认讥冗心
+尹尺夬引丑爿巴孔队办以允邓予劝双书毋幻
+
+玉刊末未示击邗戋打巧正扑卉扒邛功扔去甘世艾艽古节艿本术札可叵匝丙左厉丕石右布夯龙戊平灭轧东匜劢
+卡北占凸卢业旧帅归目旦且叮叶甲申号电田由卟叭只央史叱叽兄叼叩叫叻叨另叹冉皿凹囚四
+生失矢氕乍禾仨仕丘付仗代仙仟仡仫伋们仪白仔他仞斥卮瓜乎丛令用甩印氐乐尔句匆犰册卯犯外处冬鸟务刍包饥
+主市庀邝立冯邙玄闪兰半汀汁汇头汈汉忉宁穴宄它讦讧讨写让礼讪讫训必议讯记永
+司尻尼民弗弘阢出阡辽奶奴尕加召皮边孕发圣对弁台矛纠驭母幼丝
+
+匡耒邦玎玑式迂刑邢戎动圩圬圭扛寺吉扣扦圪考托圳老圾巩执扩圹扪扫圯圮地扬场耳芋芏共芊芍芨芄芒亚芝芎芑芗朽朴机权过亘臣吏再协西压厌厍戌在百有存而页匠夸夺夼灰达戍尥列死成夹夷轨邪尧划迈毕至
+此乩贞师尘尖劣光当吁早吐吓旯曳虫曲团同吕吊吃因吸吗吆屿屹岌帆岁回岂屺则刚网肉凼囝囡
+钆钇年朱缶氘氖牝先丢廷舌竹迁乔迄伟传乒乓休伍伎伏伛优臼伢伐仳延佤仲仵件任伤
+　　伥价伦份伧华仰伉仿伙伪伫自伊血向囟似后行甪舟全会杀合兆企汆氽众爷伞创刖肌肋朵杂夙危旬旭旮旨负犴刎犷匈犸舛各名多凫争邬色饧
+冱壮冲妆冰庄庆亦刘齐交次衣产决亥邡充妄闭问闯羊并关米灯州汗污江汕汔汲汐汛汜池汝汤汊忖忏忙兴宇守宅字安讲讳讴军讵讶祁讷许讹论讼农讽设访诀
+聿寻那艮厾迅尽导异弛阱阮孙阵阳收阪阶阴防丞奸如妁妇妃好她妈戏羽观牟欢买纡红纣驮纤纥驯纨约级纩纪驰纫巡
+
+佘寿玕\弄玙麦玖玚玛形进戒吞远违韧运扶抚坛抟技坏抔抠坜扰扼拒找批扯址走抄汞坝贡攻赤圻折抓扳坂抡扮抢扺孝坎坍均坞抑抛投抃\坟坑抗坊抖护壳志块抉扭声把报拟抒却劫毐芙芫芜苇邯芸芾芰苈苊苣芽芷芮苋芼苌花芹芥苁芩芬苍芪芴芡芟苄芳严苎芦芯劳克芭苏苡杆杜杠材村杖杌杏杉巫杓极杧杞李杨杈求忑孛甫匣更束吾豆两邴酉丽医辰励邳否还矶奁豕尬歼来忒连欤轩轪轫迓
+邶忐芈步卤卣邺坚肖旰旱盯呈时吴呋助县里呓呆吱吠呔呕园呖呃旷围呀吨旸吡町足虬邮男困吵串呙呐呗员听吟吩呛吻吹呜吭吣吲吼邑吧囤别吮岍帏岐岖岈岗岘帐岑岚兕财囵囫
+钉针钊钋钌迕氙氚牡告我乱利秃秀私岙每佞兵邱估体何佐伾佑攸但伸佃佚作伯伶佣低你佝佟住位伴佗身皂伺佛伽囱近彻役彷返佘余希佥坐谷孚妥豸含邻坌岔肝肟肛肚肘肠邸龟甸奂免劬狂犹狈狄角删狃狁鸠条彤卵灸岛邹刨饨迎饩饪饫饬饭饮系
+言冻状亩况亨庑床庋库庇疔疖疗吝应冷这庐序辛肓弃冶忘闰闱闲闳间闵闶闷羌判兑灶灿灼炀弟沣汪沅沄沐沛沔汰沤沥沌沘沏沚沙汩汨汭汽沃沂沦汹汾泛沧沨沟没汴汶沆沩沪沈沉沁泐怃忮怀怄忧忡忤忾怅忻忪怆忭忱快忸完宋宏牢究穷灾良证诂诃启评补初社祀祃诅识诈诉罕诊诋诌词诎诏诐译诒
+君灵即层屁屃尿尾迟局改张忌际陆阿孜陇陈阽阻阼附坠陀陂陉妍妩妓妪妣妙妊妖妗姊妨妫妒妞姒妤努邵劭忍刭劲甬邰矣鸡纬纭驱纯纰纱纲纳纴纵驳纶纷纸纹纺纻驴纽纾
+
+奉玩玮环玡武青责现玫玠玢玥表玦甙盂忝规匦抹卦邽坩坷坯拓垅拢拔抨坪拣拤拈坫垆坦担坤押抻抽拐拃拖拊者拍顶坼拆拎拥抵坻拘势抱拄垃拉拦幸拌拧坨坭抿拂拙招坡披拨择拚抬拇坳拗耵其耶取茉苷苦苯昔苛苤若茂茏苹苫苴苜苗英苒苘茌苻苓茚苟茆茑苑苞范茓茔茕直苠茀茁茄苕茎苔茅枉林枝杯枢枥柜枇杪杳枘枧杵枚枨析板枞松枪枫构杭枋杰述枕杻杷杼丧或画卧事刺枣雨卖矸郁矻矾矽矿砀码厕奈刳奔奇奄奋态瓯欧殴垄殁郏妻轰顷转轭斩轮软到郅鸢
+非叔歧肯齿些卓虎虏肾贤尚盱旺具昊昙果味杲昃昆国哎咕昌呵咂畅呸昕明易咙昀昂旻昉炅咔畀虮迪典固忠咀呷呻黾咒咋咐呱呼呤咚鸣咆咛咏呢咄呶咖呦咝岵岢岸岩帖罗岿岬岫帜帙帕岭岣峁刿峂迥岷剀凯帔峄沓败账贩贬购贮囹图罔
+钍钎钏钐钓钒钔钕钗邾制知迭氛迮垂牦牧物乖刮秆和季委竺秉迤佳侍佶岳佬佴供使侑佰侉例侠臾侥版侄岱侦侣侗侃侧侏凭侨侩佻佾佩货侈侪佼依佯侬帛卑的迫阜侔质欣郈征徂往爬彼径所舍金刽郐刹命肴郄斧怂爸采籴觅受乳贪念贫忿瓮戗肼肤朊肺肢肽肱肫肿肭胀朋肷股肮肪肥服胁周剁昏迩郇鱼兔狉狙狎狐忽弥狗狍狞狒咎备炙枭饯饰饱饲饳饴
+冽变京享冼庞店夜庙府底庖疟疠疝疙疚疡剂卒郊兖庚废净妾盲放刻於劾育氓闸闹郑券卷单炜炬炖炒炝炊炕炎炉炔沫浅法泔泄沽沭河泷沾泸沮泪油泱泅泗泊泠泜泺泃沿泖泡注泣泫泮泞沱泻泌泳泥泯沸泓沼波泼泽泾治怔怯怙怵怖怦怛怏性怍怕怜怩怫怊怿怪怡学宝宗定宕宠宜审宙官空帘穸穹宛实宓诓诔试郎诖诗诘戾肩房诙戽诚郓衬衫衩祆祎祉视祈诛诜话诞诟诠诡询诣诤该详诧诨诩
+建肃隶录帚屉居届刷鸤\屈弧弥弦承孟陋戕陌孤孢陕亟降函陔限卺妹姑姐妲妯姓姗妮始帑弩孥驽姆虱迦迢驾叁参迨艰线绀绁绂练驵组绅细驶织驷驸驹终绉驺驻绊驼绋绌绍驿绎经骀贯甾
+
+砉耔契贰奏春帮珏珐珂珑玷玳珀顸珍玲珊珉珈玻毒型韨拭挂封持拮拷拱垭挝垣项垮挎垯挞城挟挠垤政赴赵赳贲垱挡拽垌哉垲挺括挢埏郝垍垧垢拴拾挑垛指垫挣挤垓垟拼垞挖按挥挦挪垠拯拶某甚荆茸革茜茬荐荙巷荚荑贳荛荜茈带草茧茼莒茵茴茱莛荞茯荏荇荃荟茶荀茗荠茭茨荒垩茳茫荡荣荤荥荦荧荨茛故荩胡荪荫茹荔南荬荭药柰标栈柑枯栉柯柄柘栊柩枰栋栌相查柙枵柚枳柞柏柝栀柃柢栎枸栅柳柱柿栏柈柠柁枷柽树勃剌郚剅要酊郦柬咸威歪甭研砖厘砗厚砑砘砒砌砂泵砚斫砭砜砍面耐耍奎耷牵鸥虺残殂殃殇殄殆轱轲轳轴轵轶轷轸栎轺轻鸦虿皆毖
+韭背战觇点虐临览竖尜省削尝哐昧眄眍盹是郢眇眊盼眨昽眈哇咭哄哑显冒映禺哂星昨咴曷昴咧昱昵咦哓昭哔畎畏毗趴呲胄胃贵畋畈界虹虾虼虻蚁思蚂盅咣虽品咽骂哕剐郧勋咻哗囿咱咿响哌哙哈哚咯哆咬咳咩咪咤哝哪哏哞哟峙炭峡峣罘帧罚峒峤峋峥峧帡贱贴贶贻骨幽
+钘钙钚钛钝钞钟钡钠钢钣钤钥钦钧钨钩钪钫钬钭钮钯御缸拜看矩矧毡氡氟氢牯怎郜牲选适秕秒香种秭秋科重复竽竿笈笃俦段俨俅便俩俪叟垡贷牮顺修俏俣俚保俜促俄俐侮俭俗俘信皇泉皈鬼侵禹侯追俑俟俊盾逅待徊徇徉衍律很须舢舣叙俞弇郗剑逃俎郤爰郛食瓴盆胚胧胨胩胪胆胛胂胜胙胍胗胝朐胞胖脉胫胎鸨葡勉狨狭狮独狯狰狡飐飑狩狱狠狲訇訄逄昝贸怨急饵饶蚀饷饸饹饺饻胤饼
+峦弯孪娈将奖哀亭亮庤度弈奕迹庭庥疬疣疥疭疮疯疫疢疤庠咨姿亲竑音彦飒帝施闺闻闼闽闾闿阀阁阂差养美羑姜迸叛送类籼迷籽娄前酋首逆兹总炳炻炼炟炽炯炸烀烁炮炷炫烂烃剃洼洁洱洪洹洒洧洌浃柒浇泚浈浉浊洞洇洄测洙洗活洑涎洎洫派浍洽洮染洵洚洺洛浏济洨浐洋洴洣洲浑浒浓津浔浕洳恸恃恒恹恢恍恫恺恻恬恤恰恂恪恼恽恨举觉宣宦宥宬室宫宪突穿窀窃客诫冠诬语扁扃袆衲衽袄衿袂祛祜祓祖神祝祚诮祗祢祠误诰诱诲诳鸩说昶诵
+郡垦退既屋昼咫屏屎弭费陡逊牁眉胥孩陛陟陧陨除险院娃姞姥娅姨娆姻姝娇姚姽姣姘姹娜怒架贺盈怼羿勇炱怠癸蚤柔矜垒绑绒结绔骁绕骄骅绗绘给绚彖绛络骆绝绞骇统骈
+
+耕耘耖耗耙艳挈恝泰秦珥珙顼珰珠珽珩珧珣珞琤班珲敖素匿蚕顽盏匪恚捞栽捕埔埂捂振载赶起盐捎捍埕捏埘埋捉捆捐埚埙损袁挹捌都哲逝耆耄捡挫捋埒换挽贽挚热恐捣垸壶捃捅盍埃挨耻耿耽聂莰茝荸莆恭莽莱莲莳莫莴莪莉莠莓荷莜莅荼莶莩荽获莸荻莘晋恶莎莞莹茛莺真莙鸪莼框梆桂桔栲栳郴桓栖桡桎桢桄档桐桤株梃栝桥桕桦桁栓桧桃桅栒格桩校核样栟桉根栩逑索逋彧哥速鬲豇逗栗贾酐酎酌配酏逦翅辱唇厝孬夏砝砹砸砺砰砧砷砟砼砥砾砣础破硁恧
+　　原套剞逐砻烈殊殉顾轼轾轿辀辁辂较鸫顿趸毙致
+剕龀柴桌鸬虔虑监紧逍党眬唛逞晒晟眩眠晓眙唝哧哳哮唠鸭晃哺哽唔晔晌晁剔晏晖晕鸮趵趿畛蚌蚨蚜蚍蚋蚬畔蚝蚧蚣蚊蝌蚓哨唢哩圃哭圄哦唣唏恩盎唑鸯唤唁哼唧啊唉唆帱崂崃罡罢罟峭峨峪峰圆觊峻贼贿赂赃赅赆
+钰钱钲钳钴钵钷钹钺钻钼钽钾钿铀铁铂铃铄铅铆铈铉铊铋铌铍铎眚缺氩氤氦氧氨毪特牺造乘敌舐秣秫秤租秧积盉秩称秘透笄笕笔笑笊笫笏笋笆俸倩债俵倻借偌值倚俺倾倒俳俶倬倏倘俱倡候赁恁倭倪俾倜隼隽倞俯倍倦倓倌倥臬健臭射皋躬息郫倨倔衄颀徒徕徐殷舰舨舱般航舫瓞途拿釜耸爹舀爱豺豹奚鬯衾鸰颁颂翁胯胰胱胴胭脍脎脆脂胸胳脏脐胶脑胲胼朕脒胺脓鸱玺鱽鸲逛狴狸狷猁狳猃狺逖狼卿狻逢桀鸵留袅眢鸳皱饽饿馀馁
+凌凇凄栾挛恋桨浆衰勍衷高亳郭席准座症疳疴病疽疸疾痄斋疹痈疼疱疰痃痂疲痉脊效离衮紊唐凋颃瓷资恣凉站剖竞部旁旆旄旅旃畜阃阄阅阆羞羔恙瓶桊拳敉粉料粑益兼朔郸烤烘烜烦烧烛烟烨烩烙烊剡郯烬递涛浙涝浡浦涑浯酒涞涟涉娑消涅涠浞涓涢涡浥涔浩海浜涂浠浴浮涣浼涤流润涧涕浣浪浸涨烫涩涌涘浚悖悚悟悭悄悍悝悃悒悔悯悦悌悢悛害宽宸家宵宴宾窍窅窄容窈剜宰案请朗诸诹诺读扅诼冢扇诽袜袪袒袖袗袍袢被袯祯祧祥课冥诿谀谁谂调冤谄谅谆谇谈谊
+剥恳展剧屑屐屙弱陵陬勐奘疍牂蚩祟陲陴陶陷陪烝姬娠娱娌娉娟娲恕娥娩娴娣娘娓婀砮哿畚通能难逡预桑剟绠骊绡骋绢绣验绤绥绦骍继绨骎骏邕鸶
+
+赊彗耜焘舂琎球琏琐理琇麸琉琅捧掭堵揶措描埴域捺掎埼掩埯捷捯排焉掉掳掴埸堌捶赦赧推堆捭埠晳掀逵授捻埝堋教堍掏掐掬鸷掠掂掖培掊接堉掷掸控捩掮探悫埭埽据掘掺掇掼职聃基聆勘聊聍娶菁菝著菱萁菥菘堇勒黄萘萋勚菲菽菖萌萜萝菌萎萸萑菂菜棻菔菟萄萏菊萃菩菼菏萍菹菠菪菅菀萤营萦乾萧菰菡萨菇械梽彬梵梦婪梗梧梾梢梏梅觋检桴桷梓梳棁梯桫棂桶梭救啬郾匮曹敕副豉票鄄酝酞酗酚厢厣戚戛硎硅硭硒硕硖硗硐硚硇硌鸸瓠匏奢盔爽厩聋龚殒殓殍盛赉匾雩雪辄辅辆堑
+龁颅虚彪雀堂常眶眭唪眦啧匙晡晤晨眺眵睁眯眼眸悬野圊啪啦喏喵啉勖曼晦晞晗晚冕啄啭啡畦趼趺距趾啃跃啮跄略蚶蛄蛎蛆蚰蚺蛊圉蚱蚯蛉蛀蛇蛏蚴唬累鄂唱患啰唾唯啤啥啁啕唿啐唼唷啴啖啵啶啷唳啸啜帻崖崎崦崭逻帼崮崔帷崟崤崩崞崇崆崛赇赈婴赊圈
+铐铑铒铕铗铘铙铚铛铜铝铞铟铠铡铢铣铤铥铧铨铩铪铫铭铬铮铯铰铱铲铳铴铵银铷矫氪牾甜鸹秸梨犁稆秽移秾逶笺筇笨笸笼笪笛笙笮符笱笠笥第笳笤笾笞敏偾做鸺偃偕袋悠偿偶偈偎偲傀偷您偬售停偻偏躯皑兜皎假衅鸻徘徙倘得衔舸舻舳盘舴舶船鸼舷舵斜龛盒鸽瓻敛悉欲彩领翎脚脖脯豚脶脸脞脬脱脘脲朘匐鱾象够逸猜猪猎猫猗凰猖猡猊猞猄猝斛觖猕猛馗祭馃馄馅馆
+凑减鸾毫孰烹庶庹麻庵庼庾庳痔痍疵痊痒痕廊康庸鹿盗章竟翊商旌族旎旋望袤率阇阈阉阊阋阌阍阎阏阐着羚羝羟盖眷粝粘粗粕粒断剪兽敝焐焊烯焓焕烽焖烷烺焌清渍添渚鸿淇淋淅淞渎涯淹涿渠渐淑淖挲淌淏混淠涸渑淮淦淆渊淫淝渔淘淳液淬涪淤淡淙淀涫深渌涮涵婆梁渗淄情惬悻惜惭悱悼惝惧惕惘悸惟惆惚惊惇惦悴惮惋惨惯寇寅寄寂逭宿窒窑窕密谋谌谍谎谏扈皲谐谑裆袱袼裈裉祷祸祲谒谓谔谕谖谗谙谚谛谜谝
+逮逯敢尉屠艴弹隋堕郿随蛋隅隈粜隍隗隆隐婧婊婞婳婕娼婢婚婵婶婉胬袈颇颈翌恿欸绩绪绫骐续骑绮绯绰骒绲绳骓维绵绶绷绸绹绺绻综绽绾绿骖缀缁巢
+
+耠琫琵琴琶琪瑛琳琦琢琥琨靓琼斑琰琮琯琬琛琚辇替鼋揳揍款堪堞搽塔搭塃揸堰揠堙揩越趄趁趋超揽提堤揖博揾颉揭喜彭揣塄揿插揪搜煮堠耋揄援搀蛰蛩絷塆裁揞搁搓搂搅揎壹握摒揆搔揉掾葜聒斯期欺联葑葚葫靰靸散葳惹蒇葬蒈募葺葛蒉葸萼蓇萩董葆葩葡敬葱蒋葶蒂蒌葓蒎落萱葖韩戟朝葭辜葵棒楮棱棋椰植森棼焚椟椅椒棹棵棍椤棰椎棉椑鹀赍棚椋椁棬棕棺榔楗棣椐椭鹁惠惑逼覃粟棘酣酤酢酥酡酦鹂觌厨厦硬硝硪硷确硫雁厥殖裂雄殚殛颊雳雯辊辋
+　　椠暂辌辍辎雅翘
+辈斐悲紫凿黹辉敞棠牚赏掌晴睐暑最晰量睑睇鼎睃喷戢喋嗒喃喳晶喇遇喊喱喹遏晷晾景喈畴践跖跋跌跗跞跚跑跎跏跛跆遗蛙蛱蛲蛭蛳蛐蛔蛛蜓蛞蜒蛤蛴蛟蛘蛑畯喁喝鹃喂喟斝喘啾嗖喤喉喻喑啼嗟喽嗞喧喀喔喙嵌嵘嵖幅崴遄詈帽嵎崽嵚嵬嵛翙嵯嵝嵫幄嵋赋赌赎赐赑赔黑〔丿〕铸铹铺铻铼铽链铿销锁锃锄锂锅锆锇锈锉锊锋锌锎锏锐锑锒锓锔锕甥掣掰短智矬氰毳毯氮毽氯犊犄犋鹄犍鹅颋剩嵇稍程稀黍桴税稂筐等筘筑策筚筛筜筒筅筏筵筌答筋筝傣傲傅傈舄牍牌傥堡集焦傍傧储遑皓皖粤奥傩遁街惩御徨循舾艇舒畲弑逾颌翕釉番释鹆禽舜貂腈腊腌腓腆腴脾腋腑腙腚腔腕腱腒鱿鲀鲁鲂鲃颍猢猹猩猥猬猾猴飓觞觚猸猱惫飧然馇馈馉馊馋
+亵装蛮脔就敦裒庾斌痣痨痦痘痞痢痤痪痫痧痛鄌赓竦童瓿竣啻颏鹇阑阒阔阕善翔羡普粪粞尊奠遒道遂孳曾焯焜焰焙焱鹈湛港渫滞湖湘渣渤湮湎湝湨湜渺湿温渴渭溃湍溅滑湃湫溲湟溆渝湲湾渡游溠溇湔滋湉渲溉渥湄滁愤慌惰愠惺愦愕惴愣愀愎惶愧愉愔慨喾割寒富寓窜窝窖窗窘寐谟扉遍雇扊裢裎裣裕裤裥裙祾祺祼谠禅禄幂谡谢谣谤谥谦谧
+塈遐犀属屡孱弼强粥巽疏隔骘隙隘媒媪絮嫂媛婷媚婿巯毵翚登皴婺骛缂缃缄缅彘缆缇缈缉缌缎缏缑缒缓缔缕骗编缗骙骚缘飨
+
+耢瑟瑚鹉瑁瑞瑰瑀瑜瑗瑄瑕遨骜瑙遘韫魂髡肆摄摸填搏塥塬鄢趔趑摅塌摁鼓摆赪携塮蜇搋搬摇搞搪塘搒搐搛搠摈彀毂搌搦摊搡聘蓁戡斟蒜蓍鄞勤靴靳靶鹊蓐蓝墓幕蓦鹋蒽蓓蓖蓊蒯蓟蓬蓑蒿蒺蓠蒟蒡蓄蒹蒴蒲蒗蓉蒙蓂蓥颐蒸献蓣楔椿楠禁楂楚楝楷榄想楫榀楞楸椴槐槌楯榆榇榈槎楼榉楦概楣楹椽裘赖剽甄酮酰酯酪酩酬蜃感碛碍碘碓碑硼碉碎碚碰碇碗碌碜鹌尴雷零雾雹辏辐辑辒输
+督频龃龄龅龆觜訾粲虞鉴睛睹睦瞄睚嗪睫韪嗷嗉睡睨睢雎睥睬嘟嗜嗑嗫嗬嗔鄙嗦嗝愚戥嗄暖盟煦歇暗暅暄暇照遢暌畸跬跨跶跷跸跣跹跳跺跪路跻跤跟遣蛸蜈蜎蜗蛾蜊蜍蜉蜂蜣蜕畹蛹嗣嗯嗅嗥嗲嗳嗡嗌嗍嗨嗤嗵嗓署置罨罪罩蜀幌嵊嵩嵴骰
+锖锗错锘锚锛锜锝锞锟锡锢锣锤锥锦锧锨锪锫锩锬锭键锯锰锱矮雉氲犏辞歃稞稚稗稔稠颓愁筹筠筢筮筻筲筼筱签简筷毁舅鼠牒煲催傻像躲鹎魁敫僇衙微徭愆艄觎毹愈遥貊貅貉颔腻腠腩腰腼腽腥腮腭腹腺腧鹏塍媵腾腿詹鲅鲆鲇鲈鲉鲊稣鲋鲌鲍鲏鲐肄猿颖鹐飔飕觥触解遛煞雏馌馍馏馐
+酱鹑禀亶廒瘃痱痹痼廓痴痿瘐瘁瘅痰瘆廉鄘麂裔靖新鄣歆韵意旒雍阖阗阘阙羧豢誊粳粮数煎猷塑慈煤煳煜煨煅煌煊煸煺滟溱溘滠满漭漠滢滇溥溧溽源滤滥裟溻溷溦滗滫溴滏滔溪滃溜滦漓滚溏滂溢溯滨溶滓溟滘溺滍粱滩滪愫慑慎慥慊誉鲎塞骞寞窥窦窠窣窟寝谨裱褂褚裸裼裨裾裰禊福谩谪谫谬
+群殿辟障媾嫫媳媲嫒嫉嫌嫁嫔媸叠缙缜缚缛辔缝骝缟缠缡缢缣缤骟剿
+
+耥璈静碧瑶璃瑭瑢獒赘熬觏慝嫠韬髦墈墙摽墟墁撂摞嘉摧撄赫截翥踅誓銎摭墉境摘墒摔撇榖撖摺綦聚蔫蔷靺靼鞅靽鞁靿蔌慕暮摹蔓蔑薨蔸蓰蔹蔡蔗蔟蔺戬蔽蕖蔻蓿蔼斡熙蔚鹕兢嘏蓼榛榧模槚槛榻榫槜榭槔榴槁榜槟榨榕槠榷榍歌遭僰酵酽酾酲酷酶酴酹酿酸厮碶\碡碟碴碱碣碳碲磋磁碹碥愿劂臧豨殡需霆霁辕辖辗
+蜚裴翡雌龇龈睿裳颗夥瞅瞍睽墅嘞嘈嗽嘌嘁嘎暧暝踌踉跽踊蜻蜞蜡蜥蜮蜾蝈蜴蝇蜘蜱蜩蜷蝉蜿螂蜢嘘嘡鹗嘣嘤嘚嘛嘀嗾嘧罴罱幔嶂幢赙罂赚骷骶鹘
+锲锴锶锷锸锹锻锽锾锵锿镀镁镂镃镄镅舞犒舔稳熏箐箦箧箍箸箨箕箬算箅箩箪箔管箜箢箫箓毓舆僖儆僳僚僭僬劁僦僮僧鼻魄魅魃魆睾艋鄱貌膜膊膈膀膑鲑鲔鲙鲚鲛鲜鲟疑獐獍飗觫雒孵夤馑馒
+銮裹敲豪膏塾遮麽廙腐瘩瘌瘗瘟瘦瘊瘥瘘瘙廖辣彰竭韶端旗旖膂阚鄯鲞精粼粹粽糁歉槊鹚弊熄熘熔煽熥潢潆潇漤漆漕漱漂滹漫漯漶潋潴漪漉漳滴漩漾演澉漏潍慢慷慵寨赛搴寡窬窨窭察蜜寤寥谭肇綮谮褡褙褐褓褛褊褪禚谯谰谱谲
+暨屣鹛隧嫣嫱嫩嫖嫦嫚嫘嫜嫡嫪鼐翟翠熊凳瞀鹜骠缥缦缧骡缨骢缩缪缫
+
+慧耦耧瑾璜璀璎璁璋璇璆奭撵髯髫撷撕撒撅撩趣趟撑撮撬赭播墦擒撸鋆墩撞撤撙增撺墀撰聩聪觐鞋鞑蕙鞒鞍蕈蕨蕤蕞蕺瞢蕉劐蕃蕲蕰蕊赜蔬蕴鼒槿横樯槽槭樗樘樱樊橡槲樟橄敷鹝豌飘醋醌醇醉醅靥魇餍磕磊磔磙磅碾磉殣慭\震霄霉霈辘
+龉龊觑瞌瞒题暴瞎瞑嘻嘭噎嘶噶嘲颙暹嘹影踔踝踢踏踟踬踩踮踣踯踪踺踞蝽蝶蝾蝴蝻蝠蝰蝎蝌蝮螋蝗蝓蝣蝼蝤蝙噗嘬颚嘿噍噢噙噜噌嘱噀噔颛幞幡嶓幢嶙嶝墨骺骼骸
+镊镆镇镈镉镋镌镍镎镏镐镑镒镓镔靠稽稷稻黎稿稼箱箴篑篁篌篓箭篇篆僵牖儇儋躺僻德徵艘磐虢鹞鹟膝膘膛滕鲠鲡鲢鲣鲥鲤鲦鲧鲩鲪鲫鲬橥獗獠觯鹠馓馔
+熟摩麾褒廛瘛瘼瘪瘢瘤瘠瘫齑鹡凛颜毅羯羰糊糇遴糌糍糈糅翦遵鹣憋熜熵熠潜澍澎澌潵潮潸潭潦鲨潲鋈潟澳潘潼澈澜潽潺澄潏懂憬憔懊憧憎寮窳额谳翩褥褴褫禤谴鹤谵
+憨熨慰劈履屦嬉勰戮蝥豫缬缭缮缯骣畿
+
+耩耨耪璞璟靛璠璘聱螯髻髭髹擀撼擂操熹甏擐擅擞磬鄹颞蕻鞘燕黇颟薤蕾薯薨薛薇檠擎薪薏蕹薮薄颠翰噩薜薅樾橱橛橇樵檎橹橦樽樨橙橘橼墼整橐融翮瓢醛醐醍醒醚醑觱磺磲赝飙殪霖霏霓霍霎錾辙辚臻
+冀餐遽氅瞟瞠瞰嚄嚆噤暾曈蹀蹅踶踹踵踽嘴踱蹄蹉蹁蹂螨蟒蟆螈螅螭螗螃螠螟噱器噪噬噫噻噼幪罹圜鹦赠默黔
+镖镗镘镚镛镜镝镞镠氇氆赞憩穑穆穄篝篚篥篮篡簉篦篪篷篙篱盥儒劓翱魉魈邀徼衡歙盦膨膪膳螣膦膙雕鲭鲮鲯鲰鲱鲲鲳鲴鲵鲷鲸鲺鲹鲻獴獭獬邂
+憝亸鹧磨廨赟癀瘭瘰廪瘿瘵瘴癃瘾瘸瘳斓麇麈凝辨辩嬴壅羲糙糗糖糕瞥甑燎燠燔燃燧
+　　燏濑濒濉潞澧澡澴激澹澥澶濂澼憷懒憾懈黉褰寰窸窿褶禧
+壁避嬖犟隰嬗鹨翯颡缰缱缲缳缴
+
+璨璩璐璪戴螫擤壕擦觳罄擢藉薹鞡鞠藏薷薰藐藓藁檬檑檄檐檩檀懋醢翳繄礁礅磷磴鹩霜霞
+龋龌豳壑黻瞭瞧瞬瞳瞵瞩瞪嚏曙嚅蹑蹒蹋蹈蹊蹓蹐蟥螬螵疃螳螺蟋蟑蟀嚎嚓羁罽罾嶷赡黜黝髁髀
+镡镢镣镤镥镦镧镨镩镪镫罅穗黏魏簧簌篾簃篼簏簇簖簋繁鼢黛儡鹪鼾皤魍徽艚龠爵繇貘邈貔臌朦臊膻臁臆臃鲼鲽鲾鳀鳁鳂鳃鳄鳅鳆鳇鳈鳉鳊獯螽
+燮鹫襄糜縻膺癍癌麋辫赢糟糠馘燥懑濡濮濞濠濯懦豁蹇謇邃襕襁
+臀檗甓臂擘孺隳嬷翼蟊鹬鍪骤
+
+鏊鳌鬶鬈鬃瞽藕鞯鞨鞭鞫鞧鞣藜藠藤藩鹲檫檵覆醪蹙礞礓礌燹餮
+瞿瞻曛颢曜躇蹦鹭蹢蹜蟛蟪蟠蟮嚚嚣鹮黠黟髅髂
+镬镭镯镰镱馥簠簟簪簦鼫鼬鼩雠艟翻臑鳍鳎鳏鳐鳑鹱
+鹰癞癔癜癖糨冁蹩瀑瀍瀌鎏懵襟
+璧戳彝邋
+
+鬏攉攒鞲鞴藿蘧孽蘅警蘑藻麓攀醭醮醯礤酃霪霭
+黼曝嚯蹰蹶蹽蹼蹯蹴蹾蹲蹭蹿蹬蠖蠓蠋蟾蠊巅黢髋髌
+镲籀簸籁簿鳘齁魑艨鼗鳓鳔鳕鳗鳙鳚蟹
+颤靡癣麒鏖瓣蠃羸羹鳖爆瀚瀣瀛襦谶
+襞疆骥缵
+
+瓒鬓壤攘馨蘩蘖蘘醵醴霰颥
+酆耀矍曦躁躅蠕鼍嚼嚷巍巉黩黥
+镳镴黧籍纂鼯臜鳜鳝鳞鳟獾
+魔糯灌瀹瀵
+譬孀骧
+
+耰蠢瓘鼙醺礴礳霸露霹
+颦曩躏黯髓
+鼱鳡鳢
+癫麝赣夔爝灏禳
+鐾羼蠡
+
+耲耱懿韂蘸鹳蘼囊霾
+氍饕躔躐髑
+镵镶穰鳤
+瓤饔
+鬻
+
+鬟趱攫攥颧
+躜
+罐鼹鼷
+癯麟蠲
+
+矗蠹醾
+躞
+衢鑫
+灞襻
+
+纛鬣攮
+囔
+馕
+戆
+
+蠼
+
+爨
+
+齉

Assets/Unity中文字库7000.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8acfe905e0963fd43a0b6b25aa6d0571
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: