Răsfoiți Sursa

Merge branch 'main' of http://www.chatgpt918.top:3000/wartheking/WaterFlush

SunZhi 9 luni în urmă
părinte
comite
be21102888
44 a modificat fișierele cu 2527 adăugiri și 804 ștergeri
  1. 2 2
      Assets/Art/Material/Effect/LuJing 1.mat
  2. 2 2
      Assets/Art/Material/Effect/LuJing.mat
  3. 2 2
      Assets/Art/Material/Effect/ShuSanLuJing.mat
  4. 90 120
      Assets/Art/Prefab/LinePath.prefab
  5. 1 1
      Assets/Art/Prefab/Terrain/HeMianQuad/HeMian3.prefab
  6. 13 1
      Assets/Art/Textrue/Buildings/TaoKou/TaoKou_DiKuai5_13.png.meta
  7. 26 2
      Assets/Art/Textrue/Effect/BianYuanFaGuang.jpg.meta
  8. 26 2
      Assets/Art/Textrue/Effect/Effect1.png.meta
  9. 26 2
      Assets/Art/Textrue/Effect/Effect2.png.meta
  10. 27 3
      Assets/Art/Textrue/Effect/Effect3.png.meta
  11. 27 3
      Assets/Art/Textrue/Effect/JianBian.jpg.meta
  12. 26 2
      Assets/Art/Textrue/Effect/JianCi.png.meta
  13. BIN
      Assets/Art/Textrue/Effect/JianTou 1.png
  14. 159 0
      Assets/Art/Textrue/Effect/JianTou 1.png.meta
  15. BIN
      Assets/Art/Textrue/Effect/JianTou.png
  16. 26 2
      Assets/Art/Textrue/Effect/JianTou.png.meta
  17. 26 2
      Assets/Art/Textrue/Effect/LiZi.png.meta
  18. 26 2
      Assets/Art/Textrue/Effect/Substance_graph_basecolor.png.meta
  19. 26 2
      Assets/Art/Textrue/Effect/YuLanShaPan_HeLiu.png.meta
  20. 26 2
      Assets/Art/Textrue/Effect/YuLanShaPan_HuPo.png.meta
  21. 26 2
      Assets/Art/Textrue/Effect/YuLanShaPan_JianBian.png.meta
  22. 26 2
      Assets/Art/Textrue/Effect/YuLanShaPan_XiaoHeLiu.png.meta
  23. BIN
      Assets/JianTou.png
  24. 159 0
      Assets/JianTou.png.meta
  25. 1 1
      Assets/ModelAniTool.cs
  26. 6 0
      Assets/Plugins/museum.jslib
  27. 32 0
      Assets/Plugins/museum.jslib.meta
  28. 233 0
      Assets/Prefabs/UI/3D/GCZL.prefab
  29. 42 41
      Assets/Prefabs/UI/XHYZT/RKZY.prefab
  30. 434 51
      Assets/Prefabs/UI/XHYZT/XHDD.prefab
  31. 202 183
      Assets/Scene 1.unity
  32. 244 278
      Assets/Scene.unity
  33. 5 1
      Assets/Scripts/AssetLoadHelper_AB.cs
  34. 1 4
      Assets/Scripts/TextureLoadHelp.cs
  35. 121 4
      Assets/Scripts/UI/UIView/3D/GCZLLayer.cs
  36. 1 1
      Assets/Scripts/UI/UIView/FHSS/FHSSLayer.cs
  37. 1 0
      Assets/Scripts/UI/UIView/GCJK/GCJKLayer.cs
  38. 43 70
      Assets/Scripts/UI/UIView/RKZY/LinePath.cs
  39. 28 14
      Assets/Scripts/UI/UIView/RKZY/RKZYLayer.cs
  40. 260 0
      Assets/Scripts/UI/UIView/XHDD/XHDDLayer.cs
  41. 11 0
      Assets/Scripts/UI/UIView/XHDD/XHDDLayer.cs.meta
  42. 64 0
      Assets/StreamingAssets/moveplan.json
  43. 19 0
      Assets/TimeLineControl.cs
  44. 11 0
      Assets/TimeLineControl.cs.meta

+ 2 - 2
Assets/Art/Material/Effect/LuJing 1.mat

@@ -43,7 +43,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: 69fb0e4be12c34e4abc9dae3900812a9, type: 3}
-        m_Scale: {x: 120, y: 1}
+        m_Scale: {x: 1, y: 40}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
@@ -80,5 +80,5 @@ Material:
     - _Color: {r: 0.49513942, g: 1, b: 0.25, a: 1}
     - _EmissionColor: {r: 0.043376923, g: 1, b: 0, a: 1}
     - _MainCol: {r: 0.43258297, g: 2.828427, b: 0, a: 1}
-    - _OffsetSpeed: {r: 1, g: 0, b: 0, a: 0}
+    - _OffsetSpeed: {r: 0, g: -1, b: 0, a: 0}
   m_BuildTextureStacks: []

+ 2 - 2
Assets/Art/Material/Effect/LuJing.mat

@@ -43,7 +43,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: 69fb0e4be12c34e4abc9dae3900812a9, type: 3}
-        m_Scale: {x: 120, y: 1}
+        m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
@@ -80,5 +80,5 @@ Material:
     - _Color: {r: 1, g: 0.98831683, b: 0.23113209, a: 1}
     - _EmissionColor: {r: 0.8490566, g: 0.47325352, b: 0.084104665, a: 1}
     - _MainCol: {r: 2.828427, g: 2.1961904, b: 0.36603177, a: 1}
-    - _OffsetSpeed: {r: 1, g: 0, b: 0, a: 0}
+    - _OffsetSpeed: {r: 0, g: -1, b: 0, a: 0}
   m_BuildTextureStacks: []

+ 2 - 2
Assets/Art/Material/Effect/ShuSanLuJing.mat

@@ -41,8 +41,8 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 69fb0e4be12c34e4abc9dae3900812a9, type: 3}
-        m_Scale: {x: 20, y: 1}
+        m_Texture: {fileID: 2800000, guid: 414693b704610af458bee4eb63e98205, type: 3}
+        m_Scale: {x: 20.48, y: 0.84}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}

+ 90 - 120
Assets/Art/Prefab/LinePath.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &4511378785228946599
+--- !u!1 &3266993602827894433
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,10 +8,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 6109467418763709311}
-  - component: {fileID: 2151371319903050505}
-  - component: {fileID: 4295694243296250648}
-  - component: {fileID: 6340556194302762677}
+  - component: {fileID: 3700078261830985479}
+  - component: {fileID: 6723938716437673246}
   m_Layer: 0
   m_Name: LinePath
   m_TagString: Untagged
@@ -19,42 +17,108 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &6109467418763709311
+--- !u!4 &3700078261830985479
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4511378785228946599}
+  m_GameObject: {fileID: 3266993602827894433}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 946.3751, y: 705.52325, z: -132.77345}
+  m_LocalPosition: {x: 0, y: 0.00000023841858, z: 0.00000011920929}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 8753562591176296312}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!120 &2151371319903050505
-LineRenderer:
+--- !u!114 &6723938716437673246
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3266993602827894433}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9ea38b25cea70234e82b6982a5a3817e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  lineDir: 0
+  startPos: 
+  endPos: 
+  linePathContent: 
+  manNum: 0
+  homeNum: 0
+  completeNum: 0
+  dateTime: 
+  lineRenderer: {fileID: 5003339604974327273}
+  firMat: {fileID: 2100000, guid: 1634ed7d0286bdb4c8fd176e5e587648, type: 2}
+  secMat: {fileID: 2100000, guid: 7d49cfecc396ca144897bdace6c6ac11, type: 2}
+--- !u!1 &5003339604974327273
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8753562591176296312}
+  - component: {fileID: 6922485543903299098}
+  - component: {fileID: 8196788492578263859}
+  - component: {fileID: 8286963891257016172}
+  m_Layer: 0
+  m_Name: Line
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8753562591176296312
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5003339604974327273}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1, z: 0}
+  m_LocalScale: {x: 0.15, y: 1, z: 0.15}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3700078261830985479}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &6922485543903299098
+MeshFilter:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4511378785228946599}
+  m_GameObject: {fileID: 5003339604974327273}
+  m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &8196788492578263859
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5003339604974327273}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
   m_StaticShadowCaster: 0
-  m_MotionVectors: 0
-  m_LightProbeUsage: 0
-  m_ReflectionProbeUsage: 0
-  m_RayTracingMode: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
   m_RayTraceProcedural: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 7d49cfecc396ca144897bdace6c6ac11, type: 2}
+  - {fileID: 2100000, guid: 1634ed7d0286bdb4c8fd176e5e587648, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -75,112 +139,18 @@ LineRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Positions:
-  - {x: 0, y: 0, z: 0}
-  - {x: 0, y: 0, z: 1}
-  m_Parameters:
-    serializedVersion: 3
-    widthMultiplier: 0.29847068
-    widthCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    colorGradient:
-      serializedVersion: 2
-      key0: {r: 1, g: 1, b: 1, a: 1}
-      key1: {r: 1, g: 1, b: 1, a: 1}
-      key2: {r: 0, g: 0, b: 0, a: 0}
-      key3: {r: 0, g: 0, b: 0, a: 0}
-      key4: {r: 0, g: 0, b: 0, a: 0}
-      key5: {r: 0, g: 0, b: 0, a: 0}
-      key6: {r: 0, g: 0, b: 0, a: 0}
-      key7: {r: 0, g: 0, b: 0, a: 0}
-      ctime0: 0
-      ctime1: 65535
-      ctime2: 0
-      ctime3: 0
-      ctime4: 0
-      ctime5: 0
-      ctime6: 0
-      ctime7: 0
-      atime0: 0
-      atime1: 65535
-      atime2: 0
-      atime3: 0
-      atime4: 0
-      atime5: 0
-      atime6: 0
-      atime7: 0
-      m_Mode: 0
-      m_NumColorKeys: 2
-      m_NumAlphaKeys: 2
-    numCornerVertices: 0
-    numCapVertices: 0
-    alignment: 0
-    textureMode: 0
-    shadowBias: 0.5
-    generateLightingData: 0
-  m_UseWorldSpace: 1
-  m_Loop: 0
---- !u!114 &4295694243296250648
-MonoBehaviour:
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!136 &8286963891257016172
+CapsuleCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4511378785228946599}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9ea38b25cea70234e82b6982a5a3817e, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  lineDir: 0
-  startPos: 
-  endPos: 
-  linePathContent: 
-  manNum: 0
-  homeNum: 0
-  completeNum: 0
-  dateTime: 
-  line: {fileID: 0}
---- !u!60 &6340556194302762677
-PolygonCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4511378785228946599}
-  m_Enabled: 1
-  m_Density: 1
+  m_GameObject: {fileID: 5003339604974327273}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: 0, y: 0}
-  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0, y: 0}
-    oldSize: {x: 0, y: 0}
-    newSize: {x: 0, y: 0}
-    adaptiveTilingThreshold: 0
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
-  m_Points:
-    m_Paths:
-    - - {x: -946.3751, y: -705.374}
-      - {x: -946.517, y: -705.4771}
-      - {x: -946.4628, y: -705.644}
-      - {x: -946.2874, y: -705.644}
-      - {x: -946.2332, y: -705.4771}
+  m_Enabled: 1
+  m_Radius: 0.5000001
+  m_Height: 2
+  m_Direction: 1
+  m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}

