From 8aad1eee56d0a1ac6774f6c14ef24f2d912f3415 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 12 Mar 2021 14:31:53 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=99=90=E6=97=B6=E7=A5=9E=E8=A3=85?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Main/MainPanel.prefab | 392 ++++++++++++++++++ .../~Lua/Modules/Expert/PatFaceManager.lua | 4 +- .../~Lua/Modules/Main/MainPanel.lua | 113 ++--- .../Mission/QinglongSerectTreasureManager.lua | 2 +- .../~Lua/Modules/Net/NetManager.lua | 10 +- .../Modules/Operating/OperatingManager.lua | 8 +- .../~Lua/Modules/Player/HeadManager.lua | 4 +- .../~Lua/Modules/Ranking/RankingManager.lua | 4 +- 8 files changed, 454 insertions(+), 83 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab index ac63e5906e..fc803745c7 100644 --- a/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab @@ -26121,6 +26121,308 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2709035587268174483 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1816948176049344543} + - component: {fileID: 3937724972328542658} + - component: {fileID: 8611156633673738322} + - component: {fileID: 414087234328399521} + m_Layer: 5 + m_Name: TimeLimitSkin + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1816948176049344543 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2709035587268174483} + 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: + - {fileID: 4890665577926407777} + - {fileID: 8437346681022270691} + - {fileID: 447729072091545928} + m_Father: {fileID: 1612271237950830011} + m_RootOrder: 25 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 11, y: -63} + m_SizeDelta: {x: 148, y: 126} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3937724972328542658 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2709035587268174483} + m_CullTransparentMesh: 0 +--- !u!114 &8611156633673738322 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2709035587268174483} + 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: 0} + 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 &414087234328399521 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2709035587268174483} + 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 &2735547250683366115 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8437346681022270691} + - component: {fileID: 7542717085015098013} + - component: {fileID: 257046707052880475} + - component: {fileID: 4636099187255379352} + - component: {fileID: 5006453825346407732} + m_Layer: 5 + m_Name: Image_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8437346681022270691 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2735547250683366115} + 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: 1816948176049344543} + 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: 0, y: -77.4} + m_SizeDelta: {x: 148, y: 28} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7542717085015098013 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2735547250683366115} + m_CullTransparentMesh: 0 +--- !u!114 &257046707052880475 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2735547250683366115} + 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: d69429d22e71bbd439bbf280edeb3a71, 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!114 &4636099187255379352 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2735547250683366115} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 +--- !u!114 &5006453825346407732 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2735547250683366115} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!1 &2753970047217196362 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 447729072091545928} + - component: {fileID: 8031659862143183038} + - component: {fileID: 8967450917190171743} + m_Layer: 5 + m_Name: time + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &447729072091545928 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2753970047217196362} + 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: 1816948176049344543} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 73.7, y: -140.5} + m_SizeDelta: {x: 147.4, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8031659862143183038 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2753970047217196362} + m_CullTransparentMesh: 0 +--- !u!114 &8967450917190171743 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2753970047217196362} + 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: 28 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 47 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: --- !u!1 &2773793159959934069 GameObject: m_ObjectHideFlags: 0 @@ -72230,6 +72532,7 @@ RectTransform: - {fileID: 4983623036232270673} - {fileID: 4941688078859846456} - {fileID: 125154823310492287} + - {fileID: 1816948176049344543} m_Father: {fileID: 986452627335843391} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -78953,6 +79256,95 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5762686792390397000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4890665577926407777} + - component: {fileID: 7034585779811413897} + - component: {fileID: 5321829519412388644} + - component: {fileID: 8408268938192934196} + m_Layer: 5 + m_Name: Image_1 (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4890665577926407777 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5762686792390397000} + 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: 1816948176049344543} + 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, y: 0} + m_SizeDelta: {x: 141, y: 145} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7034585779811413897 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5762686792390397000} + m_CullTransparentMesh: 0 +--- !u!114 &5321829519412388644 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5762686792390397000} + 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: fdf133d5f79a09d4581a61fe0ee1ffef, 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!114 &8408268938192934196 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5762686792390397000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 --- !u!1 &5776566382168902959 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua index 087705f090..0873560def 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua @@ -147,9 +147,9 @@ function this.PatFaceSpecialMonitor(v,patFaceAllData,type,starUpGiftNum) local curState = ArenaTopMatchManager.GetBaseData().battleState local battleStage = ArenaTopMatchManager.GetBaseData().battleStage if battleStage and curState then - LogPink(" v.OpenRules[2] "..v.OpenRules[2].." curState "..curState.." type "..type.." battleStage "..battleStage.." v.Values "..v.Values) + Log(" v.OpenRules[2] "..v.OpenRules[2].." curState "..curState.." type "..type.." battleStage "..battleStage.." v.Values "..v.Values) else - LogPink(" v.OpenRules[2] "..v.OpenRules[2].." curState nil type "..type.." battleStage nil v.Values "..v.Values) + Log(" v.OpenRules[2] "..v.OpenRules[2].." curState nil type "..type.." battleStage nil v.Values "..v.Values) end -- if v.OpenRules[2] == curState and type == 2 and battleStage >= v.Values then --and type == 2 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 4ad2222587..a8e26ff407 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -911,13 +911,11 @@ function this:BindEvent() UIManager.OpenPanel(UIName.DemonSlayerPanel) end) -<<<<<<< HEAD --限时神装 Util.AddClick(this.btnTimeLimitSkin, function() UIManager.OpenPanel(UIName.TimeLimitSkinPanel) end) -======= --牛转钱坤 Util.AddClick(this.btnNiuZhuan, function() UIManager.OpenPanel(UIName.NiuZhuanQianKunPanel) @@ -934,27 +932,7 @@ function this:BindEvent() end end) - - -- if (ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.HongMengZhen)) then - - -- -- if #table>6 then - -- -- body - - -- -- else - -- -- UIManager.OpenPanel(UIName.HongMengPanel) - -- -- end - -- -- NetManager.RankFirstRequest(types,activiteIds,function (msg) - -- -- UIManager.OpenPanel(UIName.RankingListMainPanel,msg) - -- -- end) - -- else - -- local tip = ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.HongMengZhen) - -- PopupTipPanel.ShowTip(tip) - -- end - --this.ScenceBtnClick(FUNCTION_OPEN_TYPE.HongMengZhen) - - end) ->>>>>>> master_xma_local this.BindRedPoint() end @@ -1650,16 +1628,18 @@ function this.TimeFormat() end end -<<<<<<< HEAD --限时神装 local limitSkinGift = {} limitSkinGift = OperatingManager.GetTimeLimitSkinInfoList() - if limitSkinGift and limitSkinGift.goodsId then + if #limitSkinGift > 0 then this.btnTimeLimitSkin:SetActive(true) - this.TimeLimitSkinTime.text = TimeToHMS(limitSkinGift.endTime-GetTimeStamp()) - if limitSkinGift.endTime-GetTimeStamp() < 1 then - OperatingManager.RemoveItemInfoByType(GoodsTypeDef.DirectPurchaseGift, limitSkinGift.goodsId) -======= + this.TimeLimitSkinTime.text = TimeToHMS(limitSkinGift[1].endTime-GetTimeStamp()) + if limitSkinGift[1].endTime-GetTimeStamp() < 1 then + OperatingManager.RemoveItemInfoByType(GoodsTypeDef.DirectPurchaseGift, limitSkinGift[1].goodsId) + else + this.btnTimeLimitSkin:SetActive(true) + end + end --牛转钱坤 local NiuZhuan = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.NiuZhuan) @@ -1678,47 +1658,44 @@ function this.TimeFormat() end end end ---为限时折扣写的 -function this:GetInfoList() - local giftList={} - local infoList = OperatingManager.GetGiftGoodsInfoList(GoodsTypeDef.DirectPurchaseGift)--拿取所有类型5礼包信息(包含需要的礼包) - local infoList2 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",21) - for index, value in pairs(infoList) do - for i = 1, #infoList2 do - if infoList2[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then - table.insert(giftList,value) - end - end - end - local infoList3 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",8) - for index, value in pairs(infoList) do - for i = 1, #infoList3 do - if infoList3[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then - table.insert(giftList,value) - end - end - end - local infoList4 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",25) - for index, value in pairs(infoList) do - for i = 1, #infoList4 do - if infoList4[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then - table.insert(giftList,value) - end - end - end - local infoList5 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",26) - for index, value in pairs(infoList) do - for i = 1, #infoList5 do - if infoList5[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then - table.insert(giftList,value) - end ->>>>>>> master_xma_local - end - else - this.btnTimeLimitSkin:SetActive(true) - end +-- --为限时折扣写的 +-- function this:GetInfoList() +-- local giftList={} +-- local infoList = OperatingManager.GetGiftGoodsInfoList(GoodsTypeDef.DirectPurchaseGift)--拿取所有类型5礼包信息(包含需要的礼包) +-- local infoList2 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",21) +-- for index, value in pairs(infoList) do +-- for i = 1, #infoList2 do +-- if infoList2[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then +-- table.insert(giftList,value) +-- end +-- end +-- end +-- local infoList3 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",8) +-- for index, value in pairs(infoList) do +-- for i = 1, #infoList3 do +-- if infoList3[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then +-- table.insert(giftList,value) +-- end +-- end +-- end +-- local infoList4 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",25) +-- for index, value in pairs(infoList) do +-- for i = 1, #infoList4 do +-- if infoList4[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then +-- table.insert(giftList,value) +-- end +-- end +-- end +-- local infoList5 = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",26) +-- for index, value in pairs(infoList) do +-- for i = 1, #infoList5 do +-- if infoList5[i].Id == value.goodsId and value.dynamicBuyTimes > 0 then +-- table.insert(giftList,value) +-- end +-- end +-- end -end +-- end -- function this:OnCloseBefore(action) -- PlayUIAnimBacks(this.gameObject, action) diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua index b2276a786b..3828d60dca 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua @@ -171,7 +171,7 @@ function this.SetLevel(_level) this.level = _level end function this.SetTreasureBuyStatus(hadBuy) - LogBlue("秘宝礼包购买状态:"..hadBuy) + Log("秘宝礼包购买状态:"..hadBuy) this.hadBuyTreasure = (hadBuy == 1) end function this.GetLevel() diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 96f8a2542c..d23caeba8f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -4675,13 +4675,13 @@ function this.GetHeroSkinData(func) local msg = HeroInfoProto_pb.GetAllSkinResponse() msg:ParseFromString(data) if msg.skinInfo and #msg.skinInfo > 0 then - LogBlue("#msg.skinInfo:"..#msg.skinInfo) + Log("皮肤数:"..#msg.skinInfo) for i = 1, #msg.skinInfo do - LogBlue("i:"..i.." msg.skinInfo[i].skinId:"..msg.skinInfo[i].skinId.." msg.skinInfo[i].overTime:"..msg.skinInfo[i].overTime) + Log("i:"..i.." msg.skinInfo[i].skinId:"..msg.skinInfo[i].skinId.." msg.skinInfo[i].overTime:"..msg.skinInfo[i].overTime) end HeroSkinManager.InitialSkin(msg) else - LogBlue("没有皮肤") + Log("没有皮肤") end if func then func(msg) @@ -4732,9 +4732,9 @@ end --鸿蒙阵 -- 鸿蒙阵 游戏开始 拿到的数据 function this.HongMengInfoResponse(func) - LogGreen(tostring(MessageTypeProto_pb.HONGMENG_GET_INFO_REQUEST).." "..tostring(MessageTypeProto_pb.HONGMENG_GET_INFO_RESPONSE)) + -- LogGreen(tostring(MessageTypeProto_pb.HONGMENG_GET_INFO_REQUEST).." "..tostring(MessageTypeProto_pb.HONGMENG_GET_INFO_RESPONSE)) Network:SendMessageWithCallBack(MessageTypeProto_pb.HONGMENG_GET_INFO_REQUEST,MessageTypeProto_pb.HONGMENG_GET_INFO_RESPONSE,nil,function(buffer) - LogGreen("请求鸿蒙阵数据") + -- LogGreen("请求鸿蒙阵数据") -- local data = buffer:DataByte() -- local msg = HeroInfoProto_pb.GetHongmengInfoResponse() -- msg:ParseFromString(data) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 18165107ab..2270dec93a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -907,7 +907,7 @@ function this.CheckMonthGiftPageRedPoint() local isCanBuy = limitNum - boughtNum >0 if isCanBuy and rechargeConfig[shopData[i].goodsId].Price <= 0 then return true - end + end end end return false @@ -915,13 +915,15 @@ end --为限时神装写的(只有一个) function this.GetTimeLimitSkinInfoList() + local giftList={} local infoList = OperatingManager.GetGiftGoodsInfoList(GoodsTypeDef.DirectPurchaseGift)--拿取所有类型5礼包信息(包含需要的礼包) local infoList2 = ConfigManager.GetConfigDataByKey(ConfigName.RechargeCommodityConfig,"ShowType",29) for index, value in pairs(infoList) do - if infoList2.Id == value.goodsId and value.dynamicBuyTimes > 0 then - return value + if infoList2.Id == value.goodsId then-- and value.dynamicBuyTimes > 0 then + table.insert(giftList,value) end end + return giftList end --为限时折扣写的(含有多个) function this.GetInfoList() diff --git a/Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua index edf1997f81..ff08dc6fb6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/HeadManager.lua @@ -179,7 +179,7 @@ function HeadManager.SetHeadFrameAllData(data) this.headFrameData = {} if #data > 0 then for i = 1, #data do - LogGreen(" data[i].headFrameId ".. data[i].headFrameId.." data[i].validTime "..data[i].validTime ) + Log(" data[i].headFrameId ".. data[i].headFrameId.." data[i].validTime "..data[i].validTime ) local single_data = {} single_data.headFrameId = data[i].headFrameId single_data.validTime = data[i].validTime @@ -194,7 +194,7 @@ function HeadManager.SetSineleHeadFrameAllData(headFrameId,time) local single_data = {} single_data.headFrameId = headFrameId single_data.validTime = time - LogGreen(" headFrameId ".. headFrameId.." time "..time ) + Log(" headFrameId ".. headFrameId.." time "..time ) single_data.PlayerHeadIcon = ConfigManager.GetConfigDataByKey(ConfigName.PlayerHeadIcon,"Id",single_data.headFrameId) this.headFrameData[single_data.headFrameId] = single_data end diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua index 2810091d64..c7b92d3464 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua @@ -28,7 +28,7 @@ end --请求排行榜下面数据 function this.RequestNextWarPowerPageData(fun) if cur_isMax then LogGreen(Language[12215]) return end - LogGreen("cur_rankIndex "..cur_rankIndex) + Log("cur_rankIndex "..cur_rankIndex) NetManager.RequestRankInfo(cur_rankType, function (msg)--请求数据 this.ReceiveNextRankingData(msg,fun) end,cur_activiteId,cur_rankIndex) @@ -42,7 +42,7 @@ function this.ReceiveRankingData(msg,fun) --滚动数据 local length=#this.curRankingData for i, rank in ipairs(msg.ranks) do - LogGreen("UserRank "..rank.rankInfo.rank) + Log("UserRank "..rank.rankInfo.rank) this.curRankingData[length+i]=rank end if #msg.ranks < 20 or #this.curRankingData >= 100 then