Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-09-25 8f554f0cfdda49572a3471afd1b084bc16232e64

Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

 Core/GameEngine/Model/TelPartialConfig/tagItemCompoundConfig.cs

@@ -140,6 +140,21 @@
            return null;

        }



        public static ItemCompoundConfig GetItemCompoundByType(int firstType,int secondType, int thirdType)

        {

            if(allComposeModelDict.ContainsKey(firstType))

            {

                if(allComposeModelDict[firstType].ContainsKey(secondType))

                {

                    if(allComposeModelDict[firstType][secondType].ContainsKey(thirdType))

                    {

                        return allComposeModelDict[firstType][secondType][thirdType][0];

                    }

                }

            }

            return null;

        }



        public static bool TryGetTicketCompose(int _ticketId, out List<ItemCompoundConfig> list)

        {

            return ticketComposeDict.TryGetValue(_ticketId, out list);


 System/BlastFurnace/BlastFurnaceModel.cs

@@ -10,7 +10,7 @@
public class BlastFurnaceModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, IPlayerLoginOk

{

    public BlastFurnaceFuncTitle funcTitle = BlastFurnaceFuncTitle.MakeDan;



    private int makeDrugRedLv;

    public Action<AlchemySpecConfig> RefreshAddSpecMatEvent;



    private TreasureModel _model;

@@ -64,6 +64,8 @@
        }



        alchemyModellist = Config.Instance.GetAllValues<AlchemyConfig>();

        FuncConfigConfig alchemyRedPoint = Config.Instance.Get<FuncConfigConfig>("AlchemyRedPoint");

        int.TryParse(alchemyRedPoint.Numerical1,out makeDrugRedLv);

        SetDandrugRedPointlist();

        GlobalTimeEvent.Instance.secondEvent += SecondUpdate;

    }

@@ -757,11 +759,11 @@
        bool isCheckRed = false;

        if(!isClick)

        {

            if(PlayerDatas.Instance.baseData.LV <= 151)

            if(PlayerDatas.Instance.baseData.LV <= makeDrugRedLv)

            {

                isCheckRed = true;

            }

            else if(PlayerDatas.Instance.baseData.LV > 151 && !isLogin && !IsMakeDrugWin)

            else if(PlayerDatas.Instance.baseData.LV > makeDrugRedLv && !isLogin && !IsMakeDrugWin)

            {

                isCheckRed = true;

            }

@@ -790,7 +792,7 @@
        }

        else

        {

            if(PlayerDatas.Instance.baseData.LV > 151)

            if(PlayerDatas.Instance.baseData.LV > makeDrugRedLv)

            {

                MakeDrugRedpoint.state = RedPointState.None;

            }

@@ -1361,6 +1363,7 @@
{

    MakeDan,  //炼丹

    AttrDan,  //丹药属性

    DrugStore, //回收商店

}






 System/BlastFurnace/BlastFurnaceWin.cs

@@ -94,6 +94,9 @@
                case BlastFurnaceFuncTitle.AttrDan:

                    _treasureRefineTitle.state = TitleBtnState.Click;

                    break;

                case BlastFurnaceFuncTitle.DrugStore:

                    _storeTitle.state = TitleBtnState.Click;

                    break;

            }

          

        }

@@ -137,6 +140,7 @@


        private void OnClickStoreTitle()

        {

            FurnaceModel.funcTitle = BlastFurnaceFuncTitle.DrugStore;

            _lingDanTips.SetActive(false);

            attrDanTips.SetActive(false);

            storeTips.SetActive(true);


 System/Compose/New/ComposeWinModel.cs

@@ -814,7 +814,9 @@


        int[] composeCondi = itemConfig.JumpComposeCondi;

        if (composeCondi.Length < 3) return false;

        ItemCompoundConfig itemCompound = GetThirdTypeModellist(composeCondi[0],composeCondi[1],composeCondi[2])[0];

        ItemCompoundConfig itemCompound = ItemCompoundConfig.GetItemCompoundByType(composeCondi[0], composeCondi[1], composeCondi[2]);

        if(itemCompound != null)

        {

        if(itemCompound.levelNeed <= PlayerDatas.Instance.baseData.LV)

        {

            switch (itemCompound.firstType)

@@ -854,6 +856,9 @@
        }

    }



        return false;

    }



    public bool CheckIsComposeByType(int firstType,int secondType,int thirdType)

    {

        ItemCompoundConfig itemCompound = GetThirdTypeModellist(firstType,secondType,thirdType)[0];