Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
6391c6ea97
|
@ -6,7 +6,7 @@ AnimatorController:
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: longani 1
|
m_Name: longani 1_anim
|
||||||
serializedVersion: 5
|
serializedVersion: 5
|
||||||
m_AnimatorParameters: []
|
m_AnimatorParameters: []
|
||||||
m_AnimatorLayers:
|
m_AnimatorLayers:
|
||||||
|
|
|
@ -6,7 +6,7 @@ AnimationClip:
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: longani 1
|
m_Name: longani 1_ctrl
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Legacy: 0
|
m_Legacy: 0
|
||||||
m_Compressed: 0
|
m_Compressed: 0
|
||||||
|
|
|
@ -6,7 +6,7 @@ AnimationClip:
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: longani
|
m_Name: longani_anim
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Legacy: 0
|
m_Legacy: 0
|
||||||
m_Compressed: 0
|
m_Compressed: 0
|
||||||
|
|
|
@ -6,7 +6,7 @@ AnimatorController:
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: longani
|
m_Name: longani_ctrl
|
||||||
serializedVersion: 5
|
serializedVersion: 5
|
||||||
m_AnimatorParameters: []
|
m_AnimatorParameters: []
|
||||||
m_AnimatorLayers:
|
m_AnimatorLayers:
|
||||||
|
|
|
@ -6,7 +6,7 @@ AnimatorController:
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: longaniduan
|
m_Name: longaniduan_ctrl
|
||||||
serializedVersion: 5
|
serializedVersion: 5
|
||||||
m_AnimatorParameters: []
|
m_AnimatorParameters: []
|
||||||
m_AnimatorLayers:
|
m_AnimatorLayers:
|
||||||
|
|
|
@ -7,7 +7,7 @@ Material:
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_Name: dajin_effect_12
|
m_Name: dajin_effect_12_1
|
||||||
m_Shader: {fileID: 4800000, guid: 492429f7579297341bd1ff6e4ff530d7, type: 3}
|
m_Shader: {fileID: 4800000, guid: 492429f7579297341bd1ff6e4ff530d7, type: 3}
|
||||||
m_ShaderKeywords:
|
m_ShaderKeywords:
|
||||||
m_LightmapFlags: 4
|
m_LightmapFlags: 4
|
||||||
|
|
|
@ -4254,4 +4254,34 @@ function this.CalculatePvpBonusForShow(data)
|
||||||
return data
|
return data
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- 判断英雄是否进入版本
|
||||||
|
function this.InVersion(heroTid)
|
||||||
|
if not heroTid then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
local con = heroConfig[heroTid]
|
||||||
|
if not con or not con.Version then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
local serverOpenTime = PlayerManager.GetServerOpenTime()
|
||||||
|
local openDay = math.max(0, GetTimeStamp() - serverOpenTime)/(60*60*24)--当前是开服第几天
|
||||||
|
if openDay >= con.Version then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
-- 英雄碎片id转英雄id
|
||||||
|
function this.ChipIdToHeroId(chipId)
|
||||||
|
local item = itemConfig[chipId]
|
||||||
|
if not item then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
local reward = rewardGroup[item.RewardGroup[1]]
|
||||||
|
if not reward or not reward.ShowItem or not reward.ShowItem[1] then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
local heroId = reward.ShowItem[1][1]
|
||||||
|
return heroId
|
||||||
|
end
|
||||||
|
|
||||||
return this
|
return this
|
|
@ -84,6 +84,7 @@ end
|
||||||
--第一个参数是否是英雄或元素
|
--第一个参数是否是英雄或元素
|
||||||
--第二个参数是否显示tab 如果没有,则显示,如果有,则根据第二个参数
|
--第二个参数是否显示tab 如果没有,则显示,如果有,则根据第二个参数
|
||||||
function HeroPreviewPanel:OnOpen(...)
|
function HeroPreviewPanel:OnOpen(...)
|
||||||
|
this.AllWeightTemp = {}
|
||||||
this.heroGrid.transform.anchoredPosition = Vector2.New(0,0)
|
this.heroGrid.transform.anchoredPosition = Vector2.New(0,0)
|
||||||
this.elementGrid.transform.anchoredPosition = Vector2.New(0,0)
|
this.elementGrid.transform.anchoredPosition = Vector2.New(0,0)
|
||||||
local temp={...}
|
local temp={...}
|
||||||
|
@ -107,23 +108,27 @@ function HeroPreviewPanel:OnOpen(...)
|
||||||
if RecruitManager.isFirstEnterElementScroll then --元素
|
if RecruitManager.isFirstEnterElementScroll then --元素
|
||||||
RecruitManager.isFirstEnterElementScroll=false
|
RecruitManager.isFirstEnterElementScroll=false
|
||||||
for i,v in pairs(RecruitManager.previewElementData) do
|
for i,v in pairs(RecruitManager.previewElementData) do
|
||||||
Log(v.Pool)
|
local chipId = v.Reward[1]
|
||||||
if(v.Pool==11) then
|
local heroId = HeroManager.ChipIdToHeroId(chipId)
|
||||||
local view = SubUIManager.Open(SubUIConfig.ItemView,this.waterGrid.transform)
|
if not heroId or HeroManager.InVersion(heroId) then
|
||||||
view:OnOpen(false, {v.Reward[1], v.Reward[2] },1.1,true)
|
local allWeight = this.GetAllWeight(v.Pool)
|
||||||
view.name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f",(v.WeightShow/100000)*100) .."%</color>"
|
if(v.Pool==11) then
|
||||||
elseif(v.Pool==12) then
|
local view = SubUIManager.Open(SubUIConfig.ItemView,this.waterGrid.transform)
|
||||||
local view = SubUIManager.Open(SubUIConfig.ItemView,this.fireGrid.transform)
|
view:OnOpen(false, {v.Reward[1], v.Reward[2] },1.1,true)
|
||||||
view:OnOpen(false, {v.Reward[1], v.Reward[2] },1.1,true)
|
view.name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f",(v.WeightShow/allWeight)*100) .."%</color>"
|
||||||
view.name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f",(v.WeightShow/100000)*100) .."%</color>"
|
elseif(v.Pool==12) then
|
||||||
elseif(v.Pool==13) then
|
local view = SubUIManager.Open(SubUIConfig.ItemView,this.fireGrid.transform)
|
||||||
local view = SubUIManager.Open(SubUIConfig.ItemView,this.windyGrid.transform)
|
view:OnOpen(false, {v.Reward[1], v.Reward[2] },1.1,true)
|
||||||
view:OnOpen(false, {v.Reward[1], v.Reward[2] },1.1,true)
|
view.name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f",(v.WeightShow/allWeight)*100) .."%</color>"
|
||||||
view.name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f",(v.WeightShow/100000)*100) .."%</color>"
|
elseif(v.Pool==13) then
|
||||||
elseif(v.Pool==14) then
|
local view = SubUIManager.Open(SubUIConfig.ItemView,this.windyGrid.transform)
|
||||||
local view = SubUIManager.Open(SubUIConfig.ItemView,this.groundGrid.transform)
|
view:OnOpen(false, {v.Reward[1], v.Reward[2] },1.1,true)
|
||||||
view:OnOpen(false, {v.Reward[1], v.Reward[2] },1.1,true)
|
view.name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f",(v.WeightShow/allWeight)*100) .."%</color>"
|
||||||
view.name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f",(v.WeightShow/100000)*100) .."%</color>"
|
elseif(v.Pool==14) then
|
||||||
|
local view = SubUIManager.Open(SubUIConfig.ItemView,this.groundGrid.transform)
|
||||||
|
view:OnOpen(false, {v.Reward[1], v.Reward[2] },1.1,true)
|
||||||
|
view.name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f",(v.WeightShow/allWeight)*100) .."%</color>"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
this.elementScroll:SetActive(true)
|
this.elementScroll:SetActive(true)
|
||||||
|
@ -132,6 +137,13 @@ function HeroPreviewPanel:OnOpen(...)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function this.GetAllWeight(pool)
|
||||||
|
if not this.AllWeightTemp[pool] then
|
||||||
|
this.AllWeightTemp[pool] = RecruitManager.GetAllWeightByPool(pool)
|
||||||
|
end
|
||||||
|
return this.AllWeightTemp[pool]
|
||||||
|
end
|
||||||
|
|
||||||
function HeroPreviewPanel:OnShow()
|
function HeroPreviewPanel:OnShow()
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -650,4 +650,24 @@ function this.GetRecruitData()
|
||||||
return dicData
|
return dicData
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- 获取某个奖池的总权重
|
||||||
|
function this.GetAllWeightByPool(pool)
|
||||||
|
local all = 0
|
||||||
|
for i, v in ConfigPairs(lotteryRewardConfig) do
|
||||||
|
if v.Pool == pool then
|
||||||
|
-- 四元阵需要判断是否进入版本
|
||||||
|
local weight = v.WeightShow
|
||||||
|
if v.Pool==11 or v.Pool==12 or v.Pool==13 or v.Pool==14 then
|
||||||
|
local chipId = v.Reward[1]
|
||||||
|
local heroId = HeroManager.ChipIdToHeroId(chipId)
|
||||||
|
if heroId and not HeroManager.InVersion(heroId) then
|
||||||
|
weight = 0
|
||||||
|
end
|
||||||
|
end
|
||||||
|
all = all + weight
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return all
|
||||||
|
end
|
||||||
|
|
||||||
return this
|
return this
|
Loading…
Reference in New Issue