【百宝商会、御剑行】按钮一致性提交、显示修改

dev_chengFeng
ZhangBiao 2021-10-22 18:15:55 +08:00
parent de2ce6919c
commit cc2cfd7a21
4 changed files with 17 additions and 99 deletions

View File

@ -6486,7 +6486,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -0.00022125}
m_AnchoredPosition: {x: 0, y: -0.00021362305}
m_SizeDelta: {x: 0, y: 0.00054932}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2837923671425565333
@ -6649,7 +6649,7 @@ 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: 74, y: 148}
m_AnchoredPosition: {x: 44, y: 148}
m_SizeDelta: {x: 100, y: 64.41}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4855449838437395217
@ -17650,11 +17650,11 @@ RectTransform:
- {fileID: 1090820454469567469}
- {fileID: 1305397162518250813}
m_Father: {fileID: 4248043991083370822}
m_RootOrder: 6
m_RootOrder: 5
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: 44, y: -22}
m_AnchoredPosition: {x: 14, y: -22}
m_SizeDelta: {x: 360, y: 35}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1828144403995145226
@ -40062,7 +40062,7 @@ 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: -390, y: -20}
m_AnchoredPosition: {x: -301, y: -20}
m_SizeDelta: {x: 70, y: 70}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3633218889031437891
@ -40217,7 +40217,7 @@ RectTransform:
m_Children:
- {fileID: 3978922390848485313}
m_Father: {fileID: 4248043991083370822}
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}
@ -45958,86 +45958,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &8428939908271526842
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1719172549120207660}
- component: {fileID: 1281742748516619581}
- component: {fileID: 7532052759580986595}
m_Layer: 5
m_Name: minNum
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1719172549120207660
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8428939908271526842}
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: 4248043991083370822}
m_RootOrder: 5
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: -296.8, y: -21}
m_SizeDelta: {x: 118.3, y: 64.4}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1281742748516619581
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8428939908271526842}
m_CullTransparentMesh: 0
--- !u!114 &7532052759580986595
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8428939908271526842}
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.92549026, g: 0.8588236, b: 0.74509805, 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: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 80
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "100/\u6B21"
LanguageIndex: 11248
--- !u!1 &8481125695751606892
GameObject:
m_ObjectHideFlags: 0
@ -46975,7 +46895,6 @@ RectTransform:
- {fileID: 3665704766970931571}
- {fileID: 4268712083348899354}
- {fileID: 1313638740533107898}
- {fileID: 1719172549120207660}
- {fileID: 5089712699128326142}
- {fileID: 575292175383024035}
m_Father: {fileID: 2925180131101153177}

View File

@ -1916,27 +1916,27 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 1
m_Color: {r: 0.32941177, g: 0.1137255, b: 0.04705883, 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: 6fa15837529b0e640af6620b07d3207d, type: 3}
m_FontSize: 38
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_MinSize: 4
m_MaxSize: 45
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "18\u5143"
m_Text: "12\u5143"
--- !u!1 &7964384328588694385
GameObject:
m_ObjectHideFlags: 0

View File

@ -14,7 +14,6 @@ function this:InitComponent(gameObject)
self.icon = Util.GetGameObject(gameObject, "icon"):GetComponent("Image")
self.icon1 = Util.GetGameObject(gameObject, "icon1"):GetComponent("Image")
self.curNum = Util.GetGameObject(gameObject, "curNum"):GetComponent("Text")
self.minNum = Util.GetGameObject(gameObject, "minNum"):GetComponent("Text")
self.btnSure = Util.GetGameObject(gameObject, "BtnSure")
end
@ -64,7 +63,6 @@ end
function this:Refresh()
local curGetNum = BagManager.GetTotalItemNum(configData.JoinCost[1]) > configData.MaxRaiseNum[2] and configData.MaxRaiseNum[2] or BagManager.GetTotalItemNum(configData.JoinCost[1])
self.curNum.text = BagManager.GetTotalItemNum(configData.JoinCost[1])
self.minNum.text = configData.JoinCost[2].."/次"
self.icon.sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(configData.JoinCost[1]))
self.icon1.sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(configData.JoinCost[1]))
self.slider.minValue = configData.JoinCost[2]

View File

@ -115,7 +115,6 @@ function TreasureStoreSeason2:ShowSingleData(_go,_data,_index)
local times = Util.GetGameObject(_go,"buyInfo"):GetComponent("Text")
title.text = _data.Name
price.text = _data.Price..""
Util.SetGray(buyBtn,_data.progress == 8)
Util.SetGray(redPoint,false)
redPoint:SetActive(_data.progress == 1 and _data.Price == 0)
@ -123,9 +122,11 @@ function TreasureStoreSeason2:ShowSingleData(_go,_data,_index)
if _data.progress == 1 then
times.gameObject:SetActive(true)
times.text = string.format( "剩余:%s次",_data.canBuy)
price.text = _data.Price..""
else
times.gameObject:SetActive(false)
times.text = ""
price.text = "已购买"
end
if not self.itemViewList[_go] then