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

client_Hale

2018-09-20 1a3098212d90ec1fc3e5bb324c445272b34c012b

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

 System/Dogz/DogzActiveWin.cs

@@ -178,21 +178,25 @@
            {

                m_PropertyTypes[i].gameObject.SetActive(i < _dogzCfg.BaseAttrTypes.Length);

                m_PropertyValues[i].gameObject.SetActive(i < _dogzCfg.BaseAttrTypes.Length);

                string addAttrStr = "";

                string baseAttrStr = "";

                if (i < _dogzCfg.BaseAttrTypes.Length)

                {

                    var _propertyCfg = Config.Instance.Get<PlayerPropertyConfig>(_dogzCfg.BaseAttrTypes[i]);

                    m_PropertyTypes[i].text = _propertyCfg.Name;

                    int attrValue = _dogzCfg.BaseAttrValues[i];



                    if (isAddAttr && model.m_DogzEquipAttrDict[_propertyCfg.ID] > 0)

                    {

                        m_PropertyValues[i].text = StringUtility.Contact(UIHelper.ReplacePercentage(_dogzCfg.BaseAttrValues[i], _propertyCfg.ISPercentage)

                      , _propertyCfg.ISPercentage == 1 ? "%" : string.Empty,"+",UIHelper.ReplacePercentage(model.m_DogzEquipAttrDict[_propertyCfg.ID], _propertyCfg.ISPercentage)

                     
                        baseAttrStr = StringUtility.Contact(UIHelper.ReplacePercentage(_dogzCfg.BaseAttrValues[i], _propertyCfg.ISPercentage)

                      , _propertyCfg.ISPercentage == 1 ? "%" : string.Empty);



                        addAttrStr = StringUtility.Contact("+", UIHelper.ReplacePercentage(model.m_DogzEquipAttrDict[_propertyCfg.ID], _propertyCfg.ISPercentage)

                   , _propertyCfg.ISPercentage == 1 ? "%" : string.Empty);

                    }

                    else

                    {

                        m_PropertyValues[i].text = StringUtility.Contact(UIHelper.ReplacePercentage(_dogzCfg.BaseAttrValues[i], _propertyCfg.ISPercentage)

                        baseAttrStr = StringUtility.Contact(UIHelper.ReplacePercentage(_dogzCfg.BaseAttrValues[i], _propertyCfg.ISPercentage)

                      , _propertyCfg.ISPercentage == 1 ? "%" : string.Empty);

                    }

                  

@@ -200,13 +204,27 @@


                if(model.TryGetAssistDogzState(model.presentSelectDogz))

                {

                    m_PropertyTypes[i].material = MaterialUtility.GetUIDefaultGraphicMaterial();

                    m_PropertyValues[i].material = MaterialUtility.GetUIDefaultGraphicMaterial();

                    m_PropertyTypes[i].color = UIHelper.s_NavyBrown;

                    if(addAttrStr != "")

                    {

                        m_PropertyValues[i].text = StringUtility.Contact("<color=#401c06>", baseAttrStr, "</color>", "<color=#109d06>", addAttrStr, "</color>");

                    }

                    else

                    {

                        m_PropertyValues[i].text = StringUtility.Contact("<color=#401c06>", baseAttrStr, "</color>");

                    }

                }

                else

                {

                    m_PropertyTypes[i].material = MaterialUtility.GetDefaultSpriteGrayMaterial();

                    m_PropertyValues[i].material = MaterialUtility.GetDefaultSpriteGrayMaterial();

                    m_PropertyTypes[i].color = UIHelper.s_BrightWhiteColor;

                    if (addAttrStr != "")

                    {

                        m_PropertyValues[i].text = StringUtility.Contact("<color=#686868>", baseAttrStr, "</color>", "<color=#109d06>", addAttrStr, "</color>");

                    }

                    else

                    {

                        m_PropertyValues[i].text = StringUtility.Contact("<color=#686868>", baseAttrStr, "</color>");

                    }

                }

            }

        }

@@ -215,6 +233,7 @@
            m_Controller.m_Scorller.RefreshActiveCellViews();

            m_DogzAssistCnt.text = Language.Get("TreasurePrivilege_Dogz_1", StringUtility.Contact(model.GetAssistDogzCount(), "/", model.DogzAssistDefaultCnt));

            UpdateDogzBtn();

            UpdateDogzProperty();

        }

        private void UpdateDogzBtn()

        {


 System/MainInterfacePanel/FeatureNoticeWin.cs

@@ -256,6 +256,7 @@
                m_TextShowB.gameObject.SetActive(false);

                m_TextShowC.gameObject.SetActive(false);

                m_TextShowD.gameObject.SetActive(false);

                m_TextAdvanceName.text = "?";

            }

            else

            {

@@ -263,8 +264,9 @@
                m_TextShowB.gameObject.SetActive(true);

                m_TextShowC.gameObject.SetActive(true);

                m_TextShowD.gameObject.SetActive(true);

                m_TextAdvanceName.text = functionForecastConfig.FuncName;

            }

            m_TextAdvanceName.text = functionForecastConfig.FuncName;

            
            DisplayIcon(ClickFuncID);

            string[] StrList = ConfigParse.GetMultipleStr(functionForecastConfig.Content);

            if (StrList.Length > 0)

@@ -383,7 +385,7 @@
                    }

                }

                m_TextUnopened.gameObject.SetActive(true);

                m_TextUnopened.text = string.Format(Language.Get("NextYGLimit"), NeedLv, functionForecastConfig.FuncName);

                m_TextUnopened.text = string.Format(Language.Get("NextYGLimit"), NeedLv);

                return;

            }

            if (funcoPenConfig.LimitMagicWeapon != 0 || funcoPenConfig.LimitMissionID != 0)


 System/MainInterfacePanel/FeaturesType1.cs

