法宝修改提交

dev_chengFeng
yuanshuai 2022-08-30 15:55:37 +08:00
parent a5530496dd
commit a10a386b24
4 changed files with 256 additions and 31 deletions

View File

@ -78,6 +78,120 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 256364516928499771}
m_CullTransparentMesh: 0
--- !u!1 &321965057439669697
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 261049988240201727}
- component: {fileID: 8335094772317783721}
- component: {fileID: 4155893180197050545}
- component: {fileID: 578544388938443369}
- component: {fileID: 2998988335041794322}
m_Layer: 5
m_Name: Mask1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &261049988240201727
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 321965057439669697}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 396421673802347146}
m_Father: {fileID: 1348226185746786266}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 540, y: 0}
m_SizeDelta: {x: 1080, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8335094772317783721
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 321965057439669697}
m_CullTransparentMesh: 0
--- !u!114 &4155893180197050545
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 321965057439669697}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0.23529412}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &578544388938443369
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 321965057439669697}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!114 &2998988335041794322
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 321965057439669697}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 140
m_Right: 140
m_Top: 10
m_Bottom: 10
m_ChildAlignment: 4
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 1
--- !u!1 &421857657557048909
GameObject:
m_ObjectHideFlags: 0
@ -4849,7 +4963,7 @@ ParticleSystem:
--- !u!199 &5475183851846367264
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -10058,7 +10172,7 @@ ParticleSystem:
--- !u!199 &7175515632173838630
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -14819,7 +14933,7 @@ ParticleSystem:
--- !u!199 &2424411900952576964
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -19575,7 +19689,7 @@ ParticleSystem:
--- !u!199 &7003235447524177872
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -24689,7 +24803,7 @@ ParticleSystem:
--- !u!199 &6775624527687177699
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -29434,7 +29548,7 @@ ParticleSystem:
--- !u!199 &876445508905491866
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -34079,7 +34193,7 @@ ParticleSystem:
--- !u!199 &4107366793135521658
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -39171,7 +39285,7 @@ ParticleSystem:
--- !u!199 &8761706858282258751
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -44003,7 +44117,7 @@ ParticleSystem:
--- !u!199 &4396747555986394406
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -48844,7 +48958,7 @@ ParticleSystem:
--- !u!199 &4152745225773462240
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -54304,7 +54418,7 @@ ParticleSystem:
--- !u!199 &635127155071403073
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -59468,7 +59582,7 @@ ParticleSystem:
--- !u!199 &8461887328555741404
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -64303,7 +64417,7 @@ ParticleSystem:
--- !u!199 &4035478127761353795
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -69272,7 +69386,7 @@ ParticleSystem:
--- !u!199 &3287078869885518980
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -74513,7 +74627,7 @@ ParticleSystem:
--- !u!199 &5949988206710758398
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -74649,6 +74763,86 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!1 &7546047797970286305
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 396421673802347146}
- component: {fileID: 6324475429777358018}
- component: {fileID: 1255609769788995499}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &396421673802347146
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7546047797970286305}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 261049988240201727}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 800, y: 0}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &6324475429777358018
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7546047797970286305}
m_CullTransparentMesh: 0
--- !u!114 &1255609769788995499
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7546047797970286305}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.90588236, g: 0.76862746, b: 0.4745098, a: 1}
m_RaycastTarget: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 36
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 1
m_MaxSize: 50
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1.1
m_Text:
LanguageIndex: 0
--- !u!1 &7618102373798475093
GameObject:
m_ObjectHideFlags: 0
@ -75447,6 +75641,7 @@ RectTransform:
m_Children:
- {fileID: 5163653912637781430}
- {fileID: 1450271772483850115}
- {fileID: 261049988240201727}
m_Father: {fileID: 6564057508992171858}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

View File

