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

client_linchunjie

2019-06-26 c42581f024d3568f4c92e00613b2457980b084f5

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

 Core/GameEngine/Model/Config/EquipGSParamConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------

//    [Author]:           Fish

//    [  Date ]:           Wednesday, May 15, 2019

//    [  Date ]:           Wednesday, June 26, 2019

//--------------------------------------------------------



using System.Collections.Generic;

@@ -17,6 +17,7 @@
    public readonly int EquipClass;

    public readonly int EquipColor;

    public readonly int IsSuit;

    public readonly int Star;

    public readonly int BaseEquipMaxHPAddPerC;

    public readonly int BaseEquipAtkAddPerC;

    public readonly int SuperHitC;

@@ -49,31 +50,33 @@


            int.TryParse(tables[3],out IsSuit); 



            int.TryParse(tables[4],out BaseEquipMaxHPAddPerC); 
            int.TryParse(tables[4],out Star); 


            int.TryParse(tables[5],out BaseEquipAtkAddPerC); 
            int.TryParse(tables[5],out BaseEquipMaxHPAddPerC); 


            int.TryParse(tables[6],out SuperHitC); 
            int.TryParse(tables[6],out BaseEquipAtkAddPerC); 


            int.TryParse(tables[7],out SuperHitPerC); 
            int.TryParse(tables[7],out SuperHitC); 


            int.TryParse(tables[8],out LuckyHitRateC); 
            int.TryParse(tables[8],out SuperHitPerC); 


            int.TryParse(tables[9],out LuckyHitRateReduceC); 
            int.TryParse(tables[9],out LuckyHitRateC); 


            int.TryParse(tables[10],out LuckPerC); 
            int.TryParse(tables[10],out LuckyHitRateReduceC); 


            int.TryParse(tables[11],out PerLVAtkC); 
            int.TryParse(tables[11],out LuckPerC); 


            int.TryParse(tables[12],out PerLVMaxHPC); 
            int.TryParse(tables[12],out PerLVAtkC); 


            int.TryParse(tables[13],out DropMoneyPerC); 
            int.TryParse(tables[13],out PerLVMaxHPC); 


            int.TryParse(tables[14],out SuperHitReduceC); 
            int.TryParse(tables[14],out DropMoneyPerC); 


            int.TryParse(tables[15],out HitC); 
            int.TryParse(tables[15],out SuperHitReduceC); 


            int.TryParse(tables[16],out MissC); 
            int.TryParse(tables[16],out HitC); 


            int.TryParse(tables[17],out MissC); 
        }

        catch (Exception ex)

        {


 Core/GameEngine/Model/Config/EquipGSParamConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: b14139202185e114e8c1b11ee6917430
timeCreated: 1557892128
timeCreated: 1561530128
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Core/GameEngine/Model/Config/LegendPropertyValueConfig.cs

@@ -1,6 +1,6 @@
//--------------------------------------------------------
//    [Author]:           Fish
//    [  Date ]:           Wednesday, May 15, 2019
//    [  Date ]:           Wednesday, June 26, 2019
//--------------------------------------------------------

using System.Collections.Generic;
@@ -18,6 +18,7 @@
    public readonly int ItemClassLV;
    public readonly int ItemColor;
    public readonly int IsSuit;
    public readonly int ItemStarLevel;
    public readonly Int2[] previewValue;
    public readonly int propertyCount;

@@ -41,14 +42,16 @@

            int.TryParse(tables[4],out IsSuit); 

            string[] previewValueStringArray = tables[5].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            int.TryParse(tables[5],out ItemStarLevel); 

            string[] previewValueStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
            previewValue = new Int2[previewValueStringArray.Length];
            for (int i=0;i<previewValueStringArray.Length;i++)
            {
                 Int2.TryParse(previewValueStringArray[i],out previewValue[i]);
            }

            int.TryParse(tables[6],out propertyCount); 
            int.TryParse(tables[7],out propertyCount); 
        }
        catch (Exception ex)
        {

 Core/GameEngine/Model/Config/LegendPropertyValueConfig.cs.meta

@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 9b41155b3cd3cfe45aae5364966bac57
timeCreated: 1557892717
timeCreated: 1561527907
licenseType: Pro
MonoImporter:
  serializedVersion: 2

 Core/GameEngine/Model/TelPartialConfig/PartialLegendPropertyValueConfig.cs

@@ -9,13 +9,13 @@

    public void OnConfigParseCompleted()
    {
        var key = ItemType * 1000000 + ItemClassLV * 10000 + ItemColor * 100 + IsSuit;
        var key = ItemType * 1000000 + ItemClassLV * 10000 + ItemColor * 100 + IsSuit * 10 + ItemStarLevel;
        previewConfigs[key] = this;
    }

    public static LegendPropertyValueConfig Get(int itemType, int level, int quality, bool suit)
    public static LegendPropertyValueConfig Get(int itemType, int level, int quality, bool suit, int starLevel)
    {
        var key = itemType * 1000000 + level * 10000 + quality * 100 + (suit ? 1 : 0);
        var key = itemType * 1000000 + level * 10000 + quality * 100 + (suit ? 10 : 0) + starLevel;
        return previewConfigs.ContainsKey(key) ? previewConfigs[key] : null;
    }


 Core/GameEngine/Model/TelPartialConfig/tagEquipGSParamConfig.cs

@@ -8,22 +8,22 @@


    public void OnConfigParseCompleted()

    {

        string key = StringUtility.Contact(EquipClass, EquipColor, IsSuit);

        string key = StringUtility.Contact(EquipClass, EquipColor, IsSuit ,Star);

        s_tagGSModelDict.Add(key, this);

    }



    public static EquipGSParamConfig GetGSModel(int lv, int color, int isSuit)

    public static EquipGSParamConfig GetGSModel(int lv, int color, int isSuit, int star)

    {

        string key = StringUtility.Contact(lv, color, isSuit);

        string key = StringUtility.Contact(lv, color, isSuit, star);

        EquipGSParamConfig gsModel = null;

        s_tagGSModelDict.TryGetValue(key, out gsModel);

        return gsModel;

    }



    public static Dictionary<PropertyType, int> GetTagGsProValueDict(int lv, int color, int isSuit)

    public static Dictionary<PropertyType, int> GetTagGsProValueDict(int lv, int color, int isSuit, int star)

    {

        _tagGsProValueDict.Clear();

        EquipGSParamConfig gsModel = GetGSModel(lv, color, isSuit);

        EquipGSParamConfig gsModel = GetGSModel(lv, color, isSuit , star);

        if (gsModel == null)

            return null;




 Lua/Gen/EquipGSParamConfigWrap.cs

@@ -319,8 +319,6 @@
                    int _color = LuaAPI.xlua_tointeger(L, 2);
                    int _isSuit = LuaAPI.xlua_tointeger(L, 3);
                    
                        EquipGSParamConfig gen_ret = EquipGSParamConfig.GetGSModel( _lv, _color, _isSuit );
                        translator.Push(L, gen_ret);
                    
                    
                    
@@ -347,9 +345,6 @@
                    int _lv = LuaAPI.xlua_tointeger(L, 1);
                    int _color = LuaAPI.xlua_tointeger(L, 2);
                    int _isSuit = LuaAPI.xlua_tointeger(L, 3);
                    
                        System.Collections.Generic.Dictionary<PropertyType, int> gen_ret = EquipGSParamConfig.GetTagGsProValueDict( _lv, _color, _isSuit );
                        translator.Push(L, gen_ret);
                    
                    
                    

 Lua/Gen/LegendPropertyValueConfigWrap.cs

@@ -118,15 +118,6 @@
                }
                if(gen_param_count == 4&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 1)&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 2)&& LuaTypes.LUA_TNUMBER == LuaAPI.lua_type(L, 3)&& LuaTypes.LUA_TBOOLEAN == LuaAPI.lua_type(L, 4)) 
                {
                    int _itemType = LuaAPI.xlua_tointeger(L, 1);
                    int _level = LuaAPI.xlua_tointeger(L, 2);
                    int _quality = LuaAPI.xlua_tointeger(L, 3);
                    bool _suit = LuaAPI.lua_toboolean(L, 4);
                    
                        LegendPropertyValueConfig gen_ret = LegendPropertyValueConfig.Get( _itemType, _level, _quality, _suit );
                        translator.Push(L, gen_ret);
                    
                    
                    
                    return 1;
                }

 Lua/Gen/SnxxzUIItemLogicUtilityWrap.cs

