From 8f2c16d397fa466679167c4307058923884f0f92 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 3 Aug 2021 13:58:09 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E3=80=90=E9=80=82=E9=85=8D=E3=80=91?= =?UTF-8?q?=E6=96=B0=E5=B0=86=E6=9D=A5=E8=A2=AD=E3=80=81=E5=8D=87=E6=98=9F?= =?UTF-8?q?=E6=9C=89=E7=A4=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/DynamicActicity/page13.prefab | 14 +++++++------- .../Prefabs/UI/DynamicActicity/page15.prefab | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page13.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page13.prefab index f1dcb6f50c..f3534788ec 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page13.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page13.prefab @@ -107,10 +107,10 @@ RectTransform: m_Father: {fileID: 2078386161070176561} 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} - m_AnchoredPosition: {x: 451.70007, y: 669.28} - m_SizeDelta: {x: 127, y: 264.57} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -88.29993, y: -290.71997} + m_SizeDelta: {x: 127, y: 264.57007} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6234182306990666182 MonoBehaviour: @@ -460,9 +460,9 @@ RectTransform: m_Father: {fileID: 2078386161070176561} 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: 452.7, y: 856.7} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -87.29999, y: -103.29999} m_SizeDelta: {x: 68, y: 68} m_Pivot: {x: 0.49999955, y: 0.5} --- !u!222 &4588235694566972338 diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page15.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page15.prefab index fa40a9b968..0d17374b51 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page15.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page15.prefab @@ -6233,10 +6233,10 @@ RectTransform: m_Father: {fileID: 115914922508147437} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -207} - m_SizeDelta: {x: 0, y: -756.7} + m_SizeDelta: {x: 1080, y: 1163.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4694323316088322700 CanvasRenderer: From 0c6825597c32bbaba7d4767241c01ae7b8814fd3 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 3 Aug 2021 15:21:12 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E3=80=90=E5=8D=87=E6=98=9F=E6=9C=89?= =?UTF-8?q?=E7=A4=BC=E3=80=91=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/DynamicActicity/page15.prefab | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page15.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page15.prefab index 0d17374b51..7da27f3fae 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page15.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page15.prefab @@ -505,10 +505,10 @@ RectTransform: m_Father: {fileID: 1745397238117893692} m_RootOrder: 0 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: -122, y: 0.59999466} - m_SizeDelta: {x: 242.11, y: 39.5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 200, y: 0} + m_SizeDelta: {x: 250, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3498851698827627197 CanvasRenderer: @@ -1218,7 +1218,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: -36} - m_SizeDelta: {x: 558, y: 44} + m_SizeDelta: {x: 700, y: 44} m_Pivot: {x: 0, y: 0.5} --- !u!222 &1622256633758418865 CanvasRenderer: From 51e4e3206cd945a6f279b83624db5a39ffbe84f6 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 3 Aug 2021 15:24:49 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E3=80=90=E6=88=90=E5=B0=B1=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E3=80=91=E4=BF=AE=E5=A4=8D=E5=BF=83=E9=AD=94=E5=BF=AB?= =?UTF-8?q?=E9=80=9F=E6=88=98=E6=96=97=E7=BB=93=E7=AE=97=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E9=80=9A=E8=BF=87=E6=88=90=E5=B0=B1=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E9=A2=86=E5=8F=96=E6=88=90=E5=B0=B1=E5=A5=96=E5=8A=B1=E5=90=8E?= =?UTF-8?q?=E5=8D=A1=E6=AD=BB=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Message/MissionDailyTipPanel.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua b/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua index 39c71b09f6..8d7113a5e5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua @@ -32,6 +32,9 @@ function MissionDailyTipPanel:BindEvent() PopupTipPanel.ShowTip(Language[11305]) return end + if UIManager.IsOpen(UIName.RewardItemPopup) then--掉落界面打开时,关闭掉落界面 + UIManager.ClosePanel(UIName.RewardItemPopup, false) + end --LogGreen("showType:"..showType) UIManager.OpenPanel(UIName.MissionDailyPanel,showType == 1 and 1 or 4) self:ClosePanel() From f3ec57922895cbbdb91eac41e91885ee74f244e4 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 3 Aug 2021 15:26:47 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E3=80=90=E5=A6=96=E6=99=B6=E7=A4=BC?= =?UTF-8?q?=E5=8C=85=E3=80=91=E5=88=A0=E9=99=A4=E5=89=8D=E5=BE=80=E9=82=AE?= =?UTF-8?q?=E7=AE=B1=E9=A2=86=E5=8F=96=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab b/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab index ff6877a639..f11f95ba50 100644 --- a/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ShopView/ShopView.prefab @@ -4790,7 +4790,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u8D2D\u4E70\u6210\u529F\u540E \u8BF7\u524D\u5F80\u90AE\u7BB1\u9886\u53D6" + m_Text: LanguageIndex: 11742 --- !u!1 &4699461434874433981 GameObject: From 3199385550650d2f2a070dbadb5965051620600d Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 3 Aug 2021 15:29:26 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E3=80=90=E9=80=82=E9=85=8D=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/Prefabs/UI/DynamicActicity/page15.prefab | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page15.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page15.prefab index 7da27f3fae..263086144c 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page15.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page15.prefab @@ -421,7 +421,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: -196, y: -26} + m_AnchoredPosition: {x: -150, y: -26} m_SizeDelta: {x: 556, y: 140} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4215908669338956817 @@ -507,7 +507,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 200, y: 0} + m_AnchoredPosition: {x: 210, y: 0} m_SizeDelta: {x: 250, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3498851698827627197 From e0e015d06af834eae317a2cb8431f6615def4e4d Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 3 Aug 2021 15:36:45 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E3=80=90=E9=80=82=E9=85=8D=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/DynamicActicity/page14.prefab | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab index 36d7b96123..232b819e5a 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab @@ -1083,7 +1083,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -66} - m_SizeDelta: {x: 150, y: 50} + m_SizeDelta: {x: 80, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8742661461840986579 CanvasRenderer: @@ -1117,16 +1117,16 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} m_FontSize: 30 m_FontStyle: 0 - m_BestFit: 1 + m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: 300 + m_Text: "\u6B21\u6570\u5956\u52B1" LanguageIndex: 0 --- !u!1 &992364346240308313 GameObject: @@ -1161,10 +1161,10 @@ RectTransform: m_Father: {fileID: 2132785343472515193} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -311} - m_SizeDelta: {x: 0, y: 300} + m_SizeDelta: {x: 1080, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1066095331768010771 GameObject: @@ -5994,9 +5994,9 @@ RectTransform: m_Father: {fileID: 2132785343472515193} 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: -294, y: 850} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 246, y: -196} m_SizeDelta: {x: 483, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6562483489479470499 @@ -7890,10 +7890,10 @@ RectTransform: m_Father: {fileID: 2132785343472515193} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -655} - m_SizeDelta: {x: 0, y: 300} + m_SizeDelta: {x: 1080, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7779885449134601418 GameObject: @@ -8008,9 +8008,9 @@ RectTransform: m_Father: {fileID: 2132785343472515193} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -100, y: 603} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -100, y: -417} m_SizeDelta: {x: 150, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3003137039866507802 @@ -9641,11 +9641,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2132785343472515193} m_Modifications: - - target: {fileID: 1934794854557949798, guid: 5ccef5cfbe3d53e4b8a3c7fa9c41b4ce, - type: 3} - propertyPath: m_Name - value: Effect_xiaozhuanfeng_hit01 - objectReference: {fileID: 0} - target: {fileID: 1934794854557949801, guid: 5ccef5cfbe3d53e4b8a3c7fa9c41b4ce, type: 3} propertyPath: m_LocalPosition.x @@ -9701,6 +9696,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1934794854557949798, guid: 5ccef5cfbe3d53e4b8a3c7fa9c41b4ce, + type: 3} + propertyPath: m_Name + value: Effect_xiaozhuanfeng_hit01 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ccef5cfbe3d53e4b8a3c7fa9c41b4ce, type: 3} --- !u!4 &2487093841126313949 stripped @@ -9716,11 +9716,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2132785343472515193} m_Modifications: - - target: {fileID: 5538650172890135992, guid: c97934c2eec98be49b26b06232d68cf2, - type: 3} - propertyPath: m_Name - value: Effect_xiaozhuanfeng_hit02 - objectReference: {fileID: 0} - target: {fileID: 5538650172890135995, guid: c97934c2eec98be49b26b06232d68cf2, type: 3} propertyPath: m_LocalPosition.x @@ -9776,6 +9771,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5538650172890135992, guid: c97934c2eec98be49b26b06232d68cf2, + type: 3} + propertyPath: m_Name + value: Effect_xiaozhuanfeng_hit02 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c97934c2eec98be49b26b06232d68cf2, type: 3} --- !u!4 &1934620330201386658 stripped From b82f910df8024c9ede4c183f17d0a9939fa7d6d1 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Tue, 3 Aug 2021 15:47:02 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E3=80=90=E7=83=AD=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E3=80=91=E7=83=AD=E6=9B=B4=E6=96=B0=E7=95=8C=E9=9D=A2=E9=80=80?= =?UTF-8?q?=E5=87=BA=E6=B8=B8=E6=88=8F=E5=BC=B9=E7=AA=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/GameInit/UpdatePanel.cs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Assets/Scripts/GameInit/UpdatePanel.cs b/Assets/Scripts/GameInit/UpdatePanel.cs index 5318239c5e..84cc9d1dae 100644 --- a/Assets/Scripts/GameInit/UpdatePanel.cs +++ b/Assets/Scripts/GameInit/UpdatePanel.cs @@ -120,11 +120,18 @@ namespace GameLogic { if (Input.GetKeyDown(KeyCode.Escape)) { - msgBox.Show(SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.CANEL), SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.CONFIRM), SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.CONFIRM_CLOSE), (result) => + if(AppConst.isSDK && App.SDKMgr.IsSupportExit()) { - if (result == 1) - Application.Quit(); - }); + App.SDKMgr.ExitGame(); + } + else + { + msgBox.Show(SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.CANEL), SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.CONFIRM), SLanguageMoreLanguageMgr.Instance.GetLanguageChValBykey(more_language.CONFIRM_CLOSE), (result) => + { + if (result == 1) + Application.Quit(); + }); + } } }