@@ -38,7 +38,7 @@
            {

                return;

            }

            m_FunctionName.text = functionForecastConfig.FuncName;

           
            m_FunctionalLevel.text = functionForecastConfig.DisplayLevel.ToString()+ Language.Get("Z1041");



            bool Type = false;

@@ -51,10 +51,12 @@
            }

            if (!FuncOpen.Instance.IsFuncOpen(funcId) && Type && NeedLv > playerLv)

            {

                m_FunctionName.text = "?";

                m_FeaturesTypeIcon.SetSprite("UnKnowIcon");

            }

            else

            {

                m_FunctionName.text = functionForecastConfig.FuncName;

                m_FeaturesTypeIcon.SetSprite(functionForecastConfig.FuncIconKey);

            }

           


 System/MainInterfacePanel/FeaturesType2.cs

@@ -37,7 +37,7 @@
            {

                return;

            }

            m_FunctionName.text = functionForecastConfig.FuncName;

           
            m_FunctionalLevel.text = functionForecastConfig.DisplayLevel.ToString()+Language.Get("Z1041");

            bool  Type = false;

            int NeedLv = 0;

@@ -50,9 +50,11 @@
            if (!FuncOpen.Instance.IsFuncOpen(funcId) && Type && NeedLv> playerLv)

            {

                m_FeaturesTypeIcon.SetSprite("UnKnowIcon");

                m_FunctionName.text = "?";

            }

            else

            {

                m_FunctionName.text = functionForecastConfig.FuncName;

                m_FeaturesTypeIcon.SetSprite(functionForecastConfig.FuncIconKey);

            }

            if (PlayerDatas.Instance.baseData.LV >= functionForecastConfig.DisplayLevel)


 System/Strengthening/GodBeastAttributes.cs

@@ -35,6 +35,10 @@


        [SerializeField] UIAlphaTween m_UIAlphaTween;

        [SerializeField] Slider m_Slider;



        [SerializeField] GameObject m_Text_two;//下级属性

        [SerializeField] Button m_StrengthenDoubleBtn;//双倍强化按钮

        [SerializeField] Text m_NeedFairy;//所需的仙玉

        DogzModel Dogz_model;

        DogzModel dogz_model { get { return Dogz_model ?? (Dogz_model = ModelCenter.Instance.GetModel<DogzModel>()); } }
        private Dictionary<int, int> QualityLimit = new Dictionary<int, int>();

@@ -57,6 +61,7 @@
        {

            m_DoubleToggle.onValueChanged.AddListener(OnClickToggle);

            m_StrengthenBtn.AddListener(OnClickStrengthBtn);

            m_StrengthenDoubleBtn.AddListener(OnClickStrengthBtn);

        }
        private void OnEnable()

        {

@@ -102,7 +107,7 @@
                ListCount.Add(DicAb[key]);

            }

            if (m_DoubleToggle.isOn)

            {                
            {

                dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemInfo.ItemPlace, ListIndex, ListCount, 1);

            }

            else

