From 18053ad1927c41f46a7de0e9b5c7791beff42d24 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 2 Jun 2021 10:16:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E9=AD=82=E5=8D=B0=E3=80=91?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=AE=B9=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/SoulPrint/SoulPrintManager.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintManager.lua b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintManager.lua index dfe6b014ce..7c1aa6963f 100644 --- a/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintManager.lua @@ -743,6 +743,10 @@ end local allSoulPrintUpHeros = {}-- soulPrintSid = {heroDid,heroDid,heroDid} --增加魂印装备的英雄did function this.AddSoulPrintUpHeroDynamicId(soulPrintSid, heroDid) + if not equipConfig[soulPrintSid] then + LogYellow("魂印表里不存在,需要策划君! "..soulPrintSid) + return + end if allSoulPrintUpHeros[soulPrintSid] then table.insert(allSoulPrintUpHeros[soulPrintSid],heroDid) else From ec55dc15afae82d0f428972044f9318caef42d5a Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 2 Jun 2021 11:08:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BA=A2=E7=82=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Formation/FormationPanelV2.lua | 1 + Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua | 2 ++ Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua | 1 + .../~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua | 1 + 4 files changed, 5 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 6b748919f7..87fc8b5967 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -268,6 +268,7 @@ function this:OnClose() if this.curFormationIndex == FormationTypeDef.FORMATION_ENDLESS_MAP then EndLessMapManager.SetCanUseHeroNew() CheckRedPointStatus(RedPointType.wujinBianDui) + CheckRedPointStatus(RedPointType.EndlessPanel) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua index 71532fdeab..b08f3d916d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua @@ -52,6 +52,7 @@ function this.RefreshItemData() this.treasureData.curDataLevel = level this.SetTreasureState() CheckRedPointStatus(RedPointType.wujinTreasure) + CheckRedPointStatus(RedPointType.EndlessPanel) end local count = BagManager.GetItemCountById(this.shiQiValue) @@ -525,6 +526,7 @@ function this.SetCanUseHeroNew() LogGreen("v.isNew:"..v.isNew) end CheckRedPointStatus(RedPointType.wujinBianDui) + CheckRedPointStatus(RedPointType.EndlessPanel) end function this.GetHeroDataByProperty(_proId) diff --git a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua index 61c377508d..cda01a724b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua @@ -258,6 +258,7 @@ function this.ChangeVipRedPointState() CheckRedPointStatus(RedPointType.QinglongSerectTreasure) CheckRedPointStatus(RedPointType.pozhenzhuxianTask) CheckRedPointStatus(RedPointType.wujinMission) + CheckRedPointStatus(RedPointType.EndlessPanel) --CheckRedPointStatus(RedPointType.Achievement_One) --CheckRedPointStatus(RedPointType.Achievement_Two) --CheckRedPointStatus(RedPointType.Achievement_Three) diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua index ba78c8520e..aeb2dfca04 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua @@ -222,6 +222,7 @@ function EndLessTreasurePanel:OnBtnDealClicked(rewardItem,singleData) EndLessMapManager.SetTreasureState(singleData.Id,-1) end CheckRedPointStatus(RedPointType.wujinTreasure) + CheckRedPointStatus(RedPointType.EndlessPanel) self:refresh()--刷新界面 end) end) From 7679f85af3b9b9f79372ca2312862b6ec023a44d Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 2 Jun 2021 11:08:24 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E4=BF=AE=E8=A1=8C=E3=80=91?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/Map/UI_MainPlayer.prefab | 128 +++++++++++++++--- .../UI/PlayerInfoView/PlayerInfoView.prefab | 2 +- .../~Lua/Modules/Main/MainPanel.lua | 4 +- .../~Lua/Modules/Main/View/MainPlayerView.lua | 16 +-- 4 files changed, 122 insertions(+), 28 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/Map/UI_MainPlayer.prefab b/Assets/ManagedResources/Prefabs/Map/UI_MainPlayer.prefab index f6667b9c7f..6733525470 100644 --- a/Assets/ManagedResources/Prefabs/Map/UI_MainPlayer.prefab +++ b/Assets/ManagedResources/Prefabs/Map/UI_MainPlayer.prefab @@ -60,7 +60,8 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.65669507, y: 0.6566953, z: 0.6566953} - m_Children: [] + m_Children: + - {fileID: 7868520532870301331} m_Father: {fileID: 7615970307446995481} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -143,7 +144,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7586917845628614106 RectTransform: m_ObjectHideFlags: 0 @@ -151,16 +152,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3621620809879865289} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_LocalScale: {x: 1.5227767, y: 1.5227762, z: 1.5227762} m_Children: [] - m_Father: {fileID: 7615970307446995481} - m_RootOrder: 2 + m_Father: {fileID: 5993955088853526996} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 5, y: -32.5} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -55, y: 0} m_SizeDelta: {x: 59, y: 65} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9115302304514649136 @@ -332,7 +333,6 @@ RectTransform: m_Children: - {fileID: 8542266226903761540} - {fileID: 5993955088853526996} - - {fileID: 7586917845628614106} m_Father: {fileID: 6947002124225122056} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -452,6 +452,101 @@ RectTransform: m_AnchoredPosition: {x: 283, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &8136241361327276901 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7868520532870301331} + - component: {fileID: 8659842356983684918} + - component: {fileID: 1432783152129603294} + - component: {fileID: 1289954329682749125} + m_Layer: 0 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7868520532870301331 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8136241361327276901} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.5227767, y: 1.5227762, z: 1.5227762} + m_Children: [] + m_Father: {fileID: 8542266226903761540} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -55, y: 0} + m_SizeDelta: {x: 59, y: 65} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8659842356983684918 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8136241361327276901} + m_CullTransparentMesh: 0 +--- !u!114 &1432783152129603294 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8136241361327276901} + 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: b47ba13ec7c5df340aa580bb5505abac, 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 &1289954329682749125 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8136241361327276901} + 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 &9071092462066928365 GameObject: m_ObjectHideFlags: 0 @@ -470,7 +565,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5993955088853526996 RectTransform: m_ObjectHideFlags: 0 @@ -481,14 +576,15 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.65669507, y: 0.6566953, z: 0.6566953} - m_Children: [] + m_Children: + - {fileID: 7586917845628614106} m_Father: {fileID: 7615970307446995481} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 630, y: -35} - m_SizeDelta: {x: 420, y: 66} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 630, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3764668692912066610 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab b/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab index ad98be8423..583048d3a0 100644 --- a/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab +++ b/Assets/ManagedResources/Prefabs/UI/PlayerInfoView/PlayerInfoView.prefab @@ -6152,7 +6152,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: 393, y: -33} + m_AnchoredPosition: {x: 440, y: -33} m_SizeDelta: {x: 137.2, y: 52.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8833716866223761799 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index fcd9645558..30af02ce28 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -334,8 +334,8 @@ function this:BindEvent() -- LogYellow("username:"..tostring( NPCList[i].userName).." name:"..tostring(NPCList[i].name).." lv:"..tostring(NPCList[i].lv).." level:"..tostring(NPCList[i].level).." practiceLevel:"..tostring(NPCList[i].practiceLevel)) local _lv = NPCList[i].lv or NPCList[i].level or NPCList[i].userLevel if _lv and _lv >= GlobalSysConfig[108].OpenRules[2] then - view.ImprintImg:SetActive(true) - PracticeManager.SetPracticeIcon(view.ImprintImg,NPCList[i].practiceLevel) + view.ImprintImg2:SetActive(true) + PracticeManager.SetPracticeIcon(view.ImprintImg2,NPCList[i].practiceLevel) end view:SetAutoMove() view.leader.transform.name = "MainPlayerView"..i diff --git a/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua index 7d00286dd9..07e0e0e566 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/View/MainPlayerView.lua @@ -17,8 +17,11 @@ function MainPlayerView.New(isSelf, root, rect, pos,_NpvData,sortingOrder) instance.leader.transform:SetParent(root.transform) instance.leader.transform.localPosition = Vector3.zero instance.leader.transform.localScale = Vector3.one - instance.ImprintImg = Util.GetGameObject(instance.leader, "name/Icon")--:GetComponent("Image")--修行标识 - instance.ImprintImg:SetActive(false) + + instance.ImprintImg1 = Util.GetGameObject(instance.leader, "name/text/Icon")--修行标识 + instance.ImprintImg2 = Util.GetGameObject(instance.leader, "name/text2/Icon")--修行标识 + instance.ImprintImg1:SetActive(false) + instance.ImprintImg2:SetActive(false) local _sex, npc, scale if isSelf then @@ -35,19 +38,14 @@ function MainPlayerView.New(isSelf, root, rect, pos,_NpvData,sortingOrder) end --如果修行开启设置修行标识 if ActTimeCtrlManager.SingleFuncState(108) then - instance.ImprintImg:SetActive(true) - PracticeManager.SetPracticeIcon(instance.ImprintImg,PracticeManager.PracticeLevel) + instance.ImprintImg1:SetActive(true) + PracticeManager.SetPracticeIcon(instance.ImprintImg1,PracticeManager.PracticeLevel) end else instance.NameText = Util.GetGameObject(instance.leader, "name/text2"):GetComponent("Text") Util.GetGameObject(instance.leader, "name/text"):SetActive(false) Util.GetGameObject(instance.leader, "name/text2"):SetActive(true) _sex = _NpvData.sex - -- --如果修行开启设置修行标识 - -- if _NpvData.lv and _NpvData.lv >= GlobalSysConfig[108].OpenRules[2] then - -- instance.ImprintImg:SetActive(true) - -- PracticeManager.SetPracticeIcon(instance.ImprintImg,_NpvData.practiceLevel) - -- end if _sex == 0 then zuoqi = 80008 end local PlayerLiveViewData = { skin = _NpvData.userSkin,