红点修改提交

dev_chengFeng
jiaoyangna 2021-07-28 16:52:41 +08:00
parent ad850da05f
commit 93a9473184
5 changed files with 30 additions and 25 deletions

View File

@ -1044,8 +1044,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 93.56, y: -36.02}
m_SizeDelta: {x: 224.68, y: 86.51}
m_AnchoredPosition: {x: 93.56, y: -23.842}
m_SizeDelta: {x: 224.68, y: 110.87}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &903598582962903888
CanvasRenderer:
@ -1163,8 +1163,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -98.12, y: -36.02}
m_SizeDelta: {x: 221.56, y: 86.51}
m_AnchoredPosition: {x: -98.12, y: -23.843}
m_SizeDelta: {x: 221.56, y: 110.87}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4663026695833607491
CanvasRenderer:
@ -2628,7 +2628,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -277, y: -1746}
m_SizeDelta: {x: 224.68, y: 96.2}
m_SizeDelta: {x: 224.68, y: 110.87}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8899086003853839299
CanvasRenderer:
@ -2741,7 +2741,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.65882355, g: 0.65882355, b: 0.654902, a: 1}
m_Color: {r: 0.9490196, g: 0.91764706, b: 0.7882353, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
@ -2944,7 +2944,7 @@ RectTransform:
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_AnchoredPosition: {x: 456.4, y: 0}
m_SizeDelta: {x: 912.8, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &3795659575372293691
@ -2979,7 +2979,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_Spacing: 0
m_Spacing: 10
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
@ -3018,8 +3018,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -2.1, y: -36.5}
m_SizeDelta: {x: 926.2, y: 118.1}
m_AnchoredPosition: {x: -2.1, y: -22.4}
m_SizeDelta: {x: 926.2, y: 146.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7910508246414614372
CanvasRenderer:

View File

@ -7635,11 +7635,11 @@ RectTransform:
- {fileID: 8774495478651919640}
- {fileID: 224079165133665220}
- {fileID: 2741045372675118090}
- {fileID: 68852558248628701}
- {fileID: 1660503546251682612}
- {fileID: 605647442647711863}
- {fileID: 1978998900481182243}
- {fileID: 8180161487852970196}
- {fileID: 68852558248628701}
m_Father: {fileID: 224330976962607446}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -82402,7 +82402,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224346866425234302}
m_RootOrder: 9
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -164777,7 +164777,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224346866425234302}
m_RootOrder: 8
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -179197,7 +179197,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224346866425234302}
m_RootOrder: 5
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -184570,7 +184570,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224346866425234302}
m_RootOrder: 6
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
@ -196976,7 +196976,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 224346866425234302}
m_RootOrder: 7
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}

View File

@ -36,7 +36,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 400, y: 50.477}
m_SizeDelta: {x: 370, y: 50.477}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &802499989
CanvasRenderer:
@ -5606,10 +5606,10 @@ RectTransform:
m_Father: {fileID: 802499987}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -77.77, y: -0.11924}
m_SizeDelta: {x: 244.46, y: 50.24}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 114.73, y: -0.11924}
m_SizeDelta: {x: 229.46, y: 50.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1193572887044614810
CanvasRenderer:

View File

@ -190,6 +190,7 @@ function EquipTreasureStrongPopup:RefreshRedPoint(delta,isRefreshTabRed)
this.selectText.text = type == 1 and "强 化" or "精 炼"
this.select.transform.localScale = Vector3.one
this.select.gameObject:SetActive(true)
this.select.transform:SetSiblingIndex(1)
end,delta):Start()
if isRefreshTabRed then
local redDataStrong ,redDataRefine = false,false
@ -295,8 +296,9 @@ function EquipTreasureStrongPopup:SetScrollPre(go,data,_index)
name:GetComponent("Text").text = HeroManager.GetSingleHeroData(data.upHeroDid).heroConfig.ReadingName
Util.AddOnceClick(btn,function()
this.select.transform:SetParent(go.transform)
this.select:GetComponent("RectTransform").anchoredPosition3D = Vector3.New(-8.5,6.8,0)
this.select:GetComponent("RectTransform").anchoredPosition3D = Vector3.New(-8.5,5.04,0)
this.select.gameObject:SetActive(true)
this.select.transform:SetSiblingIndex(1)
curEquipData = data
curIndex = go
this:SetWindShow(type,0)
@ -326,7 +328,7 @@ function EquipTreasureStrongPopup:SetWindShow(_index,delta)
propertyShow = EquipTreasureManager.GetCurrLvAndNextLvPropertyValue(1,curEquipData.levelPool,curEquipData.lv)
--显示消耗
items = HeroManager.GetCostItems(curEquipData.idDyn,curEquipData.strongConfig)
if curEquipData.quality == 6 then
if curEquipData.quantity == 6 then
this.hintTxt.text = "强化等级已达上限"
else
this.hintTxt.text = Language[11778]
@ -348,7 +350,7 @@ function EquipTreasureStrongPopup:SetWindShow(_index,delta)
end
propertyShow = EquipTreasureManager.GetCurrLvAndNextLvPropertyValue(2,curEquipData.refinePool,curEquipData.refineLv)
items = HeroManager.GetCostItems(curEquipData.idDyn,curEquipData.refineConfig)
if curEquipData.quality == 6 then
if curEquipData.quantity == 6 then
this.hintTxt.text = "精炼等级已达上限"
else
this.hintTxt.text=Language[11782]

View File

@ -527,6 +527,7 @@ function this:AllEquipDownBtnOnClick()
end
PlaySoundWithoutClick(SoundConfig.Sound_TakeOff)
this.ShowHeroEquip()
this.CheckRedTab()
end
function this.ShowHeroEquip()
@ -887,7 +888,7 @@ function this.SingleItemDataShow(_go, _itemData)
if curHeroCanUpEquipTabs and #curHeroCanUpEquipTabs > 0 then
local isShow = false
for i = 1, #curHeroCanUpEquipTabs do
if curHeroCanUpEquipTabs[i] == _itemData.idDyn then
if curHeroCanUpEquipTabs[i] == _itemData.id then
isShow = true
end
end
@ -1107,6 +1108,8 @@ end
function this.CheckRedTab()
for i = 1,#redTabs do
if i < 5 then
local allEquip = BagManager.GetEquipDataByEquipPosition(curHeroData.heroConfig.Profession, i)
this:SortEquipDatas(allEquip)
local showRed = false
if curHeroCanUpEquipTabs and #curHeroCanUpEquipTabs > 0 then
for j = 1,#curHeroCanUpEquipTabs do