From 0e356c5788e6c563d45f39007ee213919fe81ec7 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期四, 10 一月 2019 17:34:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Lua/Gen/Resources.meta | 9 +++++++++
System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs | 4 ++--
System/Dungeon/DungeonModel.cs | 3 +--
System/MainInterfacePanel/ChatFrame.cs | 4 ++--
Fight/Stage/Dungeon/DungeonStage.cs | 2 +-
System/Team/TeamInvitationEntrance.cs | 2 +-
System/SystemSetting/SettingEffectMgr.cs | 2 +-
System/CrossServerBoss/CrossServerBossModel.cs | 6 ------
System/MainInterfacePanel/CoinTaskTipModel.cs | 4 ++--
System/FairyAu/FairyLeagueRemindBehaviour.cs | 2 +-
System/MainInterfacePanel/MainInterfaceWin.cs | 11 +++++------
Core/GameEngine/Model/Player/Character/PlayerBaseData.cs | 2 +-
System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs | 2 +-
13 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs b/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
index 6b4f331..3cf024d 100644
--- a/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
+++ b/Core/GameEngine/Model/Player/Character/PlayerBaseData.cs
@@ -236,7 +236,7 @@
godWeaponLV_2 = (int)serverInfo.ExAttr16;
godWeaponLV_3 = (int)serverInfo.ExAttr17;
godWeaponLV_4 = (int)serverInfo.ExAttr18;
-
+ HP = serverInfo.HP;
if (PlayerDatas.Instance.hero != null)
{
PlayerDatas.Instance.hero.ActorInfo.ResetHp((int)serverInfo.HP);
diff --git a/Fight/Stage/Dungeon/DungeonStage.cs b/Fight/Stage/Dungeon/DungeonStage.cs
index 3abe5ff..ecda7c3 100644
--- a/Fight/Stage/Dungeon/DungeonStage.cs
+++ b/Fight/Stage/Dungeon/DungeonStage.cs
@@ -186,7 +186,7 @@
private void OnEnterNormalDungeon()
{
- if (PlayerDatas.Instance.baseData.ExAttr5 == 0)
+ if (!CrossServerUtility.IsCrossServer())
{
WindowCenter.Instance.Open<DungeonFightWin>();
}
diff --git a/Lua/Gen/Resources.meta b/Lua/Gen/Resources.meta
new file mode 100644
index 0000000..5b26f40
--- /dev/null
+++ b/Lua/Gen/Resources.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: a545fb3dcf719304fa74180c10219375
+folderAsset: yes
+timeCreated: 1542357825
+licenseType: Pro
+DefaultImporter:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/System/CrossServerBoss/CrossServerBossModel.cs b/System/CrossServerBoss/CrossServerBossModel.cs
index 01e6645..d73b6a4 100644
--- a/System/CrossServerBoss/CrossServerBossModel.cs
+++ b/System/CrossServerBoss/CrossServerBossModel.cs
@@ -89,12 +89,6 @@
FuncOpen.Instance.OnFuncStateChangeEvent -= OnFunctionStateChange;
}
- public bool IsAtCrossServerBossMap()
- {
- return PlayerDatas.Instance.baseData.ExAttr5 == 1
- && PlayerDatas.Instance.baseData.MapID == DATA_MAPID;
- }
-
public void RequestEnter()
{
var sendInfo = new CC105_tagCMEnterCrossServer();
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
index bc299e6..daf61d6 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -168,7 +168,7 @@
private void UpdateFBHelp()
{
- if (PlayerDatas.Instance.baseData.ExAttr5 != 1) return;
+ if (!CrossServerUtility.IsCrossServer()) return;
var hero = PlayerDatas.Instance.hero;
var mission = dungeonModel.mission;
@@ -434,7 +434,7 @@
public bool TryGetMatchTip()
{
int mapId = PlayerDatas.Instance.baseData.MapID;
- bool isCrossDungeon = PlayerDatas.Instance.baseData.ExAttr5 == 1;
+ bool isCrossDungeon = CrossServerUtility.IsCrossServer();
if(isCrossDungeon)
{
SysNotifyMgr.Instance.ShowTip("CrossMatching3");
diff --git a/System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs b/System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs
index fce8539..ab61d48 100644
--- a/System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs
+++ b/System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs
@@ -146,7 +146,7 @@
private void UpdatePkResultEvent()
{
- if (PlayerDatas.Instance.baseData.ExAttr5 == 1)//鍓湰缁撶畻鐣岄潰
+ if (CrossServerUtility.IsCrossServer())//鍓湰缁撶畻鐣岄潰
{
if (WindowCenter.Instance.IsOpen<CrossServerOneVsOneRoundWin>())
{
diff --git a/System/Dungeon/DungeonModel.cs b/System/Dungeon/DungeonModel.cs
index 6909278..3978c07 100644
--- a/System/Dungeon/DungeonModel.cs
+++ b/System/Dungeon/DungeonModel.cs
@@ -377,8 +377,7 @@
}
}
- var crossServerBossModel = ModelCenter.Instance.GetModel<CrossServerBossModel>();
- if (crossServerBossModel.IsAtCrossServerBossMap())
+ if (CrossServerUtility.IsCrossServerBoss())
{
_error = 6;
return false;
diff --git a/System/FairyAu/FairyLeagueRemindBehaviour.cs b/System/FairyAu/FairyLeagueRemindBehaviour.cs
index 405cd41..c12becd 100644
--- a/System/FairyAu/FairyLeagueRemindBehaviour.cs
+++ b/System/FairyAu/FairyLeagueRemindBehaviour.cs
@@ -152,7 +152,7 @@
bool InCrossServer()
{
- return PlayerDatas.Instance.baseData.ExAttr5 == 1;
+ return CrossServerUtility.IsCrossServer();
}
bool TryGetStartTime(out DateTime time)
diff --git a/System/MainInterfacePanel/ChatFrame.cs b/System/MainInterfacePanel/ChatFrame.cs
index 2435c0f..a79194c 100644
--- a/System/MainInterfacePanel/ChatFrame.cs
+++ b/System/MainInterfacePanel/ChatFrame.cs
@@ -84,7 +84,7 @@
}
}
- _FriendsBtn.gameObject.SetActive(crossServerBossModel.IsAtCrossServerBossMap());
+ _FriendsBtn.gameObject.SetActive(!CrossServerUtility.IsCrossServer());
}
public void OnAfterOpen()
@@ -134,7 +134,7 @@
private void MailCountChange()
{
- if (PlayerDatas.Instance.baseData.ExAttr5 == 1)
+ if (CrossServerUtility.IsCrossServer())
{
_MailBtn.gameObject.SetActive(false);
return;
diff --git a/System/MainInterfacePanel/CoinTaskTipModel.cs b/System/MainInterfacePanel/CoinTaskTipModel.cs
index 92a1dae..9747d78 100644
--- a/System/MainInterfacePanel/CoinTaskTipModel.cs
+++ b/System/MainInterfacePanel/CoinTaskTipModel.cs
@@ -114,7 +114,7 @@
private IEnumerator PopupPanel()
{
yield return WaitingForSecondConst.WaitMS1500;
- if (PlayerDatas.Instance.baseData.ExAttr5 == 1)//鍦ㄨ法鏈嶇珵鎶�鍦轰笉鎵撳紑
+ if (CrossServerUtility.IsCrossServer())//鍦ㄨ法鏈嶇珵鎶�鍦轰笉鎵撳紑
{
yield break;
}
@@ -140,7 +140,7 @@
private IEnumerator FairyAuTaskPanel()
{
yield return WaitingForSecondConst.WaitMS1500;
- if (PlayerDatas.Instance.baseData.ExAttr5 == 1)//鍦ㄨ法鏈嶇珵鎶�鍦轰笉鎵撳紑
+ if (CrossServerUtility.IsCrossServer())//鍦ㄨ法鏈嶇珵鎶�鍦轰笉鎵撳紑
{
yield break;
}
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index 5db3e9e..b0ab69d 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -462,7 +462,7 @@
m_RedpackGetSfx.StopImediatly();
}
var requireRedpack = (OSEnvelopeModel.CanGetEnvelope()
- || redPacket.IsRedBagGetBool) && PlayerDatas.Instance.baseData.ExAttr5 != 1;
+ || redPacket.IsRedBagGetBool) && !CrossServerUtility.IsCrossServer();
if (requireRedpack)
{
m_RedBag.gameObject.SetActive(true);
@@ -731,7 +731,7 @@
private void UpdateDungeonAssistImag()
{
- if (PlayerDatas.Instance.baseData.ExAttr5 == 1)
+ if (CrossServerUtility.IsCrossServer())
{
DungeonAssistImg.gameObject.SetActive(false);
return;
@@ -741,7 +741,7 @@
private void UpdateMysticalPurchaseImag()
{
- if (PlayerDatas.Instance.baseData.ExAttr5 == 1)
+ if (CrossServerUtility.IsCrossServer())
{
MysticalPurchaseImg.gameObject.SetActive(false);
return;
@@ -751,7 +751,7 @@
private void UpdateWishAwardImag()
{
- if (PlayerDatas.Instance.baseData.ExAttr5 == 1)
+ if (CrossServerUtility.IsCrossServer())
{
WishingAwardImg.gameObject.SetActive(false);
return;
@@ -1173,8 +1173,7 @@
private void IsShowTaskPanel()//鏄惁鏄剧ず浠诲姟闈㈡澘
{
var inDungeon = IsDungeon();
- var IsCrossServerOneVsOne = PlayerDatas.Instance.baseData.ExAttr5 == 1;
- if (inDungeon || fairyGrabBossModel.grabBossHintOpen || IsCrossServerOneVsOne)
+ if (inDungeon || fairyGrabBossModel.grabBossHintOpen || CrossServerUtility.IsCrossServer())
{
m_TaskAndTeamTip.SetActive(false);
m_TaskSwithButton.gameObject.SetActive(false);
diff --git a/System/SystemSetting/SettingEffectMgr.cs b/System/SystemSetting/SettingEffectMgr.cs
index 7aebb14..fddfa33 100644
--- a/System/SystemSetting/SettingEffectMgr.cs
+++ b/System/SystemSetting/SettingEffectMgr.cs
@@ -225,7 +225,7 @@
/// </summary>
private void AutoDrugSetting()
{
- if (PlayerDatas.Instance.baseData.ExAttr5 == 1) return;
+ if (CrossServerUtility.IsCrossServerOneVsOne()) return;
float hpPercent = Mathf.RoundToInt((float)PlayerDatas.Instance.baseData.HP / PlayerDatas.Instance.extersion.MaxHP * 100);
if (hpPercent <= HangUpSetModel.Instance.GetHpSet())
diff --git a/System/Team/TeamInvitationEntrance.cs b/System/Team/TeamInvitationEntrance.cs
index a78ff0e..87add19 100644
--- a/System/Team/TeamInvitationEntrance.cs
+++ b/System/Team/TeamInvitationEntrance.cs
@@ -36,7 +36,7 @@
private void OnInvitationsChange()
{
- if (PlayerDatas.Instance.baseData.ExAttr5 == 1)
+ if (CrossServerUtility.IsCrossServer())
{
m_Invitations.gameObject.SetActive(false);
}
--
Gitblit v1.8.0