Merge branch 'china/dev' into china/飞升

dev_chengFeng
wangzhenxing 2022-01-19 16:13:20 +08:00
commit 109648ae93
33 changed files with 5553 additions and 132 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

View File

@ -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:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 29 KiB

View File

@ -46,7 +46,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 50, y: 0, z: 50, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@ -91,6 +91,17 @@ TextureImporter:
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: []

File diff suppressed because it is too large Load Diff

View File

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

View File

@ -3685,6 +3685,7 @@ GameObject:
- component: {fileID: 4333355844115441707}
- component: {fileID: 4583208166459458474}
- component: {fileID: 4655404213318427967}
- component: {fileID: 8655067180985885171}
m_Layer: 5
m_Name: btn1
m_TagString: Untagged
@ -3708,7 +3709,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: 100, y: -45}
m_AnchoredPosition: {x: 75, y: -45}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4333355844115441707
@ -3790,6 +3791,26 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &8655067180985885171
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 274533610457621645}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
m_MinWidth: 150
m_MinHeight: 150
m_PreferredWidth: 150
m_PreferredHeight: 150
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &274902705090813148
GameObject:
m_ObjectHideFlags: 0
@ -5122,7 +5143,8 @@ GameObject:
- component: {fileID: 6511771316027140810}
- component: {fileID: 5992374240210674179}
- component: {fileID: 7248200883228602651}
- component: {fileID: 8467880383253718575}
- component: {fileID: 9052219505512993352}
- component: {fileID: 9112400062881082572}
m_Layer: 5
m_Name: selectBar
m_TagString: Untagged
@ -5153,7 +5175,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -410}
m_SizeDelta: {x: 800, y: 90}
m_SizeDelta: {x: 750, y: 90}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5992374240210674179
CanvasRenderer:
@ -5184,7 +5206,7 @@ MonoBehaviour:
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: 6253e3364aa642840b7b6ca6ac30239b, type: 3}
m_Type: 0
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@ -5192,16 +5214,16 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &8467880383253718575
--- !u!114 &9052219505512993352
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 598249168862638214}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
@ -5210,12 +5232,25 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 4
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 150, y: 150}
m_Spacing: {x: 0, y: 0}
m_Constraint: 0
m_ConstraintCount: 2
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 1
m_ChildControlHeight: 0
--- !u!114 &9112400062881082572
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 598249168862638214}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
--- !u!1 &606976357762614274
GameObject:
m_ObjectHideFlags: 0
@ -12660,6 +12695,7 @@ GameObject:
- component: {fileID: 1573551743946025575}
- component: {fileID: 6361078885167551951}
- component: {fileID: 887536551713419381}
- component: {fileID: 5108813638650757704}
m_Layer: 5
m_Name: btn4
m_TagString: Untagged
@ -12683,7 +12719,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: 550, y: -45}
m_AnchoredPosition: {x: 525, y: -45}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1573551743946025575
@ -12765,6 +12801,26 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &5108813638650757704
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2115608432697034683}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
m_MinWidth: 150
m_MinHeight: 150
m_PreferredWidth: 150
m_PreferredHeight: 150
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &2132445435346043163
GameObject:
m_ObjectHideFlags: 0
@ -15836,6 +15892,7 @@ GameObject:
- component: {fileID: 4934918169303577311}
- component: {fileID: 5702460646373984212}
- component: {fileID: 1319998414647322639}
- component: {fileID: 4662526438264139595}
m_Layer: 5
m_Name: btn3
m_TagString: Untagged
@ -15859,7 +15916,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: 400, y: -45}
m_AnchoredPosition: {x: 375, y: -45}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4934918169303577311
@ -15941,6 +15998,26 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &4662526438264139595
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2866094182574242559}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
m_MinWidth: 150
m_MinHeight: 150
m_PreferredWidth: 150
m_PreferredHeight: 150
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &2906339683907172384
GameObject:
m_ObjectHideFlags: 0
@ -16942,6 +17019,7 @@ GameObject:
- component: {fileID: 5684472203954849967}
- component: {fileID: 1942408133728493382}
- component: {fileID: 6298930554117602117}
- component: {fileID: 2260448015405435983}
m_Layer: 5
m_Name: btn2
m_TagString: Untagged
@ -16965,7 +17043,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: 250, y: -45}
m_AnchoredPosition: {x: 225, y: -45}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5684472203954849967
@ -17047,6 +17125,26 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &2260448015405435983
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3250669377361977875}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
m_MinWidth: 150
m_MinHeight: 150
m_PreferredWidth: 150
m_PreferredHeight: 150
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &3317120803786011774
GameObject:
m_ObjectHideFlags: 0
@ -18138,6 +18236,7 @@ GameObject:
- component: {fileID: 6724403881698098274}
- component: {fileID: 1747768132616979826}
- component: {fileID: 1507624456525015783}
- component: {fileID: 3448473180754878737}
m_Layer: 5
m_Name: btn5
m_TagString: Untagged
@ -18161,7 +18260,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: 700, y: -45}
m_AnchoredPosition: {x: 675, y: -45}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6724403881698098274
@ -18243,6 +18342,26 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &3448473180754878737
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3674728270424437704}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 0
m_MinWidth: 150
m_MinHeight: 150
m_PreferredWidth: 150
m_PreferredHeight: 150
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!1 &3677468271317628673
GameObject:
m_ObjectHideFlags: 0
@ -28463,9 +28582,9 @@ RectTransform:
m_Father: {fileID: 6511771316027140810}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 100, y: -45}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -300, y: 0}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5283305158646677102

