From e2510985a94f54236db54198063fedc0f960fa4a Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期四, 25 十二月 2025 14:22:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/NewBieGuidance/NewBieGuideScriptableObject.cs | 1
Main/System/BillboardRank/RankModel.cs | 8 ++++
Main/System/HeroUI/HeroGiftEatWin.cs | 2
Main/System/HeroUI/HeroBaseWin.cs | 15 +++++--
Main/System/Main/MainWin.cs | 2
Main/Config/PartialConfigs/PlayerPropertyConfig.cs | 27 +++++++++++++
Main/System/HappyXB/HappyXBModel.cs | 1
Main/System/TianziBillborad/TianziBillboradPlayerTop3Cell.cs | 2 +
Main/System/NewBieGuidance/NewBieWin.cs | 8 +++
9 files changed, 59 insertions(+), 7 deletions(-)
diff --git a/Main/Config/PartialConfigs/PlayerPropertyConfig.cs b/Main/Config/PartialConfigs/PlayerPropertyConfig.cs
index 5a65d14..401630f 100644
--- a/Main/Config/PartialConfigs/PlayerPropertyConfig.cs
+++ b/Main/Config/PartialConfigs/PlayerPropertyConfig.cs
@@ -106,6 +106,33 @@
}
}
+ public static string GetBaseFullDescription(int id, long value, string format="{0}+{1}")
+ {
+ var config = Get(id);
+ if (config == null)
+ {
+ return string.Empty;
+ }
+ string showName = config.ShowName;
+ if (id == 6 || id == 16)
+ {
+ showName = Language.Get("herocard59");
+ }
+ else if (id == 7 || id == 17)
+ {
+ showName = Language.Get("herocard60");
+ }
+ else if (id == 8 || id == 18)
+ {
+ showName = Language.Get("herocard61");
+ }
+ return string.Format(format, showName, GetValueDescription(id, value));
+ }
+
+
+
+
+
//largeNumFormat 澶ф暟鍊兼牸寮忥細0 榛樿鍘熸暟鍊� 1 鎸変竾鎴栬��(K)鏄剧ず 2 鎸�6浣嶆暟浠ヤ笂锛堟墠杞崲澶ф暟鍊硷紝鏍规嵁鎯呭喌鍙粺涓�璋冩暣锛�
public static string GetValueDescription(int id, long value, int largeNumFormat = 2)
{
diff --git a/Main/System/BillboardRank/RankModel.cs b/Main/System/BillboardRank/RankModel.cs
index 4f826fb..d189d4d 100644
--- a/Main/System/BillboardRank/RankModel.cs
+++ b/Main/System/BillboardRank/RankModel.cs
@@ -210,6 +210,14 @@
}
ranksServerMaxCnt[rankType] = package.DataTotal;
+ if (package.DataTotal == 0)
+ {
+ m_RankPageDatas[rankType].Clear();
+ m_RankIDToIndex[rankType].Clear();
+ onRankRefresh?.Invoke(package.Type);
+ return;
+ }
+
for (int i = 0; i < package.PageDataCnt; i++)
{
int id = (int)package.PageDataList[i].ID;
diff --git a/Main/System/HappyXB/HappyXBModel.cs b/Main/System/HappyXB/HappyXBModel.cs
index 28dd01d..faf75db 100644
--- a/Main/System/HappyXB/HappyXBModel.cs
+++ b/Main/System/HappyXB/HappyXBModel.cs
@@ -41,6 +41,7 @@
public int lhQuality;
public int tenCallGuideID = 0;
+ public bool startTenCallGuide = false;
public override void Init()
{
diff --git a/Main/System/HeroUI/HeroBaseWin.cs b/Main/System/HeroUI/HeroBaseWin.cs
index 5342bd9..422fab3 100644
--- a/Main/System/HeroUI/HeroBaseWin.cs
+++ b/Main/System/HeroUI/HeroBaseWin.cs
@@ -24,16 +24,23 @@
}
+ protected override void OnOpen()
+ {
+ if (HappyXBModel.Instance.startTenCallGuide)
+ {
+ NewBieCenter.Instance.StartNewBieGuide(HappyXBModel.Instance.tenCallGuideID);
+ HappyXBModel.Instance.startTenCallGuide = false;
+
+ }
+ }
+
protected override void OnPreClose()
{
base.OnPreClose();
+
}
- public override void Refresh()
- {
-
- }
diff --git a/Main/System/HeroUI/HeroGiftEatWin.cs b/Main/System/HeroUI/HeroGiftEatWin.cs
index 70ffe29..ba5ca91 100644
--- a/Main/System/HeroUI/HeroGiftEatWin.cs
+++ b/Main/System/HeroUI/HeroGiftEatWin.cs
@@ -71,7 +71,7 @@
for (int i = 0; i < addAttrTexts.Length; i++)
{
int id = PlayerPropertyConfig.basePerAttrs[i];
- addAttrTexts[i].text = PlayerPropertyConfig.GetFullDescription(id, hero.qualityConfig.StarAddPer,
+ addAttrTexts[i].text = PlayerPropertyConfig.GetBaseFullDescription(id, hero.qualityConfig.StarAddPer,
"{0}+" + UIHelper.AppendColor(TextColType.Green, "{1}", true));
}
addGiftTip.SetActive(!hero.IsFullGift());
diff --git a/Main/System/Main/MainWin.cs b/Main/System/Main/MainWin.cs
index a19babd..5eb3a31 100644
--- a/Main/System/Main/MainWin.cs
+++ b/Main/System/Main/MainWin.cs
@@ -303,7 +303,7 @@
{
if (!NewBieCenter.Instance.inGuiding)
{
- NewBieCenter.Instance.StartNewBieGuide(HappyXBModel.Instance.tenCallGuideID);
+ HappyXBModel.Instance.startTenCallGuide = true;
}
}
currentSubUI = UIManager.Instance.OpenWindow<HeroBaseWin>(0);
diff --git a/Main/System/NewBieGuidance/NewBieGuideScriptableObject.cs b/Main/System/NewBieGuidance/NewBieGuideScriptableObject.cs
index 155e93f..c97395d 100644
--- a/Main/System/NewBieGuidance/NewBieGuideScriptableObject.cs
+++ b/Main/System/NewBieGuidance/NewBieGuideScriptableObject.cs
@@ -23,6 +23,7 @@
public bool clickAnyWhereComplete = false;
public bool clickCompleteNoMask = false; //闈炲己鍒跺紩瀵硷紝浠绘剰鐐瑰嚮鍏抽棴锛屽嬀閫夋椤逛細闅愯棌钂欑増锛屼笖鐐瑰嚮鍏朵粬鍖哄煙涓嶄細鍝嶅簲鎸夐挳浜嬩欢
public int delayTime = 0; //灞曠ず鏃堕棿锛堟绉掞級锛屾湡闂翠笉鍙偣鍑�
+ public string needWinName;
// 寮曞鐨勬枃鏈殑绠ご浣嶇疆
public enum ArrowPosition
diff --git a/Main/System/NewBieGuidance/NewBieWin.cs b/Main/System/NewBieGuidance/NewBieWin.cs
index a630c6e..4b601cc 100644
--- a/Main/System/NewBieGuidance/NewBieWin.cs
+++ b/Main/System/NewBieGuidance/NewBieWin.cs
@@ -140,6 +140,12 @@
{
m_lastTargetPosition = m_ClickTarget.position;
tryGuideCount = 0;
+ if (!string.IsNullOrEmpty(stepConfig.needWinName) && !UIManager.Instance.IsOpened(stepConfig.needWinName))
+ {
+ Debug.Log($"寮曞姝ラ{step}闇�瑕佹墦寮�绐楀彛{stepConfig.needWinName}");
+ ReportStepOver();
+ return;
+ }
}
else
{
@@ -147,7 +153,7 @@
{
#if UNITY_EDITOR
- if (!string.IsNullOrEmpty(stepConfig.UIElementPath))
+ if (!string.IsNullOrEmpty(stepConfig.UIElementPath) && string.IsNullOrEmpty(stepConfig.needWinName))
Debug.LogError($"寮曞姝ラ{step}鎵句笉鍒扮洰鏍噞stepConfig.UIElementPath}, 鑻ヤ笉闇�瑕佽鍒犻櫎璺緞");
#endif
ReportStepOver();
diff --git a/Main/System/TianziBillborad/TianziBillboradPlayerTop3Cell.cs b/Main/System/TianziBillborad/TianziBillboradPlayerTop3Cell.cs
index 54dcb33..7bd702a 100644
--- a/Main/System/TianziBillborad/TianziBillboradPlayerTop3Cell.cs
+++ b/Main/System/TianziBillborad/TianziBillboradPlayerTop3Cell.cs
@@ -23,12 +23,14 @@
rankValueText.text = "0";//Language.Get("L1125");
nameText.text = Language.Get("L1124");
officialTitleCell.SetActive(false);
+ model.SetActive(false);
return;
}
officialTitleCell.SetActive(true);
rankValueText.text = string.Format(valueFormat, UIHelper.ReplaceLargeNum(rankData.cmpValue2 + rankData.cmpValue * Constants.ExpPointValue));
nameText.text = rankData.name1;
officialTitleCell.InitUI((int)rankData.value1, (int)rankData.value2);
+ model.SetActive(true);
model.Create(HorseManager.Instance.GetOtherPlayerHorseSkinID((int)rankData.value6), (int)rankData.value5, rank == 1 ? 1f : 0.8f);
}
--
Gitblit v1.8.0