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

client_Hale

2019-03-18 e9d27628b32af710d2e5f44460dedbd4c0b17033

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

 Core/NetworkPackage/DTCFile/ServerPack/HA3_Function/DTCA317_tagMCAllEquipAttrActiveInfo.cs

@@ -8,15 +8,12 @@
public class DTCA317_tagMCAllEquipAttrActiveInfo : DtcBasic

{



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



    public override void Done(GameNetPackBasic vNetPack)

    {



        base.Done(vNetPack);



        HA317_tagMCAllEquipAttrActiveInfo vNetData = vNetPack as HA317_tagMCAllEquipAttrActiveInfo;

        playerPack.UpdatePlayerEquipAttrActiveInfo(vNetData);

        var vNetData = vNetPack as HA317_tagMCAllEquipAttrActiveInfo;

        ModelCenter.Instance.GetModel<TreasureSoulModel>().UpdateTreasurePrivilege(vNetData);

    }




 Lua/Gen/SnxxzUIItemOverdueModelWrap.cs

File was deleted

 Lua/Gen/SnxxzUIItemOverdueModelWrap.cs.meta

File was deleted

 Lua/Gen/SnxxzUIPackModelWrap.cs

File was deleted

 Lua/Gen/SnxxzUIPackModelWrap.cs.meta

File was deleted

 Lua/Gen/XLuaGenAutoRegister.cs

File was deleted

 Lua/Gen/XLuaGenAutoRegister.cs.meta

File was deleted

 System/Equip/EquipModel.cs

@@ -99,7 +99,7 @@
            }
            else
            {
                SysNotifyMgr.Instance.ShowTip("");
                SysNotifyMgr.Instance.ShowTip("WearRealmEquip");
            }
        }


 System/EquipGem/EquipGemModel.cs

@@ -158,7 +158,11 @@
                    description = description,

                    itemType = itemType,

                    shopId = shopDict.ContainsKey(i) ? shopDict[i] : 0,

                    composeCount = composeCount

                    composeCount = composeCount,

                    filterParams = new SinglePack.FilterParams()

                    {

                        itemTypes = new List<int>() { itemType },

                    }

                });

            }



@@ -256,14 +260,14 @@
            return m_EquipGemRedpoints.TryGetValue(packIndex, out redpoint);

        }



        public bool TryGetRedpoint(int level,out Redpoint redpoint)

        public bool TryGetRedpoint(int level, out Redpoint redpoint)

        {

            return m_EquipSetRedpoints.TryGetValue(level, out redpoint);

        }



        public bool IsEquipGemHoleOpen(int level, int place, int hole)

        {

            var equipPosition = new Int2( level ,place);

            var equipPosition = new Int2(level, place);

            var equipGuid = equipModel.GetEquip(equipPosition);

            if (string.IsNullOrEmpty(equipGuid))

            {

@@ -394,7 +398,7 @@
            foreach (var type in types)

            {

                var gemType = m_GemTypes[type];

                var itemModels = packModel.GetItemsByType(PackType.Item, gemType.itemType);

                var itemModels = packModel.GetItems(PackType.Item, gemType.filterParams);

                if (itemModels != null)

                {

                    foreach (var itemModel in itemModels)

@@ -447,7 +451,7 @@
            GemType gemType;

            TryGetGemType(type, out gemType);

            var count = 0;

            var items = packModel.GetItemsByType(PackType.Item, gemType.itemType);

            var items = packModel.GetItems(PackType.Item, gemType.filterParams);

            if (items == null)

            {

                return 0;

@@ -469,7 +473,7 @@
            GemType gemType;

            TryGetGemType(type, out gemType);

            var count = 0;

            var items = packModel.GetItemsByType(PackType.Item, gemType.itemType);

            var items = packModel.GetItems(PackType.Item, gemType.filterParams);

            if (items == null)

            {

                return 0;

@@ -491,7 +495,7 @@
            GemType gemType;

            TryGetGemType(type, out gemType);

            var count = 0;

            var items = packModel.GetItemsByType(PackType.Item, gemType.itemType);

            var items = packModel.GetItems(PackType.Item, gemType.filterParams);

            if (items == null)

            {

                return 0;

@@ -873,6 +877,7 @@
        public int itemType;

        public int shopId;

        public int composeCount;

        public SinglePack.FilterParams filterParams;

    }



    public class EquipGemRedpoint


 System/FairyAu/FairyFeastTransmitShow.cs

@@ -70,6 +70,7 @@
        PackModel playerPack { get { return ModelCenter.Instance.GetModel<PackModel>(); } }

        RoleParticularModel roleParticularModel { get { return ModelCenter.Instance.GetModel<RoleParticularModel>(); } }

        FairyFeastModel model { get { return ModelCenter.Instance.GetModel<FairyFeastModel>(); } }

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



        public event Action<ulong> popUpExpEvent;

        public event Action onComplete;

@@ -201,20 +202,13 @@


        void DisplayPlayer()

        {

            var clothes = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Clothes);

            var clothesId = clothes == null ? 0 : (int)clothes.itemId;

            var appearance = equipModel.GetAppearance();



            var wings = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Wing);

            var wingsId = wings == null ? 0 : (int)wings.itemId;



            var secondary = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Weapon2);

            var secondaryId = secondary == null ? 0 : (int)secondary.itemId;



            var fashionClothes = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.FashionClothes);

            var fashionClothesId = fashionClothes == null ? 0 : (int)fashionClothes.itemId;



            var fashionSecondary = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.FashionWeapon2);

            var fashionSecondaryId = fashionSecondary == null ? 0 : (int)fashionSecondary.itemId;

            var clothesId = appearance.clothes;

            var wingsId = appearance.wings;

            var secondaryId = appearance.secondary;

            var fashionClothesId = appearance.fashionClothes;

            var fashionSecondaryId = appearance.fashionSecondary;



            var data = new UI3DPlayerExhibitionData

            {


 System/FashionDress/FashionDressModel.cs

@@ -227,7 +227,8 @@
            if (fashionTypeMapPlaceDict.ContainsKey(type)

                && fashionDressTypeDict.ContainsKey(type))

            {

                var equipPlace = fashionTypeMapPlaceDict[type];

                var equipType = fashionTypeMapPlaceDict[type];

                var equipPlace = EquipPlaceMapConfig.GetServerPlace(0, equipType);

                var itemModel = packModel.GetItemByIndex(PackType.Equip, (int)equipPlace);

                var list = fashionDressTypeDict[type];

                if (itemModel != null)


 System/FashionDress/FashionDressWin.cs

@@ -320,17 +320,12 @@


            var playerPack = ModelCenter.Instance.GetModel<PackModel>();



            var clothes = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Clothes);

            var clothesId = clothes == null ? 0 : (int)clothes.itemId;

            var appearance = ModelCenter.Instance.GetModel<EquipModel>().GetAppearance();



            var weapon = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Weapon);

            var weaponId = weapon == null ? 0 : (int)weapon.itemId;



            var wings = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Wing);

            var wingsId = wings == null ? 0 : (int)wings.itemId;



            var secondary = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Weapon2);

            var secondaryId = secondary == null ? 0 : (int)secondary.itemId;

            var clothesId = appearance.clothes;

            var wingsId = appearance.wings;

            var secondaryId = appearance.secondary;

            var weaponId = appearance.weapon;



            var fashionDressClothesId = 0;

            var fashionDressWeaponId = 0;


 System/Guard/GuardModel.cs

