Void_F 8 місяців тому
батько
коміт
2b38f5ef6b

+ 9 - 1
Assets/LerpSlider.cs

@@ -1,7 +1,9 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.EventSystems;
+using UnityEngine.Serialization;
 using UnityEngine.UI;
 public class LerpSlider : UnityEngine.UI.Slider, IPointerDownHandler
 {
@@ -10,11 +12,15 @@ public class LerpSlider : UnityEngine.UI.Slider, IPointerDownHandler
     private float targetValue;
     private bool isLerping;
 
+    public bool UseLerping=true;
 
-
+    public Action OnPointDown;
+    
     protected override void Update()
     {
         base.Update();
+        if(!UseLerping)
+            return;
         if (isLerping)
         {
             // 平滑过渡到目标值
@@ -31,6 +37,7 @@ public class LerpSlider : UnityEngine.UI.Slider, IPointerDownHandler
 
     public void OnPointerDown(PointerEventData eventData)
     {
+        OnPointDown?.Invoke();
         // 计算点击位置的值
         RectTransformUtility.ScreenPointToLocalPointInRectangle(
             GetComponent<RectTransform>(), eventData.position, eventData.pressEventCamera, out var localPoint);
@@ -43,6 +50,7 @@ public class LerpSlider : UnityEngine.UI.Slider, IPointerDownHandler
         );
 
         targetValue = Mathf.Clamp01(normalizedValue); // 确保值在0到1之间
+        UseLerping = true;
         isLerping = true;
     }
 }

+ 0 - 1
Assets/Prefabs/UI/XHYZT/RKZY.prefab

@@ -9544,7 +9544,6 @@ MonoBehaviour:
   title2: {fileID: 3183822408748928213, guid: 5eeee34f5526f0d4691bd14a14529844, type: 3}
   plan2: {fileID: 8262524951720080470, guid: 4ccaf3d0c46bc4049b8daf067042c0db, type: 3}
   attenContent: {fileID: 9093061654308253766}
-  allServerMovePlans: []
   zYGKText:
   - {fileID: 9093061655138449395}
   - {fileID: 9093061654767134978}

+ 2 - 2
Assets/Prefabs/UI/XHYZT/XHGK.prefab

@@ -2315,7 +2315,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 6219495180201940521}
   m_Direction: 2
   m_Value: 0
-  m_Size: 1
+  m_Size: 0.7021509
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -2652,7 +2652,7 @@ 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: -150.00005}
+  m_AnchoredPosition: {x: 0.000015258789, y: -116.231125}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &6219495181246091879

+ 22 - 22
Assets/Prefabs/UI/XHYZT/YZT.prefab

@@ -18119,8 +18119,8 @@ RectTransform:
   m_Father: {fileID: 46367777035501093}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 2, y: 0}
   m_SizeDelta: {x: 359.3262, y: 0}
   m_Pivot: {x: 0, y: 1}
@@ -20521,9 +20521,9 @@ RectTransform:
   m_Father: {fileID: 46367777035501093}
   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: 2, y: -350}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 2, y: 0}
   m_SizeDelta: {x: 359.3262, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &46367776433284835
@@ -48143,7 +48143,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1564432449330385494, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_RootOrder
-      value: 18
+      value: 19
       objectReference: {fileID: 0}
     - target: {fileID: 2135825325739122964, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_Alignment
@@ -48203,15 +48203,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3352105003607594484, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_LocalScale.x
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3352105003607594484, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_LocalScale.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3352105003607594484, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_LocalScale.z
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4009633061977214278, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_Pivot.x
@@ -48267,7 +48267,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4498040699218706390, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_RootOrder
-      value: 19
+      value: 18
       objectReference: {fileID: 0}
     - target: {fileID: 4780098280845563496, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_RootOrder
@@ -48315,39 +48315,39 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5550335983870972351, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_LocalScale.x
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5550335983870972351, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_LocalScale.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5550335983870972351, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_LocalScale.z
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5975994242751112698, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_LocalScale.x
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5975994242751112698, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_LocalScale.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5975994242751112698, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_LocalScale.z
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5990173856125302576, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_LocalScale.x
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5990173856125302576, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_LocalScale.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5990173856125302576, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_LocalScale.z
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6854920185328929070, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_AnchorMax.x
@@ -48395,15 +48395,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7782033956750603786, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_LocalScale.x
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7782033956750603786, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_LocalScale.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7782033956750603786, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_LocalScale.z
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7838230741935479085, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_Pivot.x

+ 204 - 1
Assets/Prefabs/WaterRangeCtrl.prefab

@@ -202,6 +202,128 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u9000\u51FA\u6F14\u793A"
+--- !u!1 &5904502250662579036
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4512921409135192402}
+  - component: {fileID: 3163430812441680795}
+  - component: {fileID: 142763453991359310}
+  - component: {fileID: 9185011036831628009}
+  m_Layer: 5
+  m_Name: PlayButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4512921409135192402
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5904502250662579036}
+  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: 6104850283207459824}
+  m_Father: {fileID: 8253048677660793634}
+  m_RootOrder: 9
+  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: 446, y: 75}
+  m_SizeDelta: {x: 127.05591, y: 39.4166}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3163430812441680795
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5904502250662579036}
+  m_CullTransparentMesh: 1
+--- !u!114 &142763453991359310
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5904502250662579036}
+  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 &9185011036831628009
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5904502250662579036}
+  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: 142763453991359310}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &8253048676747258979
 GameObject:
   m_ObjectHideFlags: 0
