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

client_Zxw

2019-03-21 ee647b2fc49e24d5edc8722079746fa0df7d7a2c

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

 System/EquipStar/EquipStarWin.cs

@@ -46,7 +46,10 @@

        protected override void OnPreOpen()
        {
            model.SelectLevel(equipModel.GetLastestUnLockEquipSet());
            if (model.selectedLevel.value == 0)
            {
                model.SelectLevel(equipModel.GetLastestUnLockEquipSet());
            }

            DisplayBaseInfo();
            DisplayDynamicInfo(true);

 System/EquipTrain/EquipTrainWin.cs

@@ -57,7 +57,10 @@

        protected override void OnPreOpen()
        {

            if ( model.selectedLevel.value==0)
            {
                model.SelectLevel(equipModel.GetLastestUnLockEquipSet());
            }
        }

        protected override void OnAfterOpen()
@@ -77,7 +80,7 @@
        protected override void OnActived()
        {
            base.OnActived();
            model.SelectLevel(equipModel.GetLastestUnLockEquipSet());

            DisplayBaseInfo();
            DisplayDynamicInfo(true);
        }

 System/ItemTip/EquipTipUtility.cs

@@ -243,6 +243,16 @@
                    break;
                case ItemOperateType.sell:
                    break;
                case ItemOperateType.strength:
                    break;
                case ItemOperateType.star:
                    ItemOperateUtility.Instance.GotoStarUpgrade(guid);
                    break;
                case ItemOperateType.inlay:
                    break;
                case ItemOperateType.train:
                    ItemOperateUtility.Instance.GotoTrain(guid);
                    break;
            }
        }

@@ -377,7 +387,7 @@
                return default(SuitInfo);
            }

            var job = config.JobLimit ;
            var job = config.JobLimit;
            var twoConfigs = EquipSuitConfig.GetConfigs(job, config.LV, EquipSuitType.TwoSuit);

            var name = twoConfigs[0].name;
@@ -409,7 +419,7 @@
                return default(SuitInfo);
            }

            var job = config.JobLimit ;
            var job = config.JobLimit;
            var twoConfigs = EquipSuitConfig.GetConfigs(job, config.LV, EquipSuitType.TwoSuit);

            var name = twoConfigs[0].name;
@@ -604,6 +614,19 @@
            {
                case PackType.Equip:
                    operates.Add(ItemOperateType.putOff);

                    if (FuncOpen.Instance.IsFuncOpen(1))
                    {
                        operates.Add(ItemOperateType.strength);
                    }

                    operates.Add(ItemOperateType.star);
                    if (FuncOpen.Instance.IsFuncOpen(1))
                    {
                        operates.Add(ItemOperateType.inlay);
                    }

                    operates.Add(ItemOperateType.train);
                    break;
                default:
                    if (item.isAuction)

 System/ItemTip/EquipTipWin.cs

@@ -256,6 +256,18 @@
                    case ItemOperateType.putAway:
                        this.title.text = "上架";
                        break;
                    case ItemOperateType.strength:
                        this.title.text = "强化";
                        break;
                    case ItemOperateType.star:
                        this.title.text = "升星";
                        break;
                    case ItemOperateType.inlay:
                        this.title.text = "镶嵌";
                        break;
                    case ItemOperateType.train:
                        this.title.text = "洗炼";
                        break;
                    default:
                        this.title.text = "";
                        break;

 System/KnapSack/Logic/ItemOperateUtility.cs

@@ -711,18 +711,46 @@
        }
        #endregion

        #region 镶嵌
        #region 养成
        public void GotoInlayItem(string guid)
        {
            var model = packModel.GetItemByGuid(guid);
            var packType = GeneralDefine.GetPackTypeByItemType(model.config.Type);
            switch (packType)
            {
                default:
                    WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.StrengthFunc2);
                    break;
            }
            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.StrengthFunc3);
        }

        public void GotoStarUpgrade(string guid)
        {
            var item = packModel.GetItemByGuid(guid);
            if (item == null)
            {
                return;
            }

            var equipStarModel = ModelCenter.Instance.GetModel<EquipStarModel>();
            equipStarModel.SelectLevel(item.config.LV);
            equipStarModel.SelectPlace(new Int2(item.config.LV, item.config.EquipPlace));
            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.StrengthFunc1);
        }

        public void GotoStrengthen(string guid)
        {
            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.StrengthFunc2);
        }

        public void GotoTrain(string guid)
        {
            var item = packModel.GetItemByGuid(guid);
            if (item == null)
            {
                return;
            }

            var trainModel = ModelCenter.Instance.GetModel<EquipTrainModel>();
            trainModel.SelectLevel(item.config.LV);
            trainModel.SelectPlace(new Int2(item.config.LV, item.config.EquipPlace));
            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.StrengthFunc4);
        }

        #endregion

        #region 合成

 Utility/EnumHelper.cs

@@ -1307,23 +1307,25 @@
    dismantle, //拆解合成装备

    split, //拆分

    putAway,//上架

    inlay, //镶嵌

    compose,//合成

    sell, //出售

    putOff, //脱下

    putIn, //放入

    putOut, //取出

    exchange,//兑换

    donate, //捐献

    buy,//购买

    putItemout,//物品下架

    renewal,//续费

    strength, //强化

    refine, //精炼

    LevelUp,//升级

    Resolve,//分解

    Wear,//佩戴

    Replace,//替换



    strength, //强化

    inlay, //镶嵌

    train,//洗练

    star,//升星

}



public enum ItemWinType