View File

@ -11513,10 +11513,10 @@ RectTransform:
m_Father: {fileID: 6150816739817875349}
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_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1080, y: 1920}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1208765871042465929
CanvasRenderer:

View File

@ -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}

View File

@ -411,10 +411,10 @@ RectTransform:
m_Father: {fileID: 7775692205861864899}
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_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1080, y: 1920}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3346948331999818463
CanvasRenderer:

View File

@ -245,6 +245,7 @@ GameObject:
- component: {fileID: 2325927520243488187}
- component: {fileID: 4528946508881743800}
- component: {fileID: 3002483324281862553}
- component: {fileID: 42908252903026395}
m_Layer: 5
m_Name: Mask
m_TagString: Untagged
@ -308,6 +309,48 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &42908252903026395
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1170967358714303946}
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: 1
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: 3002483324281862553}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &1201628220047059380
GameObject:
m_ObjectHideFlags: 0
@ -1220,7 +1263,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: -0.000061035156}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &2956367096041833174

View File

@ -279,7 +279,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1890877083536625000}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
@ -583,7 +583,7 @@ RectTransform:
m_Children:
- {fileID: 3260179523171161292}
m_Father: {fileID: 7879877012714891354}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -659,7 +659,7 @@ RectTransform:
m_Children:
- {fileID: 7831697212941140118}
m_Father: {fileID: 7879877012714891354}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -1251,7 +1251,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7879877012714891354}
m_RootOrder: 2
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}
@ -1325,7 +1325,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4078832313246787939}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
@ -3523,6 +3523,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4398442132891921885}
- {fileID: 1321208278434534768}
- {fileID: 7143575743379140526}
- {fileID: 6488483525593613651}
- {fileID: 5413107505857025205}
@ -3654,7 +3655,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4078832313246787939}
m_RootOrder: 2
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}
@ -4480,6 +4481,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1779098289953033211}
- {fileID: 1480330125180371462}
- {fileID: 4078580868399975157}
- {fileID: 535923809914953014}
- {fileID: 1471481304063353350}
@ -4848,7 +4850,7 @@ RectTransform:
m_Children:
- {fileID: 2946592063938972413}
m_Father: {fileID: 4078832313246787939}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -4965,7 +4967,7 @@ RectTransform:
m_Children:
- {fileID: 2519452958481647892}
m_Father: {fileID: 1890877083536625000}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -5335,6 +5337,7 @@ GameObject:
- component: {fileID: 3941673511622965647}
- component: {fileID: 2785837382319435049}
- component: {fileID: 8945870842926663208}
- component: {fileID: 5608871416415651546}
m_Layer: 5
m_Name: dingwei
m_TagString: Untagged
@ -5418,7 +5421,7 @@ MonoBehaviour:
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
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}
@ -5470,6 +5473,25 @@ MonoBehaviour:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
--- !u!95 &5608871416415651546
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5056771340439473104}
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 &5168367206551728392
GameObject:
m_ObjectHideFlags: 0
@ -5579,6 +5601,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1797990151690023370}
- {fileID: 6393688340263160783}
- {fileID: 1866022348425377359}
- {fileID: 3363011683438252829}
- {fileID: 7349019032033409229}
@ -6369,6 +6392,80 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6083907829340357357}
m_CullTransparentMesh: 0
--- !u!1 &6093090120910234696
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6393688340263160783}
- component: {fileID: 4169117396266411257}
- component: {fileID: 6369462135685408736}
m_Layer: 5
m_Name: frame
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6393688340263160783
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6093090120910234696}
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: 7879877012714891354}
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: 7}
m_SizeDelta: {x: 186, y: 186}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4169117396266411257
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6093090120910234696}
m_CullTransparentMesh: 0
--- !u!114 &6369462135685408736
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6093090120910234696}
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: 0
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: 1894f7c56d5a24f4daf9907bb70ff65b, 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 &6111615362849900283
GameObject:
m_ObjectHideFlags: 0
@ -6728,6 +6825,80 @@ MonoBehaviour:
m_LineSpacing: 1
m_Text: "\u730E\u5996\u6280"
LanguageIndex: 0
--- !u!1 &6358216020600227139
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1480330125180371462}
- component: {fileID: 7129850018319722704}
- component: {fileID: 2776317192983637155}
m_Layer: 5
m_Name: frame
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1480330125180371462
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6358216020600227139}
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: 4078832313246787939}
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: 7}
m_SizeDelta: {x: 186, y: 186}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7129850018319722704
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6358216020600227139}
m_CullTransparentMesh: 0
--- !u!114 &2776317192983637155
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6358216020600227139}
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: 0
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: 1894f7c56d5a24f4daf9907bb70ff65b, 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 &6538809560804388523
GameObject:
m_ObjectHideFlags: 0
@ -6758,7 +6929,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7879877012714891354}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
@ -6834,7 +7005,7 @@ RectTransform:
m_Children:
- {fileID: 7910529805298245104}
m_Father: {fileID: 1890877083536625000}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -7314,7 +7485,6 @@ GameObject:
- component: {fileID: 7019505148616658685}
- component: {fileID: 9114218537319145345}
- component: {fileID: 4736815770412586932}
- component: {fileID: 3366190939807037850}
- component: {fileID: 4774707911790346556}
m_Layer: 5
m_Name: posBtn
@ -7379,48 +7549,6 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!114 &3366190939807037850
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7502580929939828163}
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: 1
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: 4736815770412586932}
m_OnClick:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &4774707911790346556
MonoBehaviour:
m_ObjectHideFlags: 0
@ -8151,7 +8279,7 @@ RectTransform:
m_Children:
- {fileID: 1933788044452181285}
m_Father: {fileID: 4078832313246787939}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -8225,7 +8353,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1890877083536625000}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -8299,7 +8427,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4078832313246787939}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -8586,7 +8714,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1890877083536625000}
m_RootOrder: 2
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}
@ -8630,6 +8758,80 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
--- !u!1 &8619265510193867419
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1321208278434534768}
- component: {fileID: 5126180102582048425}
- component: {fileID: 8719553069525239764}
m_Layer: 5
m_Name: frame
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1321208278434534768
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8619265510193867419}
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: 1890877083536625000}
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: 7}
m_SizeDelta: {x: 186, y: 186}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5126180102582048425
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8619265510193867419}
m_CullTransparentMesh: 0
--- !u!114 &8719553069525239764
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8619265510193867419}
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: 0
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: 1894f7c56d5a24f4daf9907bb70ff65b, 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 &8689474382382571281
GameObject:
m_ObjectHideFlags: 0
@ -8813,7 +9015,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7879877012714891354}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}

