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

client_Hale

2018-09-08 0cbe7a8f474b0ad163139515d0fb4a76bd7858df

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

 System/BlastFurnace/BlastFurnaceModel.cs

@@ -900,14 +900,14 @@
            if(playerPack.CheckIsDrugById(previewlist[i]))

            {

                AttrFruitConfig fruitConfig = Config.Instance.Get<AttrFruitConfig>(previewlist[i]);

                if(playerPack.IsReachMaxUseDrug(fruitConfig))

                if(!playerPack.IsReachMaxUseDrug(fruitConfig))

                {

                    return true;

                }

            }

        }

        return false;

    }

            }

        }

        return true;

    }



    public bool CheckNormalAlchemyIsReachMaxUse(AlchemyConfig alchemyConfig)

    {


 System/BlastFurnace/DandrugCell.cs

@@ -76,22 +76,7 @@
            unSelectImg.SetActive(true);

            selectImg.SetActive(false);

        }



        List<int> previewDanlist = FurnaceModel.GetPreviewMakeDruglist(alchemyModel).Keys.ToList();

        bool isReach = true;

        for(int i = 0; i < previewDanlist.Count; i++)

        {

            if(playerPack.CheckIsDrugById(previewDanlist[i]))

            {

                AttrFruitConfig fruitConfig = Config.Instance.Get<AttrFruitConfig>(previewDanlist[i]);

                if(!playerPack.IsReachMaxUseDrug(fruitConfig))

                {

                    isReach = false;

                    break;

                }

            }

        }



         bool isReach = FurnaceModel.IsHaveReachFull(alchemyModel);

        int alchemyLv = alchemyModel.AlchemyID % 10;

        if(isReach)

        {


 System/MainInterfacePanel/TaskListTip.cs

@@ -221,6 +221,8 @@
            for (int i = 0; i < leng; i++)

            {

                GameObject childObj = Content.GetChild(i).gameObject;

                TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();

                childObjTaskType.ClearTaskName();

                if (childObj.activeSelf)

                {

                    childObj.SetActive(!childObj.activeSelf);

@@ -279,7 +281,6 @@
            {

                GameObject childObj = Content.GetChild(i).gameObject;

                TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();

            //    childObj.GetComponent<FlyingShoesTask>().ImgSelected.SetActive(false);

                if (i < _list.Count)

                {

                    if (!childObj.activeSelf)

@@ -293,6 +294,7 @@
                }

                else

                {

                    childObjTaskType.ClearTaskName();

                    if (childObj.activeSelf)

                    {

                        childObj.SetActive(false);


 System/MainInterfacePanel/TaskType.cs

@@ -54,7 +54,6 @@

    public void IsGameObjectName(int TaskID)
    {

        if (taskmodel.allMissionDict.ContainsKey(TaskID))
        {
            switch (taskmodel.allMissionDict[TaskID].Type)
@@ -85,16 +84,12 @@
                case 12:
                    this.gameObject.name = "FairyAu_" + TaskID;
                    break;





            }
        }
            }




        }
    public void  ClearTaskName()

    {

        this.gameObject.name = "Task_PoolObject";

    }
}