From 8ebdcb8980b7a630beb6a1ff82381baa0ab2ddb5 Mon Sep 17 00:00:00 2001
From: client_Lhy <995049470@qq.com>
Date: 星期四, 04 七月 2019 13:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into LuaOrgan
---
System/WindowJump/WindowJumpMgr.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index 572ef0c..693c81f 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/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,
--
Gitblit v1.8.0