From c994c9e636ecb3bc8dfdaa7f9ae4c6958a41bbd1 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 18 Nov 2021 18:43:22 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=81=B5=E8=84=89=E7=A7=98=E5=A2=83?= =?UTF-8?q?=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/LingMaiMiJin/LingMaiMiJingPanel.prefab | 238 +++++++++++++++++- .../LingMaiMiJing/LingMaiMiJingManager.lua | 31 +-- .../LingMaiMiJing/LingMaiMiJingPanel.lua | 13 + .../~Lua/Modules/Net/IndicationManager.lua | 18 +- .../~Lua/Modules/Net/NetManager.lua | 8 +- 5 files changed, 282 insertions(+), 26 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab index aae25ff573..4c2d873123 100644 --- a/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab @@ -139,6 +139,85 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &218684267906924537 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3607884297074981814} + - component: {fileID: 6480906088105148495} + - component: {fileID: 5241149358971867064} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3607884297074981814 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 218684267906924537} + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 183363294941890755} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 198, y: 0} + m_SizeDelta: {x: 312.65002, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6480906088105148495 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 218684267906924537} + m_CullTransparentMesh: 0 +--- !u!114 &5241149358971867064 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 218684267906924537} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 50 + m_Alignment: 5 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u5269\u4F59\u8D2D\u4E70\u6B21\u6570\uFF1A2" --- !u!1 &262171843384794290 GameObject: m_ObjectHideFlags: 0 @@ -830,6 +909,7 @@ RectTransform: - {fileID: 4437302812980058350} - {fileID: 8818828409612090952} - {fileID: 3941928346300992752} + - {fileID: 183363294941890755} m_Father: {fileID: 8713029853791401389} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1241,6 +1321,80 @@ MonoBehaviour: isPlayAudio: 1 isHaveCloseBtn: 0 isPlayOnOpen: 1 +--- !u!1 &1842521276256829803 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7741170066000682909} + - component: {fileID: 1100801024866038825} + - component: {fileID: 4412391364597756380} + m_Layer: 5 + m_Name: red + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7741170066000682909 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1842521276256829803} + 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: 6377394198622654848} + m_RootOrder: 0 + 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: -15} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1100801024866038825 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1842521276256829803} + m_CullTransparentMesh: 0 +--- !u!114 &4412391364597756380 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1842521276256829803} + 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 &1873219512533023104 GameObject: m_ObjectHideFlags: 0 @@ -5587,6 +5741,81 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "3370/\u5206" +--- !u!1 &5992973229959733562 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 183363294941890755} + - component: {fileID: 8246819615250357498} + - component: {fileID: 4905981693265529162} + m_Layer: 5 + m_Name: Time2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &183363294941890755 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5992973229959733562} + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3607884297074981814} + m_Father: {fileID: 8208061848372739616} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -250, y: -150} + m_SizeDelta: {x: 500, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8246819615250357498 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5992973229959733562} + m_CullTransparentMesh: 0 +--- !u!114 &4905981693265529162 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5992973229959733562} + 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: 0, g: 0, b: 0, a: 0.78431374} + 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_Sprite: {fileID: 21300000, guid: 0d3c780efce4ada4db6993deef309b76, 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 &6017153772183952367 GameObject: m_ObjectHideFlags: 0 @@ -5994,7 +6223,8 @@ RectTransform: 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_Children: + - {fileID: 7741170066000682909} m_Father: {fileID: 6199128604822066698} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -7363,7 +7593,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: 70} + m_AnchoredPosition: {x: 0, y: 98} m_SizeDelta: {x: 150, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5147704521608157102 @@ -7675,7 +7905,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -250, y: -53} + m_AnchoredPosition: {x: -250, y: -25} m_SizeDelta: {x: 500, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2690173194265976240 @@ -8281,7 +8511,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -250, y: -142} + m_AnchoredPosition: {x: -250, y: -90} m_SizeDelta: {x: 500, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6121055052744640816 diff --git a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingManager.lua b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingManager.lua index dc76141389..8fe635b74f 100644 --- a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingManager.lua @@ -119,7 +119,7 @@ function this.CheckPrivilage(func) PopupTipPanel.ShowTip(Language[10517]) PrivilegeManager.RefreshPrivilegeUsedTimes(2031, 1)--更新特权 func() - end) + end,0) end) else PopupTipPanel.ShowTip("今日已无挑战次数!") @@ -130,25 +130,26 @@ function this.CheckPrivilage(func) end function this.CheckRedPoint() - if PrivilegeManager.GetPrivilegeRemainValue(2030) > 0 or this.CheckRecord() then + if PrivilegeManager.GetPrivilegeRemainValue(2030) > 0 then + LogGreen("特权次数大于零 return true") return true - else - return false end + if #this.recordData > 0 then + if not PlayerPrefs.GetString(PlayerManager.uid.."LingMai") then + PlayerPrefs.SetString(PlayerManager.uid.."LingMai", "") + end + if PlayerPrefs.GetString(PlayerManager.uid.."LingMai") ~= tostring(this.recordData[1].time.."1") then + LogGreen("有新的数据 return true") + return true + end + end + LogGreen(tostring(#this.recordData).." 啥也没有 return false") + return false end function this.CheckRecord() - NetManager.LingMaiRecordRequest(function () - if #this.recordData > 0 then - if not PlayerPrefs.GetString(PlayerManager.uid.."LingMai") then - PlayerPrefs.SetString(PlayerManager.uid.."LingMai", "") - end - if PlayerPrefs.GetString(PlayerManager.uid.."LingMai") ~= tostring(this.recordData[1].time) then - return true - end - end - return false - end) + LogGreen("有新的数据2: "..tostring(PlayerPrefs.GetString(PlayerManager.uid.."LingMai")).." "..tostring(this.recordData[1].time)) + return PlayerPrefs.GetString(PlayerManager.uid.."LingMai") ~= tostring(this.recordData[1].time) end return LingMaiMiJingManager \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua index afeb2f622c..881d36770f 100644 --- a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua @@ -29,6 +29,7 @@ function LingMaiMiJingPanel:InitComponent() self.jump = Util.GetGameObject(self.bottom,"Jump") self.jumpBtn = Util.GetGameObject(self.jump,"btnJump") self.battleTime = Util.GetGameObject(self.jump,"Time/Text"):GetComponent("Text") + self.buyTime = Util.GetGameObject(self.jump,"Time2/Text"):GetComponent("Text") self.inputField = Util.GetGameObject(self.jump, "Input/InputField"):GetComponent("InputField") --rightBtns @@ -36,6 +37,7 @@ function LingMaiMiJingPanel:InitComponent() self.sortBtn = Util.GetGameObject(self.rightBtns,"sortBtn") self.rewardBtn = Util.GetGameObject(self.rightBtns,"rewardBtn") self.recordBtn = Util.GetGameObject(self.rightBtns,"recordBtn") + self.recordRed = Util.GetGameObject(self.recordBtn,"red") --contentgrid self.contentGrid = Util.GetGameObject(self.gameObject,"ContentGrid") self.veinList = {} @@ -114,6 +116,9 @@ end --界面打开时调用(用于子类重写) function LingMaiMiJingPanel:OnShow() + if LingMaiMiJingManager.state == 2 then + LingMaiMiJingManager.curPage = 1 + end NetManager.GetLingMaiInfoRequest(LingMaiMiJingManager.curPage,function () self.data = LingMaiMiJingManager.GetData() self:SetTime() @@ -122,6 +127,8 @@ function LingMaiMiJingPanel:OnShow() self.groupList = ConfigManager.TryGetAllConfigsDataByKey(ConfigName.LodeConfig,"Group",lodeConfig[self.data.lingmaiData[1].Id].Group) self.lastBtn:SetActive(LingMaiMiJingManager.curPage - 1 > 0) self.nextBtn:SetActive(LingMaiMiJingManager.curPage + 1 <= 50) + local bool = LingMaiMiJingManager.CheckRecord() + self.recordRed:SetActive(bool) end) end @@ -149,6 +156,12 @@ function LingMaiMiJingPanel:SetMydata() self.TextTip:SetActive(true) self.rewardGrid:SetActive(false) end + if self.data.state ~= 1 then + self.time:SetActive(false) + self.TextTip:SetActive(false) + self.rewardGrid:SetActive(false) + end + self.buyTime.text = string.format("剩余购买次数:%s",PrivilegeManager.GetPrivilegeRemainValue(2031)) self.battleTime.text = string.format("剩余挑战次数:%s",PrivilegeManager.GetPrivilegeRemainValue(2030)) ForceRebuildLayout(self.bottom.transform) end diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index f735af3fb4..6882ec584a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -149,6 +149,8 @@ function this.RegisterMessage(network) socket:RegistNetMessage(MessageTypeProto_pb.EQUIP_BOOK_INDICATION, this.EquipBookInfoIndication) -- 周卡推送 socket:RegistNetMessage(MessageTypeProto_pb.WeekCardIndicationInfoResponse, this.WeekCardIndication) + -- 灵脉被抢夺推送 + socket:RegistNetMessage(MessageTypeProto_pb.CrossLingmaiIndicationResponse, this.LingMaiIndication) end function this.EquipBookInfoIndication(buff) @@ -1058,10 +1060,18 @@ function this.LingMaiIndication(buffer) local data = buffer:DataByte() local msg = ArenaInfoProto_pb.CrossLingmaiIndicationResponse() msg:ParseFromString(data) - LingMaiMiJingManager.recordData = msg.recordData - PlayerPrefs.SetString(PlayerManager.uid.."LingMai", tostring(this.recordData[1].time)) - CheckRedPointStatus(RedPointType.LingMaiMiJing) - LogError("收到了后端发来的Indication") + + NetManager.LingMaiRecordRequest(function () + if #LingMaiMiJingManager.recordData > 0 then + PlayerPrefs.SetString(PlayerManager.uid.."LingMai", tostring(LingMaiMiJingManager.recordData[1].time)) + else + PlayerPrefs.SetString(PlayerManager.uid.."LingMai","") + end + CheckRedPointStatus(RedPointType.LingMaiMiJing) + Game.GlobalEvent:DispatchEvent(GameEvent.LingMaiMiJing.RefreshPanel) + LogError("收到了后端发来的Indication") + end) + end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index e5fa95a444..726c99fb28 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -6088,9 +6088,11 @@ function NetManager.GetLingMaiInfoRequest(_page, func) local msg = ArenaInfoProto_pb.CrossLingmaiSecretAreaInfoResponse() msg:ParseFromString(data) LingMaiMiJingManager.GetLingMaiServerData(msg,function () - if func then - func(msg) - end + NetManager.LingMaiRecordRequest(function () + if func then + func(msg) + end + end) end) end) end