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

client_Wu Xijin

2018-09-10 776ba860c3639d31c380c2767a3958808707b1dc

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

 System/Dogz/DogzModel.cs

@@ -9,6 +9,7 @@
    public class DogzModel : Model,IBeforePlayerDataInitialize,IAfterPlayerDataInitialize,IPlayerLoginOk

    {

        PlayerPackModel playerPack { get { return ModelCenter.Instance.GetModel<PlayerPackModel>(); } }

        GodBeastModel beastModel { get { return ModelCenter.Instance.GetModel<GodBeastModel>(); } }



        public override void Init()

        {

@@ -308,7 +309,8 @@
            m_DogzEquipAttrDict.Clear();

            DogzConfig dogzConfig = Config.Instance.Get<DogzConfig>(dogzId);

            int[] baseAttrIds = dogzConfig.BaseAttrTypes;

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

            Dictionary<int, int> dogzStrenDict = beastModel.AllEnhancedProperties(dogzId);

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

            {

                int attrValue = 0;

                List<ItemModel> itemModels = GetDogzEquips(dogzId);

@@ -340,7 +342,10 @@
                        }

                    }

                }



                if(dogzStrenDict.ContainsKey(baseAttrIds[i]))

                {

                    attrValue += dogzStrenDict[baseAttrIds[i]];

                }

                m_DogzEquipAttrDict.Add(baseAttrIds[i], attrValue);

            }

            return m_DogzEquipAttrDict;


 System/KnapSack/Logic/ItemTipsModel.cs

@@ -1689,6 +1689,7 @@
        }



        RuneModel runeModel { get { return ModelCenter.Instance.GetModel<RuneModel>(); } }

        GodBeastModel beastModel { get { return ModelCenter.Instance.GetModel<GodBeastModel>(); } }



        public ItemAttrData(int id,bool isPreview = false,ulong count = 0,int index = -1, int isBind = 0,bool isCompare = false,PackType type = PackType.rptDeleted, string guid = "", Dictionary<int, List<int>> useDataDict = null,ItemTipChildType childType = ItemTipChildType.Normal)

        {

@@ -1847,6 +1848,7 @@
                {

                    StrengthLV = GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus)[0];

                }

                strengthDataDict = beastModel.SiteEnhancementAttribute(type,index);

            }



            SetWinType();


 System/Strengthening/GodBeastAttributes.cs

@@ -244,9 +244,10 @@
            m_FullLevel.SetActive(false);

            int toLv = ToLv(ToExpTotal);

            m_LvNowText.text = "+" + DogZLv.ToString();

            if (DogZLv == toLv)

            if (toLv <= DogZLv)

            {

                m_LvNextText.text = "+" + (toLv + 1).ToString();

                m_LvNextText.text = "+" + (DogZLv + 1).ToString();

                toLv = DogZLv + 1;

            }

            else

            {

@@ -261,6 +262,8 @@
                m_TextAttributesAdd1.gameObject.SetActive(false);

                m_TextAttributesAdd2.gameObject.SetActive(false);

                m_ExpNum.text = DogZExp + "/" + DogzEquipConfig.upExpTotal;

                float value = (float)DogZExp / DogzEquipConfig.upExpTotal;

                SetExperienceBar(DogZLv, value);

                if (AttType.Length > 1)

                {

                    m_TextAttributes1.gameObject.SetActive(true);

@@ -294,6 +297,8 @@
                int[] AttValueTo = ConfigParse.GetMultipleStr<int>(DogzEquipToConfig.attValue);

                string strColor = string.Format(Language.Get("DogzGreenText"), ToExpTotal);

                m_ExpNum.text = DogZExp + strColor + "/" + DogzEquipConfig.upExpTotal;

                float value= (float)DogZExp / DogzEquipConfig.upExpTotal;

                SetExperienceBar(DogZLv, value);

                if (AttType.Length > 1)

                {

                    m_TextAttributes1.gameObject.SetActive(true);

@@ -382,6 +387,28 @@
                DogZExp = IudetDogzEquipPlus[1];

            }

        }





        int GodBeast_Number = 0;

        int GodBeast_Part = 0;

        private void SetExperienceBar(int lv,float value)//设置经验条

        {

            if (GodBeast_Number != GodBeastNumber || GodBeast_Part != GodBeastPart)

            {

                GodBeast_Number = GodBeastNumber;

                GodBeast_Part = GodBeastPart;

                m_ExpSlider.stage = lv;

                m_ExpSlider.delay = 0f;

                m_ExpSlider.ResetStage();

                m_ExpSlider.value = value;

            }

            else

            {

                m_ExpSlider.delay = 0.1f;

                m_ExpSlider.stage = lv;

                m_ExpSlider.value = value;

            }

        }

    }

}

 System/Strengthening/GodBeastReinforcementWin.cs

@@ -30,6 +30,8 @@
        [SerializeField] GodBeastAttributes m_GodBeastAttributes;

        DogzModel Dogz_model;

        DogzModel dogz_model { get { return Dogz_model ?? (Dogz_model = ModelCenter.Instance.GetModel<DogzModel>()); } }

        PlayerPackModel _playerPack;

        PlayerPackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } }

        public static event Action<int> ChooseToModify;

        private List<GodBeastClass> GodBeastList = new List<GodBeastClass>();
        private int CurrentlySelected = 0;
@@ -61,14 +63,25 @@

        protected override void OnAfterOpen()
        {
            playerPack.RefreshItemCountAct += RefreshItemCountAct;
        }

        protected override void OnPreClose()
        {        
        {

            playerPack.RefreshItemCountAct -= RefreshItemCountAct;

            m_ScrollerController.OnRefreshCell -= OnRefreshGridCell;
        }





        private void RefreshItemCountAct(PackType arg1, int arg2, int arg3)

        {

            if (arg1 == PackType.rptDogzEquip)

            {

                OnCreateGridLineCell(m_ScrollerController);

                m_GodBeastSlidingList.Init();

                m_GodBeastAttributes.Init();

                m_GodBeastAttributes.GetGodBeastLocationMarker(CurrentlySelected);

            }

        }



        protected override void OnAfterClose()
        {