View File

@ -1043,7 +1043,9 @@ RedPointType = {
chaozhifanli = 90001,
--家园红点
HomeLand = 700--主城家园红点
HomeLand = 700,--主城家园红点
FestevalRed = 9501,
}
RedPointStatus = {
@ -1421,6 +1423,8 @@ ActivityTypeDef = {
XinRenShop = 91, -- 新人商城
yunmenghaoli = 93, --云梦好礼
qiandaohaoli = 95, --节日签到
}
--活动结束需要处理面板关闭类型
ActivityTypePanel = {

View File

@ -449,6 +449,7 @@ UIName = {
RoleFlyUpSuccessPanel = 455, --角色飞升成功界面
TrialRewardBackPopup = 456,
RewardRideShowPopup = 459,--坐骑信息界面
FestevalPanel = 461,
HeroPreviewNewPanel = 460,--抽卡奖池预览
}

View File

@ -452,6 +452,7 @@ FAMILYBASEINFO_LEVELTIME_FIELD = protobuf.FieldDescriptor();
FAMILYBASEINFO_FIGHTRESULT_FIELD = protobuf.FieldDescriptor();
FAMILYBASEINFO_PLAYERINTOLEVEL_FIELD = protobuf.FieldDescriptor();
FAMILYBASEINFO_FETE_FIELD = protobuf.FieldDescriptor();
FAMILYBASEINFO_EXPLORETIMES_FIELD = protobuf.FieldDescriptor();
TRANSFORMATIONCARDINFO = protobuf.Descriptor();
TRANSFORMATIONCARDINFO_ID_FIELD = protobuf.FieldDescriptor();
TRANSFORMATIONCARDINFO_INDEX_FIELD = protobuf.FieldDescriptor();
@ -5159,11 +5160,21 @@ FAMILYBASEINFO_FETE_FIELD.default_value = 0
FAMILYBASEINFO_FETE_FIELD.type = 5
FAMILYBASEINFO_FETE_FIELD.cpp_type = 1
FAMILYBASEINFO_EXPLORETIMES_FIELD.name = "exploreTimes"
FAMILYBASEINFO_EXPLORETIMES_FIELD.full_name = ".rpc.protocols.FamilyBaseInfo.exploreTimes"
FAMILYBASEINFO_EXPLORETIMES_FIELD.number = 14
FAMILYBASEINFO_EXPLORETIMES_FIELD.index = 13
FAMILYBASEINFO_EXPLORETIMES_FIELD.label = 1
FAMILYBASEINFO_EXPLORETIMES_FIELD.has_default_value = false
FAMILYBASEINFO_EXPLORETIMES_FIELD.default_value = 0
FAMILYBASEINFO_EXPLORETIMES_FIELD.type = 5
FAMILYBASEINFO_EXPLORETIMES_FIELD.cpp_type = 1
FAMILYBASEINFO.name = "FamilyBaseInfo"
FAMILYBASEINFO.full_name = ".rpc.protocols.FamilyBaseInfo"
FAMILYBASEINFO.nested_types = {}
FAMILYBASEINFO.enum_types = {}
FAMILYBASEINFO.fields = {FAMILYBASEINFO_ID_FIELD, FAMILYBASEINFO_NAME_FIELD, FAMILYBASEINFO_ANNOUCE_FIELD, FAMILYBASEINFO_LEVLE_FIELD, FAMILYBASEINFO_EXP_FIELD, FAMILYBASEINFO_TOTALNUM_FIELD, FAMILYBASEINFO_MAXNUM_FIELD, FAMILYBASEINFO_JOINTYPE_FIELD, FAMILYBASEINFO_ICON_FIELD, FAMILYBASEINFO_LEVELTIME_FIELD, FAMILYBASEINFO_FIGHTRESULT_FIELD, FAMILYBASEINFO_PLAYERINTOLEVEL_FIELD, FAMILYBASEINFO_FETE_FIELD}
FAMILYBASEINFO.fields = {FAMILYBASEINFO_ID_FIELD, FAMILYBASEINFO_NAME_FIELD, FAMILYBASEINFO_ANNOUCE_FIELD, FAMILYBASEINFO_LEVLE_FIELD, FAMILYBASEINFO_EXP_FIELD, FAMILYBASEINFO_TOTALNUM_FIELD, FAMILYBASEINFO_MAXNUM_FIELD, FAMILYBASEINFO_JOINTYPE_FIELD, FAMILYBASEINFO_ICON_FIELD, FAMILYBASEINFO_LEVELTIME_FIELD, FAMILYBASEINFO_FIGHTRESULT_FIELD, FAMILYBASEINFO_PLAYERINTOLEVEL_FIELD, FAMILYBASEINFO_FETE_FIELD, FAMILYBASEINFO_EXPLORETIMES_FIELD}
FAMILYBASEINFO.is_extendable = false
FAMILYBASEINFO.extensions = {}
TRANSFORMATIONCARDINFO_ID_FIELD.name = "id"

View File

@ -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

View File

@ -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

View File

@ -1,6 +1,5 @@
fileFormatVersion: 2
guid: 662490c50a0740444ad18e93f84b5061
folderAsset: yes
guid: bc4d6d183830fa248a002e741459c88e
DefaultImporter:
externalObjects: {}
userData:

View File

@ -20,7 +20,7 @@ function Shield:SetData(...)
self.cover = self.shieldType ~= ShieldTypeName.NormalReduce -- 除固定减伤盾外都不能叠加
-- 刷新排序等级
self.sort = 4
self.triggerTime=0
self.triggerNum=0
self.onRoleBeHit=function(atkRole, damage, bCrit, finalDmg, damageType, skill)
--damagetype为3 是 舍身济世分摊伤害
if damageType==3 then
@ -29,9 +29,9 @@ function Shield:SetData(...)
if skill then --技能造成的直接伤害
local rDamage = math.floor(damage*self.shieldValue)
if rDamage ~= 0 then
self.triggerTime=self.triggerTime+1
self.triggerNum=self.triggerNum+1
BattleUtil.ApplyDamage(nil,self.target,atkRole, rDamage)
if self.triggerTime>=self.dmgReboundFactor then
if self.triggerNum>=self.dmgReboundFactor then
self.disperse=true
end
end

View File

@ -1,6 +1,7 @@
local UpStarGift = {}
local rechargeNum = 0
local GlobalActConfig = ConfigManager.GetConfig(ConfigName.GlobalActivity)
local heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig)
function UpStarGift:New(gameObject)
local b = {}
b.gameObject = gameObject
@ -245,7 +246,7 @@ function UpStarGift:GetHeroList()
end
local heros = {}
for heroId, _ in pairs(heroList) do
table.insert(heros, heroId)
table.insert(heros, {heroId, heroConfig[heroId].PropertyName})
end
return heros
end
@ -261,7 +262,13 @@ function UpStarGift:GetCurChooseHero()
if choose == 0 and self.tempChoose and self.tempChoose ~= 0 then
-- 检测一遍临时选择的正确性,选择的人物保存到本地,这里是为了防止两期活动数据冲突
local heroList = self:GetHeroList()
if not table.indexof(heroList, self.tempChoose) then
local isHave = false
for _, h in ipairs(heroList) do
if h[1] == self.tempChoose then
isHave = true
end
end
if not isHave then
self.tempChoose = 0
end
--

View File

@ -364,6 +364,9 @@ function FightPointPassMainPanel:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.Player.OnPlayerLvChange, this.RefreshOpenTips)
Game.GlobalEvent:AddEvent(GameEvent.DynamicTask.OnMissionChange, this.refreshVipTask)
Game.GlobalEvent:AddEvent(GameEvent.JumpServerHeightLadder.UpdateWordLv, this.UpdateWordLv)
Game.GlobalEvent:AddEvent(GameEvent.UI.OnOpen, this.OnUIOpen)
Game.GlobalEvent:AddEvent(GameEvent.Guide.FuncGuideDone, this.OnFuncGuideDone)
end
--移除事件监听(用于子类重写)
@ -380,6 +383,9 @@ function FightPointPassMainPanel:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnPlayerLvChange, this.RefreshOpenTips)
Game.GlobalEvent:RemoveEvent(GameEvent.DynamicTask.OnMissionChange, this.refreshVipTask)
Game.GlobalEvent:RemoveEvent(GameEvent.JumpServerHeightLadder.UpdateWordLv, this.UpdateWordLv)
Game.GlobalEvent:RemoveEvent(GameEvent.UI.OnOpen, this.OnUIOpen)
Game.GlobalEvent:RemoveEvent(GameEvent.Guide.FuncGuideDone, this.OnFuncGuideDone)
end
--界面打开时调用(用于子类重写)
@ -671,9 +677,16 @@ function this.RefreshPassGiftShow()
end
-- 打开引导界面时关闭小手提示
function this.OnUIOpen(id)
if id == UIName.GuidePanel then
this.fightGuideEffect:SetActive(false)
end
end
-- 引导结束再显示小手
function this.OnFuncGuideDone()
this.fightGuideEffect:SetActive(not GuideManager.IsInMainGuide() and not GuideManager.IsFunctionGuideExist())
end
-- 设置挑战按钮文字
function this.SetFightBtnText()
this.fightLock:SetActive(false)

