Merge remote-tracking branch 'origin/master' into equipstar

client_Wu Xijin

2019-07-17 cbd35c0321529a33d05748f157e5be8a29757c13

Merge remote-tracking branch 'origin/master' into equipstar

 Core/GameEngine/Model/Player/PlayerDatas.cs

@@ -534,6 +534,7 @@
                {

                    hero.SwitchSuit();

                    hero.ReqLingGenEffect((int)(baseData.equipShowSwitch / 1000 % 1000));

                    hero.horseAwakeId = (int)(value / 1000000);

                }

                break;

            case PlayerDataType.LuckValue:


 Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0413_tagPlayerChangeEquip.cs

@@ -64,6 +64,14 @@
            else if (_config.EquipPlace == (int)RoleEquipType.Mount)
            {
                _player.ActorInfo.horseItemID = vNetData.EquipID;
                if (vNetData.UserDataLen > 0)
                {
                    var _jsonData = LitJson.JsonMapper.ToObject(vNetData.UserData);
                    if ((_jsonData as IDictionary).Contains("210"))
                    {
                        _player.horseAwakeId = int.Parse(_jsonData["210"].ToString());
                    }
                }
                if (_player.MovingState == E_MovingState.Ride)
                {
                    _player.OnHorse(1);

 Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs

@@ -700,6 +700,7 @@
            if (_startLockTarget)

            {

                _hero.SelectTarget = _attacker;

                _hero.LockTarget = _attacker;

                if (!_hero.aiHandler.IsAuto())

                {

                    _hero.Behaviour.StartHandupAI();


 Core/NetworkPackage/DTCFile/ServerPack/H07_PlayerItem/DTC0725_tagRolePackRefreshEx.cs

@@ -33,6 +33,15 @@
                    if (_hero != null)
                    {
                        _hero.PutonEquip(_item.ItemID);

                        if (_item.UserDataLen > 0)
                        {
                            var _jsonData = LitJson.JsonMapper.ToObject(_item.UserData);
                            if ((_jsonData as IDictionary).Contains("210"))
                            {
                                _hero.horseAwakeId = int.Parse(_jsonData["210"][0].ToString());
                            }
                        }
                    }
                }
            }

 Fight/GameActor/GActorPlayerBase.cs

@@ -1886,7 +1886,7 @@
            }

        }

    }



    public int horseAwakeId = 0;

    public void ShowHorseEffect()

    {

        HideHorseEffect();

@@ -1927,6 +1927,20 @@
                }

            }

        }



        var _model = ModelCenter.Instance.GetModel<PetModel>();

        int _effectID = _model.GetPetHorseEffect((int)HorseID, horseAwakeId);

        if (_effectID > 0)

        {

            var _bindNode = m_HorseModel.transform;

            var _bindNodeName = _model.GetPetHorseEffectNode((int)HorseID, horseAwakeId);

            if (!string.IsNullOrEmpty(_bindNodeName))

            {

                _bindNode = m_HorseModel.transform.GetChildTransformDeeply(_bindNodeName);

            }

            var _ctrl = SFXPlayUtility.Instance.PlayBattleEffect(_effectID, _bindNode);

            m_HorseEffectList.Add(_ctrl);

        }

    }



    public void PutonEquip(uint itemID)


 System/Auction/FamilyAuctioncell.cs

@@ -82,9 +82,10 @@
            ItemCellModel cellModel = new ItemCellModel(auctionItem.itemId, true, (ulong)auctionItem.itemCount,

                string.Empty, PackType.Deleted, false, auctionItem.userDataDict);

            m_ItemCell.Init(cellModel);

            var score = 0;

            if (ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId))

            {

                var score = ItemLogicUtility.Instance.GetEquipScore(auctionItem.itemId, auctionItem.userDataDict);

                score = ItemLogicUtility.Instance.GetEquipScore(auctionItem.itemId, auctionItem.userDataDict);

                var isUp = ItemLogicUtility.Instance.IsFightUp(auctionItem.itemId, score);

                m_ItemCell.stateIcon.gameObject.SetActive(isUp == 1);

                if (isUp == 1)

@@ -102,6 +103,11 @@
                {

                    itemId = auctionItem.itemId,

                    compare = true,

                    isAuctionEquip = ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId),

                    score = score,

                    legendProperty = ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId) ?

                    ItemTipUtility.GetLegendProperty(auctionItem.itemId, auctionItem.userDataDict)

                    : default(ItemTipUtility.LegendProperty),

                });

            });




 System/Auction/FullServiceAuctioncell.cs

