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

client_Wu Xijin

2018-11-24 ecdb1722542eb189d7f27477389ecc7be51287ea

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

 System/KnapSack/Logic/ItemTipsModel.cs

@@ -719,9 +719,36 @@


            bool isOverdue = modelInterface.IsOverdue(attrData.guid,attrData.itemId,attrData.useDataDict);

       

            if (attrData.itemConfig.CanSell == 1)

             switch(attrData.itemConfig.Type)

            {

                attrData.SetTipsFuncBtn(ItemWinBtnType.sell, (ItemWinBtnType, ItemAttrData) => { PackSendQuestMgr.Instance.SendSellQuest(ItemWinBtnType.sell,attrData); });

                case 124:

                    HorseConfig horseConfig = unlockMountDict[attrData.itemConfig.EffectValueA1];

                    var horseModel = ModelCenter.Instance.GetModel<PlayerMountDatas>();

                    if (horseModel._DicHorse.ContainsKey(horseConfig.HorseID) && attrData.isBind == 1)

                    {

                        if (attrData.itemConfig.CanSell == 1)

                        {

                            attrData.SetTipsFuncBtn(ItemWinBtnType.sell, (ItemWinBtnType, ItemAttrData) => { PackSendQuestMgr.Instance.SendSellQuest(ItemWinBtnType.sell, attrData); });

                        }

                    }

                    break;

                case 125:

                    PetInfoConfig petInfo = unlockPetDict[attrData.itemConfig.EffectValueA1];

                    var petmodel = ModelCenter.Instance.GetModel<PlayerPetDatas>();

                    if (petmodel._DicPetBack.ContainsKey(petInfo.ID) && attrData.isBind == 1)

                    {

                        if (attrData.itemConfig.CanSell == 1)

                        {

                            attrData.SetTipsFuncBtn(ItemWinBtnType.sell, (ItemWinBtnType, ItemAttrData) => { PackSendQuestMgr.Instance.SendSellQuest(ItemWinBtnType.sell, attrData); });

                        }

                    }

                    break;

                default:

                    if (attrData.itemConfig.CanSell == 1)

                    {

                        attrData.SetTipsFuncBtn(ItemWinBtnType.sell, (ItemWinBtnType, ItemAttrData) => { PackSendQuestMgr.Instance.SendSellQuest(ItemWinBtnType.sell, attrData); });

                    }

                    break;

            }



            List<int> dismantleReturnlist = attrData.GetUseDataModel((int)ItemUseDataKey.Def_IudetItemDecompound);


 System/Treasure/DemonTreasureWin.cs

@@ -16,6 +16,7 @@
    public class DemonTreasureWin : Window

    {

        [SerializeField] TreasureDemonBehaviour m_TreasureDemonBehaviour;

        [SerializeField] Image m_TreasureNameIcon;

        [SerializeField] Text m_PropertyTitle;

        [SerializeField] PropertyBehaviour[] m_Propertys;

        [SerializeField] Text m_SkillTitle;

@@ -38,7 +39,6 @@
        [SerializeField] PositionTween m_TreasureGainTween;

        [SerializeField] PositionTween m_DescriptionTween;

        [SerializeField] PositionTween m_SkillTween;

        [SerializeField] PositionTween m_NameTween;

        [SerializeField] UIAlphaTween m_DungeonAlphaTween;



        [SerializeField] float m_SelectHeight = 253f;

@@ -211,6 +211,7 @@
            DisplayDungeons();

            DisplayChallenge();

            DisplayDungeonPosition();

            DisplayTreasureName();

        }



        private void DisplayAnimation()

