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

client_linchunjie

2019-04-18 007bfdb84aa18f1d3a9688d2ad70f840d2254d28

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

 System/ItemTip/EquipTipUtility.cs

@@ -116,7 +116,8 @@
        static EquipTrainModel trainModel { get { return ModelCenter.Instance.GetModel<EquipTrainModel>(); } }
        static EquipStrengthModel strengthenModel { get { return ModelCenter.Instance.GetModel<EquipStrengthModel>(); } }
        static MountModel mountModel { get { return ModelCenter.Instance.GetModel<MountModel>(); } }
        static PetModel perModel { get { return ModelCenter.Instance.GetModel<PetModel>(); } }
        static PetModel petModel { get { return ModelCenter.Instance.GetModel<PetModel>(); } }
        static ComposeWinModel composeModel { get { return ModelCenter.Instance.GetModel<ComposeWinModel>(); } }

        public static TipType tipType { get; private set; }
        public static TipData mainTipData { get; private set; }
@@ -373,6 +374,15 @@
                case ItemOperateType.split:
                    ItemOperateUtility.Instance.OnClickSplitBtn(guid);
                    break;
                case ItemOperateType.compose:
                    var wannaComposeItem = packModel.GetItemByGuid(guid);
                    var jumpId = 0;
                    var isUnlock = composeModel.CheckComposeItemById(wannaComposeItem.itemId, out jumpId);
                    if (isUnlock)
                    {
                        ItemOperateUtility.Instance.GotoComposeItem(jumpId);
                    }
                    break;
            }
        }

@@ -499,7 +509,7 @@
            {
                case 26:
                    var petId = PetInfoConfig.GetItemUnLockPet(itemId);
                    properties = perModel.GetPetAttrAddDict(petId);
                    properties = petModel.GetPetAttrAddDict(petId);
                    break;
                case 41:
                case 42:
@@ -892,6 +902,15 @@
                operates.Add(ItemOperateType.inlay);
            }

            if (!config.JumpComposeCondi.IsNullOrEmpty())
            {
                var jumpId = 0;
                if (composeModel.CheckComposeItemById(itemId, out jumpId))
                {
                    operates.Add(ItemOperateType.compose);
                }
            }

            return operates;
        }


 System/ItemTip/ItemTipWin.cs

@@ -200,6 +200,9 @@
                    case ItemOperateType.putIn:
                        this.m_Title.text = "放入";
                        break;
                    case ItemOperateType.compose:
                        this.m_Title.text = "合成";
                        break;
                    default:
                        this.m_Title.text = "";
                        break;

 System/ItemTip/PetMountTipWin.cs

@@ -232,7 +232,7 @@

                m_Button.SetListener(() =>
                {
                    WindowCenter.Instance.Close<ItemTipWin>();
                    WindowCenter.Instance.Close<PetMountTipWin>();
                    EquipTipUtility.Operate(operateType, this.guid);
                });
            }

 System/WindowBase/WindowCenter.cs

@@ -77,6 +77,11 @@
            }

        }



        public WindowType GetWindowType(string name)

        {

            return windows.GetWindowType(name);

        }



        public void OpenFromLocal<T>() where T : Window

        {

            var command = new OpenCommand()

@@ -768,6 +773,18 @@
                windowKeys.Remove(key);

            }



            public WindowType GetWindowType(string key)

            {

                if (windows.ContainsKey(key))

                {

                    return windows[key].windowInfo.windowType;

                }

                else

                {

                    return WindowType.Flag;

                }

            }



        }



    }


 System/WindowJump/WindowJumpMgr.cs

@@ -80,6 +80,12 @@
        for (int i = 0; i < windowKeys.Count; i++)

        {

            var key = windowKeys[i];

            var type = WindowCenter.Instance.GetWindowType(key);

            if (type >= WindowType.Tip && type <= WindowType.Loading)

            {

                continue;

            }



            if (WindowCenter.Instance.IsOpen(key) && key != "NewBieWin")

            {

                if (!openWindows.ContainsKey(jumpPhase))


 Utility/EnumHelper.cs

@@ -139,6 +139,8 @@
    Tip = 3,

    System = 4,

    Loading = 5,



    Flag=99,

}



public enum GestureType