Browse Source

修改了部分bug

wartheking 9 months ago
parent
commit
ddc511a936

+ 3 - 0
Assets/AIPagedLod/Scripts/WebGL/CameraBird.cs

@@ -48,6 +48,9 @@ public class CameraBird : MonoBehaviour
         onUI = false;
         if (IsPointerOverUIElement()) onUI = true;
 
+
+        this.GetComponent<Camera>().nearClipPlane = currentDistance / 100.0f;
+
         // 鼠标滚轮控制摄像头远近
         if (Input.GetAxis("Mouse ScrollWheel") != 0 && !onUI)
         {

+ 2 - 0
Assets/AIPagedLod/Scripts/WebGL/CameraBirdSec.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using DG.Tweening;
+using Unity.Mathematics;
 using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.EventSystems;
@@ -107,6 +108,7 @@ public class CameraBirdSec : MonoBehaviour
         // 鼠标滚轮控制摄像头远近
         if (Input.GetAxis("Mouse ScrollWheel") != 0 && !onUI)
         {
+            scrollSensitivity = math.clamp(currentDistance, 0, 10);
             // 更新当前距离
             currentDistance -= Input.GetAxis("Mouse ScrollWheel") * scrollSensitivity;
             // 确保距离在允许的范围内

+ 27 - 3
Assets/Art/Sky/Cold Clouds Equirect.png.meta

@@ -67,12 +67,12 @@ TextureImporter:
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 1024
     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: []

+ 3 - 3
Assets/Editor/InstantiateQuadsEditor.cs

@@ -106,19 +106,19 @@ public class InstantiateQuadsEditor : EditorWindow
         {
             for (int j = 0; j < ver; j++)
             {
-                Texture texture = Resources.Load<Texture>("L11/L11_16x16" + i + "_" + j);
+                Texture texture = Resources.Load<Texture>("L16/GCJ02_L16_18x18" + i + "_" + j);
                 float startJ = 0 - (hor / 2.0f) + 0.5f;
                 float starti = 0 + (ver / 2.0f) - 0.5f;
                 // 实例化Prefab
                 GameObject quad = Instantiate(prefab, parent);
-                quad.name = "L11" + i.ToString() + "_" + j.ToString();
+                quad.name = "L16" + i.ToString() + "_" + j.ToString();
 
                 // 设置位置
                 Vector3 localPosition = new Vector3(startJ + j, starti - i, 0);
                 quad.transform.localPosition = localPosition;
 
                 // 为每个实例化的对象创建新的材质,并保存为Asset
-                Material mat = CreateAndSaveMaterial(texture, "Assets/Art/Material/Minimap");
+                Material mat = CreateAndSaveMaterial(texture, "Assets/Art/Material/Minimap/L16");
                 quad.GetComponent<MeshRenderer>().material = mat;
             }
         }

+ 12 - 18
Assets/Prefabs/UI/XHYZT/SWYJ.prefab

@@ -3629,9 +3629,9 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -3, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5877041761059382165
 CanvasRenderer:
@@ -4627,7 +4627,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5DE5\u7A0B\u5B89\u5168\u76D1\u6D4B"
+  m_Text: "\u6C34\u4F4D\u76D1\u6D4B"
 --- !u!1 &1634430268779488866
 GameObject:
   m_ObjectHideFlags: 0
@@ -10138,7 +10138,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -14634,9 +14634,9 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -17, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &6315861422165880077
 CanvasRenderer:
@@ -16053,7 +16053,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7289340260209060652
 RectTransform:
   m_ObjectHideFlags: 0
@@ -16099,12 +16099,6 @@ MonoBehaviour:
     pingJunYuLiang: 32.2
     chaoJingZhanDian: 3
     weatherTypeStr: "\u4E2D\u96E8"
-  GongChengAnQuanJianCeData:
-    pingJunShuiWei: 0.62
-    sheFangShuiWei: 3.2
-    jingJieShuiWei: 16.2
-    baoZhengShuiWei: 1685
-    shuiWei: 36.6
   ShuiWeiBianHuaData_TK_Month:
     name:
     - 1
@@ -16297,9 +16291,9 @@ RectTransform:
   m_Father: {fileID: 2174387876988070014}
   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: 185.5, y: -12}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 360, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7054476508142875670
@@ -23507,8 +23501,8 @@ RectTransform:
   m_Father: {fileID: 8935626715396282275}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0.3333333}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}

