diff --git a/Packages/com.yuxiaviation.vau320neo/Runtime/Accesories/GPWS_OWML.asset b/Packages/com.yuxiaviation.vau320neo/Runtime/Accesories/GPWS_OWML.asset index 60ab4094..4433248d 100644 --- a/Packages/com.yuxiaviation.vau320neo/Runtime/Accesories/GPWS_OWML.asset +++ b/Packages/com.yuxiaviation.vau320neo/Runtime/Accesories/GPWS_OWML.asset @@ -44,19 +44,19 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 35 + Data: 27 - Name: Entry: 7 Data: - Name: $k Entry: 1 - Data: flightData + Data: _flightData - Name: $v Entry: 7 Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: flightData + Data: _flightData - Name: k__BackingField Entry: 7 Data: 3|System.RuntimeType, mscorlib @@ -86,7 +86,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: true + Data: false - Name: _fieldAttributes Entry: 7 Data: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -110,25 +110,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: groundLayers + Data: _radioAltimeter - Name: $v Entry: 7 Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: groundLayers + Data: _radioAltimeter - Name: k__BackingField Entry: 7 Data: 7|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.LayerMask, UnityEngine.CoreModule + Data: A320VAU.RadioAltimeter.RadioAltimeter, com.yuxiaviation.vau320neo - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 7 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -140,7 +140,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: true + Data: false - Name: _fieldAttributes Entry: 7 Data: 8|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -164,19 +164,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: queryTriggerInteraction + Data: audioSource - Name: $v Entry: 7 Data: 9|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: queryTriggerInteraction + Data: audioSource - Name: k__BackingField Entry: 7 Data: 10|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.QueryTriggerInteraction, UnityEngine.PhysicsModule + Data: UnityEngine.AudioSource, UnityEngine.AudioModule - Name: Entry: 8 Data: @@ -218,19 +218,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: groundDetector + Data: bankAngleSound - Name: $v Entry: 7 Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: groundDetector + Data: bankAngleSound - Name: k__BackingField Entry: 7 Data: 13|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Transform, UnityEngine.CoreModule + Data: UnityEngine.AudioClip, UnityEngine.AudioModule - Name: Entry: 8 Data: @@ -272,13 +272,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: offsetTransorm + Data: sinkRateSound - Name: $v Entry: 7 Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: offsetTransorm + Data: sinkRateSound - Name: k__BackingField Entry: 9 Data: 13 @@ -318,177 +318,21 @@ MonoBehaviour: - Name: Entry: 7 Data: - - Name: $k - Entry: 1 - Data: audioSource - - Name: $v - Entry: 7 - Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: audioSource - - Name: k__BackingField - Entry: 7 - Data: 18|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.AudioSource, UnityEngine.AudioModule - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 18 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: bankAngleSound - - Name: $v - Entry: 7 - Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: bankAngleSound - - Name: k__BackingField - Entry: 7 - Data: 21|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.AudioClip, UnityEngine.AudioModule - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 21 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: sinkRateSound - - Name: $v - Entry: 7 - Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: sinkRateSound - - Name: k__BackingField - Entry: 9 - Data: 21 - - Name: k__BackingField - Entry: 9 - Data: 21 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - Name: $k Entry: 1 Data: pullUpSound - Name: $v Entry: 7 - Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: pullUpSound - Name: k__BackingField Entry: 9 - Data: 21 + Data: 13 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 13 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -503,7 +347,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 26|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -527,16 +371,16 @@ MonoBehaviour: Data: terrainSound - Name: $v Entry: 7 - Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: terrainSound - Name: k__BackingField Entry: 9 - Data: 21 + Data: 13 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 13 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -551,7 +395,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -575,16 +419,16 @@ MonoBehaviour: Data: dontSinkSound - Name: $v Entry: 7 - Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: dontSinkSound - Name: k__BackingField Entry: 9 - Data: 21 + Data: 13 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 13 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -599,7 +443,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -623,16 +467,16 @@ MonoBehaviour: Data: tooLowGearSound - Name: $v Entry: 7 - Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: tooLowGearSound - Name: k__BackingField Entry: 9 - Data: 21 + Data: 13 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 13 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -647,7 +491,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -671,16 +515,16 @@ MonoBehaviour: Data: tooLowFlapsSound - Name: $v Entry: 7 - Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: tooLowFlapsSound - Name: k__BackingField Entry: 9 - Data: 21 + Data: 13 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 13 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -695,7 +539,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 26|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -719,16 +563,16 @@ MonoBehaviour: Data: tooLowTerrainSound - Name: $v Entry: 7 - Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: tooLowTerrainSound - Name: k__BackingField Entry: 9 - Data: 21 + Data: 13 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 13 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -743,7 +587,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -767,13 +611,13 @@ MonoBehaviour: Data: initialClimbThreshold - Name: $v Entry: 7 - Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: initialClimbThreshold - Name: k__BackingField Entry: 7 - Data: 38|System.RuntimeType, mscorlib + Data: 30|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Single, mscorlib @@ -782,7 +626,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 38 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -797,7 +641,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -821,16 +665,16 @@ MonoBehaviour: Data: smoothing - Name: $v Entry: 7 - Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: smoothing - Name: k__BackingField Entry: 9 - Data: 38 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 38 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -845,7 +689,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -869,13 +713,13 @@ MonoBehaviour: Data: k__BackingField - Name: $v Entry: 7 - Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: k__BackingField - Name: k__BackingField Entry: 7 - Data: 43|System.RuntimeType, mscorlib + Data: 35|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -884,7 +728,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 43 + Data: 35 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -899,7 +743,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -923,16 +767,16 @@ MonoBehaviour: Data: lastAlertTime - Name: $v Entry: 7 - Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: lastAlertTime - Name: k__BackingField Entry: 9 - Data: 38 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 38 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -947,7 +791,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -971,13 +815,13 @@ MonoBehaviour: Data: vehicleRigidbody - Name: $v Entry: 7 - Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: vehicleRigidbody - Name: k__BackingField Entry: 7 - Data: 48|System.RuntimeType, mscorlib + Data: 40|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Rigidbody, UnityEngine.PhysicsModule @@ -986,7 +830,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 48 + Data: 40 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1001,103 +845,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: maxRange - - Name: $v - Entry: 7 - Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: maxRange - - Name: k__BackingField - Entry: 9 - Data: 38 - - Name: k__BackingField - Entry: 9 - Data: 38 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: seaLevel - - Name: $v - Entry: 7 - Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: seaLevel - - Name: k__BackingField - Entry: 9 - Data: 38 - - Name: k__BackingField - Entry: 9 - Data: 38 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1121,13 +869,13 @@ MonoBehaviour: Data: airVehicle - Name: $v Entry: 7 - Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: airVehicle - Name: k__BackingField Entry: 7 - Data: 55|System.RuntimeType, mscorlib + Data: 43|System.RuntimeType, mscorlib - Name: Entry: 1 Data: SaccFlightAndVehicles.SaccAirVehicle, SaccFlightAndVehicles.Runtime @@ -1151,7 +899,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1175,13 +923,13 @@ MonoBehaviour: Data: gear - Name: $v Entry: 7 - Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: gear - Name: k__BackingField Entry: 7 - Data: 58|System.RuntimeType, mscorlib + Data: 46|System.RuntimeType, mscorlib - Name: Entry: 1 Data: SaccFlightAndVehicles.DFUNC_Gear, SaccFlightAndVehicles.Runtime @@ -1205,61 +953,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 59|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: flaps - - Name: $v - Entry: 7 - Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: flaps - - Name: k__BackingField - Entry: 7 - Data: 61|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: SaccFlightAndVehicles.DFUNC_Flaps, SaccFlightAndVehicles.Runtime - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 4 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 62|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1283,13 +977,13 @@ MonoBehaviour: Data: advancedFlaps - Name: $v Entry: 7 - Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: advancedFlaps - Name: k__BackingField Entry: 7 - Data: 64|System.RuntimeType, mscorlib + Data: 49|System.RuntimeType, mscorlib - Name: Entry: 1 Data: EsnyaSFAddons.DFUNC.DFUNC_AdvancedFlaps, EsnyaSFAddons.Runtime @@ -1313,103 +1007,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: enabledTime - - Name: $v - Entry: 7 - Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: enabledTime - - Name: k__BackingField - Entry: 9 - Data: 38 - - Name: k__BackingField - Entry: 9 - Data: 38 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: offset - - Name: $v - Entry: 7 - Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: offset - - Name: k__BackingField - Entry: 9 - Data: 38 - - Name: k__BackingField - Entry: 9 - Data: 38 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: false - - Name: _fieldAttributes - Entry: 7 - Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1433,16 +1031,16 @@ MonoBehaviour: Data: radioAltitude - Name: $v Entry: 7 - Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: radioAltitude - Name: k__BackingField Entry: 9 - Data: 38 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 38 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1457,7 +1055,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1481,16 +1079,16 @@ MonoBehaviour: Data: barometlicAltitude - Name: $v Entry: 7 - Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: barometlicAltitude - Name: k__BackingField Entry: 9 - Data: 38 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 38 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1505,7 +1103,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1529,16 +1127,16 @@ MonoBehaviour: Data: prevBarometlicAltitude - Name: $v Entry: 7 - Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: prevBarometlicAltitude - Name: k__BackingField Entry: 9 - Data: 38 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 38 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1553,7 +1151,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 75|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1577,13 +1175,13 @@ MonoBehaviour: Data: velocity - Name: $v Entry: 7 - Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: velocity - Name: k__BackingField Entry: 7 - Data: 77|System.RuntimeType, mscorlib + Data: 58|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Vector3, UnityEngine.CoreModule @@ -1592,7 +1190,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 77 + Data: 58 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1607,7 +1205,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 59|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1631,16 +1229,16 @@ MonoBehaviour: Data: prevPosition - Name: $v Entry: 7 - Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: prevPosition - Name: k__BackingField Entry: 9 - Data: 77 + Data: 58 - Name: k__BackingField Entry: 9 - Data: 77 + Data: 58 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1655,7 +1253,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1679,16 +1277,16 @@ MonoBehaviour: Data: prevLandingConfiguration - Name: $v Entry: 7 - Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: prevLandingConfiguration - Name: k__BackingField Entry: 9 - Data: 43 + Data: 35 - Name: k__BackingField Entry: 9 - Data: 43 + Data: 35 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1703,7 +1301,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1727,16 +1325,16 @@ MonoBehaviour: Data: initialClimbing - Name: $v Entry: 7 - Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: initialClimbing - Name: k__BackingField Entry: 9 - Data: 43 + Data: 35 - Name: k__BackingField Entry: 9 - Data: 43 + Data: 35 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1751,7 +1349,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1775,16 +1373,16 @@ MonoBehaviour: Data: peekBarometricAltitude - Name: $v Entry: 7 - Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: peekBarometricAltitude - Name: k__BackingField Entry: 9 - Data: 38 + Data: 30 - Name: k__BackingField Entry: 9 - Data: 38 + Data: 30 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1799,7 +1397,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 86|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 67|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Packages/com.yuxiaviation.vau320neo/Runtime/Accesories/GPWS_OWML.cs b/Packages/com.yuxiaviation.vau320neo/Runtime/Accesories/GPWS_OWML.cs index e95d4d74..60a751f4 100644 --- a/Packages/com.yuxiaviation.vau320neo/Runtime/Accesories/GPWS_OWML.cs +++ b/Packages/com.yuxiaviation.vau320neo/Runtime/Accesories/GPWS_OWML.cs @@ -1,4 +1,5 @@  +using A320VAU.Common; using EsnyaSFAddons.DFUNC; using UdonSharp; using UnityEngine; @@ -13,10 +14,8 @@ namespace A320VAU.Avionics public class GPWS_OWML : UdonSharpBehaviour { - public YFI_FlightDataInterface flightData; - public LayerMask groundLayers = -1; - public QueryTriggerInteraction queryTriggerInteraction = QueryTriggerInteraction.UseGlobal; - public Transform groundDetector, offsetTransorm; + private YFI_FlightDataInterface _flightData; + private RadioAltimeter.RadioAltimeter _radioAltimeter; public AudioSource audioSource; public AudioClip bankAngleSound, sinkRateSound, pullUpSound, terrainSound, dontSinkSound, tooLowGearSound, tooLowFlapsSound, tooLowTerrainSound; @@ -31,34 +30,22 @@ public bool PullUpWarning private float lastAlertTime = 0; private Rigidbody vehicleRigidbody; - private float maxRange, seaLevel; private SaccAirVehicle airVehicle; private DFUNC_Gear gear; - private DFUNC_Flaps flaps; private DFUNC_AdvancedFlaps advancedFlaps; - private float enabledTime; - private void OnEnable() - { - enabledTime = Time.time; - } - - private float offset; private void Start() { + var injector = DependenciesInjector.GetInstance(this); + vehicleRigidbody = GetComponentInParent(); - airVehicle = vehicleRigidbody.GetComponentInChildren(); - gear = vehicleRigidbody.GetComponentInChildren(true); - flaps = vehicleRigidbody.GetComponentInChildren(true); - advancedFlaps = vehicleRigidbody.GetComponentInChildren(true); - flightData = vehicleRigidbody.GetComponentInChildren(true); + gear = injector.gear; + airVehicle = injector.saccAirVehicle; + advancedFlaps = injector.flaps; + _flightData = injector.flightData; + _radioAltimeter = injector.radioAltimeter; audioSource = GetComponent(); - maxRange = 5000f; - seaLevel = airVehicle.SeaLevel; - - offset = Vector3.Dot(groundDetector.up, offsetTransorm.position - groundDetector.position); - } private float radioAltitude, barometlicAltitude, prevBarometlicAltitude; @@ -73,7 +60,7 @@ public override void PostLateUpdate() var smoothingT = deltaTime / smoothing; radioAltitude = Mathf.Lerp(radioAltitude, GetRadioAltitude(), smoothingT); - barometlicAltitude = Mathf.Lerp(barometlicAltitude, flightData.altitude, smoothingT); + barometlicAltitude = Mathf.Lerp(barometlicAltitude, _flightData.altitude, smoothingT); var barometricDecendRate = -(barometlicAltitude - prevBarometlicAltitude) / Time.deltaTime * 60; prevBarometlicAltitude = barometlicAltitude; @@ -83,9 +70,8 @@ public override void PostLateUpdate() var airspeed = velocity.magnitude * 1.94384f; - var flapsDown = flaps ? flaps.Flaps : false; var advancedFlapsDown = advancedFlaps ? advancedFlaps.targetAngle > 0 : false; - var anyFlapsDown = !flaps && !advancedFlaps || flapsDown || advancedFlapsDown; + var anyFlapsDown = !advancedFlaps || advancedFlapsDown; var gearDown = gear ? !gear.GearUp : true; var landingConfiguration = gearDown && anyFlapsDown; @@ -124,20 +110,7 @@ public override void PostLateUpdate() PullUpWarning = state == ALERT_PULL_UP || state == ALERT_TERRAIN || state == ALERT_TOO_LOW_TERRAIN || state == ALERT_TOO_LOW_GEAR || state == ALERT_TOO_LOW_FLAPS || state == ALERT_SINK_RATE || state == ALERT_DONT_SINK; } - private float GetRadioAltitude() - { - var position = groundDetector.position; - RaycastHit hit; - if (Physics.Raycast(position, Vector3.down, out hit, maxRange * 0.3048f, groundLayers, queryTriggerInteraction)) - { - return (hit.distance + offset) * 3.28084f; - } - else - { - // return (position.y - seaLevel + offset) * 3.28084f; - return maxRange * 0.3048f; - } - } + private float GetRadioAltitude() => _radioAltimeter.radioAltitude; private const int ALERT_WINDSHEAR = 1; private const int ALERT_PULL_UP = 2; @@ -307,9 +280,6 @@ private void Alert(AudioClip clip, float interval) lastAlertTime = time; } - #region Math - #endregion - #region Audio Soruce public void PlayOneShot(AudioClip clip) { diff --git a/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Instruments/ECAM/Script/ECAMDisplay.cs b/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Instruments/ECAM/Script/ECAMDisplay.cs index a11382f4..6f6ea8bb 100644 --- a/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Instruments/ECAM/Script/ECAMDisplay.cs +++ b/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Instruments/ECAM/Script/ECAMDisplay.cs @@ -185,7 +185,7 @@ public void UpdateMemo() var rightMemoText = ""; var leftMemoText = ""; var hasWarning = false; - foreach (var memo in FWS.FWSWarningMessageDatas) + foreach (var memo in FWS.fwsWarningMessageDatas) { if (memo.IsVisable) { diff --git a/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/Common/DependenciesInjector.asset b/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/Common/DependenciesInjector.asset index ccd1e1ff..cd9e26fd 100644 --- a/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/Common/DependenciesInjector.asset +++ b/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/Common/DependenciesInjector.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 26 + Data: 24 - Name: Entry: 7 Data: @@ -437,19 +437,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: leftLadingGear + Data: gear - Name: $v Entry: 7 Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: leftLadingGear + Data: gear - Name: k__BackingField Entry: 7 Data: 25|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: A320VAU.SFEXT.SFEXT_a320_AdvancedGear, com.yuxiaviation.vau320neo + Data: SaccFlightAndVehicles.DFUNC_Gear, SaccFlightAndVehicles.Runtime - Name: Entry: 8 Data: @@ -491,16 +491,22 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: rightLadingGear + Data: leftLadingGear - Name: $v Entry: 7 Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: rightLadingGear + Data: leftLadingGear - Name: k__BackingField - Entry: 9 - Data: 25 + Entry: 7 + Data: 28|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: A320VAU.SFEXT.SFEXT_a320_AdvancedGear, com.yuxiaviation.vau320neo + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 Data: 4 @@ -518,7 +524,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -539,16 +545,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: frontLadingGear + Data: rightLadingGear - Name: $v Entry: 7 - Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: frontLadingGear + Data: rightLadingGear - Name: k__BackingField Entry: 9 - Data: 25 + Data: 28 - Name: k__BackingField Entry: 9 Data: 4 @@ -566,7 +572,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -587,22 +593,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: brake + Data: frontLadingGear - Name: $v Entry: 7 - Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: brake + Data: frontLadingGear - Name: k__BackingField - Entry: 7 - Data: 32|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: A320VAU.Brake.DFUNC_a320_Brake, com.yuxiaviation.vau320neo - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 28 - Name: k__BackingField Entry: 9 Data: 4 @@ -641,19 +641,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: landingLight + Data: brake - Name: $v Entry: 7 Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: landingLight + Data: brake - Name: k__BackingField Entry: 7 Data: 35|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: A320VAU.DFUNC.DFUNC_a320_LandingLight, com.yuxiaviation.vau320neo + Data: A320VAU.Brake.DFUNC_a320_Brake, com.yuxiaviation.vau320neo - Name: Entry: 8 Data: @@ -695,19 +695,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: canopy + Data: landingLight - Name: $v Entry: 7 Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: canopy + Data: landingLight - Name: k__BackingField Entry: 7 Data: 38|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: SaccFlightAndVehicles.DFUNC_Canopy, SaccFlightAndVehicles.Runtime + Data: A320VAU.DFUNC.DFUNC_a320_LandingLight, com.yuxiaviation.vau320neo - Name: Entry: 8 Data: @@ -749,19 +749,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: navigationReceiver1 + Data: canopy - Name: $v Entry: 7 Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: navigationReceiver1 + Data: canopy - Name: k__BackingField Entry: 7 Data: 41|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: YuxiFlightInstruments.Navigation.YFI_NavigationReceiver, com.yuxiaviation.yuxiflightinstruments + Data: SaccFlightAndVehicles.DFUNC_Canopy, SaccFlightAndVehicles.Runtime - Name: Entry: 8 Data: @@ -803,16 +803,22 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: navigationReceiver2 + Data: gpws - Name: $v Entry: 7 Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: navigationReceiver2 + Data: gpws - Name: k__BackingField - Entry: 9 - Data: 41 + Entry: 7 + Data: 44|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: A320VAU.Avionics.GPWS_OWML, com.yuxiaviation.vau320neo + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 Data: 4 @@ -830,7 +836,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -851,19 +857,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: gpws + Data: radioAltimeter - Name: $v Entry: 7 - Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: gpws + Data: radioAltimeter - Name: k__BackingField Entry: 7 - Data: 46|System.RuntimeType, mscorlib + Data: 47|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: A320VAU.Avionics.GPWS_OWML, com.yuxiaviation.vau320neo + Data: A320VAU.RadioAltimeter.RadioAltimeter, com.yuxiaviation.vau320neo - Name: Entry: 8 Data: @@ -884,7 +890,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 48|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -908,13 +914,13 @@ MonoBehaviour: Data: fmgc - Name: $v Entry: 7 - Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: fmgc - Name: k__BackingField Entry: 7 - Data: 49|System.RuntimeType, mscorlib + Data: 50|System.RuntimeType, mscorlib - Name: Entry: 1 Data: A320VAU.FMGC.FMGC, com.yuxiaviation.vau320neo @@ -938,7 +944,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -962,13 +968,13 @@ MonoBehaviour: Data: airbusAvionicsTheme - Name: $v Entry: 7 - Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: airbusAvionicsTheme - Name: k__BackingField Entry: 7 - Data: 52|System.RuntimeType, mscorlib + Data: 53|System.RuntimeType, mscorlib - Name: Entry: 1 Data: A320VAU.Common.AirbusAvionicsTheme, com.yuxiaviation.vau320neo @@ -992,7 +998,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1016,13 +1022,13 @@ MonoBehaviour: Data: navaidDatabase - Name: $v Entry: 7 - Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: navaidDatabase - Name: k__BackingField Entry: 7 - Data: 55|System.RuntimeType, mscorlib + Data: 56|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VirtualAviationJapan.NavaidDatabase, VirtualAviationJapan.Virtual-CNS @@ -1046,13 +1052,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 57|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 58|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: World @@ -1076,16 +1082,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: navigationReceiver1Name + Data: engine1Name - Name: $v Entry: 7 - Data: 58|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: navigationReceiver1Name + Data: engine1Name - Name: k__BackingField Entry: 7 - Data: 59|System.RuntimeType, mscorlib + Data: 60|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String, mscorlib @@ -1094,112 +1100,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 59 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 60|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 61|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - - Name: header - Entry: 1 - Data: Navigation Receivers Dependencies Search Settings - - Name: - Entry: 8 - Data: - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: navigationReceiver2Name - - Name: $v - Entry: 7 - Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: navigationReceiver2Name - - Name: k__BackingField - Entry: 9 - Data: 59 - - Name: k__BackingField - Entry: 9 - Data: 59 - - Name: k__BackingField - Entry: 7 - Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - - Name: - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 5 - Data: true - - Name: _fieldAttributes - Entry: 7 - Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: engine1Name - - Name: $v - Entry: 7 - Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: engine1Name - - Name: k__BackingField - Entry: 9 - Data: 59 - - Name: k__BackingField - Entry: 9 - Data: 59 + Data: 60 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1214,13 +1115,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 66|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 62|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Engines Dependencies Search Settings @@ -1247,16 +1148,16 @@ MonoBehaviour: Data: engine2Name - Name: $v Entry: 7 - Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: engine2Name - Name: k__BackingField Entry: 9 - Data: 59 + Data: 60 - Name: k__BackingField Entry: 9 - Data: 59 + Data: 60 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1271,7 +1172,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1295,16 +1196,16 @@ MonoBehaviour: Data: leftLadingGearName - Name: $v Entry: 7 - Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: leftLadingGearName - Name: k__BackingField Entry: 9 - Data: 59 + Data: 60 - Name: k__BackingField Entry: 9 - Data: 59 + Data: 60 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1319,13 +1220,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 71|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 67|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Engines Dependencies Search Settings @@ -1352,16 +1253,16 @@ MonoBehaviour: Data: rightLadingGearName - Name: $v Entry: 7 - Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: rightLadingGearName - Name: k__BackingField Entry: 9 - Data: 59 + Data: 60 - Name: k__BackingField Entry: 9 - Data: 59 + Data: 60 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1376,7 +1277,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 69|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1400,16 +1301,16 @@ MonoBehaviour: Data: frontLadingGearName - Name: $v Entry: 7 - Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: frontLadingGearName - Name: k__BackingField Entry: 9 - Data: 59 + Data: 60 - Name: k__BackingField Entry: 9 - Data: 59 + Data: 60 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1424,7 +1325,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 75|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/Common/DependenciesInjector.cs b/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/Common/DependenciesInjector.cs index 6d1f0856..acf40cec 100644 --- a/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/Common/DependenciesInjector.cs +++ b/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/Common/DependenciesInjector.cs @@ -9,6 +9,7 @@ using EsnyaSFAddons.SFEXT; using SaccFlightAndVehicles; using UdonSharp; +using UdonSharpEditor; using UnityEditor; using UnityEngine; using VirtualAviationJapan; @@ -33,6 +34,7 @@ public class DependenciesInjector : UdonSharpBehaviour public DFUNC_AdvancedFlaps flaps; + public DFUNC_Gear gear; public SFEXT_a320_AdvancedGear leftLadingGear; public SFEXT_a320_AdvancedGear rightLadingGear; public SFEXT_a320_AdvancedGear frontLadingGear; @@ -41,9 +43,8 @@ public class DependenciesInjector : UdonSharpBehaviour public DFUNC_a320_LandingLight landingLight; public DFUNC_Canopy canopy; - public YFI_NavigationReceiver navigationReceiver1; - public YFI_NavigationReceiver navigationReceiver2; public GPWS_OWML gpws; + public RadioAltimeter.RadioAltimeter radioAltimeter; public FMGC.FMGC fmgc; @@ -52,11 +53,6 @@ public class DependenciesInjector : UdonSharpBehaviour [Header("World")] public NavaidDatabase navaidDatabase; - [Header("Navigation Receivers Dependencies Search Settings")] - public string navigationReceiver1Name = "NaviReciver1"; - - public string navigationReceiver2Name = "NaviReciver2"; - [Header("Engines Dependencies Search Settings")] public string engine1Name = "AdvancedEngineL"; @@ -84,6 +80,8 @@ public class DependenciesInjectorEditor : Editor { public override void OnInspectorGUI() { + if (UdonSharpGUI.DrawDefaultUdonSharpBehaviourHeader(target)) return; + var injector = target as DependenciesInjector; if (injector == null) return; @@ -108,6 +106,7 @@ private static void Setup(DependenciesInjector injector) injector.canopy = injector.GetComponentInChildren(true); injector.gpws = injector.GetComponentInChildren(true); + injector.radioAltimeter = injector.GetComponentInChildren(true); injector.fmgc = injector.GetComponentInChildren(true); @@ -126,22 +125,9 @@ private static void Setup(DependenciesInjector injector) injector.engine2 = engine; } } - - // NavigationReceiver - var receivers = injector.GetComponentsInChildren(true); - foreach (var receiver in receivers) - { - if (receiver.gameObject.name == injector.navigationReceiver1Name) - { - injector.navigationReceiver1 = receiver; - } - else if (receiver.gameObject.name == injector.navigationReceiver2Name) - { - injector.navigationReceiver2 = receiver; - } - } - + // Gears + injector.gear = injector.GetComponentInChildren(true); var gears = injector.GetComponentsInChildren(true); foreach (var gear in gears) { diff --git a/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/FWS/FWS.asset b/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/FWS/FWS.asset index 9c7e1df0..25e211d2 100644 --- a/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/FWS/FWS.asset +++ b/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/FWS/FWS.asset @@ -44,19 +44,19 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 25 + Data: 26 - Name: Entry: 7 Data: - Name: $k Entry: 1 - Data: FWSWarningMessageDatas + Data: fwsWarningMessageDatas - Name: $v Entry: 7 Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: FWSWarningMessageDatas + Data: fwsWarningMessageDatas - Name: k__BackingField Entry: 7 Data: 3|System.RuntimeType, mscorlib @@ -116,13 +116,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: FWSWarningData + Data: _fwsWarningData - Name: $v Entry: 7 Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: FWSWarningData + Data: _fwsWarningData - Name: k__BackingField Entry: 7 Data: 8|System.RuntimeType, mscorlib @@ -152,19 +152,13 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: true + Data: false - Name: _fieldAttributes Entry: 7 Data: 10|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 11|UnityEngine.HideInInspector, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -185,13 +179,13 @@ MonoBehaviour: Data: ECAMController - Name: $v Entry: 7 - Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: ECAMController - Name: k__BackingField Entry: 7 - Data: 13|System.RuntimeType, mscorlib + Data: 12|System.RuntimeType, mscorlib - Name: Entry: 1 Data: A320VAU.ECAM.ECAMDisplay, com.yuxiaviation.vau320neo @@ -215,13 +209,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 15|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 14|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: ECAM and warning Light/Audio @@ -248,13 +242,13 @@ MonoBehaviour: Data: Caution - Name: $v Entry: 7 - Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: Caution - Name: k__BackingField Entry: 7 - Data: 17|System.RuntimeType, mscorlib + Data: 16|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.AudioClip, UnityEngine.AudioModule @@ -263,7 +257,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 17 + Data: 16 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -278,13 +272,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 19|UnityEngine.HideInInspector, UnityEngine.CoreModule + Data: 18|UnityEngine.HideInInspector, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -308,13 +302,13 @@ MonoBehaviour: Data: MasterWarningLightCAPT - Name: $v Entry: 7 - Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: MasterWarningLightCAPT - Name: k__BackingField Entry: 7 - Data: 21|System.RuntimeType, mscorlib + Data: 20|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.GameObject, UnityEngine.CoreModule @@ -323,7 +317,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 21 + Data: 20 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -338,7 +332,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -362,16 +356,16 @@ MonoBehaviour: Data: MasterWarningLightFO - Name: $v Entry: 7 - Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: MasterWarningLightFO - Name: k__BackingField Entry: 9 - Data: 21 + Data: 20 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 20 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -386,7 +380,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -410,16 +404,16 @@ MonoBehaviour: Data: MasterCautionLightCAPT - Name: $v Entry: 7 - Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: MasterCautionLightCAPT - Name: k__BackingField Entry: 9 - Data: 21 + Data: 20 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 20 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -434,7 +428,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 26|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -458,16 +452,16 @@ MonoBehaviour: Data: MasterCautionLightFO - Name: $v Entry: 7 - Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: MasterCautionLightFO - Name: k__BackingField Entry: 9 - Data: 21 + Data: 20 - Name: k__BackingField Entry: 9 - Data: 21 + Data: 20 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -482,7 +476,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -506,13 +500,13 @@ MonoBehaviour: Data: saccAirVehicle - Name: $v Entry: 7 - Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: saccAirVehicle - Name: k__BackingField Entry: 7 - Data: 30|System.RuntimeType, mscorlib + Data: 29|System.RuntimeType, mscorlib - Name: Entry: 1 Data: SaccFlightAndVehicles.SaccAirVehicle, SaccFlightAndVehicles.Runtime @@ -536,19 +530,25 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 - Data: 32|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 31|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Aircraft Systems - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: 32|UnityEngine.HideInInspector, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -602,7 +602,13 @@ MonoBehaviour: Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 36|UnityEngine.HideInInspector, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -623,13 +629,13 @@ MonoBehaviour: Data: flightData - Name: $v Entry: 7 - Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: flightData - Name: k__BackingField Entry: 7 - Data: 37|System.RuntimeType, mscorlib + Data: 38|System.RuntimeType, mscorlib - Name: Entry: 1 Data: YuxiFlightInstruments.BasicFlightData.YFI_FlightDataInterface, com.yuxiaviation.yuxiflightinstruments @@ -653,10 +659,16 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 40|UnityEngine.HideInInspector, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -677,13 +689,13 @@ MonoBehaviour: Data: equipmentData - Name: $v Entry: 7 - Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: equipmentData - Name: k__BackingField Entry: 7 - Data: 40|System.RuntimeType, mscorlib + Data: 42|System.RuntimeType, mscorlib - Name: Entry: 1 Data: A320VAU.ECAM.ECAMDataInterface, com.yuxiaviation.vau320neo @@ -707,7 +719,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -731,13 +743,13 @@ MonoBehaviour: Data: gpws - Name: $v Entry: 7 - Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: gpws - Name: k__BackingField Entry: 7 - Data: 43|System.RuntimeType, mscorlib + Data: 45|System.RuntimeType, mscorlib - Name: Entry: 1 Data: A320VAU.Avionics.GPWS_OWML, com.yuxiaviation.vau320neo @@ -761,10 +773,76 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 47|UnityEngine.HideInInspector, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: radioAltimeter + - Name: $v + Entry: 7 + Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: radioAltimeter + - Name: k__BackingField + Entry: 7 + Data: 49|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: A320VAU.RadioAltimeter.RadioAltimeter, com.yuxiaviation.vau320neo + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 9 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 51|UnityEngine.HideInInspector, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -785,13 +863,13 @@ MonoBehaviour: Data: _hasWarningVisableChange - Name: $v Entry: 7 - Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _hasWarningVisableChange - Name: k__BackingField Entry: 7 - Data: 46|System.RuntimeType, mscorlib + Data: 53|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -800,7 +878,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 46 + Data: 53 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -815,13 +893,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 48|UnityEngine.HideInInspector, UnityEngine.CoreModule + Data: 55|UnityEngine.HideInInspector, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -845,16 +923,16 @@ MonoBehaviour: Data: _hasWarningDataVisableChange - Name: $v Entry: 7 - Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _hasWarningDataVisableChange - Name: k__BackingField Entry: 9 - Data: 46 + Data: 53 - Name: k__BackingField Entry: 9 - Data: 46 + Data: 53 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -869,13 +947,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 50|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 51|UnityEngine.HideInInspector, UnityEngine.CoreModule + Data: 58|UnityEngine.HideInInspector, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -899,13 +977,13 @@ MonoBehaviour: Data: _activeWarnings - Name: $v Entry: 7 - Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _activeWarnings - Name: k__BackingField Entry: 7 - Data: 53|System.RuntimeType, mscorlib + Data: 60|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String[], mscorlib @@ -914,7 +992,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 53 + Data: 60 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -929,16 +1007,10 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 - - Name: - Entry: 7 - Data: 55|UnityEngine.HideInInspector, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: + Data: 0 - Name: Entry: 13 Data: @@ -959,13 +1031,13 @@ MonoBehaviour: Data: altitudeCalloutIndexs - Name: $v Entry: 7 - Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: altitudeCalloutIndexs - Name: k__BackingField Entry: 7 - Data: 57|System.RuntimeType, mscorlib + Data: 63|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Single[], mscorlib @@ -974,7 +1046,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 57 + Data: 63 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -989,13 +1061,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 59|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 65|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Altitude Callout @@ -1022,13 +1094,13 @@ MonoBehaviour: Data: altitudeCallouts - Name: $v Entry: 7 - Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: altitudeCallouts - Name: k__BackingField Entry: 7 - Data: 61|System.RuntimeType, mscorlib + Data: 67|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.AudioClip[], UnityEngine.AudioModule @@ -1037,7 +1109,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 61 + Data: 67 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1052,7 +1124,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 62|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1076,16 +1148,16 @@ MonoBehaviour: Data: retardCallout - Name: $v Entry: 7 - Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: retardCallout - Name: k__BackingField Entry: 9 - Data: 17 + Data: 16 - Name: k__BackingField Entry: 9 - Data: 17 + Data: 16 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1100,7 +1172,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1124,16 +1196,16 @@ MonoBehaviour: Data: hundredAboveCallout - Name: $v Entry: 7 - Data: 65|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: hundredAboveCallout - Name: k__BackingField Entry: 9 - Data: 17 + Data: 16 - Name: k__BackingField Entry: 9 - Data: 17 + Data: 16 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1148,7 +1220,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1172,16 +1244,16 @@ MonoBehaviour: Data: mininmumCallout - Name: $v Entry: 7 - Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: mininmumCallout - Name: k__BackingField Entry: 9 - Data: 17 + Data: 16 - Name: k__BackingField Entry: 9 - Data: 17 + Data: 16 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1196,7 +1268,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1220,13 +1292,13 @@ MonoBehaviour: Data: decisionHeight - Name: $v Entry: 7 - Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: decisionHeight - Name: k__BackingField Entry: 7 - Data: 70|System.RuntimeType, mscorlib + Data: 76|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Single, mscorlib @@ -1235,7 +1307,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 70 + Data: 76 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1250,7 +1322,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 71|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1274,13 +1346,13 @@ MonoBehaviour: Data: _lastAltitudeCalloutIndex - Name: $v Entry: 7 - Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _lastAltitudeCalloutIndex - Name: k__BackingField Entry: 7 - Data: 73|System.RuntimeType, mscorlib + Data: 79|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -1289,7 +1361,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 73 + Data: 79 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1304,7 +1376,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 80|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1328,16 +1400,16 @@ MonoBehaviour: Data: _lastMinimumCalloutIndex - Name: $v Entry: 7 - Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _lastMinimumCalloutIndex - Name: k__BackingField Entry: 9 - Data: 73 + Data: 79 - Name: k__BackingField Entry: 9 - Data: 73 + Data: 79 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1352,7 +1424,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 76|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1376,16 +1448,16 @@ MonoBehaviour: Data: _lastCallout - Name: $v Entry: 7 - Data: 77|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 83|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _lastCallout - Name: k__BackingField Entry: 9 - Data: 70 + Data: 76 - Name: k__BackingField Entry: 9 - Data: 70 + Data: 76 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1400,7 +1472,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 78|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 84|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/FWS/FWS.cs b/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/FWS/FWS.cs index 7c040632..908517e9 100644 --- a/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/FWS/FWS.cs +++ b/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/FWS/FWS.cs @@ -1,5 +1,6 @@ using A320VAU.ECAM; using A320VAU.Avionics; +using A320VAU.Common; using SaccFlightAndVehicles; using UdonSharp; using UnityEngine; @@ -12,10 +13,8 @@ namespace A320VAU.FWS public class FWS : UdonSharpBehaviour { #region FWS Data (OEB) (Checklist and warnings) - [HideInInspector] - public FWSWarningMessageData[] FWSWarningMessageDatas; - [HideInInspector] - public FWSWarningData FWSWarningData; + [HideInInspector] public FWSWarningMessageData[] fwsWarningMessageDatas; + private FWSWarningData _fwsWarningData; #endregion #region ECAM and Warning Light/Audio @@ -23,8 +22,6 @@ public class FWS : UdonSharpBehaviour public ECAMDisplay ECAMController; [HideInInspector] - //private AudioSource AudioSource; - public AudioClip Caution; // looking for master warning? check out the FWS gameobject public GameObject MasterWarningLightCAPT; @@ -35,11 +32,12 @@ public class FWS : UdonSharpBehaviour #region Aircraft Systems [Header("Aircraft Systems")] - public SaccAirVehicle saccAirVehicle; - public SaccEntity saccEntity; - public YFI_FlightDataInterface flightData; + [HideInInspector] public SaccAirVehicle saccAirVehicle; + [HideInInspector] public SaccEntity saccEntity; + [HideInInspector] public YFI_FlightDataInterface flightData; public ECAMDataInterface equipmentData; - public GPWS_OWML gpws; //as sound source + [HideInInspector] public GPWS_OWML gpws; //as sound source + [HideInInspector] public RadioAltimeter.RadioAltimeter radioAltimeter; #endregion #region FWS Warning @@ -47,7 +45,6 @@ public class FWS : UdonSharpBehaviour public bool _hasWarningVisableChange = false; [HideInInspector] public bool _hasWarningDataVisableChange = false; - [HideInInspector] private string[] _activeWarnings = new string[0]; #endregion @@ -72,13 +69,20 @@ public class FWS : UdonSharpBehaviour private void Start() { - FWSWarningMessageDatas = GetComponentsInChildren(); - FWSWarningData = GetComponentInChildren(); + var injector = DependenciesInjector.GetInstance(this); + saccAirVehicle = injector.saccAirVehicle; + saccEntity = injector.saccEntity; + flightData = injector.flightData; + gpws = injector.gpws; + radioAltimeter = injector.radioAltimeter; + + fwsWarningMessageDatas = GetComponentsInChildren(); + _fwsWarningData = GetComponentInChildren(); } private void LateUpdate() { - var radioAltitude = (float)gpws.GetProgramVariable("radioAltitude"); + var radioAltitude = radioAltimeter.radioAltitude; UpdateMinimumCallout(radioAltitude); UpdateAltitudeCallout(radioAltitude); @@ -98,16 +102,16 @@ private void UpdateMinimumCallout(float radioAltitude) if (_lastMinimumCalloutIndex != -1 && minimumCalloutIndex > _lastMinimumCalloutIndex) { - // HUNDRED ABOVE - if (minimumCalloutIndex == 0) - { - SendCustomEventDelayedSeconds(nameof(CalloutHundredAbove), 1); - } - - // MINIMUM - if (minimumCalloutIndex == 1) + switch (minimumCalloutIndex) { - SendCustomEventDelayedSeconds(nameof(CalloutMinimum), 1); + // HUNDRED ABOVE + case 0: + SendCustomEventDelayedSeconds(nameof(CalloutHundredAbove), 1); + break; + // MINIMUM + case 1: + SendCustomEventDelayedSeconds(nameof(CalloutMinimum), 1); + break; } } @@ -184,27 +188,27 @@ private int GetAltitudeCalloutIndex(float radioAltitude) private void UpdateFWS() { - var _hasMatserWarning = false; - var _hasMatserCaution = false; - FWSWarningData.Monitor(this); // the core of the FWS + var hasMatserWarning = false; + var hasMatserCaution = false; + _fwsWarningData.Monitor(this); // the core of the FWS if (!_hasWarningVisableChange) return; // return if there is nothing need to update #region Get Updated Warnings and Wanring Level (e.g Master Caution/Warning) - foreach (var memo in FWSWarningMessageDatas) + foreach (var memo in fwsWarningMessageDatas) { - if (memo.IsVisable && memo.Type == WarningType.Primary && !contains(_activeWarnings, memo.Id)) + if (memo.IsVisable && memo.Type == WarningType.Primary && !Contains(_activeWarnings, memo.Id)) { switch (memo.Level) { case WarningLevel.Immediate: - _hasMatserWarning = true; + hasMatserWarning = true; break; case WarningLevel.None: // doing nothing break; default: - _hasMatserCaution = true; + hasMatserCaution = true; break; } } @@ -212,7 +216,7 @@ private void UpdateFWS() #endregion #region Warning Light & Sound - if (_hasMatserWarning) + if (hasMatserWarning) { gpws.audioSource.Play(); @@ -226,7 +230,7 @@ private void UpdateFWS() gpws.audioSource.Stop(); MasterWarningLightCAPT.SetActive(false); MasterWarningLightFO.SetActive(false); - if (_hasMatserCaution) + if (hasMatserCaution) { MasterCautionLightCAPT.SetActive(true); MasterCautionLightFO.SetActive(true); @@ -253,7 +257,7 @@ public void CancleWarning() MasterCautionLightFO.SetActive(false); } - private bool contains(string[] array, string item) + private static bool Contains(string[] array, string item) { foreach (var temp in array) { diff --git a/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/FWS/FWSWarningData.asset b/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/FWS/FWSWarningData.asset index 5b0f9dd4..a2866183 100644 --- a/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/FWS/FWSWarningData.asset +++ b/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/FWS/FWSWarningData.asset @@ -50,19 +50,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: FWS + Data: ENGINE1_FIRE - Name: $v Entry: 7 Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: FWS + Data: ENGINE1_FIRE - Name: k__BackingField Entry: 7 Data: 3|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: A320VAU.FWS.FWS, com.yuxiaviation.vau320neo + Data: A320VAU.FWS.FWSWarningMessageData, com.yuxiaviation.vau320neo - Name: Entry: 8 Data: @@ -86,7 +86,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 Data: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -110,25 +110,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _hasWarningVisableChange + Data: ENGINE2_FIRE - Name: $v Entry: 7 Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _hasWarningVisableChange + Data: ENGINE2_FIRE - Name: k__BackingField - Entry: 7 - Data: 7|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: System.Boolean, mscorlib - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 3 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -140,10 +134,10 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 - Data: 8|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 7|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -164,19 +158,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _hasWarningDataVisableChange + Data: DUAL_ENGINE_FAULT - Name: $v Entry: 7 - Data: 9|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 8|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _hasWarningDataVisableChange + Data: DUAL_ENGINE_FAULT - Name: k__BackingField Entry: 9 - Data: 7 + Data: 3 - Name: k__BackingField Entry: 9 - Data: 7 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -188,10 +182,10 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 - Data: 10|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -212,22 +206,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: APU_BLEED + Data: ENGINE1_SHUT_DOWN - Name: $v Entry: 7 - Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 10|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: APU_BLEED + Data: ENGINE1_SHUT_DOWN - Name: k__BackingField - Entry: 7 - Data: 12|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: A320VAU.FWS.FWSWarningMessageData, com.yuxiaviation.vau320neo - - Name: - Entry: 8 - Data: + Entry: 9 + Data: 3 - Name: k__BackingField Entry: 9 Data: 4 @@ -245,7 +233,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 11|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -266,16 +254,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: PARK_BRK + Data: ENGINE1_FAIL - Name: $v Entry: 7 - Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: PARK_BRK + Data: ENGINE1_FAIL - Name: k__BackingField Entry: 9 - Data: 12 + Data: 3 - Name: k__BackingField Entry: 9 Data: 4 @@ -293,7 +281,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 13|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -314,16 +302,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: APU_AVAIL + Data: ENGINE2_FAIL - Name: $v Entry: 7 - Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: APU_AVAIL + Data: ENGINE2_FAIL - Name: k__BackingField Entry: 9 - Data: 12 + Data: 3 - Name: k__BackingField Entry: 9 Data: 4 @@ -341,7 +329,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -362,16 +350,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: BRAKES_HOT + Data: ENGINE1_EGT_OVERLIMIT - Name: $v Entry: 7 - Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: BRAKES_HOT + Data: ENGINE1_EGT_OVERLIMIT - Name: k__BackingField Entry: 9 - Data: 12 + Data: 3 - Name: k__BackingField Entry: 9 Data: 4 @@ -389,7 +377,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -410,16 +398,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: ENGINE1_FIRE + Data: ENGINE2_EGT_OVERLIMIT - Name: $v Entry: 7 - Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: ENGINE1_FIRE + Data: ENGINE2_EGT_OVERLIMIT - Name: k__BackingField Entry: 9 - Data: 12 + Data: 3 - Name: k__BackingField Entry: 9 Data: 4 @@ -437,7 +425,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -458,16 +446,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: ENGINE2_FIRE + Data: ENGINE1_N1_OVERLIMIT - Name: $v Entry: 7 - Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: ENGINE2_FIRE + Data: ENGINE1_N1_OVERLIMIT - Name: k__BackingField Entry: 9 - Data: 12 + Data: 3 - Name: k__BackingField Entry: 9 Data: 4 @@ -485,7 +473,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -506,16 +494,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: DUAL_ENGINE_FAULT + Data: ENGINE2_N1_OVERLIMIT - Name: $v Entry: 7 - Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: DUAL_ENGINE_FAULT + Data: ENGINE2_N1_OVERLIMIT - Name: k__BackingField Entry: 9 - Data: 12 + Data: 3 - Name: k__BackingField Entry: 9 Data: 4 @@ -533,7 +521,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -554,16 +542,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: ENGINE1_SHUT_DOWN + Data: ENGINE1_N2_OVERLIMIT - Name: $v Entry: 7 - Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: ENGINE1_SHUT_DOWN + Data: ENGINE1_N2_OVERLIMIT - Name: k__BackingField Entry: 9 - Data: 12 + Data: 3 - Name: k__BackingField Entry: 9 Data: 4 @@ -581,7 +569,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -602,16 +590,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: ENGINE1_FAIL + Data: ENGINE2_N2_OVERLIMIT - Name: $v Entry: 7 - Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: ENGINE1_FAIL + Data: ENGINE2_N2_OVERLIMIT - Name: k__BackingField Entry: 9 - Data: 12 + Data: 3 - Name: k__BackingField Entry: 9 Data: 4 @@ -629,7 +617,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -650,16 +638,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: ENGINE2_FAIL + Data: TAKEOFF_MEMO - Name: $v Entry: 7 - Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: ENGINE2_FAIL + Data: TAKEOFF_MEMO - Name: k__BackingField Entry: 9 - Data: 12 + Data: 3 - Name: k__BackingField Entry: 9 Data: 4 @@ -677,7 +665,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -698,16 +686,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: ENGINE1_EGT_OVERLIMIT + Data: LANDING_MEMO - Name: $v Entry: 7 - Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: ENGINE1_EGT_OVERLIMIT + Data: LANDING_MEMO - Name: k__BackingField Entry: 9 - Data: 12 + Data: 3 - Name: k__BackingField Entry: 9 Data: 4 @@ -725,7 +713,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -746,16 +734,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: ENGINE2_EGT_OVERLIMIT + Data: BRAKES_HOT - Name: $v Entry: 7 - Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: ENGINE2_EGT_OVERLIMIT + Data: BRAKES_HOT - Name: k__BackingField Entry: 9 - Data: 12 + Data: 3 - Name: k__BackingField Entry: 9 Data: 4 @@ -773,7 +761,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -794,16 +782,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: ENGINE1_N1_OVERLIMIT + Data: FLAPS_NOT_IN_TAKEOFF_CONFIG - Name: $v Entry: 7 - Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: ENGINE1_N1_OVERLIMIT + Data: FLAPS_NOT_IN_TAKEOFF_CONFIG - Name: k__BackingField Entry: 9 - Data: 12 + Data: 3 - Name: k__BackingField Entry: 9 Data: 4 @@ -821,7 +809,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -842,16 +830,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: ENGINE2_N1_OVERLIMIT + Data: PARK_BRAKE_ON - Name: $v Entry: 7 - Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: ENGINE2_N1_OVERLIMIT + Data: PARK_BRAKE_ON - Name: k__BackingField Entry: 9 - Data: 12 + Data: 3 - Name: k__BackingField Entry: 9 Data: 4 @@ -869,7 +857,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -890,16 +878,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: ENGINE1_N2_OVERLIMIT + Data: APU_BLEED - Name: $v Entry: 7 - Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: ENGINE1_N2_OVERLIMIT + Data: APU_BLEED - Name: k__BackingField Entry: 9 - Data: 12 + Data: 3 - Name: k__BackingField Entry: 9 Data: 4 @@ -917,7 +905,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 39|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -938,16 +926,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: ENGINE2_N2_OVERLIMIT + Data: PARK_BRK - Name: $v Entry: 7 - Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: ENGINE2_N2_OVERLIMIT + Data: PARK_BRK - Name: k__BackingField Entry: 9 - Data: 12 + Data: 3 - Name: k__BackingField Entry: 9 Data: 4 @@ -965,7 +953,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -986,16 +974,16 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: FLAPS_NOT_IN_TAKEOFF_CONFIG + Data: APU_AVAIL - Name: $v Entry: 7 - Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: FLAPS_NOT_IN_TAKEOFF_CONFIG + Data: APU_AVAIL - Name: k__BackingField Entry: 9 - Data: 12 + Data: 3 - Name: k__BackingField Entry: 9 Data: 4 @@ -1013,7 +1001,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 43|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1034,16 +1022,22 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: PARK_BRAKE_ON + Data: FWS - Name: $v Entry: 7 - Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: PARK_BRAKE_ON + Data: FWS - Name: k__BackingField - Entry: 9 - Data: 12 + Entry: 7 + Data: 45|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: A320VAU.FWS.FWS, com.yuxiaviation.vau320neo + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 Data: 4 @@ -1058,10 +1052,10 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: true + Data: false - Name: _fieldAttributes Entry: 7 - Data: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1082,19 +1076,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: TAKEOFF_MEMO + Data: _hasWarningVisableChange - Name: $v Entry: 7 - Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: TAKEOFF_MEMO + Data: _hasWarningVisableChange - Name: k__BackingField - Entry: 9 - Data: 12 + Entry: 7 + Data: 48|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 4 + Data: 48 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1106,7 +1106,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: true + Data: false - Name: _fieldAttributes Entry: 7 Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -1130,19 +1130,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: LANDING_MEMO + Data: _hasWarningDataVisableChange - Name: $v Entry: 7 Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: LANDING_MEMO + Data: _hasWarningDataVisableChange - Name: k__BackingField Entry: 9 - Data: 12 + Data: 48 - Name: k__BackingField Entry: 9 - Data: 4 + Data: 48 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1154,7 +1154,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 5 - Data: true + Data: false - Name: _fieldAttributes Entry: 7 Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib diff --git a/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/RadioAltimeter.meta b/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/RadioAltimeter.meta new file mode 100644 index 00000000..4757c37a --- /dev/null +++ b/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/RadioAltimeter.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 242ea3ad380bb744d9bad8dcdb0c82b4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/RadioAltimeter/RadioAltimeter.asset b/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/RadioAltimeter/RadioAltimeter.asset new file mode 100644 index 00000000..d820fe54 --- /dev/null +++ b/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/RadioAltimeter/RadioAltimeter.asset @@ -0,0 +1,413 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} + m_Name: RadioAltimeter + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: 455559b81674cf64e89fe29e329eb118, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: 768c409c25a06f4418a973d7aee0d610, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 1 + hasInteractEvent: 0 + scriptID: 3046232910339149565 + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: fieldDefinitions + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition, + UdonSharp.Editor]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 7 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: groundLayers + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: groundLayers + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.LayerMask, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 3 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: queryTriggerInteraction + - Name: $v + Entry: 7 + Data: 5|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: queryTriggerInteraction + - Name: k__BackingField + Entry: 7 + Data: 6|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.QueryTriggerInteraction, UnityEngine.PhysicsModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 6 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 7|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: groundDetector + - Name: $v + Entry: 7 + Data: 8|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: groundDetector + - Name: k__BackingField + Entry: 7 + Data: 9|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Transform, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 9 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 10|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: offsetTransform + - Name: $v + Entry: 7 + Data: 11|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: offsetTransform + - Name: k__BackingField + Entry: 9 + Data: 9 + - Name: k__BackingField + Entry: 9 + Data: 9 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: k__BackingField + - Name: $v + Entry: 7 + Data: 13|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: k__BackingField + - Name: k__BackingField + Entry: 7 + Data: 14|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Single, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 14 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _maxRange + - Name: $v + Entry: 7 + Data: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _maxRange + - Name: k__BackingField + Entry: 9 + Data: 14 + - Name: k__BackingField + Entry: 9 + Data: 14 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _offset + - Name: $v + Entry: 7 + Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _offset + - Name: k__BackingField + Entry: 9 + Data: 14 + - Name: k__BackingField + Entry: 9 + Data: 14 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/RadioAltimeter/RadioAltimeter.asset.meta b/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/RadioAltimeter/RadioAltimeter.asset.meta new file mode 100644 index 00000000..2df480f5 --- /dev/null +++ b/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/RadioAltimeter/RadioAltimeter.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: de035c6f7012a5c44a310ca82f5ff58d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/RadioAltimeter/RadioAltimeter.cs b/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/RadioAltimeter/RadioAltimeter.cs new file mode 100644 index 00000000..d030e0a8 --- /dev/null +++ b/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/RadioAltimeter/RadioAltimeter.cs @@ -0,0 +1,48 @@ +using System; +using A320VAU.Common; +using EsnyaSFAddons.DFUNC; +using SaccFlightAndVehicles; +using UdonSharp; +using UnityEngine; +using UnityEngine.Serialization; + +namespace A320VAU.RadioAltimeter +{ + [UdonBehaviourSyncMode(BehaviourSyncMode.None)] + [DefaultExecutionOrder(1100)] + public class RadioAltimeter : UdonSharpBehaviour + { + public LayerMask groundLayers = -1; + public QueryTriggerInteraction queryTriggerInteraction = QueryTriggerInteraction.UseGlobal; + public Transform groundDetector, offsetTransform; + + public float radioAltitude { get; private set; } + + private float _maxRange; + private float _offset; + + private void Start() + { + _maxRange = 2500f; + _offset = Vector3.Dot(groundDetector.up, offsetTransform.position - groundDetector.position); + } + + public override void PostLateUpdate() + { + radioAltitude = GetRadioAltitude(); + } + + private float GetRadioAltitude() + { + var position = groundDetector.position; + if (Physics.Raycast(position, Vector3.down, out var hit, _maxRange * 0.3048f, groundLayers, queryTriggerInteraction)) + { + return (hit.distance + _offset) * 3.28084f; + } + else + { + return _maxRange * 0.3048f; + } + } + } +} \ No newline at end of file diff --git a/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/RadioAltimeter/RadioAltimeter.cs.meta b/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/RadioAltimeter/RadioAltimeter.cs.meta new file mode 100644 index 00000000..764f8130 --- /dev/null +++ b/Packages/com.yuxiaviation.vau320neo/Runtime/Avionics/Systems/RadioAltimeter/RadioAltimeter.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 768c409c25a06f4418a973d7aee0d610 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/com.yuxiaviation.vau320neo/Runtime/Prefab/A320neo_main 1217.prefab b/Packages/com.yuxiaviation.vau320neo/Runtime/Prefab/A320neo_main 1217.prefab index 67a9bdf1..cad52b82 100644 --- a/Packages/com.yuxiaviation.vau320neo/Runtime/Prefab/A320neo_main 1217.prefab +++ b/Packages/com.yuxiaviation.vau320neo/Runtime/Prefab/A320neo_main 1217.prefab @@ -965,7 +965,7 @@ Transform: - {fileID: 550474794} - {fileID: 990511367} m_Father: {fileID: 3829476551358980309} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &264533685 MonoBehaviour: @@ -989,9 +989,7 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 264533684} - FWSWarningMessageDatas: - - {fileID: 973616004} - FWSWarningData: {fileID: 550474796} + fwsWarningMessageDatas: [] ECAMController: {fileID: 3572449968105428486} Caution: {fileID: 8300000, guid: 6a403e1603ca26c4aad5ed91e8adc545, type: 3} MasterWarningLightCAPT: {fileID: 843549757796190665} @@ -1003,6 +1001,7 @@ MonoBehaviour: flightData: {fileID: 3572449967578959347} equipmentData: {fileID: 4211560334760174508} gpws: {fileID: 6150630952558812856} + radioAltimeter: {fileID: 0} _hasWarningVisableChange: 0 _hasWarningDataVisableChange: 0 altitudeCalloutIndexs: @@ -6824,7 +6823,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3829476551358980309} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &8466730824411319993 MonoBehaviour: @@ -11427,6 +11426,7 @@ Transform: m_LocalPosition: {x: 0, y: -2.9330003, z: -14.663002} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 7965273557102221592} - {fileID: 4953121554404723820} - {fileID: 1738602164} - {fileID: 1370026350170634217} @@ -12359,6 +12359,36 @@ MonoBehaviour: serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 +--- !u!1 &2115088246425288167 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7812013589545054357} + m_Layer: 17 + m_Name: Offset + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7812013589545054357 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2115088246425288167} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0, y: -1.83, z: 0.31} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 7145072113102430802} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2128693391229739489 GameObject: m_ObjectHideFlags: 0 @@ -12476,6 +12506,93 @@ MonoBehaviour: serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 +--- !u!1 &2169396414721890176 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7965273557102221592} + - component: {fileID: 5270620018772454786} + - component: {fileID: 4681679213320614293} + m_Layer: 17 + m_Name: RadioAltimeter + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7965273557102221592 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2169396414721890176} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1.4979999, z: 11.649995} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7145072113102430802} + m_Father: {fileID: 3829476551358980309} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5270620018772454786 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2169396414721890176} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 768c409c25a06f4418a973d7aee0d610, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 4681679213320614293} + groundLayers: + serializedVersion: 2 + m_Bits: 2065 + queryTriggerInteraction: 2 + groundDetector: {fileID: 7145072113102430802} + offsetTransform: {fileID: 7812013589545054357} +--- !u!114 &4681679213320614293 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2169396414721890176} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 2 + serializedProgramAsset: {fileID: 11400000, guid: 455559b81674cf64e89fe29e329eb118, + type: 2} + programSource: {fileID: 11400000, guid: de035c6f7012a5c44a310ca82f5ff58d, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 --- !u!1 &2276477054336189610 GameObject: m_ObjectHideFlags: 0 @@ -128455,20 +128572,18 @@ MonoBehaviour: engine2: {fileID: 3635232144300207691} apu: {fileID: 3882865037580002431} flaps: {fileID: 3466493618800849727} + gear: {fileID: 302414526} leftLadingGear: {fileID: 7279579797300646458} rightLadingGear: {fileID: 3686900799420031523} frontLadingGear: {fileID: 6454646389414024702} brake: {fileID: 3572449966622490354} landingLight: {fileID: 6023051700245188894} canopy: {fileID: 3572449967539369662} - navigationReceiver1: {fileID: 0} - navigationReceiver2: {fileID: 0} gpws: {fileID: 6150630952558812856} + radioAltimeter: {fileID: 5270620018772454786} fmgc: {fileID: 5822154038607928061} airbusAvionicsTheme: {fileID: 8466730824411319993} navaidDatabase: {fileID: 0} - navigationReceiver1Name: NaviReciver1 - navigationReceiver2Name: NaviReciver2 engine1Name: AdvancedEngineL engine2Name: AdvancedEngineR leftLadingGearName: AdvancedGear_L @@ -157726,7 +157841,7 @@ Transform: - {fileID: 2595637641956867559} - {fileID: 1839530179712460665} m_Father: {fileID: 3829476551358980309} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4305427813850644792 GameObject: @@ -163173,7 +163288,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3829476551358980309} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5822154038607928061 MonoBehaviour: @@ -165893,7 +166008,7 @@ Transform: m_Children: - {fileID: 1923460565622905803} m_Father: {fileID: 3829476551358980309} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &6150630952558812856 MonoBehaviour: @@ -165917,13 +166032,6 @@ MonoBehaviour: PrefabModifications: [] SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 2880076151694981609} - flightData: {fileID: 3572449967578959347} - groundLayers: - serializedVersion: 2 - m_Bits: 2065 - queryTriggerInteraction: 2 - groundDetector: {fileID: 1923460565622905803} - offsetTransorm: {fileID: 1316401758753318835} audioSource: {fileID: 2272872432976099562} bankAngleSound: {fileID: 0} sinkRateSound: {fileID: 8300000, guid: e39cb3e1e7244eb438f95451bf1edd1a, type: 3} @@ -168008,6 +168116,37 @@ Transform: m_Father: {fileID: 3572449968008115085} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &9191240458373101745 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7145072113102430802} + m_Layer: 17 + m_Name: GroundDetector + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7145072113102430802 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9191240458373101745} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -2.55, z: -15.55} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7812013589545054357} + m_Father: {fileID: 7965273557102221592} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1853776633 PrefabInstance: m_ObjectHideFlags: 0 @@ -169327,15 +169466,9 @@ PrefabInstance: type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dc24ebb95cee31740bfafb6d263e0d9c, type: 3} ---- !u!1 &3997595167572671853 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3784576087113890372, guid: dc24ebb95cee31740bfafb6d263e0d9c, - type: 3} - m_PrefabInstance: {fileID: 288173724444706601} - m_PrefabAsset: {fileID: 0} ---- !u!1 &3997595167699144877 stripped +--- !u!1 &3997595166830923001 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 3784576086976124804, guid: dc24ebb95cee31740bfafb6d263e0d9c, + m_CorrespondingSourceObject: {fileID: 3784576087852731344, guid: dc24ebb95cee31740bfafb6d263e0d9c, type: 3} m_PrefabInstance: {fileID: 288173724444706601} m_PrefabAsset: {fileID: 0} @@ -169351,9 +169484,15 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 288173724444706601} m_PrefabAsset: {fileID: 0} ---- !u!1 &3997595166830923001 stripped +--- !u!1 &3997595167572671853 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 3784576087852731344, guid: dc24ebb95cee31740bfafb6d263e0d9c, + m_CorrespondingSourceObject: {fileID: 3784576087113890372, guid: dc24ebb95cee31740bfafb6d263e0d9c, + type: 3} + m_PrefabInstance: {fileID: 288173724444706601} + m_PrefabAsset: {fileID: 0} +--- !u!1 &3997595167699144877 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3784576086976124804, guid: dc24ebb95cee31740bfafb6d263e0d9c, type: 3} m_PrefabInstance: {fileID: 288173724444706601} m_PrefabAsset: {fileID: 0} @@ -170015,12 +170154,18 @@ PrefabInstance: type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dc24ebb95cee31740bfafb6d263e0d9c, type: 3} ---- !u!1 &3572449967130635095 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 3784576086976124804, guid: dc24ebb95cee31740bfafb6d263e0d9c, +--- !u!114 &5039985593798435103 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4676926119649877452, guid: dc24ebb95cee31740bfafb6d263e0d9c, type: 3} m_PrefabInstance: {fileID: 366594455572790483} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 507a7d663a014804ebfa233d46720a3f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &3572449967536031383 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3784576087113890372, guid: dc24ebb95cee31740bfafb6d263e0d9c, @@ -170033,42 +170178,36 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 366594455572790483} m_PrefabAsset: {fileID: 0} ---- !u!114 &5039985593798435103 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4676926119649877452, guid: dc24ebb95cee31740bfafb6d263e0d9c, +--- !u!1 &3572449967130635095 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3784576086976124804, guid: dc24ebb95cee31740bfafb6d263e0d9c, type: 3} m_PrefabInstance: {fileID: 366594455572790483} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 507a7d663a014804ebfa233d46720a3f, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &7135427586658265359 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7354455306329576924, guid: dc24ebb95cee31740bfafb6d263e0d9c, +--- !u!4 &3572449967386229139 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3784576087332373824, guid: dc24ebb95cee31740bfafb6d263e0d9c, type: 3} m_PrefabInstance: {fileID: 366594455572790483} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3572449967386229138} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6733f2998b7d58c49aed282c01d74257, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &3572449967386229138 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3784576087332373825, guid: dc24ebb95cee31740bfafb6d263e0d9c, type: 3} m_PrefabInstance: {fileID: 366594455572790483} m_PrefabAsset: {fileID: 0} ---- !u!4 &3572449967386229139 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3784576087332373824, guid: dc24ebb95cee31740bfafb6d263e0d9c, +--- !u!114 &7135427586658265359 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7354455306329576924, guid: dc24ebb95cee31740bfafb6d263e0d9c, type: 3} m_PrefabInstance: {fileID: 366594455572790483} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3572449967386229138} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6733f2998b7d58c49aed282c01d74257, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &414590168506935914 PrefabInstance: m_ObjectHideFlags: 0 @@ -171323,6 +171462,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0d77e1b72b3727c468a66cc5ea2d3fe1, type: 3} +--- !u!4 &3572449967277355478 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8507819491703238493, guid: 0d77e1b72b3727c468a66cc5ea2d3fe1, + type: 3} + m_PrefabInstance: {fileID: 5152747517492960907} + m_PrefabAsset: {fileID: 0} --- !u!114 &3825678279838664612 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8256706364718946607, guid: 0d77e1b72b3727c468a66cc5ea2d3fe1, @@ -171335,12 +171480,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6dff5fb8dcb73cc4f898ffa74817617d, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &3572449967277355478 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8507819491703238493, guid: 0d77e1b72b3727c468a66cc5ea2d3fe1, - type: 3} - m_PrefabInstance: {fileID: 5152747517492960907} - m_PrefabAsset: {fileID: 0} --- !u!1001 &5651637445400766085 PrefabInstance: m_ObjectHideFlags: 0 @@ -171513,18 +171652,18 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 5651637445400766085} m_PrefabAsset: {fileID: 0} ---- !u!1 &8180250120109682463 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4605124634110806426, guid: 6a53ce0d9aea2c04d8c92f42351f8525, - type: 3} - m_PrefabInstance: {fileID: 5651637445400766085} - m_PrefabAsset: {fileID: 0} --- !u!224 &8792987318424809646 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 3776357557930628651, guid: 6a53ce0d9aea2c04d8c92f42351f8525, type: 3} m_PrefabInstance: {fileID: 5651637445400766085} m_PrefabAsset: {fileID: 0} +--- !u!1 &8180250120109682463 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4605124634110806426, guid: 6a53ce0d9aea2c04d8c92f42351f8525, + type: 3} + m_PrefabInstance: {fileID: 5651637445400766085} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5849028664528992399 PrefabInstance: m_ObjectHideFlags: 0 @@ -173188,45 +173327,45 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 46562e3d74eca584680653dec66d42c7, type: 3} ---- !u!4 &5917235337964203235 stripped +--- !u!4 &6242365021099040612 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8992049475569757076, guid: 46562e3d74eca584680653dec66d42c7, + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 46562e3d74eca584680653dec66d42c7, type: 3} m_PrefabInstance: {fileID: 5849028664528992399} m_PrefabAsset: {fileID: 0} ---- !u!4 &2577314020566854602 stripped +--- !u!4 &2531995196829424880 stripped Transform: - m_CorrespondingSourceObject: {fileID: -941364579800804539, guid: 46562e3d74eca584680653dec66d42c7, + m_CorrespondingSourceObject: {fileID: 8216985349714388095, guid: 46562e3d74eca584680653dec66d42c7, type: 3} m_PrefabInstance: {fileID: 5849028664528992399} m_PrefabAsset: {fileID: 0} ---- !u!4 &2531995196829424880 stripped +--- !u!4 &7084224024238002241 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8216985349714388095, guid: 46562e3d74eca584680653dec66d42c7, + m_CorrespondingSourceObject: {fileID: -5513579518219163442, guid: 46562e3d74eca584680653dec66d42c7, type: 3} m_PrefabInstance: {fileID: 5849028664528992399} m_PrefabAsset: {fileID: 0} ---- !u!4 &8861572999667744336 stripped +--- !u!4 &2577314020566854602 stripped Transform: - m_CorrespondingSourceObject: {fileID: -6065982397584734497, guid: 46562e3d74eca584680653dec66d42c7, + m_CorrespondingSourceObject: {fileID: -941364579800804539, guid: 46562e3d74eca584680653dec66d42c7, type: 3} m_PrefabInstance: {fileID: 5849028664528992399} m_PrefabAsset: {fileID: 0} ---- !u!4 &8972271107760329150 stripped +--- !u!4 &8861572999667744336 stripped Transform: - m_CorrespondingSourceObject: {fileID: 3289885702763702577, guid: 46562e3d74eca584680653dec66d42c7, + m_CorrespondingSourceObject: {fileID: -6065982397584734497, guid: 46562e3d74eca584680653dec66d42c7, type: 3} m_PrefabInstance: {fileID: 5849028664528992399} m_PrefabAsset: {fileID: 0} ---- !u!4 &6242365021099040612 stripped +--- !u!4 &5917235337964203235 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 46562e3d74eca584680653dec66d42c7, + m_CorrespondingSourceObject: {fileID: -8992049475569757076, guid: 46562e3d74eca584680653dec66d42c7, type: 3} m_PrefabInstance: {fileID: 5849028664528992399} m_PrefabAsset: {fileID: 0} ---- !u!4 &7084224024238002241 stripped +--- !u!4 &8972271107760329150 stripped Transform: - m_CorrespondingSourceObject: {fileID: -5513579518219163442, guid: 46562e3d74eca584680653dec66d42c7, + m_CorrespondingSourceObject: {fileID: 3289885702763702577, guid: 46562e3d74eca584680653dec66d42c7, type: 3} m_PrefabInstance: {fileID: 5849028664528992399} m_PrefabAsset: {fileID: 0} @@ -173852,9 +173991,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6a53ce0d9aea2c04d8c92f42351f8525, type: 3} ---- !u!1 &2143594274121598478 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5033408483889229644, guid: 6a53ce0d9aea2c04d8c92f42351f8525, +--- !u!224 &7786020941794049897 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3776357557930628651, guid: 6a53ce0d9aea2c04d8c92f42351f8525, type: 3} m_PrefabInstance: {fileID: 6369728126103316802} m_PrefabAsset: {fileID: 0} @@ -173864,9 +174003,9 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 6369728126103316802} m_PrefabAsset: {fileID: 0} ---- !u!224 &7786020941794049897 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3776357557930628651, guid: 6a53ce0d9aea2c04d8c92f42351f8525, +--- !u!1 &2143594274121598478 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5033408483889229644, guid: 6a53ce0d9aea2c04d8c92f42351f8525, type: 3} m_PrefabInstance: {fileID: 6369728126103316802} m_PrefabAsset: {fileID: 0} @@ -176478,12 +176617,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9bb87407681cb9f41ba54cef51b2f6d4, type: 3} ---- !u!4 &1889970050171217382 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8118524648773481477, guid: 9bb87407681cb9f41ba54cef51b2f6d4, - type: 3} - m_PrefabInstance: {fileID: 7678723780397519331} - m_PrefabAsset: {fileID: 0} --- !u!114 &2215467337905017748 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8371810548223787639, guid: 9bb87407681cb9f41ba54cef51b2f6d4, @@ -176496,6 +176629,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6dff5fb8dcb73cc4f898ffa74817617d, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!4 &1889970050171217382 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8118524648773481477, guid: 9bb87407681cb9f41ba54cef51b2f6d4, + type: 3} + m_PrefabInstance: {fileID: 7678723780397519331} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7720272665603490038 PrefabInstance: m_ObjectHideFlags: 0 @@ -176785,27 +176924,15 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9d09ffe7c7aaed844b02f1d799050291, type: 3} ---- !u!4 &1917138628610871904 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6941183710941341949, guid: 9d09ffe7c7aaed844b02f1d799050291, - type: 3} - m_PrefabInstance: {fileID: 8849294696152119965} - m_PrefabAsset: {fileID: 0} ---- !u!1 &485556640720223255 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 8967240334149994122, guid: 9d09ffe7c7aaed844b02f1d799050291, - type: 3} - m_PrefabInstance: {fileID: 8849294696152119965} - m_PrefabAsset: {fileID: 0} --- !u!1 &485556640319150407 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8967240334550180826, guid: 9d09ffe7c7aaed844b02f1d799050291, type: 3} m_PrefabInstance: {fileID: 8849294696152119965} m_PrefabAsset: {fileID: 0} ---- !u!1 &485556641617050992 stripped +--- !u!1 &173983278912747189 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 8967240333285869549, guid: 9d09ffe7c7aaed844b02f1d799050291, + m_CorrespondingSourceObject: {fileID: 8693388178676419624, guid: 9d09ffe7c7aaed844b02f1d799050291, type: 3} m_PrefabInstance: {fileID: 8849294696152119965} m_PrefabAsset: {fileID: 0} @@ -176815,9 +176942,15 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 8849294696152119965} m_PrefabAsset: {fileID: 0} ---- !u!1 &173983278912747189 stripped +--- !u!1 &485556640720223255 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 8693388178676419624, guid: 9d09ffe7c7aaed844b02f1d799050291, + m_CorrespondingSourceObject: {fileID: 8967240334149994122, guid: 9d09ffe7c7aaed844b02f1d799050291, + type: 3} + m_PrefabInstance: {fileID: 8849294696152119965} + m_PrefabAsset: {fileID: 0} +--- !u!1 &485556641617050992 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8967240333285869549, guid: 9d09ffe7c7aaed844b02f1d799050291, type: 3} m_PrefabInstance: {fileID: 8849294696152119965} m_PrefabAsset: {fileID: 0} @@ -176827,3 +176960,9 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 8849294696152119965} m_PrefabAsset: {fileID: 0} +--- !u!4 &1917138628610871904 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6941183710941341949, guid: 9d09ffe7c7aaed844b02f1d799050291, + type: 3} + m_PrefabInstance: {fileID: 8849294696152119965} + m_PrefabAsset: {fileID: 0}