From 8429628e055f76f2befcaf39b646a9a36a6aebf5 Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期二, 31 三月 2026 20:45:24 +0800
Subject: [PATCH] 492 武将登场返场配置优化 陆逊美术资源
---
Main/System/HeroDebut/HeroDebutCell.cs | 2
Main/System/HeroDebut/HeroDebutCheckInWin.cs | 2
Main/System/HeroDebut/HeroDebutRankWin.cs | 4
Main/System/HeroDebut/HeroDebutSkinTabCell.cs | 4
Main/Config/ConfigManager.cs | 6 -
Main/System/HeroDebut/HeroDebutStarUpWin.cs | 2
Main/System/HeroReturn/HeroReturnSkinWin.cs | 10 +-
Main/System/HeroDebut/HeroDebutWin.cs | 11 --
Main/System/HeroDebut/HeroDebutCallWin.cs | 2
Main/Config/Configs/ActHeroReturnArtConfig.cs | 52 ++-----------
Main/System/HeroReturn/HeroReturnCell.cs | 2
Main/System/HeroDebut/HeroDebutGiftWin.cs | 4
Main/System/HeroReturn/HeroReturnStarUpWin.cs | 2
/dev/null | 11 --
Main/System/HeroReturn/HeroReturnCallWin.cs | 2
Main/System/HeroReturn/HeroReturnWin.cs | 17 +--
Main/System/HeroReturn/HeroReturnRankWin.cs | 4
Main/System/HeroDebut/HeroDebutSkinWin.cs | 10 +-
Main/System/HeroReturn/HeroReturnCheckInWin.cs | 3
Main/System/HeroReturn/HeroReturnSkinTabCell.cs | 4
Main/System/HeroReturn/HeroReturnPopWin.cs | 8 +-
Main/System/HeroReturn/HeroReturnGiftWin.cs | 4
Main/System/HeroDebut/HeroDebutPopWin.cs | 8 +-
Main/Config/Configs/ActHeroAppearArtConfig.cs | 52 ++-----------
24 files changed, 58 insertions(+), 168 deletions(-)
diff --git a/Main/Config/ConfigManager.cs b/Main/Config/ConfigManager.cs
index b5af31a..d3cf7bd 100644
--- a/Main/Config/ConfigManager.cs
+++ b/Main/Config/ConfigManager.cs
@@ -41,10 +41,8 @@
typeof(ActBillboardAwardConfig),
typeof(ActHeroAppearArtConfig),
typeof(ActHeroAppearConfig),
- typeof(ActHeroAppearSkinArtConfig),
typeof(ActHeroAppearStarConfig),
typeof(ActHeroReturnArtConfig),
- typeof(ActHeroReturnSkinArtConfig),
typeof(ActLunhuidianTypeConfig),
typeof(ActSignAwardConfig),
typeof(ADAwardConfig),
@@ -276,14 +274,10 @@
ClearConfigDictionary<ActHeroAppearArtConfig>();
// 娓呯┖ ActHeroAppearConfig 瀛楀吀
ClearConfigDictionary<ActHeroAppearConfig>();
- // 娓呯┖ ActHeroAppearSkinArtConfig 瀛楀吀
- ClearConfigDictionary<ActHeroAppearSkinArtConfig>();
// 娓呯┖ ActHeroAppearStarConfig 瀛楀吀
ClearConfigDictionary<ActHeroAppearStarConfig>();
// 娓呯┖ ActHeroReturnArtConfig 瀛楀吀
ClearConfigDictionary<ActHeroReturnArtConfig>();
- // 娓呯┖ ActHeroReturnSkinArtConfig 瀛楀吀
- ClearConfigDictionary<ActHeroReturnSkinArtConfig>();
// 娓呯┖ ActLunhuidianTypeConfig 瀛楀吀
ClearConfigDictionary<ActLunhuidianTypeConfig>();
// 娓呯┖ ActSignAwardConfig 瀛楀吀
diff --git a/Main/Config/Configs/ActHeroAppearArtConfig.cs b/Main/Config/Configs/ActHeroAppearArtConfig.cs
index 8e1ef2d..6a2b507 100644
--- a/Main/Config/Configs/ActHeroAppearArtConfig.cs
+++ b/Main/Config/Configs/ActHeroAppearArtConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: YYL
-// [ Date ]: 2026骞�3鏈�26鏃�
+// [ Date ]: Tuesday, March 31, 2026
//--------------------------------------------------------
using System.Collections.Generic;
@@ -19,23 +19,11 @@
public int HeroID;
public int[][] HeroNameColor;
public int[][] CallBubbleItems;
- public string EntryBgImage;
public string EntryTitleText;
- public string PopBgImage;
- public string PopTitleBgImage;
- public string PopTitleImage;
- public string PopInfoBgImage;
public int PopInfoBgUIEffectId;
public string PopInfoText;
public int[] PopInfoColor;
- public string MainBgImage;
- public string MainTitleImage;
public int MainSkinID;
- public string StarUpHeroImage;
- public string GiftBgImage;
- public string GiftHeroImage;
- public string RankAwardHeroImage;
- public string CheckInBgImage;
public override int LoadKey(string _key)
{
@@ -53,29 +41,19 @@
CallBubbleItems = JsonMapper.ToObject<int[][]>(tables[2].Replace("(", "[").Replace(")", "]"));
- EntryBgImage = tables[3];
+ EntryTitleText = tables[3];
- EntryTitleText = tables[4];
+ int.TryParse(tables[4],out PopInfoBgUIEffectId);
- PopBgImage = tables[5];
+ PopInfoText = tables[5];
- PopTitleBgImage = tables[6];
-
- PopTitleImage = tables[7];
-
- PopInfoBgImage = tables[8];
-
- int.TryParse(tables[9],out PopInfoBgUIEffectId);
-
- PopInfoText = tables[10];
-
- if (tables[11].Contains("["))
+ if (tables[6].Contains("["))
{
- PopInfoColor = JsonMapper.ToObject<int[]>(tables[11]);
+ PopInfoColor = JsonMapper.ToObject<int[]>(tables[6]);
}
else
{
- string[] PopInfoColorStringArray = tables[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] PopInfoColorStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
PopInfoColor = new int[PopInfoColorStringArray.Length];
for (int i=0;i<PopInfoColorStringArray.Length;i++)
{
@@ -83,21 +61,7 @@
}
}
- MainBgImage = tables[12];
-
- MainTitleImage = tables[13];
-
- int.TryParse(tables[14],out MainSkinID);
-
- StarUpHeroImage = tables[15];
-
- GiftBgImage = tables[16];
-
- GiftHeroImage = tables[17];
-
- RankAwardHeroImage = tables[18];
-
- CheckInBgImage = tables[19];
+ int.TryParse(tables[7],out MainSkinID);
}
catch (Exception exception)
{
diff --git a/Main/Config/Configs/ActHeroAppearSkinArtConfig.cs b/Main/Config/Configs/ActHeroAppearSkinArtConfig.cs
deleted file mode 100644
index 5c63844..0000000
--- a/Main/Config/Configs/ActHeroAppearSkinArtConfig.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-锘�//--------------------------------------------------------
-// [Author]: YYL
-// [ Date ]: 2026骞�3鏈�26鏃�
-//--------------------------------------------------------
-
-using System.Collections.Generic;
-using System;
-using UnityEngine;
-using LitJson;
-
-public partial class ActHeroAppearSkinArtConfig : ConfigBase<int, ActHeroAppearSkinArtConfig>
-{
- static ActHeroAppearSkinArtConfig()
- {
- // 璁块棶杩囬潤鎬佹瀯閫犲嚱鏁�
- visit = true;
- }
-
- public int SkinID;
- public string MainSkinBuyBgImage;
- public string BGImage;
- public string HeroNameImage;
- public string SkinInfoImage;
- public string AwardBGImage;
- public string TabInfoImage;
-
- public override int LoadKey(string _key)
- {
- int key = GetKey(_key);
- return key;
- }
-
- public override void LoadConfig(string input)
- {
- try {
- string[] tables = input.Split('\t');
- int.TryParse(tables[0],out SkinID);
-
- MainSkinBuyBgImage = tables[1];
-
- BGImage = tables[2];
-
- HeroNameImage = tables[3];
-
- SkinInfoImage = tables[4];
-
- AwardBGImage = tables[5];
-
- TabInfoImage = tables[6];
- }
- catch (Exception exception)
- {
- Debug.LogError(exception);
- }
- }
-}
diff --git a/Main/Config/Configs/ActHeroAppearSkinArtConfig.cs.meta b/Main/Config/Configs/ActHeroAppearSkinArtConfig.cs.meta
deleted file mode 100644
index 862a125..0000000
--- a/Main/Config/Configs/ActHeroAppearSkinArtConfig.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 1eaa4cc2eb8e0c84eb8519d6b09adf67
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Main/Config/Configs/ActHeroReturnArtConfig.cs b/Main/Config/Configs/ActHeroReturnArtConfig.cs
index 4d28001..de9781b 100644
--- a/Main/Config/Configs/ActHeroReturnArtConfig.cs
+++ b/Main/Config/Configs/ActHeroReturnArtConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: YYL
-// [ Date ]: 2026骞�3鏈�26鏃�
+// [ Date ]: 2026骞�3鏈�31鏃�
//--------------------------------------------------------
using System.Collections.Generic;
@@ -19,23 +19,11 @@
public int HeroID;
public int[][] HeroNameColor;
public int[][] CallBubbleItems;
- public string EntryBgImage;
public string EntryTitleText;
- public string PopBgImage;
- public string PopTitleBgImage;
- public string PopTitleImage;
- public string PopInfoBgImage;
public int PopInfoBgUIEffectId;
public string PopInfoText;
public int[] PopInfoColor;
- public string MainBgImage;
- public string MainTitleImage;
public int MainSkinID;
- public string StarUpHeroImage;
- public string GiftBgImage;
- public string GiftHeroImage;
- public string RankAwardHeroImage;
- public string CheckInBgImage;
public override int LoadKey(string _key)
{
@@ -53,29 +41,19 @@
CallBubbleItems = JsonMapper.ToObject<int[][]>(tables[2].Replace("(", "[").Replace(")", "]"));
- EntryBgImage = tables[3];
+ EntryTitleText = tables[3];
- EntryTitleText = tables[4];
+ int.TryParse(tables[4],out PopInfoBgUIEffectId);
- PopBgImage = tables[5];
+ PopInfoText = tables[5];
- PopTitleBgImage = tables[6];
-
- PopTitleImage = tables[7];
-
- PopInfoBgImage = tables[8];
-
- int.TryParse(tables[9],out PopInfoBgUIEffectId);
-
- PopInfoText = tables[10];
-
- if (tables[11].Contains("["))
+ if (tables[6].Contains("["))
{
- PopInfoColor = JsonMapper.ToObject<int[]>(tables[11]);
+ PopInfoColor = JsonMapper.ToObject<int[]>(tables[6]);
}
else
{
- string[] PopInfoColorStringArray = tables[11].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ string[] PopInfoColorStringArray = tables[6].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
PopInfoColor = new int[PopInfoColorStringArray.Length];
for (int i=0;i<PopInfoColorStringArray.Length;i++)
{
@@ -83,21 +61,7 @@
}
}
- MainBgImage = tables[12];
-
- MainTitleImage = tables[13];
-
- int.TryParse(tables[14],out MainSkinID);
-
- StarUpHeroImage = tables[15];
-
- GiftBgImage = tables[16];
-
- GiftHeroImage = tables[17];
-
- RankAwardHeroImage = tables[18];
-
- CheckInBgImage = tables[19];
+ int.TryParse(tables[7],out MainSkinID);
}
catch (Exception exception)
{
diff --git a/Main/Config/Configs/ActHeroReturnSkinArtConfig.cs b/Main/Config/Configs/ActHeroReturnSkinArtConfig.cs
deleted file mode 100644
index 0cb15c1..0000000
--- a/Main/Config/Configs/ActHeroReturnSkinArtConfig.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-锘�//--------------------------------------------------------
-// [Author]: YYL
-// [ Date ]: Thursday, March 26, 2026
-//--------------------------------------------------------
-
-using System.Collections.Generic;
-using System;
-using UnityEngine;
-using LitJson;
-
-public partial class ActHeroReturnSkinArtConfig : ConfigBase<int, ActHeroReturnSkinArtConfig>
-{
- static ActHeroReturnSkinArtConfig()
- {
- // 璁块棶杩囬潤鎬佹瀯閫犲嚱鏁�
- visit = true;
- }
-
- public int SkinID;
- public string MainSkinBuyBgImage;
- public string BGImage;
- public string HeroNameImage;
- public string SkinInfoImage;
- public string AwardBGImage;
- public string TabInfoImage;
-
- public override int LoadKey(string _key)
- {
- int key = GetKey(_key);
- return key;
- }
-
- public override void LoadConfig(string input)
- {
- try {
- string[] tables = input.Split('\t');
- int.TryParse(tables[0],out SkinID);
-
- MainSkinBuyBgImage = tables[1];
-
- BGImage = tables[2];
-
- HeroNameImage = tables[3];
-
- SkinInfoImage = tables[4];
-
- AwardBGImage = tables[5];
-
- TabInfoImage = tables[6];
- }
- catch (Exception exception)
- {
- Debug.LogError(exception);
- }
- }
-}
diff --git a/Main/Config/Configs/ActHeroReturnSkinArtConfig.cs.meta b/Main/Config/Configs/ActHeroReturnSkinArtConfig.cs.meta
deleted file mode 100644
index 7bf7cf8..0000000
--- a/Main/Config/Configs/ActHeroReturnSkinArtConfig.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 5a29cc75b87652c4d9357b05ef1853f5
-MonoImporter:
- externalObjects: {}
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Main/System/HeroDebut/HeroDebutCallWin.cs b/Main/System/HeroDebut/HeroDebutCallWin.cs
index 9096cbe..d549cf1 100644
--- a/Main/System/HeroDebut/HeroDebutCallWin.cs
+++ b/Main/System/HeroDebut/HeroDebutCallWin.cs
@@ -250,7 +250,7 @@
xbTypeInfo = HappyXBModel.Instance.GetXBInfoByType(treasureType);
if (xbTypeInfo == null) return;
- bgImage.SetSprite(artConfig.MainBgImage);
+ bgImage.SetSprite(StringUtility.Concat("HeroDebutCallBG_", heroID.ToString()));
lhController.Create(skinID, 1, motionName: "", isLh: true);
uiHeroController.Create(skinID, modleSize);
diff --git a/Main/System/HeroDebut/HeroDebutCell.cs b/Main/System/HeroDebut/HeroDebutCell.cs
index cd64d51..b13b78a 100644
--- a/Main/System/HeroDebut/HeroDebutCell.cs
+++ b/Main/System/HeroDebut/HeroDebutCell.cs
@@ -22,7 +22,7 @@
var skinConfig = HeroSkinConfig.Get(skinID);
if (skinConfig == null) return;
- bgImage.SetSprite(artConfig.EntryBgImage);
+ bgImage.SetSprite(StringUtility.Concat("HeroDebutEntryBg_", heroID.ToString()));
manager.SetHeroSquareIcon(heroImage, skinConfig.SquareIcon);
titleText.text = artConfig.EntryTitleText;
}
diff --git a/Main/System/HeroDebut/HeroDebutCheckInWin.cs b/Main/System/HeroDebut/HeroDebutCheckInWin.cs
index 251d4c9..34fb9e4 100644
--- a/Main/System/HeroDebut/HeroDebutCheckInWin.cs
+++ b/Main/System/HeroDebut/HeroDebutCheckInWin.cs
@@ -60,7 +60,7 @@
var list = ActSignAwardConfig.GetDayNumSortList(templateID);
if (list == null) return;
- bgImage.SetSprite(artConfig.CheckInBgImage);
+ bgImage.SetSprite(StringUtility.Concat("HeroDebutCheckInBG_", heroID.ToString()));
for (int i = 0; i < cells.Length; i++)
diff --git a/Main/System/HeroDebut/HeroDebutGiftWin.cs b/Main/System/HeroDebut/HeroDebutGiftWin.cs
index 4f161b8..ba43fc7 100644
--- a/Main/System/HeroDebut/HeroDebutGiftWin.cs
+++ b/Main/System/HeroDebut/HeroDebutGiftWin.cs
@@ -26,10 +26,10 @@
var artConfig = ActHeroAppearArtConfig.Get(heroID);
if (artConfig == null) return;
- bgImage.SetSprite(artConfig.GiftBgImage);
+ bgImage.SetSprite(StringUtility.Concat("HeroDebutGiftBG_", heroID.ToString()));
heroImage.SetNativeSize();
- heroImage.SetSprite(artConfig.GiftHeroImage);
+ heroImage.SetSprite(StringUtility.Concat("HeroDebutGiftHero_", heroID.ToString()));
heroImage.SetNativeSize();
OnSecondEvent();
diff --git a/Main/System/HeroDebut/HeroDebutPopWin.cs b/Main/System/HeroDebut/HeroDebutPopWin.cs
index dc25cdf..4c86f43 100644
--- a/Main/System/HeroDebut/HeroDebutPopWin.cs
+++ b/Main/System/HeroDebut/HeroDebutPopWin.cs
@@ -68,7 +68,7 @@
uiEffectPlayer.effectId = artConfig.PopInfoBgUIEffectId;
uiEffectPlayer.Play();
- bgImage.SetSprite(artConfig.PopBgImage);
+ bgImage.SetSprite(StringUtility.Concat("HeroDebutPopBG_", heroID.ToString()));
bgImage.SetNativeSize();
qaulityBgImage.SetSprite($"HeroDebutPopQaulityBG{heroConfig.Quality}");
@@ -77,13 +77,13 @@
qaulityImage.SetSprite($"HeroDebutPopQaulity{heroConfig.Quality}");
qaulityImage.SetNativeSize();
- titleBgImage.SetSprite(artConfig.PopTitleBgImage);
+ titleBgImage.SetSprite(StringUtility.Concat("HeroDebutPopTitleBG_", heroID.ToString()));
titleBgImage.SetNativeSize();
- titleImage.SetSprite(artConfig.PopTitleImage);
+ titleImage.SetSprite(StringUtility.Concat("HeroDebutPopTitle_", heroID.ToString()));
titleImage.SetNativeSize();
- infoBgImage.SetSprite(artConfig.PopInfoBgImage);
+ infoBgImage.SetSprite(StringUtility.Concat("HeroDebutPopInfoBG_", heroID.ToString()));
infoBgImage.SetNativeSize();
infoText.text = artConfig.PopInfoText;
diff --git a/Main/System/HeroDebut/HeroDebutRankWin.cs b/Main/System/HeroDebut/HeroDebutRankWin.cs
index f35f885..ecfc9f8 100644
--- a/Main/System/HeroDebut/HeroDebutRankWin.cs
+++ b/Main/System/HeroDebut/HeroDebutRankWin.cs
@@ -100,8 +100,6 @@
public void Display()
{
int heroID = manager.GetCurrentDisplayCallHeroId();
- var artConfig = ActHeroAppearArtConfig.Get(heroID);
- if (artConfig == null) return;
if (functionOrder == 0)
{
@@ -112,7 +110,7 @@
else
{
CreateAwardScroller();
- heroImage.SetSprite(artConfig.RankAwardHeroImage);
+ heroImage.SetSprite(StringUtility.Concat("HeroDebutRankAwardHero_", heroID.ToString()));
heroImage.SetNativeSize();
DisplayAwardMyRank();
}
diff --git a/Main/System/HeroDebut/HeroDebutSkinTabCell.cs b/Main/System/HeroDebut/HeroDebutSkinTabCell.cs
index 998d893..386e063 100644
--- a/Main/System/HeroDebut/HeroDebutSkinTabCell.cs
+++ b/Main/System/HeroDebut/HeroDebutSkinTabCell.cs
@@ -13,10 +13,8 @@
if (list?.Count <= index) return;
var skinID = list[index];
- var skinArtConfig = ActHeroAppearSkinArtConfig.Get(skinID);
- if (skinArtConfig == null) return;
- tabBgImage.SetSprite(skinArtConfig.TabInfoImage);
+ tabBgImage.SetSprite(StringUtility.Concat("HeroDebutSkinTabInfo_", skinID.ToString()));
tabBgImage.SetNativeSize();
maskRect.SetActive(manager.currentChooseSkinID != skinID);
chooseRect.SetActive(manager.currentChooseSkinID == skinID);
diff --git a/Main/System/HeroDebut/HeroDebutSkinWin.cs b/Main/System/HeroDebut/HeroDebutSkinWin.cs
index 8fc2731..12ee7ab 100644
--- a/Main/System/HeroDebut/HeroDebutSkinWin.cs
+++ b/Main/System/HeroDebut/HeroDebutSkinWin.cs
@@ -147,8 +147,6 @@
if (heroConfig == null) return;
int skinID = manager.currentChooseSkinID;
- var skinArtConfig = ActHeroAppearSkinArtConfig.Get(skinID);
- if (skinArtConfig == null) return;
var heroSkinAttrConfig = HeroSkinAttrConfig.Get(skinID);
if (heroSkinAttrConfig == null) return;
@@ -168,15 +166,15 @@
if (!RechargeManager.Instance.TryGetRechargeCount(ctgId, out var rechargeCount)) return;
if (!RechargeManager.Instance.TryGetRechargeItem(ctgId, out var rechargeItemList)) return;
- bgImage.SetTexture2D(skinArtConfig.BGImage);
+ bgImage.SetTexture2D(StringUtility.Concat("HeroDebutSkinBG_", skinID.ToString()));
- heroNameImage.SetSprite(skinArtConfig.HeroNameImage);
+ heroNameImage.SetSprite(StringUtility.Concat("HeroDebutSkinHeroName_", skinID.ToString()));
heroNameImage.SetNativeSize();
- skinInfoImage.SetSprite(skinArtConfig.SkinInfoImage);
+ skinInfoImage.SetSprite(StringUtility.Concat("HeroDebutSkinInfo_", skinID.ToString()));
skinInfoImage.SetNativeSize();
- awardBgImage.SetSprite(skinArtConfig.AwardBGImage);
+ awardBgImage.SetSprite(StringUtility.Concat("HeroDebutSkinAwardBG_", skinID.ToString()));
awardBgImage.SetNativeSize();
uiHeroController.Create(skinID, modelScale);
diff --git a/Main/System/HeroDebut/HeroDebutStarUpWin.cs b/Main/System/HeroDebut/HeroDebutStarUpWin.cs
index 4e14361..30c73bc 100644
--- a/Main/System/HeroDebut/HeroDebutStarUpWin.cs
+++ b/Main/System/HeroDebut/HeroDebutStarUpWin.cs
@@ -84,7 +84,7 @@
heroNameText.text = heroConfig.Name;
manager.SetGradientTextColor(heroNameText, artConfig.HeroNameColor);
- heroImage.SetSprite(artConfig.StarUpHeroImage);
+ heroImage.SetSprite(StringUtility.Concat("HeroDebutStarUpHero_", heroID.ToString()));
heroImage.SetNativeSize();
CreateScroller(config, heroConfig);
diff --git a/Main/System/HeroDebut/HeroDebutWin.cs b/Main/System/HeroDebut/HeroDebutWin.cs
index 7c4b5f7..b91223f 100644
--- a/Main/System/HeroDebut/HeroDebutWin.cs
+++ b/Main/System/HeroDebut/HeroDebutWin.cs
@@ -86,11 +86,6 @@
if (artConfig == null) return;
int skinID = manager.GetDefaultSkinID(heroID);
- var skinConfig = HeroSkinConfig.Get(skinID);
- if (skinConfig == null) return;
-
- var skinArtConfig = ActHeroAppearSkinArtConfig.Get(artConfig.MainSkinID);
- if (skinArtConfig == null) return;
uiHeroController.Create(skinID, modleSize);
uiHeroController.transform.localScale = new Vector3(-modleSize, modleSize, modleSize);
@@ -98,13 +93,13 @@
callRedImage.SetActive(!manager.IsShopVisitedToday || manager.HasGiftCanHave());
- bgImage.SetSprite(artConfig.MainBgImage);
+ bgImage.SetSprite(StringUtility.Concat("HeroDebutMainBG_", heroID.ToString()));
bgImage.SetNativeSize();
- titleImage.SetSprite(artConfig.MainTitleImage);
+ titleImage.SetSprite(StringUtility.Concat("HeroDebutMainTitle_", heroID.ToString()));
titleImage.SetNativeSize();
- skinImage.SetSprite(skinArtConfig.MainSkinBuyBgImage);
+ skinImage.SetSprite(StringUtility.Concat("HeroDebutSkinEnterBG_", artConfig.MainSkinID.ToString()));
OnSecondEvent();
}
diff --git a/Main/System/HeroReturn/HeroReturnCallWin.cs b/Main/System/HeroReturn/HeroReturnCallWin.cs
index cb85902..5723eac 100644
--- a/Main/System/HeroReturn/HeroReturnCallWin.cs
+++ b/Main/System/HeroReturn/HeroReturnCallWin.cs
@@ -262,7 +262,7 @@
topTransform.SetActive(!canChooseHero || isChooseHero);
heroInfoTransform.SetActive(!canChooseHero || isChooseHero);
- bgImage.SetSprite(artConfig.MainBgImage);
+ bgImage.SetSprite(StringUtility.Concat("HeroReturnCallBG_", heroID.ToString()));
lhController.Create(skinID, 1, motionName: "", isLh: true);
uiHeroController.Create(skinID, modleSize);
diff --git a/Main/System/HeroReturn/HeroReturnCell.cs b/Main/System/HeroReturn/HeroReturnCell.cs
index dd5cb13..2489218 100644
--- a/Main/System/HeroReturn/HeroReturnCell.cs
+++ b/Main/System/HeroReturn/HeroReturnCell.cs
@@ -21,7 +21,7 @@
var skinConfig = HeroSkinConfig.Get(skinID);
if (skinConfig == null) return;
- bgImage.SetSprite(artConfig.EntryBgImage);
+ bgImage.SetSprite(StringUtility.Concat("HeroReturnEntryBg_", heroID.ToString()));
manager.SetHeroSquareIcon(heroImage, skinConfig.SquareIcon);
titleText.text = artConfig.EntryTitleText;
}
diff --git a/Main/System/HeroReturn/HeroReturnCheckInWin.cs b/Main/System/HeroReturn/HeroReturnCheckInWin.cs
index 261207f..a446e04 100644
--- a/Main/System/HeroReturn/HeroReturnCheckInWin.cs
+++ b/Main/System/HeroReturn/HeroReturnCheckInWin.cs
@@ -60,8 +60,7 @@
var list = ActSignAwardConfig.GetDayNumSortList(templateID);
if (list == null) return;
- bgImage.SetSprite(artConfig.CheckInBgImage);
-
+ bgImage.SetSprite(StringUtility.Concat("HeroReturnCheckInBG_", heroID.ToString()));
for (int i = 0; i < cells.Length; i++)
{
if (i < list.Count)
diff --git a/Main/System/HeroReturn/HeroReturnGiftWin.cs b/Main/System/HeroReturn/HeroReturnGiftWin.cs
index 4e7244c..5f59093 100644
--- a/Main/System/HeroReturn/HeroReturnGiftWin.cs
+++ b/Main/System/HeroReturn/HeroReturnGiftWin.cs
@@ -26,10 +26,10 @@
var artConfig = ActHeroReturnArtConfig.Get(heroID);
if (artConfig == null) return;
- bgImage.SetSprite(artConfig.GiftBgImage);
+ bgImage.SetSprite(StringUtility.Concat("HeroReturnGiftBG_", heroID.ToString()));
heroImage.SetNativeSize();
- heroImage.SetSprite(artConfig.GiftHeroImage);
+ heroImage.SetSprite(StringUtility.Concat("HeroReturnGiftHero_", heroID.ToString()));
heroImage.SetNativeSize();
OnSecondEvent();
diff --git a/Main/System/HeroReturn/HeroReturnPopWin.cs b/Main/System/HeroReturn/HeroReturnPopWin.cs
index 07524ae..95bb254 100644
--- a/Main/System/HeroReturn/HeroReturnPopWin.cs
+++ b/Main/System/HeroReturn/HeroReturnPopWin.cs
@@ -68,7 +68,7 @@
uiEffectPlayer.effectId = artConfig.PopInfoBgUIEffectId;
uiEffectPlayer.Play();
- bgImage.SetSprite(artConfig.PopBgImage);
+ bgImage.SetSprite(StringUtility.Concat("HeroReturnPopBG_", heroID.ToString()));
bgImage.SetNativeSize();
qaulityBgImage.SetSprite($"HeroDebutPopQaulityBG{heroConfig.Quality}");
@@ -77,13 +77,13 @@
qaulityImage.SetSprite($"HeroDebutPopQaulity{heroConfig.Quality}");
qaulityImage.SetNativeSize();
- titleBgImage.SetSprite(artConfig.PopTitleBgImage);
+ titleBgImage.SetSprite(StringUtility.Concat("HeroReturnPopTitleBG_", heroID.ToString()));
titleBgImage.SetNativeSize();
- titleImage.SetSprite(artConfig.PopTitleImage);
+ titleImage.SetSprite(StringUtility.Concat("HeroReturnPopTitle_", heroID.ToString()));
titleImage.SetNativeSize();
- infoBgImage.SetSprite(artConfig.PopInfoBgImage);
+ infoBgImage.SetSprite(StringUtility.Concat("HeroReturnPopInfoBG_", heroID.ToString()));
infoBgImage.SetNativeSize();
infoText.text = artConfig.PopInfoText;
diff --git a/Main/System/HeroReturn/HeroReturnRankWin.cs b/Main/System/HeroReturn/HeroReturnRankWin.cs
index d9a437f..d9fc5da 100644
--- a/Main/System/HeroReturn/HeroReturnRankWin.cs
+++ b/Main/System/HeroReturn/HeroReturnRankWin.cs
@@ -100,8 +100,6 @@
public void Display()
{
int heroID = manager.GetFirstHeroId();
- var artConfig = ActHeroReturnArtConfig.Get(heroID);
- if (artConfig == null) return;
if (functionOrder == 0)
{
@@ -112,7 +110,7 @@
else
{
CreateAwardScroller();
- heroImage.SetSprite(artConfig.RankAwardHeroImage);
+ heroImage.SetSprite(StringUtility.Concat("HeroReturnRankAwardHero_", heroID.ToString()));
heroImage.SetNativeSize();
DisplayAwardMyRank();
}
diff --git a/Main/System/HeroReturn/HeroReturnSkinTabCell.cs b/Main/System/HeroReturn/HeroReturnSkinTabCell.cs
index 6d8e777..1474d76 100644
--- a/Main/System/HeroReturn/HeroReturnSkinTabCell.cs
+++ b/Main/System/HeroReturn/HeroReturnSkinTabCell.cs
@@ -13,10 +13,8 @@
if (list?.Count <= index) return;
var skinID = list[index];
- var skinArtConfig = ActHeroReturnSkinArtConfig.Get(skinID);
- if (skinArtConfig == null) return;
- tabBgImage.SetSprite(skinArtConfig.TabInfoImage);
+ tabBgImage.SetSprite(StringUtility.Concat("HeroReturnSkinTabInfo_", skinID.ToString()));
tabBgImage.SetNativeSize();
maskRect.SetActive(manager.currentChooseSkinID != skinID);
chooseRect.SetActive(manager.currentChooseSkinID == skinID);
diff --git a/Main/System/HeroReturn/HeroReturnSkinWin.cs b/Main/System/HeroReturn/HeroReturnSkinWin.cs
index d5ccbf6..aef3ab3 100644
--- a/Main/System/HeroReturn/HeroReturnSkinWin.cs
+++ b/Main/System/HeroReturn/HeroReturnSkinWin.cs
@@ -147,8 +147,6 @@
if (heroConfig == null) return;
int skinID = manager.currentChooseSkinID;
- var skinArtConfig = ActHeroReturnSkinArtConfig.Get(skinID);
- if (skinArtConfig == null) return;
var heroSkinAttrConfig = HeroSkinAttrConfig.Get(skinID);
if (heroSkinAttrConfig == null) return;
@@ -168,15 +166,15 @@
if (!RechargeManager.Instance.TryGetRechargeCount(ctgId, out var rechargeCount)) return;
if (!RechargeManager.Instance.TryGetRechargeItem(ctgId, out var rechargeItemList)) return;
- bgImage.SetTexture2D(skinArtConfig.BGImage);
+ bgImage.SetTexture2D(StringUtility.Concat("HeroReturnSkinBG_", skinID.ToString()));
- heroNameImage.SetSprite(skinArtConfig.HeroNameImage);
+ heroNameImage.SetSprite(StringUtility.Concat("HeroReturnSkinHeroName_", skinID.ToString()));
heroNameImage.SetNativeSize();
- skinInfoImage.SetSprite(skinArtConfig.SkinInfoImage);
+ skinInfoImage.SetSprite(StringUtility.Concat("HeroReturnSkinInfo_", skinID.ToString()));
skinInfoImage.SetNativeSize();
- awardBgImage.SetSprite(skinArtConfig.AwardBGImage);
+ awardBgImage.SetSprite(StringUtility.Concat("HeroReturnSkinAwardBG_", skinID.ToString()));
awardBgImage.SetNativeSize();
uiHeroController.Create(skinID, modelScale);
diff --git a/Main/System/HeroReturn/HeroReturnStarUpWin.cs b/Main/System/HeroReturn/HeroReturnStarUpWin.cs
index 7bc1420..7d345a6 100644
--- a/Main/System/HeroReturn/HeroReturnStarUpWin.cs
+++ b/Main/System/HeroReturn/HeroReturnStarUpWin.cs
@@ -124,7 +124,7 @@
heroNameText.text = heroConfig.Name;
manager.SetGradientTextColor(heroNameText, artConfig.HeroNameColor);
- heroImage.SetSprite(artConfig.StarUpHeroImage);
+ heroImage.SetSprite(StringUtility.Concat("HeroReturnStarUpHero_", heroID.ToString()));
heroImage.SetNativeSize();
CreateScroller(config, heroConfig);
diff --git a/Main/System/HeroReturn/HeroReturnWin.cs b/Main/System/HeroReturn/HeroReturnWin.cs
index 715720a..19c9f61 100644
--- a/Main/System/HeroReturn/HeroReturnWin.cs
+++ b/Main/System/HeroReturn/HeroReturnWin.cs
@@ -171,8 +171,7 @@
var skinConfig = HeroSkinConfig.Get(skinID);
if (skinConfig == null) return;
- var skinArtConfig = ActHeroReturnSkinArtConfig.Get(artConfig.MainSkinID);
- if (skinArtConfig == null) return;
+ int mainSkinID = artConfig.MainSkinID;
if (withAnimation)
{
@@ -190,7 +189,7 @@
seq.OnComplete(() =>
{
- UpdateHeroDisplay(heroID, skinID, artConfig, skinArtConfig);
+ UpdateHeroDisplay(heroID, skinID, artConfig, mainSkinID);
// 娣″叆
bgImage.DOFade(1f, FadeDuration);
lhCanvasGroup.DOFade(1f, FadeDuration);
@@ -200,7 +199,7 @@
}
else
{
- UpdateHeroDisplay(heroID, skinID, artConfig, skinArtConfig);
+ UpdateHeroDisplay(heroID, skinID, artConfig, mainSkinID);
CanvasGroup lhCanvasGroup = lhController.GetComponent<CanvasGroup>();
if (lhCanvasGroup != null)
{
@@ -212,7 +211,7 @@
/// <summary>
/// 鏇存柊姝﹀皢鏄剧ず璧勬簮
/// </summary>
- private void UpdateHeroDisplay(int heroID, int skinID, ActHeroReturnArtConfig artConfig, ActHeroReturnSkinArtConfig skinArtConfig)
+ private void UpdateHeroDisplay(int heroID, int skinID, ActHeroReturnArtConfig artConfig, int mainSkinID)
{
int chosenHeroSkinID = manager.GetDefaultSkinID(
manager.LoadCallChooseHeroStateKey(manager.GetOperationHeroAppearInfo()) ?
@@ -224,20 +223,18 @@
lhController.Create(skinID, 1, motionName: "", isLh: true);
// 鏇存柊鑳屾櫙
- bgImage.SetSprite(artConfig.MainBgImage);
+ bgImage.SetSprite(StringUtility.Concat("HeroReturnMainBG_", heroID.ToString()));
bgImage.SetNativeSize();
// 鏇存柊鏍囬
- titleImage.SetSprite(artConfig.MainTitleImage);
+ titleImage.SetSprite(StringUtility.Concat("HeroReturnMainTitle_", heroID.ToString()));
titleImage.SetNativeSize();
// 鏇存柊鐨偆鍥剧墖
int firstHeroID = manager.GetFirstHeroId();
var firstHeroIDArtConfig = ActHeroReturnArtConfig.Get(firstHeroID);
if (firstHeroIDArtConfig == null) return;
- var firstSkinArtConfig = ActHeroReturnSkinArtConfig.Get(firstHeroIDArtConfig.MainSkinID);
- if (firstSkinArtConfig == null) return;
- skinImage.SetSprite(firstSkinArtConfig.MainSkinBuyBgImage);
+ skinImage.SetSprite(StringUtility.Concat("HeroReturnSkinEnterBG_", firstHeroIDArtConfig.MainSkinID.ToString()));
}
/// <summary>
--
Gitblit v1.8.0