Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2022-02-21 18:37:18 +08:00
commit 1905b3c175
6 changed files with 55 additions and 26 deletions

View File

@ -546,7 +546,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1700717659683241118}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
@ -764,6 +764,7 @@ RectTransform:
m_Children:
- {fileID: 3821167780554179188}
- {fileID: 6991887406947613301}
- {fileID: 7113522986544161244}
- {fileID: 6299137775443855104}
- {fileID: 5703870284674408078}
- {fileID: 3494299099718931292}
@ -1414,7 +1415,6 @@ RectTransform:
- {fileID: 1711363629007474723}
- {fileID: 4238880091648937923}
- {fileID: 7153099400467144522}
- {fileID: 7113522986544161244}
m_Father: {fileID: 1700717659683241118}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1648,12 +1648,12 @@ RectTransform:
- {fileID: 121086063726210905}
- {fileID: 4356974947603394339}
m_Father: {fileID: 1700717659683241118}
m_RootOrder: 3
m_RootOrder: 4
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: -1108, y: -49}
m_SizeDelta: {x: 900, y: 140}
m_SizeDelta: {x: 1000, y: 140}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &3257478417192666744
GameObject:
@ -1905,12 +1905,12 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 8470557795340520745}
m_Father: {fileID: 3821167780554179188}
m_RootOrder: 9
m_Father: {fileID: 1700717659683241118}
m_RootOrder: 2
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: -274, y: 802}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 204, y: -126}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1926422399288210892
@ -2000,7 +2000,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1700717659683241118}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
@ -2212,7 +2212,7 @@ RectTransform:
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: -545}
m_AnchoredPosition: {x: 0, y: -624}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &122424317090520997
@ -2894,7 +2894,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1700717659683241118}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -3204,7 +3204,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -379.74002}
m_SizeDelta: {x: 912.8, y: 859.52}
m_SizeDelta: {x: 1000, y: 859.52}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8384265009896266693
CanvasRenderer:
@ -3276,12 +3276,12 @@ RectTransform:
- {fileID: 9217716073908009951}
- {fileID: 2786481321683172066}
m_Father: {fileID: 1700717659683241118}
m_RootOrder: 4
m_RootOrder: 5
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: -1108, y: -272}
m_SizeDelta: {x: 900, y: 140}
m_SizeDelta: {x: 1000, y: 140}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &7075936682646143345
GameObject:
@ -3392,7 +3392,7 @@ RectTransform:
- {fileID: 264047954469941067}
- {fileID: 4900932309319581792}
m_Father: {fileID: 1700717659683241118}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
@ -3656,7 +3656,7 @@ RectTransform:
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: 369, y: 37}
m_AnchoredPosition: {x: 417, y: 27}
m_SizeDelta: {x: 186, y: 86}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5006147964805573017
@ -3852,7 +3852,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &8113595644961861806
RectTransform:
m_ObjectHideFlags: 0

View File

@ -573,6 +573,23 @@ function GetPassiveByMaxStar(heroConfig,list)
return aaa
end
function GetPassiveByMaxStar2(heroConfig,list,star)
--local OpenPassiveSkillRules = list
local heroRankUp=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.HeroRankupConfig,"Type",2,"OpenStar",star)
if not heroRankUp then
list=heroConfig.OpenPassiveSkillRules
end
local aaa={}
if list then
for i = 1,#list do
if list[i][2]<=heroRankUp.Id then
table.insert(aaa,list[i])
end
end
end
return aaa
end
--把英雄星级父对象和星级传过来 type 1 第6-11个预设 type 2 第12-17个预设 type 3 第18-24个预设
function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rotation)

View File

@ -76,7 +76,16 @@ function this.OnClickTabBtn(_proId)
local _curData={}
for key, value in pairs(curData) do --只显示在编队中的数据
if value.IsShowInTeam==1 then
table.insert(_curData,value)
local isHeroOpen = true
for i = 1, 6 do
local heroId=value.HeroList[i]
if not HeroManager.InVersion(heroId) then
isHeroOpen = false
end
end
if isHeroOpen then
table.insert(_curData,value)
end
end
end
table.sort(_curData,function(a,b) return a.Sort<b.Sort end)