@@ -159,8 +159,6 @@
                    System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<int>> _useDataDic = (System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<int>>)translator.GetObject(L, 4, typeof(System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<int>>));
                    bool _isPreview = LuaAPI.lua_toboolean(L, 5);
                    
                        int gen_ret = gen_to_be_invoked.GetEquipScore( _type, _itemId, _useDataDic, _isPreview );
                        LuaAPI.xlua_pushinteger(L, gen_ret);
                    
                    
                    
@@ -172,9 +170,6 @@
                    int _itemId = LuaAPI.xlua_tointeger(L, 3);
                    System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<int>> _useDataDic = (System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<int>>)translator.GetObject(L, 4, typeof(System.Collections.Generic.Dictionary<int, System.Collections.Generic.List<int>>));
                    
                        int gen_ret = gen_to_be_invoked.GetEquipScore( _type, _itemId, _useDataDic );
                        LuaAPI.xlua_pushinteger(L, gen_ret);
                    
                    
                    
                    return 1;
@@ -183,10 +178,6 @@
                {
                    PackType _type;translator.Get(L, 2, out _type);
                    int _itemId = LuaAPI.xlua_tointeger(L, 3);
                    
                        int gen_ret = gen_to_be_invoked.GetEquipScore( _type, _itemId );
                        LuaAPI.xlua_pushinteger(L, gen_ret);
                    
                    
                    
                    return 1;

 System/CrossServerOneVsOneClient/ClientCrossServerOneVsOneStage.cs

@@ -282,6 +282,7 @@

            if (fightInfo.roundWinnerIds[fightInfo.roundWinnerIds.Count - 1] == PlayerDatas.Instance.baseData.PlayerID)
            {
                PlayerDatas.Instance.hero.SelectTarget = opponentPlayer;
                opponentPlayer.ActorInfo.ResetHp((int)playerInfo.maxHp, -1, (int)playerInfo.maxHp, -1);
                opponentPlayer.ActorInfo.serverDie = false;
                opponentPlayer.IdleImmediate();

 System/DailyQuest/DailyQuestModel.cs

@@ -192,13 +192,13 @@


        public void OnNewFuncOpen(int id)

        {

           


            var quests = DailyQuestConfig.GetValues();

            bool bHasAdd = false;

            foreach (var quest in quests)

            {

                if(quest.UnLockFuncID == id && !m_newDailyQuestOpenList.Contains(quest.ID))

                {              
                if (quest.UnLockFuncID == id && !m_newDailyQuestOpenList.Contains(quest.ID))

                {

                    m_newDailyQuestOpenList.Add(quest.ID);

                    bHasAdd = true;

                }

@@ -211,18 +211,18 @@


        public bool IsNewDailyQuest(int id)

        {

            if(category == DailyQuestCategory.EveryDay)

            if (category == DailyQuestCategory.EveryDay)

            {

                if (m_newDailyQuestOpenList.Contains(id) && IsDailyQuestUnLock(id))

                {

                    if(!m_HasShowDailyQuestList.Contains(id))

                    if (!m_HasShowDailyQuestList.Contains(id))

                    {

                        m_HasShowDailyQuestList.Add(id);

                    }

                    return true;

                }

            }

           


            return false;

        }



@@ -235,8 +235,6 @@
            }

            m_HasShowDailyQuestList.Clear();

        }

        






        private void RedpointValueChangeEvent(int id)

@@ -344,6 +342,18 @@
                    continue;

                }



                if (key == (int)DailyQuestType.CrossServerBoss && TimeUtility.OpenDay < GeneralDefine.crossServerOneVsOneOpenDay)

                {

                    continue;

                }



                if (key == (int)DailyQuestType.CrossServerPk

                    && (TimeUtility.OpenDay < GeneralDefine.crossServerOneVsOneOpenDay

                    || !CrossServerOneVsOnePKSeason.Instance.InPkSeason(TimeUtility.ServerNow)))

                {

                    continue;

                }



                var openTime = dailyQuestOpenTimes[key];

                switch (category)

                {

@@ -361,24 +371,12 @@
                            {

                                quests.Add(key);

                            }



                        }

                        break;

                    case DailyQuestCategory.TimeLimit:

                        if (!openTime.always)

                        {

                            if ((DailyQuestType)key == DailyQuestType.CrossServerPk)

                            {

                                if (TimeUtility.OpenDay >= GeneralDefine.crossServerOneVsOneOpenDay

                                    && CrossServerOneVsOnePKSeason.Instance.InPkSeason(TimeUtility.ServerNow))

                                {

                                    quests.Add(key);

                                }

                            }

                            else

                            {

                                quests.Add(key);

                            }

                            quests.Add(key);

                        }

                        break;

                }

@@ -839,7 +837,6 @@
                    case DailyQuestType.RuneTower:

                    case DailyQuestType.TreasureCollectSoul:

                    case DailyQuestType.Auction:

                    case DailyQuestType.DungeonAssist:

                        dailyQuest.redpoint.state = RedPointState.None;

                        break;

                    case DailyQuestType.HazyRegion:

@@ -850,7 +847,7 @@
                        break;

                    default:

                        if (PlayerDatas.Instance.baseData.LV <= GeneralDefine.dailyQuestRedpointLevelLimit

                            && (dailyQuestState == DailyQuestState.CanBuyTimes || dailyQuestState == DailyQuestState.Normal))

                            && dailyQuestState == DailyQuestState.Normal)

                        {

                            dailyQuest.redpoint.state = RedPointState.Simple;

                        }

