【修行】排行榜界面,神将界面、神将替换提示调整

dev_chengFeng
ZhangBiao 2021-05-25 11:54:19 +08:00
parent e3a45d34b5
commit 41152acae9
6 changed files with 102 additions and 12 deletions

View File

@ -75436,7 +75436,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: -159, y: 784} m_AnchoredPosition: {x: -159, y: 784}
m_SizeDelta: {x: 110, y: 110} m_SizeDelta: {x: 160, y: 160}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6108220804671371360 --- !u!222 &6108220804671371360
CanvasRenderer: CanvasRenderer:
@ -75459,14 +75459,14 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.35686275} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_OnCullStateChanged: m_OnCullStateChanged:
m_PersistentCalls: m_PersistentCalls:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: c250d38548859854aac89d61f4f367cc, type: 3} m_Sprite: {fileID: 21300000, guid: 96ef5aeb52451da4a8b1240073551192, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -151046,10 +151046,10 @@ RectTransform:
m_Father: {fileID: 9211033836197355870} m_Father: {fileID: 9211033836197355870}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0} m_SizeDelta: {x: 110, y: 110}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1128472642294734133 --- !u!222 &1128472642294734133
CanvasRenderer: CanvasRenderer:
@ -193652,7 +193652,7 @@ MonoBehaviour:
m_ChildAlignment: 4 m_ChildAlignment: 4
m_StartCorner: 0 m_StartCorner: 0
m_StartAxis: 0 m_StartAxis: 0
m_CellSize: {x: 110, y: 110} m_CellSize: {x: 160, y: 160}
m_Spacing: {x: 20, y: 10} m_Spacing: {x: 20, y: 10}
m_Constraint: 1 m_Constraint: 1
m_ConstraintCount: 5 m_ConstraintCount: 5

View File

@ -58141,7 +58141,8 @@ RectTransform:
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_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children:
- {fileID: 8308562341742117573}
m_Father: {fileID: 224287801546099592} m_Father: {fileID: 224287801546099592}
m_RootOrder: 14 m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -58178,7 +58179,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: db6fe3e950012f644b3aaf02debee77a, type: 3} m_Sprite: {fileID: 21300000, guid: 96ef5aeb52451da4a8b1240073551192, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
@ -58322,6 +58323,80 @@ MonoBehaviour:
m_FillClockwise: 1 m_FillClockwise: 1
m_FillOrigin: 0 m_FillOrigin: 0
m_UseSpriteMesh: 0 m_UseSpriteMesh: 0
--- !u!1 &7329170089680179907
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8308562341742117573}
- component: {fileID: 851387821969506053}
- component: {fileID: 779037124076647829}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8308562341742117573
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7329170089680179907}
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: 4393913951047476588}
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: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &851387821969506053
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7329170089680179907}
m_CullTransparentMesh: 0
--- !u!114 &779037124076647829
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7329170089680179907}
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: 0}
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 &7520633059228445478 --- !u!1 &7520633059228445478
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -65,7 +65,7 @@ function this:OnShow(_parent,...)
local _args = {...} local _args = {...}
data = _args[1] data = _args[1]
func = _args[2] func = _args[2]
self.heroList = HeroManager.GetHeroDataByPropertyAndProfession(data.FitList[1],data.FitList[2],5) self.heroList = HeroManager.GetHeroDataByPropertyAndProfession(data.FitList[1],data.FitList[2],1)
table.sort(self.heroList,function (a,b) table.sort(self.heroList,function (a,b)
return a.warPower > b.warPower return a.warPower > b.warPower
end) end)

View File

@ -52,7 +52,7 @@ local this = GMPanel
local equipeList = { local equipeList = {
"1#60159#1", "1#60184#1", "1#60194#1", "1#60199#1" "1#60159#1", "1#60184#1", "1#60194#1", "1#60199#1"
} }
local moneyList = {"1#3#99999999", "1#4#99999999", "1#5#99999999", "1#14#99999999", "1#15#99999999", "1#16#99999999"} local moneyList = {"1#3#99999999", "1#4#99999999", "1#5#99999999", "1#14#999999999", "1#15#99999999", "1#16#99999999","1#1226#99999999"}
--初始化组件(用于子类重写) --初始化组件(用于子类重写)
function GMPanel:InitComponent() function GMPanel:InitComponent()
this.spLoader = SpriteLoader.New() this.spLoader = SpriteLoader.New()

View File

