diff --git a/Assets/ManagedResources/Prefabs/UI/Likability/TailsmanSoulMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Likability/TailsmanSoulMainPanel.prefab index b980eb2dc0..b81f1afcf8 100644 --- a/Assets/ManagedResources/Prefabs/UI/Likability/TailsmanSoulMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Likability/TailsmanSoulMainPanel.prefab @@ -916,6 +916,7 @@ RectTransform: - {fileID: 7658422807616803030} - {fileID: 6956724721195284151} - {fileID: 6908849764999176794} + - {fileID: 5717171718495823916} m_Father: {fileID: 6717333556328300636} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1407,6 +1408,7 @@ RectTransform: - {fileID: 5508599169442562844} - {fileID: 340996770346620485} - {fileID: 3489229003808206092} + - {fileID: 2995271873781021026} m_Father: {fileID: 4919779250033632034} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2544,6 +2546,80 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 178, y: 426} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1884121596434207597 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2995271873781021026} + - component: {fileID: 9045831616556927498} + - component: {fileID: 671835484326058545} + m_Layer: 5 + m_Name: red + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2995271873781021026 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1884121596434207597} + 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: 5457998033136816301} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -1.9000015, y: -12.000092} + m_SizeDelta: {x: 57, y: 57} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9045831616556927498 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1884121596434207597} + m_CullTransparentMesh: 0 +--- !u!114 &671835484326058545 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1884121596434207597} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, 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_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &2100137675116936560 GameObject: m_ObjectHideFlags: 0 @@ -5668,6 +5744,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 9063873909196830624} + - {fileID: 3556408024042415582} m_Father: {fileID: 1345622732181280237} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6165,6 +6242,7 @@ RectTransform: - {fileID: 1253723314713787413} - {fileID: 5385236754696913418} - {fileID: 145904912022178010} + - {fileID: 5304498911872771695} m_Father: {fileID: 7501846145285807421} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6751,6 +6829,80 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 2 +--- !u!1 &6472870517932900526 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3556408024042415582} + - component: {fileID: 3333140653498035349} + - component: {fileID: 6388213131165067360} + m_Layer: 5 + m_Name: red + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3556408024042415582 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6472870517932900526} + 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: 4083169125156670223} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -5.1, y: -4.6} + m_SizeDelta: {x: 20.919998, y: 20.919998} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3333140653498035349 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6472870517932900526} + m_CullTransparentMesh: 0 +--- !u!114 &6388213131165067360 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6472870517932900526} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, 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_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &6550794761010548927 GameObject: m_ObjectHideFlags: 0 @@ -7446,6 +7598,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7077836332370533094 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5589731296582418284} + - component: {fileID: 868914608587485686} + - component: {fileID: 4718727216557840635} + m_Layer: 5 + m_Name: red + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5589731296582418284 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7077836332370533094} + 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: 8652605422963368735} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -21.5, y: -12.000092} + m_SizeDelta: {x: 57, y: 57} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &868914608587485686 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7077836332370533094} + m_CullTransparentMesh: 0 +--- !u!114 &4718727216557840635 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7077836332370533094} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, 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_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7084366997833757253 GameObject: m_ObjectHideFlags: 0 @@ -8330,6 +8556,7 @@ RectTransform: - {fileID: 4103691185389622675} - {fileID: 2783926953934681510} - {fileID: 4982596715731497182} + - {fileID: 5589731296582418284} m_Father: {fileID: 9192320967144942094} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -9109,6 +9336,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8401720251682289289 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5717171718495823916} + - component: {fileID: 3148354490740184699} + - component: {fileID: 8321521311858521792} + m_Layer: 5 + m_Name: red + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5717171718495823916 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8401720251682289289} + 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: 896673482537643642} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -8.5, y: -12.000092} + m_SizeDelta: {x: 57, y: 57} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3148354490740184699 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8401720251682289289} + m_CullTransparentMesh: 0 +--- !u!114 &8321521311858521792 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8401720251682289289} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, 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_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &8539369653715583492 GameObject: m_ObjectHideFlags: 0 @@ -9141,9 +9442,9 @@ RectTransform: m_Father: {fileID: 8469090483397192595} 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: 0.000012398, y: 344.95} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0.000012398, y: 0.000041608295} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &6617612647759148344 @@ -9220,8 +9521,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: 408, y: 0.00012207} + m_AnchoredPosition: {x: 0, y: -34.87503} + m_SizeDelta: {x: 408, y: -69.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4696751499710555437 CanvasRenderer: @@ -9480,6 +9781,80 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 178, y: 67.34} m_Pivot: {x: 0, y: 0} +--- !u!1 &8833536641223689952 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5304498911872771695} + - component: {fileID: 3169677306891356462} + - component: {fileID: 3076888529260636919} + m_Layer: 5 + m_Name: red + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5304498911872771695 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8833536641223689952} + 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: 2918172476905997167} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -15, y: -12} + m_SizeDelta: {x: 57, y: 57} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3169677306891356462 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8833536641223689952} + m_CullTransparentMesh: 0 +--- !u!114 &3076888529260636919 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8833536641223689952} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, 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_Sprite: {fileID: 21300000, guid: f9ea4c4aff328ff4abcc21aae0a4fa10, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &8920526206114837989 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 2473f74e8a..9bfc985933 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -239,7 +239,7 @@ function this.PlayerInfoRequest(func) PracticeManager.SetCultivationLevel(msg.xiuweiLevel) -- 服务器开启时间 PlayerManager.SetServerOpenTime(msg.serverOpenTime) - + TailsManSoulManager.SetTailsmanLv(msg.FaBaoSoulInfos) if func then func(msg) end @@ -6078,5 +6078,19 @@ function NetManager.GetWeekCardReward(id, func) end) end +-- 请求领取周卡奖励 +function NetManager.FaBaoSoulUpLvRequest(id,lv, func) + local data = HeroInfoProto_pb.FaBaoSoulUpLvRequest() + data.id = id + data.level = lv + local msg = data:SerializeToString() + Network:SendMessageWithCallBack(MessageTypeProto_pb.FA_BAO_SOUL_UPLV_REQUEST, MessageTypeProto_pb.FA_BAO_SOUL_UPLV_RESPONSE, msg, function(buffer) + TailsManSoulManager.SetTailsmanLvById(id,lv) + if func then + func(msg) + end + end) +end + return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSoulManager.lua b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSoulManager.lua index 55be812239..7b65028b5d 100644 --- a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSoulManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsManSoulManager.lua @@ -57,6 +57,12 @@ function this.GetTailsmanLvById(id) return this.TailsmanList[id] or 0 end +function this.SetTailsmanLv(data) + for i = 1,#data do + this.SetTailsmanLvById(data[i].id,data[i].level) + end +end + --根据法宝id 获取设置等级 function this.SetTailsmanLvById(id,lv) if not this.TailsmanList[id] then diff --git a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua index bbc1b5a75b..b947ecd62e 100644 --- a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulMainPanel.lua @@ -1,6 +1,7 @@ require("Base/BasePanel") TailsmanSoulMainPanel = Inherit(BasePanel) local propertyConfig = ConfigManager.GetConfig(ConfigName.PropertyConfig) +local ItemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local sortOrder = 0 local curData = {} function TailsmanSoulMainPanel:InitComponent() @@ -17,6 +18,7 @@ function TailsmanSoulMainPanel:InitComponent() self.starLight = Util.GetGameObject(self.transform,"proMainLayout/starGrid/starLight") self.upLvBtn = Util.GetGameObject(self.transform, "proMainLayout/upLvBtn") self.upLvBtnText = Util.GetGameObject(self.upLvBtn, "Text"):GetComponent("Text") + self.upLvBtnRed = Util.GetGameObject(self.upLvBtn, "red") self.costIcon = Util.GetGameObject(self.transform, "proMainLayout/layout/icon"):GetComponent("Image") self.costNum = Util.GetGameObject(self.transform, "proMainLayout/layout/num"):GetComponent("Text") self.pro = Util.GetGameObject(self.transform, "proMainLayout/pro") @@ -37,6 +39,7 @@ function TailsmanSoulMainPanel:InitComponent() self.tailsList[i].starGray = Util.GetGameObject(self.tailsList[i].card.transform,"starGrid/starGray") self.tailsList[i].starLight = Util.GetGameObject(self.tailsList[i].card.transform,"starGrid/starLight") self.tailsList[i].name = Util.GetGameObject(self.tailsList[i].card.transform,"nameDi/name"):GetComponent("Text") + self.tailsList[i].red = Util.GetGameObject(self.tailsList[i].card.transform,"red") end end @@ -55,7 +58,20 @@ function TailsmanSoulMainPanel:BindEvent() --逍遥游 Util.AddClick(self.upLvBtn,function() - + local costId,num = TailsManSoulManager.GetTailsmanCost(self.data.id,self.data.lv) + local curNum = BagManager.GetItemCountById(costId) + local isEnough = false,false + if num and num > 0 then + if curNum >= num then + NetManager.FaBaoSoulUpLvRequest(self.data.id,self.data.lv + 1, function() + self:OnShow() + end) + else + PopupTipPanel.ShowTip(string.format("%s不足",ItemConfig[costId].Name)) + end + else + PopupTipPanel.ShowTip("已达最高等级") + end end) end @@ -166,7 +182,13 @@ function TailsmanSoulMainPanel:SetCostItem() if num and num > 0 then self.costIcon.gameObject:SetActive(true) self.costNum.text = string.format("%s/%s",colo,curNum,num) + if curNum > num then + self.upLvBtnRed.gameObject:SetActive(true) + else + self.upLvBtnRed.gameObject:SetActive(false) + end else + self.upLvBtnRed.gameObject:SetActive(false) self.costIcon.gameObject:SetActive(false) self.costNum.text = "已达最高等级" end @@ -197,6 +219,7 @@ function TailsmanSoulMainPanel:SetTailsManList(data,grid,pre) self.tailsList[i].starGray = Util.GetGameObject(self.tailsList[i].card.transform,"starGrid/starGray") self.tailsList[i].starLight = Util.GetGameObject(self.tailsList[i].card.transform,"starGrid/starLight") self.tailsList[i].name = Util.GetGameObject(self.tailsList[i].card.transform,"nameDi/name"):GetComponent("Text") + self.tailsList[i].red = Util.GetGameObject(self.tailsList[i].card.transform,"red") end self.tailsList[i].go.gameObject:SetActive(true) self.tailsList[i].card.sprite = self.spLoader:LoadSprite(GetTailsmanCardStarImage[data[i].config.Quality]) @@ -205,6 +228,13 @@ function TailsmanSoulMainPanel:SetTailsManList(data,grid,pre) self.tailsList[i].name.text = data[i].config.Name self:SetStar(self.tailsList[i].starGray,data[i].config.Quality) self:SetStar(self.tailsList[i].starLight,data[i].lv) + local costId,num = TailsManSoulManager.GetTailsmanCost(data[i].id,data[i].lv) + local curNum = BagManager.GetItemCountById(costId) + if num and num > 0 and curNum >= num then + self.tailsList[i].red.gameObject:SetActive(true) + else + self.tailsList[i].red.gameObject:SetActive(false) + end Util.AddOnceClick(self.tailsList[i].card.gameObject,function() self.index = i self:ChangeTailsMan()