diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/TenRecruitPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/TenRecruitPanel.prefab index f60ab69548..0be7c5ab12 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/TenRecruitPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/TenRecruitPanel.prefab @@ -928,6 +928,7 @@ RectTransform: - {fileID: 1538040534526950939} - {fileID: 224023345305094434} - {fileID: 224195207668249420} + - {fileID: 8714365083243280930} m_Father: {fileID: 224684771176241312} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -11259,6 +11260,81 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4511951668672970270 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8714365083243280930} + - component: {fileID: 1037860966954925456} + - component: {fileID: 8096335930477812706} + m_Layer: 5 + m_Name: TenTip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8714365083243280930 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4511951668672970270} + m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 227.96657} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 4048999435399196903} + m_Father: {fileID: 224317909065462668} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -140, y: -677} + m_SizeDelta: {x: 549, y: 135} + m_Pivot: {x: 0, y: 0} +--- !u!222 &1037860966954925456 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4511951668672970270} + m_CullTransparentMesh: 0 +--- !u!114 &8096335930477812706 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4511951668672970270} + 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: fa958dc660689ca45bbb016673654f5a, 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 &5021645053189612763 GameObject: m_ObjectHideFlags: 0 @@ -11344,6 +11420,86 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 2 +--- !u!1 &6468418645238345001 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4048999435399196903} + - component: {fileID: 5189326943195235792} + - component: {fileID: 8068177734652925750} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4048999435399196903 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6468418645238345001} + m_LocalRotation: {x: 0.0026179885, y: 0.9999966, z: -4.902275e-10, w: -0.00000018725288} + m_LocalPosition: {x: 0, y: 0, z: -5740.3} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8714365083243280930} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 180.00002, z: 0.3} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 179, y: -40} + m_SizeDelta: {x: 418.9, y: 94.2} + m_Pivot: {x: 0, y: 0} +--- !u!222 &5189326943195235792 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6468418645238345001} + m_CullTransparentMesh: 0 +--- !u!114 &8068177734652925750 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6468418645238345001} + 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: 1, g: 0.72156864, b: 0.23137255, a: 1} + m_RaycastTarget: 0 + 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: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 3 + m_MaxSize: 51 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 0.7 + m_Text: "\u9996\u6B21\u5341\u8FDE\u5FC5\u5F97\u4E94\u661F\u795E\u5C06" + LanguageIndex: 0 --- !u!1 &8127795489127772223 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua index e43e8a6c27..c80ca9b843 100644 --- a/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/HeroInfoProto_pb.lua @@ -25,6 +25,7 @@ HERORANDREQUEST_TYPE_FIELD = protobuf.FieldDescriptor(); HERORANDRESPONSE = protobuf.Descriptor(); HERORANDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor(); HERORANDRESPONSE_EXTRABOX_FIELD = protobuf.FieldDescriptor(); +HERORANDRESPONSE_MUSTCOUNT_FIELD = protobuf.FieldDescriptor(); TEAMPOSSAVEREQUEST = protobuf.Descriptor(); TEAMPOSSAVEREQUEST_TEAMPOSINFO_FIELD = protobuf.FieldDescriptor(); GETALLTEAMPOSRESPONSE = protobuf.Descriptor(); @@ -399,11 +400,21 @@ HERORANDRESPONSE_EXTRABOX_FIELD.message_type = CommonProto_pb.DROP HERORANDRESPONSE_EXTRABOX_FIELD.type = 11 HERORANDRESPONSE_EXTRABOX_FIELD.cpp_type = 10 +HERORANDRESPONSE_MUSTCOUNT_FIELD.name = "mustCount" +HERORANDRESPONSE_MUSTCOUNT_FIELD.full_name = ".rpc.protocols.HeroRandResponse.mustCount" +HERORANDRESPONSE_MUSTCOUNT_FIELD.number = 3 +HERORANDRESPONSE_MUSTCOUNT_FIELD.index = 2 +HERORANDRESPONSE_MUSTCOUNT_FIELD.label = 1 +HERORANDRESPONSE_MUSTCOUNT_FIELD.has_default_value = false +HERORANDRESPONSE_MUSTCOUNT_FIELD.default_value = 0 +HERORANDRESPONSE_MUSTCOUNT_FIELD.type = 5 +HERORANDRESPONSE_MUSTCOUNT_FIELD.cpp_type = 1 + HERORANDRESPONSE.name = "HeroRandResponse" HERORANDRESPONSE.full_name = ".rpc.protocols.HeroRandResponse" HERORANDRESPONSE.nested_types = {} HERORANDRESPONSE.enum_types = {} -HERORANDRESPONSE.fields = {HERORANDRESPONSE_DROP_FIELD, HERORANDRESPONSE_EXTRABOX_FIELD} +HERORANDRESPONSE.fields = {HERORANDRESPONSE_DROP_FIELD, HERORANDRESPONSE_EXTRABOX_FIELD, HERORANDRESPONSE_MUSTCOUNT_FIELD} HERORANDRESPONSE.is_extendable = false HERORANDRESPONSE.extensions = {} TEAMPOSSAVEREQUEST_TEAMPOSINFO_FIELD.name = "TeamPosInfo" diff --git a/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua index 081b987d26..80a560fccc 100644 --- a/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua @@ -68,6 +68,7 @@ GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD = protobuf.FieldDescriptor(); GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD = protobuf.FieldDescriptor(); GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD = protobuf.FieldDescriptor(); GETPLAYERINFORESPONSE_SEALLIST_FIELD = protobuf.FieldDescriptor(); +GETPLAYERINFORESPONSE_RANDOMCOUNT_FIELD = protobuf.FieldDescriptor(); GETITEMINFOREQUEST = protobuf.Descriptor(); GETITEMINFOREQUEST_INDEX_FIELD = protobuf.FieldDescriptor(); GETITEMINFORESPONSE = protobuf.Descriptor(); @@ -1174,11 +1175,21 @@ GETPLAYERINFORESPONSE_SEALLIST_FIELD.message_type = CommonProto_pb.PURPLEMANSION GETPLAYERINFORESPONSE_SEALLIST_FIELD.type = 11 GETPLAYERINFORESPONSE_SEALLIST_FIELD.cpp_type = 10 +GETPLAYERINFORESPONSE_RANDOMCOUNT_FIELD.name = "randomCount" +GETPLAYERINFORESPONSE_RANDOMCOUNT_FIELD.full_name = ".rpc.protocols.GetPlayerInfoResponse.randomCount" +GETPLAYERINFORESPONSE_RANDOMCOUNT_FIELD.number = 43 +GETPLAYERINFORESPONSE_RANDOMCOUNT_FIELD.index = 41 +GETPLAYERINFORESPONSE_RANDOMCOUNT_FIELD.label = 1 +GETPLAYERINFORESPONSE_RANDOMCOUNT_FIELD.has_default_value = false +GETPLAYERINFORESPONSE_RANDOMCOUNT_FIELD.default_value = 0 +GETPLAYERINFORESPONSE_RANDOMCOUNT_FIELD.type = 5 +GETPLAYERINFORESPONSE_RANDOMCOUNT_FIELD.cpp_type = 1 + GETPLAYERINFORESPONSE.name = "GetPlayerInfoResponse" GETPLAYERINFORESPONSE.full_name = ".rpc.protocols.GetPlayerInfoResponse" GETPLAYERINFORESPONSE.nested_types = {} GETPLAYERINFORESPONSE.enum_types = {} -GETPLAYERINFORESPONSE.fields = {GETPLAYERINFORESPONSE_PLAYER_FIELD, GETPLAYERINFORESPONSE_NEWPLAYERGUIDEPOINT_FIELD, GETPLAYERINFORESPONSE_PRIVILEGE_FIELD, GETPLAYERINFORESPONSE_GIFTGOODSINFO_FIELD, GETPLAYERINFORESPONSE_BUYGOODSID_FIELD, GETPLAYERINFORESPONSE_SUDDENLYBOSSINFO_FIELD, GETPLAYERINFORESPONSE_VIPLEVETAKE_FIELD, GETPLAYERINFORESPONSE_USERCREATETIME_FIELD, GETPLAYERINFORESPONSE_REDTYPE_FIELD, GETPLAYERINFORESPONSE_RANDCOUNT_FIELD, GETPLAYERINFORESPONSE_HEROHANDBOOK_FIELD, GETPLAYERINFORESPONSE_EQUIPHANDBOOK_FIELD, GETPLAYERINFORESPONSE_TOWERRECEIVEDREWARD_FIELD, GETPLAYERINFORESPONSE_GOODSTYPEDURATION_FIELD, GETPLAYERINFORESPONSE_TREASURELEVEL_FIELD, GETPLAYERINFORESPONSE_HADBUYTREASURE_FIELD, GETPLAYERINFORESPONSE_SIGNININFO_FIELD, GETPLAYERINFORESPONSE_FIRSTTENTH_FIELD, GETPLAYERINFORESPONSE_MONSTERATTACKTIME_FIELD, GETPLAYERINFORESPONSE_ISDAYFIRST_FIELD, GETPLAYERINFORESPONSE_PLAYERBINDPHONE_FIELD, GETPLAYERINFORESPONSE_QUESTIONSTATE_FIELD, GETPLAYERINFORESPONSE_SOULEQUIPPOOL_FIELD, GETPLAYERINFORESPONSE_PLAYEDMAPTYPES_FIELD, GETPLAYERINFORESPONSE_AMOUNT_FIELD, GETPLAYERINFORESPONSE_VIPDAILY_FIELD, GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD, GETPLAYERINFORESPONSE_MONTHINFOS_FIELD, GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD, GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD, GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD, GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD, GETPLAYERINFORESPONSE_WORLDLEVE_FIELD, GETPLAYERINFORESPONSE_DEMONSTRIALREWARDINFO_FIELD, GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD, GETPLAYERINFORESPONSE_USERSKINLIST_FIELD, GETPLAYERINFORESPONSE_USERTITLELIST_FIELD, GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD, GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD, GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD, GETPLAYERINFORESPONSE_SEALLIST_FIELD} +GETPLAYERINFORESPONSE.fields = {GETPLAYERINFORESPONSE_PLAYER_FIELD, GETPLAYERINFORESPONSE_NEWPLAYERGUIDEPOINT_FIELD, GETPLAYERINFORESPONSE_PRIVILEGE_FIELD, GETPLAYERINFORESPONSE_GIFTGOODSINFO_FIELD, GETPLAYERINFORESPONSE_BUYGOODSID_FIELD, GETPLAYERINFORESPONSE_SUDDENLYBOSSINFO_FIELD, GETPLAYERINFORESPONSE_VIPLEVETAKE_FIELD, GETPLAYERINFORESPONSE_USERCREATETIME_FIELD, GETPLAYERINFORESPONSE_REDTYPE_FIELD, GETPLAYERINFORESPONSE_RANDCOUNT_FIELD, GETPLAYERINFORESPONSE_HEROHANDBOOK_FIELD, GETPLAYERINFORESPONSE_EQUIPHANDBOOK_FIELD, GETPLAYERINFORESPONSE_TOWERRECEIVEDREWARD_FIELD, GETPLAYERINFORESPONSE_GOODSTYPEDURATION_FIELD, GETPLAYERINFORESPONSE_TREASURELEVEL_FIELD, GETPLAYERINFORESPONSE_HADBUYTREASURE_FIELD, GETPLAYERINFORESPONSE_SIGNININFO_FIELD, GETPLAYERINFORESPONSE_FIRSTTENTH_FIELD, GETPLAYERINFORESPONSE_MONSTERATTACKTIME_FIELD, GETPLAYERINFORESPONSE_ISDAYFIRST_FIELD, GETPLAYERINFORESPONSE_PLAYERBINDPHONE_FIELD, GETPLAYERINFORESPONSE_QUESTIONSTATE_FIELD, GETPLAYERINFORESPONSE_SOULEQUIPPOOL_FIELD, GETPLAYERINFORESPONSE_PLAYEDMAPTYPES_FIELD, GETPLAYERINFORESPONSE_AMOUNT_FIELD, GETPLAYERINFORESPONSE_VIPDAILY_FIELD, GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD, GETPLAYERINFORESPONSE_MONTHINFOS_FIELD, GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD, GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD, GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD, GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD, GETPLAYERINFORESPONSE_WORLDLEVE_FIELD, GETPLAYERINFORESPONSE_DEMONSTRIALREWARDINFO_FIELD, GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD, GETPLAYERINFORESPONSE_USERSKINLIST_FIELD, GETPLAYERINFORESPONSE_USERTITLELIST_FIELD, GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD, GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD, GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD, GETPLAYERINFORESPONSE_SEALLIST_FIELD, GETPLAYERINFORESPONSE_RANDOMCOUNT_FIELD} GETPLAYERINFORESPONSE.is_extendable = false GETPLAYERINFORESPONSE.extensions = {} GETITEMINFOREQUEST_INDEX_FIELD.name = "index" diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index d583a2ff32..82da2a6e0a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -225,6 +225,8 @@ function this.PlayerInfoRequest(func) --修行 PracticeManager.UpdataFromServer(msg.practiceLevel)--修行等级 PracticeManager.UpdataImprintDataFromServer(msg.sealList)--神印列表 + RecruitManager.SetRecruit3MustCount(msg.randomCount) + if func then func(msg) end @@ -627,6 +629,9 @@ function this.RecruitRequest(type, func) local singHeroData = msg.drop.Hero[i] HeroManager.UpdateHeroDatas(singHeroData) end + if RecruitType.Single == type or RecruitType.Ten == type then + RecruitManager.SetRecruit3MustCount(msg.mustCount) + end CheckRedPointStatus(RedPointType.Huaxutan_CompoundHero) if func then func(msg) diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua index e2aa7bdcb7..f0aec43c52 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua @@ -12,7 +12,15 @@ local drawtType={ FindFairyTen=0 } this.freeUseTimeList={} --免费抽卡容器 +this.recruit3MustCount = 0 +function this.SetRecruit3MustCount(count) + this.recruit3MustCount = count +end + +function this.GetRecruit3MustCount() + return this.recruit3MustCount +end function this.Initialize() this.randCount = 0 --英雄抽卡已招募次数 this.isCanOpenBox = false diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua index 3e25387bad..250df2aa27 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua @@ -256,9 +256,12 @@ function this.UpdatePanelData() this.sliderText.text = string.format("%s/%s", num, lotterySetting[RecruitType.RecruitBox].CostItem[1][2]) Util.GetGameObject(this.transform, "rewardBox/content/boxIcon"):GetComponent("Animator").enabled = RecruitManager.isCanOpenBox this.UI_effect_RecruitPanel_box_normal:SetActive(not RecruitManager.isCanOpenBox) - this.tenTip:SetActive(RecruitManager.isTenRecruit == 0) - this.tenTipText.text = Language[11708] - + this.tenTip:SetActive(true) + if RecruitManager.isTenRecruit == 0 then + this.tenTipText.text = Language[11708] + else + this.tenTipText.text = string.format("剩余%s次必得五星神将",RecruitManager.GetRecruit3MustCount()) + end this.upper.text=PrivilegeManager.GetPrivilegeUsedTimes(maxTimesId).."/"..privilegeConfig[maxTimesId].Condition[1][2]--特权上限 end diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua index 3dc157e661..83ced2f040 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua @@ -22,6 +22,10 @@ function TenRecruitPanel:InitComponent() this.cardPre = Util.GetGameObject(self.transform, "card") this.grid = Util.GetGameObject(self.transform, "scroll/grid") self.effect = Util.GetGameObject(self.gameObject, "bg/effect") + + this.tenTip = Util.GetGameObject(self.gameObject, "bg/TenTip") + this.tenTipText = Util.GetGameObject(this.tenTip,"Text"):GetComponent("Text") + for i = 1, 10 do cardList[i] = SubUIManager.Open(SubUIConfig.RoleItemView, this.grid.transform) end @@ -127,6 +131,14 @@ function TenRecruitPanel:OnOpen(...) else this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.Recruit }) end + + LogGreen("recruitType[1]:"..recruitType[1]) + if RecruitType.Single == recruitType[1] or RecruitType.Ten == recruitType[1] then + this.tenTip.gameObject:SetActive(true) + this.tenTipText.text = string.format("剩余%s次必得五星神将",RecruitManager.GetRecruit3MustCount()) + else + this.tenTip.gameObject:SetActive(false) + end end --界面关闭时调用(用于子类重写)