parent
ea10cd65d1
commit
ac24c2e0ce
Binary file not shown.
After Width: | Height: | Size: 93 KiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d81c6385ac2e2cb4ab9075339d5de54e
|
||||
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: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 56
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- 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: 18b642a2066756f48b6837ca5c2ec901
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: ActivityAltas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 71e9ae136fa03d147a640fda03da962e
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -14048,6 +14048,80 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &1601457109028927852
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7288637099938518233}
|
||||
- component: {fileID: 924378422067556265}
|
||||
- component: {fileID: 3110078839196505817}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7288637099938518233
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1601457109028927852}
|
||||
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: 9134791686612385594}
|
||||
m_RootOrder: 1
|
||||
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: -75}
|
||||
m_SizeDelta: {x: 138, y: 52}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &924378422067556265
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1601457109028927852}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &3110078839196505817
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1601457109028927852}
|
||||
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: b39483e6286fbc34b9ba95f05e5f70d5, 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!1 &1665387774457749272
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -14312,6 +14386,146 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &1722438600130463438
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 9134791686612385594}
|
||||
- component: {fileID: 2653978791900620036}
|
||||
- component: {fileID: 602605325376523591}
|
||||
- component: {fileID: 4906741992467575386}
|
||||
- component: {fileID: 3901486280626128687}
|
||||
m_Layer: 5
|
||||
m_Name: FestevaBtn
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &9134791686612385594
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1722438600130463438}
|
||||
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: 980484169915642123}
|
||||
- {fileID: 7288637099938518233}
|
||||
- {fileID: 6040221783196199688}
|
||||
m_Father: {fileID: 1080492301643067761}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2653978791900620036
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1722438600130463438}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &602605325376523591
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1722438600130463438}
|
||||
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: f426e035128fc0341b3e94dcb75b36b6, 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 &4906741992467575386
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1722438600130463438}
|
||||
m_Enabled: 1
|
||||
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: 602605325376523591}
|
||||
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 &3901486280626128687
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1722438600130463438}
|
||||
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
|
||||
--- !u!1 &1742399926385009734
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -20486,7 +20700,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 64, y: -64}
|
||||
m_AnchoredPosition: {x: 64, y: -568}
|
||||
m_SizeDelta: {x: 128, y: 128}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1661146730132922393
|
||||
|
@ -77436,6 +77650,80 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u6A59\u8272\u795E\u5C06"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &7612424293905316764
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 980484169915642123}
|
||||
- component: {fileID: 1171148307242386401}
|
||||
- component: {fileID: 7403696680339926098}
|
||||
m_Layer: 5
|
||||
m_Name: redPoint
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &980484169915642123
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7612424293905316764}
|
||||
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: 9134791686612385594}
|
||||
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: 49, y: 40}
|
||||
m_SizeDelta: {x: 30, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1171148307242386401
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7612424293905316764}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7403696680339926098
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7612424293905316764}
|
||||
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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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!1 &7617820519871563473
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -77799,6 +78087,7 @@ RectTransform:
|
|||
- {fileID: 3958316192645827337}
|
||||
- {fileID: 1923652320880908015}
|
||||
- {fileID: 5723062008989145107}
|
||||
- {fileID: 9134791686612385594}
|
||||
m_Father: {fileID: 1470640894515440942}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
@ -92420,3 +92709,78 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1877475722172156223}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &2915872257903245040
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 9134791686612385594}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1411002786687704965, guid: 543a07a9e6ee0b240853603d7593f84b,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: UI_Effect_DengLu15Day_YuanKuang
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8909369018108960248, guid: 543a07a9e6ee0b240853603d7593f84b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8909369018108960248, guid: 543a07a9e6ee0b240853603d7593f84b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8909369018108960248, guid: 543a07a9e6ee0b240853603d7593f84b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8909369018108960248, guid: 543a07a9e6ee0b240853603d7593f84b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8909369018108960248, guid: 543a07a9e6ee0b240853603d7593f84b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8909369018108960248, guid: 543a07a9e6ee0b240853603d7593f84b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8909369018108960248, guid: 543a07a9e6ee0b240853603d7593f84b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8909369018108960248, guid: 543a07a9e6ee0b240853603d7593f84b,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8909369018108960248, guid: 543a07a9e6ee0b240853603d7593f84b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8909369018108960248, guid: 543a07a9e6ee0b240853603d7593f84b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8909369018108960248, guid: 543a07a9e6ee0b240853603d7593f84b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 543a07a9e6ee0b240853603d7593f84b, type: 3}
|
||||
--- !u!4 &6040221783196199688 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 8909369018108960248, guid: 543a07a9e6ee0b240853603d7593f84b,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2915872257903245040}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
@ -1038,7 +1038,9 @@ RedPointType = {
|
|||
chaozhifanli = 90001,
|
||||
|
||||
--家园红点
|
||||
HomeLand = 700--主城家园红点
|
||||
HomeLand = 700,--主城家园红点
|
||||
|
||||
FestevalRed = 9501,
|
||||
}
|
||||
|
||||
RedPointStatus = {
|
||||
|
@ -1416,6 +1418,8 @@ ActivityTypeDef = {
|
|||
|
||||
XinRenShop = 91, -- 新人商城
|
||||
yunmenghaoli = 93, --云梦好礼
|
||||
|
||||
qiandaohaoli = 95, --节日签到
|
||||
}
|
||||
--活动结束需要处理面板关闭类型
|
||||
ActivityTypePanel = {
|
||||
|
|
|
@ -448,6 +448,7 @@ UIName = {
|
|||
JingjishiLianPatface = 452,
|
||||
TrialRewardBackPopup = 456,
|
||||
RewardRideShowPopup = 459,--坐骑信息界面
|
||||
FestevalPanel = 461
|
||||
}
|
||||
|
||||
SubUIConfig = {
|
||||
|
|
|
@ -138,7 +138,7 @@ function this.InitActivityServerData(msg, isUpdate)
|
|||
if GlobalActivity[v.activityId] then
|
||||
this.CheckMoneyProgress(v)
|
||||
this.mission[v.activityId] = v
|
||||
-- LogYellow("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value)
|
||||
LogYellow("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value)
|
||||
for n, m in ipairs(v.mission) do
|
||||
-- LogGreen(" 刷新活动数据missionId:" .. m.missionId .. " state:" .. m.state .. " progress:" .. m.progress)
|
||||
if (v.activityId == ActivityTypeDef.OnlineGift) then
|
||||
|
@ -1126,6 +1126,13 @@ function this.GetTimeStartToEnd(type)
|
|||
return startTime.."~"..endtime
|
||||
end
|
||||
|
||||
function this.GetTimeStartToEnd1(type)
|
||||
local info= ActivityGiftManager.GetActivityTypeInfo(type)
|
||||
local startTime= this.GetTimeShow(info.startTime)
|
||||
local endtime= this.GetTimeShow(info.endTime)
|
||||
return startTime.."-"..endtime
|
||||
end
|
||||
|
||||
---时间格式化接口
|
||||
function this.GetTimeShow(data)
|
||||
local year = math.floor(os.date("%Y", data))
|
||||
|
@ -1434,4 +1441,19 @@ function this.TreasureStoreSeason2RedCheck()
|
|||
return false
|
||||
end
|
||||
|
||||
function this.FestevalRedCheck()
|
||||
local actData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.qiandaohaoli)
|
||||
if not actData then
|
||||
return false
|
||||
end
|
||||
local curDay = math.ceil((CalculateSecondsNowTo_N_OClock(0) + GetTimeStamp() - actData.startTime)/86400)
|
||||
for i = 1, #actData.mission do
|
||||
local config = ActivityRewardConfig[actData.mission[i].missionId]
|
||||
if actData.mission[i].state == 0 and curDay >= config.Values[1][1] then
|
||||
return true
|
||||
end
|
||||
end
|
||||
return false
|
||||
end
|
||||
|
||||
return this
|
|
@ -0,0 +1,219 @@
|
|||
require("Base/BasePanel")
|
||||
FestevalPanel = Inherit(BasePanel)
|
||||
local GlobalActivityConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity)
|
||||
local ActivityRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardConfig)
|
||||
--初始化组件(用于子类重写)
|
||||
function FestevalPanel:InitComponent()
|
||||
self.spLoader = SpriteLoader.New()
|
||||
self.closePanel = Util.GetGameObject(self.gameObject,"mask")
|
||||
self.liveRoot = Util.GetGameObject(self.closePanel,"root")
|
||||
self.title = Util.GetGameObject(self.closePanel,"title"):GetComponent("Image")
|
||||
self.tip = Util.GetGameObject(self.closePanel,"tipDi/tip"):GetComponent("Text")
|
||||
self.grid = Util.GetGameObject(self.gameObject,"content/grid")
|
||||
self.singleLinePre = Util.GetGameObject(self.gameObject,"singleLinePre")
|
||||
self.singleLinePreHeight = self.singleLinePre:GetComponent("RectTransform").rect.height
|
||||
self.lineList = {}
|
||||
|
||||
self.time = Util.GetGameObject(self.gameObject,"timeDi/time"):GetComponent("Text")
|
||||
self.gridPos = self.grid:GetComponent("RectTransform").anchoredPosition
|
||||
end
|
||||
|
||||
--绑定事件(用于子类重写)
|
||||
function FestevalPanel:BindEvent()
|
||||
Util.AddClick(self.closePanel,function()
|
||||
self:ClosePanel()
|
||||
end)
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
function FestevalPanel:AddListener()
|
||||
|
||||
end
|
||||
|
||||
--移除事件监听(用于子类重写)
|
||||
function FestevalPanel:RemoveListener()
|
||||
|
||||
end
|
||||
|
||||
--界面打开时调用(用于子类重写)
|
||||
function FestevalPanel:OnOpen(...)
|
||||
|
||||
end
|
||||
|
||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||
function FestevalPanel:OnShow()
|
||||
self.actData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.qiandaohaoli)
|
||||
if not self.actData then
|
||||
self:ClosePanel()
|
||||
return
|
||||
end
|
||||
self.actId = self.actData.activityId
|
||||
if self.live then
|
||||
poolManager:UnLoadLive(self.live.gameObject.name, self.live)
|
||||
self.live = nil
|
||||
end
|
||||
self.tempData = string.split(GlobalActivityConfig[self.actId].ExpertDec,"#")
|
||||
local data = ConfigManager.GetConfigData(ConfigName.HeroConfig,GlobalActivityConfig[self.actId].ShowArt)
|
||||
self.live = poolManager:LoadLive(GetResourcePath(data.Live), self.liveRoot.transform,
|
||||
Vector3.one * data.Scale, Vector3.New(data.Position[1], data.Position[2], 0))
|
||||
local SkeletonGraphic = self.live:GetComponent("SkeletonGraphic")
|
||||
SkeletonGraphic.AnimationState:SetAnimation(0, "idle", true)
|
||||
self.title.sprite = self.spLoader:LoadSprite(self.tempData[2])
|
||||
self.tip.text = self.tempData[1]
|
||||
self.curDay = math.ceil((CalculateSecondsNowTo_N_OClock(0) + GetTimeStamp() - self.actData.startTime)/86400)
|
||||
self:RefreshData()
|
||||
self:RemainTimeDown()
|
||||
local row,cum = self:Getrow(self.curDay)
|
||||
local h = (row - 2) * self.singleLinePreHeight
|
||||
if h < 0 then
|
||||
self.gridPos.y = 0
|
||||
elseif h > (#self.lineList - 2) * self.singleLinePreHeight then
|
||||
self.gridPos.y = (#self.lineList - 2) * self.singleLinePreHeight
|
||||
else
|
||||
self.gridPos.y = h
|
||||
end
|
||||
self.grid:GetComponent("RectTransform").anchoredPosition = self.gridPos
|
||||
end
|
||||
|
||||
function FestevalPanel:RefreshData()
|
||||
for i = 1, #self.lineList do
|
||||
self.lineList[i].go.gameObject:SetActive(false)
|
||||
for j = 1,#self.lineList[i].items do
|
||||
self.lineList[i].items[j].go.gameObject:SetActive(false)
|
||||
end
|
||||
end
|
||||
local row,cum
|
||||
for i = 1, #self.actData.mission do
|
||||
row,cum = self:Getrow(i)
|
||||
if not self.lineList[row] then
|
||||
self.lineList[row] = {}
|
||||
self.lineList[row].go = newObjToParent(self.singleLinePre,self.grid)
|
||||
self.lineList[row].go.gameObject:SetActive(false)
|
||||
self.lineList[row].items = {}
|
||||
for j = 1,4 do
|
||||
self.lineList[row].items[j] = {}
|
||||
self.lineList[row].items[j].go = Util.GetGameObject(self.lineList[row].go,"dayPre"..j)
|
||||
self.lineList[row].items[j].select = Util.GetGameObject(self.lineList[row].items[j].go,"bg/select")
|
||||
self.lineList[row].items[j].gray = Util.GetGameObject(self.lineList[row].items[j].go,"bg/gray")
|
||||
self.lineList[row].items[j].title = Util.GetGameObject(self.lineList[row].items[j].go,"title"):GetComponent("Text")
|
||||
self.lineList[row].items[j].itempPos = Util.GetGameObject(self.lineList[row].items[j].go,"itempPos")
|
||||
self.lineList[row].items[j].get = Util.GetGameObject(self.lineList[row].items[j].itempPos,"get")
|
||||
self.lineList[row].items[j].redpoint = Util.GetGameObject(self.lineList[row].items[j].go,"redpoint")
|
||||
self.lineList[row].items[j].name = Util.GetGameObject(self.lineList[row].items[j].go,"name"):GetComponent("Text")
|
||||
self.lineList[row].items[j].itemview = SubUIManager.Open(SubUIConfig.ItemView,self.lineList[row].items[j].itempPos.transform)
|
||||
self.lineList[row].items[j].itemview.transform:SetAsFirstSibling()
|
||||
self.lineList[row].items[j].data = {}
|
||||
self.lineList[row].items[j].go.gameObject:SetActive(false)
|
||||
end
|
||||
end
|
||||
self.lineList[row].go.gameObject:SetActive(true)
|
||||
self:RefreshSingleData(self.lineList[row].items[cum],self.actData.mission[i])
|
||||
end
|
||||
end
|
||||
|
||||
function FestevalPanel:Getrow(index)
|
||||
local cum,row,group,sub_group
|
||||
if index % 7==0 then
|
||||
cum = 4
|
||||
row = (math.ceil(index / 7)) * 2
|
||||
else
|
||||
group = math.floor(index / 7)
|
||||
sub_group = index % 7
|
||||
if sub_group % 3 == 0 then
|
||||
cum = 3
|
||||
else
|
||||
cum = sub_group % 3
|
||||
end
|
||||
row = (group) * 2 + math.ceil(sub_group / 3)
|
||||
end
|
||||
return row,cum
|
||||
end
|
||||
|
||||
function FestevalPanel:SetSelect(parent)
|
||||
|
||||
end
|
||||
|
||||
function FestevalPanel:RefreshSingleData(obj,data)
|
||||
obj.data = data
|
||||
obj.go.gameObject:SetActive(true)
|
||||
local config = ActivityRewardConfig[data.missionId]
|
||||
obj.title.text = string.format("第%s天",config.Values[1][1])
|
||||
obj.name.text = config.ContentsShow
|
||||
obj.itemview:OnOpen(false, config.Reward[1], 1, false, false, false, self.sortingOrder)
|
||||
obj.select.gameObject:SetActive(false)
|
||||
obj.gray.gameObject:SetActive(false)
|
||||
obj.get.gameObject:SetActive(false)
|
||||
obj.redpoint.gameObject:SetActive(false)
|
||||
if obj.data.state == 0 then
|
||||
if self.curDay >= config.Values[1][1] then
|
||||
obj.redpoint.gameObject:SetActive(true)
|
||||
end
|
||||
if self.curDay == config.Values[1][1] then
|
||||
obj.select.gameObject:SetActive(true)
|
||||
end
|
||||
else
|
||||
obj.gray.gameObject:SetActive(true)
|
||||
obj.get.gameObject:SetActive(true)
|
||||
end
|
||||
Util.AddOnceClick(obj.go,function()
|
||||
if obj.data.state == 0 then
|
||||
if self.curDay >= config.Values[1][1] then
|
||||
NetManager.GetActivityRewardRequest(obj.data.missionId, self.actId, function(drop)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function()
|
||||
obj.data.state = 1
|
||||
self:RefreshSingleData(obj,data)
|
||||
CheckRedPointStatus(RedPointType.FestevalRed)
|
||||
end)
|
||||
end)
|
||||
end
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
function FestevalPanel:OnSortingOrderChange()
|
||||
|
||||
end
|
||||
|
||||
--刷新倒计时显示
|
||||
function FestevalPanel:RemainTimeDown()
|
||||
self.time.text = string.format(Language[10584]..ActivityGiftManager.GetTimeStartToEnd1(ActivityTypeDef.qiandaohaoli))
|
||||
local timeDu = self.actData.endTime - GetTimeStamp()
|
||||
local s = function()
|
||||
timeDu = timeDu - 1
|
||||
if timeDu <= 0 then
|
||||
self:ClosePanel()
|
||||
end
|
||||
end
|
||||
s()
|
||||
if self.timer then
|
||||
self.timer:Stop()
|
||||
self.timer = nil
|
||||
end
|
||||
self.timer = Timer.New(s,1,-1,false)
|
||||
self.timer:Start()
|
||||
end
|
||||
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function FestevalPanel:OnClose()
|
||||
if self.timer then
|
||||
self.timer:Stop()
|
||||
self.timer = nil
|
||||
end
|
||||
if self.live then
|
||||
poolManager:UnLoadLive(self.live.gameObject.name, self.live)
|
||||
self.live = nil
|
||||
end
|
||||
end
|
||||
|
||||
--界面销毁时调用(用于子类重写)
|
||||
function FestevalPanel:OnDestroy()
|
||||
for i = 1, #self.lineList do
|
||||
self.lineList[i].go.gameObject:SetActive(false)
|
||||
for j = 1,#self.lineList[i].items do
|
||||
SubUIManager.Close(self.lineList[i].items[j].itemview)
|
||||
end
|
||||
end
|
||||
self.lineList = {}
|
||||
end
|
||||
|
||||
return FestevalPanel
|
|
@ -1,6 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 662490c50a0740444ad18e93f84b5061
|
||||
folderAsset: yes
|
||||
guid: bc4d6d183830fa248a002e741459c88e
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
|
@ -102,6 +102,9 @@ function this:InitComponent()
|
|||
this.zhuShengBtn=Util.GetGameObject(self.gameObject,"LeftUp/GameObject/ZhuSheng")
|
||||
this.zhuShengTime = Util.GetGameObject(this.zhuShengBtn,"Image_1/time"):GetComponent("Text")
|
||||
|
||||
this.FestevaBtn=Util.GetGameObject(self.gameObject,"LeftUp/GameObject/FestevaBtn")
|
||||
this.FestevaBtnRed=Util.GetGameObject(this.FestevaBtn,"redPoint")
|
||||
|
||||
---------------topRightPart----------------
|
||||
-- 邮件
|
||||
this.btnYouJian = Util.GetGameObject(self.gameObject, "LeftDown/btnRoot/btnYouJian")
|
||||
|
@ -436,6 +439,12 @@ function this:BindEvent()
|
|||
--UIManager.OpenPanel(UIName.PassGiftPopup,true)ActivityTypeDef.SevenDayRegister
|
||||
--JumpManager.GoJump(15001)
|
||||
UIManager.OpenPanel(UIName.EightDayGiftPanel)
|
||||
end)
|
||||
--八日登陆礼预览
|
||||
Util.AddClick(this.FestevaBtn,function()
|
||||
--UIManager.OpenPanel(UIName.PassGiftPopup,true)ActivityTypeDef.SevenDayRegister
|
||||
--JumpManager.GoJump(15001)
|
||||
UIManager.OpenPanel(UIName.FestevalPanel)
|
||||
end)
|
||||
--十五日登录奖励
|
||||
Util.AddClick(this.fgBtn,function()
|
||||
|
@ -738,6 +747,7 @@ function this.BindRedPoint()
|
|||
BindRedPointObject(RedPointType.JumpServer_MainCity, this.rpJumpServer)
|
||||
BindRedPointObject(RedPointType.TaiChuMiJuan, this.taichumijuanRed)
|
||||
BindRedPointObject(RedPointType.ExploreFunc, this.btnExploreRed)
|
||||
BindRedPointObject(RedPointType.FestevalRed, this.FestevaBtnRed)
|
||||
end
|
||||
-- 绑定红点
|
||||
function this.ClearRedPoint()
|
||||
|
@ -764,6 +774,7 @@ function this.ClearRedPoint()
|
|||
ClearRedPointObject(RedPointType.JumpServer_MainCity, this.rpJumpServer)
|
||||
ClearRedPointObject(RedPointType.TaiChuMiJuan, this.taichumijuanRed)
|
||||
ClearRedPointObject(RedPointType.ExploreFunc, this.btnExploreRed)
|
||||
ClearRedPointObject(RedPointType.FestevalRed, this.FestevaBtnRed)
|
||||
end
|
||||
|
||||
--添加事件监听(用于子类重写)
|
||||
|
@ -1775,6 +1786,11 @@ function this.RefreshEightGiftPreview()
|
|||
this.rpFifteenDayEffect:SetActive(false)
|
||||
end
|
||||
|
||||
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.qiandaohaoli) then
|
||||
this.FestevaBtn:SetActive(true)
|
||||
else
|
||||
this.FestevaBtn:SetActive(false)
|
||||
end
|
||||
end
|
||||
|
||||
-- 八日登陆奖励预览
|
||||
|
|
|
@ -656,6 +656,7 @@ function this.RegisterRedCheckFunc()
|
|||
RPData:AddCheckFunc(RedPointType.chaozhifanli,DynamicActivityManager.CheckRedPointPremium)
|
||||
--家园
|
||||
RPData:AddCheckFunc(RedPointType.HomeLand,HomeLandManager.CheckRedMain,FUNCTION_OPEN_TYPE.HOMELAND)
|
||||
RPData:AddCheckFunc(RedPointType.FestevalRed,ActivityGiftManager.FestevalRedCheck)
|
||||
end
|
||||
|
||||
-- 向红点绑定物体
|
||||
|
|
Loading…
Reference in New Issue