@@ -103,9 +103,10 @@
            ItemCellModel cellModel = new ItemCellModel(auctionItem.itemId, true, (ulong)auctionItem.itemCount,

                string.Empty, PackType.Deleted, false, auctionItem.userDataDict);

            m_ItemCell.Init(cellModel);

            var score = 0;

            if (ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId))

            {

                var score = ItemLogicUtility.Instance.GetEquipScore(auctionItem.itemId, auctionItem.userDataDict);

                score = ItemLogicUtility.Instance.GetEquipScore(auctionItem.itemId, auctionItem.userDataDict);

                var isUp = ItemLogicUtility.Instance.IsFightUp(auctionItem.itemId, score);

                m_ItemCell.stateIcon.gameObject.SetActive(isUp == 1);

                if (isUp == 1)

@@ -123,6 +124,11 @@
                {

                    itemId = auctionItem.itemId,

                    compare = true,

                    isAuctionEquip = ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId),

                    score = score,

                    legendProperty = ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId) ?

                    ItemTipUtility.GetLegendProperty(auctionItem.itemId, auctionItem.userDataDict)

                    : default(ItemTipUtility.LegendProperty),

                });

            });




 System/Auction/MyAuctionCell.cs

@@ -91,9 +91,10 @@
            ItemCellModel cellModel = new ItemCellModel(auctionItem.itemId, true, (ulong)auctionItem.itemCount,

                string.Empty, PackType.Deleted, false, auctionItem.userDataDict);

            m_ItemCell.Init(cellModel);

            var score = 0;

            if (ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId))

            {

                var score = ItemLogicUtility.Instance.GetEquipScore(auctionItem.itemId, auctionItem.userDataDict);

                score = ItemLogicUtility.Instance.GetEquipScore(auctionItem.itemId, auctionItem.userDataDict);

                var isUp = ItemLogicUtility.Instance.IsFightUp(auctionItem.itemId, score);

                m_ItemCell.stateIcon.gameObject.SetActive(isUp == 1);

                if (isUp == 1)

@@ -111,6 +112,11 @@
                {

                    itemId = auctionItem.itemId,

                    compare = true,

                    isAuctionEquip = ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId),

                    score = score,

                    legendProperty = ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId) ?

                    ItemTipUtility.GetLegendProperty(auctionItem.itemId, auctionItem.userDataDict)

                    : default(ItemTipUtility.LegendProperty),

                });

            });

            m_ItemName.text = UIHelper.GetItemName(auctionItem.itemId, true);


 System/Auction/MyFocusCell.cs

@@ -84,9 +84,10 @@
            ItemCellModel cellModel = new ItemCellModel(auctionItem.itemId, true, (ulong)auctionItem.itemCount,

                string.Empty, PackType.Deleted, false, auctionItem.userDataDict);

            m_ItemCell.Init(cellModel);

            var score = 0;

            if (ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId))

            {

                var score = ItemLogicUtility.Instance.GetEquipScore(auctionItem.itemId, auctionItem.userDataDict);

                score = ItemLogicUtility.Instance.GetEquipScore(auctionItem.itemId, auctionItem.userDataDict);

                var isUp = ItemLogicUtility.Instance.IsFightUp(auctionItem.itemId, score);

                m_ItemCell.stateIcon.gameObject.SetActive(isUp == 1);

                if (isUp == 1)

@@ -104,6 +105,11 @@
                {

                    itemId = auctionItem.itemId,

                    compare = true,

                    isAuctionEquip = ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId),

                    score = score,

                    legendProperty = ItemLogicUtility.Instance.IsRealmEquip(auctionItem.itemId) ?

                    ItemTipUtility.GetLegendProperty(auctionItem.itemId, auctionItem.userDataDict)

                    : default(ItemTipUtility.LegendProperty),

                });

            });




 System/Chat/ChatCtrl.cs

