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

client_linchunjie

2019-04-17 a756f262cb06c1c185fc0f648ccaf19e233eca14

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

 Lua/Gen/SnxxzUIItemTipsModelWrap.cs

@@ -231,15 +231,6 @@
            
                
                {
                    int _atkSpeed = LuaAPI.xlua_tointeger(L, 2);
                    string _color;
                    
                        bool gen_ret = gen_to_be_invoked.TryGetAtkSpeedColor( _atkSpeed, out _color );
                        LuaAPI.lua_pushboolean(L, gen_ret);
                    LuaAPI.lua_pushstring(L, _color);
                        
                    
                    
                    
                    return 2;
                }
@@ -356,12 +347,6 @@
            
                
                {
                    Snxxz.UI.ItemModel _itemModel = (Snxxz.UI.ItemModel)translator.GetObject(L, 2, typeof(Snxxz.UI.ItemModel));
                    bool _isCompare = LuaAPI.lua_toboolean(L, 3);
                    
                    gen_to_be_invoked.SetCurrentAttrData( _itemModel, _isCompare );
                    
                    
                    
                    return 0;
                }
@@ -710,14 +695,6 @@
            
                
                {
                    int _precentType = LuaAPI.xlua_tointeger(L, 2);
                    int _value = LuaAPI.xlua_tointeger(L, 3);
                    
                        int gen_ret = gen_to_be_invoked.GetProValueType( _precentType, _value );
                        LuaAPI.xlua_pushinteger(L, gen_ret);
                    
                    
                    
                    return 1;
                }
                

 Lua/Gen/SnxxzUIKingFairyModelWrap.cs

@@ -277,12 +277,6 @@
            
                
                {
                    int __itemId = LuaAPI.xlua_tointeger(L, 2);
                    int _count = LuaAPI.xlua_tointeger(L, 3);
                    int _isBind = LuaAPI.xlua_tointeger(L, 4);
                    
                    gen_to_be_invoked.ViewKingFairyChest( __itemId, _count, _isBind );
                    
                    
                    
                    return 0;

 System/BlastFurnace/GetEquipPathTips.cs

File was deleted

 System/BlastFurnace/GetEquipPathTips.cs.meta

File was deleted

 System/FairyAu/KingFairyChestWin.cs

File was deleted

 System/FairyAu/KingFairyChestWin.cs.meta

File was deleted

 System/FairyAu/KingFairyCtnRewardCell.cs

@@ -36,9 +36,7 @@
                    itemList[i].button.onClick.RemoveAllListeners();

                    itemList[i].button.onClick.AddListener(() =>

                    {

                        model.ViewKingFairyChest(_itemArray[0], _itemArray[1], _itemArray[2]);

                        //ItemAttrData itemAttrData = new ItemAttrData(_itemArray[0], false, (ulong)_itemArray[1], -1, _itemArray[2]);

                        //ModelCenter.Instance.GetModel<ItemTipsModel>().SetItemTipsModel(itemAttrData);

                        model.ViewKingFairyChest(_itemArray[0], _itemArray[1]);

                    });

                }

                else


 System/FairyAu/KingFairyModel.cs

@@ -98,14 +98,13 @@
        }



        public Item viewChestItem;

        public void ViewKingFairyChest(int _itemId, int count, int isBind)

        public void ViewKingFairyChest(int _itemId, int count)

        {

            viewChestItem = new Item()

            {

                id = _itemId,

                count = count,

            };

            WindowCenter.Instance.Open<KingFairyChestWin>();

        }

        #endregion

        #region 协议


 System/FairylandCeremony/CeremonyOutOfPrintWin.cs

@@ -155,7 +155,7 @@
                        switch(itemData.itemId)

                        {

                            case 2278:

                                kingFairyModel.ViewKingFairyChest(itemData.itemId,itemData.itemCount,itemData.isBind);

                                kingFairyModel.ViewKingFairyChest(itemData.itemId,itemData.itemCount);

                                break;

                            default:

                                ItemAttrData attrData = new ItemAttrData(itemData.itemId, true, (ulong)itemData.itemCount);


 System/ItemTip/EquipTipUtility.cs

@@ -277,6 +277,7 @@
                skillInfo = GetSkillInfo(itemId),
                suitInfo = GetSuitInfo(itemId),
                gemInfo = GetGemInfo(itemId),
                starInfo = GetStarInfo(itemId)
            };
        }

@@ -754,7 +755,19 @@

        private static GemInfo GetGemInfo(int itemId)
        {
            return default(GemInfo);
            var config = ItemConfig.Get(itemId);
            var level = config.LV;
            var place = config.EquipPlace;

            var gemInfo = new GemInfo();
            var maxStar = EquipStarModel.GetMaxStarLevel(config.ItemColor, config.LV);
            gemInfo.activeStates = new Dictionary<int, bool>();
            for (int i = 0; i < 4; i++)
            {
                gemInfo.activeStates[i] = IsEquipGemHoleOpen(new Int2(level, place), maxStar, i);
            }

            return gemInfo;
        }

        private static GemInfo GetGemInfo(string guid)

 System/ItemTip/TipGemInfoWidget.cs