@@ -110,11 +115,12 @@
                dogz_model.SendDogzEquipStrength(m_DogZItemModel.itemInfo.ItemPlace, ListIndex, ListCount, 0);

            }

        }



        private void ChooseToModify(int locationMarker)

        {

            GetGodBeastLocationMarker(locationMarker);

        }

        private void AbsorbEvent()//选中取消的数据刷新

        private void AbsorbEvent()//选中与取消的数据刷新

        {

            GetDogZLevelAndExp();

            AttributeAssignment();

@@ -157,6 +163,11 @@
                m_ExpSlider.ResetStage();

                m_ExpSlider.value = 0;

                m_ExpNum.text = "0/0";

                m_TextAttributes1.gameObject.SetActive(false);

                m_TextAttributes2.gameObject.SetActive(false);

                m_TextAttributesAdd1.gameObject.SetActive(false);

                m_TextAttributesAdd2.gameObject.SetActive(false);

                m_Text_two.SetActive(false);

                m_FrameNull.SetActive(false);

                m_FullLevel.SetActive(false);

            }

@@ -176,36 +187,59 @@
                var DogzEquipConfig = DogzEquipPlusConfig.GetEquipplaceAndLevel(GodBeastPart, lv);

                if (DogZLv >= lv)

                {

                    m_Text_two.SetActive(false);

                    m_FrameNull.SetActive(false);

                    m_TextAttributes1.gameObject.SetActive(false);

                    m_TextAttributes2.gameObject.SetActive(false);

                    m_TextAttributesAdd1.gameObject.SetActive(false);

                    m_TextAttributesAdd2.gameObject.SetActive(false);

                    m_FullLevel.SetActive(true);

                    GodBeast_Number = GodBeastNumber;

                    GodBeast_Part = GodBeastPart;

                    m_ExpSlider.stage = lv;

                    m_ExpSlider.delay = 0f;

                    m_ExpSlider.ResetStage();

                    m_ExpSlider.value = 1;

                    m_Slider.gameObject.SetActive(false);

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

                    int NeedExp = DogzEquipConfig.upExpTotal;

                    if (DogZLv > 0)

                    {

                        var Dogz_EquipConfig = DogzEquipPlusConfig.GetEquipplaceAndLevel(GodBeastPart, DogZLv - 1);

                        NeedExp -= Dogz_EquipConfig.upExpTotal;

                    }

                    m_ExpNum.text = DogZExp + "/" + NeedExp;

                }

                else

                {

                    m_Text_two.SetActive(true);

                    if (m_DoubleToggle.isOn)

                    {

                        m_StrengthenBtn.gameObject.SetActive(false);

                        m_StrengthenDoubleBtn.gameObject.SetActive(true);

                        m_NeedFairy.text = NeedFairyJade.ToString();

                        PropertySetting(DogZExp, DoubleProficiency);

                    }

                    else

                    {

                        m_StrengthenBtn.gameObject.SetActive(true);

                        m_StrengthenDoubleBtn.gameObject.SetActive(false);

                        PropertySetting(DogZExp, SingleProficiency);

                    }



                }

            }

            else

            {

                if (m_DoubleToggle.isOn)

                {

                    m_StrengthenBtn.gameObject.SetActive(false);

                    m_StrengthenDoubleBtn.gameObject.SetActive(true);

                    m_NeedFairy.text = NeedFairyJade.ToString();

                    PropertySetting(0, DoubleProficiency);

                }

                else

                {

                    m_StrengthenBtn.gameObject.SetActive(true);

                    m_StrengthenDoubleBtn.gameObject.SetActive(false);

                    PropertySetting(0, SingleProficiency);

                }

            }

@@ -256,6 +290,12 @@
                m_LvNextText.text = "+" + toLv.ToString();

            }

            var DogzEquipConfig = DogzEquipPlusConfig.GetEquipplaceAndLevel(GodBeastPart, DogZLv);

            int NeedExp = DogzEquipConfig.upExpTotal;

            if (DogZLv > 0)

            {

                var Dogz_EquipConfig = DogzEquipPlusConfig.GetEquipplaceAndLevel(GodBeastPart, DogZLv - 1);

                NeedExp -= Dogz_EquipConfig.upExpTotal;

            }

            int[] AttType = ConfigParse.GetMultipleStr<int>(DogzEquipConfig.attType);

            int[] AttValue = ConfigParse.GetMultipleStr<int>(DogzEquipConfig.attValue);

            if (ToExpTotal == 0)