@@ -877,7 +874,7 @@
                    {

                        case DailyQuestType.HeavenBattle:

                        case DailyQuestType.FairyFeast:

                            if (dailyQuestState == DailyQuestState.CanBuyTimes || (dailyQuestState == DailyQuestState.Normal && completedTimes < totalTimes))

                            if ((dailyQuestState == DailyQuestState.Normal && completedTimes < totalTimes))

                            {

                                dailyQuest.redpoint.state = RedPointState.Simple;

                            }

@@ -920,7 +917,7 @@
                            }

                            break;

                        default:

                            if (dailyQuestState == DailyQuestState.CanBuyTimes || dailyQuestState == DailyQuestState.Normal)

                            if (dailyQuestState == DailyQuestState.Normal)

                            {

                                dailyQuest.redpoint.state = RedPointState.Simple;

                            }


 System/DailyQuest/ResourcesBackBoxBack.cs

@@ -27,7 +27,7 @@
        [SerializeField] GameObject m_Type_One;//类型1

        ResourcesBackModel m_ResourcesBackModel;

        ResourcesBackModel resourcesBackModel { get { return m_ResourcesBackModel ?? (m_ResourcesBackModel = ModelCenter.Instance.GetModel<ResourcesBackModel>()); } }

        


        public static bool isBool = false;//是否绑玉找回

        public bool IsOneKeyBool = false;//是否一键

        public int _resourcesBackID = 0;

@@ -158,7 +158,7 @@
                    Image Icon = m_Coent.GetChild(i).Find("Icon").GetComponent<Image>();

                    Text Number = m_Coent.GetChild(i).Find("Text").GetComponent<Text>();

                    Button Btn = m_Coent.GetChild(i).Find("Image").GetComponent<Button>();

                    Image Image_1= m_Coent.GetChild(i).Find("Image").GetComponent<Image>();

                    Image Image_1 = m_Coent.GetChild(i).Find("Image").GetComponent<Image>();

                    if (resourcesBackClass.RewardList[i] == "exp")

                    {

                        double number = Equation.Instance.Eval<double>(resourcesBackClass.JadeReward.exp);

@@ -167,7 +167,7 @@
                        Number.text = ItemLogicUtility.Instance.OnChangeCoinsUnit((ulong)number);

                        var Item_1 = ItemConfig.Get(2103);

                        Image_1.SetItemBackGround(Item_1.ItemColor);

                        Btn.SetListener(()=> { ItemTipUtility.Show(2103); });

                        Btn.SetListener(() => { ItemTipUtility.Show(2103); });

                    }

                    else if (resourcesBackClass.RewardList[i] == "money")

                    {

@@ -276,8 +276,8 @@
                        {

                            continue;

                        }

                       number = Equation.Instance.Eval<double>(resourcesBackClass.CopperReward.money);

                        if ( number <= 1)

                        number = Equation.Instance.Eval<double>(resourcesBackClass.CopperReward.money);

                        if (number <= 1)

                        {

                            continue;

                        }

@@ -335,7 +335,7 @@
                            string itemIcon = ItemConfig.Get(ItemId).IconKey;

                            var Item_2 = ItemConfig.Get(ItemId);

                            Image_2.SetItemBackGround(Item_2.ItemColor);

                            Btn1.SetListener(()=> { ItemTipUtility.Show(ItemId); });

                            Btn1.SetListener(() => { ItemTipUtility.Show(ItemId); });

                            Icon1.SetSprite(itemIcon);

                            Number1.text = ItemLogicUtility.Instance.OnChangeCoinsUnit((ulong)ItemCount);

                            type += 1;

@@ -373,7 +373,7 @@
                {

                    int fairyJade = 0;

                    fairyJade = resourcesBackClass.NormalCostJade - CostJade;

                    string strLanguage = string.Format(Language.Get("FairyLand_Func13"), CostJade);

                    var strLanguage = Language.Get("FairyLand_Func13", resourcesBackClass.NormalCostJade);

                    ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), strLanguage, (bool isOk) =>

                    {

                        if (isOk)

@@ -394,7 +394,7 @@
                {

                    int fairyJade = 0;

                    fairyJade = resourcesBackClass.VipCostJade - CostJade;

                    string strLanguage = string.Format(Language.Get("FairyLand_Func13"), CostJade);

                    var strLanguage = Language.Get("FairyLand_Func13", resourcesBackClass.VipCostJade);

                    ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), strLanguage, (bool isOk) =>

                    {

                        if (isOk)

@@ -424,7 +424,7 @@
                WindowCenter.Instance.Open<RechargeTipWin>();

            }

        }

        private  int ReplaceItemID(int itemID, ResourcesBackClass resourcesBackClass)

        private int ReplaceItemID(int itemID, ResourcesBackClass resourcesBackClass)

        {

            int ItemID = itemID;

            if (resourcesBackClass.ReplaceItemID.Contains(itemID))

@@ -435,7 +435,7 @@
                    ItemID = resourcesBackClass.ReplaceItemID[(job - 1)];

                }

            }

                return ItemID;

            return ItemID;

        }

    }




 System/Dungeon/DungeonBeginCoolDownWin.cs

