From c7882cb2530bb8d9399b214c0b52b0bea205bdd7 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Mon, 24 Jun 2024 18:22:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=89=E8=99=9A=E7=95=8C=E9=9D=A2=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorldArenaBattleInfoPanel.prefab | 32 +++++++------- .../WorldArenaOtherTeamPanel.prefab | 44 +++++++++---------- .../WorldArena/WorldArenaBattleInfoPanel.lua | 8 ++-- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaBattleInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaBattleInfoPanel.prefab index 76724983c5..e7a0717e9c 100644 --- a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaBattleInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaBattleInfoPanel.prefab @@ -691,7 +691,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.57254905, g: 0.5568628, b: 0.5254902, a: 1} + m_Color: {r: 0.21698111, g: 0.19207606, b: 0.14226592, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -978,8 +978,8 @@ 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: 28.299995, y: 10.79} - m_SizeDelta: {x: 342.7, y: 87.7} + m_AnchoredPosition: {x: 43, y: 27.7} + m_SizeDelta: {x: 267, y: 33.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &957446442 CanvasRenderer: @@ -1002,7 +1002,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.69803923} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1368,7 +1368,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.57254905, g: 0.5568628, b: 0.5254902, a: 1} + m_Color: {r: 0.21960784, g: 0.19215687, b: 0.14509805, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1560,7 +1560,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.90196085, g: 0.7607844, b: 0.38823533, a: 1} + m_Color: {r: 0.7830189, g: 0.43080437, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1569,7 +1569,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -1810,8 +1810,8 @@ 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: 34, y: 10.79} - m_SizeDelta: {x: 354, y: 87.7} + m_AnchoredPosition: {x: 43.03, y: 27.7} + m_SizeDelta: {x: 267.38, y: 33.701} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1919689360 CanvasRenderer: @@ -1834,7 +1834,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.69803923} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1908,7 +1908,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.90196085, g: 0.7607844, b: 0.38823533, a: 1} + m_Color: {r: 0.78431374, g: 0.43137255, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1917,7 +1917,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 25 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -2694,7 +2694,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.72156864, g: 0.49411768, b: 0.22352943, a: 1} + m_Color: {r: 0.36078432, g: 0.2509804, b: 0.11764706, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -22556,7 +22556,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9333334, g: 0.64705884, b: 0.2901961, a: 1} + m_Color: {r: 0.36078432, g: 0.2509804, b: 0.11764706, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -52466,7 +52466,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9333334, g: 0.64705884, b: 0.2901961, a: 1} + m_Color: {r: 0.36078432, g: 0.2509804, b: 0.11764706, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -61384,7 +61384,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9333334, g: 0.64705884, b: 0.2901961, a: 1} + m_Color: {r: 0.3584906, g: 0.25085476, b: 0.11667854, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaOtherTeamPanel.prefab b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaOtherTeamPanel.prefab index 752eefbb84..bcbcf2963a 100644 --- a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaOtherTeamPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaOtherTeamPanel.prefab @@ -2253,7 +2253,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.97647065, g: 0.7490196, b: 0.47450984, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3538,7 +3538,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.97647065, g: 0.7490196, b: 0.47450984, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4465,7 +4465,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8301887, g: 0.58942956, b: 0.30936277, a: 1} + m_Color: {r: 0.3529412, g: 0.24313726, b: 0.12156863, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -6337,7 +6337,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 910, y: 491.3} + m_SizeDelta: {x: 876.64, y: 491.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6466083547730226912 MonoBehaviour: @@ -6666,7 +6666,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8301887, g: 0.58942956, b: 0.30936277, a: 1} + m_Color: {r: 0.3490566, g: 0.24236877, b: 0.12019401, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -7526,7 +7526,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.8301887, g: 0.58942956, b: 0.30936277, a: 1} + m_Color: {r: 0.3529412, g: 0.24313726, b: 0.12156863, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -10020,7 +10020,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 910, y: 229} + m_SizeDelta: {x: 876.774, y: 229} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4031768733052715064 MonoBehaviour: @@ -10230,7 +10230,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 910, y: 254.3} + m_SizeDelta: {x: 876.74, y: 254.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7076006150527824184 MonoBehaviour: @@ -10293,7 +10293,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -39} - m_SizeDelta: {x: 911, y: 78} + m_SizeDelta: {x: 876.74, y: 78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1510126380560650291 CanvasRenderer: @@ -10323,7 +10323,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 66bbab0812b3c0c47849ca9e06509e53, type: 3} + m_Sprite: {fileID: 21300000, guid: 413fc49362e98784c9661075ed046cd6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -12366,7 +12366,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -39} - m_SizeDelta: {x: 911, y: 78} + m_SizeDelta: {x: 876.774, y: 78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &77791658078892440 CanvasRenderer: @@ -12396,7 +12396,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 66bbab0812b3c0c47849ca9e06509e53, type: 3} + m_Sprite: {fileID: 21300000, guid: 413fc49362e98784c9661075ed046cd6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -12483,7 +12483,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9725491, g: 0.9333334, b: 0.7607844, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -12688,7 +12688,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: -268.4, y: -15.900024} + m_AnchoredPosition: {x: -276.1, y: -41} m_SizeDelta: {x: 436.4, y: 50} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4483727906883282775 @@ -12712,7 +12712,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.57254905, g: 0.5568628, b: 0.5254902, a: 1} + m_Color: {r: 0.3207547, g: 0.23653139, b: 0.06808473, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -13003,8 +13003,8 @@ 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: -150.1, y: 8.4} - m_SizeDelta: {x: 500, y: 110} + m_AnchoredPosition: {x: -120, y: 35.75} + m_SizeDelta: {x: 334.66, y: 55.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &691581194353361399 CanvasRenderer: @@ -13027,7 +13027,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.49803922} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -13228,8 +13228,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -39} - m_SizeDelta: {x: 911, y: 78} + m_AnchoredPosition: {x: 0.000012398, y: -39} + m_SizeDelta: {x: 875, y: 78} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7788935127660819599 CanvasRenderer: @@ -13259,7 +13259,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 66bbab0812b3c0c47849ca9e06509e53, type: 3} + m_Sprite: {fileID: 21300000, guid: 413fc49362e98784c9661075ed046cd6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -15502,7 +15502,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.97647065, g: 0.7490196, b: 0.47450984, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua index 5fe6997434..50af6254a2 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua @@ -495,15 +495,15 @@ function this.ShowInfo(msg) this.myScore.text= msg.myScore>0 and "积分+"..msg.myScore or "积分"..msg.myScore this.enScore.text= msg.defScore>0 and "积分+"..msg.defScore or "积分"..msg.defScore end - this.myScore.color = msg.myScore>0 and UIColor.GREEN or UIColor.RED - this.enScore.color = msg.defScore>0 and UIColor.GREEN or UIColor.RED + --this.myScore.color = msg.myScore>0 and UIColor.GREEN or UIColor.RED + --this.enScore.color = msg.defScore>0 and UIColor.GREEN or UIColor.RED else myOldScore=msg.myTeamInfo.crossTeamScore this.myScore.text="积分 "..myOldScore enOldScore=msg.defTeamInfo.crossTeamScore this.enScore.text="积分 "..enOldScore - this.myScore.color =Color.New(0.9019,0.76,0.3882,1) - this.enScore.color = Color.New(0.9019,0.76,0.3882,1) + --this.myScore.color =Color.New(0.9019,0.76,0.3882,1) + --this.enScore.color = Color.New(0.9019,0.76,0.3882,1) end this.SetTeamInfo(this.myTeamInfo,msg.myTeamInfo.crossTeam,1) this.SetTeamInfo(this.enTeamInfo,msg.defTeamInfo.crossTeam,2)