From 4934ee3ee5ee0ce717cab2c6c001b580e9693e66 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 21 十一月 2025 16:39:36 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Horse/HorseController.cs | 2 +-
Main/Core/GameEngine/Launch/LaunchInHot.cs | 14 ++++++++++++++
Main/System/PhantasmPavilion/PhantasmPavilionManager.cs | 8 ++++++--
Main/System/Main/MainWin.cs | 4 +++-
4 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/Main/Core/GameEngine/Launch/LaunchInHot.cs b/Main/Core/GameEngine/Launch/LaunchInHot.cs
index 740a69b..c6c9e25 100644
--- a/Main/Core/GameEngine/Launch/LaunchInHot.cs
+++ b/Main/Core/GameEngine/Launch/LaunchInHot.cs
@@ -22,6 +22,20 @@
void Start()
{
+
+#if !UNITY_EDITOR
+ if (File.Exists(Directory.GetParent(Application.persistentDataPath) + "/Debug") ||
+ LocalSave.GetString("#@#BrancH") != string.Empty)
+ {
+ Debug.unityLogger.logEnabled = true;
+ }
+ else
+ {
+ Debug.unityLogger.logEnabled = false;
+ }
+
+#endif
+
System.Net.ServicePointManager.DefaultConnectionLimit = 100;//璁剧疆http鏈�澶ц繛鎺ユ暟
Application.backgroundLoadingPriority = ThreadPriority.High;
Screen.sleepTimeout = SleepTimeout.NeverSleep;
diff --git a/Main/System/Horse/HorseController.cs b/Main/System/Horse/HorseController.cs
index fa80444..b3c76d3 100644
--- a/Main/System/Horse/HorseController.cs
+++ b/Main/System/Horse/HorseController.cs
@@ -54,7 +54,7 @@
skeletonGraphic = instanceGO.GetComponentInChildren<SkeletonGraphic>(true);
- skeletonGraphic.skeletonDataAsset = ResManager.Instance.LoadAsset<SkeletonDataAsset>("UIEffect/Spine/Horse/", skinConfig.Spine);
+ skeletonGraphic.skeletonDataAsset = ResManager.Instance.LoadAsset<SkeletonDataAsset>("UIEffect/Spine/Horse", skinConfig.Spine);
if (skeletonGraphic.skeletonDataAsset == null)
{
diff --git a/Main/System/Main/MainWin.cs b/Main/System/Main/MainWin.cs
index 8139624..e6a335c 100644
--- a/Main/System/Main/MainWin.cs
+++ b/Main/System/Main/MainWin.cs
@@ -164,7 +164,9 @@
case PlayerDataType.default26:
hammerText.text = UIHelper.GetMoneyCnt(41).ToString();
break;
-
+ case PlayerDataType.ExAttr3:
+ officialRankText.InitUI(PlayerDatas.Instance.baseData.realmLevel, PlayerDatas.Instance.baseData.TitleID);
+ break;
}
}
diff --git a/Main/System/PhantasmPavilion/PhantasmPavilionManager.cs b/Main/System/PhantasmPavilion/PhantasmPavilionManager.cs
index 8425e25..e80f837 100644
--- a/Main/System/PhantasmPavilion/PhantasmPavilionManager.cs
+++ b/Main/System/PhantasmPavilion/PhantasmPavilionManager.cs
@@ -229,8 +229,6 @@
spine.enabled = false;
uiFrame.enabled = false;
-
-
if (sprite == null)
{
if (!IconConfig.HasKey(resourceValue))
@@ -246,6 +244,10 @@
imgFace.enabled = true;
uiFrame.enabled = false;
spine.enabled = true;
+
+ imgFace.sprite = null;
+ imgFace.overrideSprite = null;
+
spine.effectId = int.Parse(resourceValue);
spine.isPlaySpineLoop = true;
spine.Play();
@@ -255,7 +257,9 @@
imgFace.enabled = true;
spine.enabled = false;
uiFrame.enabled = true;
+
imgFace.sprite = null;
+ imgFace.overrideSprite = null;
if (!UIFrameMgr.Inst.ContainsDynamicImage(resourceValue))
break;
--
Gitblit v1.8.0