snxxz_scripts.git

parent: 312676a8 | 补丁 | 提交 | ignore whitespace

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

client_Wu Xijin

2018-09-28 cb93261c759e82ed9fb3a74392e7c88bd78cd504

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

10个文件已修改

	System/Dogz/DogzModel.cs	28 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Dogz/DogzPackCell.cs	71 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Dogz/DogzPackWin.cs	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/MainInterfacePanel/SideMission.cs	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Role/RolePanel.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Role/RoleRenameWin.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Strengthening/GodBeastAttributes.cs	31 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Strengthening/GodBeastModel.cs	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Strengthening/GodBeastSlidingList.cs	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	System/Vip/LimitedTimePackageModel.cs	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 System/Dogz/DogzModel.cs

@@ -575,6 +575,11 @@


        private void SendPutOffEquip(int equipPlace)

        {

            if(playerPack.GetReaminGridCount(PackType.rptDogzItem) < 1)

            {

                SysNotifyMgr.Instance.ShowTip("DogzBagFull");

                return;

            }

            GetDogzEquipPlaceStates(presentSelectDogz);

            CA5C1_tagCMDogzUnEquipItem dogzPutOff = new CA5C1_tagCMDogzUnEquipItem();

            dogzPutOff.DogzID = (byte)presentSelectDogz;

@@ -639,6 +644,23 @@
            }

            dogzItemList.Sort(CompareByDogzItemPack);

            return dogzItemList;

        }



        public int GetDogzPackMatNum()

        {

            SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptDogzItem);

            if (singlePack == null) return 0;



            int num = 0;

            Dictionary<int, ItemModel> pairs = singlePack.GetPackModelIndexDict();

            foreach (var value in pairs.Values)

            {

               if(value.chinItemModel.EquipPlace == 0)

                {

                    num += 1;

                }

            }

            return num;

        }



        public bool IsReachSelectCondi(int itemId)

@@ -708,6 +730,12 @@
            y = end.equipScore;

            if (x.CompareTo(y) != 0) return -x.CompareTo(y);



            List<int> strenglist = start.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus);

            x = strenglist != null ? strenglist[0] : 0;

            strenglist = end.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus);

            y = strenglist != null ? strenglist[0] : 0;

            if (x.CompareTo(y) != 0) return -x.CompareTo(y);



            return 0;

        }

        #endregion


 System/Dogz/DogzPackCell.cs

@@ -1,30 +1,41 @@
using Snxxz.UI;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
namespace EnhancedUI.EnhancedScroller
{
    public class DogzPackCell : ScrollerUI
    {
        [SerializeField] List<DogzItemCell> dogzItemlist;
        DogzPackModel m_Model;
        DogzPackModel model
        {
            get
            {
                return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<DogzPackModel>());
            }
        }
        public override void Refresh(CellView cell)
        {
            var _line = cell.index;
            for (int i = 0; i < 4; i++)
            {
                var _index = _line * 4 + i;
                dogzItemlist[i].Display(_index);
            }
        }
    }
}

using Snxxz.UI;

using System.Collections;

using System.Collections.Generic;

using UnityEngine;

using UnityEngine.UI;

namespace EnhancedUI.EnhancedScroller

{

    public class DogzPackCell : ScrollerUI

    {

        [SerializeField] List<DogzItemCell> dogzItemlist;

        DogzModel m_Model;

        DogzModel model

        {

            get

            {

                return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<DogzModel>());

            }

        }

        public override void Refresh(CellView cell)

        {

            var _line = cell.index;

            for (int i = 0; i < 4; i++)

            {

                var _index = _line * 4 + i;

                dogzItemlist[i].gameObject.SetActive(true);

                if (model.SelectDogzItemQuality == 0

                    && model.SelectDogzItemStart == 0)

                {

                    int hideIndex = model.DogzPackGridCnt - model.GetDogzPackMatNum();

                    if (_index >= hideIndex)

                    {

                        dogzItemlist[i].gameObject.SetActive(false);

                    }

                }

              
                dogzItemlist[i].Display(_index);

            }

        }

    }

}




 System/Dogz/DogzPackWin.cs