+ 300 - 15
Assets/Prefabs/UI/XHYZT/XHGK.prefab

@@ -240,6 +240,129 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5E74\n"
+--- !u!1 &893910815902067414
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7520677871434138643}
+  - component: {fileID: 3951333997054678787}
+  - component: {fileID: 5556085679723536977}
+  - component: {fileID: 1794755267887360569}
+  m_Layer: 5
+  m_Name: SJShow
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7520677871434138643
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 893910815902067414}
+  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: 399923344724761731}
+  - {fileID: 5536384878788855619}
+  m_Father: {fileID: 7690069329040521624}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 456.6377, y: 64.519165}
+  m_SizeDelta: {x: 127.05591, y: 39.4166}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3951333997054678787
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 893910815902067414}
+  m_CullTransparentMesh: 1
+--- !u!114 &5556085679723536977
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 893910815902067414}
+  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: 8767a0ad99618e64890d6a266ece4757, type: 3}
+  m_Type: 1
+  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 &1794755267887360569
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 893910815902067414}
+  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: 5556085679723536977}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &1612400332521416611
 GameObject:
   m_ObjectHideFlags: 0
@@ -1070,6 +1193,86 @@ MonoBehaviour:
   m_Text: '18
 
 '
+--- !u!1 &3302057340076630182
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 399923344724761731}
+  - component: {fileID: 8380408537028953878}
+  - component: {fileID: 2426748534508903133}
+  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 &399923344724761731
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3302057340076630182}
+  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: 7520677871434138643}
+  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: 11.0628, y: 0}
+  m_SizeDelta: {x: 104.9283, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8380408537028953878
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3302057340076630182}
+  m_CullTransparentMesh: 1
+--- !u!114 &2426748534508903133
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3302057340076630182}
+  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: "\u4E8B\u4EF6\u63CF\u8FF0"
 --- !u!1 &3501587121332576871
 GameObject:
   m_ObjectHideFlags: 0
@@ -1948,7 +2151,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -2357,9 +2560,9 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -4.7692, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &6219495181141314803
 CanvasRenderer:
@@ -2449,8 +2652,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.000015258789, y: -149.99998}
-  m_SizeDelta: {x: 0, y: 32}
+  m_AnchoredPosition: {x: 0.000015258789, y: -150.00005}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &6219495181246091879
 MonoBehaviour:
@@ -2886,6 +3089,82 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5E74\n"
+--- !u!1 &6612391864939198599
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5536384878788855619}
+  - component: {fileID: 2049271983971426058}
+  - component: {fileID: 7598433095451343638}
+  m_Layer: 5
+  m_Name: Icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5536384878788855619
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6612391864939198599}
+  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: 7520677871434138643}
+  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}
+  m_AnchoredPosition: {x: -31.4, y: -1.5}
+  m_SizeDelta: {x: 16.3292, y: 16.3286}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2049271983971426058
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6612391864939198599}
+  m_CullTransparentMesh: 1
+--- !u!114 &7598433095451343638
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6612391864939198599}
+  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: 4afa5df9bbfa6d44ab63b5a5dbf1ab76, 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 &7298729788572497091
 GameObject:
   m_ObjectHideFlags: 0
@@ -2920,10 +3199,10 @@ RectTransform:
   m_Father: {fileID: 7298729790221269523}
   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: 211.3655, y: -0}
-  m_SizeDelta: {x: 382.731, y: 37}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 211.3655, y: 0}
+  m_SizeDelta: {x: 382.731, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &7298729788572497103
 CanvasRenderer:
@@ -3321,9 +3600,9 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -6.9890003, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &7298729788653894755
 CanvasRenderer:
@@ -5281,7 +5560,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -6320,7 +6599,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 37}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &7298729790221269521
 MonoBehaviour:
@@ -6972,7 +7251,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7690069328844681077
 RectTransform:
   m_ObjectHideFlags: 0
