uhhhhh ok

5 years ago · d0b8af2a1f
parent 30cb6f0fa1
commit d0b8af2a1f
9 changed files with 14870 additions and 5139 deletions
--- a/Assets/Fonts.meta
+++ b/Assets/Fonts.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 93aa6510b61dc25429a2110249aec48a
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Fonts/Roboto-Light.ttf
+++ b/Assets/Fonts/Roboto-Light.ttf
--- a/Assets/Fonts/Roboto-Light.ttf.meta
+++ b/Assets/Fonts/Roboto-Light.ttf.meta
@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 36ddaa2571e8e2b43bb68048b3b9f116
+TrueTypeFontImporter:
+  externalObjects: {}
+  serializedVersion: 4
+  fontSize: 16
+  forceTextureCase: -2
+  characterSpacing: 0
+  characterPadding: 1
+  includeFontData: 1
+  fontName: Roboto
+  fontNames:
+  - Roboto
+  fallbackFontReferences: []
+  customCharacters: 
+  fontRenderingMode: 0
+  ascentCalculationMode: 1
+  useLegacyBoundsCalculation: 0
+  shouldRoundAdvanceValue: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Models/gladius.fbx
+++ b/Assets/Models/gladius.fbx
--- a/Assets/Models/gladius.fbx.meta
+++ b/Assets/Models/gladius.fbx.meta
@ -0,0 +1,131 @@
+fileFormatVersion: 2
+guid: d8b98d7c3d6e13b478f037448ab4f911
+ModelImporter:
+  serializedVersion: 23
+  fileIDToRecycleName:
+    100000: Cube
+    100002: Cube.001
+    100004: Cube.002
+    100006: Gladius
+    100008: //RootNode
+    100010: Plane
+    100012: Plane.001
+    400000: Cube
+    400002: Cube.001
+    400004: Cube.002
+    400006: Gladius
+    400008: //RootNode
+    400010: Plane
+    400012: Plane.001
+    2100000: Steel
+    2100002: Wood
+    2100004: Ebony
+    2100006: Copper
+    2100008: Material.001
+    2100010: Ivory
+    2100012: Material.002
+    2300000: Cube
+    2300002: Cube.001
+    2300004: Cube.002
+    2300006: Gladius
+    2300008: Plane
+    2300010: Plane.001
+    2300012: //RootNode
+    3300000: Cube
+    3300002: Cube.001
+    3300004: Cube.002
+    3300006: Gladius
+    3300008: Plane
+    3300010: Plane.001
+    3300012: //RootNode
+    4300000: Gladius
+    4300002: Plane
+    4300004: Cube
+    4300006: Plane.001
+    2186277476908879412: ImportLogs
+  externalObjects: {}
+  materials:
+    importMaterials: 1
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 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: 1
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    optimizeMeshForGPU: 1
+    keepQuads: 0
+    weldVertices: 1
+    preserveHierarchy: 0
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    previousCalculatedGlobalScale: 1
+    hasPreviousCalculatedGlobalScale: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  importAnimation: 1
+  copyAvatar: 0
+  humanDescription:
+    serializedVersion: 2
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  animationType: 0
+  humanoidOversampling: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scenes/Main.unity
+++ b/Assets/Scenes/Main.unity
--- a/Assets/Scripts/HudController.cs
+++ b/Assets/Scripts/HudController.cs
@ -2,21 +2,20 @@
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
-using TMPro;

 public class HudController : MonoBehaviour
 {

-    public TextMeshProUGUI scoreText;
+    public Text scoreText;

    public GameObject destinationBox;
-    public TextMeshProUGUI destinationText;
+    public Text destinationText;

    public GameObject directionsBox;
-    public TextMeshProUGUI directionsText;
+    public Text directionsText;

    public GameObject locationBox;
-    public TextMeshProUGUI locationText;
+    public Text locationText;

    private PlayerController player;

--- a/ProjectSettings/EditorBuildSettings.asset
+++ b/ProjectSettings/EditorBuildSettings.asset
@ -4,5 +4,8 @@
 EditorBuildSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 2
-  m_Scenes: []
+  m_Scenes:
+  - enabled: 1
+    path: Assets/Scenes/Main.unity
+    guid: d79a98c3d6868254d8c6ed25241faa86
  m_configObjects: {}
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@ -44,7 +44,7 @@ PlayerSettings:
  m_HolographicTrackingLossScreen: {fileID: 0}
  defaultScreenWidth: 1024
  defaultScreenHeight: 768
-  defaultScreenWidthWeb: 960
+  defaultScreenWidthWeb: 900
  defaultScreenHeightWeb: 600
  m_StereoRenderingPath: 0
  m_ActiveColorSpace: 0
@ -520,7 +520,7 @@ PlayerSettings:
  webGLMemorySize: 256
  webGLExceptionSupport: 1
  webGLNameFilesAsHashes: 0
-  webGLDataCaching: 1
+  webGLDataCaching: 0
  webGLDebugSymbols: 0
  webGLEmscriptenArgs: 
  webGLModulesDirectory: