From 3a5e3cf17ec333f8227fc46f62b225e155345409 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sun, 26 Sep 2021 21:32:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=BD=E6=84=9F=E5=BA=A6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LikabilityAtlas/h_haogandu_hddrk.png | Bin 25928 -> 25808 bytes .../LikabilityAtlas/h_haogandu_hddrk.png.meta | 26 ++--- .../PublicAtlas/r_hero_roudundi.png.meta | 13 ++- .../DynamicAtlas/d_dhxx_tiao_03.png.meta | 13 ++- .../w_xianshizhekou_banzi.png.meta | 13 ++- .../UI/Fight/FightAreaRewardPopup.prefab | 98 +++++++++--------- .../Prefabs/UI/RoleInfo/RoleListPanel.prefab | 12 +-- .../UI/RoleInfo/RoleProInfoPopup.prefab | 2 +- .../~Lua/Common/GlobalDefine.lua | 2 +- .../Modules/Fight/FightAreaRewardPopup.lua | 12 ++- .../~Lua/Modules/Player/JumpManager.lua | 3 + .../~Lua/Modules/RoleInfo/RoleListPanel.lua | 21 ++-- .../Modules/RoleInfo/RoleProInfoPopup.lua | 30 +++++- 13 files changed, 159 insertions(+), 86 deletions(-) diff --git a/Assets/ManagedResources/Atlas/LikabilityAtlas/h_haogandu_hddrk.png b/Assets/ManagedResources/Atlas/LikabilityAtlas/h_haogandu_hddrk.png index 71bc9151fec3aea83753eed2f5ce52031109a495..dac6b4ca024f44205ef1020de1ab2b973d19060b 100644 GIT binary patch literal 25808 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 literal 25928 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 diff --git a/Assets/ManagedResources/Atlas/LikabilityAtlas/h_haogandu_hddrk.png.meta b/Assets/ManagedResources/Atlas/LikabilityAtlas/h_haogandu_hddrk.png.meta index 5353df7198..e3ff851555 100644 --- a/Assets/ManagedResources/Atlas/LikabilityAtlas/h_haogandu_hddrk.png.meta +++ b/Assets/ManagedResources/Atlas/LikabilityAtlas/h_haogandu_hddrk.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3893d1ea2164ccf4281d8d3f848ca202 +guid: a10b70ed0605a3341910d6073eb2e103 TextureImporter: fileIDToRecycleName: {} externalObjects: {} @@ -58,6 +58,17 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 - serializedVersion: 2 buildTarget: Android maxTextureSize: 2048 @@ -80,24 +91,13 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 - - serializedVersion: 2 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] physicsShape: [] bones: [] - spriteID: 9408016a9c5e94f4e9a8fe63590404a7 + spriteID: b33eb0f381d6dcd4ab9f934a468c14f6 vertices: [] indices: edges: [] diff --git a/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_roudundi.png.meta b/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_roudundi.png.meta index 2078f0235c..1e147545a6 100644 --- a/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_roudundi.png.meta +++ b/Assets/ManagedResources/Atlas/PublicAtlas/r_hero_roudundi.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 4, y: 39, z: 5, w: 40} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -91,6 +91,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/DynamicAtlas/d_dhxx_tiao_03.png.meta b/Assets/ManagedResources/DynamicAtlas/d_dhxx_tiao_03.png.meta index 19d412a033..4d15877882 100644 --- a/Assets/ManagedResources/DynamicAtlas/d_dhxx_tiao_03.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/d_dhxx_tiao_03.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 108, y: 68, z: 112, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -91,6 +91,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/DynamicAtlas/w_xianshizhekou_banzi.png.meta b/Assets/ManagedResources/DynamicAtlas/w_xianshizhekou_banzi.png.meta index 1507804d2e..81e0bab792 100644 --- a/Assets/ManagedResources/DynamicAtlas/w_xianshizhekou_banzi.png.meta +++ b/Assets/ManagedResources/DynamicAtlas/w_xianshizhekou_banzi.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 469, y: 87, z: 465, w: 88} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -91,6 +91,17 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 1 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightAreaRewardPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightAreaRewardPopup.prefab index dbf753a6d8..04118a757f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightAreaRewardPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightAreaRewardPopup.prefab @@ -109,7 +109,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0.00007695533} + m_AnchoredPosition: {x: 0, y: 0.00003435052} m_SizeDelta: {x: 925.1, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &2443668873975028990 @@ -183,7 +183,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: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 143.56} m_SizeDelta: {x: 586.9, y: 258.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &427987219057071297 @@ -333,7 +333,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0.000004479818, y: -0.000046788646} + m_AnchoredPosition: {x: 0.000004479818, y: 0.000034399924} m_SizeDelta: {x: 924.2, y: 0} m_Pivot: {x: 0, y: 1} --- !u!114 &2775142083553738788 @@ -368,7 +368,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 0 - m_Spacing: 0 + m_Spacing: 90 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -790,7 +790,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3373193103947791580 RectTransform: m_ObjectHideFlags: 0 @@ -808,9 +808,9 @@ RectTransform: m_Father: {fileID: 932376224564149815} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 275.64, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6207175487511199908 @@ -820,7 +820,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1723933262280676722} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -830,7 +830,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 4 + m_ChildAlignment: 3 m_Spacing: 20 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 @@ -1057,7 +1057,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7612208493574075147 RectTransform: m_ObjectHideFlags: 0 @@ -1074,9 +1074,9 @@ RectTransform: m_Father: {fileID: 6383449964992838374} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 67.5, y: -67.5} m_SizeDelta: {x: 135, y: 135} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3583722796192179126 @@ -1115,7 +1115,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 925.1, y: 257.6} + m_SizeDelta: {x: 980, y: 257.6} m_Pivot: {x: 0, y: 0.5} --- !u!114 &8309868526075451557 MonoBehaviour: @@ -1734,7 +1734,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: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 144.92} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5778419981250962112 @@ -1903,7 +1903,7 @@ MonoBehaviour: m_Padding: m_Left: 80 m_Right: 0 - m_Top: 74 + m_Top: 93 m_Bottom: 0 m_ChildAlignment: 0 m_Spacing: -9.98 @@ -1997,11 +1997,11 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: New Text --- !u!1 &6312564577378405425 @@ -2142,7 +2142,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 12.9 + m_Spacing: 35 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -2176,7 +2176,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4786197492143541674 RectTransform: m_ObjectHideFlags: 0 @@ -2191,10 +2191,10 @@ RectTransform: m_Father: {fileID: 5283082049955171346} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 462.55, y: -85} + m_SizeDelta: {x: 130, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6824175088076126020 GameObject: @@ -2229,10 +2229,10 @@ RectTransform: m_Father: {fileID: 3373193103947791580} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -100} + m_SizeDelta: {x: 138, y: 52} m_Pivot: {x: 0, y: 0} --- !u!222 &554498780250852566 CanvasRenderer: @@ -2262,7 +2262,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 5e66e46bf0e737d4799e4e225f0f5a5d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2606,10 +2606,10 @@ RectTransform: m_Father: {fileID: 3373193103947791580} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 345.64, y: 0} - m_SizeDelta: {x: 205.64, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 242, y: -97.5} + m_SizeDelta: {x: 179, y: 47} m_Pivot: {x: 0, y: 0} --- !u!222 &4727830957886342103 CanvasRenderer: @@ -2649,10 +2649,10 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: New Text + m_Text: --- !u!114 &7130449306859413999 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2660,12 +2660,12 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7863336960982840397} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalFit: 0 + m_HorizontalFit: 2 m_VerticalFit: 2 --- !u!1 &8173076154655527794 GameObject: @@ -2795,10 +2795,10 @@ MonoBehaviour: m_Padding: m_Left: 80 m_Right: 0 - m_Top: 74 - m_Bottom: 0 + m_Top: 20 + m_Bottom: 60 m_ChildAlignment: 0 - m_Spacing: -9.98 + m_Spacing: 10 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -2959,10 +2959,10 @@ RectTransform: m_Father: {fileID: 3373193103947791580} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 120, y: 0} - m_SizeDelta: {x: 205.64, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 138, y: -94} + m_SizeDelta: {x: 90.5, y: 46} m_Pivot: {x: 0, y: 0} --- !u!222 &4254684229021910898 CanvasRenderer: @@ -3005,7 +3005,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: New Text + m_Text: --- !u!114 &8334007990201709644 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3013,10 +3013,10 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9192581918767064148} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_HorizontalFit: 0 + m_HorizontalFit: 2 m_VerticalFit: 2 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleListPanel.prefab index d32f24373a..4446c4d864 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleListPanel.prefab @@ -3289,7 +3289,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: 0, y: -1.0475} + m_AnchoredPosition: {x: 0, y: 10.79} m_SizeDelta: {x: 127, y: 120.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2285869320661923719 @@ -3313,7 +3313,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -3323,7 +3323,7 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} m_FontSize: 34 - m_FontStyle: 0 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 0 m_MaxSize: 100 @@ -3333,7 +3333,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: + m_Text: 88 --- !u!1 &6256473394043693734 GameObject: m_ObjectHideFlags: 0 @@ -3591,7 +3591,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 125, y: 123} + m_SizeDelta: {x: 128, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3491426057908555132 CanvasRenderer: @@ -3621,7 +3621,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: c0b3bf3c739b5874aa4ccb849bd2ba74, type: 3} + m_Sprite: {fileID: 21300000, guid: a10b70ed0605a3341910d6073eb2e103, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleProInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleProInfoPopup.prefab index 39f9c8ad9f..339b9f69fd 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleProInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleProInfoPopup.prefab @@ -1952,7 +1952,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &4753211590647630719 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index cbb5691ca5..f5d72b95cf 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1077,7 +1077,7 @@ JumpType = { JumpServerHightLadder = 82,--灵兽山 HongMengZhen = 86,-- 鸿蒙阵 FightLevel = 107,-- 山河社稷图 - + likeability = 114, BuyVigor = 10000, --体力购买 BuyGold = 10001, --金币购买 Privilege = 10003, -- 特权 diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua index 367198a6ac..88bd6f98d1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardPopup.lua @@ -125,28 +125,31 @@ function FightAreaRewardPopup:OnShow() str1 = str1 .. string.format(config.Name,GetPropertyFormatStrOne(config.IfFloat, v)) end data.content = str1 + data.type = 1 this.PriAdapter(num,data) num = num + 1 end if vipLv > 0 then local data = {} - data.sprite = "h_haogandu_aixin" + data.sprite = "r_zjm_tequanpaizi" data.iconText = "特权" data.lv = vipLv.."级" local value = 0 - local config = ConfigManager.GetConfigData(ConfigName.PropertyConfig,1) + local config = ConfigManager.GetConfigData(ConfigName.PrivilegeTypeConfig,1) for i = 1,#config.Condition do if config.Condition[i][1] == vipLv then value = config.Condition[i][2] end end data.content = string.format(config.Name,GetPropertyFormatStrOne(config.IfFloat, value)) + data.type = 2 this.PriAdapter(num,data) num = num + 1 end end ForceRebuildLayout(this.scroller.transform) + ForceRebuildLayout(this.extraRewardGrid.transform) end function this.PriAdapter(num,data) @@ -156,11 +159,14 @@ function this.PriAdapter(num,data) _ExtraRewardList[num].icon = Util.GetGameObject(_ExtraRewardList[num].go, "icon"):GetComponent("Image") _ExtraRewardList[num].lv = Util.GetGameObject(_ExtraRewardList[num].go, "lv"):GetComponent("Text") _ExtraRewardList[num].content = Util.GetGameObject(_ExtraRewardList[num].go, "content"):GetComponent("Text") - _ExtraRewardList[num].iconText = Util.GetGameObject(_ExtraRewardList[num].icon, "Text"):GetComponent("Text") + _ExtraRewardList[num].iconText = Util.GetGameObject(_ExtraRewardList[num].icon.transform, "Text"):GetComponent("Text") end _ExtraRewardList[num].go.gameObject:SetActive(true) _ExtraRewardList[num].icon.sprite = this.spLoader:LoadSprite(data.sprite) _ExtraRewardList[num].icon:SetNativeSize() + if data.type == 1 then + _ExtraRewardList[num].icon.transform:GetComponent("RectTransform").sizeDelta = Vector2.New(71,65) + end _ExtraRewardList[num].lv.text = data.lv _ExtraRewardList[num].content.text = data.content _ExtraRewardList[num].iconText.text = data.iconText diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 89810115a8..39b387a1b2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -776,6 +776,9 @@ local jumpDic = { [JumpType.linglongShangShi] = function(data) this.JumpActivity(JumpType.linglongShangShi,data[1]) end, + [JumpType.likeability] = function() + UIManager.OpenPanel(UIName.LikeAbilityPanel) + end, } function this.JumpActivity(data,skipfactor) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua index 746d877bda..39d38238ef 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua @@ -40,7 +40,8 @@ function RoleListPanel:InitComponent() --this.fenJieBtn:SetActive(false) this.formationBtn = Util.GetGameObject(self.gameObject, "formationBtn") this.haogandu = Util.GetGameObject(self.gameObject, "haogandu") - this.haogandu.gameObject:SetActive(false) + this.haoganduLv = Util.GetGameObject(this.haogandu, "lv"):GetComponent("Text") + --this.haogandu.gameObject:SetActive(false) this.haoganduRed = Util.GetGameObject(this.treeBtn, "redPoint") if not this.playerInfoView then @@ -96,11 +97,11 @@ function RoleListPanel:BindEvent() end) Util.AddClick(this.fenJieBtn, function() UIManager.OpenPanel(UIName.HandBookHeroAndEquipListPanel,1) - --if ActTimeCtrlManager.SingleFuncState(24) then + -- if ActTimeCtrlManager.SingleFuncState(24) then -- UIManager.OpenPanel(UIName.HeroAndEquipResolvePanel,1) - --else + -- else -- PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(24)) - --end + -- end end) Util.AddClick(this.formationBtn, function() if ActTimeCtrlManager.SingleFuncState(54) then @@ -162,11 +163,11 @@ function RoleListPanel:OnShow() sortType = HeroManager.heroListPanelSortID proId = HeroManager.heroListPanelProID this:GetCurSortHeroListData() - --if ActTimeCtrlManager.SingleFuncState(24) then + -- if ActTimeCtrlManager.SingleFuncState(24) then -- Util.SetGray(this.fenJieBtn, false) - --else - --Util.SetGray(this.fenJieBtn, true) - --end + -- else + -- Util.SetGray(this.fenJieBtn, true) + -- end if ActTimeCtrlManager.SingleFuncState(54) then Util.SetGray(this.formationBtn, false) else @@ -177,7 +178,9 @@ function RoleListPanel:OnShow() -- end -- 刷新一次编队战斗力 FormationManager.RefreshMainFormationPower() - + --this.haogandu.gameObject:SetActive(ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.LikeAbility)) + local totalCurNum,totalLv,totalNum = LikabilityManager.GetTotalHeroLikeLv(-1) + this.haoganduLv.text = totalLv this.haogandu.gameObject:SetActive(true)--ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.LikeAbility)) end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua index 4633052368..85ea75086a 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua @@ -129,6 +129,34 @@ function RoleProInfoPopup:OnOpen(_allAddProVal,_configData,_isShowGuild,_guildSk -- 跳转按钮如果设置的公会技能等级,说明是别人,就不显示跳转 this.jumpBtn:SetActive(_guildSkill == nil) end + local lv = LikabilityManager.GetTotalHeroLikeLv(_configData.Id) + local pro = LikabilityManager.GetProData(2,-1,lv) + if not this.specialPro then + this.specialPro = {} + end + for i = 1,#this.specialPro do + this.specialPro.go.gameObject:SetActive(false) + end + if pro and LengthOfTable(pro) > 0 then + this.thirdlyGridP:SetActive(true) + for k,v in pairs(pro) do + if not this.specialPro[k] then + this.specialPro[k] = {} + this.specialPro[k].go = newObjToParent(this.proPre2,this.thirdlyGrid) + this.specialPro[k].jumpBtn = Util.GetGameObject(this.specialPro[k].go, "jumpBtn") + this.specialPro[k].guildProName = Util.GetGameObject(this.specialPro[k].go, "proName"):GetComponent("Text") + this.specialPro[k].guildProValue = Util.GetGameObject(this.specialPro[k].go, "proVale"):GetComponent("Text") + end + this.specialPro[k].guildProName.text = "好感度-"..propertyConfig[k].Info + this.specialPro[k].guildProValue.text = v + -- 跳转按钮如果设置的公会技能等级,说明是别人,就不显示跳转 + this.specialPro[k].jumpBtn:SetActive(_guildSkill == nil) + Util.AddOnceClick(this.specialPro[k].jumpBtn, function() + JumpManager.GoJump(40033) + end) + end + end + end --界面关闭时调用(用于子类重写) function RoleProInfoPopup:OnClose() @@ -138,7 +166,7 @@ end --界面销毁时调用(用于子类重写) function RoleProInfoPopup:OnDestroy() this.spLoader:Destroy() - + this.specialPro = {} ProGoList = nil end