@ -3,6 +3,7 @@ local orginLayer
local curImprintData={} local curImprintData={}
local trigger = true local trigger = true
local curNum = 0 local curNum = 0
local curhero = ""
function PracticeImprint:InitComponent() function PracticeImprint:InitComponent()
self.spLoader = SpriteLoader.New() self.spLoader = SpriteLoader.New()
@ -136,6 +137,9 @@ function PracticeImprint:SetSingleImprint(_go,_imprintId)
end end
if serverData.subId ~= nil and serverData.subId ~= "" and serverData.subId ~= "nil" then if serverData.subId ~= nil and serverData.subId ~= "" and serverData.subId ~= "nil" then
heroImg.sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(HeroManager.GetSingleHeroData(tostring(serverData.subId)).id)) heroImg.sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(HeroManager.GetSingleHeroData(tostring(serverData.subId)).id))
curhero = tostring(serverData.subId)
else
curhero = ""
end end
end end
icon.sprite = self.spLoader:LoadSprite(GetResourcePath(configData.Icon)) icon.sprite = self.spLoader:LoadSprite(GetResourcePath(configData.Icon))
@ -204,6 +208,7 @@ function PracticeImprint:ShowSingleImprintInfoLayout(_serverData,_configData)
end end
NetManager.PracticeImprintRequest(old,new,tostring(sub),function () NetManager.PracticeImprintRequest(old,new,tostring(sub),function ()
self:Refresh(true,true,function () self:Refresh(true,true,function ()
curhero = tostring(sub)
self:Animation(2) self:Animation(2)
self:ShowSingleImprintInfoLayout(PracticeManager.GetSingleImprintData(new)) self:ShowSingleImprintInfoLayout(PracticeManager.GetSingleImprintData(new))
end) end)
@ -234,6 +239,9 @@ function PracticeImprint:ShowSingleImprintInfoLayout(_serverData,_configData)
lv.text = heroData.lv lv.text = heroData.lv
proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName)) proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName))
SetHeroStars(self.spLoader,starGrid, heroData.star) SetHeroStars(self.spLoader,starGrid, heroData.star)
curhero = _serverData.subId
else
curhero = ""
end end
Util.AddOnceClick(self.MaskBtn,function() Util.AddOnceClick(self.MaskBtn,function()
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.XiuXingSelectHero,_configData,function (_heroData) UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.XiuXingSelectHero,_configData,function (_heroData)
@ -244,8 +252,12 @@ function PracticeImprint:ShowSingleImprintInfoLayout(_serverData,_configData)
lv.text = _heroData.lv lv.text = _heroData.lv
proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(_heroData.heroConfig.PropertyName)) proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(_heroData.heroConfig.PropertyName))
SetHeroStars(self.spLoader,starGrid, _heroData.star) SetHeroStars(self.spLoader,starGrid, _heroData.star)
if curhero ~= _heroData.dynamicId and curhero ~= nil and curhero ~= "" and curhero ~= "nil" then
PopupTipPanel.ShowTip("已替换附身神将!")
end
--刷新 --刷新
self:Refresh(true,true,function () self:Refresh(true,true,function ()
curhero = _heroData.dynamicId
self:Animation(2) self:Animation(2)
self:ShowSingleImprintInfoLayout(PracticeManager.GetSingleImprintData(_configData.Id)) self:ShowSingleImprintInfoLayout(PracticeManager.GetSingleImprintData(_configData.Id))
end) end)
@ -290,11 +302,13 @@ function PracticeImprint:Animation(num)
ScrollTrans.sizeDelta = self.sizeDelta[1] ScrollTrans.sizeDelta = self.sizeDelta[1]
ImprintTrans.localPosition = initPos ImprintTrans.localPosition = initPos
trigger = true trigger = true
curhero = ""
end end
end end
function PracticeImprint:OnClose() function PracticeImprint:OnClose()
curhero = ""
if self.tween1 then if self.tween1 then
self.tween1:Kill() self.tween1:Kill()
end end

View File

@ -93,6 +93,7 @@ function RoleInfoPanel:InitComponent()
this.talentTipStrGo=Util.GetGameObject(self.transform,"talentBtn/tipStr") this.talentTipStrGo=Util.GetGameObject(self.transform,"talentBtn/tipStr")
--神印 --神印
this.imprintBtn=Util.GetGameObject(self.transform,"imprintBtn") this.imprintBtn=Util.GetGameObject(self.transform,"imprintBtn")
this.imprintImg=Util.GetGameObject(self.transform,"imprintBtn/Image"):GetComponent("Image")
this.force = Util.GetGameObject(self.transform, "powerBtn/value"):GetComponent("Text") this.force = Util.GetGameObject(self.transform, "powerBtn/value"):GetComponent("Text")
Util.GetGameObject(self.transform, "powerBtn"):GetComponent("Image").sprite = this.spLoader:LoadSprite("t_tongyong-zhanli_zh") Util.GetGameObject(self.transform, "powerBtn"):GetComponent("Image").sprite = this.spLoader:LoadSprite("t_tongyong-zhanli_zh")
@ -623,7 +624,7 @@ function this:UpdateHeroInfoData()
local imprintId = PracticeManager.CheckHeroWearImprint(curHeroData.dynamicId) local imprintId = PracticeManager.CheckHeroWearImprint(curHeroData.dynamicId)
if imprintId then if imprintId then
this.imprintBtn:SetActive(true) this.imprintBtn:SetActive(true)
this.imprintBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetResourcePath(XiuXianSkillConfig[imprintId].Icon)) this.imprintImg.sprite = this.spLoader:LoadSprite(GetResourcePath(XiuXianSkillConfig[imprintId].Icon))
Util.AddOnceClick(this.imprintBtn,function () Util.AddOnceClick(this.imprintBtn,function ()
UIManager.OpenPanel(UIName.GeneralInfoPopup,GENERALINFO_TYPE.Imprint,imprintId,curHeroData.id) UIManager.OpenPanel(UIName.GeneralInfoPopup,GENERALINFO_TYPE.Imprint,imprintId,curHeroData.id)
end) end)