【按钮优化】累计充值 主题任务 通关好礼

dev_chengFeng
ZhangBiao 2021-01-28 10:19:38 +08:00
parent 3fed23cbe0
commit dbf91a5db4
5 changed files with 239 additions and 113 deletions

View File

@ -317,7 +317,7 @@ RectTransform:
- {fileID: 1920011930119483693}
- {fileID: 5891043179852445327}
- {fileID: 2455317896006654691}
- {fileID: 2374190210062659520}
- {fileID: 8691724688550707523}
- {fileID: 6017491746640892995}
- {fileID: 4726411301596622647}
m_Father: {fileID: 3548071070586436623}
@ -1092,102 +1092,6 @@ Animator:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &3017995108204339187
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2374190210062659520}
- component: {fileID: 8805007153718656680}
- component: {fileID: 957472998741853857}
- component: {fileID: 5828153174236512654}
m_Layer: 5
m_Name: getFinishText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &2374190210062659520
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3017995108204339187}
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: 3684421727810690695}
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}
m_AnchoredPosition: {x: 309.59998, y: 4.4000015}
m_SizeDelta: {x: 193.34, y: 62.19}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8805007153718656680
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3017995108204339187}
m_CullTransparentMesh: 0
--- !u!114 &957472998741853857
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3017995108204339187}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_EffectColor: {r: 0.35686275, g: 0.15294118, b: 0.050980393, a: 1}
m_EffectDistance: {x: 1, y: -1}
m_UseGraphicAlpha: 1
--- !u!114 &5828153174236512654
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3017995108204339187}
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: 1, b: 1, 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: 44
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 44
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 1
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u5DF2\u9886\u53D6"
LanguageIndex: 10004
--- !u!1 &3040413728214008313
GameObject:
m_ObjectHideFlags: 0
@ -1975,7 +1879,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &6017491746640892995
RectTransform:
m_ObjectHideFlags: 0
@ -2782,3 +2686,221 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u9886\u53D6"
LanguageIndex: 10002
--- !u!1 &6401957431770552462
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5441531830610816261}
- component: {fileID: 1141960830416677198}
- component: {fileID: 5091757362806698573}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5441531830610816261
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6401957431770552462}
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: 8691724688550707523}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -1.800003, y: -0.40000153}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1141960830416677198
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6401957431770552462}
m_CullTransparentMesh: 0
--- !u!114 &5091757362806698573
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6401957431770552462}
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.35686275, g: 0.15294118, b: 0.050980393, 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: 45
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 49
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u5DF2\u9886\u53D6"
LanguageIndex: 10002
--- !u!1 &7136142060954008968
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8691724688550707523}
- component: {fileID: 1511810847900198814}
- component: {fileID: 5592926320190182642}
- component: {fileID: 4996240875599771961}
- component: {fileID: 6290671503500268472}
m_Layer: 5
m_Name: getFinishText
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8691724688550707523
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7136142060954008968}
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: 5441531830610816261}
m_Father: {fileID: 3684421727810690695}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 758.1, y: -113.7}
m_SizeDelta: {x: 210.65, y: 77.61}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1511810847900198814
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7136142060954008968}
m_CullTransparentMesh: 0
--- !u!114 &5592926320190182642
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7136142060954008968}
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: 1, g: 1, b: 1, 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_Sprite: {fileID: 21300000, guid: addacd5860691b74db509358d99a6dfb, type: 3}
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 &4996240875599771961
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7136142060954008968}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 3
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 5592926320190182642}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!95 &6290671503500268472
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7136142060954008968}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0

View File

@ -146,11 +146,11 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
m_FontSize: 36
m_FontSize: 45
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 40
m_MaxSize: 45
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
@ -913,7 +913,7 @@ GameObject:
- component: {fileID: 4605831712976354441}
- component: {fileID: 5116607775713916321}
m_Layer: 5
m_Name: page_3
m_Name: page1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -1083,7 +1083,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7863140877775700190
RectTransform:
m_ObjectHideFlags: 0

View File