@@ -263,8 +303,9 @@
                m_Slider.gameObject.SetActive(false);

                m_TextAttributesAdd1.gameObject.SetActive(false);

                m_TextAttributesAdd2.gameObject.SetActive(false);

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

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



                m_ExpNum.text = DogZExp + "/" + NeedExp;

                float value = (float)DogZExp / NeedExp;

                SetExperienceBar(DogZLv, value);

                if (AttType.Length > 1)

                {

@@ -285,54 +326,30 @@
            else

            {

                m_Slider.gameObject.SetActive(true);

                if (DogZExp + ToExpTotal >= DogzEquipConfig.upExpTotal)

                if (DogZExp + ToExpTotal >= NeedExp)

                {

                    m_Slider.value = 1f;

                }

                else

                {

                    m_Slider.value = (float)(DogZExp + ToExpTotal) / (float)(DogzEquipConfig.upExpTotal);

                    m_Slider.value = (float)(DogZExp + ToExpTotal) / (float)(NeedExp);

                }

                m_UIAlphaTween.Play();

                var DogzEquipToConfig = DogzEquipPlusConfig.GetEquipplaceAndLevel(GodBeastPart, toLv);

                int[] AttTypeTo = ConfigParse.GetMultipleStr<int>(DogzEquipToConfig.attType);

                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;

                m_ExpNum.text = DogZExp + strColor + "/" + NeedExp;

                float value = (float)DogZExp / NeedExp;

                SetExperienceBar(DogZLv, value);

                if (AttType.Length > 1)

                {

                    m_TextAttributes1.gameObject.SetActive(true);

                    m_TextAttributes2.gameObject.SetActive(true);

                    m_TextAttributesAdd1.gameObject.SetActive(true);

                    m_TextAttributesAdd2.gameObject.SetActive(true);

                    string StrName1 = Config.Instance.Get<PlayerPropertyConfig>(AttType[0]).Name;

                    string StrName2 = Config.Instance.Get<PlayerPropertyConfig>(AttType[1]).Name;

                    m_TextAttributes1.text = StrName1 + ":" + AttValue[0];

                    m_TextAttributes2.text = StrName2 + ":" + AttValue[1];

                    m_TextAttributesAdd1.text = "+" + (AttValueTo[0] - AttValue[0]);

                    m_TextAttributesAdd2.text = "+" + (AttValueTo[1] - AttValue[1]);

                }

                else

                {

                    m_TextAttributes1.gameObject.SetActive(true);

                    m_TextAttributesAdd1.gameObject.SetActive(true);

                    m_TextAttributes2.gameObject.SetActive(false);

                    m_TextAttributesAdd2.gameObject.SetActive(false);

                    string StrName1 = Config.Instance.Get<PlayerPropertyConfig>(AttType[0]).Name;

                    m_TextAttributes1.text = StrName1 + ":" + AttValue[0];

                    m_TextAttributesAdd1.text = "+" + (AttValueTo[0] - AttValue[0]);

                }

            }



            SetAddAttributes(DogzEquipConfig, GodBeastPart, toLv);//设置预览的属性

            if (ToExpTotal == 0)

            {

                m_StrengthenBtn.interactable = false;

                m_StrengthenDoubleBtn.interactable = false;

            }

            else

            {

                m_StrengthenBtn.interactable = true;

                m_StrengthenDoubleBtn.interactable = true;

            }

        }