@@ -219,7 +220,6 @@
            {

                case AnimationStep.None2Lock:

                    m_DescriptionTween.Play();

                    m_NameTween.Play();

                    m_SkillTween.Play();

                    m_TreasureGainTween.SetStartState();

                    UI3DTreasureSelectStage.Instance.SetStartState();

@@ -230,12 +230,10 @@
                    m_DungeonAlphaTween.Play();

                    treasureTweening = true;

                    timer = 0f;

                    UI3DTreasureSelectStage.Instance.Tween(()=> 
                    {

                        treasureTweening = false;

                    });

                    StopAllLine();

                    m_TreasureNameIcon.gameObject.SetActive(false);

                    UI3DTreasureSelectStage.Instance.Tween(OnTreasureTweenComplete);

                    m_DescriptionTween.SetStartState();

                    m_NameTween.SetStartState();

                    m_SkillTween.SetStartState();

                    m_TreasureGainTween.Play();

                    break;

@@ -244,12 +242,9 @@
                    m_DungeonAlphaTween.Play();

                    treasureTweening = true;

                    timer = 0f;

                    UI3DTreasureSelectStage.Instance.Tween(() =>

                    {

                        treasureTweening = false;

                    });

                    StopAllLine();

                    UI3DTreasureSelectStage.Instance.Tween(OnTreasureTweenComplete);

                    m_DescriptionTween.Play(true);

                    m_NameTween.Play(true);

                    m_SkillTween.Play(true);

                    m_TreasureGainTween.Play();

                    break;

@@ -257,11 +252,29 @@
                    m_ContainerDungeons.gameObject.SetActive(false);

                    UI3DTreasureSelectStage.Instance.SetStartState();

                    m_DescriptionTween.Play();

                    m_NameTween.Play();

                    m_SkillTween.Play();

                    m_TreasureGainTween.Play(true);

                    break;

            }

        }



        void OnTreasureTweenComplete()

        {

            treasureTweening = false;

            DisplayLines();

            DisplayTreasureName();

        }



        private void DisplayTreasureName()

        {

            if (treasureTweening)

            {

                m_TreasureNameIcon.gameObject.SetActive(false);

                return;

            }

            m_TreasureNameIcon.gameObject.SetActive(true);

            var config = Config.Instance.Get<TreasureConfig>(model.selectedTreasure);

            m_TreasureNameIcon.SetSprite(config.TreasureNameIcon);

        }



        private void DisplayProperty()

@@ -524,10 +537,13 @@
        public const float LINE_NORMAL_SCALE = 0.78f;

        private void DisplayLines()

        {

            Treasure treasure;

            model.TryGetTreasure(model.selectedTreasure, out treasure);

            TreasureDungeon treasureDungeon;

            var scriptable = ScriptableObjectLoader.LoadSoDemonDungeon(model.selectedTreasure);

            if (scriptable == null)

            if (scriptable == null || treasureTweening || treasure == null || treasure.state == TreasureState.Locked)

            {

                StopAllLine();

                return;

            }

            if (model.TryGetTreasureDungeon(model.selectedTreasure, out treasureDungeon))

@@ -538,8 +554,8 @@
                    if (index < m_DungeonBehaviours.Length)

                    {

                        var line = m_DungeonBehaviours[index].line;

                        line.Stop();

                        if (i < treasureDungeon.currentLevel)

                        line.StopImediatly();

                        if (i <= treasureDungeon.currentLevel && treasureDungeon.maxLevel > i)

                        {

                            line.Play();

                            if (line.target != null)

@@ -561,6 +577,14 @@
                }

            }

        }



        private void StopAllLine()

        {

            for (int i = 0; i < m_DungeonBehaviours.Length; i++)

            {

                m_DungeonBehaviours[i].line.StopImediatly();

            }

        }

        #endregion



        enum AnimationStep


 System/Treasure/TreasureDemonBehaviour.cs

@@ -9,7 +9,6 @@
{

    public class TreasureDemonBehaviour : MonoBehaviour

    {

        [SerializeField] Image m_TreasureNameIcon;

        [SerializeField] Text m_TreasureDescription;

        [SerializeField] RectTransform m_ContainerFightPower;

        [SerializeField] Text m_FightPower;

@@ -63,7 +62,6 @@
            var myPower = PlayerDatas.Instance.baseData.FightPoint;

            m_ContainerLimit.gameObject.SetActive(m_Treasure.state == TreasureState.Locked);

            m_ContainerFightPower.gameObject.SetActive(m_Treasure.state == TreasureState.Collected);

            m_TreasureNameIcon.SetSprite(config.TreasureNameIcon);



            if (m_Treasure.state == TreasureState.Locked)

            {