Merge pull request #5066 from planetarium/feature/refactor-vfx

Feature/refactor vfx
planetarium · Jun 14, 2024 · 29071df · 29071df
2 parents a813348 + fe0b688
commit 29071df
Show file tree

Hide file tree

Showing 3 changed files with 224 additions and 144 deletions.
diff --git a/nekoyume/Assets/Resources/ScriptableObject/BuffVFXData.asset b/nekoyume/Assets/Resources/ScriptableObject/BuffVFXData.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 510b4ed31bf193f4595806794f747a2b, type: 3}
  m_Name: BuffVFXData
  m_EditorClassIdentifier: 
- DataList:
+ <DataList>k__BackingField:
  - StatType: 1
  PlusIcon: {fileID: 21300000, guid: c4377040b973b41eb82d99b5e2022d75, type: 3}
  MinusIcon: {fileID: 21300000, guid: 0e3b4f674f3b24e9a82bca31a8e7a4ca, type: 3}
@@ -134,31 +134,7 @@ MonoBehaviour:
  type: 3}
  MinusVFX: {fileID: 7837708294353371776, guid: c0b45884b3a1a8447b760337c0618eaa,
  type: 3}
- OverrideDataList:
- - Id: 500001
- Icon: {fileID: 21300000, guid: a3c38c985c66a42b1b20aaaba99934b1, type: 3}
- CastingVFX: {fileID: 5166876917278104467, guid: 5b2f8b6efafe66b4b864000303377aab,
- type: 3}
- BuffVFX: {fileID: 7171611368931243746, guid: 717216517b03d4c57bae5a9a59286335,
- type: 3}
- - Id: 500002
- Icon: {fileID: 21300000, guid: a3c38c985c66a42b1b20aaaba99934b1, type: 3}
- CastingVFX: {fileID: 5166876917278104467, guid: 5b2f8b6efafe66b4b864000303377aab,
- type: 3}
- BuffVFX: {fileID: 7171611368931243746, guid: 717216517b03d4c57bae5a9a59286335,
- type: 3}
- - Id: 500003
- Icon: {fileID: 21300000, guid: a3c38c985c66a42b1b20aaaba99934b1, type: 3}
- CastingVFX: {fileID: 5166876917278104467, guid: 5b2f8b6efafe66b4b864000303377aab,
- type: 3}
- BuffVFX: {fileID: 7171611368931243746, guid: 717216517b03d4c57bae5a9a59286335,
- type: 3}
- - Id: 600001
- Icon: {fileID: 21300000, guid: a3c38c985c66a42b1b20aaaba99934b1, type: 3}
- CastingVFX: {fileID: 5166876917278104467, guid: 5b2f8b6efafe66b4b864000303377aab,
- type: 3}
- BuffVFX: {fileID: 7171611368931243746, guid: 717216517b03d4c57bae5a9a59286335,
- type: 3}
+ <OverrideDataList>k__BackingField:
  - Id: 701000
  Icon: {fileID: 21300000, guid: b44fd3fdbb6304b45aa8a18aad5db6d5, type: 3}
  CastingVFX: {fileID: 5166876917278104467, guid: 5e3a035730f654cc5a4edd3cee17a180,
@@ -177,88 +153,62 @@ MonoBehaviour:
  type: 3}
  BuffVFX: {fileID: 1391978601354276969, guid: bcbcfa4b5d2e148ed94d37debecd2d34,
  type: 3}
