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

yyl

7 天以前 4145075707a34f925235d74306788b186328eac3

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

 Main/System/Battle/ArenaBattleWin.cs

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using LitJson;
using UnityEngine;
using UnityEngine.UI;
@@ -71,6 +72,7 @@
    {
        base.OnPreOpen();
        // SetBattleField(BattleManager.Instance.storyBattleField);
        MainWin.TabChangeEvent += OnTabChangeEvent;
        BattleManager.Instance.onBattleFieldCreate += OnCreateBattleField;
        EventBroadcast.Instance.AddListener<BattleDmgInfo>(EventName.BATTLE_DAMAGE_TAKEN, OnDamageTaken);
        EventBroadcast.Instance.AddListener<string, JsonData>(EventName.BATTLE_END, OnBattleEnd);
@@ -81,11 +83,18 @@
    {
        base.OnPreClose();
        UIManager.Instance.CloseWindow<BattleHUDWin>();
        MainWin.TabChangeEvent -= OnTabChangeEvent;
        BattleManager.Instance.onBattleFieldCreate -= OnCreateBattleField;
        EventBroadcast.Instance.RemoveListener<BattleDmgInfo>(EventName.BATTLE_DAMAGE_TAKEN, OnDamageTaken);
        EventBroadcast.Instance.RemoveListener<string, JsonData>(EventName.BATTLE_END, OnBattleEnd);
        //UIManager.Instance.OpenWindow<MainWin>(0);
    }

    private void OnTabChangeEvent()
    {
        UIManager.Instance.CloseWindow<ArenaBattleWin>(true);
    }

    private void OnBattleEnd(string guid, JsonData endData)
    {
        if (battleField != null && guid == battleField.guid)

 Main/System/Battle/BattleField/StoryBattleField.cs

@@ -139,7 +139,10 @@
    protected override void OnSettlement(JsonData turnFightStateData)
    {
        base.OnSettlement(turnFightStateData);
        BattleManager.Instance.MainFightRequest(4);
        if (battleState == StoryBattleState.Battle)
        {
            BattleManager.Instance.MainFightRequest(4);
        }
    }



 Main/System/Battle/BattleManager.cs

@@ -24,6 +24,10 @@
        }
    }

    public int fightGuideID;
    public int fightGuideMainLevelLimit;
    public int fightGuideNoClickSeconds;

    public Action<string, BattleField> onBattleFieldCreate;

    public Action<string, BattleField> onBattleFieldDestroy;
@@ -45,6 +49,11 @@
    {
        var config = FuncConfigConfig.Get("AutoGuaji");
        speedGear = JsonMapper.ToObject<float[]>(config.Numerical4);

        config = FuncConfigConfig.Get("FightGuide");
        fightGuideID = int.Parse(config.Numerical1);
        fightGuideMainLevelLimit = int.Parse(config.Numerical2);
        fightGuideNoClickSeconds = int.Parse(config.Numerical3);
    }


@@ -576,4 +585,24 @@

        return null;
    }

    /// <summary>
    /// 检查是否有非主线战斗（如竞技场、白骨等）正在进行
    /// </summary>
    /// <returns>如果有任何非主线战斗且未结束，则返回true</returns>
    public bool IsOtherBattleInProgress()
    {
        foreach (var kvp in battleFields)
        {
            BattleField battleField = kvp.Value;
            // 检查战场是否有效且尚未结束
            if (battleField == null || battleField.IsBattleFinish)
                continue;
            // MapID 1 (StoryBattleField) 和 2 (StoryBossBattleField) 都是主线
            if (battleField.MapID == 1 || battleField.MapID == 2)
                continue;
            return true;
        }
        return false;
    }
}

 Main/System/Battle/BattleWin.cs

