From 790f7cacbb853379a6ea0e6f65267c679cf2ed5c Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 12 十一月 2019 14:15:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/snxxz_scripts
---
Utility/ConfigInitiator.cs | 10 ++--
System/MainInterfacePanel/ChatFrame.cs | 26 ++++++++-----
System/WorldMap/MapModel.cs | 2
Core/NetworkPackage/DTCFile/ServerPack/H03_MainCharacter/DTC0309_tagPlayerLoginInfo.cs | 10 +++-
Fight/MapTransferUtility.cs | 2
System/MainInterfacePanel/TaskListTip.cs | 4 +-
System/SystemSetting/SystemSetting.cs | 2
System/MainInterfacePanel/MainInterfaceWin.cs | 4 +-
System/Login/CreateRoleWin.cs | 9 ----
9 files changed, 36 insertions(+), 33 deletions(-)
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H03_MainCharacter/DTC0309_tagPlayerLoginInfo.cs b/Core/NetworkPackage/DTCFile/ServerPack/H03_MainCharacter/DTC0309_tagPlayerLoginInfo.cs
index 6874cd7..a5fa102 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H03_MainCharacter/DTC0309_tagPlayerLoginInfo.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H03_MainCharacter/DTC0309_tagPlayerLoginInfo.cs
@@ -1,6 +1,6 @@
锘縰sing System;
using LitJson;
-
+using Snxxz.UI;
using UnityEngine;
/** 涓昏鐧诲綍鏃跺�欑殑绠�鐭俊鎭� */
@@ -20,9 +20,13 @@
GameNetSystem.Instance.UpdateCrossServerData(vNetData.IP, vNetData.Port, vNetData.CrossState);
}
- if (RoleChange != null)
+ if (DTC0132_tagCreateRoleSucess.isCreateRole)
{
- RoleChange();
+ var tagCRoleLoginAsk = new C0108_tagCRoleLoginAsk();
+ tagCRoleLoginAsk.Type = 2;//杩涘叆娓告垙
+ tagCRoleLoginAsk.ClientID = SDKUtility.Instance.RegistrationID;
+ GameNetSystem.Instance.SendInfo(tagCRoleLoginAsk);
+ NetLinkWin.Show();
}
var _hero = PlayerDatas.Instance.hero;
diff --git a/Fight/MapTransferUtility.cs b/Fight/MapTransferUtility.cs
index 40109fd..26d26d3 100644
--- a/Fight/MapTransferUtility.cs
+++ b/Fight/MapTransferUtility.cs
@@ -765,7 +765,7 @@
var _curMapConfig = MapConfig.Get(PlayerDatas.Instance.baseData.MapID);
// 鍓湰涓笉鍙互浼犻��
- if (_curMapConfig.MapFBType != 0)
+ if (_curMapConfig.MapFBType != 0 && PlayerDatas.Instance.baseData.MapID != 31020)
{
SysNotifyMgr.Instance.ShowTip("InDungeon_CantGo");
return;
diff --git a/System/Login/CreateRoleWin.cs b/System/Login/CreateRoleWin.cs
index 1c500ab..9ef331d 100644
--- a/System/Login/CreateRoleWin.cs
+++ b/System/Login/CreateRoleWin.cs
@@ -78,7 +78,6 @@
protected override void OnPreOpen()
{
- DTC0309_tagPlayerLoginInfo.RoleChange += OnCreateRoleSuccess;
model.onCreateRole = true;
}
@@ -93,7 +92,6 @@
protected override void OnAfterClose()
{
- DTC0309_tagPlayerLoginInfo.RoleChange -= OnCreateRoleSuccess;
model.onCreateRole = false;
}
@@ -249,6 +247,7 @@
LanguageVerify.Instance.VerifyPlayerName(m_NameInput.text, 0, string.Empty, 0, 0, (bool ok, string name) =>
{
+ DTC0132_tagCreateRoleSucess.isCreateRole = false;
C0105_tagCCreateRole createRole = new C0105_tagCCreateRole();//瀹炰緥鍖朇0105_tagCCreateRole
createRole.Job = (byte)CreateRoleManager.Instance.selectedJob.value;
createRole.Name = name;
@@ -269,12 +268,6 @@
ServerTipDetails.DisplayNormalTip(Language.Get("L1116"));
return;
}
-
- var tagCRoleLoginAsk = new C0108_tagCRoleLoginAsk();
- tagCRoleLoginAsk.Type = 2;//杩涘叆娓告垙
- tagCRoleLoginAsk.ClientID = SDKUtility.Instance.RegistrationID;
- GameNetSystem.Instance.SendInfo(tagCRoleLoginAsk);
- NetLinkWin.Show();
}
[System.Serializable]
diff --git a/System/MainInterfacePanel/ChatFrame.cs b/System/MainInterfacePanel/ChatFrame.cs
index 703001d..c5d14d0 100644
--- a/System/MainInterfacePanel/ChatFrame.cs
+++ b/System/MainInterfacePanel/ChatFrame.cs
@@ -265,7 +265,7 @@
}
else
{
- language = Language.Get(config.ExitDescription);
+ //language = Language.Get(config.ExitDescription);
}
}
else
@@ -273,15 +273,21 @@
language = Language.Get(config.ExitDescription);
}
- ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),
- language, (bool isOk) =>
- {
- if (isOk)
- {
- GoToOneKeyButton();
- }
- }
- );
+ if (language == string.Empty)
+ {
+ GoToOneKeyButton();
+ }
+ else {
+ ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),
+ language, (bool isOk) =>
+ {
+ if (isOk)
+ {
+ GoToOneKeyButton();
+ }
+ }
+ );
+ }
}
else
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index 711e8bc..7789ab8 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -140,7 +140,7 @@
IsShowTaskPanel();//鏄惁鏄剧ず浠诲姟闈㈡澘
m_MainPositionTween.ShowTaskImmedidately(true, false);
- if (MapUtility.IsDungeon(PlayerDatas.Instance.baseData.MapID))
+ if (MapUtility.IsDungeon(PlayerDatas.Instance.baseData.MapID) && PlayerDatas.Instance.baseData.MapID != 31020)
{
m_FunctionForecastTip.gameObject.SetActive(false);
}
@@ -509,7 +509,7 @@
private void IsShowTaskPanel()//鏄惁鏄剧ず浠诲姟闈㈡澘
{
var hideTask = AdventureStage.Instance.IsInAdventureStage
- || MapUtility.IsDungeon(PlayerDatas.Instance.baseData.MapID)
+ || (MapUtility.IsDungeon(PlayerDatas.Instance.baseData.MapID) && PlayerDatas.Instance.baseData.MapID != 31020)
|| CrossServerUtility.IsCrossServer()
|| ClientCrossServerOneVsOne.isClientCrossServerOneVsOne;
diff --git a/System/MainInterfacePanel/TaskListTip.cs b/System/MainInterfacePanel/TaskListTip.cs
index 833ece2..cfe6fd2 100644
--- a/System/MainInterfacePanel/TaskListTip.cs
+++ b/System/MainInterfacePanel/TaskListTip.cs
@@ -476,11 +476,11 @@
return 1;
}
- private bool IsDungeon()//鍒ゆ柇鏄惁鍦ㄥ壇鏈腑
+ private bool IsDungeon()//鍒ゆ柇鏄惁鍦ㄥ壇鏈腑, boss涔嬪鏆傛椂瑙嗕负鍚岄潪鍓湰
{
var mapId = PlayerDatas.Instance.baseData.MapID;
var mapConfig = MapConfig.Get(mapId);
- return mapConfig != null && mapConfig.MapFBType != 0;
+ return mapConfig != null && mapConfig.MapFBType != 0 && mapId != 31020;
}
private void TaskJump(int jumpTask = 0)
diff --git a/System/SystemSetting/SystemSetting.cs b/System/SystemSetting/SystemSetting.cs
index f059569..dfea04f 100644
--- a/System/SystemSetting/SystemSetting.cs
+++ b/System/SystemSetting/SystemSetting.cs
@@ -67,7 +67,7 @@
public GameFps GetGameFps()
{
- return (GameFps)LocalSave.GetInt(GAMEFRAME_KEY, (int)GameFps.Half);
+ return (GameFps)LocalSave.GetInt(GAMEFRAME_KEY, (int)GameFps.Full);
}
public void SetSystemSettingSwitch(SystemSwitch type, bool _value)
diff --git a/System/WorldMap/MapModel.cs b/System/WorldMap/MapModel.cs
index 2094587..b659dce 100644
--- a/System/WorldMap/MapModel.cs
+++ b/System/WorldMap/MapModel.cs
@@ -106,7 +106,7 @@
}
var currentMapConfig = MapConfig.Get(PlayerDatas.Instance.baseData.MapID);
- if (currentMapConfig.MapFBType != 0)
+ if (currentMapConfig.MapFBType != 0 && PlayerDatas.Instance.baseData.MapID != 31020)
{
SysNotifyMgr.Instance.ShowTip("DungeonNoGO");
return;
diff --git a/Utility/ConfigInitiator.cs b/Utility/ConfigInitiator.cs
index 9435c3f..44fd848 100644
--- a/Utility/ConfigInitiator.cs
+++ b/Utility/ConfigInitiator.cs
@@ -294,11 +294,11 @@
normalTasks.Add(new ConfigInitTask("VipPrivilegeInfoConfig", () => { VipPrivilegeInfoConfig.Init(); }, () => { return VipPrivilegeInfoConfig.inited; }));
normalTasks.Add(new ConfigInitTask("FairyLeagueRankAwardConfig", () => { FairyLeagueRankAwardConfig.Init(); }, () => { return FairyLeagueRankAwardConfig.inited; }));
normalTasks.Add(new ConfigInitTask("SpiritWeaponConfig", () => { SpiritWeaponConfig.Init(); }, () => { return SpiritWeaponConfig.inited; }));
- normalTasks.Add(new ConfigInitTask("NewDropItemGroupConfig", () => { NewDropItemGroupConfig.Init(); }, () => { return NewDropItemGroupConfig.inited; }));
- normalTasks.Add(new ConfigInitTask("OpenServerActivityConfig", () => { OpenServerActivityConfig.Init(); }, () => { return OpenServerActivityConfig.inited; }));
- normalTasks.Add(new ConfigInitTask("RidingPetBossRewardConfig", () => { RidingPetBossRewardConfig.Init(); }, () => { return RidingPetBossRewardConfig.inited; }));
- normalTasks.Add(new ConfigInitTask("ReikiRootEffectConfig", () => { ReikiRootEffectConfig.Init(); }, () => { return ReikiRootEffectConfig.inited; }));
- normalTasks.Add(new ConfigInitTask("ItemExchangeConfig", () => { ItemExchangeConfig.Init(); }, () => { return ItemExchangeConfig.inited; }));
+ normalTasks.Add(new ConfigInitTask("NewDropItemGroupConfig", () => { NewDropItemGroupConfig.Init(); }, () => { return NewDropItemGroupConfig.inited; }));
+ normalTasks.Add(new ConfigInitTask("OpenServerActivityConfig", () => { OpenServerActivityConfig.Init(); }, () => { return OpenServerActivityConfig.inited; }));
+ normalTasks.Add(new ConfigInitTask("RidingPetBossRewardConfig", () => { RidingPetBossRewardConfig.Init(); }, () => { return RidingPetBossRewardConfig.inited; }));
+ normalTasks.Add(new ConfigInitTask("ReikiRootEffectConfig", () => { ReikiRootEffectConfig.Init(); }, () => { return ReikiRootEffectConfig.inited; }));
+ normalTasks.Add(new ConfigInitTask("ItemExchangeConfig", () => { ItemExchangeConfig.Init(); }, () => { return ItemExchangeConfig.inited; }));
normalTasks.Add(new ConfigInitTask("AddUpRechargeConfig", () => { AddUpRechargeConfig.Init(); }, () => { return AddUpRechargeConfig.inited; }));
normalTasks.Add(new ConfigInitTask("BOSSFirstKillConfig", () => { BOSSFirstKillConfig.Init(); }, () => { return BOSSFirstKillConfig.inited; }));
normalTasks.Add(new ConfigInitTask("EquipShenAttrConfig", () => { EquipShenAttrConfig.Init(); }, () => { return EquipShenAttrConfig.inited; }));
--
Gitblit v1.8.0