@@ -102,7 +102,8 @@
        private void CheckFairyLandGuard()

        {

            fairyLandGuard = false;

            var itemModel = pack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Guard1);

            var equipPlace = EquipPlaceMapConfig.GetServerPlace(0, (int)RoleEquipType.Guard1);

            var itemModel = pack.GetItemByIndex(PackType.Equip, equipPlace);

            if (itemModel == null || !fairyLandGuardItems.Contains(itemModel.itemId))

            {

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


 System/KnapSack/Logic/ItemOverdueModel.cs

@@ -15,26 +15,25 @@
        private Dictionary<int, List<int>> itemOverdueDict;

        public static event Action FirstGoldWPOver;//首冲试用结束



        PackModel _playerPack;

        PackModel playerPack {

            get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); }

        }

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



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

         Dictionary<int, string> guardOverdueIconDict { get;  set; }



        Dictionary<string, OverdueItem> itemStack = new Dictionary<string, OverdueItem>();

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



        public event Action showItemRefreshEvent;

        public OverdueItem currentShowItem { get; private set; }

        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

        bool isdelay = true;



        public readonly int VipExperirnceID = 985;

        public readonly int VipCardID = 978;

        Dictionary<int, Dictionary<int, List<ItemModel>>> allGuardDict = new Dictionary<int, Dictionary<int, List<ItemModel>>>(); //守护类型，守护ID



        public override void Init()

        {

            SysNotifyMgr.Instance.sysNotifyEvent += GetSysNotify;

            //TimeMgr.Instance.OnSyntonyEvent += OnSyntonyEvent;

            itemOverdueDict = new Dictionary<int, List<int>>();

            FuncConfigConfig itemOverdueFunc = FuncConfigConfig.Get("ItemTimeOut");

            JsonData jsonData = JsonMapper.ToObject(itemOverdueFunc.Numerical1);

@@ -48,10 +47,10 @@
                }

                itemOverdueDict.Add(int.Parse(key), renewallist);

            }



            FuncConfigConfig guardOverdueIcon = FuncConfigConfig.Get("GuardianOverDueImg");

            guardOverdueIconDict = ConfigParse.GetDic<int, string>(guardOverdueIcon.Numerical1);

        }





        public void OnBeforePlayerDataInitialize()

        {

@@ -74,6 +73,7 @@
            GlobalTimeEvent.Instance.secondEvent += UpdateSecond;

            time = 0;

        }



        float time = 0;

        private void UpdateSecond()

        {

@@ -300,13 +300,13 @@


        public void SendRenewalQuest(int index, int moneyType)

        {

            CA307_tagCMItemRenew tagCMItemRenew = new CA307_tagCMItemRenew();

            var tagCMItemRenew = new CA307_tagCMItemRenew();

            tagCMItemRenew.ItemIndex = (byte)index;

            tagCMItemRenew.MoneyType = (byte)moneyType;

            GameNetSystem.Instance.SendInfo(tagCMItemRenew);

        }



        public void GetOverdueGuard()

         void GetOverdueGuard()

        {

            SetAllGuardIdlist();

            overdueGuardPushlist.Clear();

@@ -358,6 +358,7 @@
                    }

                }

            }



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

            {

                OnGetOverdueItem(overdueGuardPushlist[i].itemId, overdueGuardPushlist[i].guid, overdueGuardPushlist[i].gridIndex);

@@ -370,10 +371,11 @@
            {

                return true;

            }



            return false;

        }



        public void SetAllGuardIdlist()

         void SetAllGuardIdlist()

        {

            allGuardDict.Clear();

            foreach (var id in itemOverdueDict.Keys)


 System/KnapSack/Logic/ModelShowPerfab.cs

@@ -174,26 +174,16 @@
        {

            var job = PlayerDatas.Instance.baseData.Job;



            var clothes = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Clothes);

            var clothesId = clothes == null ? 0 : (int)clothes.itemId;

            var appearance = ModelCenter.Instance.GetModel<EquipModel>().GetAppearance();



            var weapon = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Weapon);

            var weaponId = weapon == null ? 0 : (int)weapon.itemId;

            var clothesId = appearance.clothes;

            var weaponId = appearance.weapon;

            var wingsId = appearance.wings;

            var secondaryId = appearance.secondary;



            var wings = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Wing);

            var wingsId = wings == null ? 0 : (int)wings.itemId;



            var secondary = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Weapon2);

            var secondaryId = secondary == null ? 0 : (int)secondary.itemId;



            var fashionClothes = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.FashionClothes);

            var fashionClothesId = fashionClothes == null ? 0 : (int)fashionClothes.itemId;



            var fashionWeapon = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.FashionWeapon);

            var fashionWeaponId = fashionWeapon == null ? 0 : (int)fashionWeapon.itemId;



            var fashionSecondary = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.FashionWeapon2);

            var fashionSecondaryId = fashionSecondary == null ? 0 : (int)fashionSecondary.itemId;

            var fashionClothesId = appearance.fashionClothes;

            var fashionWeaponId = appearance.fashionWeapon;

            var fashionSecondaryId = appearance.fashionWeapon;



            int _suitLevel = 0;

            UI3DPlayerExhibitionData data = new UI3DPlayerExhibitionData()


 System/KnapSack/Logic/PackModel.cs