@@ -7015,9 +7294,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b97b91d4d24807b46bfb39fb25183de1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  viewMode: 0
   xhgkContent: {fileID: 7690069329040521624}
   compare: {fileID: 7298729789897259354}
-  znz: {fileID: 0}
   yearContent: {fileID: 6219495180838894991}
   middleContent: {fileID: 7298729789502172461}
   importantContent: {fileID: 6219495181246091873}
@@ -7033,6 +7312,11 @@ MonoBehaviour:
   currentActive: 0
   yearBtns: []
   importThingPrefab: {fileID: 6159620504471101086, guid: f7e50c9c10c7b404fb317ad4af6ebf2b, type: 3}
+  closeBtn: {fileID: 7298729789841279868}
+  showInfoBtn: {fileID: 1794755267887360569}
+  showSprites:
+  - {fileID: 21300000, guid: 9eb4cb859e3c36b44bf2a2da8fa61736, type: 3}
+  - {fileID: 21300000, guid: 8767a0ad99618e64890d6a266ece4757, type: 3}
   importBtns: []
   leftImage: {fileID: 7298729789245168097}
   rightImage: {fileID: 7298729789477652467}
@@ -7080,6 +7364,7 @@ RectTransform:
   - {fileID: 7690069330519247234}
   - {fileID: 6219495180967607244}
   - {fileID: 7298729789502172461}
+  - {fileID: 7520677871434138643}
   m_Father: {fileID: 7690069328844681077}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 215 - 52
Assets/Prefabs/UI/XHYZT/YZT.prefab

@@ -2692,9 +2692,9 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -4.2598, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &330678582
 CanvasRenderer:
@@ -7077,7 +7077,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0.0002961589}
-  m_SizeDelta: {x: 0, y: 11}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &931717859
 MonoBehaviour:
@@ -7095,7 +7095,7 @@ MonoBehaviour:
     m_Left: 0
     m_Right: 0
     m_Top: 11
-    m_Bottom: 0
+    m_Bottom: 15
   m_ChildAlignment: 0
   m_Spacing: 9.2
   m_ChildForceExpandWidth: 1
@@ -14139,7 +14139,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -18500,6 +18500,7 @@ MonoBehaviour:
   - {fileID: 21300000, guid: 18587a7f1754a804aacadc5efd21b858, type: 3}
   - {fileID: 21300000, guid: ef4a8427bee96a24aa96432ccc41248d, type: 3}
   - {fileID: 21300000, guid: 7d577dada64b78949a0d1270179aaec8, type: 3}
+  - {fileID: 21300000, guid: 4afa5df9bbfa6d44ab63b5a5dbf1ab76, type: 3}
   layerBtnPrefab: {fileID: 8799306973542105704, guid: 3fc5d8cc22a8f5543a2c8826c1a3e67f, type: 3}
   secLayerBtnPrefab: {fileID: 707166769807136026, guid: c77f059ab873cdf48a5d3013ed330006, type: 3}
   layerDatas:
@@ -18535,9 +18536,22 @@ MonoBehaviour:
   currentActiveLeft: 0
   layerInfo: {fileID: 5761950834214704942}
   layerInfoExitBtn: {fileID: 2033742229965487536}
+  cancelLayer: 
   sprites:
   - {fileID: 21300000, guid: 2e2b18e73fe3f044fb538a6cbe9064b0, type: 3}
   - {fileID: 21300000, guid: 8767a0ad99618e64890d6a266ece4757, type: 3}
+  rainText: {fileID: 1010277432}
+  rainTextNum:
+  - {fileID: 279746817}
+  - {fileID: 1395903677}
+  - {fileID: 111352839}
+  - {fileID: 859671681}
+  - {fileID: 255474612}
+  - {fileID: 1998676186}
+  thingPrefab: {fileID: 4637747037787186541, guid: 7353580f31f37a04895c0efb0c71bb38, type: 3}
+  thingParent: {fileID: 931717857}
+  rescordSWStationData: []
+  thing3s: []
 --- !u!1 &46367776369383933
 GameObject:
   m_ObjectHideFlags: 0
