Răsfoiți Sursa

水位蔓延时间轴调整

Void_F 7 luni în urmă
părinte
comite
cf8b47468a

+ 53 - 34
Assets/Art/Prefab/Effect/JinHongFenQu.prefab

@@ -15,7 +15,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &4961563033811451659
 Transform:
   m_ObjectHideFlags: 0
@@ -59,7 +59,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5959140516932723847}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -2484.035, y: -9771.695, z: 39.5}
+  m_LocalPosition: {x: -2484.035, y: -9771.695, z: 40}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -82,7 +82,7 @@ MeshRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5959140516932723847}
   m_Enabled: 1
-  m_CastShadows: 1
+  m_CastShadows: 0
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
   m_StaticShadowCaster: 0
@@ -185,6 +185,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   FxObjects: []
   waterRangeMat: {fileID: 0}
+  hemian: {fileID: 0}
   waterCurveSZ:
     serializedVersion: 2
     m_Curve:
@@ -328,36 +329,45 @@ MonoBehaviour:
     m_Curve:
     - serializedVersion: 3
       time: 0
-      value: 0.9
-      inSlope: -1.3839998
-      outSlope: -1.3839998
-      tangentMode: 34
+      value: 0.9017275
+      inSlope: -0.008637607
+      outSlope: -0.008637607
+      tangentMode: 65
       weightedMode: 0
       inWeight: 0
       outWeight: 0.33333334
     - serializedVersion: 3
-      time: 0.25
+      time: 0.2
+      value: 0.9
+      inSlope: -0.008637607
+      outSlope: -1.7299998
+      tangentMode: 69
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.4
       value: 0.554
-      inSlope: -1.3839998
-      outSlope: -1.74
+      inSlope: -1.7299998
+      outSlope: -2.1749997
       tangentMode: 69
       weightedMode: 0
       inWeight: 0.33333334
       outWeight: 0.33333334
     - serializedVersion: 3
-      time: 0.5
+      time: 0.6
       value: 0.119
-      inSlope: -1.74
-      outSlope: -0.044
+      inSlope: -2.1749997
+      outSlope: -0.055000003
       tangentMode: 69
       weightedMode: 0
       inWeight: 0.33333334
       outWeight: 0.33333334
     - serializedVersion: 3
-      time: 0.75
+      time: 0.8
       value: 0.108
-      inSlope: -0.044
-      outSlope: -0.432
+      inSlope: -0.055000003
+      outSlope: -0.54
       tangentMode: 69
       weightedMode: 0
       inWeight: 0.33333334
@@ -365,8 +375,8 @@ MonoBehaviour:
     - serializedVersion: 3
       time: 1
       value: 0
-      inSlope: -0.432
-      outSlope: -0.432
+      inSlope: -0.54
+      outSlope: -0.54
       tangentMode: 34
       weightedMode: 0
       inWeight: 0.33333334
@@ -379,36 +389,45 @@ MonoBehaviour:
     m_Curve:
     - serializedVersion: 3
       time: 0
-      value: 0.9
-      inSlope: -1.3839998
-      outSlope: -1.3839998
-      tangentMode: 34
+      value: 1
+      inSlope: -0.5000001
+      outSlope: -0.5000001
+      tangentMode: 65
       weightedMode: 0
       inWeight: 0
       outWeight: 0.33333334
     - serializedVersion: 3
-      time: 0.25
+      time: 0.2
+      value: 0.9
+      inSlope: -0.5000001
+      outSlope: -1.7299998
+      tangentMode: 69
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.4
       value: 0.554
-      inSlope: -1.3839998
-      outSlope: -1.756
+      inSlope: -1.7299998
+      outSlope: -2.195
       tangentMode: 69
       weightedMode: 0
       inWeight: 0.33333334
       outWeight: 0.33333334
     - serializedVersion: 3
-      time: 0.5
+      time: 0.6
       value: 0.115
-      inSlope: -1.756
-      outSlope: -0.26
+      inSlope: -2.195
+      outSlope: -0.32500002
       tangentMode: 69
       weightedMode: 0
       inWeight: 0.33333334
       outWeight: 0.33333334
     - serializedVersion: 3
-      time: 0.75
+      time: 0.8
       value: 0.05
-      inSlope: -0.26
-      outSlope: -0.2
+      inSlope: -0.32500002
+      outSlope: -0.25000003
       tangentMode: 69
       weightedMode: 0
       inWeight: 0.33333334
@@ -416,8 +435,8 @@ MonoBehaviour:
     - serializedVersion: 3
       time: 1
       value: 0
-      inSlope: -0.2
-      outSlope: -0.2
+      inSlope: -0.25000003
+      outSlope: -0.25000003
       tangentMode: 34
       weightedMode: 0
       inWeight: 0.33333334
@@ -475,7 +494,7 @@ MeshRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6141318737994756229}
   m_Enabled: 1
-  m_CastShadows: 1
+  m_CastShadows: 0
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
   m_StaticShadowCaster: 0

BIN
Assets/Art/UI/BigScreen/img_tl_bg.png


+ 106 - 24
Assets/Prefabs/WaterRangeCtrl.prefab

@@ -33,7 +33,7 @@ RectTransform:
   m_Children:
   - {fileID: 6068581200950435814}
   m_Father: {fileID: 8253048677660793634}
