diff --git a/Assets/000_assets/shader.meta b/Assets/000_assets/shader.meta new file mode 100644 index 00000000..fbaf7893 --- /dev/null +++ b/Assets/000_assets/shader.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 59f7065eb24bb4a339f5005ea9baec7a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/GameElements/Track/DefaultTrackMaterial.mat b/Assets/Prefabs/GameElements/Track/DefaultTrackMaterial.mat index cc186a00..1a894cb1 100644 --- a/Assets/Prefabs/GameElements/Track/DefaultTrackMaterial.mat +++ b/Assets/Prefabs/GameElements/Track/DefaultTrackMaterial.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: DefaultTrackMaterial - m_Shader: {fileID: 4800000, guid: 423e4019c51e2433e94a8efed1980448, type: 3} + m_Shader: {fileID: 4800000, guid: 44e8d6dab1446644688189717537509a, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] diff --git a/Assets/Prefabs/GameElements/Track/DefaultTrailMaterial.mat b/Assets/Prefabs/GameElements/Track/DefaultTrailMaterial.mat index d85c7331..d7cc1d58 100644 --- a/Assets/Prefabs/GameElements/Track/DefaultTrailMaterial.mat +++ b/Assets/Prefabs/GameElements/Track/DefaultTrailMaterial.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: DefaultTrailMaterial - m_Shader: {fileID: 4800000, guid: 423e4019c51e2433e94a8efed1980448, type: 3} + m_Shader: {fileID: 4800000, guid: 44e8d6dab1446644688189717537509a, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: [] diff --git a/Assets/Scripts/EditorGame/GameElements/Notes/NoteObjects/Hold.cs b/Assets/Scripts/EditorGame/GameElements/Notes/NoteObjects/Hold.cs index 5b80ed04..84c3e3b9 100644 --- a/Assets/Scripts/EditorGame/GameElements/Notes/NoteObjects/Hold.cs +++ b/Assets/Scripts/EditorGame/GameElements/Notes/NoteObjects/Hold.cs @@ -13,7 +13,9 @@ namespace Ichni.RhythmGame public partial class Hold : NoteBase { public float holdEndTime; + public float holdingTime; public bool isHolding; + public bool isFinalJudged; public static Hold GenerateElement(string elementName, Guid id, List tags, bool isFirstGenerated, GameElement parentElement, float exactJudgeTime, float holdEndTime) @@ -23,6 +25,7 @@ namespace Ichni.RhythmGame hold.Initialize(elementName, id, tags, isFirstGenerated, parentElement); hold.exactJudgeTime = exactJudgeTime; hold.holdEndTime = holdEndTime; + hold.holdingTime = 0; if (parentElement.TryGetComponent(out Track track)) { @@ -48,6 +51,31 @@ namespace Ichni.RhythmGame return hold; } } + + public partial class Hold + { + public override void UpdateNoteInMovableTrack() + { + if (!isHolding && !isFinalJudged) + { + base.UpdateNoteInMovableTrack(); + } + + if (noteVisual is NoteVisualBaseHold noteVisualHold) + { + noteVisualHold.UpdateHoldInMovableTrack(); + } + } + + public override void UpdateNoteInStaticTrack() + { + base.UpdateNoteInStaticTrack(); + if (noteVisual is NoteVisualBaseHold noteVisualHold) + { + noteVisualHold.UpdateHoldInStaticTrack(); + } + } + } public partial class Hold { @@ -92,10 +120,7 @@ namespace Ichni.RhythmGame if (isOnTrack) { - if (track.trackTimeSubmodule is TrackTimeSubmoduleStatic) - { - UpdateNoteInStaticTrack(); - } + UpdateNoteInTrack(); } float songTime = EditorManager.instance.songInformation.songTime; @@ -104,11 +129,19 @@ namespace Ichni.RhythmGame { isFirstJudged = false; isHolding = false; + isFinalJudged = false; + holdingTime = 0; + } + + if (isHolding) + { + holdingTime = songTime - exactJudgeTime; } if (isHolding && songTime > holdEndTime) { isHolding = false; + isFinalJudged = true; } if (!isFirstJudged && songTime >= exactJudgeTime) diff --git a/Assets/Scripts/EditorGame/GameElements/Notes/NoteVisual/NoteVisualBaseHold.cs b/Assets/Scripts/EditorGame/GameElements/Notes/NoteVisual/NoteVisualBaseHold.cs index 014b12d9..0993c1d7 100644 --- a/Assets/Scripts/EditorGame/GameElements/Notes/NoteVisual/NoteVisualBaseHold.cs +++ b/Assets/Scripts/EditorGame/GameElements/Notes/NoteVisual/NoteVisualBaseHold.cs @@ -7,6 +7,16 @@ namespace Ichni.RhythmGame { public class NoteVisualBaseHold : NoteVisualBase { + public Hold hold; + public virtual void UpdateHoldInMovableTrack() + { + + } + + public virtual void UpdateHoldInStaticTrack() + { + + } } } diff --git a/Assets/Shaders/Sprite Unlit.shadergraph b/Assets/Shaders/Sprite Unlit.shadergraph deleted file mode 100755 index 2e148c4e..00000000 --- a/Assets/Shaders/Sprite Unlit.shadergraph +++ /dev/null @@ -1,2627 +0,0 @@ -{ - "m_SGVersion": 3, - "m_Type": "UnityEditor.ShaderGraph.GraphData", - "m_ObjectId": "dd0af14fb0ee4c70b73d7c2e41882ba3", - "m_Properties": [ - { - "m_Id": "880fb357f3ba4b7cb5daec1a90d56627" - }, - { - "m_Id": "e27cad7ab9644e64bc6883004f1db301" - }, - { - "m_Id": "626bd6bd0667473da6dc55dd965a6fba" - }, - { - "m_Id": "ab29b29cca884b51815d81fdb6677a87" - }, - { - "m_Id": "2be558f86960426cbe7c12c7cc2d24d0" - } - ], - "m_Keywords": [], - "m_Dropdowns": [], - "m_CategoryData": [ - { - "m_Id": "571d4d052d00497fb446bf3408e72d34" - } - ], - "m_Nodes": [ - { - "m_Id": "912e9229b0b14886b77e3965279e3241" - }, - { - "m_Id": "4f1b82c870c944288f6872adcbd70678" - }, - { - "m_Id": "3990761310f74640a0bc654f3f98a578" - }, - { - "m_Id": "eaa201f108704cae86e5ed274f552ed4" - }, - { - "m_Id": "baee01b79a4e4f17b987aeeda8312c00" - }, - { - "m_Id": "cbd1d51a576c451284ca372dad790bfb" - }, - { - "m_Id": "259f4a366a054feb8929d157a1846a7f" - }, - { - "m_Id": "a8b88c6c7bcc44da90dbfd41ba4984ac" - }, - { - "m_Id": "19f9b39129bf4917a61fc1be9cbf19fa" - }, - { - "m_Id": "1f6e10bdd207414b9ef05ef6e5a1269d" - }, - { - "m_Id": "07cf75bccf2442ae837ee4685e40f177" - }, - { - "m_Id": "9a09640183ef41f79645df2ff7cd0707" - }, - { - "m_Id": "dfebe9556aa94f4686c75f286a7a691d" - }, - { - "m_Id": "9e0a2fcad72c46abb353776a37d0fee9" - }, - { - "m_Id": "7b1cc6b0830040c986158950b127be71" - }, - { - "m_Id": "bdafa652db9b4a8b9d0c522a46af1bf5" - }, - { - "m_Id": "c112a1a671e24a71bfc4c697234dd772" - }, - { - "m_Id": "13c35d1073534cefad97e0eda317e8ec" - }, - { - "m_Id": "1febb804161c469d844617b8a10e4743" - }, - { - "m_Id": "3e1ef78537c74c71a256f4f854295c16" - } - ], - "m_GroupDatas": [], - "m_StickyNoteDatas": [], - "m_Edges": [ - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "07cf75bccf2442ae837ee4685e40f177" - }, - "m_SlotId": 2 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "1f6e10bdd207414b9ef05ef6e5a1269d" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "13c35d1073534cefad97e0eda317e8ec" - }, - "m_SlotId": 3 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "3e1ef78537c74c71a256f4f854295c16" - }, - "m_SlotId": 3 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "19f9b39129bf4917a61fc1be9cbf19fa" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "07cf75bccf2442ae837ee4685e40f177" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "1f6e10bdd207414b9ef05ef6e5a1269d" - }, - "m_SlotId": 2 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "7b1cc6b0830040c986158950b127be71" - }, - "m_SlotId": 1 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "1febb804161c469d844617b8a10e4743" - }, - "m_SlotId": 1 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "13c35d1073534cefad97e0eda317e8ec" - }, - "m_SlotId": 1 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "1febb804161c469d844617b8a10e4743" - }, - "m_SlotId": 4 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "13c35d1073534cefad97e0eda317e8ec" - }, - "m_SlotId": 2 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "259f4a366a054feb8929d157a1846a7f" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "1febb804161c469d844617b8a10e4743" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "259f4a366a054feb8929d157a1846a7f" - }, - "m_SlotId": 4 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "3e1ef78537c74c71a256f4f854295c16" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "259f4a366a054feb8929d157a1846a7f" - }, - "m_SlotId": 5 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "3e1ef78537c74c71a256f4f854295c16" - }, - "m_SlotId": 1 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "259f4a366a054feb8929d157a1846a7f" - }, - "m_SlotId": 6 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "3e1ef78537c74c71a256f4f854295c16" - }, - "m_SlotId": 2 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "3e1ef78537c74c71a256f4f854295c16" - }, - "m_SlotId": 4 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "9a09640183ef41f79645df2ff7cd0707" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "7b1cc6b0830040c986158950b127be71" - }, - "m_SlotId": 3 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "eaa201f108704cae86e5ed274f552ed4" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "9a09640183ef41f79645df2ff7cd0707" - }, - "m_SlotId": 2 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "7b1cc6b0830040c986158950b127be71" - }, - "m_SlotId": 2 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "9a09640183ef41f79645df2ff7cd0707" - }, - "m_SlotId": 2 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "a8b88c6c7bcc44da90dbfd41ba4984ac" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "9e0a2fcad72c46abb353776a37d0fee9" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "7b1cc6b0830040c986158950b127be71" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "a8b88c6c7bcc44da90dbfd41ba4984ac" - }, - "m_SlotId": 4 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "07cf75bccf2442ae837ee4685e40f177" - }, - "m_SlotId": 1 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "a8b88c6c7bcc44da90dbfd41ba4984ac" - }, - "m_SlotId": 4 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "baee01b79a4e4f17b987aeeda8312c00" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "c112a1a671e24a71bfc4c697234dd772" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "13c35d1073534cefad97e0eda317e8ec" - }, - "m_SlotId": 0 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "cbd1d51a576c451284ca372dad790bfb" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "259f4a366a054feb8929d157a1846a7f" - }, - "m_SlotId": 1 - } - }, - { - "m_OutputSlot": { - "m_Node": { - "m_Id": "dfebe9556aa94f4686c75f286a7a691d" - }, - "m_SlotId": 0 - }, - "m_InputSlot": { - "m_Node": { - "m_Id": "9a09640183ef41f79645df2ff7cd0707" - }, - "m_SlotId": 1 - } - } - ], - "m_VertexContext": { - "m_Position": { - "x": 899.3333740234375, - "y": -452.66668701171877 - }, - "m_Blocks": [ - { - "m_Id": "912e9229b0b14886b77e3965279e3241" - }, - { - "m_Id": "4f1b82c870c944288f6872adcbd70678" - }, - { - "m_Id": "3990761310f74640a0bc654f3f98a578" - } - ] - }, - "m_FragmentContext": { - "m_Position": { - "x": 899.5000610351563, - "y": -118.00000762939453 - }, - "m_Blocks": [ - { - "m_Id": "eaa201f108704cae86e5ed274f552ed4" - }, - { - "m_Id": "baee01b79a4e4f17b987aeeda8312c00" - }, - { - "m_Id": "bdafa652db9b4a8b9d0c522a46af1bf5" - } - ] - }, - "m_PreviewData": { - "serializedMesh": { - "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", - "m_Guid": "" - }, - "preventRotation": false - }, - "m_Path": "Soullies", - "m_GraphPrecision": 0, - "m_PreviewMode": 2, - "m_OutputNode": { - "m_Id": "" - }, - "m_SubDatas": [], - "m_ActiveTargets": [ - { - "m_Id": "f5a7aea5aea74e3f9a54dd0bfd4fad5a" - } - ] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "011f1c1998d845f0946dcfd26589d85b", - "m_Id": 4, - "m_DisplayName": "A", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "A", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", - "m_ObjectId": "07cf75bccf2442ae837ee4685e40f177", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Multiply", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -263.3333435058594, - "y": -794.0000610351563, - "width": 209.33328247070313, - "height": 304.0 - } - }, - "m_Slots": [ - { - "m_Id": "adde7e960b7f48e79c13d863e8f125c4" - }, - { - "m_Id": "c621c6f7f6f5438bb4353f6266746d88" - }, - { - "m_Id": "a5c401d20ad646c8b7ce381a8c916a2a" - } - ], - "synonyms": [ - "multiplication", - "times", - "x" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "0a552ccc83494042ba87751d9c5973f6", - "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.Vector1MaterialSlot", - "m_ObjectId": "0d4161e2f1a34ea8ac51db9826ae1674", - "m_Id": 1, - "m_DisplayName": "R", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "R", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", - "m_ObjectId": "0fdd035efe2142089b64663cc335685a", - "m_Id": 0, - "m_DisplayName": "Position", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Position", - "m_StageCapability": 1, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [], - "m_Space": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BranchNode", - "m_ObjectId": "13c35d1073534cefad97e0eda317e8ec", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Branch", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -1628.5, - "y": -511.0000305175781, - "width": 208.0001220703125, - "height": 326.00006103515627 - } - }, - "m_Slots": [ - { - "m_Id": "8ff96116a30e4cc9ae8f04af9084f57e" - }, - { - "m_Id": "54d55aa358964f959691c4effaf9762b" - }, - { - "m_Id": "a8ea16df2ae64b5d80dfdc01b09a5027" - }, - { - "m_Id": "95183898956a48f0a28a45860411b7db" - } - ], - "synonyms": [ - "switch", - "if", - "else" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "14cd9fe0b07a4947877591981a3b932a", - "m_Id": 5, - "m_DisplayName": "G", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "G", - "m_StageCapability": 2, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "19c1f743e4d84ef1ae4df7f6f1115177", - "m_Id": 0, - "m_DisplayName": "Alpha", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Alpha", - "m_StageCapability": 2, - "m_Value": 1.0, - "m_DefaultValue": 1.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PropertyNode", - "m_ObjectId": "19f9b39129bf4917a61fc1be9cbf19fa", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Property", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -576.0000610351563, - "y": -749.0000610351563, - "width": 154.00006103515626, - "height": 34.00006103515625 - } - }, - "m_Slots": [ - { - "m_Id": "d45b49a40f3b436c9d04ea2c826a3055" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Property": { - "m_Id": "e27cad7ab9644e64bc6883004f1db301" - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "1bd98ed975a849cdb9dc0e7e7af6b98c", - "m_Id": 1, - "m_DisplayName": "B", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "B", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.AddNode", - "m_ObjectId": "1f6e10bdd207414b9ef05ef6e5a1269d", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Add", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 195.99998474121095, - "y": -775.3333129882813, - "width": 209.3333282470703, - "height": 304.0000305175781 - } - }, - "m_Slots": [ - { - "m_Id": "869f18aa87a24110bd5a33c2c295a847" - }, - { - "m_Id": "1bd98ed975a849cdb9dc0e7e7af6b98c" - }, - { - "m_Id": "bc581a524447490a8b51c704eceebb05" - } - ], - "synonyms": [ - "addition", - "sum", - "plus" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "1f82552d33004d94a89f3b1b8415c85b", - "m_Id": 2, - "m_DisplayName": "B", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "B", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.SplitNode", - "m_ObjectId": "1febb804161c469d844617b8a10e4743", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Split", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -1898.0, - "y": -300.0000305175781, - "width": 119.0, - "height": 149.00001525878907 - } - }, - "m_Slots": [ - { - "m_Id": "c10e2594570441478d309162d90c8055" - }, - { - "m_Id": "e99fe3dde8a5459aa4d37432b5250b6d" - }, - { - "m_Id": "93f9a81279c747d4923b9095109fed4e" - }, - { - "m_Id": "73d7392e13034943b3a7ad617dd2095f" - }, - { - "m_Id": "d2396c62b22542e5a9bbf62813309eed" - } - ], - "synonyms": [ - "separate" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", - "m_ObjectId": "259f4a366a054feb8929d157a1846a7f", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Sample Texture 2D", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -2189.5, - "y": -184.9999542236328, - "width": 208.0, - "height": 433.99993896484377 - } - }, - "m_Slots": [ - { - "m_Id": "588259991eb64f0cb9bc004ba9e55245" - }, - { - "m_Id": "d7e04ea01c56461785ba3d16dea652e3" - }, - { - "m_Id": "14cd9fe0b07a4947877591981a3b932a" - }, - { - "m_Id": "7d7b25d5f940419d9513d6456c5f4491" - }, - { - "m_Id": "d54301dcd7cf4c90b92e8a0e8a6906b4" - }, - { - "m_Id": "9451aee0e3034c35b6f602291b212b23" - }, - { - "m_Id": "3446cbd6a9f0464ca615c2c51991f3b9" - }, - { - "m_Id": "366d9320a7c5414d86380a18989b01f8" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_TextureType": 0, - "m_NormalMapSpace": 0, - "m_EnableGlobalMipBias": true, - "m_MipSamplingMode": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Internal.BooleanShaderProperty", - "m_ObjectId": "2be558f86960426cbe7c12c7cc2d24d0", - "m_Guid": { - "m_GuidSerialized": "7961b8ad-eabe-4eef-bcec-dcf1948de1fb" - }, - "m_Name": "UseRedAsAlpha", - "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "UseRedAsAlpha", - "m_DefaultReferenceName": "_UseRedAsAlpha", - "m_OverrideReferenceName": "", - "m_GeneratePropertyBlock": true, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, - "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, - "m_Hidden": false, - "m_Value": false -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "2e607b0913e24da3a9815ff970da7e01", - "m_Id": 3, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", - "m_ObjectId": "3446cbd6a9f0464ca615c2c51991f3b9", - "m_Id": 2, - "m_DisplayName": "UV", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "UV", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0 - }, - "m_Labels": [], - "m_Channel": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "358a10fdfb6542f2812a8eeabbe232ab", - "m_Id": 1, - "m_DisplayName": "G", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "G", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", - "m_ObjectId": "366d9320a7c5414d86380a18989b01f8", - "m_Id": 3, - "m_DisplayName": "Sampler", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Sampler", - "m_StageCapability": 3, - "m_BareResource": false -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "3990761310f74640a0bc654f3f98a578", - "m_Group": { - "m_Id": "" - }, - "m_Name": "VertexDescription.Tangent", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 846.6666870117188, - "y": -314.0000305175781, - "width": 200.00006103515626, - "height": 42.66668701171875 - } - }, - "m_Slots": [ - { - "m_Id": "c050320eda194440a7b3cfd0e3f59881" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "VertexDescription.Tangent" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", - "m_ObjectId": "3bdfdbc52896459986d5f7b86a08acfc", - "m_Id": 0, - "m_DisplayName": "Predicate", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Predicate", - "m_StageCapability": 3, - "m_Value": false, - "m_DefaultValue": false -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", - "m_ObjectId": "3e16f8c4d1654613aa56540e18dbc914", - "m_Id": 0, - "m_DisplayName": "Normal", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Normal", - "m_StageCapability": 1, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [], - "m_Space": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.CombineNode", - "m_ObjectId": "3e1ef78537c74c71a256f4f854295c16", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Combine", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -1378.0, - "y": -151.00001525878907, - "width": 208.0, - "height": 350.0000305175781 - } - }, - "m_Slots": [ - { - "m_Id": "5301889694cc4852ae163fcfe314efc2" - }, - { - "m_Id": "358a10fdfb6542f2812a8eeabbe232ab" - }, - { - "m_Id": "1f82552d33004d94a89f3b1b8415c85b" - }, - { - "m_Id": "e60c2d39f0c84e47966e6cee02b36ee6" - }, - { - "m_Id": "7b89108c8fba40bca21491221d1415dd" - }, - { - "m_Id": "bf247be20d3942459cd523446f02bc90" - }, - { - "m_Id": "ec264b848d244dd59e98ce034495d9a3" - } - ], - "synonyms": [ - "append" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalSpriteUnlitSubTarget", - "m_ObjectId": "45316362d1f44bc0bf7df3564117e5c0" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "4628a8c818aa4718809fb6497dec0d8d", - "m_Id": 2, - "m_DisplayName": "G", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "G", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.ColorRGBAMaterialSlot", - "m_ObjectId": "490142ce0c894fa98c4d31c74ccd711a", - "m_Id": 0, - "m_DisplayName": "Sprite Mask", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "SpriteMask", - "m_StageCapability": 2, - "m_Value": { - "x": 1.0, - "y": 1.0, - "z": 1.0, - "w": 1.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "4f1b82c870c944288f6872adcbd70678", - "m_Group": { - "m_Id": "" - }, - "m_Name": "VertexDescription.Normal", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "3e16f8c4d1654613aa56540e18dbc914" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "VertexDescription.Normal" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "52e80b2d276f4929ab1d5d015ed3fdbc", - "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.Vector1MaterialSlot", - "m_ObjectId": "5301889694cc4852ae163fcfe314efc2", - "m_Id": 0, - "m_DisplayName": "R", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "R", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "54d55aa358964f959691c4effaf9762b", - "m_Id": 1, - "m_DisplayName": "True", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "True", - "m_StageCapability": 3, - "m_Value": { - "x": 1.0, - "y": 1.0, - "z": 1.0, - "w": 1.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.CategoryData", - "m_ObjectId": "571d4d052d00497fb446bf3408e72d34", - "m_Name": "", - "m_ChildObjectList": [ - { - "m_Id": "880fb357f3ba4b7cb5daec1a90d56627" - }, - { - "m_Id": "ab29b29cca884b51815d81fdb6677a87" - }, - { - "m_Id": "e27cad7ab9644e64bc6883004f1db301" - }, - { - "m_Id": "626bd6bd0667473da6dc55dd965a6fba" - }, - { - "m_Id": "2be558f86960426cbe7c12c7cc2d24d0" - } - ] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", - "m_ObjectId": "588259991eb64f0cb9bc004ba9e55245", - "m_Id": 0, - "m_DisplayName": "RGBA", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "RGBA", - "m_StageCapability": 2, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_Labels": [] -} - -{ - "m_SGVersion": 3, - "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", - "m_ObjectId": "626bd6bd0667473da6dc55dd965a6fba", - "m_Guid": { - "m_GuidSerialized": "3c58b2ca-6d66-4f80-94f9-b1be593ae362" - }, - "m_Name": "Base Color", - "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "Base Color", - "m_DefaultReferenceName": "_Base_Color", - "m_OverrideReferenceName": "_BaseColor", - "m_GeneratePropertyBlock": true, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, - "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, - "m_Hidden": false, - "m_Value": { - "r": 1.0, - "g": 1.0, - "b": 1.0, - "a": 1.0 - }, - "isMainColor": false, - "m_ColorMode": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "73d7392e13034943b3a7ad617dd2095f", - "m_Id": 3, - "m_DisplayName": "B", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "B", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BranchNode", - "m_ObjectId": "7b1cc6b0830040c986158950b127be71", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Branch", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 435.3333435058594, - "y": -471.3332824707031, - "width": 209.33322143554688, - "height": 328.00006103515627 - } - }, - "m_Slots": [ - { - "m_Id": "3bdfdbc52896459986d5f7b86a08acfc" - }, - { - "m_Id": "d18739a7999f486a996f73e1e3b6f3ca" - }, - { - "m_Id": "882f4dd206554f808ed6d0f1035043d1" - }, - { - "m_Id": "2e607b0913e24da3a9815ff970da7e01" - } - ], - "synonyms": [ - "switch", - "if", - "else" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", - "m_ObjectId": "7b89108c8fba40bca21491221d1415dd", - "m_Id": 4, - "m_DisplayName": "RGBA", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "RGBA", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "7d7b25d5f940419d9513d6456c5f4491", - "m_Id": 6, - "m_DisplayName": "B", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "B", - "m_StageCapability": 2, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "7ffb44447a8145ab911838fbc3389dda", - "m_Id": 0, - "m_DisplayName": "In", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "In", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "869f18aa87a24110bd5a33c2c295a847", - "m_Id": 0, - "m_DisplayName": "A", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "A", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", - "m_ObjectId": "880fb357f3ba4b7cb5daec1a90d56627", - "m_Guid": { - "m_GuidSerialized": "68674d53-c19a-4f10-8e8f-25f94902f410" - }, - "m_Name": "Main Tex", - "m_DefaultRefNameVersion": 0, - "m_RefNameGeneratedByDisplayName": "", - "m_DefaultReferenceName": "Texture2D_880fb357f3ba4b7cb5daec1a90d56627", - "m_OverrideReferenceName": "_MainTex", - "m_GeneratePropertyBlock": true, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, - "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, - "m_Hidden": false, - "m_Value": { - "m_SerializedTexture": "", - "m_Guid": "" - }, - "isMainTexture": false, - "useTilingAndOffset": false, - "m_Modifiable": true, - "m_DefaultType": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "882f4dd206554f808ed6d0f1035043d1", - "m_Id": 2, - "m_DisplayName": "False", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "False", - "m_StageCapability": 3, - "m_Value": { - "x": 1.0, - "y": 1.0, - "z": 1.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", - "m_ObjectId": "8ff96116a30e4cc9ae8f04af9084f57e", - "m_Id": 0, - "m_DisplayName": "Predicate", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Predicate", - "m_StageCapability": 3, - "m_Value": false, - "m_DefaultValue": false -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "912e9229b0b14886b77e3965279e3241", - "m_Group": { - "m_Id": "" - }, - "m_Name": "VertexDescription.Position", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "0fdd035efe2142089b64663cc335685a" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "VertexDescription.Position" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "93f9a81279c747d4923b9095109fed4e", - "m_Id": 2, - "m_DisplayName": "G", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "G", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", - "m_ObjectId": "9451aee0e3034c35b6f602291b212b23", - "m_Id": 1, - "m_DisplayName": "Texture", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Texture", - "m_StageCapability": 3, - "m_BareResource": false, - "m_Texture": { - "m_SerializedTexture": "", - "m_Guid": "" - }, - "m_DefaultType": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "95183898956a48f0a28a45860411b7db", - "m_Id": 3, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", - "m_ObjectId": "9a09640183ef41f79645df2ff7cd0707", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Multiply", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -940.0000610351563, - "y": -211.33334350585938, - "width": 209.3333740234375, - "height": 304.00006103515627 - } - }, - "m_Slots": [ - { - "m_Id": "9dad4233ca4349a999e9777ca12e97c5" - }, - { - "m_Id": "0a552ccc83494042ba87751d9c5973f6" - }, - { - "m_Id": "52e80b2d276f4929ab1d5d015ed3fdbc" - } - ], - "synonyms": [ - "multiplication", - "times", - "x" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "9dad4233ca4349a999e9777ca12e97c5", - "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.PropertyNode", - "m_ObjectId": "9e0a2fcad72c46abb353776a37d0fee9", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Property", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -24.000038146972658, - "y": -488.6666259765625, - "width": 124.66669464111328, - "height": 36.0 - } - }, - "m_Slots": [ - { - "m_Id": "bea2fb594f9f4477a794397ee1119cec" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Property": { - "m_Id": "ab29b29cca884b51815d81fdb6677a87" - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", - "m_ObjectId": "a1fd8366472545a495ab050fc1abd0b9", - "m_Id": 0, - "m_DisplayName": "Base Color", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "a5c401d20ad646c8b7ce381a8c916a2a", - "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.SplitNode", - "m_ObjectId": "a8b88c6c7bcc44da90dbfd41ba4984ac", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Split", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -576.0000610351563, - "y": -397.99993896484377, - "width": 120.66671752929688, - "height": 150.6666717529297 - } - }, - "m_Slots": [ - { - "m_Id": "7ffb44447a8145ab911838fbc3389dda" - }, - { - "m_Id": "0d4161e2f1a34ea8ac51db9826ae1674" - }, - { - "m_Id": "4628a8c818aa4718809fb6497dec0d8d" - }, - { - "m_Id": "d1e01570e6a24494bd071aa3476aab4c" - }, - { - "m_Id": "011f1c1998d845f0946dcfd26589d85b" - } - ], - "synonyms": [ - "separate" - ], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "a8ea16df2ae64b5d80dfdc01b09a5027", - "m_Id": 2, - "m_DisplayName": "False", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "False", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Internal.BooleanShaderProperty", - "m_ObjectId": "ab29b29cca884b51815d81fdb6677a87", - "m_Guid": { - "m_GuidSerialized": "1db86734-ebeb-4430-8ae9-224de4f493bf" - }, - "m_Name": "Emission", - "m_DefaultRefNameVersion": 1, - "m_RefNameGeneratedByDisplayName": "Emission", - "m_DefaultReferenceName": "_Emission", - "m_OverrideReferenceName": "_Emission", - "m_GeneratePropertyBlock": true, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, - "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, - "m_Hidden": false, - "m_Value": false -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "adde7e960b7f48e79c13d863e8f125c4", - "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.BlockNode", - "m_ObjectId": "baee01b79a4e4f17b987aeeda8312c00", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.Alpha", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "19c1f743e4d84ef1ae4df7f6f1115177" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.Alpha" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "bc581a524447490a8b51c704eceebb05", - "m_Id": 2, - "m_DisplayName": "Out", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "bdafa652db9b4a8b9d0c522a46af1bf5", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.SpriteMask", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "490142ce0c894fa98c4d31c74ccd711a" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.SpriteMask" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", - "m_ObjectId": "bea2fb594f9f4477a794397ee1119cec", - "m_Id": 0, - "m_DisplayName": "Emission", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": false, - "m_DefaultValue": false -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot", - "m_ObjectId": "bf247be20d3942459cd523446f02bc90", - "m_Id": 5, - "m_DisplayName": "RGB", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "RGB", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", - "m_ObjectId": "c050320eda194440a7b3cfd0e3f59881", - "m_Id": 0, - "m_DisplayName": "Tangent", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "Tangent", - "m_StageCapability": 1, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [], - "m_Space": 0 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "c10e2594570441478d309162d90c8055", - "m_Id": 0, - "m_DisplayName": "In", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "In", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PropertyNode", - "m_ObjectId": "c112a1a671e24a71bfc4c697234dd772", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Property", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -1898.0, - "y": -545.0, - "width": 160.5001220703125, - "height": 33.999969482421878 - } - }, - "m_Slots": [ - { - "m_Id": "dd0265460ecf4499a6847e9d76f54d22" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Property": { - "m_Id": "2be558f86960426cbe7c12c7cc2d24d0" - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", - "m_ObjectId": "c47d2c94dfd542c28a6d0dcb0aa4fb21", - "m_Id": 0, - "m_DisplayName": "Main Tex", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_BareResource": false -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", - "m_ObjectId": "c621c6f7f6f5438bb4353f6266746d88", - "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.PropertyNode", - "m_ObjectId": "cbd1d51a576c451284ca372dad790bfb", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Property", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -2364.0, - "y": -245.50001525878907, - "width": 131.5, - "height": 34.00001525878906 - } - }, - "m_Slots": [ - { - "m_Id": "c47d2c94dfd542c28a6d0dcb0aa4fb21" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Property": { - "m_Id": "880fb357f3ba4b7cb5daec1a90d56627" - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", - "m_ObjectId": "cf44e4206509447ebe0dc6c113942747", - "m_Id": 0, - "m_DisplayName": "Base Color", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "BaseColor", - "m_StageCapability": 2, - "m_Value": { - "x": 0.5, - "y": 0.5, - "z": 0.5 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0 - }, - "m_Labels": [], - "m_ColorMode": 0, - "m_DefaultColor": { - "r": 0.5, - "g": 0.5, - "b": 0.5, - "a": 1.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", - "m_ObjectId": "d18739a7999f486a996f73e1e3b6f3ca", - "m_Id": 1, - "m_DisplayName": "True", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "True", - "m_StageCapability": 3, - "m_Value": { - "x": 1.0, - "y": 1.0, - "z": 1.0, - "w": 1.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - } -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "d1e01570e6a24494bd071aa3476aab4c", - "m_Id": 3, - "m_DisplayName": "B", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "B", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "d2396c62b22542e5a9bbf62813309eed", - "m_Id": 4, - "m_DisplayName": "A", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "A", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", - "m_ObjectId": "d45b49a40f3b436c9d04ea2c826a3055", - "m_Id": 0, - "m_DisplayName": "Emission Color", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0, - "z": 0.0, - "w": 0.0 - }, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "d54301dcd7cf4c90b92e8a0e8a6906b4", - "m_Id": 7, - "m_DisplayName": "A", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "A", - "m_StageCapability": 2, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "d7e04ea01c56461785ba3d16dea652e3", - "m_Id": 4, - "m_DisplayName": "R", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "R", - "m_StageCapability": 2, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", - "m_ObjectId": "dd0265460ecf4499a6847e9d76f54d22", - "m_Id": 0, - "m_DisplayName": "UseRedAsAlpha", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "Out", - "m_StageCapability": 3, - "m_Value": false, - "m_DefaultValue": false -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.PropertyNode", - "m_ObjectId": "dfebe9556aa94f4686c75f286a7a691d", - "m_Group": { - "m_Id": "" - }, - "m_Name": "Property", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": -1110.666748046875, - "y": -63.33333206176758, - "width": 135.33331298828126, - "height": 35.999969482421878 - } - }, - "m_Slots": [ - { - "m_Id": "a1fd8366472545a495ab050fc1abd0b9" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_Property": { - "m_Id": "626bd6bd0667473da6dc55dd965a6fba" - } -} - -{ - "m_SGVersion": 3, - "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", - "m_ObjectId": "e27cad7ab9644e64bc6883004f1db301", - "m_Guid": { - "m_GuidSerialized": "7baeb5dc-1658-4e5a-a311-56291639a406" - }, - "m_Name": "Emission Color", - "m_DefaultRefNameVersion": 0, - "m_RefNameGeneratedByDisplayName": "", - "m_DefaultReferenceName": "_Emission_Color", - "m_OverrideReferenceName": "_EmissionColor", - "m_GeneratePropertyBlock": true, - "m_UseCustomSlotLabel": false, - "m_CustomSlotLabel": "", - "m_DismissedVersion": 0, - "m_Precision": 0, - "overrideHLSLDeclaration": false, - "hlslDeclarationOverride": 0, - "m_Hidden": false, - "m_Value": { - "r": 0.0, - "g": 0.0, - "b": 0.0, - "a": 0.0 - }, - "isMainColor": false, - "m_ColorMode": 1 -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "e60c2d39f0c84e47966e6cee02b36ee6", - "m_Id": 3, - "m_DisplayName": "A", - "m_SlotType": 0, - "m_Hidden": false, - "m_ShaderOutputName": "A", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", - "m_ObjectId": "e99fe3dde8a5459aa4d37432b5250b6d", - "m_Id": 1, - "m_DisplayName": "R", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "R", - "m_StageCapability": 3, - "m_Value": 0.0, - "m_DefaultValue": 0.0, - "m_Labels": [] -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.BlockNode", - "m_ObjectId": "eaa201f108704cae86e5ed274f552ed4", - "m_Group": { - "m_Id": "" - }, - "m_Name": "SurfaceDescription.BaseColor", - "m_DrawState": { - "m_Expanded": true, - "m_Position": { - "serializedVersion": "2", - "x": 0.0, - "y": 0.0, - "width": 0.0, - "height": 0.0 - } - }, - "m_Slots": [ - { - "m_Id": "cf44e4206509447ebe0dc6c113942747" - } - ], - "synonyms": [], - "m_Precision": 0, - "m_PreviewExpanded": true, - "m_DismissedVersion": 0, - "m_PreviewMode": 0, - "m_CustomColors": { - "m_SerializableColors": [] - }, - "m_SerializedDescriptor": "SurfaceDescription.BaseColor" -} - -{ - "m_SGVersion": 0, - "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot", - "m_ObjectId": "ec264b848d244dd59e98ce034495d9a3", - "m_Id": 6, - "m_DisplayName": "RG", - "m_SlotType": 1, - "m_Hidden": false, - "m_ShaderOutputName": "RG", - "m_StageCapability": 3, - "m_Value": { - "x": 0.0, - "y": 0.0 - }, - "m_DefaultValue": { - "x": 0.0, - "y": 0.0 - }, - "m_Labels": [] -} - -{ - "m_SGVersion": 1, - "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", - "m_ObjectId": "f5a7aea5aea74e3f9a54dd0bfd4fad5a", - "m_Datas": [], - "m_ActiveSubTarget": { - "m_Id": "45316362d1f44bc0bf7df3564117e5c0" - }, - "m_AllowMaterialOverride": true, - "m_SurfaceType": 0, - "m_ZTestMode": 4, - "m_ZWriteControl": 0, - "m_AlphaMode": 0, - "m_RenderFace": 0, - "m_AlphaClip": false, - "m_CastShadows": false, - "m_ReceiveShadows": false, - "m_SupportsLODCrossFade": false, - "m_CustomEditorGUI": "Soullies", - "m_SupportVFX": false -} - diff --git a/Assets/Shaders/Sprite Unlit.shadergraph.meta b/Assets/Shaders/Sprite Unlit.shadergraph.meta deleted file mode 100644 index 188b6b84..00000000 --- a/Assets/Shaders/Sprite Unlit.shadergraph.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: ee7160752d2114149904ca2b2b012bbf -ScriptedImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 2 - userData: - assetBundleName: - assetBundleVariant: - script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} diff --git a/Assets/Shaders/TrackShader.shader b/Assets/Shaders/TrackShader.shader old mode 100644 new mode 100755 index b0597b55..d51674ea --- a/Assets/Shaders/TrackShader.shader +++ b/Assets/Shaders/TrackShader.shader @@ -6,10 +6,10 @@ Shader "Soullies/TrackShader" { [HideInInspector] _AlphaCutoff("Alpha Cutoff ", Range(0, 1)) = 0.5 _MainTexture("MainTexture", 2D) = "white" {} - _BaseColor("BaseColor", Color) = (0,0,0,0) - _UseRedAsAlpha("UseRedAsAlpha", Int) = 0 - _Emission("Emission", Int) = 0 - _EmissionColor("EmissionColor", Color) = (0,0,0,0) + [HDR]_BaseColor("BaseColor", Color) = (0,0,0,0) + [HDR]_EmissionColor("EmissionColor", Color) = (0,0,0,0) + [Toggle(_USEREDASALPHA_ON)] _UseRedAsAlpha("UseRedAsAlpha", Float) = 1 + [Toggle(_EMISSION_ON)] _Emission("Emission", Float) = 1 [HideInInspector] _texcoord( "", 2D ) = "white" {} [HideInInspector][NoScaleOffset] unity_Lightmaps("unity_Lightmaps", 2DArray) = "" {} @@ -70,15 +70,15 @@ Shader "Soullies/TrackShader" #include "Packages/com.unity.render-pipelines.universal/Shaders/2D/Include/SurfaceData2D.hlsl" #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Debug/Debugging2D.hlsl" - + #pragma shader_feature_local _USEREDASALPHA_ON + #pragma shader_feature_local _EMISSION_ON + sampler2D _MainTexture; CBUFFER_START( UnityPerMaterial ) float4 _MainTexture_ST; float4 _BaseColor; float4 _EmissionColor; - int _Emission; - int _UseRedAsAlpha; CBUFFER_END @@ -151,10 +151,20 @@ Shader "Soullies/TrackShader" float2 uv_MainTexture = IN.texCoord0.xy * _MainTexture_ST.xy + _MainTexture_ST.zw; float4 break10 = tex2D( _MainTexture, uv_MainTexture ); - float4 appendResult13 = (float4(break10.r , break10.g , break10.b , ( (float)_UseRedAsAlpha == 1.0 ? break10.r : break10.a ))); - float4 temp_output_14_0 = ( appendResult13 * _BaseColor ); + #ifdef _USEREDASALPHA_ON + float staticSwitch28 = break10.r; + #else + float staticSwitch28 = break10.a; + #endif + float4 appendResult13 = (float4(break10.r , break10.g , break10.b , staticSwitch28)); + float4 temp_cast_0 = (1.0).xxxx; + #ifdef _EMISSION_ON + float4 staticSwitch29 = _EmissionColor; + #else + float4 staticSwitch29 = temp_cast_0; + #endif - float4 Color = ( (float)_Emission == 1.0 ? ( temp_output_14_0 * _EmissionColor ) : temp_output_14_0 ); + float4 Color = ( ( appendResult13 * _BaseColor ) * staticSwitch29 ); #if ETC1_EXTERNAL_ALPHA float4 alpha = SAMPLE_TEXTURE2D( _AlphaTex, sampler_AlphaTex, IN.texCoord0.xy ); @@ -218,15 +228,15 @@ Shader "Soullies/TrackShader" #include "Packages/com.unity.render-pipelines.universal/Shaders/2D/Include/SurfaceData2D.hlsl" #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Debug/Debugging2D.hlsl" - + #pragma shader_feature_local _USEREDASALPHA_ON + #pragma shader_feature_local _EMISSION_ON + sampler2D _MainTexture; CBUFFER_START( UnityPerMaterial ) float4 _MainTexture_ST; float4 _BaseColor; float4 _EmissionColor; - int _Emission; - int _UseRedAsAlpha; CBUFFER_END @@ -299,10 +309,20 @@ Shader "Soullies/TrackShader" float2 uv_MainTexture = IN.texCoord0.xy * _MainTexture_ST.xy + _MainTexture_ST.zw; float4 break10 = tex2D( _MainTexture, uv_MainTexture ); - float4 appendResult13 = (float4(break10.r , break10.g , break10.b , ( (float)_UseRedAsAlpha == 1.0 ? break10.r : break10.a ))); - float4 temp_output_14_0 = ( appendResult13 * _BaseColor ); + #ifdef _USEREDASALPHA_ON + float staticSwitch28 = break10.r; + #else + float staticSwitch28 = break10.a; + #endif + float4 appendResult13 = (float4(break10.r , break10.g , break10.b , staticSwitch28)); + float4 temp_cast_0 = (1.0).xxxx; + #ifdef _EMISSION_ON + float4 staticSwitch29 = _EmissionColor; + #else + float4 staticSwitch29 = temp_cast_0; + #endif - float4 Color = ( (float)_Emission == 1.0 ? ( temp_output_14_0 * _EmissionColor ) : temp_output_14_0 ); + float4 Color = ( ( appendResult13 * _BaseColor ) * staticSwitch29 ); #if ETC1_EXTERNAL_ALPHA float4 alpha = SAMPLE_TEXTURE2D( _AlphaTex, sampler_AlphaTex, IN.texCoord0.xy ); @@ -364,15 +384,15 @@ Shader "Soullies/TrackShader" #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/ShaderGraphFunctions.hlsl" #include "Packages/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/ShaderPass.hlsl" - + #pragma shader_feature_local _USEREDASALPHA_ON + #pragma shader_feature_local _EMISSION_ON + sampler2D _MainTexture; CBUFFER_START( UnityPerMaterial ) float4 _MainTexture_ST; float4 _BaseColor; float4 _EmissionColor; - int _Emission; - int _UseRedAsAlpha; CBUFFER_END @@ -431,10 +451,20 @@ Shader "Soullies/TrackShader" { float2 uv_MainTexture = IN.ase_texcoord.xy * _MainTexture_ST.xy + _MainTexture_ST.zw; float4 break10 = tex2D( _MainTexture, uv_MainTexture ); - float4 appendResult13 = (float4(break10.r , break10.g , break10.b , ( (float)_UseRedAsAlpha == 1.0 ? break10.r : break10.a ))); - float4 temp_output_14_0 = ( appendResult13 * _BaseColor ); + #ifdef _USEREDASALPHA_ON + float staticSwitch28 = break10.r; + #else + float staticSwitch28 = break10.a; + #endif + float4 appendResult13 = (float4(break10.r , break10.g , break10.b , staticSwitch28)); + float4 temp_cast_0 = (1.0).xxxx; + #ifdef _EMISSION_ON + float4 staticSwitch29 = _EmissionColor; + #else + float4 staticSwitch29 = temp_cast_0; + #endif - float4 Color = ( (float)_Emission == 1.0 ? ( temp_output_14_0 * _EmissionColor ) : temp_output_14_0 ); + float4 Color = ( ( appendResult13 * _BaseColor ) * staticSwitch29 ); half4 outColor = half4(_ObjectId, _PassValue, 1.0, 1.0); return outColor; @@ -476,15 +506,15 @@ Shader "Soullies/TrackShader" #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/ShaderGraphFunctions.hlsl" #include "Packages/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/ShaderPass.hlsl" - + #pragma shader_feature_local _USEREDASALPHA_ON + #pragma shader_feature_local _EMISSION_ON + sampler2D _MainTexture; CBUFFER_START( UnityPerMaterial ) float4 _MainTexture_ST; float4 _BaseColor; float4 _EmissionColor; - int _Emission; - int _UseRedAsAlpha; CBUFFER_END @@ -541,10 +571,20 @@ Shader "Soullies/TrackShader" { float2 uv_MainTexture = IN.ase_texcoord.xy * _MainTexture_ST.xy + _MainTexture_ST.zw; float4 break10 = tex2D( _MainTexture, uv_MainTexture ); - float4 appendResult13 = (float4(break10.r , break10.g , break10.b , ( (float)_UseRedAsAlpha == 1.0 ? break10.r : break10.a ))); - float4 temp_output_14_0 = ( appendResult13 * _BaseColor ); + #ifdef _USEREDASALPHA_ON + float staticSwitch28 = break10.r; + #else + float staticSwitch28 = break10.a; + #endif + float4 appendResult13 = (float4(break10.r , break10.g , break10.b , staticSwitch28)); + float4 temp_cast_0 = (1.0).xxxx; + #ifdef _EMISSION_ON + float4 staticSwitch29 = _EmissionColor; + #else + float4 staticSwitch29 = temp_cast_0; + #endif - float4 Color = ( (float)_Emission == 1.0 ? ( temp_output_14_0 * _EmissionColor ) : temp_output_14_0 ); + float4 Color = ( ( appendResult13 * _BaseColor ) * staticSwitch29 ); half4 outColor = _SelectionID; return outColor; } @@ -559,36 +599,33 @@ Shader "Soullies/TrackShader" } /*ASEBEGIN Version=19501 -Node;AmplifyShaderEditor.SamplerNode;6;-912,-256;Inherit;True;Property;_MainTexture;MainTexture;0;0;Create;True;0;0;0;False;0;False;-1;None;None;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;6;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT3;5 -Node;AmplifyShaderEditor.BreakToComponentsNode;10;-592,-256;Inherit;False;COLOR;1;0;COLOR;0,0,0,0;False;16;FLOAT;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT;5;FLOAT;6;FLOAT;7;FLOAT;8;FLOAT;9;FLOAT;10;FLOAT;11;FLOAT;12;FLOAT;13;FLOAT;14;FLOAT;15 -Node;AmplifyShaderEditor.IntNode;12;-672,-480;Inherit;False;Property;_UseRedAsAlpha;UseRedAsAlpha;2;0;Create;True;0;0;0;False;0;False;0;0;False;0;1;INT;0 -Node;AmplifyShaderEditor.Compare;18;-416,-480;Inherit;False;0;4;0;INT;0;False;1;FLOAT;1;False;2;FLOAT;0;False;3;FLOAT;0;False;1;FLOAT;0 +Node;AmplifyShaderEditor.SamplerNode;6;-992,-272;Inherit;True;Property;_MainTexture;MainTexture;0;0;Create;True;0;0;0;False;0;False;-1;None;None;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;8;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;6;FLOAT;0;False;7;SAMPLERSTATE;;False;6;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT3;5 +Node;AmplifyShaderEditor.BreakToComponentsNode;10;-672,-272;Inherit;False;COLOR;1;0;COLOR;0,0,0,0;False;16;FLOAT;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT;5;FLOAT;6;FLOAT;7;FLOAT;8;FLOAT;9;FLOAT;10;FLOAT;11;FLOAT;12;FLOAT;13;FLOAT;14;FLOAT;15 +Node;AmplifyShaderEditor.StaticSwitch;28;-512,-160;Inherit;False;Property;_UseRedAsAlpha;UseRedAsAlpha;3;0;Create;True;0;0;0;False;0;False;0;1;1;True;;Toggle;2;Key0;Key1;Create;True;True;All;9;1;FLOAT;0;False;0;FLOAT;0;False;2;FLOAT;0;False;3;FLOAT;0;False;4;FLOAT;0;False;5;FLOAT;0;False;6;FLOAT;0;False;7;FLOAT;0;False;8;FLOAT;0;False;1;FLOAT;0 Node;AmplifyShaderEditor.DynamicAppendNode;13;-192,-288;Inherit;False;COLOR;4;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;0;False;3;FLOAT;0;False;1;COLOR;0 -Node;AmplifyShaderEditor.ColorNode;8;-256,-112;Inherit;False;Property;_BaseColor;BaseColor;1;0;Create;True;0;0;0;False;0;False;0,0,0,0;0,0,0,0;True;True;0;6;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT3;5 +Node;AmplifyShaderEditor.RangedFloatNode;30;-48,0;Inherit;False;Constant;_Float0;Float 0;6;0;Create;True;0;0;0;False;0;False;1;0;0;0;0;1;FLOAT;0 +Node;AmplifyShaderEditor.ColorNode;8;-368,-16;Inherit;False;Property;_BaseColor;BaseColor;1;1;[HDR];Create;True;0;0;0;False;0;False;0,0,0,0;0,0,0,0;True;True;0;6;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT3;5 +Node;AmplifyShaderEditor.ColorNode;20;-96,128;Inherit;False;Property;_EmissionColor;EmissionColor;2;1;[HDR];Create;True;0;0;0;False;0;False;0,0,0,0;0,0,0,0;True;True;0;6;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT3;5 Node;AmplifyShaderEditor.SimpleMultiplyOpNode;14;-16,-192;Inherit;False;2;2;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;1;COLOR;0 -Node;AmplifyShaderEditor.ColorNode;20;-80,96;Inherit;False;Property;_EmissionColor;EmissionColor;4;0;Create;True;0;0;0;False;0;False;0,0,0,0;0,0,0,0;True;True;0;6;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4;FLOAT3;5 -Node;AmplifyShaderEditor.IntNode;17;139.8661,-417.2427;Inherit;False;Property;_Emission;Emission;3;0;Create;True;0;0;0;False;0;False;0;0;False;0;1;INT;0 -Node;AmplifyShaderEditor.SimpleMultiplyOpNode;21;192,-112;Inherit;False;2;2;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;1;COLOR;0 -Node;AmplifyShaderEditor.Compare;16;384,-320;Inherit;False;0;4;0;INT;0;False;1;FLOAT;1;False;2;COLOR;0,0,0,0;False;3;COLOR;0,0,0,0;False;1;COLOR;0 +Node;AmplifyShaderEditor.StaticSwitch;29;144,-32;Inherit;False;Property;_Emission;Emission;4;0;Create;True;0;0;0;False;0;False;0;1;1;True;;Toggle;2;Key0;Key1;Create;True;True;All;9;1;COLOR;0,0,0,0;False;0;COLOR;0,0,0,0;False;2;COLOR;0,0,0,0;False;3;COLOR;0,0,0,0;False;4;COLOR;0,0,0,0;False;5;COLOR;0,0,0,0;False;6;COLOR;0,0,0,0;False;7;COLOR;0,0,0,0;False;8;COLOR;0,0,0,0;False;1;COLOR;0 +Node;AmplifyShaderEditor.SimpleMultiplyOpNode;21;416,-144;Inherit;False;2;2;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;1;COLOR;0 Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;3;0,0;Float;False;False;-1;2;ASEMaterialInspector;0;1;New Amplify Shader;cf964e524c8e69742b1d21fbe2ebcc4a;True;Sprite Unlit Forward;0;1;Sprite Unlit Forward;0;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;2;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Transparent=RenderType;Queue=Transparent=Queue=0;True;0;True;12;all;0;False;True;2;5;False;;10;False;;3;1;False;;10;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;True;True;True;True;0;False;;False;False;False;False;False;False;False;True;False;0;False;;255;False;;255;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;False;True;1;False;;True;3;False;;True;True;0;False;;0;False;;True;1;LightMode=UniversalForward;False;False;0;Hidden/InternalErrorShader;0;0;Standard;0;False;0 Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;4;0,0;Float;False;False;-1;2;ASEMaterialInspector;0;1;New Amplify Shader;cf964e524c8e69742b1d21fbe2ebcc4a;True;SceneSelectionPass;0;2;SceneSelectionPass;0;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;2;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Transparent=RenderType;Queue=Transparent=Queue=0;True;0;True;12;all;0;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;2;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;1;LightMode=SceneSelectionPass;False;False;0;Hidden/InternalErrorShader;0;0;Standard;0;False;0 Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;5;0,0;Float;False;False;-1;2;ASEMaterialInspector;0;1;New Amplify Shader;cf964e524c8e69742b1d21fbe2ebcc4a;True;ScenePickingPass;0;3;ScenePickingPass;0;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;2;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Transparent=RenderType;Queue=Transparent=Queue=0;True;0;True;12;all;0;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;2;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;1;LightMode=Picking;False;False;0;Hidden/InternalErrorShader;0;0;Standard;0;False;0 -Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;2;832,-96;Float;False;True;-1;2;ASEMaterialInspector;0;15;Soullies/TrackShader;cf964e524c8e69742b1d21fbe2ebcc4a;True;Sprite Unlit;0;0;Sprite Unlit;4;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;2;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Transparent=RenderType;Queue=Transparent=Queue=0;True;2;True;12;all;0;False;True;2;5;False;;10;False;;3;1;False;;10;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;True;True;True;True;0;False;;False;False;False;False;False;False;False;True;False;0;False;;255;False;;255;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;True;True;1;False;;True;3;False;;True;True;0;False;;0;False;;True;1;LightMode=Universal2D;False;False;0;Hidden/InternalErrorShader;0;0;Standard;3;Vertex Position;1;0;Debug Display;0;0;External Alpha;0;0;0;4;True;True;True;True;False;;False;0 +Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;2;704,-160;Float;False;True;-1;2;ASEMaterialInspector;0;17;Soullies/TrackShader;cf964e524c8e69742b1d21fbe2ebcc4a;True;Sprite Unlit;0;0;Sprite Unlit;4;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;2;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;3;RenderPipeline=UniversalPipeline;RenderType=Transparent=RenderType;Queue=Transparent=Queue=0;True;2;True;12;all;0;False;True;2;5;False;;10;False;;3;1;False;;10;False;;False;False;False;False;False;False;False;False;False;False;False;False;False;False;True;True;True;True;True;0;False;;False;False;False;False;False;False;False;True;False;0;False;;255;False;;255;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;0;False;;True;True;1;False;;True;3;False;;True;True;0;False;;0;False;;True;1;LightMode=Universal2D;False;False;0;Hidden/InternalErrorShader;0;0;Standard;3;Vertex Position;1;0;Debug Display;0;0;External Alpha;0;0;0;4;True;True;True;True;False;;False;0 WireConnection;10;0;6;0 -WireConnection;18;0;12;0 -WireConnection;18;2;10;0 -WireConnection;18;3;10;3 +WireConnection;28;1;10;3 +WireConnection;28;0;10;0 WireConnection;13;0;10;0 WireConnection;13;1;10;1 WireConnection;13;2;10;2 -WireConnection;13;3;18;0 +WireConnection;13;3;28;0 WireConnection;14;0;13;0 WireConnection;14;1;8;0 +WireConnection;29;1;30;0 +WireConnection;29;0;20;0 WireConnection;21;0;14;0 -WireConnection;21;1;20;0 -WireConnection;16;0;17;0 -WireConnection;16;2;21;0 -WireConnection;16;3;14;0 -WireConnection;2;1;16;0 +WireConnection;21;1;29;0 +WireConnection;2;1;21;0 ASEEND*/ -//CHKSM=23C607089893A356315F304BB06119DFAE587F85 \ No newline at end of file +//CHKSM=40C28A86E8CC0AB370CE278DE6A8EB09B052B98B \ No newline at end of file diff --git a/Assets/Shaders/TrackShader.shader.meta b/Assets/Shaders/TrackShader.shader.meta old mode 100644 new mode 100755 index 25b60a08..047c6962 --- a/Assets/Shaders/TrackShader.shader.meta +++ b/Assets/Shaders/TrackShader.shader.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 423e4019c51e2433e94a8efed1980448 +guid: 44e8d6dab1446644688189717537509a ShaderImporter: externalObjects: {} defaultTextures: [] diff --git a/Assets/StreamingAssets/AutoSave/Terminal/AutoSave_0.json b/Assets/StreamingAssets/AutoSave/Terminal/AutoSave_0.json new file mode 100644 index 00000000..a7b34922 --- /dev/null +++ b/Assets/StreamingAssets/AutoSave/Terminal/AutoSave_0.json @@ -0,0 +1,717 @@ +{ + "BeatMap" : { + "__type" : "Ichni.RhythmGame.Beatmap.BeatmapContainer_BM,Assembly-CSharp", + "value" : { + "elementList" : [ + { + "__type" : "Ichni.RhythmGame.Beatmap.ElementFolder_BM,Assembly-CSharp", + "elementName" : "New Folder", + "tags" : [ + + ], + "elementGuid" : { + "value" : "030b4b43-46bb-43c9-84e7-6a98207a39c9" + }, + "attachedElementGuid" : { + "value" : "00000000-0000-0000-0000-000000000000" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TransformSubmodule_BM,Assembly-CSharp", + "originalPosition" : { + "x" : 0, + "y" : 0, + "z" : 0 + }, + "originalEulerAngles" : { + "x" : 0, + "y" : 0, + "z" : 0 + }, + "originalScale" : { + "x" : 1, + "y" : 1, + "z" : 1 + }, + "attachedElementGuid" : { + "value" : "030b4b43-46bb-43c9-84e7-6a98207a39c9" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", + "isOverridingDuration" : false, + "startTime" : -32767, + "endTime" : 32767, + "attachedElementGuid" : { + "value" : "030b4b43-46bb-43c9-84e7-6a98207a39c9" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.Track_BM,Assembly-CSharp", + "elementName" : "New Track", + "tags" : [ + + ], + "elementGuid" : { + "value" : "d9d3df55-9509-46dc-8e2f-d628993313cb" + }, + "attachedElementGuid" : { + "value" : "030b4b43-46bb-43c9-84e7-6a98207a39c9" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TransformSubmodule_BM,Assembly-CSharp", + "originalPosition" : { + "x" : 0, + "y" : 0, + "z" : 0 + }, + "originalEulerAngles" : { + "x" : 0, + "y" : 0, + "z" : 0 + }, + "originalScale" : { + "x" : 1, + "y" : 1, + "z" : 1 + }, + "attachedElementGuid" : { + "value" : "d9d3df55-9509-46dc-8e2f-d628993313cb" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", + "isOverridingDuration" : false, + "startTime" : -32767, + "endTime" : 32767, + "attachedElementGuid" : { + "value" : "d9d3df55-9509-46dc-8e2f-d628993313cb" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TrackPathSubmodule_BM,Assembly-CSharp", + "trackSpaceType" : 0, + "trackSamplingType" : 0, + "isClosed" : false, + "isShowingDisplay" : false, + "attachedElementGuid" : { + "value" : "d9d3df55-9509-46dc-8e2f-d628993313cb" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TrackRendererSubmoduleAutoOrient_BM,Assembly-CSharp", + "materialThemeBundleName" : "departure_to_multiverse", + "materialName" : "EnergyTrail0", + "enableEmission" : true, + "emissionIntensity" : 0, + "attachedElementGuid" : { + "value" : "d9d3df55-9509-46dc-8e2f-d628993313cb" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TrackTimeSubmoduleMovable_BM,Assembly-CSharp", + "trackStartTime" : 0, + "trackEndTime" : 4, + "visibleTrackTimeLength" : 2, + "animationCurveType" : 0, + "attachedElementGuid" : { + "value" : "d9d3df55-9509-46dc-8e2f-d628993313cb" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.PathNode_BM,Assembly-CSharp", + "isShowingSphere" : false, + "elementName" : "New Path Node", + "tags" : [ + + ], + "elementGuid" : { + "value" : "e4152ed1-e7ba-4484-988c-132aac93bb4f" + }, + "attachedElementGuid" : { + "value" : "d9d3df55-9509-46dc-8e2f-d628993313cb" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TransformSubmodule_BM,Assembly-CSharp", + "originalPosition" : { + "x" : 10, + "y" : 0, + "z" : 10 + }, + "originalEulerAngles" : { + "x" : 0, + "y" : 0, + "z" : 0 + }, + "originalScale" : { + "x" : 1, + "y" : 1, + "z" : 1 + }, + "attachedElementGuid" : { + "value" : "e4152ed1-e7ba-4484-988c-132aac93bb4f" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", + "isOverridingDuration" : false, + "startTime" : -32767, + "endTime" : 32767, + "attachedElementGuid" : { + "value" : "e4152ed1-e7ba-4484-988c-132aac93bb4f" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.ColorSubmodule_BM,Assembly-CSharp", + "originalBaseColor" : { + "r" : 1, + "g" : 1, + "b" : 0, + "a" : 1 + }, + "emissionEnabled" : false, + "originalEmissionColor" : { + "r" : 0, + "g" : 0, + "b" : 0, + "a" : 1 + }, + "originalEmissionIntensity" : 0, + "attachedElementGuid" : { + "value" : "e4152ed1-e7ba-4484-988c-132aac93bb4f" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.PathNode_BM,Assembly-CSharp", + "isShowingSphere" : false, + "elementName" : "New Path Node", + "tags" : [ + + ], + "elementGuid" : { + "value" : "42fc001e-dd4f-4480-ab39-5e739519c068" + }, + "attachedElementGuid" : { + "value" : "d9d3df55-9509-46dc-8e2f-d628993313cb" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TransformSubmodule_BM,Assembly-CSharp", + "originalPosition" : { + "x" : -10, + "y" : 0, + "z" : 10 + }, + "originalEulerAngles" : { + "x" : 0, + "y" : 0, + "z" : 0 + }, + "originalScale" : { + "x" : 1, + "y" : 1, + "z" : 1 + }, + "attachedElementGuid" : { + "value" : "42fc001e-dd4f-4480-ab39-5e739519c068" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", + "isOverridingDuration" : false, + "startTime" : -32767, + "endTime" : 32767, + "attachedElementGuid" : { + "value" : "42fc001e-dd4f-4480-ab39-5e739519c068" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.ColorSubmodule_BM,Assembly-CSharp", + "originalBaseColor" : { + "r" : 0, + "g" : 1, + "b" : 1, + "a" : 1 + }, + "emissionEnabled" : false, + "originalEmissionColor" : { + "r" : 0, + "g" : 0, + "b" : 0, + "a" : 1 + }, + "originalEmissionIntensity" : 0, + "attachedElementGuid" : { + "value" : "42fc001e-dd4f-4480-ab39-5e739519c068" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.Tap_BM,Assembly-CSharp", + "exactJudgeTime" : 1, + "elementName" : "New Tap", + "tags" : [ + + ], + "elementGuid" : { + "value" : "336d5719-77a3-41d1-b5bc-7e358cb8b002" + }, + "attachedElementGuid" : { + "value" : "d9d3df55-9509-46dc-8e2f-d628993313cb" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", + "isOverridingDuration" : false, + "startTime" : -32767, + "endTime" : 32767, + "attachedElementGuid" : { + "value" : "336d5719-77a3-41d1-b5bc-7e358cb8b002" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.NoteJudgeSubmodule_BM,Assembly-CSharp", + "judgeUnitList" : [ + { + "__type" : "Ichni.RhythmGame.Beatmap.TouchAreaJudgeUnit_BM,Assembly-CSharp", + "areaRadius" : 1000 + } + ], + "attachedElementGuid" : { + "value" : "336d5719-77a3-41d1-b5bc-7e358cb8b002" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.Stay_BM,Assembly-CSharp", + "exactJudgeTime" : 3, + "elementName" : "New Stay", + "tags" : [ + + ], + "elementGuid" : { + "value" : "36f8bb90-4082-4ea8-965c-b7c3ffa838f9" + }, + "attachedElementGuid" : { + "value" : "d9d3df55-9509-46dc-8e2f-d628993313cb" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", + "isOverridingDuration" : false, + "startTime" : -32767, + "endTime" : 32767, + "attachedElementGuid" : { + "value" : "36f8bb90-4082-4ea8-965c-b7c3ffa838f9" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.NoteJudgeSubmodule_BM,Assembly-CSharp", + "judgeUnitList" : [ + { + "__type" : "Ichni.RhythmGame.Beatmap.TouchAreaJudgeUnit_BM,Assembly-CSharp", + "areaRadius" : 1000 + } + ], + "attachedElementGuid" : { + "value" : "36f8bb90-4082-4ea8-965c-b7c3ffa838f9" + } + },{ + "__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp", + "themeBundleName" : "departure_to_multiverse", + "objectName" : "DTM_NoteVisualTap", + "elementName" : "New Note Visual", + "tags" : [ + + ], + "elementGuid" : { + "value" : "0f3c45f4-f76f-44f3-b195-a2af6f6221e6" + }, + "attachedElementGuid" : { + "value" : "336d5719-77a3-41d1-b5bc-7e358cb8b002" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TransformSubmodule_BM,Assembly-CSharp", + "originalPosition" : { + "x" : 0, + "y" : 0, + "z" : 0 + }, + "originalEulerAngles" : { + "x" : 0, + "y" : 0, + "z" : 0 + }, + "originalScale" : { + "x" : 1, + "y" : 1, + "z" : 1 + }, + "attachedElementGuid" : { + "value" : "0f3c45f4-f76f-44f3-b195-a2af6f6221e6" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", + "isOverridingDuration" : false, + "startTime" : -32767, + "endTime" : 32767, + "attachedElementGuid" : { + "value" : "0f3c45f4-f76f-44f3-b195-a2af6f6221e6" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.ColorSubmodule_BM,Assembly-CSharp", + "originalBaseColor" : { + "r" : 1, + "g" : 1, + "b" : 1, + "a" : 1 + }, + "emissionEnabled" : false, + "originalEmissionColor" : { + "r" : 0, + "g" : 0, + "b" : 0, + "a" : 1 + }, + "originalEmissionIntensity" : 0, + "attachedElementGuid" : { + "value" : "0f3c45f4-f76f-44f3-b195-a2af6f6221e6" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.EffectSubmodule_BM,Assembly-CSharp", + "effectCollection" : {"Generate":[ + + ],"GeneralJudge":[ + + ],"Holding":[ + + ],"Perfect":[ + { + "__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNotePerfectBurst_BM,Assembly-CSharp", + "effectTime" : 0 + },{ + "__type" : "Ichni.RhythmGame.Beatmap.BloomEffect_BM,Assembly-CSharp", + "duration" : 0.5, + "peak" : 3, + "intensityCurve" : { + "keys" : [ + { + "time" : 0, + "value" : 1, + "inTangent" : 0, + "outTangent" : 0 + },{ + "time" : 1, + "value" : 0, + "inTangent" : 0, + "outTangent" : 0 + } + ], + "preWrapMode" : 8, + "postWrapMode" : 8 + }, + "effectTime" : 0 + } + ],"Good":[ + { + "__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteGoodBurst_BM,Assembly-CSharp", + "effectTime" : 0 + } + ],"Bad":[ + { + "__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteBadBurst_BM,Assembly-CSharp", + "effectTime" : 0 + } + ],"Miss":[ + + ] + }, + "attachedElementGuid" : { + "value" : "0f3c45f4-f76f-44f3-b195-a2af6f6221e6" + } + },{ + "__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNoteVisual_BM,Assembly-CSharp", + "themeBundleName" : "departure_to_multiverse", + "objectName" : "DTM_NoteVisualStay", + "elementName" : "New Note Visual", + "tags" : [ + + ], + "elementGuid" : { + "value" : "976c1bde-65be-468c-81d3-0c133f615edb" + }, + "attachedElementGuid" : { + "value" : "36f8bb90-4082-4ea8-965c-b7c3ffa838f9" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TransformSubmodule_BM,Assembly-CSharp", + "originalPosition" : { + "x" : 0, + "y" : 0, + "z" : 0 + }, + "originalEulerAngles" : { + "x" : 0, + "y" : 0, + "z" : 0 + }, + "originalScale" : { + "x" : 1, + "y" : 1, + "z" : 1 + }, + "attachedElementGuid" : { + "value" : "976c1bde-65be-468c-81d3-0c133f615edb" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", + "isOverridingDuration" : false, + "startTime" : -32767, + "endTime" : 32767, + "attachedElementGuid" : { + "value" : "976c1bde-65be-468c-81d3-0c133f615edb" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.ColorSubmodule_BM,Assembly-CSharp", + "originalBaseColor" : { + "r" : 1, + "g" : 1, + "b" : 1, + "a" : 1 + }, + "emissionEnabled" : false, + "originalEmissionColor" : { + "r" : 0, + "g" : 0, + "b" : 0, + "a" : 1 + }, + "originalEmissionIntensity" : 0, + "attachedElementGuid" : { + "value" : "976c1bde-65be-468c-81d3-0c133f615edb" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.EffectSubmodule_BM,Assembly-CSharp", + "effectCollection" : {"Generate":[ + + ],"GeneralJudge":[ + + ],"Holding":[ + + ],"Perfect":[ + { + "__type" : "Ichni.RhythmGame.ThemeBundles.DepartureToMultiverse.Beatmap.DTMNotePerfectBurst_BM,Assembly-CSharp", + "effectTime" : 0 + } + ],"Good":[ + + ],"Bad":[ + + ],"Miss":[ + + ] + }, + "attachedElementGuid" : { + "value" : "976c1bde-65be-468c-81d3-0c133f615edb" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.Hold_BM,Assembly-CSharp", + "holdEndTime" : 2.5, + "exactJudgeTime" : 1.5, + "elementName" : "New Hold", + "tags" : [ + + ], + "elementGuid" : { + "value" : "431b9cdf-3d07-4ca3-a540-e5772fdcacb9" + }, + "attachedElementGuid" : { + "value" : "d9d3df55-9509-46dc-8e2f-d628993313cb" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", + "isOverridingDuration" : false, + "startTime" : -1, + "endTime" : 0, + "attachedElementGuid" : { + "value" : "431b9cdf-3d07-4ca3-a540-e5772fdcacb9" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.NoteJudgeSubmodule_BM,Assembly-CSharp", + "judgeUnitList" : [ + + ], + "attachedElementGuid" : { + "value" : "431b9cdf-3d07-4ca3-a540-e5772fdcacb9" + } + },{ + "__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicHoldVisualMovable_BM,Assembly-CSharp", + "themeBundleName" : "basic", + "objectName" : "BasicNoteHoldMovable", + "elementName" : "New Note Visual", + "tags" : [ + + ], + "elementGuid" : { + "value" : "160d94d5-652f-4402-b0e3-a7451b554307" + }, + "attachedElementGuid" : { + "value" : "431b9cdf-3d07-4ca3-a540-e5772fdcacb9" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TransformSubmodule_BM,Assembly-CSharp", + "originalPosition" : { + "x" : 0, + "y" : 0, + "z" : 0 + }, + "originalEulerAngles" : { + "x" : 0, + "y" : 0, + "z" : 0 + }, + "originalScale" : { + "x" : 1, + "y" : 1, + "z" : 1 + }, + "attachedElementGuid" : { + "value" : "160d94d5-652f-4402-b0e3-a7451b554307" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", + "isOverridingDuration" : false, + "startTime" : -1, + "endTime" : 0, + "attachedElementGuid" : { + "value" : "160d94d5-652f-4402-b0e3-a7451b554307" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.ColorSubmodule_BM,Assembly-CSharp", + "originalBaseColor" : { + "r" : 1, + "g" : 1, + "b" : 1, + "a" : 1 + }, + "emissionEnabled" : false, + "originalEmissionColor" : { + "r" : 0, + "g" : 0, + "b" : 0, + "a" : 1 + }, + "originalEmissionIntensity" : 0, + "attachedElementGuid" : { + "value" : "160d94d5-652f-4402-b0e3-a7451b554307" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.EffectSubmodule_BM,Assembly-CSharp", + "effectCollection" : {"Generate":[ + { + "__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicNoteGenerateExpand_BM,Assembly-CSharp", + "generateTime" : 1, + "effectTime" : 0.1 + } + ],"GeneralJudge":[ + + ],"Holding":[ + { + "__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicNoteHoldingExpand_BM,Assembly-CSharp", + "effectTime" : 1 + } + ],"Perfect":[ + { + "__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicNotePerfectBurst_BM,Assembly-CSharp", + "effectTime" : 0.1 + } + ],"Good":[ + { + "__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicNoteGoodBurst_BM,Assembly-CSharp", + "effectTime" : 0.1 + } + ],"Bad":[ + { + "__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicNoteBadShrink_BM,Assembly-CSharp", + "effectTime" : 0.1 + } + ],"Miss":[ + { + "__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicNoteMissPale_BM,Assembly-CSharp", + "effectTime" : 0.2 + } + ] + }, + "attachedElementGuid" : { + "value" : "160d94d5-652f-4402-b0e3-a7451b554307" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TrackPercentPoint_BM,Assembly-CSharp", + "trackPercent" : { + "animatedFloatList" : [ + { + "startValue" : 0, + "endValue" : 1, + "startTime" : 0, + "endTime" : 4, + "animationCurveType" : 0 + } + ] + }, + "elementName" : "New Track Percent Point", + "tags" : [ + + ], + "elementGuid" : { + "value" : "e4f33324-1df1-44f7-b730-21357edfcda4" + }, + "attachedElementGuid" : { + "value" : "d9d3df55-9509-46dc-8e2f-d628993313cb" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", + "isOverridingDuration" : false, + "startTime" : -1, + "endTime" : 0, + "attachedElementGuid" : { + "value" : "e4f33324-1df1-44f7-b730-21357edfcda4" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.Trail_BM,Assembly-CSharp", + "visibleTimeLength" : 2, + "renderMaterialName" : "DefaultTrailMaterial", + "isAutoOrient" : true, + "widthMultiplier" : 1, + "widthCurve" : { + "keys" : [ + { + "time" : 0, + "value" : 1, + "inTangent" : 0, + "outTangent" : 0 + },{ + "time" : 1, + "value" : 1, + "inTangent" : 0, + "outTangent" : 0 + } + ], + "preWrapMode" : 8, + "postWrapMode" : 8 + }, + "elementName" : "New Trail", + "tags" : [ + + ], + "elementGuid" : { + "value" : "7e68e165-d078-442e-a68a-c2d4f10827a9" + }, + "attachedElementGuid" : { + "value" : "e4f33324-1df1-44f7-b730-21357edfcda4" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TransformSubmodule_BM,Assembly-CSharp", + "originalPosition" : { + "x" : 0, + "y" : -2, + "z" : 0 + }, + "originalEulerAngles" : { + "x" : 0, + "y" : 0, + "z" : 0 + }, + "originalScale" : { + "x" : 1, + "y" : 1, + "z" : 1 + }, + "attachedElementGuid" : { + "value" : "7e68e165-d078-442e-a68a-c2d4f10827a9" + } + } + ], + "attachedElementGuid" : { + "value" : "00000000-0000-0000-0000-000000000000" + } + } + } +} \ No newline at end of file diff --git a/Assets/StreamingAssets/Projects/Terminal/Beatmap.json b/Assets/StreamingAssets/Projects/Terminal/Beatmap.json index da931502..a7b34922 100644 --- a/Assets/StreamingAssets/Projects/Terminal/Beatmap.json +++ b/Assets/StreamingAssets/Projects/Terminal/Beatmap.json @@ -97,7 +97,7 @@ "materialThemeBundleName" : "departure_to_multiverse", "materialName" : "EnergyTrail0", "enableEmission" : true, - "emissionIntensity" : 4, + "emissionIntensity" : 0, "attachedElementGuid" : { "value" : "d9d3df55-9509-46dc-8e2f-d628993313cb" } @@ -523,9 +523,9 @@ "value" : "431b9cdf-3d07-4ca3-a540-e5772fdcacb9" } },{ - "__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicHoldVisual_BM,Assembly-CSharp", + "__type" : "Ichni.RhythmGame.ThemeBundles.Basic.Beatmap.BasicHoldVisualMovable_BM,Assembly-CSharp", "themeBundleName" : "basic", - "objectName" : "BasicNoteHold", + "objectName" : "BasicNoteHoldMovable", "elementName" : "New Note Visual", "tags" : [ @@ -623,6 +623,90 @@ "attachedElementGuid" : { "value" : "160d94d5-652f-4402-b0e3-a7451b554307" } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TrackPercentPoint_BM,Assembly-CSharp", + "trackPercent" : { + "animatedFloatList" : [ + { + "startValue" : 0, + "endValue" : 1, + "startTime" : 0, + "endTime" : 4, + "animationCurveType" : 0 + } + ] + }, + "elementName" : "New Track Percent Point", + "tags" : [ + + ], + "elementGuid" : { + "value" : "e4f33324-1df1-44f7-b730-21357edfcda4" + }, + "attachedElementGuid" : { + "value" : "d9d3df55-9509-46dc-8e2f-d628993313cb" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TimeDurationSubmodule_BM,Assembly-CSharp", + "isOverridingDuration" : false, + "startTime" : -1, + "endTime" : 0, + "attachedElementGuid" : { + "value" : "e4f33324-1df1-44f7-b730-21357edfcda4" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.Trail_BM,Assembly-CSharp", + "visibleTimeLength" : 2, + "renderMaterialName" : "DefaultTrailMaterial", + "isAutoOrient" : true, + "widthMultiplier" : 1, + "widthCurve" : { + "keys" : [ + { + "time" : 0, + "value" : 1, + "inTangent" : 0, + "outTangent" : 0 + },{ + "time" : 1, + "value" : 1, + "inTangent" : 0, + "outTangent" : 0 + } + ], + "preWrapMode" : 8, + "postWrapMode" : 8 + }, + "elementName" : "New Trail", + "tags" : [ + + ], + "elementGuid" : { + "value" : "7e68e165-d078-442e-a68a-c2d4f10827a9" + }, + "attachedElementGuid" : { + "value" : "e4f33324-1df1-44f7-b730-21357edfcda4" + } + },{ + "__type" : "Ichni.RhythmGame.Beatmap.TransformSubmodule_BM,Assembly-CSharp", + "originalPosition" : { + "x" : 0, + "y" : -2, + "z" : 0 + }, + "originalEulerAngles" : { + "x" : 0, + "y" : 0, + "z" : 0 + }, + "originalScale" : { + "x" : 1, + "y" : 1, + "z" : 1 + }, + "attachedElementGuid" : { + "value" : "7e68e165-d078-442e-a68a-c2d4f10827a9" + } } ], "attachedElementGuid" : { diff --git a/Assets/StreamingAssets/ThemeBundles/OSX/OSX b/Assets/StreamingAssets/ThemeBundles/OSX/OSX index 5d6885e1..86ff17c9 100644 Binary files a/Assets/StreamingAssets/ThemeBundles/OSX/OSX and b/Assets/StreamingAssets/ThemeBundles/OSX/OSX differ diff --git a/Assets/StreamingAssets/ThemeBundles/OSX/OSX.manifest b/Assets/StreamingAssets/ThemeBundles/OSX/OSX.manifest index eee0f705..9ebf8eb2 100644 --- a/Assets/StreamingAssets/ThemeBundles/OSX/OSX.manifest +++ b/Assets/StreamingAssets/ThemeBundles/OSX/OSX.manifest @@ -1,5 +1,5 @@ ManifestFileVersion: 0 -CRC: 2326133601 +CRC: 3393409780 AssetBundleManifest: AssetBundleInfos: Info_0: diff --git a/Assets/StreamingAssets/ThemeBundles/OSX/basic b/Assets/StreamingAssets/ThemeBundles/OSX/basic index 5e0e675f..e8b21bf0 100644 Binary files a/Assets/StreamingAssets/ThemeBundles/OSX/basic and b/Assets/StreamingAssets/ThemeBundles/OSX/basic differ diff --git a/Assets/StreamingAssets/ThemeBundles/OSX/basic.manifest b/Assets/StreamingAssets/ThemeBundles/OSX/basic.manifest index 2f4b24ea..a776686a 100644 --- a/Assets/StreamingAssets/ThemeBundles/OSX/basic.manifest +++ b/Assets/StreamingAssets/ThemeBundles/OSX/basic.manifest @@ -1,15 +1,15 @@ ManifestFileVersion: 0 -CRC: 1307421485 +CRC: 2839714745 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 1915ed5d0b6e0ca23eb1ec1e0033bbac + Hash: e97f9ef7be70f049f85b3caa0f210dda TypeTreeHash: serializedVersion: 2 - Hash: 8c861b0fd2b539f00421fd97e0447b27 + Hash: ba4dbc034cf972e8bde9558b656c4876 IncrementalBuildHash: serializedVersion: 2 - Hash: 1915ed5d0b6e0ca23eb1ec1e0033bbac + Hash: e97f9ef7be70f049f85b3caa0f210dda HashAppended: 0 ClassTypes: - Class: 1 @@ -42,6 +42,8 @@ ClassTypes: Script: {fileID: 11500000, guid: 72caf325f2b59403c94193cd2037b7ba, type: 3} - Class: 114 Script: {fileID: 11500000, guid: f92b9b8f89de544adaa001ccfdf7eae4, type: 3} +- Class: 114 + Script: {fileID: 11500000, guid: cba1fe17342b14361bb504a9a506878b, type: 3} - Class: 115 Script: {instanceID: 0} - Class: 212 @@ -53,6 +55,7 @@ SerializeReferenceClassIdentifiers: ClassName: Sirenix.Serialization.SerializationData Assets: - Assets/ThemeBundles/Basic/Prefabs/Plane.prefab +- Assets/ThemeBundles/Basic/Prefabs/BasicNoteHoldMovable.prefab - Assets/ThemeBundles/Basic/Prefabs/Square2D.prefab - Assets/ThemeBundles/Basic/Prefabs/Cube.prefab - Assets/ThemeBundles/Basic/Prefabs/Cylinder.prefab @@ -66,7 +69,7 @@ Assets: - Assets/ThemeBundles/Basic/Prefabs/Sphere.prefab - Assets/ThemeBundles/Basic/Prefabs/Quad.prefab - Assets/ThemeBundles/Basic/Prefabs/BasicNoteTap3D.prefab -- Assets/ThemeBundles/Basic/Prefabs/BasicNoteHold.prefab +- Assets/ThemeBundles/Basic/Prefabs/BasicNoteHoldStatic.prefab - Assets/ThemeBundles/Basic/Prefabs/DirectionalLight.prefab - Assets/ThemeBundles/Basic/Prefabs/PointLight.prefab Dependencies: [] diff --git a/Assets/ThemeBundles/Basic/Prefabs/BasicNoteHoldMovable.prefab b/Assets/ThemeBundles/Basic/Prefabs/BasicNoteHoldMovable.prefab new file mode 100644 index 00000000..0534a8e9 --- /dev/null +++ b/Assets/ThemeBundles/Basic/Prefabs/BasicNoteHoldMovable.prefab @@ -0,0 +1,255 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6759562726529963496 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8577101396104971865} + - component: {fileID: 1652441339443578052} + m_Layer: 0 + m_Name: JudgeEffect + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8577101396104971865 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6759562726529963496} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 4303129164719886000} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1652441339443578052 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6759562726529963496} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 0ab11be59df835d4099df401d7420c44, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 1 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &7418166426351319151 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2236104322558172231} + - component: {fileID: 4662184346438900431} + - component: {fileID: 7556478762474901918} + m_Layer: 0 + m_Name: NoteMain + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2236104322558172231 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7418166426351319151} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4303129164719886000} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4662184346438900431 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7418166426351319151} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &7556478762474901918 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7418166426351319151} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: b39306d2c39754d0aafabe8570b8e640, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &8969796646526822168 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4303129164719886000} + - component: {fileID: 1274404912192895846} + m_Layer: 0 + m_Name: BasicNoteHoldMovable + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4303129164719886000 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8969796646526822168} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2236104322558172231} + - {fileID: 8577101396104971865} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1274404912192895846 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8969796646526822168} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cba1fe17342b14361bb504a9a506878b, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: elementGuid + Entry: 2 + Data: 00000000000000000000000000000000 + - Name: submoduleList + Entry: 7 + Data: 0|System.Collections.Generic.List`1[[Ichni.RhythmGame.SubmoduleBase, + Assembly-CSharp]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + elementName: + tags: [] + parentElement: {fileID: 0} + connectedTab: {fileID: 0} + childElementList: [] + themeBundleName: + objectName: + note: {fileID: 0} + noteMain: {fileID: 7418166426351319151} + judgeEffect: {fileID: 6759562726529963496} + notePartList: + - {fileID: 7418166426351319151} + effectPartList: + - {fileID: 6759562726529963496} + hold: {fileID: 0} diff --git a/Assets/ThemeBundles/Basic/Prefabs/BasicNoteHoldMovable.prefab.meta b/Assets/ThemeBundles/Basic/Prefabs/BasicNoteHoldMovable.prefab.meta new file mode 100644 index 00000000..2dba3239 --- /dev/null +++ b/Assets/ThemeBundles/Basic/Prefabs/BasicNoteHoldMovable.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e8618d7bd895943258b55c798f5b3da6 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: basic + assetBundleVariant: diff --git a/Assets/ThemeBundles/Basic/Prefabs/BasicNoteHold.prefab b/Assets/ThemeBundles/Basic/Prefabs/BasicNoteHoldStatic.prefab similarity index 98% rename from Assets/ThemeBundles/Basic/Prefabs/BasicNoteHold.prefab rename to Assets/ThemeBundles/Basic/Prefabs/BasicNoteHoldStatic.prefab index f9b0f913..a0972098 100644 --- a/Assets/ThemeBundles/Basic/Prefabs/BasicNoteHold.prefab +++ b/Assets/ThemeBundles/Basic/Prefabs/BasicNoteHoldStatic.prefab @@ -178,7 +178,7 @@ GameObject: - component: {fileID: 4303129164719886000} - component: {fileID: 7543664491821477037} m_Layer: 0 - m_Name: BasicNoteHold + m_Name: BasicNoteHoldStatic m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -243,8 +243,8 @@ MonoBehaviour: parentElement: {fileID: 0} connectedTab: {fileID: 0} childElementList: [] - themeBundleName: basic - objectName: BasicNoteHold + themeBundleName: + objectName: note: {fileID: 0} noteMain: {fileID: 7418166426351319151} judgeEffect: {fileID: 6759562726529963496} @@ -252,3 +252,4 @@ MonoBehaviour: - {fileID: 7418166426351319151} effectPartList: - {fileID: 6759562726529963496} + hold: {fileID: 0} diff --git a/Assets/ThemeBundles/Basic/Prefabs/BasicNoteHold.prefab.meta b/Assets/ThemeBundles/Basic/Prefabs/BasicNoteHoldStatic.prefab.meta similarity index 100% rename from Assets/ThemeBundles/Basic/Prefabs/BasicNoteHold.prefab.meta rename to Assets/ThemeBundles/Basic/Prefabs/BasicNoteHoldStatic.prefab.meta diff --git a/Assets/ThemeBundles/Basic/Prefabs/BasicNoteTap3D.prefab b/Assets/ThemeBundles/Basic/Prefabs/BasicNoteTap3D.prefab index b3d75dc4..6ee95625 100644 --- a/Assets/ThemeBundles/Basic/Prefabs/BasicNoteTap3D.prefab +++ b/Assets/ThemeBundles/Basic/Prefabs/BasicNoteTap3D.prefab @@ -225,79 +225,10 @@ MonoBehaviour: - Name: elementGuid Entry: 2 Data: 00000000000000000000000000000000 - - Name: timeDurationSubmodule + - Name: submoduleList Entry: 7 - Data: 0|Ichni.RhythmGame.TimeDurationSubmodule, Assembly-CSharp - - Name: attachedElement - Entry: 6 - Data: - - Name: isOverridingDuration - Entry: 5 - Data: false - - Name: startTime - Entry: 4 - Data: 0 - - Name: endTime - Entry: 4 - Data: 0 - - Name: - Entry: 8 - Data: - - Name: transformSubmodule - Entry: 7 - Data: 1|Ichni.RhythmGame.TransformSubmodule, Assembly-CSharp - - Name: attachedElement - Entry: 6 - Data: - - Name: originalPosition - Entry: 7 - Data: UnityEngine.Vector3, UnityEngine.CoreModule - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 8 - Data: - - Name: originalEulerAngles - Entry: 7 - Data: UnityEngine.Vector3, UnityEngine.CoreModule - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 8 - Data: - - Name: originalScale - Entry: 7 - Data: UnityEngine.Vector3, UnityEngine.CoreModule - - Name: - Entry: 4 - Data: 1 - - Name: - Entry: 4 - Data: 1 - - Name: - Entry: 4 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: positionOffset - Entry: 7 - Data: 2|System.Collections.Generic.List`1[[UnityEngine.Vector3, UnityEngine.CoreModule]], - mscorlib + Data: 0|System.Collections.Generic.List`1[[Ichni.RhythmGame.SubmoduleBase, + Assembly-CSharp]], mscorlib - Name: Entry: 12 Data: 0 @@ -307,242 +238,13 @@ MonoBehaviour: - Name: Entry: 8 Data: - - Name: eulerAnglesOffset - Entry: 7 - Data: 3|System.Collections.Generic.List`1[[UnityEngine.Vector3, UnityEngine.CoreModule]], - mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: scaleOffset - Entry: 7 - Data: 4|System.Collections.Generic.List`1[[UnityEngine.Vector3, UnityEngine.CoreModule]], - mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: currentPosition - Entry: 7 - Data: UnityEngine.Vector3, UnityEngine.CoreModule - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 8 - Data: - - Name: currentEulerAngles - Entry: 7 - Data: UnityEngine.Vector3, UnityEngine.CoreModule - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 8 - Data: - - Name: currentScale - Entry: 7 - Data: UnityEngine.Vector3, UnityEngine.CoreModule - - Name: - Entry: 4 - Data: 1 - - Name: - Entry: 4 - Data: 1 - - Name: - Entry: 4 - Data: 1 - - Name: - Entry: 8 - Data: - - Name: positionDirtyMark - Entry: 5 - Data: false - - Name: eulerAnglesDirtyMark - Entry: 5 - Data: false - - Name: scaleDirtyMark - Entry: 5 - Data: false - - Name: eulerAnglesOffsetLock - Entry: 5 - Data: false - - Name: OnPositionChanged - Entry: 6 - Data: - - Name: OnEulerAnglesChanged - Entry: 6 - Data: - - Name: OnScaleChanged - Entry: 6 - Data: - - Name: - Entry: 8 - Data: - - Name: colorSubmodule - Entry: 7 - Data: 5|Ichni.RhythmGame.ColorSubmodule, Assembly-CSharp - - Name: attachedElement - Entry: 6 - Data: - - Name: originalBaseColor - Entry: 7 - Data: UnityEngine.Color, UnityEngine.CoreModule - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 8 - Data: - - Name: emissionEnabled - Entry: 5 - Data: false - - Name: originalEmissionColor - Entry: 7 - Data: UnityEngine.Color, UnityEngine.CoreModule - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 8 - Data: - - Name: originalEmissionIntensity - Entry: 4 - Data: 0 - - Name: baseColorOffset - Entry: 7 - Data: 6|System.Collections.Generic.List`1[[UnityEngine.Color, UnityEngine.CoreModule]], - mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: emissionColorOffset - Entry: 7 - Data: 7|System.Collections.Generic.List`1[[UnityEngine.Color, UnityEngine.CoreModule]], - mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: emissionIntensityOffset - Entry: 7 - Data: 8|System.Collections.Generic.List`1[[System.Single, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - Name: - Entry: 13 - Data: - - Name: - Entry: 8 - Data: - - Name: currentBaseColor - Entry: 7 - Data: UnityEngine.Color, UnityEngine.CoreModule - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 8 - Data: - - Name: currentEmissionColor - Entry: 7 - Data: UnityEngine.Color, UnityEngine.CoreModule - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 4 - Data: 0 - - Name: - Entry: 8 - Data: - - Name: currentEmissionIntensity - Entry: 4 - Data: 0 - - Name: baseColorDirtyMark - Entry: 5 - Data: false - - Name: emissionColorDirtyMark - Entry: 5 - Data: false - - Name: - Entry: 8 - Data: elementName: - serialNumber: 0 tags: [] parentElement: {fileID: 0} + connectedTab: {fileID: 0} childElementList: [] - themeBundleName: basic - objectName: BasicNoteTap3D + themeBundleName: + objectName: note: {fileID: 0} noteMain: {fileID: 7418166426351319151} judgeEffect: {fileID: 6759562726529963496} diff --git a/Assets/ThemeBundles/Basic/Scripts/NoteVisual/BasicHoldVisualMovable.cs b/Assets/ThemeBundles/Basic/Scripts/NoteVisual/BasicHoldVisualMovable.cs new file mode 100644 index 00000000..fc8e1a30 --- /dev/null +++ b/Assets/ThemeBundles/Basic/Scripts/NoteVisual/BasicHoldVisualMovable.cs @@ -0,0 +1,85 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using Ichni.RhythmGame.Beatmap; +using UnityEngine; + +namespace Ichni.RhythmGame.ThemeBundles.Basic +{ + public partial class BasicHoldVisualMovable : NoteVisualBaseHold + { + public static BasicHoldVisualMovable GenerateElement(string elementName, Guid id, List tags, + bool isFirstGenerated, GameElement parentElement, string themeBundleName, string objectName) + { + BasicHoldVisualMovable holdVisualMovable = SubstantialObject.GenerateElement(elementName, id, tags, + isFirstGenerated, themeBundleName, objectName, parentElement).GetComponent(); + + return holdVisualMovable; + } + + public override void FirstSetUpObject(bool isFirstGenerated) + { + NoteBase note = parentElement as NoteBase; + if(note == null) throw new System.Exception("NoteVisual只能生成在Note下。"); + this.note = note; + note.noteVisual = this; + this.hold = note as Hold; + + if (isFirstGenerated) + { + effectSubmodule.effectCollection["Generate"].Add(new BasicNoteGenerateExpand(this)); + effectSubmodule.effectCollection["Holding"].Add(new BasicNoteHoldingExpand(this)); + effectSubmodule.effectCollection["Perfect"].Add(new BasicNotePerfectBurst(this)); + effectSubmodule.effectCollection["Good"].Add(new BasicNoteGoodBurst(this)); + effectSubmodule.effectCollection["Bad"].Add(new BasicNoteBadShrink(this)); + effectSubmodule.effectCollection["Miss"].Add(new BasicNoteMissPale(this)); + } + } + } + + public partial class BasicHoldVisualMovable + { + public override void SaveBM() + { + matchedBM = new Beatmap.BasicHoldVisualMovable_BM(elementName, elementGuid, tags, parentElement.matchedBM as GameElement_BM, themeBundleName, objectName); + } + + public override void UpdateHoldInMovableTrack() + { + if (hold.isHolding) + { + float percent = (hold.track.trackTimeSubmodule as TrackTimeSubmoduleMovable).GetTrackPercent(hold.exactJudgeTime + hold.holdingTime); + hold.trackPositioner.SetPercent(percent); + } + } + } + + namespace Beatmap + { + public class BasicHoldVisualMovable_BM : SubstantialObject_BM + { + public BasicHoldVisualMovable_BM() + { + + } + + public BasicHoldVisualMovable_BM(string elementName, Guid id, List tags, + GameElement_BM parent, string themeBundleName, string objectName) : + base(elementName, id, tags, parent, themeBundleName, objectName) + { + + } + + public override void ExecuteBM() + { + matchedElement = BasicHoldVisualMovable.GenerateElement(elementName, elementGuid, tags, false, + GetElement(attachedElementGuid), themeBundleName, objectName); + } + + public override GameElement DuplicateBM(GameElement parent) + { + return BasicHoldVisualMovable.GenerateElement(elementName, Guid.NewGuid(), tags, false, parent, themeBundleName, objectName); + } + } + } +} \ No newline at end of file diff --git a/Assets/ThemeBundles/Basic/Scripts/NoteVisual/BasicHoldVisualMovable.cs.meta b/Assets/ThemeBundles/Basic/Scripts/NoteVisual/BasicHoldVisualMovable.cs.meta new file mode 100644 index 00000000..9bc87911 --- /dev/null +++ b/Assets/ThemeBundles/Basic/Scripts/NoteVisual/BasicHoldVisualMovable.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cba1fe17342b14361bb504a9a506878b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ThemeBundles/Basic/Scripts/NoteVisual/BasicHoldVisual.cs b/Assets/ThemeBundles/Basic/Scripts/NoteVisual/BasicHoldVisualStatic.cs similarity index 63% rename from Assets/ThemeBundles/Basic/Scripts/NoteVisual/BasicHoldVisual.cs rename to Assets/ThemeBundles/Basic/Scripts/NoteVisual/BasicHoldVisualStatic.cs index 3734e829..b16b4584 100644 --- a/Assets/ThemeBundles/Basic/Scripts/NoteVisual/BasicHoldVisual.cs +++ b/Assets/ThemeBundles/Basic/Scripts/NoteVisual/BasicHoldVisualStatic.cs @@ -6,15 +6,15 @@ using UnityEngine; namespace Ichni.RhythmGame.ThemeBundles.Basic { - public partial class BasicHoldVisual : NoteVisualBaseHold + public partial class BasicHoldVisualStatic : NoteVisualBaseHold { - public static BasicHoldVisual GenerateElement(string elementName, Guid id, List tags, + public static BasicHoldVisualStatic GenerateElement(string elementName, Guid id, List tags, bool isFirstGenerated, GameElement parentElement, string themeBundleName, string objectName) { - BasicHoldVisual holdVisual = SubstantialObject.GenerateElement(elementName, id, tags, - isFirstGenerated, themeBundleName, objectName, parentElement).GetComponent(); + BasicHoldVisualStatic holdVisualStatic = SubstantialObject.GenerateElement(elementName, id, tags, + isFirstGenerated, themeBundleName, objectName, parentElement).GetComponent(); - return holdVisual; + return holdVisualStatic; } public override void FirstSetUpObject(bool isFirstGenerated) @@ -23,6 +23,7 @@ namespace Ichni.RhythmGame.ThemeBundles.Basic if(note == null) throw new System.Exception("NoteVisual只能生成在Note下。"); this.note = note; note.noteVisual = this; + this.hold = note as Hold; if (isFirstGenerated) { @@ -36,24 +37,24 @@ namespace Ichni.RhythmGame.ThemeBundles.Basic } } - public partial class BasicHoldVisual + public partial class BasicHoldVisualStatic { public override void SaveBM() { - matchedBM = new Beatmap.BasicHoldVisual_BM(elementName, elementGuid, tags, parentElement.matchedBM as GameElement_BM, themeBundleName, objectName); + matchedBM = new Beatmap.BasicHoldVisualStatic_BM(elementName, elementGuid, tags, parentElement.matchedBM as GameElement_BM, themeBundleName, objectName); } } namespace Beatmap { - public class BasicHoldVisual_BM : SubstantialObject_BM + public class BasicHoldVisualStatic_BM : SubstantialObject_BM { - public BasicHoldVisual_BM() + public BasicHoldVisualStatic_BM() { } - public BasicHoldVisual_BM(string elementName, Guid id, List tags, + public BasicHoldVisualStatic_BM(string elementName, Guid id, List tags, GameElement_BM parent, string themeBundleName, string objectName) : base(elementName, id, tags, parent, themeBundleName, objectName) { @@ -62,13 +63,13 @@ namespace Ichni.RhythmGame.ThemeBundles.Basic public override void ExecuteBM() { - matchedElement = BasicHoldVisual.GenerateElement(elementName, elementGuid, tags, false, + matchedElement = BasicHoldVisualStatic.GenerateElement(elementName, elementGuid, tags, false, GetElement(attachedElementGuid), themeBundleName, objectName); } public override GameElement DuplicateBM(GameElement parent) { - return BasicHoldVisual.GenerateElement(elementName, Guid.NewGuid(), tags, false, parent, themeBundleName, objectName); + return BasicHoldVisualStatic.GenerateElement(elementName, Guid.NewGuid(), tags, false, parent, themeBundleName, objectName); } } } diff --git a/Assets/ThemeBundles/Basic/Scripts/NoteVisual/BasicHoldVisual.cs.meta b/Assets/ThemeBundles/Basic/Scripts/NoteVisual/BasicHoldVisualStatic.cs.meta similarity index 100% rename from Assets/ThemeBundles/Basic/Scripts/NoteVisual/BasicHoldVisual.cs.meta rename to Assets/ThemeBundles/Basic/Scripts/NoteVisual/BasicHoldVisualStatic.cs.meta diff --git a/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/EnergyTrail0.mat b/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/EnergyTrail0.mat index ad64128b..9be7c087 100644 --- a/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/EnergyTrail0.mat +++ b/Assets/ThemeBundles/DepartureToMultiverse/Materials/Track/EnergyTrail0.mat @@ -8,16 +8,17 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: EnergyTrail0 - m_Shader: {fileID: -6465566751694194690, guid: ee7160752d2114149904ca2b2b012bbf, - type: 3} + m_Shader: {fileID: 4800000, guid: 44e8d6dab1446644688189717537509a, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _EMISSION_ON + - _USEREDASALPHA_ON m_InvalidKeywords: - _ALPHAPREMULTIPLY_ON - _FLIPBOOKBLENDING_OFF - _RECEIVE_SHADOWS_OFF - m_LightmapFlags: 0 + m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 m_CustomRenderQueue: -1 @@ -59,6 +60,10 @@ Material: m_Texture: {fileID: 2800000, guid: fe0f51232d3c144e98a40dcef497dca2, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _MainTexture: + m_Texture: {fileID: 2800000, guid: fe0f51232d3c144e98a40dcef497dca2, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _MaskTex: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -83,6 +88,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _texcoord: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - unity_Lightmaps: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -98,6 +107,7 @@ Material: m_Ints: [] m_Floats: - _AlphaClip: 0 + - _AlphaCutoff: 0.5 - _AlphaToMask: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 @@ -119,7 +129,7 @@ Material: - _DistortionStrengthScaled: 0 - _DstBlend: 10 - _DstBlendAlpha: 0 - - _Emission: 0 + - _Emission: 1 - _EmissionEnabled: 0 - _EnableExternalAlpha: 0 - _EnvironmentReflections: 1 @@ -157,7 +167,7 @@ Material: - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 2, g: 2, b: 2, a: 1} - _Flip: {r: 1, g: 1, b: 1, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}