From 1b2a902d635669056b793b654eaaf80e16d6373f Mon Sep 17 00:00:00 2001
From: QD-PangDeRong <593317293@qq.com>
Date: 星期四, 09 八月 2018 14:27:48 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Core/GameEngine/Model/ConfigManager.cs | 6 --
Core/NetworkPackage/ServerPack/MapServerPack/HA3_Activity/HA319_tagMCPackDownloadRecord.cs.meta | 4 +
System/NewBieGuidance/NewBieCenter.cs | 16 ++++++++
System/Treasure/TreasureCollectBriefInfoBehaviour.cs | 2
System/MainInterfacePanel/TopRightTip.cs | 4 ++
Utility/EnumHelper.cs | 3 +
System/Dungeon/TrialExchangeWin.cs | 5 ++
Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs | 3 +
Fight/GameActor/GAStaticDefine.cs | 2
System/Dungeon/TrialDungeonModel.cs | 2 +
System/MainInterfacePanel/MainInterfaceWin.cs | 4 +
System/Treasure/TreasureModel.cs | 18 ++++-----
12 files changed, 48 insertions(+), 21 deletions(-)
diff --git a/Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs b/Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
index 62f1c32..0ae8a02 100644
--- a/Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
+++ b/Core/Editor/AssetBundleBrowser/AssetBundleBuildTab.cs
@@ -521,7 +521,8 @@
}
}
- AssetBundleBuildExtersion.Build(m_UserData.m_OutputPath, _category, opt, (BuildTarget)m_UserData.m_BuildTarget);
+ var outputPath = Application.dataPath.Replace("Assets", m_UserData.m_OutputPath);
+ AssetBundleBuildExtersion.Build(outputPath, _category, opt, (BuildTarget)m_UserData.m_BuildTarget);
}
private void ExcuteBuildAudio()
diff --git a/Core/GameEngine/Model/ConfigManager.cs b/Core/GameEngine/Model/ConfigManager.cs
index a644121..7778f95 100644
--- a/Core/GameEngine/Model/ConfigManager.cs
+++ b/Core/GameEngine/Model/ConfigManager.cs
@@ -403,11 +403,7 @@
{
if (_task.assetPath == AssetPath.ResourceOut)
{
- var fileInfo = new FileInfo(_task.filePath);
- var fs = fileInfo.OpenRead();
- sr = new StreamReader(fs, Encoding.UTF8);
- var content = sr.ReadToEnd();
- lines = content.Split(lineStep, StringSplitOptions.None);
+ lines = File.ReadAllLines(_task.filePath,Encoding.UTF8);
}
else if (_task.assetPath == AssetPath.External)
{
diff --git a/Core/NetworkPackage/ServerPack/MapServerPack/HA3_Activity/HA319_tagMCPackDownloadRecord.cs.meta b/Core/NetworkPackage/ServerPack/MapServerPack/HA3_Activity/HA319_tagMCPackDownloadRecord.cs.meta
index c8835b5..8e22d6a 100644
--- a/Core/NetworkPackage/ServerPack/MapServerPack/HA3_Activity/HA319_tagMCPackDownloadRecord.cs.meta
+++ b/Core/NetworkPackage/ServerPack/MapServerPack/HA3_Activity/HA319_tagMCPackDownloadRecord.cs.meta
@@ -1,8 +1,10 @@
fileFormatVersion: 2
-guid: 3c817ad288f3e2a4e92d436c3d75938e
+guid: a53e1a4c69fcb264eac797b394e065da
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Fight/GameActor/GAStaticDefine.cs b/Fight/GameActor/GAStaticDefine.cs
index a031213..88fa8a5 100644
--- a/Fight/GameActor/GAStaticDefine.cs
+++ b/Fight/GameActor/GAStaticDefine.cs
@@ -361,7 +361,7 @@
else if (target is GA_NpcFightNorm)
{
_casterRealm = PlayerDatas.Instance.baseData.realmLevel;
- _targetRealm = (int)target.ActorInfo.realm;
+ _targetRealm = (int)target.ActorInfo.realm == 0 ? 99999999 : (int)target.ActorInfo.realm;
}
}
else if (target is GA_Hero)
diff --git a/System/Dungeon/TrialDungeonModel.cs b/System/Dungeon/TrialDungeonModel.cs
index 9c3566d..83fc67d 100644
--- a/System/Dungeon/TrialDungeonModel.cs
+++ b/System/Dungeon/TrialDungeonModel.cs
@@ -17,6 +17,8 @@
public event Action SelectEquipClassEvent;
bool serverInited = false;
+
+ public const int TRIALEXCHANGE_GUIDE = 91;
public override void Init()
{
ParseConfig();
diff --git a/System/Dungeon/TrialExchangeWin.cs b/System/Dungeon/TrialExchangeWin.cs
index 46a4d8c..ded39a0 100644
--- a/System/Dungeon/TrialExchangeWin.cs
+++ b/System/Dungeon/TrialExchangeWin.cs
@@ -89,6 +89,11 @@
{
model.SelectEquipClassEvent -= SelectEquipClassEvent;
packModel.RefreshItemCountAct -= RefreshItemCountAct;
+
+ if (!NewBieCenter.Instance.completeGuidesBuf.Contains(TrialDungeonModel.TRIALEXCHANGE_GUIDE))
+ {
+ NewBieCenter.Instance.RemoveNewBieGuide(TrialDungeonModel.TRIALEXCHANGE_GUIDE);
+ }
}
protected override void OnAfterClose()
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index 8bcf8b8..d4f5936 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -384,7 +384,9 @@
private void GuideBeginEvent()
{
- if (NewBieCenter.Instance.inGuiding && NewBieCenter.Instance.currentGuide == 89)
+ if (NewBieCenter.Instance.inGuiding
+ && (NewBieCenter.Instance.currentGuide == 89
+ || NewBieCenter.Instance.currentGuide == TrialDungeonModel.TRIALEXCHANGE_GUIDE))
{
UnFlodFunctionArea(true, 0);
}
diff --git a/System/MainInterfacePanel/TopRightTip.cs b/System/MainInterfacePanel/TopRightTip.cs
index 14fe3fe..7c3e693 100644
--- a/System/MainInterfacePanel/TopRightTip.cs
+++ b/System/MainInterfacePanel/TopRightTip.cs
@@ -47,6 +47,10 @@
{
ModelCenter.Instance.GetModel<DailyQuestModel>().currentDailyQuest = (int)DailyQuestType.FairyLand;
}
+ if (NewBieCenter.Instance.inGuiding && NewBieCenter.Instance.currentGuide == TrialDungeonModel.TRIALEXCHANGE_GUIDE)
+ {
+ ModelCenter.Instance.GetModel<DailyQuestModel>().currentDailyQuest = (int)DailyQuestType.Trial;
+ }
WindowCenter.Instance.Close<MainInterfaceWin>();
WindowCenter.Instance.Open<DailyQuestWin>();
}
diff --git a/System/NewBieGuidance/NewBieCenter.cs b/System/NewBieGuidance/NewBieCenter.cs
index 7994dc6..f09f97f 100644
--- a/System/NewBieGuidance/NewBieCenter.cs
+++ b/System/NewBieGuidance/NewBieCenter.cs
@@ -205,6 +205,19 @@
}
}
+ public void RemoveNewBieGuide(int _id)
+ {
+ if (!completeGuidesBuf.Contains(_id))
+ {
+ completeGuidesBuf.Add(_id);
+ }
+
+ var send = new CA222_tagCMSetGuideOK();
+ send.GuideIndex = (byte)_id;
+ send.IsOK = 1;
+ GameNetSystem.Instance.SendInfo(send);
+ }
+
public void FinishCurrentGuideWithoutCloseWin()
{
var guideRecord = currentGuide;
@@ -339,6 +352,9 @@
return state == DailyQuestModel.DailyQuestState.CanBuyTimes;
case GuideTriggerType.TeamAutoAccept:
return !teamModel.myTeam.inTeam;
+ case GuideTriggerType.TrialExchange:
+ var trialDailyState = dailyModel.GetQuestState((int)DailyQuestType.Trial);
+ return trialDailyState == DailyQuestModel.DailyQuestState.Completed;
default:
return false;
}
diff --git a/System/Treasure/TreasureCollectBriefInfoBehaviour.cs b/System/Treasure/TreasureCollectBriefInfoBehaviour.cs
index bbef1c4..3e301f8 100644
--- a/System/Treasure/TreasureCollectBriefInfoBehaviour.cs
+++ b/System/Treasure/TreasureCollectBriefInfoBehaviour.cs
@@ -106,7 +106,7 @@
model.humanTreasureStateChangeEvent -= OnHumanTreasureStateChange;
model.potentialLevelChangeEvent -= OnPotentialLevelChange;
- RedpointCenter.Instance.redpointValueChangeEvent += OnRedpointUpdate;
+ RedpointCenter.Instance.redpointValueChangeEvent -= OnRedpointUpdate;
}
private void OnHumanTreasureStateChange(int _treasureId)
diff --git a/System/Treasure/TreasureModel.cs b/System/Treasure/TreasureModel.cs
index 4e8d441..04e7a8c 100644
--- a/System/Treasure/TreasureModel.cs
+++ b/System/Treasure/TreasureModel.cs
@@ -869,19 +869,17 @@
{
return;
}
- treasure.skillLevelUpRedpoint.state = RedPointState.None;
- if (treasure.state != TreasureState.Collected || !treasure.IsMaxStage())
- {
- return;
- }
var anyPointialLevelupAble = false;
- for (int i = 0; i < treasure.potentials.Count; i++)
+ if (treasure.state == TreasureState.Collected && treasure.IsMaxStage())
{
- var potential = treasure.potentials[i];
- if (SatisyPotentialLevelUp(treasure.id, potential.id))
+ for (int i = 0; i < treasure.potentials.Count; i++)
{
- anyPointialLevelupAble = true;
- break;
+ var potential = treasure.potentials[i];
+ if (SatisyPotentialLevelUp(treasure.id, potential.id))
+ {
+ anyPointialLevelupAble = true;
+ break;
+ }
}
}
treasure.skillLevelUpRedpoint.state = anyPointialLevelupAble ? RedPointState.Simple : RedPointState.None;
diff --git a/Utility/EnumHelper.cs b/Utility/EnumHelper.cs
index a53dd38..1ba069f 100644
--- a/Utility/EnumHelper.cs
+++ b/Utility/EnumHelper.cs
@@ -1176,7 +1176,8 @@
Pray = 18,//绁堟効
VIPExperience = 19,//vip浣撻獙
FairyLandBuyTimes = 20,//浠欑晫绉樺璐拱娆℃暟
- TeamAutoAccept=21,//鑷姩鎺ュ彈缁勯槦閭�璇�
+ TeamAutoAccept = 21,//鑷姩鎺ュ彈缁勯槦閭�璇�
+ TrialExchange = 22,//瀹楅棬璇曠偧鍏戞崲鏉愭枡
QuestCanAccept = 100,//浠诲姟鍙帴
QuestCanDo = 101,//浠诲姟鍙繘琛�
--
Gitblit v1.8.0