From 45a6f4aaaf13119215f4cc2f20f5e8300ba13e00 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 26 十月 2018 16:10:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/FairyAu/FairyFeastModel.cs | 28 +++++++++++++
System/Sound/SoundPlayer.cs | 2
System/AssetVersion/AssetVersionUtility.cs | 2
Utility/EnumHelper.cs | 1
Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs | 2 +
System/FairyAu/FairyFeastBehaviour.cs | 11 +++++
Core/GameEngine/Login/Launch.cs | 43 ++++++++++++++-------
System/BossShow/BossShowModel.cs | 1
System/Dogz/DogzModel.cs | 15 +++++--
Core/SDK/SDKUtility.cs | 2
System/Vip/VipInvest/WheelOfFortuneWin.cs | 2
11 files changed, 85 insertions(+), 24 deletions(-)
diff --git a/Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs b/Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
index 8d0a18c..7fe6b04 100644
--- a/Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
+++ b/Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
@@ -409,6 +409,8 @@
EditorGUILayout.Space();
GUILayout.BeginHorizontal();
+ ClientPackage.obfuscatorEnabled = EditorGUILayout.Toggle("obfuscator enable ", ClientPackage.obfuscatorEnabled);
+
#if UNITY_ANDROID
if (GUILayout.Button("APK"))
{
diff --git a/Core/GameEngine/Login/Launch.cs b/Core/GameEngine/Login/Launch.cs
index 012aa47..4a42e9b 100644
--- a/Core/GameEngine/Login/Launch.cs
+++ b/Core/GameEngine/Login/Launch.cs
@@ -54,20 +54,20 @@
GlobalTimeEvent.Instance.Begin();
#if UNITY_ANDROID && !UNITY_EDITOR
- if (!SDKUtility.Instance.builtinAssetCopyFinished)
+ if (!SDKUtility.builtinAssetCopyFinished)
{
- SDKUtility.Instance.CopyContent("builtin_assetbundle");
- SDKUtility.Instance.CopyContent("builtin_assetbundle.manifest");
- SDKUtility.Instance.CopyContent("builtin/music");
- SDKUtility.Instance.CopyContent("builtin/music.manifest");
- SDKUtility.Instance.CopyContent("builtin/prefabs");
- SDKUtility.Instance.CopyContent("builtin/prefabs.manifest");
- SDKUtility.Instance.CopyContent("builtin/sprite");
- SDKUtility.Instance.CopyContent("builtin/sprite.manifest");
- SDKUtility.Instance.CopyContent("config/Contact");
- SDKUtility.Instance.CopyContent("config/HelpInfo");
- SDKUtility.Instance.CopyContent("config/PriorBundle");
- SDKUtility.Instance.CopyContent("config/PriorLanguage");
+ SDKUtility.Instance.CopyOneAsset("builtin_assetbundle");
+ SDKUtility.Instance.CopyOneAsset("builtin_assetbundle.manifest");
+ SDKUtility.Instance.CopyOneAsset("builtin/music");
+ SDKUtility.Instance.CopyOneAsset("builtin/music.manifest");
+ SDKUtility.Instance.CopyOneAsset("builtin/prefabs");
+ SDKUtility.Instance.CopyOneAsset("builtin/prefabs.manifest");
+ SDKUtility.Instance.CopyOneAsset("builtin/sprite");
+ SDKUtility.Instance.CopyOneAsset("builtin/sprite.manifest");
+ SDKUtility.Instance.CopyOneAsset("config/Contact.txt");
+ SDKUtility.Instance.CopyOneAsset("config/HelpInfo.txt");
+ SDKUtility.Instance.CopyOneAsset("config/PriorBundle.txt");
+ SDKUtility.Instance.CopyOneAsset("config/PriorLanguage.txt");
LocalSave.SetString("BuiltInAssetCopyCompleted_Android", VersionConfig.Get().version);
}
@@ -76,7 +76,7 @@
#if UNITY_IOS && !UNITY_EDITOR
if (!VersionUtility.Instance.InIosAuditTime())
{
- if (!SDKUtility.Instance.builtinAssetCopyFinished)
+ if (!SDKUtility.builtinAssetCopyFinished)
{
var targetDirectory = ResourcesPath.Instance.ExternalStorePath;
if (!Directory.Exists(targetDirectory))
@@ -96,10 +96,25 @@
fileNames.Add("builtin_assetbundle");
fileNames.Add("builtin_assetbundle.manifest");
+ var configFiles = new List<FileInfo>();
+ FileExtersion.GetAllDirectoryFileInfos(StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, "config"), configFiles);
+ foreach (var file in configFiles)
+ {
+ var name = Path.GetFileName(file.FullName);
+ fileNames.Add(StringUtility.Contact("config", Path.DirectorySeparatorChar, name));
+ }
+
foreach (var item in fileNames)
{
var fromPath = StringUtility.Contact(ResourcesPath.Instance.StreamingAssetPath, item);
var toPath = StringUtility.Contact(targetDirectory, item);
+
+ var destDirectoryName = Path.GetDirectoryName(toPath);
+ if (!Directory.Exists(destDirectoryName))
+ {
+ Directory.CreateDirectory(destDirectoryName);
+ }
+
File.Copy(fromPath, toPath, true);
}
}
diff --git a/Core/SDK/SDKUtility.cs b/Core/SDK/SDKUtility.cs
index ff554e5..43d1ddf 100644
--- a/Core/SDK/SDKUtility.cs
+++ b/Core/SDK/SDKUtility.cs
@@ -70,7 +70,7 @@
/// </summary>
public UnityAction<NetworkReachability> OnNetworkStatusChanged;
- public bool builtinAssetCopyFinished { get; private set; }
+ public static bool builtinAssetCopyFinished { get; private set; }
/// <summary>
/// 鏄惁宸茬粡灏哠treamingAsset鎷疯礉鑷崇洰鏍囪矾寰�
diff --git a/System/AssetVersion/AssetVersionUtility.cs b/System/AssetVersion/AssetVersionUtility.cs
index 8fdbeea..50527a3 100644
--- a/System/AssetVersion/AssetVersionUtility.cs
+++ b/System/AssetVersion/AssetVersionUtility.cs
@@ -195,7 +195,7 @@
}
else
{
- if (SDKUtility.Instance.builtinAssetCopyFinished)
+ if (SDKUtility.builtinAssetCopyFinished)
{
path = StringUtility.Contact(ResourcesPath.Instance.ExternalStorePath, _assetKey);
}
diff --git a/System/BossShow/BossShowModel.cs b/System/BossShow/BossShowModel.cs
index 451fa8a..d732fd2 100644
--- a/System/BossShow/BossShowModel.cs
+++ b/System/BossShow/BossShowModel.cs
@@ -79,6 +79,7 @@
{
WindowJumpMgr.Instance.ClearJumpData();
WindowCenter.Instance.CloseImmediately<TreasureLevelUpWin>();
+ WindowCenter.Instance.CloseImmediately<TreasureSelectWin>();
WindowCenter.Instance.Open<MainInterfaceWin>();
}
diff --git a/System/Dogz/DogzModel.cs b/System/Dogz/DogzModel.cs
index 7d9c3b0..07a2b45 100644
--- a/System/Dogz/DogzModel.cs
+++ b/System/Dogz/DogzModel.cs
@@ -866,10 +866,13 @@
public void UpdateDogzAssistRed()
{
- foreach(var value in dogzAssistRedDict.Values)
+ if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Dogz)) return;
+
+ foreach (var value in dogzAssistRedDict.Values)
{
value.state = RedPointState.None;
}
+
bool isMaxAssistNum = GetAssistDogzCount() >= curSumAssistNum ? true : false;
int minAlreadyAssistId = 0;
foreach (var dogzId in m_DogzEquipLimit.Keys)
@@ -926,7 +929,9 @@
public void UpdateDogzEquipPlaceRed()
{
- foreach(var value in dogzEquipPlaceRedDict.Values)
+ if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Dogz)) return;
+
+ foreach (var value in dogzEquipPlaceRedDict.Values)
{
foreach(var value2 in value.Values)
{
@@ -934,7 +939,7 @@
}
}
- foreach(var value in dogzAssistRedDict.Values)
+ foreach (var value in dogzAssistRedDict.Values)
{
if(value.state == RedPointState.Simple)
{
@@ -1056,7 +1061,9 @@
public void UpdateAssistNumRed()
{
- if(CheckIsAddAssistNum() && !IsAddMaxAssist())
+ if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Dogz)) return;
+
+ if (CheckIsAddAssistNum() && !IsAddMaxAssist())
{
if(addAssistDogzRedpoint.state == RedPointState.None)
{
diff --git a/System/FairyAu/FairyFeastBehaviour.cs b/System/FairyAu/FairyFeastBehaviour.cs
index 8cbfa81..72b6ce2 100644
--- a/System/FairyAu/FairyFeastBehaviour.cs
+++ b/System/FairyAu/FairyFeastBehaviour.cs
@@ -16,6 +16,8 @@
FairyModel model { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }
+ FairyFeastModel fairyFeastModel { get { return ModelCenter.Instance.GetModel<FairyFeastModel>(); } }
+
private void Awake()
{
m_GotoFeast.onClick.AddListener(OnGotoFeast);
@@ -28,6 +30,7 @@
dungeonModel.updateMissionEvent += UpdateMissionEvent;
GA_NpcCollect.OnArrive += OnArriveCollectNPC;
GA_NpcCollect.OnLeave += OnLeaveCollectNpc;
+ fairyFeastModel.selectTransmit += SelectTransmit;
Display();
}
@@ -37,6 +40,12 @@
dungeonModel.updateMissionEvent -= UpdateMissionEvent;
GA_NpcCollect.OnArrive -= OnArriveCollectNPC;
GA_NpcCollect.OnLeave -= OnLeaveCollectNpc;
+ fairyFeastModel.selectTransmit -= SelectTransmit;
+ }
+
+ private void SelectTransmit()
+ {
+ Display();
}
private void PlayerDataRefreshInfoEvent(PlayerDataRefresh refreshType)
@@ -60,7 +69,7 @@
{
var mapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);
var collected = dungeonModel.mission.hasCollect;
- m_GotoFeast.gameObject.SetActive(mapId == 31230 && collected != 1 && !nearNpc);
+ m_GotoFeast.gameObject.SetActive(mapId == 31230 && collected != 1 && !nearNpc && !fairyFeastModel.allowTransmit);
}
private void OnArriveCollectNPC(uint arg0, int _npcId)
diff --git a/System/FairyAu/FairyFeastModel.cs b/System/FairyAu/FairyFeastModel.cs
index 9531aa8..d0e577c 100644
--- a/System/FairyAu/FairyFeastModel.cs
+++ b/System/FairyAu/FairyFeastModel.cs
@@ -10,10 +10,13 @@
public uint selectPlayer { get; private set; }
public bool allowTransmit { get; private set; }
+ public bool nearNpc { get; private set; }
+
public event Action selectTransmit;
public event Action transmitStateUpdate;
DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
+ FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }
public override void Init()
{
@@ -23,6 +26,8 @@
StageManager.Instance.onStageLoadFinish += OnStageLoadFinish;
dungeonModel.updateMissionEvent += UpdateMissionEvent;
PrepareHandler.Instance.OnPrepareEndSuccess += OnPrepareEndSuccess;
+ GA_NpcCollect.OnArrive += OnArriveNpc;
+ GA_NpcCollect.OnLeave += OnLeaveNpc;
}
public override void UnInit()
@@ -32,6 +37,8 @@
StageManager.Instance.onStageLoadFinish -= OnStageLoadFinish;
dungeonModel.updateMissionEvent -= UpdateMissionEvent;
PrepareHandler.Instance.OnPrepareEndSuccess -= OnPrepareEndSuccess;
+ GA_NpcCollect.OnArrive -= OnArriveNpc;
+ GA_NpcCollect.OnLeave -= OnLeaveNpc;
}
public void OnBeforePlayerDataInitialize()
@@ -47,6 +54,7 @@
private void OnStageLoadFinish()
{
selectPlayer = 0;
+ nearNpc = false;
if (transmitClock != null)
{
transmitClock.Stop();
@@ -94,6 +102,24 @@
}
}
+ private void OnArriveNpc(uint arg0, int _npcId)
+ {
+ if (_npcId == fairyModel.fairyFeastDeskNpc)
+ {
+ nearNpc = true;
+ SecondEvent();
+ }
+ }
+
+ private void OnLeaveNpc(uint arg0, int _npcId)
+ {
+ if (_npcId == fairyModel.fairyFeastDeskNpc)
+ {
+ nearNpc = false;
+ SecondEvent();
+ }
+ }
+
float transmitDistance = 2f;
public int transmitCostSeconds { get; private set; }
void ParseConfig()
@@ -111,7 +137,7 @@
{
var hero = PlayerDatas.Instance.hero;
if (hero == null || hero.IsCollecting()
- || hero.IsCollect() || hero.IsDaZuo())
+ || hero.IsCollect() || hero.IsDaZuo() || nearNpc)
{
return false;
}
diff --git a/System/Sound/SoundPlayer.cs b/System/Sound/SoundPlayer.cs
index b72acef..c4f4875 100644
--- a/System/Sound/SoundPlayer.cs
+++ b/System/Sound/SoundPlayer.cs
@@ -291,7 +291,7 @@
public void PlayLoginMusic()
{
- var loginMusic = Resources.Load<AudioClip>("Music/Music_Login");
+ var loginMusic = BuiltInLoader.LoadMusic("Music_Login");
if (!m_MusicAudioSource.isPlaying || m_MusicAudioSource.clip != loginMusic)
{
StartCoroutine(Co_BackGroundMusicFadeOutIn(loginMusic, false));
diff --git a/System/Vip/VipInvest/WheelOfFortuneWin.cs b/System/Vip/VipInvest/WheelOfFortuneWin.cs
index 877c725..2dfbb98 100644
--- a/System/Vip/VipInvest/WheelOfFortuneWin.cs
+++ b/System/Vip/VipInvest/WheelOfFortuneWin.cs
@@ -275,7 +275,7 @@
Str = Language.Get("Num_CHS_1");
return Str;
case 2:
- Str = Language.Get("Num_CHS_2");
+ Str = Language.Get("Turntable5");
return Str;
case 3:
Str = Language.Get("Num_CHS_3");
diff --git a/Utility/EnumHelper.cs b/Utility/EnumHelper.cs
index b99c069..cb4d9be 100644
--- a/Utility/EnumHelper.cs
+++ b/Utility/EnumHelper.cs
@@ -881,6 +881,7 @@
OpenServerRedEnvelope = 122,//寮�鏈嶇孩鍖�
EquipDecompose = 123, //瑁呭鍒嗚В
TreasureFindHost = 124, //娉曞疂璁や富
+ Dogz = 138, //绁炲吔
AddPoint = 145,//鍔犵偣
}
//灞炴�х被鍨�
--
Gitblit v1.8.0