-  m_RootOrder: 8
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -235,11 +235,11 @@ RectTransform:
   m_Children:
   - {fileID: 6104850283207459824}
   m_Father: {fileID: 8253048677660793634}
-  m_RootOrder: 9
+  m_RootOrder: 10
   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_AnchoredPosition: {x: 500, y: 75}
   m_SizeDelta: {x: 127.05591, y: 39.4166}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3163430812441680795
@@ -324,6 +324,86 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &6094965095045655076
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5042758756591645234}
+  - component: {fileID: 8042703849527079831}
+  - component: {fileID: 2201653687296576156}
+  m_Layer: 5
+  m_Name: Text (Legacy) (5)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5042758756591645234
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6094965095045655076}
+  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: 8253048677660793634}
+  m_RootOrder: 6
+  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: 376, y: -480}
+  m_SizeDelta: {x: 50, y: 17}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8042703849527079831
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6094965095045655076}
+  m_CullTransparentMesh: 1
+--- !u!114 &2201653687296576156
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6094965095045655076}
+  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: 0.64705884, g: 0.7490196, b: 0.8862745, 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: 12
+    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: "\uFF1E48h"
 --- !u!1 &8253048676747258979
 GameObject:
   m_ObjectHideFlags: 0
@@ -438,8 +518,8 @@ RectTransform:
   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: 1}
-  m_SizeDelta: {x: -10, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -10, y: 2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &8253048676951609228
 GameObject:
@@ -477,7 +557,7 @@ RectTransform:
   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: 612, y: 12}
+  m_SizeDelta: {x: 762, y: 12}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8253048676951609227
 CanvasRenderer:
@@ -556,7 +636,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 960, y: -995}
-  m_SizeDelta: {x: 612, y: 12}
+  m_SizeDelta: {x: 762, y: 12}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8253048676979172417
 MonoBehaviour:
@@ -619,10 +699,11 @@ MonoBehaviour:
   m_MinValue: 0
   m_MaxValue: 1
   m_WholeNumbers: 0
-  m_Value: 0
+  m_Value: 1
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+  UseLerping: 1
 --- !u!1 &8253048677225292345
 GameObject:
   m_ObjectHideFlags: 0
@@ -695,8 +776,8 @@ 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: 300, y: -480}
-  m_SizeDelta: {x: 40, y: 17}
+  m_AnchoredPosition: {x: 224, y: -480}
+  m_SizeDelta: {x: 50, y: 17}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8253048677293673163
 CanvasRenderer:
@@ -739,7 +820,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\uFF1E48h"
+  m_Text: "24\uFF1E48h"
 --- !u!1 &8253048677296599434
 GameObject:
   m_ObjectHideFlags: 0
@@ -851,7 +932,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: -150, y: -480}
+  m_AnchoredPosition: {x: -224, y: -480}
   m_SizeDelta: {x: 36, y: 17}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8253048677328866668
@@ -895,7 +976,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 3~6h
+  m_Text: 0~3h
 --- !u!1 &8253048677462732639
 GameObject:
   m_ObjectHideFlags: 0
@@ -931,7 +1012,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -480}
+  m_AnchoredPosition: {x: -75, y: -480}
   m_SizeDelta: {x: 40, y: 17}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8253048677462732634
@@ -975,7 +1056,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 6~24h
+  m_Text: 3~6h
 --- !u!1 &8253048677660793637
 GameObject:
   m_ObjectHideFlags: 0
@@ -1011,6 +1092,7 @@ RectTransform:
   - {fileID: 8253048677462732636}
   - {fileID: 8253048678500869937}
   - {fileID: 8253048677293673165}
+  - {fileID: 5042758756591645234}
   - {fileID: 8253048678295640465}
   - {fileID: 8253048678753697408}
   - {fileID: 1814838842660102814}
@@ -1074,8 +1156,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: -1}
-  m_SizeDelta: {x: 288, y: 2}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 288, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8253048677781518240
 CanvasRenderer:
@@ -1150,7 +1232,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: -300, y: -480}
+  m_AnchoredPosition: {x: -376, y: -480}
   m_SizeDelta: {x: 26, y: 17}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8253048678015048285
@@ -1194,7 +1276,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\uFF1C3h"
+  m_Text: 0h
 --- !u!1 &8253048678295640464
 GameObject:
   m_ObjectHideFlags: 0
@@ -1229,7 +1311,7 @@ RectTransform:
   m_Children:
   - {fileID: 8253048678823976856}
   m_Father: {fileID: 8253048677660793634}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1365,8 +1447,8 @@ 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: 150, y: -480}
-  m_SizeDelta: {x: 40, y: 17}
+  m_AnchoredPosition: {x: 75, y: -480}
+  m_SizeDelta: {x: 50, y: 17}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8253048678500869935
 CanvasRenderer:
@@ -1409,7 +1491,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 24~48h
+  m_Text: 6~24h
 --- !u!1 &8253048678753697411
 GameObject:
   m_ObjectHideFlags: 0
@@ -1444,7 +1526,7 @@ RectTransform:
   m_Children:
   - {fileID: 8253048676747258976}
   m_Father: {fileID: 8253048677660793634}
-  m_RootOrder: 7
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}

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


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