少年修仙传客户端代码仓库
client_linchunjie
2019-07-17 a8ae40c207dc6c1848092c04a8786fb191250390
8110 【前端】【主干】神兽装备标签
8个文件已修改
42 ■■■■■ 已修改文件
System/Dogz/DogzEquip.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dogz/DogzItemCell.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dogz/DogzModel.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/ItemTip/TipEquipBaseInfoWidget.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/GodBeastAttributes.cs 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/GodBeastChildNodes.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/GodBeastEntry.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Strengthening/GodBeastSlidingList.cs 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Dogz/DogzEquip.cs
@@ -11,6 +11,7 @@
    {
        [SerializeField] CommonItemBaisc itemBaisc;
        [SerializeField] Text strengLvTxt;
        [SerializeField] Text m_StarLevelLabel;
        public void Display(ItemModel model)
        {
@@ -29,6 +30,10 @@
            {
                strengLvTxt.gameObject.SetActive(false);
            }
            var dogzModel = ModelCenter.Instance.GetModel<DogzModel>();
            m_StarLevelLabel.text = dogzModel.GetStarLevelLabel(model.config.StarLevel);
            itemBaisc.button.RemoveAllListeners();
            itemBaisc.button.AddListener(()=>
            {
System/Dogz/DogzItemCell.cs
@@ -7,6 +7,7 @@
    {
        [SerializeField] CommonItemBaisc itemBaisc;
        [SerializeField] Text strengthLvTxt;
        [SerializeField] Text m_StarLevelLabel;
        
        DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }
@@ -24,6 +25,7 @@
            {
                itemBaisc.gameObject.SetActive(false);
                strengthLvTxt.gameObject.SetActive(false);
                m_StarLevelLabel.gameObject.SetActive(false);
                return;
            }
            DebugEx.Log("model:"+ model.itemId);
@@ -41,6 +43,8 @@
            {
                strengthLvTxt.gameObject.SetActive(false);
            }
            m_StarLevelLabel.gameObject.SetActive(true);
            m_StarLevelLabel.text = dogzModel.GetStarLevelLabel(model.config.StarLevel);
            itemBaisc.gameObject.SetActive(true);
            itemBaisc.Init(model,true);
System/Dogz/DogzModel.cs
@@ -9,6 +9,8 @@
    [XLua.LuaCallCSharp]
    public class DogzModel : Model,IBeforePlayerDataInitialize,IAfterPlayerDataInitialize,IPlayerLoginOk
    {
        Dictionary<int, string> m_StarLevelLabels;
        PackModel playerPack { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
        GodBeastModel beastModel { get { return ModelCenter.Instance.GetModel<GodBeastModel>(); } }
@@ -85,6 +87,7 @@
            DogzPackGridCnt = int.Parse(_funcCfg.Numerical1);
            _funcCfg = FuncConfigConfig.Get("DogzGrade");
            dogzScoreFormula = _funcCfg.Numerical1;
            m_StarLevelLabels = ConfigParse.GetDic<int, string>(_funcCfg.Numerical2);
        }
        /// <summary>
        /// 获得格子可以穿戴的装备限制  神兽Id  格子索引 
@@ -696,6 +699,15 @@
        #endregion
        public string GetStarLevelLabel(int starLevel)
        {
            if (m_StarLevelLabels != null && m_StarLevelLabels.ContainsKey(starLevel))
            {
                return m_StarLevelLabels[starLevel];
            }
            return string.Empty;
        }
        #region 神兽背包物品
        public int SelectDogzItemQuality { get; set; }
        public int SelectDogzItemStart { get; set; }
System/ItemTip/TipEquipBaseInfoWidget.cs
@@ -20,6 +20,9 @@
        [SerializeField] RectTransform m_SurplusTimeContainer;
        [SerializeField] Text m_SurplusTime;
        [SerializeField] Text m_Star;
        [SerializeField] Text m_DogzStarLabel;
        DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }
        public void Display(ItemTipUtility.BaseInfo baseInfo)
        {
@@ -43,10 +46,13 @@
                m_Label.gameObject.SetActive(false);
            }
            m_DogzStarLabel.text = "";
            var itemConfig = ItemConfig.Get(baseInfo.itemId);
            if (ItemLogicUtility.Instance.IsDogzEquip(baseInfo.itemId))
            {
                m_Star.text = string.Format("{0}星", itemConfig.StarLevel);
                m_Star.text = "";
                m_DogzStarLabel.text = dogzModel.GetStarLevelLabel(itemConfig.StarLevel);
            }
            var strengthenPostfix = baseInfo.strengthenLevel > 0 ? string.Format("+{0}", baseInfo.strengthenLevel) : "";
System/Strengthening/GodBeastAttributes.cs
@@ -15,6 +15,7 @@
    public class GodBeastAttributes : MonoBehaviour
    {
        [SerializeField] ItemCell m_ItemCell;
        [SerializeField] Text m_StarLabel;
        [SerializeField] GameObject m_FrameNull;
        [SerializeField] GameObject m_FullLevel;
        [SerializeField] GameObject m_BottomDisplay;
@@ -244,6 +245,7 @@
            if (LocationMarker != 0)
            {
                m_ItemCell.gameObject.SetActive(true);
                m_StarLabel.gameObject.SetActive(true);
                GodBeastNumber = LocationMarker % 100;//神兽编号
                GodBeastPart = LocationMarker / 100;//神兽装备位ID
                List<ItemModel> itemModel = dogz_model.GetDogzEquips(GodBeastNumber);
@@ -255,6 +257,7 @@
                        {
                            ItemCellModel ItemModel = new ItemCellModel(itemModel[i].itemId, true, 0);//默认显示不上锁
                            m_ItemCell.Init(ItemModel);
                            m_StarLabel.text = dogz_model.GetStarLevelLabel(itemModel[i].config.StarLevel);
                            m_ItemCell.button.RemoveAllListeners();
                            int type = i;
                            m_ItemCell.button.AddListener(() =>
@@ -275,6 +278,7 @@
                GodBeastNumber = 0;
                GodBeastPart = 0;
                m_ItemCell.gameObject.SetActive(false);
                m_StarLabel.gameObject.SetActive(false);
                m_ExpSlider.stage = 0;
                m_ExpSlider.delay = 0f;
                m_ExpSlider.ResetStage();
System/Strengthening/GodBeastChildNodes.cs
@@ -10,6 +10,7 @@
    public class GodBeastChildNodes:MonoBehaviour {
        [SerializeField] ItemCell m_ItemCell;
        [SerializeField] Text m_StarLabel;
        [SerializeField] GameObject m_ChoosenImg;
        [SerializeField] Text m_TextNumber;
        [SerializeField] Button m_Button;
@@ -17,6 +18,7 @@
        [SerializeField] Text m_NumberNow;//选中水晶量
        PackModel _playerPack;
        PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } }
        DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } }
        public Button ButtonDown
        {
            get { return m_Button; }
@@ -42,11 +44,15 @@
            get { return m_NumberNow; }
            set { m_NumberNow = value; }
        }
        public Text starLabel { get { return m_StarLabel; } }
        public void  GetGodBeastIndex(int Index)
        {
            ItemModel itemModel = playerPack.GetItemByIndex(PackType.DogzItem, Index);
            m_ItemCell.button.enabled = false;
            m_ItemCell.Init(itemModel);
            m_StarLabel.gameObject.SetActive(true);
            m_StarLabel.text = dogzModel.GetStarLevelLabel(itemModel.config.StarLevel);
            m_ItemCell.countText.gameObject.SetActive(false);
            var IudetDogzEquipPlus = itemModel.GetUseData((int)ItemUseDataKey.dogzEquipPlus);// 神兽装备强化信息列表 [强化等级, 强化熟练度]
            TextNumber.gameObject.SetActive(false);
System/Strengthening/GodBeastEntry.cs
@@ -14,6 +14,7 @@
    public class GodBeastEntry : MonoBehaviour
    {
        [SerializeField] ItemCell m_itemCell;
        [SerializeField] Text m_StarLabel;
        [SerializeField] GameObject m_Selectedbar_Image;
        [SerializeField] Text m_Item_Text;
        [SerializeField] Button m_GodBeastButton;
@@ -53,6 +54,7 @@
                            m_RedPoint.redpointId = godBeastModel.GodBeastRedPointDic[(itemModel[i].gridIndex)].id;
                        }
                        m_itemCell.Init(ItemModel);
                        m_StarLabel.text = dogz_model.GetStarLevelLabel(itemModel[i].config.StarLevel);
                        var itemConfig = ItemConfig.Get(itemModel[i].itemId);
                        var IudetDogzEquipPlus = itemModel[i].GetUseData((int)ItemUseDataKey.dogzEquipPlus);// 神兽装备强化信息列表 [强化等级, 强化熟练度]
                        m_Item_Text.color = UIHelper.GetUIColor(itemConfig.ItemColor);                     
System/Strengthening/GodBeastSlidingList.cs
@@ -403,6 +403,7 @@
                GodBeastChildNodes.ChoosenImg.SetActive(false);
                GodBeastChildNodes.TextNumber.gameObject.SetActive(false);
                GodBeastChildNodes.NumberNow.gameObject.SetActive(false);
                GodBeastChildNodes.starLabel.gameObject.SetActive(false);
                GodBeastChildNodes.ButtonDown.RemoveAllListeners();
                if (cellCount - 1 < GodBeastBagList.Count)
                {