diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleAwakeSuccessPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleAwakeSuccessPanel.prefab
index ae0e5688e5..ac2d4cdeae 100644
--- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleAwakeSuccessPanel.prefab
+++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleAwakeSuccessPanel.prefab
@@ -4943,7 +4943,7 @@ ParticleSystem:
--- !u!199 &1856257942139737830
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -9625,7 +9625,7 @@ ParticleSystem:
--- !u!199 &1856080476376360000
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -14390,7 +14390,7 @@ ParticleSystem:
--- !u!199 &1856296212845401034
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -19371,7 +19371,7 @@ ParticleSystem:
--- !u!199 &1855965046494566518
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -24326,7 +24326,7 @@ ParticleSystem:
--- !u!199 &1856514560942937682
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -29037,7 +29037,7 @@ ParticleSystem:
--- !u!199 &1855895684385913908
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -33793,7 +33793,7 @@ ParticleSystem:
--- !u!199 &1856180451866631520
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -38585,7 +38585,7 @@ ParticleSystem:
--- !u!199 &1856629332692429568
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -38702,7 +38702,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
- m_Color: {r: 0.3019608, g: 0.54509807, b: 0.41176474, a: 1}
+ m_Color: {r: 0.4, g: 1, b: 0, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@@ -38759,7 +38759,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 53.79, y: -20}
- m_SizeDelta: {x: 108, y: 30}
+ m_SizeDelta: {x: 108, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1734632983288119862
CanvasRenderer:
@@ -38793,7 +38793,7 @@ MonoBehaviour:
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 40
m_FontStyle: 0
- m_BestFit: 1
+ m_BestFit: 0
m_MinSize: 20
m_MaxSize: 40
m_Alignment: 4
@@ -43605,7 +43605,7 @@ ParticleSystem:
--- !u!199 &1855777142281396492
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -48447,7 +48447,7 @@ ParticleSystem:
--- !u!199 &1856183630649036132
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -54085,7 +54085,7 @@ ParticleSystem:
--- !u!199 &8249727502637510580
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@@ -59035,7 +59035,7 @@ ParticleSystem:
--- !u!199 &8250219202736023134
ParticleSystemRenderer:
serializedVersion: 6
- m_ObjectHideFlags: 0
+ m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua
index 278adf14e0..cdb76d7c09 100644
--- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua
+++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua
@@ -109,14 +109,17 @@ function this.GetNewTalentDataShow()
-- breakSkillDataList[curBreakId] = {index = curBreakId,type = 1,str =""..titleStr..Desc..""}
-- end
else--升星
- local curUpStarId = curHeroData.heroConfig.Awaken[i][2]
- local titleStr = NumToSimplenessFont[heroRankupConfig[curUpStarId].Phase[2]] .. Language[11792]
- local _passiveSkillId = passiveSkillConfig[curHeroData.heroConfig.Awaken[i][3]].Id
- if upStarSkillDataList[curUpStarId] then
- upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,type = 2,index = curUpStarId,str = upStarSkillDataList[curUpStarId].str .. " "..Desc..""}
- else
- upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,type = 2,index = curUpStarId,str =""..titleStr..Desc..""}
- end
+ local curUpStarId = curHeroData.heroConfig.Awaken[i][2]
+ local titleStr = NumToSimplenessFont[heroRankupConfig[curUpStarId].Phase[2]] .. Language[11792]
+ local _passiveSkillId = passiveSkillConfig[curHeroData.heroConfig.Awaken[i][3]].Id
+ -- 觉醒成功,非特性不再显示
+ if passiveSkillLogicConfig[_passiveSkillId].Judge == 1 then
+ if upStarSkillDataList[curUpStarId] then
+ upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,type = 2,index = curUpStarId,str = upStarSkillDataList[curUpStarId].str .. " "..Desc..""}
+ else
+ upStarSkillDataList[curUpStarId] = {passiveSkillId = _passiveSkillId,type = 2,index = curUpStarId,str =""..titleStr..Desc..""}
+ end
+ end
end
end
end