From 37fe958376a003a36154bf9e4b456397f5c254b1 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 12 四月 2019 19:46:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/FindPrecious/FindPreciousBossRebornBehaviour.cs | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/System/FindPrecious/FindPreciousBossRebornBehaviour.cs b/System/FindPrecious/FindPreciousBossRebornBehaviour.cs
index 911d58a..84117ad 100644
--- a/System/FindPrecious/FindPreciousBossRebornBehaviour.cs
+++ b/System/FindPrecious/FindPreciousBossRebornBehaviour.cs
@@ -24,12 +24,10 @@
[SerializeField] Button m_Close;
float timer = 0f;
- MapModel mapModel { get { return ModelCenter.Instance.GetModel<MapModel>(); } }
FindPreciousModel model { get { return ModelCenter.Instance.GetModel<FindPreciousModel>(); } }
DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
DemonJarModel demonJarModel { get { return ModelCenter.Instance.GetModel<DemonJarModel>(); } }
BossHomeModel bossHomeModel { get { return ModelCenter.Instance.GetModel<BossHomeModel>(); } }
- DogzDungeonModel dogzDungeonModel { get { return ModelCenter.Instance.GetModel<DogzDungeonModel>(); } }
CrossServerBossModel crossServerBossModel { get { return ModelCenter.Instance.GetModel<CrossServerBossModel>(); } }
private void OnEnable()
@@ -85,7 +83,6 @@
if (model.currentBossNotify != default(FindPreciousModel.BossNotify))
{
var bossId = model.currentBossNotify.bossId;
- var type = model.GetBossFindPreciousType(bossId);
m_ContainerBossReborn.gameObject.SetActive(true);
var config = NPCConfig.Get(bossId);
@@ -104,7 +101,6 @@
private void GotoKillBoss()
{
- var mapId = PlayerDatas.Instance.baseData.MapID;
var bossId = model.currentBossNotify.bossId;
var type = model.GetBossFindPreciousType(bossId);
@@ -158,10 +154,9 @@
if (mapConfig.MapFBType == (int)MapType.OpenCountry)
{
WindowCenter.Instance.Close<MainInterfaceWin>();
- var demonJarModel = ModelCenter.Instance.GetModel<DemonJarModel>();
demonJarModel.selectedBoss = _bossId;
demonJarModel.lockSelectedBoss = true;
- WindowCenter.Instance.Open<LootPreciousFrameWin>(false, 0);
+ WindowCenter.Instance.Open<FindPreciousFrameWin>(false, 3);
}
else
{
--
Gitblit v1.8.0