menu
This commit is contained in:
1 parent
45fc3026b4
commit
7dc0a04856
15 files changed
+339
-125
No files matched your search
@@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 8c78e70010d5a83b29f78e0d50fa18e5
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -0,0 +1,78 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1 &3221660762140721390
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 9074617566735061565}
|
||||||
|
- component: {fileID: 5731929726813851803}
|
||||||
|
- component: {fileID: 5313449993149091347}
|
||||||
|
- component: {fileID: 3459824902519845831}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Menu
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 2147483647
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &9074617566735061565
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3221660762140721390}
|
||||||
|
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_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_RootOrder: 4
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!114 &5731929726813851803
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3221660762140721390}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
m_PanelSettings: {fileID: 11400000, guid: dab173ab15446054bb709b9a7ab085b6, type: 2}
|
||||||
|
m_ParentUI: {fileID: 0}
|
||||||
|
sourceAsset: {fileID: 9197481963319205126, guid: 59e6af4d391d177a8910e7a8ab6e05e6, type: 3}
|
||||||
|
m_SortingOrder: 0
|
||||||
|
--- !u!114 &5313449993149091347
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3221660762140721390}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: b7da082ca2a8e6ee9a5b1151245f535f, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
timingDoc: {fileID: 0}
|
||||||
|
shipControls: {fileID: 0}
|
||||||
|
--- !u!114 &3459824902519845831
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3221660762140721390}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: af1d31f9c950ece1e852a40ebd6c45a2, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: ebed5434f18ca13e38d2d7bfcc18d6c3
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -10024,6 +10024,75 @@ PrefabInstance:
|
|||||||
m_AddedGameObjects: []
|
m_AddedGameObjects: []
|
||||||
m_AddedComponents: []
|
m_AddedComponents: []
|
||||||
m_SourcePrefab: {fileID: 100100000, guid: 73ab56de058af21389c312279181f856, type: 3}
|
m_SourcePrefab: {fileID: 100100000, guid: 73ab56de058af21389c312279181f856, type: 3}
|
||||||
|
--- !u!1001 &327871849
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TransformParent: {fileID: 0}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 3221660762140721390, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: Menu
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: timingDoc
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 766862836}
|
||||||
|
- target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: shipControls
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 1972710421}
|
||||||
|
- target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: m_RootOrder
|
||||||
|
value: 5
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_RemovedGameObjects: []
|
||||||
|
m_AddedGameObjects: []
|
||||||
|
m_AddedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
--- !u!1001 &328429983
|
--- !u!1001 &328429983
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -22611,6 +22680,17 @@ Transform:
|
|||||||
m_CorrespondingSourceObject: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3}
|
m_CorrespondingSourceObject: {fileID: 4743817676494260426, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3}
|
||||||
m_PrefabInstance: {fileID: 766862834}
|
m_PrefabInstance: {fileID: 766862834}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!114 &766862836 stripped
|
||||||
|
MonoBehaviour:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 957429026670911964, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 766862834}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
--- !u!1001 &767277666
|
--- !u!1001 &767277666
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ LightingSettings:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: New Lighting Settings
|
m_Name: New Lighting Settings
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_GIWorkflowMode: 0
|
m_GIWorkflowMode: 1
|
||||||
m_EnableBakedLightmaps: 1
|
m_EnableBakedLightmaps: 1
|
||||||
m_EnableRealtimeLightmaps: 0
|
m_EnableRealtimeLightmaps: 0
|
||||||
m_RealtimeEnvironmentLighting: 1
|
m_RealtimeEnvironmentLighting: 1
|
||||||
|
|||||||
+78
-113
@@ -172,54 +172,6 @@ Transform:
|
|||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1 &114959033
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 114959034}
|
|
||||||
- component: {fileID: 114959035}
|
|
||||||
m_Layer: 0
|
|
||||||
m_Name: MenuDoc
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 2147483647
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!4 &114959034
|
|
||||||
Transform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 114959033}
|
|
||||||
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_ConstrainProportionsScale: 0
|
|
||||||
m_Children: []
|
|
||||||
m_Father: {fileID: 1914996160}
|
|
||||||
m_RootOrder: -1
|
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
||||||
--- !u!114 &114959035
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 114959033}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_PanelSettings: {fileID: 11400000, guid: dab173ab15446054bb709b9a7ab085b6, type: 2}
|
|
||||||
m_ParentUI: {fileID: 0}
|
|
||||||
sourceAsset: {fileID: 9197481963319205126, guid: 59e6af4d391d177a8910e7a8ab6e05e6, type: 3}
|
|
||||||
m_SortingOrder: 0
|
|
||||||
--- !u!1001 &339815783
|
--- !u!1001 &339815783
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -545,7 +497,7 @@ Light:
|
|||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Bits: 4294967295
|
m_Bits: 4294967295
|
||||||
m_RenderingLayerMask: 1
|
m_RenderingLayerMask: 1
|
||||||
m_Lightmapping: 1
|
m_Lightmapping: 4
|
||||||
m_LightShadowCasterMode: 0
|
m_LightShadowCasterMode: 0
|
||||||
m_AreaSize: {x: 1, y: 1}
|
m_AreaSize: {x: 1, y: 1}
|
||||||
m_BounceIntensity: 1
|
m_BounceIntensity: 1
|
||||||
@@ -602,10 +554,18 @@ PrefabInstance:
|
|||||||
serializedVersion: 3
|
serializedVersion: 3
|
||||||
m_TransformParent: {fileID: 965851724}
|
m_TransformParent: {fileID: 965851724}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 957429026670911964, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3}
|
||||||
|
propertyPath: m_Enabled
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2603084029878042569, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3}
|
- target: {fileID: 2603084029878042569, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3}
|
||||||
propertyPath: m_Name
|
propertyPath: m_Name
|
||||||
value: Timing
|
value: Timing
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 2603084029878042569, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3}
|
||||||
|
propertyPath: m_IsActive
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 2603084029878042569, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3}
|
- target: {fileID: 2603084029878042569, guid: dcb64e3a91f1fec7ab6098f4f407830b, type: 3}
|
||||||
propertyPath: m_StaticEditorFlags
|
propertyPath: m_StaticEditorFlags
|
||||||
value: 2147483647
|
value: 2147483647
|
||||||
@@ -1050,54 +1010,6 @@ Transform:
|
|||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1 &1914996159
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Component:
|
|
||||||
- component: {fileID: 1914996160}
|
|
||||||
- component: {fileID: 1914996162}
|
|
||||||
m_Layer: 0
|
|
||||||
m_Name: Menu
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 2147483647
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!4 &1914996160
|
|
||||||
Transform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1914996159}
|
|
||||||
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_ConstrainProportionsScale: 0
|
|
||||||
m_Children:
|
|
||||||
- {fileID: 114959034}
|
|
||||||
m_Father: {fileID: 0}
|
|
||||||
m_RootOrder: 4
|
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
||||||
--- !u!114 &1914996162
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1914996159}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: b7da082ca2a8e6ee9a5b1151245f535f, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
menuDoc: {fileID: 114959035}
|
|
||||||
timingDoc: {fileID: 1705992920}
|
|
||||||
shipControls: {fileID: 1972710421}
|
|
||||||
--- !u!1 &1972710416
|
--- !u!1 &1972710416
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -1114,7 +1026,6 @@ GameObject:
|
|||||||
- component: {fileID: 1972710421}
|
- component: {fileID: 1972710421}
|
||||||
- component: {fileID: 1972710424}
|
- component: {fileID: 1972710424}
|
||||||
- component: {fileID: 1972710425}
|
- component: {fileID: 1972710425}
|
||||||
- component: {fileID: 1972710426}
|
|
||||||
m_Layer: 10
|
m_Layer: 10
|
||||||
m_Name: Ship
|
m_Name: Ship
|
||||||
m_TagString: Untagged
|
m_TagString: Untagged
|
||||||
@@ -1321,21 +1232,6 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 0cee35157fdc2b133bf69416f2db2ac3, type: 3}
|
m_Script: {fileID: 11500000, guid: 0cee35157fdc2b133bf69416f2db2ac3, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
--- !u!114 &1972710426
|
|
||||||
MonoBehaviour:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_GameObject: {fileID: 1972710416}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_EditorHideFlags: 0
|
|
||||||
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
|
|
||||||
m_Name:
|
|
||||||
m_EditorClassIdentifier:
|
|
||||||
m_FirstSelected: {fileID: 0}
|
|
||||||
m_sendNavigationEvents: 1
|
|
||||||
m_DragThreshold: 10
|
|
||||||
--- !u!1 &2129212232
|
--- !u!1 &2129212232
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@@ -1494,6 +1390,75 @@ LookAtConstraint:
|
|||||||
m_Sources:
|
m_Sources:
|
||||||
- sourceTransform: {fileID: 2129212233}
|
- sourceTransform: {fileID: 2129212233}
|
||||||
weight: 1
|
weight: 1
|
||||||
|
--- !u!1001 &656092325660581143
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TransformParent: {fileID: 0}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 3221660762140721390, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: Menu
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: timingDoc
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 1705992920}
|
||||||
|
- target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: shipControls
|
||||||
|
value:
|
||||||
|
objectReference: {fileID: 1972710421}
|
||||||
|
- target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: m_RootOrder
|
||||||
|
value: 4
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: -0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 9074617566735061565, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_RemovedGameObjects: []
|
||||||
|
m_AddedGameObjects: []
|
||||||
|
m_AddedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
|
||||||
--- !u!1001 &1029791531313142756
|
--- !u!1001 &1029791531313142756
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
File renamed without changes.
@@ -65,6 +65,11 @@ public class ShipControls : MonoBehaviour, SpaceRaceInput.IShipActions {
|
|||||||
decelerateAction = input.FindAction("decelerate");
|
decelerateAction = input.FindAction("decelerate");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void OnDestroy() {
|
||||||
|
input.ship.RemoveCallbacks(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void Update() {
|
void Update() {
|
||||||
// to minimise input lag we poll for the thrust vector every frame and set it
|
// to minimise input lag we poll for the thrust vector every frame and set it
|
||||||
thrust = getThrust();
|
thrust = getThrust();
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ using UnityEngine.UIElements;
|
|||||||
using UnityEngine.InputSystem;
|
using UnityEngine.InputSystem;
|
||||||
|
|
||||||
public class MenuControls : MonoBehaviour, SpaceRaceInput.IMenuActions {
|
public class MenuControls : MonoBehaviour, SpaceRaceInput.IMenuActions {
|
||||||
[SerializeField]
|
|
||||||
UIDocument menuDoc;
|
UIDocument menuDoc;
|
||||||
|
|
||||||
[SerializeField]
|
[SerializeField]
|
||||||
@@ -12,27 +11,43 @@ public class MenuControls : MonoBehaviour, SpaceRaceInput.IMenuActions {
|
|||||||
[SerializeField]
|
[SerializeField]
|
||||||
ShipControls shipControls;
|
ShipControls shipControls;
|
||||||
|
|
||||||
|
MenuUi menuUi;
|
||||||
|
|
||||||
SpaceRaceInput input;
|
SpaceRaceInput input;
|
||||||
bool visible = false;
|
bool visible = false;
|
||||||
|
|
||||||
void Start() {
|
void Awake() {
|
||||||
|
menuDoc = GetComponent<UIDocument>();
|
||||||
|
|
||||||
if (input == null) {
|
if (input == null) {
|
||||||
input = new SpaceRaceInput();
|
input = new SpaceRaceInput();
|
||||||
input.menu.SetCallbacks(this);
|
input.menu.SetCallbacks(this);
|
||||||
}
|
}
|
||||||
input.menu.Enable();
|
input.menu.Enable();
|
||||||
|
|
||||||
|
menuUi = GetComponent<MenuUi>();
|
||||||
|
if (!menuUi) {
|
||||||
|
Debug.LogError("No MenuUI");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
Hide();
|
Hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void OnDestroy() {
|
||||||
|
input.menu.RemoveCallbacks(this);
|
||||||
|
}
|
||||||
|
|
||||||
void Show() {
|
void Show() {
|
||||||
visible = true;
|
visible = true;
|
||||||
UnityEngine.Cursor.lockState = CursorLockMode.None;
|
UnityEngine.Cursor.lockState = CursorLockMode.None;
|
||||||
menuDoc.enabled = true;
|
menuDoc.enabled = true;
|
||||||
|
menuUi.AddTracks();
|
||||||
|
|
||||||
// take control off the ship
|
// take control off the ship
|
||||||
timingDoc.enabled = false;
|
timingDoc.enabled = false;
|
||||||
shipControls.enabled = false;
|
shipControls.enabled = false;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Hide() {
|
void Hide() {
|
||||||
|
|||||||
@@ -0,0 +1,35 @@
|
|||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.UIElements;
|
||||||
|
using UnityEngine.SceneManagement;
|
||||||
|
|
||||||
|
using System.IO;
|
||||||
|
|
||||||
|
public class MenuUi : MonoBehaviour {
|
||||||
|
UIDocument uiDocument;
|
||||||
|
VisualElement tracks;
|
||||||
|
|
||||||
|
void Start() {
|
||||||
|
uiDocument = GetComponent<UIDocument>();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void AddTracks() {
|
||||||
|
tracks = uiDocument.rootVisualElement.Q<VisualElement>("tracks");
|
||||||
|
tracks.Clear();
|
||||||
|
|
||||||
|
for (int i = 0; i < SceneManager.sceneCountInBuildSettings; ++i) {
|
||||||
|
int j = i; // top kek
|
||||||
|
Scene scene = SceneManager.GetSceneByBuildIndex(i);
|
||||||
|
string scenePath = SceneUtility.GetScenePathByBuildIndex(i);
|
||||||
|
string sceneName = Path.GetFileNameWithoutExtension(scenePath);
|
||||||
|
Button button = new Button();
|
||||||
|
button.text = sceneName;
|
||||||
|
button.clicked += () => LoadScene(j);
|
||||||
|
tracks.Add(button);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void LoadScene(int i) {
|
||||||
|
Debug.Log($"Loading scene {i}");
|
||||||
|
SceneManager.LoadScene(i);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: af1d31f9c950ece1e852a40ebd6c45a2
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@@ -20,7 +20,7 @@ public class ShipUi : MonoBehaviour {
|
|||||||
VisualElement sectors;
|
VisualElement sectors;
|
||||||
VisualElement timeSheet;
|
VisualElement timeSheet;
|
||||||
|
|
||||||
void OnEnable() {
|
void Awake() {
|
||||||
speed = uiDocument.rootVisualElement.Q<Label>("speed");
|
speed = uiDocument.rootVisualElement.Q<Label>("speed");
|
||||||
timer = uiDocument.rootVisualElement.Q<Label>("timer");
|
timer = uiDocument.rootVisualElement.Q<Label>("timer");
|
||||||
sectors = uiDocument.rootVisualElement.Q<VisualElement>("sectors");
|
sectors = uiDocument.rootVisualElement.Q<VisualElement>("sectors");
|
||||||
@@ -28,6 +28,12 @@ public class ShipUi : MonoBehaviour {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void FixedUpdate() {
|
void FixedUpdate() {
|
||||||
|
if (timer == null || speed == null) {
|
||||||
|
Debug.LogWarning("no speed or timer");
|
||||||
|
Awake();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
timer.text = $"{TimeSpan.FromSeconds(timing.lapTime):m\\:ss\\.fff}";
|
timer.text = $"{TimeSpan.FromSeconds(timing.lapTime):m\\:ss\\.fff}";
|
||||||
speed.text = $"{ship.Speed():0} u/s";
|
speed.text = $"{ship.Speed():0} u/s";
|
||||||
|
|
||||||
|
|||||||
@@ -3,10 +3,12 @@
|
|||||||
<ui:VisualElement name="Menu" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); -unity-font: url('project://database/Assets/UI%20Toolkit/Fonts/Jura-Medium.otf?fileID=12800000&guid=65648a14640996362a6b0929c723b6e4&type=3#Jura-Medium'); -unity-font-definition: initial; font-size: 38px; letter-spacing: 24px;">
|
<ui:VisualElement name="Menu" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); -unity-font: url('project://database/Assets/UI%20Toolkit/Fonts/Jura-Medium.otf?fileID=12800000&guid=65648a14640996362a6b0929c723b6e4&type=3#Jura-Medium'); -unity-font-definition: initial; font-size: 38px; letter-spacing: 24px;">
|
||||||
<ui:VisualElement name="header" style="flex-grow: 0; background-color: rgba(0, 0, 0, 0);" />
|
<ui:VisualElement name="header" style="flex-grow: 0; background-color: rgba(0, 0, 0, 0);" />
|
||||||
<ui:VisualElement name="main" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); justify-content: flex-start; flex-direction: row; align-items: flex-start;">
|
<ui:VisualElement name="main" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); justify-content: flex-start; flex-direction: row; align-items: flex-start;">
|
||||||
<ui:VisualElement name="tracks" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); justify-content: center;">
|
<ui:VisualElement style="flex-grow: 1; background-color: rgba(0, 0, 0, 0);">
|
||||||
<ui:Label tabindex="-1" text="Track" display-tooltip-when-elided="true" name="Track" style="-unity-font: url('project://database/Assets/UI%20Toolkit/Fonts/Jura-DemiBold.otf?fileID=12800000&guid=1d103e83da4f14189b3e8b0b865eca3d&type=3#Jura-DemiBold');" />
|
<ui:Label tabindex="-1" text="Track" display-tooltip-when-elided="true" name="Track" style="-unity-font: url('project://database/Assets/UI%20Toolkit/Fonts/Jura-DemiBold.otf?fileID=12800000&guid=1d103e83da4f14189b3e8b0b865eca3d&type=3#Jura-DemiBold');" />
|
||||||
<ui:Button text="sr_junglism" display-tooltip-when-elided="true" />
|
<ui:VisualElement name="tracks" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); justify-content: flex-start;">
|
||||||
<ui:Button text="sr_silverstorage" display-tooltip-when-elided="true" />
|
<ui:Button text="sr_junglism" display-tooltip-when-elided="true" />
|
||||||
|
<ui:Button text="sr_silverstorage" display-tooltip-when-elided="true" />
|
||||||
|
</ui:VisualElement>
|
||||||
</ui:VisualElement>
|
</ui:VisualElement>
|
||||||
<ui:VisualElement name="settings" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); flex-direction: column; align-self: auto; align-items: flex-end;">
|
<ui:VisualElement name="settings" style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); flex-direction: column; align-self: auto; align-items: flex-end;">
|
||||||
<ui:Label tabindex="-1" text="Settings" display-tooltip-when-elided="true" style="-unity-font: url('project://database/Assets/UI%20Toolkit/Fonts/Jura-DemiBold.otf?fileID=12800000&guid=1d103e83da4f14189b3e8b0b865eca3d&type=3#Jura-DemiBold');" />
|
<ui:Label tabindex="-1" text="Settings" display-tooltip-when-elided="true" style="-unity-font: url('project://database/Assets/UI%20Toolkit/Fonts/Jura-DemiBold.otf?fileID=12800000&guid=1d103e83da4f14189b3e8b0b865eca3d&type=3#Jura-DemiBold');" />
|
||||||
|
|||||||
@@ -6,7 +6,10 @@ EditorBuildSettings:
|
|||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Scenes:
|
m_Scenes:
|
||||||
- enabled: 1
|
- enabled: 1
|
||||||
path: Assets/Scenes/TLScene.unity
|
path: Assets/Scenes/sr_silverstorage/sr_silverstorage.unity
|
||||||
guid: dbae1149c8224201f9956d49725b1676
|
guid: 5ee7c8e44f8a4f39f9ff8615ec98dd7f
|
||||||
|
- enabled: 1
|
||||||
|
path: Assets/Scenes/sr_junglism/sr_junglism.unity
|
||||||
|
guid: b054f85626ab5e712942665de82ced33
|
||||||
m_configObjects:
|
m_configObjects:
|
||||||
com.unity.input.settings: {fileID: 11400000, guid: 020903acd8b50dd45a683fb9312ba7af, type: 2}
|
com.unity.input.settings: {fileID: 11400000, guid: 020903acd8b50dd45a683fb9312ba7af, type: 2}
|
||||||
@@ -134,8 +134,7 @@ PlayerSettings:
|
|||||||
vulkanEnableCommandBufferRecycling: 1
|
vulkanEnableCommandBufferRecycling: 1
|
||||||
loadStoreDebugModeEnabled: 0
|
loadStoreDebugModeEnabled: 0
|
||||||
bundleVersion: 0.1
|
bundleVersion: 0.1
|
||||||
preloadedAssets:
|
preloadedAssets: []
|
||||||
- {fileID: 11400000, guid: 020903acd8b50dd45a683fb9312ba7af, type: 2}
|
|
||||||
metroInputSource: 0
|
metroInputSource: 0
|
||||||
wsaTransparentSwapchain: 0
|
wsaTransparentSwapchain: 0
|
||||||
m_HolographicPauseOnTrackingLoss: 1
|
m_HolographicPauseOnTrackingLoss: 1
|
||||||
|
|||||||
Reference in new issue
Block a user