@@ -22,6 +22,7 @@
        bool isUpdatePlayerLv = false;

        BlastFurnaceModel FurnaceModel { get { return ModelCenter.Instance.GetModel<BlastFurnaceModel>(); } }
        ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }

        public override void Init()
        {
@@ -93,7 +94,6 @@
                }
            }

            SetRoleEquipRedpoint();
        }

        public void OnBeforePlayerDataInitialize()
@@ -108,7 +108,6 @@
            itemGUIDDict.Clear();
            showDropItem = false;
            isPlayBetterEquipEffect = false;
            equipAttrActiveDict.Clear();
            colorType = EquipColorType.Purple;
            lvType = EquipLvType.All;
            starType = EquipStarType.None;
@@ -126,7 +125,6 @@
        public void OnPlayerLoginOk()
        {
            ItemOperateUtility.Instance.RequestWarehouseData();
            SetPlayerAttrActiveRedPoint();
            EquipDecomRedCtrl();
            RoleEquipLocalSave = StringUtility.Contact("RoleEquipLocalSave", PlayerDatas.Instance.baseData.PlayerID);
            StrengthAttrShift_RecordKey = StringUtility.Contact(PlayerDatas.Instance.baseData.PlayerID, "StrengthAttrShift");
@@ -147,8 +145,6 @@
        {

        }

        ItemTipsModel itemTipsModel { get { return ModelCenter.Instance.GetModel<ItemTipsModel>(); } }

        public event Action<PackType> refrechPackEvent; //刷新整个背包数据
        public event Action<PackType, int, int> refreshItemCountEvent; //（单个）最新物品数量刷新(旧的弃用)在得到新物品、物品数量的改变，清理该物品时均会触发 int 位置索引 int物品id
@@ -227,11 +223,6 @@
                itemCntAddEvent(type, itemInfo.index, itemInfo.itemId);
            }

            if (type == PackType.Equip)
            {
                SetPlayerAttrActiveRedPoint();
            }

            UpdatePackRedpoint(type);
            EquipDecomRedCtrl();
        }
@@ -261,6 +252,7 @@
            PackType type = (PackType)refresh.PackType;
            SinglePack singlePack = null;
            playerPackDict.TryGetValue(type, out singlePack);

            if (singlePack != null)
            {
                ItemModel itemModel = singlePack.GetItemByIndex(refresh.ItemIndex);
@@ -308,17 +300,6 @@
            {
                singlePack.Clear();
            }

            if (type == PackType.Equip)
            {
                SetPlayerAttrActiveRedPoint();
            }
            //if (RefreshPackAct != null)
            //{
            //    RefreshPackAct(type);
            //}

            //RedPointPackCtrl(type);
        }

        public void RemoveItem(H0709_tagClearItem clearItem)