View File

@ -508,7 +508,7 @@ function this.GetCanUseHeroDatas()
this.canUseHeroDatas = {}
end
for k,v in pairs(this.heroDataLists) do
if PlayerManager.GetHeroDataByStar(0,v.id) then
if PlayerManager.GetHeroDataByStar(0,v.id) and HeroManager.InVersion(v.id) then
if this.canUseHeroDatas[v.dynamicId] then
if this.allHeroBlood[v.dynamicId] and this.allHeroBlood[v.dynamicId].percentHp <= 0 then
this.canUseHeroDatas[v.dynamicId] = nil

View File

@ -3,7 +3,7 @@ local PowerRice = Inherit(BasePanel)
local globalActConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity)
local this = PowerRice
local STATE = {
[0] = {Img = "s_slbz_1anniuhuangse",text = Language[11948]},
[0] = {Img = "s_slbz_1anniuhuangse",text = Language[10556]},
[1] = {Img = "s_slbz_1anniuongse",text = Language[11948]},
[2] = {Img = "s_slbz_1anniuhuise",text = Language[10101]},
}
@ -27,7 +27,7 @@ function PowerRice:InitComponent()
self.leftTime = Util.GetGameObject(self.gameObject,"bg/timeBg/LeftTime"):GetComponent("Text")
self.text1 = Util.GetGameObject(self.gameObject,"bg/tiao/Text1"):GetComponent("Text")
self.text2 = Util.GetGameObject(self.gameObject,"bg/tiao/Text4"):GetComponent("Text")
self.power = Util.GetGameObject(self.gameObject,"bg/power"):GetComponent("Text")
self.power = Util.GetGameObject(self.gameObject,"power"):GetComponent("Text")
self.grid = Util.GetGameObject(self.gameObject,"bg/ren")
self.Scroll = Util.GetGameObject(self.gameObject,"Scroll")
@ -104,7 +104,7 @@ end
function this.SwitchView(index)
--先执行上一面板关闭逻辑
curIndex = index
this:OnShow()
PowerRice:Refresh(curIndex,true,true)
end
--界面打开时调用(用于子类重写)
@ -113,7 +113,11 @@ end
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
function PowerRice:OnShow()
curIndex = 1
PowerRice:Refresh(curIndex,true,true)
if this.TabCtrl then
this.TabCtrl:ChangeTab(curIndex)
end
end
function PowerRice:Refresh(_curIndex,isTop,isAni)
@ -145,7 +149,7 @@ end
function PowerRice:SetLive2D()
--设置立绘
if not self.Live then
self.Live = poolManager:LoadLive("live2d_h_puti", self.grid.transform, Vector3.one*0.8, Vector2.zero)
self.Live = poolManager:LoadLive("live2d_h_puti", self.grid.transform, Vector3.one*0.9, Vector2.zero)
self.Live:GetComponent("SkeletonGraphic").AnimationState:SetAnimation(0, "idle", true)
end
end
@ -217,7 +221,6 @@ function PowerRice:SingleDataShow2(item,data,index)
local reward = Util.GetGameObject(item,"reward")
local sort4Text = Util.GetGameObject(sortNumTabs[4],"TitleText"):GetComponent("Text")
local mark = Util.GetGameObject(item,"mark")
LogGreen("self.myRank:"..tostring(self.myRank))
mark:SetActive(self.myRank > 0 and self.myRank >= data.MinRank and self.myRank <= data.MaxRank)
if data.MinRank == data.MaxRank then

View File

@ -100,7 +100,7 @@ function this.GetNewTalentDataShow()
local upStarSkillDataList = {}
if heroConfig.Awaken then
local Awaken=heroConfig.Awaken
Awaken=GetPassiveByMaxStar(heroConfig,heroConfig.Awaken)
Awaken=GetPassiveByMaxStar2(heroConfig,heroConfig.Awaken,11)
for i = 1, #Awaken do
local Desc = GetLanguageStrById(passiveSkillConfig[Awaken[i][3]].Desc)
if heroConfig.Awaken[i][1] == 1 then--突破