From 22c57e95fdffc808ea85940c1e6e08bf15d42efe Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期六, 24 十一月 2018 11:04:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Dungeon/IceCrystalVeinModel.cs | 1
System/Dungeon/AssistCheckInSuccessWin.cs.meta | 12 +++
System/Dungeon/AssistPlayerCell.cs | 68 ++++++++++++++++-
System/Dungeon/DungeonAssistModel.cs | 5 +
System/Dungeon/AssistCheckInSuccessWin.cs | 52 +++++++++++++
System/Dungeon/DungeonGradeWin.cs | 17 +--
System/Dungeon/DungeonAssistPlayerWin.cs | 6
System/Dungeon/IceCrystalVeinWin.cs | 13 ++
Fight/GameActor/GA_Hero.cs | 4 +
System/DailyQuest/DailyQuestModel.cs | 2
System/Dungeon/DungeonAssistWin.cs | 26 ++++--
11 files changed, 175 insertions(+), 31 deletions(-)
diff --git a/Fight/GameActor/GA_Hero.cs b/Fight/GameActor/GA_Hero.cs
index cd7793c5..650cd59 100644
--- a/Fight/GameActor/GA_Hero.cs
+++ b/Fight/GameActor/GA_Hero.cs
@@ -884,6 +884,10 @@
private IEnumerator Wait()
{
yield return WaitingForSecondConst.WaitMS1500;
+ if (WindowCenter.Instance.Open<VipExperienceWin>())
+ {
+ yield break;
+ }
if (PlayerDatas.Instance.extersion.bossState == 1)
{
yield break;
diff --git a/System/DailyQuest/DailyQuestModel.cs b/System/DailyQuest/DailyQuestModel.cs
index 3e2b17a..9c642d8 100644
--- a/System/DailyQuest/DailyQuestModel.cs
+++ b/System/DailyQuest/DailyQuestModel.cs
@@ -833,6 +833,8 @@
{
return DailyQuestState.CanBuyTimes;
}
+ case 19:
+ return DailyQuestState.Normal;
default:
return DailyQuestState.Completed;
}
diff --git a/System/Dungeon/AssistCheckInSuccessWin.cs b/System/Dungeon/AssistCheckInSuccessWin.cs
new file mode 100644
index 0000000..974d9dd
--- /dev/null
+++ b/System/Dungeon/AssistCheckInSuccessWin.cs
@@ -0,0 +1,52 @@
+锘縰sing UnityEngine;
+using UnityEngine.UI;
+
+namespace Snxxz.UI
+{
+ [XLua.Hotfix]
+ public class AssistCheckInSuccessWin : Window
+ {
+ [SerializeField] Text infoText;
+ [SerializeField] Text conditionText;
+ [SerializeField] Button sureBtn;
+ [SerializeField] Button closeBtn;
+
+ DungeonAssistModel assistModel { get { return ModelCenter.Instance.GetModel<DungeonAssistModel>(); } }
+ #region Built-in
+ protected override void BindController()
+ {
+
+ }
+ protected override void AddListeners()
+ {
+ sureBtn.AddListener(CloseClick);
+ closeBtn.AddListener(CloseClick);
+ }
+ protected override void OnPreOpen()
+ {
+ SetDisplay();
+ }
+ protected override void OnAfterOpen()
+ {
+
+ }
+
+ protected override void OnPreClose()
+ {
+
+ }
+
+ protected override void OnAfterClose()
+ {
+
+ }
+ #endregion
+
+ public void SetDisplay()
+ {
+ infoText.text = Language.Get("DungeonAssist123",10);
+ conditionText.text = Language.Get("DungeonAssist124",assistModel.checkInTotalTime);
+ }
+
+ }
+}
diff --git a/System/Dungeon/AssistCheckInSuccessWin.cs.meta b/System/Dungeon/AssistCheckInSuccessWin.cs.meta
new file mode 100644
index 0000000..20296ec
--- /dev/null
+++ b/System/Dungeon/AssistCheckInSuccessWin.cs.meta
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 9950bf1cb2fa6324d883d04122d4837b
+timeCreated: 1543024934
+licenseType: Pro
+MonoImporter:
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/System/Dungeon/AssistPlayerCell.cs b/System/Dungeon/AssistPlayerCell.cs
index 36a4ee1..d042809 100644
--- a/System/Dungeon/AssistPlayerCell.cs
+++ b/System/Dungeon/AssistPlayerCell.cs
@@ -2,6 +2,7 @@
using UnityEngine.UI;
using TableConfig;
using System;
+using System.Collections.Generic;
namespace Snxxz.UI
{
@@ -32,12 +33,13 @@
private void OnEnable()
{
+ goldHelpBtn.AddListener(ClickGoldHelp);
assistModel.UpdataAssistPlayerEvent += UpdateAssistState;
}
private void OnDisable()
{
- helpBtn.RemoveAllListeners();
+ goldHelpBtn.RemoveAllListeners();
assistModel.UpdataAssistPlayerEvent -= UpdateAssistState;
}
@@ -51,12 +53,13 @@
int realmLv = playerInfo.RealmLV;
var realmConfig = Config.Instance.Get<RealmConfig>(playerInfo.RealmLV);
realmIcon.SetSprite(realmConfig == null ? "NoRealm" : realmConfig.Img);
- fightPowerText.text = StringUtility.Contact("鎴樺姏锛�",playerInfo.FightPower);
+ fightPowerText.text = StringUtility.Contact(Language.Get("MainInterfacePanel_HeadPortraitTip_ZL"),playerInfo.FightPower);
helpBtn.gameObject.SetActive(!playerInfo.IsGoldAssist);
goldHelpBtn.gameObject.SetActive(playerInfo.IsGoldAssist);
UpdateAssistState(playerInfo.PlayerID);
jobNameText.text = OccupationNameConfig.GetOccupationName(playerInfo.Job,1);
goldHelpText.text = assistModel.goldAssistPlayer.ToString();
+ UpdateAssistReward();
int nirvanaLv = playerInfo.LV - friendsModel.OpenGreatLV;
lvIcon.gameObject.SetActive(nirvanaLv > 0);
if (nirvanaLv > 0)
@@ -76,14 +79,51 @@
if(playerInfo.IsAssist)
{
- helpText.text = "宸插彫鍞�";
+ helpText.text = Language.Get("DungeonAssist122");
helpBgImg.material = MaterialUtility.GetDefaultSpriteGrayMaterial();
}
else
{
helpBtn.AddListener(ClickHelp);
- helpText.text = "鍙敜";
+ helpText.text = Language.Get("DungeonAssist121");
helpBgImg.material = MaterialUtility.GetUIDefaultGraphicMaterial();
+ }
+ }
+
+ public void UpdateAssistReward()
+ {
+ if (playerInfo == null) return;
+
+ var related = playerInfo.relatedToPlayer;
+ List<int> rewards = null;
+ int sumCoins = 0;
+ switch (related)
+ {
+ case DungeonAssistModel.RelatedToPlayer.Ally:
+ rewards = assistModel.GetAssistReward(2);
+ break;
+ case DungeonAssistModel.RelatedToPlayer.Friend:
+ case DungeonAssistModel.RelatedToPlayer.FriendAndAlly:
+ rewards = assistModel.GetAssistReward(1);
+ break;
+ }
+
+ if (rewards != null)
+ {
+ for (int i = 0; i < rewards.Count; i++)
+ {
+ sumCoins += rewards[i];
+ }
+ }
+
+ if (sumCoins > 0)
+ {
+ rewardText.gameObject.SetActive(true);
+ rewardText.text = Language.Get("DungeonAssist127", sumCoins);
+ }
+ else
+ {
+ rewardText.gameObject.SetActive(false);
}
}
@@ -94,5 +134,25 @@
assistModel.SendPlayerAssist(0,playerInfo.PlayerID,playerInfo.IsNeedGold);
}
+ private void ClickGoldHelp()
+ {
+ ulong haveMoney = UIHelper.GetMoneyCnt(1) + UIHelper.GetMoneyCnt(2);
+ ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),Language.Get("DungeonAssist131",assistModel.goldAssistPlayer),
+ (bool isOk)=>
+ {
+ if(isOk)
+ {
+ if(haveMoney >= (ulong)assistModel.goldAssistPlayer)
+ {
+ assistModel.SendPlayerAssist(0, playerInfo.PlayerID, playerInfo.IsNeedGold);
+ }
+ else
+ {
+ WindowCenter.Instance.Open<RechargeTipWin>();
+ }
+ }
+ });
+ }
+
}
}
diff --git a/System/Dungeon/DungeonAssistModel.cs b/System/Dungeon/DungeonAssistModel.cs
index f3f8a2e..10aa2f5 100644
--- a/System/Dungeon/DungeonAssistModel.cs
+++ b/System/Dungeon/DungeonAssistModel.cs
@@ -89,6 +89,7 @@
public int refreshCostMoney { get; private set; }
public int maxXianYuanCoins { get; private set; }
public int checkInTotalTime { get; private set; }
+ public int assistRobotId { get; private set; }
public Dictionary<int, List<int>> assistCoinsDict { get; private set; }
private void ParseFuncConfig()
{
@@ -119,6 +120,8 @@
}
FuncConfigConfig HelpBattleCheckIn = Config.Instance.Get<FuncConfigConfig>("HelpBattleCheckIn");
checkInTotalTime = int.Parse(HelpBattleCheckIn.Numerical1);
+ FuncConfigConfig HelpBattleRobot = Config.Instance.Get<FuncConfigConfig>("HelpBattleRobot");
+ assistRobotId = int.Parse(HelpBattleRobot.Numerical1);
}
/// <summary>
@@ -394,6 +397,8 @@
}
else
{
+ NPCConfig nPCConfig = Config.Instance.Get<NPCConfig>(assistModel.assistRobotId);
+ Name = nPCConfig.charName;
relatedToPlayer = RelatedToPlayer.None;
int mapId = PlayerDatas.Instance.baseData.MapID;
int lineId = PlayerDatas.Instance.baseData.dungeonLineId;
diff --git a/System/Dungeon/DungeonAssistPlayerWin.cs b/System/Dungeon/DungeonAssistPlayerWin.cs
index 0a1b839..b3d44a8 100644
--- a/System/Dungeon/DungeonAssistPlayerWin.cs
+++ b/System/Dungeon/DungeonAssistPlayerWin.cs
@@ -102,12 +102,12 @@
goldRefreshBtn.gameObject.SetActive(!isFree);
if(isFree)
{
- freeRefreshText.text = StringUtility.Contact("鍓╀綑", remainNum, "娆�");
+ freeRefreshText.text = Language.Get("DungeonAssist129",remainNum);
}
else
{
goldRefreshCostMoneyText.text = assistModel.refreshCostMoney.ToString();
- goldRefreshRemianNumText.text = StringUtility.Contact("鍓╀綑", remainNum, "娆�");
+ goldRefreshRemianNumText.text = Language.Get("DungeonAssist129", remainNum);
}
}
@@ -115,7 +115,7 @@
{
if(time > 0)
{
- oneKeyHelpText.text = StringUtility.Contact(time,"绉掑悗鑷姩鍒锋柊");
+ oneKeyHelpText.text = Language.Get("DungeonAssist128", time);
}
else
{
diff --git a/System/Dungeon/DungeonAssistWin.cs b/System/Dungeon/DungeonAssistWin.cs
index 7874790..0f81a73 100644
--- a/System/Dungeon/DungeonAssistWin.cs
+++ b/System/Dungeon/DungeonAssistWin.cs
@@ -31,7 +31,7 @@
protected override void OnPreOpen()
{
- assistModel.UpdateCheckInResultEvent += UpdateCheckIn;
+ assistModel.UpdateCheckInResultEvent += UpdateCheckInResult;
assistModel.UpdateResultEvent += UpdateResult;
SetDisplay();
}
@@ -44,7 +44,7 @@
protected override void OnPreClose()
{
assistModel.UpdateResultEvent -= UpdateResult;
- assistModel.UpdateCheckInResultEvent -= UpdateCheckIn;
+ assistModel.UpdateCheckInResultEvent -= UpdateCheckInResult;
}
protected override void OnAfterClose()
@@ -56,6 +56,7 @@
private void SetDisplay()
{
CreateResultCell();
+ UpdateRegisterBtn();
}
private void CreateResultCell()
@@ -77,16 +78,26 @@
CreateResultCell();
}
- private void UpdateCheckIn()
+ private void UpdateRegisterBtn()
{
registerBtn.RemoveAllListeners();
- if(assistModel.IsCheckInOk)
+ if (assistModel.IsCheckInOk)
{
-
+ registerBgImg.material = MaterialUtility.GetDefaultSpriteGrayMaterial();
}
else
{
+ registerBgImg.material = MaterialUtility.GetUIDefaultGraphicMaterial();
registerBtn.AddListener(ClickAssistRegister);
+ }
+ }
+
+ private void UpdateCheckInResult()
+ {
+ UpdateRegisterBtn();
+ if(assistModel.IsCheckInOk)
+ {
+ WindowCenter.Instance.Open<AssistCheckInSuccessWin>();
}
}
@@ -96,11 +107,6 @@
{
assistModel.SendAssistCheckIn();
}
- else
- {
-
- }
-
}
private void ClickStore()
diff --git a/System/Dungeon/DungeonGradeWin.cs b/System/Dungeon/DungeonGradeWin.cs
index 7cbfed1..ffc3c9c 100644
--- a/System/Dungeon/DungeonGradeWin.cs
+++ b/System/Dungeon/DungeonGradeWin.cs
@@ -41,10 +41,6 @@
DateTime dungeonEndTime;
private bool exitDungeonStage = false;
- public enum CopyMapId
- {
- IceCrystalVein=31140,
- }
private DungeonModel model
{
get
@@ -65,7 +61,6 @@
protected override void OnPreOpen()
{
model.dungeonCoolDownEvent += DungeonCoolDownEvent;
- DebugEx.LogError(PlayerDatas.Instance.baseData.MapID);
SetTween(gradePosTween, gradeScaleTween, 0);
SetTween(expPosTween, expScaleTween, 0);
@@ -98,7 +93,7 @@
int rate = 0;
if (model.GetRewardRateWithGrade(_mapid, model.mission.grade, out rate))
{
- if (PlayerDatas.Instance.baseData.MapID == (int)CopyMapId.IceCrystalVein)
+ if (PlayerDatas.Instance.baseData.MapID ==IceCrystalVeinModel.ICECRYSTALVEIN_MAPID)
{
expGrade.SetSprite(GetStarNum(model.mission.grade));
}
@@ -112,7 +107,7 @@
}
else
{
- if (PlayerDatas.Instance.baseData.MapID == (int)CopyMapId.IceCrystalVein)
+ if (PlayerDatas.Instance.baseData.MapID == IceCrystalVeinModel.ICECRYSTALVEIN_MAPID)
{
grade.SetSprite(GetStarNum(model.mission.grade));
}
@@ -148,7 +143,7 @@
else if (index == 1)
{
expContainer.SetActive(false);
- if (PlayerDatas.Instance.baseData.MapID == (int)CopyMapId.IceCrystalVein)
+ if (PlayerDatas.Instance.baseData.MapID == IceCrystalVeinModel.ICECRYSTALVEIN_MAPID)
{
grade.SetSprite(GetStarNum(model.mission.grade));
}
@@ -171,7 +166,7 @@
endTime = model.GetCoolDownEndTime(type);
break;
case DungeonCoolDownType.LeaveMap:
- if (PlayerDatas.Instance.baseData.MapID == (int)CopyMapId.IceCrystalVein)
+ if (PlayerDatas.Instance.baseData.MapID == IceCrystalVeinModel.ICECRYSTALVEIN_MAPID)
{
surplusTime.text = Language.Get("IceCrystal_3", GetStarNumStr(model.mission.grade));
}
@@ -220,7 +215,7 @@
expContainer.SetActive(false);
gradeContainer.SetActive(false);
}
- if (PlayerDatas.Instance.baseData.MapID == (int)CopyMapId.IceCrystalVein)
+ if (PlayerDatas.Instance.baseData.MapID == IceCrystalVeinModel.ICECRYSTALVEIN_MAPID)
{
grade.SetSprite(GetStarNum(model.mission.grade));
}
@@ -267,7 +262,7 @@
}
}
else timeZeroShow = false;
- if (PlayerDatas.Instance.baseData.MapID == (int)CopyMapId.IceCrystalVein)
+ if (PlayerDatas.Instance.baseData.MapID == IceCrystalVeinModel.ICECRYSTALVEIN_MAPID)
{
surplusTime.text = Language.Get("DungeonGrade_3", TimeUtility.SecondsToHMSCHSRetain((int)surplus.TotalSeconds, false, false), GetStarNumStr(model.mission.grade - 1));
}
diff --git a/System/Dungeon/IceCrystalVeinModel.cs b/System/Dungeon/IceCrystalVeinModel.cs
index 6e02c88..563b706 100644
--- a/System/Dungeon/IceCrystalVeinModel.cs
+++ b/System/Dungeon/IceCrystalVeinModel.cs
@@ -36,6 +36,7 @@
public event Action UpdateIceLodeInf;
DungeonModel m_Model;
DungeonModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<DungeonModel>()); } }
+ public const int ICECRYSTALVEIN_MAPID = 31140;
public override void Init()
{
var IceLodeCfg = Config.Instance.Get<FuncConfigConfig>("IceLodeCfg");
diff --git a/System/Dungeon/IceCrystalVeinWin.cs b/System/Dungeon/IceCrystalVeinWin.cs
index 990381a..abf68a6 100644
--- a/System/Dungeon/IceCrystalVeinWin.cs
+++ b/System/Dungeon/IceCrystalVeinWin.cs
@@ -24,6 +24,7 @@
[SerializeField] Transform m_GridBottom;//搴曞眰缁�
[SerializeField] Text m_TextNumber;//鎵崱鎴樺姏
[SerializeField] Text m_Text_Fight;//鎴戠殑鎴樺姏
+ [SerializeField] Text m_TextLv;//鎸戞垬绛夌骇
ItemTipsModel _itemTipsModel;
ItemTipsModel itemTipsModel { get { return _itemTipsModel ?? (_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } }
IceCrystalVeinModel m_IceCrystalVeinModel;
@@ -43,8 +44,9 @@
for (int i = 0; i < IceCrystalVeinReward.Length; i++)
{
IceCrystalVeinMiddle.Add(IceCrystalVeinReward[i]);
- }
-
+ }
+ var Openconfig = Config.Instance.Get<FuncOpenLVConfig>(83);
+ m_TextLv.text = Language.Get("IceCrystal_4", Openconfig.LimitLV);
}
protected override void AddListeners()
@@ -128,6 +130,11 @@
var dungeonConfig = Config.Instance.Get<DungeonConfig>(dungeonId);
if (dungeonConfig == null)
{
+ return;
+ }
+ if (PlayerDatas.Instance.baseData.MapID == IceCrystalVeinModel.ICECRYSTALVEIN_MAPID)//鍓湰涓笉鍏佽鎵崱
+ {
+ SysNotifyMgr.Instance.ShowTip("IceCrystal_Sweep");
return;
}
if (dungeonConfig.SweepLVLimit > PlayerDatas.Instance.baseData.LV)
@@ -357,7 +364,7 @@
m_TextNumber.text = PlayerLV.IceLodeFightPower.ToString();
if (PlayerDatas.Instance.baseData.FightPoint >= PlayerLV.IceLodeFightPower)
{
- m_Text_Fight.color = new Color32(27,103,22,255);
+ m_Text_Fight.color = new Color32(16,157,6,255);
}
else
{
--
Gitblit v1.8.0