@@ -344,6 +361,11 @@
                return DogzLv;

            }

            int lv = QualityLimit[m_DogZItemModel.chinItemModel.ItemColor];

            var IudetDogzEquipPlus = m_DogZItemModel.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus);

            if (IudetDogzEquipPlus != null)

            {

                ToExpTotal+= IudetDogzEquipPlus[1];

            }

            for (int i = lv; i >= 0; i--)

            {

                var DogzEquipConfig = DogzEquipPlusConfig.GetEquipplaceAndLevel(GodBeastPart, i);

@@ -386,14 +408,23 @@
            if (IudetDogzEquipPlus != null)

            {

                DogZLv = IudetDogzEquipPlus[0];

                DogZExp = IudetDogzEquipPlus[1];

                if (DogZLv > 0)

                {

                    var Dogz_EquipConfig = DogzEquipPlusConfig.GetEquipplaceAndLevel(GodBeastPart, DogZLv - 1);

                    DogZExp = IudetDogzEquipPlus[1] - Dogz_EquipConfig.upExpTotal;

                }

                else

                {

                    DogZExp = IudetDogzEquipPlus[1];

                }



            }

        }





        int GodBeast_Number = 0;

        int GodBeast_Part = 0;

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

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

        {

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

            {

@@ -411,6 +442,39 @@
                m_ExpSlider.value = value;

            }

        }



        private void SetAddAttributes(DogzEquipPlusConfig DogzEquipConfig, int GodBeastPart, int toLv)//设置预览的属性

        {

            int[] AttType = ConfigParse.GetMultipleStr<int>(DogzEquipConfig.attType);

            int[] AttValue = ConfigParse.GetMultipleStr<int>(DogzEquipConfig.attValue);

            var DogzEquipToConfig = DogzEquipPlusConfig.GetEquipplaceAndLevel(GodBeastPart, toLv);

            int[] AttTypeTo = ConfigParse.GetMultipleStr<int>(DogzEquipToConfig.attType);

            int[] AttValueTo = ConfigParse.GetMultipleStr<int>(DogzEquipToConfig.attValue);

            if (AttType.Length > 1)

            {

                m_TextAttributes1.gameObject.SetActive(true);

                m_TextAttributes2.gameObject.SetActive(true);

                m_TextAttributesAdd1.gameObject.SetActive(true);

                m_TextAttributesAdd2.gameObject.SetActive(true);

                string StrName1 = Config.Instance.Get<PlayerPropertyConfig>(AttType[0]).Name;

                string StrName2 = Config.Instance.Get<PlayerPropertyConfig>(AttType[1]).Name;

                m_TextAttributes1.text = StrName1 + ":" + AttValue[0];

                m_TextAttributes2.text = StrName2 + ":" + AttValue[1];

                m_TextAttributesAdd1.text = "+" + (AttValueTo[0] - AttValue[0]);

                m_TextAttributesAdd2.text = "+" + (AttValueTo[1] - AttValue[1]);

            }

            else

            {

                m_TextAttributes1.gameObject.SetActive(true);

                m_TextAttributesAdd1.gameObject.SetActive(true);

                m_TextAttributes2.gameObject.SetActive(false);

                m_TextAttributesAdd2.gameObject.SetActive(false);

                string StrName1 = Config.Instance.Get<PlayerPropertyConfig>(AttType[0]).Name;

                m_TextAttributes1.text = StrName1 + ":" + AttValue[0];

                m_TextAttributesAdd1.text = "+" + (AttValueTo[0] - AttValue[0]);

            }



        }

    }

}

 System/Strengthening/GodBeastModel.cs

@@ -17,6 +17,7 @@
    public event Action AbsorbEvent;

    public int ItemInde = 0;//物品下标

    public ItemModel Crystal_ItemModel;

    public int ItemPlace =-1;//神兽装备位置信息

    DogzModel Dogz_model;

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

    PlayerPackModel _playerPack;


 System/Strengthening/GodBeastReinforcementWin.cs

@@ -21,6 +21,7 @@
        public int GodBeastStar;//神兽星级

        public int LocationMarker;//位置标记

        public int EquipScore;//装备评分

        public int ItemPlace;//背包装备位置

    }
    public class GodBeastReinforcementWin : Window
    {

@@ -32,6 +33,8 @@
        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>()); } }

        GodBeastModel GodBeastModel;

        GodBeastModel godBeastModel { get { return GodBeastModel ?? (GodBeastModel = ModelCenter.Instance.GetModel<GodBeastModel>()); } }

        public static event Action<int> ChooseToModify;

        private List<GodBeastClass> GodBeastList = new List<GodBeastClass>();
        private int CurrentlySelected = 0;
