From d6eb3ffabaa1c551927fec66ab5c776cb58fed58 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 24 四月 2026 11:04:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Horse/HorseCarouselView.cs | 4 ++++
Main/System/Qunying/QYWin.cs | 17 ++++++++++++++++-
Main/System/Horse/HorseItem.cs | 7 +++++++
Main/Utility/OperationLogCollect.cs | 4 ++--
4 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/Main/System/Horse/HorseCarouselView.cs b/Main/System/Horse/HorseCarouselView.cs
index 2c63b70..9ffa92e 100644
--- a/Main/System/Horse/HorseCarouselView.cs
+++ b/Main/System/Horse/HorseCarouselView.cs
@@ -166,6 +166,10 @@
// 6. 鏁版嵁涓庤〃鐜版洿鏂� (鍒锋柊澶村儚銆佸悕瀛楃瓑)
itemUI.UpdateData(horseConfigs[realIndex], realIndex);
itemUI.onItemClick = SelectIndex;
+
+ // 7. 鏍规嵁鏄惁灞呬腑鏉ヨ缃�変腑鐘舵��
+ bool isSelected = Mathf.Approximately(distanceToCenter, 0f);
+ itemUI.SetSelected(isSelected);
}
}
diff --git a/Main/System/Horse/HorseItem.cs b/Main/System/Horse/HorseItem.cs
index 7aa429e..652e07a 100644
--- a/Main/System/Horse/HorseItem.cs
+++ b/Main/System/Horse/HorseItem.cs
@@ -10,6 +10,7 @@
public Image lockImg;
public TextEx useTxt;
public ButtonEx clickBtn;
+ public Image chooseImg;
// 鐐瑰嚮鍥炶皟锛屼紶閫掕Item瀵瑰簲鐨剅ealIndex
public System.Action<int> onItemClick;
@@ -40,4 +41,10 @@
clickBtn.onClick.RemoveAllListeners();
clickBtn.onClick.AddListener(() => onItemClick?.Invoke(realIndex));
}
+
+ // 鎺у埗閫変腑鍥剧墖鐨勬樉绀�
+ public void SetSelected(bool selected)
+ {
+ chooseImg.SetActive(selected);
+ }
}
\ No newline at end of file
diff --git a/Main/System/Qunying/QYWin.cs b/Main/System/Qunying/QYWin.cs
index 5a91f8c..2466dd8 100644
--- a/Main/System/Qunying/QYWin.cs
+++ b/Main/System/Qunying/QYWin.cs
@@ -14,6 +14,7 @@
[SerializeField] Button closeBtn;
[SerializeField] Text gameTimeText;
+ [SerializeField] Text gameStepNameText;
[SerializeField] Button buyTicketBtn;
[SerializeField] Text ticketCountText;
[SerializeField] Text ticketTimeText;
@@ -170,7 +171,21 @@
//娲诲姩鏃堕棿
void ShowGameTime()
{
- gameTimeText.text = QunyingManager.Instance.GetEndSecondStr();
+ var zoneInfo = CrossServerBaseManager.Instance.GetCrossZoneInfo(QunyingManager.DataMapID);
+ if (zoneInfo != null && zoneInfo.ZoneID == 0)
+ {
+ //鍊掕鏃舵寜0:05缁撴潫
+ var seconds = (TimeUtility.GetTodayStartTime().AddMinutes(5) - TimeUtility.GetCommServerNow(0)).TotalSeconds;
+ gameTimeText.text = TimeUtility.SecondsToDHMS((int)seconds);
+ gameStepNameText.text = Language.Get("Qunying3_1");
+ }
+ else
+ {
+ //闈炶法鏈� 鎴栬�� 璺ㄦ湇鍦ㄨ繘琛屼腑鐨勬椂鍊欐甯告樉绀哄�掕鏃�
+ gameTimeText.text = QunyingManager.Instance.GetEndSecondStr();
+ gameStepNameText.text = Language.Get("Qunying3");
+ }
+
if (QunyingManager.Instance.m_LastRecoverTime == 0)
{
ticketTimeText.text = "";
diff --git a/Main/Utility/OperationLogCollect.cs b/Main/Utility/OperationLogCollect.cs
index d6188b7..5c7ddf6 100644
--- a/Main/Utility/OperationLogCollect.cs
+++ b/Main/Utility/OperationLogCollect.cs
@@ -35,8 +35,9 @@
//6104 SDK璐﹀彿鐧诲綍澶辫触
public void RecordLauchEvent(int _step)
{
+#if !UNITY_EDITOR
//榛樿鍙戦�佸嵆浣胯〃娌℃湁鍒濆鍖�
- if (InitialFunctionConfig.isInit)
+ if (SDKUtils.Instance.AssetCopyFinished)
{
var config = InitialFunctionConfig.Get("Event");
if (config != null && config.Numerical1 != "1")
@@ -44,7 +45,6 @@
return;
}
}
-#if !UNITY_EDITOR
var tables = new Dictionary<string, string>();
tables["OperatorID"] = VersionConfig.Get().appId;
tables["RegionName"] = "data";
--
Gitblit v1.8.0