From 733d87da4ff662d274892c6bf5963238c8fd0226 Mon Sep 17 00:00:00 2001 From: "DESKTOP-SAJ6RKV\\Administrator" Date: Tue, 3 Jun 2025 22:26:10 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BB=84=E9=87=91=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/AssetRaw/UI/UIGameBattle.prefab | 4 +- .../HotFix/GameLogic/Common/CommonData.cs | 7 ++ .../GameLogic/Manager/DataGameSceneManager.cs | 5 +- .../HotFix/GameLogic/UI/UIGameBattle.cs | 74 +++++++++++++++++++ 4 files changed, 87 insertions(+), 3 deletions(-) diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab index ce56bc85..34904e03 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab @@ -37074,7 +37074,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3665105469090519557 RectTransform: m_ObjectHideFlags: 0 @@ -78141,7 +78141,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7639078275878196855 RectTransform: m_ObjectHideFlags: 0 diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/CommonData.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/CommonData.cs index a69fc9ce..15e8c70f 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/CommonData.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/CommonData.cs @@ -19,6 +19,13 @@ namespace GameLogic } + public class SjData + { + public string openId; + public string name; + public int count; + } + public class UploadScoreRequest { public string roomId; diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs index 78da0d4d..18f4f2ac 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs @@ -40,7 +40,10 @@ namespace GameLogic public long m_AllTeamPush = 0; public int m_TeamId = 0;// 当前朝代Id - + public bool isLiShiShiJian = false; // 是否是历史事件 + public int m_LiShiShiJianLikeCount = 0; // 历史事件点赞触发条件 + public int m_LiShiShiJianLikeCountMax = 200; // 历史事件点赞触发条件最大值 + public List sjDatas = new List(); // 历史事件数据 public void OnInit() { diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs index 1adecaae..fa069c78 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs @@ -8,6 +8,7 @@ using Cysharp.Threading.Tasks; using TMPro; using Coffee.UIExtensions; using UnityEngine.Video; +using System.Xml.Linq; namespace GameLogic { @@ -36,7 +37,14 @@ namespace GameLogic private TextMeshProUGUI m_tmpCount; private RawImage m_rimg_ViewTexture; private VideoPlayer m_video_Video; + private Image m_img_HuangJinShiDai; + private Text m_textHuangJinInfo; private Button m_btn_StartBtn; + private RectTransform m_rect_ShiJian; + private Image m_img_JinDu; + private TextMeshProUGUI m_tmp_ShiJian; + private TextMeshProUGUI m_tmp_ShiJianValue; + private Image m_imgShiJianSign; protected override void ScriptGenerator() { m_rectSdx = FindChildComponent("Bg/m_rectSdx"); @@ -60,7 +68,14 @@ namespace GameLogic m_tmpCount = FindChildComponent("Bg/m_rect_GiftPanel/GiftItem/Item/m_tmpCount"); m_rimg_ViewTexture = FindChildComponent("Bg/BattleBg/m_rimg_ViewTexture"); m_video_Video = FindChildComponent("Bg/BattleBg/m_video_Video"); + m_img_HuangJinShiDai = FindChildComponent("Bg/m_img_HuangJinShiDai"); + m_textHuangJinInfo = FindChildComponent("Bg/m_img_HuangJinShiDai/m_textHuangJinInfo"); m_btn_StartBtn = FindChildComponent