@@ -19080,7 +19094,7 @@ RectTransform:
   - {fileID: 46367775825458257}
   - {fileID: 46367775855576228}
   m_Father: {fileID: 46367777041217393}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -19266,7 +19280,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 46367777041217393}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -20232,6 +20246,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 8006203734806766901}
   - {fileID: 46367776645936368}
   - {fileID: 46367776498931538}
   m_Father: {fileID: 7917872797199088731}
@@ -29408,6 +29423,7 @@ GameObject:
   - component: {fileID: 5848144679064568270}
   - component: {fileID: 4209283622321050121}
   - component: {fileID: 913032233633673168}
+  - component: {fileID: 269717875}
   m_Layer: 5
   m_Name: WYLayer
   m_TagString: Untagged
@@ -29519,6 +29535,18 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!225 &269717875
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 665113465656576042}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &665348723711416754
 GameObject:
   m_ObjectHideFlags: 0
@@ -30818,6 +30846,7 @@ GameObject:
   - component: {fileID: 8459548935811813087}
   - component: {fileID: 5866632815881221250}
   - component: {fileID: 6722031497145886536}
+  - component: {fileID: 1586736161}
   m_Layer: 5
   m_Name: SWLayer
   m_TagString: Untagged
@@ -30929,6 +30958,18 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!225 &1586736161
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1162403531408649762}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &1163376762923348150
 GameObject:
   m_ObjectHideFlags: 0
@@ -32427,6 +32468,7 @@ GameObject:
   - component: {fileID: 5924681813344575259}
   - component: {fileID: 8862762895684952200}
   - component: {fileID: 1939554973594537145}
+  - component: {fileID: 1864982778}
   m_Layer: 5
   m_Name: PowerLayer
   m_TagString: Untagged
@@ -32538,6 +32580,18 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!225 &1864982778
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2302694908684433532}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &2313129672304249926
 GameObject:
   m_ObjectHideFlags: 0
@@ -35861,6 +35915,7 @@ GameObject:
   - component: {fileID: 2449784639014682826}
   - component: {fileID: 1852052819524731999}
   - component: {fileID: 6322202349786482727}
+  - component: {fileID: 1018546067}
   m_Layer: 5
   m_Name: WaterLayer
   m_TagString: Untagged
@@ -35972,6 +36027,18 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!225 &1018546067
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3930517887312012742}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &4051384506460317274
 GameObject:
   m_ObjectHideFlags: 0
@@ -36240,6 +36307,7 @@ GameObject:
   - component: {fileID: 5215286825542147594}
   - component: {fileID: 8578854937967957620}
   - component: {fileID: 5681608577501327801}
+  - component: {fileID: 1672735894}
   m_Layer: 5
   m_Name: BZLayer
   m_TagString: Untagged
@@ -36351,6 +36419,18 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!225 &1672735894
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4116352865219865830}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &4145433682714066422
 GameObject:
   m_ObjectHideFlags: 0
@@ -36439,6 +36519,7 @@ GameObject:
   - component: {fileID: 4511598113238727881}
   - component: {fileID: 6938387851831145590}
   - component: {fileID: 3157859933489661351}
+  - component: {fileID: 1156511437}
   m_Layer: 5
   m_Name: RainLayer
   m_TagString: Untagged
@@ -36550,6 +36631,18 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!225 &1156511437
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4180031985814359323}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &4459273800298014745
 GameObject:
   m_ObjectHideFlags: 0
@@ -37903,7 +37996,6 @@ GameObject:
   - component: {fileID: 5761950834214704942}
   - component: {fileID: 4277870150491494484}
   - component: {fileID: 6933789134383002677}
-  - component: {fileID: 6172293438460759735}
   m_Layer: 5
   m_Name: IconInfo
   m_TagString: Untagged
@@ -37981,50 +38073,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &6172293438460759735
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5049229497477318500}
-  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: 6933789134383002677}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &5069019289261369648
 GameObject:
   m_ObjectHideFlags: 0
@@ -38733,6 +38781,7 @@ GameObject:
   - component: {fileID: 1776408298865155593}
   - component: {fileID: 731453765658959}
   - component: {fileID: 8743584687644865351}
+  - component: {fileID: 1692918336}
   m_Layer: 5
   m_Name: ZHLayer
   m_TagString: Untagged