@@ -41,6 +41,7 @@
        {
            if (CrossServerUtility.IsCrossServerOneVsOne() || ClientCrossServerOneVsOne.isClientCrossServerOneVsOne)
            {
                beginTime = TimeUtility.ServerNow;
                m_CoolDownContainer.gameObject.SetActive(false);
            }
            else
@@ -69,6 +70,7 @@
        {
            if (CrossServerUtility.IsCrossServerOneVsOne() || ClientCrossServerOneVsOne.isClientCrossServerOneVsOne)
            {
                beginTime = TimeUtility.ServerNow;
                m_CoolDownContainer.gameObject.SetActive(false);
                return;
            }

 System/Dungeon/DungeonEndCoolDownWin.cs

@@ -37,6 +37,7 @@


            if (CrossServerUtility.IsCrossServerOneVsOne() || ClientCrossServerOneVsOne.isClientCrossServerOneVsOne)

            {

                endTime = TimeUtility.ServerNow;

                m_CoolDownContainer.gameObject.SetActive(false);

            }

            else

@@ -71,6 +72,7 @@
        {

            if (CrossServerUtility.IsCrossServerOneVsOne() || ClientCrossServerOneVsOne.isClientCrossServerOneVsOne)

            {

                endTime = TimeUtility.ServerNow;

                m_CoolDownContainer.gameObject.SetActive(false);

                return;

            }


 System/FairyAu/ExchangeEquipCell.cs

@@ -29,20 +29,29 @@
        bool bIsChose = m_Model.ChoseEquips.Contains(m_ItemModel);

        m_ChoseImg.gameObject.SetActive(bIsChose);

        m_ItemCell.Init(item, true);

        m_ItemCell.button.RemoveAllListeners();

        //m_ItemCell.button.RemoveAllListeners();

        

        m_ItemCell.button.AddListener(() =>

        {

            m_Model.EquipCellClick(m_ItemModel,

                ()=>

                {

                    m_ChoseImg.gameObject.SetActive(m_Model.ChoseEquips.Contains(m_ItemModel));

                });        
        });

        //m_ItemCell.button.AddListener(() =>

        //{

        //    m_Model.EquipCellClick(m_ItemModel,

        //        ()=>

        //        {

        //            m_ChoseImg.gameObject.SetActive(m_Model.ChoseEquips.Contains(m_ItemModel));

        //        });        
        //});

        if(m_LongBtn == null)

        {

            m_LongBtn = m_ItemCell.itemIcon.AddMissingComponent<LongPressButton>();           

        }

        m_LongBtn.onClick.RemoveAllListeners();

        m_LongBtn.AddListener(() =>

        {

            m_Model.EquipCellClick(m_ItemModel,

                () =>

                {

                    m_ChoseImg.gameObject.SetActive(m_Model.ChoseEquips.Contains(m_ItemModel));

                });

        });

        m_LongBtn.onPress.RemoveAllListeners();

        m_LongBtn.onPress.AddListener(()=>ItemTipUtility.Show(m_ItemModel.guid, false));

        m_LongBtn.targetGraphic = m_ItemCell.itemIcon;


 System/FashionDress/FashionDetailsWin.cs

@@ -157,6 +157,12 @@
                        m_GetWaysWidget.Hide();
                    }
                });

                if (getWay.defaultUnfold)

                {

                    m_GetWaysWidget.Display(getWay);

                    m_GetWaysWidget.Bind("FashionDetailsWin");

                }
            }
        }




 System/FindPrecious/WorldBossCell.cs

@@ -60,7 +60,12 @@
        }

        if(bIsItemNone)

        {

            ItemTipUtility.Show(m_ItemID);

            ItemTipUtility.Show(new ItemTipUtility.ItemViewInfo()

            {

                itemId = m_ItemID,

                unfoldGetWay = true

            });



            return;

        }

        if(bIsBossCountFull)


 System/ItemTip/EquipTipWin.cs

@@ -304,6 +304,12 @@
                                getWaysWidget.Hide();
                            }
                        });

                        if (getWay.defaultUnfold)
                        {
                            getWaysWidget.Display(getWay);
                            getWaysWidget.Bind("EquipTipWin");
                        }
                    }
                }


 System/ItemTip/ItemTipUtility.cs

@@ -136,6 +136,7 @@

        public struct GetWay
        {
            public bool defaultUnfold;
            public List<int> ways;
        }

