From 76bbd1e312847ede0c9cdddb5890aa15e1f434c7 Mon Sep 17 00:00:00 2001 From: EliteAsian Date: Mon, 10 Apr 2023 12:00:23 -0400 Subject: [PATCH] Fixed vocal starpower activate --- .../PlayMode/VocalStarpowerActivate.mat | 1 + Assets/Art/Shaders/StarpowerBar.shadergraph | 58 +--- .../VocalStarpowerActivate.shadergraph | 321 +++++++++++++++++- Assets/Prefabs/EndPhraseLine.prefab | 8 +- Assets/Script/Pools/VocalStarpowerActivate.cs | 2 +- 5 files changed, 321 insertions(+), 69 deletions(-) diff --git a/Assets/Art/Materials/PlayMode/VocalStarpowerActivate.mat b/Assets/Art/Materials/PlayMode/VocalStarpowerActivate.mat index 21dd8a260..909056c61 100644 --- a/Assets/Art/Materials/PlayMode/VocalStarpowerActivate.mat +++ b/Assets/Art/Materials/PlayMode/VocalStarpowerActivate.mat @@ -83,6 +83,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - Alpha: 0.75 - Tiling: 1 - _AlphaClip: 0 - _Blend: 0 diff --git a/Assets/Art/Shaders/StarpowerBar.shadergraph b/Assets/Art/Shaders/StarpowerBar.shadergraph index b2d10322d..a43d3d3b8 100644 --- a/Assets/Art/Shaders/StarpowerBar.shadergraph +++ b/Assets/Art/Shaders/StarpowerBar.shadergraph @@ -845,7 +845,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -943,12 +942,10 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] - }, - "m_HashType": 0 + } } { @@ -977,7 +974,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -991,8 +987,7 @@ "m_ObjectId": "0bb6105629ba479eb67e55b5211e2d70", "m_WorkflowMode": 1, "m_NormalDropOffSpace": 0, - "m_ClearCoat": false, - "m_BlendModePreserveSpecular": true + "m_ClearCoat": false } { @@ -1077,7 +1072,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1314,7 +1308,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1357,7 +1350,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1475,7 +1467,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1524,7 +1515,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1562,7 +1552,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1821,7 +1810,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -1997,7 +1985,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2104,7 +2091,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2150,7 +2136,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2236,7 +2221,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2303,7 +2287,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2368,7 +2351,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2535,7 +2517,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2593,7 +2574,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2643,7 +2623,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2714,7 +2693,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2781,7 +2759,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2842,7 +2819,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2878,7 +2854,6 @@ "m_SGVersion": 1, "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", "m_ObjectId": "69027c65f0d24ababc0f34767ef978d4", - "m_Datas": [], "m_ActiveSubTarget": { "m_Id": "0bb6105629ba479eb67e55b5211e2d70" }, @@ -2891,7 +2866,6 @@ "m_AlphaClip": false, "m_CastShadows": true, "m_ReceiveShadows": true, - "m_SupportsLODCrossFade": false, "m_CustomEditorGUI": "", "m_SupportVFX": false } @@ -2951,7 +2925,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -2986,7 +2959,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3028,7 +3000,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3062,7 +3033,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3096,7 +3066,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3160,7 +3129,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3281,7 +3249,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3323,7 +3290,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3360,7 +3326,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3404,7 +3369,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3492,7 +3456,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3630,7 +3593,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -3701,7 +3663,6 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -3980,7 +3941,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4297,7 +4257,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4343,7 +4302,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4447,7 +4405,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4561,7 +4518,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4676,7 +4632,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4785,7 +4740,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4855,7 +4809,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -4877,7 +4830,6 @@ "m_GeneratePropertyBlock": true, "m_UseCustomSlotLabel": false, "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, "m_Precision": 0, "overrideHLSLDeclaration": false, "hlslDeclarationOverride": 0, @@ -4952,7 +4904,6 @@ "synonyms": [], "m_Precision": 0, "m_PreviewExpanded": true, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] @@ -5043,12 +4994,10 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] - }, - "m_HashType": 0 + } } { @@ -5517,7 +5466,6 @@ ], "m_Precision": 0, "m_PreviewExpanded": false, - "m_DismissedVersion": 0, "m_PreviewMode": 0, "m_CustomColors": { "m_SerializableColors": [] diff --git a/Assets/Art/Shaders/VocalStarpowerActivate.shadergraph b/Assets/Art/Shaders/VocalStarpowerActivate.shadergraph index f767b58e9..c0415e893 100644 --- a/Assets/Art/Shaders/VocalStarpowerActivate.shadergraph +++ b/Assets/Art/Shaders/VocalStarpowerActivate.shadergraph @@ -11,6 +11,9 @@ }, { "m_Id": "6b4ca706153246bf9bf372b11699d833" + }, + { + "m_Id": "839c8bdf81384372baaa38b2df946695" } ], "m_Keywords": [], @@ -101,6 +104,12 @@ }, { "m_Id": "278f3dcd83b744a2ae5ffd50162601e3" + }, + { + "m_Id": "5c250839e20d40008e086b2ef1be8d79" + }, + { + "m_Id": "230c0b7f1f4c41299b4f6bf5d585c29c" } ], "m_GroupDatas": [], @@ -120,6 +129,20 @@ "m_SlotId": 2 } }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "230c0b7f1f4c41299b4f6bf5d585c29c" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "5c250839e20d40008e086b2ef1be8d79" + }, + "m_SlotId": 1 + } + }, { "m_OutputSlot": { "m_Node": { @@ -197,6 +220,20 @@ }, "m_SlotId": 2 }, + "m_InputSlot": { + "m_Node": { + "m_Id": "5c250839e20d40008e086b2ef1be8d79" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "5c250839e20d40008e086b2ef1be8d79" + }, + "m_SlotId": 2 + }, "m_InputSlot": { "m_Node": { "m_Id": "dc63b54cd6f049c4890d67b39001173a" @@ -712,7 +749,7 @@ "m_ShaderOutputName": "B", "m_StageCapability": 3, "m_Value": { - "e00": 0.02500000037252903, + "e00": 0.03500000014901161, "e01": 2.0, "e02": 2.0, "e03": 2.0, @@ -809,6 +846,41 @@ "m_BareResource": false } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "230c0b7f1f4c41299b4f6bf5d585c29c", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -292.0, + "y": 594.0, + "width": 105.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "3f6fd707ad414b53a6314f25bda58736" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "839c8bdf81384372baaa38b2df946695" + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.PropertyNode", @@ -914,6 +986,9 @@ }, { "m_Id": "ca582f5d869e4d139f0b8f662754234f" + }, + { + "m_Id": "839c8bdf81384372baaa38b2df946695" } ] } @@ -1081,6 +1156,54 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "3316178cd2974ad39527f54ada4bf885", + "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.Vector2MaterialSlot", @@ -1117,6 +1240,21 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "3f6fd707ad414b53a6314f25bda58736", + "m_Id": 0, + "m_DisplayName": "Alpha", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", @@ -1495,8 +1633,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -261.0, - "y": 350.0, + "x": -292.0, + "y": 374.0, "width": 126.0, "height": 118.0 } @@ -1540,6 +1678,48 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "5c250839e20d40008e086b2ef1be8d79", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -149.0, + "y": 510.0, + "width": 126.0, + "height": 118.0 + } + }, + "m_Slots": [ + { + "m_Id": "60f9321051a3421f93a3fccd642db450" + }, + { + "m_Id": "96a11f12e7064f9bbafbbd6903a99171" + }, + { + "m_Id": "3316178cd2974ad39527f54ada4bf885" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": false, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", @@ -1588,6 +1768,54 @@ } } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "60f9321051a3421f93a3fccd642db450", + "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.DynamicValueMaterialSlot", @@ -1947,6 +2175,33 @@ } } +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "839c8bdf81384372baaa38b2df946695", + "m_Guid": { + "m_GuidSerialized": "ece35921-4d99-4f40-ae89-28f06835be83" + }, + "m_Name": "Alpha", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Alpha", + "m_DefaultReferenceName": "_Alpha", + "m_OverrideReferenceName": "Alpha", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 1.0, + "m_FloatType": 0, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } +} + { "m_SGVersion": 0, "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", @@ -1959,10 +2214,10 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -540.0000610351563, - "y": 386.9999694824219, - "width": 183.00006103515626, - "height": 251.00003051757813 + "x": -571.0, + "y": 411.0, + "width": 183.0, + "height": 251.0 } }, "m_Slots": [ @@ -2124,6 +2379,54 @@ "m_Labels": [] } +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "96a11f12e7064f9bbafbbd6903a99171", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 1.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.TimeNode", @@ -2281,8 +2584,8 @@ "m_Expanded": true, "m_Position": { "serializedVersion": "2", - "x": -699.0, - "y": 391.0, + "x": -730.0, + "y": 415.0, "width": 117.0, "height": 34.0 } diff --git a/Assets/Prefabs/EndPhraseLine.prefab b/Assets/Prefabs/EndPhraseLine.prefab index d19175ca2..733ff0314 100644 --- a/Assets/Prefabs/EndPhraseLine.prefab +++ b/Assets/Prefabs/EndPhraseLine.prefab @@ -26,13 +26,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6881370188666117159} - m_LocalRotation: {x: 0.4999998, y: 0.5000003, z: -0.5000002, w: 0.4999997} - m_LocalPosition: {x: 0, y: 0.1, z: 0} - m_LocalScale: {x: 2, y: 0.05, z: 1} + m_LocalRotation: {x: 0.49999976, y: 0.5000003, z: -0.5000002, w: 0.49999973} + m_LocalPosition: {x: 0, y: 0.15, z: 0.01} + m_LocalScale: {x: 1.93, y: 0.05, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: -1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90, y: 0, z: -90} --- !u!33 &6881370188666117178 MeshFilter: diff --git a/Assets/Script/Pools/VocalStarpowerActivate.cs b/Assets/Script/Pools/VocalStarpowerActivate.cs index 686560023..b7ee8fcce 100644 --- a/Assets/Script/Pools/VocalStarpowerActivate.cs +++ b/Assets/Script/Pools/VocalStarpowerActivate.cs @@ -20,7 +20,7 @@ public void SetLength(float length) { } private void Update() { - //meshRenderer.enabled = MicPlayer.Instance.StarpowerReady; + meshRenderer.enabled = MicPlayer.Instance.StarpowerReady; transform.localPosition -= new Vector3(Time.deltaTime * MicPlayer.TRACK_SPEED, 0f, 0f);