@@ -156,9 +156,11 @@
    EquipTrainModel equipTrainModel { get { return ModelCenter.Instance.GetModel<EquipTrainModel>(); } }

    EquipModel equipModel { get { return ModelCenter.Instance.GetModel<EquipModel>(); } }

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

    DungeonAssistModel dungeonAssistModel { get { return ModelCenter.Instance.GetModel<DungeonAssistModel>(); } }



    public Dictionary<ChatInfoType, List<string>> achievementRandoms = new Dictionary<ChatInfoType, List<string>>();

    List<string> assistThankLanguages = new List<string>();

    Int2 assistThankLevelLimit = new Int2(150, 200);



    private ChatCtrl()

    {

@@ -195,6 +197,11 @@
                m_TaskRandomChats.Add(type, new List<string>(LitJson.JsonMapper.ToObject<string[]>(json[key].ToJson())));

            }

            assistThankLanguages.AddRange(ConfigParse.GetMultipleStr(_cfg.Numerical4));

            if (!string.IsNullOrEmpty(_cfg.Numerical5))

            {

                var levelArray = ConfigParse.GetMultipleStr<int>(_cfg.Numerical5);

                assistThankLevelLimit = new Int2(levelArray[0], levelArray[1]);

            }

        }

        catch (Exception e)

        {

@@ -1356,6 +1363,18 @@
    #region 协助感谢

    public void SendThank2AssistPlayer(int playerId)

    {

        if (PlayerDatas.Instance.baseData.LV >= assistThankLevelLimit.x)

        {

            return;

        }

        var assistPlayerInfo = dungeonAssistModel.GetAssistPlayerInfo(playerId);

        if (assistPlayerInfo != null)

        {

            if (assistPlayerInfo.LV >= assistThankLevelLimit.y)

            {

                return;

            }

        }

        var languageKeyIndex = UnityEngine.Random.Range(0, assistThankLanguages.Count);

        if (assistThankLanguages.Count > 0)

        {


 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/FriendSystem/MailWin.cs

@@ -321,13 +321,28 @@
                        {
                            itemCell.gameObject.SetActive(true);
                            MailItemModel itemModel = info.Items[giftCount];
                            var userDataDict = ConfigParse.Analysis(itemModel.UserData);
                            ItemCellModel cellModel = new ItemCellModel((int)itemModel.ItemID, false, (ulong)itemModel.Count,
                               "", PackType.Deleted, false, ConfigParse.Analysis(itemModel.UserData));
                               "", PackType.Deleted, false, userDataDict);
                            itemCell.Init(cellModel);
                            itemCell.button.onClick.RemoveAllListeners();
                            itemCell.button.onClick.AddListener(() =>
                            {
                                ItemTipUtility.Show((int)itemModel.ItemID);
                                if (itemModel.IsBind == 1 &&

                                ItemLogicUtility.Instance.IsRealmEquip((int)itemModel.ItemID))

                                {

                                    ItemTipUtility.Show(new ItemTipUtility.ItemViewInfo()

                                    {

                                        itemId = (int)itemModel.ItemID,

                                        isAuctionEquip = true,

                                        score = ItemLogicUtility.Instance.GetEquipScore((int)itemModel.ItemID, userDataDict),

                                        legendProperty = ItemTipUtility.GetLegendProperty((int)itemModel.ItemID, userDataDict),

                                    });

                                }
                                else

                                {

                                    ItemTipUtility.Show((int)itemModel.ItemID);
                                }
                            }
                            );
                        }

 System/ItemTip/ItemTipUtility.cs

@@ -87,6 +87,7 @@
            public int itemId;
            public int trueCount;
            public List<Int2> properties;
            public int score;
        }

        public struct SuitInfo
@@ -197,6 +198,9 @@
            public int itemId;

            public bool compare;

            public bool unfoldGetWay;

            public bool isAuctionEquip;

            public LegendProperty legendProperty;

            public int score;

        }

        static PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