@ -113,6 +113,16 @@ function this.Show()
this.coreText.text=string.format( "%s【%s】",GetLanguageStrById(passiveSkillConfig[skillLv].Desc),Language[11533])
end
end
--显示核心特性(50级解锁)
local skillLv_50= ConfigManager.GetConfigDataByDoubleKey(ConfigName.EquipTalismana,"TalismanaId",data[2],"Level",50).OpenSkillRules[1]
if skillLv_50 then
if curLv<50 then
this.coreText.text=this.coreText.text.."\n"..string.format( Language[11532],GetLanguageStrById(passiveSkillConfig[skillLv_50].Desc),50)
else
this.coreText.text=this.coreText.text.."\n"..string.format( "%s【%s】",GetLanguageStrById(passiveSkillConfig[skillLv_50].Desc),Language[11533])
end
end
--显示基础属性
for i=1,#curTalismanConFig.Property do
@ -150,7 +160,7 @@ function this.Show()
strTable[n]=string.format( Language[11535],GetLanguageStrById(passiveSkillConfig[dowerData[n].OpenSkillRules[1]].Desc),dowerData[n].Level,"\n")
end
if dowerData[n].Level==25 then
if dowerData[n].Level==25 or dowerData[n].Level==50 then
strTable[n]=string.gsub(strTable[n],"·","")
strTable[n]=Language[11536]..strTable[n]
end

View File

@ -53,6 +53,7 @@ function RoleTalismanPanelV2:InitComponent()
this.core=Util.GetGameObject(this.gameObject,"ScrollView/Viewport/Content/Core")
this.coreText=Util.GetGameObject(this.core,"Mask/Text"):GetComponent("Text")
this.coreText1=Util.GetGameObject(this.core,"Mask1/Text"):GetComponent("Text")
this.dower=Util.GetGameObject(this.gameObject,"ScrollView/Viewport/Content/Dower")
this.dowerText=Util.GetGameObject(this.dower,"Mask/Text"):GetComponent("Text")
@ -207,12 +208,22 @@ function this.OnShowHeroAndTalisman()
this.talismanName.text = string.format( "%s <color=#FE5022><size=42>+%s</size></color>",GetLanguageStrById(itemConfig[data[2]].Name),curLv)
--显示核心特性(25级解锁)
local skillLv= ConfigManager.GetConfigDataByDoubleKey(ConfigName.EquipTalismana,"TalismanaId",data[2],"Level",25).OpenSkillRules[1]
if skillLv then
local skillLv_25= ConfigManager.GetConfigDataByDoubleKey(ConfigName.EquipTalismana,"TalismanaId",data[2],"Level",25).OpenSkillRules[1]
if skillLv_25 then
if curLv<25 then
this.coreText.text=string.format( Language[11532],GetLanguageStrById(passiveSkillConfig[skillLv].Desc),25)
this.coreText.text=string.format( Language[11532],GetLanguageStrById(passiveSkillConfig[skillLv_25].Desc),25)
else
this.coreText.text=string.format( "%s【%s】",GetLanguageStrById(passiveSkillConfig[skillLv].Desc),Language[11533])
this.coreText.text=string.format( "%s【%s】",GetLanguageStrById(passiveSkillConfig[skillLv_25].Desc),Language[11533])
end
end
--显示核心特性(50级解锁)
local skillLv_50= ConfigManager.GetConfigDataByDoubleKey(ConfigName.EquipTalismana,"TalismanaId",data[2],"Level",50).OpenSkillRules[1]
if skillLv_50 then
if curLv<50 then
this.coreText1.text=string.format( Language[11532],GetLanguageStrById(passiveSkillConfig[skillLv_50].Desc),50)
else
this.coreText1.text=string.format( "%s【%s】",GetLanguageStrById(passiveSkillConfig[skillLv_50].Desc),Language[11533])
end
end
@ -254,7 +265,7 @@ function this.OnShowHeroAndTalisman()
else --否则就正常显示
strTable[n]=string.format( Language[11535],GetLanguageStrById(passiveSkillConfig[dowerData[n].OpenSkillRules[1]].Desc),dowerData[n].Level,"\n")
end
if dowerData[n].Level==25 then --特性显示
if dowerData[n].Level==25 or dowerData[n].Level==50 then --特性显示
strTable[n]=string.gsub(strTable[n],"·","")
local str=Language[11536]..strTable[n]
strTable[n]=string.gsub(str," "," ") --unity text中的单词过长 避免自动添加空格并换行 将那个空格替换