@@ -38844,6 +38893,18 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!225 &1692918336
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5842140631302979429}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &5885704604076645263
 GameObject:
   m_ObjectHideFlags: 0
@@ -39578,6 +39639,82 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
+--- !u!1 &6543209486245251758
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8006203734806766901}
+  - component: {fileID: 7477952568352307281}
+  - component: {fileID: 75916286289875436}
+  m_Layer: 5
+  m_Name: BG
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8006203734806766901
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6543209486245251758}
+  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: 46367777041217393}
+  m_RootOrder: 0
+  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!222 &7477952568352307281
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6543209486245251758}
+  m_CullTransparentMesh: 1
+--- !u!114 &75916286289875436
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6543209486245251758}
+  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: 2e07baada5bc940458d45b408039f686, type: 3}
+  m_Type: 1
+  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 &6560607364328954372
 GameObject:
   m_ObjectHideFlags: 0
@@ -40923,6 +41060,7 @@ GameObject:
   - component: {fileID: 1794390064007991725}
   - component: {fileID: 6861556515430001298}
   - component: {fileID: 6598702132132502726}
+  - component: {fileID: 1303109596}
   m_Layer: 5
   m_Name: VideoLayer
   m_TagString: Untagged
@@ -41034,6 +41172,18 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!225 &1303109596
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7639661316721100422}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &7721547239155319598
 GameObject:
   m_ObjectHideFlags: 0
@@ -41855,6 +42005,7 @@ GameObject:
   - component: {fileID: 1708943795475481903}
   - component: {fileID: 6199518666948196916}
   - component: {fileID: 4456591826763596238}
+  - component: {fileID: 486977108}
   m_Layer: 5
   m_Name: ZZLayer
   m_TagString: Untagged
@@ -41966,6 +42117,18 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!225 &486977108
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8067399137326339708}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &8208477151535551678
 GameObject:
   m_ObjectHideFlags: 0

File diff suppressed because it is too large
+ 8 - 343
Assets/Scene 1.unity


+ 21 - 0
Assets/Scripts/UI/UIView/XHGK/XHGKLayer.cs

@@ -88,6 +88,12 @@ public class XHGKLayer : YZTRootLayer
 
     public ImportBtn importThingPrefab;
 
+    public Button closeBtn;
+
+    public Button showInfoBtn;
+
+    public Sprite[] showSprites;
+
     public List<ImportBtn> importBtns;
 
     public Image leftImage;
@@ -290,6 +296,21 @@ public class XHGKLayer : YZTRootLayer
     }
 
     async Task InitDSJPanel(List<XHGKLayerData> xHGKLayerDatas) {
+
+        showInfoBtn.GetComponent<Image>().sprite = showSprites[1];
+
+        closeBtn.onClick.AddListener(() =>
+        {
+            showInfoBtn.GetComponent<Image>().sprite = showSprites[0];
+            middleContent.gameObject.SetActive(false);
+        });
+
+        showInfoBtn.onClick.AddListener(() =>
+        {
+            showInfoBtn.GetComponent<Image>().sprite = showSprites[1];
+            middleContent.gameObject.SetActive(true);
+        });
+
         scrollView.GetComponent<CanvasGroup>().alpha = 0;
         for (int i = importBtns.Count - 1; i >= 0; i--) {
             Destroy(importBtns[i].gameObject);

+ 0 - 17
Assets/Scripts/UI/UIView/YZT/OnePicNav.cs

@@ -102,23 +102,6 @@ public class OnePicNav : MonoBehaviour
             {
                 CameraManager.SwitchCamera(0);
             }
-        if (index == 1)
-        {
-            GameObject par = GameObject.FindGameObjectWithTag("Particle");
-            for (int i = 0; i < par.transform.childCount; i++)
-            {
-
-                par.transform.GetChild(i).gameObject.SetActive(true);
-            }
-        }
-        else
-        {
-            GameObject par = GameObject.FindGameObjectWithTag("Particle");
-            for (int i = 0; i < par.transform.childCount; i++)
-            {
-                par.transform.GetChild(i).gameObject.SetActive(false);
-            }
-        }
         layers[index].gameObject.SetActive(true);
     }
 

Some files were not shown because too many files changed in this diff