图鉴预设修改提交

onepiece_demo_arena
wangzhenxing 2024-01-20 14:21:47 +08:00
parent e90f7f628a
commit f2c3cfa8bf
5 changed files with 18 additions and 18 deletions

View File

@ -3896,7 +3896,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 32 m_FontSize: 40
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
m_MinSize: 3 m_MinSize: 3
@ -3944,7 +3944,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1} m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -90, y: -200} m_AnchoredPosition: {x: -140, y: -197}
m_SizeDelta: {x: 121, y: 121} m_SizeDelta: {x: 121, y: 121}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6161143365764854322 --- !u!222 &6161143365764854322
@ -4395,9 +4395,9 @@ RectTransform:
m_Father: {fileID: 164915241442772717} m_Father: {fileID: 164915241442772717}
m_RootOrder: 21 m_RootOrder: 21
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 968, y: -733.4} m_AnchoredPosition: {x: -112, y: -737}
m_SizeDelta: {x: 160, y: 160} m_SizeDelta: {x: 160, y: 160}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9049422214420379269 --- !u!222 &9049422214420379269
@ -5200,7 +5200,7 @@ RectTransform:
m_GameObject: {fileID: 7562258272849120841} m_GameObject: {fileID: 7562258272849120841}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 0.9, y: 0.9, z: 1}
m_Children: m_Children:
- {fileID: 7438115198098257837} - {fileID: 7438115198098257837}
m_Father: {fileID: 458271444932364388} m_Father: {fileID: 458271444932364388}
@ -5495,7 +5495,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData: m_FontData:
m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3}
m_FontSize: 44 m_FontSize: 40
m_FontStyle: 0 m_FontStyle: 0
m_BestFit: 0 m_BestFit: 0
m_MinSize: 0 m_MinSize: 0
@ -5819,7 +5819,7 @@ RectTransform:
m_GameObject: {fileID: 8984313322781969218} m_GameObject: {fileID: 8984313322781969218}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 0.9, y: 0.9, z: 1}
m_Children: m_Children:
- {fileID: 7012391571410172215} - {fileID: 7012391571410172215}
- {fileID: 8654895496356684777} - {fileID: 8654895496356684777}
@ -5830,7 +5830,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 138, y: -737} m_AnchoredPosition: {x: 105, y: -737}
m_SizeDelta: {x: 151.25, y: 186} m_SizeDelta: {x: 151.25, y: 186}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &274082961861789344 --- !u!222 &274082961861789344

View File

@ -87,7 +87,7 @@ function SelectGem:SingleDataShow(go,data,index)
elseif PropertyConfig[property[i][1]].Style==2 then elseif PropertyConfig[property[i][1]].Style==2 then
str=string.format( "全体英雄%s+%s",PropertyConfig[property[i][1]].Info,property[i][2]/100).."%" str=string.format( "全体英雄%s+%s",PropertyConfig[property[i][1]].Info,property[i][2]/100).."%"
end end
textDesc = str--textDesc..string.format( "全体神将%s+%s",PropertyConfig[property[i][1]].Info,property[i][2]/100).."%" textDesc = str--textDesc..string.format( "全体英雄%s+%s",PropertyConfig[property[i][1]].Info,property[i][2]/100).."%"
if property[i+1] then if property[i+1] then
textDesc = textDesc.."\n" textDesc = textDesc.."\n"
end end

View File

@ -179,14 +179,14 @@ function EndLessMapView:BindEvent()
local pros = u(id,false,pros) local pros = u(id,false,pros)
local str = s(pros) local str = s(pros)
if str and str ~= "" then if str and str ~= "" then
table.insert(pro,string.format("本级加成:全体神将<color=#55c688>%s</color>",str)) table.insert(pro,string.format("本级加成:全体英雄<color=#55c688>%s</color>",str))
end end
id = id + 1 id = id + 1
if endlessMorale[id] then if endlessMorale[id] then
local pros = u(id,true,pros) local pros = u(id,true,pros)
local str = s(pros) local str = s(pros)
if str and str ~= "" then if str and str ~= "" then
table.insert(pro,string.format("下级加成:全体神将<color=#55c688>%s</color>",str)) table.insert(pro,string.format("下级加成:全体英雄<color=#55c688>%s</color>",str))
end end
end end
else --特殊加成 else --特殊加成