@@ -20,7 +20,7 @@
            {
                var behaviour = m_GemBehaviours[i];
                var active = gemInfo.activeStates.ContainsKey(i) ? gemInfo.activeStates[i] : false;
                var gem = gemInfo.gems.ContainsKey(i) ? gemInfo.gems[i] : 0;
                var gem = (gemInfo.gems != null && gemInfo.gems.ContainsKey(i)) ? gemInfo.gems[i] : 0;
                behaviour.Display(active, gem);
            }
        }
@@ -70,7 +70,7 @@
                        for (int i = 0; i < properties.Count; i++)
                        {
                            var property = properties[i];
                            lines[i] =PlayerPropertyConfig.GetFullDescription(property.x, property.y);
                            lines[i] = PlayerPropertyConfig.GetFullDescription(property.x, property.y);
                        }

                        propertyBehaviour.text = string.Join("\r\n", lines);

 System/KnapSack/Logic/EquipTip.cs

File was deleted

 System/KnapSack/Logic/EquipTip.cs.meta

File was deleted

 System/KnapSack/Logic/ItemTipsModel.cs

@@ -222,24 +222,6 @@
            }

        }



        public bool TryGetAtkSpeedColor(int atkSpeed, out string color)

        {

            color = string.Empty;

            foreach (var key in atkSpeedColorDict.Keys)

            {

                var rangelist = atkSpeedColorDict[key];

                if (rangelist.Count > 1)

                {

                    if (atkSpeed >= rangelist[0] && atkSpeed <= rangelist[1])

                    {

                        color = key;

                        return true;

                    }

                }

            }

            return false;

        }



        #endregion



        /// <summary>

@@ -323,14 +305,6 @@
            }

        }



        public void SetCurrentAttrData(ItemModel itemModel, bool isCompare)

        {

            curAttrData = new ItemAttrData(itemModel.itemId, false, (ulong)itemModel.count

                  , itemModel.gridIndex, isCompare

                  , itemModel.packType, itemModel.guid, ConfigParse.Analysis(itemModel.itemInfo.userData), ItemTipChildType.Normal);

        }





        public void SetCompareAttrData(ItemModel itemModel)

        {

            compareAttrData = new ItemAttrData(itemModel.itemId, false, (ulong)itemModel.count

@@ -395,10 +369,6 @@
                        {

                            EquipTipUtility.Show(curAttrData.guid);

                        }

                    }

                    else

                    {

                        WindowCenter.Instance.Open<EquipWin>();

                    }

                    break;

                case ItemWinType.wingsWin:

@@ -876,28 +846,6 @@
            return s;

        }



        private string SetAttrColor(string attrStr, int atkSpeed, int equipPlace)

        {

            string color = string.Empty;

            bool isColor = TryGetAtkSpeedColor(atkSpeed, out color);

            if (isColor)

            {

                return StringUtility.Contact("<color=#", color, ">", attrStr, "</color>");

            }

            return attrStr;

        }



        public int GetProValueType(int precentType, int value)

        {

            switch (precentType)

            {

                case 1:

                case 2:

                    return Mathf.RoundToInt(value / 100);

                default:

                    return value;

            }

        }

        #endregion



        #region 设置传奇属性

@@ -1757,7 +1705,6 @@
        public ItemTipChildType ChildType { get; private set; }  //决定当前面板打开哪个

        public Dictionary<int, List<int>> useDataDict { get; private set; }

        public Dictionary<int, int> strengthDataDict { get; private set; }

        public Dictionary<int, int> washDataDict { get; private set; }

        public Dictionary<int, int> legendDataDict { get; private set; }

        public Dictionary<int, int> exhaustedMaxDataDict { get; private set; }

        public Dictionary<int, int> wingsRefineMatDict { get; private set; }


 System/KnapSack/New/EquipWin.cs

File was deleted

 System/KnapSack/New/EquipWin.cs.meta

File was deleted

 System/KnapSack/New/KnapSackEventMgr.cs

@@ -60,11 +60,7 @@


    public void HideItemPopWin()

    {

        if (WindowCenter.Instance.IsOpen<EquipWin>())

        {

            HideEquipWin();

        }

        else if (WindowCenter.Instance.IsOpen<WingsWin>())

        if (WindowCenter.Instance.IsOpen<WingsWin>())

        {

            HideWingsWin();

        }

@@ -75,10 +71,6 @@
        else if (WindowCenter.Instance.IsOpen<GuardianWin>())

        {

            HideGuardWin();

        }

        else if (WindowCenter.Instance.IsOpen<KingFairyChestWin>())

        {

            WindowCenter.Instance.Close<KingFairyChestWin>();

        }

    }




 System/NewYearFairylandCeremony/NewYearCeremonyOutOfPrintWin.cs

@@ -155,7 +155,7 @@
                        switch(itemData.itemId)

                        {

                            case 2278:

                                kingFairyModel.ViewKingFairyChest(itemData.itemId,itemData.itemCount,itemData.isBind);

                                kingFairyModel.ViewKingFairyChest(itemData.itemId,itemData.itemCount);

                                break;

                            default:

                                ItemAttrData attrData = new ItemAttrData(itemData.itemId, true, (ulong)itemData.itemCount);


 System/Store/Logic/BuyEquipTip.cs

File was deleted

 System/Store/Logic/BuyEquipTip.cs.meta

File was deleted