From 973edc44a04dceb8b48a32ca912e6167f86189d4 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 25 八月 2025 17:38:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Launch/LaunchWin.cs | 58 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/Main/System/Launch/LaunchWin.cs b/Main/System/Launch/LaunchWin.cs
index f923b3c..efad36f 100644
--- a/Main/System/Launch/LaunchWin.cs
+++ b/Main/System/Launch/LaunchWin.cs
@@ -14,7 +14,7 @@
public class LaunchWin : UIBase
{
// [SerializeField] UIAlphaTween m_AlphaTween;
- [SerializeField] Image m_BackGround;
+ // [SerializeField] Image m_BackGround;
[SerializeField] RectTransform m_AndroidProgressContainer;
[SerializeField] RectTransform m_NetworkContainer;
[SerializeField] SmoothSlider m_PartProgressSlider;
@@ -42,25 +42,25 @@
protected override void InitComponent()
{
base.InitComponent();
- m_BackGround.preserveAspect = true;
- if (Application.isEditor)
- {
- var sprite = BuiltInLoader.LoadSprite("Launch_1");
- m_BackGround.overrideSprite = sprite;
- }
- else
- {
- for (var i = 0; i < 3; i++)
- {
- var sprite = BuiltInLoader.LoadSprite(StringUtility.Contact("Launch_", i + 1));
- if (sprite != null)
- {
- backGrounds.Add(sprite);
- }
- }
+ // m_BackGround.preserveAspect = true;
+ // if (Application.isEditor)
+ // {
+ // var sprite = BuiltInLoader.LoadSprite("Launch_1");
+ // m_BackGround.overrideSprite = sprite;
+ // }
+ // else
+ // {
+ // for (var i = 0; i < 3; i++)
+ // {
+ // var sprite = BuiltInLoader.LoadSprite(StringUtility.Contact("Launch_", i + 1));
+ // if (sprite != null)
+ // {
+ // backGrounds.Add(sprite);
+ // }
+ // }
- m_BackGround.overrideSprite = backGrounds[0];
- }
+ // m_BackGround.overrideSprite = backGrounds[0];
+ // }
}
@@ -175,15 +175,15 @@
{
UpdateProgress();
- backGroundTimer += Time.deltaTime;
- if (backGroundTimer >= 3f)
- {
- backGroundTimer = 0f;
- if (backGrounds.Count > 1)
- {
- m_BackGround.overrideSprite = backGrounds[(++backGroundIndex) % backGrounds.Count];
- }
- }
+ // backGroundTimer += Time.deltaTime;
+ // if (backGroundTimer >= 3f)
+ // {
+ // backGroundTimer = 0f;
+ // if (backGrounds.Count > 1)
+ // {
+ // m_BackGround.overrideSprite = backGrounds[(++backGroundIndex) % backGrounds.Count];
+ // }
+ // }
if (HttpBehaviour.ConnectAllTimes >= AllTimes && m_NetworkContainer != null)
{
@@ -283,7 +283,7 @@
return new LaunchWinData(){
backGroundTimer = backGroundTimer,
backGroundIndex = backGroundIndex,
- sprite = m_BackGround.overrideSprite,
+ // sprite = m_BackGround.overrideSprite,
sprites = backGrounds,
};
}
--
Gitblit v1.8.0