diff --git a/SVSim.BattleEngine/Engine/Wizard.Scripts.Network.Data.TaskData.Arena/Reward.cs b/SVSim.BattleEngine/Engine/Wizard.Scripts.Network.Data.TaskData.Arena/Reward.cs new file mode 100644 index 0000000..61bd381 --- /dev/null +++ b/SVSim.BattleEngine/Engine/Wizard.Scripts.Network.Data.TaskData.Arena/Reward.cs @@ -0,0 +1,28 @@ +using LitJson; + +namespace Wizard.Scripts.Network.Data.TaskData.Arena; + +public class Reward +{ + public int num; + + public int _effectId; + + public string _name; + + public UserGoods UserGoodsData { get; private set; } + + public Reward(JsonData data) + { + num = data["reward_number"].ToInt(); + if (data.Keys.Contains("effect_id")) + { + _effectId = data["effect_id"].ToInt(); + } + if (data.Keys.Contains("name")) + { + _name = data["name"].ToString(); + } + UserGoodsData = new UserGoods((UserGoods.Type)data["reward_type"].ToInt(), data["reward_detail_id"].ToLong()); + } +} diff --git a/SVSim.BattleEngine/Shim/External/LooseEnds.cs b/SVSim.BattleEngine/Shim/External/LooseEnds.cs index 681b912..854f30c 100644 --- a/SVSim.BattleEngine/Shim/External/LooseEnds.cs +++ b/SVSim.BattleEngine/Shim/External/LooseEnds.cs @@ -17,7 +17,6 @@ namespace Wizard.Scripts.Network.Data.TaskData.SpotCardExchange { internal class namespace Wizard.DeckSelect.FirstDisplayPageIndexGetter { internal class _ShimAnchor { } } namespace Wizary.StorySelectionWorld { internal class _ShimAnchor { } } namespace Wizard.Scripts.Network.Data.TableData.Arena.TwoPick { internal class _ShimAnchor { } } -namespace Wizard.Scripts.Network.Data.TaskData.Arena { public class Reward { } } // IManager: a Cute manager interface implemented by NetworkManager/ResourcesManager. namespace Cute { public interface IManager { } } diff --git a/SVSim.BattleEngine/Shim/External/ThirdParty.cs b/SVSim.BattleEngine/Shim/External/ThirdParty.cs index ddc707b..57ca103 100644 --- a/SVSim.BattleEngine/Shim/External/ThirdParty.cs +++ b/SVSim.BattleEngine/Shim/External/ThirdParty.cs @@ -9,8 +9,24 @@ namespace UnityEngine { public partial class Font : Object { } public enum Space { World, Self } - // NGUI's UIInputOnGUI reads Event.current (legacy IMGUI event). - public class Event { public static Event current => null; } + // NGUI's UIInputOnGUI / UIInput read the legacy IMGUI Event. + public enum EventType + { + MouseDown, MouseUp, MouseMove, MouseDrag, KeyDown, KeyUp, + ScrollWheel, Repaint, Layout, DragUpdated, DragPerform, DragExited, + Ignore, Used, ValidateCommand, ExecuteCommand, ContextClick, + MouseEnterWindow, MouseLeaveWindow, TouchDown, TouchUp, TouchMove, + TouchEnter, TouchLeave, TouchStationary + } + public class Event + { + public static Event current => null; + public EventType type; + public EventType rawType => type; + public KeyCode keyCode; + public EventModifiers modifiers; + public void Use() { } + } } namespace UnityEngine.Networking diff --git a/SVSim.BattleEngine/Shim/Generated/AttackTargetSelectTouchProcessor.g.cs b/SVSim.BattleEngine/Shim/Generated/AttackTargetSelectTouchProcessor.g.cs index aa78a94..159cde6 100644 --- a/SVSim.BattleEngine/Shim/Generated/AttackTargetSelectTouchProcessor.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/AttackTargetSelectTouchProcessor.g.cs @@ -21,7 +21,7 @@ public partial class AttackTargetSelectTouchProcessor private MouseState _mouseState; private Vector2 _positionStart; public EvolutionSimpleProcessor EvolutionProcessor { get; set; } - public AttackTargetSelectTouchProcessor(BattleManagerBase battleMgr, BattleCardBase touchCard, InputMgr inputMgr, Prediction prediction) { } + public AttackTargetSelectTouchProcessor(BattleManagerBase battleMgr, BattleCardBase touchCard, InputMgr inputMgr, Prediction prediction) : base(battleMgr, touchCard, inputMgr) { } public VfxBase Update(float dt, Camera camera) => global::Wizard.Battle.View.Vfx.NullVfx.GetInstance(); public static bool CheckAttackToUnitNotHasGuardError(BattleCardBase attackCard, BattleCardBase targetCard) => default!; private bool AttackTargetSelectable(BattleCardBase attackCard, BattleCardBase targetCard) => default!; diff --git a/SVSim.BattleEngine/Shim/Generated/AwakeSkillActivationVfx.g.cs b/SVSim.BattleEngine/Shim/Generated/AwakeSkillActivationVfx.g.cs index b5d8d4d..be6227f 100644 --- a/SVSim.BattleEngine/Shim/Generated/AwakeSkillActivationVfx.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/AwakeSkillActivationVfx.g.cs @@ -4,6 +4,6 @@ namespace Wizard.Battle.View.Vfx public partial class AwakeSkillActivationVfx { public const float WAIT_TIME = 0.2f; - public AwakeSkillActivationVfx(IBattleCardView cardView) { } + public AwakeSkillActivationVfx(IBattleCardView cardView) : base("stt_act_awake_1", "se_stt_act_awake_1", cardView.Transform, 0.2f) { } } } diff --git a/SVSim.BattleEngine/Shim/Generated/BerserkSkillActivationVfx.g.cs b/SVSim.BattleEngine/Shim/Generated/BerserkSkillActivationVfx.g.cs index 72a993a..ef00365 100644 --- a/SVSim.BattleEngine/Shim/Generated/BerserkSkillActivationVfx.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/BerserkSkillActivationVfx.g.cs @@ -3,6 +3,6 @@ namespace Wizard.Battle.View.Vfx { public partial class BerserkSkillActivationVfx { - public BerserkSkillActivationVfx(IBattleCardView cardView) { } + public BerserkSkillActivationVfx(IBattleCardView cardView) : base("stt_act_berserk_1", "se_stt_act_berserk_1", cardView.Transform, 0.3f) { } } } diff --git a/SVSim.BattleEngine/Shim/Generated/BishopInfomationUI.g.cs b/SVSim.BattleEngine/Shim/Generated/BishopInfomationUI.g.cs index 30de23f..d1818d3 100644 --- a/SVSim.BattleEngine/Shim/Generated/BishopInfomationUI.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/BishopInfomationUI.g.cs @@ -23,7 +23,7 @@ public partial class BishopInfomationUI private const string BISHOP_INFORMATION_UI_CHILD = "BishopSummonInfomation_"; private bool _isPressing; private List _loadingTokenInfoUIList; - public BishopInfomationUI(BattlePlayerBase battlePlayerBase, IBattlePlayerView battlePlayerView, IBattlePlayerView battleEnemyView, int orderCount, int totalInfoNum) { } + public BishopInfomationUI(BattlePlayerBase battlePlayerBase, IBattlePlayerView battlePlayerView, IBattlePlayerView battleEnemyView, int orderCount, int totalInfoNum) : base(battlePlayerBase, battlePlayerView, orderCount, totalInfoNum) { } public void ShowInfomation(bool playEffect) { } public void HideInfomation() { } public void HideOtherInfomation() { } diff --git a/SVSim.BattleEngine/Shim/Generated/ChoiceBraveTouchProcessor.g.cs b/SVSim.BattleEngine/Shim/Generated/ChoiceBraveTouchProcessor.g.cs index 11899df..211506f 100644 --- a/SVSim.BattleEngine/Shim/Generated/ChoiceBraveTouchProcessor.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/ChoiceBraveTouchProcessor.g.cs @@ -8,7 +8,7 @@ namespace Wizard.Battle.Touch public partial class ChoiceBraveTouchProcessor { public bool EnableCancel; - public ChoiceBraveTouchProcessor(BattleManagerBase battleMgr, BattleCardBase card, List choiceSkills) { } + public ChoiceBraveTouchProcessor(BattleManagerBase battleMgr, BattleCardBase card, List choiceSkills) : base(battleMgr, card, battleMgr.TouchControl.GetPrediction(), choiceSkills, isEvolve: false, isChoiceBrave: true) { } public VfxBase Update(float dt, Camera camera) => global::Wizard.Battle.View.Vfx.NullVfx.GetInstance(); public VfxWith End() => default!; } diff --git a/SVSim.BattleEngine/Shim/Generated/ClassCardVfxCreatorBase.g.cs b/SVSim.BattleEngine/Shim/Generated/ClassCardVfxCreatorBase.g.cs index 51f6e1c..f1e48b4 100644 --- a/SVSim.BattleEngine/Shim/Generated/ClassCardVfxCreatorBase.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/ClassCardVfxCreatorBase.g.cs @@ -17,7 +17,7 @@ public partial class ClassCardVfxCreatorBase private const string _leaderFrameMeshName = "Class"; private IStatusPanelControl StatusPanelControl { get; set; } private GameObject LeaderFrameMesh { get; set; } - protected ClassCardVfxCreatorBase(bool isPlayer, BattleCardBase card, ClassBattleCardViewBase battleCardView, IBattlePlayerView battleView, IBattleResourceMgr resourceMgr) { } + protected ClassCardVfxCreatorBase(bool isPlayer, BattleCardBase card, ClassBattleCardViewBase battleCardView, IBattlePlayerView battleView, IBattleResourceMgr resourceMgr) : base(isPlayer, card, battleCardView, resourceMgr) { } public VfxBase CreateDamage(int damage, int currentHealth, int maxHealth, int baseHealth, bool isReflectedDamage, bool isSkillDamage) => global::Wizard.Battle.View.Vfx.NullVfx.GetInstance(); public VfxBase CreateHealing(int healAmount, int currentHealth, int maxHealth, int baseHealth) => global::Wizard.Battle.View.Vfx.NullVfx.GetInstance(); public virtual VfxBase CreateCharacterPanelShake() => global::Wizard.Battle.View.Vfx.NullVfx.GetInstance(); diff --git a/SVSim.BattleEngine/Shim/Generated/DamageVfx.g.cs b/SVSim.BattleEngine/Shim/Generated/DamageVfx.g.cs index 4f6012f..3fa6130 100644 --- a/SVSim.BattleEngine/Shim/Generated/DamageVfx.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/DamageVfx.g.cs @@ -8,7 +8,7 @@ public partial class DamageVfx public const int STRONG_DAMAGE_VALUE = 7; private const float KNOCKBACK_AMOUNT = 0.1f; protected string _effectName { get; set; } - public DamageVfx(IBattleCardView targetCardView, int damage) { } + public DamageVfx(IBattleCardView targetCardView, int damage) : base(targetCardView) { } protected Vector3 GetKnockbackDirection(IBattleCardView targetCardView) => default!; protected void SetupNumberAnimation(int value) { } private IEnumerator KnockbackByDamage(IBattleCardView cardView, float targetLocalY, float moveTime) => default!; diff --git a/SVSim.BattleEngine/Shim/Generated/DefaultOpeningVfx.g.cs b/SVSim.BattleEngine/Shim/Generated/DefaultOpeningVfx.g.cs index de96fd9..f4eeffd 100644 --- a/SVSim.BattleEngine/Shim/Generated/DefaultOpeningVfx.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/DefaultOpeningVfx.g.cs @@ -3,7 +3,7 @@ namespace Wizard.Battle.View.Vfx { public partial class DefaultOpeningVfx { - public DefaultOpeningVfx(BackGroundBase backGround) { } + public DefaultOpeningVfx(BackGroundBase backGround) : base(backGround) { } public override void RegisterOpeningVfx(ClassBattleCardBase playerClass, ClassBattleCardBase enemyClass) { } } } diff --git a/SVSim.BattleEngine/Shim/Generated/DragonInfomationUI.g.cs b/SVSim.BattleEngine/Shim/Generated/DragonInfomationUI.g.cs index 11b373d..90b94ed 100644 --- a/SVSim.BattleEngine/Shim/Generated/DragonInfomationUI.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/DragonInfomationUI.g.cs @@ -10,7 +10,7 @@ public partial class DragonInfomationUI private UILabel _label1; private UILabel _label2; private GameObject _chainSprite; - public DragonInfomationUI(BattlePlayerBase battlePlayerBase, IBattlePlayerView battlePlayerView, int orderCount, int totalInfoNum) { } + public DragonInfomationUI(BattlePlayerBase battlePlayerBase, IBattlePlayerView battlePlayerView, int orderCount, int totalInfoNum) : base(battlePlayerBase, battlePlayerView, orderCount, totalInfoNum) { } public void ShowInfomation(bool playEffect) { } public void HideInfomation() { } protected void ShowAlert() { } diff --git a/SVSim.BattleEngine/Shim/Generated/ElfInfomationUI.g.cs b/SVSim.BattleEngine/Shim/Generated/ElfInfomationUI.g.cs index 7b6cca5..379defd 100644 --- a/SVSim.BattleEngine/Shim/Generated/ElfInfomationUI.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/ElfInfomationUI.g.cs @@ -8,7 +8,7 @@ namespace Wizard.Battle.UI public partial class ElfInfomationUI { private UILabel _playCountLabel; - public ElfInfomationUI(BattlePlayerBase battlePlayerBase, IBattlePlayerView battlePlayerView, int orderCount, int totalInfoNum) { } + public ElfInfomationUI(BattlePlayerBase battlePlayerBase, IBattlePlayerView battlePlayerView, int orderCount, int totalInfoNum) : base(battlePlayerBase, battlePlayerView, orderCount, totalInfoNum) { } public void ShowInfomation(bool playEffect) { } public void HideInfomation() { } protected void ShowAlert() { } diff --git a/SVSim.BattleEngine/Shim/Generated/EnemyClassCardVfxCreator.g.cs b/SVSim.BattleEngine/Shim/Generated/EnemyClassCardVfxCreator.g.cs index fcaeb68..3aa6ddb 100644 --- a/SVSim.BattleEngine/Shim/Generated/EnemyClassCardVfxCreator.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/EnemyClassCardVfxCreator.g.cs @@ -4,7 +4,7 @@ namespace Wizard.Battle.View.Vfx { public partial class EnemyClassCardVfxCreator { - public EnemyClassCardVfxCreator(ClassBattleCardViewBase battleCardView, BattleCardBase card, IBattlePlayerView battleView, IBattleResourceMgr resourceMgr) { } + public EnemyClassCardVfxCreator(ClassBattleCardViewBase battleCardView, BattleCardBase card, IBattlePlayerView battleView, IBattleResourceMgr resourceMgr) : base(isPlayer: false, card, battleCardView, battleView, resourceMgr) { } protected void SetupDamageVfxEvent(DamageVfx vfx) { } } } diff --git a/SVSim.BattleEngine/Shim/Generated/EnemyMulliganDrawVfx.g.cs b/SVSim.BattleEngine/Shim/Generated/EnemyMulliganDrawVfx.g.cs index 23f0d9b..b427ca4 100644 --- a/SVSim.BattleEngine/Shim/Generated/EnemyMulliganDrawVfx.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/EnemyMulliganDrawVfx.g.cs @@ -4,6 +4,6 @@ namespace Wizard.Battle.View.Vfx { public partial class EnemyMulliganDrawVfx { - public EnemyMulliganDrawVfx(IEnumerable drawCards, bool isHideCard) { } + public EnemyMulliganDrawVfx(IEnumerable drawCards, bool isHideCard) : base(drawCards) { } } } diff --git a/SVSim.BattleEngine/Shim/Generated/FieldCardVfxCreator.g.cs b/SVSim.BattleEngine/Shim/Generated/FieldCardVfxCreator.g.cs index 14c092e..6c1f83f 100644 --- a/SVSim.BattleEngine/Shim/Generated/FieldCardVfxCreator.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/FieldCardVfxCreator.g.cs @@ -4,7 +4,7 @@ namespace Wizard.Battle.View.Vfx { public partial class FieldCardVfxCreator { - public FieldCardVfxCreator(bool isPlayer, BattleCardBase card, IBattleCardView battleCardView, IBattleResourceMgr resourceMgr) { } + public FieldCardVfxCreator(bool isPlayer, BattleCardBase card, IBattleCardView battleCardView, IBattleResourceMgr resourceMgr) : base(isPlayer, card, battleCardView, resourceMgr) { } public VfxBase CreateDestroy(BattleCardBase.DeathTypeInformation deathTypes, BattlePlayerBase battlePlayerBase) => global::Wizard.Battle.View.Vfx.NullVfx.GetInstance(); public VfxBase CreateMaskCardInPlay() => global::Wizard.Battle.View.Vfx.NullVfx.GetInstance(); } diff --git a/SVSim.BattleEngine/Shim/Generated/NecromanceInfomationUI.g.cs b/SVSim.BattleEngine/Shim/Generated/NecromanceInfomationUI.g.cs index 148749a..f16b60d 100644 --- a/SVSim.BattleEngine/Shim/Generated/NecromanceInfomationUI.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/NecromanceInfomationUI.g.cs @@ -9,7 +9,7 @@ public partial class NecromanceInfomationUI { private UILabel _label1; private new BattlePlayerBase _player; - public NecromanceInfomationUI(BattlePlayerBase battlePlayerBase, IBattlePlayerView battlePlayerView, int orderCount, int totalInfoNum) { } + public NecromanceInfomationUI(BattlePlayerBase battlePlayerBase, IBattlePlayerView battlePlayerView, int orderCount, int totalInfoNum) : base(battlePlayerBase, battlePlayerView, orderCount, totalInfoNum) { } public void ShowInfomation(bool playEffect) { } public void HideInfomation() { } protected void ShowAlert() { } diff --git a/SVSim.BattleEngine/Shim/Generated/NecromanceSkillActivationVfx.g.cs b/SVSim.BattleEngine/Shim/Generated/NecromanceSkillActivationVfx.g.cs index 7b7ed94..533ddd1 100644 --- a/SVSim.BattleEngine/Shim/Generated/NecromanceSkillActivationVfx.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/NecromanceSkillActivationVfx.g.cs @@ -4,6 +4,6 @@ namespace Wizard.Battle.View.Vfx { public partial class NecromanceSkillActivationVfx { - public NecromanceSkillActivationVfx(IBattleCardView cardView) { } + public NecromanceSkillActivationVfx(IBattleCardView cardView) : base("stt_act_necromance_1", "se_stt_act_necromance_1", () => new Vector3(cardView.GameObject.transform.position.x, cardView.GameObject.transform.position.y, cardView.CardWrapObject.transform.position.z), 0.5f) { } } } diff --git a/SVSim.BattleEngine/Shim/Generated/NemesisInfomationUI.g.cs b/SVSim.BattleEngine/Shim/Generated/NemesisInfomationUI.g.cs index 331d316..658506a 100644 --- a/SVSim.BattleEngine/Shim/Generated/NemesisInfomationUI.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/NemesisInfomationUI.g.cs @@ -11,7 +11,7 @@ public partial class NemesisInfomationUI private int _classLife; private GameObject _resonatePanel; private GameObject _notResonatePanel; - public NemesisInfomationUI(BattlePlayerBase player, IBattlePlayerView battlePlayerView, int orderCount, int totalInfoNum) { } + public NemesisInfomationUI(BattlePlayerBase player, IBattlePlayerView battlePlayerView, int orderCount, int totalInfoNum) : base(player, battlePlayerView, orderCount, totalInfoNum) { } public void ShowInfomation(bool playEffect) { } public void HideInfomation() { } protected void ShowAlert() { } diff --git a/SVSim.BattleEngine/Shim/Generated/NullEnemyBattleView.g.cs b/SVSim.BattleEngine/Shim/Generated/NullEnemyBattleView.g.cs index 2679531..f9d52fe 100644 --- a/SVSim.BattleEngine/Shim/Generated/NullEnemyBattleView.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/NullEnemyBattleView.g.cs @@ -6,7 +6,7 @@ namespace Wizard.Battle.View { public partial class NullEnemyBattleView { - public NullEnemyBattleView() { } + public NullEnemyBattleView() : base(null) { } public VfxBase StartShowSelect(BattleCardBase actCard, SkillBase skill, IEnumerable selectableCards, bool isEvol) => global::Wizard.Battle.View.Vfx.NullVfx.GetInstance(); public VfxBase PrepareCardsForAttackSequenceVfx(IBattleCardView attackInitiator, IBattleCardView attackTarget) => global::Wizard.Battle.View.Vfx.NullVfx.GetInstance(); protected HandViewBase CreateHandView(GameObject gameObject) => default!; diff --git a/SVSim.BattleEngine/Shim/Generated/NullFieldBattleCardView.g.cs b/SVSim.BattleEngine/Shim/Generated/NullFieldBattleCardView.g.cs index 3f768fc..0f319e8 100644 --- a/SVSim.BattleEngine/Shim/Generated/NullFieldBattleCardView.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/NullFieldBattleCardView.g.cs @@ -7,7 +7,7 @@ namespace Wizard.Battle.View public partial class NullFieldBattleCardView { public GameObject GameObject { get; set; } - public NullFieldBattleCardView(BuildInfo buildInfo) { } + public NullFieldBattleCardView(BuildInfo buildInfo) : base(buildInfo) { } public void UpdateMovability() { } public VfxBase LoadResource() => global::Wizard.Battle.View.Vfx.NullVfx.GetInstance(); public VfxBase GetResourcePathes(List resourceInfos) => global::Wizard.Battle.View.Vfx.NullVfx.GetInstance(); diff --git a/SVSim.BattleEngine/Shim/Generated/NullPlayerBattleView.g.cs b/SVSim.BattleEngine/Shim/Generated/NullPlayerBattleView.g.cs index 6887813..da62439 100644 --- a/SVSim.BattleEngine/Shim/Generated/NullPlayerBattleView.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/NullPlayerBattleView.g.cs @@ -6,7 +6,7 @@ namespace Wizard.Battle.View { public partial class NullPlayerBattleView { - public NullPlayerBattleView() { } + public NullPlayerBattleView() : base(null) { } public VfxBase StartShowSelect(BattleCardBase actCard, SkillBase skill, IEnumerable selectableCards, bool isEvol) => global::Wizard.Battle.View.Vfx.NullVfx.GetInstance(); public void ShowTurnEndPulseEffect() { } public VfxBase HideTurnEndPulseEffect() => global::Wizard.Battle.View.Vfx.NullVfx.GetInstance(); diff --git a/SVSim.BattleEngine/Shim/Generated/PlayEffectAndSeVfx.g.cs b/SVSim.BattleEngine/Shim/Generated/PlayEffectAndSeVfx.g.cs index 59a9e50..2aab2df 100644 --- a/SVSim.BattleEngine/Shim/Generated/PlayEffectAndSeVfx.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/PlayEffectAndSeVfx.g.cs @@ -7,9 +7,9 @@ namespace Wizard.Battle.View.Vfx public partial class PlayEffectAndSeVfx { public int NowStep { get; set; } - public PlayEffectAndSeVfx(Func getLoadedEffectObject, Transform baseTransform, bool isFollow = false, bool isFollowPosition = false, bool isFollowAll = false) { } - public PlayEffectAndSeVfx(Func getLoadedEffectObject, Vector3 position, bool isFollow = false, bool isFollowPosition = false) { } - public PlayEffectAndSeVfx(Func getLoadedEffectObject, Func getPosition, bool isFollow = false, bool isFollowPosition = false, int layer = -1) { } + public PlayEffectAndSeVfx(Func getLoadedEffectObject, Transform baseTransform, bool isFollow = false, bool isFollowPosition = false, bool isFollowAll = false) : base(getLoadedEffectObject, baseTransform, isFollow, isFollowPosition, isFollowAll) { } + public PlayEffectAndSeVfx(Func getLoadedEffectObject, Vector3 position, bool isFollow = false, bool isFollowPosition = false) : base(getLoadedEffectObject, position, isFollow, isFollowPosition) { } + public PlayEffectAndSeVfx(Func getLoadedEffectObject, Func getPosition, bool isFollow = false, bool isFollowPosition = false, int layer = -1) : base(getLoadedEffectObject, getPosition, isFollow, isFollowPosition, layer) { } public void Play() { } } } diff --git a/SVSim.BattleEngine/Shim/Generated/PlayerClassCardVfxCreator.g.cs b/SVSim.BattleEngine/Shim/Generated/PlayerClassCardVfxCreator.g.cs index fb567b7..1737141 100644 --- a/SVSim.BattleEngine/Shim/Generated/PlayerClassCardVfxCreator.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/PlayerClassCardVfxCreator.g.cs @@ -4,6 +4,6 @@ namespace Wizard.Battle.View.Vfx { public partial class PlayerClassCardVfxCreator { - public PlayerClassCardVfxCreator(ClassBattleCardViewBase battleCardView, BattleCardBase card, IBattlePlayerView battleView, IBattleResourceMgr resourceMgr) { } + public PlayerClassCardVfxCreator(ClassBattleCardViewBase battleCardView, BattleCardBase card, IBattlePlayerView battleView, IBattleResourceMgr resourceMgr) : base(isPlayer: true, card, battleCardView, battleView, resourceMgr) { } } } diff --git a/SVSim.BattleEngine/Shim/Generated/RoyalInfomationUI.g.cs b/SVSim.BattleEngine/Shim/Generated/RoyalInfomationUI.g.cs index 09827cf..2f24eca 100644 --- a/SVSim.BattleEngine/Shim/Generated/RoyalInfomationUI.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/RoyalInfomationUI.g.cs @@ -22,7 +22,7 @@ public partial class RoyalInfomationUI private static readonly Vector3 ICON_OFFSET_SMALL; private static readonly Vector3 ICON_OFFSET_IN_HAND; private new BattlePlayerBase _player; - public RoyalInfomationUI(BattlePlayerBase battlePlayerBase, IBattlePlayerView battlePlayerView, int orderCount, int totalInfoNum) { } + public RoyalInfomationUI(BattlePlayerBase battlePlayerBase, IBattlePlayerView battlePlayerView, int orderCount, int totalInfoNum) : base(battlePlayerBase, battlePlayerView, orderCount, totalInfoNum) { } public void ShowInfomation(bool playEffect) { } public void HideInfomation() { } public void HideAllInfomation() { } diff --git a/SVSim.BattleEngine/Shim/Generated/SpellCardVfxCreator.g.cs b/SVSim.BattleEngine/Shim/Generated/SpellCardVfxCreator.g.cs index c5d0698..4a635ec 100644 --- a/SVSim.BattleEngine/Shim/Generated/SpellCardVfxCreator.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/SpellCardVfxCreator.g.cs @@ -6,7 +6,7 @@ namespace Wizard.Battle.View.Vfx public partial class SpellCardVfxCreator { private Func isActionCard; - public SpellCardVfxCreator(bool isPlayer, BattleCardBase card, IBattleCardView battleCardView, IBattleResourceMgr resourceMgr, Func isActionCard) { } + public SpellCardVfxCreator(bool isPlayer, BattleCardBase card, IBattleCardView battleCardView, IBattleResourceMgr resourceMgr, Func isActionCard) : base(isPlayer, card, battleCardView, resourceMgr) { } public VfxBase CreatePick() => global::Wizard.Battle.View.Vfx.NullVfx.GetInstance(); public VfxBase CreateDestroy(BattleCardBase.DeathTypeInformation deathTypes, BattlePlayerBase battlePlayerBase) => global::Wizard.Battle.View.Vfx.NullVfx.GetInstance(); public VfxBase CreateDestroyHand(BattleCardBase.DeathTypeInformation deathTypes, BattlePlayerBase battlePlayerBase) => global::Wizard.Battle.View.Vfx.NullVfx.GetInstance(); diff --git a/SVSim.BattleEngine/Shim/Generated/StartPlaySpellVfx.g.cs b/SVSim.BattleEngine/Shim/Generated/StartPlaySpellVfx.g.cs index 398e8e2..1072ae3 100644 --- a/SVSim.BattleEngine/Shim/Generated/StartPlaySpellVfx.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/StartPlaySpellVfx.g.cs @@ -3,6 +3,6 @@ namespace Wizard.Battle.View.Vfx { public partial class StartPlaySpellVfx { - public StartPlaySpellVfx(IBattleCardView cardView, BattleCardBase card) { } + public StartPlaySpellVfx(IBattleCardView cardView, BattleCardBase card) : base(cardView, card) { } } } diff --git a/SVSim.BattleEngine/Shim/Generated/StartSummonCardVfx.g.cs b/SVSim.BattleEngine/Shim/Generated/StartSummonCardVfx.g.cs index 86131c5..d2021a5 100644 --- a/SVSim.BattleEngine/Shim/Generated/StartSummonCardVfx.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/StartSummonCardVfx.g.cs @@ -8,6 +8,6 @@ public partial class StartSummonCardVfx private new readonly BattleCardBase _card; private new readonly IBattleCardView _cardView; private new WaitUntilCardIsQueuedToBePlayedVfx waitUntilCardIsInPlayQueueVfx; - public StartSummonCardVfx(IBattleCardView cardView, IBattleResourceMgr resourceMgr, BattleCardBase card, NetworkBattleReceiver.CardInfo cardInfo = null) { } + public StartSummonCardVfx(IBattleCardView cardView, IBattleResourceMgr resourceMgr, BattleCardBase card, NetworkBattleReceiver.CardInfo cardInfo = null) : base(cardView, card) { } } } diff --git a/SVSim.BattleEngine/Shim/Generated/TutorialBattleMgrBase.g.cs b/SVSim.BattleEngine/Shim/Generated/TutorialBattleMgrBase.g.cs index de0fd37..2933cab 100644 --- a/SVSim.BattleEngine/Shim/Generated/TutorialBattleMgrBase.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/TutorialBattleMgrBase.g.cs @@ -52,7 +52,7 @@ public partial class TutorialBattleMgrBase protected int EnemyCharaID { get; set; } protected int EnemyClassID { get; set; } public int GetMaxDeckCount(bool isSelf) => default!; - public TutorialBattleMgrBase(IBattleMgrContentsCreator contentsCreator) { } + public TutorialBattleMgrBase(IBattleMgrContentsCreator contentsCreator) : base(contentsCreator) { } protected virtual TouchControl CreateTouchControl() => default!; public IInnerOptionsBuilder CreateEnemyInnerOptionsBuilder() => default!; public void StartOpening(int FirstAttack) { } diff --git a/SVSim.BattleEngine/Shim/Generated/UnitCardVfxCreator.g.cs b/SVSim.BattleEngine/Shim/Generated/UnitCardVfxCreator.g.cs index f04aff3..9de9027 100644 --- a/SVSim.BattleEngine/Shim/Generated/UnitCardVfxCreator.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/UnitCardVfxCreator.g.cs @@ -4,7 +4,7 @@ namespace Wizard.Battle.View.Vfx { public partial class UnitCardVfxCreator { - public UnitCardVfxCreator(bool isPlayer, BattleCardBase card, IBattleCardView battleCardView, IBattleResourceMgr resourceMgr) { } + public UnitCardVfxCreator(bool isPlayer, BattleCardBase card, IBattleCardView battleCardView, IBattleResourceMgr resourceMgr) : base(isPlayer, card, battleCardView, resourceMgr) { } public VfxBase CreateDestroy(BattleCardBase.DeathTypeInformation deathTypes, BattlePlayerBase battlePlayerBase) => global::Wizard.Battle.View.Vfx.NullVfx.GetInstance(); public VfxBase CreateDamage(int damage, int currentHealth, int maxHealth, int baseHealth, bool isReflectedDamage, bool isSkillDamage) => global::Wizard.Battle.View.Vfx.NullVfx.GetInstance(); public VfxBase CreateMaskCardInPlay() => global::Wizard.Battle.View.Vfx.NullVfx.GetInstance(); diff --git a/SVSim.BattleEngine/Shim/Generated/VampireInfomationUI.g.cs b/SVSim.BattleEngine/Shim/Generated/VampireInfomationUI.g.cs index c693d0a..c897bd7 100644 --- a/SVSim.BattleEngine/Shim/Generated/VampireInfomationUI.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/VampireInfomationUI.g.cs @@ -16,7 +16,7 @@ public partial class VampireInfomationUI public void HideInfomation() { } protected void ShowAlert() { } protected void HideAlert() { } - public VampireInfomationUI(BattlePlayerBase player, IBattlePlayerView battlePlayerView, int orderCount, int totalInfoNum) { } + public VampireInfomationUI(BattlePlayerBase player, IBattlePlayerView battlePlayerView, int orderCount, int totalInfoNum) : base(player, battlePlayerView, orderCount, totalInfoNum) { } public VfxBase LoadResources(Transform parent, bool isPlayer) => global::Wizard.Battle.View.Vfx.NullVfx.GetInstance(); public void SetUpEvent(BattlePlayerBase player) { } public void Recovery() { } diff --git a/SVSim.BattleEngine/Shim/Generated/WaitLoadEffectAndSetSeVfx.g.cs b/SVSim.BattleEngine/Shim/Generated/WaitLoadEffectAndSetSeVfx.g.cs index c913f4d..646f218 100644 --- a/SVSim.BattleEngine/Shim/Generated/WaitLoadEffectAndSetSeVfx.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/WaitLoadEffectAndSetSeVfx.g.cs @@ -7,6 +7,6 @@ namespace Wizard.Battle.View.Vfx { public partial class WaitLoadEffectAndSetSeVfx { - public WaitLoadEffectAndSetSeVfx(string fileName, string criSeName, Action setEffectObject) { } + public WaitLoadEffectAndSetSeVfx(string fileName, string criSeName, Action setEffectObject) : base(fileName, delegate(GameObject effectObject) { if (!BattleManagerBase.GetIns().IsRecovery && !GameMgr.GetIns().GetSoundMgr().IsRejectNewSound()) { if (effectObject != null && !string.IsNullOrEmpty(criSeName)) { effectObject.AddComponent().cueName = criSeName; } setEffectObject.Call(effectObject); } }) { } } } diff --git a/SVSim.BattleEngine/Shim/Generated/WaitLoadVoiceResourceVfx.g.cs b/SVSim.BattleEngine/Shim/Generated/WaitLoadVoiceResourceVfx.g.cs index a55da10..5df0450 100644 --- a/SVSim.BattleEngine/Shim/Generated/WaitLoadVoiceResourceVfx.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/WaitLoadVoiceResourceVfx.g.cs @@ -6,7 +6,7 @@ public partial class WaitLoadVoiceResourceVfx { private readonly IBattleCardView m_view; private readonly string m_cueName; - public WaitLoadVoiceResourceVfx(IBattleCardView view, string voiceFileName) { } + public WaitLoadVoiceResourceVfx(IBattleCardView view, string voiceFileName) : base("v/vo_" + voiceFileName + ".acb") { } public void Update(float dt, List effectVfxList) { } } } diff --git a/SVSim.BattleEngine/Shim/Generated/WitchInfomationUI.g.cs b/SVSim.BattleEngine/Shim/Generated/WitchInfomationUI.g.cs index 0a3409d..d7ebb73 100644 --- a/SVSim.BattleEngine/Shim/Generated/WitchInfomationUI.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/WitchInfomationUI.g.cs @@ -11,7 +11,7 @@ public partial class WitchInfomationUI private new BattlePlayerBase _player; private readonly Vector3 SPELL_CHARGE_COUNT_POSITION; private bool _isPlayer; - public WitchInfomationUI(BattlePlayerBase battlePlayerBase, IBattlePlayerView battlePlayerView, int orderCount, int totalInfoNum) { } + public WitchInfomationUI(BattlePlayerBase battlePlayerBase, IBattlePlayerView battlePlayerView, int orderCount, int totalInfoNum) : base(battlePlayerBase, battlePlayerView, orderCount, totalInfoNum) { } public void ShowInfomation(bool playEffect) { } public void HideInfomation() { } public void HideOtherInfomation() { }