+ 1 - 1
Assets/Art/Prefab/Terrain/HeMianQuad/HeMian3.prefab

@@ -26,7 +26,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5800732452942267230}
   m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -29704.04, y: 6513.7324, z: 7.7974973}
+  m_LocalPosition: {x: -29704.04, y: 6513.7324, z: 58}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

+ 13 - 1
Assets/Art/Textrue/Buildings/TaoKou/TaoKou_DiKuai5_13.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 12
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -125,6 +125,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 80
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 26 - 2
Assets/Art/Textrue/Effect/BianYuanFaGuang.jpg.meta

@@ -71,8 +71,8 @@ TextureImporter:
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 80
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,30 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 26 - 2
Assets/Art/Textrue/Effect/Effect1.png.meta

@@ -71,8 +71,8 @@ TextureImporter:
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 80
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,30 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 26 - 2
Assets/Art/Textrue/Effect/Effect2.png.meta

@@ -71,8 +71,8 @@ TextureImporter:
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 80
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,30 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 27 - 3
Assets/Art/Textrue/Effect/Effect3.png.meta

@@ -67,12 +67,12 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 512
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 80
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,30 @@ TextureImporter:
     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: Windows Store Apps
+    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: []

+ 27 - 3
Assets/Art/Textrue/Effect/JianBian.jpg.meta

@@ -67,12 +67,12 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 256
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 80
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,30 @@ TextureImporter:
     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: Windows Store Apps
+    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: []

+ 26 - 2
Assets/Art/Textrue/Effect/JianCi.png.meta

@@ -71,8 +71,8 @@ TextureImporter:
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 80
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,30 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 128
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 128
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

BIN
Assets/Art/Textrue/Effect/JianTou 1.png


+ 159 - 0
Assets/Art/Textrue/Effect/JianTou 1.png.meta

@@ -0,0 +1,159 @@
+fileFormatVersion: 2
+guid: 414693b704610af458bee4eb63e98205
+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: 1
+  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: 1
+  spriteTessellationDetail: -1
+  textureType: 0
+  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: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 80
+    crunchedCompression: 1
+    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
+  - 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: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 512
+    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: 

BIN
Assets/Art/Textrue/Effect/JianTou.png


+ 26 - 2
Assets/Art/Textrue/Effect/JianTou.png.meta

@@ -71,8 +71,8 @@ TextureImporter:
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 80
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,30 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 26 - 2
Assets/Art/Textrue/Effect/LiZi.png.meta

@@ -67,12 +67,12 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 32
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
-    crunchedCompression: 0
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,30 @@ TextureImporter:
     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: Windows Store Apps
+    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: []

+ 26 - 2
Assets/Art/Textrue/Effect/Substance_graph_basecolor.png.meta

@@ -71,8 +71,8 @@ TextureImporter:
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 80
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,30 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 512
+    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: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 26 - 2
Assets/Art/Textrue/Effect/YuLanShaPan_HeLiu.png.meta

@@ -71,8 +71,8 @@ TextureImporter:
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 80
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,30 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 26 - 2
Assets/Art/Textrue/Effect/YuLanShaPan_HuPo.png.meta

@@ -71,8 +71,8 @@ TextureImporter:
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 80
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,30 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 26 - 2
Assets/Art/Textrue/Effect/YuLanShaPan_JianBian.png.meta

@@ -71,8 +71,8 @@ TextureImporter:
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 80
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,30 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 26 - 2
Assets/Art/Textrue/Effect/YuLanShaPan_XiaoHeLiu.png.meta

@@ -71,8 +71,8 @@ TextureImporter:
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
+    compressionQuality: 80
+    crunchedCompression: 1
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
@@ -113,6 +113,30 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 1024
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

BIN
Assets/JianTou.png


+ 159 - 0
Assets/JianTou.png.meta

@@ -0,0 +1,159 @@
+fileFormatVersion: 2
+guid: 93f35ece77c7b6e4ca8d97a238298080
+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: 1
+  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: 1
+  spriteTessellationDetail: -1
+  textureType: 0
+  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: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 80
+    crunchedCompression: 1
+    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
+  - 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: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 512
+    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: 

+ 1 - 1
Assets/ModelAniTool.cs

@@ -19,7 +19,7 @@ public class ModelAniTool : MonoBehaviour
 
     [FormerlySerializedAs("targetPos")] public Vector3 targetV3;
 
-    public float speed=1.0f;
+    public float speed=2.0f;
 
     private GameObject targetObj;
 

+ 6 - 0
Assets/Plugins/museum.jslib

@@ -0,0 +1,6 @@
+mergeInto(LibraryManager.library,
+    {
+        OpenNewWebsite: function (str) {
+            window.open(Pointer_stringify(str));
+        },
+    });

+ 32 - 0
Assets/Plugins/museum.jslib.meta

@@ -0,0 +1,32 @@
+fileFormatVersion: 2
+guid: 29ac0e02351f49249bf9b92891d513cc
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      WebGL: WebGL
+    second:
+      enabled: 1
+      settings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 233 - 0
Assets/Prefabs/UI/3D/GCZL.prefab

@@ -2528,6 +2528,23 @@ MonoBehaviour:
   - http://www.chatgpt918.top:15001/projectImages/2022/tk.jpg
   - http://www.chatgpt918.top:15001/projectImages/2023/tk.jpg
   photoIndex: 0
+  BY_PdfUrl:
+  - http://www.chatgpt918.top:15001/projectImages/pdf/by_pdf.jpg
+  - http://www.chatgpt918.top:15001/projectImages/pdf/by_pdf1.jpg
+  - http://www.chatgpt918.top:15001/projectImages/pdf/by_pdf2.jpg
+  TK_PdfUrl:
+  - http://www.chatgpt918.top:15001/projectImages/pdf/tk_pdf.jpg
+  - http://www.chatgpt918.top:15001/projectImages/pdf/tk_pdf1.jpg
+  - http://www.chatgpt918.top:15001/projectImages/pdf/tk_pdf2.jpg
+  - http://www.chatgpt918.top:15001/projectImages/pdf/tk_pdf3.jpg
+  pdfIndex: 0
+  BY_PdfDownloadUrl:
+  - http://www.chatgpt918.top:15001/projectImages/pdf/BY_1.pdf
+  TK_PdfDownloadUrl:
+  - http://www.chatgpt918.top:15001/projectImages/pdf/TK_1.pdf
+  - http://www.chatgpt918.top:15001/projectImages/pdf/TK_2.pdf
+  - http://www.chatgpt918.top:15001/projectImages/pdf/TK_3.pdf
+  - http://www.chatgpt918.top:15001/projectImages/pdf/TK_4.pdf
 --- !u!1 &4452380874908355294
 GameObject:
   m_ObjectHideFlags: 0
@@ -3073,6 +3090,141 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5206\u7C7B:"
+--- !u!1 &4915468641392692563
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8110580898130128142}
+  - component: {fileID: 1536144164001275670}
+  - component: {fileID: 8614699360409155982}
+  - component: {fileID: 7593292315218695284}
+  - component: {fileID: 3403959896276329373}
+  m_Layer: 5
+  m_Name: DownButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8110580898130128142
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4915468641392692563}
+  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:
+  - {fileID: 254979009190617321}
+  m_Father: {fileID: 4051474671842082500}
+  m_RootOrder: 14
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 1557, y: -864}
+  m_SizeDelta: {x: 128, y: 40}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1536144164001275670
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4915468641392692563}
+  m_CullTransparentMesh: 1
+--- !u!114 &8614699360409155982
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4915468641392692563}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 726a5caf9dca86e47ad9bc5d753a7564, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &7593292315218695284
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4915468641392692563}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 8614699360409155982}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!225 &3403959896276329373
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4915468641392692563}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &4936610124545253557
 GameObject:
   m_ObjectHideFlags: 0
@@ -4263,6 +4415,7 @@ RectTransform:
   - {fileID: 8481814305050007921}
   - {fileID: 8625270066674768233}
   - {fileID: 940483529556732293}
+  - {fileID: 8110580898130128142}
   m_Father: {fileID: 4452380874907860040}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4828,6 +4981,86 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 2023/08/12
+--- !u!1 &8137734702966113029
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 254979009190617321}
+  - component: {fileID: 6579631255840295299}
+  - component: {fileID: 63005927712789716}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &254979009190617321
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8137734702966113029}
+  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: 8110580898130128142}
+  m_RootOrder: 0
+  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: 0}
+  m_SizeDelta: {x: 128, y: 40}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6579631255840295299
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8137734702966113029}
+  m_CullTransparentMesh: 1
+--- !u!114 &63005927712789716
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8137734702966113029}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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_FontData:
+    m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u4E0B\u8F7DPDF"
 --- !u!1 &8229156708626318363
 GameObject:
   m_ObjectHideFlags: 0

+ 42 - 41
Assets/Prefabs/UI/XHYZT/RKZY.prefab

@@ -1292,7 +1292,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: 51.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061653251029749
@@ -2096,8 +2096,8 @@ RectTransform:
   - {fileID: 9093061654171932179}
   - {fileID: 9093061653790504663}
   - {fileID: 9093061654966100337}
-  - {fileID: 9093061653291335120}
   - {fileID: 9093061653547392614}
