活动 提交

dev_chengFeng
jiaoyangna 2021-03-30 18:26:10 +08:00
parent a0552233ae
commit c2fac79eca
48 changed files with 16563 additions and 2476 deletions

View File

@ -41,7 +41,7 @@ TextureImporter:
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@ -134,7 +134,7 @@ TextureImporter:
indices:
edges: []
weights: []
spritePackingTag:
spritePackingTag: EightDayAtlas
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6b70977931326b54eb4026ab12e933be
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d18b5313e980cc243814daeada265dc2
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,701 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI_Effect_MianBan_LiBao_button_01_anim
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.2924528
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6
value: 0.2924528
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.5
value: 0.2924528
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.9
value: 0.2924528
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material._TintColor.r
path: saoguang (1)
classID: 23
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.25831035
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6
value: 0.25831035
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.5
value: 0.25831035
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.9
value: 0.25831035
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material._TintColor.g
path: saoguang (1)
classID: 23
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.13932894
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6
value: 0.13932894
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.5
value: 0.13932894
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.9
value: 0.13932894
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material._TintColor.b
path: saoguang (1)
classID: 23
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6
value: 0.5882353
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.5
value: 0.5882353
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.9
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material._TintColor.a
path: saoguang (1)
classID: 23
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.9
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material._MainTex_ST.x
path: saoguang (1)
classID: 23
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.9
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material._MainTex_ST.y
path: saoguang (1)
classID: 23
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.41
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.9
value: -1.4
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material._MainTex_ST.z
path: saoguang (1)
classID: 23
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.9
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material._MainTex_ST.w
path: saoguang (1)
classID: 23
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 1672172905
attribute: 1895888582
script: {fileID: 0}
typeID: 23
customType: 22
isPPtrCurve: 0
- serializedVersion: 2
path: 1672172905
attribute: 646366601
script: {fileID: 0}
typeID: 23
customType: 22
isPPtrCurve: 0
- serializedVersion: 2
path: 1672172905
attribute: 1090582214
script: {fileID: 0}
typeID: 23
customType: 22
isPPtrCurve: 0
- serializedVersion: 2
path: 1672172905
attribute: 1359017670
script: {fileID: 0}
typeID: 23
customType: 22
isPPtrCurve: 0
- serializedVersion: 2
path: 1672172905
attribute: 1627453126
script: {fileID: 0}
typeID: 23
customType: 22
isPPtrCurve: 0
- serializedVersion: 2
path: 1672172905
attribute: 109495689
script: {fileID: 0}
typeID: 23
customType: 22
isPPtrCurve: 0
- serializedVersion: 2
path: 1672172905
attribute: 377931145
script: {fileID: 0}
typeID: 23
customType: 22
isPPtrCurve: 0
- serializedVersion: 2
path: 1672172905
attribute: 914802057
script: {fileID: 0}
typeID: 23
customType: 22
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 2.9
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.2924528
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6
value: 0.2924528
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.5
value: 0.2924528
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.9
value: 0.2924528
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material._TintColor.r
path: saoguang (1)
classID: 23
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.25831035
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6
value: 0.25831035
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.5
value: 0.25831035
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.9
value: 0.25831035
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material._TintColor.g
path: saoguang (1)
classID: 23
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.13932894
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6
value: 0.13932894
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.5
value: 0.13932894
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.9
value: 0.13932894
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material._TintColor.b
path: saoguang (1)
classID: 23
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.6
value: 0.5882353
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.5
value: 0.5882353
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.9
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material._TintColor.a
path: saoguang (1)
classID: 23
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.9
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material._MainTex_ST.x
path: saoguang (1)
classID: 23
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.9
value: 1
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material._MainTex_ST.y
path: saoguang (1)
classID: 23
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.41
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.9
value: -1.4
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material._MainTex_ST.z
path: saoguang (1)
classID: 23
script: {fileID: 0}
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 2.9
value: 0
inSlope: 0
outSlope: 0
tangentMode: 136
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: material._MainTex_ST.w
path: saoguang (1)
classID: 23
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0be4d9cf4af950d4b8d2f3ec13e44363
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI_Effect_MianBan_LiBao_button_01_ctr
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 1107715638252474986}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &1102662919027858254
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI_Effect_MianBan_LiBao_button_01
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 0be4d9cf4af950d4b8d2f3ec13e44363, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &1107715638252474986
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1102662919027858254}
m_Position: {x: 204, y: 0, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 1102662919027858254}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 5cba8a37bfe5dac408727bfdf1ffb40d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: aaa32a8edb418ff4ead0795c13facfd8
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,36 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI_Effect_TouXiang_Lanlong_01
m_Shader: {fileID: 4800000, guid: 508f1ff17d221c748927a8db3bc7ee3f, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _Lin:
m_Texture: {fileID: 2800000, guid: 1556ba40063954e4a9376d89eb48a29e, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 676add6677a496a4fa44daf160b3f619, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _InvFade: 1
- _Num: 0.3
- _Speed: 0.4
m_Colors:
- _MainColor: {r: 1, g: 1, b: 1, a: 0}
- _TintColor: {r: 1, g: 1, b: 1, a: 0.83137256}

View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 0ba8e1f7539fa5b4987a656b2012d5d5
timeCreated: 1528724438
licenseType: Pro
NativeFormatImporter:
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,124 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: dajin_effect_15_lz_01
m_Shader: {fileID: 4800000, guid: 90b3ba6f62b8edd459b20422a5c5d61a, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DissolveSrc:
m_Texture: {fileID: 2800000, guid: a522db3de7bf79b4687234f73dc2031a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DissolveTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 009e962e487024649b6733b303731a4e, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: -0.41, y: 0}
- _Mask:
m_Texture: {fileID: 2800000, guid: bb880b14f2456f347836e48a5ae490de, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MaskTex:
m_Texture: {fileID: 2800000, guid: 064b311ca0c97a0438a84c77d7271da7, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Tex:
m_Texture: {fileID: 2800000, guid: 9fa93b3af64a2204aad0d86d0a92f4d1, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _Amount: 0.28
- _BlendMode: 0
- _BlendOp: -1
- _BumpScale: 1
- _CullMode: 0
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _Dissolve: 0
- _DissolveEdge: 0
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Illuminate: 0
- _InvFade: 0.01
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _PZWrite: 0
- _Parallax: 0.02
- _QueueOffset: 0
- _RenderMode: 0
- _ReplaySpeed: 4
- _Shininess: 0.03
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _StartAmount: 0.1
- _Thickness: 0
- _Tile: 1
- _U: 0
- _UVSec: 0
- _V: 0.4
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorAnimate: {r: 0.15, g: 0.15, b: 1, a: 1}
- _Color_wai: {r: 0.41509432, g: 0.36268163, b: 0.26041293, a: 1}
- _DissColor: {r: 1, g: 1, b: 1, a: 1}
- _EdgeColor: {r: 1, g: 0.8, b: 0.3, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _NumTexTiles: {r: 4, g: 4, b: 0, a: 0}
- _Scrolls: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
- _Tiling: {r: 2, g: 2, b: 2, a: 1}
- _TintColor: {r: 0.2924528, g: 0.25831035, b: 0.13932894, a: 1}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 5a54d73dbc6d1944e9f72ce85d4a1191
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d8664d8092fb5ba47a373e9bfdd8c5fd
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,82 @@
fileFormatVersion: 2
guid: 2537ff16ece60b846add6e54c8ba9a5a
timeCreated: 1484815182
licenseType: Pro
ModelImporter:
serializedVersion: 19
fileIDToRecycleName:
100000: //RootNode
400000: //RootNode
2300000: //RootNode
3300000: //RootNode
4300000: Plane001
materials:
importMaterials: 0
materialName: 0
materialSearch: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
clipAnimations: []
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
importBlendShapes: 1
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
optimizeMeshForGPU: 1
keepQuads: 0
weldVertices: 1
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
importAnimation: 0
copyAvatar: 0
humanDescription:
serializedVersion: 2
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
rootMotionBoneName:
rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 0
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 0
humanoidOversampling: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 4e3de84e62255e14e8db20e26171296e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 8c814567b148a2048bab0abcfc1eb94b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: ae2f52df422a8f949a979548af759be8
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: ee9304e5f1d403d4ea55d2f19fafa324
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 03c6c2e248c72574dbaa2c47f6923d2d
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 12b6e67638c13b84b875e865513e0095
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,27 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: H_0975_01
m_Shader: {fileID: 10720, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: f06b7bcde44c5394295ced44ac9289c8, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats: []
m_Colors: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f1844f9894f60fa49877c96a18d81de4
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 29be57456472b88419fdbd56ca949124
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f6508dd0a883cee41a942c7e1545545a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3ccac246022894343b9aa394e169dce7
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 43425ee5dac0a2d45afddc47ca75e237
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,59 @@
fileFormatVersion: 2
guid: 009e962e487024649b6733b303731a4e
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 0
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 1024
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 0
textureType: 5
buildTargetSettings:
- buildTarget: iPhone
maxTextureSize: 1024
textureFormat: 32
compressionQuality: 50
- buildTarget: Standalone
maxTextureSize: 1024
textureFormat: 10
compressionQuality: 50
- buildTarget: Android
maxTextureSize: 256
textureFormat: 45
compressionQuality: 50
spriteSheet:
sprites: []
spritePackingTag:
userData:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: aeb011b9a27e49449b2c1ac862876f6c
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,68 @@
fileFormatVersion: 2
guid: 676add6677a496a4fa44daf160b3f619
timeCreated: 1519806733
licenseType: Pro
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 4
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1698,6 +1698,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2265465264857924457}
- {fileID: 4744428278025829081}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -3426,3 +3427,133 @@ MonoBehaviour:
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!1001 &7331318982885401276
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 186607428668674391}
m_Modifications:
- target: {fileID: 2623781795014531170, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_Name
value: UI_Effect_MianBan_LiBao_button_01
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531170, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.000061035156
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ee9304e5f1d403d4ea55d2f19fafa324, type: 3}
--- !u!224 &4744428278025829081 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2623781795014531173, guid: ee9304e5f1d403d4ea55d2f19fafa324,
type: 3}
m_PrefabInstance: {fileID: 7331318982885401276}
m_PrefabAsset: {fileID: 0}

File diff suppressed because it is too large Load Diff

View File

@ -349,7 +349,8 @@ function this:RefreshTimes()
Util.AddOnceClick(
Util.GetGameObject(this.vipTips.gameObject, "GameObject"),
function()
UIManager.OpenPanel(UIName.MainRechargePanel, 3)
DynamicActivityManager.SetSelectIndex(DataType.Direct,{4003})
JumpManager.GoJump(36006)
end
)
end

View File

@ -143,7 +143,6 @@ function DailyRechargePanel:OnDealBtnClicked()
end
self:ClosePanel()
end
end
return DailyRechargePanel

View File

@ -154,9 +154,9 @@ end
-- tab改变事件
function this.OnPageTabChange(index)
if index == _CurPageIndex then
return
end
-- if index == _CurPageIndex then
-- return
-- end
if subViewList[_CurPageIndex] and subViewList[_CurPageIndex].config and subViewList[_CurPageIndex].sub then
subViewList[_CurPageIndex].sub:OnClose()
end

View File

@ -5,9 +5,16 @@ local shopItemConfig = ConfigManager.GetConfig(ConfigName.StoreConfig)
local rechargeCommodityConfig = ConfigManager.GetConfig(ConfigName.RechargeCommodityConfig)
local actRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardConfig)
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
local GlobalActivity = ConfigManager.GetConfig(ConfigName.GlobalActivity)
this.curLevel = 0--社稷大典的等级
this.curActivityType = 0
this.OpenUIList = {}
this.selectIndex = {dataType = 0,goodsId = {}}
function this.SetSelectIndex(dataType,goodsId)
this.selectIndex.dataType = dataType
this.selectIndex.goodsId = goodsId
end
function this.Initialize()
end
@ -489,7 +496,7 @@ function this.GetGiftDataByType(ShopData)
elseif ShopData[i][1] == 2 then
local topspeedData = this.ResetShopData(ShopManager.GetShopDataByType(ShopData[i][2]).storeItem, ShopData[i][2], ShopData[i][1])
for i = 1, #topspeedData do
if rechargeNum >= topspeedData[i].data.shopItemData.ShowRule[2] then
if (not topspeedData[i].data.shopItemData.ShowRule) or (rechargeNum >= topspeedData[i].data.shopItemData.ShowRule[2]) then
table.insert(shopData,topspeedData[i])
end
end
@ -590,9 +597,11 @@ end
function this.GetMissionDataByActId(activityId)
local actiInfo = ActivityGiftManager.GetActivityInfoByType(activityId)
local havaBought = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, GlobalActivity[activityId].CanBuyRechargeId[1])--当前礼包ID(101\102\103\104\105)
local data = {}
LogGreen("actiInfo.mission:"..#actiInfo.mission)
for k,v in ipairs(actiInfo.mission) do
table.insert(data,this.CreatSingleMissionData(v))
table.insert(data,this.CreatSingleMissionData(v,havaBought))
end
table.sort(data, function(a, b)
if a.state == 0 and b.state ~= 0 then
@ -606,27 +615,30 @@ function this.GetMissionDataByActId(activityId)
end
return a.state < b.state
end)
return data
end
function this.CreatSingleMissionData(missionData)
function this.CreatSingleMissionData(missionData,havaBought)
local data = {}
data.missionId = missionData.missionId
data.shows = actRewardConfig[missionData.missionId].Reward
data.title = itemConfig[data.shows[1][1]].Name
data.itemName = itemConfig[data.shows[1][1]].Name
data.content = "达到"..actRewardConfig[data.missionId].Values[1][2].."级可领取"
data.isCanGetReward = PlayerManager.level >= actRewardConfig[data.missionId].Values[1][2]
data.goods = OperatingManager.GetHadBuyGoodsTypeId(GoodsTypeDef.GrowthReward)--已购买礼包ID
data.state = data.state
--0 未领取(已达到条件) 1 已领取 -1 未达到等级 2可领取
--0 未领取(已达到条件) 1 已领取 -1 未达到等级 2可领取
if data.state == 0 then
if PlayerManager.level < actRewardConfig[data.missionId].Values[1][2] then
state = -1
elseif self.gift.buyTimes > 0 then
state = 2
data.state = -1
elseif havaBought.buyTimes > 0 then
data.state = 2
end
else
state = data.state
data.state = data.state
end
return data
end
return this

View File

@ -78,7 +78,7 @@ function FastExploreInfoPopup:BindEvent()
Util.AddClick(this.privilegeGo, function()
local isActive = PrivilegeManager.GetPrivilegeOpenStatusById(33)
if not isActive then
UIManager.OpenPanel(UIName.MainRechargePanel, 3)
JumpManager.GoJump(36006)
end
end)
end

View File

@ -35,7 +35,7 @@ function FightAreaRewardPopup:BindEvent()
-- Util.AddClick(this.privilegeGo, function()
-- local isActive = PrivilegeManager.GetPrivilegeOpenStatusById(35)
-- if not isActive then
-- UIManager.OpenPanel(UIName.MainRechargePanel, 3)
-- JumpManager.GoJump(36006)
-- end
-- end)
end

View File

@ -75,6 +75,7 @@ function FindTreasureMainPanel:BindEvent()
self:ClosePanel()
end)
Util.AddClick(self.goBtn, function()
DynamicActivityManager.SetSelectIndex(DataType.Shop,{20091,20092})
JumpManager.GoJump(MazeTreasureSetting[1].Jump)
end)
Util.AddClick(self.materialImageBg, function()

View File

@ -24,10 +24,14 @@ end
function GrowthGiftPage:InitComponent()
--定义头部文字和按钮
self.bg = Util.GetGameObject(self.gameObject, "rzyBg")
self.tip = Util.GetGameObject(self.gameObject, "rzyBg/bg/tip"):GetComponent("Text")
self.tip.text = "超值返利,累计可获<color=#FF6500>10000</color>妖晶"
self.titleBgIma = Util.GetGameObject(self.bg,"bg"):GetComponent("Image")
self.titleIma = Util.GetGameObject(self.bg,"titleIma"):GetComponent("Image")
self.titleTipBg = Util.GetGameObject(self.bg,"titleTipBg"):GetComponent("Image")
self.titleTip = Util.GetGameObject(self.bg,"titleTip"):GetComponent("Text")
self.btnInvest = Util.GetGameObject(self.gameObject, "rzyBg/bg/btnInvest")
self.btnInvestText = Util.GetGameObject(self.gameObject, "rzyBg/bg/btnInvest/Text"):GetComponent("Text")
--滚动条和预设
self.scrollItem = Util.GetGameObject(self.gameObject, "rzyBg/scrollItem")
self.itemPre = Util.GetGameObject(self.gameObject, "rzyBg/ItemPre")
@ -41,7 +45,7 @@ function GrowthGiftPage:InitComponent()
end
--绑定事件(用于子类重写)
function GrowthGiftPage:BindEvent()
function GrowthGiftPage:BindEvent()
Util.AddOnceClick(self.btnInvest,function()
self:OnBtnInvestClicked()
end)
@ -49,12 +53,10 @@ end
--添加事件监听(用于子类重写)
function GrowthGiftPage:AddListener()
end
--移除事件监听(用于子类重写)
function GrowthGiftPage:RemoveListener()
end
--界面打开时调用(用于子类重写)
@ -67,7 +69,9 @@ end
-- 打开,重新打开时回调
function GrowthGiftPage:OnShow(_sortingOrder)
self.gameObject:SetActive(true)
sortingOrder = _sortingOrder
if _sortingOrder then
sortingOrder = _sortingOrder
end
self.curActiId = self.actConfig.ActId
self.actType = self.actConfig.ActiveType
@ -83,12 +87,34 @@ function GrowthGiftPage:OnShow(_sortingOrder)
end
end
end
if self.actConfig.Icon[3] and self.actConfig.Icon[3] ~= "" then
self.titleBgIma.sprite = Util.LoadSprite(self.actConfig.Icon[3])
end
if self.actConfig.Icon[4] and self.actConfig.Icon[4] ~= "" then
self.titleIma.gameObject:SetActive(true)
self.titleIma.sprite = Util.LoadSprite(self.actConfig.Icon[4])
self.titleIma:SetNativeSize()
self.titleIma.transform.localPosition = Vector3.New(self.actConfig.TitleImapos[1],self.actConfig.TitleImapos[2],self.actConfig.TitleImapos[3])
else
self.titleIma.gameObject:SetActive(false)
end
local str = string.split(self.actConfig.TitleText,"|")
if str[1] and str[1] ~= "" then
self.titleTip.text = str[1]
self.titleTip.transform.localPosition = Vector3.New((str[2] or 0),(str[3] or 0),(str[4] or 0))
self.titleTip.gameObject:SetActive(true)
else
self.titleTip.gameObject:SetActive(false)
end
self.curGiftsId = GlobalActivity[self.curActiId].CanBuyRechargeId[1]
self:RefreshData()
end
function GrowthGiftPage:RefreshData()
self:SetBtnInvestState()
if self.actType == ActivityTypeDef.GrowthReward then
self:SetBtnInvestState()
self.clickFun = self.GrowthGiftPageOnClick
end
self:RefreshGiftData(true)
end
@ -108,81 +134,29 @@ function GrowthGiftPage:SetBtnInvestState()
end
function GrowthGiftPage:RefreshGiftData(anim)
self.actiInfo = ActivityGiftManager.GetActivityInfoByType(self.curActiId)
table.sort(self.actiInfo.mission, function(a, b)
if a.state == 0 and b.state ~= 0 then
return true
end
if a.state ~= 0 and b.state == 0 then
return false
end
if a.state == b.state then
return a.missionId < b.missionId
end
return a.state < b.state
end)
self.mission = DynamicActivityManager.GetMissionDataByActId(self.curActiId)
if not self.missionPre then
self.missionPre = {}
end
for k,v in pairs(self.missionPre) do
v.gameObject:SetActive(false)
end
self.scrollView:ForeachItemGO(function (index, go)
go.gameObject:SetActive(false)
end)
self.scrollView:SetData(self.actiInfo.mission, function(index, item)
self:RefreshShowData(item, self.actiInfo.mission[index])
self.scrollView:SetData(self.mission, function(index, item)
self:RefreshShowData(item, self.mission[index])
end,not anim)
end
--刷新每一条item
function GrowthGiftPage:RefreshShowData(item, data)
if not self.missionPre[item] then
self.missionPre[item] = SubUIManager.Open(SubUIConfig[360],item.transform)
local config = SubUIConfig[self.actConfig.UIName[2]]
self.missionPre[item] = SubUIManager.Open(config,item.transform)
end
self.missionPre[item].gameObject:SetActive(true)
local shows = actRewardConfig[data.missionId].Reward
local title = rewardNameConfig[shows[1][1]].Name
local content = "达到"..actRewardConfig[data.missionId].Values[1][2].."级可领取"
local isCanGetReward = PlayerManager.level >= actRewardConfig[data.missionId].Values[1][2]
local goods = OperatingManager.GetHadBuyGoodsTypeId(GoodsTypeDef.GrowthReward)--已购买礼包ID
local state = data.state
--0 未领取(已达到条件) 1 已领取 -1 未达到等级 2可领取
if data.state == 0 then
if PlayerManager.level < actRewardConfig[data.missionId].Values[1][2] then
state = -1
elseif self.gift.buyTimes > 0 then
state = 2
end
else
state = data.state
end
self.missionPre[item]:OnShow(shows,title,content,state,function()
end,function()
if state == -1 then
PopupTipPanel.ShowTip("未达到等级要求~~~")
elseif state == 2 then
NetManager.GetActivityRewardRequest(data.missionId,self.curActiId, function(drop)
UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1)
ActivityGiftManager.SetActivityInfo(self.curActiId, data.missionId, 1)
RedpotManager.CheckRedPointStatus(RedPointType.GrowthGift)
if self:CheckAllGet(self.curActiId,data.missionId) == 0 then
self:RefreshGiftData(false)
return
end
if(self.curActiId == 16)then--16是最后一个礼包的ActivityId
MsgPanel.ShowOne("恭喜!您已领取全部成长基金!")
else
MsgPanel.ShowOne("恭喜!您已激活更高等级成长基金,大量妖晶福利等您领取,快来激活吧!")
self:OnShow(sortingOrder)
end
end)
else
PopupTipPanel.ShowTip("请购买基金后领取")
end
end,function()
end,sortingOrder)
item.gameObject:SetActive(true)
self.missionPre[item]:SetData(data,self,sortingOrder,self.clickFun)
end
--检测是否全部已领取
@ -195,6 +169,30 @@ function GrowthGiftPage:CheckAllGet(curActiId,missionId)
end
return 1
end
function GrowthGiftPage.GrowthGiftPageOnClick(data,curActiId)
if data.state == -1 then
PopupTipPanel.ShowTip("未达到等级要求~~~")
elseif data.state == 2 then
NetManager.GetActivityRewardRequest(data.missionId,curActiId, function(drop)
UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1)
ActivityGiftManager.SetActivityInfo(curActiId, data.missionId, 1)
RedpotManager.CheckRedPointStatus(RedPointType.GrowthGift)
if this.CheckAllGet(curActiId,data.missionId) == 0 then
self:RefreshGiftData(false)
return
end
if(self.curActiId == 16)then--16是最后一个礼包的ActivityId
MsgPanel.ShowOne("恭喜!您已领取全部成长基金!")
else
MsgPanel.ShowOne("恭喜!您已激活更高等级成长基金,大量妖晶福利等您领取,快来激活吧!")
self:OnShow(sortingOrder)
end
end)
elseif data.state ~= 1 then
PopupTipPanel.ShowTip("请购买基金后领取")
end
end
--点击进行投资购买礼包
function GrowthGiftPage:OnBtnInvestClicked()

View File

@ -14,10 +14,7 @@ local rechargeNum
function MissionPre:InitComponent()
self.upLayout = Util.GetGameObject(self.gameObject, "bg/upLayout")
self.middleLayout = Util.GetGameObject(self.gameObject, "bg/middleLayout")
self.tipImage = Util.GetGameObject(self.upLayout, "tipImage")
self.tipText = Util.GetGameObject(self.tipImage, "Text"):GetComponent("Text")
self.tagIma = Util.GetGameObject(self.upLayout, "tag")
self.tagText = Util.GetGameObject(self.tagIma, "tagTxt"):GetComponent("Text")
self.type1 = Util.GetGameObject(self.upLayout, "type1")
self.type1Text1 = Util.GetGameObject(self.type1, "text1"):GetComponent("Text")
self.type1Text3 = Util.GetGameObject(self.type1, "text3"):GetComponent("Text")
@ -27,30 +24,24 @@ function MissionPre:InitComponent()
table.insert(self.numList,self.numGrid.transform:GetChild(i-1):GetComponent("Text"))
end
self.type2 = Util.GetGameObject(self.upLayout, "type2")
self.type2Ima = Util.GetGameObject(self.upLayout, "Image")
self.type2Icon1 = Util.GetGameObject(self.type2, "icon_1")
self.type2Text1 = Util.GetGameObject(self.type2, "text1"):GetComponent("Text")
self.type2Icon2 = Util.GetGameObject(self.type2, "icon_2")
self.type2Text2 = Util.GetGameObject(self.type2, "text2"):GetComponent("Text")
self.btnBuy = Util.GetGameObject(self.middleLayout, "btnBuy")
self.icon = Util.GetGameObject(self.btnBuy, "icon"):GetComponent("Image")
self.price = Util.GetGameObject(self.btnBuy, "price"):GetComponent("Text")
self.buyInfo = Util.GetGameObject(self.middleLayout, "buyInfo"):GetComponent("Text")
self.redPoint = Util.GetGameObject(self.btnBuy, "redPoint")
self.btnGet = Util.GetGameObject(self.middleLayout, "btnGet")
self.btnGetText = Util.GetGameObject(self.btnGet, "get"):GetComponent("Text")
self.redPoint = Util.GetGameObject(self.btnGet, "redPoint")
self.buyInfo = Util.GetGameObject(self.btnGet, "buyInfo"):GetComponent("Text")
self.shadow=Util.GetGameObject(self.middleLayout,"shadow")
self.grid = Util.GetGameObject(self.middleLayout, "scrollView/grid")
self.redpot = Util.GetGameObject(self.gameObject, "bg/redpot")
self.isCanBuy = 0
self.contents = Util.GetGameObject(self.middleLayout, "contents")
self.itemName = Util.GetGameObject(self.middleLayout, "contents/name"):GetComponent("Text")
self.content = Util.GetGameObject(self.middleLayout, "contents/condition"):GetComponent("Text")
self.data = {}
self.itemList = {}
end
--绑定事件(用于子类重写)
function MissionPre:BindEvent()
Util.AddOnceClick(self.btnBuy, function()
Util.AddOnceClick(self.btnGet, function()
self.data.OnClick(self.data,self.parent.curActiId)
end)
end
@ -65,39 +56,57 @@ end
function MissionPre:OnOpen()
end
function MissionPre:SetData(data,_parent,_rechargeNum,sortingOrder)
rechargeNum = _rechargeNum
function MissionPre:SetData(data,_parent,sortingOrder)
self.data = data
self.parent = _parent
if self.data.data.tagName and self.data.data.tagName ~= "" then
self.tagIma.gameObject:SetActive(true)
self.tagText.text = self.data.data.tagName
self.sortingOrder = sortingOrder
if self.data.title and self.data.title ~= "" then
self.upLayout.gameObject:SetActive(true)
else
self.tagIma.gameObject:SetActive(false)
self.upLayout.gameObject:SetActive(false)
end
if (not self.data.itemName or self.data.itemName == "") and (not self.data.content or self.data.content == "") then
self.contents:SetActive(false)
else
self.contents:SetActive(true)
end
if self.data.itemName and self.data.itemName ~= "" then
self.itemName.gameObject:SetActive(true)
self.itemName.text = self.data.itemName
else
self.itemName.gameObject:SetActive(false)
end
if self.data.content and self.data.content ~= "" then
self.content.gameObject:SetActive(true)
self.content.text = self.data.content
else
self.content.gameObject:SetActive(false)
end
if self.data.buyInfo and self.data.buyInfo ~= "" then
self.buyInfo.text = self.data.buyInfo
self.buyInfo.gameObject:SetActive(true)
else
self.buyInfo.gameObject:SetActive(false)
end
if not self.itemList then
self.itemList = {}
end
for i = 1, #self.itemList do
self.itemList[i].gameObject:SetActive(false)
end
for i = 1, #self.data.data.shows do
for i = 1, #self.data.shows do
if not self.itemList[i] then
self.itemList[i] = SubUIManager.Open(SubUIConfig.ItemView,self.grid.transform)
self.itemList[i].gameObject:SetActive(false)
end
self.itemList[i]:OnOpen(false, {self.data.data.shows[i][1],self.data.data.shows[i][2]}, 0.9,false,false,false,sortingOrder)
self.itemList[i]:OnOpen(false, {self.data.shows[i][1],self.data.shows[i][2]}, 0.9,false,false,false,sortingOrder)
self.itemList[i].gameObject:SetActive(true)
end
if self.data.data.tipImageText and self.data.data.tagName and self.data.data.tagName ~= "" then
self.tipImage.gameObject:SetActive(true)
self.tipText.text = self.data.data.tipImageText
else
self.tipImage.gameObject:SetActive(false)
end
self:SetIcon(self.data)
self:SetContent1()
end
@ -107,7 +116,19 @@ function MissionPre:SetContent1()
end
function MissionPre:SetIcon(_itemdata)
Util.SetGray(self.btnGet,false)
self.btnGet:GetComponent("Image").sprite = Util.LoadSprite("s_slbz_1anniuongse")
self.redPoint.gameObject:SetActive(false)
if self.data.state == -1 then
Util.SetGray(self.btnGet,true)
self.btnGetText.text = "领取"
elseif self.data.state == 2 then
self.redPoint.gameObject:SetActive(true)
self.btnGetText.text = "领取"
elseif self.data.state == 1 then
self.redPoint.gameObject:SetActive(false)
self.btnGet.text = "已领取"
end
end
function MissionPre:OnClose()

View File

@ -295,10 +295,10 @@ local jumpDic = {
end
end,
[JumpType.recharge] = function(data)--充值
UIManager.OpenPanel(UIName.MainRechargePanel, data[1])
UIManager.OpenPanel(UIName.ActivityMainPanel, JumpType.recharge, data[1])
end,
[JumpType.Welfare] = function(data)--福利
UIManager.OpenPanel(UIName.OperatingPanel,{tabIndex = data[1],extraParam = data[2] })
UIManager.OpenPanel(UIName.ActivityMainPanel, JumpType.Welfare, data[1])
end,
[JumpType.Expert] = function(data)--限时活动
if data and data[1] then

View File

@ -19,7 +19,8 @@ end
function this:BindEvent()
Util.AddClick(this.goButton,function()
UIManager.OpenPanel(UIName.MainRechargePanel, 3)
DynamicActivityManager.SetSelectIndex(DataType.Direct,{4003})
JumpManager.GoJump(36006)
end)
Util.AddClick(this.cancelBtn,function()
parent:ClosePanel()

View File

@ -66,6 +66,8 @@ function GiftPre:InitComponent()
self.shadow=Util.GetGameObject(self.middleLayout,"shadow")
self.grid = Util.GetGameObject(self.middleLayout, "scrollView/grid")
self.redpot = Util.GetGameObject(self.gameObject, "bg/redpot")
self.UI_Effect_MianBan_LiBao_button_01 = Util.GetGameObject(self.gameObject, "UI_Effect_MianBan_LiBao_button_01")
self.isCanBuy = 0
self.itemList = {}
end
@ -177,7 +179,17 @@ function GiftPre:SetData(data,_parent,_rechargeNum,sortingOrder)
else
self.tipImage.gameObject:SetActive(false)
end
Util.SetParticleSortLayer(self.UI_Effect_MianBan_LiBao_button_01, sortingOrder)
local isshow = false
if self.data.DataType == DynamicActivityManager.selectIndex.dataType then
for i = 1 , #DynamicActivityManager.selectIndex.goodsId do
if self.data.data.shopData.id == DynamicActivityManager.selectIndex.goodsId[i] then
isshow = true
break
end
end
end
self.UI_Effect_MianBan_LiBao_button_01.gameObject:SetActive(isshow)
self:SetIcon(self.data)
self:SetContent1()
end
@ -256,6 +268,7 @@ function GiftPre:SetIcon(_itemdata)
end
function GiftPre:OnClose()
DynamicActivityManager.SetSelectIndex(0,{})
for k,v in pairs(self.itemList) do
SubUIManager.Close(v)
end