From 1251ec5ab76e063af69fbd891e7facab6b39b520 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 28 十一月 2018 10:46:48 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/MainInterfaceWin.cs | 2 +-
System/OpenServerActivity/MysticalPurchaseModel.cs | 1 +
System/OpenServerActivity/MysticalPurchaseSaleItem.cs | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index fa4f5b9..f5cc293 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -705,7 +705,7 @@
private void ClickDungeonAssist()
{
- WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.DungeonAssitCheckIn);
+ WindowCenter.Instance.Open<DungeonAssistWin>();
}
private void UpdateDungeonAssistImag()
diff --git a/System/OpenServerActivity/MysticalPurchaseModel.cs b/System/OpenServerActivity/MysticalPurchaseModel.cs
index a859dcc..b61dfe2 100644
--- a/System/OpenServerActivity/MysticalPurchaseModel.cs
+++ b/System/OpenServerActivity/MysticalPurchaseModel.cs
@@ -35,6 +35,7 @@
isLogin = false;
GlobalTimeEvent.Instance.halfMinuteEvent += UpdateSecond;
storeModel.RefreshBuyShopLimitEvent += UpdateBuyTimes;
+ UpdateRedpoint();
}
public override void UnInit()
diff --git a/System/OpenServerActivity/MysticalPurchaseSaleItem.cs b/System/OpenServerActivity/MysticalPurchaseSaleItem.cs
index 185bde6..54e51f6 100644
--- a/System/OpenServerActivity/MysticalPurchaseSaleItem.cs
+++ b/System/OpenServerActivity/MysticalPurchaseSaleItem.cs
@@ -46,7 +46,7 @@
int remianTime = mysticalShop.GetRemainSellTime();
saleTime.text = Language.Get("MysticalPurchase101", TimeUtility.SecondsToHMS(remianTime));
float zhe = ((float)mysticalShop.storeConfig.MoneyNumber / mysticalShop.storeConfig.MoneyOriginal) * 10;
- zheText.text = Language.Get("MysticalPurchase102", Math.Round(zhe, 1));
+ zheText.text = Language.Get("MysticalPurchase102", (float)Math.Round(zhe, 1));
var items = storeModel.GetShopItemlistByIndex(mysticalShop.storeConfig);
for(int i = 0; i < itemBaiscs.Count; i++)
{
--
Gitblit v1.8.0