+  - {fileID: 9093061653291335120}
   m_Father: {fileID: 9093061653547399692}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3673,7 +3673,7 @@ RectTransform:
   - {fileID: 9093061654250234089}
   - {fileID: 9093061654520656945}
   m_Father: {fileID: 9093061653288701945}
-  m_RootOrder: 19
+  m_RootOrder: 20
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -5216,7 +5216,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: 14.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061653390156198
@@ -6350,8 +6350,8 @@ RectTransform:
   - {fileID: 9093061654473964874}
   - {fileID: 9093061654439686107}
   - {fileID: 9093061654508591210}
-  - {fileID: 9093061654094578440}
   - {fileID: 9093061655173667199}
+  - {fileID: 9093061654094578440}
   m_Father: {fileID: 9093061653547399692}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -8241,7 +8241,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: 65, y: 0}
+  m_AnchoredPosition: {x: 53, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &9093061653439058966
@@ -9529,8 +9529,8 @@ MonoBehaviour:
   - {fileID: 9093061654470739987}
   - {fileID: 9093061654945861418}
   - {fileID: 9093061655264504357}
-  beforeC: {fileID: 0}
-  afterC: {fileID: 0}
+  beforeC: {fileID: 9093061654007353219}
+  afterC: {fileID: 9093061653632635951}
   linePaths: []
   sprites:
   - {fileID: 21300000, guid: 9eb4cb859e3c36b44bf2a2da8fa61736, type: 3}
@@ -9557,7 +9557,8 @@ MonoBehaviour:
   - {fileID: 9093061654753997886}
   - {fileID: 9093061653390156193}
   - {fileID: 9093061654081961280}
-  linePathPrefab: {fileID: 0}
+  afterMat: {fileID: 2100000, guid: 1634ed7d0286bdb4c8fd176e5e587648, type: 2}
+  linePathPrefab: {fileID: 6723938716437673246, guid: 23505d13caaae9c4d9933cc5fa6860e5, type: 3}
 --- !u!1 &9093061653507687472
 GameObject:
   m_ObjectHideFlags: 0
@@ -10552,7 +10553,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061654502916386}
   m_Father: {fileID: 9093061653288701945}
-  m_RootOrder: 20
+  m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -12321,8 +12322,8 @@ RectTransform:
   - {fileID: 9093061653470972603}
   - {fileID: 9093061654687722099}
   - {fileID: 9093061653243042817}
-  - {fileID: 9093061653995338931}
   - {fileID: 9093061654484229631}
+  - {fileID: 9093061653995338931}
   m_Father: {fileID: 9093061654363556753}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -13768,7 +13769,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: 12, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061653670084901
@@ -16470,7 +16471,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: 69, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061653826032820
@@ -17821,8 +17822,8 @@ RectTransform:
   - {fileID: 9093061654072247880}
   - {fileID: 9093061654206497080}
   - {fileID: 9093061653641891623}
-  - {fileID: 9093061654922658960}
   - {fileID: 9093061654333608751}
+  - {fileID: 9093061654922658960}
   m_Father: {fileID: 9093061654363556753}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -19175,9 +19176,9 @@ RectTransform:
   m_Father: {fileID: 9093061653991772692}
   m_RootOrder: 4
   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: 75, y: -128}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 1035, y: 412}
   m_SizeDelta: {x: 403.2766, y: 143.345}
   m_Pivot: {x: 0, y: 0}
 --- !u!114 &5749431054939426625
@@ -20564,7 +20565,7 @@ RectTransform:
   - {fileID: 9093061654420124646}
   - {fileID: 9093061654101750909}
   m_Father: {fileID: 9093061653632941889}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -21671,7 +21672,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: 122.78147, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654075877072
@@ -21986,7 +21987,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: 12, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654081961281
@@ -22218,7 +22219,7 @@ RectTransform:
   - {fileID: 9093061654638090311}
   - {fileID: 9093061653249892629}
   m_Father: {fileID: 9093061653428426712}
-  m_RootOrder: 18
+  m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -22455,7 +22456,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: 194.06294, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654110165202
@@ -22911,7 +22912,7 @@ RectTransform:
   - {fileID: 9093061654616157509}
   - {fileID: 9093061654729128352}
   m_Father: {fileID: 9093061655308519380}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -26756,7 +26757,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061653234529556}
   m_Father: {fileID: 9093061653915434462}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -27788,7 +27789,7 @@ RectTransform:
   - {fileID: 9093061653434614468}
   - {fileID: 9093061654382310616}
   m_Father: {fileID: 9093061654506419288}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -29019,7 +29020,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: 8.638107, y: -20.9211}
+  m_AnchoredPosition: {x: 8.638123, y: -20.9211}
   m_SizeDelta: {x: 376.3581, y: 91.5862}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654454388229
@@ -29508,7 +29509,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061653476887218}
   m_Father: {fileID: 9093061653632941889}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -30241,8 +30242,8 @@ RectTransform:
   - {fileID: 9093061654547690391}
   - {fileID: 9093061654503076447}
   - {fileID: 9093061654759647064}
-  - {fileID: 9093061654399081119}
   - {fileID: 9093061655340129781}
+  - {fileID: 9093061654399081119}
   m_Father: {fileID: 9093061654363556753}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -31512,7 +31513,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061653333981062}
   m_Father: {fileID: 9093061655308519380}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -33858,7 +33859,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: 52, y: 0}
+  m_AnchoredPosition: {x: 46, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654650731069
@@ -35650,7 +35651,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: 26.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654753997887
@@ -38818,7 +38819,7 @@ RectTransform:
   - {fileID: 9093061654642475065}
   - {fileID: 9093061655299507566}
   m_Father: {fileID: 9093061653915434462}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -40157,10 +40158,10 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 3
-  m_Spacing: 6
+  m_Spacing: 0
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
-  m_ChildControlWidth: 0
+  m_ChildControlWidth: 1
   m_ChildControlHeight: 1
   m_ChildScaleWidth: 1
   m_ChildScaleHeight: 0
@@ -40177,7 +40178,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_HorizontalFit: 1
+  m_HorizontalFit: 2
   m_VerticalFit: 0
 --- !u!1 &9093061654973564116
 GameObject:
@@ -45278,7 +45279,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061655282686621}
   m_Father: {fileID: 9093061653428426712}
-  m_RootOrder: 19
+  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -46812,7 +46813,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: 33.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061655252027404
@@ -48000,7 +48001,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: 38.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061655287619152
@@ -48512,8 +48513,8 @@ RectTransform:
   - {fileID: 9093061654029534039}
   - {fileID: 9093061654993506973}
   - {fileID: 9093061655336903256}
-  - {fileID: 9093061654135754304}
   - {fileID: 9093061654518704622}
+  - {fileID: 9093061654135754304}
   m_Father: {fileID: 9093061654363556753}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -49407,7 +49408,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: 33.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061655308691109
@@ -49689,7 +49690,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061654544985612}
   m_Father: {fileID: 9093061654506419288}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}

+ 434 - 51
Assets/Prefabs/UI/XHYZT/XHDD.prefab

@@ -273,12 +273,12 @@ RectTransform:
   - {fileID: 8105133392499129011}
   - {fileID: 8074800038338618640}
   - {fileID: 7665667343748992606}
-  m_Father: {fileID: 4461453780397662635}
+  m_Father: {fileID: 1433254892590319225}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 1700, y: -734}
+  m_AnchoredPosition: {x: 790, y: -244}
   m_SizeDelta: {x: 400, y: 604}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2270233978406412043
@@ -1183,7 +1183,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u6B65\u9AA4\u5185\u5BB9\u63CF\u8FF0"
+  m_Text: 
 --- !u!1 &501947246381286439
 GameObject:
   m_ObjectHideFlags: 0
@@ -2088,7 +2088,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u6B65\u9AA4\u5185\u5BB9\u63CF\u8FF0"
+  m_Text: 
 --- !u!1 &810741157113817204
 GameObject:
   m_ObjectHideFlags: 0
@@ -2250,12 +2250,12 @@ RectTransform:
   m_Children:
   - {fileID: 6507922548951515005}
   - {fileID: 5861501568670569256}
-  m_Father: {fileID: 4461453780397662635}
-  m_RootOrder: 4
+  m_Father: {fileID: 1433254892590319225}
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 1416, y: -1016}
+  m_AnchoredPosition: {x: 506, y: -526}
   m_SizeDelta: {x: 128, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4907553520516791180
@@ -2453,8 +2453,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3842237776255885102}
-  m_Father: {fileID: 4461453780397662635}
-  m_RootOrder: 7
+  m_Father: {fileID: 1724459407232952396}
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -4393,12 +4393,12 @@ RectTransform:
   - {fileID: 2200639800268982220}
   - {fileID: 8406788019371051239}
   - {fileID: 1789533074030108284}
-  m_Father: {fileID: 4461453780397662635}
-  m_RootOrder: 3
+  m_Father: {fileID: 1724459407232952396}
+  m_RootOrder: 0
   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: -320, y: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 220, y: 0}
   m_SizeDelta: {x: 400, y: 636}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &219406561796399640
@@ -6245,12 +6245,12 @@ RectTransform:
   - {fileID: 4607867684694671341}
   - {fileID: 8070707265906614534}
   - {fileID: 3340241162286544805}
-  m_Father: {fileID: 4461453780397662635}
+  m_Father: {fileID: 1433254892590319225}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 220, y: -578}
+  m_AnchoredPosition: {x: -690, y: -88}
   m_SizeDelta: {x: 400, y: 916}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8216960240360293190
@@ -6956,8 +6956,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 50, y: -9}
-  m_SizeDelta: {x: 53, y: 16}
+  m_AnchoredPosition: {x: 55.21158, y: -9}
+  m_SizeDelta: {x: 63.4232, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4477812812617768007
 CanvasRenderer:
@@ -7000,7 +7000,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u65E5\u671F/\u65F6\u95F4"
+  m_Text: "\u9884\u6848\u8FC7\u7A0B\u4E09"
 --- !u!1 &2143319221431121310
 GameObject:
   m_ObjectHideFlags: 0
@@ -8890,8 +8890,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 50, y: -9}
-  m_SizeDelta: {x: 53, y: 16}
+  m_AnchoredPosition: {x: 56.94879, y: -9}
+  m_SizeDelta: {x: 66.8976, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7766910674727851474
 CanvasRenderer:
@@ -8934,7 +8934,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u65E5\u671F/\u65F6\u95F4"
+  m_Text: "\u9884\u6848\u8FC7\u7A0B\u4E8C"
 --- !u!1 &2887970753265574595
 GameObject:
   m_ObjectHideFlags: 0
@@ -9693,6 +9693,46 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6A59\u8272\u9884\u8B66"
+--- !u!1 &2999942417590375324
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1433254892590319225}
+  m_Layer: 5
+  m_Name: QDDYS
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1433254892590319225
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2999942417590375324}
+  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:
+  - {fileID: 5774837649050539594}
+  - {fileID: 7976389318387736493}
+  - {fileID: 2367656975193514399}
+  - {fileID: 8804470076358901232}
+  m_Father: {fileID: 4461453780397662635}
+  m_RootOrder: 0
+  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: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &3016730716363800576
 GameObject:
   m_ObjectHideFlags: 0