@@ -49,13 +52,33 @@
        {

            CurrentlySelected = 0;

            GetGodBeast();//获取神兽强化装备信息

            if (GodBeastList.Count > 0)



            if (godBeastModel.ItemPlace != -1)

            {

                CurrentlySelected = GodBeastList[0].LocationMarker;

                m_ScrollerController.JumpIndex(0);

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

                {

                    if (GodBeastList[i].ItemPlace == godBeastModel.ItemPlace)

                    {

                        CurrentlySelected = GodBeastList[i].LocationMarker;

                        int Index = 0;

                        Index = GodBeastList.FindIndex((x) =>

                        {

                            return x.ItemPlace == godBeastModel.ItemPlace;

                        });

                        m_ScrollerController.JumpIndex(Index);

                    }

                }

            }

            else

            {

                if (GodBeastList.Count > 0)

                {

                    CurrentlySelected = GodBeastList[0].LocationMarker;

                    m_ScrollerController.JumpIndex(0);

                }

            }

            m_ScrollerController.OnRefreshCell += OnRefreshGridCell;
            OnCreateGridLineCell(m_ScrollerController);          
            OnCreateGridLineCell(m_ScrollerController);

            m_GodBeastSlidingList.Init();
            m_GodBeastAttributes.Init();
            m_GodBeastAttributes.GetGodBeastLocationMarker(CurrentlySelected);
@@ -63,20 +86,32 @@

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

            DTCA814_tagMCMakeItemAnswer.MakeItemAnswerEvent += MakeItemAnswerEvent;
        }

        protected override void OnPreClose()
        {

            godBeastModel.ItemPlace = -1;

            playerPack.RefreshItemCountAct -= RefreshItemCountAct;

            m_ScrollerController.OnRefreshCell -= OnRefreshGridCell;
            m_ScrollerController.OnRefreshCell -= OnRefreshGridCell;

            DTCA814_tagMCMakeItemAnswer.MakeItemAnswerEvent -= MakeItemAnswerEvent;
        }



        private void MakeItemAnswerEvent(HA814_tagMCMakeItemAnswer obj)

        {

            if ((int)obj.MakeType == (int)MakeType.Def_mitDogzEquipPlus)

            {



            }

        }



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

        {

            if (arg1 == PackType.rptDogzEquip)

            {

                OnCreateGridLineCell(m_ScrollerController);

                //OnCreateGridLineCell(m_ScrollerController);

                m_ScrollerController.m_Scorller.RefreshActiveCellViews();//刷新可见

                m_GodBeastSlidingList.Init();

                m_GodBeastAttributes.Init();

                m_GodBeastAttributes.GetGodBeastLocationMarker(CurrentlySelected);

@@ -96,7 +131,7 @@
            {

                if (DogzEquipDict[key] == 1)

                {

                   


                    List<ItemModel> itemModel = dogz_model.GetDogzEquips(key);

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

                    {

@@ -106,6 +141,7 @@
                        godBeastClass.GodBeastQuality = itemModel[i].chinItemModel.ItemColor;

                        godBeastClass.GodBeastStar = itemModel[i].chinItemModel.StarLevel;

                        godBeastClass.EquipScore = itemModel[i].equipScore;

                        godBeastClass.ItemPlace = itemModel[i].itemInfo.ItemPlace;

                        var IudetDogzEquipPlus = itemModel[i].GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus);// 神兽装备强化信息列表 [强化等级, 强化熟练度]

                        if (IudetDogzEquipPlus == null)

                        {

@@ -116,8 +152,8 @@
                        {

                            godBeastClass.GodBeastLv = IudetDogzEquipPlus[0];

                            godBeastClass.GodBeasProficiency = IudetDogzEquipPlus[1];

                        }                                  
                        godBeastClass.LocationMarker=itemModel[i].EquipPlace*100+key;

                        }

                        godBeastClass.LocationMarker = itemModel[i].EquipPlace * 100 + key;

                        GodBeastList.Add(godBeastClass);

                    }

                }

@@ -177,7 +213,7 @@
            int locationMarker = cell.index;

            godBeastEntry.GetGodBeastLocationMarker(locationMarker, CurrentlySelected);

            godBeastEntry.GodBeastButton.RemoveAllListeners();

            godBeastEntry.GodBeastButton.AddListener(()=> 
            godBeastEntry.GodBeastButton.AddListener(() =>

            {

                if (locationMarker != CurrentlySelected)

                {

@@ -187,7 +223,7 @@
                    {

                        ChooseToModify(CurrentlySelected);

                    }

                }             
                }

            });

        }
    }

 System/Strengthening/WashTips.cs

