From 0780d6f78efd25030fdbb0701a14d43d73a0ebe2 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 21 三月 2019 09:50:03 +0800
Subject: [PATCH] Merge branch 'master' into Rune
---
System/Auction/AuctionHelpModel.cs | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/System/Auction/AuctionHelpModel.cs b/System/Auction/AuctionHelpModel.cs
index a1add02..e9260eb 100644
--- a/System/Auction/AuctionHelpModel.cs
+++ b/System/Auction/AuctionHelpModel.cs
@@ -48,6 +48,12 @@
get { return wait; }
set { wait = value; }
}
+ public bool isOpenPanel = true;
+ public bool IsOpenPanel
+ {
+ get { return isOpenPanel; }
+ set { isOpenPanel = value; }
+ }
public override void Init()
{
var AuctionTaxrateConfig = FuncConfigConfig.Get("AuctionTaxrate");
@@ -186,6 +192,10 @@
bool isBool = false;
string equipGuid = string.Empty;
var equipSet = equipModel.GetEquipSet(equipLevel);
+ if (equipSet == null)
+ {
+ return false;
+ }
equipGuid = equipSet.GetEquip(equipPlace);
isBool = !string.IsNullOrEmpty(equipGuid);
return isBool;
--
Gitblit v1.8.0