Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

yyl

6 小时以前 e18e6f74e211bfb65747cac364f942b41620645c

 Main/System/Main/MainWin.cs

@@ -28,6 +28,7 @@
    [SerializeField] UIEffectPlayer openCloseAnim;
    [SerializeField] FillTween cdTween;
    [SerializeField] Text hammerText;
    [SerializeField] Text multiFightText;

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

@@ -54,6 +55,7 @@
        PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefresh;
        AutoFightModel.Instance.OnFightEvent += OnSkillCast;
        RenameManager.Instance.OnUpdateRenameResultEvent += OnUpdateRenameResultEvent;
        UIManager.Instance.OnCloseWindow += OnCloseWindow;
        base.OnPreOpen();

        // 刷新UI
@@ -65,6 +67,7 @@
        PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefresh;
        AutoFightModel.Instance.OnFightEvent -= OnSkillCast;
        RenameManager.Instance.OnUpdateRenameResultEvent -= OnUpdateRenameResultEvent;
        UIManager.Instance.OnCloseWindow -= OnCloseWindow;
        base.OnPreClose();
        isForcePlayFightUIAnim = true;
    }
@@ -79,6 +82,13 @@
        topBar.SetActive(functionOrder == 0 || functionOrder == 2);
    }

    void OnCloseWindow(UIBase _ui)
    {
        if (_ui.name == "AutoFightWin")
        {
            multiFightText.text = Language.Get("MultiFight", AutoFightModel.Instance.fightCost);
        }
    }

    //战斗按钮动画
    void ClickAnimation(int index)
@@ -293,6 +303,7 @@
            fightOtherWinBG.SetActive(false);
            fightOtherWinWarnImg.SetActive(false);
            fightBG.SetActive(true);
            multiFightText.text = Language.Get("MultiFight", AutoFightModel.Instance.fightCost);


            if (BattleManager.Instance.storyBattleField != null &&
@@ -313,6 +324,7 @@
        {
            //非主城界面
            fightOtherWinBG.SetActive(true);
            multiFightText.text = "";
            fightBG.SetActive(false);
            if (BattleManager.Instance.storyBattleField != null &&
            BattleManager.Instance.storyBattleField.GetBattleMode() == BattleMode.Stop)