@@ -274,12 +274,28 @@
                    }

                    else

                    {

                        int putStrenLv = 0;

                        if (itemModel.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus) != null)

                        {

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

                        }



                        int selectStrenLv = 0;

                        if (selectModel.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus) != null)

                        {

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

                        }



                        if (itemModel.chinItemModel.ItemColor < selectModel.chinItemModel.ItemColor

                           || (itemModel.chinItemModel.StarLevel < selectModel.chinItemModel.StarLevel

                           && itemModel.chinItemModel.ItemColor == selectModel.chinItemModel.ItemColor)

                            || (itemModel.equipScore < selectModel.equipScore 

                            && itemModel.chinItemModel.ItemColor == selectModel.chinItemModel.ItemColor

                            && itemModel.chinItemModel.StarLevel == selectModel.chinItemModel.StarLevel))

                            && itemModel.chinItemModel.StarLevel == selectModel.chinItemModel.StarLevel)

                            ||(itemModel.equipScore == selectModel.equipScore

                            && itemModel.chinItemModel.ItemColor == selectModel.chinItemModel.ItemColor

                            && itemModel.chinItemModel.StarLevel == selectModel.chinItemModel.StarLevel

                            && putStrenLv < selectStrenLv))

                        {

                            indexlist.Add(dogzModel.selectEquipPlacelist[0].itemInfo.ItemPlace);

                        }


 System/MainInterfacePanel/SideMission.cs

@@ -90,11 +90,14 @@
            gridCtrl.Refresh();

            foreach (var key in taskmodel.SideQuestsDic.Keys)

            {

                if (TaskIdNow == 0)

                if (taskmodel.SideQuestsDic[key].MissionState != 0)

                {

                    TaskIdNow = key;

                }

                gridCtrl.AddCell(ScrollerDataType.Header, key);

                    if (TaskIdNow == 0)

                    {

                        TaskIdNow = key;

                    }

                    gridCtrl.AddCell(ScrollerDataType.Header, key);

                }          
            }

            gridCtrl.Restart();

        }


 System/Role/RolePanel.cs

@@ -104,7 +104,7 @@
        }

        private void OnRenameClick()

        {

            MessageWin.Inst.ShowFixedTip(Language.Get("Z1025"));

            WindowCenter.Instance.Open<RoleRenameWin>();

        }



        private void OnElixirClick()


 System/Role/RoleRenameWin.cs