@@ -11386,8 +11426,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 50, y: -9}
-  m_SizeDelta: {x: 53, y: 16}
+  m_AnchoredPosition: {x: 61.65393, y: -9}
+  m_SizeDelta: {x: 76.3079, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &392867768925489220
 CanvasRenderer:
@@ -11430,7 +11470,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u65E5\u671F/\u65F6\u95F4"
+  m_Text: "\u9884\u6848\u8FC7\u7A0B\u4E00"
 --- !u!1 &3572905169093954274
 GameObject:
   m_ObjectHideFlags: 0
@@ -13383,7 +13423,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u6B65\u9AA4\u5185\u5BB9\u63CF\u8FF0"
+  m_Text: 
 --- !u!1 &3948040924713009985
 GameObject:
   m_ObjectHideFlags: 0
@@ -14094,7 +14134,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u65B9\u6848\u6A21\u5F0FC\u8C03\u5EA6\u6D41\u7A0B/\u8BE6\u60C5"
+  m_Text: "2023\u9884\u6848\u6D41\u7A0B"
 --- !u!1 &4069155641375423183
 GameObject:
   m_ObjectHideFlags: 0
@@ -15097,6 +15137,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 4461453780397662635}
+  - component: {fileID: 4106698132159902332}
   m_Layer: 5
   m_Name: XHDD
   m_TagString: Untagged
@@ -15116,14 +15157,8 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 5774837649050539594}
-  - {fileID: 7976389318387736493}
-  - {fileID: 2367656975193514399}
-  - {fileID: 2722392582514453356}
-  - {fileID: 8804470076358901232}
-  - {fileID: 6539525867132957182}
-  - {fileID: 2650794406654079504}
-  - {fileID: 347112442423315460}
+  - {fileID: 1433254892590319225}
+  - {fileID: 1724459407232952396}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -15132,6 +15167,34 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &4106698132159902332
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4461453780397662634}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e5f456c8c14ee8b4e99f0d9aa27f1b8e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  viewMode: 0
+  qxhddContent: {fileID: 1433254892590319225}
+  xhddContent: {fileID: 1724459407232952396}
+  enterBtn: {fileID: 7938849158392947181}
+  exitBtn: {fileID: 8210063434999076041}
+  playBtn: {fileID: 7957729707524492880}
+  threeStepBtns:
+  - {fileID: 6867871996458727472}
+  - {fileID: 4825051706142097018}
+  - {fileID: 8015265847920820169}
+  yjDropdown: {fileID: 7610704235068337357}
+  yjButtons:
+  - {fileID: 4390153991718414138}
+  - {fileID: 8054682521577699501}
+  - {fileID: 5539151981274453399}
+  yJType: 0
 --- !u!1 &4480951497541427372
 GameObject:
   m_ObjectHideFlags: 0
@@ -17591,6 +17654,47 @@ MonoBehaviour:
     - {r: 0, g: 0, b: 0, a: 0}
     - {r: 0, g: 0, b: 0, a: 0}
     m_Rotation: 0
+--- !u!1 &5386509468387234655
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1724459407232952396}
+  m_Layer: 5
+  m_Name: DDYS
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1724459407232952396
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5386509468387234655}
+  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:
+  - {fileID: 2722392582514453356}
+  - {fileID: 6539525867132957182}
+  - {fileID: 2650794406654079504}
+  - {fileID: 347112442423315460}
+  - {fileID: 921700526036744437}
+  m_Father: {fileID: 4461453780397662635}
+  m_RootOrder: 1
+  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}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &5455927372352429256
 GameObject:
   m_ObjectHideFlags: 0
@@ -19638,7 +19742,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8406788019371051239
 RectTransform:
   m_ObjectHideFlags: 0
@@ -19902,6 +20006,86 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5468\u5929\u4E00"
+--- !u!1 &6248795705415250658
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6218167792810341877}
+  - component: {fileID: 2010706027771433926}
+  - component: {fileID: 2972146885000766615}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6218167792810341877
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6248795705415250658}
+  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: 921700526036744437}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 76, y: 0}
+  m_SizeDelta: {x: 56, y: 19}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2010706027771433926
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6248795705415250658}
+  m_CullTransparentMesh: 1
+--- !u!114 &2972146885000766615
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6248795705415250658}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u9000\u51FA\u6F14\u793A"
 --- !u!1 &6285712715096663460
 GameObject:
   m_ObjectHideFlags: 0
@@ -20098,12 +20282,12 @@ RectTransform:
   - {fileID: 6396372826392836139}
   - {fileID: 8519267101757914042}
   - {fileID: 7812997865502190060}
-  m_Father: {fileID: 4461453780397662635}
+  m_Father: {fileID: 1433254892590319225}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 1700, y: -266}
+  m_AnchoredPosition: {x: 790, y: 224}
   m_SizeDelta: {x: 400, y: 292}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1455635294360030635
@@ -21189,7 +21373,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u65E5\u671F/\u65F6\u95F4"
+  m_Text: "\u542F\u52A8\u6761\u4EF6"
 --- !u!1 &6876078169529546350
 GameObject:
   m_ObjectHideFlags: 0
@@ -22069,7 +22253,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u6B65\u9AA4\u5185\u5BB9\u63CF\u8FF0"
+  m_Text: "\u6D2A\u6C34\u9884\u62A5\u5185\u5BB9\u3002\u5E94\u6839\u636E\u6C34\u6587\u6C14\u8C61\u90E8\u95E8\u548C\u9632\u6C5B\u6307\u6325\u90E8\u7684\u89C4\u5B9A\u548C\u8981\u6C42\u8FDB\u884C\u3002\u8B66\u62A5\u5185\u5BB9\u5305\u62EC\u9884\u6D4B\u7684\u6D2A\u6C34\u4F4D\u3001\u6D2A\u6C34\u91CF\u3001\u5206\u6D2A\u65F6\u95F4\u3001\u6709\u5173\u51C6\u5907\u5DE5\u4F5C\u3001\u7D27\u6025\u907F\u6D2A\u548C\u64A4\u9000\u8DEF\u7EBF\u53CA\u5141\u8BB8\u64A4\u79BB\u7684\u65F6\u9650\u7B49\u3002"
 --- !u!1 &7081882770934076612
 GameObject:
   m_ObjectHideFlags: 0
@@ -22754,6 +22938,82 @@ MonoBehaviour:
   managerText: {fileID: 0}
   stateText: {fileID: 0}
   ctrlText: {fileID: 0}
+--- !u!1 &7220922576140235312
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 9078792488463253278}
+  - component: {fileID: 8853985065310568344}
+  - component: {fileID: 2832500513258366221}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9078792488463253278
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7220922576140235312}
+  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: 921700526036744437}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 32, y: 0}
+  m_SizeDelta: {x: 16, y: 16}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8853985065310568344
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7220922576140235312}
+  m_CullTransparentMesh: 1
+--- !u!114 &2832500513258366221
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7220922576140235312}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: ac0f9b3881a27df4da162896f0a2db2f, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &7227154209630765052
 GameObject:
   m_ObjectHideFlags: 0
@@ -24021,6 +24281,129 @@ MonoBehaviour:
   managerText: {fileID: 0}
   stateText: {fileID: 0}
   ctrlText: {fileID: 0}
+--- !u!1 &7557482804048976825
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 921700526036744437}
+  - component: {fileID: 6891774104955167702}
+  - component: {fileID: 2218381066323850415}
+  - component: {fileID: 8210063434999076041}
+  m_Layer: 5
+  m_Name: ExitButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &921700526036744437
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7557482804048976825}
+  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:
+  - {fileID: 6218167792810341877}
+  - {fileID: 9078792488463253278}
+  m_Father: {fileID: 1724459407232952396}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 1416, y: -1016}
+  m_SizeDelta: {x: 128, y: 40}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6891774104955167702
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7557482804048976825}
+  m_CullTransparentMesh: 1
+--- !u!114 &2218381066323850415
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7557482804048976825}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 21300000, guid: 2e2b18e73fe3f044fb538a6cbe9064b0, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &8210063434999076041
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7557482804048976825}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 2218381066323850415}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &7588996154831273592
 GameObject:
   m_ObjectHideFlags: 0
@@ -24176,7 +24559,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u53D1\u5E03\u8C03\u5EA6\u4EE4"
+  m_Text: "\u5F00\u59CB\u6F14\u793A"
 --- !u!1 &7707261343525427208
 GameObject:
   m_ObjectHideFlags: 0
@@ -24688,8 +25071,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8446415508596338237}
-  m_Father: {fileID: 4461453780397662635}
-  m_RootOrder: 6
+  m_Father: {fileID: 1724459407232952396}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -24786,7 +25169,7 @@ CanvasGroup:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7785298714377333862}
   m_Enabled: 1
-  m_Alpha: 0.2
+  m_Alpha: 0.5
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
@@ -24903,8 +25286,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6070746097945426574}
-  m_Father: {fileID: 4461453780397662635}
-  m_RootOrder: 5
+  m_Father: {fileID: 1724459407232952396}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -27435,7 +27818,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Option A
+  m_Text: "\u9EC4\u8272\u9884\u8B66"
 --- !u!1 &8546362545208280545
 GameObject:
   m_ObjectHideFlags: 0
@@ -27880,11 +28263,11 @@ MonoBehaviour:
   m_Value: 0
   m_Options:
     m_Options:
-    - m_Text: Option A
+    - m_Text: "\u9EC4\u8272\u9884\u8B66"
       m_Image: {fileID: 0}
-    - m_Text: Option B
+    - m_Text: "\u6A59\u8272\u9884\u8B66"
       m_Image: {fileID: 0}
