diff --git a/Assets/Bundled/Games/Fireworks/Sprites/bg_gradient.png.meta b/Assets/Bundled/Games/Fireworks/Sprites/bg_gradient.png.meta index 3fe01ef15..1efba5f41 100644 --- a/Assets/Bundled/Games/Fireworks/Sprites/bg_gradient.png.meta +++ b/Assets/Bundled/Games/Fireworks/Sprites/bg_gradient.png.meta @@ -119,5 +119,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: agbexplode/common assetBundleVariant: diff --git a/Assets/Bundled/Games/ForkLifter/Sprites/megamixfloor.png.meta b/Assets/Bundled/Games/ForkLifter/Sprites/megamixfloor.png.meta index 128864701..4047b186c 100644 --- a/Assets/Bundled/Games/ForkLifter/Sprites/megamixfloor.png.meta +++ b/Assets/Bundled/Games/ForkLifter/Sprites/megamixfloor.png.meta @@ -119,5 +119,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: rvlfork/common assetBundleVariant: diff --git a/Assets/Bundled/Games/SpaceSoccer/background.png b/Assets/Bundled/Games/SpaceSoccer/background.png new file mode 100644 index 000000000..2224587a2 Binary files /dev/null and b/Assets/Bundled/Games/SpaceSoccer/background.png differ diff --git a/Assets/Bundled/Games/SpaceSoccer/kicker_main.mat b/Assets/Bundled/Games/SpaceSoccer/kicker_main.mat new file mode 100644 index 000000000..898f3d386 --- /dev/null +++ b/Assets/Bundled/Games/SpaceSoccer/kicker_main.mat @@ -0,0 +1,91 @@ +%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: kicker_main + m_Shader: {fileID: 4800000, guid: ff54fed5718ccc543808dec1f266d1c8, type: 3} + 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: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + 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} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _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.72156864, g: 0.53333336, b: 0.972549, a: 1} + - _ColorBravo: {r: 1, g: 1, b: 1, a: 1} + - _ColorDelta: {r: 0.53333336, g: 0.2509804, b: 0.972549, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Bundled/Games/SpaceSoccer/kicker_main.mat.meta b/Assets/Bundled/Games/SpaceSoccer/kicker_main.mat.meta new file mode 100644 index 000000000..0e3e3e935 --- /dev/null +++ b/Assets/Bundled/Games/SpaceSoccer/kicker_main.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c20be2758e14cd748a9733a57db326fc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: ntrsoccer/common + assetBundleVariant: diff --git a/Assets/Bundled/Games/SpaceSoccer/kicker_mouth.mat b/Assets/Bundled/Games/SpaceSoccer/kicker_mouth.mat new file mode 100644 index 000000000..4f83123ba --- /dev/null +++ b/Assets/Bundled/Games/SpaceSoccer/kicker_mouth.mat @@ -0,0 +1,91 @@ +%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: kicker_mouth + m_Shader: {fileID: 4800000, guid: ff54fed5718ccc543808dec1f266d1c8, type: 3} + 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: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + 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} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _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.9411765, g: 0.28235295, b: 0.09411765, a: 1} + - _ColorBravo: {r: 1, g: 1, b: 1, a: 1} + - _ColorDelta: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Bundled/Games/SpaceSoccer/kicker_mouth.mat.meta b/Assets/Bundled/Games/SpaceSoccer/kicker_mouth.mat.meta new file mode 100644 index 000000000..19a781e5c --- /dev/null +++ b/Assets/Bundled/Games/SpaceSoccer/kicker_mouth.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1af4ec528c9f7154f93b578b6df3a536 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: ntrsoccer/common + assetBundleVariant: diff --git a/Assets/Bundled/Games/SpaceSoccer/platform_fire.mat b/Assets/Bundled/Games/SpaceSoccer/platform_fire.mat new file mode 100644 index 000000000..b1ad34804 --- /dev/null +++ b/Assets/Bundled/Games/SpaceSoccer/platform_fire.mat @@ -0,0 +1,91 @@ +%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: platform_fire + m_Shader: {fileID: 4800000, guid: ff54fed5718ccc543808dec1f266d1c8, type: 3} + 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: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + 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} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _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.72156864, g: 0.53333336, b: 0.972549, a: 1} + - _ColorBravo: {r: 0.44705883, g: 0.15294118, b: 0.6745098, a: 1} + - _ColorDelta: {r: 0.972549, g: 0.972549, b: 0.34509805, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Bundled/Games/SpaceSoccer/platform_fire.mat.meta b/Assets/Bundled/Games/SpaceSoccer/platform_fire.mat.meta new file mode 100644 index 000000000..50e18f171 --- /dev/null +++ b/Assets/Bundled/Games/SpaceSoccer/platform_fire.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1731b1eea99050a4c881281ecb07476b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: ntrsoccer/common + assetBundleVariant: diff --git a/Assets/Bundled/Games/SpaceSoccer/platform_main.mat b/Assets/Bundled/Games/SpaceSoccer/platform_main.mat new file mode 100644 index 000000000..8b9c310ae --- /dev/null +++ b/Assets/Bundled/Games/SpaceSoccer/platform_main.mat @@ -0,0 +1,91 @@ +%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: platform_main + m_Shader: {fileID: 4800000, guid: ff54fed5718ccc543808dec1f266d1c8, type: 3} + 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: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + 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} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _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.09411765, g: 0.21960784, b: 0.15686275, a: 1} + - _ColorBravo: {r: 0.4392157, g: 0.972549, b: 0.5647059, a: 1} + - _ColorDelta: {r: 0.34509805, g: 0.65882355, b: 0.5019608, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Bundled/Games/SpaceSoccer/platform_main.mat.meta b/Assets/Bundled/Games/SpaceSoccer/platform_main.mat.meta new file mode 100644 index 000000000..eb2b4cae4 --- /dev/null +++ b/Assets/Bundled/Games/SpaceSoccer/platform_main.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eda7f760ba4d52b41a364b9b1d3127cc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: ntrsoccer/common + assetBundleVariant: diff --git a/Assets/Bundled/Games/SpaceSoccer/spaceSoccer.prefab b/Assets/Bundled/Games/SpaceSoccer/spaceSoccer.prefab index b750636a8..9781cdc99 100644 --- a/Assets/Bundled/Games/SpaceSoccer/spaceSoccer.prefab +++ b/Assets/Bundled/Games/SpaceSoccer/spaceSoccer.prefab @@ -52,7 +52,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 1af4ec528c9f7154f93b578b6df3a536, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -137,7 +137,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: c20be2758e14cd748a9733a57db326fc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -385,7 +385,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 1731b1eea99050a4c881281ecb07476b, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -491,7 +491,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: c20be2758e14cd748a9733a57db326fc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -672,7 +672,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: eda7f760ba4d52b41a364b9b1d3127cc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -756,7 +756,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: c20be2758e14cd748a9733a57db326fc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -840,7 +840,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: c20be2758e14cd748a9733a57db326fc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -925,7 +925,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: c20be2758e14cd748a9733a57db326fc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1016,7 +1016,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.972549, g: 0.972549, b: 0.972549, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1189,7 +1189,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 1731b1eea99050a4c881281ecb07476b, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1294,7 +1294,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: c20be2758e14cd748a9733a57db326fc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1483,9 +1483,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: SoundSequences: [] - EligibleHits: [] - scheduledInputs: [] - firstEnable: 0 kickerPrefab: {fileID: 8473221055918901540} ballRef: {fileID: 7976131226454805035} kickers: @@ -1567,6 +1564,12 @@ MonoBehaviour: useLastRealPos: 0 values: [] ballDispensed: 0 + xBaseSpeed: 1 + yBaseSpeed: 1 + kickerMat: {fileID: 2100000, guid: c20be2758e14cd748a9733a57db326fc, type: 2} + mouthMat: {fileID: 2100000, guid: 1af4ec528c9f7154f93b578b6df3a536, type: 2} + platMat: {fileID: 2100000, guid: eda7f760ba4d52b41a364b9b1d3127cc, type: 2} + fireMat: {fileID: 2100000, guid: 1731b1eea99050a4c881281ecb07476b, type: 2} --- !u!114 &2258816687143469160 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1638,7 +1641,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: eda7f760ba4d52b41a364b9b1d3127cc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1722,7 +1725,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: c20be2758e14cd748a9733a57db326fc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1806,7 +1809,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: c20be2758e14cd748a9733a57db326fc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1952,7 +1955,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: c20be2758e14cd748a9733a57db326fc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2036,7 +2039,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: c20be2758e14cd748a9733a57db326fc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2120,7 +2123,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: c20be2758e14cd748a9733a57db326fc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2204,7 +2207,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: c20be2758e14cd748a9733a57db326fc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2288,7 +2291,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: c20be2758e14cd748a9733a57db326fc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2373,7 +2376,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: c20be2758e14cd748a9733a57db326fc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2542,7 +2545,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: c20be2758e14cd748a9733a57db326fc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2797,7 +2800,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 1af4ec528c9f7154f93b578b6df3a536, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2882,7 +2885,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: c20be2758e14cd748a9733a57db326fc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2966,7 +2969,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: c20be2758e14cd748a9733a57db326fc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3050,7 +3053,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: c20be2758e14cd748a9733a57db326fc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -3166,7 +3169,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: c20be2758e14cd748a9733a57db326fc, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/Assets/Bundled/Games/SpaceSoccer/spaceSoccer_main.png b/Assets/Bundled/Games/SpaceSoccer/spaceSoccer_main.png new file mode 100644 index 000000000..5a49b7d37 Binary files /dev/null and b/Assets/Bundled/Games/SpaceSoccer/spaceSoccer_main.png differ diff --git a/Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs b/Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs index 4340ba9e0..18a20b9b1 100644 --- a/Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs +++ b/Assets/Scripts/Games/SpaceSoccer/SpaceSoccer.cs @@ -96,11 +96,37 @@ namespace HeavenStudio.Games.Loaders { new Param("start", SpaceSoccer.defaultBGColor, "Start Color", "Set the color at the start of the event."), new Param("end", SpaceSoccer.defaultBGColor, "End Color", "Set the color at the end of the event."), - new Param("startDots", Color.white, "Start Color (Dots)", "Set the color at the start of the event."), - new Param("endDots", Color.white, "End Color (Dots)", "Set the color at the end of the event."), + new Param("startDots", SpaceSoccer.defaultStarColor, "Start Color (Dots)", "Set the color at the start of the event."), + new Param("endDots", SpaceSoccer.defaultStarColor, "End Color (Dots)", "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("changeKick", "Kicker Appearance") + { + function = delegate {var e = eventCaller.currentEntity; SpaceSoccer.instance.KickerColor(e.beat, e["outfit"], e["boots"], e["skin"]); }, + defaultLength = 0.5f, + parameters = new List() + { + new Param("outfit", SpaceSoccer.kickerLavender, "Outfit Color", "Set the color at the start of the event."), + new Param("boots", SpaceSoccer.kickerPurple, "Boots Color", "Set the color at the start of the event."), + new Param("skin", Color.white, "Skin Color", "Set the color at the start of the event."), + } + }, + new GameAction("changePlat", "Platform Appearance") + { + function = delegate {var e = eventCaller.currentEntity; SpaceSoccer.instance.PlatformColor(e.beat, e["top"], e["side"], e["outline"], e["flame"], e["mid"]); }, + defaultLength = 0.5f, + parameters = new List() + { + new Param("top", SpaceSoccer.platTop, "Top Color", "Set the color at the start of the event."), + new Param("side", SpaceSoccer.platSide, "Side Color", "Set the color at the start of the event."), + new Param("outline", SpaceSoccer.platOutline, "Outline Color", "Set the color at the start of the event."), + new Param("flame", SpaceSoccer.kickerLavender, "Flame Color", "Set the color at the start of the event."), + new Param("mid", SpaceSoccer.fireYellow, "Flame Middle Color", "Set the color at the start of the event."), + } + }, + + new GameAction("scroll", "Scrolling Background") { function = delegate { var e = eventCaller.currentEntity; SpaceSoccer.instance.UpdateScrollSpeed(e["x"], e["y"]); }, @@ -167,7 +193,7 @@ namespace HeavenStudio.Games using System; public class SpaceSoccer : Minigame - { + { public enum EnterExitPresets { FiveKickers, @@ -192,6 +218,13 @@ namespace HeavenStudio.Games Exit = 1 } public static Color defaultBGColor = new(1f, 0.49f, 0.153f); + public static Color defaultStarColor = new(248/255f, 248/255f, 248/255f); + public static Color kickerLavender = new(184/255f, 136/255f, 248/255f); + public static Color kickerPurple = new(136/255f, 64/255f, 248/255f); + public static Color platTop = new(112/255f, 248/255f, 144/255f); + public static Color platSide = new(88/255f, 168/255f, 128/255f); + public static Color platOutline = new(24/255f, 56/255f, 40/255f); + public static Color fireYellow = new(248/255f, 248/255f, 88/255f); [Header("Components")] [SerializeField] private GameObject kickerPrefab; @@ -209,6 +242,12 @@ namespace HeavenStudio.Games float yScrollMultiplier = 0.3f; [SerializeField] private float xBaseSpeed = 1; [SerializeField] private float yBaseSpeed = 1; + + [Header("Materials")] + public Material kickerMat; + public Material mouthMat; + public Material platMat; + public Material fireMat; private List _highKickToeBeats = new(); private List _stopBeats = new(); @@ -238,6 +277,16 @@ namespace HeavenStudio.Games { _highKickToeBeats.Add(e.beat); } + + kickerMat.SetColor("_ColorAlpha", kickerLavender); + kickerMat.SetColor("_ColorBravo", Color.white); + mouthMat.SetColor("_ColorBravo", Color.white); + kickerMat.SetColor("_ColorDelta", kickerPurple); + platMat.SetColor("_ColorAlpha", platOutline); + platMat.SetColor("_ColorBravo", platTop); + platMat.SetColor("_ColorDelta", platSide); + fireMat.SetColor("_ColorAlpha", kickerLavender); + fireMat.SetColor("_ColorDelta", fireYellow); } new void OnDrawGizmos() @@ -572,6 +621,23 @@ namespace HeavenStudio.Games bgColorEase = new(beat, length, startColorBG, endColorBG, ease); dotColorEase = new(beat, length, startColorDot, endColorDot, ease); } + + public void KickerColor(double beat, Color main, Color alt, Color skin) + { + kickerMat.SetColor("_ColorAlpha", main); + kickerMat.SetColor("_ColorBravo", skin); + mouthMat.SetColor("_ColorBravo", skin); + kickerMat.SetColor("_ColorDelta", alt); + } + + public void PlatformColor(double beat, Color top, Color side, Color outline, Color fire, Color mid) + { + platMat.SetColor("_ColorAlpha", outline); + platMat.SetColor("_ColorBravo", top); + platMat.SetColor("_ColorDelta", side); + fireMat.SetColor("_ColorAlpha", fire); + fireMat.SetColor("_ColorDelta", mid); + } //call this in OnPlay(double beat) and OnGameSwitch(double beat) private void PersistColor(double beat) @@ -582,6 +648,22 @@ namespace HeavenStudio.Games allEventsBeforeBeat.Sort((x, y) => x.beat.CompareTo(y.beat)); //just in case var lastEvent = allEventsBeforeBeat[^1]; BackgroundColor(lastEvent.beat, lastEvent.length, lastEvent["start"], lastEvent["end"], lastEvent["startDots"], lastEvent["endDots"], lastEvent["ease"]); + } + + var allEventsBeforeBeatKick = EventCaller.GetAllInGameManagerList("spaceSoccer", new string[] { "changeKick" }).FindAll(x => x.beat < beat); + if (allEventsBeforeBeatKick.Count > 0) + { + allEventsBeforeBeatKick.Sort((x, y) => x.beat.CompareTo(y.beat)); //just in case + var lastEvent = allEventsBeforeBeatKick[^1]; + KickerColor(lastEvent.beat, lastEvent["outfit"], lastEvent["boots"], lastEvent["skin"]); + } + + var allEventsBeforeBeatPlat = EventCaller.GetAllInGameManagerList("spaceSoccer", new string[] { "changePlat" }).FindAll(x => x.beat < beat); + if (allEventsBeforeBeatPlat.Count > 0) + { + allEventsBeforeBeatPlat.Sort((x, y) => x.beat.CompareTo(y.beat)); //just in case + var lastEvent = allEventsBeforeBeatPlat[^1]; + PlatformColor(lastEvent.beat, lastEvent["top"], lastEvent["side"], lastEvent["outline"], lastEvent["flame"], lastEvent["mid"]); } }