From bb463ef0b13236738a1da9cd04f57def3e7e2c7c Mon Sep 17 00:00:00 2001 From: yyl <yyl> Date: 星期五, 29 八月 2025 15:21:51 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts --- Main/System/Main/HomeWin.cs | 95 +++++++++++++++++++++++++++++++++++------------ 1 files changed, 71 insertions(+), 24 deletions(-) diff --git a/Main/System/Main/HomeWin.cs b/Main/System/Main/HomeWin.cs index f4e73cd..eefb2ad 100644 --- a/Main/System/Main/HomeWin.cs +++ b/Main/System/Main/HomeWin.cs @@ -27,8 +27,16 @@ [SerializeField] Button changeHeroPosBtn; - [SerializeField] Button autoBtn; + //绛夌骇 + [SerializeField] Button officialUpBtn; + + //搴曢儴鍔熻兘 + [SerializeField] Button autoBtn; + [SerializeField] Image autoCloseImg; + [SerializeField] UIEffectPlayer autoOpenEffect; + [SerializeField] Button blessLVBtn; + [SerializeField] Text blessLVText; //鍏朵粬鍔熻兘鍏ュ彛 [SerializeField] Button monthCardBtn; @@ -52,25 +60,30 @@ autoBtn.AddListener(() => { - //娴嬭瘯鎷惧彇鎵�鏈夌墿鍝� - var items = PackManager.Instance.GetItems(PackType.DropItem); - List<int> dropindexs = new List<int>(); - for (int i = 0; i < items.Count; i++) - { - var item = items[i]; - if (dropindexs.Count > 5) - { - EquipModel.Instance.NotifyItemDrop(dropindexs, BattleManager.Instance.storyBattleField.battleRootNode.blueTeamNodeList[Random.Range(0, 5)].GetComponent<RectTransform>()); - dropindexs.Clear(); - } + // //娴嬭瘯鎷惧彇鎵�鏈夌墿鍝� + // var items = PackManager.Instance.GetItems(PackType.DropItem); + // List<int> dropindexs = new List<int>(); + // for (int i = 0; i < items.Count; i++) + // { + // var item = items[i]; + // if (dropindexs.Count > 5) + // { + // EquipModel.Instance.NotifyItemDrop(dropindexs, BattleManager.Instance.storyBattleField.battleRootNode.blueTeamNodeList[Random.Range(0, 5)].GetComponent<RectTransform>()); + // dropindexs.Clear(); + // } - dropindexs.Add(item.gridIndex); - } - if (dropindexs.Count > 0) + // dropindexs.Add(item.gridIndex); + // } + // if (dropindexs.Count > 0) + // { + // EquipModel.Instance.NotifyItemDrop(dropindexs, BattleManager.Instance.storyBattleField.battleRootNode.blueTeamNodeList[Random.Range(0, 5)].GetComponent<RectTransform>()); + // dropindexs.Clear(); + // } + if (!FuncOpen.Instance.IsFuncOpen(108, true)) { - EquipModel.Instance.NotifyItemDrop(dropindexs, BattleManager.Instance.storyBattleField.battleRootNode.blueTeamNodeList[Random.Range(0, 5)].GetComponent<RectTransform>()); - dropindexs.Clear(); + return; } + UIManager.Instance.OpenWindow<AutoFightWin>(); }); @@ -78,37 +91,51 @@ { InvestModel.Instance.BuyInvest(InvestModel.monthCardType); }); + + blessLVBtn.AddListener(() => + { + UIManager.Instance.OpenWindow<BlessLVWin>(); + }); + + officialUpBtn.AddListener(()=> + { + if (RealmConfig.GetKeys().Count <= PlayerDatas.Instance.baseData.realmLevel) + return; + UIManager.Instance.OpenWindow<OfficialUpWin>(); + }); } - public override void Refresh() + public void Display() { UpdatePlayerInfo(); UpdateTask(); RefreshRecharge(); + ShowBlessLV(); + DisplayAutoFight(); } protected override void OnPreOpen() { PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefresh; TaskManager.Instance.OnTaskUpdate += UpdateTask; - Refresh(); + BlessLVManager.Instance.OnBlessLVUpdateEvent += ShowBlessLV; + AutoFightModel.Instance.ChangeAutoEvent += DisplayAutoFight; + Display(); // var battleWin = UIManager.Instance.OpenWindow<BattleWin>(); // battleWin.SetBattleField(BattleManager.Instance.storyBattleField); } - protected override void OnOpen() - { - base.OnOpen(); - - } + protected override void OnPreClose() { PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefresh; TaskManager.Instance.OnTaskUpdate -= UpdateTask; + BlessLVManager.Instance.OnBlessLVUpdateEvent -= ShowBlessLV; + AutoFightModel.Instance.ChangeAutoEvent -= DisplayAutoFight; // 鍏抽棴鐨勬椂鍊欐妸鎴樻枟鐣岄潰涔熺粰鍏充簡 铏界劧鏄湪澶栭潰寮�鐨� UIManager.Instance.CloseWindow<BattleWin>(); @@ -135,6 +162,26 @@ monthCardBtn.SetActive(!InvestModel.Instance.IsInvested(InvestModel.monthCardType)); } + + void ShowBlessLV() + { + blessLVText.text = BlessLVManager.Instance.m_TreeLV.ToString(); + } + + void DisplayAutoFight() + { + if (AutoFightModel.Instance.isAutoAttackSet) + { + autoCloseImg.SetActive(false); + autoOpenEffect.Play(); + } + else + { + autoCloseImg.SetActive(true); + autoOpenEffect.Stop(); + } + } + /// <summary> /// 鏇存柊鐜╁淇℃伅 /// </summary> -- Gitblit v1.8.0