-    - m_Text: Option C
+    - m_Text: "\u7EA2\u8272\u9884\u8B66"
       m_Image: {fileID: 0}
   m_OnValueChanged:
     m_PersistentCalls:
@@ -28068,7 +28451,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2403854792155950119
 RectTransform:
   m_ObjectHideFlags: 0

Fișier diff suprimat deoarece este prea mare
+ 202 - 183
Assets/Scene 1.unity


Fișier diff suprimat deoarece este prea mare
+ 244 - 278
Assets/Scene.unity


+ 5 - 1
Assets/Scripts/AssetLoadHelper_AB.cs

@@ -12,7 +12,8 @@ public class AssetLoadHelper_AB : MonoBehaviour
 
     public bool addMat = false;
     public Material defulMat;
-    
+
+    public List<string> ignoreObjs = new List<string>();
     void Start()
     {
         if (insRoot == null)
@@ -33,6 +34,9 @@ public class AssetLoadHelper_AB : MonoBehaviour
             GameObject[] objs = tempAb.LoadAllAssets<GameObject>();
             for (int i = 0; i < objs.Length; i++)
             {
+                if (ignoreObjs.Contains(objs[i].name)) {
+                    continue;
+                }
                 GameObject insObj=Instantiate(objs[i], insRoot);
                 if (addMat)
                 {

+ 1 - 4
Assets/Scripts/TextureLoadHelp.cs

@@ -280,11 +280,8 @@ public class TextureLoadHelp : MonoBehaviour
 
     IEnumerator DownLoadTex_Raw(string path, long loadId)
     {
-#if UNITY_EDITOR
         WWW www = new WWW(path);
-#else
-            WWW www = WWW.LoadFromCacheOrDownload($"{Application.streamingAssetsPath}/{ab_Name}",0);
-#endif
+
         yield return www;
         if (www.isDone)
         {

+ 121 - 4
Assets/Scripts/UI/UIView/3D/GCZLLayer.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Runtime.InteropServices;
 using UnityEngine;
 using UnityAsync;
 using WaitUntil = UnityAsync.WaitUntil;
@@ -57,7 +58,18 @@ public class GCZLLayer : MonoBehaviour
     public string[] BY_PhotoUrl;
     public string[] TK_PhotoUrl;
     public int photoIndex;
+
+    public string[] BY_PdfUrl;
+    public string[] TK_PdfUrl;
+    public int pdfIndex;
+    public string[] BY_PdfDownloadUrl;
+    public string[] TK_PdfDownloadUrl;
+    private Button downloadPdfButton;
+    private int showTypeIndex = 0;
     
+    [DllImport("__Internal")]
+    private static extern void OpenNewWebsite(string str);
+
     private void Awake()
     {
         InfoPanel = this.transform.Find("InfoPanel").gameObject;
@@ -108,9 +120,34 @@ public class GCZLLayer : MonoBehaviour
         showFrame.texture = modelRT;
 
         lastPhotoButton = DetailPanel.transform.Find("LastPhotoButton").GetComponent<Button>();
-        lastPhotoButton.onClick.AddListener(()=>ChangePhoto(-1));
+        lastPhotoButton.onClick.AddListener(()=>
+        {
+            switch (showTypeIndex)
+            {
+                case 1:
+                    ChangePDF((-1));
+                    break;
+                case 2:
+                    ChangePhoto(-1);
+                    break;
+            }
+        });
         nextPhotoButton = DetailPanel.transform.Find("NextPhotoButton").GetComponent<Button>();
-        nextPhotoButton.onClick.AddListener(()=>ChangePhoto(1));
+        nextPhotoButton.onClick.AddListener(()=>
+        {
+            switch (showTypeIndex)
+            {
+                case 1:
+                    ChangePDF((1));
+                    break;
+                case 2:
+                    ChangePhoto(1);
+                    break;
+            }
+        });
+
+        downloadPdfButton = DetailPanel.transform.Find("DownButton").GetComponent<Button>();
+        downloadPdfButton.onClick.AddListener(DownLoadPDF);
         
         OpenAniButton = DetailPanel.transform.Find("OpenAniButton").GetComponent<Button>();
         OpenAniButton.onClick.AddListener(() => { ActionInstance._Instance.ModelAni_On?.Invoke(); });
@@ -274,13 +311,16 @@ public class GCZLLayer : MonoBehaviour
     public void ResetDetailPanel()
     {
         photoIndex = 0;
+        pdfIndex = 0;
         lastPhotoButton.gameObject.SetActive(false);
         nextPhotoButton.gameObject.SetActive(false);
+        downloadPdfButton.gameObject.SetActive(false);
         DetailShowType(0);
     }
 
     public void DetailShowType(int index)
     {
+        showTypeIndex = index;
         switch (index)
         {
             case 0:
@@ -295,6 +335,7 @@ public class GCZLLayer : MonoBehaviour
                                                    currentData.name_pri.Equals("TaoKou"));
                 CloseAniButton.gameObject.SetActive(currentData.name_pri.Equals("BuYuan") ||
                                                     currentData.name_pri.Equals("TaoKou"));
+                downloadPdfButton.gameObject.SetActive(false);
                 break;
             case 1:
                 detail_modelCG.alpha = 0.6f;
@@ -302,10 +343,11 @@ public class GCZLLayer : MonoBehaviour
                 detail_photoCG.alpha = 0.6f;
                 detail_videoCG.alpha = 0.6f;
                 showFrame.texture = null;
-                lastPhotoButton.gameObject.SetActive(false);
-                nextPhotoButton.gameObject.SetActive(false);
+                lastPhotoButton.gameObject.SetActive(true);
+                nextPhotoButton.gameObject.SetActive(true);
                 OpenAniButton.gameObject.SetActive(false);
                 CloseAniButton.gameObject.SetActive(false);
+                ChangePDF(0);
                 break;
             case 2:
                 detail_modelCG.alpha = 0.6f;
@@ -317,6 +359,7 @@ public class GCZLLayer : MonoBehaviour
                 nextPhotoButton.gameObject.SetActive(true);
                 OpenAniButton.gameObject.SetActive(false);
                 CloseAniButton.gameObject.SetActive(false);
+                downloadPdfButton.gameObject.SetActive(false);
                 ChangePhoto(0);
                 break;
             case 3:
@@ -329,6 +372,7 @@ public class GCZLLayer : MonoBehaviour
                 nextPhotoButton.gameObject.SetActive(false);
                 OpenAniButton.gameObject.SetActive(false);
                 CloseAniButton.gameObject.SetActive(false);
+                downloadPdfButton.gameObject.SetActive(false);
                 break;
         }
     }
@@ -384,4 +428,77 @@ public class GCZLLayer : MonoBehaviour
             }
         }
     }
+    
+    
+    public void ChangePDF(int moveIndex)
+    {
+        if (currentData.name_pri.Equals("BuYuan"))
+        {
+            switch (moveIndex)
+            {
+                case -1:
+                    if (pdfIndex - 1 >= 0)
+                    {
+                        pdfIndex--;
+                        TextureLoadHelp._Instance.LoadTexFromUrl(BY_PdfUrl[pdfIndex], showFrame);
+                    }
+                    break;
+                case 0:
+                    downloadPdfButton.gameObject.SetActive(true);
+                    pdfIndex = 0;
+                    TextureLoadHelp._Instance.LoadTexFromUrl(BY_PdfUrl[pdfIndex], showFrame);
+                    break;
+                case 1:
+                    if (pdfIndex + 1 <= BY_PdfUrl.Length-1)
+                    {
+                        pdfIndex++;
+                        TextureLoadHelp._Instance.LoadTexFromUrl(BY_PdfUrl[pdfIndex], showFrame);
+                    }
+                    break;
+            }
+        }
+        if (currentData.name_pri.Equals("TaoKou"))
+        {
+            switch (moveIndex)
+            {
+                case -1:
+                    if (pdfIndex - 1 >= 0)
+                    {
+                        pdfIndex--;
+                        TextureLoadHelp._Instance.LoadTexFromUrl(TK_PdfUrl[pdfIndex], showFrame);
+                    }
+                    break;
+                case 0:
+                    downloadPdfButton.gameObject.SetActive(true);
+                    pdfIndex = 0;
+                    TextureLoadHelp._Instance.LoadTexFromUrl(TK_PdfUrl[pdfIndex], showFrame);
+                    break;
+                case 1:
+                    if (pdfIndex + 1 <= TK_PdfUrl.Length-1)
+                    {
+                        pdfIndex++;
+                        TextureLoadHelp._Instance.LoadTexFromUrl(TK_PdfUrl[pdfIndex], showFrame);
+                    }
+                    break;
+            }
+        }
+    }
+
+    public void DownLoadPDF()
+    {
+        if (currentData.name_pri.Equals("BuYuan"))
+        {
+            for (int i = 0; i < BY_PdfDownloadUrl.Length; i++)
+            {
+                OpenNewWebsite(BY_PdfDownloadUrl[i]);     
+            }
+        }
+        if (currentData.name_pri.Equals("TaoKou"))
+        {
+            for (int i = 0; i < TK_PdfDownloadUrl.Length; i++)
+            {
+                OpenNewWebsite(TK_PdfDownloadUrl[i]);     
+            }
+        }
+    }
 }

+ 1 - 1
Assets/Scripts/UI/UIView/FHSS/FHSSLayer.cs

@@ -38,7 +38,7 @@ public class FHSSLayer : YZTRootLayer
 
     private void OnEnable()
     {
-        StaticLod.instance.OnFoucusStatic(-1);
+        StaticLod.instance.OnFoucusStatic("Bird0");
         //StaticLod.instance.currentStatic.SetCameraToCenter(new Vector3(513.8401f, 20, 4938.701f), 21389, new Vector2(89.61806f, 85.64014f));
     }
 }

+ 1 - 0
Assets/Scripts/UI/UIView/GCJK/GCJKLayer.cs

@@ -138,6 +138,7 @@ public class SWZData
     // 天气
     public string wth;
 }
