diff --git a/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab index 1d5e95ed54..da8fde42e0 100644 --- a/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureMainPanel.prefab @@ -1203,6 +1203,8 @@ GameObject: - component: {fileID: 1953938260952920226} - component: {fileID: 8355385185974677893} - component: {fileID: 2792106087334975588} + - component: {fileID: 7320645504264393411} + - component: {fileID: 2209065021048935642} m_Layer: 5 m_Name: lockLock m_TagString: Untagged @@ -1251,7 +1253,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1266,6 +1268,67 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &7320645504264393411 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1856576761029748112} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2792106087334975588} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &2209065021048935642 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1856576761029748112} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &1995309521881031476 GameObject: m_ObjectHideFlags: 0 @@ -1277,6 +1340,8 @@ GameObject: - component: {fileID: 658213266825868305} - component: {fileID: 1021206959409228131} - component: {fileID: 3678724632312226947} + - component: {fileID: 4029412657395768882} + - component: {fileID: 316477862948761817} m_Layer: 5 m_Name: lockOpen m_TagString: Untagged @@ -1325,7 +1390,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -1340,6 +1405,67 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &4029412657395768882 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995309521881031476} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 3678724632312226947} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &316477862948761817 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1995309521881031476} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &2108466554499027033 GameObject: m_ObjectHideFlags: 0 @@ -1647,8 +1773,6 @@ GameObject: m_Component: - component: {fileID: 255139674672280025} - component: {fileID: 1727709791038661959} - - component: {fileID: 7028421732423786562} - - component: {fileID: 1408440319805353705} m_Layer: 5 m_Name: lockBtn m_TagString: Untagged @@ -1685,68 +1809,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2392344033276440377} m_CullTransparentMesh: 0 ---- !u!114 &7028421732423786562 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2392344033276440377} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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 ---- !u!114 &1408440319805353705 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2392344033276440377} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 7028421732423786562} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &2398503472117447074 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua index cf2eb3c163..f1542b3a87 100644 --- a/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua @@ -11,7 +11,7 @@ local resolveBooleList={false,false,false,false,false,false,false,false} local curSelectQuantityList={}--当前选择后的稀有度 选项 {0=true,1=false ...} 稀有度是依次减小的 local curResolveAllItemList={}--最终向后段发送的分解list local isShowTishi=false - +local endHeroNum = 0 --碎片合成 local itemData local compoundNum=0 @@ -131,7 +131,11 @@ function BagResolveAnCompoundPanel:BindEvent() this.SendBackCompoundReCallBack(drop) end) else - PopupTipPanel.ShowTip(Language[10200]) + if endHeroNum > 0 then + PopupTipPanel.ShowTip(Language[10200]) + else + PopupTipPanel.ShowTip("神将已达上限") + end end elseif itemData.itemConfig.ItemType==ItemType.Box then--宝箱 if compoundNum>0 then @@ -293,7 +297,7 @@ function this.OnShowLayout3Data() this.btnCompoundText.text=Language[10210] local maxCompoundValue = math.floor(itemData.num/itemData.itemConfig.UsePerCount) compoundMaxNum=maxCompoundValue > gameSetting.HeroCompoundLimit and gameSetting.HeroCompoundLimit or maxCompoundValue - local endHeroNum=gameSetting.HeroNumlimit-LengthOfTable(HeroManager.heroDataLists) + endHeroNum=gameSetting.HeroNumlimit-LengthOfTable(HeroManager.heroDataLists) compoundMaxNum=compoundMaxNum >endHeroNum and endHeroNum or compoundMaxNum elseif itemData.itemConfig.ItemType==ItemType.Box then--宝箱 this.nameText.text=Language[10211] @@ -307,10 +311,14 @@ function this.OnShowLayout3Data() compoundMaxNum=itemData.num end compoundNum=1 - this.Slider:GetComponent("Slider").value=1 compoundNum= compoundNum>=compoundMaxNum and compoundMaxNum or compoundNum - Log("compoundNum "..compoundNum) - this.Slider:GetComponent("Slider").minValue=1 + if compoundMaxNum > 0 then + this.Slider:GetComponent("Slider").value=1 + this.Slider:GetComponent("Slider").minValue=1 + else + this.Slider:GetComponent("Slider").value=0 + this.Slider:GetComponent("Slider").minValue=0 + end this.Slider:GetComponent("Slider").maxValue=compoundMaxNum --this.ShowCompoundNumData(compoundNum) this.ShowCompoundNumData(compoundMaxNum) diff --git a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua index 299419b46d..f106b23134 100644 --- a/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureMainPanel.lua @@ -390,20 +390,25 @@ function FindTreasureMainPanel:ActivityRewardSingleShow(_activityRewardGo,reward end) end) - Util.AddOnceClick(lockBtn, function() - if rewardData.lock == 0 then - rewardData.lock = 1 - PopupTipPanel.ShowTip("已锁定任务!") - else - rewardData.lock = 0 - PopupTipPanel.ShowTip("已将任务解锁!") - end + Util.AddOnceClick(lockLockImage, function() + rewardData.lock = 0 + PopupTipPanel.ShowTip("已将任务解锁!") NetManager.MissingRoomLockRequest(rewardData.missionId,rewardData.lock, function() - --刷新界面 - TaskManager.RefreshFindTreasureStatrData2(rewardData.missionId,rewardData.lock) - LogPink("rewardData.lock "..rewardData.lock) - self:ActivityRewardSingleShow(activityRewardGo,rewardData) - end) + --刷新界面 + TaskManager.RefreshFindTreasureStatrData2(rewardData.missionId,rewardData.lock) + LogPink("rewardData.lock "..rewardData.lock) + self:ActivityRewardSingleShow(activityRewardGo,rewardData) + end) + end) + Util.AddOnceClick(lockOpenImage, function() + rewardData.lock = 1 + PopupTipPanel.ShowTip("已锁定任务!") + NetManager.MissingRoomLockRequest(rewardData.missionId,rewardData.lock, function() + --刷新界面 + TaskManager.RefreshFindTreasureStatrData2(rewardData.missionId,rewardData.lock) + LogPink("rewardData.lock "..rewardData.lock) + self:ActivityRewardSingleShow(activityRewardGo,rewardData) + end) end) end --刷新倒计时显示 diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 4aeb77eea3..749a39bd04 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -59,11 +59,17 @@ function RewardItemSingleShowPopup:BindEvent() item.itemId= _itemData.id item.itemNum=compoundNum*_itemData.itemConfig.UsePerCount Log("sssssssssssssss "..item.itemId.." "..item.itemNum) - NetManager.HeroComposeRequest(item,function (drop) - this.SendBackCompoundReCallBack(drop) - end) - if compoundNum<=0 then - PopupTipPanel.ShowTip(Language[10200]) + local gameSetting = ConfigManager.GetConfigData(ConfigName.GameSetting, 1) + local endHeroNum=gameSetting.HeroNumlimit-LengthOfTable(HeroManager.heroDataLists) + if endHeroNum > 0 then + NetManager.HeroComposeRequest(item,function (drop) + this.SendBackCompoundReCallBack(drop) + end) + if compoundNum<=0 then + PopupTipPanel.ShowTip(Language[10200]) + end + else + PopupTipPanel.ShowTip("神将已达上限") end else PopupTipPanel.ShowTip(Language[11592])