@@ -251,6 +255,12 @@
            {

                case TipType.Equip:

                    mainTipData = CreateNormalEquipData(itemId);

                    if (item.isAuctionEquip)

                    {

                        mainTipData.legendProperty = item.legendProperty;

                        mainTipData.baseInfo.score = item.score;

                        mainTipData.baseInfo.isPreview = false;

                    }



                    if (item.compare)

                    {

@@ -1190,6 +1200,34 @@
            return data;
        }

        public static LegendProperty GetLegendProperty(int itemId, Dictionary<int, List<int>> userData)

        {

            var data = new LegendProperty();
            data.isPreview = false;
            data.itemId = itemId;



            List<int> ids = null;

            List<int> values = null;
            if (userData != null)

            {

                userData.TryGetValue(17, out ids);

                userData.TryGetValue(17, out values);

            }
            if (!ids.IsNullOrEmpty() && !values.IsNullOrEmpty())
            {
                var properties = new List<Int2>();
                var count = Mathf.Min(ids.Count, values.Count);
                for (int i = 0; i < count; i++)
                {
                    properties.Add(new Int2(ids[i], values[i]));
                }

                data.properties = properties;
            }

            return data;

        }

        private static SuitInfo GetSuitInfo(int itemId)
        {
            var config = ItemConfig.Get(itemId);

 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) : "";
@@ -66,7 +72,7 @@

            if (baseInfo.score != 0)
            {
                if (!baseInfo.isPreview && !baseInfo.isAuction)
                if (!baseInfo.isPreview)
                {
                    m_ScoreOrType.text = Language.Get("EquipWin_EquipPointText_1") + baseInfo.score;
                }

 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -263,7 +263,7 @@


        private void SecondEvent()

        {

            var cell = m_ActivityCtrl.GetActiveCellView(12);

            var cell = m_ActivityCtrl.GetActiveCellView(12, ScrollerDataType.Header);

            if (cell != null)

            {

                var activityCell = cell as OpenServerActivityCell;

@@ -444,10 +444,10 @@
                        }

                        foreach (var _type in impactRankModel.impactRankSorts)

                        {

                            if (impactRankModel.IsLock(_type))

                            {

                                continue;

                            }

                            //if (impactRankModel.IsLock(_type))

                            //{

                            //    continue;

                            //}

                            m_ActivityCtrl.AddCell(ScrollerDataType.Normal, activityId * 100 + _type);

                        }

                        break;


 System/Skill/ScrollerController.cs

@@ -236,6 +236,24 @@
        return null;

    }



    public CellView GetActiveCellView(int _index, ScrollerDataType type)

    {

        if (m_Scorller == null)

        {

            return null;

        }

        var views = m_Scorller.GetActiveCellViews();

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

        {

            var _cellView = views[i] as CellView;

            if (views[i].index == _index && _cellView.type == type)

            {

                return _cellView;

            }

        }

        return null;

    }



    public void AddCell(ScrollerDataType type, int index, Action<CellView> action = null, CellInfo? info = null)

    {

        ScrollerData data = null;


 System/Store/StoreModel.cs

@@ -380,6 +380,7 @@
    {

        showStoreTypeDict.Clear();

        int playeLv = PlayerDatas.Instance.baseData.LV;

        int vipLevel = PlayerDatas.Instance.baseData.VIPLv;

        foreach (var type in storeTypeDict.Keys)

        {

            var storeDatas = storeTypeDict[type];

@@ -745,6 +746,11 @@


    private void RefreshPlayerData(PlayerDataType type)

    {

        if (type == PlayerDataType.VIPLv && !isLogin)

        {

            UpdateShowStore();

        }



        switch (type)

        {

            case PlayerDataType.LV:


 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)

                {


 System/WindowJump/WindowJumpMgr.cs

@@ -931,11 +931,6 @@
                break;

            case JumpUIType.OpenServerMountRank:

                var type = int.Parse(_tagWinSearchModel.SelectActive);

                if (rankModel.IsLock(type))

                {

                    SysNotifyMgr.Instance.ShowTip("InOperationTimeError");

                    return false;

                }

                if (TimeUtility.OpenDay >= rankModel.openServerActivityDays)

                {

                    SysNotifyMgr.Instance.ShowTip("ActiveOutTime");


 UI/EnhancedScroller/EnhancedScroller.cs

@@ -2,6 +2,7 @@
using UnityEngine.UI;

using System.Collections;

using System;

using System.Collections.Generic;



namespace EnhancedUI.EnhancedScroller

{

@@ -584,6 +585,11 @@
            return null;

        }



        public SmallList<EnhancedScrollerCellView> GetActiveCellViews()

        {

            return _activeCellViews;

        }



        internal float GetCellSize(int _dataIndex)

        {

            if (_dataIndex >= 0 && _dataIndex < _cellViewSizeArray.Count)