Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
ZhangBiao
commit
2cb1af4c8b
Binary file not shown.
|
After Width: | Height: | Size: 7.8 KiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 5181fcd15ac993f418020dfe6020c14e
|
||||
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: e66f67042adced0459cada7f44b54cbc
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: ZhiZhunJiangShiAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 30 KiB |
|
|
@ -0,0 +1,88 @@
|
|||
fileFormatVersion: 2
|
||||
guid: c934fc7e46473aa4cbcc9f39f046c09c
|
||||
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: -1
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 74d4c7c7a7bc9cd4b85f547a5079cf18
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -4865,7 +4865,7 @@ ParticleSystem:
|
|||
--- !u!199 &325797788
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -4924,6 +4924,42 @@ ParticleSystemRenderer:
|
|||
m_Mesh2: {fileID: 0}
|
||||
m_Mesh3: {fileID: 0}
|
||||
m_MaskInteraction: 0
|
||||
--- !u!1 &366932770
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 366932771}
|
||||
m_Layer: 5
|
||||
m_Name: OpenTips
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &366932771
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 366932770}
|
||||
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: 1322237861}
|
||||
m_Father: {fileID: 1388929535}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -509.89996, y: 491}
|
||||
m_SizeDelta: {x: 977.6, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &384354872
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -9621,7 +9657,7 @@ ParticleSystem:
|
|||
--- !u!199 &689865173
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -9983,6 +10019,86 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!1 &796774146
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 796774147}
|
||||
- component: {fileID: 796774150}
|
||||
- component: {fileID: 796774148}
|
||||
m_Layer: 5
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &796774147
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 796774146}
|
||||
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: 1322237861}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 1.3999939, y: 0.69999695}
|
||||
m_SizeDelta: {x: -42.8, y: -18.6}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &796774150
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 796774146}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &796774148
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 796774146}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.86274517, g: 0.6901961, b: 0.48235297, 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_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 30
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 0
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: '************************************************************************************'
|
||||
LanguageIndex: 10530
|
||||
--- !u!1 &921277673
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -10666,6 +10782,81 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u8D60\u9001"
|
||||
LanguageIndex: 10514
|
||||
--- !u!1 &1322237860
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1322237861}
|
||||
- component: {fileID: 1322237863}
|
||||
- component: {fileID: 1322237862}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1322237861
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1322237860}
|
||||
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: 796774147}
|
||||
m_Father: {fileID: 366932771}
|
||||
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: 302, y: 17}
|
||||
m_SizeDelta: {x: 400, y: 150}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1322237863
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1322237860}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1322237862
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1322237860}
|
||||
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: cea2de122c1a9514ca0fccab6368d837, 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 &1388929534
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -10695,6 +10886,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 1398615584}
|
||||
- {fileID: 3144727546776224643}
|
||||
- {fileID: 366932771}
|
||||
m_Father: {fileID: 6976277603980592380}
|
||||
m_RootOrder: 10
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -15460,7 +15652,7 @@ ParticleSystem:
|
|||
--- !u!199 &1640369986
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -20399,7 +20591,7 @@ ParticleSystem:
|
|||
--- !u!199 &2023267969
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -25520,7 +25712,7 @@ ParticleSystem:
|
|||
--- !u!199 &53865032735354669
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -30371,7 +30563,7 @@ ParticleSystem:
|
|||
--- !u!199 &53865032903479894
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -35106,7 +35298,7 @@ ParticleSystem:
|
|||
--- !u!199 &53865033217178009
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -39719,7 +39911,7 @@ ParticleSystem:
|
|||
--- !u!199 &53865033315684810
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -40488,7 +40680,7 @@ RectTransform:
|
|||
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_AnchoredPosition: {x: 50, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 61.48}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &7481411220995830971
|
||||
|
|
@ -41320,7 +41512,7 @@ RectTransform:
|
|||
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_AnchoredPosition: {x: 50, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 217.5}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1473222624206509369
|
||||
|
|
@ -42585,7 +42777,7 @@ MonoBehaviour:
|
|||
--- !u!199 &2029503781167846324
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -52351,7 +52543,7 @@ ParticleSystem:
|
|||
--- !u!199 &6880421793403083728
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -58115,7 +58307,7 @@ ParticleSystem:
|
|||
--- !u!199 &4461638917069206421
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -63553,7 +63745,7 @@ ParticleSystem:
|
|||
--- !u!199 &3013323903669708406
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -68317,7 +68509,7 @@ ParticleSystem:
|
|||
--- !u!199 &3013323904051820469
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -72889,7 +73081,7 @@ ParticleSystem:
|
|||
--- !u!199 &3013323905367474027
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -80323,7 +80515,7 @@ ParticleSystem:
|
|||
--- !u!199 &4464147961387653562
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -85026,7 +85218,7 @@ ParticleSystem:
|
|||
--- !u!199 &4464147961555461313
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -89909,7 +90101,7 @@ ParticleSystem:
|
|||
--- !u!199 &4464147961868422926
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -94596,7 +94788,7 @@ ParticleSystem:
|
|||
--- !u!199 &4464147962235348829
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -100405,7 +100597,7 @@ ParticleSystem:
|
|||
--- !u!199 &6988990775388982249
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -106510,7 +106702,7 @@ ParticleSystem:
|
|||
--- !u!199 &1454073279585546898
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -111487,7 +111679,7 @@ ParticleSystem:
|
|||
--- !u!199 &6133679773105218358
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -116381,7 +116573,7 @@ ParticleSystem:
|
|||
--- !u!199 &6133679773792227019
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -121047,7 +121239,7 @@ ParticleSystem:
|
|||
--- !u!199 &6133679774607836274
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -125927,7 +126119,7 @@ ParticleSystem:
|
|||
--- !u!199 &7281689276397397565
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -126096,9 +126288,9 @@ RectTransform:
|
|||
m_Father: {fileID: 3952385394978222417}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 50, y: -111.479996}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 50, y: 0}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &109213283015355470
|
||||
|
|
@ -131313,7 +131505,7 @@ ParticleSystem:
|
|||
--- !u!199 &6542693245334262270
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -136182,7 +136374,7 @@ ParticleSystem:
|
|||
--- !u!199 &6542693245491611079
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -143689,7 +143881,7 @@ ParticleSystem:
|
|||
--- !u!199 &4325216380872068964
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 0
|
||||
m_ObjectHideFlags: 2
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -1797,6 +1797,86 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u67E5\u770B\u795E\u5C06"
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &4807791001723234914
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6018432383040005467}
|
||||
- component: {fileID: 59271303520494573}
|
||||
- component: {fileID: 4822299028475260433}
|
||||
m_Layer: 5
|
||||
m_Name: armorLock
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6018432383040005467
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4807791001723234914}
|
||||
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: 5657074182624981674}
|
||||
m_RootOrder: 6
|
||||
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: 160, y: 29.1375}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &59271303520494573
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4807791001723234914}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &4822299028475260433
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4807791001723234914}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 0.8000001, b: 0, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3}
|
||||
m_FontSize: 30
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 40
|
||||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text:
|
||||
LanguageIndex: 0
|
||||
--- !u!1 &4987017433144427803
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2306,6 +2386,7 @@ RectTransform:
|
|||
- {fileID: 6708840274652747615}
|
||||
- {fileID: 2212749366653133608}
|
||||
- {fileID: 59611912520081040}
|
||||
- {fileID: 6018432383040005467}
|
||||
m_Father: {fileID: 9015164529682029271}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
|
|||
|
|
@ -92504,6 +92504,7 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 5422714689001390831}
|
||||
- {fileID: 3979928378610803921}
|
||||
- {fileID: 1485635558825404010}
|
||||
- {fileID: 1423786620825678682}
|
||||
|
|
@ -93766,7 +93767,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 3458161776330785400}
|
||||
m_Father: {fileID: 8819440390954273562}
|
||||
m_RootOrder: 2
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
|
|
@ -116139,7 +116140,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 7538222833600628052}
|
||||
m_Father: {fileID: 8819440390954273562}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
|
|
@ -117349,6 +117350,80 @@ Animator:
|
|||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &9017703315835868481
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5422714689001390831}
|
||||
- component: {fileID: 3693348905635138102}
|
||||
- component: {fileID: 3325669649431455292}
|
||||
m_Layer: 5
|
||||
m_Name: select
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5422714689001390831
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9017703315835868481}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0.1409013, w: 0.9900237}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 8819440390954273562}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -16.2}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 34.599976, y: -95.589966}
|
||||
m_SizeDelta: {x: 317, y: 139}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3693348905635138102
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9017703315835868481}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &3325669649431455292
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9017703315835868481}
|
||||
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: 5181fcd15ac993f418020dfe6020c14e, 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 &9220029143091251412
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -117381,7 +117456,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 4951834801670015792}
|
||||
m_Father: {fileID: 8819440390954273562}
|
||||
m_RootOrder: 0
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 11.7}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
|
|
|
|||
|
|
@ -1379,6 +1379,8 @@ ActivityTypeDef = {
|
|||
ContinuePackage = 87, -- 连购礼包
|
||||
Incarnation = 86,--抽卡变身卡
|
||||
jingjishilian = 88,
|
||||
|
||||
chaozhifanli = 90,
|
||||
}
|
||||
--活动结束需要处理面板关闭类型
|
||||
ActivityTypePanel = {
|
||||
|
|
|
|||
|
|
@ -244,6 +244,7 @@ ConfigName = {
|
|||
GoodsConfig = "GoodsConfig",
|
||||
ThemeActivityShop = "ThemeActivityShop",
|
||||
SummonTreasure = "SummonTreasure",
|
||||
LevelTips = "LevelTips",
|
||||
}
|
||||
|
||||
require "Framework/GameDataBase"
|
||||
|
|
|
|||
|
|
@ -1,31 +1,24 @@
|
|||
require("Base/BasePanel")
|
||||
local ContinuePackagePanel = Inherit(BasePanel)
|
||||
local PremiumRebatePanel = Inherit(BasePanel)
|
||||
local this = PremiumRebatePanel
|
||||
local rechargeConfig = ConfigManager.GetConfig(ConfigName.RechargeCommodityConfig)
|
||||
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||
local artResourcesConfig = ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
|
||||
local activityRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardConfig)
|
||||
local TabBox = require("Modules/Common/TabBox")
|
||||
local tabs = {}
|
||||
local BTNS = {
|
||||
[1] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "b_baibao_liangouhaoli-a",text2 = "b_baibao_liangouhaoli",title = "b_baibao_liangouhaoli-b"},
|
||||
[2] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "b_baibao_meiritehui-a",text2 = "b_baibao_meiritehui",title = "b_baibao_meiritehui-b"},
|
||||
[3] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "b_baibao_chaozhitehui-a",text2 = "b_baibao_chaozhitehui",title = "b_baibao_chaozhitehui-b"},
|
||||
[1] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "6\n元",showType = 48,},
|
||||
[2] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "30\n元",showType = 49,},
|
||||
}
|
||||
local btnType = {
|
||||
LianGou = 1,
|
||||
Meiri = 2,
|
||||
ChaoZhi = 3,
|
||||
}
|
||||
|
||||
function ContinuePackagePanel:InitComponent()
|
||||
local curPage = 1
|
||||
function PremiumRebatePanel:InitComponent()
|
||||
self.spLoader = SpriteLoader.New()
|
||||
self.backBtn = Util.GetGameObject(self.gameObject, "closeBtn")
|
||||
self.itemPre = Util.GetGameObject(self.gameObject, "Bg/ItemPre")
|
||||
self.scrollItem = Util.GetGameObject(self.gameObject, "Bg/scroll")
|
||||
self.itemPre = Util.GetGameObject(self.gameObject, "Bg/scroll/ItemPre")
|
||||
self.backArena = Util.GetGameObject(self.gameObject, "backArena")
|
||||
self.itemPre:SetActive(false)
|
||||
self.leftTime = Util.GetGameObject(self.gameObject, "Bg/time/leftTime"):GetComponent("Text")
|
||||
self.title = Util.GetGameObject(self.gameObject, "Bg/NameBg/Image"):GetComponent("Image")
|
||||
self.btnList = {}
|
||||
for i = 1, 3 do
|
||||
self.btnList[i] = Util.GetGameObject(self.gameObject, "Bg/btns/btn"..i)
|
||||
end
|
||||
self.leftTime = Util.GetGameObject(self.gameObject, "Bg/time"):GetComponent("Text")
|
||||
self.tabbox = Util.GetGameObject(self.gameObject, "bg/tabbox")
|
||||
|
||||
local rootHight = self.scrollItem.transform.rect.height
|
||||
local width = self.scrollItem.transform.rect.width
|
||||
|
|
@ -34,225 +27,150 @@ function ContinuePackagePanel:InitComponent()
|
|||
self.scrollView.moveTween.MomentumAmount = 1
|
||||
self.scrollView.moveTween.Strength = 2
|
||||
self.scrollView.elastic = false
|
||||
|
||||
self.itemViewList = {}
|
||||
self.sortingOrder = 0
|
||||
self.curPage = btnType.LianGou
|
||||
end
|
||||
|
||||
--绑定事件（用于子类重写）
|
||||
function ContinuePackagePanel:BindEvent()
|
||||
for i = 1, self.backArena.transform.childCount do
|
||||
Util.AddOnceClick(self.backArena.transform:GetChild(i-1).gameObject, function()
|
||||
self:ClosePanel()
|
||||
end)
|
||||
end
|
||||
for j = 1, 3 do
|
||||
Util.AddOnceClick(self.btnList[j], function()
|
||||
if self.curPage ~= j then
|
||||
self.curPage = j
|
||||
ContinuePackagePanel:Refresh(true,true)
|
||||
end
|
||||
end)
|
||||
function PremiumRebatePanel:BindEvent()
|
||||
Util.AddOnceClick(self.backBtn, function()
|
||||
self:ClosePanel()
|
||||
end)
|
||||
-- 初始化Tab管理器
|
||||
self.PageTabCtrl = TabBox.New()
|
||||
self.PageTabCtrl:SetTabAdapter(self.PageTabAdapter)
|
||||
self.PageTabCtrl:SetTabIsLockCheck(self.PageTabIsLockCheck)
|
||||
self.PageTabCtrl:SetChangeTabCallBack(self.OnPageTabChange)
|
||||
end
|
||||
|
||||
function PremiumRebatePanel.PageTabAdapter(tab, index, status)
|
||||
local select = Util.GetGameObject(tab, "select")
|
||||
local title = Util.GetGameObject(tab, "title"):GetComponent("Text")
|
||||
title.text = self.spLoader:LoadSprite(BTNS[index].text1)
|
||||
if status == "select" then
|
||||
select.gameObject:SetActive(true)
|
||||
else
|
||||
select.gameObject:SetActive(false)
|
||||
end
|
||||
end
|
||||
|
||||
function PremiumRebatePanel.PageTabIsLockCheck()
|
||||
return true
|
||||
end
|
||||
|
||||
function PremiumRebatePanel.OnPageTabChange(index)
|
||||
if curPage == index then
|
||||
return
|
||||
end
|
||||
curPage = index
|
||||
this:Refresh(false,false)
|
||||
end
|
||||
|
||||
--添加事件监听（用于子类重写）
|
||||
function ContinuePackagePanel:AddListener()
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityProgressStateChange,self.Refresh,self)
|
||||
function PremiumRebatePanel:AddListener()
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityProgressStateChange,self.OnShow,self)
|
||||
end
|
||||
|
||||
--移除事件监听（用于子类重写）
|
||||
function ContinuePackagePanel:RemoveListener()
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityProgressStateChange,self.Refresh,self)
|
||||
function PremiumRebatePanel:RemoveListener()
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityProgressStateChange,self.OnShow,self)
|
||||
end
|
||||
|
||||
function ContinuePackagePanel:OnSortingOrderChange()
|
||||
function PremiumRebatePanel:OnSortingOrderChange()
|
||||
|
||||
end
|
||||
local fun
|
||||
|
||||
--界面打开时调用（用于子类重写）
|
||||
function ContinuePackagePanel:OnOpen(_linkActId, _fun)
|
||||
self.linkActId = _linkActId
|
||||
self.fun = _fun
|
||||
function PremiumRebatePanel:OnOpen()
|
||||
|
||||
end
|
||||
|
||||
--界面打开或者重新打开后，界面刷新时调用（用于子类重写）
|
||||
function ContinuePackagePanel:OnShow()
|
||||
ContinuePackagePanel:Refresh(true,true)
|
||||
function PremiumRebatePanel:OnShow()
|
||||
self.actData = ActivityGiftManager.GetActivityInfo(ActivityTypeDef.chaozhifanli)
|
||||
self.actConfigData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",ActivityTypeDef.chaozhifanli)
|
||||
self:Refresh(true,true)
|
||||
end
|
||||
|
||||
function ContinuePackagePanel:Refresh(isTop,isAni)
|
||||
self.actData = CommonActPageManager.GetData(ActivityTypeDef.ContinuePackage,self.linkActId)
|
||||
self:SetBtns()
|
||||
function PremiumRebatePanel:Refresh(isTop,isAni)
|
||||
self.giftData = DynamicActivityManager.GetGiftDataByType({DataType.Direct,5,BTNS[curPage].showType})
|
||||
self:SetRewardShow(isTop,isAni)
|
||||
self:SetTime()
|
||||
end
|
||||
|
||||
function ContinuePackagePanel:SetBtns()
|
||||
self.title.sprite = self.spLoader:LoadSprite(BTNS[self.curPage].title)
|
||||
for i = 1, 3 do
|
||||
if not self.actData.rewards[i] or #self.actData.rewards[i] <= 0 then
|
||||
self.btnList[i]:SetActive(false)
|
||||
else
|
||||
self.btnList[i]:SetActive(true)
|
||||
if self.curPage == i then
|
||||
Util.GetGameObject(self.btnList[i],"Image"):GetComponent("Image").sprite = self.spLoader:LoadSprite(BTNS[i].text2)
|
||||
self.btnList[i]:GetComponent("Image").sprite = self.spLoader:LoadSprite(BTNS[i].bg2)
|
||||
else
|
||||
Util.GetGameObject(self.btnList[i],"Image"):GetComponent("Image").sprite = self.spLoader:LoadSprite(BTNS[i].text1)
|
||||
self.btnList[i]:GetComponent("Image").sprite = self.spLoader:LoadSprite(BTNS[i].bg1)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function ContinuePackagePanel:SetRewardShow(isTop,isAni)
|
||||
function PremiumRebatePanel:SetRewardShow(isTop,isAni)
|
||||
-- 显示
|
||||
self.scrollView:SetData(self.actData.rewards[self.curPage], function (index, item)
|
||||
if self.actData.rewards[self.curPage][index].otherData.Type == self.curPage then
|
||||
self:ShowSingleHero(item, self.actData.rewards[self.curPage][index],index)
|
||||
end
|
||||
self.scrollView:SetData(self.giftData, function (index, item)
|
||||
self:ShowSingleHero(item, self.giftData[index],index)
|
||||
end,not isTop,not isAni)
|
||||
end
|
||||
|
||||
function ContinuePackagePanel:ShowSingleHero(go,data,index)
|
||||
function PremiumRebatePanel:ShowSingleHero(go,_data,index)
|
||||
local title = Util.GetGameObject(go, "title"):GetComponent("Text")
|
||||
local grid = Util.GetGameObject(go, "Grid")
|
||||
local btnGet = Util.GetGameObject(go, "btnGet")
|
||||
local btnText = Util.GetGameObject(go, "btnGet/Text"):GetComponent("Text")
|
||||
local btnImg = Util.GetGameObject(go, "btnGet"):GetComponent("Image")
|
||||
local buyDayImg = Util.GetGameObject(go, "bugDay")
|
||||
local buyDayText = Util.GetGameObject(buyDayImg, "Text"):GetComponent("Text")
|
||||
local obj = Util.GetGameObject(btnGet, "Obj")
|
||||
local icon = Util.GetGameObject(obj, "icon"):GetComponent("Image")
|
||||
local cost = Util.GetGameObject(obj, "cost"):GetComponent("Text")
|
||||
local canBuyTime = Util.GetGameObject(go, "times"):GetComponent("Text")
|
||||
|
||||
local missionConfigData = self.actConfigData[(curPage - 1)*15 + index]
|
||||
title.text = missionConfigData.ContentsShow
|
||||
if not self.itemViewList[go] then
|
||||
self.itemViewList[go] = {}
|
||||
end
|
||||
for k,v in ipairs(self.itemViewList[go]) do
|
||||
v.gameObject:SetActive(false)
|
||||
end
|
||||
for i = 1, #data.otherData.Reward do
|
||||
local rewardData = data.otherData.Reward[i]
|
||||
for i = 1, #_data.data.shows do
|
||||
if not self.itemViewList[go][i] then
|
||||
self.itemViewList[go][i] = SubUIManager.Open(SubUIConfig.ItemView, grid.transform)
|
||||
self.itemViewList[go][i] = SubUIManager.Open(SubUIConfig.ItemView,self.grid.transform)
|
||||
self.itemViewList[go][i].gameObject:SetActive(false)
|
||||
end
|
||||
self.itemViewList[go][i]:OnOpen(false, rewardData, 0.9,false,false,false,self.sortingOrder)
|
||||
self.itemViewList[go][i]:OnOpen(false, {_data.data.shows[i][1],_data.data.shows[i][2],_data.data.shows[i][3]}, 0.9,false,false,false,self.sortingOrder)
|
||||
self.itemViewList[go][i].gameObject:SetActive(true)
|
||||
end
|
||||
|
||||
-- LogBlue("Id:"..tostring(data.missionId).." state:"..tostring(data.state).." progress:"..tostring(data.progress))
|
||||
Util.SetGray(btnGet,false)
|
||||
buyDayImg:SetActive(false)
|
||||
btnText.gameObject:SetActive(false)
|
||||
obj:SetActive(false)
|
||||
canBuyTime.text = string.format( "剩余：%s次",data.progress)
|
||||
canBuyTime.gameObject:SetActive(self.curPage ~= btnType.LianGou)--第一页连购好礼不显示剩余次数
|
||||
btnImg.sprite = self.spLoader:LoadSprite("s_slbz_anniu")
|
||||
if data.otherData.GoodType == 1 then--直购
|
||||
btnText.gameObject:SetActive(true)
|
||||
btnText.text = string.format("%s 元",data.otherData.Price)
|
||||
if data.state == 8 then
|
||||
btnImg.sprite = self.spLoader:LoadSprite("s_slbz_1anniuhuise")
|
||||
btnText.text = Language[10514]
|
||||
canBuyTime.text = ""
|
||||
elseif data.state == 3 then
|
||||
Util.SetGray(btnGet,true)
|
||||
elseif data.state == 2 then
|
||||
Util.SetGray(btnGet,true)
|
||||
buyDayImg:SetActive(true)
|
||||
buyDayText.text = string.format("%s日后可购",data.otherData.canBuyDay)
|
||||
end
|
||||
elseif data.otherData.GoodType == 2 then--商品
|
||||
obj:SetActive(true)
|
||||
icon.sprite = self.spLoader:LoadSprite(GetSpriteNameByItemId(data.otherData.Price[1]))
|
||||
cost.text = data.otherData.Price[2]
|
||||
if data.state == 8 then
|
||||
obj:SetActive(false)
|
||||
btnText.gameObject:SetActive(true)
|
||||
btnImg.sprite = self.spLoader:LoadSprite("s_slbz_1anniuhuise")
|
||||
btnText.text = Language[10514]
|
||||
canBuyTime.text = ""
|
||||
elseif data.state == 3 then
|
||||
Util.SetGray(btnGet,true)
|
||||
elseif data.state == 2 then
|
||||
Util.SetGray(btnGet,true)
|
||||
buyDayImg:SetActive(true)
|
||||
buyDayText.text = string.format("%s日后可购",data.otherData.canBuyDay)
|
||||
end
|
||||
end
|
||||
|
||||
Util.AddOnceClick(btnGet,function ()
|
||||
if data.state == 1 then
|
||||
if data.otherData.GoodType == 1 then--直购
|
||||
PayManager.Pay(data.otherData.GoodId, function(id)
|
||||
FirstRechargeManager.RefreshAccumRechargeValue(data.otherData.GoodId)
|
||||
OperatingManager.SetHadBuyGoodsId({data.otherData.GoodId})
|
||||
-- OperatingManager.RemoveItemInfoByType(GoodsTypeDef.DirectPurchaseGift, data.otherData.GoodId)
|
||||
btnText.gameObject:SetActive(true)
|
||||
btnText.text = string.format("%s 元",_data.data.price)
|
||||
local missionData = self.actData.mission[(curPage - 1)*15 + index]
|
||||
if missionData then
|
||||
if missionData.state == 0 then
|
||||
Util.SetGray(btnGet,false)
|
||||
Util.AddOnceClick(btnGet,function ()
|
||||
PayManager.Pay(_data.data.shopData.goodsId, function(id)
|
||||
FirstRechargeManager.RefreshAccumRechargeValue(_data.data.shopData.goodsId)
|
||||
OperatingManager.SetHadBuyGoodsId({_data.data.shopData.goodsId})
|
||||
missionData.state = 0
|
||||
self:ShowSingleHero(go,_data,index)
|
||||
self:Refresh(false,false)
|
||||
end)
|
||||
elseif data.otherData.GoodType == 2 then--商品
|
||||
NetManager.ContinueBuyItemRequest(data.otherData.GoodId,function (drop)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function()
|
||||
self:Refresh(false,false)
|
||||
end)
|
||||
end)
|
||||
end
|
||||
elseif data.state == 3 then
|
||||
PopupTipPanel.ShowTip("请先购买上一礼包，即可解锁此礼包")
|
||||
elseif data.state == 2 then
|
||||
PopupTipPanel.ShowTip("礼包尚未开启，请耐心等待")
|
||||
end)
|
||||
else
|
||||
Util.SetGray(btnGet,true)
|
||||
btnText.text = "已购买"
|
||||
end
|
||||
end)
|
||||
else
|
||||
Util.SetGray(btnGet,true)
|
||||
PopupTipPanel.ShowTip("累计购买X天后才可购买！")
|
||||
end
|
||||
end
|
||||
|
||||
function ContinuePackagePanel:SetTime()
|
||||
function PremiumRebatePanel:SetTime()
|
||||
|
||||
end
|
||||
|
||||
function PremiumRebatePanel:OnClose()
|
||||
if self.timer then
|
||||
self.timer:Stop()
|
||||
self.timer = nil
|
||||
end
|
||||
local time = self.actData.endTime - GetTimeStamp()
|
||||
local leftTime = time - 86280
|
||||
if self.curPage == btnType.Meiri and leftTime > 0 then--如果是每日特惠显示每日倒计时
|
||||
time = CalculateSecondsNowTo_N_OClock(24)
|
||||
end
|
||||
--每日特惠处理
|
||||
self.leftTime.text = Language[10512]..TimeToFelaxible(time)
|
||||
if self.curPage == btnType.Meiri then
|
||||
self.leftTime.text = Language[10023]..TimeToFelaxible(time)
|
||||
end
|
||||
self.timer = Timer.New(function ()
|
||||
if time <= 0 then
|
||||
if self.curPage == btnType.Meiri and leftTime > 0 then
|
||||
self:Refresh(false,false)
|
||||
return
|
||||
end
|
||||
self:ClosePanel()
|
||||
end
|
||||
self.leftTime.text = Language[10512]..TimeToFelaxible(time)
|
||||
if self.curPage == btnType.Meiri then
|
||||
self.leftTime.text = Language[10023]..TimeToFelaxible(time)
|
||||
end
|
||||
time = time -1
|
||||
end, 1, -1, true)
|
||||
self.timer:Start()
|
||||
end
|
||||
|
||||
function ContinuePackagePanel:OnClose()
|
||||
if self.timer then
|
||||
self.timer:Stop()
|
||||
self.timer = nil
|
||||
end
|
||||
self.sortingOrder = 0
|
||||
if self.fun then
|
||||
self.fun()
|
||||
self.fun = nil
|
||||
end
|
||||
end
|
||||
|
||||
--界面销毁时调用（用于子类重写）
|
||||
function ContinuePackagePanel:OnDestroy()
|
||||
function PremiumRebatePanel:OnDestroy()
|
||||
self.spLoader:Destroy()
|
||||
self.itemViewList = {}
|
||||
end
|
||||
|
||||
return ContinuePackagePanel
|
||||
return PremiumRebatePanel
|
||||
|
|
@ -730,7 +730,7 @@ function this.CreatSingleData(shopData,DataTypeIndex,buyType,actType)
|
|||
if data.shopItemData.DailyUpdate == 7 then
|
||||
data.tipImageText = Language[11699]
|
||||
elseif data.shopItemData.DailyUpdate == 15 then
|
||||
data.tipImageText = Language[11700]
|
||||
data.tipImageText = Language[11700]
|
||||
elseif data.shopItemData.DailyUpdate == 30 then
|
||||
data.tipImageText = Language[11357]
|
||||
elseif shopData.goodsId == 9107 then
|
||||
|
|
|
|||
|
|
@ -129,6 +129,9 @@ function FightPointPassMainPanel:InitComponent()
|
|||
this.getRewardButton = Util.GetGameObject(self.gameObject, "Bg/RightDown/mainTask/getRewardButton")
|
||||
this.mainTaskGRewardImage = Util.GetGameObject(self.gameObject, "Bg/RightDown/mainTask/getRewardButton/getRewardImage")
|
||||
this.mainTaskJumpImage = Util.GetGameObject(self.gameObject, "Bg/RightDown/mainTask/getRewardButton/jumpImage")
|
||||
-- 解锁提示
|
||||
this.OpenTips = Util.GetGameObject(self.gameObject, "Bg/RightDown/OpenTips")
|
||||
this.OpenTipsTxt = Util.GetGameObject(self.gameObject, "Bg/RightDown/OpenTips/Image/Text"):GetComponent("Text")
|
||||
|
||||
this.GuideEffectGo = poolManager:LoadAsset("GuideEffect", PoolManager.AssetType.GameObject)
|
||||
this.GuideEffectGo.transform:SetParent(this.mainTaskGRewardImage.transform)
|
||||
|
|
@ -355,6 +358,7 @@ function FightPointPassMainPanel:AddListener()
|
|||
Game.GlobalEvent:AddEvent(GameEvent.Mission.GetOpenServerRewardRefreshFightPoint, this.UpdateOpenSeverWelfare)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Player.OnPlayerLvChange, this.SetFightBtnText)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.Player.OnPlayerLvChange, this.RefreshOpenTips)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.DynamicTask.OnMissionChange, this.refreshVipTask)
|
||||
Game.GlobalEvent:AddEvent(GameEvent.JumpServerHeightLadder.UpdateWordLv, this.UpdateWordLv)
|
||||
end
|
||||
|
|
@ -370,6 +374,7 @@ function FightPointPassMainPanel:RemoveListener()
|
|||
Game.GlobalEvent:RemoveEvent(GameEvent.Mission.GetOpenServerRewardRefreshFightPoint, this.UpdateOpenSeverWelfare)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnShowBattleUpLvTip, this.RefreshBattleUpLvTip)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnPlayerLvChange, this.SetFightBtnText)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.Player.OnPlayerLvChange, this.RefreshOpenTips)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.DynamicTask.OnMissionChange, this.refreshVipTask)
|
||||
Game.GlobalEvent:RemoveEvent(GameEvent.JumpServerHeightLadder.UpdateWordLv, this.UpdateWordLv)
|
||||
end
|
||||
|
|
@ -490,6 +495,8 @@ function FightPointPassMainPanel:OnShow()
|
|||
|
||||
-- 刷新任务显示
|
||||
this.refreshVipTask()
|
||||
-- 刷新解锁信息显示
|
||||
this.RefreshOpenTips()
|
||||
end
|
||||
|
||||
|
||||
|
|
@ -517,6 +524,17 @@ function this.refreshVipTask()
|
|||
end
|
||||
end
|
||||
|
||||
-- 刷新提示文字显示
|
||||
function this.RefreshOpenTips()
|
||||
local tips = FightPointPassManager.GetCurLevelTips()
|
||||
if tips then
|
||||
this.OpenTips:SetActive(true)
|
||||
this.OpenTipsTxt.text = tips
|
||||
else
|
||||
this.OpenTips:SetActive(false)
|
||||
end
|
||||
end
|
||||
|
||||
--寻宝显示
|
||||
function this.UpdateFindTreasureMaterialNum()
|
||||
local mazeTreasureMax = ConfigManager.GetConfigData(ConfigName.PlayerLevelConfig,PlayerManager.level).MazeTreasureMax
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ local mainLevelConfig = ConfigManager.GetConfig(ConfigName.MainLevelConfig)
|
|||
-- 火洞吊裸
|
||||
local Huo_Dong_Diao_Luo = ConfigManager.GetConfig(ConfigName.ActivityDropReward)
|
||||
local rewardGroupConfig = ConfigManager.GetConfig(ConfigName.RewardGroup)
|
||||
local LevelTipsConfig = ConfigManager.GetConfig(ConfigName.LevelTips)
|
||||
this.talkingTime = 0 --对话时间
|
||||
-- 挂机物品栏位对应vip数值加成特权
|
||||
|
||||
|
|
@ -295,13 +296,14 @@ function this.CheckFightOpenRule(fightId)
|
|||
if PlayerManager.level < mainLevelConfig[this.curOpenFight].LevelLimit then
|
||||
local tip = tostring(mainLevelConfig[this.curOpenFight].LevelLimit .. Language[10056])
|
||||
LogRed(tip .. " 当前："..PlayerManager.level)
|
||||
return false, tip
|
||||
return false, tip, tip
|
||||
end
|
||||
|
||||
local openRule = mainLevelConfig[fightId].OpenRule
|
||||
if openRule then
|
||||
local states = {}
|
||||
local tips = {}
|
||||
local btnTxts = {}
|
||||
for index, rule in ipairs(openRule) do
|
||||
if not rule[1] or rule[1] == 0 then
|
||||
LogRed("当前：没有限制条件1")
|
||||
|
|
@ -310,21 +312,24 @@ function this.CheckFightOpenRule(fightId)
|
|||
local star = FightLevelManager.GetAllChapterStars()
|
||||
if star < rule[2] then
|
||||
states[index] = false
|
||||
tips[index] = string.format("山河社稷图星数达%s", rule[2])
|
||||
tips[index] = string.format("山河社稷图星数达%s", rule[2])-- 山河社稷图%s星
|
||||
btnTxts[index] = string.format("山河社稷图%s星", rule[2])
|
||||
LogRed(tips[index]..", 当前："..star)
|
||||
end
|
||||
elseif rule[1] == 2 then
|
||||
local wave = MonsterCampManager.GetMonsterCampCurWave()
|
||||
if wave <= rule[2] then
|
||||
states[index] = false
|
||||
tips[index] = string.format("心魔试炼通关%s层", rule[2])
|
||||
tips[index] = string.format("心魔试炼通关%s层", rule[2])-- 心魔试炼通关999层
|
||||
btnTxts[index] = string.format("心魔试炼通关999层", rule[2])
|
||||
LogRed(tips[index]..", 当前："..wave)
|
||||
end
|
||||
elseif rule[1] == 3 then
|
||||
local lv = HarmonyManager.GetSingleAdditions(HarmonyAddType.AddLv)
|
||||
if lv < rule[2] then
|
||||
states[index] = false
|
||||
tips[index] = string.format("鸿蒙阵共鸣等级达%s", rule[2])
|
||||
tips[index] = string.format("鸿蒙阵共鸣等级达%s", rule[2])-- 鸿蒙阵共鸣%s级
|
||||
btnTxts[index] = string.format("鸿蒙阵共鸣%s级", rule[2])
|
||||
LogRed(tips[index]..", 当前："..lv)
|
||||
end
|
||||
elseif rule[1] == 4 then
|
||||
|
|
@ -334,13 +339,15 @@ function this.CheckFightOpenRule(fightId)
|
|||
local equipStarConfig = ConfigManager.GetConfigData(ConfigName.EquipStarsConfig, rule[2])
|
||||
states[index] = false
|
||||
tips[index] = string.format("拥有%s个%s%s星装备", rule[3], QualityNameDef[equipStarConfig.Quality], equipStarConfig.Stars)
|
||||
btnTxts[index] = string.format("%s个%s%s星装备", rule[3], QualityNameDef[equipStarConfig.Quality], equipStarConfig.Stars)
|
||||
LogRed(tips[index]..", 当前："..num)
|
||||
end
|
||||
elseif rule[1] == 5 then
|
||||
local _, tlv, _ = LikabilityManager.GetTotalHeroLikeLv(-1)
|
||||
if tlv < rule[2] then
|
||||
states[index] = false
|
||||
tips[index] = string.format("神将总好感度等级达%s", rule[2])
|
||||
tips[index] = string.format("神将总好感度等级达%s", rule[2]) -- 总好感度%s级
|
||||
btnTxts[index] = string.format("总好感度%s级", rule[2])
|
||||
LogRed(tips[index]..", 当前："..tlv)
|
||||
end
|
||||
elseif rule[1] == 6 then
|
||||
|
|
@ -348,7 +355,8 @@ function this.CheckFightOpenRule(fightId)
|
|||
local xyPassTimes = XiaoYaoManager.GetCurPassTimes()
|
||||
if xyPassTimes < rule[2] then
|
||||
states[index] = false
|
||||
tips[index] = string.format("通关逍遥游%s次", rule[2])
|
||||
tips[index] = string.format("逍遥游通关%s次", rule[2])
|
||||
btnTxts[index] = string.format("逍遥游通关%s次", rule[2])
|
||||
LogRed(tips[index]..", 当前："..xyPassTimes)
|
||||
end
|
||||
elseif rule[1] == 7 then
|
||||
|
|
@ -357,24 +365,33 @@ function this.CheckFightOpenRule(fightId)
|
|||
local num = #HeroManager.GetAllHeroDatas(c_lv)
|
||||
if num < c_num then
|
||||
states[index] = false
|
||||
tips[index] = string.format("拥有%s个等级%s以上的神将", c_num, c_lv)
|
||||
tips[index] = string.format("拥有%s个等级%s以上的神将", c_num, c_lv)-- %s个%s级神将
|
||||
btnTxts[index] = string.format("%s个%s级神将", c_num, c_lv)
|
||||
LogRed(tips[index]..", 当前："..num)
|
||||
end
|
||||
end
|
||||
end
|
||||
local tip = ""
|
||||
local btnTxt = ""
|
||||
local isOk = true
|
||||
for index, state in pairs(states) do
|
||||
if not state then
|
||||
isOk = false
|
||||
-- 提示文字
|
||||
if tip ~= "" then
|
||||
tip = tip..string.format("，且%s", tips[index])
|
||||
else
|
||||
tip = tips[index]
|
||||
end
|
||||
-- 按钮显示文字
|
||||
if btnTxt ~= "" then
|
||||
btnTxt = tip..string.format("，且%s", btnTxts[index])
|
||||
else
|
||||
btnTxt = btnTxts[index]
|
||||
end
|
||||
end
|
||||
end
|
||||
return isOk, tip.."解锁"
|
||||
return isOk, tip.."解锁", btnTxt
|
||||
end
|
||||
LogRed("当前：没有限制条件2")
|
||||
return true
|
||||
|
|
@ -396,8 +413,9 @@ function this.GetBtnText()
|
|||
return limitLevel .. Language[10056]
|
||||
end
|
||||
--
|
||||
if not this.CheckFightOpenRule(this.curOpenFight) then
|
||||
return "条件未达成"
|
||||
local isOk, tip, btnTxt= this.CheckFightOpenRule(this.curOpenFight)
|
||||
if not isOk then
|
||||
return btnTxt
|
||||
end
|
||||
|
||||
local offset = 1
|
||||
|
|
@ -623,4 +641,42 @@ function this.GetStopBtnState()
|
|||
return isShow
|
||||
end
|
||||
|
||||
-- 用于比较副本id的大小
|
||||
-- > 0 cId1 比 cId2 大
|
||||
-- = 0 相同关卡
|
||||
-- < 0 cId1 比 cId2 小
|
||||
function this.CarbonIdCompare(cId1, cId2)
|
||||
local len1 = string.len(cId1)
|
||||
local diff1 = tonumber(string.sub(cId1, len1, len1))
|
||||
local id1 = tonumber(string.sub(cId1, 1, len1-1))
|
||||
|
||||
local len2 = string.len(cId2)
|
||||
local diff2 = tonumber(string.sub(cId2, len2, len2))
|
||||
local id2 = tonumber(string.sub(cId2, 1, len2-1))
|
||||
|
||||
if diff1 == diff2 then
|
||||
return id1 - id2
|
||||
end
|
||||
return diff1 - diff2
|
||||
end
|
||||
|
||||
-- 获取当前需要显示的描述文字
|
||||
function this.GetCurLevelTips()
|
||||
LogError("GetCurLevelTips")
|
||||
|
||||
for id, config in ConfigPairs(LevelTipsConfig) do
|
||||
LogError(id)
|
||||
if config.Type == 1 then
|
||||
if this.CarbonIdCompare(this.GetCurFightId(), config.Parameter) < 0 then
|
||||
return config.Desc
|
||||
end
|
||||
elseif config.Type == 2 then
|
||||
if PlayerManager.level < config.Parameter then
|
||||
return config.Desc
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
return this
|
||||
|
|
@ -56,8 +56,8 @@ local function _CarbonIdCompare(cId1, cId2)
|
|||
local id1 = tonumber(string.sub(cId1, 1, len1-1))
|
||||
|
||||
local len2 = string.len(cId2)
|
||||
local diff2 = tonumber(string.sub(cId1, len2, len2))
|
||||
local id2 = tonumber(string.sub(cId1, 1, len2-1))
|
||||
local diff2 = tonumber(string.sub(cId2, len2, len2))
|
||||
local id2 = tonumber(string.sub(cId2, 1, len2-1))
|
||||
|
||||
if diff1 == diff2 then
|
||||
return id1 - id2
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ function RewardItemSingleShowPopup:InitComponent()
|
|||
this.itemName = Util.GetGameObject(this.info, "name"):GetComponent("Text")
|
||||
this.armorTitle = Util.GetGameObject(this.info, "armorTitle"):GetComponent("Text")
|
||||
this.armorDesc = Util.GetGameObject(this.info, "armorDesc"):GetComponent("Text")
|
||||
this.armorLock = Util.GetGameObject(this.info, "armorLock"):GetComponent("Text")
|
||||
this.equipQuaText = Util.GetGameObject(self.transform, "bg/topBar/armor/equipQuaText"):GetComponent("Text")
|
||||
this.armorInfo = Util.GetGameObject(self.transform, "bg/topBar/armorInfo")
|
||||
this.armorInfoText = Util.GetGameObject(self.transform, "bg/topBar/armorInfo"):GetComponent("Text")
|
||||
|
|
@ -85,6 +86,10 @@ function RewardItemSingleShowPopup:BindEvent()
|
|||
end)
|
||||
|
||||
Util.AddClick(this.btnSure, function()
|
||||
if itemConfigData.UseLevel and itemConfigData.UseLevel > 0 and PlayerManager.level < itemConfigData.UseLevel then
|
||||
PopupTipPanel.ShowTip(string.format("等级达%s后可以使用", itemConfigData.UseLevel))
|
||||
return
|
||||
end
|
||||
if itemConfigData.ItemType == ItemType.HeroDebris then
|
||||
local gameSetting = ConfigManager.GetConfigData(ConfigName.GameSetting, 1)
|
||||
local endHeroNum=gameSetting.HeroNumlimit-LengthOfTable(HeroManager.GetAllHeroDatas())
|
||||
|
|
@ -528,7 +533,13 @@ function RewardItemSingleShowPopup:OnShow()
|
|||
else
|
||||
this.checkHero:SetActive(false)
|
||||
end
|
||||
|
||||
|
||||
-- 判断是否要显示等级限制
|
||||
this.armorLock.gameObject:SetActive(false)
|
||||
if itemConfigData.UseLevel and itemConfigData.UseLevel > 0 and PlayerManager.level < itemConfigData.UseLevel then
|
||||
this.armorLock.gameObject:SetActive(true)
|
||||
this.armorLock.text = string.format("<color=%s>等级达%s后可以使用</color>", UIColorStr.RED, itemConfigData.UseLevel)
|
||||
end
|
||||
end
|
||||
|
||||
--获取道具种类
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@ local idList = {
|
|||
[1] = {id = 4201,state1 = "前往充值",state2 = "",state3 = "s_slbz_yilingqu_zh"},
|
||||
[2] = {id = 4202,state1 = "前往充值",state2 = "",state3 = "s_slbz_yilingqu_zh"},
|
||||
[3] = {id = 4203,state1 = "前往充值",state2 = "领 取",state3 = "s_slbz_yilingqu_zh"},
|
||||
rotation = Vector3.New(0,0,11.7),
|
||||
position = Vector3.New(-16,-10.8,0),
|
||||
},
|
||||
[2] = {
|
||||
panelId = 1,
|
||||
|
|
@ -28,6 +30,8 @@ local idList = {
|
|||
[1] = {id = 4204,state1 = "前往充值",state2 = "",state3 = "s_slbz_yilingqu_zh"},
|
||||
[2] = {id = 4205,state1 = "前往充值",state2 = "领 取",state3 = "s_slbz_yilingqu_zh"},
|
||||
[3] = {id = 4206,state1 = "前往充值",state2 = "领 取",state3 = "s_slbz_yilingqu_zh"},
|
||||
rotation = Vector3.New(0,0,-0.2),
|
||||
position = Vector3.New(-16,-9,0),
|
||||
},
|
||||
[3] = {
|
||||
panelId = 2,
|
||||
|
|
@ -36,6 +40,8 @@ local idList = {
|
|||
[1] = {id = 4207,state1 = "前往充值",state2 = "领 取",state3 = "s_slbz_yilingqu_zh"},
|
||||
[2] = {id = 4208,state1 = "前往充值",state2 = "领 取",state3 = "s_slbz_yilingqu_zh"},
|
||||
[3] = {id = 4209,state1 = "前往充值",state2 = "点击购买",state3 = "s_slbz_yilingqu_zh"},
|
||||
rotation = Vector3.New(0,0,-16.2),
|
||||
position = Vector3.New(-16,9,0)
|
||||
},
|
||||
}
|
||||
|
||||
|
|
@ -95,7 +101,7 @@ function SupremeHeroPopupNew:InitComponent()
|
|||
this.tianjingzunzheRed = Util.GetGameObject(this.tianjingzunzhe, "red")
|
||||
this.lingxiaobaojian = Util.GetGameObject(this.btnLayer.transform, "threeTab")
|
||||
this.lingxiaobaojianRed = Util.GetGameObject(this.lingxiaobaojian, "red")
|
||||
|
||||
this.select = Util.GetGameObject(this.btnLayer.transform, "select")
|
||||
--1玉帝 2御剑
|
||||
this.panelist = {}
|
||||
for i = 1,3 do
|
||||
|
|
@ -175,7 +181,7 @@ function SupremeHeroPopupNew:BindEvent()
|
|||
if lastPage == curPage then
|
||||
return
|
||||
end
|
||||
|
||||
this:SetSelect()
|
||||
this.SetMissionData()
|
||||
end)
|
||||
Util.AddClick(this.tianjingzunzhe, function()
|
||||
|
|
@ -183,6 +189,7 @@ function SupremeHeroPopupNew:BindEvent()
|
|||
if lastPage == curPage then
|
||||
return
|
||||
end
|
||||
this:SetSelect()
|
||||
this.SetMissionData()
|
||||
end)
|
||||
Util.AddClick(this.lingxiaobaojian, function()
|
||||
|
|
@ -190,10 +197,25 @@ function SupremeHeroPopupNew:BindEvent()
|
|||
if lastPage == curPage then
|
||||
return
|
||||
end
|
||||
this:SetSelect()
|
||||
this.SetMissionData()
|
||||
end)
|
||||
end
|
||||
|
||||
function SupremeHeroPopupNew:SetSelect()
|
||||
local parent = this.lingxiaobaojian.transform
|
||||
if curPage == 1 then
|
||||
parent = this.oneTab.transform
|
||||
elseif curPage == 2 then
|
||||
parent = this.tianjingzunzhe.transform
|
||||
else
|
||||
parent = this.lingxiaobaojian.transform
|
||||
end
|
||||
this.select.transform:SetParent(parent)
|
||||
this.select.transform.localPosition = idList[curPage].position
|
||||
this.select:GetComponent("RectTransform").rotation = Quaternion.Euler(idList[curPage].rotation)
|
||||
end
|
||||
|
||||
--添加事件监听（用于子类重写）
|
||||
function SupremeHeroPopupNew:AddListener()
|
||||
|
||||
|
|
@ -232,6 +254,7 @@ function SupremeHeroPopupNew:OnShow()
|
|||
break
|
||||
end
|
||||
end
|
||||
self:SetSelect()
|
||||
local actData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.SupremeHero)
|
||||
this.oneTab.gameObject:SetActive(true)
|
||||
this.tianjingzunzhe.gameObject:SetActive(true)
|
||||
|
|
|
|||
Loading…
Reference in New Issue