From 006a6ae7ab696329e8d7b82c9735be1ddecd8fe9 Mon Sep 17 00:00:00 2001 From: gamer147 Date: Fri, 3 Jul 2026 21:51:02 -0400 Subject: [PATCH] cull(engine-cleanup): pass-8 phase-2 cascade round 1 after MyPageItemBattle stub --- SVSim.BattleEngine/Engine/DialogBase.cs | 12 - SVSim.BattleEngine/Engine/FadeUtility.cs | 9 - SVSim.BattleEngine/Engine/FriendInfo.cs | 5 - SVSim.BattleEngine/Engine/FriendInfoDetail.cs | 1 - SVSim.BattleEngine/Engine/IDInput.cs | 147 ---------- .../Engine/InviteFriendBattle.cs | 3 - .../Engine/MyPageBattleCampaign.cs | 63 ----- .../Engine/MyPageCardPanelAnimation.cs | 11 - SVSim.BattleEngine/Engine/MyPageItem.cs | 124 --------- SVSim.BattleEngine/Engine/MyPageItemBattle.cs | 4 - SVSim.BattleEngine/Engine/MyPageMenu.cs | 9 - .../Engine/RoomInviteFriendColum.cs | 31 --- .../Engine/RoomInviteReceiveDialog.cs | 255 ----------------- SVSim.BattleEngine/Engine/TopBar.cs | 39 --- .../Wizard.Lottery/LotteryLoadTaskData.cs | 5 - .../Engine/Wizard/AllLabelColorChanger.cs | 6 - .../Engine/Wizard/AvatarBattleAllInfo.cs | 2 - .../Engine/Wizard/CampaignBattleWin.cs | 3 - SVSim.BattleEngine/Engine/Wizard/Data.cs | 2 - .../Engine/Wizard/DeckSelectUI.cs | 47 ---- .../Engine/Wizard/DeckSelectUIDialog.cs | 263 ------------------ .../Engine/Wizard/DeckSelectUIDialogTitle.cs | 181 ------------ SVSim.BattleEngine/Engine/Wizard/FirstTips.cs | 2 - .../Engine/Wizard/FormatChangeUI.cs | 11 - ...FreeAndRankMatchDeckSelectConfirmDialog.cs | 23 -- .../Engine/Wizard/InviteAcceptTask.cs | 33 --- .../Engine/Wizard/InviteGetListTask.cs | 39 --- SVSim.BattleEngine/Engine/Wizard/LoadQueue.cs | 145 ---------- .../Engine/Wizard/MyPageDetail.cs | 16 -- .../Wizard/MyPageRewardDialogBoxCount.cs | 34 --- .../Wizard/MyPageSpecialWinRewardDialog.cs | 198 ------------- .../Engine/Wizard/MyRotationAllInfo.cs | 2 - .../MypageReceiveSpecialTreasureTask.cs | 6 - .../Engine/Wizard/NetworkDefine.cs | 16 +- .../Engine/Wizard/PlayerStaticData.cs | 14 +- .../Wizard/RoomNonPossessionCardCampaign.cs | 2 - .../Engine/Wizard/SpecialTreasureInfo.cs | 17 -- .../Engine/Wizard/UIAtlasManager.cs | 1 - SVSim.BattleEngine/Engine/Wizard/UIUtil.cs | 13 - .../Shim/Generated/Friend_PlayerData.g.cs | 15 - .../Shim/Generated/RoomConnectController.g.cs | 10 +- ...ConnectController_InitializeParameter.g.cs | 4 - .../Shim/Generated/RoomRuleSelectDialog.g.cs | 9 - .../Shim/Generated/RoomRuleSetting.g.cs | 8 - .../Shim/Generated/UIManager.g.cs | 1 - .../Shim/Generated/_BaseClauses.g.cs | 2 +- .../Shim/View/SettingsUiStubs.cs | 1 - .../Shim/View/StoryTitleStubs.cs | 5 - 48 files changed, 4 insertions(+), 1845 deletions(-) delete mode 100644 SVSim.BattleEngine/Engine/IDInput.cs delete mode 100644 SVSim.BattleEngine/Engine/MyPageBattleCampaign.cs delete mode 100644 SVSim.BattleEngine/Engine/RoomInviteFriendColum.cs delete mode 100644 SVSim.BattleEngine/Engine/RoomInviteReceiveDialog.cs delete mode 100644 SVSim.BattleEngine/Engine/Wizard/DeckSelectUIDialog.cs delete mode 100644 SVSim.BattleEngine/Engine/Wizard/DeckSelectUIDialogTitle.cs delete mode 100644 SVSim.BattleEngine/Engine/Wizard/InviteAcceptTask.cs delete mode 100644 SVSim.BattleEngine/Engine/Wizard/InviteGetListTask.cs delete mode 100644 SVSim.BattleEngine/Engine/Wizard/LoadQueue.cs delete mode 100644 SVSim.BattleEngine/Engine/Wizard/MyPageRewardDialogBoxCount.cs delete mode 100644 SVSim.BattleEngine/Engine/Wizard/MyPageSpecialWinRewardDialog.cs diff --git a/SVSim.BattleEngine/Engine/DialogBase.cs b/SVSim.BattleEngine/Engine/DialogBase.cs index 3a1d93ff..b628f5ec 100644 --- a/SVSim.BattleEngine/Engine/DialogBase.cs +++ b/SVSim.BattleEngine/Engine/DialogBase.cs @@ -559,18 +559,6 @@ public class DialogBase : MonoBehaviour titleLabel.text = str; } - public void SetTitleLabelActive(bool active) - { - titleLabel.gameObject.SetActive(active); - } - - public void AttachObjToTitleLabel(GameObject obj, Vector3 localPosition) - { - obj.transform.parent = TitleObjs.transform; - obj.transform.localScale = Vector3.one; - obj.transform.localPosition = localPosition; - } - public void SetObj(GameObject obj) { SetObj(obj, new Vector3(0f, 0f, 0f)); diff --git a/SVSim.BattleEngine/Engine/FadeUtility.cs b/SVSim.BattleEngine/Engine/FadeUtility.cs index 32d9295c..bf820d8a 100644 --- a/SVSim.BattleEngine/Engine/FadeUtility.cs +++ b/SVSim.BattleEngine/Engine/FadeUtility.cs @@ -6,15 +6,6 @@ public class FadeUtility { private static readonly AnimationCurve FADE_ALPHA_ANIM_CURVE = AnimationCurve.Linear(0f, 0f, 1f, 1f); - public static void FadeOutObjectAndNonActive(GameObject obj) - { - FadeFinish(obj); - FadeOut(obj, delegate - { - obj.SetActive(value: false); - }); - } - private static void FadeOut(GameObject obj, Action onFinish) { UIButtonColor button = obj.GetComponent(); diff --git a/SVSim.BattleEngine/Engine/FriendInfo.cs b/SVSim.BattleEngine/Engine/FriendInfo.cs index 61c8aa3a..7a4d28a2 100644 --- a/SVSim.BattleEngine/Engine/FriendInfo.cs +++ b/SVSim.BattleEngine/Engine/FriendInfo.cs @@ -1,9 +1,4 @@ public class FriendInfo : HeaderData { public FriendInfoDetail data; - - public void Initialize() - { - data = new FriendInfoDetail(); - } } diff --git a/SVSim.BattleEngine/Engine/FriendInfoDetail.cs b/SVSim.BattleEngine/Engine/FriendInfoDetail.cs index 1302f993..4f3fe002 100644 --- a/SVSim.BattleEngine/Engine/FriendInfoDetail.cs +++ b/SVSim.BattleEngine/Engine/FriendInfoDetail.cs @@ -2,5 +2,4 @@ using System.Collections.Generic; public class FriendInfoDetail { - public List friendList = new List(); } diff --git a/SVSim.BattleEngine/Engine/IDInput.cs b/SVSim.BattleEngine/Engine/IDInput.cs deleted file mode 100644 index 43c5e845..00000000 --- a/SVSim.BattleEngine/Engine/IDInput.cs +++ /dev/null @@ -1,147 +0,0 @@ -using System; -using System.Text.RegularExpressions; -using UnityEngine; -using Wizard; - -public class IDInput : MonoBehaviour -{ - [Serializable] - public class LayoutSet - { - public GameObject _root; - - public UILabel[] _label; - } - - [SerializeField] - private UIButton[] m_InputBtns; - - [SerializeField] - private UIButton m_InputClearBtn; - - [SerializeField] - private LayoutSet[] _layoutSet; - - private LayoutSet _currentLayout; - - [SerializeField] - private UIButton _pasteButton; - - private int InputIndex; - - private int _maxIndex; - - public DialogBase CurrentDialogBase; - - [HideInInspector] - public string InputID { get; set; } - - public static IDInput Create(GameObject parentObj) - { - return NGUITools.AddChild(parentObj, UIManager.GetInstance().IdInputPrefab).GetComponent(); - } - - public void InitInputID(int maxCount) - { - InputIndex = 0; - InputID = ""; - _maxIndex = maxCount - 1; - for (int i = 0; i < m_InputBtns.Length; i++) - { - UIEventListener uIEventListener = UIEventListener.Get(m_InputBtns[i].gameObject); - uIEventListener.onClick = (UIEventListener.VoidDelegate)Delegate.Combine(uIEventListener.onClick, new UIEventListener.VoidDelegate(InputNum)); - } - _pasteButton.onClick.Add(new EventDelegate(delegate - { - Paste(); - })); - LayoutSet[] layoutSet = _layoutSet; - foreach (LayoutSet layoutSet2 in layoutSet) - { - if (layoutSet2._label.Length == maxCount) - { - layoutSet2._root.SetActive(value: true); - _currentLayout = layoutSet2; - } - else - { - layoutSet2._root.SetActive(value: false); - } - } - if (_currentLayout == null) - { - Debug.LogError("未知の桁数です"); - } - for (int num2 = 0; num2 < _currentLayout._label.Length; num2++) - { - _currentLayout._label[num2].text = "_"; - } - UIEventListener uIEventListener2 = UIEventListener.Get(m_InputClearBtn.gameObject); - uIEventListener2.onClick = (UIEventListener.VoidDelegate)Delegate.Combine(uIEventListener2.onClick, new UIEventListener.VoidDelegate(ClearNum)); - Invoke("SetButtonEnabled", 0.01f); - } - - private void SetButtonEnabled() - { - CurrentDialogBase.SetButtonDisable(isEnableOK: true); - } - - public void InputNum(GameObject g) - { - if (InputIndex <= _maxIndex) - { - string text = g.name; - _currentLayout._label[InputIndex].text = text; - JoinNums(); - InputIndex++; - - if (InputIndex > _maxIndex) - { - CurrentDialogBase.SetButtonDisable(isEnableOK: false); - } - } - } - - public void ClearNum(GameObject g) - { - if (InputIndex > 0) - { - InputIndex--; - _currentLayout._label[InputIndex].text = "_"; - - CurrentDialogBase.SetButtonDisable(isEnableOK: true); - } - } - - private void JoinNums() - { - string text = ""; - for (int i = 0; i < _currentLayout._label.Length && !(_currentLayout._label[i].text == "_"); i++) - { - text += _currentLayout._label[i].text; - } - InputID = text; - } - - private void Paste() - { - - string clipboard = ClipboardHelper.Clipboard; - clipboard = Regex.Replace(clipboard, "[０-９]", (Match match) => ((char)(match.Value[0] - 65296 + 48)).ToString()); - clipboard = Regex.Replace(clipboard, "\\s", ""); - if (UIUtil.IsValidIdDigits(clipboard, _currentLayout._label.Length)) - { - for (int num = 0; num < _currentLayout._label.Length; num++) - { - _currentLayout._label[num].text = "_"; - } - for (int num2 = 0; num2 < clipboard.Length; num2++) - { - _currentLayout._label[num2].text = clipboard[num2].ToString(); - JoinNums(); - } - InputIndex = clipboard.Length; - CurrentDialogBase.SetButtonDisable(isEnableOK: false); - } - } -} diff --git a/SVSim.BattleEngine/Engine/InviteFriendBattle.cs b/SVSim.BattleEngine/Engine/InviteFriendBattle.cs index 2ad1b61a..83dfc53a 100644 --- a/SVSim.BattleEngine/Engine/InviteFriendBattle.cs +++ b/SVSim.BattleEngine/Engine/InviteFriendBattle.cs @@ -2,7 +2,4 @@ using Wizard; public class InviteFriendBattle : HeaderData { - public string RoomId { get; set; } - - public BattleParameter BattleParameterInstance { get; set; } } diff --git a/SVSim.BattleEngine/Engine/MyPageBattleCampaign.cs b/SVSim.BattleEngine/Engine/MyPageBattleCampaign.cs deleted file mode 100644 index 06c27f31..00000000 --- a/SVSim.BattleEngine/Engine/MyPageBattleCampaign.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System.Collections; -using UnityEngine; -using Wizard; - -public class MyPageBattleCampaign : MonoBehaviour -{ - [SerializeField] - private UILabel _timeLabel; - - [SerializeField] - private GameObject _boxRoot; - - [SerializeField] - private UILabel _boxLabel; - - [SerializeField] - private UISprite _boxSprite; - - [SerializeField] - private UILabel _specialBoxLabel; - - [SerializeField] - private UISprite _specialBoxSprite; - - public IEnumerator Init() - { - base.gameObject.SetActive(value: false); - while (Data.MyPage.data == null) - { - yield return null; - } - _specialBoxLabel.gameObject.SetActive(value: false); - _specialBoxSprite.gameObject.SetActive(value: false); - CampaignBattleWin campaignBattleWin = Data.MyPageNotifications.data.CampaignBattleWin; - if (campaignBattleWin.IsInSessionCampaign) - { - base.gameObject.SetActive(value: true); - _timeLabel.text = Data.SystemText.Get("MyPage_0048", ConvertTime.ToLocal(ConvertTime.UnixTimeToDateTime(campaignBattleWin.EndUnixTime))); - if (campaignBattleWin.BoxGrade == CampaignBattleWin.eBoxGrade.None) - { - _boxLabel.width = 50; - _boxLabel.text = Data.SystemText.Get("MyPage_0046", campaignBattleWin.GetBoxNum.ToString(), campaignBattleWin.MaxBoxNum.ToString()); - _boxSprite.spriteName = "box_campaign_00"; - if (campaignBattleWin.IsHaveSpecialWinReward && !campaignBattleWin.SpecialTreasureInfo.IsGotSpecialTreasureBox) - { - _boxRoot.transform.localPosition = new Vector3(-90f, _boxRoot.transform.localPosition.y, _boxRoot.transform.localPosition.z); - _specialBoxLabel.gameObject.SetActive(value: true); - _specialBoxSprite.gameObject.SetActive(value: true); - } - } - else - { - _boxLabel.width = 150; - _boxLabel.text = Data.SystemText.Get("MyPage_0047"); - _boxSprite.spriteName = "box_campaign_" + ((int)(campaignBattleWin.BoxGrade - 1)).ToString("00"); - } - } - else - { - base.gameObject.SetActive(value: false); - } - } -} diff --git a/SVSim.BattleEngine/Engine/MyPageCardPanelAnimation.cs b/SVSim.BattleEngine/Engine/MyPageCardPanelAnimation.cs index 989e3fef..9f811ff6 100644 --- a/SVSim.BattleEngine/Engine/MyPageCardPanelAnimation.cs +++ b/SVSim.BattleEngine/Engine/MyPageCardPanelAnimation.cs @@ -118,17 +118,6 @@ public class MyPageCardPanelAnimation : MonoBehaviour } } - public void OnClicked(int i, bool isPlaySe = true) - { - ClickRotateTimeTotal = 1f; - ClickRotateTime = ClickRotateTimeTotal; - ClickIndex = i; - if (isPlaySe) - { - - } - } - public void StopMove() { _state = State.End; diff --git a/SVSim.BattleEngine/Engine/MyPageItem.cs b/SVSim.BattleEngine/Engine/MyPageItem.cs index 0741f4fd..d0162ba9 100644 --- a/SVSim.BattleEngine/Engine/MyPageItem.cs +++ b/SVSim.BattleEngine/Engine/MyPageItem.cs @@ -18,20 +18,6 @@ public class MyPageItem : MonoBehaviour private bool cardAnimationInitialized; - protected bool IsCardMoving - { - get - { - if (_cardMove != null) - { - return _cardMove.IsCardMoving; - } - return false; - } - } - - public TopBar TopBar => _parent.TopBar; - protected MyPageCardPanelAnimation CardAnimation => _cardMove; protected MyPageMenu Parent => _parent; @@ -69,18 +55,6 @@ public class MyPageItem : MonoBehaviour base.gameObject.SetActive(value: false); } - public virtual void OnClose() - { - } - - protected void StartCardPanelAppearAnimation() - { - if (_cardMove != null) - { - _cardMove.StartCardPanelAnimation(isCutCardMotion: false); - } - } - protected void SaveCardPanelDefaultPosition() { int num = _cardPanelList.Length; @@ -95,30 +69,6 @@ public class MyPageItem : MonoBehaviour } } - protected void RestoreCardPanelPosition() - { - if (_cardPanelList == null) - { - return; - } - for (int i = 0; i < _cardPanelList.Length; i++) - { - if (_cardPanelList[i] != null) - { - _cardPanelList[i].RestoreSavedPosition(); - _cardPanelList[i].gameObject.SetActive(value: true); - _cardPanelList[i].EffectActive = false; - _cardPanelList[i].EffectActive = true; - _cardPanelList[i].CheckMaintenanceType(); - UITweenAlpha component = _cardPanelList[i].GetComponent(); - if (component != null) - { - UnityEngine.Object.Destroy(component); - } - } - } - } - public virtual void OnMyPageInfoReceive() { if (_cardPanelList == null) @@ -149,19 +99,6 @@ public class MyPageItem : MonoBehaviour iTween.MoveTo(obj, iTween.Hash("x", x, "time", 0.3f, "delay", 0.1f, "islocal", true, "easetype", iTween.EaseType.easeOutExpo)); } - protected void MoveCardPanelLeftPosition(GameObject moveObj) - { - CardAnimation.StopMove(); - TweenMoveTo(moveObj, -328f); - } - - public void AppearAnimationFromRight(GameObject obj) - { - RemoveITween(obj); - obj.gameObject.SetActive(value: true); - iTween.MoveFrom(obj, iTween.Hash("x", obj.transform.localPosition.x + 1000f, "time", 0.3f, "delay", 0.1f, "islocal", true, "easetype", iTween.EaseType.easeOutExpo)); - } - protected void FadeOutCardPanel(MyPageCardPanel panel, Action onFinish) { panel.EffectActive = false; @@ -171,70 +108,9 @@ public class MyPageItem : MonoBehaviour }); } - protected void FadeOutCardPanelAndNonActive(MyPageCardPanel panel) - { - FadeOutCardPanel(panel, delegate - { - panel.gameObject.SetActive(value: false); - }); - } - protected static void FadeOutObject(UITweenAlpha tweenAlpha, Action onFinish = null) { tweenAlpha.End(); FadeUtility.FadeOutObject(tweenAlpha, onFinish); } - - protected void ResetAlphaAndRemoveTween(UISprite spriteObj) - { - UITweenAlpha component = spriteObj.GetComponent(); - if (component != null) - { - UnityEngine.Object.Destroy(component); - } - spriteObj.alpha = 1f; - } - - public static CardPanelMaintenancePlate SetMaintenanceVisible(bool isMaintenance, UIButton button, CardPanelMaintenancePlate currentPlate, int buttonLabelDepth) - { - if (isMaintenance) - { - if (currentPlate == null) - { - GameObject prefab = null; // Pre-Phase-5b: no PrefabMgr headless - currentPlate = NGUITools.AddChild(button.gameObject, prefab).GetComponent(); - currentPlate.SetDepth(buttonLabelDepth + 1); - } - currentPlate.gameObject.SetActive(value: true); - UIManager.SetObjectToGrey(button.gameObject, b: true); - UIManager.SetObjectToGrey(currentPlate.gameObject, b: false); - button.isEnabled = false; - } - else - { - if (currentPlate != null) - { - currentPlate.gameObject.SetActive(value: false); - } - UIManager.SetObjectToGrey(button.gameObject, b: false); - button.isEnabled = true; - } - return currentPlate; - } - - protected void SaveDefaultPosition(GameObject obj) - { - if (obj != null) - { - _defaultPosition[obj.GetInstanceID()] = obj.transform.localPosition; - } - } - - protected void RestoreDefaultPosition(GameObject obj) - { - if (_defaultPosition.ContainsKey(obj.GetInstanceID())) - { - obj.transform.localPosition = _defaultPosition[obj.GetInstanceID()]; - } - } } diff --git a/SVSim.BattleEngine/Engine/MyPageItemBattle.cs b/SVSim.BattleEngine/Engine/MyPageItemBattle.cs index b89506ab..f39fdb5d 100644 --- a/SVSim.BattleEngine/Engine/MyPageItemBattle.cs +++ b/SVSim.BattleEngine/Engine/MyPageItemBattle.cs @@ -8,8 +8,4 @@ using Wizard.RoomMatch; // Held alive by MyPageMenu.BattleMenu return-type reference. See Task 2a of PASS8-PLAN.md. public class MyPageItemBattle : MyPageItem { - public IEnumerator JoinRoom(RoomConnectController.InitializeParameter param, bool isInvite) - { - yield break; - } } diff --git a/SVSim.BattleEngine/Engine/MyPageMenu.cs b/SVSim.BattleEngine/Engine/MyPageMenu.cs index 95911a6a..5a33cd56 100644 --- a/SVSim.BattleEngine/Engine/MyPageMenu.cs +++ b/SVSim.BattleEngine/Engine/MyPageMenu.cs @@ -14,31 +14,22 @@ public class MyPageMenu : UIBase public static MyPageMenu Instance => null; public MyPageItemHome HomeMenu => null; - public MyPageItemBattle BattleMenu => null; public bool IsEnableFooterCurrentMenu => false; public bool IsVisible => false; public bool _treasureBoxCpRewardDialogClosed => true; - public bool IsEnableRoomInvite => false; public bool IsFirstGuid => false; public TopBar TopBar { get; set; } public MyPageCustomBGControl CustomBGControl => null; - public List WinnerRewardInfoCopy => new List(); public static void SetEnableReloadCard() { } public static DialogBase CreateDialogForTutorial() => null; public void ChangeMenu(int index, bool isCutCardMotion = false) { } public void ChangeMyPageBG(MyPageDetail.BGType type, string id) { } - public void SetBackButtonEnable() { } - public void RoomInviteClear() { } - public BoxCollider GetNotTouchMypageCollider() => null; - public void SetDefaultBackButtonHandler() { } public void FinishTutorialMode() { } public void ResetFirstGuide() { } public void OnReadGift() { } - public void SpecialWinRewardOpened() { } - public void SetAfterSpecialWinRewardOpened() { } public void SetGuideEffect(Transform parent, Vector3 localPosition, float rotation) { } public void SetGuideToOkOnlyDialog(DialogBase dialog) { } public void UpdateMissionCount() { } diff --git a/SVSim.BattleEngine/Engine/RoomInviteFriendColum.cs b/SVSim.BattleEngine/Engine/RoomInviteFriendColum.cs deleted file mode 100644 index eb5ce502..00000000 --- a/SVSim.BattleEngine/Engine/RoomInviteFriendColum.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Collections.Generic; -using UnityEngine; -using Wizard.UIFriend; - -public class RoomInviteFriendColum : FriendDataBase -{ - [SerializeField] - public UIButton ButtonObject; - - [SerializeField] - private UISprite _guildIcon; - - [SerializeField] - private UISprite _friendIcon; - - [SerializeField] - public GameObject UnderLineObject; - - public override void SetPlayerData(Friend.PlayerData inPlayerData, List inLoadList) - { - base.SetPlayerData(inPlayerData, inLoadList); - if (_guildIcon != null) - { - _guildIcon.gameObject.SetActive(inPlayerData.IsSameGuildMember); - } - if (_friendIcon != null) - { - _friendIcon.gameObject.SetActive(inPlayerData.isFriend); - } - } -} diff --git a/SVSim.BattleEngine/Engine/RoomInviteReceiveDialog.cs b/SVSim.BattleEngine/Engine/RoomInviteReceiveDialog.cs deleted file mode 100644 index 22132817..00000000 --- a/SVSim.BattleEngine/Engine/RoomInviteReceiveDialog.cs +++ /dev/null @@ -1,255 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using Cute; -using UnityEngine; -using Wizard; -using Wizard.ErrorDialog; -using Wizard.RoomMatch; -using Wizard.UIFriend; - -public class RoomInviteReceiveDialog : MonoBehaviour -{ - [SerializeField] - protected UIWrapContent WrapContents; - - [SerializeField] - protected WrapContentsScrollBarSize WrapScrollbarSize; - - [SerializeField] - protected GameObject ScrollViewObject; - - [SerializeField] - protected GameObject ScrollBarObject; - - [SerializeField] - protected GameObject ScrollAreaObject; - - protected List _playerList; - - protected Dictionary> _loadQueueDict = new Dictionary>(); - - protected List _loadBookingList = new List(); - - protected List _loadedList = new List(); - - protected LoadQueue _loadQueue = new LoadQueue(); - - protected DialogBase _dialog; - - protected bool _isJoinRoom; - - public MyPageMenu MyPageClass { get; set; } - - public void SetFriendList() - { - _playerList = new List(); - Friend.PlayerData item = default(Friend.PlayerData); - foreach (UserFriend friend in Wizard.Data.FriendInfo.data.friendList) - { - item.Copy(friend); - _playerList.Add(item); - } - StartCoroutine(LoadCoroutine()); - } - - private IEnumerator LoadCoroutine() - { - if (_playerList.Count == 0) - { - _dialog = UIManager.GetInstance().CreateDialogClose(); - _dialog.SetTitleLabel(Wizard.Data.SystemText.Get("RoomBattle_0068")); - _dialog.SetButtonLayout(DialogBase.ButtonLayout.OkBtn); - _dialog.SetText(Wizard.Data.SystemText.Get("RoomBattle_0067")); - ReturnTopFromError(_playerList.Count); - } - else - { - _loadedList.Clear(); - _loadBookingList.Clear(); - _loadQueueDict.Clear(); - List list = new List(); - for (int i = 0; i < _playerList.Count; i++) - { - string assetTypePath = Toolbox.ResourcesManager.GetAssetTypePath(_playerList[i].EmblemId.ToString(), ResourcesManager.AssetLoadPathType.Emblem_S); - string assetTypePath2 = Toolbox.ResourcesManager.GetAssetTypePath(_playerList[i].Rank.ToString("00"), ResourcesManager.AssetLoadPathType.RankIcon_S); - string text = (string.IsNullOrEmpty(_playerList[i].Country) ? null : Toolbox.ResourcesManager.GetAssetTypePath(_playerList[i].Country, ResourcesManager.AssetLoadPathType.Country_S)); - List list2 = new List(); - if (!_loadedList.Contains(assetTypePath) && !list.Contains(assetTypePath)) - { - list.Add(assetTypePath); - list2.Add(assetTypePath); - } - foreach (string degreeResource in DegreeHelper.GetDegreeResourceList(_playerList[i].DegreeId, DegreeHelper.DegreeType.SMALL, isFetch: false)) - { - if (!_loadedList.Contains(degreeResource) && !list.Contains(degreeResource)) - { - list.Add(degreeResource); - list2.Add(degreeResource); - } - } - if (!_loadedList.Contains(assetTypePath2) && !list.Contains(assetTypePath2)) - { - list.Add(assetTypePath2); - list2.Add(assetTypePath2); - } - if (text != null && !_loadedList.Contains(text) && !list.Contains(text)) - { - list.Add(text); - list2.Add(text); - } - if (6 > i) - { - _loadBookingList.AddRange(list2); - continue; - } - _loadQueueDict.Add(i, list2); - LoadQueue.Callback onEnd = delegate(string id) - { - _loadedList.AddRange(_loadQueueDict[int.Parse(id)]); - }; - _loadQueue.AddToLast(i.ToString(), list2, null, onEnd); - } - bool loadEndFlg = false; - StartCoroutine(Toolbox.ResourcesManager.LoadAssetGroupAsync(_loadBookingList, delegate - { - loadEndFlg = true; - })); - while (!loadEndFlg) - { - yield return null; - } - _loadedList.AddRange(_loadBookingList); - _loadQueue.StartLoad(); - _dialog = UIManager.GetInstance().CreateDialogClose(); - _dialog.SetTitleLabel(Wizard.Data.SystemText.Get("RoomBattle_0069")); - _dialog.SetObj(base.gameObject); - _dialog.SetButtonLayout(DialogBase.ButtonLayout.CloseBtn); - _dialog.SetSize(DialogBase.Size.M); - _dialog.OnClose = delegate - { - UIManager.GetInstance().StartCoroutine(InviteDialogClose()); - }; - Init(); - } - UIManager.GetInstance().closeInSceneCenterLoading(); - } - - protected IEnumerator InviteDialogClose() - { - if (!_isJoinRoom) - { - UIManager.GetInstance().createInSceneCenterLoading(); - } - _loadQueue.Clear(); - while (_loadQueue.IsClearing) - { - yield return null; - } - Toolbox.ResourcesManager.RemoveAssetGroup(_loadedList); - if (!_isJoinRoom) - { - UIManager.GetInstance().closeInSceneCenterLoading(); - } - } - - public void Init() - { - WrapContents.onInitializeItem = _OnInitializeItem; - WrapContents.maxIndex = 0; - ScrollBarObject.GetComponent().m_WrapContents = WrapContents; - WrapContents.minIndex = -(_playerList.Count - 1); - WrapScrollbarSize.ContentUpdate(); - WrapContents.SortBasedOnScrollMovement(); - UIPanel component = ScrollViewObject.GetComponent(); - int count = _playerList.Count; - if (component.height > (float)(count * WrapContents.itemSize)) - { - ScrollBarObject.SetActive(value: false); - ScrollAreaObject.SetActive(value: false); - ScrollViewObject.GetComponent().ResetPosition(); - } - else - { - ScrollBarObject.SetActive(value: true); - ScrollAreaObject.SetActive(value: true); - } - ScrollViewObject.GetComponent().ResetPosition(); - ScrollBarObject.GetComponent().value = 0f; - } - - protected void _OnInitializeItem(GameObject go, int wrapIndex, int realIndex) - { - int num = realIndex * -1; - go.name = num.ToString(); - Transform[] componentsInChildren = go.GetComponentsInChildren(includeInactive: true); - Transform[] array; - if (num >= _playerList.Count || num < 0) - { - array = componentsInChildren; - for (int i = 0; i < array.Length; i++) - { - array[i].gameObject.SetActive(value: false); - } - return; - } - array = componentsInChildren; - for (int i = 0; i < array.Length; i++) - { - array[i].gameObject.SetActive(value: true); - } - go.transform.GetComponent().SetPlayerData(_playerList[num], _loadedList); - EventDelegate eventDelegate = new EventDelegate(this, "RoomJoin"); - eventDelegate.parameters[0].value = num; - RoomInviteFriendColum component = go.GetComponent(); - component.ButtonObject.onClick.Clear(); - component.ButtonObject.onClick.Add(eventDelegate); - if (num + 1 == _playerList.Count) - { - component.UnderLineObject.SetActive(value: false); - } - else - { - component.UnderLineObject.SetActive(value: true); - } - } - - protected void RoomJoin(int inPlayerIndex) - { - - InviteAcceptTask inviteAcceptTask = new InviteAcceptTask(); - inviteAcceptTask.SetParameter(_playerList[inPlayerIndex].ViewerId); - inviteAcceptTask.SkipAllCuteResultCodeCheckErrorPopup(); - StartCoroutine(Toolbox.NetworkManager.Connect(inviteAcceptTask, AcceptSuccess, null, ErrorDialog)); - } - - private void AcceptSuccess(NetworkTask.ResultCode inResultCode) - { - if (!(_dialog == null)) - { - _dialog.Close(); - _isJoinRoom = true; - RoomConnectController.InitializeParameter param = new RoomConnectController.InitializeParameter(RoomConnectController.PositionMode.VISITOR, new BattleParameter(NetworkDefine.ServerBattleType.OpenRoom, Format.Max, TwoPickFormat.None, Wizard.Data.InviteFriendBattle.BattleParameterInstance.Rule, isOpenDeckRoom: false), Wizard.Data.InviteFriendBattle.RoomId); - UIManager.GetInstance().StartCoroutine(MyPageMenu.Instance.BattleMenu.JoinRoom(param, isInvite: true)); - } - } - - protected void ErrorDialog(int inErrorNo) - { - ReturnTopFromError(Wizard.Data.Load.data._receiveInviteCount); - _dialog.Close(); - Dialog.Create(inErrorNo); - } - - protected void ReturnTopFromError(int inInviteCount) - { - if (inInviteCount <= 1) - { - InviteReset(); - } - } - - protected void InviteReset() - { - Object.Destroy(base.gameObject); - } -} diff --git a/SVSim.BattleEngine/Engine/TopBar.cs b/SVSim.BattleEngine/Engine/TopBar.cs index 943449f2..a54be079 100644 --- a/SVSim.BattleEngine/Engine/TopBar.cs +++ b/SVSim.BattleEngine/Engine/TopBar.cs @@ -47,45 +47,6 @@ public class TopBar : MonoBehaviour UIManager.SetObjectToGrey(BackButton.gameObject, !enable); } - public void SetBackButtonEvent(GameObject obj, UIManager.ViewScene backScene, EventDelegate inEvent) - { - BackButton.onClick.Clear(); - if (inEvent != null) - { - BackButton.onClick.Add(inEvent); - return; - } - BackButton.onClick.Add(new EventDelegate(delegate - { - UIBase uibase = obj.GetComponent(); - Action action = delegate - { - if (backScene == UIManager.ViewScene.None) - { - - uibase.PushTurnButton(); - } - else - { - UIManager.ViewScene currentScene = UIManager.GetInstance().GetCurrentScene(); - if (UIManager.GetInstance().IsCurrentScene(UIManager.ViewScene.Room)) - { - (UIManager.GetInstance().GetUIBase(UIManager.ViewScene.Room) as RoomRoot).CreateChangeSceneDialog(uibase.getBackScene(), UIManager.GetInstance().TopBarBackParameterDict[currentScene]); - } - else - { - - UIManager.GetInstance().ChangeViewScene(uibase.getBackScene(), UIManager.GetInstance().TopBarBackParameterDict[currentScene], UIManager.GetInstance().GetLastSceneChangeParam(uibase.getBackScene())); - } - } - }; - if (uibase.IsGetOutOfScene(action)) - { - action(); - } - })); - } - private void Awake() { TitleObject.SetActive(value: true); diff --git a/SVSim.BattleEngine/Engine/Wizard.Lottery/LotteryLoadTaskData.cs b/SVSim.BattleEngine/Engine/Wizard.Lottery/LotteryLoadTaskData.cs index a77fdb7f..9858048b 100644 --- a/SVSim.BattleEngine/Engine/Wizard.Lottery/LotteryLoadTaskData.cs +++ b/SVSim.BattleEngine/Engine/Wizard.Lottery/LotteryLoadTaskData.cs @@ -16,11 +16,6 @@ public class LotteryLoadTaskData private double ReceiveSinceStartUpTime { get; set; } - public bool IsCampaignTimeNow() - { - return IsTimeEnablePeriod(StartTime, EndTime); - } - private bool IsTimeEnablePeriod(DateTime start, DateTime end) { if (!IsEnable) diff --git a/SVSim.BattleEngine/Engine/Wizard/AllLabelColorChanger.cs b/SVSim.BattleEngine/Engine/Wizard/AllLabelColorChanger.cs index d18be69f..f6b075ab 100644 --- a/SVSim.BattleEngine/Engine/Wizard/AllLabelColorChanger.cs +++ b/SVSim.BattleEngine/Engine/Wizard/AllLabelColorChanger.cs @@ -83,12 +83,6 @@ public class AllLabelColorChanger } }; - public static Dictionary COLOR_TABLE_DECK_SELECTION_ROTATION_UNLIMITED = new Dictionary { - { - LabelDefine.TEXT_COLOR_NORMAL, - new ColorSet(FromHexRGB(16777215), FromHexRGB(16777215), UILabel.Effect.None, new Vector2(2f, 2f)) - } }; - public static Dictionary COLOR_TABLE_DECK_SELECTION = new Dictionary { { diff --git a/SVSim.BattleEngine/Engine/Wizard/AvatarBattleAllInfo.cs b/SVSim.BattleEngine/Engine/Wizard/AvatarBattleAllInfo.cs index 7a9b4a47..58f376c2 100644 --- a/SVSim.BattleEngine/Engine/Wizard/AvatarBattleAllInfo.cs +++ b/SVSim.BattleEngine/Engine/Wizard/AvatarBattleAllInfo.cs @@ -25,8 +25,6 @@ public class AvatarBattleAllInfo private double _receiveServerUnixTime; - public bool IsWithinFreeMatchPeriod => IsWithinPeriod(FreeMatchPeriod); - public AvatarBattleInfo Get(string id) { if (string.IsNullOrEmpty(id)) diff --git a/SVSim.BattleEngine/Engine/Wizard/CampaignBattleWin.cs b/SVSim.BattleEngine/Engine/Wizard/CampaignBattleWin.cs index 920416c6..cd42fdbf 100644 --- a/SVSim.BattleEngine/Engine/Wizard/CampaignBattleWin.cs +++ b/SVSim.BattleEngine/Engine/Wizard/CampaignBattleWin.cs @@ -12,9 +12,6 @@ public class CampaignBattleWin public enum eBoxStatus { - NO_GET, - ACTIVE, - ALREADY_GET } public bool IsInSessionCampaign { get; private set; } diff --git a/SVSim.BattleEngine/Engine/Wizard/Data.cs b/SVSim.BattleEngine/Engine/Wizard/Data.cs index 95f1581d..c922d51d 100644 --- a/SVSim.BattleEngine/Engine/Wizard/Data.cs +++ b/SVSim.BattleEngine/Engine/Wizard/Data.cs @@ -144,8 +144,6 @@ public static class Data public static GenerateDeckCode GenerateDeckCode { get; set; } - public static InviteFriendBattle InviteFriendBattle { get; set; } - public static InitializeRoomBattle InitializeRoomBattle { get; set; } public static ReplayInfo ReplayInfo { get; set; } diff --git a/SVSim.BattleEngine/Engine/Wizard/DeckSelectUI.cs b/SVSim.BattleEngine/Engine/Wizard/DeckSelectUI.cs index e867c75b..5afc53ce 100644 --- a/SVSim.BattleEngine/Engine/Wizard/DeckSelectUI.cs +++ b/SVSim.BattleEngine/Engine/Wizard/DeckSelectUI.cs @@ -20,8 +20,6 @@ public class DeckSelectUI : MonoBehaviour public bool CanUseNonPossessionCard { get; set; } public IFirstDisplayPageIndexGetter FirstDisplayPageIndexGetter { get; set; } - - public int? LongTextTitlePosition { get; set; } } private enum ChangeMoveDirection @@ -197,51 +195,6 @@ public class DeckSelectUI : MonoBehaviour public bool IsPageMoving { get; private set; } - public void Initialize(List deckGroupList, Format format, bool isVisibleCreateNew, Action onSelectDeck, Action onChangePage, Action onInitializeFinish, InitOptions initOptions = null) - { - if (initOptions == null) - { - initOptions = new InitOptions(); - } - _infoButton.gameObject.SetActive(initOptions.OnClickInfoButton != null); - _canUseNonPossessionCard = initOptions.CanUseNonPossessionCard; - UIEventListener uIEventListener = UIEventListener.Get(_flickCollider.gameObject); - uIEventListener.onDrag = (UIEventListener.VectorDelegate)Delegate.Combine(uIEventListener.onDrag, (UIEventListener.VectorDelegate)delegate(GameObject g, Vector2 v) - { - OnDragPanel(v); - }); - UIEventListener uIEventListener2 = UIEventListener.Get(_rightButton.gameObject); - uIEventListener2.onClick = (UIEventListener.VoidDelegate)Delegate.Combine(uIEventListener2.onClick, (UIEventListener.VoidDelegate)delegate - { - NextPage(); - }); - UIEventListener uIEventListener3 = UIEventListener.Get(_leftButton.gameObject); - uIEventListener3.onClick = (UIEventListener.VoidDelegate)Delegate.Combine(uIEventListener3.onClick, (UIEventListener.VoidDelegate)delegate - { - PrevPage(); - }); - if (initOptions.OnClickInfoButton != null) - { - UIEventListener uIEventListener4 = UIEventListener.Get(_infoButton.gameObject); - uIEventListener4.onClick = (UIEventListener.VoidDelegate)Delegate.Combine(uIEventListener4.onClick, (UIEventListener.VoidDelegate)delegate - { - - initOptions.OnClickInfoButton.Call(); - }); - } - OnSelectDeck = onSelectDeck; - OnChangePage = onChangePage; - _deckTables[0] = new DeckTable(_deckTableGrids[0], _deckFrameOriginal, OnClickDeck, OnDragPanel, initOptions.OnUpdateDeckUICustomize); - _deckTables[1] = new DeckTable(_deckTableGrids[1], _deckFrameOriginal, OnClickDeck, OnDragPanel, initOptions.OnUpdateDeckUICustomize); - _cautionLabel.gameObject.SetActive(value: false); - Action onSettingDeckListFinish = delegate - { - _isInitialized = true; - onInitializeFinish.Call(); - }; - UpdateDeckView(deckGroupList, format, isVisibleCreateNew, onSettingDeckListFinish, initOptions.PrimaryFirstDisplayDeck, initOptions.FirstDisplayPageIndexGetter); - } - public void UpdateDeckView(List deckGroupList, Format format, bool isVisibleCreateNew, Action onSettingDeckListFinish = null, DeckData primaryFirstDisplayDeck = null, IFirstDisplayPageIndexGetter firstDisplayPageIndexGetter = null) { List list = new List(); diff --git a/SVSim.BattleEngine/Engine/Wizard/DeckSelectUIDialog.cs b/SVSim.BattleEngine/Engine/Wizard/DeckSelectUIDialog.cs deleted file mode 100644 index 94cb7231..00000000 --- a/SVSim.BattleEngine/Engine/Wizard/DeckSelectUIDialog.cs +++ /dev/null @@ -1,263 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using Cute; -using UnityEngine; - -namespace Wizard; - -public class DeckSelectUIDialog -{ - public enum eFormatChangeUIType - { - SingleFormat, - NormalFormatOnly, - WithPrerotation, - WithCrossover, - WithMyRotation, - UseOtherCategory - } - - private static readonly Vector2 FORMAT_CHANGE_UI_POSITION = new Vector3(-508f, 65f); - - private DeckSelectUIDialogTitle _deckSelectDialogTitleUI; - - private DeckGroupListData _deckGroupListData; - - private bool _isVisibleCreateNew; - - private DeckSelectUI _deckSelectUI; - - private static readonly Format[] OTHER_CATEGORY_FORMATS = new Format[5] - { - Format.Crossover, - Format.PreRotation, - Format.MyRotation, - Format.Avatar, - Format.Max - }; - - private static readonly Dictionary FORMAT_CATEGORY_TO_FORMAT = new Dictionary - { - { - FormatChangeUI.FormatCategory.Rotation, - Format.Rotation - }, - { - FormatChangeUI.FormatCategory.Unlimited, - Format.Unlimited - }, - { - FormatChangeUI.FormatCategory.PreRotation, - Format.PreRotation - }, - { - FormatChangeUI.FormatCategory.Crossover, - Format.Crossover - }, - { - FormatChangeUI.FormatCategory.Other, - Format.Max - }, - { - FormatChangeUI.FormatCategory.Hof, - Format.Hof - }, - { - FormatChangeUI.FormatCategory.Windfall, - Format.Windfall - }, - { - FormatChangeUI.FormatCategory.MyRotation, - Format.MyRotation - }, - { - FormatChangeUI.FormatCategory.Avatar, - Format.Avatar - } - }; - - public DialogBase Dialog { get; private set; } - - public static DeckSelectUIDialog Create(string dialogTitle, DeckGroupListData deckGroupListData, Format defaultFormat, eFormatChangeUIType formatChangeUIType, bool isVisibleCreateNew, Action OnSelectDeck, DeckSelectUI.InitOptions initOptions = null) - { - if (defaultFormat == Format.All) - { - defaultFormat = (Format)PlayerPrefsWrapper.GetValue(PlayerPrefsWrapper.LAST_SELECT_DECK_FORMAT); - } - if (formatChangeUIType == eFormatChangeUIType.UseOtherCategory && IsIncludeInOtherCategory(defaultFormat)) - { - defaultFormat = Format.Max; - bool num = PlayerPrefsWrapper.GetBool(PlayerPrefsWrapper.LAST_BATTLE_IS_TRIALDECK); - bool flag = PlayerPrefsWrapper.GetBool(PlayerPrefsWrapper.LAST_BATTLE_IS_DEFDECK); - if (!num && !flag) - { - Format[] oTHER_CATEGORY_FORMATS = OTHER_CATEGORY_FORMATS; - foreach (Format format in oTHER_CATEGORY_FORMATS) - { - if (deckGroupListData.IsExistDeckListByFormat(format)) - { - defaultFormat = format; - break; - } - } - } - } - if (formatChangeUIType != eFormatChangeUIType.SingleFormat && !deckGroupListData.IsExistDeckListByFormat(defaultFormat)) - { - defaultFormat = deckGroupListData.DeckGroupList.FirstOrDefault((DeckGroup deckGroup) => deckGroup.DeckDataList.Any((DeckData deck) => !deck.IsNoCard()))?.DeckFormat ?? Format.Rotation; - } - FormatChangeUI.FormatCategory formatCategoryByFormat = GetFormatCategoryByFormat(defaultFormat, formatChangeUIType == eFormatChangeUIType.UseOtherCategory); - DeckSelectUIDialog deckSelectUIDialog = new DeckSelectUIDialog(dialogTitle, deckGroupListData, defaultFormat, formatCategoryByFormat, formatChangeUIType, isVisibleCreateNew, OnSelectDeck, initOptions); - deckSelectUIDialog.CreateFormatChangeUI(formatCategoryByFormat, formatChangeUIType); - return deckSelectUIDialog; - } - - private DeckSelectUIDialog(string dialogTitle, DeckGroupListData deckGroupListData, Format format, FormatChangeUI.FormatCategory formatCategory, eFormatChangeUIType formatChangeUIType, bool isVisibleCreateNew, Action OnSelectDeck, DeckSelectUI.InitOptions initOptions) - { - DeckSelectUIDialog deckSelectUIDialog = this; - _isVisibleCreateNew = isVisibleCreateNew; - _deckGroupListData = deckGroupListData; - Dialog = UIManager.GetInstance().CreateDialogClose(); - Dialog.SetTitleLabel(dialogTitle); - Dialog.SetSize(DialogBase.Size.XL); - Dialog.SetButtonLayout(DialogBase.ButtonLayout.NONE); - Dialog.SetActive(inActive: false); - int? longTextPositionOverride = initOptions?.LongTextTitlePosition; - _deckSelectDialogTitleUI = DeckSelectUIDialogTitle.Create(Dialog, dialogTitle, format, formatChangeUIType != eFormatChangeUIType.SingleFormat, longTextPositionOverride); - List deckGroupList = GetDeckGroupList(formatCategory); - GameObject gameObject = UnityEngine.Object.Instantiate(Resources.Load("UI/DeckList/DeckSelectUI/DeckSelectUI")) as GameObject; - _deckSelectUI = gameObject.GetComponent(); - _deckSelectUI.gameObject.SetActive(value: false); - _deckSelectUI.Initialize(deckGroupList, format, isVisibleCreateNew, delegate(DeckData deck) - { - OnSelectDeck.Call(deckSelectUIDialog.Dialog, deck); - }, delegate(Format changeFormat) - { - deckSelectUIDialog._deckSelectDialogTitleUI.UpdateFormatObj(changeFormat); - }, delegate - { - deckSelectUIDialog.Dialog.SetActive(inActive: true); - deckSelectUIDialog._deckSelectUI.gameObject.SetActive(value: true); - }, initOptions); - Dialog.SetObj(_deckSelectUI.gameObject); - _deckSelectUI.gameObject.GetComponent().alpha = 1f; - } - - public void Close() - { - if (Dialog != null) - { - Dialog.Close(); - } - } - - public static string GetTitleByBattleType(DataMgr.BattleType battleType) - { - string result = string.Empty; - switch (battleType) - { - case DataMgr.BattleType.FreeBattle: - result = Data.SystemText.Get("Battle_0005"); - break; - case DataMgr.BattleType.RankBattle: - result = Data.SystemText.Get("Battle_0006"); - break; - case DataMgr.BattleType.RoomBattle: - case DataMgr.BattleType.RoomTwoPick: - result = Data.SystemText.Get("Battle_0007"); - break; - case DataMgr.BattleType.ColosseumNormal: - case DataMgr.BattleType.ColosseumHof: - result = Data.SystemText.Get("Battle_0488"); - break; - } - return result; - } - - private void CreateFormatChangeUI(FormatChangeUI.FormatCategory defaultFormatCategory, eFormatChangeUIType formatChangeUIType) - { - if (formatChangeUIType != eFormatChangeUIType.SingleFormat) - { - FormatChangeUI.FormatCategory anotherFormatCategory = FormatChangeUI.FormatCategory.Invalid; - switch (formatChangeUIType) - { - case eFormatChangeUIType.NormalFormatOnly: - anotherFormatCategory = FormatChangeUI.FormatCategory.Invalid; - break; - case eFormatChangeUIType.UseOtherCategory: - anotherFormatCategory = FormatChangeUI.FormatCategory.Other; - break; - case eFormatChangeUIType.WithPrerotation: - anotherFormatCategory = FormatChangeUI.FormatCategory.PreRotation; - break; - case eFormatChangeUIType.WithCrossover: - anotherFormatCategory = FormatChangeUI.FormatCategory.Crossover; - break; - case eFormatChangeUIType.WithMyRotation: - anotherFormatCategory = FormatChangeUI.FormatCategory.MyRotation; - break; - } - FormatChangeUI formatChangeUI = FormatChangeUI.Create(defaultFormatCategory, anotherFormatCategory, OnClickChangeFormatBtn); - Dialog.AttachObjToTitleLabel(formatChangeUI.gameObject, FORMAT_CHANGE_UI_POSITION); - } - } - - private void OnClickChangeFormatBtn(FormatChangeUI.FormatCategory formatCategory) - { - Format formatByFormatCategory = GetFormatByFormatCategory(formatCategory); - _deckSelectUI.gameObject.SetActive(value: false); - List deckGroupList = GetDeckGroupList(formatCategory); - _deckSelectUI.UpdateDeckView(deckGroupList, formatByFormatCategory, _isVisibleCreateNew, delegate - { - _deckSelectUI.gameObject.SetActive(value: true); - }); - } - - private List GetDeckGroupList(FormatChangeUI.FormatCategory formatCategory) - { - List list = new List(); - if (formatCategory == FormatChangeUI.FormatCategory.Other) - { - Format[] oTHER_CATEGORY_FORMATS = OTHER_CATEGORY_FORMATS; - foreach (Format format in oTHER_CATEGORY_FORMATS) - { - list.AddRange(_deckGroupListData.SelectDeckGroupList(format)); - } - } - else - { - Format formatByFormatCategory = GetFormatByFormatCategory(formatCategory); - list.AddRange(_deckGroupListData.SelectDeckGroupList(formatByFormatCategory)); - } - return list; - } - - private static Format GetFormatByFormatCategory(FormatChangeUI.FormatCategory formatCategory) - { - return FORMAT_CATEGORY_TO_FORMAT[formatCategory]; - } - - private static FormatChangeUI.FormatCategory GetFormatCategoryByFormat(Format format, bool useOtherCategory) - { - if (useOtherCategory && IsIncludeInOtherCategory(format)) - { - return FormatChangeUI.FormatCategory.Other; - } - FormatChangeUI.FormatCategory result = FormatChangeUI.FormatCategory.Invalid; - foreach (KeyValuePair item in FORMAT_CATEGORY_TO_FORMAT) - { - if (item.Value == format) - { - result = item.Key; - break; - } - } - return result; - } - - private static bool IsIncludeInOtherCategory(Format format) - { - return OTHER_CATEGORY_FORMATS.Any((Format f) => f == format); - } -} diff --git a/SVSim.BattleEngine/Engine/Wizard/DeckSelectUIDialogTitle.cs b/SVSim.BattleEngine/Engine/Wizard/DeckSelectUIDialogTitle.cs deleted file mode 100644 index 9540d28b..00000000 --- a/SVSim.BattleEngine/Engine/Wizard/DeckSelectUIDialogTitle.cs +++ /dev/null @@ -1,181 +0,0 @@ -using System.Collections; -using UnityEngine; - -namespace Wizard; - -public class DeckSelectUIDialogTitle : MonoBehaviour -{ - - private static readonly Color32 FORMAT_COLOR_ROTATION = new Color32(43, 39, 144, byte.MaxValue); - - private static readonly Color32 FORMAT_COLOR_UNLIMITED = new Color32(125, 60, 37, byte.MaxValue); - - private static readonly Color32 FORMAT_COLOR_PRE_ROTATION = new Color32(23, 111, 40, byte.MaxValue); - - private static readonly Color32 FORMAT_COLOR_CROSSOVER = new Color32(156, 55, 140, byte.MaxValue); - - private static readonly Color32 FORMAT_COLOR_MYROTATION = new Color32(184, 25, 70, byte.MaxValue); - - private static readonly Color32 FORMAT_COLOR_AVATAR = new Color32(147, 140, 19, byte.MaxValue); - - [SerializeField] - private GameObject _titleUIRoot; - - [SerializeField] - private UILabel _deckListTitleLabel; - - [SerializeField] - private UITable _formatTable; - - [SerializeField] - private UILabel _formatLabel; - - [SerializeField] - private UISprite _formatIcon; - - [SerializeField] - private UISprite _formatDecorationSprite; - - [SerializeField] - private int _tableBorderLine; - - private Format _format; - - private Vector3 _tableFirstPosition; - - private bool _isFirstUpdateTablePosition = true; - - private int? _longTextPositionOverride; - - private bool _isExistFormatChangeUI; - - public static DeckSelectUIDialogTitle Create(DialogBase dialog, string titleText, Format defaultFormat, bool isExistFormatChangeUI, int? longTextPositionOverride) - { - DeckSelectUIDialogTitle component = (Object.Instantiate(Resources.Load("UI/DeckList/DeckSelectUI/DeckSelectUIDialogTitle")) as GameObject).GetComponent(); - component.Initialize(dialog, titleText, defaultFormat, isExistFormatChangeUI, longTextPositionOverride); - return component; - } - - private void Initialize(DialogBase dialog, string titleText, Format defaultFormat, bool isExistFormatChangeUI, int? longTextPositionOverride) - { - _longTextPositionOverride = longTextPositionOverride; - _isExistFormatChangeUI = isExistFormatChangeUI; - _deckListTitleLabel.InitializeFont(); - _formatLabel.InitializeFont(); - _deckListTitleLabel.text = titleText; - dialog.AttachObjToTitleLabel(_titleUIRoot, Vector3.zero); - dialog.SetTitleLabelActive(active: false); - UpdateFormatObj(defaultFormat); - } - - public void UpdateFormatObj(Format format) - { - _format = format; - switch (format) - { - case Format.Rotation: - SetActiveFormatObjs(isActive: true); - _formatIcon.spriteName = "icon_timesliprotation_s"; - _formatLabel.text = Data.SystemText.Get("Common_0154"); - _formatDecorationSprite.color = FORMAT_COLOR_ROTATION; - break; - case Format.PreRotation: - SetActiveFormatObjs(isActive: true); - _formatIcon.spriteName = "icon_prerotation_s"; - _formatLabel.text = Data.SystemText.Get("Common_0163"); - _formatDecorationSprite.color = FORMAT_COLOR_PRE_ROTATION; - break; - case Format.Unlimited: - SetActiveFormatObjs(isActive: true); - _formatIcon.spriteName = "icon_unlimited_s"; - _formatLabel.text = Data.SystemText.Get("Common_0155"); - _formatDecorationSprite.color = FORMAT_COLOR_UNLIMITED; - break; - case Format.Crossover: - SetActiveFormatObjs(isActive: true); - _formatIcon.spriteName = "icon_crossover_s"; - _formatLabel.text = Data.SystemText.Get("Common_0166"); - _formatDecorationSprite.color = FORMAT_COLOR_CROSSOVER; - break; - case Format.MyRotation: - SetActiveFormatObjs(isActive: true); - _formatIcon.spriteName = "icon_myrotation_s"; - _formatLabel.text = Data.SystemText.Get("Common_0178"); - _formatDecorationSprite.color = FORMAT_COLOR_MYROTATION; - break; - case Format.Avatar: - SetActiveFormatObjs(isActive: true); - _formatIcon.spriteName = "icon_heroesbattle_s"; - _formatLabel.text = Data.SystemText.Get("HeroesBattle_0001"); - _formatDecorationSprite.color = FORMAT_COLOR_AVATAR; - break; - default: - SetActiveFormatObjs(isActive: false); - break; - } - _formatTable.Reposition(); - if (UIManager.GetInstance().IsCurrentScene(UIManager.ViewScene.QuestSelectionPage)) - { - _deckListTitleLabel.color = LabelDefine.TEXT_COLOR_NORMAL; - _formatLabel.color = LabelDefine.TEXT_COLOR_NORMAL; - if (format == Format.Unlimited || format == Format.Rotation) - { - AllLabelColorChanger.ChangeAllLabel(_formatTable.gameObject, AllLabelColorChanger.COLOR_TABLE_DECK_SELECTION_ROTATION_UNLIMITED); - } - else - { - AllLabelColorChanger.ChangeAllLabel(_formatTable.gameObject); - } - } - UpdateTablePosition(); - } - - private IEnumerator UpdateTableCoroutine() - { - yield return null; - UpdateTablePosition(); - } - - [ContextMenu("UpdateTablePosition")] - public void UpdateTablePosition() - { - Bounds bounds = NGUIMath.CalculateRelativeWidgetBounds(_formatTable.transform); - if (bounds.size.x < 1f) - { - UIManager.GetInstance().StartCoroutine(UpdateTableCoroutine()); - return; - } - if (_isFirstUpdateTablePosition) - { - _isFirstUpdateTablePosition = false; - _tableFirstPosition = _formatTable.transform.localPosition; - } - _formatTable.transform.localPosition = _tableFirstPosition; - if (!_isExistFormatChangeUI) - { - return; - } - if ((int)bounds.size.x <= _tableBorderLine) - { - if (_longTextPositionOverride.HasValue && _format == Format.Rotation) - { - _formatTable.transform.localPosition = new Vector3(_longTextPositionOverride.Value, _tableFirstPosition.y, _tableFirstPosition.z); - } - } - else if (_longTextPositionOverride.HasValue) - { - _formatTable.transform.localPosition = new Vector3(_longTextPositionOverride.Value, _tableFirstPosition.y, _tableFirstPosition.z); - } - else - { - _formatTable.transform.localPosition = _tableFirstPosition + new Vector3(bounds.size.x - (float)_tableBorderLine, 0f, 0f); - } - } - - private void SetActiveFormatObjs(bool isActive) - { - _formatIcon.gameObject.SetActive(isActive); - _formatLabel.gameObject.SetActive(isActive); - _formatDecorationSprite.gameObject.SetActive(isActive); - } -} diff --git a/SVSim.BattleEngine/Engine/Wizard/FirstTips.cs b/SVSim.BattleEngine/Engine/Wizard/FirstTips.cs index 10034937..28b4237a 100644 --- a/SVSim.BattleEngine/Engine/Wizard/FirstTips.cs +++ b/SVSim.BattleEngine/Engine/Wizard/FirstTips.cs @@ -13,7 +13,6 @@ public class FirstTips : MonoBehaviour Deck = 0, Battle = 4, ShopCardPack = 10, - BattleBeforeFormatUser = 13, ColosseumInfo = 17, GachaPointExchange = 24, Quest = 25, @@ -21,7 +20,6 @@ public class FirstTips : MonoBehaviour Crossover = 28, MyRotationDeck = 33, BossRush = 34, - HeroesFreeMatch = 40, TimeslipResurgentCard = 42, Max = 46, MyPage = 1001 } diff --git a/SVSim.BattleEngine/Engine/Wizard/FormatChangeUI.cs b/SVSim.BattleEngine/Engine/Wizard/FormatChangeUI.cs index 80405afe..af907965 100644 --- a/SVSim.BattleEngine/Engine/Wizard/FormatChangeUI.cs +++ b/SVSim.BattleEngine/Engine/Wizard/FormatChangeUI.cs @@ -15,10 +15,7 @@ public class FormatChangeUI : MonoBehaviour Unlimited, PreRotation, Crossover, - Hof, - Windfall, MyRotation, - Avatar, Other } @@ -55,14 +52,6 @@ public class FormatChangeUI : MonoBehaviour private Action _onChangeFormat; - public static FormatChangeUI Create(FormatCategory defaultFormatCategory, FormatCategory anotherFormatCategory, Action onChangeFormat) - { - FormatChangeUI component = (UnityEngine.Object.Instantiate(Resources.Load("UI/layoutParts/Guild/FormatChangeUI")) as GameObject).GetComponent(); - component.gameObject.SetActive(value: true); - component.Initialize(defaultFormatCategory, anotherFormatCategory, onChangeFormat); - return component; - } - public void ChangeFormat(FormatCategory inFormatCategory) { _currentFormatCategory = inFormatCategory; diff --git a/SVSim.BattleEngine/Engine/Wizard/FreeAndRankMatchDeckSelectConfirmDialog.cs b/SVSim.BattleEngine/Engine/Wizard/FreeAndRankMatchDeckSelectConfirmDialog.cs index f8ac53c2..b5216c6a 100644 --- a/SVSim.BattleEngine/Engine/Wizard/FreeAndRankMatchDeckSelectConfirmDialog.cs +++ b/SVSim.BattleEngine/Engine/Wizard/FreeAndRankMatchDeckSelectConfirmDialog.cs @@ -6,29 +6,6 @@ namespace Wizard; public static class FreeAndRankMatchDeckSelectConfirmDialog { - public static void Create(DialogBase dialogDeckList, DeckData deck, bool isBattleEnd) - { - if (!deck.IsUsable()) - { - InCompleteDeckDecideDialog.Create(dialogDeckList, deck, null, canUseNonPossessionCard: false, ChangeViewSceneAndSetBattleRetry); - return; - } - CompleteDeckDecideDialog.CreateForSingleDeck(dialogDeckList, deck, showSimpleStageOption: true, delegate - { - DecideDeck(deck, isBattleEnd); - }).DecisionUI.CardListCustomize = delegate(UICardList uiCardList) - { - if (!deck.IsRentalDeck) - { - uiCardList.SetEnableBlueButton(isEnable: true, Data.SystemText.Get("Card_0007"), delegate - { - - DeckCardEditUI.SetDeckEditParameter(deck, null); - ChangeViewSceneAndSetBattleRetry(UIManager.ViewScene.DeckCardEdit); - }); - } - }; - } public static void DecideDeck(DeckData deck, bool isBattleEnd, bool notBlack = false, bool notCollider = false) { diff --git a/SVSim.BattleEngine/Engine/Wizard/InviteAcceptTask.cs b/SVSim.BattleEngine/Engine/Wizard/InviteAcceptTask.cs deleted file mode 100644 index f5321699..00000000 --- a/SVSim.BattleEngine/Engine/Wizard/InviteAcceptTask.cs +++ /dev/null @@ -1,33 +0,0 @@ -namespace Wizard; - -public class InviteAcceptTask : BaseTask -{ - public class InviteAcceptTaskParam : BaseParam - { - public int friend_viewer_id; - } - - public InviteAcceptTask() - { - base.type = ApiType.Type.InviteAccept; - } - - public void SetParameter(int friendViewerId) - { - InviteAcceptTaskParam inviteAcceptTaskParam = new InviteAcceptTaskParam(); - inviteAcceptTaskParam.friend_viewer_id = friendViewerId; - base.Params = inviteAcceptTaskParam; - } - - protected override int Parse() - { - int num = base.Parse(); - if (num != 1) - { - return num; - } - Data.InviteFriendBattle.RoomId = base.ResponseData["data"]["room_id"].ToString(); - Data.InviteFriendBattle.BattleParameterInstance = BattleParameter.JsonToBattleParameter(base.ResponseData["data"]); - return num; - } -} diff --git a/SVSim.BattleEngine/Engine/Wizard/InviteGetListTask.cs b/SVSim.BattleEngine/Engine/Wizard/InviteGetListTask.cs deleted file mode 100644 index 400ab208..00000000 --- a/SVSim.BattleEngine/Engine/Wizard/InviteGetListTask.cs +++ /dev/null @@ -1,39 +0,0 @@ -using LitJson; - -namespace Wizard; - -public class InviteGetListTask : BaseTask -{ - public class InviteGetListTaskParam : BaseParam - { - } - - public InviteGetListTask() - { - base.type = ApiType.Type.InviteGetList; - } - - public void SetParameter() - { - InviteGetListTaskParam inviteGetListTaskParam = new InviteGetListTaskParam(); - base.Params = inviteGetListTaskParam; - } - - protected override int Parse() - { - int num = base.Parse(); - if (num != 1) - { - return num; - } - Data.FriendInfo.Initialize(); - JsonData jsonData = base.ResponseData["data"]; - for (int i = 0; i < jsonData.Count; i++) - { - UserFriend item = new UserFriend(jsonData[i]); - Data.FriendInfo.data.friendList.Add(item); - } - Data.FriendInfo.servertime = base.ResponseData["data_headers"]["servertime"].ToInt(); - return num; - } -} diff --git a/SVSim.BattleEngine/Engine/Wizard/LoadQueue.cs b/SVSim.BattleEngine/Engine/Wizard/LoadQueue.cs deleted file mode 100644 index aef12375..00000000 --- a/SVSim.BattleEngine/Engine/Wizard/LoadQueue.cs +++ /dev/null @@ -1,145 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using Cute; - -namespace Wizard; - -public class LoadQueue -{ - public delegate void Callback(string id); - - private class Data - { - public string ID { get; private set; } - - public List PathList { get; set; } - - public Callback OnStart { get; set; } - - public Callback OnEnd { get; set; } - - public Data(string id, List pathList, Callback onStart, Callback onEnd) - { - ID = id; - PathList = pathList; - OnStart = onStart; - OnEnd = onEnd; - } - } - - private enum State - { - IDLE, - LOAD - } - - private readonly List _loadList = new List(); - - private State _state; - - public bool IsChangingPauseLoad { get; private set; } - - public bool IsClearing { get; private set; } - - public void AddToLast(string id, List pathList, Callback onStart, Callback onEnd) - { - Add(isFirst: false, id, pathList, onStart, onEnd); - } - - public void Add(bool isFirst, string id, List pathList, Callback onStart, Callback onEnd) - { - Remove(id); - Data item = new Data(id, pathList, onStart, onEnd); - if (isFirst) - { - _loadList.Insert(0, item); - } - else - { - _loadList.Add(item); - } - } - - public bool Remove(string id) - { - if (IsValidId(id)) - { - return _loadList.RemoveAll((Data x) => x.ID == id) > 0; - } - return false; - } - - public void StartLoad() - { - IsChangingPauseLoad = false; - if (_state != State.LOAD) - { - _state = State.LOAD; - LoadNext(); - } - } - - private void LoadNext() - { - if (_loadList.Count <= 0) - { - _state = State.IDLE; - return; - } - Data data = _loadList[0]; - _loadList.RemoveAt(0); - data.OnStart?.Invoke(data.ID); - if (data.PathList != null) - { - List list = (data.PathList = data.PathList.Where((string path) => !string.IsNullOrEmpty(path)).ToList()); - List list3 = list; - if (list3.Count > 0) - { - Toolbox.ResourcesManager.StartCoroutine_LoadAssetGroupAsync(list3, delegate - { - EndOneLoad(data); - }); - return; - } - } - EndOneLoad(data); - } - - private void EndOneLoad(Data data) - { - if (IsClearing) - { - _state = State.IDLE; - IsClearing = false; - if (data.PathList != null) - { - Toolbox.ResourcesManager.RemoveAssetGroup(data.PathList); - } - } - else if (IsChangingPauseLoad) - { - _state = State.IDLE; - IsChangingPauseLoad = false; - data.OnEnd?.Invoke(data.ID); - } - else - { - data.OnEnd?.Invoke(data.ID); - LoadNext(); - } - } - - public void Clear() - { - _loadList.Clear(); - if (_state == State.LOAD) - { - IsClearing = true; - } - } - - private static bool IsValidId(string id) - { - return !string.IsNullOrEmpty(id); - } -} diff --git a/SVSim.BattleEngine/Engine/Wizard/MyPageDetail.cs b/SVSim.BattleEngine/Engine/Wizard/MyPageDetail.cs index ec8eed2d..ef359a0c 100644 --- a/SVSim.BattleEngine/Engine/Wizard/MyPageDetail.cs +++ b/SVSim.BattleEngine/Engine/Wizard/MyPageDetail.cs @@ -20,8 +20,6 @@ public class MyPageDetail public int unreceived_mission_reward_count; - public LotteryLoadTaskData _lotteryData = new LotteryLoadTaskData(); - public List _bannerList; public List _subBannerInfoList; @@ -38,20 +36,6 @@ public class MyPageDetail public SpeedChallengeInfo SpeedChallengeInfo { get; set; } - public bool IsRoomNonPossessionCardCampaign() - { - if (RoomNonPossessionCardCampaign == null) - { - return false; - } - double nowUnixTime = GetNowUnixTime(); - if (nowUnixTime < RoomNonPossessionCardCampaign.StartUnixTime || nowUnixTime >= RoomNonPossessionCardCampaign.EndUnixTime) - { - return false; - } - return true; - } - private double GetNowUnixTime() { return ServerUnixTime + (double)Time.realtimeSinceStartup - (double)SinceTime; diff --git a/SVSim.BattleEngine/Engine/Wizard/MyPageRewardDialogBoxCount.cs b/SVSim.BattleEngine/Engine/Wizard/MyPageRewardDialogBoxCount.cs deleted file mode 100644 index 2195ebb7..00000000 --- a/SVSim.BattleEngine/Engine/Wizard/MyPageRewardDialogBoxCount.cs +++ /dev/null @@ -1,34 +0,0 @@ -using UnityEngine; - -namespace Wizard; - -public class MyPageRewardDialogBoxCount : MonoBehaviour -{ - [SerializeField] - private UILabel _label; - - public static GameObject Create(GameObject prefab, CampaignBattleWin info) - { - GameObject obj = Object.Instantiate(prefab); - obj.GetComponentInChildren().Initialize(info); - return obj; - } - - private void Initialize(CampaignBattleWin info) - { - string text = ""; - switch (info.BoxStatus) - { - case CampaignBattleWin.eBoxStatus.NO_GET: - text = Data.SystemText.Get("MyPage_0078"); - break; - case CampaignBattleWin.eBoxStatus.ACTIVE: - text = Data.SystemText.Get("MyPage_0079"); - break; - case CampaignBattleWin.eBoxStatus.ALREADY_GET: - text = Data.SystemText.Get("MyPage_0080"); - break; - } - _label.text = Data.SystemText.Get("MyPage_0077") + " " + text; - } -} diff --git a/SVSim.BattleEngine/Engine/Wizard/MyPageSpecialWinRewardDialog.cs b/SVSim.BattleEngine/Engine/Wizard/MyPageSpecialWinRewardDialog.cs deleted file mode 100644 index 62eb425d..00000000 --- a/SVSim.BattleEngine/Engine/Wizard/MyPageSpecialWinRewardDialog.cs +++ /dev/null @@ -1,198 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using Cute; -using UnityEngine; - -namespace Wizard; - -public class MyPageSpecialWinRewardDialog : MonoBehaviour -{ - - private float[] _memoryValue = new float[16] - { - 0f, 0.0585f, 0.126f, 0.194f, 0.263f, 0.331f, 0.399f, 0.467f, 0.535f, 0.602f, - 0.67f, 0.738f, 0.806f, 0.875f, 0.943f, 1f - }; - - [SerializeField] - private UISprite _boxSprite; - - [SerializeField] - private UIGauge _gradeGauge; - - [SerializeField] - private UISprite _gaugeBackground; - - [SerializeField] - private UILabel _treasureBoxLabel; - - [SerializeField] - private UILabel _titleLabel; - - [SerializeField] - private UILabel _completeLabel; - - [SerializeField] - private GameObject _clickObject; - - [SerializeField] - private BoxCollider _clickObjectCollider; - - [SerializeField] - private UILabel _remineNumLabel; - - private List _loadFileList = new List(); - - private UIAtlas _arenaAtlas; - - private BoxCollider _notTouchMypageCollider; - - private GameObject _boxOpenEffectObj; - - private GameObject _treasureEffectObj; - - public static GameObject Create(GameObject prefab, BoxCollider notTouchMypageCollider) - { - GameObject obj = UnityEngine.Object.Instantiate(prefab); - obj.GetComponentInChildren().Initialize(notTouchMypageCollider); - return obj; - } - - private void Initialize(BoxCollider notTouchMypageCollider) - { - SystemText systemText = Data.SystemText; - _notTouchMypageCollider = notTouchMypageCollider; - SpecialTreasureInfo info = Data.MyPageNotifications.data.CampaignBattleWin.SpecialTreasureInfo; - _titleLabel.text = systemText.Get("MyPage_0109", info.SpecialTreasureBoxNecessaryNumbers.ToString()); - _remineNumLabel.text = systemText.Get("MyPage_0113", (info.SpecialTreasureBoxNecessaryNumbers - info.ReceivedBoxNumbers).ToString()); - _gradeGauge.Value = _memoryValue[info.ReceivedBoxNumbers]; - _treasureBoxLabel.text = (info.IsGotSpecialTreasureBox ? systemText.Get("TreasureBoxCp_0009") : ""); - UIManager.SetObjectToGrey(_boxSprite.gameObject, info.IsGotSpecialTreasureBox); - _completeLabel.gameObject.SetActive(info.ReceivedBoxNumbers == info.SpecialTreasureBoxNecessaryNumbers); - _clickObject.SetActive(info.IsTreasureBoxReadyToOpen); - _clickObjectCollider.enabled = info.IsTreasureBoxReadyToOpen; - string atlasName = UIManager.GetInstance().GetSceneAssetPath(UIAtlasManager.AssetBundleNames.Arena, null); - _loadFileList.Add(atlasName); - StartCoroutine(Toolbox.ResourcesManager.LoadAssetAsync(atlasName, delegate - { - atlasName = UIManager.GetInstance().GetSceneAssetPath(UIAtlasManager.AssetBundleNames.Arena, null, isload: true); - _arenaAtlas = Toolbox.ResourcesManager.LoadObject(atlasName).GetComponent(); - _boxSprite.atlas = _arenaAtlas; - _gaugeBackground.atlas = UIManager.GetInstance().GetAtlasList().FirstOrDefault((UIAtlas s) => s.name == "MypageComon"); - _boxSprite.spriteName = (info.IsGotSpecialTreasureBox ? $"box_2pick_0{5}_open" : $"box_2pick_0{5}_close"); - _gaugeBackground.spriteName = "gauge_bg_scale_15"; - })); - UIEventListener.Get(_boxSprite.gameObject).onClick = OnClickBoxReceiveRewards; - } - - private void OnClickBoxReceiveRewards(GameObject g) - { - - MypageReceiveSpecialTreasureTask receiveSpecialTreasureTask = new MypageReceiveSpecialTreasureTask(); - receiveSpecialTreasureTask.SetParameter(); - UIManager.GetInstance().StartCoroutine(Toolbox.NetworkManager.Connect(receiveSpecialTreasureTask, delegate - { - UIManager.GetInstance().StartCoroutine(RunOpenBoxEffect(receiveSpecialTreasureTask.Result, delegate - { - Data.MyPageNotifications.data.CampaignBattleWin.SpecialTreasureInfo.SetGotSpecialTreasureBox(isGot: true); - CreateRewardDialog(receiveSpecialTreasureTask, RedrawDialog); - RunHideBoxEffect(); - })); - })); - } - - private IEnumerator RunOpenBoxEffect(MypageReceiveSpecialTreasureTask.MypageTreasureBoxCpOpenTaskData result, Action endAction) - { - UIManager.GetInstance().OpenNotTouch(); - _notTouchMypageCollider.enabled = true; - yield return new WaitForSeconds(1f); - _boxOpenEffectObj = NGUITools.AddChild(base.gameObject, Resources.Load("UI/layoutParts/RankWinnerRewardResultPanel") as GameObject); - NguiObjs component = _boxOpenEffectObj.GetComponent(); - UISprite bg = component.sprites[0]; - UISprite window = component.sprites[1]; - UISprite box = component.sprites[2]; - box.atlas = _arenaAtlas; - UILabel label = component.labels[0]; - label.text = Data.SystemText.Get("MyPage_0111"); - UIPanel panel = _boxOpenEffectObj.GetComponent(); - panel.alpha = 0f; - box.spriteName = $"box_2pick_0{5}_close"; - string loadEffectName = $"cmn_arena_treasure_{6}"; - List list = new List(); - list.Add(Toolbox.ResourcesManager.GetAssetTypePath(loadEffectName, ResourcesManager.AssetLoadPathType.Effect2D)); - yield return UIManager.GetInstance().StartCoroutine(Toolbox.ResourcesManager.LoadAssetGroupAsync(list, null)); - _treasureEffectObj = UnityEngine.Object.Instantiate(Toolbox.ResourcesManager.LoadObject(Toolbox.ResourcesManager.GetAssetTypePath(loadEffectName, ResourcesManager.AssetLoadPathType.Effect2D, isfetch: true)) as GameObject); - _treasureEffectObj.transform.parent = _boxOpenEffectObj.transform; - /* Pre-Phase-5b: SetUIParticleShader dropped */ - _boxOpenEffectObj.SetLayer(LayerMask.NameToLayer("SystemUI"), isSetChildren: true); - bg.alpha = 0f; - box.alpha = 0f; - label.alpha = 0f; - panel.alpha = 1f; - TweenAlpha.Begin(bg.gameObject, 0.5f, 0.65f); - TweenAlpha.Begin(label.gameObject, 0.5f, 1f); - TweenAlpha.Begin(box.gameObject, 0.5f, 1f); - label.transform.localPosition = new Vector3(100f, 0f, 0f); - window.transform.localScale = new Vector3(1f, 0.01f, 1f); - box.transform.localPosition = new Vector3(180f, 0f, 0f); - iTween.MoveTo(label.gameObject, iTween.Hash("x", 20f, "time", 0.5f, "islocal", true, "easetype", iTween.EaseType.easeOutExpo)); - iTween.ScaleTo(window.gameObject, iTween.Hash("y", 1f, "time", 0.5f, "easetype", iTween.EaseType.easeInOutExpo)); - iTween.MoveTo(box.gameObject, iTween.Hash("y", 20f, "time", 0.5f, "islocal", true, "easetype", iTween.EaseType.easeOutExpo)); - yield return new WaitForSeconds(0.8f); - TweenAlpha.Begin(label.gameObject, 0.5f, 0f); - iTween.MoveTo(box.gameObject, iTween.Hash("x", 0f, "time", 0.7f, "islocal", true, "easetype", iTween.EaseType.easeInOutExpo)); - - yield return new WaitForSeconds(1f); - _treasureEffectObj.transform.localPosition = box.transform.localPosition; - _treasureEffectObj.transform.localScale = Vector3.one * 320f * 1.75f; - _treasureEffectObj.SetActive(value: true); - box.gameObject.SetActive(value: false); - yield return new WaitForSeconds(1.2f); - endAction.Call(); - } - - private void CreateRewardDialog(MypageReceiveSpecialTreasureTask info, Action onClose) - { - UIManager.GetInstance().createInSceneCenterLoading(); - DialogBase dialogBase = UIManager.GetInstance().CreateDialogClose(); - dialogBase.SetSize(DialogBase.Size.M); - dialogBase.SetLayer("MyPage"); - dialogBase.SetPanelDepth(105, isSetBackViewDepthImmediately: true); - dialogBase.SetTitleLabel(Data.SystemText.Get("TreasureBoxCp_0026")); - dialogBase.SetButtonLayout(DialogBase.ButtonLayout.OkBtn); - RewardBase component = NGUITools.AddChild(dialogBase.gameObject, Resources.Load("UI/layoutParts/StoryRewardPanel")).GetComponent(); - for (int i = 0; i < info.Result.RewardDataList.Count; i++) - { - component.AddReward(info.Result.RewardDataList[i]); - } - component.EndCreate(); - dialogBase.OnClose = delegate - { - onClose.Call(); - }; - } - - private void RunHideBoxEffect() - { - _treasureEffectObj.SetActive(value: false); - _boxOpenEffectObj.SetActive(value: false); - UnityEngine.Object.Destroy(_boxOpenEffectObj); - UnityEngine.Object.Destroy(_treasureEffectObj); - UIManager.GetInstance().offNotTouch(); - _notTouchMypageCollider.enabled = false; - } - - private void RedrawDialog() - { - SpecialTreasureInfo specialTreasureInfo = Data.MyPageNotifications.data.CampaignBattleWin.SpecialTreasureInfo; - _boxSprite.spriteName = (specialTreasureInfo.IsGotSpecialTreasureBox ? $"box_2pick_0{5}_open" : $"box_2pick_0{5}_close"); - UIManager.SetObjectToGrey(_boxSprite.gameObject, specialTreasureInfo.IsGotSpecialTreasureBox); - _completeLabel.gameObject.SetActive(specialTreasureInfo.ReceivedBoxNumbers == specialTreasureInfo.SpecialTreasureBoxNecessaryNumbers); - _treasureBoxLabel.text = (specialTreasureInfo.IsGotSpecialTreasureBox ? Data.SystemText.Get("TreasureBoxCp_0009") : ""); - _clickObject.SetActive(specialTreasureInfo.IsTreasureBoxReadyToOpen); - MyPageMenu.Instance.SetAfterSpecialWinRewardOpened(); - MyPageMenu.Instance.SpecialWinRewardOpened(); - } -} diff --git a/SVSim.BattleEngine/Engine/Wizard/MyRotationAllInfo.cs b/SVSim.BattleEngine/Engine/Wizard/MyRotationAllInfo.cs index 2777b329..e420988b 100644 --- a/SVSim.BattleEngine/Engine/Wizard/MyRotationAllInfo.cs +++ b/SVSim.BattleEngine/Engine/Wizard/MyRotationAllInfo.cs @@ -33,8 +33,6 @@ public class MyRotationAllInfo public bool IsMyRotationEnable => IsWithinPeriod(FreeMatchPeriod); - public bool IsWithinFreeMatchPeriod => IsWithinPeriod(FreeMatchPeriod); - public MyRotationInfo Get(string id) { if (string.IsNullOrEmpty(id)) diff --git a/SVSim.BattleEngine/Engine/Wizard/MypageReceiveSpecialTreasureTask.cs b/SVSim.BattleEngine/Engine/Wizard/MypageReceiveSpecialTreasureTask.cs index 142c7a87..44bc778a 100644 --- a/SVSim.BattleEngine/Engine/Wizard/MypageReceiveSpecialTreasureTask.cs +++ b/SVSim.BattleEngine/Engine/Wizard/MypageReceiveSpecialTreasureTask.cs @@ -26,12 +26,6 @@ public class MypageReceiveSpecialTreasureTask : BaseTask base.type = ApiType.Type.TreasureOpenSpecialTreasureBox; } - public void SetParameter() - { - MypageReceiveSpecialTreasureTaskParam mypageReceiveSpecialTreasureTaskParam = new MypageReceiveSpecialTreasureTaskParam(); - base.Params = mypageReceiveSpecialTreasureTaskParam; - } - protected override int Parse() { int num = base.Parse(); diff --git a/SVSim.BattleEngine/Engine/Wizard/NetworkDefine.cs b/SVSim.BattleEngine/Engine/Wizard/NetworkDefine.cs index a0ff3f5c..0ea9f44a 100644 --- a/SVSim.BattleEngine/Engine/Wizard/NetworkDefine.cs +++ b/SVSim.BattleEngine/Engine/Wizard/NetworkDefine.cs @@ -14,33 +14,19 @@ public static class NetworkDefine SHOP_SKIN_MAINTENANCE = 2024, SHOP_ITEM_MAINTENANCE = 2037, MISSION_MAINTENANCE = 2010, - ROOM_BATTLE_MAINTENANCE = 2014, STORY_MAINTENANCE = 2015, CARD_MAINTENANCE = 2018, DECK_MAINTENANCE = 2019, - ROOM_TWOPICK_MAINTENANCE = 2029, - ROOM_ALL_MAINTENANCE = 2030, - ROOM_WATCHING_MAINTENANCE = 2031, - FREEBATTLE_UNLIMITED = 2044, - FREEBATTLE_ROTATION = 2045, - RANKBATTLE_UNLIMITED = 2046, - RANKBATTLE_ROTATION = 2047, - ROOM_ROTATION = 2049, COLOSSEUM = 2050, GUILD_MAINTENANCE = 2054, ARENA_SEALED_BATTLE_MAINTENANCE = 2056, - FREEBATTLE_PREROTATION = 2065, BATTLE_PASS = 2070, AUTO_DECK_CREATE = 2080, - FREEBATTLE_CROSSOVER = 2084, - RANKBATTLE_CROSSOVER = 2085, - FREEBATTLE_MYROTATION = 2093, BOSS_RUSH = 2096, REPLAY_ALL = 2034, NEWREPLAY_ALL = 2097, NEWREPLAY_EXCLUDE_ROTATION = 2098, - NEWREPLAY_RECORD = 2099, - FREEBATTLE_AVATAR = 2103} + NEWREPLAY_RECORD = 2099} public enum ServerBattleType { diff --git a/SVSim.BattleEngine/Engine/Wizard/PlayerStaticData.cs b/SVSim.BattleEngine/Engine/Wizard/PlayerStaticData.cs index b3993d70..6cc0304d 100644 --- a/SVSim.BattleEngine/Engine/Wizard/PlayerStaticData.cs +++ b/SVSim.BattleEngine/Engine/Wizard/PlayerStaticData.cs @@ -210,8 +210,7 @@ public class PlayerStaticData : MonoBehaviour public enum RankTexSize { - S, - L } + S} public enum CountryTexSize { @@ -415,17 +414,6 @@ public class PlayerStaticData : MonoBehaviour return Data.Load.data._userRank[(int)inFormat].rank; } - public static void LoadUserRankTexture(Format inFormat) - { - UserRankTexture.Format = inFormat; - UserRankTexture.LoadTexture(); - } - - public static void AttachUserRankTexture(UITexture uiTexture, RankTexSize size) - { - UserRankTexture.AttachTexture(uiTexture, (int)size); - } - public static bool IsMasterRankCurrentFormat() { return IsMasterRank(Data.CurrentFormat); diff --git a/SVSim.BattleEngine/Engine/Wizard/RoomNonPossessionCardCampaign.cs b/SVSim.BattleEngine/Engine/Wizard/RoomNonPossessionCardCampaign.cs index 919e1dee..9d923dc7 100644 --- a/SVSim.BattleEngine/Engine/Wizard/RoomNonPossessionCardCampaign.cs +++ b/SVSim.BattleEngine/Engine/Wizard/RoomNonPossessionCardCampaign.cs @@ -5,6 +5,4 @@ public class RoomNonPossessionCardCampaign public double StartUnixTime { get; set; } public double EndUnixTime { get; set; } - - public string EndLocalTimeString => ConvertTime.ToLocal(ConvertTime.UnixTimeToDateTime((int)EndUnixTime)).ToString(); } diff --git a/SVSim.BattleEngine/Engine/Wizard/SpecialTreasureInfo.cs b/SVSim.BattleEngine/Engine/Wizard/SpecialTreasureInfo.cs index 191d75b8..f85048f8 100644 --- a/SVSim.BattleEngine/Engine/Wizard/SpecialTreasureInfo.cs +++ b/SVSim.BattleEngine/Engine/Wizard/SpecialTreasureInfo.cs @@ -10,27 +10,10 @@ public class SpecialTreasureInfo public bool IsGotSpecialTreasureBox { get; private set; } - public bool IsTreasureBoxReadyToOpen - { - get - { - if (SpecialTreasureBoxNecessaryNumbers == ReceivedBoxNumbers) - { - return !IsGotSpecialTreasureBox; - } - return false; - } - } - public SpecialTreasureInfo(JsonData json) { SpecialTreasureBoxNecessaryNumbers = json["special_treasure_box_necessary_numbers"].ToInt(); ReceivedBoxNumbers = json["received_box_numbers"].ToInt(); IsGotSpecialTreasureBox = json["is_got_special_treasure_box"].ToInt() == 1; } - - public void SetGotSpecialTreasureBox(bool isGot) - { - IsGotSpecialTreasureBox = isGot; - } } diff --git a/SVSim.BattleEngine/Engine/Wizard/UIAtlasManager.cs b/SVSim.BattleEngine/Engine/Wizard/UIAtlasManager.cs index af71f5b2..c92aab64 100644 --- a/SVSim.BattleEngine/Engine/Wizard/UIAtlasManager.cs +++ b/SVSim.BattleEngine/Engine/Wizard/UIAtlasManager.cs @@ -10,7 +10,6 @@ public class UIAtlasManager { public enum AssetBundleNames { - MypageComon, Battle, BattleLang, Arena, diff --git a/SVSim.BattleEngine/Engine/Wizard/UIUtil.cs b/SVSim.BattleEngine/Engine/Wizard/UIUtil.cs index 5f43b249..a994e2fa 100644 --- a/SVSim.BattleEngine/Engine/Wizard/UIUtil.cs +++ b/SVSim.BattleEngine/Engine/Wizard/UIUtil.cs @@ -106,19 +106,6 @@ public static class UIUtil } } - public static bool IsValidIdDigits(string idString, int numOfDigits) - { - if (idString.Length != numOfDigits) - { - return false; - } - if (!int.TryParse(idString, out var result)) - { - return false; - } - return result >= 0; - } - public static string CreateListText(IList list, string separator, string header = null, string footer = null) { StringBuilder tempStringBuilder = GetTempStringBuilder(); diff --git a/SVSim.BattleEngine/Shim/Generated/Friend_PlayerData.g.cs b/SVSim.BattleEngine/Shim/Generated/Friend_PlayerData.g.cs index 0a950b4d..7f75ccba 100644 --- a/SVSim.BattleEngine/Shim/Generated/Friend_PlayerData.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/Friend_PlayerData.g.cs @@ -8,19 +8,4 @@ using UnityEngine; using Wizard.ErrorDialog; namespace Wizard.UIFriend { -public partial class Friend -{ -public partial class PlayerData -{ - public int ViewerId; - public long EmblemId; - public int DegreeId; - public int Rank; - public string Country; - public bool isFriend; - public bool IsSameGuildMember { get; set; } - public PlayerData(string in_Name, long in_EmblemId, int in_DegreeId, int in_Rank, string in_Country) { } - public void Copy(UserFriend src) { } -} -} } diff --git a/SVSim.BattleEngine/Shim/Generated/RoomConnectController.g.cs b/SVSim.BattleEngine/Shim/Generated/RoomConnectController.g.cs index c8313743..76e55751 100644 --- a/SVSim.BattleEngine/Shim/Generated/RoomConnectController.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/RoomConnectController.g.cs @@ -16,9 +16,6 @@ public partial class RoomConnectController public partial class RoomUserData { } public enum PositionMode { - OWNER, - VISITOR, - WATCHER } public enum BattleRule { @@ -28,15 +25,10 @@ public partial class RoomConnectController RANDOM } public enum ConnectRoomResult { - ERROR = -3, - SUCCESS = 0 - } + ERROR = -3 } private enum RoomSetupErrorAction { } - public ConnectRoomResult ConnectRoomResultType { get; set; } - public bool IsEnterErrorDeckCount { get; set; } public RoomConnectController(InitializeParameter param) { } - public IEnumerator StartConnect(string battleId = "") => default!; } } diff --git a/SVSim.BattleEngine/Shim/Generated/RoomConnectController_InitializeParameter.g.cs b/SVSim.BattleEngine/Shim/Generated/RoomConnectController_InitializeParameter.g.cs index 1d384e0b..4e93ee6f 100644 --- a/SVSim.BattleEngine/Shim/Generated/RoomConnectController_InitializeParameter.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/RoomConnectController_InitializeParameter.g.cs @@ -14,10 +14,6 @@ public partial class RoomConnectController { public partial class InitializeParameter { - public ConventionInfo ConventionInfo { get; set; } - public bool IsPermitFriendWatch { get; set; } - public bool IsPermitGuildWatch { get; set; } - public bool IsEnableTurnSelect { get; set; } public InitializeParameter(PositionMode positionMode, BattleParameter battleParameter, string roomId) { } } } diff --git a/SVSim.BattleEngine/Shim/Generated/RoomRuleSelectDialog.g.cs b/SVSim.BattleEngine/Shim/Generated/RoomRuleSelectDialog.g.cs index 8bf23332..0d8fb334 100644 --- a/SVSim.BattleEngine/Shim/Generated/RoomRuleSelectDialog.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/RoomRuleSelectDialog.g.cs @@ -5,13 +5,4 @@ using Cute; using UnityEngine; namespace Wizard.RoomMatch { -public partial class RoomRuleSelectDialog -{ - public enum eRoomBaseRule - { - } - public static DialogBase Create(RoomRuleSetting ruleSetting, out RoomRuleSelectDialog roomDialog, bool isTwoPick, bool isSelectBaseRule = false) { roomDialog = default!; return default!; } - public static RoomConnectController.BattleRule GetLastRule(KeyValuePair key, RoomConnectController.BattleRule defaultRule) => default!; - public static TwoPickFormat GetLastTwoPickFormat(KeyValuePair key, TwoPickFormat defaultTwoPickFormatType) => default!; -} } diff --git a/SVSim.BattleEngine/Shim/Generated/RoomRuleSetting.g.cs b/SVSim.BattleEngine/Shim/Generated/RoomRuleSetting.g.cs index 911dccab..c3ec85a8 100644 --- a/SVSim.BattleEngine/Shim/Generated/RoomRuleSetting.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/RoomRuleSetting.g.cs @@ -2,12 +2,4 @@ using System; namespace Wizard.RoomMatch { -public partial class RoomRuleSetting -{ - public Action OnDecide; - public BattleParameter BattleParameterInstance { get; set; } - public bool EnableFriendWatch { get; set; } - public bool EnableGuildWatch { get; set; } - public RoomRuleSetting() { } -} } diff --git a/SVSim.BattleEngine/Shim/Generated/UIManager.g.cs b/SVSim.BattleEngine/Shim/Generated/UIManager.g.cs index 6e046d3a..6dd7f198 100644 --- a/SVSim.BattleEngine/Shim/Generated/UIManager.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/UIManager.g.cs @@ -67,7 +67,6 @@ public partial class UIManager public NguiObjs TextInputDialogPrefab { get; set; } public DrumrollDialog DrumrollDialogPrefab { get; set; } public DialogBase NowOpenDialog { get; set; } - public GameObject IdInputPrefab { get; set; } public Camera FrontCamera { get; set; } public int FrontCameraPixelWidth { get; set; } public int FrontCameraPixelHeight { get; set; } diff --git a/SVSim.BattleEngine/Shim/Generated/_BaseClauses.g.cs b/SVSim.BattleEngine/Shim/Generated/_BaseClauses.g.cs index 2d7270e5..ff892d2f 100644 --- a/SVSim.BattleEngine/Shim/Generated/_BaseClauses.g.cs +++ b/SVSim.BattleEngine/Shim/Generated/_BaseClauses.g.cs @@ -62,7 +62,7 @@ namespace Wizard.RoomMatch { } namespace Wizard.RoomMatch { } namespace Wizard.Battle.UI { } namespace Wizard.RoomMatch { public partial class RoomBase : MonoBehaviour { } } -namespace Wizard.RoomMatch { public partial class RoomRuleSelectDialog : MonoBehaviour { } } +namespace Wizard.RoomMatch { } namespace Wizard.Battle.UI { } namespace Wizard.Battle.View { public partial class SpellBattleCardView : BattleCardView { } } namespace Wizard.Battle.View.Vfx { } diff --git a/SVSim.BattleEngine/Shim/View/SettingsUiStubs.cs b/SVSim.BattleEngine/Shim/View/SettingsUiStubs.cs index d7d5967f..b043c099 100644 --- a/SVSim.BattleEngine/Shim/View/SettingsUiStubs.cs +++ b/SVSim.BattleEngine/Shim/View/SettingsUiStubs.cs @@ -111,7 +111,6 @@ namespace DeckBuilder namespace Wizard.RoomMatch { - public partial class RoomRuleSetting { } } namespace Cute diff --git a/SVSim.BattleEngine/Shim/View/StoryTitleStubs.cs b/SVSim.BattleEngine/Shim/View/StoryTitleStubs.cs index 044c838e..ac79b72f 100644 --- a/SVSim.BattleEngine/Shim/View/StoryTitleStubs.cs +++ b/SVSim.BattleEngine/Shim/View/StoryTitleStubs.cs @@ -16,11 +16,6 @@ namespace Wizard.Story.ChapterSelection namespace Wizard.UIFriend { - public partial class Friend { public partial class PlayerData { } } - public class FriendDataBase - { - public virtual void SetPlayerData(Friend.PlayerData in_PlayerData, System.Collections.Generic.List in_LoadList) { } - } } namespace Wizard.Title { } namespace Wizard.RoomMatch { }