@@ -120,7 +120,7 @@
              {

                  if (isOk)

                  {

                      LanguageVerify.Instance.VerifyPlayerName(renameInput.text, 0,

                      LanguageVerify.Instance.VerifyPlayerName(renameInput.text, (int)PlayerDatas.Instance.baseData.PlayerID,

                        UIHelper.ServerStringTrim(PlayerDatas.Instance.baseData.PlayerName), PlayerDatas.Instance.baseData.LV,

                         PlayerDatas.Instance.baseData.VIPLv, (bool ok, string name) =>

                         {


 System/Strengthening/GodBeastAttributes.cs

@@ -40,6 +40,9 @@
        [SerializeField] Button m_StrengthenDoubleBtn;//双倍强化按钮

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

        [SerializeField] GameObject m_BottomBox;



        [SerializeField] Text m_Text_Attributes3;

        [SerializeField] Text m_Text_Attributes4;

        DogzModel Dogz_model;

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

        PlayerPackModel _playerPack;

@@ -72,6 +75,8 @@
            }

            GodBeastReinforcementWin.ChooseToModify += ChooseToModify;

            godBeastModel.AbsorbEvent += AbsorbEvent;

            m_Text_Attributes3.gameObject.SetActive(false);

            m_Text_Attributes4.gameObject.SetActive(false);

        }

        private void OnDisable()

        {

@@ -286,6 +291,8 @@
                m_FullLevel.SetActive(false);

                m_UIAlphaTween.gameObject.SetActive(false);

                m_BottomBox.SetActive(false);

                m_Text_Attributes3.gameObject.SetActive(false);

                m_Text_Attributes4.gameObject.SetActive(false);

            }

        }



@@ -327,7 +334,8 @@
                }

                else

                {



                    m_Text_Attributes3.gameObject.SetActive(false);

                    m_Text_Attributes4.gameObject.SetActive(false);

                    m_StrengthenDoubleBtn.interactable = true;

                    m_StrengthenBtn.interactable = true;

                    m_Text_two.SetActive(true);

@@ -348,6 +356,8 @@
            }

            else

            {

                m_Text_Attributes3.gameObject.SetActive(false);

                m_Text_Attributes4.gameObject.SetActive(false);

                if (m_DoubleToggle.isOn)

                {

                    m_StrengthenBtn.gameObject.SetActive(false);

@@ -596,25 +606,28 @@
        }

        private void FullLevelAttributes()//设置满级属性

        {

            m_TextAttributes1.gameObject.SetActive(false);

            m_TextAttributesAdd1.gameObject.SetActive(false);

            m_TextAttributes2.gameObject.SetActive(false);

            m_TextAttributesAdd2.gameObject.SetActive(false);

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

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

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

            m_TextAttributesAdd1.gameObject.SetActive(false);

            m_TextAttributesAdd2.gameObject.SetActive(false);

            if (AttType.Length > 1)

            {

                m_TextAttributes1.gameObject.SetActive(true);

                m_TextAttributes2.gameObject.SetActive(true);

                m_Text_Attributes3.gameObject.SetActive(true);

                m_Text_Attributes4.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_Text_Attributes3.text = StrName1 + ":" + AttValue[0];

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

            }

            else

            {

                m_TextAttributes2.gameObject.SetActive(false);

                m_Text_Attributes3.gameObject.SetActive(true);

                m_Text_Attributes4.gameObject.SetActive(false);

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

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

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

            }

        }

    }

 System/Strengthening/GodBeastModel.cs

@@ -47,12 +47,22 @@
        playerPack.ItemCntReduceAct -= ItemCntReduceAct;

        dogz_model.UpdateAssistDogzEvent -= UpdateAssistDogzEvent;

        FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;

        DTC0721_tagMakeItemAnswer.MakeItemAnswerEvent -= MakeItemAnswerEvent;

        DTC0721_tagMakeItemAnswer.MakeItemAnswerEvent += MakeItemAnswerEvent;

        playerPack.ItemCntAddAct += ItemCntAddAct;//物品数量增加

        playerPack.ItemCntReduceAct += ItemCntReduceAct;//物品数量减少

        dogz_model.UpdateAssistDogzEvent += UpdateAssistDogzEvent;

        FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;

        SetRedPointID();

        GodBeastRedPoint();

    }



    private void MakeItemAnswerEvent(H0721_tagMakeItemAnswer obj)

    {

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

        {

            GodBeastRedPoint();

        }

    }



    private void OnFuncStateChangeEvent(int obj)

@@ -389,6 +399,7 @@
                {

                    if (_IudetDogzEquipPlus[0] < Lv)

                    {

                        Lv = _IudetDogzEquipPlus[0];

                        IndexId = RedPointLIst[i];

                    }

                }


 System/Strengthening/GodBeastSlidingList.cs