+
 public class GCJKLayer : YZTRootLayer
 {
     public static GCJKLayer _Instance;

+ 43 - 70
Assets/Scripts/UI/UIView/RKZY/LinePath.cs

@@ -1,5 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Net;
+using Unity.Mathematics;
 using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.EventSystems;
@@ -30,97 +32,68 @@ public class LinePath : MonoBehaviour
     public int completeNum;
     public string dateTime;
 
-    public LineRenderer lineRenderer;
-    private List<Vector3> points = new List<Vector3>();
-    // Use this for initialization
-    PolygonCollider2D polygonCollider;   //添加多边形碰撞
-    private float colliderWidth;
+    public GameObject lineRenderer;
+
+    public Material firMat;
+    public Material secMat;
+
     void Start()
     {
-        lineRenderer = this.GetComponent<LineRenderer>();
-        polygonCollider = gameObject.GetComponent<PolygonCollider2D>();
+        
 
-        // 获取LineRenderer的点在世界坐标系中的位置
-        Vector3[] worldPositions = new Vector3[2];
-        lineRenderer.GetPositions(worldPositions);
+    }
 
-        // 将世界坐标系中的点转换为局部坐标系
-        Vector2[] localPositions = new Vector2[worldPositions.Length];
-        for (int i = 0; i < worldPositions.Length; i++)
-        {
-            Vector3 localPos = transform.InverseTransformPoint(worldPositions[i]);
-            localPositions[i] = new Vector2(localPos.x, localPos.y); // 只使用X和Y分量
-        }
+    public void SetPath(Vector3 start, Vector3 end) {
+        this.transform.position = start;
 
-        List<Vector2> colliderPath = GetColliderPath(localPositions);
+        Vector3 direction = end - start;
+        Vector3 up = Vector3.up; // (0,1,0)
 
-        // 设置PolygonCollider2D的路径
-        polygonCollider.SetPath(0, colliderPath.ToArray());
+        // 计算夹角
+        float angle = Vector3.Angle(direction, up);
 
-        // 调整PolygonCollider2D的位置以匹配LineRenderer的Z轴位置
-        AdjustColliderZPosition(worldPositions);
+        // 使用叉积来判断方向
+        Vector3 crossProduct = Vector3.Cross(direction, up);
+        if (crossProduct.z < 0)
+        {
+            angle = 360 - angle;
+        }
+        //print(angle);
+        float distance = Vector3.Distance(end, start);
+        this.transform.localScale = new Vector3(1,distance / 2,1);
+        this.transform.eulerAngles = new Vector3(1, 1, -angle);
+        
     }
 
-    List<Vector2> GetColliderPath(Vector2[] pointList2)
-    {
-        // 碰撞体宽度
-        colliderWidth = lineRenderer.startWidth;
 
-        List<Vector2> edgePointList = new List<Vector2>();
-
-        for (int j = 1; j < pointList2.Length; j++)
+    public void OnShow()
+    {
+        if (RKZYLayer.lineInfoStatic)
         {
-            // 当前点指向前一点的向量
-            Vector2 distanceVector = pointList2[j - 1] - pointList2[j];
-            // 法线向量
-            Vector2 crossVector = new Vector2(-distanceVector.y, distanceVector.x);
-            // 标准化,单位向量
-            Vector2 offsetVector = crossVector.normalized;
-            // 沿法线方向与法线反方向各偏移一定距离
-            Vector2 up = pointList2[j - 1] + 0.5f * colliderWidth * offsetVector;
-            Vector2 down = pointList2[j - 1] - 0.5f * colliderWidth * offsetVector;
-            // 分别加到List的首位和末尾,保证List中的点位可以围成一个闭合且不交叉的折线
-            edgePointList.Insert(0, down);
-            edgePointList.Add(up);
-            // 加入最后一点
-            if (j == pointList2.Length - 1)
+            if (!RKZYLayer.lineInfoStatic.linePaths.Contains(this))
             {
-                up = pointList2[j] + 0.5f * colliderWidth * offsetVector;
-                down = pointList2[j] - 0.5f * colliderWidth * offsetVector;
-                edgePointList.Insert(0, down);
-                edgePointList.Add(up);
+                RKZYLayer.lineInfoStatic.SetData(this);
+                RKZYLayer.lineInfoStatic.GetComponent<RectTransform>().anchoredPosition = Input.mousePosition;
+                RKZYLayer.lineInfoStatic.linePaths.Add(this);
+                this.lineRenderer.GetComponent<MeshRenderer>().material = secMat;
             }
         }
-        // 返回点位
-        return edgePointList;
     }
 
-
-    void AdjustColliderZPosition(Vector3[] worldPositions)
+    public void UnShow()
     {
-        if (worldPositions.Length == 0) return;
+        RKZYLayer.lineInfoStatic.linePaths.Remove(this);
+        this.lineRenderer.GetComponent<MeshRenderer>().material = firMat;
 
-        // 获取LineRenderer的平均Z位置
-        float averageZ = 0;
-        foreach (var pos in worldPositions)
-        {
-            averageZ += pos.z;
-        }
-        averageZ /= worldPositions.Length;
-
-        // 设置PolygonCollider2D的Z位置
-        var colliderTransform = polygonCollider.transform;
-        var colliderPosition = colliderTransform.position;
-        colliderTransform.position = new Vector3(colliderPosition.x, colliderPosition.y, averageZ);
     }
 
-    public void OnShow()
+    private void Update()
     {
-        if (RKZYLayer.lineInfoStatic)
-        {
-            RKZYLayer.lineInfoStatic.SetData(this);
-            //RKZYLayer.lineInfoStatic.GetComponent<RectTransform>().anchoredPosition = this.GetComponent<RectTransform>().anchoredPosition;
-            RKZYLayer.lineInfoStatic.linePaths.Add(this);
+        if (CameraManager.instance.secondCamera != null) {
+            float dyScale = CameraManager.instance.secondCamera.GetComponent<CameraBirdSec>().currentDistance / 6;
+            dyScale = math.clamp(dyScale, 1, 12);
+            this.transform.localScale = new Vector3(dyScale, this.transform.localScale.y, dyScale);
+            this.lineRenderer.GetComponent<MeshRenderer>().material.SetTextureScale("_MainTex", new Vector2(1, this.transform.localScale.y * 10 / this.transform.localScale.x));
         }
     }
 }

+ 28 - 14
Assets/Scripts/UI/UIView/RKZY/RKZYLayer.cs

@@ -243,19 +243,18 @@ public class RKZYLayer : YZTRootLayer
             {
                 LinePath linePath = Instantiate(linePathPrefab);
                 linePath.transform.SetParent(beforeC);
-                linePath.transform.localScale = Vector3.one;
                 linePath.startPos = allServerMovePlans[i].from;
                 Vector3 localPos = CoordinateConverter.GeoToUGUISmall(allServerMovePlans[i].fromLong, allServerMovePlans[i].fromLttd);
                 Vector3 worldPos = runtimPointParent.TransformPoint(localPos);
                 worldPos.z = -583;
-                linePath.GetComponent<LineRenderer>().SetPosition(1, worldPos);
+
                 linePath.endPos = allServerMovePlans[i].to;
                 Vector3 localPos1 = CoordinateConverter.GeoToUGUISmall(allServerMovePlans[i].toLong, allServerMovePlans[i].toLttd);
                 Vector3 worldPos1 = runtimPointParent.TransformPoint(localPos1);
                 worldPos1.z = -583;
-                float distance = Vector3.Distance(worldPos, worldPos1);
-                linePath.GetComponent<LineRenderer>().material.SetTextureScale("_MainTex", new Vector2(distance * 120 / 25, 1));
-                linePath.GetComponent<LineRenderer>().SetPosition(0, worldPos1);
+
+                linePath.SetPath(worldPos, worldPos1);
+
                 linePath.lineDir = isOut ? LineDir.Out : LineDir.In;
                 linePath.linePathContent = allServerMovePlans[i].desc;
                 linePath.manNum = allServerMovePlans[i].manNum;
@@ -283,20 +282,16 @@ public class RKZYLayer : YZTRootLayer
             {
                 LinePath linePath = Instantiate(linePathPrefab);
                 linePath.transform.SetParent(afterC);
-                linePath.transform.localScale = Vector3.one;
                 linePath.startPos = allServerMovePlans[i].from;
                 Vector3 localPos = CoordinateConverter.GeoToUGUISmall(allServerMovePlans[i].fromLong, allServerMovePlans[i].fromLttd);
                 Vector3 worldPos = runtimPointParent.TransformPoint(localPos);
                 worldPos.z = -583;
-                linePath.GetComponent<LineRenderer>().SetPosition(1, worldPos);
                 linePath.endPos = allServerMovePlans[i].to;
                 Vector3 localPos1 = CoordinateConverter.GeoToUGUISmall(allServerMovePlans[i].toLong, allServerMovePlans[i].toLttd);
                 Vector3 worldPos1 = runtimPointParent.TransformPoint(localPos1);
                 worldPos1.z = -583;
-                float distance = Vector3.Distance(worldPos, worldPos1);
-                linePath.GetComponent<LineRenderer>().material = afterMat;
-                linePath.GetComponent<LineRenderer>().material.SetTextureScale("_MainTex", new Vector2(distance * 120 / 25,1));
-                linePath.GetComponent<LineRenderer>().SetPosition(0, worldPos1);
+
+                linePath.SetPath(worldPos, worldPos1);
                 linePath.lineDir = isOut ? LineDir.Out : LineDir.In;
                 linePath.linePathContent = allServerMovePlans[i].desc;
                 linePath.manNum = allServerMovePlans[i].manNum;
@@ -543,7 +538,7 @@ public class RKZYLayer : YZTRootLayer
         // 将格式化的时间字符串设置到UI Text组件上
         timeText.text = timeString;
     }
-
+    LinePath lastPath;
     private void FixedUpdate()
     {
         if (lineInfo.linePaths.Count > 0)
@@ -561,9 +556,28 @@ public class RKZYLayer : YZTRootLayer
         {
             Debug.Log(hit.collider.gameObject.name);
             // 检查射线是否击中 LineRenderer 所在的物体
-            if (hit.collider.GetComponent<LineRenderer>() != null)
+            if (hit.collider.transform.parent.GetComponent<LinePath>() != null)
+            {
+                if (lastPath != null && hit.collider.transform.parent.GetComponent<LinePath>() != lastPath) {
+                    lastPath.UnShow();
+                }
+                hit.collider.transform.parent.GetComponent<LinePath>().OnShow();
+                lastPath = hit.collider.transform.parent.GetComponent<LinePath>();
+            }
+            else
+            {
+                if (lastPath)
+                {
+                    lastPath.UnShow();
+                    lastPath = null;
+                }
+            }
+        }
+        else {
+            if (lastPath)
             {
-                hit.collider.gameObject.GetComponent<LinePath>().OnShow();
+                lastPath.UnShow();
+                lastPath = null;
             }
         }
     }

+ 260 - 0
Assets/Scripts/UI/UIView/XHDD/XHDDLayer.cs

@@ -0,0 +1,260 @@
+using DG.Tweening;
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using UnityEngine;
+using UnityEngine.UI;
+
+[System.Serializable]
+public enum YJType {
+    YELLOW,
+    ORANGE,
+    RED
+}
+
+public class XHDDLayer : YZTRootLayer
+{
+
+    public RectTransform qxhddContent;
+    public RectTransform xhddContent;
+
+    public Button enterBtn;
+    public Button exitBtn;
+
+    public Button playBtn;
+
+    public List<Text> threeStepBtns = new List<Text>();
+
+
+    public Dropdown yjDropdown;
+    public Button[] yjButtons;
+
+    public YJType yJType;
+
+    public string[,] allYAContent = new string[3, 3];
+
+    bool playing = false;
+
+    // Start is called before the first frame update
+    void Start()
+    {
+        InitYAContent();
+        InitButton();
+    }
+    private void OnEnable()
+    {
+        CameraManager.SwitchCamera(0);
+        StaticLod.instance.OnFoucusStatic(1);
+    }
+
+    void InitYAContent() {
+        allYAContent[0, 0] = "当预报洪水将达到或超过蓄滞洪区启用标准时(套口进洪闸的设防水位为32m),发布黄色预警,做好运用准备。";
+        allYAContent[0, 1] = "分洪前线指挥部及其下设七个责任组责任人和成员迅速进入运用准备状态,服从前指的统一调度。";
+        allYAContent[0, 2] = "分蓄洪区内各个乡镇、村组确定1名领导专门负责承担警报发布和传递任务。警报一经发布,各项避洪工作必须迅速及时,不得有误。";
+
+        allYAContent[1, 0] = "当需要区内人员转移时,发布橙色预警,开始实施分蓄洪区内居民转移、清场等工作。";
+        allYAContent[1, 1] = "人员转移时机根据荆江河段及城陵矶附近地区实时水情、防洪工程情况和区内人员转移所需时间等确定。";
+        allYAContent[1, 2] = "采取电视、广播、电话、传真、汽笛、敲锣、挂旗、报警器、鸣枪或挨户通知等一切可能的形式迅速向分洪区传播分洪转移命令。";
+
+        allYAContent[2, 0] = "当决定启用蓄滞洪区时,发布红色警报。";
+        allYAContent[2, 1] = "开启套口进洪闸或实施上车湾口门爆破,开始分蓄洪。";
+        allYAContent[2, 2] = "红色警报期持续至具备返迁条件时为止。";
+    }
+    void InitButton() {
+        enterBtn.onClick.AddListener(() =>
+        {
+            qxhddContent.gameObject.SetActive(false);
+            xhddContent.gameObject.SetActive(true);
+        });
+
+        exitBtn.onClick.AddListener(() =>
+        {
+            qxhddContent.gameObject.SetActive(true);
+            xhddContent.gameObject.SetActive(false);
+            playBtn.interactable = true;
+            playing = false;
+            AllRestore();
+        });
+
+        for (int i = 0; i < yjButtons.Length; i++) {
+            int temp = i;
+            yjButtons[i].onClick.AddListener(() =>
+            {
+                if (!playing) {
+                    ClearAllText();
+                }
+                for (int j = 0; j < yjButtons.Length; j++) {
+                    yjButtons[j].GetComponent<CanvasGroup>().alpha = 0.2f;
+                
+                }
+                yjButtons[temp].GetComponent<CanvasGroup>().alpha = 1f;
+                yJType = (YJType)temp;
+                yjDropdown.value = temp;
+            });
+            
+        }
+
+        playBtn.onClick.AddListener(() =>
+        {
+            ClearAllText();
+            playing = true;
+            playBtn.interactable = false;
+            ControlYJ();
+        });
+    }
+
+    void AllRestore() {
+        TimeLineControl.instance.transform.GetChild(1).GetChild(1).localPosition = Vector3.zero;
+        TimeLineControl.instance.transform.GetChild(0).gameObject.SetActive(false);
+        Material material = TimeLineControl.instance.transform.GetChild(1).GetChild(0).GetComponent<MeshRenderer>().material;
+        material.SetFloat("_ClipLength", 1);
+    }
+
+    void ClearAllText() {
+        for (int i = 0; i < threeStepBtns.Count; i++) {
+            threeStepBtns[i].text = "";
+        }
+    }
+
+    async void ControlYJ() {
+        switch (yJType) {
+            case YJType.YELLOW:
+                TimeLineControl.instance.transform.GetChild(1).GetChild(1).localPosition = Vector3.zero;
+                threeStepBtns[0].text = allYAContent[(int)yJType, 0];
+                await Task.Delay(1000);
+                if (!playing) {
+                    playBtn.interactable = true;
+                    return;
+                }
+                StaticLod.instance.OnFoucusStatic("Bird1");
+                await Task.Delay(2000);
+                if (!playing)
+                {
+                    playBtn.interactable = true;
+                    return;
+                }
+                TimeLineControl.instance.transform.GetChild(1).GetChild(1).DOLocalMove(new Vector3(0, 0, 31.2f), 12.0f);
+                await Task.Delay(11000);
+                if (!playing)
+                {
+                    playBtn.interactable = true;
+                    return;
+                }
+                threeStepBtns[1].text = allYAContent[(int)yJType, 1];
+                StaticLod.instance.OnFoucusStatic("Bird2");
+                await Task.Delay(3000);
+                if (!playing)
+                {
+                    playBtn.interactable = true;
+                    return;
+                }
+                threeStepBtns[2].text = allYAContent[(int)yJType, 2];
+                playBtn.interactable = true;
+                break;
+            case YJType.ORANGE:
+                TimeLineControl.instance.transform.GetChild(1).GetChild(1).localPosition = new Vector3(0, 0, 31.2f);
+                TimeLineControl.instance.transform.GetChild(0).gameObject.SetActive(false);
+                threeStepBtns[0].text = allYAContent[(int)yJType, 0];
+                await Task.Delay(1000);
+                if (!playing)
+                {
+                    playBtn.interactable = true;
+                    return;
+                }
+                StaticLod.instance.OnFoucusStatic("Bird2");
+                await Task.Delay(2000);
+                if (!playing)
+                {
+                    playBtn.interactable = true;
+                    return;
+                }
+                TimeLineControl.instance.transform.GetChild(0).gameObject.SetActive(true);
+                await Task.Delay(8000);
+                if (!playing)
+                {
+                    playBtn.interactable = true;
+                    return;
+                }
+                threeStepBtns[1].text = allYAContent[(int)yJType, 1];
+                StaticLod.instance.OnFoucusStatic("Bird3");
+                await Task.Delay(3000);
+                if (!playing)
+                {
+                    playBtn.interactable = true;
+                    return;
+                }
+                threeStepBtns[2].text = allYAContent[(int)yJType, 2];
+                playBtn.interactable = true;
+                break;
+            case YJType.RED:
+                Material material = TimeLineControl.instance.transform.GetChild(1).GetChild(0).GetComponent<MeshRenderer>().material;
+                material.SetFloat("_ClipLength", 1);
+                TimeLineControl.instance.transform.GetChild(1).GetChild(1).localPosition = new Vector3(0, 0, 31.2f);
+                TimeLineControl.instance.transform.GetChild(2).GetChild(0).gameObject.SetActive(false);
+                threeStepBtns[0].text = allYAContent[(int)yJType, 0];
+                await Task.Delay(1000);
+                if (!playing)
+                {
+                    playBtn.interactable = true;
+                    return;
+                }
+                StaticLod.instance.OnFoucusStatic("Bird2");
+                await Task.Delay(3000);
+                if (!playing)
+                {
+                    playBtn.interactable = true;
+                    return;
+                }
+                StaticLod.instance.OnFoucusStatic("Bird4");
+                ActionInstance._Instance.ModelAni_On?.Invoke();
+                await Task.Delay(1200);
+                TimeLineControl.instance.transform.GetChild(2).GetChild(0).gameObject.SetActive(true);
+                if (!playing)
+                {
+                    playBtn.interactable = true;
+                    return;
+                }
+                await Task.Delay(500);
+                
+                material.SetFloat("_ClipLength", 0.981f);
+                if (!playing)
+                {
+                    playBtn.interactable = true;
+                    return;
+                }
+                threeStepBtns[1].text = allYAContent[(int)yJType, 1];
+                await Task.Delay(2000);
+                if (!playing)
+                {
+                    playBtn.interactable = true;
+                    return;
+                }
+                StaticLod.instance.OnFoucusStatic("Bird5");
+                DOTween.To(() => material.GetFloat("_ClipLength"), x => material.SetFloat("_ClipLength", x), 0.881f, 4f);
+                await Task.Delay(5000);
+                if (!playing)
+                {
+                    playBtn.interactable = true;
+                    return;
+                }
+                StaticLod.instance.OnFoucusStatic("Bird3");
+                DOTween.To(() => material.GetFloat("_ClipLength"), x => material.SetFloat("_ClipLength", x), 0.1f, 6f);
+                await Task.Delay(6000);
+                if (!playing)
+                {
+                    playBtn.interactable = true;
+                    return;
+                }
+                
+                threeStepBtns[2].text = allYAContent[(int)yJType, 2];
+                playBtn.interactable = true;
+                break;
+        }
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

+ 11 - 0
Assets/Scripts/UI/UIView/XHDD/XHDDLayer.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e5f456c8c14ee8b4e99f0d9aa27f1b8e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 64 - 0
Assets/StreamingAssets/moveplan.json

@@ -140,7 +140,11 @@
         "isOut": true,
         "desc": "大同湖管理区12395户、37272人自筹机动车辆(手拖、小型客运车等)上唐旺干线公路转移到大同湖办事处集中,再用45座客运车(需客运车92辆)上武监高速转孝洪高速入仙桃市张沟镇安置。",
         "from": "大同湖管理区",
+        "fromLong":	116.607176,
+        "fromLttd":	39.929456,
         "to": "张沟镇",
+        "toLong": 113.380530,
+        "toLttd": 30.250071,
         "manNum": 37272,
         "homeNum": 12395,
         "completeNum": 29987,
@@ -153,7 +157,11 @@
         "isOut": true,
         "desc": "螺山镇10520户、39830人自筹机动车辆(手拖、小型客运车等)上新螺路及乡镇公路到螺山镇集中,再用45座客运车(需客运车98辆)在螺山入口上武监高速转随岳高速公路到陈场路口下高速转入仙桃市通海口镇、郭河镇安置。",
         "from": "螺山镇",
+        "fromLong":	113.322769,
+        "fromLttd":	29.667271,
         "to": "郭河镇",
+        "toLong": 113.293540,
+        "toLttd": 30.240309,
         "manNum": 39830,
         "homeNum": 10520,
         "completeNum": 27770,
@@ -166,7 +174,11 @@
         "isOut": true,
         "desc": "乌林镇13297户、48182人,自筹机动车辆(手拖、小型客运车等)上汊腰路、黄周路及乡镇公路到乌林、石码头集中,再用45座客运车(需客运车119辆)在新堤入口进入武监高速公路到汉南路口下高速转入武汉市汉南区安置。",
         "from": "乌林镇",
+        "fromLong":	113.601400,
+        "fromLttd":	29.914429,
         "to": "汉南区",
+        "toLong": 114.085000,
+        "toLttd": 30.308900,
         "manNum": 48182,
         "homeNum": 13297,
         "completeNum": 14626,
@@ -179,7 +191,11 @@
         "isOut": true,
         "desc": "龙口镇13450户、51356人,自筹机动车辆(手拖、小型客运车等)上龙江路、高王路及乡镇公路到龙口镇集中,再用45座客运车(需客运车127辆)在大同湖高速路入口进入武监高速公路到武汉转入武汉市洪山区安置。",
         "from": "龙口镇",
+        "fromLong":	113.768400,
+        "fromLttd":	29.940620,
         "to": "洪山区",
+        "toLong": 114.342865,
+        "toLttd": 30.500516,
         "manNum": 51356,
         "homeNum": 13450,
         "completeNum": 5292,
@@ -192,7 +208,11 @@
         "isOut": true,
         "desc": "大沙管理区13607户、36255人,自筹机动车辆(手拖、小型客运车等)上荻彭路及乡镇公路到大沙集镇集中,再用45座客运车(需客运车91辆)在孝洪高速路燕窝入口进入后转入武监高速公路到武汉转入武汉市黄陂区安置。",
         "from": "大沙管理区",
+        "fromLong":	113.856341,
+        "fromLttd":	30.013239,
         "to": "武汉市黄陂区",
+        "toLong": 114.376000,
+        "toLttd": 30.881299,
         "manNum": 36255,
         "homeNum": 13607,
         "completeNum": 34040,
@@ -205,7 +225,11 @@
         "isOut": true,
         "desc": "燕窝镇12086户、40975人,自筹机动车辆(手拖、小型客运车等)上燕新路、四清路及乡镇公路到燕窝镇集中,再用45座客运车(需客运车101辆)在孝洪高速路燕窝入口进入后转入武监高速公路到武汉转入武汉市蔡甸区安置。",
         "from": "燕窝镇",
+        "fromLong":	114.022761,
+        "fromLttd":	30.080289,
         "to": "蔡甸区",
+        "toLong": 114.029003,
+        "toLttd": 30.582099,
         "manNum": 40975,
         "homeNum": 12086,
         "completeNum": 22196,
@@ -218,7 +242,11 @@
         "isOut": true,
         "desc": "新滩镇11867户、39915人,自筹机动车辆(手拖、小型客运车等)上燕新路、荻彭路、宦坪路及乡镇公路到新滩集中,再用45座客运车(需客运车99辆)在新滩高速路入口进入武监高速公路到武汉转入武汉市江夏区安置。",
         "from": "新滩镇",
+        "fromLong":	114.022761,
+        "fromLttd":	30.080289,
         "to": "武汉市江夏区",
+        "toLong": 114.322004,
+        "toLttd": 30.375693,
         "manNum": 39915,
         "homeNum": 11867,
         "completeNum": 22785,
@@ -231,7 +259,11 @@
         "isOut": true,
         "desc": "老湾乡3746户、17317人,自筹机动车辆(手拖、小型客运车等)上黄老路及乡镇公路到老湾乡集中,再用45座客运车(需客运车43辆)在大同湖高速路入口进入武监高速公路到武汉转入武汉市经济开发区安置。",
         "from": "老湾乡",
+        "fromLong":	113.670907,
+        "fromLttd":	29.971485,
         "to": "经济开发区",
+        "toLong": 113.469829,
+        "toLttd": 29.829878,
         "manNum": 17317,
         "homeNum": 3746,
         "completeNum": 10964,
@@ -380,7 +412,11 @@
         "isOut": true,
         "desc": "大同湖管理区12395户、37272人自筹机动车辆(手拖、小型客运车等)上唐旺干线公路转移到大同湖办事处集中,再用45座客运车(需客运车92辆)上武监高速转孝洪高速入仙桃市张沟镇安置。",
         "from": "张沟镇",
+        "fromLong": 113.380530,
+        "fromLttd": 30.250071,
         "to": "大同湖管理区",
+        "toLong":	116.607176,
+        "toLttd":	39.929456,
         "manNum": 37272,
         "homeNum": 12395,
         "completeNum": 22926,
@@ -393,7 +429,11 @@
         "isOut": true,
         "desc": "螺山镇10520户、39830人自筹机动车辆(手拖、小型客运车等)上新螺路及乡镇公路到螺山镇集中,再用45座客运车(需客运车98辆)在螺山入口上武监高速转随岳高速公路到陈场路口下高速转入仙桃市通海口镇、郭河镇安置。",
         "from": "郭河镇",
+        "fromLong": 113.293540,
+        "fromLttd": 30.240309,
         "to": "螺山镇",
+        "toLong":	113.322769,
+        "toLttd":	29.667271,
         "manNum": 39830,
         "homeNum": 10520,
         "completeNum": 6220,
@@ -406,7 +446,11 @@
         "isOut": true,
         "desc": "乌林镇13297户、48182人,自筹机动车辆(手拖、小型客运车等)上汊腰路、黄周路及乡镇公路到乌林、石码头集中,再用45座客运车(需客运车119辆)在新堤入口进入武监高速公路到汉南路口下高速转入武汉市汉南区安置。",
         "from": "汉南区",
+        "fromLong": 114.085000,
+        "fromLttd": 30.308900,
         "to": "乌林镇",
+        "toLong":	113.601400,
+        "toLttd":	29.914429,
         "manNum": 48182,
         "homeNum": 13297,
         "completeNum": 13970,
@@ -419,7 +463,11 @@
         "isOut": true,
         "desc": "龙口镇13450户、51356人,自筹机动车辆(手拖、小型客运车等)上龙江路、高王路及乡镇公路到龙口镇集中,再用45座客运车(需客运车127辆)在大同湖高速路入口进入武监高速公路到武汉转入武汉市洪山区安置。",
         "from": "洪山区",
+        "fromLong": 114.342865,
+        "fromLttd": 30.500516,
         "to": "龙口镇",
+        "toLong":	113.768400,
+        "toLttd":	29.940620,
         "manNum": 51356,
         "homeNum": 13450,
         "completeNum": 31358,
@@ -432,7 +480,11 @@
         "isOut": true,
         "desc": "大沙管理区13607户、36255人,自筹机动车辆(手拖、小型客运车等)上荻彭路及乡镇公路到大沙集镇集中,再用45座客运车(需客运车91辆)在孝洪高速路燕窝入口进入后转入武监高速公路到武汉转入武汉市黄陂区安置。",
         "from": "武汉市黄陂区",
+        "fromLong": 114.376000,
+        "fromLttd": 30.881299,
         "to": "大沙管理区",
+        "toLong":	113.856341,
+        "toLttd":	30.013239,
         "manNum": 36255,
         "homeNum": 13607,
         "completeNum": 21239,
@@ -445,7 +497,11 @@
         "isOut": true,
         "desc": "燕窝镇12086户、40975人,自筹机动车辆(手拖、小型客运车等)上燕新路、四清路及乡镇公路到燕窝镇集中,再用45座客运车(需客运车101辆)在孝洪高速路燕窝入口进入后转入武监高速公路到武汉转入武汉市蔡甸区安置。",
         "from": "蔡甸区",
+        "fromLong": 114.029003,
+        "fromLttd": 30.582099,
         "to": "燕窝镇",
+        "toLong":	114.022761,
+        "toLttd":	30.080289,
         "manNum": 40975,
         "homeNum": 12086,
         "completeNum": 38231,
@@ -458,7 +514,11 @@
         "isOut": true,
         "desc": "新滩镇11867户、39915人,自筹机动车辆(手拖、小型客运车等)上燕新路、荻彭路、宦坪路及乡镇公路到新滩集中,再用45座客运车(需客运车99辆)在新滩高速路入口进入武监高速公路到武汉转入武汉市江夏区安置。",
         "from": "武汉市江夏区",
+        "fromLong": 114.322004,
+        "fromLttd": 30.375693,
         "to": "新滩镇",
+        "toLong":	114.022761,
+        "toLttd":	30.080289,
         "manNum": 39915,
         "homeNum": 11867,
         "completeNum": 17831,
@@ -471,7 +531,11 @@
         "isOut": true,
         "desc": "老湾乡3746户、17317人,自筹机动车辆(手拖、小型客运车等)上黄老路及乡镇公路到老湾乡集中,再用45座客运车(需客运车43辆)在大同湖高速路入口进入武监高速公路到武汉转入武汉市经济开发区安置。",
         "from": "经济开发区",
+        "fromLong": 113.469829,
+        "fromLttd": 29.829878,
         "to": "老湾乡",
+        "toLong":	113.670907,
+        "toLttd":	29.971485,
         "manNum": 17317,
         "homeNum": 3746,
         "completeNum": 7808,

+ 19 - 0
Assets/TimeLineControl.cs

@@ -0,0 +1,19 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class TimeLineControl : MonoBehaviour
+{
+    public static TimeLineControl instance;
+    // Start is called before the first frame update
+    void Start()
+    {
+        instance = this;
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}

+ 11 - 0
Assets/TimeLineControl.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e7a7a7bf9a77f05419c12c0d9c24761f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff