From 332610ed31d7ac8ca75ab9dfdf47f480d1829b10 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 07 十一月 2025 12:42:04 +0800
Subject: [PATCH] 236 子 【福利内容】每日任务/每周任务/章节奖励 / 【福利内容】每日任务/每周任务/章节奖励-客户端
---
Main/System/Main/RightFuncInHome.cs | 7 ++++++-
Main/System/DayMission/DayMissionCell.cs | 1 +
Main/System/Battle/BattleManager.cs | 2 ++
Main/Config/PartialConfigs/SuccessConfig.cs | 2 +-
Main/System/Achievement/AchievementManager.cs | 4 ++--
Main/System/DayMission/MissionHeroRoadCell.cs | 9 ++++++++-
Main/System/NewBieGuidance/NewBieCenter.cs | 11 +++++++++++
7 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/Main/Config/PartialConfigs/SuccessConfig.cs b/Main/Config/PartialConfigs/SuccessConfig.cs
index 96f1802..9952c7e 100644
--- a/Main/Config/PartialConfigs/SuccessConfig.cs
+++ b/Main/Config/PartialConfigs/SuccessConfig.cs
@@ -26,7 +26,7 @@
if (typeToIDsDict.ContainsKey(type))
{
var conds = Get(typeToIDsDict[type][0]).Condition;
- return conds.IsNullOrEmpty() ? "" : conds.ToString();
+ return conds.IsNullOrEmpty() ? "" : string.Join("|", conds);
}
return "";
}
diff --git a/Main/System/Achievement/AchievementManager.cs b/Main/System/Achievement/AchievementManager.cs
index f67a54f..e5a97f6 100644
--- a/Main/System/Achievement/AchievementManager.cs
+++ b/Main/System/Achievement/AchievementManager.cs
@@ -37,7 +37,7 @@
achivementDict[info.SuccType] = new Dictionary<string, int>();
}
- string key = info.CLen > 0 ? info.Conds.ToString() : "";
+ string key = info.CLen > 0 ? string.Join("|", info.Conds) : "";
achivementDict[info.SuccType][key] = (int)info.CurValue;
OnAchievementUpdateEvent?.Invoke(info.SuccType);
@@ -104,8 +104,8 @@
//鑾峰彇鎴愬氨鐘舵�� 0: 鏈鍙� 1: 鏈揪鎴� 2: 宸查鍙�
public int GetAchievementState(int id)
{
- var process = GetAchievementProgress(id);
var config = SuccessConfig.Get(id);
+ var process = GetAchievementProgress(config.Type);
if (process < config.NeedCnt)
{
return 1;
diff --git a/Main/System/Battle/BattleManager.cs b/Main/System/Battle/BattleManager.cs
index f879dec..23bd7dc 100644
--- a/Main/System/Battle/BattleManager.cs
+++ b/Main/System/Battle/BattleManager.cs
@@ -29,6 +29,7 @@
public int fightGuideID;
public int fightGuideMainLevelLimit;
public int fightGuideNoClickSeconds;
+ public int[] challengeBossGuides;
public Action<string, BattleField> onBattleFieldCreate;
@@ -56,6 +57,7 @@
fightGuideID = int.Parse(config.Numerical1);
fightGuideMainLevelLimit = int.Parse(config.Numerical2);
fightGuideNoClickSeconds = int.Parse(config.Numerical3);
+ challengeBossGuides = JsonMapper.ToObject<int[]>(config.Numerical4);
config = FuncConfigConfig.Get("BattleButton");
passRound= int.Parse(config.Numerical1);
diff --git a/Main/System/DayMission/DayMissionCell.cs b/Main/System/DayMission/DayMissionCell.cs
index d6cec92..de1928b 100644
--- a/Main/System/DayMission/DayMissionCell.cs
+++ b/Main/System/DayMission/DayMissionCell.cs
@@ -34,6 +34,7 @@
mask.SetActive(true);
gotoBtn.AddListener(()=>
{
+ RightFuncInHome.RemoveListenWindow();
UIManager.Instance.CloseWindow<DayMissionBaseWin>();
NewBieCenter.Instance.StartNewBieGuide(config.GuideID);
});
diff --git a/Main/System/DayMission/MissionHeroRoadCell.cs b/Main/System/DayMission/MissionHeroRoadCell.cs
index 68fe83a..27c209d 100644
--- a/Main/System/DayMission/MissionHeroRoadCell.cs
+++ b/Main/System/DayMission/MissionHeroRoadCell.cs
@@ -55,11 +55,18 @@
gotRect.SetActive(state == 2);
mask.SetActive(state == 2);
-
+
getBtn.AddListener(() =>
{
AchievementManager.Instance.SendGetAward(id);
});
+
+ gotoBtn.AddListener(() =>
+ {
+ RightFuncInHome.RemoveListenWindow();
+ UIManager.Instance.CloseWindow<DayMissionBaseWin>();
+ NewBieCenter.Instance.StartNewBieGuide(BattleManager.Instance.challengeBossGuides[0]);
+ });
}
diff --git a/Main/System/Main/RightFuncInHome.cs b/Main/System/Main/RightFuncInHome.cs
index 57c9b5b..19f020c 100644
--- a/Main/System/Main/RightFuncInHome.cs
+++ b/Main/System/Main/RightFuncInHome.cs
@@ -15,7 +15,7 @@
[SerializeField] Button monthCardBtn;
[SerializeField] Button dayMissionBtn;
- string listenWindowName = ""; //鐩戝惉鍏抽棴鏃跺啀鏄剧ず
+ static string listenWindowName = ""; //鐩戝惉鍏抽棴鏃跺啀鏄剧ず
bool isShow = false;
void Awake()
@@ -91,5 +91,10 @@
listenWindowName = _listenWindowName;
}
+ public static void RemoveListenWindow()
+ {
+ listenWindowName = "";
+ }
+
}
diff --git a/Main/System/NewBieGuidance/NewBieCenter.cs b/Main/System/NewBieGuidance/NewBieCenter.cs
index 55688be..dc303e9 100644
--- a/Main/System/NewBieGuidance/NewBieCenter.cs
+++ b/Main/System/NewBieGuidance/NewBieCenter.cs
@@ -247,6 +247,8 @@
return false;
}
+ _id = ReplaceGuideID(_id);
+
var config = GuideConfig.Get(_id);
if (config == null)
{
@@ -521,7 +523,16 @@
}
}
+ //鍔ㄦ�佸彉鍖栧紩瀵�
+ public int ReplaceGuideID(int id)
+ {
+ if (id == BattleManager.Instance.challengeBossGuides[0] && MainLevelManager.Instance.CanChallengeBoss())
+ {
+ return BattleManager.Instance.challengeBossGuides[1];
+ }
+ return id;
+ }
}
--
Gitblit v1.8.0