@@ -490,7 +490,8 @@
                {

                    if (equipWashModel.IsWashFull(_itemModel, _washProModel, _tagWashModel))

                    {

                        if(_washProModel.XLAttrLV  >= equipWashModel.GetMaxWashLv())

                        if(_washProModel.XLAttrLV  >= equipWashModel.GetMaxWashLv()

                            && _washProModel.XLAttrLV <= equipWashModel.GetWashFullLv(_itemModel.chinItemModel.LV))

                        {

                            _washFullLvText.text = Language.Get("WashLevelFulled");

                        }

@@ -539,6 +540,8 @@
                ObjHideOrShow(false, false, false, false, true);



            }





        }

        else

        {


 System/Team/TeamModel.cs

@@ -563,7 +563,7 @@
            }



            var minLevel = 1;

            var maxLevel = 1;

            var maxLevel = GeneralConfig.Instance.playerMaxLevel;



            if (_mission != myTeam.mission)

            {

@@ -580,8 +580,11 @@
                {

                    var dungeonId = ModelCenter.Instance.GetModel<DungeonModel>().GetDungeonId(_mission.mapId, _mission.mapEx);

                    var dungeonConfig = Config.Instance.Get<DungeonConfig>(dungeonId);

                    minLevel = dungeonConfig.LVLimitMin;

                    maxLevel = dungeonConfig.LVLimitMax;

                    if (dungeonConfig != null)

                    {

                        minLevel = dungeonConfig.LVLimitMin;

                        maxLevel = dungeonConfig.LVLimitMax;

                    }

                }



                missionBuf = _mission;


 System/Treasure/TreasureModel.cs

@@ -17,7 +17,6 @@
        public const int TREASURE_DATAMAPID = 41110;

        public const int TREASURE_MAPID = 41110;

        public const int TREASURE_GUIDE_ID = 102;

        public const int TREASURE_SOUL_ID = 115;



        const int TREASURE_REDPOINTID = 7000;

        readonly static int[] CATEGORY_REDPOINTIDS = { 7001, 7002, 7003, 7004, 7005 };

@@ -33,7 +32,6 @@
        Redpoint zergRedpoint = new Redpoint(TREASURE_REDPOINTID, CATEGORY_REDPOINTIDS[(int)TreasureCategory.Zerg - 1]);



        public Redpoint stoveRedpoint = new Redpoint(CATEGORY_REDPOINTIDS[(int)TreasureCategory.Fairy - 1], 7200);

        public Redpoint treasureSoulRedpoint = new Redpoint(1, TREASURE_SOUL_ID);



        public event Action<int> treasureCollectProgressUpdateEvent;

        public event Action<int> treasureSelectedEvent;


 System/Treasure/TreasureSoulModel.cs

@@ -8,6 +8,10 @@
{

    public class TreasureSoulModel : Model, IBeforePlayerDataInitialize, IPlayerLoginOk

    {

        public const int TREASURE_SOUL_ID = 115;

        Redpoint treasureSoulRedpoint = new Redpoint(1, TREASURE_SOUL_ID);

        Redpoint treasureSoulNewGotRedpoint = new Redpoint(TREASURE_SOUL_ID, 115100);



        Dictionary<int, TreasureSpecialData> treasureSoulDict = new Dictionary<int, TreasureSpecialData>();

        List<int> treasureSouls = new List<int>();

        public Dictionary<int, int> signAddProperty = new Dictionary<int, int>();

@@ -32,6 +36,8 @@


        public int gotoSoul { get; set; }



        public int newGotSoul { get; set; }



        public bool serverInited { get; private set; }



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

@@ -41,6 +47,7 @@
        {

            packModel.RefreshItemCountAct += RefreshItemCountAct;

            PlayerStrengthengDatas.RefreshEquipUpgradLvAct += RefreshEquipSTRLv;

            FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;

            ParseConfig();

        }



@@ -54,6 +61,7 @@
                special.itemGet = false;

                special.active = false;

            }

            treasureSoulNewGotRedpoint.state = RedPointState.None;

        }



        public void OnPlayerLoginOk()

@@ -66,6 +74,7 @@
        {

            packModel.RefreshItemCountAct -= RefreshItemCountAct;

            PlayerStrengthengDatas.RefreshEquipUpgradLvAct -= RefreshEquipSTRLv;

            FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;

        }



        void ParseConfig()

@@ -88,6 +97,11 @@
            {

                signAddProperty.Add(int.Parse(_key), int.Parse(jsonData[_key].ToString()));

            }

        }



        public void SetViewTreasureNewGot()

        {

            treasureSoulNewGotRedpoint.state = RedPointState.None;

        }



        public List<int> GetTreasureSouls()