- - Id: 704000
- Icon: {fileID: 21300000, guid: 84b2b543cf286054a8c1ca1f7d651c85, type: 3}
- CastingVFX: {fileID: 5166876917278104467, guid: 96b1b4bff4a56f249a2c0b5bd7b05bba,
+ - Id: 709000
+ Icon: {fileID: 21300000, guid: 8bc7f399af0f54c4a83c9f407283e061, type: 3}
+ CastingVFX: {fileID: 5372250249709306658, guid: e4aadf58488f469468b5b96d3b8bfa3b,
  type: 3}
- BuffVFX: {fileID: 5359811590792080300, guid: 22f1ce67a3f7c5c4e80923d30d7507bf,
+ BuffVFX: {fileID: 1597932600176430146, guid: a812dcf0b3bedf84dbcd7d96f139d3c4,
+ type: 3}
+ - Id: 709001
+ Icon: {fileID: 21300000, guid: 8bc7f399af0f54c4a83c9f407283e061, type: 3}
+ CastingVFX: {fileID: 5372250249709306658, guid: e4aadf58488f469468b5b96d3b8bfa3b,
+ type: 3}
+ BuffVFX: {fileID: 1597932600176430146, guid: a812dcf0b3bedf84dbcd7d96f139d3c4,
+ type: 3}
+ - Id: 709002
+ Icon: {fileID: 21300000, guid: 8bc7f399af0f54c4a83c9f407283e061, type: 3}
+ CastingVFX: {fileID: 5372250249709306658, guid: e4aadf58488f469468b5b96d3b8bfa3b,
+ type: 3}
+ BuffVFX: {fileID: 1597932600176430146, guid: a812dcf0b3bedf84dbcd7d96f139d3c4,
+ type: 3}
+ <ActionBuffVFXOverrideDataList>k__BackingField:
+ - Type: 0
+ Icon: {fileID: 21300000, guid: a3c38c985c66a42b1b20aaaba99934b1, type: 3}
+ CastingVFX: {fileID: 5166876917278104467, guid: 5b2f8b6efafe66b4b864000303377aab,
+ type: 3}
+ BuffVFX: {fileID: 7171611368931243746, guid: 717216517b03d4c57bae5a9a59286335,
  type: 3}
- - Id: 704001
+ - Type: 1
  Icon: {fileID: 21300000, guid: 84b2b543cf286054a8c1ca1f7d651c85, type: 3}
  CastingVFX: {fileID: 5166876917278104467, guid: 96b1b4bff4a56f249a2c0b5bd7b05bba,
  type: 3}
  BuffVFX: {fileID: 5359811590792080300, guid: 22f1ce67a3f7c5c4e80923d30d7507bf,
  type: 3}
- - Id: 705000
+ - Type: 2
  Icon: {fileID: 21300000, guid: 57a7c7f4be51432478858aafb6f53b71, type: 3}
  CastingVFX: {fileID: 2280207480576973039, guid: 6b823acc2182e4f45ab6ee216761e7c8,
  type: 3}
  BuffVFX: {fileID: 6607344730775082401, guid: c0623a33e4f1fd94cace5dd3cfd158a4,
  type: 3}
- - Id: 706000
+ - Type: 3
  Icon: {fileID: 21300000, guid: 987237b059aecf8479124be78b862e09, type: 3}
  CastingVFX: {fileID: 567492925472903853, guid: d7a82287ca7c1cb429791e364b7831a7,
  type: 3}
  BuffVFX: {fileID: 6480292753974600568, guid: 837736bf1d83a0545b2e6dd3548f0ed1,
  type: 3}
- - Id: 707000
- Icon: {fileID: 21300000, guid: b2c3ad93baec3614baf400a8ac26c2e9, type: 3}
- CastingVFX: {fileID: 517495102393359299, guid: 271ea9a1d7475434393c24f4739ef06e,
- type: 3}
- BuffVFX: {fileID: 5068662467704735941, guid: 36d05c79df5e4a847934261885229a83,
- type: 3}
- - Id: 707001
- Icon: {fileID: 21300000, guid: b2c3ad93baec3614baf400a8ac26c2e9, type: 3}
+ - Type: 4
+ Icon: {fileID: 21300000, guid: 7eddbb706b01b0048bf1e2958013ba31, type: 3}
  CastingVFX: {fileID: 517495102393359299, guid: 271ea9a1d7475434393c24f4739ef06e,
  type: 3}
  BuffVFX: {fileID: 5068662467704735941, guid: 36d05c79df5e4a847934261885229a83,
  type: 3}
- - Id: 708000
- Icon: {fileID: 21300000, guid: 7eddbb706b01b0048bf1e2958013ba31, type: 3}
- CastingVFX: {fileID: 5986082888471747642, guid: d2dbf19aefdb0fd42b42c65c4d46301c,
- type: 3}
- BuffVFX: {fileID: 8503561367185379965, guid: 756b29425ce20a848ba8a8686b086942,
- type: 3}
- - Id: 708001
- Icon: {fileID: 21300000, guid: 7eddbb706b01b0048bf1e2958013ba31, type: 3}
- CastingVFX: {fileID: 5986082888471747642, guid: d2dbf19aefdb0fd42b42c65c4d46301c,
- type: 3}
- BuffVFX: {fileID: 8503561367185379965, guid: 756b29425ce20a848ba8a8686b086942,
- type: 3}
- - Id: 708002
+ - Type: 5
  Icon: {fileID: 21300000, guid: 7eddbb706b01b0048bf1e2958013ba31, type: 3}
  CastingVFX: {fileID: 5986082888471747642, guid: d2dbf19aefdb0fd42b42c65c4d46301c,
  type: 3}
  BuffVFX: {fileID: 8503561367185379965, guid: 756b29425ce20a848ba8a8686b086942,
  type: 3}
- - Id: 709000
- Icon: {fileID: 21300000, guid: 8bc7f399af0f54c4a83c9f407283e061, type: 3}
- CastingVFX: {fileID: 5372250249709306658, guid: e4aadf58488f469468b5b96d3b8bfa3b,
- type: 3}
- BuffVFX: {fileID: 1597932600176430146, guid: a812dcf0b3bedf84dbcd7d96f139d3c4,
- type: 3}
- - Id: 709001
- Icon: {fileID: 21300000, guid: 8bc7f399af0f54c4a83c9f407283e061, type: 3}
- CastingVFX: {fileID: 5372250249709306658, guid: e4aadf58488f469468b5b96d3b8bfa3b,
- type: 3}
- BuffVFX: {fileID: 1597932600176430146, guid: a812dcf0b3bedf84dbcd7d96f139d3c4,
- type: 3}
- - Id: 709002
- Icon: {fileID: 21300000, guid: 8bc7f399af0f54c4a83c9f407283e061, type: 3}
- CastingVFX: {fileID: 5372250249709306658, guid: e4aadf58488f469468b5b96d3b8bfa3b,
- type: 3}
- BuffVFX: {fileID: 1597932600176430146, guid: a812dcf0b3bedf84dbcd7d96f139d3c4,
- type: 3}
- BuffPosOverrideDataList:
- - Id: 708000
- IsCasting: 0
- Position: {x: 0, y: 0, z: 0}
- - Id: 708001
- IsCasting: 0
- Position: {x: 0, y: 0, z: 0}
- - Id: 708002
- IsCasting: 0
- Position: {x: 0, y: 0, z: 0}
+ <BuffPosOverrideDataList>k__BackingField:
  - Id: 709000
  IsCasting: 0
  Position: {x: 0, y: 1.1, z: 0}
@@ -277,9 +227,14 @@ MonoBehaviour:
  - Id: 709002
  IsCasting: 1
  Position: {x: 0, y: 1.1, z: 0}
- FallbackIcon: {fileID: 21300000, guid: 39d46914ec312d8469b6bb4740099db4, type: 3}
- FallbackCastingVFX: {fileID: 2327172370517842916, guid: 8e07f2c1b187b68428f03f03327fa497,
+ <ActionBuffPosOverrideDataList>k__BackingField:
+ - Type: 5
+ IsCasting: 0
+ Position: {x: 0, y: 0, z: 0}
+ <FallbackIcon>k__BackingField: {fileID: 21300000, guid: 39d46914ec312d8469b6bb4740099db4,
+ type: 3}
+ <FallbackCastingVFX>k__BackingField: {fileID: 2327172370517842916, guid: 8e07f2c1b187b68428f03f03327fa497,
  type: 3}
- FallbackBuffVFX: {fileID: 7756120939619406518, guid: 18a90bf73ccf9834db3f450f3e3b3278,
+ <FallbackBuffVFX>k__BackingField: {fileID: 7756120939619406518, guid: 18a90bf73ccf9834db3f450f3e3b3278,
  type: 3}
- FallbackPosition: {x: 0, y: 0.55, z: 0}
+ <FallbackPosition>k__BackingField: {x: 0, y: 0.55, z: 1}
diff --git a/nekoyume/Assets/_Scripts/Game/ScriptableObject/BuffVFXScriptableObject.cs b/nekoyume/Assets/_Scripts/Game/ScriptableObject/BuffVFXScriptableObject.cs
@@ -1,22 +1,25 @@
 using Nekoyume.Model.Stat;
 using System;
 using System.Collections.Generic;
+using Nekoyume.Model.Skill;
 using UnityEngine;
 
 namespace Nekoyume
 {
- [CreateAssetMenu(fileName = "BuffVFXData",
- menuName = "Scriptable Object/Buff VFX Data",
- order = int.MaxValue)]
+ [CreateAssetMenu(fileName = "BuffVFXData", menuName = "Scriptable Object/Buff VFX Data", order = int.MaxValue)]
  public class BuffVFXScriptableObject : ScriptableObject
  {
- public List<BuffVFXData> DataList;
- public List<BuffVFXOverrideData> OverrideDataList;
- public List<BuffPosOverrideData> BuffPosOverrideDataList;
- public Sprite FallbackIcon;
- public GameObject FallbackCastingVFX;
- public GameObject FallbackBuffVFX;
- public Vector3 FallbackPosition;
+ [field:SerializeField] public List<BuffVFXData> DataList { get; set; }
+ [field:SerializeField] public List<BuffVFXOverrideData> OverrideDataList { get; set; }
+ [field:SerializeField] public List<ActionBuffVFXOverrideData> ActionBuffVFXOverrideDataList { get; set; }
+
+ [field:SerializeField] public List<BuffPosOverrideData> BuffPosOverrideDataList { get; set; }
+ [field:SerializeField] public List<ActionBuffPosOverrideData> ActionBuffPosOverrideDataList { get; set; }
+
+ [field:SerializeField] public Sprite FallbackIcon { get; set; }
+ [field:SerializeField] public GameObject FallbackCastingVFX { get; set; }
+ [field:SerializeField] public GameObject FallbackBuffVFX { get; set; }
+ [field:SerializeField] public Vector3 FallbackPosition { get; set; }
 
  [Serializable]
  public class BuffVFXData
@@ -38,6 +41,15 @@ public class BuffVFXOverrideData
  public GameObject CastingVFX;
  public GameObject BuffVFX;
  }
+
+ [Serializable]
+ public class ActionBuffVFXOverrideData
+ {
+ public ActionBuffType Type;
+ public Sprite Icon;
+ public GameObject CastingVFX;
+ public GameObject BuffVFX;
+ }
 
  [Serializable]
  public class BuffPosOverrideData
@@ -46,5 +58,13 @@ public class BuffPosOverrideData
  public bool IsCasting;
  public Vector3 Position;
  }
+
+ [Serializable]
+ public class ActionBuffPosOverrideData
+ {
+ public ActionBuffType Type;
+ public bool IsCasting;
+ public Vector3 Position;
+ }
  }
 }