diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index ae66d42493..b05b267243 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -3822,7 +3822,7 @@ RectTransform: m_Children: - {fileID: 2466685563055975460} m_Father: {fileID: 8229610283058382897} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -6902,6 +6902,7 @@ RectTransform: - {fileID: 3798719250441801945} - {fileID: 8165174769819941536} - {fileID: 4134529790793770453} + - {fileID: 1113430802928872061} - {fileID: 1562987996890943355} m_Father: {fileID: 1309844718863455023} m_RootOrder: 0 @@ -6948,6 +6949,86 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6554288150578468794 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2602619569538988374} + - component: {fileID: 8739320527228231907} + - component: {fileID: 2709726430321291128} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2602619569538988374 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6554288150578468794} + 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: 1113430802928872061} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8739320527228231907 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6554288150578468794} + m_CullTransparentMesh: 0 +--- !u!114 &2709726430321291128 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6554288150578468794} + 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.9647059, g: 0.88235295, b: 0.7137255, 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: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u9644\u8EAB\u4E2D" + LanguageIndex: 0 --- !u!1 &6555154253990894717 GameObject: m_ObjectHideFlags: 0 @@ -7786,6 +7867,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7229491252151889507} m_CullTransparentMesh: 0 +--- !u!1 &7254476337188559443 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1113430802928872061} + - component: {fileID: 1023102876278506098} + - component: {fileID: 2862265521947629467} + m_Layer: 5 + m_Name: imprint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1113430802928872061 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7254476337188559443} + 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: 2602619569538988374} + m_Father: {fileID: 8229610283058382897} + m_RootOrder: 6 + 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.1, y: -0.43} + m_SizeDelta: {x: 142.38, y: 143.14} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1023102876278506098 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7254476337188559443} + m_CullTransparentMesh: 0 +--- !u!114 &2862265521947629467 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7254476337188559443} + 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: 477ecd3af8f109449a1c3a27c5e8d047, 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 &7275972870704052744 GameObject: m_ObjectHideFlags: 0 @@ -8949,7 +9105,7 @@ MonoBehaviour: m_SelectOnDown: {fileID: 0} m_SelectOnLeft: {fileID: 0} m_SelectOnRight: {fileID: 0} - m_Transition: 1 + m_Transition: 0 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} diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua index b25bc70a26..2bf1198421 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_PracticeStatePreview.lua @@ -43,7 +43,7 @@ function PracticeStatePreview:OnShow(_parent,_args) self:SetSingleData(index,go,self.previewData[index]) end) ForceRebuildLayout(self.GameObject.transform) - self.ScrollView:SetIndex(PracticeManager.PracticeBigLevel - 1 > 0 and PracticeManager.PracticeBigLevel - 1 or 1) + self.ScrollView:SetIndex(PracticeManager.PracticeBigLevel > 0 and PracticeManager.PracticeBigLevel - 1 or 1) end function PracticeStatePreview:SetSingleData(index,_go,_data) @@ -88,9 +88,14 @@ function PracticeStatePreview:SetSingleData(index,_go,_data) num.text = string.format("%s",string2) end end - specialText.text = _data.RealmDesc - if _data.IsActive then - specialText.text = string.format("%s",_data.RealmDesc) + if _data.RealmDesc then + specialText.gameObject:SetActive(true) + specialText.text = _data.RealmDesc + if _data.IsActive then + specialText.text = string.format("%s",_data.RealmDesc) + end + else + specialText.gameObject:SetActive(false) end title.text = string.format("%s期",_data.RealmName) ForceRebuildLayout(_go.transform) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XiuXingSelectHero.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XiuXingSelectHero.lua index f3269bd62e..d16f7c281e 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XiuXingSelectHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XiuXingSelectHero.lua @@ -26,7 +26,8 @@ function this:InitComponent(gameObject) self.scrollView.moveTween.Strength = 2 self.heroList={} self.itemList = {} - self.maskList = {} + self.maskList = {}--对勾的list + self.maskImprintList = {}--附身中的list end function this:BindEvent() @@ -102,16 +103,31 @@ function this:ShowSingleData(go,heroData,index) Util.GetGameObject(go, "proIcon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName)) local starGrid = Util.GetGameObject(go, "star") local starPre = Util.GetGameObject(go, "starPre") + self.maskList[index] = Util.GetGameObject(go, "choosed") - -- LogGreen("data.UnlockId:"..tostring(data.UnlockId)) self.maskList[index]:SetActive(tostring(PracticeManager.ImprintServerData[data.Id].subId) == tostring(heroData.dynamicId)) + + self.maskImprintList[index] = {} + self.maskImprintList[index].heroDid = heroData.dynamicId + self.maskImprintList[index].obj = Util.GetGameObject(go, "imprint") + if self.maskList[index].activeInHierarchy then + self.maskImprintList[index].obj:SetActive(false) + else + self.maskImprintList[index].obj:SetActive(PracticeManager.CheckHeroHaveImprintAndActive(heroData.dynamicId)) + end + SetHeroStars(self.spLoader,starGrid, heroData.star) Util.AddOnceClick(go, function() - -- LogGreen("subId:"..tostring(PracticeManager.ImprintServerData[data.Id].subId).." did:"..tostring(heroData.dynamicId)) for i = 1, #self.maskList do self.maskList[i]:SetActive(false) end + for i = 1, #self.maskImprintList do + self.maskImprintList[i].obj:SetActive(PracticeManager.CheckHeroHaveImprintAndActive(self.maskImprintList[i].heroDid)) + end + if self.maskImprintList[index].obj.activeInHierarchy then + self.maskImprintList[index].obj:SetActive(false) + end self.maskList[index]:SetActive(true) self.heroD = heroData end) @@ -125,6 +141,7 @@ function this:OnClose() self.selectId = nil self.heroList={} self.maskList = {} + self.maskImprintList = {} end function this:OnDestroy() diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua index cbdedd7136..0b45bf6f58 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeImprintPanel.lua @@ -280,7 +280,8 @@ function PracticeImprint:Animation(num) trigger = false elseif num == 2 then--刷新界面 self.ImprintInfo:SetActive(true) - ScrollTrans.sizeDelta = self.sizeDelta[1] + ScrollTrans.sizeDelta = self.sizeDelta[2] + ImprintTrans.localPosition = endPos trigger = false elseif num == 3 then--关闭界面 self.ImprintInfo:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua index a8cb3756cf..29a23310e9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua @@ -141,11 +141,13 @@ end function this.GetPreViewData() local AddListData = this.GetAddsListWithOutTemplate() local previewList = {} - for i = 2, #AddListData do + for i = 1, #AddListData do local data = {} local configData = ConfigManager.GetConfigDataByKey(ConfigName.XiuXianConfig,"RealmId",i) data.RealmName = configData.RealmName - data.RealmDesc = configData.RealmDesc + if configData.RealmDesc then + data.RealmDesc = configData.RealmDesc + end data.IsActive = this.PracticeBigLevel >= i data.AddList = AddListData[i] table.insert(previewList,data) @@ -363,4 +365,16 @@ function this.PracticeCheckImprint() return false end +--检测英雄是否附身中并且神印已激活 +function this.CheckHeroHaveImprintAndActive(heroDid) + if this.HeroWithImprintList[heroDid] then + if this.ImprintServerData[this.HeroWithImprintList[heroDid]] then + if this.ImprintServerData[this.HeroWithImprintList[heroDid]].state == 1 then + return true + end + end + end + return false +end + return PracticeManager \ No newline at end of file