diff --git a/Assets/MyGame/Scripts/Turret/FlyTurretData.cs b/Assets/MyGame/Scripts/Turret/FlyTurretData.cs index bf9ff4b31..1dd55c6e1 100644 --- a/Assets/MyGame/Scripts/Turret/FlyTurretData.cs +++ b/Assets/MyGame/Scripts/Turret/FlyTurretData.cs @@ -2,17 +2,25 @@ using System; using UnityEngine; /// -/// 起飞炮台(TurretData 子类): -/// 平时是一门正常炮台(照常手动瞄准开火/自动开火/锁定瞄准); -/// 额外支持起飞模式:轻点空白处 → 炮台飞到该点(点到哪飞到哪)→ 到达后持续向上发射子弹, -/// upFireDuration 到时自动降落回原位恢复正常开火;起飞时播放特殊 spine 动画 -/// (takeoffAnim 播一次,flyLoopAnim 循环衔接)。 +/// 起飞炮台(TurretData 子类):炮台模式 / 起飞模式 两态分离。 +/// 【炮台模式(IsFlying=false,默认形态)】就是一门正常炮台:手动瞄准开火/自动开火/锁定瞄准照常, +/// 与普通 TurretData 行为完全一致(轻点屏幕只走正常开火流程,不会起飞)。 +/// 【起飞模式(IsFlying=true)】点"起飞按钮"进入(按钮逻辑待完善;默认 allowTapTakeoff=false +/// 时轻点屏幕不触发起飞):炮台飞到目标点 → 到达后持续向上发射子弹,upFireDuration +/// 到时自动降落回原炮台位;起飞时播放特殊 spine 动画(takeoffAnim 播一次,flyLoopAnim 循环衔接); +/// 期间炮口固定朝上、状态切换/开火/按住输入均被拦截(见 ChangeState/各开火入口)。 +/// 起飞入口:TakeoffToScreenPos(当前轻点路径,受 allowTapTakeoff 控制); +/// 将来"起飞按钮"接入后走同一入口即可(或在面板上打开 allowTapTakeoff 恢复轻点起飞)。 /// 交互判定在 GameMainPanel_FishBase.HandleInput(轻点=按下短+几乎没移动;按住扫射不触发起飞)。 -/// 挂在 XJMH 座位炮台(xjmhTurretList 中的子对象)上即可,无需改预制体结构。 +/// 挂载:XJMH 座位炮台(xjmhTurretList 中的子对象),飞机预制体挂在炮台节点下面(PW_Plane_x,默认隐藏)。 /// 注意:不要在本类定义 Awake/OnEnable,会隐藏基类的同名私有初始化逻辑。 /// public class FlyTurretData : TurretData { + [Header("起飞入口")] + [Tooltip("允许轻点屏幕起飞(默认关=false:没点起飞按钮就不起飞)。\n将来\"起飞按钮\"逻辑接入后走专门入口,不受本开关限制")] + public bool allowTapTakeoff = false; + [Header("起飞(点哪飞哪)")] [Tooltip("起飞特殊 spine 动画名(起飞时播一次;为空则直接播飞行循环动画)")] public string takeoffAnim; @@ -85,11 +93,17 @@ public class FlyTurretData : TurretData /// /// 起飞/移动到目标屏幕点(点到哪飞到哪)。 - /// 首次调用=起飞;飞行中再次调用=改目标点;降落中调用=取消降落改飞新目标。 - /// 返回 false 表示未起飞(节点不是 UGUI 或画布引用缺失)。 + /// 首次调用=进入起飞模式;飞行中再次调用=改目标点;降落中调用=取消降落改飞新目标。 + /// ⭐ 轻点起飞总开关:未进入起飞模式时受 allowTapTakeoff 控制——默认 false, + /// 即"没点起飞按钮就不起飞"(轻点松开只会走正常 Idle/开火流程);飞行中改目标不受此限制。 + /// 返回 false 表示未起飞(开关未开 / 节点不是 UGUI / 画布引用缺失)。 /// public bool TakeoffToScreenPos(Vector2 screenPos) { + // ⭐ 默认不响应轻点起飞("起飞先不做",起飞按钮逻辑待完善):进入起飞模式前先过开关。 + // 已在飞行=起飞模式内部行为(改目标点),不受开关限制 + if (!IsFlying && !allowTapTakeoff) return false; + EnsureRefs(); if (_rect == null || _parentRect == null || _canvasRect == null) return false; diff --git a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab index fa92808a4..fe201bdc4 100644 --- a/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab +++ b/Assets/MyGame/aa/UI/Game/XJMH/GameMainPanelXJMH.prefab @@ -110,6 +110,7 @@ RectTransform: - {fileID: 1483129334820609872} - {fileID: 8888044228984105172} - {fileID: 8544176105351417358} + - {fileID: 9104377632393096111} m_Father: {fileID: 3277345602720993286} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -227,6 +228,14 @@ MonoBehaviour: enterHoldTime: 0.3 enterBackRiseTime: 0.5 enterBackHoldTime: 1 + takeoffAnim: + flyLoopAnim: + flyDuration: 0.6 + flySmooth: 1 + edgePadding: 60 + upFireInterval: 0.4 + upFireDuration: 0 + upFireDelay: 0 --- !u!1 &253341679092850940 GameObject: m_ObjectHideFlags: 0 @@ -3195,6 +3204,7 @@ RectTransform: - {fileID: 2585933579711493789} - {fileID: 7286931408868715974} - {fileID: 7224306260467258853} + - {fileID: 9099133134549514083} m_Father: {fileID: 8019622945320605939} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -3312,6 +3322,14 @@ MonoBehaviour: enterHoldTime: 0.3 enterBackRiseTime: 0.5 enterBackHoldTime: 1 + takeoffAnim: + flyLoopAnim: + flyDuration: 0.6 + flySmooth: 1 + edgePadding: 60 + upFireInterval: 0.4 + upFireDuration: 0 + upFireDelay: 0 --- !u!1 &2242422221712062153 GameObject: m_ObjectHideFlags: 0 @@ -5219,6 +5237,7 @@ RectTransform: - {fileID: 5950502439358931235} - {fileID: 3258375768815483037} - {fileID: 7141428490297003823} + - {fileID: 9104377632393096108} m_Father: {fileID: 8019622945320605939} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -5336,6 +5355,14 @@ MonoBehaviour: enterHoldTime: 0.3 enterBackRiseTime: 0.5 enterBackHoldTime: 1 + takeoffAnim: + flyLoopAnim: + flyDuration: 0.6 + flySmooth: 1 + edgePadding: 60 + upFireInterval: 0.4 + upFireDuration: 0 + upFireDelay: 0 --- !u!1 &3711488664002568915 GameObject: m_ObjectHideFlags: 0 @@ -5506,6 +5533,7 @@ RectTransform: - {fileID: 1302767484332382325} - {fileID: 5851200782724068970} - {fileID: 2658537813087443838} + - {fileID: 9099340353664519262} m_Father: {fileID: 8019622945320605939} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -5623,6 +5651,14 @@ MonoBehaviour: enterHoldTime: 0.3 enterBackRiseTime: 0.5 enterBackHoldTime: 1 + takeoffAnim: + flyLoopAnim: + flyDuration: 0.6 + flySmooth: 1 + edgePadding: 60 + upFireInterval: 0.4 + upFireDuration: 0 + upFireDelay: 0 --- !u!1 &3886340901439864889 GameObject: m_ObjectHideFlags: 0 @@ -7200,6 +7236,7 @@ RectTransform: - {fileID: 7264436600080207069} - {fileID: 427313923256951245} - {fileID: 1060857570771423379} + - {fileID: 9099285438435746538} m_Father: {fileID: 8019622945320605939} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -7317,6 +7354,14 @@ MonoBehaviour: enterHoldTime: 0.3 enterBackRiseTime: 0.5 enterBackHoldTime: 1 + takeoffAnim: + flyLoopAnim: + flyDuration: 0.6 + flySmooth: 1 + edgePadding: 60 + upFireInterval: 0.4 + upFireDuration: 0 + upFireDelay: 0 --- !u!1 &4508178292270846436 GameObject: m_ObjectHideFlags: 0 @@ -8254,6 +8299,7 @@ RectTransform: - {fileID: 4860695395499455952} - {fileID: 2863370905449016388} - {fileID: 1869585545127341248} + - {fileID: 9099285438435746541} m_Father: {fileID: 3277345602720993286} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -8371,6 +8417,14 @@ MonoBehaviour: enterHoldTime: 0.3 enterBackRiseTime: 0.5 enterBackHoldTime: 1 + takeoffAnim: + flyLoopAnim: + flyDuration: 0.6 + flySmooth: 1 + edgePadding: 60 + upFireInterval: 0.4 + upFireDuration: 0 + upFireDelay: 0 --- !u!1 &5134684228922341683 GameObject: m_ObjectHideFlags: 0 @@ -9165,6 +9219,7 @@ RectTransform: - {fileID: 5331806061087152293} - {fileID: 9139518176597319663} - {fileID: 7621566521641746198} + - {fileID: 9099340353664519249} m_Father: {fileID: 3277345602720993286} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -9282,6 +9337,14 @@ MonoBehaviour: enterHoldTime: 0.3 enterBackRiseTime: 0.5 enterBackHoldTime: 1 + takeoffAnim: + flyLoopAnim: + flyDuration: 0.6 + flySmooth: 1 + edgePadding: 60 + upFireInterval: 0.4 + upFireDuration: 0 + upFireDelay: 0 --- !u!1 &5753672904061524006 GameObject: m_ObjectHideFlags: 0 @@ -12001,6 +12064,7 @@ RectTransform: - {fileID: 7054586600097795909} - {fileID: 3995459900669261184} - {fileID: 7554007501053883213} + - {fileID: 9099133134549514080} m_Father: {fileID: 3277345602720993286} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -12118,6 +12182,14 @@ MonoBehaviour: enterHoldTime: 0.3 enterBackRiseTime: 0.5 enterBackHoldTime: 1 + takeoffAnim: + flyLoopAnim: + flyDuration: 0.6 + flySmooth: 1 + edgePadding: 60 + upFireInterval: 0.4 + upFireDuration: 0 + upFireDelay: 0 --- !u!1 &7266668546312689239 GameObject: m_ObjectHideFlags: 0 @@ -17328,6 +17400,14 @@ MonoBehaviour: enterHoldTime: 0.3 enterBackRiseTime: 0.5 enterBackHoldTime: 1 + takeoffAnim: + flyLoopAnim: + flyDuration: 0.6 + flySmooth: 1 + edgePadding: 60 + upFireInterval: 0.4 + upFireDuration: 0 + upFireDelay: 0 --- !u!224 &1389440235311396706 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 224302894081038485, guid: d2f8fbd9109e67448b98f8bc0f5c2e7c, @@ -17662,7 +17742,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1502787830614766, guid: 45613d68bc30eb1428a454bb23ecf900, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1515817542015711, guid: 45613d68bc30eb1428a454bb23ecf900, type: 3} propertyPath: m_IsActive @@ -17863,6 +17943,526 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 1.8 objectReference: {fileID: 0} + - target: {fileID: 1570664476173777734, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1570664476173777734, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1570664476173777734, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7509757493367504664, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7509757493367504664, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7509777503073282109, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7509777503073282109, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7509803421072165956, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7509803421072165956, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7509848168608529883, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7509848168608529883, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7509858961402859323, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7509858961402859323, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7509864952267359930, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7509864952267359930, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7509888384674896940, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7509888384674896940, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7509924365022916671, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7509924365022916671, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7509926891110877408, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7509926891110877408, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7509947587908439898, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7509947587908439898, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7509985220623115944, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7509985220623115944, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7510020624054656615, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7510020624054656615, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7510022324553468697, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7510022324553468697, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7510061637214128693, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7510061637214128693, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511265828510859101, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511265828510859101, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511269922509986637, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511269922509986637, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511305075771499840, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511305075771499840, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511326066021314292, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511326066021314292, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511366319885889381, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511366319885889381, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511368239789909774, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511368239789909774, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511375704301330801, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511375704301330801, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511383790798155434, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511383790798155434, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511393016104744706, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511393016104744706, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511415896586505684, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511415896586505684, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511441440564603310, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511441440564603310, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511498581715784647, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511498581715784647, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511513684519773045, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511513684519773045, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511552591624067531, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511552591624067531, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511558864731102804, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511558864731102804, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511581429835002250, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511581429835002250, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511587471065007569, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511587471065007569, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511588333106436684, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511588333106436684, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511607530887714219, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511607530887714219, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511653721488774601, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511653721488774601, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511658051367283828, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511658051367283828, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511671084709109777, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511671084709109777, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511675931241817619, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511675931241817619, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511707526239430747, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511707526239430747, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511722337886604182, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511722337886604182, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511741383556688057, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511741383556688057, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511742304373345573, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511742304373345573, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511776729324054267, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511776729324054267, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511897764198541246, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511897764198541246, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511948536095093816, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511948536095093816, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511955958964644754, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511955958964644754, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511961915805182615, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511961915805182615, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511965665142120443, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511965665142120443, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511976084308073850, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511976084308073850, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511980689731994407, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511980689731994407, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7511982884030537741, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7511982884030537741, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7710087130507345309, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -17940,6 +18540,14 @@ MonoBehaviour: enterHoldTime: 0.3 enterBackRiseTime: 0.5 enterBackHoldTime: 1 + takeoffAnim: + flyLoopAnim: + flyDuration: 0.6 + flySmooth: 1 + edgePadding: 60 + upFireInterval: 0.4 + upFireDuration: 0 + upFireDelay: 0 --- !u!1 &2021156807635991242 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1623584695762664, guid: 45613d68bc30eb1428a454bb23ecf900, @@ -18779,6 +19387,14 @@ MonoBehaviour: enterHoldTime: 0.3 enterBackRiseTime: 0.5 enterBackHoldTime: 1 + takeoffAnim: + flyLoopAnim: + flyDuration: 0.6 + flySmooth: 1 + edgePadding: 60 + upFireInterval: 0.4 + upFireDuration: 0 + upFireDelay: 0 --- !u!224 &3062865518337237255 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 224302894081038485, guid: d2f8fbd9109e67448b98f8bc0f5c2e7c, @@ -19569,6 +20185,14 @@ MonoBehaviour: enterHoldTime: 0.3 enterBackRiseTime: 0.5 enterBackHoldTime: 1 + takeoffAnim: + flyLoopAnim: + flyDuration: 0.6 + flySmooth: 1 + edgePadding: 60 + upFireInterval: 0.4 + upFireDuration: 0 + upFireDelay: 0 --- !u!1001 &4910852602575628657 PrefabInstance: m_ObjectHideFlags: 0 @@ -21223,6 +21847,14 @@ MonoBehaviour: enterHoldTime: 0.3 enterBackRiseTime: 0.5 enterBackHoldTime: 1 + takeoffAnim: + flyLoopAnim: + flyDuration: 0.6 + flySmooth: 1 + edgePadding: 60 + upFireInterval: 0.4 + upFireDuration: 0 + upFireDelay: 0 --- !u!1001 &6987163507780192041 PrefabInstance: m_ObjectHideFlags: 0 @@ -22506,6 +23138,11 @@ PrefabInstance: propertyPath: m_SortingLayer value: 0 objectReference: {fileID: 0} + - target: {fileID: 7710087130507345309, guid: 45613d68bc30eb1428a454bb23ecf900, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -22589,6 +23226,14 @@ MonoBehaviour: enterHoldTime: 0.3 enterBackRiseTime: 0.5 enterBackHoldTime: 1 + takeoffAnim: + flyLoopAnim: + flyDuration: 0.6 + flySmooth: 1 + edgePadding: 60 + upFireInterval: 0.4 + upFireDuration: 0 + upFireDelay: 0 --- !u!224 &7436292789528995505 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 224045311262509612, guid: 45613d68bc30eb1428a454bb23ecf900, @@ -22900,6 +23545,14 @@ MonoBehaviour: enterHoldTime: 0.3 enterBackRiseTime: 0.5 enterBackHoldTime: 1 + takeoffAnim: + flyLoopAnim: + flyDuration: 0.6 + flySmooth: 1 + edgePadding: 60 + upFireInterval: 0.4 + upFireDuration: 0 + upFireDelay: 0 --- !u!1 &7694097479653003727 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1466856939302812, guid: 574a35f9ac1d30a4baae69fe573af86a, @@ -23986,12 +24639,236 @@ MonoBehaviour: enterHoldTime: 0.3 enterBackRiseTime: 0.5 enterBackHoldTime: 1 + takeoffAnim: + flyLoopAnim: + flyDuration: 0.6 + flySmooth: 1 + edgePadding: 60 + upFireInterval: 0.4 + upFireDuration: 0 + upFireDelay: 0 --- !u!1 &9092269916604898265 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1323434655067039, guid: 3f4820e8b7d63b44f983ebd7dca20d71, type: 3} m_PrefabInstance: {fileID: 9091229400045400134} m_PrefabAsset: {fileID: 0} +--- !u!1001 &9100000000000000001 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2312809170298891864} + m_Modifications: + - target: {fileID: 1229005548691535, guid: f4f7967ac88aaaf4f975719c27df12aa, type: 3} + propertyPath: m_Name + value: PW_Plane_1 + objectReference: {fileID: 0} + - target: {fileID: 1229005548691535, guid: f4f7967ac88aaaf4f975719c27df12aa, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f4f7967ac88aaaf4f975719c27df12aa, type: 3} +--- !u!4 &9104377632393096108 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4660767374928813, guid: f4f7967ac88aaaf4f975719c27df12aa, + type: 3} + m_PrefabInstance: {fileID: 9100000000000000001} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &9100000000000000002 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4349447237878066425} + m_Modifications: + - target: {fileID: 1229005548691535, guid: f4f7967ac88aaaf4f975719c27df12aa, type: 3} + propertyPath: m_Name + value: PW_Plane_1 + objectReference: {fileID: 0} + - target: {fileID: 1229005548691535, guid: f4f7967ac88aaaf4f975719c27df12aa, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f4f7967ac88aaaf4f975719c27df12aa, type: 3} +--- !u!4 &9104377632393096111 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4660767374928813, guid: f4f7967ac88aaaf4f975719c27df12aa, + type: 3} + m_PrefabInstance: {fileID: 9100000000000000002} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &9100000000000000003 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 9179185251833639535} + m_Modifications: + - target: {fileID: 1844358439086301, guid: 29589d6bc93a47e499105e964f1f5c6b, type: 3} + propertyPath: m_Name + value: PW_Plane_2 + objectReference: {fileID: 0} + - target: {fileID: 1844358439086301, guid: 29589d6bc93a47e499105e964f1f5c6b, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 29589d6bc93a47e499105e964f1f5c6b, type: 3} +--- !u!4 &9099285438435746538 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4105766132179689, guid: 29589d6bc93a47e499105e964f1f5c6b, + type: 3} + m_PrefabInstance: {fileID: 9100000000000000003} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &9100000000000000004 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 9092467386780033531} + m_Modifications: + - target: {fileID: 1844358439086301, guid: 29589d6bc93a47e499105e964f1f5c6b, type: 3} + propertyPath: m_Name + value: PW_Plane_2 + objectReference: {fileID: 0} + - target: {fileID: 1844358439086301, guid: 29589d6bc93a47e499105e964f1f5c6b, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 29589d6bc93a47e499105e964f1f5c6b, type: 3} +--- !u!4 &9099285438435746541 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4105766132179689, guid: 29589d6bc93a47e499105e964f1f5c6b, + type: 3} + m_PrefabInstance: {fileID: 9100000000000000004} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &9100000000000000005 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4980046371408964510} + m_Modifications: + - target: {fileID: 1147314469400488, guid: 9672abcceca61c846b14184d9bba766f, type: 3} + propertyPath: m_Name + value: PW_Plane_3 + objectReference: {fileID: 0} + - target: {fileID: 1147314469400488, guid: 9672abcceca61c846b14184d9bba766f, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9672abcceca61c846b14184d9bba766f, type: 3} +--- !u!4 &9099133134549514083 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4271229695522662, guid: 9672abcceca61c846b14184d9bba766f, + type: 3} + m_PrefabInstance: {fileID: 9100000000000000005} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &9100000000000000006 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4236298556684268778} + m_Modifications: + - target: {fileID: 1147314469400488, guid: 9672abcceca61c846b14184d9bba766f, type: 3} + propertyPath: m_Name + value: PW_Plane_3 + objectReference: {fileID: 0} + - target: {fileID: 1147314469400488, guid: 9672abcceca61c846b14184d9bba766f, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9672abcceca61c846b14184d9bba766f, type: 3} +--- !u!4 &9099133134549514080 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4271229695522662, guid: 9672abcceca61c846b14184d9bba766f, + type: 3} + m_PrefabInstance: {fileID: 9100000000000000006} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &9100000000000000007 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5781209983944085165} + m_Modifications: + - target: {fileID: 1901813101868570, guid: 6bca3101cb2436147ba613930ade7bc6, type: 3} + propertyPath: m_Name + value: PW_Plane_4 + objectReference: {fileID: 0} + - target: {fileID: 1901813101868570, guid: 6bca3101cb2436147ba613930ade7bc6, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6bca3101cb2436147ba613930ade7bc6, type: 3} +--- !u!4 &9099340353664519262 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4195865732516953, guid: 6bca3101cb2436147ba613930ade7bc6, + type: 3} + m_PrefabInstance: {fileID: 9100000000000000007} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &9100000000000000008 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2487576147542109954} + m_Modifications: + - target: {fileID: 1901813101868570, guid: 6bca3101cb2436147ba613930ade7bc6, type: 3} + propertyPath: m_Name + value: PW_Plane_4 + objectReference: {fileID: 0} + - target: {fileID: 1901813101868570, guid: 6bca3101cb2436147ba613930ade7bc6, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6bca3101cb2436147ba613930ade7bc6, type: 3} +--- !u!4 &9099340353664519249 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4195865732516953, guid: 6bca3101cb2436147ba613930ade7bc6, + type: 3} + m_PrefabInstance: {fileID: 9100000000000000008} + m_PrefabAsset: {fileID: 0} --- !u!1001 &9183017407538746356 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/pw/pw_recovered_stubs/PW_Recovered_16f0b0b6d0b7.cs.meta b/Assets/pw/pw_recovered_stubs/PW_Recovered_16f0b0b6d0b7.cs.meta index dcccdeb98..a9fd84243 100644 --- a/Assets/pw/pw_recovered_stubs/PW_Recovered_16f0b0b6d0b7.cs.meta +++ b/Assets/pw/pw_recovered_stubs/PW_Recovered_16f0b0b6d0b7.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1 +guid: b8aad276f6c30ea498a65ccd21c89209 MonoImporter: externalObjects: {} serializedVersion: 2