diff --git a/Assets/GameAssets/Prefebs/Models/WRJ/RadioAngleView.prefab b/Assets/GameAssets/Prefebs/Models/WRJ/RadioAngleView.prefab index b0df6ec5..275ac450 100644 --- a/Assets/GameAssets/Prefebs/Models/WRJ/RadioAngleView.prefab +++ b/Assets/GameAssets/Prefebs/Models/WRJ/RadioAngleView.prefab @@ -475,7 +475,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5661051786863276578 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UIPanel/Training_pilot_panl.prefab b/Assets/Resources/UIPanel/Training_pilot_panl.prefab index d17d6091..6793eb34 100644 --- a/Assets/Resources/UIPanel/Training_pilot_panl.prefab +++ b/Assets/Resources/UIPanel/Training_pilot_panl.prefab @@ -746,125 +746,6 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u7ED3\u675F\u6F14\u7EC3" ---- !u!1 &2602178730647806783 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6004446956045847452} - - component: {fileID: 5569109176832175815} - - component: {fileID: 5436201971426386749} - - component: {fileID: 932264985702432863} - m_Layer: 5 - m_Name: "\u6001\u52BF" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6004446956045847452 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2602178730647806783} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 5023455744183058547} - m_Father: {fileID: 5855821741811488939} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 800, y: 400} - m_SizeDelta: {x: 138, y: 41} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5569109176832175815 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2602178730647806783} - m_CullTransparentMesh: 0 ---- !u!114 &5436201971426386749 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2602178730647806783} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7a62f982c6b82d0468dbeb46934c7b76, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &932264985702432863 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2602178730647806783} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 2 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 21300000, guid: 02f4d08c9858d234496c1131127f6df9, type: 3} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 5436201971426386749} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!1 &2664863769300752706 GameObject: m_ObjectHideFlags: 0 @@ -1057,84 +938,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!1 &3528446423698543118 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3167849659523605952} - - component: {fileID: 3836707014670237944} - - component: {fileID: 2627494934905031891} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3167849659523605952 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3528446423698543118} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} - m_Children: [] - m_Father: {fileID: 8124937490118142283} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.00009918213, y: -0.000047683716} - m_SizeDelta: {x: 322.00043, y: 95.66644} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3836707014670237944 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3528446423698543118} - m_CullTransparentMesh: 0 ---- !u!114 &2627494934905031891 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3528446423698543118} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.9811321, g: 0.9302243, b: 0.9302243, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 80 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 80 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u5F00\u59CB\u63A8\u6F14" --- !u!1 &5589895292110777514 GameObject: m_ObjectHideFlags: 0 @@ -2268,8 +2071,6 @@ RectTransform: - {fileID: 78139658} - {fileID: 1565322411} - {fileID: 2509213301309598130} - - {fileID: 8124937490118142283} - - {fileID: 6004446956045847452} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3672,200 +3473,3 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7494409985008885670 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8124937490118142283} - - component: {fileID: 1958230682657817026} - - component: {fileID: 4086470763841674606} - - component: {fileID: 4958548409271537096} - m_Layer: 5 - m_Name: initiate_botn - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &8124937490118142283 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7494409985008885670} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 3167849659523605952} - m_Father: {fileID: 5855821741811488939} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 800, y: 400} - m_SizeDelta: {x: 138, y: 41} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1958230682657817026 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7494409985008885670} - m_CullTransparentMesh: 0 ---- !u!114 &4086470763841674606 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7494409985008885670} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7a62f982c6b82d0468dbeb46934c7b76, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!114 &4958548409271537096 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7494409985008885670} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 2 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 21300000, guid: 02f4d08c9858d234496c1131127f6df9, type: 3} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 4086470763841674606} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &7801122366378610123 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5023455744183058547} - - component: {fileID: 4422744379698825382} - - component: {fileID: 6213471855567082455} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5023455744183058547 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7801122366378610123} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} - m_Children: [] - m_Father: {fileID: 6004446956045847452} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.00009918213, y: -0.000047683716} - m_SizeDelta: {x: 322.00043, y: 95.66644} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4422744379698825382 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7801122366378610123} - m_CullTransparentMesh: 0 ---- !u!114 &6213471855567082455 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7801122366378610123} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.9811321, g: 0.9302243, b: 0.9302243, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 80 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 80 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u8FDB\u5165\u6001\u52BF" diff --git a/Assets/Temp/Scripts/Scenariopage.cs b/Assets/Temp/Scripts/Scenariopage.cs index f7a2661e..ecc04c3f 100644 --- a/Assets/Temp/Scripts/Scenariopage.cs +++ b/Assets/Temp/Scripts/Scenariopage.cs @@ -567,6 +567,7 @@ public class Scenariopage : MonoBehaviour { toggleprobes[i].isOn = false; } + toggleprobes[0].isOn = true; Slider_Successful1.value = 0; Slider_respond.value = 0; Slider_precision.value = 0; @@ -830,8 +831,8 @@ public class Scenariopage : MonoBehaviour Toggle5.isOn = false; Toggle6.isOn = false; Toggle7.isOn = false; - toggle1.isOn = true; - toggle8.isOn = false; + toggle8.isOn = true; + toggle9.isOn = false; } radar_panl.gameObject.SetActive(false); @@ -1082,6 +1083,7 @@ public class Scenariopage : MonoBehaviour { togglesdisturbs[i].isOn = false; } + togglesdisturbs[0].isOn = true; Toggle_Drive.isOn = true; Dropdown_power.value = 0; Slider_angle.value = 0; diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity index c280b3f3..3f4cf388 100644 --- a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity +++ b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 1113159741} - m_IndirectSpecularColor: {r: 0.16228974, g: 0.30605963, b: 0.6690127, a: 1} + m_IndirectSpecularColor: {r: 0.16234884, g: 0.30607942, b: 0.6687164, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -6696,6 +6696,131 @@ RectTransform: m_AnchoredPosition: {x: -47, y: -7} m_SizeDelta: {x: 379.45496, y: 52.651123} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &109340334 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 147647011} + m_Modifications: + - target: {fileID: 9088936257154008812, guid: cf122010443e3604895bdfb8410700d5, + type: 3} + propertyPath: m_Name + value: Tips + objectReference: {fileID: 0} + - target: {fileID: 9088936257154008813, guid: cf122010443e3604895bdfb8410700d5, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9088936257154008813, guid: cf122010443e3604895bdfb8410700d5, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9088936257154008813, guid: cf122010443e3604895bdfb8410700d5, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9088936257154008813, guid: cf122010443e3604895bdfb8410700d5, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9088936257154008813, guid: cf122010443e3604895bdfb8410700d5, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9088936257154008813, guid: cf122010443e3604895bdfb8410700d5, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9088936257154008813, guid: cf122010443e3604895bdfb8410700d5, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9088936257154008813, guid: cf122010443e3604895bdfb8410700d5, + type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 9088936257154008813, guid: cf122010443e3604895bdfb8410700d5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9088936257154008813, guid: cf122010443e3604895bdfb8410700d5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9088936257154008813, guid: cf122010443e3604895bdfb8410700d5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9088936257154008813, guid: cf122010443e3604895bdfb8410700d5, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -228.70001 + objectReference: {fileID: 0} + - target: {fileID: 9088936257154008813, guid: cf122010443e3604895bdfb8410700d5, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 156.70001 + objectReference: {fileID: 0} + - target: {fileID: 9088936257154008813, guid: cf122010443e3604895bdfb8410700d5, + type: 3} + propertyPath: m_SizeDelta.x + value: 457.29932 + objectReference: {fileID: 0} + - target: {fileID: 9088936257154008813, guid: cf122010443e3604895bdfb8410700d5, + type: 3} + propertyPath: m_SizeDelta.y + value: 313.45807 + objectReference: {fileID: 0} + - target: {fileID: 9088936257154008813, guid: cf122010443e3604895bdfb8410700d5, + type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9088936257154008813, guid: cf122010443e3604895bdfb8410700d5, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9088936257154008813, guid: cf122010443e3604895bdfb8410700d5, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9088936257154008813, guid: cf122010443e3604895bdfb8410700d5, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9088936257154008813, guid: cf122010443e3604895bdfb8410700d5, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 9088936257154008813, guid: cf122010443e3604895bdfb8410700d5, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cf122010443e3604895bdfb8410700d5, type: 3} +--- !u!224 &109340335 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 9088936257154008813, guid: cf122010443e3604895bdfb8410700d5, + type: 3} + m_PrefabInstance: {fileID: 109340334} + m_PrefabAsset: {fileID: 0} --- !u!1 &125837377 GameObject: m_ObjectHideFlags: 0 @@ -7168,6 +7293,7 @@ RectTransform: - {fileID: 522047489} - {fileID: 1585142379} - {fileID: 1423699382} + - {fileID: 109340335} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -72521,7 +72647,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: 706678875 + randSeed: 90549796 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &1820978574 diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 3.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 3.unity index 27729164..76a319ed 100644 Binary files a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 3.unity and b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 3.unity differ diff --git a/Assets/Zion/Scripts/WRJ0125/RadioAngleView.cs b/Assets/Zion/Scripts/WRJ0125/RadioAngleView.cs index ff02afc0..fdacbade 100644 --- a/Assets/Zion/Scripts/WRJ0125/RadioAngleView.cs +++ b/Assets/Zion/Scripts/WRJ0125/RadioAngleView.cs @@ -45,11 +45,11 @@ public class RadioAngleView : MonoBehaviour //btnAmplification = transform.Find("放大查看").GetComponent