Project_SG_scripts.git

			@@ -32,6 +32,7 @@
			[SerializeField] Text multiFightText;

			[SerializeField] Transform gameTip; //10连
			[SerializeField] Transform mgTip;

			bool isForcePlayFightUIAnim = true; //强制播放战斗锤子框动画

			@@ -60,6 +61,7 @@
			RenameManager.Instance.OnUpdateRenameResultEvent += OnUpdateRenameResultEvent;
			UIManager.Instance.OnCloseWindow += OnCloseWindow;
			GlobalTimeEvent.Instance.MSEvent += OnMSEvent;
			RedpointCenter.Instance.redpointValueChangeEvent += OnRedpointValueChangeEvent;
			var xbInfo = HappyXBModel.Instance.GetXBInfoByType((int)HappXBTitle.HeroCallAdvanced);
			gameTip.SetActive(false);
			if (xbInfo != null && xbInfo.treasureCount < GeneralDefine.herocall10TipLimit)
			@@ -69,6 +71,7 @@
			EventBroadcast.Instance.AddListener<string>(EventName.BATTLE_START, OnBattleStart);
			base.OnPreOpen();

			mgTip.SetActive(false);
			// 刷新UI
			Display();
			}
			@@ -82,6 +85,7 @@
			GlobalTimeEvent.Instance.MSEvent -= OnMSEvent;
			GlobalTimeEvent.Instance.fiveSecondEvent -= OnFiveSecondEvent;
			EventBroadcast.Instance.RemoveListener<string>(EventName.BATTLE_START, OnBattleStart);
			RedpointCenter.Instance.redpointValueChangeEvent -= OnRedpointValueChangeEvent;

			base.OnPreClose();
			isForcePlayFightUIAnim = true;
			@@ -92,6 +96,16 @@
			Display();
			}

			void OnRedpointValueChangeEvent(int id)
			{
			if (id == (MainRedDot.RedPoint_Mingge * 10 + 4))
			{
			mgTip.SetActive(MinggeManager.Instance.redpointAuto.state != RedPointState.None);
			}
			}


			//用于10连提示，没有10连会取消时间事件委托
			void OnFiveSecondEvent()
			{
			if (HappyXBModel.Instance.bestXB10Red.state != RedPointState.None)
			@@ -107,6 +121,7 @@
			GlobalTimeEvent.Instance.fiveSecondEvent -= OnFiveSecondEvent;
			}
			}

			}

			void DisplayTopBar()
			@@ -119,6 +134,10 @@
			if (_ui.name == "AutoFightWin")
			{
			multiFightText.text = Language.Get("MultiFight", AutoFightModel.Instance.fightCost);
			}
			if (_ui.name == "MinggeWin")
			{
			mgTip.SetActive(false);
			}
			}

			@@ -384,7 +403,7 @@
			{
			if (string.IsNullOrEmpty(guid))
			{
			var tmpHero = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero("");
			var tmpHero = TeamManager.Instance.GetTeam(BattlePreSetType.Story).GetNextServerHero("");
			if (tmpHero != null)
			{
			AutoFightModel.Instance.fightingHeroSkinID = tmpHero.SkinID;
			@@ -409,7 +428,7 @@
			cdTween.SetStartState();
			cdTween.Play(() =>
			{
			var tmpHero = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid);
			var tmpHero = TeamManager.Instance.GetTeam(BattlePreSetType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid);
			if (tmpHero != null)
			{
			AutoFightModel.Instance.fightingHeroSkinID = tmpHero.SkinID;
			@@ -430,7 +449,7 @@

			if (AutoFightModel.Instance.fightingHeroSkinID == 0)
			{
			var tmpHero = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid);
			var tmpHero = TeamManager.Instance.GetTeam(BattlePreSetType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid);
			if (tmpHero != null)
			{
			AutoFightModel.Instance.fightingHeroSkinID = tmpHero.SkinID;