spa

2023-07-27 16:54:03 +10:00
1 parent 0c6dce0f1b
commit d7f9ca70d0
@@ -10036,6 +10036,10 @@ PrefabInstance:
      propertyPath: m_Name
      value: Menu
      objectReference: {fileID: 0}
+    - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
+      propertyPath: shipUi
+      value: 
+      objectReference: {fileID: 766862837}
    - target: {fileID: 5313449993149091347, guid: ebed5434f18ca13e38d2d7bfcc18d6c3, type: 3}
      propertyPath: timingDoc
      value: 
@@ -22691,6 +22695,17 @@ MonoBehaviour:
  m_Script: {fileID: 19102, guid: 0000000000000000e000000000000000, type: 0}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!114 &766862837 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5975136821837370545, 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: 11500000, guid: 14d590d5e541e871cb4b472e9e009128, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &767277666
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -58135,7 +58150,7 @@ MeshRenderer:
  m_RenderingLayerMask: 1
  m_RendererPriority: 0
  m_Materials:
-  - {fileID: 2100000, guid: 8b25de64655d073f883875ed79a58948, type: 2}
+  - {fileID: 2100000, guid: 5c6ae25f73498fb4db2e36a46d2c620f, type: 2}
  m_StaticBatchInfo:
    firstSubMesh: 0
    subMeshCount: 0
@@ -58272,9 +58287,13 @@ MonoBehaviour:
      m_Calls: []
    m_ActionId: cea65125-c42e-40e9-bc97-966522e16691
    m_ActionName: movement/quit[/Keyboard/f10]
+  - m_PersistentCalls:
+      m_Calls: []
+    m_ActionId: cee6d41d-d488-4548-b2d6-11e16bb6b116
+    m_ActionName: menu/ToggleMenu[/Gamepad/start,/Keyboard/escape]
  m_NeverAutoSwitchControlSchemes: 0
  m_DefaultControlScheme: 
-  m_DefaultActionMap: movement
+  m_DefaultActionMap: ship
  m_SplitScreenIndex: -1
  m_Camera: {fileID: 0}
 --- !u!114 &1972710425
@@ -1124,7 +1124,7 @@ Transform:
  m_GameObject: {fileID: 1972710416}
  m_LocalRotation: {x: 0, y: 0.88294756, z: 0, w: 0.46947163}
  m_LocalPosition: {x: -838.9999, y: 0, z: 945.99976}
-  m_LocalScale: {x: 2.45, y: 2.45, z: 2.45}
+  m_LocalScale: {x: 2, y: 2, z: 5}
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 2129212233}
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 885173df93a29ed63b29e9e8a6eca8f5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,109 @@
+fileFormatVersion: 2
+guid: 64b045a17d258ce37b459b444db394d4
+ModelImporter:
+  serializedVersion: 22200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importPhysicalCameras: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0070df7f2cdafdb82ac4d4504004ed10
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7623657cc93a9912eb98bdb1bae4d70d
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: