yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

パーティクルスキン変更処理追加

This commit is contained in:
kimura 2021-07-26 11:55:46 +09:00
parent 683d6fe837
commit 09abcff7aa
7 changed files with 131 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
popcorn/Assets/MyGame/Resource/Effect/EffectPrefabs/pt_Popcorn_strike.prefab
View File

@ -9680,6 +9680,7 @@ GameObject:
- component: {fileID: 7516975307168929495}
- component: {fileID: 7516975307168929494}
- component: {fileID: 7516975307168929493}
- component: {fileID: 721213865261247925}
m_Layer: 0
m_Name: pt_Popcorn_strike
m_TagString: Untagged
@ -14482,6 +14483,24 @@ ParticleSystemRenderer:
m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0}
m_MaskInteraction: 0
--- !u!114 &721213865261247925
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7516975307168929492}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0125090276d945c2bb856fd440fdff6b, type: 3}
m_Name:
m_EditorClassIdentifier:
particleRenderA: {fileID: 7516975307813098671}
particleRenderB: {fileID: 7516975307116267766}
particleRenderC: {fileID: 7516975306867202139}
burntMaterialA: {fileID: 2100000, guid: bec51957e6eb5467abd3d46dc72f642a, type: 2}
burntMaterialB: {fileID: 2100000, guid: cea7e196dbc8d4a4a8b8540ce7a2410f, type: 2}
burntMaterialC: {fileID: 2100000, guid: 036c01b6cfb3f425e9b48f183b100571, type: 2}
--- !u!1 &7516975307813098669
GameObject:
m_ObjectHideFlags: 0

77
popcorn/Assets/MyGame/Resource/Material/popcorn/popcorn_unfinished_burnt_failure_Dither.mat Normal file
View File

@ -0,0 +1,77 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: popcorn_unfinished_burnt_failure_Dither
m_Shader: {fileID: 10721, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
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: 2800000, guid: 8d287beb744ac6b458a3088ac499a1dd, type: 3}
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_Floats:
- _BumpScale: 1
- _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
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

8
popcorn/Assets/MyGame/Resource/Material/popcorn/popcorn_unfinished_burnt_failure_Dither.mat.meta Normal file
View File

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

2
popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity
View File

@ -8912,7 +8912,7 @@ MonoBehaviour:
cornSpawnTarget: {fileID: 1440136003}
cornPrefab: {fileID: 5499754490129207122, guid: 2b790fd908bd14de4a601c21374fb55b,
type: 3}
spilledCornAnimationPrefab: {fileID: 2449901118440757730, guid: 7e7fbf241bd7f461fb46363ff0c6be3e,
spilledCornAnimationPrefab: {fileID: 7516975307168929492, guid: 33c91c454a38e410cb291f1f2e5756cc,
type: 3}
cornSpawnCount: 50
maxFailedCornCount: 25

2
popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornManager.cs
View File

@ -253,7 +253,7 @@ public class CornManager : MonoBehaviour
// 画面KO再生
var animation = Instantiate(spilledCornAnimationPrefab, position, Quaternion.identity);
// KOコーンスキン変更
animation.GetComponent<CornSpilled>().ChangeCornSkin(condition);
animation.GetComponent<PopcornStrikeEffect>().ChangeSkin(condition);
VibrationManager.Instance.PlayVibrationDoubleStrong();
this.CallWaitForSeconds(1.5f, () => Destroy(animation));
}

22
popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornStrikeEffect.cs Normal file
View File

@ -0,0 +1,22 @@
using System;
using UnityEngine;
public class PopcornStrikeEffect : MonoBehaviour
{
[SerializeField] private ParticleSystemRenderer particleRenderA;
[SerializeField] private ParticleSystemRenderer particleRenderB;
[SerializeField] private ParticleSystemRenderer particleRenderC;
[SerializeField] private Material burntMaterialA;
[SerializeField] private Material burntMaterialB;
[SerializeField] private Material burntMaterialC;
public void ChangeSkin(CornCondition condition)
{
if (condition == CornCondition.Burnt)
{
particleRenderA.material = burntMaterialA;
particleRenderB.material = burntMaterialB;
particleRenderC.material = burntMaterialC;
}
}
}

3
popcorn/Assets/MyGame/Scenes/Cooking/Scripts/PopcornStrikeEffect.cs.meta Normal file
View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 0125090276d945c2bb856fd440fdff6b
timeCreated: 1627263716