@@ -335,7 +316,9 @@
                ItemModel itemModel = singlePack.GetItemByIndex(clearItem.ItemIndex);
                guid = itemModel.guid;
                int itemId = itemModel.itemId;
                DeleteItemDictByGUID(type, itemModel.guid);

                DeleteItemDictByGUID( itemModel.guid);

                singlePack.RemoveItem(clearItem.ItemIndex);
                if (refreshItemCountEvent != null)
                {
@@ -347,10 +330,7 @@
                    itemCntReduceEvent(type, clearItem.ItemIndex, itemId);
                }
            }
            if (type == PackType.Equip)
            {
                SetPlayerAttrActiveRedPoint();
            }

            UpdatePackRedpoint(type);
            EquipDecomRedCtrl();

@@ -371,11 +351,11 @@
            isPlayBetterEquipEffect = false;
            SetLookIndex(null);
            if (success.PlayerID != PlayerDatas.Instance.baseData.PlayerID)
            {
                return;
            }

            ItemConfig itemConfig = ItemConfig.Get((int)success.ItemID);
            MakeUseItemSuccess(success.ItemIndex, (int)success.ItemID);

            switch (success.ItemID)
            {
                case 221:
@@ -423,8 +403,10 @@
            }
            else
            {
                PackType prePack = itemGUIDDict[itemModel.guid].packType;
                var prePack = itemGUIDDict[itemModel.guid].packType;

                itemGUIDDict[itemModel.guid] = itemModel;

                if (prePack != itemModel.packType)
                {
                    GetItemEventCtrl(itemModel);
@@ -432,15 +414,11 @@
            }
        }

        void DeleteItemDictByGUID(PackType type, string guid)
        void DeleteItemDictByGUID(string guid)
        {

            if (itemGUIDDict.ContainsKey(guid))
            {
                if (itemGUIDDict[guid].packType == type)
                {
                    itemGUIDDict.Remove(guid);
                }
                itemGUIDDict.Remove(guid);
            }
        }

@@ -491,114 +469,8 @@
                {
                    refreshItemSumUseCountEvent(itemId);
                }

            }
        }

        #region 接收全身星级，强化属性激活
        public event Action RefreshActiveAttrAct;
        private Dictionary<int, int> equipAttrActiveDict = new Dictionary<int, int>();
        public void UpdatePlayerEquipAttrActiveInfo(HA317_tagMCAllEquipAttrActiveInfo info)
        {
            for (int i = 0; i < info.Count; i++)
            {
                int type = info.ActiveInfo[i].Type;
                int cnt = (int)info.ActiveInfo[i].Cnt;
                if (type == 1)
                {
                    cnt = RoleEquipStarsConfig.GetActiveStars(cnt);
                }
                if (!equipAttrActiveDict.ContainsKey(type))
                {
                    equipAttrActiveDict.Add(type, cnt);
                }
                else
                {
                    equipAttrActiveDict[type] = cnt;
                }
            }

            if (RefreshActiveAttrAct != null)
            {
                RefreshActiveAttrAct();
            }

            SetPlayerAttrActiveRedPoint();
        }

        public void SendActiveAttrQuest(int type, int cnt)
        {
            var equipAttr = new CA503_tagCMActiveAllEquipAttr();
            equipAttr.Type = (byte)type;
            equipAttr.Cnt = (uint)cnt;
            GameNetSystem.Instance.SendInfo(equipAttr);
        }

        public int GetActiveCntByType(int type)
        {
            int cnt = 0;
            equipAttrActiveDict.TryGetValue(type, out cnt);
            return cnt;
        }

        public List<int> GetAddAttrIdByStars(int _curStarsCount, out int starsCount)
        {
            starsCount = 0;
            List<int> activeIdlist = new List<int>();
            List<int> addIdlist = new List<int>();
            List<int> starslist = RoleEquipStarsConfig.GetEquipStarsCntlist();
            if (starslist == null || starslist.Count < 1) return addIdlist;
            int activeStars = GetActiveCntByType(1);
            int realActiveStars = _curStarsCount > activeStars ? activeStars : _curStarsCount;
            for (int i = starslist.Count - 1; i > -1; i--)
            {
                if (i == 0 && starslist[i] > realActiveStars)
                {
                    realActiveStars = 0;
                    break;
                }
                if (starslist[i] <= realActiveStars)
                {
                    realActiveStars = starslist[i];
                    break;
                }
            }

            RoleEquipStarsConfig activeStarsConfig = RoleEquipStarsConfig.GetEquipStarsModel(realActiveStars);
            if (activeStarsConfig != null)
            {
                for (int i = 0; i < activeStarsConfig.attType.Length; i++)
                {
                    activeIdlist.Add(activeStarsConfig.attType[i]);
                }
            }
            List<RoleEquipStarsConfig> starsConfigs = RoleEquipStarsConfig.GetValues();
            for (int i = 0; i < starsConfigs.Count; i++)
            {
                bool isAddId = false;
                RoleEquipStarsConfig starsConfig = starsConfigs[i];
                if (realActiveStars < starsConfig.countNeed)
                {
                    for (int j = 0; j < starsConfig.attType.Length; j++)
                    {
                        int attrId = starsConfig.attType[j];
                        if (!activeIdlist.Contains(attrId))
                        {
                            isAddId = true;
                            addIdlist.Add(attrId);
                        }
                    }
                }
                if (isAddId)
                {
                    starsCount = starsConfig.countNeed;
                    break;
                }

            }
            return addIdlist;
        }
        #endregion

        #endregion