@@ -191,6 +192,7 @@
        {

            public int itemId;

            public bool compare;

            public bool unfoldGetWay;

        }

        static PackModel packModel { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
@@ -265,6 +267,7 @@
                    break;

            }



            mainTipData.getWay.defaultUnfold = item.unfoldGetWay;

            switch (tipType)

            {

                case TipType.Equip:

@@ -934,7 +937,7 @@
                isAuction = false,
                isEquiped = false,
                isPreview = true,
                score = ItemLogicUtility.Instance.GetEquipScore(PackType.Item, itemId, null, true),
                score = ItemLogicUtility.Instance.GetEquipScore(itemId, null, true),
                auctionSurplusTime = 0,
                levelLimit = config.UseLV,
                realmLimit = config.RealmLimit,
@@ -1097,42 +1100,23 @@
            var data = new LegendProperty();
            data.isPreview = true;

            var config = ItemConfig.Get(itemId);
            switch (config.Type)
            {
                case 119:

                case 120:

                case 121:

                case 122:

                case 123:

                    data.trueCount = LegendPropertyUtility.GetDogzPropertyCount(config.ItemColor, config.StarLevel, LegendAttrType.Normal);

                    data.properties = new List<Int2>();
                    var keys = LegendPropertyUtility.GetDogzPlaceProperties(config.EquipPlace);

                    foreach (var key in keys)

                    {

                        var value = LegendPropertyUtility.GetDogzQualityPropertyValue(key, config.ItemColor);

                        data.properties.Add(new Int2(key, value));

                    }
                    break;
                default:
                    if (config.Effect1 == 220)

                    {

                        data.isPreview = false;

                        var appConfig = AppointItemConfig.Get(itemId);

                        data.trueCount = 0;

            var config = ItemConfig.Get(itemId);

            if (config.Effect1 == 220)

            {

                data.isPreview = false;

                var appConfig = AppointItemConfig.Get(itemId);

                data.trueCount = 0;



                        data.properties = new List<Int2>();

                        for (var i = 0; i < appConfig.LegendAttrID.Length; i++)

                        {

                            data.properties.Add(new Int2(appConfig.LegendAttrID[i], appConfig.LegendAttrValue[i]));

                        }

                    }

                    else

                    {

                        data.trueCount = LegendPropertyUtility.GetEquipPropertyCount(itemId);

                        data.properties = LegendPropertyUtility.GetEquipProperties(itemId);

                    }
                    break;
                data.properties = new List<Int2>();

                for (var i = 0; i < appConfig.LegendAttrID.Length; i++)

                {

                    data.properties.Add(new Int2(appConfig.LegendAttrID[i], appConfig.LegendAttrValue[i]));

                }

            }

            else

            {

                data.trueCount = LegendPropertyUtility.GetEquipPropertyCount(itemId);

                data.properties = LegendPropertyUtility.GetEquipProperties(itemId);

            }

            return data;

 System/ItemTip/ItemTipWin.cs

@@ -174,6 +174,12 @@
                        m_GetWaysWidget.Hide();
                    }
                });

                if (getWay.defaultUnfold)
                {
                    m_GetWaysWidget.Display(getWay);
                    m_GetWaysWidget.Bind("ItemTipWin");
                }
            }
        }


 System/ItemTip/PetMountTipWin.cs

@@ -210,6 +210,12 @@
                        m_GetWaysWidget.Hide();
                    }
                });

                if (getWay.defaultUnfold)
                {
                    m_GetWaysWidget.Display(getWay);
                    m_GetWaysWidget.Bind("PetMountTipWin");
                }
            }
        }


 System/ItemTip/SpiritWeaponTipWin.cs

@@ -129,6 +129,12 @@
                        m_GetWaysWidget.Hide();
                    }
                });

                if (getWay.defaultUnfold)
                {
                    m_GetWaysWidget.Display(getWay);
                    m_GetWaysWidget.Bind("SpiritWeaponTipWin");
                }
            }
        }


 System/ItemTip/TipSuitPropertyWidget.cs

@@ -71,7 +71,7 @@
                m_SuitEquipNames[i].text = setName + EquipSuitNameConfig.GetSuitName(suitInfo.level, place, suitInfo.job);
                var hasSuit = suitInfo.places.Contains(place)
                    && suitInfo.placeStars.ContainsKey(place) && suitInfo.placeStars[place] >= star;
                m_SuitEquipNames[i].color = UIHelper.GetUIColor(hasSuit ? TextColType.Green : TextColType.White, true);
                m_SuitEquipNames[i].color = UIHelper.GetUIColor(hasSuit ? TextColType.Green : TextColType.White);
            }
        }

@@ -81,7 +81,7 @@
            m_FiveSuit.Display(suitInfo.fiveSuitProperties[star]);
            m_EightSuitDescription.text = GetEightSuitDescription(suitInfo.job, suitInfo.level, star);
            var eightSuitActive = suitInfo.eightSuits[star];
            var color = UIHelper.GetUIColor(eightSuitActive ? TextColType.Green : TextColType.White, true);
            var color = UIHelper.GetUIColor(eightSuitActive ? TextColType.Green : TextColType.White);
            m_EightSuitTitle.color = color;
            m_EightSuitDescription.color = color;
        }

 System/ItemTip/WingTipWin.cs

@@ -144,6 +144,12 @@
                        m_GetWaysWidget.Hide();
                    }
                });

                if (getWay.defaultUnfold)
                {
                    m_GetWaysWidget.Display(getWay);
                    m_GetWaysWidget.Bind("WingTipWin");
                }
            }
        }


 System/KnapSack/Logic/ItemLogicUtility.cs

@@ -211,7 +211,7 @@

        }

        public int GetEquipScore(PackType type, int itemId, Dictionary<int, List<int>> useDataDic = null, bool isPreview = false)
        public int GetEquipScore(int itemId, Dictionary<int, List<int>> useDataDic = null, bool isPreview = false)
        {
            var config = ItemConfig.Get(itemId);
            if (config.EquipPlace == 0)

@@ -225,7 +225,7 @@
            {
                properties.AddBaseProperties(config.EffectValueA1, equipBaseProperties);
                properties.AddCustomProperties(itemId);
                return CalculateEquipScore(type, config.EffectValueA1, properties);
                return CalculateEquipScore( config.EffectValueA1, properties);
            }

            properties.AddBaseProperties(itemId, equipBaseProperties);
@@ -249,7 +249,7 @@
                        break;
                }

                return CalculateEquipScore(type, itemId, properties);
                return CalculateEquipScore( itemId, properties);
            }

            if (useDataDic != null)
