diff --git a/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity b/Assets/Zion/Scenes/AdamTraining_pilot_terminal_panl 1.unity index 19923d1d..1a69433f 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.16234791, g: 0.30616677, b: 0.6691997, a: 1} + m_IndirectSpecularColor: {r: 0.1721589, g: 0.30467987, b: 0.5980986, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -6651,6 +6651,7 @@ MonoBehaviour: deviceID: isPlayer: 0 isThinck: 0 + wrjModel: 0 --- !u!224 &138577124 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 1586417955185665353, guid: 18a1ad49a084edc44b006d5905c6d928, @@ -36376,6 +36377,153 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u5730\u5821" +--- !u!1001 &609129004 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1744702645} + m_Modifications: + - target: {fileID: 3625114602127132433, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_Text + value: "\u5149\u5B66\u65E0\u4EBA\u673A" + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075994, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_Name + value: WRJ + objectReference: {fileID: 0} + - target: {fileID: 3625114603413174334, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: wrjModel + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 504e1e72e287c0740a66218ad23fbd0e, type: 3} +--- !u!224 &609129005 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + m_PrefabInstance: {fileID: 609129004} + m_PrefabAsset: {fileID: 0} +--- !u!114 &609129006 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3625114603413174334, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + m_PrefabInstance: {fileID: 609129004} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &611708598 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4154274434303431880, guid: 2b1026bed8e10f947bd7495185d1d6e6, @@ -37489,6 +37637,153 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 732495660} m_CullTransparentMesh: 0 +--- !u!1001 &745447506 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1744702645} + m_Modifications: + - target: {fileID: 3625114602127132433, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_Text + value: "\u7535\u5B50\u4FA6\u5BDF\u65E0\u4EBA\u673A" + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075994, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_Name + value: WRJ (1) + objectReference: {fileID: 0} + - target: {fileID: 3625114603413174334, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: wrjModel + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 504e1e72e287c0740a66218ad23fbd0e, type: 3} +--- !u!224 &745447507 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + m_PrefabInstance: {fileID: 745447506} + m_PrefabAsset: {fileID: 0} +--- !u!114 &745447508 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3625114603413174334, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + m_PrefabInstance: {fileID: 745447506} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &754191141 GameObject: m_ObjectHideFlags: 0 @@ -47174,6 +47469,153 @@ Transform: m_Father: {fileID: 1820978575} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1213021905 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1744702645} + m_Modifications: + - target: {fileID: 3625114602127132433, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_Text + value: "\u81EA\u6740\u5F0F\u65E0\u4EBA\u673A" + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3625114603376075994, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: m_Name + value: WRJ (2) + objectReference: {fileID: 0} + - target: {fileID: 3625114603413174334, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + propertyPath: wrjModel + value: 3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 504e1e72e287c0740a66218ad23fbd0e, type: 3} +--- !u!224 &1213021906 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3625114603376075993, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + m_PrefabInstance: {fileID: 1213021905} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1213021907 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3625114603413174334, guid: 504e1e72e287c0740a66218ad23fbd0e, + type: 3} + m_PrefabInstance: {fileID: 1213021905} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 154ea33a68384034b8bef474a9a6440d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1242063470 GameObject: m_ObjectHideFlags: 0 @@ -48950,7 +49392,12 @@ MonoBehaviour: Teacher: {fileID: 754191141} student: {fileID: 1862065805184089353} posture: {fileID: 1719983405} + wrjCount: 0 players: [] + wrjDrags: + - {fileID: 609129006} + - {fileID: 745447508} + - {fileID: 1213021907} --- !u!4 &1436809530 Transform: m_ObjectHideFlags: 0 @@ -49049,7 +49496,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: deviceimages1: [] - deviceimages: [] + devices: [] modellist: [] --- !u!114 &1436809535 MonoBehaviour: @@ -61771,7 +62218,10 @@ RectTransform: 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_Children: + - {fileID: 609129005} + - {fileID: 745447507} + - {fileID: 1213021906} m_Father: {fileID: 1913435859} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -63114,7 +63564,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - randSeed: -1465470250 + randSeed: 9799953 isDoingTransition: 0 minimumHeight: 0 --- !u!114 &1820978574