diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_flyUp/Model/longani 1_anim.controller b/Assets/ManagedResources/EffectResSkill/Effect_c_flyUp/Model/longani 1_anim.controller
index 142c199b12..5d69990ed0 100644
--- a/Assets/ManagedResources/EffectResSkill/Effect_c_flyUp/Model/longani 1_anim.controller
+++ b/Assets/ManagedResources/EffectResSkill/Effect_c_flyUp/Model/longani 1_anim.controller
@@ -6,7 +6,7 @@ AnimatorController:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: longani 1
+ m_Name: longani 1_anim
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_flyUp/Model/longani 1_ctrl.anim b/Assets/ManagedResources/EffectResSkill/Effect_c_flyUp/Model/longani 1_ctrl.anim
index 04858058f1..33e8eb61e3 100644
--- a/Assets/ManagedResources/EffectResSkill/Effect_c_flyUp/Model/longani 1_ctrl.anim
+++ b/Assets/ManagedResources/EffectResSkill/Effect_c_flyUp/Model/longani 1_ctrl.anim
@@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: longani 1
+ m_Name: longani 1_ctrl
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_flyUp/Model/longani_anim.anim b/Assets/ManagedResources/EffectResSkill/Effect_c_flyUp/Model/longani_anim.anim
index a09062050d..f4d4e3b723 100644
--- a/Assets/ManagedResources/EffectResSkill/Effect_c_flyUp/Model/longani_anim.anim
+++ b/Assets/ManagedResources/EffectResSkill/Effect_c_flyUp/Model/longani_anim.anim
@@ -6,7 +6,7 @@ AnimationClip:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: longani
+ m_Name: longani_anim
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_flyUp/Model/longani_ctrl.controller b/Assets/ManagedResources/EffectResSkill/Effect_c_flyUp/Model/longani_ctrl.controller
index 34dcb6b05f..02a4332111 100644
--- a/Assets/ManagedResources/EffectResSkill/Effect_c_flyUp/Model/longani_ctrl.controller
+++ b/Assets/ManagedResources/EffectResSkill/Effect_c_flyUp/Model/longani_ctrl.controller
@@ -6,7 +6,7 @@ AnimatorController:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: longani
+ m_Name: longani_ctrl
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
diff --git a/Assets/ManagedResources/EffectResSkill/Effect_c_flyUp/Model/longaniduan_ctrl.controller b/Assets/ManagedResources/EffectResSkill/Effect_c_flyUp/Model/longaniduan_ctrl.controller
index f5f1dcfd5b..de42dd383a 100644
--- a/Assets/ManagedResources/EffectResSkill/Effect_c_flyUp/Model/longaniduan_ctrl.controller
+++ b/Assets/ManagedResources/EffectResSkill/Effect_c_flyUp/Model/longaniduan_ctrl.controller
@@ -6,7 +6,7 @@ AnimatorController:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: longaniduan
+ m_Name: longaniduan_ctrl
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
diff --git a/Assets/ManagedResources/EffectResUI/FifteenDayGift/Materials/dajin_effect_12_1.mat b/Assets/ManagedResources/EffectResUI/FifteenDayGift/Materials/dajin_effect_12_1.mat
index 04d9f4a679..db977e49af 100644
--- a/Assets/ManagedResources/EffectResUI/FifteenDayGift/Materials/dajin_effect_12_1.mat
+++ b/Assets/ManagedResources/EffectResUI/FifteenDayGift/Materials/dajin_effect_12_1.mat
@@ -7,7 +7,7 @@ Material:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {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_ShaderKeywords:
m_LightmapFlags: 4
diff --git a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
index 6129cb2341..ff7b282321 100644
--- a/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
@@ -4254,4 +4254,34 @@ function this.CalculatePvpBonusForShow(data)
return data
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
\ No newline at end of file
diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewPanel.lua
index 4a22151782..10e6b7ce11 100644
--- a/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Recruit/HeroPreviewPanel.lua
@@ -84,6 +84,7 @@ end
--第一个参数是否是英雄或元素
--第二个参数是否显示tab 如果没有,则显示,如果有,则根据第二个参数
function HeroPreviewPanel:OnOpen(...)
+ this.AllWeightTemp = {}
this.heroGrid.transform.anchoredPosition = Vector2.New(0,0)
this.elementGrid.transform.anchoredPosition = Vector2.New(0,0)
local temp={...}
@@ -107,23 +108,27 @@ function HeroPreviewPanel:OnOpen(...)
if RecruitManager.isFirstEnterElementScroll then --元素
RecruitManager.isFirstEnterElementScroll=false
for i,v in pairs(RecruitManager.previewElementData) do
- Log(v.Pool)
- if(v.Pool==11) then
- local view = SubUIManager.Open(SubUIConfig.ItemView,this.waterGrid.transform)
- view:OnOpen(false, {v.Reward[1], v.Reward[2] },1.1,true)
- view.name:GetComponent("Text").text=""..string.format("%.2f",(v.WeightShow/100000)*100) .."%"
- elseif(v.Pool==12) then
- local view = SubUIManager.Open(SubUIConfig.ItemView,this.fireGrid.transform)
- view:OnOpen(false, {v.Reward[1], v.Reward[2] },1.1,true)
- view.name:GetComponent("Text").text=""..string.format("%.2f",(v.WeightShow/100000)*100) .."%"
- elseif(v.Pool==13) then
- local view = SubUIManager.Open(SubUIConfig.ItemView,this.windyGrid.transform)
- view:OnOpen(false, {v.Reward[1], v.Reward[2] },1.1,true)
- view.name:GetComponent("Text").text=""..string.format("%.2f",(v.WeightShow/100000)*100) .."%"
- 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=""..string.format("%.2f",(v.WeightShow/100000)*100) .."%"
+ local chipId = v.Reward[1]
+ local heroId = HeroManager.ChipIdToHeroId(chipId)
+ if not heroId or HeroManager.InVersion(heroId) then
+ local allWeight = this.GetAllWeight(v.Pool)
+ if(v.Pool==11) then
+ local view = SubUIManager.Open(SubUIConfig.ItemView,this.waterGrid.transform)
+ view:OnOpen(false, {v.Reward[1], v.Reward[2] },1.1,true)
+ view.name:GetComponent("Text").text=""..string.format("%.2f",(v.WeightShow/allWeight)*100) .."%"
+ elseif(v.Pool==12) then
+ local view = SubUIManager.Open(SubUIConfig.ItemView,this.fireGrid.transform)
+ view:OnOpen(false, {v.Reward[1], v.Reward[2] },1.1,true)
+ view.name:GetComponent("Text").text=""..string.format("%.2f",(v.WeightShow/allWeight)*100) .."%"
+ elseif(v.Pool==13) then
+ local view = SubUIManager.Open(SubUIConfig.ItemView,this.windyGrid.transform)
+ view:OnOpen(false, {v.Reward[1], v.Reward[2] },1.1,true)
+ view.name:GetComponent("Text").text=""..string.format("%.2f",(v.WeightShow/allWeight)*100) .."%"
+ 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=""..string.format("%.2f",(v.WeightShow/allWeight)*100) .."%"
+ end
end
end
this.elementScroll:SetActive(true)
@@ -132,6 +137,13 @@ function HeroPreviewPanel:OnOpen(...)
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()
end
diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua
index 4a4c930019..a11b7ce812 100644
--- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua
@@ -650,4 +650,24 @@ function this.GetRecruitData()
return dicData
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
\ No newline at end of file