@@ -265,7 +265,7 @@
                }
            }

            return CalculateEquipScore(type, itemId, properties);
            return CalculateEquipScore( itemId, properties);
        }

        private Dictionary<int, int> GetEquipLegendProperties(int itemId)
@@ -299,7 +299,7 @@
        /// <param name="itemId"></param>
        /// <returns></returns>
        private Dictionary<PropertyType, float> curEquipAttrDict = new Dictionary<PropertyType, float>(); //存储当前装备属性对应的数值 key 属性 value 属性值
        private int CalculateEquipScore(PackType type, int itemId, EquipSorceProperties properties)
        private int CalculateEquipScore(int itemId, EquipSorceProperties properties)
        {
            var config = ItemConfig.Get(itemId);
            if (config == null || !GeneralDefine.CompareEquipPlaces.Contains(config.EquipPlace))
@@ -317,7 +317,7 @@
            Equation.Instance.Clear();
            curEquipAttrDict.Clear();

            var GSProValueDict = EquipGSParamConfig.GetTagGsProValueDict(config.LV, config.ItemColor, config.SuiteiD > 0 ? 1 : 0);
            var GSProValueDict = EquipGSParamConfig.GetTagGsProValueDict(config.LV, config.ItemColor, config.SuiteiD > 0 ? 1 : 0 ,config.StarLevel);
            foreach (var key in properties.Keys)
            {
                var attrType = (PropertyType)key;
@@ -353,11 +353,6 @@
                }
            }

            if (type == PackType.Deleted)
            {
                type = GeneralDefine.GetPackTypeByItemType(config.Type);
            }

            var skillScore = 0;
            if (config.AddSkill1 != 0 && equipSkillScores.ContainsKey(config.AddSkill1))
            {
@@ -375,13 +370,13 @@
                spiritWeaponScore = SpiritWeaponConfig.Get(itemId).AttrScore;

            }

            switch (type)
            {
                case PackType.DogzEquip:
                case PackType.DogzItem:
                    return Equation.Instance.Eval<int>(dogzGSFormula);
                default:
                    return spiritWeaponScore + skillScore + Equation.Instance.Eval<int>(normalGSFormula);
            if (IsDogzEquip(itemId))

            {

                return Equation.Instance.Eval<int>(dogzGSFormula);

            }

            else

            {

                return spiritWeaponScore + skillScore + Equation.Instance.Eval<int>(normalGSFormula);

            }
        }


 System/KnapSack/Logic/ItemModel.cs

@@ -96,7 +96,7 @@
                }

            }



            this.score = ItemLogicUtility.Instance.GetEquipScore(packType, itemId, useDataDict, isAuction);

            this.score = ItemLogicUtility.Instance.GetEquipScore(itemId, useDataDict, isAuction);

        }



        public void RefreshCount(int count)


 System/KnapSack/Logic/LegendPropertyUtility.cs

@@ -5,18 +5,9 @@

public class LegendPropertyUtility
{
    static PropertyColor propertyColor;
    static PropertyMap dogzPropertyMap;
    static PropertyCount dogzPropertyCount;
    static QualityPropertyValue dogzQualityPropertyValue;

    public static void Init()
    {
        propertyColor = new PropertyColor("LegendAttrColor");
        dogzPropertyMap = new PropertyMap(FuncConfigConfig.Get("DogzLegendAttrColor").Numerical1,
            FuncConfigConfig.Get("DogzLegendAttrRulePreview").Numerical1);
        dogzPropertyCount = new PropertyCount(FuncConfigConfig.Get("DogzLegendAttrCountPreview").Numerical1);
        dogzQualityPropertyValue = new QualityPropertyValue(FuncConfigConfig.Get("DogzLegendAttrValueByColorPreview").Numerical1);
    }

