From 03930e86e9689e2ad9b3d622f53515c4f0d48b9b Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 17 九月 2025 17:34:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/Config/Configs/HeroConfig.cs | 47 +++++++++++++++++++++++++----------------------
Main/System/HappyXB/HeroCallResultWin.cs | 3 +++
Main/System/HeroUI/HeroUIManager.Collect.cs | 2 ++
Main/System/HeroUI/HeroUIManager.cs | 3 +++
4 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/Main/Config/Configs/HeroConfig.cs b/Main/Config/Configs/HeroConfig.cs
index 9f364eb..f388315 100644
--- a/Main/Config/Configs/HeroConfig.cs
+++ b/Main/Config/Configs/HeroConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: YYL
-// [ Date ]: 2025骞�9鏈�9鏃�
+// [ Date ]: Wednesday, September 17, 2025
//--------------------------------------------------------
using System.Collections.Generic;
@@ -18,6 +18,7 @@
public int HeroID;
public string Name;
+ public int PlayerCanUse;
public int Country;
public int Quality;
public int Class;
@@ -48,21 +49,23 @@
Name = tables[1];
- int.TryParse(tables[2],out Country);
+ int.TryParse(tables[2],out PlayerCanUse);
- int.TryParse(tables[3],out Quality);
+ int.TryParse(tables[3],out Country);
- int.TryParse(tables[4],out Class);
+ int.TryParse(tables[4],out Quality);
- int.TryParse(tables[5],out Position);
+ int.TryParse(tables[5],out Class);
- if (tables[6].Contains("["))
+ int.TryParse(tables[6],out Position);
+
+ if (tables[7].Contains("["))
{
- SkinIDList = JsonMapper.ToObject<int[]>(tables[6]);
+ SkinIDList = JsonMapper.ToObject<int[]>(tables[7]);
}
else
{
- string[] SkinIDListStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] SkinIDListStringArray = tables[7].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
SkinIDList = new int[SkinIDListStringArray.Length];
for (int i=0;i<SkinIDListStringArray.Length;i++)
{
@@ -70,25 +73,25 @@
}
}
- int.TryParse(tables[7],out AtkSkillID);
+ int.TryParse(tables[8],out AtkSkillID);
- int.TryParse(tables[8],out AngerSkillID);
+ int.TryParse(tables[9],out AngerSkillID);
- int.TryParse(tables[9],out AtkInheritPer);
+ int.TryParse(tables[10],out AtkInheritPer);
- int.TryParse(tables[10],out DefInheritPer);
+ int.TryParse(tables[11],out DefInheritPer);
- int.TryParse(tables[11],out HPInheritPer);
+ int.TryParse(tables[12],out HPInheritPer);
- BatAttrDict = ConfigParse.ParseIntDict(tables[12]);
+ BatAttrDict = ConfigParse.ParseIntDict(tables[13]);
- if (tables[13].Contains("["))
+ if (tables[14].Contains("["))
{
- FetterIDList = JsonMapper.ToObject<int[]>(tables[13]);
+ FetterIDList = JsonMapper.ToObject<int[]>(tables[14]);
}
else
{
- string[] FetterIDListStringArray = tables[13].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] FetterIDListStringArray = tables[14].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
FetterIDList = new int[FetterIDListStringArray.Length];
for (int i=0;i<FetterIDListStringArray.Length;i++)
{
@@ -96,17 +99,17 @@
}
}
- float.TryParse(tables[14],out UIScale);
+ float.TryParse(tables[15],out UIScale);
- Desc = tables[15];
+ Desc = tables[16];
- if (tables[16].Contains("["))
+ if (tables[17].Contains("["))
{
- TalentList = JsonMapper.ToObject<int[]>(tables[16]);
+ TalentList = JsonMapper.ToObject<int[]>(tables[17]);
}
else
{
- string[] TalentListStringArray = tables[16].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] TalentListStringArray = tables[17].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
TalentList = new int[TalentListStringArray.Length];
for (int i=0;i<TalentListStringArray.Length;i++)
{
diff --git a/Main/System/HappyXB/HeroCallResultWin.cs b/Main/System/HappyXB/HeroCallResultWin.cs
index 93b9a17..3b011d7 100644
--- a/Main/System/HappyXB/HeroCallResultWin.cs
+++ b/Main/System/HappyXB/HeroCallResultWin.cs
@@ -22,6 +22,7 @@
[SerializeField] GameObject result10LihuiObj; //鍗佽繛绔嬬粯灞曠ず
[SerializeField] UIHeroController roleLHModel;
+ [SerializeField] RawImage bgTexture;
[SerializeField] Image qualityImg;
[SerializeField] HeroCallResultCell showLHResultCell;
[SerializeField] Image newMarkLHImg;
@@ -303,6 +304,8 @@
newMarkLHImg.SetActive(HeroUIManager.Instance.IsNewHero(heroID));
showLHResultCell.Display(heroID, 0, true);
RefreshHeroInfo(heroID);
+
+ bgTexture.SetTexture2D("countryBG" + hero.Country);
}
void RefreshHeroInfo(int heroID)
diff --git a/Main/System/HeroUI/HeroUIManager.Collect.cs b/Main/System/HeroUI/HeroUIManager.Collect.cs
index fc12286..ce72014 100644
--- a/Main/System/HeroUI/HeroUIManager.Collect.cs
+++ b/Main/System/HeroUI/HeroUIManager.Collect.cs
@@ -71,6 +71,8 @@
foreach (var heroID in heroIDs)
{
HeroConfig heroConfig = HeroConfig.Get(heroID);
+ if (heroConfig.PlayerCanUse == 0)
+ continue;
if (!heroCollectDict.ContainsKey(heroConfig.Quality))
{
heroCollectDict[heroConfig.Quality] = new List<int>();
diff --git a/Main/System/HeroUI/HeroUIManager.cs b/Main/System/HeroUI/HeroUIManager.cs
index 9a0dabc..b0f8634 100644
--- a/Main/System/HeroUI/HeroUIManager.cs
+++ b/Main/System/HeroUI/HeroUIManager.cs
@@ -484,6 +484,9 @@
heroBookRedpointList.Clear();
foreach (var key in HeroConfig.GetKeys())
{
+ var config = HeroConfig.Get(key);
+ if (config.PlayerCanUse == 0)
+ continue;
heroBookRedpointList.Add(new Redpoint(MainRedDot.HeroCardCollectRedpoint, MainRedDot.HeroCardCollectRedpoint * 10000000 + key));
}
}
--
Gitblit v1.8.0