Skip to content

Commit

Permalink
Showing 4 changed files with 212 additions and 9 deletions.
219 changes: 211 additions & 8 deletions Assets/Art/Shaders/VocalStarpowerActivate.shadergraph
Original file line number Diff line number Diff line change
@@ -98,6 +98,9 @@
},
{
"m_Id": "eb24e1f12b99440fb0eb454c4827b663"
},
{
"m_Id": "278f3dcd83b744a2ae5ffd50162601e3"
}
],
"m_GroupDatas": [],
@@ -131,6 +134,20 @@
"m_SlotId": 1
}
},
{
"m_OutputSlot": {
"m_Node": {
"m_Id": "278f3dcd83b744a2ae5ffd50162601e3"
},
"m_SlotId": 2
},
"m_InputSlot": {
"m_Node": {
"m_Id": "56b2b98420a24cf6bd3fdf56b57b1bc1"
},
"m_SlotId": 1
}
},
{
"m_OutputSlot": {
"m_Node": {
@@ -280,9 +297,9 @@
},
"m_InputSlot": {
"m_Node": {
"m_Id": "56b2b98420a24cf6bd3fdf56b57b1bc1"
"m_Id": "278f3dcd83b744a2ae5ffd50162601e3"
},
"m_SlotId": 1
"m_SlotId": 0
}
},
{
@@ -565,6 +582,54 @@
"m_Labels": []
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
"m_ObjectId": "0684de44ab3f43abb1468d154c7bc6e8",
"m_Id": 0,
"m_DisplayName": "A",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "A",
"m_StageCapability": 3,
"m_Value": {
"e00": 0.0,
"e01": 0.0,
"e02": 0.0,
"e03": 0.0,
"e10": 0.0,
"e11": 0.0,
"e12": 0.0,
"e13": 0.0,
"e20": 0.0,
"e21": 0.0,
"e22": 0.0,
"e23": 0.0,
"e30": 0.0,
"e31": 0.0,
"e32": 0.0,
"e33": 0.0
},
"m_DefaultValue": {
"e00": 1.0,
"e01": 0.0,
"e02": 0.0,
"e03": 0.0,
"e10": 0.0,
"e11": 1.0,
"e12": 0.0,
"e13": 0.0,
"e20": 0.0,
"e21": 0.0,
"e22": 1.0,
"e23": 0.0,
"e30": 0.0,
"e31": 0.0,
"e32": 0.0,
"e33": 1.0
}
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@@ -647,7 +712,7 @@
"m_ShaderOutputName": "B",
"m_StageCapability": 3,
"m_Value": {
"e00": 0.10000000149011612,
"e00": 0.02500000037252903,
"e01": 2.0,
"e02": 2.0,
"e03": 2.0,
@@ -828,7 +893,7 @@
"m_Hidden": false,
"m_ShaderOutputName": "Y",
"m_StageCapability": 3,
"m_Value": 0.0,
"m_Value": -0.06499999761581421,
"m_DefaultValue": 0.0,
"m_Labels": [
"Y"
@@ -853,6 +918,48 @@
]
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.MultiplyNode",
"m_ObjectId": "278f3dcd83b744a2ae5ffd50162601e3",
"m_Group": {
"m_Id": ""
},
"m_Name": "Multiply",
"m_DrawState": {
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": -2035.0,
"y": -129.00001525878907,
"width": 126.0,
"height": 118.00000762939453
}
},
"m_Slots": [
{
"m_Id": "0684de44ab3f43abb1468d154c7bc6e8"
},
{
"m_Id": "68348c5fc8e54de49797a0403bf56dc0"
},
{
"m_Id": "5d2639b0b6894f3498794ea73653ae81"
}
],
"synonyms": [
"multiplication",
"times",
"x"
],
"m_Precision": 0,
"m_PreviewExpanded": false,
"m_PreviewMode": 0,
"m_CustomColors": {
"m_SerializableColors": []
}
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.GradientNoiseNode",
@@ -1292,7 +1399,7 @@
"m_ShaderOutputName": "B",
"m_StageCapability": 3,
"m_Value": {
"e00": 0.10000000149011612,
"e00": 0.30000001192092898,
"e01": 2.0,
"e02": 2.0,
"e03": 2.0,
@@ -1433,6 +1540,54 @@
"m_Labels": []
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
"m_ObjectId": "5d2639b0b6894f3498794ea73653ae81",
"m_Id": 2,
"m_DisplayName": "Out",
"m_SlotType": 1,
"m_Hidden": false,
"m_ShaderOutputName": "Out",
"m_StageCapability": 3,
"m_Value": {
"e00": 0.0,
"e01": 0.0,
"e02": 0.0,
"e03": 0.0,
"e10": 0.0,
"e11": 0.0,
"e12": 0.0,
"e13": 0.0,
"e20": 0.0,
"e21": 0.0,
"e22": 0.0,
"e23": 0.0,
"e30": 0.0,
"e31": 0.0,
"e32": 0.0,
"e33": 0.0
},
"m_DefaultValue": {
"e00": 1.0,
"e01": 0.0,
"e02": 0.0,
"e03": 0.0,
"e10": 0.0,
"e11": 1.0,
"e12": 0.0,
"e13": 0.0,
"e20": 0.0,
"e21": 0.0,
"e22": 1.0,
"e23": 0.0,
"e30": 0.0,
"e31": 0.0,
"e32": 0.0,
"e33": 1.0
}
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
@@ -1481,6 +1636,54 @@
}
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
"m_ObjectId": "68348c5fc8e54de49797a0403bf56dc0",
"m_Id": 1,
"m_DisplayName": "B",
"m_SlotType": 0,
"m_Hidden": false,
"m_ShaderOutputName": "B",
"m_StageCapability": 3,
"m_Value": {
"e00": 2.0,
"e01": 2.0,
"e02": 2.0,
"e03": 2.0,
"e10": 2.0,
"e11": 2.0,
"e12": 2.0,
"e13": 2.0,
"e20": 2.0,
"e21": 2.0,
"e22": 2.0,
"e23": 2.0,
"e30": 2.0,
"e31": 2.0,
"e32": 2.0,
"e33": 2.0
},
"m_DefaultValue": {
"e00": 1.0,
"e01": 0.0,
"e02": 0.0,
"e03": 0.0,
"e10": 0.0,
"e11": 1.0,
"e12": 0.0,
"e13": 0.0,
"e20": 0.0,
"e21": 0.0,
"e22": 1.0,
"e23": 0.0,
"e30": 0.0,
"e31": 0.0,
"e32": 0.0,
"e33": 1.0
}
}

{
"m_SGVersion": 0,
"m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot",
@@ -2028,10 +2231,10 @@
"m_Expanded": true,
"m_Position": {
"serializedVersion": "2",
"x": -2084.0,
"y": -26.999998092651368,
"x": -2188.0,
"y": -27.000003814697267,
"width": 104.0,
"height": 34.00000762939453
"height": 34.0
}
},
"m_Slots": [
Binary file modified Assets/Art/Textures/VocalMask.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Assets/Art/Textures/VocalStarpowerActivate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Assets/Script/PlayMode/MicPlayer.cs
Original file line number Diff line number Diff line change
@@ -495,7 +495,7 @@ private void Update() {
float currentStarpower = starpowerOverlay.material.GetFloat("AlphaMultiplier");
if (starpowerActive) {
starpowerOverlay.material.SetFloat("AlphaMultiplier",
Mathf.Lerp(currentStarpower, 0.25f, Time.deltaTime * 2f));
Mathf.Lerp(currentStarpower, 1f, Time.deltaTime * 2f));
} else {
starpowerOverlay.material.SetFloat("AlphaMultiplier",
Mathf.Lerp(currentStarpower, 0f, Time.deltaTime * 4f));

0 comments on commit a82d488

Please sign in to comment.