    public static List<Int2> GetEquipProperties(int itemId)
@@ -27,7 +18,7 @@
            return null;
        }

        var legendPropertyConfig = LegendPropertyValueConfig.Get(config.Type, config.LV, config.ItemColor, config.SuiteiD != 0);
        var legendPropertyConfig = LegendPropertyValueConfig.Get(config.Type, config.LV, config.ItemColor, config.SuiteiD != 0, config.StarLevel);
        if (legendPropertyConfig == null)
        {
            return null;
@@ -44,328 +35,13 @@
            return 0;
        }

        var legendPropertyConfig = LegendPropertyValueConfig.Get(config.Type, config.LV, config.ItemColor, config.SuiteiD != 0);
        var legendPropertyConfig = LegendPropertyValueConfig.Get(config.Type, config.LV, config.ItemColor, config.SuiteiD != 0, config.StarLevel);
        if (legendPropertyConfig == null)
        {
            return 0;
        }

        return legendPropertyConfig.propertyCount;
    }

    public static LegendAttrType GetDogzPropertyType(int propertyId)
    {
        return dogzPropertyMap.GetPropertyType(propertyId);
    }

    public static bool HasDogzPlace(int place)
    {
        return dogzPropertyMap.HasPlace(place);
    }

    public static List<int> GetDogzPlaceProperties(int place)
    {
        return dogzPropertyMap.GetProperties(place);
    }

    public static int GetDogzPropertyCount(int quality, int star, LegendAttrType type)
    {
        return dogzPropertyCount.GetCount(quality, star, type);
    }

    public static int GetDogzQualityPropertyValue(int property, int quality)
    {
        return dogzQualityPropertyValue.GetValue(property, quality);
    }

    public class PropertyColor
    {
        Dictionary<int, Dictionary<int, string>> wingLegendPropertyColors = new Dictionary<int, Dictionary<int, string>>();

        public PropertyColor(string configId)
        {
            var config = FuncConfigConfig.Get(configId);

            var wingColorJsonData = JsonMapper.ToObject(config.Numerical2);
            foreach (var key in wingColorJsonData.Keys)
            {
                var propertyId = int.Parse(key);
                if (!wingLegendPropertyColors.ContainsKey(propertyId))
                {
                    wingLegendPropertyColors[propertyId] = new Dictionary<int, string>();
                }

                var subJson = wingColorJsonData[key];
                var colors = wingLegendPropertyColors[propertyId];
                foreach (var key2 in subJson.Keys)
                {
                    var limit = int.Parse(key2);
                    colors[limit] = subJson[key2][0].ToString();
                }
            }

        }

        public string GetWingPropertyColor(int propertyId, int value)
        {
            if (!wingLegendPropertyColors.ContainsKey(propertyId))
            {
                return "ffffff";
            }

            var colors = wingLegendPropertyColors[propertyId];
            var ienumerator = colors.GetEnumerator();
            ienumerator.MoveNext();
            var color = ienumerator.Current.Value;

            while (ienumerator.MoveNext())
            {
                if (value < ienumerator.Current.Key)
                {
                    color = ienumerator.Current.Value;
                }
                else
                {
                    break;
                }
            }

            return color;
        }
    }

    public class PropertyMap
    {
        Dictionary<int, LegendAttrType> propertyTypes = new Dictionary<int, LegendAttrType>();
        // key 装备位 value 属性ID
        Dictionary<int, List<int>> placeToProperties = new Dictionary<int, List<int>>();

        public PropertyMap(string typeConfig, string placeConfig)
        {
            var json = JsonMapper.ToObject(typeConfig);
            foreach (var item in json.Keys)
            {
                var type = (LegendAttrType)(int.Parse(item) - 1);
                var propertyId = 0;
                int.TryParse(json[item].ToString(), out propertyId);
                propertyTypes[propertyId] = type;
            }

            json = JsonMapper.ToObject(placeConfig);
            foreach (var key in json.Keys)
            {
                var equipPlace = int.Parse(key);
                var properties = new List<int>();
                placeToProperties.Add(equipPlace, properties);

                if (json[key].IsArray)
                {
                    var subJson = json[key];
                    for (var i = 0; i < subJson.Count; i++)
                    {
                        if (subJson[i].IsArray)
                        {
                            for (var j = 0; j < subJson[i].Count; j++)
                            {
                                var propertyId = (int)subJson[i][j];
                                properties.Add(propertyId);
                            }
                        }
                    }
                }
            }
        }

        public bool HasProperty(int propertyId)
        {
            return propertyTypes.ContainsKey(propertyId);
        }

        public LegendAttrType GetPropertyType(int propertyId)
        {
            if (HasProperty(propertyId))
            {
                return propertyTypes[propertyId];
            }
            else
            {
                return LegendAttrType.Normal;
            }
        }

        public bool HasPlace(int place)
        {
            return placeToProperties.ContainsKey(place);
        }

        public List<int> GetProperties(int place)
        {
            if (HasPlace(place))
            {
                return placeToProperties[place];
            }
            else
            {
                return null;
            }
        }

        public List<int> GetProperties(int place, LegendAttrType type)
        {
            if (!HasPlace(place))
            {
                return null;
            }

            var allProperties = placeToProperties[place];
            var properties = new List<int>();
            for (var i = 0; i < allProperties.Count; i++)
            {
                var propertyId = allProperties[i];
                if (propertyTypes[propertyId] == type)
                {
                    properties.Add(propertyId);
                }
            }

            return properties;
        }

    }

    public class PropertyCount
    {
        Dictionary<int, StarPropertyCount> qualityToStarLegendPropertyCounts = new Dictionary<int, StarPropertyCount>();

        public PropertyCount(string config)
        {
            var json = JsonMapper.ToObject(config);
            foreach (var key in json.Keys)
            {
                var quality = int.Parse(key);
                qualityToStarLegendPropertyCounts[quality] = new StarPropertyCount(json[key]);
            }
        }

        public bool Has(int quality)
        {
            return qualityToStarLegendPropertyCounts.ContainsKey(quality);
        }

        public bool Has(int quality, int star)
        {
            if (!qualityToStarLegendPropertyCounts.ContainsKey(quality))
            {
                return false;
            }

            return qualityToStarLegendPropertyCounts[quality].Has(star);
        }

        public int GetCount(int quality, int star, LegendAttrType type)
        {
            if (!Has(quality, star))
            {
                return 0;
            }

            return qualityToStarLegendPropertyCounts[quality].GetCount(star, type);
        }

        class StarPropertyCount
        {
            Dictionary<int, Dictionary<LegendAttrType, int>> counts = new Dictionary<int, Dictionary<LegendAttrType, int>>();

            public StarPropertyCount(JsonData json)
            {
                foreach (var key in json.Keys)
                {
                    var star = int.Parse(key);
                    var typeCounts = counts[star] = new Dictionary<LegendAttrType, int>();
                    var subJson = json[key];

                    if (subJson.IsArray)
                    {
                        for (int i = 0; i < subJson.Count; i++)
                        {
                            var type = (LegendAttrType)(i);
                            typeCounts[type] = (int)subJson[i];
                        }
                    }
                }
            }

            public bool Has(int star)
            {
                return counts.ContainsKey(star);
            }

            public int GetCount(int star, LegendAttrType type)
            {
                if (!counts.ContainsKey(star))
                {
                    return 0;
                }

                if (!counts[star].ContainsKey(type))
                {
                    return 0;
                }

                return counts[star][type];
            }

        }
    }

    public class QualityPropertyValue
    {
        // key 属性ID value 装备品质，属性数值
        Dictionary<int, Dictionary<int, int>> qualityValues = new Dictionary<int, Dictionary<int, int>>();

        public QualityPropertyValue(string config)
        {
            var json = JsonMapper.ToObject(config);
            foreach (var key in json.Keys)
            {
                var propertyId = int.Parse(key);
                var qualityToValue = new Dictionary<int, int>();
                qualityValues.Add(propertyId, qualityToValue);

                var subJson = json[key];
                for (var i = 0; i < subJson.Count; i++)
                {
                    qualityToValue[(int)subJson[i][0]] = (int)subJson[i][1];
                }
            }
        }

        public bool Has(int property)
        {
            return qualityValues.ContainsKey(property);
        }

        public bool Has(int property, int quality)
        {
            if (!qualityValues.ContainsKey(property))
            {
                return false;
            }

            return qualityValues[property].ContainsKey(property);
        }

        public int GetValue(int property, int quality)
        {
            if (Has(property, quality))
            {
                return qualityValues[property][quality];
            }
            else
            {
                return 0;
            }
        }
    }

}

 System/KnapSack/New/CommonItemBaisc.cs