View File

@ -430,9 +430,9 @@ function RewardEquipSingleShowPopup2:OnShow()
_BaseProList[num]:SetActive(true) _BaseProList[num]:SetActive(true)
Util.GetGameObject(_BaseProList[num], "curProVale").gameObject:SetActive(false) Util.GetGameObject(_BaseProList[num], "curProVale").gameObject:SetActive(false)
if equipConfigData.Position==7 then if equipConfigData.Position==7 then
_BaseProList[num]:GetComponent("Text").text ="全体神将潜能等级+"..equipConfigData.PotentialNew[2] _BaseProList[num]:GetComponent("Text").text ="全体英雄潜能等级+"..equipConfigData.PotentialNew[2]
elseif equipConfigData.Position==8 then elseif equipConfigData.Position==8 then
_BaseProList[num]:GetComponent("Text").text = "神将潜能等级+"..equipConfigData.PotentialNew[2] _BaseProList[num]:GetComponent("Text").text = "英雄潜能等级+"..equipConfigData.PotentialNew[2]
end end
end end
if equipConfigData.HeroGitUp>0 then if equipConfigData.HeroGitUp>0 then
@ -443,7 +443,7 @@ function RewardEquipSingleShowPopup2:OnShow()
_BaseProList[num]:SetActive(true) _BaseProList[num]:SetActive(true)
Util.GetGameObject(_BaseProList[num], "curProVale").gameObject:SetActive(false) Util.GetGameObject(_BaseProList[num], "curProVale").gameObject:SetActive(false)
if equipConfigData.Position==7 then if equipConfigData.Position==7 then
_BaseProList[num]:GetComponent("Text").text =string.format("全体神将礼物属性+%s%%",equipConfigData.HeroGitUp/100) _BaseProList[num]:GetComponent("Text").text =string.format("全体英雄礼物属性+%s%%",equipConfigData.HeroGitUp/100)
end end
end end
end end

View File

@ -240,8 +240,8 @@ function this.RefreshWindowData()
this:OnClickTabBtn(1) this:OnClickTabBtn(1)
local proList=IncarnationManager.GetproDesLst(GiftManager.GetPlayerGiftAddPro(),"00FF00") local proList=IncarnationManager.GetproDesLst(GiftManager.GetPlayerGiftAddPro(),"00FF00")
table.insert(proList,string.format("全体神将潜能等级+%s",GiftManager.GetPlayerGiftAddPotencyLv())) table.insert(proList,string.format("全体英雄潜能等级+%s",GiftManager.GetPlayerGiftAddPotencyLv()))
table.insert(proList,string.format("全体神将礼物属性+%s%%",GiftManager.GetPlayerGiftAdd())) table.insert(proList,string.format("全体英雄礼物属性+%s%%",GiftManager.GetPlayerGiftAdd()))
if proList and #proList>0 then if proList and #proList>0 then
this.proGrid:SetActive(true) this.proGrid:SetActive(true)
this.proEmptyObj:SetActive(false) this.proEmptyObj:SetActive(false)
@ -265,7 +265,7 @@ function this.RefreshWindowData()
this.proGrid:SetActive(false) this.proGrid:SetActive(false)
this.proEmptyObj:SetActive(true) this.proEmptyObj:SetActive(true)
end end
--this.tipInfo.text=string.format("全体神将潜能等级+%s",GiftManager.GetPlayerGiftAddPotencyLv()) --this.tipInfo.text=string.format("全体英雄潜能等级+%s",GiftManager.GetPlayerGiftAddPotencyLv())
end end