From 67e49e9852c296e7cdba19ceddbc944848e1c7c8 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 22 十月 2019 02:30:12 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.173on.com:10010/r/snxxz_scripts
---
Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0109_tagServerPrepareOK.cs | 4 +---
Fight/Stage/Dungeon/DungeonStage.cs | 4 +---
Core/SDK/SDKUtility.cs | 9 ---------
3 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0109_tagServerPrepareOK.cs b/Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0109_tagServerPrepareOK.cs
index 71acaa3..b95b8c5 100644
--- a/Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0109_tagServerPrepareOK.cs
+++ b/Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0109_tagServerPrepareOK.cs
@@ -29,9 +29,7 @@
OnServerPrepareOk();
}
- if (PlayerDatas.Instance.baseData.LV == 1
- && !CreateRolePostProcessor.HasPlayMovie((int)PlayerDatas.Instance.baseData.PlayerID)
- && !SDKUtility.Instance.IsEmulator)
+ if (PlayerDatas.Instance.baseData.LV == 1 && !CreateRolePostProcessor.HasPlayMovie((int)PlayerDatas.Instance.baseData.PlayerID))
{
var sendInfo = new CA231_tagCMClientStartCustomScene();
GameNetSystem.Instance.SendInfo(sendInfo);
diff --git a/Core/SDK/SDKUtility.cs b/Core/SDK/SDKUtility.cs
index 171d290..156c8e1 100644
--- a/Core/SDK/SDKUtility.cs
+++ b/Core/SDK/SDKUtility.cs
@@ -125,13 +125,10 @@
public FP_LoginOk FreePlatformInfo { get; private set; }
#endregion
- public bool IsEmulator = false;
-
private JsonData m_Json = new JsonData();
public void Init()
{
- IsEmulator = false;
Yj_AppID = string.Empty;
Yj_SpID = string.Empty;
ThirdPartVersion = string.Empty;
@@ -468,12 +465,6 @@
case CodeA2U.SdkInitComplete:
InitFinished = true;
var _dict = _json as IDictionary;
-
- if (_dict != null && _dict.Contains("IsEmulator"))
- {
- IsEmulator = _json["IsEmulator"].ToString() == "1";
- }
-
if (_dict != null && _dict.Contains("channelPlatform"))
{
var _channelPlatform = _json["channelPlatform"].ToString();
diff --git a/Fight/Stage/Dungeon/DungeonStage.cs b/Fight/Stage/Dungeon/DungeonStage.cs
index 7382d59..0752d0c 100644
--- a/Fight/Stage/Dungeon/DungeonStage.cs
+++ b/Fight/Stage/Dungeon/DungeonStage.cs
@@ -55,9 +55,7 @@
}
WindowCenter.Instance.Open<MainInterfaceWin>(true);
- if (PlayerDatas.Instance.baseData.LV == 1
- && !CreateRolePostProcessor.HasPlayMovie((int)PlayerDatas.Instance.baseData.PlayerID)
- && !SDKUtility.Instance.IsEmulator)
+ if (PlayerDatas.Instance.baseData.LV == 1 && !CreateRolePostProcessor.HasPlayMovie((int)PlayerDatas.Instance.baseData.PlayerID))
{
WindowCenter.Instance.Close<MainInterfaceWin>();
CreateRolePostProcessor.Begin(() =>
--
Gitblit v1.8.0