@@ -501,7 +623,6 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
-  lerpDuration: 2
 --- !u!1 &8253048677225292345
 GameObject:
   m_ObjectHideFlags: 0
@@ -893,6 +1014,7 @@ RectTransform:
   - {fileID: 8253048678295640465}
   - {fileID: 8253048678753697408}
   - {fileID: 1814838842660102814}
+  - {fileID: 4512921409135192402}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -916,6 +1038,7 @@ MonoBehaviour:
   rangeSlider: {fileID: 0}
   ShuiweiButton_1: {fileID: 0}
   ShuiweiButton_2: {fileID: 0}
+  _playButton: {fileID: 0}
 --- !u!1 &8253048677781518245
 GameObject:
   m_ObjectHideFlags: 0
@@ -1502,3 +1625,83 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "65000m\xB3/s"
+--- !u!1 &8382221579433235898
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6104850283207459824}
+  - component: {fileID: 3507197554296526013}
+  - component: {fileID: 7970066183769246551}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6104850283207459824
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8382221579433235898}
+  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: 4512921409135192402}
+  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: 127.05591, y: 39.4166}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3507197554296526013
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8382221579433235898}
+  m_CullTransparentMesh: 1
+--- !u!114 &7970066183769246551
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8382221579433235898}
+  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: "\u6C34\u4F4D\u6F14\u793A"

Різницю між файлами не показано, бо вона завелика
+ 98 - 1
Assets/Scene 1.unity


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

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using DG.Tweening;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -18,6 +19,7 @@ public class FHSSLayer : YZTRootLayer
 
 
     public RectTransform[] hotPoints;
+    
     private void Awake()
     {
         yuJingZongShuText = this.transform.Find("ShuiWeiZhuangKuang/ShuiWeiYuJing/countText").GetComponent<Text>();
@@ -26,7 +28,7 @@ public class FHSSLayer : YZTRootLayer
         chaoLiShiShuiWeiText = this.transform.Find("ShuiWeiZhuangKuang/ChaoLiShiShuiWei/countText").GetComponent<Text>();
         chaoXunXianShuiWeiText = this.transform.Find("ShuiWeiZhuangKuang/ChaoXunXianShuiWei/countText").GetComponent<Text>();
         zhengChangShuiWeiText = this.transform.Find("ShuiWeiZhuangKuang/ZhengChangShuiWei/countText").GetComponent<Text>();
-
+        
         if (shuiWeiZhuangKuangData != null)
         {
             yuJingZongShuText.text = $"{shuiWeiZhuangKuangData.yuJingZongShu}个";

+ 31 - 3
Assets/WaterRangeCtrl_UI.cs

@@ -1,25 +1,33 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using DG.Tweening;
 using UnityEngine;
 using UnityEngine.UI;
 
 public class WaterRangeCtrl_UI : MonoBehaviour
 {
-    public Slider rangeSlider;
+    public LerpSlider rangeSlider;
     public Button ShuiweiButton_1;
     public Button ShuiweiButton_2;
     private CanvasGroup button_CG1;
     private CanvasGroup button_CG2;
+
+    public Button _playButton;
+    private Tween playT;
     private void Awake()
     {
-        rangeSlider = this.transform.Find("WaterRangeSilder").GetComponent<Slider>();
+        rangeSlider = this.transform.Find("WaterRangeSilder").GetComponent<LerpSlider>();
         ShuiweiButton_1 = this.transform.Find("Shuiwei_1_Button").GetComponent<Button>();
         button_CG1 = ShuiweiButton_1.GetComponent<CanvasGroup>();
         ShuiweiButton_2 = this.transform.Find("Shuiwei_2_Button").GetComponent<Button>();
         button_CG2 = ShuiweiButton_2.GetComponent<CanvasGroup>();
 
-        rangeSlider.onValueChanged.AddListener((sliderValue)=>WaterRangeCtrlTool._Instance.SetRangeValue(sliderValue));
+        rangeSlider.OnPointDown += CanCelTween;
+        rangeSlider.onValueChanged.AddListener((sliderValue)=>
+        {
+            WaterRangeCtrlTool._Instance.SetRangeValue(sliderValue);
+        });
         ShuiweiButton_1.onClick.AddListener(()=>
         {
             WaterRangeCtrlTool._Instance.ChangeWaterCurve(0);
@@ -36,6 +44,26 @@ public class WaterRangeCtrl_UI : MonoBehaviour
             rangeSlider.value = 0;
             WaterRangeCtrlTool._Instance.ShowFx(true);
         });
+        
+        
+        _playButton = this.transform.Find("PlayButton").GetComponent<Button>();
+        _playButton.onClick.AddListener(PlayRangeSlider);
+    }
+
+    private void PlayRangeSlider()
+    {
+        rangeSlider.UseLerping = false;
+        rangeSlider.value = 0;
+        playT = rangeSlider.DOValue(1.0f, 4.0f);
+    }
+
+    public void CanCelTween()
+    {
+        if (playT != null)
+        {
+            playT.Kill();
+            playT = null;
+        }
     }
 
     private void OnEnable()

Деякі файли не було показано, через те що забагато файлів було змінено