From 45d6943b89db562e80d9e10906707893c101df71 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 05 十二月 2025 17:24:53 +0800
Subject: [PATCH] 0312 基金图片变更修复;修复初始打开排行榜没有显示模型问题
---
Main/System/Horse/HorseController.cs | 45 +++++++++++++++++++++++++--------------------
Main/System/BattlePass/BattlePassCommonWin.cs | 4 ++++
Main/System/Horse/HorseWin.cs | 1 +
Main/System/Achievement/AchievementManager.cs | 4 ++++
4 files changed, 34 insertions(+), 20 deletions(-)
diff --git a/Main/System/Achievement/AchievementManager.cs b/Main/System/Achievement/AchievementManager.cs
index 14a27c8..cdbbb98 100644
--- a/Main/System/Achievement/AchievementManager.cs
+++ b/Main/System/Achievement/AchievementManager.cs
@@ -146,6 +146,10 @@
foreach (var type in _types)
{
+ if (!redpointDict.ContainsKey(type))
+ {
+ continue;
+ }
var redpoint = RedpointCenter.Instance.GetRedpoint(redpointDict[type]);
redpoint.state = RedPointState.None;
if (!isOpened(type))
diff --git a/Main/System/BattlePass/BattlePassCommonWin.cs b/Main/System/BattlePass/BattlePassCommonWin.cs
index 273c821..d1beacd 100644
--- a/Main/System/BattlePass/BattlePassCommonWin.cs
+++ b/Main/System/BattlePass/BattlePassCommonWin.cs
@@ -11,6 +11,8 @@
[SerializeField] Text itemNameText; //棰濆濂栧姳
[SerializeField] Text totalActivityText;
[SerializeField] Text tabNameText;
+ [SerializeField] Image adWordImg;
+ [SerializeField] Image adBg;
[SerializeField] Transform lockRect;
[SerializeField] ScrollerController scroller;
[SerializeField] Transform rechargeRect;
@@ -84,6 +86,8 @@
itemNameText.text = Language.Get("BattlePassAD" + battlePasstype);
tabNameText.text = Language.Get("BattlePassTab" + battlePasstype);
titleText.text = Language.Get("BattlePassTitle" + battlePasstype);
+ adWordImg.SetSprite("BattlePassInWord" + battlePasstype);
+ adBg.SetSprite("BattlePassInBG" + battlePasstype);
}
diff --git a/Main/System/Horse/HorseController.cs b/Main/System/Horse/HorseController.cs
index 55dbf5e..cd8df27 100644
--- a/Main/System/Horse/HorseController.cs
+++ b/Main/System/Horse/HorseController.cs
@@ -21,25 +21,7 @@
public void Create(int _skinID, int _heroSkinID = 0, float scale = 1f, Action _onComplete = null, string motionName = "idle")
{
- if (skinID == _skinID)
- {
- CreateHero(_heroSkinID);
- //閬垮厤閲嶅鍒涘缓
- return;
- }
-
- skinID = _skinID;
- var skinConfig = HorseSkinConfig.Get(skinID);
-
- this.transform.localScale = Vector3.one * scale;
-
- onComplete = _onComplete;
pool = GameObjectPoolManager.Instance.GetPool(UILoader.LoadPrefab("UIHorse"));
-
- if (!transform.gameObject.activeSelf)
- {
- transform.SetActive(true);
- }
if (instanceGO == null)
{
instanceGO = pool.Request();
@@ -51,9 +33,32 @@
instanceGO.transform.localScale = Vector3.one;
instanceGO.transform.localRotation = Quaternion.identity;
}
-
- // skeletonGraphic = instanceGO.GetComponentInChildren<SkeletonGraphic>(true);
skeletonGraphic = instanceGO.transform.Find("Horse").GetComponent<SkeletonGraphic>();
+
+ if (skinID == _skinID)
+ {
+ if (skinID == 0)
+ {
+ skeletonGraphic.enabled = false;
+ }
+ CreateHero(_heroSkinID);
+ //閬垮厤閲嶅鍒涘缓
+ return;
+ }
+
+ skinID = _skinID;
+ var skinConfig = HorseSkinConfig.Get(skinID);
+
+ this.transform.localScale = Vector3.one * scale;
+
+ onComplete = _onComplete;
+
+ if (!transform.gameObject.activeSelf)
+ {
+ transform.SetActive(true);
+ }
+
+
if (skinConfig == null || string.IsNullOrEmpty(skinConfig.Spine))
{
//鍗镐笅鍧愰獞鐨勬儏鍐�
diff --git a/Main/System/Horse/HorseWin.cs b/Main/System/Horse/HorseWin.cs
index fb7e609..58e9f7a 100644
--- a/Main/System/Horse/HorseWin.cs
+++ b/Main/System/Horse/HorseWin.cs
@@ -226,6 +226,7 @@
case PlayerDataType.EquipShowSwitch:
var skinConfig = HorseSkinConfig.Get(HorseManager.Instance.GetUsingHorseSkinID());
modelImg.Create(skinConfig.SkinID, PhantasmPavilionManager.Instance.GetMyModelSkinID());
+ nameText.text = skinConfig.Name;
break;
}
--
Gitblit v1.8.0