少年修仙传客户端代码仓库
client_linchunjie
2018-11-24 a90d653d5a25ba817a560c81ff1279b4bd755d22
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
6个文件已修改
108 ■■■■ 已修改文件
Core/GameEngine/Model/TelPartialConfig/PartialGodWeaponEffectConfig.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Compose/New/ComposeEquipWin.cs 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dungeon/IceCrystalVeinModel.cs 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dungeon/IceCrystalVeinWin.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/FindPrecious/FindPreciousModel.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/GeneralConfig/GeneralDefine.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Core/GameEngine/Model/TelPartialConfig/PartialGodWeaponEffectConfig.cs
@@ -30,14 +30,14 @@
            {
                if (config != null)
                {
                    if (item.level < level && item.level > config.level)
                    if (item.level <= level && item.level > config.level)
                    {
                        config = item;
                    }
                }
                else
                {
                    if (item.level < level)
                    if (item.level <= level)
                    {
                        config = item;
                    }
System/Compose/New/ComposeEquipWin.cs
@@ -18,9 +18,14 @@
        [SerializeField] GameObject increaseRateItem;
        [SerializeField] GameObject increaseGridCell;
        [Header("固定物品和非固定物品")]
        [SerializeField] List<ComposeMatCell> fixedAndUnfixeds = new List<ComposeMatCell>();
        [SerializeField] GameObject three_ComposeEquip;
        [SerializeField] GameObject five_ComposeEquip;
        [Header("固定物品和三个非固定物品")]
        [SerializeField] List<ComposeMatCell> three_FixedAndUnfixeds = new List<ComposeMatCell>();
        [Header("固定物品和五个非固定物品")]
        [SerializeField] List<ComposeMatCell> five_FixedAndUnfixeds = new List<ComposeMatCell>();
        [Header("合成物品")]
        [SerializeField] List<ComposeMatCell> makeItems = new List<ComposeMatCell>();
        [Header("提高成功率")]
@@ -47,9 +52,7 @@
        [SerializeField]
        GameObject chooseComposeEquip;
        [SerializeField]
        GameObject composeEquip;
        [SerializeField] GameObject container_ComposeEquip;
        [SerializeField] UIEffect composeEffect;
        [SerializeField] UIEffect successEffect;
        [SerializeField] UIEffect failEffect;
@@ -396,7 +399,7 @@
        {
            notChooseBG.SetActive(isShows[0]);
            chooseComposeEquip.SetActive(isShows[1]);
            composeEquip.SetActive(isShows[2]);
            container_ComposeEquip.SetActive(isShows[2]);
        }
        private void UpdateComposeMat()
@@ -417,21 +420,31 @@
            int[] fixedIds = compoundModel.itemID;
            int[] fixedDisplays = compoundModel.itemDisplay;
            int[] unfixedIds = compoundModel.unfixedItemID;
            int[] unfixedDisplays = compoundModel.unfixedItemDisplay;
            if(compoundModel.unfixedItemCount <= 3)
            {
                three_ComposeEquip.SetActive(true);
                five_ComposeEquip.SetActive(false);
            }
            else
            {
                three_ComposeEquip.SetActive(false);
                five_ComposeEquip.SetActive(true);
            }
            for(int i = 0; i < fixedAndUnfixeds.Count; i++)
            var fixedAndUnfixeds = compoundModel.unfixedItemCount > 3 ? five_FixedAndUnfixeds : three_FixedAndUnfixeds;
            for (int i = 0; i < fixedAndUnfixeds.Count; i++)
            {
                var matCell = fixedAndUnfixeds[i];
                matCell.SetDisplay(compoundModel, NeedMatType.Nothing, true);
            }
            for(int i = 0; i < fixedDisplays.Length; i++)
            for (int i = 0; i < fixedDisplays.Length; i++)
            {
                var fixedDisplay = fixedDisplays[i];
                if(fixedDisplay != 0)
                if (fixedDisplay != 0)
                {
                    var matCell = fixedAndUnfixeds[fixedDisplay -1];
                    var matCell = fixedAndUnfixeds[fixedDisplay - 1];
                    int fixedId = 0;
                    composeWinModel.TryGetIdByDisplay(NeedMatType.fixedItem, compoundModel, fixedDisplay, out fixedId);
                    matCell.SetDisplay(compoundModel, NeedMatType.fixedItem, false, "", fixedId);
@@ -447,6 +460,7 @@
                    matCell.SetDisplay(compoundModel, NeedMatType.unfixedItem, false, UIHelper.ReplaceNewLine(Language.Get("ComposeWin_PutInText_2")));
                }
            }
            int[] increases = compoundModel.successRateIncrease;
            if (increases == null || increases.Length < 2)
@@ -608,6 +622,8 @@
            var unfixedSelectItemDict = selectModel.GetUnfixedItemModel();
            var unfixeAddDict = selectModel.GetHaveUnfixedSelectItem();
            int[] unfixedDisplays = compoundModel.unfixedItemDisplay;
            var fixedAndUnfixeds = compoundModel.unfixedItemCount > 3 ? five_FixedAndUnfixeds : three_FixedAndUnfixeds;
            for (int i = 0; i < unfixedDisplays.Length; i++)
            {
                var unfixedDisplay = unfixedDisplays[i];
System/Dungeon/IceCrystalVeinModel.cs
@@ -26,6 +26,7 @@
{
    public Dictionary<int, IceLodeStarAwardClass> DicIceLodeStarAward = new Dictionary<int, IceLodeStarAwardClass>();
    public List<int> LineList = new List<int>();//玩法列表
    private List<IceLodeStarAwardClass> IceLodeStarAwardList = new List<IceLodeStarAwardClass>();
    public Dictionary<int, string> IconKeyDic = new Dictionary<int, string>();
    public int AwardRecord = 0;//领奖记录
    public int HasSweep = 0;//是否已扫荡
@@ -37,6 +38,8 @@
    DungeonModel m_Model;
    DungeonModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<DungeonModel>()); } }
    public const int ICECRYSTALVEIN_MAPID = 31140;
    public const int ICECRYSTALVEIN_REDPOINT = 78102;
    public Redpoint Redpoint = new Redpoint(78001, ICECRYSTALVEIN_REDPOINT);
    public override void Init()
    {
        var IceLodeCfg = Config.Instance.Get<FuncConfigConfig>("IceLodeCfg");
@@ -49,15 +52,26 @@
    }
    public void OnBeforePlayerDataInitialize()
    {
        model.dungeonRecordChangeEvent -= dungeonRecordChangeEvent;
    }
    private void dungeonRecordChangeEvent(int fbId)
    {
        if (fbId == ICECRYSTALVEIN_MAPID)
        {
            IsShowRedPoint();
        }
    }
    public override void UnInit()
    {
    }
    public void OnPlayerLoginOk()
    {
        model.dungeonRecordChangeEvent += dungeonRecordChangeEvent;
        AddIceLodeStarAwardList();
        IsShowRedPoint();
    }
    private void Assignment()
@@ -107,6 +121,8 @@
        AwardRecord = (int)info.AwardRecord;
        HasSweep = (int)info.HasSweep;
        DayLv = (int)info.DayLV;
        AddIceLodeStarAwardList();
        IsShowRedPoint();
        if (UpdateIceLodeInf != null)
        {
            UpdateIceLodeInf();
@@ -163,6 +179,42 @@
        }
        return true;
    }
    private void AddIceLodeStarAwardList()
    {
        IceLodeStarAwardList.Clear();
        foreach (var key in DicIceLodeStarAward.Keys)
        {
            var Dic = DicIceLodeStarAward[key];
            int Lv = DayLv;
            if (Lv >= Dic.MinLv && Lv <= Dic.MaxLv)
            {
                IceLodeStarAwardList.Add(Dic);
            }
        }
    }
    private void  IsShowRedPoint()//是否显示红点
    {
        bool Isbool = false;
        for (int i = 0; i < IceLodeStarAwardList.Count; i++)
        {
            IceLodeStarAwardClass IceLode = IceLodeStarAwardList[i];
            int All_star = GetAllStar();
            bool _bool = MathUtility.GetBitValue((uint)AwardRecord, (ushort)IceLode.Index);
            if (All_star >= IceLode.Star && !_bool)
            {
                Isbool = true;
            }
        }
        if (Isbool)
        {
            Redpoint.state = RedPointState.Simple;
        }
        else
        {
            Redpoint.state = RedPointState.None;
        }
    }
}
System/Dungeon/IceCrystalVeinWin.cs
@@ -109,7 +109,7 @@
        private void dungeonRecordChangeEvent(int fbId)
        {
            if (fbId == 31140)
            if (fbId == IceCrystalVeinModel.ICECRYSTALVEIN_MAPID)
            {
                StarAll = iceCrystalVeinModel.GetAllStar();
                SetGridBotton();
System/FindPrecious/FindPreciousModel.cs
@@ -473,7 +473,7 @@
        private void RemoveBossRebornNotify(int bossId)
        {
            for (var i = bossNotifies.Count; i >= 0; i--)
            for (var i = bossNotifies.Count - 1; i >= 0; i--)
            {
                var notify = bossNotifies[i];
                if (notify.bossId == bossId)
@@ -558,7 +558,7 @@
                return false;
            }
            if (PlayerDatas.Instance.hero != null && Time.realtimeSinceStartup - PlayerDatas.Instance.hero.calculAutoFightTime < 60f)
            if (PlayerDatas.Instance.hero != null && Time.realtimeSinceStartup - PlayerDatas.Instance.hero.calculAutoFightTime < GeneralDefine.DemonJarAutoTime)
            {
                return false;
            }
System/GeneralConfig/GeneralDefine.cs
@@ -153,6 +153,7 @@
    public static int fairyLandBuffCondition { get; private set; }
    public static int fairyLandBuffId { get; private set; }
    public static int achievementEarlierStageLevel { get; private set; }
    public static int DemonJarAutoTime { get; private set; }
    public static void Init()
    {
@@ -535,6 +536,7 @@
            PreloadSkillEffect = new int[2][];
            PreloadSkillEffect[0] = GetIntArray("PreloadSkillEffect");
            PreloadSkillEffect[1] = GetIntArray("PreloadSkillEffect", 2);
            DemonJarAutoTime = GetInt("DemonJarAutoTime");
        }
        catch (Exception ex)
        {