@@ -711,6 +583,7 @@

                    }
                }

                if (!isOverdue)
                {
                    ItemLogicUtility.Instance.RecommendItem(itemModel);
@@ -787,20 +660,7 @@
            }
        }

        public List<ItemModel> GetItemsByType(PackType packType, int itemType)
        {
            if (playerPackDict.ContainsKey(packType))
            {
                var singlePack = playerPackDict[packType];
                return singlePack.GetItemsByType(itemType);
            }
            else
            {
                return null;
            }
        }

        public List<ItemModel> GetItems( PackType packType, SinglePack.FilterParams param)
        public List<ItemModel> GetItems(PackType packType, SinglePack.FilterParams param)
        {
            if (playerPackDict.ContainsKey(packType))
            {
@@ -843,31 +703,6 @@
            }

            return count;
        }

        public bool CheckBagIsPutNewItem(int itemId)
        {
            var singlePack = GetSinglePack(PackType.Item);
            if (singlePack == null)
            {
                return false;
            }

            var config = ItemConfig.Get(itemId);
            var items = singlePack.GetItemsById(itemId);
            var count = singlePack.GetCountById(itemId);

            int sumPutCnt = config.PackCount * items.Count;
            if (sumPutCnt > count)
            {
                return true;
            }
            else if (GetEmptyGridCount(PackType.Item) > 0)
            {
                return true;
            }

            return false;
        }

        public int GetEmptyGridCount(PackType type)
@@ -958,90 +793,6 @@
        }

        #region 红点逻辑判断
        private Dictionary<int, Redpoint> roleEquipRedDict = new Dictionary<int, Redpoint>();
        public void SetRoleEquipRedpoint()
        {
            roleEquipRedDict.Clear();
            for (int i = 1; i < 13; i++)
            {
                int redKey = ITEMPACK_REDKEY + i;
                Redpoint redpoint = new Redpoint(MainRedDot.RedPoint_BagFuncKey, redKey);
                roleEquipRedDict.Add(i, redpoint);
            }
        }

        public void UpdateRoleEquipRed()
        {
            foreach (var key in roleEquipRedDict.Keys)
            {
                var item = GetItemByIndex(PackType.Equip, key);
                switch ((RoleEquipType)key)
                {
                    case RoleEquipType.FairyCan1:
                        if (PlayerDatas.Instance.baseData.LV >= fairyRedPointLvlimt && !TryGetRoleEquipLocalSave(key)
                           && item == null && roleEquipRedDict[(int)RoleEquipType.FairyCan2].state == RedPointState.None)
                        {
                            roleEquipRedDict[key].state = RedPointState.Simple;
                        }
                        else
                        {
                            roleEquipRedDict[key].state = RedPointState.None;
                        }
                        break;
                    case RoleEquipType.FairyCan2:
                        if (PlayerDatas.Instance.baseData.LV >= fairyRedPointLvlimt && !TryGetRoleEquipLocalSave(key)
                            && item == null && roleEquipRedDict[(int)RoleEquipType.FairyCan1].state == RedPointState.None)
                        {
                            roleEquipRedDict[key].state = RedPointState.Simple;
                        }
                        else
                        {
                            roleEquipRedDict[key].state = RedPointState.None;
                        }
                        break;
                    case RoleEquipType.Wing:
                        if (PlayerDatas.Instance.baseData.LV >= wingsRedpointLvlimt && !TryGetRoleEquipLocalSave(key)
                          && item == null)
                        {
                            roleEquipRedDict[key].state = RedPointState.Simple;
                        }
                        else
                        {
                            roleEquipRedDict[key].state = RedPointState.None;
                        }
                        break;
                    default:
                        roleEquipRedDict[key].state = RedPointState.None;
                        break;
                }
            }
        }

        private bool TryGetRoleEquipLocalSave(int equipPlace)
        {
            if (LocalSavePlaceArray != null)
            {
                for (int i = 0; i < LocalSavePlaceArray.Count; i++)
                {
                    if (equipPlace == 9 || equipPlace == 10)
                    {
                        if (LocalSavePlaceArray[i] == 9 || LocalSavePlaceArray[i] == 10)
                        {
                            return true;
                        }
                    }
                    else
                    {
                        if (LocalSavePlaceArray[i] == equipPlace)
                        {
                            return true;
                        }
                    }

                }
            }
            return false;
        }

        const int ITEMPACK_REDKEY = 102011003;
        Redpoint redpointItemPack = new Redpoint(MainRedDot.RedPoint_BagFuncKey, ITEMPACK_REDKEY);