@@ -45,7 +45,10 @@
        PlayerPackModel _playerPack;
        PlayerPackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } }

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



        private void Awake()

        {

            
        }

        private void Start()

        {

            m_Arrow.AddListener(OnClickArrow);

@@ -132,6 +135,7 @@
        public void Init()

        {

            Quality = 10;

            LINE = Mathf.CeilToInt((float)100 / 3);

            ContentSelect(Quality);

            if (m_ScrollViewFirst.activeSelf)

            {


 System/Vip/LimitedTimePackageModel.cs

@@ -21,7 +21,7 @@
        OperationTimeHepler.Instance.operationEndEvent += OperationEndEvent;

    }



    




    public bool IsShowPanel = false;

    private const int Redpoint_key1 = 20907;

@@ -63,9 +63,13 @@
    {

        OperationTimeHepler.Instance.operationStartEvent -= operationStartEvent;

        OperationTimeHepler.Instance.operationStartEvent += operationStartEvent;

        OperationTimeHepler.Instance.operationAdvanceEvent -= operationAdvanceEvent;

        OperationTimeHepler.Instance.operationAdvanceEvent += operationAdvanceEvent;

        IsShowTip();



    }







    private void operationStartEvent(Operation arg1, int arg2)

    {

@@ -78,7 +82,17 @@
            }

        }

    }



    private void operationAdvanceEvent(Operation obj)

    {

        if (obj == Operation.GiftPackage)

        {

            IsShowTip();

            if (onStateUpate != null)

            {

                onStateUpate(7);

            }

        }

    }

    private void OperationEndEvent(Operation arg1, int arg2)

    {

        if (arg1 == Operation.GiftPackage && arg2 == 0)

@@ -143,7 +157,7 @@
    public bool IsExpired()

    {

        bool IsBool = false;

        IsBool =(OperationTimeHepler.Instance.SatisfyOpenCondition(Operation.GiftPackage)|| OperationTimeHepler.Instance.SatisfyAdvanceCondition(Operation.GiftPackage));

        IsBool = (OperationTimeHepler.Instance.SatisfyOpenCondition(Operation.GiftPackage) || OperationTimeHepler.Instance.SatisfyAdvanceCondition(Operation.GiftPackage));

        bool IsBuyBool = false;

        OperationBase operationBase;

        if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.GiftPackage, out operationBase))

			@@ -575,6 +575,11 @@

			private void SendPutOffEquip(int equipPlace)
			{
			if(playerPack.GetReaminGridCount(PackType.rptDogzItem) < 1)
			{
			SysNotifyMgr.Instance.ShowTip("DogzBagFull");
			return;
			}
			GetDogzEquipPlaceStates(presentSelectDogz);
			CA5C1_tagCMDogzUnEquipItem dogzPutOff = new CA5C1_tagCMDogzUnEquipItem();
			dogzPutOff.DogzID = (byte)presentSelectDogz;
			@@ -639,6 +644,23 @@
			}
			dogzItemList.Sort(CompareByDogzItemPack);
			return dogzItemList;
			}

			public int GetDogzPackMatNum()
			{
			SinglePackModel singlePack = playerPack.GetSinglePackModel(PackType.rptDogzItem);
			if (singlePack == null) return 0;

			int num = 0;
			Dictionary<int, ItemModel> pairs = singlePack.GetPackModelIndexDict();
			foreach (var value in pairs.Values)
			{
			if(value.chinItemModel.EquipPlace == 0)
			{
			num += 1;
			}
			}
			return num;
			}

			public bool IsReachSelectCondi(int itemId)
			@@ -708,6 +730,12 @@
			y = end.equipScore;
			if (x.CompareTo(y) != 0) return -x.CompareTo(y);

			List<int> strenglist = start.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus);
			x = strenglist != null ? strenglist[0] : 0;
			strenglist = end.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus);
			y = strenglist != null ? strenglist[0] : 0;
			if (x.CompareTo(y) != 0) return -x.CompareTo(y);

			return 0;
			}
			#endregion

			@@ -1,30 +1,41 @@
			using Snxxz.UI;
			using System.Collections;
			using System.Collections.Generic;
			using UnityEngine;
			using UnityEngine.UI;
			namespace EnhancedUI.EnhancedScroller
			{
			public class DogzPackCell : ScrollerUI
			{
			[SerializeField] List<DogzItemCell> dogzItemlist;
			DogzPackModel m_Model;
			DogzPackModel model
			{
			get
			{
			return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<DogzPackModel>());
			}
			}
			public override void Refresh(CellView cell)
			{
			var _line = cell.index;
			for (int i = 0; i < 4; i++)
			{
			var _index = _line * 4 + i;
			dogzItemlist[i].Display(_index);
			}
			}
			}
			}

			using Snxxz.UI;
			using System.Collections;
			using System.Collections.Generic;
			using UnityEngine;
			using UnityEngine.UI;
			namespace EnhancedUI.EnhancedScroller
			{
			public class DogzPackCell : ScrollerUI
			{
			[SerializeField] List<DogzItemCell> dogzItemlist;
			DogzModel m_Model;
			DogzModel model
			{
			get
			{
			return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<DogzModel>());
			}
			}
			public override void Refresh(CellView cell)
			{
			var _line = cell.index;
			for (int i = 0; i < 4; i++)
			{
			var _index = _line * 4 + i;
			dogzItemlist[i].gameObject.SetActive(true);
			if (model.SelectDogzItemQuality == 0
			&& model.SelectDogzItemStart == 0)
			{
			int hideIndex = model.DogzPackGridCnt - model.GetDogzPackMatNum();
			if (_index >= hideIndex)
			{
			dogzItemlist[i].gameObject.SetActive(false);
			}
			}

			dogzItemlist[i].Display(_index);
			}
			}
			}
			}

			@@ -274,12 +274,28 @@
			}
			else
			{
			int putStrenLv = 0;
			if (itemModel.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus) != null)
			{
			putStrenLv = itemModel.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus)[0];
			}

			int selectStrenLv = 0;
			if (selectModel.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus) != null)
			{
			selectStrenLv = selectModel.GetUseDataModel((int)ItemUseDataKey.Def_IudetDogzEquipPlus)[0];
			}

			if (itemModel.chinItemModel.ItemColor < selectModel.chinItemModel.ItemColor
			\|\| (itemModel.chinItemModel.StarLevel < selectModel.chinItemModel.StarLevel
			&& itemModel.chinItemModel.ItemColor == selectModel.chinItemModel.ItemColor)
			\|\| (itemModel.equipScore < selectModel.equipScore
			&& itemModel.chinItemModel.ItemColor == selectModel.chinItemModel.ItemColor
			&& itemModel.chinItemModel.StarLevel == selectModel.chinItemModel.StarLevel))
			&& itemModel.chinItemModel.StarLevel == selectModel.chinItemModel.StarLevel)
			\|\|(itemModel.equipScore == selectModel.equipScore
			&& itemModel.chinItemModel.ItemColor == selectModel.chinItemModel.ItemColor
			&& itemModel.chinItemModel.StarLevel == selectModel.chinItemModel.StarLevel
			&& putStrenLv < selectStrenLv))
			{
			indexlist.Add(dogzModel.selectEquipPlacelist[0].itemInfo.ItemPlace);
			}

			@@ -90,11 +90,14 @@
			gridCtrl.Refresh();
			foreach (var key in taskmodel.SideQuestsDic.Keys)
			{
			if (TaskIdNow == 0)
			if (taskmodel.SideQuestsDic[key].MissionState != 0)
			{
			TaskIdNow = key;
			}
			gridCtrl.AddCell(ScrollerDataType.Header, key);
			if (TaskIdNow == 0)
			{
			TaskIdNow = key;
			}
			gridCtrl.AddCell(ScrollerDataType.Header, key);
			}
			}
			gridCtrl.Restart();
			}

			@@ -104,7 +104,7 @@
			}
			private void OnRenameClick()
			{
			MessageWin.Inst.ShowFixedTip(Language.Get("Z1025"));
			WindowCenter.Instance.Open<RoleRenameWin>();
			}

			private void OnElixirClick()

			@@ -120,7 +120,7 @@
			{
			if (isOk)
			{
			LanguageVerify.Instance.VerifyPlayerName(renameInput.text, 0,
			LanguageVerify.Instance.VerifyPlayerName(renameInput.text, (int)PlayerDatas.Instance.baseData.PlayerID,
			UIHelper.ServerStringTrim(PlayerDatas.Instance.baseData.PlayerName), PlayerDatas.Instance.baseData.LV,
			PlayerDatas.Instance.baseData.VIPLv, (bool ok, string name) =>
			{

			@@ -40,6 +40,9 @@
			[SerializeField] Button m_StrengthenDoubleBtn;//双倍强化按钮
			[SerializeField] Text m_NeedFairy;//所需的仙玉
			[SerializeField] GameObject m_BottomBox;

			[SerializeField] Text m_Text_Attributes3;
			[SerializeField] Text m_Text_Attributes4;
			DogzModel Dogz_model;
			DogzModel dogz_model { get { return Dogz_model ?? (Dogz_model = ModelCenter.Instance.GetModel<DogzModel>()); } }
			PlayerPackModel _playerPack;
			@@ -72,6 +75,8 @@
			}
			GodBeastReinforcementWin.ChooseToModify += ChooseToModify;
			godBeastModel.AbsorbEvent += AbsorbEvent;
			m_Text_Attributes3.gameObject.SetActive(false);
			m_Text_Attributes4.gameObject.SetActive(false);
			}
			private void OnDisable()
			{
			@@ -286,6 +291,8 @@
			m_FullLevel.SetActive(false);
			m_UIAlphaTween.gameObject.SetActive(false);
			m_BottomBox.SetActive(false);
			m_Text_Attributes3.gameObject.SetActive(false);
			m_Text_Attributes4.gameObject.SetActive(false);
			}
			}

			@@ -327,7 +334,8 @@
			}
			else
			{

			m_Text_Attributes3.gameObject.SetActive(false);
			m_Text_Attributes4.gameObject.SetActive(false);
			m_StrengthenDoubleBtn.interactable = true;
			m_StrengthenBtn.interactable = true;
			m_Text_two.SetActive(true);
			@@ -348,6 +356,8 @@
			}
			else
			{
			m_Text_Attributes3.gameObject.SetActive(false);
			m_Text_Attributes4.gameObject.SetActive(false);
			if (m_DoubleToggle.isOn)
			{
			m_StrengthenBtn.gameObject.SetActive(false);
			@@ -596,25 +606,28 @@
			}
			private void FullLevelAttributes()//设置满级属性
			{
			m_TextAttributes1.gameObject.SetActive(false);
			m_TextAttributesAdd1.gameObject.SetActive(false);
			m_TextAttributes2.gameObject.SetActive(false);
			m_TextAttributesAdd2.gameObject.SetActive(false);
			var DogzEquipConfig = DogzEquipPlusConfig.GetEquipplaceAndLevel(GodBeastPart, DogZLv);
			int[] AttType = ConfigParse.GetMultipleStr<int>(DogzEquipConfig.attType);
			int[] AttValue = ConfigParse.GetMultipleStr<int>(DogzEquipConfig.attValue);
			m_TextAttributesAdd1.gameObject.SetActive(false);
			m_TextAttributesAdd2.gameObject.SetActive(false);
			if (AttType.Length > 1)
			{
			m_TextAttributes1.gameObject.SetActive(true);
			m_TextAttributes2.gameObject.SetActive(true);
			m_Text_Attributes3.gameObject.SetActive(true);
			m_Text_Attributes4.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_Text_Attributes3.text = StrName1 + ":" + AttValue[0];
			m_Text_Attributes4.text = StrName2 + ":" + AttValue[1];
			}
			else
			{
			m_TextAttributes2.gameObject.SetActive(false);
			m_Text_Attributes3.gameObject.SetActive(true);
			m_Text_Attributes4.gameObject.SetActive(false);
			string StrName1 = Config.Instance.Get<PlayerPropertyConfig>(AttType[0]).Name;
			m_TextAttributes1.text = StrName1 + ":" + AttValue[0];
			m_Text_Attributes3.text = StrName1 + ":" + AttValue[0];
			}
			}
			}

			@@ -47,12 +47,22 @@
			playerPack.ItemCntReduceAct -= ItemCntReduceAct;
			dogz_model.UpdateAssistDogzEvent -= UpdateAssistDogzEvent;
			FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
			DTC0721_tagMakeItemAnswer.MakeItemAnswerEvent -= MakeItemAnswerEvent;
			DTC0721_tagMakeItemAnswer.MakeItemAnswerEvent += MakeItemAnswerEvent;
			playerPack.ItemCntAddAct += ItemCntAddAct;//物品数量增加
			playerPack.ItemCntReduceAct += ItemCntReduceAct;//物品数量减少
			dogz_model.UpdateAssistDogzEvent += UpdateAssistDogzEvent;
			FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
			SetRedPointID();
			GodBeastRedPoint();
			}

			private void MakeItemAnswerEvent(H0721_tagMakeItemAnswer obj)
			{
			if ((int)obj.MakeType == (int)MakeType.Def_mitDogzEquipPlus)
			{
			GodBeastRedPoint();
			}
			}

			private void OnFuncStateChangeEvent(int obj)
			@@ -389,6 +399,7 @@
			{
			if (_IudetDogzEquipPlus[0] < Lv)
			{
			Lv = _IudetDogzEquipPlus[0];
			IndexId = RedPointLIst[i];
			}
			}

			@@ -45,7 +45,10 @@
			PlayerPackModel _playerPack;
			PlayerPackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } }
			GodBeastModel godBeastModel { get { return ModelCenter.Instance.GetModel<GodBeastModel>(); } }

			private void Awake()
			{

			}
			private void Start()
			{
			m_Arrow.AddListener(OnClickArrow);
			@@ -132,6 +135,7 @@
			public void Init()
			{
			Quality = 10;
			LINE = Mathf.CeilToInt((float)100 / 3);
			ContentSelect(Quality);
			if (m_ScrollViewFirst.activeSelf)
			{

			@@ -21,7 +21,7 @@
			OperationTimeHepler.Instance.operationEndEvent += OperationEndEvent;
			}




			public bool IsShowPanel = false;
			private const int Redpoint_key1 = 20907;
			@@ -63,9 +63,13 @@
			{
			OperationTimeHepler.Instance.operationStartEvent -= operationStartEvent;
			OperationTimeHepler.Instance.operationStartEvent += operationStartEvent;
			OperationTimeHepler.Instance.operationAdvanceEvent -= operationAdvanceEvent;
			OperationTimeHepler.Instance.operationAdvanceEvent += operationAdvanceEvent;
			IsShowTip();

			}



			private void operationStartEvent(Operation arg1, int arg2)
			{
			@@ -78,7 +82,17 @@
			}
			}
			}

			private void operationAdvanceEvent(Operation obj)
			{
			if (obj == Operation.GiftPackage)
			{
			IsShowTip();
			if (onStateUpate != null)
			{
			onStateUpate(7);
			}
			}
			}
			private void OperationEndEvent(Operation arg1, int arg2)
			{
			if (arg1 == Operation.GiftPackage && arg2 == 0)
			@@ -143,7 +157,7 @@
			public bool IsExpired()
			{
			bool IsBool = false;
			IsBool =(OperationTimeHepler.Instance.SatisfyOpenCondition(Operation.GiftPackage)\|\| OperationTimeHepler.Instance.SatisfyAdvanceCondition(Operation.GiftPackage));
			IsBool = (OperationTimeHepler.Instance.SatisfyOpenCondition(Operation.GiftPackage) \|\| OperationTimeHepler.Instance.SatisfyAdvanceCondition(Operation.GiftPackage));
			bool IsBuyBool = false;
			OperationBase operationBase;
			if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.GiftPackage, out operationBase))