【牛气冲天】增加进度
parent
0aef47cc9f
commit
27e433ca6b
|
@ -1080,6 +1080,86 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u9886\u53D6"
|
||||
LanguageIndex: 10002
|
||||
--- !u!1 &1864274299572146969
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1121365959429271992}
|
||||
- component: {fileID: 8799121687072226636}
|
||||
- component: {fileID: 953736533333891260}
|
||||
m_Layer: 0
|
||||
m_Name: progress
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1121365959429271992
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1864274299572146969}
|
||||
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: 1350465337999593540}
|
||||
m_RootOrder: 3
|
||||
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: 315.3, y: -63.7}
|
||||
m_SizeDelta: {x: 100, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8799121687072226636
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1864274299572146969}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &953736533333891260
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1864274299572146969}
|
||||
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: 1, g: 0.93333334, b: 0.8392157, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
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: 3
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_LineSpacing: 1
|
||||
m_Text: 2/2
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &2063991881770354046
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -2767,6 +2847,7 @@ RectTransform:
|
|||
- {fileID: 8669047331830701111}
|
||||
- {fileID: 5660903253093529981}
|
||||
- {fileID: 6713643918384602890}
|
||||
- {fileID: 1121365959429271992}
|
||||
- {fileID: 4062633902952021743}
|
||||
m_Father: {fileID: 3026942363793877950}
|
||||
m_RootOrder: 4
|
||||
|
@ -9834,7 +9915,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1350465337999593540}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
|
|
@ -64,6 +64,8 @@ function this.UpdateStatus()
|
|||
local temp = TaskManager.GetTypeTaskList(TaskTypeDef.NiuQiChongTian)
|
||||
for k,v in pairs(this.rewardData) do
|
||||
v.state = temp[v.id].state
|
||||
LogGreen("Id:"..v.id.." progress:"..tostring(temp[v.id].progress))
|
||||
v.progress = temp[v.id].progress
|
||||
end
|
||||
CheckRedPointStatus(RedPointType.NiuQiChongTian_1)
|
||||
CheckRedPointStatus(RedPointType.NiuQiChongTian_2)
|
||||
|
@ -80,6 +82,8 @@ function this.CreatSingleData(sData)
|
|||
data.Type = sData.Type
|
||||
data.state = 0
|
||||
data.jumpId = sData.JumpID
|
||||
data.value = sData.ValuesII
|
||||
data.progress = 0
|
||||
return data
|
||||
end
|
||||
|
||||
|
|
|
@ -219,6 +219,7 @@ function NiuQiChongTianPanel:SingleDataShow(go, index,data)
|
|||
local rewardList = Util.GetGameObject(go, "rewardList")
|
||||
local grid = Util.GetGameObject(go, "rewardList")
|
||||
local shadow = Util.GetGameObject(go, "shadow")
|
||||
local progress = Util.GetGameObject(go, "progress"):GetComponent("Text")
|
||||
|
||||
local shows = data.Reward
|
||||
title.text = GetLanguageStrById(data.Text)
|
||||
|
@ -226,6 +227,12 @@ function NiuQiChongTianPanel:SingleDataShow(go, index,data)
|
|||
btn.interactable = data.state ~= 2
|
||||
btnImg.sprite = self.spLoader:LoadSprite(BtnState[data.state].ImgName)
|
||||
btnText.text = BtnState[data.state].Text
|
||||
if data.state == 0 and self.curPage ~= 2 then
|
||||
progress.gameObject:SetActive(true)
|
||||
progress.text = string.format( "%s/%s",data.progress,data.value[2][1])
|
||||
else
|
||||
progress.gameObject:SetActive(false)
|
||||
end
|
||||
--滚动条复用重设itemview
|
||||
if self.itemsGrid[go] then
|
||||
for i = 1, 4 do
|
||||
|
|
Loading…
Reference in New Issue