@@ -1082,119 +833,6 @@

        const int PLAYERSUMSTAR_REDKEY = 102011002;
        Redpoint redpointSTAR = new Redpoint(MainRedDot.RedPoint_BagFuncKey, PLAYERSUMSTAR_REDKEY);

        public event Action<int, bool> RefreshAttrActiveAct;
        public void SetPlayerAttrActiveRedPoint()
        {
            if (IsActiveStarAttr())
            {
                if (redpointSTAR.state != RedPointState.Simple)
                {
                    redpointSTAR.state = RedPointState.Simple;
                    if (RefreshAttrActiveAct != null)
                    {
                        RefreshAttrActiveAct(1, true);
                    }
                }
            }
            else
            {
                if (redpointSTAR.state != RedPointState.None)
                {
                    redpointSTAR.state = RedPointState.None;
                    if (RefreshAttrActiveAct != null)
                    {
                        RefreshAttrActiveAct(1, false);
                    }
                }
            }
        }

        public bool IsActiveStarAttr()
        {
            List<int> starslist = RoleEquipStarsConfig.GetEquipStarsCntlist();
            SinglePack singlePack = GetSinglePack(PackType.Equip);
            if (singlePack == null || starslist == null || starslist.Count < 1) return false;

            Dictionary<int, ItemModel> _itemDict = singlePack.GetAllItems();
            int playerSumStars = 0;
            foreach (var model in _itemDict.Values)
            {
                playerSumStars += model.config.StarLevel;
            }
            int cnt = GetActiveCntByType(1);
            int nextActiveStars = 0;
            for (int i = 0; i < starslist.Count; i++)
            {
                if (cnt == 0)
                {
                    nextActiveStars = starslist[0];
                    break;
                }
                else
                {
                    if (starslist[i] == cnt)
                    {
                        if (i < starslist.Count - 1)
                        {
                            nextActiveStars = starslist[i + 1];
                        }
                        break;
                    }
                }
            }

            if (nextActiveStars != 0 && playerSumStars >= nextActiveStars)
            {
                return true;
            }

            return false;
        }

        public bool IsActiveSTRAttr()
        {
            List<string> strenlist = ItemPlusSumAttrConfig.GetKeys();
            if (strenlist == null || strenlist.Count < 1) return false;
            int playerSumSTR = 0;
            //Dictionary<int, EquipmentInitialization> strenInfoDict = ModelCenter.Instance.GetModel<StrengthenModel>()._EqInfo;
            //foreach (var value in strenInfoDict.Values)
            //{
            //    ItemModel itemModel = GetItemByIndex(PackType.Equip, value.EquipIndex);
            //    if (itemModel != null)
            //    {
            //        playerSumSTR += value.EquipPartStarLV;
            //    }
            //}
            int cnt = GetActiveCntByType(0);
            int nextActiveSTR = 0;
            for (int i = 0; i < strenlist.Count; i++)
            {
                if (cnt == 0)
                {
                    nextActiveSTR = int.Parse(strenlist[0]);
                    break;
                }
                else
                {
                    if (int.Parse(strenlist[i]) == cnt)
                    {
                        if (i < strenlist.Count - 1)
                        {
                            nextActiveSTR = int.Parse(strenlist[i + 1]);
                        }
                        break;
                    }
                }
            }

            if (nextActiveSTR != 0 && playerSumSTR >= nextActiveSTR)
            {
                return true;
            }

            return false;
        }

        public const int EquipDecompose_RedKey = 10205;
        public Redpoint redpointEquipDecom = new Redpoint(MainRedDot.RedPoint_MainPackKey, EquipDecompose_RedKey);
@@ -1238,7 +876,6 @@
            {
                lookEquipEvent();
            }

        }

        public event Action RefreshBagEvent;
@@ -1380,7 +1017,6 @@
                {
                    count = (ulong)remainDayCnt;
                }

            }

            int remainSumCnt = 0;
@@ -1651,7 +1287,7 @@
        public bool IsMaxDecomLv(int decomLv, out int realLv)
        {
            realLv = decomLv;
            List<EquipDeComposeConfig> decomlist = EquipDeComposeConfig.GetValues();
            var decomlist = EquipDeComposeConfig.GetValues();
            if (decomLv > decomlist[decomlist.Count - 1].LV)
            {
                realLv = decomlist[decomlist.Count - 1].LV;
@@ -1660,7 +1296,6 @@

            return false;
        }


        public List<ItemModel> selectDevourlist = new List<ItemModel>();
        public void GetSelectDevourList()
@@ -1779,8 +1414,8 @@

        public void SendEquipDevourRecordQuest()
        {
            string record = StringUtility.Contact((int)colorType + 1, (int)lvType + 1, (int)starType + 1);
            CA32D_tagCMDecomposeSeting decomSet = new CA32D_tagCMDecomposeSeting();
            var record = StringUtility.Contact((int)colorType + 1, (int)lvType + 1, (int)starType + 1);
            var decomSet = new CA32D_tagCMDecomposeSeting();
            decomSet.Seting = uint.Parse(record);
            GameNetSystem.Instance.SendInfo(decomSet);
        }
@@ -1807,7 +1442,7 @@
            {
                for (int i = decomposeLv; i <= realLv; i++)
                {
                    EquipDeComposeConfig deComposeConfig = EquipDeComposeConfig.Get(i);
                    var deComposeConfig = EquipDeComposeConfig.Get(i);
                    if (i == decomposeLv)
                    {
                        addDecomposeExp = deComposeConfig.UpNeedExp - decomposeExp;

 System/KnapSack/Logic/PlayerStarNumWin.cs

File was deleted

 System/KnapSack/Logic/PlayerStarNumWin.cs.meta

File was deleted

 System/KnapSack/New/KnapSackWin.cs

@@ -49,11 +49,7 @@


        #endregion



        PackModel _playerPack;

        PackModel playerPack {

            get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); }

        }



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

        public static KnapsackFuncTitle titleType = KnapsackFuncTitle.bag;



        #region Built-in

@@ -144,20 +140,17 @@


        private void OnClickOrnamentTitle()

        {



            playerPack.SetLookIndex(null);

            playerPack.isPlayBetterEquipEffect = false;

            functionOrder = _ornamentTitle.order;



        }



        private void OnClickBagTitle()

        {

            CloseSubWindows();

            titleType = KnapsackFuncTitle.bag;



            WindowCenter.Instance.Open<BagWin>();

            WindowCenter.Instance.Open<RoleEquipWin>();

            WindowCenter.Instance.Open<BagWin>();

            functionOrder = _bagTitle.order;

        }




 System/MainInterfacePanel/PlayerMainDate.cs

@@ -104,9 +104,6 @@
    {

        WindowCenter.Instance.Get<MainInterfaceWin>().IsShowButtonGroup();

    }

    //-----是否在自动强化中

    public bool StrengthegingBool = false;//是否再自动强化中

    public int StrengthegingAddFight = 0;//存取需要添加的战斗力值

    // --用于任务仙玉不足购买飞鞋

    public bool IsFlyShoseBool = false;

    public int FlyShoseTaskID = 0;

@@ -296,8 +293,6 @@
    {

        FlyShoseTaskID = 0;

        IsFlyShoseBool = false;

        StrengthegingAddFight = 0;

        StrengthegingBool = false;

        IsTipBool = true;

        prowNum = 0;

        ProwNumAdd = 0;

@@ -387,19 +382,12 @@
            if (power > prowNum)

            {

                ProwNumAdd = power - prowNum;

                if (StrengthegingBool || StrengthegingAddFight != 0)

                {

                    StrengthegingAddFight += ProwNumAdd;

                }

                prowNum = power;

                if (!StrengthegingBool && StrengthegingAddFight == 0)

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

                {

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

                    {

                        WindowCenter.Instance.Close<PowerAddWin>();

                    }

                    WindowCenter.Instance.Open<PowerAddWin>();

                    WindowCenter.Instance.CloseImmediately("PowerAddWin");

                }

                WindowCenter.Instance.Open<PowerAddWin>();



            }

            else

@@ -407,18 +395,6 @@
                prowNum = power;

            }

        }

    }



    IEnumerator LoadingIE()

    {

        yield return new WaitForSeconds(0.5f);

        ProwNumAdd = StrengthegingAddFight;

        StrengthegingAddFight = 0;

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

        {

            WindowCenter.Instance.Close<PowerAddWin>();

        }

        WindowCenter.Instance.Open<PowerAddWin>();

    }



    public void FabaoPowerAdd(int power)


 System/Realm/RealmAnimationBehaviour.cs

@@ -20,6 +20,7 @@


        [SerializeField, Header("小境界升级特效时长")] float m_NormalLevelUpEffectTime = 1.5f;

        [SerializeField, Header("大境界升级特效时长")] float m_SpecialLevelUpEffectTime = 4.5f;

        [SerializeField, Header("Boss特效时长")] float m_BossEffectTime = 2f;



        Coroutine m_RotateCoroutine = null;



@@ -29,6 +30,7 @@


        public event Action onRotateComplete;

        public event Action onLevelUpComplete;

        public event Action onBossAppearComplete;



        RealmModel model { get { return ModelCenter.Instance.GetModel<RealmModel>(); } }



@@ -160,6 +162,13 @@
                        obj.gameObject.SetActive(false);

                    }

                }



                yield return WaitingForSecondConst.GetWaitForSeconds(m_BossEffectTime);

                if (onBossAppearComplete != null)

                {

                    onBossAppearComplete();

                }

                yield return WaitingForSecondConst.GetWaitForSeconds(Mathf.Max(0f, 3.1f - m_BossEffectTime));

            }



            if (onLevelUpComplete != null)


 System/Realm/RealmBossShow.cs

