From 548f5508ac2cec5fdc5a804119bcf2564a4939b9 Mon Sep 17 00:00:00 2001 From: "DESKTOP-SAJ6RKV\\Administrator" Date: Wed, 28 May 2025 14:42:47 +0800 Subject: [PATCH] 1 --- .../Atlas/UIRaw_Atlas_弹窗.spriteatlas | 4 +++ .../Assets/AssetRaw/UI/UIGameBattle.prefab | 10 +++--- .../Assets/AssetRaw/UI/UIGmForm.prefab | 20 ++++++------ .../HotFix/GameLogic/Actor/ActorHItem.cs | 31 +++++++++++++++---- .../Manager/DataDanMuSceneManager.cs | 2 ++ .../GameLogic/Manager/DataGameSceneManager.cs | 4 +++ .../HotFix/GameLogic/UI/UIGmForm.cs | 9 ++++-- 7 files changed, 57 insertions(+), 23 deletions(-) diff --git a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_弹窗.spriteatlas b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_弹窗.spriteatlas index 0d7b43d0..8d1326c4 100644 --- a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_弹窗.spriteatlas +++ b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_弹窗.spriteatlas @@ -77,6 +77,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 3b8788a5800321a4498485a85c170fc0, type: 3} - {fileID: 21300000, guid: af50fc7eee516a645b09aa8f79017aaa, type: 3} - {fileID: 21300000, guid: d2ee8cbf34c48214688c60c2fadf0e8e, type: 3} + - {fileID: 21300000, guid: e0932649c675784419f71913a849d5f2, type: 3} - {fileID: 21300000, guid: 464e18bfd9c3d5e4b927c13ec9def492, type: 3} - {fileID: 21300000, guid: 9c5e0e9bd6ee88c4597788568c620662, type: 3} - {fileID: 21300000, guid: d54d40edf100af147a5223de2f881ca3, type: 3} @@ -94,6 +95,7 @@ SpriteAtlas: - 3b8788a5800321a4498485a85c170fc0: 21300000 - 1ae1cec5530a6cd44b0d31ea027ebcf1: 21300000 - e7f5460757eef7c409168510aa3c5037: 21300000 + - e0932649c675784419f71913a849d5f2: 21300000 - 2cfbfa89505825949b3cec3b48d323a6: 21300000 - 9c5e0e9bd6ee88c4597788568c620662: 21300000 - 321bf3fcbdc862a46bc384367d7fbe90: 21300000 @@ -110,6 +112,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 3b8788a5800321a4498485a85c170fc0, type: 3} - {fileID: 21300000, guid: 1ae1cec5530a6cd44b0d31ea027ebcf1, type: 3} - {fileID: 21300000, guid: e7f5460757eef7c409168510aa3c5037, type: 3} + - {fileID: 21300000, guid: e0932649c675784419f71913a849d5f2, type: 3} - {fileID: 21300000, guid: 2cfbfa89505825949b3cec3b48d323a6, type: 3} - {fileID: 21300000, guid: 9c5e0e9bd6ee88c4597788568c620662, type: 3} - {fileID: 21300000, guid: 321bf3fcbdc862a46bc384367d7fbe90, type: 3} @@ -125,6 +128,7 @@ SpriteAtlas: - MC - DZ_icon - GJSK + - NL_box 2 - qz_jr - NL_box_1 - gx diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab index 32a4fb2e..c40fb83e 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab @@ -5612,7 +5612,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &9171262180880956483 RectTransform: m_ObjectHideFlags: 0 @@ -5625,11 +5625,11 @@ RectTransform: m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 688984147342290442} + m_Father: {fileID: 1814839733780877975} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 72, y: 56} + m_AnchoredPosition: {x: -64, y: 78.0011} m_SizeDelta: {x: 60, y: 49} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3031959468877678420 @@ -5971,7 +5971,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2724436185550919054 RectTransform: m_ObjectHideFlags: 0 @@ -11140,6 +11140,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4871076593613299986} + - {fileID: 9171262180880956483} - {fileID: 688984147342290442} m_Father: {fileID: 8086681985000168470} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -76654,7 +76655,6 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: - - {fileID: 9171262180880956483} - {fileID: 5645085182591318069} - {fileID: 8010860323348911180} - {fileID: 4670639706423021333} diff --git a/UnityProject/Assets/AssetRaw/UI/UIGmForm.prefab b/UnityProject/Assets/AssetRaw/UI/UIGmForm.prefab index d2298f0a..d760c1f5 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGmForm.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGmForm.prefab @@ -115,7 +115,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -421, y: -79} + m_AnchoredPosition: {x: -111, y: -91} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7810983908619713087 @@ -436,7 +436,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -61, y: -79} + m_AnchoredPosition: {x: 252, y: -86} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7065787271315614077 @@ -715,7 +715,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 117.18, y: -24.949} + m_AnchoredPosition: {x: 252.18002, y: -36.949005} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9083428567683313109 @@ -1073,7 +1073,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -61, y: -20} + m_AnchoredPosition: {x: 74.000015, y: -32} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5354092341571425919 @@ -1955,7 +1955,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -241, y: -20} + m_AnchoredPosition: {x: -105.999985, y: -32} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4554694178838688397 @@ -2355,7 +2355,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 302, y: -24.949} + m_AnchoredPosition: {x: -282, y: -93} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3421215217899163350 @@ -2660,7 +2660,7 @@ RectTransform: m_GameObject: {fileID: 3787398473645480383} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 1.5304, y: 1.5304, z: 1.5304} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2554093885699993755} @@ -2683,7 +2683,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -0.0010986328, y: -0.0010986328} + m_AnchoredPosition: {x: 31.556, y: 223} m_SizeDelta: {x: 677.5, y: 277.8983} m_Pivot: {x: 0.5, y: 0} --- !u!1 &3797963436205863034 @@ -2722,7 +2722,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -421, y: -20} + m_AnchoredPosition: {x: -286, y: -32} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6158124813356784663 @@ -3638,7 +3638,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -241, y: -79} + m_AnchoredPosition: {x: 73, y: -91} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6471808054285214965 diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs index 2c3caa20..90602265 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs @@ -263,6 +263,31 @@ namespace GameLogic // 龙卷风特效特殊处理 } + else if (buff.m_Id == 1) + { + // 点赞 + Log.Debug("点赞"); + + + // 创建一个玩家头像出来 + UIPlayerHeadItem actorHItem = CreateWidgetByPrefab(m_itemHeadItem, m_rectHeadRt, true); + actorHItem.OnInit(unitPlayerData); + + actorHItem.transform.SetParent(m_rectCar.transform); + actorHItem.transform.localPosition = new Vector3(-1500, 0, 0); + actorHItem.transform.localScale = Vector3.one; + actorHItem.gameObject.SetActive(true); + actorHItem.transform.DOLocalMoveX(0, 4f).OnComplete(async () => + { + // 显示一下脑袋 + + + + await UniTask.Delay(2000); + // 特效播放完毕后销毁 + GameObject.Destroy(actorHItem.gameObject); + }); + } else if (buff.m_Id == 2) { // 红仙女棒的额外特殊处理 @@ -271,7 +296,6 @@ namespace GameLogic eGo.transform.localPosition = new Vector3(-1500, 0, 0); eGo.transform.localScale = Vector3.one; eGo.gameObject.SetActive(true); - eGo.transform.DOLocalMoveX(0, 4f).OnComplete(async () => { await UniTask.Delay(2000); @@ -285,7 +309,6 @@ namespace GameLogic speedLineGo.transform.localPosition = new Vector3(-1500, 0, 0); speedLineGo.transform.localScale = Vector3.one; speedLineGo.gameObject.SetActive(true); - GameModule.Timer.AddTimer((e) => { GameObject.Destroy(speedLineGo); @@ -303,7 +326,6 @@ namespace GameLogic eGo.transform.localPosition = new Vector3(500, 0, 0); eGo.transform.localScale = Vector3.one * 0.1f; eGo.gameObject.SetActive(true); - eGo.transform.DOLocalMoveX(0, 1.5f).OnComplete(async () => { // 特效播放完毕后销毁 @@ -327,7 +349,6 @@ namespace GameLogic eGo.transform.localPosition = new Vector3(-1500, 0, 0); eGo.transform.localScale = Vector3.one; eGo.gameObject.SetActive(true); - eGo.transform.DOLocalMoveX(0, 4f).OnComplete(() => { // 特效播放完毕后销毁 @@ -354,7 +375,6 @@ namespace GameLogic eGo.transform.localPosition = new Vector3(500, 0, 0); eGo.transform.localScale = Vector3.one; eGo.gameObject.SetActive(true); - eGo.transform.DOLocalMoveX(0, 1.5f).OnComplete(async () => { // 特效播放完毕后销毁 @@ -369,7 +389,6 @@ namespace GameLogic // 销毁爆点特效 GameObject.Destroy(effectGo); }); - } } else if (buff.m_Id == 2) diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs index 148c3e41..933b4904 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataDanMuSceneManager.cs @@ -220,6 +220,8 @@ namespace GameLogic if (data == null) { + Log.Error("玩家 {0} 没有加入过阵营,无法点赞", protCustMessageData.openId); + //data = DataGameSceneManager.Instance.CreateUnitPlayerData(protCustMessageData); //// 二次容错 //if (data == null) diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs index 74820d9c..caab7981 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs @@ -358,6 +358,10 @@ namespace GameLogic m_AllTimer = giftConfig.TimerLen, m_CraeteTimer = Time.deltaTime, }, unitPlayerData, giftConfig); + + + + } else if (giftConfig.Id == 2) { diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGmForm.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGmForm.cs index a4c319d1..d5d5dc30 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGmForm.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGmForm.cs @@ -70,10 +70,15 @@ namespace GameLogic { if (string.IsNullOrEmpty(m_input_GmPlayName.text)) { - Log.Error("请输入玩家名称!必须!"); - return; + //Log.Error("请输入玩家名称!必须!"); + //return; + + + // 没有输入玩家名称默认取上一次的玩家名称 + m_input_GmPlayName.text = "Gm" + (EventConts.GmActorId - 1); } + string num = string.IsNullOrEmpty(m_input_GmGiftNum.text) ? "1" : m_input_GmGiftNum.text; ProtCustMessageData protCustMessageData = new ProtCustMessageData();