@@ -266,7 +266,7 @@
            this.useDataDic = useDataDic;

            this.packType = type;



            this.score = ItemLogicUtility.Instance.GetEquipScore(type, itemId, useDataDic, isPreview);

            this.score = ItemLogicUtility.Instance.GetEquipScore( itemId, useDataDic, isPreview);

        }



        public ItemCellModel(int itemId)

@@ -289,7 +289,7 @@
            this.useDataDic = null;

            this.packType = PackType.Deleted;



            this.score = ItemLogicUtility.Instance.GetEquipScore(PackType.Deleted, itemId, null, isPreview);

            this.score = ItemLogicUtility.Instance.GetEquipScore( itemId, null, isPreview);

        }



        int AdjustItemId(int itemId)


 System/Loading/LoadingWin.cs

@@ -55,6 +55,7 @@


        protected override void OnPreOpen()

        {

            loadingType = isCrossServerOneVsOne ? LoadingType.CrossServerOneOne : LoadingType.Normal;

            m_ContainerNormal.gameObject.SetActive(false);

            m_CrossServerOneVsOne.gameObject.SetActive(false);

        }

@@ -66,7 +67,6 @@
        protected override void OnPreClose()

        {

            isCrossServerOneVsOne = false;

            loadingType = isCrossServerOneVsOne ? LoadingType.CrossServerOneOne : LoadingType.Normal;



            CameraUtility.StopShotCut(m_ScreenShotCut);

            if (!AssetSource.uiFromEditor)


 System/MainInterfacePanel/HighSettingTip.cs

@@ -197,13 +197,22 @@
        void OnClickCrossServerBtn()//跨服PK

        {

            HighSettingFadeInFadeOut.SetAutoCloseTimer();



            int limitlv = FuncOpenLVConfig.Get(157).LimitLV;

            if (FuncOpen.Instance.IsFuncOpen(157) && TimeUtility.OpenDay >= crossServerModel.afterOpenDayOpenCross)

            {

                WindowCenter.Instance.Open<CrossServerWin>();

            }

            else

            {

                WindowCenter.Instance.Open<CrossServerWin>();

                if (PlayerDatas.Instance.baseData.LV < limitlv)

                {

                    SysNotifyMgr.Instance.ShowTip("CrossMatching14", limitlv);

                }

                else

                {

                    SysNotifyMgr.Instance.ShowTip("CrossMatching15", crossServerModel.afterOpenDayOpenCross);

                }

            }

        }




 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -509,7 +509,14 @@
        void CheckChatTipOpen()

        {

            bool _chatWinOpen = WindowCenter.Instance.IsOpen<ChatWin>();

            m_ChatTip.gameObject.SetActive(!_chatWinOpen);

            if (CrossServerUtility.IsCrossServerOneVsOne())

            {

                m_ChatTip.gameObject.SetActive(false);

            }

            else

            {

                m_ChatTip.gameObject.SetActive(!_chatWinOpen);

            }

        }



        private void WindowAfterEvent(Window _win)


 System/Message/RichViewItemUtility.cs

@@ -133,7 +133,7 @@
                    starLevel = itemplus.Star,

                    gems = gems,

                    legendProperties = legendProperties,

                    score = ItemLogicUtility.Instance.GetEquipScore(PackType.Item, itemId, useDataDict, true),

                    score = ItemLogicUtility.Instance.GetEquipScore(itemId, useDataDict, true),

                    gemHoleActiveStates = gemHoleActiveStates,

                    suitLevels = suitLevels,

                    suitPlaces = suitplaces,


 System/RoleParticulars/OtherPlayerEquipModel.cs

@@ -314,7 +314,7 @@
                    legendValues.Add(property.y);
                }

                this.score = ItemLogicUtility.Instance.GetEquipScore(PackType.Item, itemId, userData);
                this.score = ItemLogicUtility.Instance.GetEquipScore(itemId, userData);
            }

        }

 System/SkyTower/SkyTowerWin.cs

@@ -34,6 +34,7 @@
        [SerializeField] PositionTween m_RewardShowTween;
        [SerializeField] RewardPreviewGroup m_RewardBehaviour;
        [SerializeField] TextEx m_LevelLimit;
        [SerializeField] RectTransform m_FightPowerContainer;
        [SerializeField] TextEx m_FightPower;

        [SerializeField] Button m_Challenge;
@@ -158,12 +159,20 @@
            var config = SkyTowerConfig.Get(model.currentFloor);
            m_RewardBehaviour.Display(config.rewards);

            m_FightPower.text = config.fightPower.ToString();
            m_FightPower.colorType = PlayerDatas.Instance.baseData.FightPoint >= config.fightPower ? TextColType.Green : TextColType.Red;

            m_LevelLimit.text = config.levelLimit.ToString();
            m_LevelLimit.colorType = PlayerDatas.Instance.baseData.LV >= config.levelLimit ? TextColType.Green : TextColType.Red;

            if (PlayerDatas.Instance.baseData.LV >= config.levelLimit)
            {
                m_FightPowerContainer.gameObject.SetActive(true);
                m_FightPower.text = config.fightPower.ToString();
                m_FightPower.colorType = PlayerDatas.Instance.baseData.FightPoint >= config.fightPower ? TextColType.Green : TextColType.Red;
            }
            else
            {
                m_FightPowerContainer.gameObject.SetActive(false);
            }

            if (immediately)
            {
                m_RewardShowTween.SetEndState();