From eedeb8a020fce13e0e63ad7c57adfdff7578e875 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 14 三月 2019 21:05:23 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/PlayerDead/PlayerDeadModel.cs | 20 ++++----------------
1 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/System/PlayerDead/PlayerDeadModel.cs b/System/PlayerDead/PlayerDeadModel.cs
index e1fee56..1bc9011 100644
--- a/System/PlayerDead/PlayerDeadModel.cs
+++ b/System/PlayerDead/PlayerDeadModel.cs
@@ -78,21 +78,9 @@
}
}
- DungeonModel _dungeonModel;
- DungeonModel dungeonModel {
- get { return _dungeonModel ?? (_dungeonModel = ModelCenter.Instance.GetModel<DungeonModel>()); }
- }
-
- StoreModel _storeModel;
- StoreModel m_storeModel {
- get { return _storeModel ?? (_storeModel = ModelCenter.Instance.GetModel<StoreModel>()); }
- }
-
- PackModel _playerPack;
- PackModel playerPack {
- get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); }
- }
-
+ DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
+ StoreModel m_storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }
+ PackModel playerPack { get { return ModelCenter.Instance.GetModel<PackModel>(); } }
ActivityModel activityModel { get { return ModelCenter.Instance.GetModel<ActivityModel>(); } }
private DungeonOpenTimeConfig _dungeonOpenTimeModel;
@@ -317,7 +305,7 @@
public bool IsCanInplaceReborn(int rebornPrice)
{
- playerCoins = (int)PlayerDatas.Instance.baseData.diamond + (int)PlayerDatas.Instance.baseData.bindDiamond;
+ playerCoins = (int)PlayerDatas.Instance.baseData.diamond;
if (playerCoins >= rebornPrice)
return true;
else
--
Gitblit v1.8.0