Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
abf8548cc9
File diff suppressed because it is too large
Load Diff
|
|
@ -1,35 +1,36 @@
|
||||||
require("Base/BasePanel")
|
require("Base/BasePanel")
|
||||||
DropGetSSRHeroShopPanel = Inherit(BasePanel)
|
DropGetSSRHeroShopPanel = Inherit(BasePanel)
|
||||||
local heroConfigData = ConfigManager.GetConfig(ConfigName.HeroConfig)
|
local heroConfigData = ConfigManager.GetConfig(ConfigName.HeroConfig)
|
||||||
|
local passiveSkillConfig=ConfigManager.GetConfig(ConfigName.PassiveSkillConfig)
|
||||||
|
local passiveSkillLogicConfig=ConfigManager.GetConfig(ConfigName.PassiveSkillLogicConfig)
|
||||||
|
local heroRankupConfig=ConfigManager.GetConfig(ConfigName.HeroRankupConfig)
|
||||||
local heroBackData = {}
|
local heroBackData = {}
|
||||||
local callBack
|
local callBack
|
||||||
local orginLayer
|
local orginLayer
|
||||||
--初始化组件(用于子类重写)
|
--初始化组件(用于子类重写)
|
||||||
function DropGetSSRHeroShopPanel:InitComponent()
|
function DropGetSSRHeroShopPanel:InitComponent()
|
||||||
self.spLoader = SpriteLoader.New()
|
self.spLoader = SpriteLoader.New()
|
||||||
|
|
||||||
orginLayer = 0
|
orginLayer = 0
|
||||||
self.live2dRoot = Util.GetGameObject(self.gameObject, "live2dRoot")
|
self.live2dRoot = Util.GetGameObject(self.gameObject, "live2dRoot")
|
||||||
self.bg = Util.GetGameObject(self.gameObject, "bg")
|
self.bg = Util.GetGameObject(self.gameObject, "bg")
|
||||||
self.bg2 = Util.GetGameObject(self.gameObject, "bg2")
|
self.bg2 = Util.GetGameObject(self.gameObject, "bg2")
|
||||||
screenAdapte(self.bg2)
|
screenAdapte(self.bg2)
|
||||||
self.heroName = Util.GetGameObject(self.transform, "rolePanel/rolePanel1/nameAndPossLayout/heroName"):GetComponent("Text")
|
|
||||||
--self.profession = Util.GetGameObject(self.transform, "rolePanel/rolePanel1/nameAndPossLayout/posImage/posImage/posImage"):GetComponent("Image")
|
|
||||||
Util.GetGameObject(self.transform, "rolePanel/rolePanel1/nameAndPossLayout/posImage"):SetActive(false)
|
|
||||||
self.proImage = Util.GetGameObject(self.transform, "rolePanel/rolePanel1/nameAndPossLayout/proImage/proImage"):GetComponent("Image")
|
|
||||||
self.starGrid = Util.GetGameObject(self.transform, "rolePanel/rolePanel1/sartAndLvLayout")
|
|
||||||
self.sureBtn = Util.GetGameObject(self.transform, "sureBtn")
|
self.sureBtn = Util.GetGameObject(self.transform, "sureBtn")
|
||||||
--self.dragView = SubUIManager.Open(SubUIConfig.DragView, self.gameObject.transform)
|
|
||||||
--self.dragView.transform:SetSiblingIndex(1)
|
|
||||||
self.UI_Effect_chouka = Util.GetGameObject(self.transform, "bg/UI_Effect_chouka")
|
self.UI_Effect_chouka = Util.GetGameObject(self.transform, "bg/UI_Effect_chouka")
|
||||||
--self.quality=Util.GetGameObject(self.transform,"rolePanel/rolePanel1/nameAndPossLayout/quality/quality"):GetComponent("Image")
|
|
||||||
--self.qualityImage=Util.GetGameObject(self.transform,"quality"):GetComponent("Image")
|
|
||||||
--self.quality=Util.GetGameObject(self.transform,"quality/qualityText")
|
self.sureBtn = Util.GetGameObject(self.transform, "sureBtn")
|
||||||
Util.GetGameObject(self.transform,"quality"):SetActive(false)
|
self.rolePanel = Util.GetGameObject(self.transform, "rolePanel")
|
||||||
self.doubleQuality=Util.GetGameObject(self.transform,"quality/qualityDoubleText")
|
self.heroName = Util.GetGameObject(self.transform, "rolePanel/Panel/name/heroName"):GetComponent("Text")
|
||||||
self.posImage=Util.GetGameObject(self.transform,"Pos/PosImage"):GetComponent("Image")
|
self.proImage = Util.GetGameObject(self.transform, "rolePanel/Panel/name/proImage/proImage/proImage"):GetComponent("Image")
|
||||||
self.pos = Util.GetGameObject(self.transform,"Pos")
|
self.starGrid = Util.GetGameObject(self.transform, "rolePanel/Panel/star")
|
||||||
self.posText=Util.GetGameObject(self.pos ,"PosText"):GetComponent("Text")
|
self.posImage=Util.GetGameObject(self.transform,"rolePanel/Pos/PosImage"):GetComponent("Image")
|
||||||
|
self.posText=Util.GetGameObject(self.transform,"rolePanel/Pos/PosText"):GetComponent("Text")
|
||||||
|
self.info=Util.GetGameObject(self.gameObject,"rolePanel/Panel/Info")
|
||||||
|
self.infoTitleBg=Util.GetGameObject(self.info,"TitleBg")
|
||||||
|
self.infoTitle=Util.GetGameObject(self.infoTitleBg,"Title"):GetComponent("Text")
|
||||||
|
self.infoBody=Util.GetGameObject(self.info,"BodyBg/Viewport/Body"):GetComponent("Text")
|
||||||
|
self.infoBodyGo=Util.GetGameObject(self.info,"BodyBg")
|
||||||
end
|
end
|
||||||
|
|
||||||
--绑定事件(用于子类重写)
|
--绑定事件(用于子类重写)
|
||||||
|
|
@ -38,13 +39,6 @@ function DropGetSSRHeroShopPanel:BindEvent()
|
||||||
Util.AddClick(self.sureBtn, function()
|
Util.AddClick(self.sureBtn, function()
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
end)
|
end)
|
||||||
--Util.AddClick(this.dragView.gameObject, function ()
|
|
||||||
-- local testLive= Util.GetGameObject(this.live2dRoot, "testLive")
|
|
||||||
-- if testLive then
|
|
||||||
-- local SkeletonGraphic = testLive:GetComponent("SkeletonGraphic")
|
|
||||||
-- SkeletonGraphic.AnimationState:SetAnimation(0, "touch", false)
|
|
||||||
-- end
|
|
||||||
--end)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
--添加事件监听(用于子类重写)
|
--添加事件监听(用于子类重写)
|
||||||
|
|
@ -67,10 +61,9 @@ function DropGetSSRHeroShopPanel:OnOpen(_heroBackData,func)
|
||||||
end
|
end
|
||||||
|
|
||||||
function DropGetSSRHeroShopPanel:OnSortingOrderChange()
|
function DropGetSSRHeroShopPanel:OnSortingOrderChange()
|
||||||
|
|
||||||
Util.AddParticleSortLayer(self.bg, self.sortingOrder - orginLayer)
|
Util.AddParticleSortLayer(self.bg, self.sortingOrder - orginLayer)
|
||||||
self.live2dRoot:GetComponent("Canvas").sortingOrder = self.sortingOrder + 10
|
self.live2dRoot:GetComponent("Canvas").sortingOrder = self.sortingOrder + 10
|
||||||
Util.GetGameObject(self.transform,"Pos"):GetComponent("Canvas").sortingOrder = self.sortingOrder + 20
|
self.rolePanel:GetComponent("Canvas").sortingOrder = self.sortingOrder + 100
|
||||||
orginLayer = self.sortingOrder
|
orginLayer = self.sortingOrder
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -90,21 +83,62 @@ function DropGetSSRHeroShopPanel:OnShow()
|
||||||
SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete - idle
|
SkeletonGraphic.AnimationState.Complete = SkeletonGraphic.AnimationState.Complete - idle
|
||||||
end)
|
end)
|
||||||
|
|
||||||
--self.dragView:SetDragGO(testLiveGO)
|
self.infoTitle.text=GetLanguageStrById(heroStaticData.HeroLocationDesc1)
|
||||||
|
SetHeroStars(self.spLoader, self.starGrid, heroStaticData.Star,1,Vector2.New(52,52),-2,Vector2.New(0.5,0.5))
|
||||||
|
-- self.profession.sprite = self.spLoader:LoadSprite(GetJobSpriteStrByJobNum(heroStaticData.Profession))
|
||||||
|
self.proImage.sprite =self.spLoader:LoadSprite(GetProStrImageByProNum(heroStaticData.PropertyName))
|
||||||
|
self.heroName.text =GetLanguageStrById(heroStaticData.ReadingName) --string.format("lv.%s", heroData.lv)
|
||||||
|
Util.GetGameObject(self.transform,"Pos"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetHeroPosBgStr(heroStaticData.Profession))
|
||||||
self.posImage.sprite=self.spLoader:LoadSprite(GetHeroPosStr(heroStaticData.Profession))
|
self.posImage.sprite=self.spLoader:LoadSprite(GetHeroPosStr(heroStaticData.Profession))
|
||||||
self.posText.text=GetLanguageStrById(heroStaticData.HeroLocation)
|
self.posText.text=GetLanguageStrById(heroStaticData.HeroLocation)
|
||||||
SetTextVerTial(self.posText.transform,Vector3.New(67.01,0.3,0),"MiddleLeft")
|
SetTextVerTial(self.posText.gameObject,Vector3.New(63.76,1.5,0),"MiddleLeft")
|
||||||
local starSize = Vector2.New(60,60)
|
--指定星级开启info
|
||||||
SetHeroStars(self.spLoader, self.starGrid, heroBackData.star,2,starSize,-10,Vector2.New(0.5,0.5))
|
self.info:SetActive(heroStaticData.Star == 5 or heroStaticData.Star == 4)
|
||||||
--self.profession.sprite = self.spLoader:LoadSprite(GetJobSpriteStrByJobNum(heroStaticData.Profession))
|
self.infoBodyGo:SetActive(heroStaticData.Star == 5)
|
||||||
self.proImage.sprite =self.spLoader:LoadSprite(GetProStrImageByProNum(heroStaticData.PropertyName))
|
self.infoTitle.text=GetLanguageStrById(heroStaticData.HeroLocationDesc1)
|
||||||
self.heroName.text =GetLanguageStrById(heroStaticData.ReadingName)
|
if heroStaticData.Star == 5 then
|
||||||
--self.quality.sprite=self.spLoader:LoadSprite(GetQualityIconByQualityNumer(heroStaticData.Natural))
|
local t={}
|
||||||
--self.qualityImage.sprite=GetQuantityImage(self.spLoader, heroStaticData.Natural)
|
local upStarSkillDataList={} --数据容器
|
||||||
--self.quality:SetActive(heroStaticData.Natural < 10)
|
--获取几星激活数据
|
||||||
--self.doubleQuality:SetActive(heroStaticData.Natural >= 10)
|
for i = 1, #heroStaticData.OpenPassiveSkillRules do
|
||||||
--self.quality:GetComponent("Text").text = heroStaticData.Natural
|
if heroStaticData.OpenPassiveSkillRules[i][1] == 2 then
|
||||||
--self.doubleQuality:GetComponent("Text").text = heroStaticData.Natural
|
local passiveSkillConfig = passiveSkillConfig[heroStaticData.OpenPassiveSkillRules[i][3]]
|
||||||
|
if passiveSkillConfig and passiveSkillLogicConfig[passiveSkillConfig.Id].Judge == 1 and string.len(passiveSkillConfig.Desc) > 1 then
|
||||||
|
local d = {}
|
||||||
|
d.passiveSkillConfig = passiveSkillConfig
|
||||||
|
d.OpenPassiveSkillRules = heroStaticData.OpenPassiveSkillRules[i]
|
||||||
|
d.titleStr = "<size=34><color=#5AC383>"..NumToSimplenessFont[heroRankupConfig[heroStaticData.OpenPassiveSkillRules[i][2]].Phase[2]] .. Language[11718]
|
||||||
|
table.insert(upStarSkillDataList,d)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
--数据插入t
|
||||||
|
for j = 1, #upStarSkillDataList do
|
||||||
|
if passiveSkillLogicConfig[upStarSkillDataList[j].passiveSkillConfig.Id].Judge == 1 then
|
||||||
|
table.insert(t,upStarSkillDataList[j].titleStr..GetLanguageStrById(upStarSkillDataList[j].passiveSkillConfig.Desc).."\n")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
--获取法宝数据
|
||||||
|
local dTalis = ConfigManager.GetConfigData(ConfigName.HeroConfig,heroStaticData.Id).EquipTalismana--当前法宝数据 data[1]星级 data[2]法宝ID
|
||||||
|
local dowerAllData= ConfigManager.GetAllConfigsDataByKey(ConfigName.EquipTalismana,"TalismanaId",dTalis[2])--当前法宝全部天赋数据(天赋可能为空)
|
||||||
|
local dowerData={}--当前法宝全部技能数据(天赋不为空)
|
||||||
|
for k=1,#dowerAllData do
|
||||||
|
if dowerAllData[k].OpenSkillRules then
|
||||||
|
table.insert(dowerData, dowerAllData[k])
|
||||||
|
end
|
||||||
|
end
|
||||||
|
--数据插入t,保证在星数据后
|
||||||
|
for n=1,#dowerData do
|
||||||
|
if dowerData[n].Level==25 then
|
||||||
|
table.insert(t,Language[11719]..GetLanguageStrById(passiveSkillConfig[dowerData[n].OpenSkillRules[1]].Desc).."\n")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
local s=table.concat(t)--将表里字符串拼接
|
||||||
|
--看这下面 是全角空格哦~
|
||||||
|
self.infoBody.text=string.sub(s,1,-2)--去除最后\n
|
||||||
|
end
|
||||||
|
|
||||||
PlayUIAnim(self.transform)
|
PlayUIAnim(self.transform)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -122,7 +156,6 @@ end
|
||||||
--界面销毁时调用(用于子类重写)
|
--界面销毁时调用(用于子类重写)
|
||||||
function DropGetSSRHeroShopPanel:OnDestroy()
|
function DropGetSSRHeroShopPanel:OnDestroy()
|
||||||
self.spLoader:Destroy()
|
self.spLoader:Destroy()
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
return DropGetSSRHeroShopPanel
|
return DropGetSSRHeroShopPanel
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue