diff --git a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaResultPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaResultPopup.prefab index 2080eca6d0..0b3edc2b4a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Arena/ArenaResultPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Arena/ArenaResultPopup.prefab @@ -68824,6 +68824,7 @@ RectTransform: - {fileID: 224493225263767744} - {fileID: 224541249121245682} - {fileID: 224963067871776782} + - {fileID: 299109670693176614} m_Father: {fileID: 224762347063628656} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -79361,6 +79362,7 @@ RectTransform: - {fileID: 224515522065417770} - {fileID: 224641037374104132} - {fileID: 224946892147312120} + - {fileID: 7600131354499790481} m_Father: {fileID: 224454662386073102} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -99211,6 +99213,198 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: +100 +--- !u!1 &930807356313609173 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7600131354499790481} + - component: {fileID: 4924476314706716746} + - component: {fileID: 2560973324821773685} + - component: {fileID: 7449306669937560876} + m_Layer: 0 + m_Name: score + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7600131354499790481 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 930807356313609173} + 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_Children: [] + m_Father: {fileID: 224371483493508420} + m_RootOrder: 4 + 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: 319.02405, y: 97} + m_SizeDelta: {x: 160, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4924476314706716746 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 930807356313609173} + m_CullTransparentMesh: 0 +--- !u!114 &2560973324821773685 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 930807356313609173} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 +--- !u!114 &7449306669937560876 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 930807356313609173} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9764706, g: 0.8745098, b: 0.6039216, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 38 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 42 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u79EF\u5206 +15" + LanguageIndex: 10081 +--- !u!1 &1171911692294478180 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 299109670693176614} + - component: {fileID: 3314163554278061843} + - component: {fileID: 3848566528530341219} + - component: {fileID: 2599214617736841938} + m_Layer: 0 + m_Name: score + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &299109670693176614 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1171911692294478180} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.99992007, y: 0.99992007, z: 0.99992007} + m_Children: [] + m_Father: {fileID: 224654456285038450} + m_RootOrder: 4 + 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: 319, y: -132} + m_SizeDelta: {x: 160, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3314163554278061843 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1171911692294478180} + m_CullTransparentMesh: 0 +--- !u!114 &3848566528530341219 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1171911692294478180} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 +--- !u!114 &2599214617736841938 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1171911692294478180} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9764706, g: 0.8745098, b: 0.6039216, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 38 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 42 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u79EF\u5206 +15" + LanguageIndex: 10081 --- !u!1 &1267498100800410910 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua index dd6252505a..6ba4b6a283 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/ArenaResultPopup.lua @@ -85,7 +85,7 @@ function ArenaResultPopup:OnOpen(_args,_fun) local redName = Util.GetGameObject(_CurPanel, "Right/Grade/name") local redHeadIcon = Util.GetGameObject(_CurPanel, "Right/Grade/headIcon") local redHeadBg = Util.GetGameObject(_CurPanel, "Right/Grade/headBg") - -- local redScore = Util.GetGameObject(_CurPanel, "Right/Grade/score") + local redScore = Util.GetGameObject(_CurPanel, "Right/Grade/score") local redResult = Util.GetGameObject(_CurPanel, "Right/result") local bigResult = Util.GetGameObject(_CurPanel, "ShiBai_WenZi"):GetComponent("Image") @@ -123,15 +123,15 @@ function ArenaResultPopup:OnOpen(_args,_fun) blueScore:SetActive(false) end - -- local rScore = redInfo.deltaScore - -- if rScore then - -- redScore:SetActive(true) - -- local redScoreColor = rScore >= 0 and UIColorStr.GREEN or UIColorStr.RED - -- local redScoreStr = rScore >= 0 and "+"..rScore or rScore - -- redScore:GetComponent("Text").text = string.format(Language[10093],redScoreColor, redScoreStr) - -- else - -- redScore:SetActive(false) - -- end + local rScore = redInfo.deltaScore + if rScore and isWin then + redScore:SetActive(true) + local redScoreColor = rScore >= 0 and UIColorStr.GREEN or UIColorStr.RED + local redScoreStr = rScore >= 0 and "+"..rScore or rScore + redScore:GetComponent("Text").text = string.format(Language[10093],redScoreColor, redScoreStr) + else + redScore:SetActive(false) + end -- 判断显示类型 if panelType == 0 then @@ -156,7 +156,7 @@ end --界面关闭时调用(用于子类重写) function ArenaResultPopup:OnClose() if fun then - LogRed("抛弹竞猜结束 打开 ATM_GuessTipView") + -- LogRed("抛弹竞猜结束 打开 ATM_GuessTipView") fun() fun = nil end