From 43f563e19eb1be216179aebc42133f46f3a0851f Mon Sep 17 00:00:00 2001 From: wookywok <62037083+wookywok@users.noreply.github.com> Date: Mon, 4 Mar 2024 17:52:21 -0600 Subject: [PATCH] recolorable sky --- Assets/Resources/Games/airboarder.prefab | 33 ++-- .../Models/Games/Airboarder/Materials/Sky.png | Bin 0 -> 2097 bytes .../Games/Airboarder/Materials/Sky.png.meta | 176 ++++++++++++++++++ .../Airboarder/Materials/airboy_body.png.meta | 14 +- .../Games/Airboarder/Materials/floor 1.png | Bin 0 -> 7142 bytes .../Airboarder/Materials/floor 1.png.meta | 123 ++++++++++++ .../Games/Airboarder/Materials/floor.mat | 20 +- .../Games/Airboarder/Materials/floor.png | Bin 7142 -> 5710 bytes .../Games/Airboarder/Materials/floor.png.meta | 8 +- .../Airboarder/Materials/floorspecular.mat | 85 +++++++++ .../Materials/floorspecular.mat.meta | 8 + .../Models/Games/Airboarder/Materials/sky.mat | 13 +- .../Prefabs/GameView/GameTex.renderTexture | 4 +- .../Prefabs/GameView/OverlayTex.renderTexture | 4 +- .../Sprites/Editor/GameIcons/airboarder.png | Bin 1343 -> 7247 bytes .../Editor/GameIcons/airboarder.png.meta | 2 +- .../Animations/carpenterHit.anim | 131 +------------ Assets/Scenes/Editor.unity | 12 +- Assets/Scripts/AppInfo.cs | 4 +- Assets/Scripts/Games/Airboarder/Airboarder.cs | 51 ++++- Assets/Scripts/Games/Airboarder/Arch.cs | 8 +- Assets/Shaders/StandardMapped.shader | 53 ++++++ Assets/Shaders/StandardMapped.shader.meta | 10 + ProjectSettings/ProjectSettings.asset | 6 +- ...Generator.Editor.ProjectSettingsData.asset | 84 +-------- 25 files changed, 593 insertions(+), 256 deletions(-) create mode 100644 Assets/Resources/Models/Games/Airboarder/Materials/Sky.png create mode 100644 Assets/Resources/Models/Games/Airboarder/Materials/Sky.png.meta create mode 100644 Assets/Resources/Models/Games/Airboarder/Materials/floor 1.png create mode 100644 Assets/Resources/Models/Games/Airboarder/Materials/floor 1.png.meta create mode 100644 Assets/Resources/Models/Games/Airboarder/Materials/floorspecular.mat create mode 100644 Assets/Resources/Models/Games/Airboarder/Materials/floorspecular.mat.meta create mode 100644 Assets/Shaders/StandardMapped.shader create mode 100644 Assets/Shaders/StandardMapped.shader.meta 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 0000000000000000000000000000000000000000..3410c68252208bef952a5d8683a07a4a581aac8f GIT binary patch literal 2097 zcmeHI&5zSY6rb=>J_;2Q7vMCQ3l-QNJ6UHl!YoU&-9)Olt0hvG8D)-&SB4T(#SRR#Y57f>%nTmcDH{R=91&WE*IQNAu*uxxoe^PAs$?>Fx~|FXKW zeDv_C!w8|Ht!85lp%M&B=-?iBJw3MI!0S-byqY2O?eY96p*wd^AhiFKY_IF};77_; zWU)|ngf)s1KqGWvVU#ewAvErYo{W9tpWh!EScbmw^ISlJq%Qihxt)qD+beCpy}@gt zv2YPz7*QaIgl2dY4dRTBd}GW@VVqCf1|CE7hHot92Jw2Zit8#B*t3Yq32||?W;tG^ zGCzMFyTm0nsoD-PU6&G%&Xw`>GQe6IcIjH)c% z;@Ylj0>aF;V$DWooSm65G(^TznP{nEoHMeH+SI-Qo=!rDl7cqQrZRzG_J}36W05?h zF)-u>F4;^6W8)#W#Xv+N))`=(0-N-eR#{*D4|TD;%K%6l1ci-v`VvKjiA*oufH0~8Ibx?UTOxLl@lyP=RYA=B)G;E>a~|lFqHAU5PXB@86ZMqIxRn2feG!fFM#wt zc`<=ys;h@A6^lJk>mxGH2KVi}XeW`_{|$1ywxhsjaOfKOuxMBCQ8YXeLzhdTojw2U z^&5ot{LyMGwnumWe(IDEKJth>die4*Up~J7=63JJr9Yp2cPsb?KSuXX-m2{VwTqq{ oxpb%0EF<}K@~a?UJQ@BvaR1f5fA>Bno&2ZXT3Ts5xP0yQTl{2u)c^nh literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c2d9b47d7239fb3e6837ccc8b905ec37f8c16f77 GIT binary patch literal 7142 zcmd5=du$X%9NucFWfKU#AodShBE)LM?#=AZ?(&iXmGTe)Arwu3y}R970=C$q1w?rl zMIs;?zu9m_!yEn5l^ZmZ> z`~7B;?mL4A^=&1m$&w_s>X+MRD1LkLJ2eH*bp;bDB`IlqLGRv!3jzU2%3L^c;jRI_ ztVhbypZzv-|H?UYQy!R?GCMQ%uu^d_?L@|xIh#gLACXo4REG`O17;p?v%N~INcqR-uH_|rKx$lCZC=-e_zR=!Fx|-bzAewpRK z?T1`FvhB}zHjiGMG`p~K_mda&dBxA)+>*DTZ@ay(Uaz{?#W=aI|ELkO*UXwacIB#V z7r)wlVCj<^4|H5`EHFVg|t9yPt?ZT?d>vtCJ`1R%Tj_q?Q(}tH!xKJ_g zbk^9M9ZtvmoMRO)t{8je-&;NAU%otW>&~vpQ#Y00Fq1Y;U3+@qwdxb-|ngN0ViYffYWw_8l3BUJw?=j20d=^?7nxVdI1VRITali~kAO_xZ@Gwv) z5ao;r-iOx9W~f1VWDNL16RnUuW*T~JY5vfBFFc-n9&VXG%%D3}@tNLmbYIosUQk0E zN{CGn3r|8-+<1duiz+f27H)<~KFZKmsg9=))IB*cLy#7h=*3jz9r^38Am=Z|Om9I^ zNkEeM(@Sp#VX~$$gE_j2o4PGdkb)Wzsi6{18p3Ll#{ z<5Ub;M}6oDwTMF;-MxsdgDtV$SUPb~1t$MPiY9$OZ9n zk4J4LpaE~;9AT!eK$-~?Y%mKkg)IajH8A3ukrD{;{si)TAuiWRqc(dtv>kC*h6EVK zf)Ey3#KpLt!RR>fZvI4YnR^qBUJKlSbfsZv25IhzCZg954$s^*BD@^(CF}*#?3(Ma zfX)lgwN}%Z4Xa%@ke$FjwUvVjjX|iP-G7v z)&k9JC?J6P#2Y&$$8SiM0fP~XeExz}0kZ=SlhmJIl zmoKv0-2GNl6e{0oD$X+nFjxlP_}K&-!n@P0qsU=_1+X?e=+#(c6bnsiqbLH{P~lDM zzEiAFLGmTHx4;9hJ710$A-te=^k}~BSV+DM%No=#fW2`We50tnVk!RC067du1 zd0OrzMjrb{F^ZL#Mghfgu(^R^i4l1?m{0ouD!n$+szO?AX+TS+NhlHct5QP~Y>lltWh>a(%em>K^8&4gto literal 0 HcmV?d00001 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 c2d9b47d7239fb3e6837ccc8b905ec37f8c16f77..fd128a392bb86ba12b5776efa8b438a9787f5d77 100644 GIT binary patch literal 5710 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 I(B!=T01a)nVE_OC literal 7142 zcmd5=du$X%9NucFWfKU#AodShBE)LM?#=AZ?(&iXmGTe)Arwu3y}R970=C$q1w?rl zMIs;?zu9m_!yEn5l^ZmZ> z`~7B;?mL4A^=&1m$&w_s>X+MRD1LkLJ2eH*bp;bDB`IlqLGRv!3jzU2%3L^c;jRI_ ztVhbypZzv-|H?UYQy!R?GCMQ%uu^d_?L@|xIh#gLACXo4REG`O17;p?v%N~INcqR-uH_|rKx$lCZC=-e_zR=!Fx|-bzAewpRK z?T1`FvhB}zHjiGMG`p~K_mda&dBxA)+>*DTZ@ay(Uaz{?#W=aI|ELkO*UXwacIB#V z7r)wlVCj<^4|H5`EHFVg|t9yPt?ZT?d>vtCJ`1R%Tj_q?Q(}tH!xKJ_g zbk^9M9ZtvmoMRO)t{8je-&;NAU%otW>&~vpQ#Y00Fq1Y;U3+@qwdxb-|ngN0ViYffYWw_8l3BUJw?=j20d=^?7nxVdI1VRITali~kAO_xZ@Gwv) z5ao;r-iOx9W~f1VWDNL16RnUuW*T~JY5vfBFFc-n9&VXG%%D3}@tNLmbYIosUQk0E zN{CGn3r|8-+<1duiz+f27H)<~KFZKmsg9=))IB*cLy#7h=*3jz9r^38Am=Z|Om9I^ zNkEeM(@Sp#VX~$$gE_j2o4PGdkb)Wzsi6{18p3Ll#{ z<5Ub;M}6oDwTMF;-MxsdgDtV$SUPb~1t$MPiY9$OZ9n zk4J4LpaE~;9AT!eK$-~?Y%mKkg)IajH8A3ukrD{;{si)TAuiWRqc(dtv>kC*h6EVK zf)Ey3#KpLt!RR>fZvI4YnR^qBUJKlSbfsZv25IhzCZg954$s^*BD@^(CF}*#?3(Ma zfX)lgwN}%Z4Xa%@ke$FjwUvVjjX|iP-G7v z)&k9JC?J6P#2Y&$$8SiM0fP~XeExz}0kZ=SlhmJIl zmoKv0-2GNl6e{0oD$X+nFjxlP_}K&-!n@P0qsU=_1+X?e=+#(c6bnsiqbLH{P~lDM zzEiAFLGmTHx4;9hJ710$A-te=^k}~BSV+DM%No=#fW2`We50tnVk!RC067du1 zd0OrzMjrb{F^ZL#Mghfgu(^R^i4l1?m{0ouD!n$+szO?AX+TS+NhlHct5QP~Y>lltWh>a(%em>K^8&4gto 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 84b5ce1886eec4e23f0f595f555d053ef8cee360..80bca94f34be9b8cc9208f9e2e7ad64a7a26fbd0 100644 GIT binary patch literal 7247 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 d00008000000002eQj#P delta 1309 zcmV+&1>*Y8IKK)ZiBL{Q4GJ0x0000DNk~Le0000i0000k2nGNE08>o+3Xvf+e+1M? zL_t(&L)Dmpv8x~uMbm;U*a9uk0xj5rE!cuB*n%zC0xj4A|6XLxqG&Y9o5{yHllKsI zugkKMJVFScQUeFN#I!;BIfi3PHZD`_ya1gKU^z_XjMO_Kj~Z>! zCT*8|?kIK^Xuw}L`Y8F%D0V9Nf8@-=!#2-z7{@WRZ5uJhWJo{9aO{glU#HP7b|wrc zHahP6K3HpE;c*Mj;oKME>AR!}77Cr9D3(qbt&$L-s;Z3A7=gA@F2{VrP)9A=dt-b+MEpZE!tDT)P-~ohApO*EggVoF$U?elyg79;+<$a zR1~!;N0;fAdM*CwyU=2kMR2wb+_ic#4T^CJfkd zm=U%HvusBHT#ah1qF}ud3zZ}0vIx%BAVxGzq#@he=+rfEj2+I0e~4+Kmhmc_6RQkt z(3b096ZYvxN0}NnjT&)hDH~baI?(^Wg5wPY)%E=csvi0HLc`V%!7hIhoHJn> z+u+A8V;rzTCa<|yDWrv^;H4&|rkABeTuxxEL5|{FfE=Z;;E`e{Oc35;Jm+yfDcRRh z%cgag1iO9=&FDire@;={JiQip2Itex1ZcN`-P%6)jc`e@E@y&+Q9I!n>9Irw0iV!L zJ~-Gm%|1|t@^(#djRTeCp{n5UQ)WLz`&E~pSIB#US%zS+F;&71UJatf4)tn2u38zUT?kx-(XCMGq!Vx zypro-T1EN+N7*F)mf#lEfj@q(QBKu@`BoBr7fFQ}UF;M3XmDGt)*c87>K?5^NkwgkAWf@wM7?~pMu(;F+BbO@m>w} TI5$gY00000NkvXXu0mjf!Kip~ 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: []