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

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: []

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: []

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}

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}

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));
         }
     }
 }

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;
             }
         }
     }