From 2d0858f1625caa403fafce227b64fff029eb8cbe Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 17 七月 2019 20:26:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into equipstar
---
System/MainInterfacePanel/HeadPortraitTip.cs | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/System/MainInterfacePanel/HeadPortraitTip.cs b/System/MainInterfacePanel/HeadPortraitTip.cs
index 27b5a92..133e06c 100644
--- a/System/MainInterfacePanel/HeadPortraitTip.cs
+++ b/System/MainInterfacePanel/HeadPortraitTip.cs
@@ -286,7 +286,18 @@
return;
}
WindowCenter.Instance.Close<MainInterfaceWin>();
- WindowCenter.Instance.Open<VipRechargeWin>(false, 1);
+ if (ModelCenter.Instance.GetModel<VipModel>().vipRedpoint.state == RedPointState.Simple)
+ {
+ WindowCenter.Instance.Open<VipRechargeWin>(false, 1);
+ }
+ else if(ModelCenter.Instance.GetModel<AddUpRechargeModel>().redpoint.state == RedPointState.Simple)
+ {
+ WindowCenter.Instance.Open<VipRechargeWin>(false, 2);
+ }
+ else
+ {
+ WindowCenter.Instance.Open<VipRechargeWin>(false, 1);
+ }
}
void HeadButton()
--
Gitblit v1.8.0