diff --git a/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat b/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat index ed6dd43..12c7b16 100644 --- a/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat +++ b/Assets/MyPostProcess/Effects/Wave/Attack_Wave/AWM0.mat @@ -44,6 +44,6 @@ Material: - WaveIntensity_2: 1 - WaveSpread_Value: 0 m_Colors: - - Center: {r: 0.20614505, g: 0.31337723, b: 0, a: 0} + - Center: {r: 0.29671168, g: 0.39065522, b: 0, a: 0} - Vector2_d2d098295fc146f08b921b231b2e5199: {r: 1.6, g: 0.9, b: 0, a: 0} m_BuildTextureStacks: [] diff --git a/Assets/Scenes/第一关.unity b/Assets/Scenes/第一关.unity index 2a0ff8d..cd441c8 100644 --- a/Assets/Scenes/第一关.unity +++ b/Assets/Scenes/第一关.unity @@ -136,7 +136,7 @@ GameObject: - component: {fileID: 2036946} m_Layer: 0 m_Name: Main Camera (1) - m_TagString: MainCamera + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -264,7 +264,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.13324745, y: 0.172} m_AnchorMax: {x: 0.565, y: 0.41035822} - m_AnchoredPosition: {x: 0.80000305, y: -1.9000092} + m_AnchoredPosition: {x: 0.7999878, y: -1.8999939} m_SizeDelta: {x: -8, y: -12} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &14316730 @@ -5884,7 +5884,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8233114533063075529, guid: 82d871be611f9d14fbe8c166075c1a37, type: 3} propertyPath: m_AnchoredPosition.y - value: -3.9001007 + value: -3.9001465 objectReference: {fileID: 0} - target: {fileID: 8233114533063075529, guid: 82d871be611f9d14fbe8c166075c1a37, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5900,7 +5900,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8233114533355190934, guid: 82d871be611f9d14fbe8c166075c1a37, type: 3} propertyPath: m_AnchoredPosition.y - value: -3.9999466 + value: -3.9999542 objectReference: {fileID: 0} - target: {fileID: 8233114533355190935, guid: 82d871be611f9d14fbe8c166075c1a37, type: 3} propertyPath: m_Sprite @@ -5912,7 +5912,7 @@ PrefabInstance: objectReference: {fileID: 21300000, guid: 37b11312617daf740bb62cd2115d4705, type: 3} - target: {fileID: 8233114534707674507, guid: 82d871be611f9d14fbe8c166075c1a37, type: 3} propertyPath: m_AnchoredPosition.y - value: -3.9999466 + value: -3.9999542 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 82d871be611f9d14fbe8c166075c1a37, type: 3} @@ -5955,7 +5955,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.13324745, y: 0.41035822} m_AnchorMax: {x: 0.5877423, y: 0.60871625} - m_AnchoredPosition: {x: -1.1608276, y: 2.89999} + m_AnchoredPosition: {x: -1.1608276, y: 2.899994} m_SizeDelta: {x: -12, y: -4} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &93894042 @@ -7237,7 +7237,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.579304, y: 0.2014793} m_AnchorMax: {x: 0.7063023, y: 0.29224858} - m_AnchoredPosition: {x: -0.8999939, y: 0.1000061} + m_AnchoredPosition: {x: -0.8999939, y: 0.10003662} m_SizeDelta: {x: 0.9000015, y: 0.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &339161309 @@ -17542,7 +17542,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.58686066, y: 0.3504793} m_AnchorMax: {x: 0.666, y: 0.42672947} - m_AnchoredPosition: {x: -0.2999878, y: 0.30000305} + m_AnchoredPosition: {x: -0.2999878, y: 0.2999878} m_SizeDelta: {x: -0.099998474, y: -0.10000038} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &434645702 @@ -18226,10 +18226,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} + m_ReferenceResolution: {x: 1920, y: 1080} m_ScreenMatchMode: 0 m_MatchWidthOrHeight: 0 m_PhysicalUnit: 3 @@ -18702,7 +18702,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.028, y: 0.8655201} m_AnchorMax: {x: 0.2527861, y: 0.95120806} - m_AnchoredPosition: {x: 1.0006104, y: -0.1533966} + m_AnchoredPosition: {x: 1.0006104, y: -0.15338135} m_SizeDelta: {x: -6.6341, y: -3.6931992} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &635089480 @@ -19163,7 +19163,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.030000001, y: 0.076000005} m_AnchorMax: {x: 0.47876447, y: 0.44016734} - m_AnchoredPosition: {x: 0.2000122, y: -0.7000122} + m_AnchoredPosition: {x: 0.19995117, y: -0.7000122} m_SizeDelta: {x: -5.972471, y: -8.314741} m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &677818674 @@ -19780,7 +19780,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.030000001, y: 0.076000005} m_AnchorMax: {x: 0.47876447, y: 0.44016734} - m_AnchoredPosition: {x: 0.2000122, y: -0.7000122} + m_AnchoredPosition: {x: 0.19995117, y: -0.7000122} m_SizeDelta: {x: -5.972471, y: -8.314741} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &715828850 @@ -20488,7 +20488,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.579304, y: 0.1564793} m_AnchorMax: {x: 0.6987456, y: 0.29224858} - m_AnchoredPosition: {x: -0.19999695, y: -0.099975586} + m_AnchoredPosition: {x: -0.2000122, y: -0.099975586} m_SizeDelta: {x: -0.70000076, y: -0.34000015} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &737854902 @@ -23652,7 +23652,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1142437218} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -28.99847, y: -3.2993822, z: -10} + m_LocalPosition: {x: -29.008896, y: -3.2993822, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1608038909} @@ -24869,7 +24869,7 @@ 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.000061035156, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1265914333 @@ -25272,7 +25272,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.579304, y: 0.089} m_AnchorMax: {x: 0.7088212, y: 0.18352072} - m_AnchoredPosition: {x: -0.30000305, y: -0.4000244} + m_AnchoredPosition: {x: -0.2999878, y: -0.4000244} m_SizeDelta: {x: 0.9000015, y: -0.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1367957205 @@ -32572,7 +32572,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.579304, y: 0.31} m_AnchorMax: {x: 0.7088212, y: 0.39985374} - m_AnchoredPosition: {x: -0.30000305, y: 0.19999695} + m_AnchoredPosition: {x: -0.2999878, y: 0.2000122} m_SizeDelta: {x: 0.9000015, y: 0.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1652353655 @@ -43995,7 +43995,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.523, y: 0.059222218} m_AnchorMax: {x: 0.9732738, y: 0.46247932} - m_AnchoredPosition: {x: 1.0999756, y: -0.39987183} + m_AnchoredPosition: {x: 1.0999756, y: -0.3998413} m_SizeDelta: {x: -5.90609, y: -2.1826124} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1922630721 @@ -45116,7 +45116,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.13324745, y: 0.6407686} m_AnchorMax: {x: 0.45847487, y: 0.8197163} - m_AnchoredPosition: {x: -0.103134155, y: -0.73651123} + m_AnchoredPosition: {x: -0.103149414, y: -0.73651123} m_SizeDelta: {x: -6.6049995, y: -6.7173996} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2054268820 diff --git a/Assets/Scripts/事件/VeteranSacrifice.cs b/Assets/Scripts/事件/VeteranSacrifice.cs index 6067fa2..e669d30 100644 --- a/Assets/Scripts/事件/VeteranSacrifice.cs +++ b/Assets/Scripts/事件/VeteranSacrifice.cs @@ -48,7 +48,7 @@ public class VeteranSacrifice : Event } public IEnumerator SelfOnCall() { - parallax.canParallax = false; + //parallax.canParallax = false; deadAudio.Play(); //1.关闭玩家操作地图 FindObjectOfType().SwitchCurrentActionMap("NullMap");