From 22ef593593b36fd565d1cecf6a89db9018197700 Mon Sep 17 00:00:00 2001 From: gamer147 Date: Fri, 3 Jul 2026 21:52:04 -0400 Subject: [PATCH] cull(engine-cleanup): pass-8 phase-2 cascade round 2 after MyPageItemBattle stub --- .../Engine/CardPanelMaintenancePlate.cs | 6 - SVSim.BattleEngine/Engine/DeckData.cs | 13 -- SVSim.BattleEngine/Engine/DeckDecisionUI.cs | 138 ------------------ SVSim.BattleEngine/Engine/FadeUtility.cs | 33 ----- .../Engine/InviteFriendBattle.cs | 5 - SVSim.BattleEngine/Engine/MyPageCardPanel.cs | 5 - .../Engine/MyPageCardPanelAnimation.cs | 46 ------ SVSim.BattleEngine/Engine/MyPageItem.cs | 17 --- SVSim.BattleEngine/Engine/MyPageItemBattle.cs | 11 -- SVSim.BattleEngine/Engine/UIBase.cs | 9 -- SVSim.BattleEngine/Engine/UICardList.cs | 27 ---- SVSim.BattleEngine/Engine/UserFriend.cs | 38 ----- .../Wizard.Lottery/LotteryLoadTaskData.cs | 34 ----- .../Engine/Wizard/AvatarBattleAllInfo.cs | 16 -- .../Engine/Wizard/CompleteDeckDecideDialog.cs | 56 ------- .../Engine/Wizard/DeckSelectUI.cs | 60 -------- .../Engine/Wizard/FormatChangeUI.cs | 7 - ...FreeAndRankMatchDeckSelectConfirmDialog.cs | 9 -- .../Wizard/InCompleteDeckDecideDialog.cs | 115 --------------- .../Engine/Wizard/MyPageDetail.cs | 7 - .../Engine/Wizard/PlayerStaticData.cs | 12 -- .../Wizard/RoomNonPossessionCardCampaign.cs | 3 - SVSim.BattleEngine/Engine/iTween.cs | 96 ------------ .../Shim/Generated/RoomBase.g.cs | 2 - .../Shim/Generated/UIManager.g.cs | 3 - .../Shim/UnityEngine/UnityShim.cs | 2 +- 26 files changed, 1 insertion(+), 769 deletions(-) delete mode 100644 SVSim.BattleEngine/Engine/DeckDecisionUI.cs delete mode 100644 SVSim.BattleEngine/Engine/InviteFriendBattle.cs delete mode 100644 SVSim.BattleEngine/Engine/MyPageItemBattle.cs delete mode 100644 SVSim.BattleEngine/Engine/UserFriend.cs delete mode 100644 SVSim.BattleEngine/Engine/Wizard.Lottery/LotteryLoadTaskData.cs delete mode 100644 SVSim.BattleEngine/Engine/Wizard/CompleteDeckDecideDialog.cs delete mode 100644 SVSim.BattleEngine/Engine/Wizard/InCompleteDeckDecideDialog.cs diff --git a/SVSim.BattleEngine/Engine/CardPanelMaintenancePlate.cs b/SVSim.BattleEngine/Engine/CardPanelMaintenancePlate.cs index 294fbc46..a06824ff 100644 --- a/SVSim.BattleEngine/Engine/CardPanelMaintenancePlate.cs +++ b/SVSim.BattleEngine/Engine/CardPanelMaintenancePlate.cs @@ -7,10 +7,4 @@ public class CardPanelMaintenancePlate : MonoBehaviour [SerializeField] private UILabel _label; - - public void SetDepth(int depth) - { - _sprite.depth = depth; - _label.depth = depth + 1; - } } diff --git a/SVSim.BattleEngine/Engine/DeckData.cs b/SVSim.BattleEngine/Engine/DeckData.cs index 51134235..0ff86881 100644 --- a/SVSim.BattleEngine/Engine/DeckData.cs +++ b/SVSim.BattleEngine/Engine/DeckData.cs @@ -62,19 +62,6 @@ public class DeckData public string RotationId { get; set; } - public bool IsRentalDeck - { - get - { - DeckAttributeType deckAttributeType = DeckAttributeType; - if ((uint)(deckAttributeType - 2) <= 3u) - { - return true; - } - return false; - } - } - public DeckData(Format format = Format.Max, DeckAttributeType deckAttributeType = DeckAttributeType.Invalid) { _skinId = 0; diff --git a/SVSim.BattleEngine/Engine/DeckDecisionUI.cs b/SVSim.BattleEngine/Engine/DeckDecisionUI.cs deleted file mode 100644 index d762fd9c..00000000 --- a/SVSim.BattleEngine/Engine/DeckDecisionUI.cs +++ /dev/null @@ -1,138 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using Cute; -using UnityEngine; -using Wizard; -using Wizard.Dialog.Setting; -using Wizard.RoomMatch; - -public class DeckDecisionUI : MonoBehaviour -{ - - [SerializeField] - private GameObject _uiCardListPrefab; - - [SerializeField] - private GameObject _cardDetailPrefab; - - protected List _loadCardAssetList; - - protected static int DetailLayer; - - private ConventionDeckList conventionDeckList; - - public bool IsCanShowQRCode = true; - - private IFormatBehavior _formatBehavior; - - public DeckData DeckData { get; private set; } - - public string DeckName { get; set; } - - public Action CardListCustomize { get; set; } - - protected CardDetailUI CardDetail { get; set; } - - protected UICardList UiCardList { get; set; } - - public Action CardDetailCustomize { get; set; } - - public bool IsShowSimpleStageOption { get; set; } - - public void SetDeckData(DeckData deck, ConventionDeckList deckList) - { - DeckData = deck; - conventionDeckList = deckList; - _formatBehavior = FormatBehaviorManager.Create(deck.Format, deckList); - } - - public void OnClickCreateCardList() - { - CheckTimeSlipRotationPeriodTask task = new CheckTimeSlipRotationPeriodTask(); - StartCoroutine(Toolbox.NetworkManager.Connect(task, delegate - { - UIManager.GetInstance().createInSceneCenterLoading(); - if (CardDetail == null) - { - CardDetail = UnityEngine.Object.Instantiate(_cardDetailPrefab).GetComponent(); - CardDetail.transform.parent = base.transform.parent.parent; - CardDetail.transform.localPosition = new Vector3(0f, 0f, -300f); - CardDetail.transform.localScale = Vector3.one; - CardDetail.Initialize(DetailLayer, _formatBehavior.CardMasterId, _formatBehavior); - CardDetail.IsShowFlavorTextButton = true; - CardDetail.IsShowVoiceButton = true; - CardDetail.IsShowEvolutionButton = true; - CardDetail.IsCardTextDialogLayerSet = false; - CardDetailCustomize.Call(CardDetail); - UIManager.GetInstance().SetLayerRecursive(CardDetail.gameObject.transform, DetailLayer); - } - if (UiCardList == null) - { - bool in_DetailCameraUse = false; - UiCardList = UnityEngine.Object.Instantiate(_uiCardListPrefab).GetComponent(); - UIManager.ViewScene currentScene = UIManager.GetInstance().GetCurrentScene(); - if (currentScene != UIManager.ViewScene.MyPage && currentScene != UIManager.ViewScene.QuestSelectionPage) - { - in_DetailCameraUse = true; - } - else - { - UiCardList.SetCamera(UIManager.GetInstance().MyPageUICameraObj.GetComponent()); - } - int in_MaxCardNum = 40; - if (DeckData.Format == Format.Windfall) - { - in_MaxCardNum = 35; - } - UiCardList.Init(base.transform.parent.parent.gameObject, CardDetail, null, DeckViewClose, LayerMask.LayerToName(DetailLayer), in_DetailCameraUse, null, in_MaxCardNum); - UiCardList.SetActive(in_Active: false); - } - CardListCustomize.Call(UiCardList); - CardDetail.gameObject.SetActive(value: false); - StartCoroutine(CardLoadCoroutine(DeckData)); - })); - } - - private IEnumerator CardLoadCoroutine(DeckData inDeckData) - { - RoomBase.StartDialogLoading(); - IList cardIdList = inDeckData.GetCardIdList(); - inDeckData.GetDeckName(); - UiCardList.RemoveData(); - UiCardList._loadingEnd = false; - _loadCardAssetList = UiCardList.GetLoadFileList(cardIdList as List); - yield return StartCoroutine(Toolbox.ResourcesManager.LoadAssetGroupAsync(_loadCardAssetList, null)); - UiCardList.SetDeck(inDeckData, conventionDeckList); - yield return null; - DialogSetDisp(inDisp: false); - if (IsCanShowQRCode) - { - UiCardList.SetQRSmallTexture(); - } - UiCardList.SetActive(in_Active: true); - UIManager.GetInstance().closeInSceneCenterLoading(); - UiCardList._loadingEnd = true; - RoomBase.FinishDiloagLoading(); - } - - protected void DeckViewClose() - { - UiCardList.SetActive(in_Active: false); - if (_loadCardAssetList != null) - { - Toolbox.ResourcesManager.RemoveAssetGroup(_loadCardAssetList); - _loadCardAssetList = null; - } - DialogSetDisp(inDisp: true); - UnityEngine.Object.Destroy(UiCardList.gameObject); - UnityEngine.Object.Destroy(CardDetail.gameObject); - UiCardList = null; - CardDetail = null; - } - - protected void DialogSetDisp(bool inDisp) - { - UIManager.GetInstance().ActiveChangeDialogAll(inDisp); - } -} diff --git a/SVSim.BattleEngine/Engine/FadeUtility.cs b/SVSim.BattleEngine/Engine/FadeUtility.cs index bf820d8a..ba3dac21 100644 --- a/SVSim.BattleEngine/Engine/FadeUtility.cs +++ b/SVSim.BattleEngine/Engine/FadeUtility.cs @@ -6,39 +6,6 @@ public class FadeUtility { private static readonly AnimationCurve FADE_ALPHA_ANIM_CURVE = AnimationCurve.Linear(0f, 0f, 1f, 1f); - private static void FadeOut(GameObject obj, Action onFinish) - { - UIButtonColor button = obj.GetComponent(); - float originalDuration = 0f; - if (button != null) - { - originalDuration = button.duration; - button.duration = 0f; - } - TweenColor component = obj.GetComponent(); - if (component != null) - { - component.enabled = false; - } - FadeOutObject(obj.AddMissingComponent(), delegate - { - if (button != null) - { - button.duration = originalDuration; - } - onFinish(); - }); - } - - public static void FadeFinish(GameObject obj) - { - UITweenAlpha component = obj.GetComponent(); - if (!(component == null)) - { - component.End(); - } - } - public static void FadeOutObject(UITweenAlpha tweenAlpha, Action onFinish = null) { if (!(tweenAlpha == null)) diff --git a/SVSim.BattleEngine/Engine/InviteFriendBattle.cs b/SVSim.BattleEngine/Engine/InviteFriendBattle.cs deleted file mode 100644 index 83dfc53a..00000000 --- a/SVSim.BattleEngine/Engine/InviteFriendBattle.cs +++ /dev/null @@ -1,5 +0,0 @@ -using Wizard; - -public class InviteFriendBattle : HeaderData -{ -} diff --git a/SVSim.BattleEngine/Engine/MyPageCardPanel.cs b/SVSim.BattleEngine/Engine/MyPageCardPanel.cs index 049628ce..3320a509 100644 --- a/SVSim.BattleEngine/Engine/MyPageCardPanel.cs +++ b/SVSim.BattleEngine/Engine/MyPageCardPanel.cs @@ -99,9 +99,4 @@ public class MyPageCardPanel : MonoBehaviour _savedPosition = base.transform.localPosition; return _savedPosition.Value; } - - public void RestoreSavedPosition() - { - base.transform.localPosition = _savedPosition.Value; - } } diff --git a/SVSim.BattleEngine/Engine/MyPageCardPanelAnimation.cs b/SVSim.BattleEngine/Engine/MyPageCardPanelAnimation.cs index 9f811ff6..1a727f57 100644 --- a/SVSim.BattleEngine/Engine/MyPageCardPanelAnimation.cs +++ b/SVSim.BattleEngine/Engine/MyPageCardPanelAnimation.cs @@ -8,12 +8,8 @@ public class MyPageCardPanelAnimation : MonoBehaviour End } - private float ClickRotateTimeTotal; - private float ClickRotateTime; - private float ClickIndex; - private bool _isCutCardMotion; private State _state = State.End; @@ -30,18 +26,6 @@ public class MyPageCardPanelAnimation : MonoBehaviour private Vector3[] _defaultPosition; - public bool IsCardMoving - { - get - { - if (!(ClickRotateTime > 0f)) - { - return _state != State.End; - } - return true; - } - } - public void SetCardPanelList(GameObject[] list) { _cardPanel = new GameObject[list.Length]; @@ -78,21 +62,6 @@ public class MyPageCardPanelAnimation : MonoBehaviour } } - public void StartCardPanelAnimation(bool isCutCardMotion) - { - _state = State.Start; - _timer = 0f; - _isCutCardMotion = isCutCardMotion; - for (int i = 0; i < _cardPanel.Length; i++) - { - GameObject obj = _cardPanel[i]; - Vector3 localPosition = obj.transform.transform.localPosition; - localPosition.x = -22100f; - obj.transform.transform.localPosition = localPosition; - iTween.Stop(obj); - } - } - private void ColorChange(bool isForceOpacity = false) { if (_panel == null) @@ -118,21 +87,6 @@ public class MyPageCardPanelAnimation : MonoBehaviour } } - public void StopMove() - { - _state = State.End; - for (int i = 0; i < _cardPanel.Length; i++) - { - iTween.Stop(_cardPanel[i]); - if (_panel != null) - { - _panel[i].alpha = 1f; - } - } - InitRandom(); - ColorChange(isForceOpacity: true); - } - private void InitRandom() { _randomDir = new int[_cardPanel.Length]; diff --git a/SVSim.BattleEngine/Engine/MyPageItem.cs b/SVSim.BattleEngine/Engine/MyPageItem.cs index d0162ba9..12ecb58b 100644 --- a/SVSim.BattleEngine/Engine/MyPageItem.cs +++ b/SVSim.BattleEngine/Engine/MyPageItem.cs @@ -14,8 +14,6 @@ public class MyPageItem : MonoBehaviour private MyPageMenu _parent; - private Dictionary _defaultPosition = new Dictionary(); - private bool cardAnimationInitialized; protected MyPageCardPanelAnimation CardAnimation => _cardMove; @@ -93,21 +91,6 @@ public class MyPageItem : MonoBehaviour } } - protected void TweenMoveTo(GameObject obj, float x) - { - RemoveITween(obj); - iTween.MoveTo(obj, iTween.Hash("x", x, "time", 0.3f, "delay", 0.1f, "islocal", true, "easetype", iTween.EaseType.easeOutExpo)); - } - - protected void FadeOutCardPanel(MyPageCardPanel panel, Action onFinish) - { - panel.EffectActive = false; - FadeOutObject(panel.gameObject.AddMissingComponent(), delegate - { - onFinish.Call(); - }); - } - protected static void FadeOutObject(UITweenAlpha tweenAlpha, Action onFinish = null) { tweenAlpha.End(); diff --git a/SVSim.BattleEngine/Engine/MyPageItemBattle.cs b/SVSim.BattleEngine/Engine/MyPageItemBattle.cs deleted file mode 100644 index f39fdb5d..00000000 --- a/SVSim.BattleEngine/Engine/MyPageItemBattle.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.Collections; -using Wizard.RoomMatch; - -// PASS-8/Phase-2 STUB: 1,119-line client-side battle-tab MyPage panel reduced to its -// compile-time surface. MyPageMenu.Instance returns null so BattleMenu.JoinRoom is -// never reachable at runtime on the headless node. One external caller -// (RoomInviteReceiveDialog) references JoinRoom; preserved as yield-break IEnumerator. -// Held alive by MyPageMenu.BattleMenu return-type reference. See Task 2a of PASS8-PLAN.md. -public class MyPageItemBattle : MyPageItem -{ -} diff --git a/SVSim.BattleEngine/Engine/UIBase.cs b/SVSim.BattleEngine/Engine/UIBase.cs index 468c9bba..3d5c913a 100644 --- a/SVSim.BattleEngine/Engine/UIBase.cs +++ b/SVSim.BattleEngine/Engine/UIBase.cs @@ -119,16 +119,7 @@ public class UIBase : MonoBehaviour { } - public virtual void PushTurnButton() - { - } - public virtual void assetBundleEnd() { } - - public UIManager.ViewScene getBackScene() - { - return backSceneSave; - } } diff --git a/SVSim.BattleEngine/Engine/UICardList.cs b/SVSim.BattleEngine/Engine/UICardList.cs index 377cd591..370c377d 100644 --- a/SVSim.BattleEngine/Engine/UICardList.cs +++ b/SVSim.BattleEngine/Engine/UICardList.cs @@ -191,9 +191,6 @@ public class UICardList : MonoBehaviour private bool _isLabelMoved; - [NonSerialized] - public bool _loadingEnd; - public Action OnCardDetailOpen { get; set; } public Action OnCardDetailClose { get; set; } @@ -678,30 +675,6 @@ public class UICardList : MonoBehaviour })); } - public void SetQRSmallTexture() - { - if (PlayerDataIds.Count != 40 || !_formatBehavior.CanShowQRCode || (_formatBehavior.UseSubClass && !CanShowQRCodeUseSubclass()) || (_format == Format.MyRotation && _deck != null && !IsAllCardCorrectMyRotation())) - { - return; - } - if (PlayerPrefsWrapper.GetValue(PlayerPrefsWrapper.SHOWQRCODE) == 0) - { - _showQRCodeButton.gameObject.SetActive(value: true); - UIManager.SetObjectToGrey(_showQRCodeButton.gameObject, b: false); - _qrCodeRoot.gameObject.SetActive(value: false); - _showQRCodeButton.onClick.Add(new EventDelegate(delegate - { - - ShowQRCode(); - })); - } - else - { - ShowQRCode(); - } - ChangeBlueUtilButtonPosToRightSide(); - } - public bool CanShowQRCodeUseSubclass() { CardMaster cardMaster = CardMaster.GetInstance(_formatBehavior.CardMasterId); diff --git a/SVSim.BattleEngine/Engine/UserFriend.cs b/SVSim.BattleEngine/Engine/UserFriend.cs deleted file mode 100644 index 10653d2f..00000000 --- a/SVSim.BattleEngine/Engine/UserFriend.cs +++ /dev/null @@ -1,38 +0,0 @@ -using LitJson; - -public class UserFriend : HeaderData -{ - public int viewerId; - - public string name; - - public string countryCode; - - public int rank; - - public long emblemId; - - public int degreeId; - - public bool IsFriend { get; private set; } - - public bool IsSameGuildMember { get; private set; } - - public UserFriend(JsonData data) - { - viewerId = data["viewer_id"].ToInt(); - name = data["name"].ToString(); - countryCode = data["country_code"].ToString(); - rank = data["rank"].ToInt(); - emblemId = data["emblem_id"].ToLong(); - degreeId = data["degree_id"].ToInt(); - if (data.Keys.Contains("is_friend")) - { - IsFriend = data["is_friend"].ToBoolean(); - } - if (data.Keys.Contains("is_guild_member")) - { - IsSameGuildMember = data["is_guild_member"].ToBoolean(); - } - } -} diff --git a/SVSim.BattleEngine/Engine/Wizard.Lottery/LotteryLoadTaskData.cs b/SVSim.BattleEngine/Engine/Wizard.Lottery/LotteryLoadTaskData.cs deleted file mode 100644 index 9858048b..00000000 --- a/SVSim.BattleEngine/Engine/Wizard.Lottery/LotteryLoadTaskData.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System; -using LitJson; -using UnityEngine; - -namespace Wizard.Lottery; - -public class LotteryLoadTaskData -{ - private bool IsEnable { get; set; } - - private DateTime StartTime { get; set; } - - private DateTime EndTime { get; set; } - - private int ReceiveServerTime { get; set; } - - private double ReceiveSinceStartUpTime { get; set; } - - private bool IsTimeEnablePeriod(DateTime start, DateTime end) - { - if (!IsEnable) - { - return false; - } - double num = ConvertTime.DateTimeToUnixTime(start); - double num2 = ConvertTime.DateTimeToUnixTime(end); - double num3 = (double)((float)ReceiveServerTime + Time.realtimeSinceStartup) - ReceiveSinceStartUpTime; - if (num3 < num || num3 >= num2) - { - return false; - } - return true; - } -} diff --git a/SVSim.BattleEngine/Engine/Wizard/AvatarBattleAllInfo.cs b/SVSim.BattleEngine/Engine/Wizard/AvatarBattleAllInfo.cs index 58f376c2..365043d1 100644 --- a/SVSim.BattleEngine/Engine/Wizard/AvatarBattleAllInfo.cs +++ b/SVSim.BattleEngine/Engine/Wizard/AvatarBattleAllInfo.cs @@ -17,8 +17,6 @@ public class AvatarBattleAllInfo private Dictionary _avatarBattleDictionary = new Dictionary(); - public PeriodData FreeMatchPeriod = new PeriodData(); - private bool _avatarBattleScheduleExist; private float _receiveSinceTime; @@ -37,18 +35,4 @@ public class AvatarBattleAllInfo } return null; } - - private bool IsWithinPeriod(PeriodData period) - { - if (!_avatarBattleScheduleExist) - { - return false; - } - double num = _receiveServerUnixTime + (double)Time.realtimeSinceStartup - (double)_receiveSinceTime; - if (num > period.EndUnixTime) - { - return false; - } - return num > period.StartUnixTime; - } } diff --git a/SVSim.BattleEngine/Engine/Wizard/CompleteDeckDecideDialog.cs b/SVSim.BattleEngine/Engine/Wizard/CompleteDeckDecideDialog.cs deleted file mode 100644 index b7007a31..00000000 --- a/SVSim.BattleEngine/Engine/Wizard/CompleteDeckDecideDialog.cs +++ /dev/null @@ -1,56 +0,0 @@ -using System; -using Cute; -using UnityEngine; - -namespace Wizard; - -public class CompleteDeckDecideDialog -{ - - public DialogBase Dialog { get; private set; } - - public DeckDecisionUI DecisionUI { get; private set; } - - public static CompleteDeckDecideDialog CreateForSingleDeck(DialogBase dialogDeckList, DeckData deck, bool showSimpleStageOption, Action onDecide, ConventionDeckList conventionDeckList = null) - { - CompleteDeckDecideDialog completeDeckDecideDialog = new CompleteDeckDecideDialog(showSimpleStageOption); - completeDeckDecideDialog.InitializeForSingleDeck(dialogDeckList, deck, onDecide, conventionDeckList); - return completeDeckDecideDialog; - } - - private CompleteDeckDecideDialog(bool showSimpleStageOption) - { - CreateDialogBase(showSimpleStageOption); - } - - private void CreateDialogBase(bool showSimpleStageOption) - { - Dialog = UIManager.GetInstance().CreateDialogClose(); - Dialog.SetTitleLabel(Data.SystemText.Get("Dia_DeckSelect_001_Title")); - Dialog.SetPanelDepth(15); - DecisionUI = UnityEngine.Object.Instantiate(Toolbox.ResourcesManager.LoadObject("UI/DeckList/DeckDecision", isServerResources: false)); - DecisionUI.IsShowSimpleStageOption = showSimpleStageOption; - Dialog.SetObj(DecisionUI.gameObject); - } - - private void InitializeForSingleDeck(DialogBase dialogDeckList, DeckData deck, Action onDecide, ConventionDeckList conventionDeckList = null) - { - Dialog.SetButtonText(Data.SystemText.Get("Common_0004"), Data.SystemText.Get("Card_0083")); - Dialog.SetButtonLayout(DialogBase.ButtonLayout.BlueBtn_GrayBtn); - Dialog.ClickSe_Btn1 = 0; - DecisionUI.SetDeckData(deck, conventionDeckList); - DecisionUI.DeckName = deck.GetDeckName(); - Dialog.onPushButton2 = DecisionUI.OnClickCreateCardList; - Dialog.ClickSe_Btn2 = 0; - Dialog.isNotCloseWindowButton2 = true; - Dialog.onPushButton1 = delegate - { - Dialog.button1.isEnabled = false; - if (dialogDeckList != null) - { - dialogDeckList.CloseWithoutSelect(); - } - onDecide.Call(); - }; - } -} diff --git a/SVSim.BattleEngine/Engine/Wizard/DeckSelectUI.cs b/SVSim.BattleEngine/Engine/Wizard/DeckSelectUI.cs index 5afc53ce..cd03a752 100644 --- a/SVSim.BattleEngine/Engine/Wizard/DeckSelectUI.cs +++ b/SVSim.BattleEngine/Engine/Wizard/DeckSelectUI.cs @@ -11,15 +11,6 @@ public class DeckSelectUI : MonoBehaviour { public class InitOptions { - public Action OnUpdateDeckUICustomize { get; set; } - - public Action OnClickInfoButton { get; set; } - - public DeckData PrimaryFirstDisplayDeck { get; set; } - - public bool CanUseNonPossessionCard { get; set; } - - public IFirstDisplayPageIndexGetter FirstDisplayPageIndexGetter { get; set; } } private enum ChangeMoveDirection @@ -135,9 +126,6 @@ public class DeckSelectUI : MonoBehaviour private static readonly Vector3 OUTSIDE_LEFT_PAGE_POSITION = VIEW_PAGE_POSITION + Vector3.left * 1400f; - [SerializeField] - private DeckUI _deckFrameOriginal; - [SerializeField] private UILabel _titleLabel; @@ -164,15 +152,6 @@ public class DeckSelectUI : MonoBehaviour [SerializeField] private UILabel _noDeckText; - [SerializeField] - private UILabel _cautionLabel; - - [SerializeField] - private UIGrid[] _deckTableGrids = new UIGrid[2]; - - [SerializeField] - private UIButton _infoButton; - private DeckTable[] _deckTables = new DeckTable[2]; private int _deckTableIndex; @@ -195,45 +174,6 @@ public class DeckSelectUI : MonoBehaviour public bool IsPageMoving { get; private set; } - public void UpdateDeckView(List deckGroupList, Format format, bool isVisibleCreateNew, Action onSettingDeckListFinish = null, DeckData primaryFirstDisplayDeck = null, IFirstDisplayPageIndexGetter firstDisplayPageIndexGetter = null) - { - List list = new List(); - foreach (DeckGroup deckGroup in deckGroupList) - { - list.AddRange(deckGroup.DeckDataList); - } - LoadResources(list, delegate - { - if (!_isOnDestroy) - { - if (firstDisplayPageIndexGetter == null) - { - firstDisplayPageIndexGetter = new DefaultFirstDisplayPageIndexGetter(); - } - CreateDeckGroupPages(deckGroupList, isVisibleCreateNew, format, primaryFirstDisplayDeck, firstDisplayPageIndexGetter); - onSettingDeckListFinish.Call(); - } - }); - } - - private void OnClickDeck(DeckUI deckUI) - { - - OnSelectDeck.Call(deckUI.Deck); - } - - private void OnDragPanel(Vector2 dir) - { - if (dir.x >= 70f) - { - PrevPage(); - } - else if (dir.x <= -70f) - { - NextPage(); - } - } - private void NextPage() { if (_pageList.Count > 1) diff --git a/SVSim.BattleEngine/Engine/Wizard/FormatChangeUI.cs b/SVSim.BattleEngine/Engine/Wizard/FormatChangeUI.cs index af907965..0aa2e11b 100644 --- a/SVSim.BattleEngine/Engine/Wizard/FormatChangeUI.cs +++ b/SVSim.BattleEngine/Engine/Wizard/FormatChangeUI.cs @@ -96,13 +96,6 @@ public class FormatChangeUI : MonoBehaviour } } - private void Initialize(FormatCategory defaultFormatCategory, FormatCategory anotherFormatCategory, Action onChangeFormat) - { - InitializeFormatCategoryButtons(anotherFormatCategory); - _onChangeFormat = onChangeFormat; - ChangeFormat(defaultFormatCategory); - } - private void InitializeFormatCategoryButtons(FormatCategory anotherFormatCategory) { _btnRotation.onClick.Add(new EventDelegate(delegate diff --git a/SVSim.BattleEngine/Engine/Wizard/FreeAndRankMatchDeckSelectConfirmDialog.cs b/SVSim.BattleEngine/Engine/Wizard/FreeAndRankMatchDeckSelectConfirmDialog.cs index b5216c6a..d99b5b98 100644 --- a/SVSim.BattleEngine/Engine/Wizard/FreeAndRankMatchDeckSelectConfirmDialog.cs +++ b/SVSim.BattleEngine/Engine/Wizard/FreeAndRankMatchDeckSelectConfirmDialog.cs @@ -24,15 +24,6 @@ public static class FreeAndRankMatchDeckSelectConfirmDialog UIManager.GetInstance().ChangeViewScene(UIManager.ViewScene.RankMatch); } - private static void ChangeViewSceneAndSetBattleRetry(UIManager.ViewScene viewScene) - { - // Pre-Phase-5b: battle-scene branch routed through GameMgr.GetBattleCtrl().BattleEnd. - // BattleControl is a stub (chunk 7); collapse to the else branch. - UIManager.ChangeViewSceneParam changeViewSceneParam = new UIManager.ChangeViewSceneParam(); - changeViewSceneParam.OnChange = SetBattleRetryForDeckCardEdit; - UIManager.GetInstance().ChangeViewScene(viewScene, changeViewSceneParam); - } - private static void SetBattleRetryForDeckCardEdit() { UIManager instance = UIManager.GetInstance(); diff --git a/SVSim.BattleEngine/Engine/Wizard/InCompleteDeckDecideDialog.cs b/SVSim.BattleEngine/Engine/Wizard/InCompleteDeckDecideDialog.cs deleted file mode 100644 index 92f8d2aa..00000000 --- a/SVSim.BattleEngine/Engine/Wizard/InCompleteDeckDecideDialog.cs +++ /dev/null @@ -1,115 +0,0 @@ -using System; -using Cute; -using Wizard.DeckCardEdit; - -namespace Wizard; - -public static class InCompleteDeckDecideDialog -{ - - public static void Create(DialogBase dialogDeckList, DeckData deck, ConventionDeckList conventionDeckList = null, bool canUseNonPossessionCard = false, Action unusableDeckChangeViewSceneAction = null) - { - DeckData.UnusableReason reason; - if (deck.IsNoCard()) - { - Action onStartChangeViewScene = delegate - { - dialogDeckList.CloseWithoutSelect(); - }; - DeckCreateMenuUI.ShowDeckCreateMenu(deck, conventionDeckList, onStartChangeViewScene); - } - else if (!deck.IsUsable(out reason, canUseNonPossessionCard)) - { - CreateUnusableDeckDialog(deck, conventionDeckList, reason, unusableDeckChangeViewSceneAction, dialogDeckList); - } - } - - private static void CreateUnusableDeckDialog(DeckData deck, ConventionDeckList conventionDeckList, DeckData.UnusableReason unusableReason, Action changeViewSceneAction, DialogBase dialogDeckList) - { - if (unusableReason == DeckData.UnusableReason.MaintenanceCard && deck.IsRentalDeck) - { - DialogBase dialogBase = UIManager.GetInstance().CreateConfirmationDialog(Data.SystemText.Get("Story_0060")); - dialogBase.SetButtonLayout(DialogBase.ButtonLayout.CloseBtn); - dialogBase.SetTitleLabel(Data.SystemText.Get("System_0022")); - dialogBase.SetPanelDepth(100); - return; - } - (string, string) textsUnusableDeckDialog = GetTextsUnusableDeckDialog(unusableReason); - DialogBase dialogBase2 = UIManager.GetInstance().CreateDialogClose(); - dialogBase2.SetTitleLabel(textsUnusableDeckDialog.Item1); - dialogBase2.SetText(textsUnusableDeckDialog.Item2); - dialogBase2.SetButtonLayout(DialogBase.ButtonLayout.BlueBtn_CancelBtn); - dialogBase2.SetButtonText(Data.SystemText.Get("Dia_DeckSelect_002_Button")); - dialogBase2.onPushButton1 = delegate - { - if (Data.MaintenanceCodeList.Contains(NetworkDefine.MAINTENANCE_TYPE.DECK_MAINTENANCE)) - { - - } - else - { - DeckCardEditUI.SetDeckEditParameter(deck, conventionDeckList); - dialogDeckList.CloseWithoutSelect(); - if (changeViewSceneAction != null) - { - changeViewSceneAction(UIManager.ViewScene.DeckCardEdit); - } - else - { - UIManager.ChangeViewSceneParam param = new UIManager.ChangeViewSceneParam - { - IsUpdateFooterMenuTexture = true - }; - UIManager.GetInstance().ChangeViewScene(UIManager.ViewScene.DeckCardEdit, param); - } - } - }; - dialogBase2.ClickSe_Btn1 = 0; - dialogBase2.SetPanelDepth(100); - } - - private static (string title, string body) GetTextsUnusableDeckDialog(DeckData.UnusableReason unusableReason) - { - string item = string.Empty; - string item2 = string.Empty; - switch (unusableReason) - { - case DeckData.UnusableReason.MaintenanceCard: - item = Data.SystemText.Get("System_0022"); - item2 = Data.SystemText.Get("System_0039"); - break; - case DeckData.UnusableReason.FormatRestrictCard: - item = Data.SystemText.Get("Dia_DeckSelect_004_Title"); - item2 = Data.SystemText.Get("Card_0192"); - break; - case DeckData.UnusableReason.TooLittleCards: - item = Data.SystemText.Get("Dia_DeckSelect_002_Title"); - item2 = Data.SystemText.Get("Card_0069"); - break; - case DeckData.UnusableReason.TooMuchCards: - item = Data.SystemText.Get("Dia_DeckSelect_003_Title"); - item2 = Data.SystemText.Get("Card_0140"); - break; - case DeckData.UnusableReason.NonPossessionCard: - item = Data.SystemText.Get("Dia_DeckSelect_004_Title"); - item2 = Data.SystemText.Get("Card_0254"); - break; - case DeckData.UnusableReason.ShortageMainClassCards: - item = Data.SystemText.Get("Dia_DeckSelect_005_Title"); - item2 = Data.SystemText.Get("Card_0289"); - break; - case DeckData.UnusableReason.ShortageSubClassCards: - item = Data.SystemText.Get("Dia_DeckSelect_006_Title"); - item2 = Data.SystemText.Get("Card_0290"); - break; - case DeckData.UnusableReason.ShortageBothClassCards: - item = Data.SystemText.Get("Dia_DeckSelect_007_Title"); - item2 = Data.SystemText.Get("Card_0291"); - break; - case DeckData.UnusableReason.Unknown: - Debug.LogError("unknown deck unusable reason."); - break; - } - return (title: item, body: item2); - } -} diff --git a/SVSim.BattleEngine/Engine/Wizard/MyPageDetail.cs b/SVSim.BattleEngine/Engine/Wizard/MyPageDetail.cs index ef359a0c..8131bec6 100644 --- a/SVSim.BattleEngine/Engine/Wizard/MyPageDetail.cs +++ b/SVSim.BattleEngine/Engine/Wizard/MyPageDetail.cs @@ -30,14 +30,7 @@ public class MyPageDetail public MyPageHomeDialogData MyPageHomeDialogData { get; set; } = new MyPageHomeDialogData(); - public RoomNonPossessionCardCampaign RoomNonPossessionCardCampaign { get; set; } - public MyPageBGInfo BGInfo { get; set; } = new MyPageBGInfo(); public SpeedChallengeInfo SpeedChallengeInfo { get; set; } - - private double GetNowUnixTime() - { - return ServerUnixTime + (double)Time.realtimeSinceStartup - (double)SinceTime; - } } diff --git a/SVSim.BattleEngine/Engine/Wizard/PlayerStaticData.cs b/SVSim.BattleEngine/Engine/Wizard/PlayerStaticData.cs index 6cc0304d..cf4cd8eb 100644 --- a/SVSim.BattleEngine/Engine/Wizard/PlayerStaticData.cs +++ b/SVSim.BattleEngine/Engine/Wizard/PlayerStaticData.cs @@ -120,18 +120,6 @@ public class PlayerStaticData : MonoBehaviour } } - public void AttachTexture(UITexture uiTexture, int size) - { - if (m_loadingCnt == 0) - { - uiTexture.mainTexture = m_loadedList[size]; - } - else - { - m_requiredAttachList[size].Add(uiTexture); - } - } - private void UpdateTexture() { ResourcesManager resourcesManager = Toolbox.ResourcesManager; diff --git a/SVSim.BattleEngine/Engine/Wizard/RoomNonPossessionCardCampaign.cs b/SVSim.BattleEngine/Engine/Wizard/RoomNonPossessionCardCampaign.cs index 9d923dc7..a26d6186 100644 --- a/SVSim.BattleEngine/Engine/Wizard/RoomNonPossessionCardCampaign.cs +++ b/SVSim.BattleEngine/Engine/Wizard/RoomNonPossessionCardCampaign.cs @@ -2,7 +2,4 @@ namespace Wizard; public class RoomNonPossessionCardCampaign { - public double StartUnixTime { get; set; } - - public double EndUnixTime { get; set; } } diff --git a/SVSim.BattleEngine/Engine/iTween.cs b/SVSim.BattleEngine/Engine/iTween.cs index ba912bd1..62d4df3d 100644 --- a/SVSim.BattleEngine/Engine/iTween.cs +++ b/SVSim.BattleEngine/Engine/iTween.cs @@ -329,102 +329,6 @@ public class iTween : MonoBehaviour Launch(target, args); } - public static void MoveFrom(GameObject target, Hashtable args) - { - args = CleanArgs(args); - bool flag = ((!args.Contains("islocal")) ? Defaults.isLocal : ((bool)args["islocal"])); - if (args.Contains("path")) - { - Vector3[] array2; - if (args["path"].GetType() == typeof(Vector3[])) - { - Vector3[] array = (Vector3[])args["path"]; - array2 = new Vector3[array.Length]; - Array.Copy(array, array2, array.Length); - } - else - { - Transform[] array3 = (Transform[])args["path"]; - array2 = new Vector3[array3.Length]; - for (int i = 0; i < array3.Length; i++) - { - array2[i] = array3[i].position; - } - } - if (array2[array2.Length - 1] != target.transform.position) - { - Vector3[] array4 = new Vector3[array2.Length + 1]; - Array.Copy(array2, array4, array2.Length); - if (flag) - { - array4[array4.Length - 1] = target.transform.localPosition; - target.transform.localPosition = array4[0]; - } - else - { - array4[array4.Length - 1] = target.transform.position; - target.transform.position = array4[0]; - } - args["path"] = array4; - } - else - { - if (flag) - { - target.transform.localPosition = array2[0]; - } - else - { - target.transform.position = array2[0]; - } - args["path"] = array2; - } - } - else - { - Vector3 vector2; - Vector3 vector = ((!flag) ? (vector2 = target.transform.position) : (vector2 = target.transform.localPosition)); - if (args.Contains("position")) - { - if (args["position"].GetType() == typeof(Transform)) - { - vector2 = ((Transform)args["position"]).position; - } - else if (args["position"].GetType() == typeof(Vector3)) - { - vector2 = (Vector3)args["position"]; - } - } - else - { - if (args.Contains("x")) - { - vector2.x = (float)args["x"]; - } - if (args.Contains("y")) - { - vector2.y = (float)args["y"]; - } - if (args.Contains("z")) - { - vector2.z = (float)args["z"]; - } - } - if (flag) - { - target.transform.localPosition = vector2; - } - else - { - target.transform.position = vector2; - } - args["position"] = vector; - } - args["type"] = "move"; - args["method"] = "to"; - Launch(target, args); - } - public static void MoveAdd(GameObject target, Hashtable args) { args = CleanArgs(args); diff --git a/SVSim.BattleEngine/Shim/Generated/RoomBase.g.cs b/SVSim.BattleEngine/Shim/Generated/RoomBase.g.cs index 8a54dbd6..e5779439 100644 --- a/SVSim.BattleEngine/Shim/Generated/RoomBase.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/RoomBase.g.cs @@ -14,7 +14,5 @@ public partial class RoomBase public DialogBase TreasureCpGradeUpConditionDialog { get; set; } public static RoomBase GetInstance() => default!; public static void OnSoftwareReset() { } - public static void StartDialogLoading() { } - public static void FinishDiloagLoading() { } } } diff --git a/SVSim.BattleEngine/Shim/Generated/UIManager.g.cs b/SVSim.BattleEngine/Shim/Generated/UIManager.g.cs index 6dd7f198..31172f58 100644 --- a/SVSim.BattleEngine/Shim/Generated/UIManager.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/UIManager.g.cs @@ -55,7 +55,6 @@ public partial class UIManager public UIRoot UIManagerRoot; public Camera UIRootLoadingCamera; public GameObject _lotteryApplyPrefab; - public Dictionary TopBarBackParameterDict; public DeckCreateMenuUI _deckCreateMenuOriginal; public bool isErrorProc; public bool isRetryProc; @@ -87,7 +86,6 @@ public partial class UIManager public UIBase GetUIBase(ViewScene scene) => default!; public T GetCurrentSceneParam() where T : class => default!; public void OverrideSceneParam(ViewScene scene, object sceneParam) { } - public object GetLastSceneChangeParam(ViewScene scene) => default!; public T GetSceneParam(ViewScene scene) where T : class => default!; public void ChangeViewScene(ViewScene nextScene, ChangeViewSceneParam param = null, object sceneParam = null) { } public void OnReadyViewScene(bool isFadein, Action onFinishChangeView = null, Action onFinishFadeIn = null) { } @@ -102,7 +100,6 @@ public partial class UIManager public DialogBase CreateDialogClose(bool isSystem = false, bool dontChangeLabelColor = false) => default!; public DialogBase CreateConfirmationDialog(string message) => default!; public void dialogAllClear() { } - public void ActiveChangeDialogAll(bool active) { } public bool isOpenDialog() => default!; public void createInSceneLoading(bool notBlack = false, bool notCollider = false, bool force = true, int playIndex = -1) { } public void closeInSceneLoading(bool force = true) { } diff --git a/SVSim.BattleEngine/Shim/UnityEngine/UnityShim.cs b/SVSim.BattleEngine/Shim/UnityEngine/UnityShim.cs index 4c7d827e..f81f32de 100644 --- a/SVSim.BattleEngine/Shim/UnityEngine/UnityShim.cs +++ b/SVSim.BattleEngine/Shim/UnityEngine/UnityShim.cs @@ -40,7 +40,7 @@ namespace UnityEngine public struct Plane { public Plane(Vector3 normal, Vector3 point) { } public Plane(Vector3 inNormal, float d) { } public Plane(Vector3 a, Vector3 b, Vector3 c) { } public bool Raycast(Ray r, out float enter) { enter = 0; return false; } } public struct Ray { public Ray(Vector3 origin, Vector3 dir) { this.origin = origin; this.direction = dir; } public Vector3 origin; public Vector3 direction; public Vector3 GetPoint(float d) => origin; } public struct RaycastHit { public Vector3 point; public Vector3 normal; public float distance; public Collider collider; } - public struct LayerMask { public int value; public static int NameToLayer(string n) => 0; public static string LayerToName(int layer) => ""; public static implicit operator int(LayerMask m) => m.value; public static implicit operator LayerMask(int v) => new LayerMask { value = v }; } + public struct LayerMask { public int value; public static int NameToLayer(string n) => 0; public static implicit operator int(LayerMask m) => m.value; public static implicit operator LayerMask(int v) => new LayerMask { value = v }; } // ---- core object model ---- public class Object