Merge remote-tracking branch 'origin/master' into LuaOrgan

client_Lhy

2019-07-04 8ebdcb8980b7a630beb6a1ff82381baa0ab2ddb5

 System/WindowJump/WindowJumpMgr.cs

@@ -798,8 +798,6 @@
            case JumpUIType.UnionFunc2:

            case JumpUIType.UnionWarehouse:

            case JumpUIType.UnionHall:

            case JumpUIType.UnionTask:

            case JumpUIType.UnionTask2:

            case JumpUIType.UnionActive1:

            case JumpUIType.UnionActive2:

                if (!PlayerDatas.Instance.fairyData.HasFairy)

@@ -1427,6 +1425,8 @@
/// <summary>

/// 规则是每个系统对应标签页顺序

/// </summary>

/// 
[XLua.LuaCallCSharp]

public enum JumpUIType

{

    None = 0,