diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
index 9071f4a1c4..c9894f1b6f 100644
--- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
@@ -4772,7 +4772,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: 151, y: -39}
+ m_AnchoredPosition: {x: 151, y: -35}
m_SizeDelta: {x: 262, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6414556168369772292
@@ -6154,13 +6154,14 @@ RectTransform:
m_Children:
- {fileID: 5519669512198605595}
- {fileID: 3630269392129034293}
+ - {fileID: 4205529841618498703}
m_Father: {fileID: 7606515546217958673}
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: -1.8, y: 175}
- m_SizeDelta: {x: 905, y: 78}
+ m_AnchoredPosition: {x: -1.8, y: 159.5}
+ m_SizeDelta: {x: 905, y: 109}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6593275248874976042
CanvasRenderer:
@@ -6214,9 +6215,9 @@ MonoBehaviour:
m_Padding:
m_Left: 20
m_Right: 0
- m_Top: 0
+ m_Top: 10
m_Bottom: 0
- m_ChildAlignment: 3
+ m_ChildAlignment: 0
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
@@ -11645,7 +11646,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: 567, y: -39}
+ m_AnchoredPosition: {x: 567, y: -35}
m_SizeDelta: {x: 570, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5816999955467277152
@@ -11689,7 +11690,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: "\u540C\u7CFB\u795E\u5C06\u6BCF\u65E5\u53EA\u53EF\u9009\u62E9\u5E76\u83B7\u53D6\u4E00\u6B21\u6982\u7387\u63D0\u5347"
+ m_Text: "\u540C\u7CFB\u795E\u5C06\u6BCF\u65E5\u53EA\u53EF\u9009\u62E9\u5E76\u83B7\u53D6\u4E00\u6B21\u6982\u7387\u63D0\u5347"
LanguageIndex: 0
--- !u!1 &7155416707831602318
GameObject:
@@ -12166,7 +12167,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: "\u62BD\u52305\u661F\u795E\u5C06\u65F6\uFF0C\u670940%\u51E0\u7387\u8F6C\u5316\u4E3A\u5FC3\u613F\u795E\u5C06\uFF01"
+ m_Text: "\u62BD\u52305\u661F\u795E\u5C06\u65F6\uFF0C\u670940%\u51E0\u7387\u8F6C\u5316\u4E3A\u5FC3\u613F\u795E\u5C06\uFF01"
LanguageIndex: 0
--- !u!1 &7349818788191680945
GameObject:
@@ -13971,6 +13972,107 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &8637436980630201770
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4205529841618498703}
+ - component: {fileID: 7501801898535476680}
+ - component: {fileID: 5429397426301861913}
+ - component: {fileID: 6737946928187578861}
+ m_Layer: 0
+ m_Name: Text (2)
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4205529841618498703
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8637436980630201770}
+ 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: 2977717086846436942}
+ 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: 0, y: -20}
+ m_SizeDelta: {x: 900, y: 50}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7501801898535476680
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8637436980630201770}
+ m_CullTransparentMesh: 0
+--- !u!114 &5429397426301861913
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8637436980630201770}
+ 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.9803922, g: 0.83921576, b: 0.6745098, 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: 30
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 0
+ m_MaxSize: 50
+ m_Alignment: 7
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 1
+ m_LineSpacing: 1
+ m_Text: "\u672A\u8BBE\u7F6E\u5FC3\u613F\u7684\u683C\u5B50\u4E5F\u5728\u5FC3\u613F\u89E6\u53D1\u7684\u8303\u56F4\u5185\uFF0C\u62BD\u4E2D\u65F6\u83B7\u5F97\u968F\u673A\u795E\u5C06\u3002"
+ LanguageIndex: 0
+--- !u!114 &6737946928187578861
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8637436980630201770}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreLayout: 1
+ m_MinWidth: -1
+ m_MinHeight: -1
+ m_PreferredWidth: -1
+ m_PreferredHeight: -1
+ m_FlexibleWidth: -1
+ m_FlexibleHeight: -1
+ m_LayoutPriority: 1
--- !u!1 &8654037135046806565
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/ManagedResources/Prefabs/UI/LuckyTurnTable/LuckyTurnTablePanel.prefab b/Assets/ManagedResources/Prefabs/UI/LuckyTurnTable/LuckyTurnTablePanel.prefab
index 3daad42c4b..2004b6c4bb 100644
--- a/Assets/ManagedResources/Prefabs/UI/LuckyTurnTable/LuckyTurnTablePanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/LuckyTurnTable/LuckyTurnTablePanel.prefab
@@ -1676,6 +1676,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
+--- !u!1 &1653313230070043358
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 4174870618839493381}
+ - component: {fileID: 4662046646691758547}
+ - component: {fileID: 5143600174058392177}
+ m_Layer: 5
+ m_Name: red
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &4174870618839493381
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1653313230070043358}
+ 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: 1811479771572553572}
+ m_RootOrder: 3
+ 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: 143.7, y: 36.08}
+ m_SizeDelta: {x: 30, y: 30}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4662046646691758547
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1653313230070043358}
+ m_CullTransparentMesh: 0
+--- !u!114 &5143600174058392177
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1653313230070043358}
+ 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 &1699621450893562782
GameObject:
m_ObjectHideFlags: 0
@@ -3124,6 +3198,7 @@ RectTransform:
- {fileID: 6365031021975070072}
- {fileID: 7215630962761925126}
- {fileID: 2842084672370111721}
+ - {fileID: 4174870618839493381}
m_Father: {fileID: 6138877246532216303}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarLayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarLayout.prefab
index b46d075856..86d83cef12 100644
--- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarLayout.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarLayout.prefab
@@ -9352,7 +9352,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
- m_Text: "\u8FDB\u9636\u8981\u6C42"
+ m_Text: "\u8FDB\u9636\u9884\u89C8"
LanguageIndex: 11558
--- !u!1 &7733290414840101524
GameObject:
diff --git a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
index 2d844f3ce9..244bde8b47 100644
--- a/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
@@ -101,6 +101,7 @@ function this.BackDataRefreshEnerny(msgItemInfo)
end
end
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.BagGold)
+ RedpotManager.CheckRedPointStatus(RedPointType.LuckyTurn)
CheckRedPointStatus(RedPointType.Recruit_Normal)
end
end
@@ -765,6 +766,7 @@ function this.GetTableByBackDropData(drop)
end
end
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.BagGold)
+ RedpotManager.CheckRedPointStatus(RedPointType.LuckyTurn)
return itemDataList
end
@@ -1094,6 +1096,7 @@ function this.BagIndicationRefresh(msg)
end
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.OnTempBagChanged)
end
+ RedpotManager.CheckRedPointStatus(RedPointType.LuckyTurn)
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.BagGold)
--检测背包红点
CheckRedPointStatus(RedPointType.Bag_HeroDebris)
diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
index 7dc954a67c..d52ab78f08 100644
--- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
@@ -6487,6 +6487,13 @@ local passivityList = {
local f1 = args[2]
local f2=args[3]
local onRoleHit = function(target, damage, bCrit, finalDmg, damageType, skill)
+ if not skill then
+ return
+ end
+
+ if skill.isNotLoop then
+ return
+ end
--如果是技能并且这个被动已经被触发过 return
if skill and BattleUtil.ChecklistIsContainValue(skill.triggerPassivityId,id) then
return
@@ -6498,7 +6505,7 @@ local passivityList = {
if target:IsDead() and not BattleUtil.CheckIsNoDead(target) and not role:IsDead() then
--role:InsertExtraSkill(f1,f2)
local effectData={role.superSkill[1],role.superSkill[2],role.superSkill[3],role.superSkill[4],{targets,{1,f1,f2}}}
- SkillManager.InsertSkill(role, effectData,BattleSkillType.Extra, nil, true, false)
+ SkillManager.InsertSkill(role, effectData,BattleSkillType.Extra, nil, true, false,false,true)
if skill then
table.insert(skill.triggerPassivityId,id)
end
@@ -7254,24 +7261,25 @@ local passivityList = {
--延时一帧,等所有英雄死亡结束后再执行逻辑
local roleRage=role.Rage
BattleLogic.WaitForTrigger(BattleLogic.GameDeltaTime,function()
- local arr=RoleManager.Query(function(v) return v.camp==role.camp and v~=role and not BattleUtil.CheckIsNoDead(v) end)
- local len=#arr
- local rage1=roleRage*v1
- if rage1= this.dialRewardSettingConfig[1].MultipleCostItem[2][4] then
+ isShow = true
+ end
+ local moreData={this.dialRewardSettingConfig[1].ExtractingTime,this.dialRewardSettingConfig[1].MultipleCostItem[2][4],isShow}
local icon = SetIcon(spLoader, 60)
return oneData,moreData,icon
elseif treasureType==TreasureType.Advanced then
- local oneData={1,this.dialRewardSettingConfig[2].CostItem[2][4]}
- local moreData={this.dialRewardSettingConfig[2].ExtractingTime,this.dialRewardSettingConfig[2].MultipleCostItem[2][4]}
+ local oneData={1,this.dialRewardSettingConfig[2].CostItem[2][4],isShow}
+ local moreData={this.dialRewardSettingConfig[2].ExtractingTime,this.dialRewardSettingConfig[2].MultipleCostItem[2][4],isShow}
local icon = SetIcon(spLoader, 61)
return oneData,moreData,icon
end
@@ -393,7 +399,13 @@ end
-------红点相关--------------
function this.ReturnRedPointState()
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.LuckyTurnTable_One) then
- return this.ReturnRewardBoxRedPoint()
+ if BagManager.GetItemCountById(60) >= this.dialRewardSettingConfig[1].MultipleCostItem[2][4] then
+ return true
+ end
+ if this.ReturnRewardBoxRedPoint() then
+ return true
+ end
+ return false
else
--Log("红点返回False")
return false
diff --git a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua
index e3539d3f67..a754acb153 100644
--- a/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua
@@ -24,7 +24,6 @@ local isPlayVideo = false
---初始化组件(用于子类重写)
function LuckyTurnTablePanel:InitComponent(gameObject)
this.spLoader = SpriteLoader.New()
- LuckyTurnTableManager.InitTableData()
LuckyTurnTableManager.GetLuckyTurnRequest()
this.luckyTurnPanel=Util.GetGameObject(self.gameObject,"Panel")
@@ -82,6 +81,7 @@ function LuckyTurnTablePanel:InitComponent(gameObject)
this.treasureMultipleText=Util.GetGameObject(this.treasureMultipleBtn,"Text"):GetComponent("Text")
this.treasureMultipleIcon=Util.GetGameObject(this.treasureMultipleBtn,"Icon"):GetComponent("Image")
this.treasureMultipleNum=Util.GetGameObject(this.treasureMultipleBtn,"Num"):GetComponent("Text")
+ this.treasureMultipleRed=Util.GetGameObject(this.treasureMultipleBtn,"red")
this.refreshBtn=Util.GetGameObject(this.bottom,"RefreshBtn")
this.freeDetail=Util.GetGameObject(this.refreshBtn,"FreeDetail")
this.detail=Util.GetGameObject(this.refreshBtn,"Detail")
@@ -274,14 +274,14 @@ function this.SwitchTreasureType(treasureType)
--设置需要材料显示
this.SetPropShow(60,treasureType)
--探宝按钮显示
- local oneData,moreData,icon=LuckyTurnTableManager.GetTreasureBtnInfo(this.spLoader, treasureType)
- this.SetTreasureBtnShow(oneData,moreData,icon)
+ this.SetTreasureBtnShow(treasureType)
--探宝泉预览
Util.AddOnceClick(this.propBtn,function()
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,60)
end)
--探宝1次按钮
Util.AddOnceClick(this.treasureOnceBtn, function()
+ local oneData,moreData,icon=LuckyTurnTableManager.GetTreasureBtnInfo(this.spLoader, treasureType)
if LuckyTurnTableManager.GetTreasureTicketNum(treasureType)-oneData[2]>=0
and LuckyTurnTableManager.luckyTimes + 1 <= maxTimesCount then
LuckyTurnTableManager.GetLuckyTurnRankRequest(TreasureType.Lucky,false,function()
@@ -292,6 +292,7 @@ function this.SwitchTreasureType(treasureType)
LuckyTurnTableManager.SetTimes(LuckyTurnTableManager.luckyTimes + 1)
this.maxTimes.text =string.format(Language[11156],LuckyTurnTableManager.luckyTimes,maxTimesCount)
isPlayVideo = true
+ this.SetTreasureBtnShow(treasureType)
end)
else
--PopupTipPanel.ShowTip("幸运探宝券不足!")
@@ -305,6 +306,7 @@ function this.SwitchTreasureType(treasureType)
end)
--探宝10次按钮
Util.AddOnceClick(this.treasureMultipleBtn, function()
+ local oneData,moreData,icon=LuckyTurnTableManager.GetTreasureBtnInfo(this.spLoader, treasureType)
if LuckyTurnTableManager.GetTreasureTicketNum(treasureType)-moreData[2]>=0
and LuckyTurnTableManager.luckyTimes + 15 <= maxTimesCount then
LuckyTurnTableManager.GetLuckyTurnRankRequest(TreasureType.Lucky,true,function()
@@ -315,6 +317,7 @@ function this.SwitchTreasureType(treasureType)
LuckyTurnTableManager.SetTimes(LuckyTurnTableManager.luckyTimes + 15)
this.maxTimes.text =string.format(Language[11156],LuckyTurnTableManager.luckyTimes,maxTimesCount)
isPlayVideo = true
+ this.SetTreasureBtnShow(treasureType)
end)
else
--PopupTipPanel.ShowTip("幸运探宝券不足!")
@@ -388,8 +391,7 @@ function this.SwitchTreasureType(treasureType)
this.SetPropShow(61,treasureType)
--探宝按钮显示
- local oneData,moreData,icon=LuckyTurnTableManager.GetTreasureBtnInfo(this.spLoader, treasureType)
- this.SetTreasureBtnShow(oneData,moreData,icon)
+ this.SetTreasureBtnShow(treasureType)
--探宝泉预览
Util.AddOnceClick(this.propBtn,function()
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup,61)
@@ -448,7 +450,6 @@ function this.SwitchTreasureType(treasureType)
end)
--刷新按钮
Util.AddOnceClick(this.refreshBtn, function()
- LogBlue("高级刷新券 "..BagManager.GetItemCountById(63))
if BagManager.GetItemCountById(63)>0 then
this.PlayItemListAnim()
LuckyTurnTableManager.GetLuckyTurnRefreshRequest(TreasureType.Advanced,true,function()
@@ -458,9 +459,6 @@ function this.SwitchTreasureType(treasureType)
this.RefreshBtnCountDown()
end)
else
- LogBlue("高级刷新券 "..LuckyTurnTableManager.GetRefreshItemNum())
- LogBlue("高级刷新券 "..LuckyTurnTableManager.dialRewardSettingConfig[2].Cost[2][4])
- LogBlue("高级刷新券 ".. LuckyTurnTableManager.GetRefreshItemNum()-LuckyTurnTableManager.dialRewardSettingConfig[2].Cost[2][4])
if LuckyTurnTableManager.GetRefreshItemNum()-LuckyTurnTableManager.dialRewardSettingConfig[2].Cost[2][4]>=0 then
this.PlayItemListAnim()
LuckyTurnTableManager.GetLuckyTurnRefreshRequest(TreasureType.Advanced,false,function()
@@ -629,13 +627,15 @@ function this.SetPropShow(itemId,treasureType)
end
---探宝按钮显示
-function this.SetTreasureBtnShow(oneData,moreData,icon)
+function this.SetTreasureBtnShow(treasureType)
+ local oneData,moreData,icon=LuckyTurnTableManager.GetTreasureBtnInfo(this.spLoader, treasureType)
this.treasureOnceText.text=Language[11163]..oneData[1]..Language[10048]
this.treasureOnceNum.text=oneData[2]
this.treasureOnceIcon.sprite=icon
this.treasureMultipleText.text=Language[11163]..moreData[1]..Language[10048]
this.treasureMultipleNum.text=moreData[2]
this.treasureMultipleIcon.sprite=icon
+ this.treasureMultipleRed.gameObject:SetActive(moreData[3])
end
--------------------------------免费刷新--------------------------------