View File

@ -174,7 +174,7 @@ function TalismanInfoPanel:OnShowPanelData()
data=ConfigManager.GetConfigData(ConfigName.HeroConfig,curHeroData.id).EquipTalismana--当前法宝数据 data[1]星级 data[2]法宝ID
--获取最大等级
TalismanManager.GetStartAndEndStar()
maxLv=TalismanManager.AllTalismanEndStar[data[2]]
maxLv=50
--获取当前法宝等级
curLv=HeroManager.GetTalismanLv(curHeroData.dynamicId)
@ -184,15 +184,17 @@ function TalismanInfoPanel:OnShowPanelData()
nextLv=curLv+1
end
isMaxStar = curLv >= maxLv
curTalismanConFig= ConfigManager.GetConfigDataByDoubleKey(ConfigName.EquipTalismana,"Level",curLv,"TalismanaId",data[2])
nextTalismanConFig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.EquipTalismana, "TalismanaId", data[2], "Level", nextLv)
if isMaxStar==false then
nextTalismanConFig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.EquipTalismana, "TalismanaId", data[2], "Level", nextLv)
end
--法宝战力
local curPower = TalismanManager.CalculateWarForceBase(curTalismanConFig,0)
local nextPower=TalismanManager.CalculateWarForceBase(nextTalismanConFig,0)
-- local nextPower=TalismanManager.CalculateWarForceBase(nextTalismanConFig,0)
self.force.text = curPower
self.addForce.text="+"..(nextPower-curPower)
-- self.addForce.text="+"..(nextPower-curPower)
--法宝Icon 边框品质
self.talismanRoot.sprite = this.spLoader:LoadSprite(TalismanBubble[itemConfig[data[2]].Quantity])
self.talismanIcon.sprite = this.spLoader:LoadSprite(GetResourcePath(itemConfig[data[2]].ResourceID))
@ -230,8 +232,10 @@ function TalismanInfoPanel:ShowProAndSkillData()
local skillId=curTalismanConFig.Property[i][1]
local curValue=curTalismanConFig.Property[i][2]
local nextValue=nextTalismanConFig.Property[i][2]
local nextValue=0
if not isMaxStar then
nextValue=nextTalismanConFig.Property[i][2]
end
icon.sprite=this.spLoader:LoadSprite(artResourcesConfig[propertyConfig[skillId].PropertyIcon].Name)
icon:SetNativeSize()
proName.text= GetLanguageStrById(propertyConfig[skillId].Info)
@ -249,9 +253,14 @@ function TalismanInfoPanel:ShowProAndSkillData()
end
end
table.sort(dowerData, function(a,b) return a.OpenSkillRules[1]<b.OpenSkillRules[1] end)
local skillId=ConfigManager.GetConfigDataByDoubleKey(ConfigName.EquipTalismana,"Level",self:GetTargetLv(dowerData),"TalismanaId",data[2]).OpenSkillRules[1]
self.skillInfoText.text=string.format( Language[11532],GetLanguageStrById(passiveSkillConfig[skillId].Desc),self:GetTargetLv(dowerData))
local targetLv=self:GetTargetLv(dowerData)
if isMaxStar==false then
local skillId=ConfigManager.GetConfigDataByDoubleKey(ConfigName.EquipTalismana,"Level",targetLv,"TalismanaId",data[2]).OpenSkillRules[1]
self.skillInfoText.text=string.format( Language[11532],GetLanguageStrById(passiveSkillConfig[skillId].Desc),self:GetTargetLv(dowerData))
else
self.skillInfoText.text=""
end
end
--根据当前法宝等级获取法宝最近的下一等级