diff --git a/Assets/Resources/Games/airboarder.prefab b/Assets/Resources/Games/airboarder.prefab
index 3b32fdc2a..1b5bc581d 100644
--- a/Assets/Resources/Games/airboarder.prefab
+++ b/Assets/Resources/Games/airboarder.prefab
@@ -317,11 +317,14 @@ MonoBehaviour:
SoundSequences: []
scheduledInputs: []
wantsCrouch: 0
+ bgMaterial: {fileID: 2100000, guid: d308d6053cbc091489ae82391d36d476, type: 2}
+ floorMaterial: {fileID: 2100000, guid: 5c5aa636b730eba44b9a80ea76a7bc4e, type: 2}
cameraPivot: {fileID: 2677427256397037315}
cameraPos: {fileID: 2677427256397037315}
cameraFOV: 25
archBasic: {fileID: 6590728124445756167}
wallBasic: {fileID: 4600485667161481742}
+ floor: {fileID: 6175185380924501080}
CPU1: {fileID: 1975474441940497211}
CPU2: {fileID: 1643307588540728724}
Player: {fileID: 4556547465341807253}
@@ -2264,6 +2267,18 @@ PrefabInstance:
propertyPath: m_Name
value: floor_model
objectReference: {fileID: 0}
+ - target: {fileID: 5521721997653780584, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3}
+ propertyPath: m_Materials.Array.size
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 5521721997653780584, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3}
+ propertyPath: m_Materials.Array.data[0]
+ value:
+ objectReference: {fileID: 2100000, guid: 5c5aa636b730eba44b9a80ea76a7bc4e, type: 2}
+ - target: {fileID: 5521721997653780584, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3}
+ propertyPath: m_Materials.Array.data[1]
+ value:
+ objectReference: {fileID: 2100000, guid: 5c5aa636b730eba44b9a80ea76a7bc4e, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3}
--- !u!1 &6175185380924501080 stripped
@@ -2290,8 +2305,7 @@ SkinnedMeshRenderer:
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: 189d3cb852c97e347a22ac98acecf531, type: 2}
+ m_Materials: []
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -2345,21 +2359,6 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
---- !u!114 &2801103463188715858
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6175185380924501080}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 801f20123d7ca1a4ebbf7aa1d9de53f8, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- scrollSpeedX: 1
- scrollSpeedY: 0
- game: {fileID: 0}
--- !u!4 &6843636135936194274 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: ddff1c9d4886fd746bbd2b69bf51f546, type: 3}
diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/Sky.png b/Assets/Resources/Models/Games/Airboarder/Materials/Sky.png
new file mode 100644
index 000000000..3410c6825
Binary files /dev/null and b/Assets/Resources/Models/Games/Airboarder/Materials/Sky.png differ
diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/Sky.png.meta b/Assets/Resources/Models/Games/Airboarder/Materials/Sky.png.meta
new file mode 100644
index 000000000..0b25187b6
--- /dev/null
+++ b/Assets/Resources/Models/Games/Airboarder/Materials/Sky.png.meta
@@ -0,0 +1,176 @@
+fileFormatVersion: 2
+guid: 5b82c9572d4fe7c41af997c06e051ea0
+TextureImporter:
+ internalIDToNameTable:
+ - first:
+ 213: 7482667652216324306
+ second: Square
+ externalObjects: {}
+ serializedVersion: 12
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 0
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMasterTextureLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 1
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 256
+ spriteBorder: {x: 4, y: 4, z: 4, w: 4}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: 0
+ textureType: 1
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ cookieLightType: 1
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Server
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites:
+ - serializedVersion: 2
+ name: Square
+ rect:
+ serializedVersion: 2
+ x: 0
+ y: 0
+ width: 256
+ height: 256
+ alignment: 0
+ pivot: {x: 0.5, y: 0.5}
+ border: {x: 0, y: 0, z: 0, w: 0}
+ outline: []
+ physicsShape: []
+ tessellationDetail: 0
+ bones: []
+ spriteID: 2d009a6b596c7d760800000000000000
+ internalID: 7482667652216324306
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ outline: []
+ physicsShape:
+ - - {x: -128, y: 128}
+ - {x: -128, y: -128}
+ - {x: 128, y: -128}
+ - {x: 128, y: 128}
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ nameFileIdTable:
+ Square: 7482667652216324306
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_body.png.meta b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_body.png.meta
index ef8d535b1..a817a82c4 100644
--- a/Assets/Resources/Models/Games/Airboarder/Materials/airboy_body.png.meta
+++ b/Assets/Resources/Models/Games/Airboarder/Materials/airboy_body.png.meta
@@ -6,7 +6,7 @@ TextureImporter:
serializedVersion: 12
mipmaps:
mipMapMode: 0
- enableMipMap: 0
+ enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -34,12 +34,12 @@ TextureImporter:
textureSettings:
serializedVersion: 2
filterMode: 1
- aniso: 1
+ aniso: 8
mipBias: 0
- wrapU: 1
+ wrapU: 3
wrapV: 1
wrapW: 1
- nPOTScale: 0
+ nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 1
@@ -50,10 +50,10 @@ TextureImporter:
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
- alphaUsage: 1
- alphaIsTransparency: 1
+ alphaUsage: 0
+ alphaIsTransparency: 0
spriteTessellationDetail: -1
- textureType: 8
+ textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/floor 1.png b/Assets/Resources/Models/Games/Airboarder/Materials/floor 1.png
new file mode 100644
index 000000000..c2d9b47d7
Binary files /dev/null and b/Assets/Resources/Models/Games/Airboarder/Materials/floor 1.png differ
diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/floor 1.png.meta b/Assets/Resources/Models/Games/Airboarder/Materials/floor 1.png.meta
new file mode 100644
index 000000000..0a9bfebf7
--- /dev/null
+++ b/Assets/Resources/Models/Games/Airboarder/Materials/floor 1.png.meta
@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: e63f82dce03ddec43891c66e2945190b
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 12
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMasterTextureLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 1
+ aniso: 1
+ mipBias: 0
+ wrapU: 0
+ wrapV: 0
+ wrapW: 0
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 4096
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Server
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ nameFileIdTable: {}
+ spritePackingTag:
+ pSDRemoveMatte: 0
+ pSDShowRemoveMatteOption: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/floor.mat b/Assets/Resources/Models/Games/Airboarder/Materials/floor.mat
index eae0eb722..bfc347490 100644
--- a/Assets/Resources/Models/Games/Airboarder/Materials/floor.mat
+++ b/Assets/Resources/Models/Games/Airboarder/Materials/floor.mat
@@ -8,10 +8,11 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: floor
- m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0}
+ m_Shader: {fileID: 4800000, guid: ff54fed5718ccc543808dec1f266d1c8, type: 3}
m_ValidKeywords: []
- m_InvalidKeywords: []
- m_LightmapFlags: 4
+ m_InvalidKeywords:
+ - _EMISSION
+ m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
@@ -59,6 +60,7 @@ Material:
m_Ints: []
m_Floats:
- _BumpScale: 1
+ - _ColorMask: 15
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
@@ -71,10 +73,20 @@ Material:
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilOp: 0
+ - _StencilReadMask: 255
+ - _StencilWriteMask: 255
- _UVSec: 0
+ - _UseUIAlphaClip: 0
- _ZWrite: 1
m_Colors:
+ - _AddColor: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _ColorAlpha: {r: 0.82745105, g: 0.1254902, b: 0.8078432, a: 1}
+ - _ColorBravo: {r: 1, g: 1, b: 1, a: 1}
+ - _ColorDelta: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0.6766883, g: 0.6766883, b: 0.6766883, a: 1}
- - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+ - _SpecColor: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 1}
m_BuildTextureStacks: []
diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/floor.png b/Assets/Resources/Models/Games/Airboarder/Materials/floor.png
index c2d9b47d7..fd128a392 100644
Binary files a/Assets/Resources/Models/Games/Airboarder/Materials/floor.png and b/Assets/Resources/Models/Games/Airboarder/Materials/floor.png differ
diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/floor.png.meta b/Assets/Resources/Models/Games/Airboarder/Materials/floor.png.meta
index 576921ed9..dc195c34c 100644
--- a/Assets/Resources/Models/Games/Airboarder/Materials/floor.png.meta
+++ b/Assets/Resources/Models/Games/Airboarder/Materials/floor.png.meta
@@ -6,8 +6,8 @@ TextureImporter:
serializedVersion: 12
mipmaps:
mipMapMode: 0
- enableMipMap: 0
- sRGBTexture: 0
+ enableMipMap: 1
+ sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
@@ -51,9 +51,9 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
- alphaIsTransparency: 1
+ alphaIsTransparency: 0
spriteTessellationDetail: -1
- textureType: 8
+ textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/floorspecular.mat b/Assets/Resources/Models/Games/Airboarder/Materials/floorspecular.mat
new file mode 100644
index 000000000..9d00adfa0
--- /dev/null
+++ b/Assets/Resources/Models/Games/Airboarder/Materials/floorspecular.mat
@@ -0,0 +1,85 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+ serializedVersion: 8
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: floorspecular
+ m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0}
+ m_ValidKeywords: []
+ m_InvalidKeywords: []
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _BumpMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailAlbedoMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailMask:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DetailNormalMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _EmissionMap:
+ m_Texture: {fileID: 2800000, guid: e63f82dce03ddec43891c66e2945190b, type: 3}
+ m_Scale: {x: 128, y: 0}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 2800000, guid: e63f82dce03ddec43891c66e2945190b, type: 3}
+ m_Scale: {x: 128, y: 0}
+ m_Offset: {x: 0, y: 0}
+ - _MetallicGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _OcclusionMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _ParallaxMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _SpecGlossMap:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Ints: []
+ m_Floats:
+ - _BumpScale: 1
+ - _Cutoff: 0.5
+ - _DetailNormalMapScale: 1
+ - _DstBlend: 0
+ - _GlossMapScale: 1
+ - _Glossiness: 0.65
+ - _GlossyReflections: 1
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _UVSec: 0
+ - _ZWrite: 1
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+ - _SpecColor: {r: 0.21960786, g: 0.21960786, b: 0.21960786, a: 1}
+ m_BuildTextureStacks: []
diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/floorspecular.mat.meta b/Assets/Resources/Models/Games/Airboarder/Materials/floorspecular.mat.meta
new file mode 100644
index 000000000..5fcd539b1
--- /dev/null
+++ b/Assets/Resources/Models/Games/Airboarder/Materials/floorspecular.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5c5aa636b730eba44b9a80ea76a7bc4e
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Models/Games/Airboarder/Materials/sky.mat b/Assets/Resources/Models/Games/Airboarder/Materials/sky.mat
index d46ace6be..00360dede 100644
--- a/Assets/Resources/Models/Games/Airboarder/Materials/sky.mat
+++ b/Assets/Resources/Models/Games/Airboarder/Materials/sky.mat
@@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: sky
- m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0}
+ m_Shader: {fileID: 10755, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords: []
m_InvalidKeywords:
- _GLOSSYREFLECTIONS_OFF
@@ -43,7 +43,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 2800000, guid: b3d955972a2608c49b05b527a1c374bd, type: 3}
+ m_Texture: {fileID: 2800000, guid: 5b82c9572d4fe7c41af997c06e051ea0, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
@@ -61,6 +61,8 @@ Material:
m_Ints: []
m_Floats:
- _BumpScale: 1
+ - _ColorMask: 15
+ - _CullMode: 0
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
@@ -74,10 +76,17 @@ Material:
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 0
- _SrcBlend: 1
+ - _Stencil: 0
+ - _StencilComp: 8
+ - _StencilOp: 0
+ - _StencilReadMask: 255
+ - _StencilWriteMask: 255
- _Threshold: 0
- _UVSec: 0
+ - _UseUIAlphaClip: 0
- _ZWrite: 1
m_Colors:
+ - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
diff --git a/Assets/Resources/Prefabs/GameView/GameTex.renderTexture b/Assets/Resources/Prefabs/GameView/GameTex.renderTexture
index 8c4b7c141..a724bcdd0 100644
--- a/Assets/Resources/Prefabs/GameView/GameTex.renderTexture
+++ b/Assets/Resources/Prefabs/GameView/GameTex.renderTexture
@@ -14,8 +14,8 @@ RenderTexture:
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 5
- m_Width: 1057
- m_Height: 595
+ m_Width: 1228
+ m_Height: 691
m_AntiAliasing: 2
m_MipCount: -1
m_DepthStencilFormat: 92
diff --git a/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture b/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture
index 0adc9aee6..44baf42de 100644
--- a/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture
+++ b/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture
@@ -14,8 +14,8 @@ RenderTexture:
m_DownscaleFallback: 0
m_IsAlphaChannelOptional: 0
serializedVersion: 5
- m_Width: 1585
- m_Height: 892
+ m_Width: 1842
+ m_Height: 1036
m_AntiAliasing: 1
m_MipCount: -1
m_DepthStencilFormat: 92
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/airboarder.png b/Assets/Resources/Sprites/Editor/GameIcons/airboarder.png
index 84b5ce188..80bca94f3 100644
Binary files a/Assets/Resources/Sprites/Editor/GameIcons/airboarder.png and b/Assets/Resources/Sprites/Editor/GameIcons/airboarder.png differ
diff --git a/Assets/Resources/Sprites/Editor/GameIcons/airboarder.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/airboarder.png.meta
index dd2115985..7eb01f893 100644
--- a/Assets/Resources/Sprites/Editor/GameIcons/airboarder.png.meta
+++ b/Assets/Resources/Sprites/Editor/GameIcons/airboarder.png.meta
@@ -67,7 +67,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
- maxTextureSize: 2048
+ maxTextureSize: 4096
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
diff --git a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/carpenterHit.anim b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/carpenterHit.anim
index 44d41407a..c4b6e2ca5 100644
--- a/Assets/Resources/Sprites/Games/NailCarpenter/Animations/carpenterHit.anim
+++ b/Assets/Resources/Sprites/Games/NailCarpenter/Animations/carpenterHit.anim
@@ -20,15 +20,6 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: {x: 0, y: 3.36, z: 0}
- inSlope: {x: 0, y: 0, z: 0}
- outSlope: {x: 0, y: 0, z: 0}
- tangentMode: 0
- weightedMode: 0
- inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- - serializedVersion: 3
- time: 0.05
value: {x: 0.1, y: 3.2, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@@ -37,7 +28,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
- time: 0.25
+ time: 0.2
value: {x: 0, y: 3.36, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@@ -54,15 +45,6 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: {x: 0, y: 1.1, z: 0}
- inSlope: {x: 0, y: 0, z: 0}
- outSlope: {x: 0, y: 0, z: 0}
- tangentMode: 0
- weightedMode: 0
- inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- - serializedVersion: 3
- time: 0.05
value: {x: 0, y: 1.05, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@@ -71,7 +53,7 @@ AnimationClip:
inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
- serializedVersion: 3
- time: 0.25
+ time: 0.2
value: {x: 0, y: 1.1, z: 0}
inSlope: {x: 0, y: 0, z: 0}
outSlope: {x: 0, y: 0, z: 0}
@@ -88,20 +70,14 @@ AnimationClip:
m_PPtrCurves:
- curve:
- time: 0
- value: {fileID: -1543273638, guid: 99d6a57b351ee2046b9af317c31f4a05, type: 3}
- - time: 0.016666668
- value: {fileID: 1352923740, guid: 99d6a57b351ee2046b9af317c31f4a05, type: 3}
- - time: 0.033333335
- value: {fileID: 931314201, guid: 99d6a57b351ee2046b9af317c31f4a05, type: 3}
- - time: 0.05
value: {fileID: -973307119, guid: 99d6a57b351ee2046b9af317c31f4a05, type: 3}
- - time: 0.13333334
+ - time: 0.083333336
value: {fileID: 931314201, guid: 99d6a57b351ee2046b9af317c31f4a05, type: 3}
- - time: 0.16666667
+ - time: 0.11666667
value: {fileID: 931314201, guid: 99d6a57b351ee2046b9af317c31f4a05, type: 3}
- - time: 0.2
+ - time: 0.15
value: {fileID: 1352923740, guid: 99d6a57b351ee2046b9af317c31f4a05, type: 3}
- - time: 0.23333333
+ - time: 0.18333334
value: {fileID: -1543273638, guid: 99d6a57b351ee2046b9af317c31f4a05, type: 3}
attribute: m_Sprite
path: Arm
@@ -136,9 +112,6 @@ AnimationClip:
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- - {fileID: -1543273638, guid: 99d6a57b351ee2046b9af317c31f4a05, type: 3}
- - {fileID: 1352923740, guid: 99d6a57b351ee2046b9af317c31f4a05, type: 3}
- - {fileID: 931314201, guid: 99d6a57b351ee2046b9af317c31f4a05, type: 3}
- {fileID: -973307119, guid: 99d6a57b351ee2046b9af317c31f4a05, type: 3}
- {fileID: 931314201, guid: 99d6a57b351ee2046b9af317c31f4a05, type: 3}
- {fileID: 931314201, guid: 99d6a57b351ee2046b9af317c31f4a05, type: 3}
@@ -149,7 +122,7 @@ AnimationClip:
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 0.25
+ m_StopTime: 0.2
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
@@ -170,15 +143,6 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.05
value: 0.1
inSlope: 0
outSlope: 0
@@ -187,7 +151,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 0.25
+ time: 0.2
value: 0
inSlope: 0
outSlope: 0
@@ -207,15 +171,6 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: 3.36
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.05
value: 3.2
inSlope: 0
outSlope: 0
@@ -224,7 +179,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 0.25
+ time: 0.2
value: 3.36
inSlope: 0
outSlope: 0
@@ -244,53 +199,6 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- attribute: m_LocalPosition.z
- path: Head
- classID: 4
- script: {fileID: 0}
- - curve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- attribute: m_LocalPosition.x
- path: Body
- classID: 4
- script: {fileID: 0}
- - curve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 1.1
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.05
value: 1.05
inSlope: 0
outSlope: 0
@@ -299,7 +207,7 @@ AnimationClip:
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
- time: 0.25
+ time: 0.2
value: 1.1
inSlope: 0
outSlope: 0
@@ -314,25 +222,6 @@ AnimationClip:
path: Body
classID: 4
script: {fileID: 0}
- - curve:
- serializedVersion: 2
- m_Curve:
- - serializedVersion: 3
- time: 0
- value: 0
- inSlope: 0
- outSlope: 0
- tangentMode: 136
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- m_PreInfinity: 2
- m_PostInfinity: 2
- m_RotationOrder: 4
- attribute: m_LocalPosition.z
- path: Body
- classID: 4
- script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity
index 9dabc4655..736d75c83 100644
--- a/Assets/Scenes/Editor.unity
+++ b/Assets/Scenes/Editor.unity
@@ -8194,7 +8194,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
- m_fontSize: 14
+ m_fontSize: 9.6
m_fontSizeBase: 14.3
m_fontWeight: 400
m_enableAutoSizing: 1
@@ -13012,7 +13012,7 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 171581557}
m_HandleRect: {fileID: 171581556}
m_Direction: 2
- m_Value: 0
+ m_Value: 1
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
@@ -24624,7 +24624,7 @@ MonoBehaviour:
m_HandleRect: {fileID: 1589389271}
m_Direction: 2
m_Value: 1
- m_Size: 0.9897467
+ m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
@@ -30367,7 +30367,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
- m_AnchoredPosition: {x: 0, y: 121.101654}
+ m_AnchoredPosition: {x: 0, y: 76.36735}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &1154875945
@@ -39827,8 +39827,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1220118245}
m_HandleRect: {fileID: 1220118244}
m_Direction: 2
- m_Value: 1.0000005
- m_Size: 0.60513115
+ m_Value: 1.0000002
+ m_Size: 0.23447229
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
diff --git a/Assets/Scripts/AppInfo.cs b/Assets/Scripts/AppInfo.cs
index 3c4e770f2..c905f36a4 100644
--- a/Assets/Scripts/AppInfo.cs
+++ b/Assets/Scripts/AppInfo.cs
@@ -1,8 +1,8 @@
using System;
public static class AppInfo {
- public const string Version = "1.0.6";
- public static readonly DateTime Date = new DateTime(2024, 03, 02, 01, 37, 04, 692, DateTimeKind.Utc);
+ public const string Version = "1.0.7";
+ public static readonly DateTime Date = new DateTime(2024, 03, 04, 16, 30, 24, 733, DateTimeKind.Utc);
}
diff --git a/Assets/Scripts/Games/Airboarder/Airboarder.cs b/Assets/Scripts/Games/Airboarder/Airboarder.cs
index 066f1d692..5cd4cf116 100644
--- a/Assets/Scripts/Games/Airboarder/Airboarder.cs
+++ b/Assets/Scripts/Games/Airboarder/Airboarder.cs
@@ -101,6 +101,20 @@ namespace HeavenStudio.Games.Loaders
}
},
+ new GameAction("fade background", "Background Color")
+ {
+ function = delegate {Airboarder.instance.BackgroundColor(eventCaller.currentEntity.beat, eventCaller.currentEntity.length, eventCaller.currentEntity["colorStart"], eventCaller.currentEntity["colorEnd"], eventCaller.currentEntity["ease"]); },
+ defaultLength = 4f,
+ resizable = true,
+ parameters = new List()
+ {
+ new Param("colorStart", Color.white, "Start Color", "Set the color at the start of the event."),
+ new Param("colorEnd", Airboarder.defaultBGColor, "End Color", "Set the color at the end of the event."),
+ new Param("ease", Util.EasingFunction.Ease.Linear, "Ease", "Set the easing of the action.")
+ }
+ },
+
+
new GameAction("camera", "Camera Controls")
{
function = delegate {
@@ -118,6 +132,7 @@ namespace HeavenStudio.Games.Loaders
new Param("additive", true, "Additive Rotation", "Toggle if the above rotation should be added to the current angle instead of setting the target angle to travel to.")
}
},
+
},
@@ -145,7 +160,12 @@ namespace HeavenStudio.Games
public static Airboarder instance;
+ public static Color defaultBGColor = new Color(0.9921569f, 0.7686275f, 0.9921569f);
+
public bool wantsCrouch;
+ [Header("Materials")]
+ [SerializeField] private Material bgMaterial;
+ [SerializeField] private Material[] floorMaterial;
[Header("Camera")]
[SerializeField] Transform cameraPivot;
@@ -155,6 +175,7 @@ namespace HeavenStudio.Games
[Header("Objects")]
[SerializeField] Arch archBasic;
[SerializeField] Wall wallBasic;
+ [SerializeField] GameObject floor;
[Header("Animators")]
[SerializeField] public Animator CPU1;
@@ -190,10 +211,12 @@ namespace HeavenStudio.Games
GameCamera.AdditionalPosition = cameraPos.position + (Quaternion.Euler(cameraPos.rotation.eulerAngles) * Vector3.forward * 10f);
GameCamera.AdditionalRotEuler = cameraPos.rotation.eulerAngles;
GameCamera.AdditionalFoV = cameraFOV;
+
}
public override void OnGameSwitch(double beat)
{
+
List actions = new()
{};
wantsCrouch = false;
@@ -228,12 +251,14 @@ namespace HeavenStudio.Games
wallBasic.CueJump(e.beat);
break;
}
- }
+ }
+ PersistColor (beat);
}
private void Start()
{
EntityPreCheck(Conductor.instance.songPositionInBeatsAsDouble);
+ bgMaterial.color = defaultBGColor;
}
void EntityPreCheck(double beat)
@@ -289,6 +314,7 @@ namespace HeavenStudio.Games
{
var cond = Conductor.instance;
var currentBeat = cond.songPositionInBeatsAsDouble;
+ BackgroundColorUpdate();
float normalizedBeat = Conductor.instance.GetPositionFromBeat(startBeat, 5f);
@@ -339,7 +365,30 @@ namespace HeavenStudio.Games
}
+ private ColorEase bgColorEase = new();
+ //call this in update
+ private void BackgroundColorUpdate()
+ {
+ bgMaterial.color = bgColorEase.GetColor();
+
+ }
+ public void BackgroundColor(double beat, float length, Color startColor, Color endColor, int ease)
+ {
+ bgColorEase = new(beat, length, startColor, endColor, ease);
+ }
+
+
+ private void PersistColor(double beat)
+ {
+ var allEventsBeforeBeat = EventCaller.GetAllInGameManagerList("airboarder", new string[] { "fade background" }).FindAll(x => x.beat < beat);
+ if (allEventsBeforeBeat.Count > 0)
+ {
+ allEventsBeforeBeat.Sort((x, y) => x.beat.CompareTo(y.beat)); //just in case
+ var lastEvent = allEventsBeforeBeat[^1];
+ BackgroundColor(lastEvent.beat, lastEvent.length, lastEvent["colorStart"], lastEvent["colorEnd"], lastEvent["ease"]);
+ }
+ }
public void ForceCharge()
{
diff --git a/Assets/Scripts/Games/Airboarder/Arch.cs b/Assets/Scripts/Games/Airboarder/Arch.cs
index 286538f7d..e9a0cfb37 100644
--- a/Assets/Scripts/Games/Airboarder/Arch.cs
+++ b/Assets/Scripts/Games/Airboarder/Arch.cs
@@ -42,11 +42,12 @@ namespace HeavenStudio.Games.Scripts_Airboarder
public void CueDuck(double duckBeat)
{
- game.wantsCrouch = false;
+
game.ScheduleInput(duckBeat, 3f, Minigame.InputAction_BasicPress, DuckSuccess, DuckMiss, DuckEmpty);
BeatAction.New(game, new List() {
new BeatAction.Action(duckBeat, delegate {
+ game.wantsCrouch = false;
game.cpu1CantBop = true;
game.CPU1.DoScaledAnimationAsync("letsgo", 1f, 0, 1);
} ),
@@ -73,12 +74,11 @@ namespace HeavenStudio.Games.Scripts_Airboarder
public void CueCrouch(double crouchBeat)
{
- game.wantsCrouch = true;
- game.ScheduleInput(crouchBeat, 3f, Minigame.InputAction_BasicPress, CrouchSuccess, CrouchMiss, CrouchEmpty);
-
+ game.ScheduleInput(crouchBeat, 3f, Minigame.InputAction_BasicPress, CrouchSuccess, CrouchMiss, CrouchEmpty);
BeatAction.New(game, new List() {
new BeatAction.Action(crouchBeat, delegate {
+ game.wantsCrouch = true;
game.cpu1CantBop = true;
game.CPU1.DoScaledAnimationAsync("letsgo", 1f, 0, 1);
}),
diff --git a/Assets/Shaders/StandardMapped.shader b/Assets/Shaders/StandardMapped.shader
new file mode 100644
index 000000000..ec256b71e
--- /dev/null
+++ b/Assets/Shaders/StandardMapped.shader
@@ -0,0 +1,53 @@
+Shader "Custom/StandardMapped"
+{
+ Properties
+ {
+ _Color ("Color", Color) = (1,1,1,1)
+ _MainTex ("Albedo (RGB)", 2D) = "white" {}
+ _Glossiness ("Smoothness", Range(0,1)) = 0.5
+ _Metallic ("Metallic", Range(0,1)) = 0.0
+ }
+ SubShader
+ {
+ Tags { "RenderType"="Opaque" }
+ LOD 200
+
+ CGPROGRAM
+ // Physically based Standard lighting model, and enable shadows on all light types
+ #pragma surface surf Standard fullforwardshadows
+
+ // Use shader model 3.0 target, to get nicer looking lighting
+ #pragma target 3.0
+
+ sampler2D _MainTex;
+
+ struct Input
+ {
+ float2 uv_MainTex;
+ };
+
+ half _Glossiness;
+ half _Metallic;
+ fixed4 _Color;
+
+ // Add instancing support for this shader. You need to check 'Enable Instancing' on materials that use the shader.
+ // See https://docs.unity3d.com/Manual/GPUInstancing.html for more information about instancing.
+ // #pragma instancing_options assumeuniformscaling
+ UNITY_INSTANCING_BUFFER_START(Props)
+ // put more per-instance properties here
+ UNITY_INSTANCING_BUFFER_END(Props)
+
+ void surf (Input IN, inout SurfaceOutputStandard o)
+ {
+ // Albedo comes from a texture tinted by color
+ fixed4 c = tex2D (_MainTex, IN.uv_MainTex) * _Color;
+ o.Albedo = c.rgb;
+ // Metallic and smoothness come from slider variables
+ o.Metallic = _Metallic;
+ o.Smoothness = _Glossiness;
+ o.Alpha = c.a;
+ }
+ ENDCG
+ }
+ FallBack "Diffuse"
+}
diff --git a/Assets/Shaders/StandardMapped.shader.meta b/Assets/Shaders/StandardMapped.shader.meta
new file mode 100644
index 000000000..dd742f566
--- /dev/null
+++ b/Assets/Shaders/StandardMapped.shader.meta
@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: fc134ad1a02fcd040949946dea95b304
+ShaderImporter:
+ externalObjects: {}
+ defaultTextures: []
+ nonModifiableTextures: []
+ preprocessorOverride: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index f14776fea..39527ff15 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -134,7 +134,7 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
- bundleVersion: 1.0.6
+ bundleVersion: 1.0.7
preloadedAssets:
- {fileID: 102900000, guid: 5348c08b82446e0478cee8bda6c02cfc, type: 3}
metroInputSource: 0
@@ -158,11 +158,11 @@ PlayerSettings:
applicationIdentifier:
Standalone: com.RHeavenStudio.Heaven-Studio
buildNumber:
- Standalone: 100006
+ Standalone: 100007
iPhone: 0
tvOS: 0
overrideDefaultApplicationIdentifier: 0
- AndroidBundleVersionCode: 100006
+ AndroidBundleVersionCode: 100007
AndroidMinSdkVersion: 22
AndroidTargetSdkVersion: 0
AndroidPreferredInstallLocation: 1
diff --git a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset
index 7aec8d377..16b46e873 100644
--- a/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset
+++ b/ProjectSettings/SatorImaging.UnitySourceGenerator.Editor.ProjectSettingsData.asset
@@ -17,85 +17,9 @@ MonoBehaviour:
DenseViewWidthThreshold: 512
_disableAutoReloadInBackground: 0
ImportedScriptPaths:
- - Assets/Scripts/Games/Tunnel/Tunnel.cs
- - Assets/Scripts/Games/ClappyTrio/ClappyTrio.cs
- - Assets/Scripts/LevelEditor/RemixPropertiesDialog/RemixPropertiesDialog.cs
- - Assets/Scripts/Games/TotemClimb/TotemClimb.cs
- - Assets/Plugins/StandaloneFileBrowser/IStandaloneFileBrowser.cs
- - Assets/Scripts/LevelEditor/Commands/CommandManager.cs
- - Assets/Scripts/Games/FirstContact/Translator.cs
- - Assets/Scripts/LevelEditor/TooltipGiver.cs
- - Assets/Scripts/InputSystem/USG.g/InitInputControllers.PlayerInput.ControllerLoaderGenerator.g.cs
- - Assets/Scripts/Games/DrummingPractice/DrummerHit.cs
- - Assets/Scripts/LevelEditor/TempoFinder/TempoFinder.cs
- - Assets/Scripts/LevelEditor/EventSelector/EventParameterManager.cs
- - Assets/Scripts/StudioDance/Dancer.cs
- - Assets/Scripts/LevelEditor/EventSelector/EventPropertyPrefab.cs
- - Assets/Scripts/Games/Lockstep/Lockstep.cs
- - Assets/Scripts/Games/TotemClimb/TCTotemManager.cs
- - Assets/Scripts/UI/Overlays/TimingAccuracyDisplay.cs
- - Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs
- - Assets/Scripts/Games/ForkLifter/ForkLifterPlayer.cs
- - Assets/Scripts/Games/DoubleDate/SoccerBall.cs
- - Assets/Scripts/Games/RhythmTweezers/Tweezers.cs
- - Assets/Scripts/Games/WorkingDough/WorkingDough.cs
- - Assets/Scripts/Games/TotemClimb/TCFrog.cs
- - Assets/Scripts/UI/SettingsDialog/Tabs/ControllerSettings.cs
- - Assets/Scripts/Games/SpaceDance/SpaceDance.cs
- - Assets/Scripts/Games/MrUpbeat/UpbeatMan.cs
- - Assets/Scripts/Games/OctopusMachine/OctopusMachine.cs
- - Assets/Scripts/Games/TotemClimb/TCPillarManager.cs
- - Assets/Scripts/Games/Fireworks/Fireworks.cs
- - Assets/Scripts/Games/FlipperFlop/FlipperFlop.cs
- - Assets/Scripts/Games/WizardsWaltz/Wizard.cs
- - Assets/Scripts/Games/MonkeyWatch/MonkeyWatch.cs
- - Assets/Scripts/Games/MonkeyWatch/WatchMonkeyHandler.cs
- - Assets/Scripts/Games/MonkeyWatch/WatchBackgroundHandler.cs
- - Assets/Scripts/Games/MonkeyWatch/MonkeyClockArrow.cs
- - Assets/Scripts/Games/MonkeyWatch/BalloonHandler.cs
- - Assets/Scripts/Games/MonkeyWatch/WatchMonkey.cs
- - Assets/Scripts/Games/LumBEARjack/LumBEARjack.cs
- - Assets/Scripts/Games/LumBEARjack/LBJBigObject.cs
- - Assets/Scripts/Games/LumBEARjack/LBJSmallObject.cs
- - Assets/Scripts/Games/LumBEARjack/LBJBear.cs
- - Assets/Scripts/Games/LumBEARjack/LBJHugeObject.cs
- - Assets/Scripts/Games/LumBEARjack/LBJCatMove.cs
- - Assets/Scripts/Util/ParticleSystemHelpers.cs
- - Assets/Scripts/Games/LumBEARjack/LBJBGCat.cs
- - Assets/Scripts/Games/LumBEARjack/LBJBaby.cs
- - Assets/Scripts/Games/LumBEARjack/LBJObjectRotate.cs
- - Assets/Scripts/Games/LumBEARjack/LBJMissObject.cs
- - Assets/Scripts/LevelEditor/RemixPropertiesDialog/PropertyPrefabs/BoolChartPropertyPrefab.cs
- - Assets/Plugins/Starpelly/Textures.cs
- - Assets/Plugins/Starpelly/OS.cs
- - Assets/Plugins/Color picker/ColorPreview.cs
- - Assets/Scripts/Games/Manzai/Manzai.cs
- - Assets/Plugins/Starpelly/Starpelly.cs
- - Assets/Scripts/LevelEditor/Tooltip.cs
- - Assets/Scripts/Games/SoundEffects.cs
- - Assets/Plugins/Starpelly/Random.cs
- - Assets/Plugins/Starpelly/OperatingSystem/Linux.cs
- - Assets/Plugins/Starpelly/Utils.cs
- - Assets/Plugins/Starpelly/Enums/Windows.cs
- - Assets/Plugins/Starpelly/OperatingSystem/Windows.cs
- - Assets/Plugins/Starpelly/Pelly.cs
- - Assets/Plugins/Starpelly/Enums/StringType.cs
- - Assets/Plugins/Starpelly/OperatingSystem/User32.cs
- - Assets/Plugins/Starpelly/Extensions.cs
- - Assets/Plugins/Starpelly/ScreenUtility.cs
- - Assets/Plugins/Starpelly/Properties/Strings.cs
- - Assets/Plugins/Starpelly/Anchors.cs
- - Assets/Plugins/Starpelly/Properties/Arrays.cs
- - Assets/Plugins/Starpelly/OperatingSystem/IOperatingSystem.cs
- - Assets/Scripts/LevelEditor/RemixPropertiesDialog/RemixPropertyPrefab.cs
- - Assets/Scripts/LevelEditor/Timeline/LayerLabel.cs
- - Assets/Plugins/Starpelly/Transformer.cs
- - Assets/Plugins/Starpelly/RendererExtensions.cs
- - Assets/Scripts/Util/StringUtils.cs
- - Assets/Plugins/Starpelly/OperatingSystem/MacOS.cs
- - Assets/Plugins/Starpelly/Common.cs
- - Assets/Scripts/Games/LumBEARjack/LBJBomb.cs
- - Assets/Scripts/Games/SumoBrothers/SumoBrothers.cs
- - Assets/Scripts/Games/RhythmTestGBA/RhythmTestGBA.cs
+ - Assets/Scripts/Games/Airboarder/Arch.cs
+ - Assets/Scripts/Games/Airboarder/Airboarder.cs
+ - Assets/Scripts/AppInfo.cs
+ - Assets/Scripts/Games/TossBoys/TossBoys.cs
PathsToSkipImportEvent: []
PathsToIgnoreOverwriteSettingOnAttribute: []