@@ -13,6 +13,8 @@

    private BattleField battleField;

    float lastClickTime;
    bool needGuide = false;
    // 生命周期
    protected override void InitComponent()
    {
@@ -40,14 +42,15 @@

    protected override void OnPreOpen()
    {
        base.OnPreOpen();
        lastClickTime = Time.realtimeSinceStartup;
        needGuide = !MainLevelManager.Instance.IsPassedByMainLevelID(BattleManager.Instance.fightGuideMainLevelLimit);

        // SetBattleField(BattleManager.Instance.storyBattleField);
        BattleManager.Instance.onBattleFieldCreate += OnCreateBattleField;
    }

    protected override void OnPreClose()
    {
        base.OnPreClose();
        UIManager.Instance.CloseWindow<BattleHUDWin>();
        BattleManager.Instance.onBattleFieldCreate -= OnCreateBattleField;
    }
@@ -113,4 +116,42 @@
        ui.SetBattleField(battleField);
        battleField.UpdateCanvas(canvas);
    }

    


    void LateUpdate()
    {
        if (!needGuide)
            return;

        if (Input.GetMouseButtonDown(0))
        {
            lastClickTime = Time.realtimeSinceStartup;
        }


        if (Time.realtimeSinceStartup - lastClickTime > BattleManager.Instance.fightGuideNoClickSeconds)
        {
            if (AutoFightModel.Instance.isAutoAttack)
            {
                return;
            }

            if (NewBieCenter.Instance.inGuiding)
            {
                return;
            }

            if (UIManager.Instance.ExistAnyFullScreenOrMaskWin(""))
            {
                return;
            }

            NewBieCenter.Instance.StartNewBieGuide(BattleManager.Instance.fightGuideID);
            needGuide = !MainLevelManager.Instance.IsPassedByMainLevelID(BattleManager.Instance.fightGuideMainLevelLimit);
            BattleManager.Instance.storyBattleField.IsPause = false;
            lastClickTime = Time.realtimeSinceStartup;
        }
    }
}

 Main/System/ChallengeTab/ChallengeTabWin.cs

@@ -90,7 +90,20 @@
            UIManager.Instance.CloseWindow<ChallengeTabWin>();
            if (!FuncOpen.Instance.IsFuncOpen(funcId, true))
                return;
            UIManager.Instance.OpenWindow<ArenaWin>();
            BattleField arenaBattle = BattleManager.Instance.GetBattleFieldByMapID(3);
            if (arenaBattle != null)
            {
                ArenaBattleWin fsBattleWin = UIManager.Instance.GetUI<ArenaBattleWin>();
                if (null == fsBattleWin)
                {
                    fsBattleWin = UIManager.Instance.OpenWindow<ArenaBattleWin>();
                }
                fsBattleWin.SetBattleField(arenaBattle);
            }
            else
            {
                UIManager.Instance.OpenWindow<ArenaWin>();
            }
        });
    }


 Main/System/KnapSack/Logic/SinglePack.cs

@@ -228,6 +228,11 @@
    {
        return items.Values.ToList();
    }

    public List<int> GetItemIndexs()
    {
        return items.Keys.ToList();
    }
    
    public List<ItemModel> GetItems(FilterParams filterParams)
    {

 Main/System/Main/MainWin.cs

@@ -27,10 +27,12 @@
    [SerializeField] UIEffectPlayer fightEffect;
    [SerializeField] UIEffectPlayer openCloseAnim;
    [SerializeField] FillTween cdTween;
    int index = 0;

    public bool isFirstOpen = true; //首次打开
    public Text hammerText;

    public static event Action TabChangeEvent;
    protected override void InitComponent()
    {
        base.InitComponent();
@@ -43,6 +45,7 @@
        UpdateCurrency();
        UpdatePlayerInfo();
        RefreshFightBtn();
        DisplayTopBar(index);
    }

    protected override void OnPreOpen()
@@ -50,6 +53,8 @@
        PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefresh;
        AutoFightModel.Instance.OnFightEvent += OnSkillCast;
        ChallengeTabWin.OnCloseChallengeTabWin += OnCloseChallengeTabWin;
        BattleManager.Instance.onBattleFieldCreate += OnBattleFieldCreate;
        BattleManager.Instance.onBattleFieldDestroy += OnBattleFieldDestroy;
        base.OnPreOpen();

        // 刷新UI
@@ -61,7 +66,19 @@
        PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefresh;
        AutoFightModel.Instance.OnFightEvent -= OnSkillCast;
        ChallengeTabWin.OnCloseChallengeTabWin -= OnCloseChallengeTabWin;
        BattleManager.Instance.onBattleFieldCreate -= OnBattleFieldCreate;
        BattleManager.Instance.onBattleFieldDestroy -= OnBattleFieldDestroy;
        base.OnPreClose();
    }

    private void OnBattleFieldCreate(string guid, BattleField battleField)
    {
        Refresh();
    }

    private void OnBattleFieldDestroy(string guid, BattleField battleField)
    {
        Refresh();
    }

    private void OnCloseChallengeTabWin()
