Browse Source

FINAL PUSH

main
Joshua 1 year ago
parent
commit
87c415e131
14 changed files with 57 additions and 26 deletions
  1. BIN
      Assets/Data/Tiles/Bend_Right 1.asset
  2. +8
    -0
      Assets/Data/Tiles/Bend_Right 1.asset.meta
  3. BIN
      Assets/Data/Tiles/Bend_Right.asset
  4. +22
    -3
      Assets/Free Stylized Skybox/CubeMap/Textures/Sky_LowPoly_02_Night_a.png.meta
  5. +2
    -2
      Assets/Materials/New Material.mat
  6. BIN
      Assets/Prefab/PlayerController.prefab
  7. BIN
      Assets/Prefab/Tile_01_env.prefab
  8. BIN
      Assets/Prefab/Tile_02 1.prefab
  9. BIN
      Assets/Prefab/Tile_03_env.prefab
  10. BIN
      Assets/Scenes/Main.unity
  11. +4
    -4
      Assets/Scripts/BoatController.cs
  12. BIN
      Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
  13. +4
    -3
      ProjectSettings/BurstAotSettings_StandaloneWindows.json
  14. +1
    -1
      ProjectSettings/CommonBurstAotSettings.json

BIN
Assets/Data/Tiles/Bend_Right 1.asset (Stored with Git LFS) View File

size 504

+ 8
- 0
Assets/Data/Tiles/Bend_Right 1.asset.meta View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e0837635cf06a7a459501c8171f34e96
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Data/Tiles/Bend_Right.asset (Stored with Git LFS) View File

size 502

+ 22
- 3
Assets/Free Stylized Skybox/CubeMap/Textures/Sky_LowPoly_02_Night_a.png.meta View File

@ -3,7 +3,7 @@ guid: b4503954fd147c94180872808dde9eb3
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
@ -23,6 +23,8 @@ TextureImporter:
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
@ -31,9 +33,9 @@ TextureImporter:
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
filterMode: 1
aniso: 2
mipBias: -100
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
@ -54,10 +56,14 @@ TextureImporter:
textureType: 0
textureShape: 2
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 2
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
@ -119,6 +125,18 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
@ -132,6 +150,7 @@ TextureImporter:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0

+ 2
- 2
Assets/Materials/New Material.mat View File

@ -119,8 +119,8 @@ Material:
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 0.041586675, g: 0.7264151, b: 0, a: 1}
- _Color: {r: 0.041586652, g: 0.7264151, b: 0, a: 1}
- _BaseColor: {r: 0.5239635, g: 0.6415094, b: 0.25720897, a: 1}
- _Color: {r: 0.52396345, g: 0.6415094, b: 0.25720894, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

BIN
Assets/Prefab/PlayerController.prefab (Stored with Git LFS) View File

size 46690

BIN
Assets/Prefab/Tile_01_env.prefab (Stored with Git LFS) View File

size 252686

BIN
Assets/Prefab/Tile_02 1.prefab (Stored with Git LFS) View File

size 184282

BIN
Assets/Prefab/Tile_03_env.prefab (Stored with Git LFS) View File

size 282529

BIN
Assets/Scenes/Main.unity (Stored with Git LFS) View File

size 84087

+ 4
- 4
Assets/Scripts/BoatController.cs View File

@ -53,20 +53,20 @@ public class BoatController : MonoBehaviour
{
//print(transform.rotation.eulerAngles.y);
//constrain rotation
if (transform.rotation.eulerAngles.y > 180 && transform.rotation.eulerAngles.y < 270)
/*if (transform.rotation.eulerAngles.y > 180 && transform.rotation.eulerAngles.y < 270)
{
print("under");
transform.rotation = Quaternion.Euler(new Vector3(0f, 270f, 0f));
rigidBody.angularVelocity = Vector3.zero;
}
}*/
//constrain rotation
if (transform.rotation.eulerAngles.y < 180 && transform.rotation.eulerAngles.y > 90f)
/*if (transform.rotation.eulerAngles.y < 180 && transform.rotation.eulerAngles.y > 90f)
{
print("over");
transform.rotation = Quaternion.Euler(new Vector3(0f, 90f, 0f));
rigidBody.angularVelocity = Vector3.zero;
}
}*/
}
public void RowLeft()

BIN
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset (Stored with Git LFS) View File

size 9525

+ 4
- 3
ProjectSettings/BurstAotSettings_StandaloneWindows.json View File

@ -1,16 +1,17 @@
{
"MonoBehaviour": {
"Version": 3,
"Version": 4,
"EnableBurstCompilation": true,
"EnableOptimisations": true,
"EnableSafetyChecks": false,
"EnableDebugInAllBuilds": false,
"UsePlatformSDKLinker": false,
"EnableArmv9SecurityFeatures": false,
"CpuMinTargetX32": 0,
"CpuMaxTargetX32": 0,
"CpuMinTargetX64": 0,
"CpuMaxTargetX64": 0,
"CpuTargetsX32": 6,
"CpuTargetsX64": 72
"CpuTargetsX64": 72,
"OptimizeFor": 0
}
}

+ 1
- 1
ProjectSettings/CommonBurstAotSettings.json View File

@ -1,6 +1,6 @@
{
"MonoBehaviour": {
"Version": 3,
"Version": 4,
"DisabledWarnings": ""
}
}

Loading…
Cancel
Save