@ -250,7 +250,7 @@ function CourtesyDressPanel:ScrollActivityDataShow(item, index, data, activityTy
local nextOpenBtnText = Util.GetGameObject(item, "nextDayOpenBtn/Text"):GetComponent("Text")
local getRewardBtn = Util.GetGameObject(item, "getRewardBtn")
local getFinishText = Util.GetGameObject(item, "getFinishText")
local getRewardProgress = Util.GetGameObject(item, "getRewardProgress"):GetComponent("Text")
local getRewardProgress = Util.GetGameObject(item, "getRewardProgress"):SetActive(false)
--local redPoint = Util.GetGameObject(item, "getRewardBtn/redPoint")
if (activityType == ActivityTypeDef.EightDayGift) then
titleText.text = Language[10020] .. data.Sort .. Language[10021]
@ -279,14 +279,14 @@ function CourtesyDressPanel:ScrollActivityDataShow(item, index, data, activityTy
getRewardBtn:SetActive(false)
getFinishText:SetActive(false)
nextOpenBtn:SetActive(true)
getRewardProgress.text = "(0/1)"
-- getRewardProgress.text = "(0/1)"
end
if (data.Sort <= isCanReward and getRewardState[data.Id] == 0) then
getRewardBtn:SetActive(true)
getFinishText:SetActive(false)
nextOpenBtn:SetActive(false)
--redPoint:SetActive(true)
getRewardProgress.text = "(1/1)"
-- getRewardProgress.text = "(1/1)"
if (index == 1) then
jumpNeedBtn = getRewardBtn
end
@ -295,7 +295,8 @@ function CourtesyDressPanel:ScrollActivityDataShow(item, index, data, activityTy
getRewardBtn:SetActive(false)
getFinishText:SetActive(true)
nextOpenBtn:SetActive(false)
getRewardProgress.text = "(1/1)"
Util.SetGray(getFinishText,true)
-- getRewardProgress.text = "(1/1)"
end
else
local isPass = FightPointPassManager.GetFightStateById(data.Values[1][1]) == FIGHT_POINT_STATE.PASS
@ -303,20 +304,21 @@ function CourtesyDressPanel:ScrollActivityDataShow(item, index, data, activityTy
getRewardBtn:SetActive(true)
getFinishText:SetActive(false)
nextOpenBtn:SetActive(false)
getRewardProgress.text = "(1/1)"
-- getRewardProgress.text = "(1/1)"
if (index == 1) then
jumpNeedBtn = getRewardBtn
end
elseif isPass and getRewardState[data.Id] == 1 then
getRewardBtn:SetActive(false)
getFinishText:SetActive(true)
Util.SetGray(getFinishText,true)
nextOpenBtn:SetActive(false)
getRewardProgress.text = "(1/1)"
-- getRewardProgress.text = "(1/1)"
else
getRewardBtn:SetActive(false)
getFinishText:SetActive(false)
nextOpenBtn:SetActive(true)
getRewardProgress.text = "(0/1)"
-- getRewardProgress.text = "(0/1)"
end
end
Util.AddOnceClick(getRewardBtn, function()

View File

@ -241,10 +241,11 @@ function this.SingleDataShow(pre,value)
local red = Util.GetGameObject(lingquButton.gameObject, "redPoint")
red:SetActive(state == 1)
Util.GetGameObject(lingquButton.gameObject, "Button/Text"):GetComponent("Text").text = type[state].text
Util.GetGameObject(lingquButton.gameObject, "Button"):GetComponent("Image").sprite = Util.LoadSprite(type[state].sprite)
Util.GetGameObject(lingquButton.gameObject, "Button").gameObject:SetActive(state ~= 2)
Util.GetGameObject(lingquButton.gameObject, "image").gameObject:SetActive(state == 2)
local btn = Util.GetGameObject(lingquButton.gameObject, "Button")
Util.GetGameObject(btn, "Text"):GetComponent("Text").text = type[state].text
btn:GetComponent("Image").sprite = Util.LoadSprite(type[state].sprite)
btn:GetComponent("Button").enabled = state ~= 2
Util.SetGray(btn,state == 2)
Util.AddOnceClick(Util.GetGameObject(lingquButton.gameObject, "Button"), function()
if state == 1 then

View File

@ -169,6 +169,7 @@ function this.SingleDataShow(pre,value)
Util.GetGameObject(lingquButton.gameObject, "price"):GetComponent("Text").text = type[state].text
lingquButton:GetComponent("Image").sprite = Util.LoadSprite(type[state].sprite)
lingquButton:GetComponent("Button").enabled = (state ~= 1)
Util.SetGray(lingquButton,state == 1)
Util.AddOnceClick(lingquButton, function()
if state == 2 then