@@ -115,17 +115,13 @@
        {

            var _job = PlayerDatas.Instance.baseData.Job;

            #region 装备

            var clothes = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Clothes);

            var _clothesId = clothes == null ? 0 : (int)clothes.itemId;

            var appearance = ModelCenter.Instance.GetModel<EquipModel>().GetAppearance();



            var secondary = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Weapon2);

            var _secondaryId = secondary == null ? 0 : (int)secondary.itemId;

            var _clothesId = appearance.clothes;

            var _secondaryId = appearance.secondary;



            var fashionClothes = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.FashionClothes);

            var fashionClothesId = fashionClothes == null ? 0 : (int)fashionClothes.itemId;



            var fashionSecondary = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.FashionWeapon2);

            var fashionSecondaryId = fashionSecondary == null ? 0 : (int)fashionSecondary.itemId;

            var fashionClothesId = appearance.fashionClothes;

            var fashionSecondaryId = appearance.fashionSecondary;

            #endregion



            showPoint = m_HeroStage;


 System/Realm/RealmWin.cs

@@ -96,6 +96,7 @@
            model.selectRealmRefresh += SelectRealmRefresh;

            m_RealmAnimation.onRotateComplete += OnRotateComplete;

            m_RealmAnimation.onLevelUpComplete += OnLevelUpComplete;

            m_RealmAnimation.onBossAppearComplete += OnBossAppearComplete;



            cacheRealmLevel = PlayerDatas.Instance.baseData.realmLevel;

        }

@@ -129,6 +130,7 @@
            model.selectRealmRefresh -= SelectRealmRefresh;

            m_RealmAnimation.onRotateComplete -= OnRotateComplete;

            m_RealmAnimation.onLevelUpComplete -= OnLevelUpComplete;

            m_RealmAnimation.onBossAppearComplete -= OnBossAppearComplete;



            HideRealmUp();

        }

@@ -419,6 +421,11 @@
            }

        }



        public void OnBossAppearComplete()

        {

            m_GotoBoss.gameObject.SetActive(true);

        }



        private void SelectRealmRefresh()

        {

            DisplayRealmBrief();


 System/RoleParticulars/ViewFuncCell.cs

@@ -133,7 +133,8 @@
                            {

                                targetCompareTxt.text = string.Format(viewRoleFuncModel.compareTip, Language.Get("RoleParticularWin_7"));

                            }

                            ItemModel itemModel = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Wing);

                            var equipPlace = EquipPlaceMapConfig.GetServerPlace(0, (int)RoleEquipType.Wing);

                            var itemModel = playerPack.GetItemByIndex(PackType.Equip, equipPlace);

                            if (itemModel != null)

                            {

                                ItemConfig _tagChinItemModel = ItemConfig.Get((int)itemModel.itemId);


 System/Treasure/TreasureSoulPattern4.cs

@@ -60,7 +60,8 @@
                    break;

                case TreasurePrivilege.Wing:

                    var percentWing = (float)special.propertyDict[86] / 10000;

                    var itemModel = pack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Wing);

                    var equipPlace = EquipPlaceMapConfig.GetServerPlace(0, (int)RoleEquipType.Wing);

                    var itemModel = pack.GetItemByIndex(PackType.Equip, equipPlace);

                    m_ContainerHas.gameObject.SetActive(itemModel != null);

                    m_ContainerNone.gameObject.SetActive(itemModel == null);

                    if (itemModel != null)


 System/Treasure/TreasureSoulWin.cs

@@ -328,7 +328,8 @@
                    break;

                case TreasurePrivilege.Wing:

                    var percentWing = (float)special.propertyDict[86] / 10000;

                    var itemModel = pack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Wing);

                    var equipPlace = EquipPlaceMapConfig.GetServerPlace(0, (int)RoleEquipType.Wing);

                    var itemModel = pack.GetItemByIndex(PackType.Equip, equipPlace);

                    m_ContainerPreview.gameObject.SetActive(itemModel != null);

                    if (itemModel != null)

                    {


 UI/Common/UI3DHeroSkillShow.cs

@@ -91,26 +91,15 @@
            var _job = PlayerDatas.Instance.baseData.Job;



            #region 装备

            var clothes = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Clothes);

            var _clothesId = clothes == null ? 0 : (int)clothes.itemId;

            var appearance = ModelCenter.Instance.GetModel<EquipModel>().GetAppearance();



            var weapon = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Weapon);

            var _weaponId = weapon == null ? 0 : (int)weapon.itemId;



            var wings = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Wing);

            var _wingsId = wings == null ? 0 : (int)wings.itemId;



            var secondary = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.Weapon2);

            var _secondaryId = secondary == null ? 0 : (int)secondary.itemId;



            var fashionClothes = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.FashionClothes);

            var fashionClothesId = fashionClothes == null ? 0 : (int)fashionClothes.itemId;



            var fashionWeapon = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.FashionWeapon);

            var fashionWeaponId = fashionWeapon == null ? 0 : (int)fashionWeapon.itemId;



            var fashionSecondary = playerPack.GetItemByIndex(PackType.Equip, (int)RoleEquipType.FashionWeapon2);

            var fashionSecondaryId = fashionSecondary == null ? 0 : (int)fashionSecondary.itemId;

            var _clothesId = appearance.clothes;

            var _wingsId = appearance.wings;

            var _secondaryId = appearance.secondary;

            var _weaponId = appearance.weapon;

            var fashionClothesId = appearance.fashionClothes;

            var fashionWeaponId = appearance.fashionWeapon;

            var fashionSecondaryId = appearance.fashionSecondary;



            int _suitLevel = 0;

            #endregion