diff --git a/Assets/Resources/UIPanel/Training_pilot_panl.prefab b/Assets/Resources/UIPanel/Training_pilot_panl.prefab
index 2a7895ea..3168e8b3 100644
--- a/Assets/Resources/UIPanel/Training_pilot_panl.prefab
+++ b/Assets/Resources/UIPanel/Training_pilot_panl.prefab
@@ -1,5 +1,202 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &78139657
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 78139658}
+ - component: {fileID: 78139661}
+ - component: {fileID: 78139660}
+ - component: {fileID: 78139659}
+ 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 &78139658
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 78139657}
+ 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: 1779143264}
+ m_Father: {fileID: 5855821741811488939}
+ m_RootOrder: 3
+ 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 &78139661
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 78139657}
+ m_CullTransparentMesh: 0
+--- !u!114 &78139660
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 78139657}
+ 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 &78139659
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 78139657}
+ 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: 78139660}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!1 &1091505609
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1091505610}
+ - component: {fileID: 1091505612}
+ - component: {fileID: 1091505611}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1091505610
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1091505609}
+ 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: 1565322411}
+ 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 &1091505612
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1091505609}
+ m_CullTransparentMesh: 0
+--- !u!114 &1091505611
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1091505609}
+ 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"
--- !u!1 &1412379811
GameObject:
m_ObjectHideFlags: 0
@@ -118,6 +315,281 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
+--- !u!1 &1565322410
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1565322411}
+ - component: {fileID: 1565322414}
+ - component: {fileID: 1565322413}
+ - component: {fileID: 1565322412}
+ 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 &1565322411
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1565322410}
+ 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: 1091505610}
+ m_Father: {fileID: 5855821741811488939}
+ m_RootOrder: 4
+ 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 &1565322414
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1565322410}
+ m_CullTransparentMesh: 0
+--- !u!114 &1565322413
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1565322410}
+ 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 &1565322412
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1565322410}
+ 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: 1565322413}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!1 &1695597036
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1695597037}
+ - component: {fileID: 1695597039}
+ - component: {fileID: 1695597038}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &1695597037
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1695597036}
+ 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: []
+ m_Father: {fileID: 5855821741811488939}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 500, y: 300}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1695597039
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1695597036}
+ m_CullTransparentMesh: 0
+--- !u!114 &1695597038
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1695597036}
+ 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.9579922, b: 0.9579922, 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: 200
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 0
+ m_MaxSize: 300
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text:
+--- !u!1 &1779143263
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1779143264}
+ - component: {fileID: 1779143266}
+ - component: {fileID: 1779143265}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1779143264
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1779143263}
+ 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: 78139658}
+ 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 &1779143266
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1779143263}
+ m_CullTransparentMesh: 0
+--- !u!114 &1779143265
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1779143263}
+ 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 &2664863769300752706
GameObject:
m_ObjectHideFlags: 0
@@ -288,7 +760,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &5855821740938569026
RectTransform:
m_ObjectHideFlags: 0
@@ -306,7 +778,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 300, y: 12}
+ m_AnchoredPosition: {x: 450, y: 12}
m_SizeDelta: {x: 31, y: 31}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5855821740938569025
@@ -781,7 +1253,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
- m_AnchoredPosition: {x: 0, y: 40}
+ m_AnchoredPosition: {x: 0, y: 36.69995}
m_SizeDelta: {x: 1920, y: 73}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5855821741515730285
@@ -834,12 +1306,12 @@ GameObject:
- component: {fileID: 5855821741593404599}
- component: {fileID: 5855821741593404598}
m_Layer: 5
- m_Name: "\u542F\u52A8"
+ m_Name: finish
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &5855821741593404593
RectTransform:
m_ObjectHideFlags: 0
@@ -1049,7 +1521,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -130, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 40, y: 41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5855821741614971531
@@ -1119,7 +1591,7 @@ MonoBehaviour:
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
- m_SelectedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 21300000, guid: 47390e15134f347458cdb6364e799ffc, type: 3}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
@@ -1240,6 +1712,9 @@ RectTransform:
m_Children:
- {fileID: 5855821742696231877}
- {fileID: 5855821741515730287}
+ - {fileID: 1695597037}
+ - {fileID: 78139658}
+ - {fileID: 1565322411}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1260,21 +1735,21 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8cc5b0ca4594d7845a3d00cc6b7371d6, type: 3}
m_Name:
m_EditorClassIdentifier:
- fanhui1: {fileID: 0}
- off_btn: {fileID: 0}
- initiate_btn: {fileID: 0}
- Pause_btn: {fileID: 0}
- finish_btn: {fileID: 0}
- countdown_text: {fileID: 0}
+ fanhui1: {fileID: 5855821741890996493}
+ off_btn: {fileID: 5855821742602621133}
+ initiate_btn: {fileID: 5855821741614971573}
+ Pause_btn: {fileID: 5855821741812748374}
+ finish_btn: {fileID: 5855821741593404598}
+ countdown_text: {fileID: 1695597038}
isp: 0
a: 5
competitioncontentpanl: {fileID: 0}
- content_bton: {fileID: 0}
+ content_bton: {fileID: 5855821742456550828}
seatpanl: {fileID: 0}
- message_btn: {fileID: 0}
+ message_btn: {fileID: 5855821741819214776}
modellinkedlistpanl: {fileID: 0}
- model2_btn: {fileID: 0}
- initiate_botn: {fileID: 0}
+ model2_btn: {fileID: 5855821740938569027}
+ initiate_botn: {fileID: 78139659}
--- !u!1 &5855821741812748368
GameObject:
m_ObjectHideFlags: 0
@@ -1293,7 +1768,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &5855821741812748369
RectTransform:
m_ObjectHideFlags: 0
@@ -1310,7 +1785,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -130, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 40, y: 41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5855821741812748372
@@ -1340,7 +1815,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 21300000, guid: f5d91a28a8b20e14e88757dacb1e1e5d, type: 3}
+ m_Sprite: {fileID: 21300000, guid: 47390e15134f347458cdb6364e799ffc, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -1489,7 +1964,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &5855821741819214779
RectTransform:
m_ObjectHideFlags: 0
@@ -1863,7 +2338,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: "\u8BAD\u7EC3\u5BFC\u8C03\u7CFB\u7EDF"
+ m_Text: "\u8BAD\u7EC3\u5BFC\u8C03\u7AEF"
--- !u!1 &5855821742140429978
GameObject:
m_ObjectHideFlags: 0
@@ -1960,7 +2435,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &5855821742187232579
RectTransform:
m_ObjectHideFlags: 0
@@ -2110,6 +2585,7 @@ GameObject:
- component: {fileID: 5855821742305114458}
- component: {fileID: 5855821742305114456}
- component: {fileID: 5855821742305114459}
+ - component: {fileID: 1395352661}
m_Layer: 5
m_Name: "\u65F6\u95F4"
m_TagString: Untagged
@@ -2176,7 +2652,20 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: "2023\u5E7410\u670810\u65E5 12\uFF1A23\uFF1A33"
+ m_Text:
+--- !u!114 &1395352661
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 5855821742305114437}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 7acfba70dcc2e8144997db2bbb3d1318, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ time: {fileID: 5855821742305114459}
--- !u!1 &5855821742456550830
GameObject:
m_ObjectHideFlags: 0
@@ -2195,7 +2684,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &5855821742456550831
RectTransform:
m_ObjectHideFlags: 0
@@ -2432,7 +2921,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &5855821742633352628
RectTransform:
m_ObjectHideFlags: 0
diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity
index 1411dcf4..c3d2a2ae 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.1623277, g: 0.30598003, b: 0.66832066, a: 1}
+ m_IndirectSpecularColor: {r: 0.16220906, g: 0.30600852, b: 0.66929173, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -6193,125 +6193,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
---- !u!1 &78139657
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 78139658}
- - component: {fileID: 78139661}
- - component: {fileID: 78139660}
- - component: {fileID: 78139659}
- 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 &78139658
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 78139657}
- 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: 1779143264}
- m_Father: {fileID: 1923624323}
- m_RootOrder: 3
- 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!114 &78139659
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 78139657}
- 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: 78139660}
- m_OnClick:
- m_PersistentCalls:
- m_Calls: []
---- !u!114 &78139660
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 78139657}
- 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!222 &78139661
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 78139657}
- m_CullTransparentMesh: 0
--- !u!1 &81847170
GameObject:
m_ObjectHideFlags: 0
@@ -6561,18 +6442,6 @@ RectTransform:
m_AnchoredPosition: {x: -47, y: -7}
m_SizeDelta: {x: 379.45496, y: 52.651123}
m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &115478587 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 5855821741614971573, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- m_PrefabInstance: {fileID: 1923624322}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!1 &125837377
GameObject:
m_ObjectHideFlags: 0
@@ -8038,18 +7907,6 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 198973212}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
---- !u!114 &199054390 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 5855821740938569027, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- m_PrefabInstance: {fileID: 1923624322}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!1 &200191025
GameObject:
m_ObjectHideFlags: 0
@@ -14404,18 +14261,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 293106569}
m_CullTransparentMesh: 0
---- !u!114 &305432344 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 5855821741890996493, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- m_PrefabInstance: {fileID: 1923624322}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!1001 &306624956
PrefabInstance:
m_ObjectHideFlags: 0
@@ -20751,18 +20596,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 410625768}
m_CullTransparentMesh: 0
---- !u!114 &411057009 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 5855821741812748374, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- m_PrefabInstance: {fileID: 1923624322}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!1 &413808733
GameObject:
m_ObjectHideFlags: 0
@@ -20965,18 +20798,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 417348009}
m_CullTransparentMesh: 0
---- !u!114 &418148654 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 5855821742456550828, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- m_PrefabInstance: {fileID: 1923624322}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!1 &425639434
GameObject:
m_ObjectHideFlags: 0
@@ -50142,84 +49963,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1088861080}
m_CullTransparentMesh: 0
---- !u!1 &1091505609
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1091505610}
- - component: {fileID: 1091505612}
- - component: {fileID: 1091505611}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1091505610
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1091505609}
- 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: 1565322411}
- 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!114 &1091505611
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1091505609}
- 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"
---- !u!222 &1091505612
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1091505609}
- m_CullTransparentMesh: 0
--- !u!1 &1097525982
GameObject:
m_ObjectHideFlags: 0
@@ -51949,18 +51692,6 @@ Transform:
m_Father: {fileID: 338275145}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1242325903 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 5855821741819214776, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- m_PrefabInstance: {fileID: 1923624322}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!1 &1243387091
GameObject:
m_ObjectHideFlags: 0
@@ -53710,37 +53441,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1395060513}
m_CullTransparentMesh: 0
---- !u!1 &1395352660 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 5855821742305114437, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- m_PrefabInstance: {fileID: 1923624322}
- m_PrefabAsset: {fileID: 0}
---- !u!114 &1395352661
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1395352660}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 7acfba70dcc2e8144997db2bbb3d1318, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- time: {fileID: 1395352662}
---- !u!114 &1395352662 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 5855821742305114459, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- m_PrefabInstance: {fileID: 1923624322}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1395352660}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!1 &1398729638
GameObject:
m_ObjectHideFlags: 0
@@ -55017,18 +54717,6 @@ Light:
m_UseBoundingSphereOverride: 0
m_ShadowRadius: 0
m_ShadowAngle: 0
---- !u!114 &1453259149 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 5855821741593404598, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- m_PrefabInstance: {fileID: 1923624322}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
- m_Name:
- m_EditorClassIdentifier:
--- !u!1 &1454380842
GameObject:
m_ObjectHideFlags: 0
@@ -65514,125 +65202,18 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1565299796}
m_CullTransparentMesh: 0
---- !u!1 &1565322410
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1565322411}
- - component: {fileID: 1565322414}
- - component: {fileID: 1565322413}
- - component: {fileID: 1565322412}
- 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 &1565322411
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1565322410}
- 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: 1091505610}
- m_Father: {fileID: 1923624323}
- m_RootOrder: 4
- 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!114 &1565322412
+--- !u!114 &1565322412 stripped
MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
+ m_CorrespondingSourceObject: {fileID: 1565322412, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
+ type: 3}
+ m_PrefabInstance: {fileID: 1923624322}
m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1565322410}
+ m_GameObject: {fileID: 0}
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: 1565322413}
- m_OnClick:
- m_PersistentCalls:
- m_Calls: []
---- !u!114 &1565322413
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1565322410}
- 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!222 &1565322414
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1565322410}
- m_CullTransparentMesh: 0
--- !u!1 &1566619606
GameObject:
m_ObjectHideFlags: 0
@@ -67924,84 +67505,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 28}
m_Pivot: {x: 0.5, y: 1}
---- !u!1 &1695597036
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1695597037}
- - component: {fileID: 1695597039}
- - component: {fileID: 1695597038}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!224 &1695597037
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1695597036}
- 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: []
- m_Father: {fileID: 1923624323}
- m_RootOrder: 2
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0.5}
- m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 500, y: 300}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &1695597038
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1695597036}
- 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.9579922, b: 0.9579922, 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: 200
- m_FontStyle: 0
- m_BestFit: 0
- m_MinSize: 0
- m_MaxSize: 300
- m_Alignment: 4
- m_AlignByGeometry: 0
- m_RichText: 1
- m_HorizontalOverflow: 0
- m_VerticalOverflow: 0
- m_LineSpacing: 1
- m_Text:
---- !u!222 &1695597039
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1695597036}
- m_CullTransparentMesh: 0
--- !u!1 &1696055514
GameObject:
m_ObjectHideFlags: 0
@@ -68599,6 +68102,7 @@ MonoBehaviour:
distance: 0
isScale: 0
satelliteImagery: {fileID: 1378295488}
+ rect: {fileID: 6368481659655708048}
--- !u!1 &1720385560
GameObject:
m_ObjectHideFlags: 0
@@ -69520,96 +69024,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1774650468 stripped
-MonoBehaviour:
- m_CorrespondingSourceObject: {fileID: 5855821742602621133, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- m_PrefabInstance: {fileID: 1923624322}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 0}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
- m_Name:
- m_EditorClassIdentifier:
---- !u!1 &1779143263
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1779143264}
- - component: {fileID: 1779143266}
- - component: {fileID: 1779143265}
- m_Layer: 5
- m_Name: Text
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!224 &1779143264
-RectTransform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1779143263}
- 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: 78139658}
- 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!114 &1779143265
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1779143263}
- 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!222 &1779143266
-CanvasRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1779143263}
- m_CullTransparentMesh: 0
--- !u!1 &1806606056
GameObject:
m_ObjectHideFlags: 0
@@ -70680,7 +70094,7 @@ MonoBehaviour:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
- randSeed: 102493484
+ randSeed: 114122218
isDoingTransition: 0
minimumHeight: 0
--- !u!114 &1820978574
@@ -72677,88 +72091,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 754191142}
m_Modifications:
- - target: {fileID: 861193248, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, type: 3}
- propertyPath: m_AnchorMax.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 861193248, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, type: 3}
- propertyPath: m_AnchorMax.x
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1855648179, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, type: 3}
- propertyPath: m_AnchorMax.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 1855648179, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, type: 3}
- propertyPath: m_AnchorMin.x
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 1855648179, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, type: 3}
- propertyPath: m_AnchorMax.x
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5855821740938569026, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: m_AnchoredPosition.x
- value: 450
- objectReference: {fileID: 0}
- - target: {fileID: 5855821740938569037, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5855821741208403615, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5855821741515730287, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: 36.69995
- objectReference: {fileID: 0}
- - target: {fileID: 5855821741593404592, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: m_Name
- value: finish
- objectReference: {fileID: 0}
- - target: {fileID: 5855821741593404592, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5855821741614971530, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: m_Sprite
- value:
- objectReference: {fileID: 21300000, guid: f5d91a28a8b20e14e88757dacb1e1e5d,
- type: 3}
- - target: {fileID: 5855821741614971573, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: m_Transition
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5855821741614971573, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: m_SpriteState.m_SelectedSprite
- value:
- objectReference: {fileID: 21300000, guid: 47390e15134f347458cdb6364e799ffc,
- type: 3}
- - target: {fileID: 5855821741614971575, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: m_IsActive
- value: 1
- objectReference: {fileID: 0}
- target: {fileID: 5855821741811488938, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
type: 3}
propertyPath: m_Name
value: Training_pilot_panl
objectReference: {fileID: 0}
- - target: {fileID: 5855821741811488938, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: m_IsActive
- value: 1
- objectReference: {fileID: 0}
- target: {fileID: 5855821741811488939, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
type: 3}
propertyPath: m_LocalPosition.x
@@ -72864,142 +72201,21 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- - target: {fileID: 5855821741812748368, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5855821741812748375, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: m_Sprite
- value:
- objectReference: {fileID: 21300000, guid: 47390e15134f347458cdb6364e799ffc,
- type: 3}
- - target: {fileID: 5855821741819214778, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5855821741890996493, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5855821741890996493, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 5855821741890996493, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
- value: 2
- objectReference: {fileID: 0}
- - target: {fileID: 5855821741890996493, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
- value:
- objectReference: {fileID: 1436809529}
- - target: {fileID: 5855821741890996493, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
- value: OnLeaveRoom
- objectReference: {fileID: 0}
- - target: {fileID: 5855821741890996493, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
- value: UnityEngine.Object, UnityEngine
- objectReference: {fileID: 0}
- - target: {fileID: 5855821741952944143, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: m_Text
- value: "\u8BAD\u7EC3\u5BFC\u8C03\u7AEF"
- objectReference: {fileID: 0}
- - target: {fileID: 5855821742074298732, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: initiate_btn
- value:
- objectReference: {fileID: 115478587}
- - target: {fileID: 5855821742074298732, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: Pause_btn
- value:
- objectReference: {fileID: 411057009}
- - target: {fileID: 5855821742074298732, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: fanhui1
- value:
- objectReference: {fileID: 305432344}
- - target: {fileID: 5855821742074298732, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: finish_btn
- value:
- objectReference: {fileID: 1453259149}
- - target: {fileID: 5855821742074298732, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: countdown_text
- value:
- objectReference: {fileID: 1695597038}
- - target: {fileID: 5855821742074298732, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: content_bton
- value:
- objectReference: {fileID: 418148654}
- target: {fileID: 5855821742074298732, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
type: 3}
propertyPath: competitioncontentpanl
value:
objectReference: {fileID: 1611038951}
- - target: {fileID: 5855821742074298732, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: off_btn
- value:
- objectReference: {fileID: 1774650468}
- target: {fileID: 5855821742074298732, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
type: 3}
propertyPath: seatpanl
value:
objectReference: {fileID: 1686556795}
- - target: {fileID: 5855821742074298732, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: message_btn
- value:
- objectReference: {fileID: 1242325903}
- target: {fileID: 5855821742074298732, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
type: 3}
propertyPath: modellinkedlistpanl
value:
objectReference: {fileID: 1576746880}
- - target: {fileID: 5855821742074298732, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: model2_btn
- value:
- objectReference: {fileID: 199054390}
- - target: {fileID: 5855821742074298732, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: initiate_botn
- value:
- objectReference: {fileID: 78139659}
- - target: {fileID: 5855821742187232578, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5855821742305114459, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: m_Text
- value:
- objectReference: {fileID: 0}
- - target: {fileID: 5855821742456550830, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 5855821742633352631, guid: fbbb5cf357f688c4e8fb400e3c92f0e1,
- type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fbbb5cf357f688c4e8fb400e3c92f0e1, type: 3}
--- !u!224 &1923624323 stripped
@@ -100604,8 +99820,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -71, y: -28.6}
- m_SizeDelta: {x: 167.36975, y: -41.188477}
+ m_AnchoredPosition: {x: -0.000030517578, y: 0}
+ m_SizeDelta: {x: 14.560303, y: -131.06934}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &6368481659655708051
GameObject:
diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 3.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 3.unity
index 1d93b7ca..09400cff 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/Adam/Components/PostureController.cs b/Assets/Zion/Scripts/Adam/Components/PostureController.cs
index 11dc05f6..f85de56e 100644
--- a/Assets/Zion/Scripts/Adam/Components/PostureController.cs
+++ b/Assets/Zion/Scripts/Adam/Components/PostureController.cs
@@ -26,6 +26,7 @@ public class PostureController : MonoBehaviour
public Camera satelliteImagery;
public Coroutine currentCoroutine;
+ public RectTransform rect;
// Start is called before the first frame update
void Awake()
@@ -41,10 +42,13 @@ public class PostureController : MonoBehaviour
{
if (Input.GetMouseButton(0))
{
- float mouseX = Input.GetAxis("Mouse X") * 10f * Time.deltaTime;
- float mouseY = Input.GetAxis("Mouse Y") * 10f * Time.deltaTime;
- satelliteImagery.transform.Translate(Vector3.down * mouseY * 60f);
- satelliteImagery.transform.Translate(Vector3.left * mouseX * 60f);
+ if (RectTransformUtility.RectangleContainsScreenPoint(rect, Input.mousePosition))
+ {
+ float mouseX = Input.GetAxis("Mouse X") * 10f * Time.deltaTime;
+ float mouseY = Input.GetAxis("Mouse Y") * 10f * Time.deltaTime;
+ satelliteImagery.transform.Translate(Vector3.down * mouseY * 60f);
+ satelliteImagery.transform.Translate(Vector3.left * mouseX * 60f);
+ }
}
}
@@ -55,15 +59,15 @@ public class PostureController : MonoBehaviour
if (distance >= 1120)
{
distance = 1120;
- currentCoroutine = null;
+ //currentCoroutine = null;
return;
}
-
- if (currentCoroutine == null)
- {
- isScale = true;
- currentCoroutine = StartCoroutine(Merge(distance));
- }
+ satelliteImagery.orthographicSize = distance;
+ //if (currentCoroutine == null)
+ //{
+ // isScale = true;
+ // currentCoroutine = StartCoroutine(Merge(distance));
+ //}
}
private void OnDown()
@@ -73,15 +77,15 @@ public class PostureController : MonoBehaviour
if (distance <= 200f)
{
distance = 200f;
- currentCoroutine = null;
+ //currentCoroutine = null;
return;
}
-
- if (currentCoroutine == null)
- {
- isScale = true;
- currentCoroutine = StartCoroutine(Merge(distance));
- }
+ satelliteImagery.orthographicSize = distance;
+ //if (currentCoroutine == null)
+ //{
+ // isScale = true;
+ // currentCoroutine = StartCoroutine(Merge(distance));
+ //}
}
private IEnumerator Merge(float targetPoint)