From aa37abe50850c34c934f8e2d17bc30632bb081f3 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 27 十月 2025 14:14:24 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Equip/ItemsOnFloor.cs | 3 ++-
Main/System/BoneField/BoneFieldWin.cs | 18 ++++++++++++++++--
Main/System/Arena/ArenaManager.cs | 2 +-
Main/System/NewBieGuidance/NewBieWin.cs | 3 +++
4 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/Main/System/Arena/ArenaManager.cs b/Main/System/Arena/ArenaManager.cs
index 688c257..70c9467 100644
--- a/Main/System/Arena/ArenaManager.cs
+++ b/Main/System/Arena/ArenaManager.cs
@@ -219,7 +219,7 @@
public Dictionary<int, int[][]> GetArenaAwardDict(int functionOrder)
{
- return functionOrder == 0 ? dailyRankRewards : seasonRankRewards;
+ return functionOrder == 0 ? seasonRankRewards : dailyRankRewards;
}
public void SendViewGameRecPack()
diff --git a/Main/System/BoneField/BoneFieldWin.cs b/Main/System/BoneField/BoneFieldWin.cs
index 2b81791..9be1550 100644
--- a/Main/System/BoneField/BoneFieldWin.cs
+++ b/Main/System/BoneField/BoneFieldWin.cs
@@ -4,6 +4,8 @@
{
[SerializeField] TextEx txtDifficulty;
[SerializeField] TextEx txtBossName;
+ [SerializeField] ImageEx imgMoneyCount;
+ [SerializeField] TextEx txtNeedMoneyCount;
[SerializeField] TextEx txtTodaySweepCount;
[SerializeField] TextEx txtTodayAdsCount;
[SerializeField] TextEx txtFirstFree;
@@ -203,7 +205,19 @@
imgSweepRed.SetActive(isSweepCountOk && myFightPower < dungeonConfig.FightPower);
txtFirstFree.SetActive(showSweepMaxCount == showrealRemainSweepCount);
txtTodaySweepCount.SetActive(showSweepMaxCount > showrealRemainSweepCount);
- txtTodaySweepCount.text = UIHelper.AppendColor(isSweepCountOk ? TextColType.Green : TextColType.Red, Language.Get("BoneField08", showrealRemainSweepCount, showSweepMaxCount));
+ txtTodaySweepCount.text = UIHelper.AppendColor(isSweepCountOk ? TextColType.LightGreen : TextColType.Red, Language.Get("BoneField08", showrealRemainSweepCount, showSweepMaxCount));
+ imgMoneyCount.SetActive(showSweepMaxCount != showrealRemainSweepCount && isSweepCountOk);
+ txtNeedMoneyCount.SetActive(showSweepMaxCount != showrealRemainSweepCount && isSweepCountOk);
+ if (showSweepMaxCount != showrealRemainSweepCount && isSweepCountOk)
+ {
+ int dataMapID = BoneFieldManager.Instance.DataMapID;
+ DungeonOpenTimeConfig config = DungeonOpenTimeConfig.Get(dataMapID);
+ int index = Mathf.Min(Mathf.Max(0, showSweepMaxCount - showrealRemainSweepCount - 1), config.PayMoneyValues.Length - 1);
+ int payMoneyValue = config.PayMoneyValues[index];
+ int payMoneyType = config.PayMoneyType;
+ imgMoneyCount.SetIconWithMoneyType(payMoneyType);
+ txtNeedMoneyCount.text = payMoneyValue.ToString();
+ }
}
public void DisplayAdsButton(ADAwardConfig aDAwardConfig)
@@ -212,7 +226,7 @@
bool isShowAds = adsCnt < aDAwardConfig.ADCntMax;
int remainAdsCount = aDAwardConfig.ADCntMax - adsCnt;
btnAds.SetActive(isShowAds);
- txtTodayAdsCount.text = UIHelper.AppendColor(isShowAds ? TextColType.Green : TextColType.Red, Language.Get("BoneField09", remainAdsCount, aDAwardConfig.ADCntMax)); ;
+ txtTodayAdsCount.text = UIHelper.AppendColor(isShowAds ? TextColType.LightGreen : TextColType.Red, Language.Get("BoneField09", remainAdsCount, aDAwardConfig.ADCntMax)); ;
}
public void DisplayItemCellList(List<ItemCell> itemCells, int[][] items)
diff --git a/Main/System/Equip/ItemsOnFloor.cs b/Main/System/Equip/ItemsOnFloor.cs
index dc61532..5bc8e96 100644
--- a/Main/System/Equip/ItemsOnFloor.cs
+++ b/Main/System/Equip/ItemsOnFloor.cs
@@ -109,7 +109,8 @@
}
if (item.isActiveAndEnabled)
{
- //闃茶寖涓�鐩存挱鏀炬帀钀藉姩鐢�
+ //闃茶寖涓�鐩存挱鏀炬帀钀藉姩鐢�,鏌愮鍘熷洜琚墦鏂簡鍚庣画鐨勭晫闈㈡樉绀猴紝杩欓噷鐩存帴瑙﹀彂鎵撳紑鐣岄潰
+ EquipModel.Instance.CalcFloorEquip(i);
continue;
}
diff --git a/Main/System/NewBieGuidance/NewBieWin.cs b/Main/System/NewBieGuidance/NewBieWin.cs
index a76c333..428c80b 100644
--- a/Main/System/NewBieGuidance/NewBieWin.cs
+++ b/Main/System/NewBieGuidance/NewBieWin.cs
@@ -32,6 +32,7 @@
[SerializeField] Transform m_NewBieGuide;
[SerializeField] Transform m_ContainerDialogue;
[SerializeField] RichText m_Dialogue;
+ [SerializeField] RectTransform m_DialogueBG;
[SerializeField] Image m_ArrowUP;
[SerializeField] Image m_ArrowDown;
[SerializeField] Image m_ArrowLeft;
@@ -253,6 +254,8 @@
{
m_ContainerDialogue.SetActive(true);
m_Dialogue.text = stepConfig.GetTipContent();
+ //寮哄埗鍒锋柊涓�娆� contentSizeFitter 鐨勮绠�
+ LayoutRebuilder.ForceRebuildLayoutImmediate(m_DialogueBG);
m_ArrowUP.SetActive(stepConfig.arrowPosition == NewBieGuideScriptableObject.ArrowPosition.Top);
m_ArrowDown.SetActive(stepConfig.arrowPosition == NewBieGuideScriptableObject.ArrowPosition.Bottom);
m_ArrowLeft.SetActive(stepConfig.arrowPosition == NewBieGuideScriptableObject.ArrowPosition.Left);
--
Gitblit v1.8.0