@@ -82,8 +99,37 @@
        tabButtons[functionOrder].SelectBtn();
    }

    public void DisplayTopBar(int index)
    {
        bool isOtherBattleInProgress = BattleManager.Instance.IsOtherBattleInProgress();
        switch (index)
        {
            case 0:
            case 2:
                topBar.SetActive(true);
                break;
            case 1:
            case 4:
                topBar.SetActive(false);
                break;
            case 3:
                topBar.SetActive(!isOtherBattleInProgress);
                break;
            default:
                topBar.SetActive(true);
                break;
        }
    }

    protected override void SelectBottomTab(int index)
    {
        bool isOtherBattleInProgress = BattleManager.Instance.IsOtherBattleInProgress();
        if (isOtherBattleInProgress)
        {
            // 如果正在非主线战斗中，没满足解锁条件则不允许切换
        }
        DisplayTopBar(index);

        if (index == 3)
        {
            //挑战特殊显示逻辑
@@ -91,7 +137,8 @@
            return;
        }

        topBar.SetActive(index == 0 || index == 2);


        // 如果点击当前已选中的标签，不做处理
        if (functionOrder == index && currentSubUI != null)
        {
@@ -107,6 +154,8 @@

        // 根据选中的标签打开对应的界面
        OpenSubUIByTabIndex();

        TabChangeEvent?.Invoke();
    }

    //战斗按钮动画
@@ -187,6 +236,9 @@
    /// </summary>
    protected override void OnTabButtonClicked(int index)
    {
        this.index = index;


        if (index == 0)
        {
            if (currentSubUI != null && currentSubUI.name == "HomeWin")
@@ -201,8 +253,6 @@
            UIManager.Instance.OpenWindow<GuildJoinWin>();
            return;
        }


        SelectBottomTab(index);
    }


 Main/System/MainLevel/MainLevelManager.cs

@@ -53,5 +53,20 @@

        return true;
    }
	

    //levelID 为客户端配置的ID
    public bool IsPassedByMainLevelID(int levelID)
    {
        var value = PlayerDatas.Instance.baseData.ExAttr1;
        var chapterID = value / 10000;
        var levelNum = value % 10000 / 100;

        var config = MainLevelConfig.Get(levelID);
        if (chapterID > config.ChapterID || (chapterID == config.ChapterID && levelNum > config.LevelNum))
        {
            return true;
        }

        return false;
    }
}

 Main/System/NewBieGuidance/NewBieCenter.cs

@@ -251,11 +251,16 @@
        {

            waitGuideWinNames.Remove(config.WinName);

        }



        BattleManager.Instance.storyBattleField.IsPause = true;

        currentGuide = _id;



        guideStep = config.Steps.Length > 0 ? config.Steps[0] : 0;

        var stepConfig = ScriptableObjectLoader.LoadSoNewBieGuideStep(guideStep);

        if (!(stepConfig.guideType == GuideType.NewBie && stepConfig.clickCompleteNoMask))

        {

            // 非强制引导不暂停战斗，如有具体需要可以增加字段

            BattleManager.Instance.storyBattleField.IsPause = true;

        }





        if (guideBeginEvent != null)

        {


 Main/System/NewBieGuidance/NewBieGuideScriptableObject.cs

@@ -17,9 +17,11 @@
    public Vector2 usherPosition;
    public UsherOrientation usherOrientation;
    public int usherAction;
    public bool clickAnyWhereComplete = false;
    public bool clickCompleteNoMask = false;    //任意点击关闭  勾选此项会隐藏蒙版

    //有蒙版的 亦有强制点击的效果
    // 特殊例子：镂空范围超过屏幕就可以实现看起来不是强制引导 点击任意位置有效
    //  如果后续想做：不想要蒙版 又想要点击引导的位置才有效 则可以是在勾选clickAnyWhereComplete情况下，改变mask的alpha值即可配合提示
    public bool clickAnyWhereComplete = false;  
    public bool clickCompleteNoMask = false;    //非强制引导，任意点击关闭，勾选此项会隐藏蒙版，且点击其他区域不会响应按钮事件


    // 引导的文本的箭头位置

 Main/Utility/TimeUtility.cs

@@ -424,7 +424,7 @@
    //例子
    //x天
    //x时
    //x分x秒
    //x分
    //x秒
    public static string SecondsToConsumeRebate(int _seconds)
    {
@@ -438,15 +438,15 @@
        }
        else if (hours >= 1)
        {
            return StringUtility.Contact(Mathf.CeilToInt(hours), Language.Get("Hour"));
            return StringUtility.Contact(Mathf.CeilToInt(hours), Language.Get("L1072"));
        }
        else if (mins >= 1)
        {
            return StringUtility.Contact(mins, Language.Get("Minute"), seconds, Language.Get("RealmWin_Bewrite_35"));
            return StringUtility.Contact(mins, Language.Get("L1073"));
        }
        else
        {
            return StringUtility.Contact(seconds, Language.Get("RealmWin_Bewrite_35"));
            return StringUtility.Contact(seconds, Language.Get("L1075"));
        }
    }