From 871594462e82d6bc1341918d39e11ab036d59563 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 18 九月 2025 19:26:28 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Main/MainWin.cs | 151 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 132 insertions(+), 19 deletions(-)
diff --git a/Main/System/Main/MainWin.cs b/Main/System/Main/MainWin.cs
index 037ee51..8cacbdf 100644
--- a/Main/System/Main/MainWin.cs
+++ b/Main/System/Main/MainWin.cs
@@ -8,18 +8,31 @@
/// </summary>
public class MainWin : FunctionsBaseWin
{
- //澶村儚鍖�
+ //澶村儚鍖�
+ [SerializeField] GameObject topBar;
[SerializeField] AvatarCell avatarCell;
[SerializeField] Text playerNameText;
[SerializeField] Text powerText;
[SerializeField] OfficialTitleCell officialRankText;
+
+ //鎴樻枟鎸夐挳
+ [SerializeField] Image fightOtherWinBG; //鍒囨崲鍏朵粬鐣岄潰鐨勬樉绀�
+ [SerializeField] Image fightOtherWinWarnImg; //鍒囨崲鍏朵粬鐣岄潰 濡傛灉鏄垬鏂椾腑娉涚孩鎻愮ず
+ [SerializeField] GameObject fightBG; //鎴樻枟鐣岄潰鏄剧ず
+ [SerializeField] Image restImg; //浼戞伅鐘舵��
+ [SerializeField] GameObject fightGo; //鎴樻枟鐘舵��
+ [SerializeField] Image fightHeroImg; //鎴樻枟鏄剧ず鑻遍泟
+ [SerializeField] ScaleTween fightHeroScale; //鎴樻枟鏄剧ず鑻遍泟缂╂斁
+ [SerializeField] UIEffectPlayer fightEffect;
+ [SerializeField] FillTween cdTween;
+
public Text hammerText;
protected override void InitComponent()
{
base.InitComponent();
-
+
avatarCell.button.AddListener(() => { });
}
@@ -28,11 +41,13 @@
{
UpdateCurrency();
UpdatePlayerInfo();
+ RefreshFightBtn();
}
protected override void OnPreOpen()
{
PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefresh;
+ AutoFightModel.Instance.OnFightEvent += OnSkillCast;
base.OnPreOpen();
// 鍒锋柊UI
@@ -42,6 +57,7 @@
protected override void OnPreClose()
{
PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefresh;
+ AutoFightModel.Instance.OnFightEvent -= OnSkillCast;
base.OnPreClose();
}
@@ -49,10 +65,12 @@
protected override void SelectBottomTab(int index)
{
if (index == 3)
- {
+ {
//鎸戞垬鐗规畩鏄剧ず閫昏緫
return;
}
+
+ topBar.SetActive(index == 0 || index == 2);
// 濡傛灉鐐瑰嚮褰撳墠宸查�変腑鐨勬爣绛撅紝涓嶅仛澶勭悊
if (functionOrder == index && currentSubUI != null)
{
@@ -60,7 +78,7 @@
}
// 鏇存柊褰撳墠閫変腑鐨勬爣绛剧储寮�
- functionOrder = index;
+ functionOrder = index;
// 鍏抽棴褰撳墠鎵撳紑鐨勫瓙鐣岄潰
CloseCurrentSubUI();
@@ -82,7 +100,7 @@
PlayerDatas.Instance.baseData.facePic));
playerNameText.text = PlayerDatas.Instance.baseData.PlayerName;
- powerText.text = UIHelper.ReplaceLargeArtNum(PlayerDatas.Instance.baseData.FightPoint);
+ powerText.text = UIHelper.ReplaceLargeArtNum(PlayerDatas.Instance.baseData.FightPower);
officialRankText.InitUI(PlayerDatas.Instance.baseData.realmLevel, PlayerDatas.Instance.baseData.TitleID);
}
@@ -92,7 +110,7 @@
switch (type)
{
case PlayerDataType.FightPower:
- powerText.text = UIHelper.ReplaceLargeArtNum(PlayerDatas.Instance.baseData.FightPoint);
+ powerText.text = UIHelper.ReplaceLargeArtNum(PlayerDatas.Instance.baseData.FightPower);
break;
case PlayerDataType.RealmLevel:
officialRankText.InitUI(PlayerDatas.Instance.baseData.realmLevel, PlayerDatas.Instance.baseData.TitleID);
@@ -106,7 +124,7 @@
case PlayerDataType.default26:
hammerText.text = UIHelper.GetMoneyCnt(41).ToString();
break;
-
+
}
}
@@ -119,7 +137,7 @@
{
hammerText.text = UIHelper.GetMoneyCnt(41).ToString();
}
-
+
/// <summary>
/// 搴曢儴鏍囩鎸夐挳鐐瑰嚮
/// </summary>
@@ -129,21 +147,13 @@
{
if (currentSubUI != null && currentSubUI.name == "HomeWin")
{
- //鎵撳紑涓荤晫闈㈢殑鎯呭喌涓嬪啀鐐瑰嚮鎸夐挳锛屾墽琛屾敾鍑婚�昏緫
- if (AutoFightModel.Instance.isAutoAttackSet)
- {
- AutoFightModel.Instance.isAutoAttack = true;
- }
- StoryBattleField storyBattleField = BattleManager.Instance.storyBattleField;
- if (storyBattleField != null)
- {
- storyBattleField.operationAgent.DoNext();
- }
+ //鎵嬪姩鑷姩涓�璧峰鐞�
+ AutoFightModel.Instance.StartFight();
}
}
SelectBottomTab(index);
}
-
+
/// <summary>
/// 鏍规嵁鏍囩绱㈠紩鎵撳紑瀵瑰簲鐨勫瓙鐣岄潰
@@ -190,5 +200,108 @@
Debug.LogWarning("鏈煡鐨勬爣绛剧储寮�: " + functionOrder);
break;
}
+
+ RefreshFightBtn();
+ }
+
+
+ ///鎴樻枟鎸夐挳鏄剧ず瑙勫垯
+ /// 1.鍦ㄤ富绾挎垬鏂楃晫闈笅锛�
+ /// 1.1.浼戞伅鐘舵�佺殑鎸夐挳
+ /// 1.2.鎴樻枟鐘舵�佺殑鎸夐挳 锛氭樉绀轰笅涓�涓鏀诲嚮鐨勬灏嗗ご鍍忥紝鎸変綅缃『搴忔帹绠楁樉绀哄ご鍍忥紱涓ヨ皑鎯呭喌涓嬮渶鍒ゆ柇涓嬩竴涓灏嗘槸鍚﹀彲鏀诲嚮濡傝鐪╂檿绛�
+ /// 鏈夎挋鐗堬細榛樿鏄剧ず鎾斁鍏朵粬鎴樻枟鐨勭姸鎬侊紝鐪╂檿鐨勭姸鎬佺瓑姣旇緝澶氾紙澶у鏄挋鐗堟樉绀虹殑鎯呭喌锛屾牴鎹疄闄呯湅鏄惁闇�瑕侊級
+ /// 鏃犺挋鐗堬細缁撴潫涓�涓皬閫氱煡鐨勬椂鍊欙紙B425锛夊彲浠ラ噴鏀剧殑鍘绘帀钂欑増锛涙湁鎬掓皵鐨勬椂鍊欐槸鍚︾壒娈婅〃鐜帮紙寰幆鐏壒鏁堬紵锛�
+ /// 杞湀锛氱偣鍑婚噴鏀� 鎾斁鐗规晥涓旇挋鐗堣浆鍦堬紝杞湀缁撴潫鍚庢樉绀鸿挋鐗� -- 鍚屾椂涓婃柟鍗＄墝鎾斁鐗规晥鍜岃浆鍦堬紵
+ /// 2.鍦ㄩ潪涓荤嚎鎴樻枟鐣岄潰涓嬶細
+ /// 1. 浼戞伅鏄剧ず鍏抽棴鐘舵�� 鏃犵壒鏁�
+ /// 2. 鎴樻枟涓紝鏄剧ず娉涚孩鐗规晥
+ /// 涓婃柟鍗＄墝 鏀诲嚮鏃舵挱鏀剧壒鏁堝拰杞湀锛屾湁鎬掓皵鐨勬椂鍊欐樉绀烘�掓皵鐗规晥锛�
+
+
+ void RefreshFightBtn()
+ {
+ if (functionOrder == 0)
+ {
+ //涓诲煄鐣岄潰
+ fightOtherWinBG.SetActive(false);
+ fightBG.SetActive(true);
+
+
+ if (BattleManager.Instance.storyBattleField != null &&
+ BattleManager.Instance.storyBattleField.GetBattleMode() == BattleMode.Stop)
+ {
+ fightGo.SetActive(false);
+ restImg.SetActive(true);
+ }
+ else
+ {
+ fightGo.SetActive(true);
+ restImg.SetActive(false);
+ RefreshFightIng();
+ }
+
+ }
+ else
+ {
+ //闈炰富鍩庣晫闈�
+ fightOtherWinBG.SetActive(true);
+ fightBG.SetActive(false);
+ if (BattleManager.Instance.storyBattleField != null &&
+ BattleManager.Instance.storyBattleField.GetBattleMode() == BattleMode.Stop)
+ {
+ fightOtherWinWarnImg.SetActive(false);
+ }
+ else
+ {
+ fightOtherWinWarnImg.SetActive(true);
+ }
+ }
+ }
+
+
+ void RefreshFightIng(bool isfighting = false)
+ {
+ if (isfighting)
+ {
+ fightEffect.Play();
+ cdTween.SetStartState();
+ cdTween.Play(() =>
+ {
+ AutoFightModel.Instance.fightingHeroSkinID = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid).SkinID;
+ fightHeroImg.SetOrgSprite(HeroSkinConfig.Get(AutoFightModel.Instance.fightingHeroSkinID).SquareIcon, "HeroHead");
+ });
+ fightHeroScale.SetStartState();
+ fightHeroScale.Play();
+ }
+ else
+ {
+ fightEffect.Stop();
+ cdTween.Stop();
+ cdTween.SetEndState();
+ fightHeroScale.Stop();
+ }
+
+ if (AutoFightModel.Instance.fightingHeroSkinID == 0)
+ {
+ AutoFightModel.Instance.fightingHeroSkinID = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid).SkinID;
+ }
+
+ fightHeroImg.SetOrgSprite(HeroSkinConfig.Get(AutoFightModel.Instance.fightingHeroSkinID).SquareIcon, "HeroHead");
+ }
+
+ void OnSkillCast(bool isfighting)
+ {
+
+ if (functionOrder != 0)
+ return;
+
+ if (isfighting)
+ {
+ RefreshFightIng(isfighting);
+ }
+ else
+ {
+ RefreshFightBtn();
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0