chichafengyun icon 提交,开服福利添加动画

jiaoyangna 2020-09-11 11:47:55 +08:00
parent 8454ba4015
commit b0280552a1
5 changed files with 185 additions and 22 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: be0a2563396e6a24f9dd5e765f5e8f33
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 2bed79db2a030254184ca955b7d4a88f
vertices: []
indices:
edges: []
weights: []
spritePackingTag: MainAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -25,11 +25,11 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 195598563839727006}
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_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 9053343245304168271}
m_Father: {fileID: 5353316285221063870}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -728,7 +728,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3396995828663788262}
m_Father: {fileID: 9053343245304168271}
m_Father: {fileID: 5353316285221063870}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
@ -863,7 +863,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 9053343245304168271}
m_Father: {fileID: 5353316285221063870}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -938,7 +938,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5521731061797254459}
m_Father: {fileID: 9053343245304168271}
m_Father: {fileID: 5353316285221063870}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -1166,7 +1166,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 9053343245304168271}
m_Father: {fileID: 5353316285221063870}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -1246,7 +1246,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 9053343245304168271}
m_Father: {fileID: 5353316285221063870}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -1341,7 +1341,7 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 9053343245304168271}
m_Father: {fileID: 5353316285221063870}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -1475,13 +1475,14 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 9053343245304168271}
- component: {fileID: 5131262180630368864}
m_Layer: 5
m_Name: rewardPre
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &9053343245304168271
RectTransform:
m_ObjectHideFlags: 0
@ -1493,22 +1494,44 @@ RectTransform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4682586752510086079}
- {fileID: 2253953398044893657}
- {fileID: 5980144258678500786}
- {fileID: 5277688751061807496}
- {fileID: 1540167191899536294}
- {fileID: 309736676202243045}
- {fileID: 901535261340262834}
- {fileID: 757560583063933138}
- {fileID: 5353316285221063870}
m_Father: {fileID: 361156968702865171}
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: -1.5000001, y: 345}
m_AnchoredPosition: {x: -3245, y: 340}
m_SizeDelta: {x: 900, y: 224}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &5131262180630368864
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7804127822467120640}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenSequeue:
- initV3: {x: 230, y: 0, z: 0}
initFloat: 0
isInit: 1
changeV3: {x: 0, y: 0, z: 0}
changeFloat: 0
duration: 0.15
delay: 0
curveType: 11
changeType: 0
sequeueType: 1
loop: 0
loopType: 0
targetObj: {fileID: 5353316285221063870}
isPlayAudio: 1
isHaveCloseBtn: 0
isPlayOnOpen: 0
--- !u!1 &7821570915007494527
GameObject:
m_ObjectHideFlags: 0
@ -1583,6 +1606,49 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &7884010962735593673
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5353316285221063870}
m_Layer: 5
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5353316285221063870
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7884010962735593673}
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: 4682586752510086079}
- {fileID: 2253953398044893657}
- {fileID: 5980144258678500786}
- {fileID: 5277688751061807496}
- {fileID: 1540167191899536294}
- {fileID: 309736676202243045}
- {fileID: 901535261340262834}
- {fileID: 757560583063933138}
m_Father: {fileID: 9053343245304168271}
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: 0, y: 0}
m_SizeDelta: {x: 900, y: 224}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8924498035348377815
GameObject:
m_ObjectHideFlags: 0
@ -1616,7 +1682,7 @@ RectTransform:
m_Children:
- {fileID: 6383796309620069328}
- {fileID: 4616335173819957655}
m_Father: {fileID: 9053343245304168271}
m_Father: {fileID: 5353316285221063870}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}

View File

@ -2,6 +2,7 @@
OpenSeverWelfarePanel = Inherit(BasePanel)
local this = OpenSeverWelfarePanel
local activityRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardConfig)
local isPlayAnim = true
--初始化组件(用于子类重写)
function OpenSeverWelfarePanel:InitComponent()
this.closeBtn = Util.GetGameObject(self.transform, "bg/closeBtn")
@ -39,6 +40,7 @@ end
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
function OpenSeverWelfarePanel:OnShow()
isPlayAnim = true
this.OnShowPanelData()
end
function OpenSeverWelfarePanel:OnSortingOrderChange()
@ -62,12 +64,20 @@ function this.OnShowPanelData()
this.ScrollView:SetData(activityData.mission, function (index, go)
this.SingleDataShow(go, activityData.mission[index])
end)
if isPlayAnim then
SecTorPlayAnimByScroll(this.ScrollView)
isPlayAnim = false
end
end
end
function this.SingleDataShow(go,rewardData)
local activityRewardGo = go
activityRewardGo:SetActive(true)
if isPlayAnim then
activityRewardGo:SetActive(false)
else
activityRewardGo:SetActive(true)
end
local sConFigData = activityRewardConfig[rewardData.missionId]
local titleText = Util.GetGameObject(activityRewardGo, "titleImage/titleText"):GetComponent("Text")
titleText.text = sConFigData.ContentsShow

View File

@ -51,7 +51,7 @@ local lightList = {
local mainDynamicActivityIcon = {
[1] = "r_zjm_huodongicon-pozhenzhuxian", --破阵诛仙
[2] = "r_zjm_huodongicon-yongguansanjun", -- 勇冠三军
[3] = "r_zjm_huodongicon-pozhenzhuxian", --叱咤风云
[3] = "r_zjm_huodongicon-chichafenyun", --叱咤风云
}
function this:AddFuncItem(btnGO, pos)
return {go = btnGO, open = Util.GetGameObject(btnGO, "open"), lock = Util.GetGameObject(btnGO, "lock"), pos = pos}
@ -1605,7 +1605,6 @@ function this.RefreshActivityBtn(context)
elseif context.type==ActivityTypeDef.DynamicAct then
isRefeshIcon = true
LogBlue("11111111111111111111111111111111111111111")
this.btnDynamicActivity:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct))
end
if ActTimeCtrlManager.IsQualifiled(42) then