From aabbfee8c149cd91c8a5c9ebd5578706da6817be Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期六, 29 六月 2019 14:01:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dogz/DogzPackWin.cs | 2 +-
System/WindowJump/WindowJumpMgr.cs | 3 ---
Core/GameEngine/Model/Player/Fairy/PlayerFairyData.cs | 6 ++++++
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Core/GameEngine/Model/Player/Fairy/PlayerFairyData.cs b/Core/GameEngine/Model/Player/Fairy/PlayerFairyData.cs
index 8fff9be..4bf6148 100644
--- a/Core/GameEngine/Model/Player/Fairy/PlayerFairyData.cs
+++ b/Core/GameEngine/Model/Player/Fairy/PlayerFairyData.cs
@@ -22,6 +22,7 @@
{
get { return _storeModel ?? (_storeModel = ModelCenter.Instance.GetModel<StoreModel>()); }
}
+
public FairyData fairy = null;
public FairyMember mine = null;
public event Action OnRefreshFairyInfo;
@@ -260,6 +261,11 @@
{
if (vNetData.FamilyNameLen > 0)
{
+ if (fairy == null)
+ {
+ fairy = new FairyData();
+ }
+
if (mine != null)
{
mine.FamilyLV = vNetData.FamilyMemberLV;
diff --git a/System/Dogz/DogzPackWin.cs b/System/Dogz/DogzPackWin.cs
index e26a1be..de79c35 100644
--- a/System/Dogz/DogzPackWin.cs
+++ b/System/Dogz/DogzPackWin.cs
@@ -261,7 +261,7 @@
private void GetEquipBtn()
{
//--鐣岄潰璺宠浆
- WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.DogzDungeon);
+ WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.CrossServerBoss);
}
diff --git a/System/WindowJump/WindowJumpMgr.cs b/System/WindowJump/WindowJumpMgr.cs
index 6225d7f..88952a1 100644
--- a/System/WindowJump/WindowJumpMgr.cs
+++ b/System/WindowJump/WindowJumpMgr.cs
@@ -390,12 +390,10 @@
case JumpUIType.JadeDynastyBoss290:
SetJumpLogic<FindPreciousFrameWin>(_tagWinSearchModel.TABID);
break;
- case JumpUIType.DogzDungeon:
case JumpUIType.FairyGrabBoss:
SetJumpLogic<LootPreciousFrameWin>(_tagWinSearchModel.TABID);
break;
case JumpUIType.LootPreciousFrameSpec:
- DemonJarWin.guideChallenge = true;
SetJumpLogic<LootPreciousFrameWin>(_tagWinSearchModel.TABID);
break;
case JumpUIType.BlastFurnaceFunc1:
@@ -1517,7 +1515,6 @@
RuneTower = 99,//绗﹀嵃濉�
WelfareFunc1 = 102, //绛惧埌
WelfareFunc2 = 103, //绁堟効
- DogzDungeon = 242, //寮傚吔涔嬪湴
SystemSettingFunc1 = 109,//鎸傛満璁剧疆
RebornOpenBag = 113,//姝讳骸澶嶆椿鎵撳紑鑳屽寘
--
Gitblit v1.8.0