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

yyl

7 天以前 4145075707a34f925235d74306788b186328eac3

 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;
    }
}