From 165aeb9d6d072235e293c50dbb5ee9696bbfb27f Mon Sep 17 00:00:00 2001 From: "DESKTOP-SAJ6RKV\\Administrator" Date: Wed, 4 Jun 2025 03:43:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=8E=86=E5=8F=B2=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E6=88=90=E5=8A=9F=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/AssetRaw/UI/UIGameBattle.prefab | 4 ++-- .../HotFix/GameLogic/Actor/ActorHItem.cs | 2 +- .../HotFix/GameLogic/Common/EventConts.cs | 2 +- .../GameLogic/Manager/DataDanMuSceneManager.cs | 9 +++++++-- .../HotFix/GameLogic/UI/UIGameBattle.cs | 18 ++++++++++++------ 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab index 6812b9d9..4dbea392 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab @@ -93103,10 +93103,10 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 08cc5ee6f40805f4180c0771351a0aeb, type: 3} - m_Type: 0 + m_Type: 3 m_PreserveAspect: 0 m_FillCenter: 1 - m_FillMethod: 4 + m_FillMethod: 0 m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs index 301a78db..2eca84ad 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs @@ -275,7 +275,7 @@ namespace GameLogic else if (buff.m_Id == 1) { // 点赞 - Log.Debug("点赞"); + //Log.Debug("点赞"); // 创建一个玩家头像出来 diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs index 9b4dc4ea..1f275a13 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs @@ -31,7 +31,7 @@ namespace GameLogic public static int GmActorId = 1; public static int HuangJinShiDaiEnd = 5; // 黄金时代结束时间 - public static int LiShiShiJianEnd = 5; // 历史事件结束时间 + public static int LiShiShiJianEnd = 15; // 历史事件结束时间 // 测试玩家头像Url diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs index 6d92eaef..3c943ff6 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs @@ -266,11 +266,13 @@ namespace GameLogic Log.Error("礼物配置表Id异常 {0}", 1); return; } - Log.Debug("点赞:" + data.teamId); + //Log.Debug("点赞:" + data.teamId); DataGameSceneManager.Instance.OnGiftFunc(giftConfig, int.Parse(protCustMessageData.Count), data); - if (DataGameSceneManager.Instance.isHuangJinShiDai) + if (DataGameSceneManager.Instance.isLiShiShiJian) { + DataGameSceneManager.Instance.m_LiShiShiJianLikeCount += int.Parse(protCustMessageData.Count); + bool isAdd = true; // 检查列表是否存在该玩家 foreach (var item in DataGameSceneManager.Instance.sjDatas) @@ -286,6 +288,9 @@ namespace GameLogic if (isAdd) { + // 给玩家增加贡献 + data.m_GongXian++; + SjData sjData = new SjData() { }; sjData.openId = data.protCustMessageData.openId; sjData.name = data.protCustMessageData.nickName; diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs index 27db6aad..65751166 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs @@ -177,8 +177,10 @@ namespace GameLogic // 更新界面逻辑 // 目前固定两百个点赞逻辑。 m_tmp_ShiJianValue.text = string.Format("{0}/200", DataGameSceneManager.Instance.m_LiShiShiJianLikeCount); + + m_img_JinDu.fillAmount = (float)(DataGameSceneManager.Instance.m_LiShiShiJianLikeCount / (float)DataGameSceneManager.Instance.m_LiShiShiJianLikeCountMax); + - m_img_JinDu.fillAmount = (float)DataGameSceneManager.Instance.m_LiShiShiJianLikeCount / DataGameSceneManager.Instance.m_LiShiShiJianLikeCountMax; // 奖励也是固定死的 if (DataGameSceneManager.Instance.m_LiShiShiJianLikeCount >= DataGameSceneManager.Instance.m_LiShiShiJianLikeCountMax) @@ -210,11 +212,11 @@ namespace GameLogic // 设置用户信息 m_textHuangJinInfo.text = string.Format( - config.TextInfo, - DataGameSceneManager.Instance.sjDatas[0] == null ? "暂无" : DataGameSceneManager.Instance.sjDatas[0].name, - DataGameSceneManager.Instance.sjDatas[1] == null ? "暂无" : DataGameSceneManager.Instance.sjDatas[1].name, - DataGameSceneManager.Instance.sjDatas[2] == null ? "暂无" : DataGameSceneManager.Instance.sjDatas[2].name - ); + config.TextInfo, + DataGameSceneManager.Instance.sjDatas.Count > 0 && DataGameSceneManager.Instance.sjDatas[0] != null ? DataGameSceneManager.Instance.sjDatas[0].name : "暂无", + DataGameSceneManager.Instance.sjDatas.Count > 1 && DataGameSceneManager.Instance.sjDatas[1] != null ? DataGameSceneManager.Instance.sjDatas[1].name : "暂无", + DataGameSceneManager.Instance.sjDatas.Count > 2 && DataGameSceneManager.Instance.sjDatas[2] != null ? DataGameSceneManager.Instance.sjDatas[2].name : "暂无" + ); // 设置图片从透明到不透明 @@ -230,6 +232,8 @@ namespace GameLogic m_img_HuangJinShiDai.gameObject.SetActive(false); m_rect_ShiJian.gameObject.SetActive(false); + DataGameSceneManager.Instance.m_LiShiShiJianLikeCount = 0; + }); } } @@ -328,6 +332,8 @@ namespace GameLogic DataGameSceneManager.Instance.sjDatas.Clear(); // 清空数据 + DataGameSceneManager.Instance.m_LiShiShiJianLikeCount = 0; + // 等待五秒钟后关闭 UniTask.Delay(5000).ContinueWith(() =>