@@ -152,6 +166,14 @@
            }

        }



        private void OnFuncStateChangeEvent(int func)

        {

            if (func == 126)

            {

                UpdateRedpoints();

            }

        }



        public void UpdateTreasurePrivilege(HA353_tagMCMWPrivilegeDataInfo package)

        {

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

@@ -164,12 +186,12 @@
                }

                bool beforeActived = special.active;

                special.active = _data.State == 1;

                //if (!beforeActived && special.active && serverInited && WindowCenter.Instance.CheckOpen<TreasureSoulWin>()

                //    && !WindowCenter.Instance.CheckOpen<TreasureSoulActiveWin>() && !NewBieCenter.Instance.inGuiding)

                //{

                //    TreasureSoulActiveWin.treasureSoulId = (int)_data.PriID;

                //    WindowCenter.Instance.Open<TreasureSoulActiveWin>();

                //}

                if (!beforeActived && special.active && serverInited

                    && !WindowCenter.Instance.CheckOpen<TreasureSoulWin>())

                {

                    treasureSoulNewGotRedpoint.state = RedPointState.Simple;

                    newGotSoul = (int)_data.PriID;

                }

                if ((TreasurePrivilege)_data.PriID == TreasurePrivilege.StrengthenAdd)

                {

                    if (treasureSoulEvent != null)

@@ -363,7 +385,7 @@
                totalProgress = configs[configs.Count - 1].countNeed;

            }



            redpoint = new Redpoint(TreasureModel.TREASURE_SOUL_ID, TreasureModel.TREASURE_SOUL_ID * 100 + (int)type);

            redpoint = new Redpoint(TreasureSoulModel.TREASURE_SOUL_ID, TreasureSoulModel.TREASURE_SOUL_ID * 100 + (int)type);

            switch (_type)

            {

                case TreasurePrivilege.DemonJarAtk:


 System/Treasure/TreasureSoulWin.cs

@@ -83,6 +83,7 @@
            model.treasureSoulEvent += TreasureSoulEvent;

            m_TreasureSoulBtn.state = TitleBtnState.Click;

            Display();

            model.SetViewTreasureNewGot();

        }



        protected override void OnActived()

@@ -113,6 +114,7 @@
                m_TreasureSouls[i].Dispose();

            }

            m_SelectSoul = model.selectSoul;

            model.newGotSoul = 0;

        }



        protected override void OnAfterClose()

@@ -179,6 +181,11 @@
                    _select = sortSouls[i];

                }

            }

            if (model.newGotSoul != 0 && sortSouls.Contains(model.newGotSoul))

            {

                _select = model.newGotSoul;

                model.newGotSoul = 0;

            }

            _select = _select == 0 ? sortSouls[0] : _select;

            return _select;

        }


 Utility/EnumHelper.cs

@@ -787,6 +787,7 @@
    Def_mitRefine = 18,            // 炼丹

    Def_mitMWUpLevel = 19,         //法宝进阶

    Def_DanRecycle = 20, //丹药回收

    Def_mitDogzEquipPlus=21,// 神兽装备强化 
}

/// <summary>

/// 金钱类型(虚拟物品)


 Utility/UIHelper.cs

@@ -359,7 +359,7 @@
    public static readonly Color32 s_BrightBlueColor = new Color32(0, 107, 227, 255);

    public static readonly Color32 s_BrightOrangeColor = new Color32(255, 103, 1, 255); //FF6701FF

    public static readonly Color32 s_BrightWhiteColor = new Color32(104, 104, 104, 255); //686868

    public static readonly Color32 s_BrightGreenColor = new Color32(16, 157, 6, 255);

    public static readonly Color32 s_BrightGreenColor = new Color32(16, 157, 6, 255); //109d06



    public static readonly Color32 s_DarkPinkColor = new Color32(255, 124, 124, 255);

    public static readonly Color32 s_DarkRedColor = new Color32(250, 1, 1, 255);