View File

@ -141,12 +141,14 @@ function HandBookRoleInfoLayout:OnShowHeroData(_starType,star,_lv)
passObj:SetActive(true)
allBtns[len+1].gameObject:SetActive(true)
Util.GetGameObject(passObj,"s"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetTianFuIcon(star))
Util.GetGameObject(passObj,"frame"):SetActive(false)
local aaa=5
if star>9 then
if star>=9 then
if star>=11 then
Util.GetGameObject(passObj,"frame"):SetActive(true)
aaa=7
else
aaa=star-4
aaa=star-3
end
end
@ -201,7 +203,7 @@ function HandBookRoleInfoLayout:OnShowHeroData(_starType,star,_lv)
local line=Util.GetGameObject(go.transform,"line")
line:SetActive(false)
local bg=Util.GetGameObject(go.transform,"Image"):GetComponent("Image")
Util.GetGameObject(go.transform,"frame"):SetActive(false)
Util.GetGameObject(go.transform,"s"):GetComponent("Image").sprite=this.spLoader:LoadSprite(GetResourcePath(skillList[i].skillConfig.Icon))
Util.GetGameObject(go.transform,"s/Text"):SetActive(false)
local index=i

View File

@ -47,8 +47,6 @@ function EnvoyItem:SetItemData(data)
end
function EnvoyItem:OnOpen()
self.lock:SetActive(false)
self:SetItem(self.gameObject,self.data)
Util.AddOnceClick(self.gameObject,function ()
@ -58,12 +56,12 @@ function EnvoyItem:OnOpen()
-- body
UIManager.OpenPanel(UIName.HongMengEnvoyUnloadPanel,self.data)
else
if self.data.time - GetTimeStamp() > 0 then
local content = ""
local money = math.ceil((self.data.time - GetTimeStamp()) / 432)
local str = ConfigManager.GetConfigData(ConfigName.SpecialConfig,100).Value
local num = tonumber(string.split(str,"#")[1])
local money = math.ceil((self.data.time - GetTimeStamp()) / num)*tonumber(string.split(str,"#")[3])
content =string.format(Language[12189],money)
MsgPanel.ShowTwo(content,function ()
MsgPanel.Hide()
end,function ()

View File

@ -621,15 +621,17 @@ end
function this.updateHomeLandEquipLv()
for key, value in pairs(this.equipDatas) do
value.HomeEquipLv = function()
local data = HomeLandManager.EquipData[value.position]
if data and data.configData and data.configPro then
return {data.configData.Level,data.configPro.Level}
if this.equipDatas then
for key, value in pairs(this.equipDatas) do
value.HomeEquipLv = function()
local data = HomeLandManager.EquipData[value.position]
if data and data.configData and data.configPro then
return {data.configData.Level,data.configPro.Level}
end
return {0,0}
end
return {0,0}
value.homeEquipLv = value.HomeEquipLv()
end
value.homeEquipLv = value.HomeEquipLv()
end
end

View File

@ -177,7 +177,9 @@ function this.SingleBoxDataShow(go,boxData,index)
-- print(Language[12205],HarmonyManager.GongMingBox)
else
local content = ""
local money = math.ceil((HarmonyManager.hongmengHeroInfos[boxData.Id].time - GetTimeStamp()) / 432)
local str = ConfigManager.GetConfigData(ConfigName.SpecialConfig,100).Value
local num = tonumber(string.split(str,"#")[1])
local money = math.ceil((HarmonyManager.hongmengHeroInfos[boxData.Id].time - GetTimeStamp()) / num)*tonumber(string.split(str,"#")[3])
content =string.format(Language[12189],money)
MsgPanel.ShowTwo(content,function ()
MsgPanel.Hide()

View File

@ -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
-- 八日登陆奖励预览

View File

@ -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
-- 向红点绑定物体

View File

@ -17,6 +17,7 @@ local TypeLv=0
function TalismanInfoPopup:InitComponent()
this.spLoader = SpriteLoader.New()
this.backBtn=Util.GetGameObject(this.gameObject,"Panel/BackBtn")
this.backBtn2=Util.GetGameObject(this.gameObject,"Mask")
this.title=Util.GetGameObject(this.gameObject,"Panel/Title"):GetComponent("Text")
--滚动条
@ -41,7 +42,11 @@ function TalismanInfoPopup:BindEvent()
--返回按钮
Util.AddClick(this.backBtn,function()
self:ClosePanel()
end)
end)
Util.AddClick(this.backBtn2,function()
self:ClosePanel()
end)
end
function TalismanInfoPopup:AddListener()

View File

@ -97,12 +97,22 @@ function this:Refresh(_page)
local heroDatas={}
for i = 1, #heros do
local CONFIG = heros[i][2] == 5 and itemConfig or heroConfig
if _page == heros[i][2] and CONFIG[heros[i][1]] then
table.insert(heroDatas,{CONFIG[heros[i][1]],heros[i][2]})
if CONFIG[heros[i][1]] then
if not heroDatas[heros[i][2]] then
heroDatas[heros[i][2]] = {}
end
table.insert(heroDatas[heros[i][2]],{CONFIG[heros[i][1]],heros[i][2]})
end
end
this.ScrollView:SetData(heroDatas, function(index, go)
this.SingleHeroDataShow(go,heroDatas[index],index)
for i = 1, 5 do
if not heroDatas[i] then
this.btnList[i]:SetActive(false)
else
this.btnList[i]:SetActive(true)
end
end
this.ScrollView:SetData(heroDatas[curPage], function(index, go)
this.SingleHeroDataShow(go,heroDatas[curPage][index],index)
end)
end

View File

@ -383,6 +383,9 @@ function EveryDayGiftNew:GetRemainTime()
self.localTimer = nil
end
local la = self.actConfig.ShowTime ~= 1 and Language[10023] or Language[11355]
if self.actConfig.ActiveType == ActivityTypeDef.XinRenShop then
la = "结束时间:"
end
local freshTime = 0
local packFreshTime = 0

View File

@ -259,6 +259,11 @@ function this.SwitchView(index)
this.List5[i].gameObject:SetActive(true)
end
for i = 1, #this.List6 do
if this.List6[i] then
this.List6[i].gameObject:SetActive(false)
end
end
for i = 1, #sixData do
if not this.List6[i] then
this.List6[i] = SubUIManager.Open(SubUIConfig.ItemView,this.sixGrid.transform)
@ -278,7 +283,11 @@ function this.SwitchView(index)
-- this.List6[i].name:GetComponent("Text").text="<color=#EDB64C>"..string.format("%.2f", (sixData[i].WeightShow/100000)*100) .."%</color>"
-- this.List6[i].gameObject:SetActive(true)
-- end
for i = 1, #this.List7 do
if this.List7[i] then
this.List7[i].gameObject:SetActive(false)
end
end
for i = 1, #sevenData do
if not this.List7[i] then
this.List7[i] = SubUIManager.Open(SubUIConfig.ItemView,this.sevenGrid.transform)

View File

@ -667,6 +667,10 @@ function this:UpdateHeroUpLvAndBreakMaterialShow()
if curHeroData.lv>=HeroManager.heroLvEnd[curHeroData.heroConfig.Id] then
this.noUpLvText:SetActive(true)
this.upLv:SetActive(false)
-- 长按升到最大级了,会无法触发抬起事件,主动调用一下
if _isLongPress then
this._onPointerUp()
end
else
this.noUpLvText:SetActive(false)
this.upLv:SetActive(true)
@ -939,7 +943,7 @@ function this.OnUpdate()
if timer <= 0 then
timer = timer + 0.1
_isLongPress = true
this:LvUpClick(false)
this:LvUpClick(false)
end
if Time.frameCount - oldFrame > 0 then
oldFrame = Time.frameCount

View File

@ -348,16 +348,20 @@ function UpView:RechargeType(_type)
PopupTipPanel.ShowTip(Language[10422])
return
end
JumpManager.GoJump(36008)
elseif _type == UpViewRechargeType.SoulCrystal then
-- 充值商店
if not MapManager.Mapping then
if not ShopManager.IsActive(SHOP_TYPE.SOUL_STONE_SHOP) then
PopupTipPanel.ShowTip(Language[10422])
return
end
if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.XinRenShop) then
JumpManager.GoJump(36012)
else
JumpManager.GoJump(36008)
end
-- elseif _type == UpViewRechargeType.SoulCrystal then
-- -- 充值商店
-- if not MapManager.Mapping then
-- if not ShopManager.IsActive(SHOP_TYPE.SOUL_STONE_SHOP) then
-- PopupTipPanel.ShowTip(Language[10422])
-- return
-- end
-- JumpManager.GoJump(36008)
-- end
elseif _type == UpViewRechargeType.YeQiuQuan then--跳限时商市
if UIManager.IsOpen(UIName.TenRecruitPanel) then
UIManager.ClosePanel(UIName.TenRecruitPanel)