From 4861711fbc58cdc47da1627f7e8a77fb7c875d80 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 3 Mar 2021 18:25:34 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9C=AC=E5=9C=B0=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Fight/FightAreaRewardPopup.prefab | 20 ++-- .../UI/OnlineReward/OnlineRewardPanel.prefab | 92 +++++++++++++++++-- .../Modules/Fight/FightPointPassMainPanel.lua | 3 + .../OnlineReward/OnlineRewardPanel.lua | 10 +- 4 files changed, 104 insertions(+), 21 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightAreaRewardPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightAreaRewardPopup.prefab index cf2d8e8068..2be585307e 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightAreaRewardPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightAreaRewardPopup.prefab @@ -148,7 +148,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -0.98500025, y: 259.9} - m_SizeDelta: {x: 273.2, y: 62.299988} + m_SizeDelta: {x: 300, y: 62.299988} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1527864042 CanvasRenderer: @@ -182,9 +182,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 42 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 10 - m_MaxSize: 48 + m_MaxSize: 42 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -227,7 +227,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -250.885, y: 263} + m_AnchoredPosition: {x: -300, y: 263} m_SizeDelta: {x: 300, y: 12.720001} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1542162659 @@ -381,7 +381,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: 255.51498, y: 263.46005} + m_AnchoredPosition: {x: 300, y: 263.46005} m_SizeDelta: {x: 300, y: 14.200012} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1691078026 @@ -1019,7 +1019,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -250.885, y: -84.46005} + m_AnchoredPosition: {x: -300, y: -84.46005} m_SizeDelta: {x: 300, y: 12.720001} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4156035042143104241 @@ -1505,7 +1505,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: -0.98500025, y: -85.7} - m_SizeDelta: {x: 273.2, y: 62.299988} + m_SizeDelta: {x: 300, y: 62.299988} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3364858115052033459 CanvasRenderer: @@ -1539,9 +1539,9 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 42 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 10 - m_MaxSize: 48 + m_MaxSize: 42 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 @@ -6522,7 +6522,7 @@ 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: 255.51498, y: -84} + m_AnchoredPosition: {x: 300, y: -84} m_SizeDelta: {x: 300, y: 14.200012} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &629970461923600925 diff --git a/Assets/ManagedResources/Prefabs/UI/OnlineReward/OnlineRewardPanel.prefab b/Assets/ManagedResources/Prefabs/UI/OnlineReward/OnlineRewardPanel.prefab index 4576269b62..7af9f99b01 100644 --- a/Assets/ManagedResources/Prefabs/UI/OnlineReward/OnlineRewardPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/OnlineReward/OnlineRewardPanel.prefab @@ -355,8 +355,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: -0.14, y: -0.67} + m_SizeDelta: {x: -22.68, y: -17.34} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8624376893170273536 CanvasRenderer: @@ -1089,7 +1089,7 @@ RectTransform: m_Children: - {fileID: 4035571355383968657} m_Father: {fileID: 7501235318200768921} - m_RootOrder: 3 + 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} @@ -2225,7 +2225,7 @@ RectTransform: m_Children: - {fileID: 2113464250180834794} m_Father: {fileID: 7501235318200768921} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3147,7 +3147,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6631754304823686522 RectTransform: m_ObjectHideFlags: 0 @@ -3162,7 +3162,7 @@ RectTransform: - {fileID: 6631754304352580647} - {fileID: 6631754305410274471} m_Father: {fileID: 7501235318200768921} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -3801,6 +3801,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6631754303772144012} + - {fileID: 281301063172283042} - {fileID: 6631754304823686522} - {fileID: 6032101344337433508} - {fileID: 921232602260109187} @@ -4447,6 +4448,85 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &9014588840574552595 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 281301063172283042} + - component: {fileID: 3918630109396743327} + - component: {fileID: 2625377729832775367} + m_Layer: 5 + m_Name: Time + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &281301063172283042 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9014588840574552595} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.7819, y: 1.7819, z: 1.7819} + m_Children: [] + m_Father: {fileID: 7501235318200768921} + m_RootOrder: 1 + 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: -16.9, y: 372.40005} + m_SizeDelta: {x: 200.4, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3918630109396743327 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9014588840574552595} + m_CullTransparentMesh: 0 +--- !u!114 &2625377729832775367 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9014588840574552595} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, 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: 21 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 00:00:00 --- !u!1 &9014625740881121700 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index edc8f6aaf2..dc06861cd6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -406,6 +406,9 @@ function FightPointPassMainPanel:OnShow() chapterId = FightPointPassManager.GetCurChapterIndex() end this.areaName.text = str + if GetCurLanguage() ~= 0 then + this.areaName.gameObject.transform.localPosition = Vector2.New(0,0) + end this.chapterName.text = GetLanguageStrById(fightLevelSetConfig[chapterId].Name) this.FreshPlayerInfo() diff --git a/Assets/ManagedResources/~Lua/Modules/OnlineReward/OnlineRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/OnlineReward/OnlineRewardPanel.lua index 0b4f471bec..14c3469c4a 100644 --- a/Assets/ManagedResources/~Lua/Modules/OnlineReward/OnlineRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/OnlineReward/OnlineRewardPanel.lua @@ -10,7 +10,7 @@ function OnlineRewardPanel:InitComponent() this.getAll = Util.GetGameObject(this.gameObject,"show/btnGetAll") this.preViewBtn = Util.GetGameObject(this.gameObject,"show/bg/preview") this.light = Util.GetGameObject(this.gameObject,"light") - this.time = Util.GetGameObject(this.gameObject,"show/timeCount/time"):GetComponent("Text") + this.time2 = Util.GetGameObject(this.gameObject,"show/Time"):GetComponent("Text") end @@ -193,7 +193,7 @@ end function OnlineRewardPanel:RemainTimeDown() self:RemainTimeDownUpdata() if ActivityGiftManager.currentTimeIndex == #ActivityGiftManager.onlineData then - this.time.text = "00:00:00" + this.time2.text = "已达到最大时长" end if self.timer then self.timer:Stop() @@ -206,7 +206,7 @@ function OnlineRewardPanel:RemainTimeDown() if ActivityGiftManager.currentTimeIndex == #ActivityGiftManager.onlineData then self.timer:Stop() self.timer = nil - this.time.text = "00:00:00" + this.time2.text = "已达到最大时长" end end, 1, -1, true) self.timer:Start() @@ -231,9 +231,9 @@ function OnlineRewardPanel:RemainTimeDownUpdata() this:OnShowActivityData(ActivityGiftManager.onlineData, ActivityTypeDef.OnlineGift, ActivityGiftManager.onlineGetRewardState, ActivityGiftManager.currentTimeIndex) end if(newSort<12)then - this.time.text = TimeToHMS(ActivityGiftManager.onlineData[newSort+1].Values[1][1]*60-timeNum) + this.time2.text = Language[10032]..TimeToHMS(ActivityGiftManager.onlineData[newSort+1].Values[1][1]*60-timeNum) else - this.time.text ="00:00:00" + this.time2.text =Language[10032].."00:00:00" end end