From 63b8b36a37bb5e105b0a4d2bae9c5c66d23de833 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 17 Jul 2020 13:38:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=94=E9=99=A4logo=E7=AD=89=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Loading/LoadingPanel.prefab | 2 +- .../Prefabs/UI/Login/LoginPanel.prefab | 180 +----------------- .../Prefabs/UI/Popup/CreateNamePopup.prefab | 2 +- .../~Lua/Modules/Guild/GuildMainCityPanel.lua | 4 + 4 files changed, 14 insertions(+), 174 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Loading/LoadingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Loading/LoadingPanel.prefab index ea540bb189..792bd9685f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Loading/LoadingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Loading/LoadingPanel.prefab @@ -91,7 +91,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &224247026787075430 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab index d7669e2165..d6fc6f7ee6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Login/LoginPanel.prefab @@ -333,7 +333,7 @@ RectTransform: m_Children: - {fileID: 7369032967720175446} m_Father: {fileID: -2215574213872556275} - m_RootOrder: 15 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -440,7 +440,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: -2215574213872556275} - m_RootOrder: 17 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -11182,7 +11182,7 @@ RectTransform: m_Children: - {fileID: 5927256624349660267} m_Father: {fileID: -2215574213872556275} - m_RootOrder: 13 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -11320,7 +11320,7 @@ RectTransform: m_Children: - {fileID: 101792638633129790} m_Father: {fileID: -2215574213872556275} - m_RootOrder: 14 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -11442,7 +11442,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &-6037744603300707855 RectTransform: m_ObjectHideFlags: 0 @@ -11616,8 +11616,6 @@ RectTransform: - {fileID: 2708405315770155492} - {fileID: 6843256373559084944} - {fileID: 5072891096382605988} - - {fileID: 1964037918337564624} - - {fileID: 7879031627494634651} - {fileID: 1327999820929537843} - {fileID: 374248658615334256} - {fileID: 2778620781583660934} @@ -16620,7 +16618,7 @@ RectTransform: m_Children: - {fileID: 4955619200740033519} m_Father: {fileID: -2215574213872556275} - m_RootOrder: 12 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -16664,87 +16662,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &4851423005618304338 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7879031627494634651} - - component: {fileID: 7805796834390215136} - - component: {fileID: 7378201615770460120} - m_Layer: 5 - m_Name: Text (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7879031627494634651 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4851423005618304338} - 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: -2215574213872556275} - m_RootOrder: 11 - 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: -2, y: -850} - m_SizeDelta: {x: 997.4, y: 48.7} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7805796834390215136 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4851423005618304338} - m_CullTransparentMesh: 0 ---- !u!114 &7378201615770460120 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4851423005618304338} - 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.5838377, g: 0.59131366, b: 0.6037736, 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: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 23 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u8457\u4F5C\u6743\u4EBA\uFF1A\u798F\u5DDE\u84DD\u8682\u8681\u8F6F\u4EF6\u6280\u672F\u5F00\u53D1\u6709\u9650\u516C\u53F8 - \u51FA\u7248\u670D\u52A1\u5355\u4F4D\uFF1A\u6781\u81F4\u70B9\u51FB\uFF08\u5317\u4EAC\uFF09\u79D1\u6280\u6709\u9650\u516C\u53F8" - LanguageIndex: 10929 --- !u!1 &4912883380251438568 GameObject: m_ObjectHideFlags: 0 @@ -16775,11 +16692,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: -2215574213872556275} - m_RootOrder: 16 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 73.1, y: -26.8} + m_AnchoredPosition: {x: 73.1001, y: -26.800049} m_SizeDelta: {x: 100, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9171444830315599766 @@ -22337,87 +22254,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &8794296099043584374 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1964037918337564624} - - component: {fileID: 696010299220161271} - - component: {fileID: 6334694974290946750} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1964037918337564624 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8794296099043584374} - 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: -2215574213872556275} - m_RootOrder: 10 - 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: 0, y: -817} - m_SizeDelta: {x: 997.4, y: 48.7} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &696010299220161271 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8794296099043584374} - m_CullTransparentMesh: 0 ---- !u!114 &6334694974290946750 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8794296099043584374} - 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.5838377, g: 0.59131366, b: 0.6037736, 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: 6fa15837529b0e640af6620b07d3207d, type: 3} - m_FontSize: 23 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u6279\u51C6\u6587\u53F7\uFF1A\u65B0\u5E7F\u51FA\u5BA1[2014]647\u53F7 \u51FA\u7248\u7269\u53F7\uFF1AISBN - 978-7-89471-961-4 \u8457\u4F5C\u6743\u767B\u8BB0\u53F7\uFF1A2013SR014702" - LanguageIndex: 10928 --- !u!1 &9084273472131053029 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/CreateNamePopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/CreateNamePopup.prefab index a3cdbbf691..40e5b97e75 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/CreateNamePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/CreateNamePopup.prefab @@ -79387,7 +79387,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6118259456929420034 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua index b2e7837ae6..e2a8e95763 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildMainCityPanel.lua @@ -311,6 +311,10 @@ function GuildMainCityPanel:OnShow() this.UpView:OnOpen({ showType = UpViewOpenType.ShowRight, panelType = PanelType.Guild }) this.BtView:OnOpen({ sortOrder = self.sortingOrder, panelType = PanelTypeView.GongHui }) CheckRedPointStatus(RedPointType.Guild_RedPacket) + CheckRedPointStatus(RedPointType.Guild_Fete) + CheckRedPointStatus(RedPointType.Guild_AidBox) + CheckRedPointStatus(RedPointType.Guild_AidGuild) + CheckRedPointStatus(RedPointType.Guild_AidMy) if not PlayerManager.familyId or PlayerManager.familyId == 0 then this:ClosePanel() Log(Language[10405])