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

client_linchunjie

2019-03-26 dccf31d0452ff74a8630703a0e367226421ef062

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

 System/Equip/EquipFrameWin.cs

@@ -24,8 +24,6 @@
        [SerializeField] Button m_Last;
        [SerializeField] Button m_Next;

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

        #region Built-in
        protected override void BindController()
        {

 System/ItemTip/EquipTipUtility.cs

@@ -643,8 +643,8 @@
                    }
                    else
                    {
                        operates.Add(ItemOperateType.putOn);
                        operates.Add(ItemOperateType.sell);
                        operates.Add(ItemOperateType.putOn);
                    }
                    break;
            }

 System/KnapSack/Logic/ItemOperateUtility.cs

@@ -735,12 +735,12 @@
            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);
            WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.StrengthFunc2);
        }

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

        public void GotoTrain(string guid)

 System/WindowJump/WindowJumpMgr.cs

@@ -1407,10 +1407,10 @@
    SkillFunc2 = 10,

    SkillFunc2Type2 = 243, //被动技能界面

    SkillFunc3 = 11,

    StrengthFunc1 = 12,

    StrengthFunc2 = 13,

    StrengthFunc3 = 14,

    StrengthFunc4 = 15,

    StrengthFunc1 = 12,//强化

    StrengthFunc2 = 13,//升星

    StrengthFunc3 = 14,//镶嵌

    StrengthFunc4 = 15,//洗炼

    EquipLowSuit = 241, //普通套装界面

    StrengthFunc5 = 16,

    EquipWashType2 = 239, //装备洗练界面