Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
b3650db6ae
Binary file not shown.
|
Before Width: | Height: | Size: 359 KiB After Width: | Height: | Size: 334 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 36 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 34 KiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f27d46871f5cd584985da167f990ec46
|
||||
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: 573ff71131929e649a06252b588673ee
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: RecruitAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 24 KiB |
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: bbd93b31adc71d74b96e42d564603572
|
||||
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: faf134a5ac8bb0c4b9549c1ecc8fbdb8
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: RecruitAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -4363,8 +4363,8 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: -8.9, y: -130.29999}
|
||||
m_SizeDelta: {x: 257, y: 87}
|
||||
m_AnchoredPosition: {x: -1, y: -128}
|
||||
m_SizeDelta: {x: 265, y: 87}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1978896024203804663
|
||||
CanvasRenderer:
|
||||
|
|
@ -5199,6 +5199,7 @@ GameObject:
|
|||
- component: {fileID: 3260027999130258769}
|
||||
- component: {fileID: 3260027999130258775}
|
||||
- component: {fileID: 6870029257176831716}
|
||||
- component: {fileID: 7223917086581848817}
|
||||
m_Layer: 5
|
||||
m_Name: num
|
||||
m_TagString: Untagged
|
||||
|
|
@ -5246,7 +5247,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.9921569, g: 0.6745098, b: 0, a: 1}
|
||||
m_Color: {r: 1, g: 0.9764706, b: 0.8784314, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
|
@ -5268,6 +5269,21 @@ MonoBehaviour:
|
|||
m_LineSpacing: 1
|
||||
m_Text: "\u7B2C55\u5C42"
|
||||
LanguageIndex: 10238
|
||||
--- !u!114 &7223917086581848817
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3260027999130258770}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_EffectColor: {r: 0.3529412, g: 0.18039216, b: 0.043137256, a: 0.5}
|
||||
m_EffectDistance: {x: 1, y: -2}
|
||||
m_UseGraphicAlpha: 1
|
||||
--- !u!1 &3263340749084306874
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -11798,7 +11814,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 0.7176471, b: 0.4039216, a: 1}
|
||||
m_Color: {r: 1, g: 0.9764706, b: 0.80784315, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
|
|
@ -11807,11 +11823,11 @@ MonoBehaviour:
|
|||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_FontData:
|
||||
m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3}
|
||||
m_FontSize: 28
|
||||
m_FontSize: 32
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 1
|
||||
m_MinSize: 20
|
||||
m_MaxSize: 28
|
||||
m_MinSize: 3
|
||||
m_MaxSize: 32
|
||||
m_Alignment: 5
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
|
|
|
|||
|
|
@ -478,6 +478,8 @@ RectTransform:
|
|||
- {fileID: 3542388914378049150}
|
||||
- {fileID: 4210854367932731508}
|
||||
- {fileID: 1965169765554186566}
|
||||
- {fileID: 4558947000371413883}
|
||||
- {fileID: 2033406775299504181}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -5620,7 +5622,7 @@ ParticleSystem:
|
|||
--- !u!199 &6259170830804911733
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -10345,7 +10347,7 @@ ParticleSystem:
|
|||
--- !u!199 &7663224388703278961
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -11094,6 +11096,143 @@ MonoBehaviour:
|
|||
m_FillClockwise: 0
|
||||
m_FillOrigin: 2
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &2689889527873723320
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2033406775299504181}
|
||||
- component: {fileID: 5406922750988588122}
|
||||
- component: {fileID: 1199748476850193939}
|
||||
- component: {fileID: 1445601311729786276}
|
||||
- component: {fileID: 4800005995910992411}
|
||||
m_Layer: 5
|
||||
m_Name: helpBtn
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2033406775299504181
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2689889527873723320}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 100}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 224104263369352388}
|
||||
m_RootOrder: 11
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -100, y: -100}
|
||||
m_SizeDelta: {x: 68, y: 68}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5406922750988588122
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2689889527873723320}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1199748476850193939
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2689889527873723320}
|
||||
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: 47b0d71d3c8ef79468a5fb4d8ec5f365, 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 &1445601311729786276
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2689889527873723320}
|
||||
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: 1199748476850193939}
|
||||
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 &4800005995910992411
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2689889527873723320}
|
||||
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 &2708091584041882913
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -15733,7 +15872,7 @@ ParticleSystem:
|
|||
--- !u!199 &8731954686797860230
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -20458,7 +20597,7 @@ ParticleSystem:
|
|||
--- !u!199 &8433999198031367376
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -25219,7 +25358,7 @@ ParticleSystem:
|
|||
--- !u!199 &3108859455760721518
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -30481,7 +30620,7 @@ ParticleSystem:
|
|||
--- !u!199 &8993958049925528917
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -35677,7 +35816,7 @@ ParticleSystem:
|
|||
--- !u!199 &6352028774183577065
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -40380,7 +40519,7 @@ ParticleSystem:
|
|||
--- !u!199 &6341223334757385390
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -45638,7 +45777,7 @@ ParticleSystem:
|
|||
--- !u!199 &1364151743088453039
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -50590,7 +50729,7 @@ ParticleSystem:
|
|||
--- !u!199 &8405279735407594183
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -55519,7 +55658,7 @@ ParticleSystem:
|
|||
--- !u!199 &1786108631160810919
|
||||
ParticleSystemRenderer:
|
||||
serializedVersion: 6
|
||||
m_ObjectHideFlags: 2
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -55968,3 +56107,140 @@ MonoBehaviour:
|
|||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
--- !u!1 &9193910416414577949
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4558947000371413883}
|
||||
- component: {fileID: 4543166409878565958}
|
||||
- component: {fileID: 7639140612752414857}
|
||||
- component: {fileID: 1082879779725279886}
|
||||
- component: {fileID: 7773503353796939704}
|
||||
m_Layer: 5
|
||||
m_Name: wishBtn
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4558947000371413883
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9193910416414577949}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 100}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 224104263369352388}
|
||||
m_RootOrder: 10
|
||||
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: -120, y: -500}
|
||||
m_SizeDelta: {x: 173, y: 174}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4543166409878565958
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9193910416414577949}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7639140612752414857
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9193910416414577949}
|
||||
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: f27d46871f5cd584985da167f990ec46, 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 &1082879779725279886
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9193910416414577949}
|
||||
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: 7639140612752414857}
|
||||
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 &7773503353796939704
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9193910416414577949}
|
||||
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
|
||||
|
|
|
|||
|
|
@ -1629,6 +1629,7 @@ HELP_TYPE = {
|
|||
Practice = 91,--修行
|
||||
FightLevel = 92,--山河社稷图
|
||||
GuildInFo = 95,--工会信息
|
||||
WishCard = 97,--心愿抽卡
|
||||
}
|
||||
|
||||
NumToComplexFont = {
|
||||
|
|
@ -2050,10 +2051,11 @@ GENERAL_POPUP_TYPE={
|
|||
RecrutReward = 35, --限时招募奖励
|
||||
RecrutDetail = 36, --限时招募奖励详情
|
||||
XiuXingSelectHero = 38,--修行选择英雄弹窗
|
||||
WuJinShuXing = 40,
|
||||
WuJinSetting = 39,
|
||||
ChooseUpHero = 41,--选择up英雄
|
||||
JinJieYuLan = 42,
|
||||
WuJinShuXing = 40, --无尽属性
|
||||
WuJinSetting = 39, --无尽设置
|
||||
ChooseUpHero = 41, --选择up英雄
|
||||
JinJieYuLan = 42, --进阶预览
|
||||
WishDraw = 43, --心愿抽卡
|
||||
}
|
||||
|
||||
--通用信息弹窗类型
|
||||
|
|
|
|||
|
|
@ -1291,7 +1291,7 @@ function GetTimePass(timeValue)
|
|||
forwardDay = 0
|
||||
end
|
||||
local dayPass = math.ceil((GetTimeStamp() - timeStartSum) / 86400)
|
||||
return (dayPass + forwardDay) > 3 and 3 or (dayPass + forwardDay)
|
||||
return (dayPass + forwardDay) > 7 and 7 or (dayPass + forwardDay)
|
||||
end
|
||||
|
||||
---时间格式化接口
|
||||
|
|
|
|||
|
|
@ -121,8 +121,6 @@ MAIL_SENDTIME_FIELD = protobuf.FieldDescriptor();
|
|||
MAIL_EFFECTIVETIME_FIELD = protobuf.FieldDescriptor();
|
||||
MAIL_SENDNAME_FIELD = protobuf.FieldDescriptor();
|
||||
MAIL_MAILTYPE_FIELD = protobuf.FieldDescriptor();
|
||||
MAIL_ISTOP_FIELD = protobuf.FieldDescriptor();
|
||||
MAIL_MARKTYPE_FIELD = protobuf.FieldDescriptor();
|
||||
DROP = protobuf.Descriptor();
|
||||
DROP_ITEMLIST_FIELD = protobuf.FieldDescriptor();
|
||||
DROP_EQUIPID_FIELD = protobuf.FieldDescriptor();
|
||||
|
|
@ -697,6 +695,13 @@ PURPLEMANSIONSEAL_STATE_FIELD = protobuf.FieldDescriptor();
|
|||
KEYVAL = protobuf.Descriptor();
|
||||
KEYVAL_KEY_FIELD = protobuf.FieldDescriptor();
|
||||
KEYVAL_VAL_FIELD = protobuf.FieldDescriptor();
|
||||
WISHDRAWCARDINFO = protobuf.Descriptor();
|
||||
WISHDRAWCARDINFO_ID_FIELD = protobuf.FieldDescriptor();
|
||||
WISHDRAWCARDINFO_HEROTID_FIELD = protobuf.FieldDescriptor();
|
||||
WISHDRAWCARDINFO_STATUS_FIELD = protobuf.FieldDescriptor();
|
||||
RANDOMTYPENUM = protobuf.Descriptor();
|
||||
RANDOMTYPENUM_TYPE_FIELD = protobuf.FieldDescriptor();
|
||||
RANDOMTYPENUM_NUM_FIELD = protobuf.FieldDescriptor();
|
||||
|
||||
ERRORRESPONSE_ERRCODE_FIELD.name = "errCode"
|
||||
ERRORRESPONSE_ERRCODE_FIELD.full_name = ".rpc.protocols.ErrorResponse.errCode"
|
||||
|
|
@ -1826,31 +1831,11 @@ MAIL_MAILTYPE_FIELD.default_value = 0
|
|||
MAIL_MAILTYPE_FIELD.type = 5
|
||||
MAIL_MAILTYPE_FIELD.cpp_type = 1
|
||||
|
||||
MAIL_ISTOP_FIELD.name = "isTop"
|
||||
MAIL_ISTOP_FIELD.full_name = ".rpc.protocols.Mail.isTop"
|
||||
MAIL_ISTOP_FIELD.number = 10
|
||||
MAIL_ISTOP_FIELD.index = 9
|
||||
MAIL_ISTOP_FIELD.label = 1
|
||||
MAIL_ISTOP_FIELD.has_default_value = false
|
||||
MAIL_ISTOP_FIELD.default_value = 0
|
||||
MAIL_ISTOP_FIELD.type = 5
|
||||
MAIL_ISTOP_FIELD.cpp_type = 1
|
||||
|
||||
MAIL_MARKTYPE_FIELD.name = "markType"
|
||||
MAIL_MARKTYPE_FIELD.full_name = ".rpc.protocols.Mail.markType"
|
||||
MAIL_MARKTYPE_FIELD.number = 11
|
||||
MAIL_MARKTYPE_FIELD.index = 10
|
||||
MAIL_MARKTYPE_FIELD.label = 1
|
||||
MAIL_MARKTYPE_FIELD.has_default_value = false
|
||||
MAIL_MARKTYPE_FIELD.default_value = 0
|
||||
MAIL_MARKTYPE_FIELD.type = 5
|
||||
MAIL_MARKTYPE_FIELD.cpp_type = 1
|
||||
|
||||
MAIL.name = "Mail"
|
||||
MAIL.full_name = ".rpc.protocols.Mail"
|
||||
MAIL.nested_types = {}
|
||||
MAIL.enum_types = {}
|
||||
MAIL.fields = {MAIL_MAILID_FIELD, MAIL_STATE_FIELD, MAIL_HEAD_FIELD, MAIL_CONTENT_FIELD, MAIL_MAILITEM_FIELD, MAIL_SENDTIME_FIELD, MAIL_EFFECTIVETIME_FIELD, MAIL_SENDNAME_FIELD, MAIL_MAILTYPE_FIELD, MAIL_ISTOP_FIELD, MAIL_MARKTYPE_FIELD}
|
||||
MAIL.fields = {MAIL_MAILID_FIELD, MAIL_STATE_FIELD, MAIL_HEAD_FIELD, MAIL_CONTENT_FIELD, MAIL_MAILITEM_FIELD, MAIL_SENDTIME_FIELD, MAIL_EFFECTIVETIME_FIELD, MAIL_SENDNAME_FIELD, MAIL_MAILTYPE_FIELD}
|
||||
MAIL.is_extendable = false
|
||||
MAIL.extensions = {}
|
||||
DROP_ITEMLIST_FIELD.name = "itemlist"
|
||||
|
|
@ -7325,6 +7310,70 @@ KEYVAL.enum_types = {}
|
|||
KEYVAL.fields = {KEYVAL_KEY_FIELD, KEYVAL_VAL_FIELD}
|
||||
KEYVAL.is_extendable = false
|
||||
KEYVAL.extensions = {}
|
||||
WISHDRAWCARDINFO_ID_FIELD.name = "id"
|
||||
WISHDRAWCARDINFO_ID_FIELD.full_name = ".rpc.protocols.wishDrawCardInfo.id"
|
||||
WISHDRAWCARDINFO_ID_FIELD.number = 1
|
||||
WISHDRAWCARDINFO_ID_FIELD.index = 0
|
||||
WISHDRAWCARDINFO_ID_FIELD.label = 1
|
||||
WISHDRAWCARDINFO_ID_FIELD.has_default_value = false
|
||||
WISHDRAWCARDINFO_ID_FIELD.default_value = 0
|
||||
WISHDRAWCARDINFO_ID_FIELD.type = 5
|
||||
WISHDRAWCARDINFO_ID_FIELD.cpp_type = 1
|
||||
|
||||
WISHDRAWCARDINFO_HEROTID_FIELD.name = "heroTid"
|
||||
WISHDRAWCARDINFO_HEROTID_FIELD.full_name = ".rpc.protocols.wishDrawCardInfo.heroTid"
|
||||
WISHDRAWCARDINFO_HEROTID_FIELD.number = 2
|
||||
WISHDRAWCARDINFO_HEROTID_FIELD.index = 1
|
||||
WISHDRAWCARDINFO_HEROTID_FIELD.label = 1
|
||||
WISHDRAWCARDINFO_HEROTID_FIELD.has_default_value = false
|
||||
WISHDRAWCARDINFO_HEROTID_FIELD.default_value = 0
|
||||
WISHDRAWCARDINFO_HEROTID_FIELD.type = 5
|
||||
WISHDRAWCARDINFO_HEROTID_FIELD.cpp_type = 1
|
||||
|
||||
WISHDRAWCARDINFO_STATUS_FIELD.name = "status"
|
||||
WISHDRAWCARDINFO_STATUS_FIELD.full_name = ".rpc.protocols.wishDrawCardInfo.status"
|
||||
WISHDRAWCARDINFO_STATUS_FIELD.number = 3
|
||||
WISHDRAWCARDINFO_STATUS_FIELD.index = 2
|
||||
WISHDRAWCARDINFO_STATUS_FIELD.label = 1
|
||||
WISHDRAWCARDINFO_STATUS_FIELD.has_default_value = false
|
||||
WISHDRAWCARDINFO_STATUS_FIELD.default_value = 0
|
||||
WISHDRAWCARDINFO_STATUS_FIELD.type = 5
|
||||
WISHDRAWCARDINFO_STATUS_FIELD.cpp_type = 1
|
||||
|
||||
WISHDRAWCARDINFO.name = "wishDrawCardInfo"
|
||||
WISHDRAWCARDINFO.full_name = ".rpc.protocols.wishDrawCardInfo"
|
||||
WISHDRAWCARDINFO.nested_types = {}
|
||||
WISHDRAWCARDINFO.enum_types = {}
|
||||
WISHDRAWCARDINFO.fields = {WISHDRAWCARDINFO_ID_FIELD, WISHDRAWCARDINFO_HEROTID_FIELD, WISHDRAWCARDINFO_STATUS_FIELD}
|
||||
WISHDRAWCARDINFO.is_extendable = false
|
||||
WISHDRAWCARDINFO.extensions = {}
|
||||
RANDOMTYPENUM_TYPE_FIELD.name = "type"
|
||||
RANDOMTYPENUM_TYPE_FIELD.full_name = ".rpc.protocols.randomTypeNum.type"
|
||||
RANDOMTYPENUM_TYPE_FIELD.number = 1
|
||||
RANDOMTYPENUM_TYPE_FIELD.index = 0
|
||||
RANDOMTYPENUM_TYPE_FIELD.label = 1
|
||||
RANDOMTYPENUM_TYPE_FIELD.has_default_value = false
|
||||
RANDOMTYPENUM_TYPE_FIELD.default_value = 0
|
||||
RANDOMTYPENUM_TYPE_FIELD.type = 5
|
||||
RANDOMTYPENUM_TYPE_FIELD.cpp_type = 1
|
||||
|
||||
RANDOMTYPENUM_NUM_FIELD.name = "num"
|
||||
RANDOMTYPENUM_NUM_FIELD.full_name = ".rpc.protocols.randomTypeNum.num"
|
||||
RANDOMTYPENUM_NUM_FIELD.number = 2
|
||||
RANDOMTYPENUM_NUM_FIELD.index = 1
|
||||
RANDOMTYPENUM_NUM_FIELD.label = 1
|
||||
RANDOMTYPENUM_NUM_FIELD.has_default_value = false
|
||||
RANDOMTYPENUM_NUM_FIELD.default_value = 0
|
||||
RANDOMTYPENUM_NUM_FIELD.type = 5
|
||||
RANDOMTYPENUM_NUM_FIELD.cpp_type = 1
|
||||
|
||||
RANDOMTYPENUM.name = "randomTypeNum"
|
||||
RANDOMTYPENUM.full_name = ".rpc.protocols.randomTypeNum"
|
||||
RANDOMTYPENUM.nested_types = {}
|
||||
RANDOMTYPENUM.enum_types = {}
|
||||
RANDOMTYPENUM.fields = {RANDOMTYPENUM_TYPE_FIELD, RANDOMTYPENUM_NUM_FIELD}
|
||||
RANDOMTYPENUM.is_extendable = false
|
||||
RANDOMTYPENUM.extensions = {}
|
||||
|
||||
ActivityInfo = protobuf.Message(ACTIVITYINFO)
|
||||
ActivityInfo.MissionInfo = protobuf.Message(ACTIVITYINFO_MISSIONINFO)
|
||||
|
|
@ -7447,4 +7496,6 @@ blessReward = protobuf.Message(BLESSREWARD)
|
|||
endlessHero = protobuf.Message(ENDLESSHERO)
|
||||
endlessSign = protobuf.Message(ENDLESSSIGN)
|
||||
fiveResetTowerInfo = protobuf.Message(FIVERESETTOWERINFO)
|
||||
randomTypeNum = protobuf.Message(RANDOMTYPENUM)
|
||||
wishDrawCardInfo = protobuf.Message(WISHDRAWCARDINFO)
|
||||
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ HERORANDRESPONSE = protobuf.Descriptor();
|
|||
HERORANDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor();
|
||||
HERORANDRESPONSE_EXTRABOX_FIELD = protobuf.FieldDescriptor();
|
||||
HERORANDRESPONSE_MUSTCOUNT_FIELD = protobuf.FieldDescriptor();
|
||||
HERORANDRESPONSE_DRAWTIMES_FIELD = protobuf.FieldDescriptor();
|
||||
TEAMPOSSAVEREQUEST = protobuf.Descriptor();
|
||||
TEAMPOSSAVEREQUEST_TEAMPOSINFO_FIELD = protobuf.FieldDescriptor();
|
||||
GETALLTEAMPOSRESPONSE = protobuf.Descriptor();
|
||||
|
|
@ -215,6 +216,12 @@ REPLACEPRUPLEMANSIONSEALRESPONSE = protobuf.Descriptor();
|
|||
REPLACEPRUPLEMANSIONSEALRESPONSE_SEALLIST_FIELD = protobuf.FieldDescriptor();
|
||||
PURPLEMANSIONSEALINDICATION = protobuf.Descriptor();
|
||||
PURPLEMANSIONSEALINDICATION_SEALLIST_FIELD = protobuf.FieldDescriptor();
|
||||
WISHDRAWCARDINDICATION = protobuf.Descriptor();
|
||||
WISHDRAWCARDINDICATION_INFOLIST_FIELD = protobuf.FieldDescriptor();
|
||||
CHOICEWISHHEROREQUEST = protobuf.Descriptor();
|
||||
CHOICEWISHHEROREQUEST_INFOLIST_FIELD = protobuf.FieldDescriptor();
|
||||
CHOICEWISHHERORESPONSE = protobuf.Descriptor();
|
||||
CHOICEWISHHERORESPONSE_INFOLIST_FIELD = protobuf.FieldDescriptor();
|
||||
|
||||
GETHEROLISTINFOREQUEST_INDEX_FIELD.name = "index"
|
||||
GETHEROLISTINFOREQUEST_INDEX_FIELD.full_name = ".rpc.protocols.GetHeroListInfoRequest.index"
|
||||
|
|
@ -410,11 +417,22 @@ HERORANDRESPONSE_MUSTCOUNT_FIELD.default_value = 0
|
|||
HERORANDRESPONSE_MUSTCOUNT_FIELD.type = 5
|
||||
HERORANDRESPONSE_MUSTCOUNT_FIELD.cpp_type = 1
|
||||
|
||||
HERORANDRESPONSE_DRAWTIMES_FIELD.name = "drawTimes"
|
||||
HERORANDRESPONSE_DRAWTIMES_FIELD.full_name = ".rpc.protocols.HeroRandResponse.drawTimes"
|
||||
HERORANDRESPONSE_DRAWTIMES_FIELD.number = 4
|
||||
HERORANDRESPONSE_DRAWTIMES_FIELD.index = 3
|
||||
HERORANDRESPONSE_DRAWTIMES_FIELD.label = 3
|
||||
HERORANDRESPONSE_DRAWTIMES_FIELD.has_default_value = false
|
||||
HERORANDRESPONSE_DRAWTIMES_FIELD.default_value = {}
|
||||
HERORANDRESPONSE_DRAWTIMES_FIELD.message_type = CommonProto_pb.RANDOMTYPENUM
|
||||
HERORANDRESPONSE_DRAWTIMES_FIELD.type = 11
|
||||
HERORANDRESPONSE_DRAWTIMES_FIELD.cpp_type = 10
|
||||
|
||||
HERORANDRESPONSE.name = "HeroRandResponse"
|
||||
HERORANDRESPONSE.full_name = ".rpc.protocols.HeroRandResponse"
|
||||
HERORANDRESPONSE.nested_types = {}
|
||||
HERORANDRESPONSE.enum_types = {}
|
||||
HERORANDRESPONSE.fields = {HERORANDRESPONSE_DROP_FIELD, HERORANDRESPONSE_EXTRABOX_FIELD, HERORANDRESPONSE_MUSTCOUNT_FIELD}
|
||||
HERORANDRESPONSE.fields = {HERORANDRESPONSE_DROP_FIELD, HERORANDRESPONSE_EXTRABOX_FIELD, HERORANDRESPONSE_MUSTCOUNT_FIELD, HERORANDRESPONSE_DRAWTIMES_FIELD}
|
||||
HERORANDRESPONSE.is_extendable = false
|
||||
HERORANDRESPONSE.extensions = {}
|
||||
TEAMPOSSAVEREQUEST_TEAMPOSINFO_FIELD.name = "TeamPosInfo"
|
||||
|
|
@ -2127,6 +2145,60 @@ PURPLEMANSIONSEALINDICATION.enum_types = {}
|
|||
PURPLEMANSIONSEALINDICATION.fields = {PURPLEMANSIONSEALINDICATION_SEALLIST_FIELD}
|
||||
PURPLEMANSIONSEALINDICATION.is_extendable = false
|
||||
PURPLEMANSIONSEALINDICATION.extensions = {}
|
||||
WISHDRAWCARDINDICATION_INFOLIST_FIELD.name = "infoList"
|
||||
WISHDRAWCARDINDICATION_INFOLIST_FIELD.full_name = ".rpc.protocols.wishDrawCardIndication.infoList"
|
||||
WISHDRAWCARDINDICATION_INFOLIST_FIELD.number = 1
|
||||
WISHDRAWCARDINDICATION_INFOLIST_FIELD.index = 0
|
||||
WISHDRAWCARDINDICATION_INFOLIST_FIELD.label = 3
|
||||
WISHDRAWCARDINDICATION_INFOLIST_FIELD.has_default_value = false
|
||||
WISHDRAWCARDINDICATION_INFOLIST_FIELD.default_value = {}
|
||||
WISHDRAWCARDINDICATION_INFOLIST_FIELD.message_type = CommonProto_pb.WISHDRAWCARDINFO
|
||||
WISHDRAWCARDINDICATION_INFOLIST_FIELD.type = 11
|
||||
WISHDRAWCARDINDICATION_INFOLIST_FIELD.cpp_type = 10
|
||||
|
||||
WISHDRAWCARDINDICATION.name = "wishDrawCardIndication"
|
||||
WISHDRAWCARDINDICATION.full_name = ".rpc.protocols.wishDrawCardIndication"
|
||||
WISHDRAWCARDINDICATION.nested_types = {}
|
||||
WISHDRAWCARDINDICATION.enum_types = {}
|
||||
WISHDRAWCARDINDICATION.fields = {WISHDRAWCARDINDICATION_INFOLIST_FIELD}
|
||||
WISHDRAWCARDINDICATION.is_extendable = false
|
||||
WISHDRAWCARDINDICATION.extensions = {}
|
||||
CHOICEWISHHEROREQUEST_INFOLIST_FIELD.name = "infoList"
|
||||
CHOICEWISHHEROREQUEST_INFOLIST_FIELD.full_name = ".rpc.protocols.choiceWishHeroRequest.infoList"
|
||||
CHOICEWISHHEROREQUEST_INFOLIST_FIELD.number = 1
|
||||
CHOICEWISHHEROREQUEST_INFOLIST_FIELD.index = 0
|
||||
CHOICEWISHHEROREQUEST_INFOLIST_FIELD.label = 3
|
||||
CHOICEWISHHEROREQUEST_INFOLIST_FIELD.has_default_value = false
|
||||
CHOICEWISHHEROREQUEST_INFOLIST_FIELD.default_value = {}
|
||||
CHOICEWISHHEROREQUEST_INFOLIST_FIELD.message_type = CommonProto_pb.WISHDRAWCARDINFO
|
||||
CHOICEWISHHEROREQUEST_INFOLIST_FIELD.type = 11
|
||||
CHOICEWISHHEROREQUEST_INFOLIST_FIELD.cpp_type = 10
|
||||
|
||||
CHOICEWISHHEROREQUEST.name = "choiceWishHeroRequest"
|
||||
CHOICEWISHHEROREQUEST.full_name = ".rpc.protocols.choiceWishHeroRequest"
|
||||
CHOICEWISHHEROREQUEST.nested_types = {}
|
||||
CHOICEWISHHEROREQUEST.enum_types = {}
|
||||
CHOICEWISHHEROREQUEST.fields = {CHOICEWISHHEROREQUEST_INFOLIST_FIELD}
|
||||
CHOICEWISHHEROREQUEST.is_extendable = false
|
||||
CHOICEWISHHEROREQUEST.extensions = {}
|
||||
CHOICEWISHHERORESPONSE_INFOLIST_FIELD.name = "infoList"
|
||||
CHOICEWISHHERORESPONSE_INFOLIST_FIELD.full_name = ".rpc.protocols.choiceWishHeroResponse.infoList"
|
||||
CHOICEWISHHERORESPONSE_INFOLIST_FIELD.number = 1
|
||||
CHOICEWISHHERORESPONSE_INFOLIST_FIELD.index = 0
|
||||
CHOICEWISHHERORESPONSE_INFOLIST_FIELD.label = 3
|
||||
CHOICEWISHHERORESPONSE_INFOLIST_FIELD.has_default_value = false
|
||||
CHOICEWISHHERORESPONSE_INFOLIST_FIELD.default_value = {}
|
||||
CHOICEWISHHERORESPONSE_INFOLIST_FIELD.message_type = CommonProto_pb.WISHDRAWCARDINFO
|
||||
CHOICEWISHHERORESPONSE_INFOLIST_FIELD.type = 11
|
||||
CHOICEWISHHERORESPONSE_INFOLIST_FIELD.cpp_type = 10
|
||||
|
||||
CHOICEWISHHERORESPONSE.name = "choiceWishHeroResponse"
|
||||
CHOICEWISHHERORESPONSE.full_name = ".rpc.protocols.choiceWishHeroResponse"
|
||||
CHOICEWISHHERORESPONSE.nested_types = {}
|
||||
CHOICEWISHHERORESPONSE.enum_types = {}
|
||||
CHOICEWISHHERORESPONSE.fields = {CHOICEWISHHERORESPONSE_INFOLIST_FIELD}
|
||||
CHOICEWISHHERORESPONSE.is_extendable = false
|
||||
CHOICEWISHHERORESPONSE.extensions = {}
|
||||
|
||||
AllBookEnableRequest = protobuf.Message(ALLBOOKENABLEREQUEST)
|
||||
CancelHeroChangeRequest = protobuf.Message(CANCELHEROCHANGEREQUEST)
|
||||
|
|
@ -2207,4 +2279,7 @@ UpPracticeLevelRequest = protobuf.Message(UPPRACTICELEVELREQUEST)
|
|||
UpPracticeLevelResponse = protobuf.Message(UPPRACTICELEVELRESPONSE)
|
||||
UpQuickSoulEquipRequest = protobuf.Message(UPQUICKSOULEQUIPREQUEST)
|
||||
UpSoulEquipResponse = protobuf.Message(UPSOULEQUIPRESPONSE)
|
||||
choiceWishHeroRequest = protobuf.Message(CHOICEWISHHEROREQUEST)
|
||||
choiceWishHeroResponse = protobuf.Message(CHOICEWISHHERORESPONSE)
|
||||
wishDrawCardIndication = protobuf.Message(WISHDRAWCARDINDICATION)
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -70,6 +70,7 @@ GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD = protobuf.FieldDescriptor();
|
|||
GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD = protobuf.FieldDescriptor();
|
||||
GETPLAYERINFORESPONSE_SEALLIST_FIELD = protobuf.FieldDescriptor();
|
||||
GETPLAYERINFORESPONSE_RANDOMCOUNT_FIELD = protobuf.FieldDescriptor();
|
||||
GETPLAYERINFORESPONSE_DRAWTIMES_FIELD = protobuf.FieldDescriptor();
|
||||
GETITEMINFOREQUEST = protobuf.Descriptor();
|
||||
GETITEMINFOREQUEST_INDEX_FIELD = protobuf.FieldDescriptor();
|
||||
GETITEMINFORESPONSE = protobuf.Descriptor();
|
||||
|
|
@ -1196,11 +1197,22 @@ GETPLAYERINFORESPONSE_RANDOMCOUNT_FIELD.default_value = 0
|
|||
GETPLAYERINFORESPONSE_RANDOMCOUNT_FIELD.type = 5
|
||||
GETPLAYERINFORESPONSE_RANDOMCOUNT_FIELD.cpp_type = 1
|
||||
|
||||
GETPLAYERINFORESPONSE_DRAWTIMES_FIELD.name = "drawTimes"
|
||||
GETPLAYERINFORESPONSE_DRAWTIMES_FIELD.full_name = ".rpc.protocols.GetPlayerInfoResponse.drawTimes"
|
||||
GETPLAYERINFORESPONSE_DRAWTIMES_FIELD.number = 44
|
||||
GETPLAYERINFORESPONSE_DRAWTIMES_FIELD.index = 42
|
||||
GETPLAYERINFORESPONSE_DRAWTIMES_FIELD.label = 3
|
||||
GETPLAYERINFORESPONSE_DRAWTIMES_FIELD.has_default_value = false
|
||||
GETPLAYERINFORESPONSE_DRAWTIMES_FIELD.default_value = {}
|
||||
GETPLAYERINFORESPONSE_DRAWTIMES_FIELD.message_type = CommonProto_pb.RANDOMTYPENUM
|
||||
GETPLAYERINFORESPONSE_DRAWTIMES_FIELD.type = 11
|
||||
GETPLAYERINFORESPONSE_DRAWTIMES_FIELD.cpp_type = 10
|
||||
|
||||
GETPLAYERINFORESPONSE.name = "GetPlayerInfoResponse"
|
||||
GETPLAYERINFORESPONSE.full_name = ".rpc.protocols.GetPlayerInfoResponse"
|
||||
GETPLAYERINFORESPONSE.nested_types = {}
|
||||
GETPLAYERINFORESPONSE.enum_types = {}
|
||||
GETPLAYERINFORESPONSE.fields = {GETPLAYERINFORESPONSE_PLAYER_FIELD, GETPLAYERINFORESPONSE_NEWPLAYERGUIDEPOINT_FIELD, GETPLAYERINFORESPONSE_PRIVILEGE_FIELD, GETPLAYERINFORESPONSE_GIFTGOODSINFO_FIELD, GETPLAYERINFORESPONSE_BUYGOODSID_FIELD, GETPLAYERINFORESPONSE_SUDDENLYBOSSINFO_FIELD, GETPLAYERINFORESPONSE_VIPLEVETAKE_FIELD, GETPLAYERINFORESPONSE_USERCREATETIME_FIELD, GETPLAYERINFORESPONSE_REDTYPE_FIELD, GETPLAYERINFORESPONSE_RANDCOUNT_FIELD, GETPLAYERINFORESPONSE_HEROHANDBOOK_FIELD, GETPLAYERINFORESPONSE_EQUIPHANDBOOK_FIELD, GETPLAYERINFORESPONSE_TOWERRECEIVEDREWARD_FIELD, GETPLAYERINFORESPONSE_GOODSTYPEDURATION_FIELD, GETPLAYERINFORESPONSE_TREASURELEVEL_FIELD, GETPLAYERINFORESPONSE_HADBUYTREASURE_FIELD, GETPLAYERINFORESPONSE_SIGNININFO_FIELD, GETPLAYERINFORESPONSE_FIRSTTENTH_FIELD, GETPLAYERINFORESPONSE_MONSTERATTACKTIME_FIELD, GETPLAYERINFORESPONSE_ISDAYFIRST_FIELD, GETPLAYERINFORESPONSE_PLAYERBINDPHONE_FIELD, GETPLAYERINFORESPONSE_QUESTIONSTATE_FIELD, GETPLAYERINFORESPONSE_SOULEQUIPPOOL_FIELD, GETPLAYERINFORESPONSE_PLAYEDMAPTYPES_FIELD, GETPLAYERINFORESPONSE_AMOUNT_FIELD, GETPLAYERINFORESPONSE_VIPDAILY_FIELD, GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD, GETPLAYERINFORESPONSE_MONTHINFOS_FIELD, GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD, GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD, GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD, GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD, GETPLAYERINFORESPONSE_WORLDLEVE_FIELD, GETPLAYERINFORESPONSE_DEMONSTRIALREWARDINFO_FIELD, GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD, GETPLAYERINFORESPONSE_USERSKINLIST_FIELD, GETPLAYERINFORESPONSE_USERTITLELIST_FIELD, GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD, GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD, GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD, GETPLAYERINFORESPONSE_SEALLIST_FIELD, GETPLAYERINFORESPONSE_RANDOMCOUNT_FIELD}
|
||||
GETPLAYERINFORESPONSE.fields = {GETPLAYERINFORESPONSE_PLAYER_FIELD, GETPLAYERINFORESPONSE_NEWPLAYERGUIDEPOINT_FIELD, GETPLAYERINFORESPONSE_PRIVILEGE_FIELD, GETPLAYERINFORESPONSE_GIFTGOODSINFO_FIELD, GETPLAYERINFORESPONSE_BUYGOODSID_FIELD, GETPLAYERINFORESPONSE_SUDDENLYBOSSINFO_FIELD, GETPLAYERINFORESPONSE_VIPLEVETAKE_FIELD, GETPLAYERINFORESPONSE_USERCREATETIME_FIELD, GETPLAYERINFORESPONSE_REDTYPE_FIELD, GETPLAYERINFORESPONSE_RANDCOUNT_FIELD, GETPLAYERINFORESPONSE_HEROHANDBOOK_FIELD, GETPLAYERINFORESPONSE_EQUIPHANDBOOK_FIELD, GETPLAYERINFORESPONSE_TOWERRECEIVEDREWARD_FIELD, GETPLAYERINFORESPONSE_GOODSTYPEDURATION_FIELD, GETPLAYERINFORESPONSE_TREASURELEVEL_FIELD, GETPLAYERINFORESPONSE_HADBUYTREASURE_FIELD, GETPLAYERINFORESPONSE_SIGNININFO_FIELD, GETPLAYERINFORESPONSE_FIRSTTENTH_FIELD, GETPLAYERINFORESPONSE_MONSTERATTACKTIME_FIELD, GETPLAYERINFORESPONSE_ISDAYFIRST_FIELD, GETPLAYERINFORESPONSE_PLAYERBINDPHONE_FIELD, GETPLAYERINFORESPONSE_QUESTIONSTATE_FIELD, GETPLAYERINFORESPONSE_SOULEQUIPPOOL_FIELD, GETPLAYERINFORESPONSE_PLAYEDMAPTYPES_FIELD, GETPLAYERINFORESPONSE_AMOUNT_FIELD, GETPLAYERINFORESPONSE_VIPDAILY_FIELD, GETPLAYERINFORESPONSE_MISSINGREFRESHCOUNT_FIELD, GETPLAYERINFORESPONSE_MONTHINFOS_FIELD, GETPLAYERINFORESPONSE_DAILYCHALLENGEINFO_FIELD, GETPLAYERINFORESPONSE_EXPEDITIONLEVE_FIELD, GETPLAYERINFORESPONSE_HADLUCKTIME_FIELD, GETPLAYERINFORESPONSE_HADADVANCELUCKTIME_FIELD, GETPLAYERINFORESPONSE_WORLDLEVE_FIELD, GETPLAYERINFORESPONSE_DEMONSTRIALREWARDINFO_FIELD, GETPLAYERINFORESPONSE_HEADFRAMEBAG_FIELD, GETPLAYERINFORESPONSE_USERSKINLIST_FIELD, GETPLAYERINFORESPONSE_USERTITLELIST_FIELD, GETPLAYERINFORESPONSE_USERMOUNTLIST_FIELD, GETPLAYERINFORESPONSE_DAILYREDPACK_FIELD, GETPLAYERINFORESPONSE_PRACTICELEVEL_FIELD, GETPLAYERINFORESPONSE_SEALLIST_FIELD, GETPLAYERINFORESPONSE_RANDOMCOUNT_FIELD, GETPLAYERINFORESPONSE_DRAWTIMES_FIELD}
|
||||
GETPLAYERINFORESPONSE.is_extendable = false
|
||||
GETPLAYERINFORESPONSE.extensions = {}
|
||||
GETITEMINFOREQUEST_INDEX_FIELD.name = "index"
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@ local contentScripts = {
|
|||
[GENERAL_POPUP_TYPE.XiuXingSelectHero] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_XiuXingSelectHero"), panelName = "GeneralBigPopup_XiuXingSelectHero"},
|
||||
[GENERAL_POPUP_TYPE.WuJinShuXing] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_WuJinShuXing"), panelName = "GeneralBigPopup_WuJinShuXing"},
|
||||
[GENERAL_POPUP_TYPE.JinJieYuLan] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_JinJieYuLan"), panelName = "GeneralBigPopup_JinJieYuLan"},
|
||||
--心愿抽卡
|
||||
[GENERAL_POPUP_TYPE.WishDraw] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_WishDraw"), panelName = "GeneralBigPopup_WishDraw"},
|
||||
}
|
||||
--子模块预设
|
||||
local contentPrefabs={}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,179 @@
|
|||
----- 心愿抽卡弹窗 -----
|
||||
local this = {}
|
||||
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||
local heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig)
|
||||
local specialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig)
|
||||
|
||||
function this:InitComponent(gameObject)
|
||||
self.spLoader = SpriteLoader.New()
|
||||
|
||||
self.scroll = Util.GetGameObject(gameObject,"selectList")
|
||||
self.itemPre = Util.GetGameObject(gameObject,"itemPre")
|
||||
-- 设置循环滚动,万一内容不停地加
|
||||
local rootHight = self.scroll.transform.rect.height
|
||||
local width = self.scroll.transform.rect.width
|
||||
self.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.scroll.transform,
|
||||
self.itemPre, nil, Vector2.New(width, rootHight), 1, 5, Vector2.New(20, 45))
|
||||
self.scrollView.moveTween.MomentumAmount = 1
|
||||
self.scrollView.moveTween.Strength = 2
|
||||
|
||||
self.itemList = {}
|
||||
self.maskList = {}
|
||||
--wishList
|
||||
self.wishListObj = {}
|
||||
self.bgObjlist = {}
|
||||
for i = 1, 3 do
|
||||
self.wishListObj[i] = Util.GetGameObject(gameObject,"wishList/hero ("..i..")")
|
||||
self.bgObjlist[i] = Util.GetGameObject(gameObject,"Bg/bglist/obj"..i)
|
||||
end
|
||||
--tabList
|
||||
self.tabListObj = {}
|
||||
self.selectBtn = Util.GetGameObject(gameObject,"Tabs/grid/selectBtn")
|
||||
for j = 1, 4 do
|
||||
self.maskList[j] = {}
|
||||
self.itemList[j] = {}
|
||||
self.tabListObj[j] = Util.GetGameObject(gameObject,"Tabs/grid/Btn"..j)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
function this:BindEvent()
|
||||
for i = 1, 4 do
|
||||
Util.AddOnceClick(self.tabListObj[i],function ()
|
||||
self.curSelect = i
|
||||
this:Refresh(true,false)
|
||||
end)
|
||||
end
|
||||
for i = 1, 3 do
|
||||
Util.AddOnceClick(self.bgObjlist[i],function ()
|
||||
self.curSelect = RecruitManager.CheckIndex()
|
||||
this:Refresh(true,false)
|
||||
end)
|
||||
end
|
||||
end
|
||||
|
||||
function this:AddListener()
|
||||
end
|
||||
|
||||
function this:RemoveListener()
|
||||
end
|
||||
|
||||
function this:OnShow(_parent,...)
|
||||
self.parent=_parent
|
||||
self.sortingOrder = _parent.sortingOrder
|
||||
NetManager.ChoiceWishHeroRequest(nil,function ()
|
||||
self.curSelect = RecruitManager.CheckIndex()
|
||||
this:Refresh(true,true)
|
||||
end)
|
||||
end
|
||||
|
||||
function this:Refresh(isTop,isAni)
|
||||
local data = tonumber(specialConfig[119].Value)
|
||||
if not RecruitManager.drawTimes[1] or RecruitManager.drawTimes[1] < data then
|
||||
self.parent:ClosePanel()
|
||||
end
|
||||
self.selectBtn:GetComponent("RectTransform").localPosition = self.tabListObj[self.curSelect]:GetComponent("RectTransform").localPosition
|
||||
this:SetHeroList(isTop,isAni)
|
||||
this:SetUpHero()
|
||||
end
|
||||
|
||||
function this:SetUpHero()
|
||||
for i = 1, 3 do
|
||||
local go = self.wishListObj[i]
|
||||
local frame = Util.GetGameObject(go, "frame"):GetComponent("Image")
|
||||
local icon = Util.GetGameObject(go, "icon"):GetComponent("Image")
|
||||
local proIcon = Util.GetGameObject(go, "proIcon"):GetComponent("Image")
|
||||
local starGrid = Util.GetGameObject(go, "star")
|
||||
local choosed = Util.GetGameObject(go, "choosed")
|
||||
local heroId = RecruitManager.WishCardData[i].heroTid
|
||||
choosed:SetActive(false)
|
||||
if heroId > 0 then
|
||||
go:SetActive(true)
|
||||
local heroData = heroConfig[heroId]
|
||||
frame.sprite = self.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.Quality,heroData.Star))
|
||||
icon.sprite = self.spLoader:LoadSprite(GetResourcePath(heroData.Icon))
|
||||
proIcon.sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName))
|
||||
SetHeroStars(self.spLoader,starGrid, heroData.Star)
|
||||
choosed:SetActive(RecruitManager.WishCardData[i].status == 1)
|
||||
Util.AddOnceClick(go,function ()
|
||||
if RecruitManager.WishCardData[i].status == 1 then
|
||||
PopupTipPanel.ShowTip("同系神将每日只可选择一位获取一次概率提升~")
|
||||
elseif RecruitManager.WishCardData[i].status == 0 then
|
||||
RecruitManager.ChangeHero(2,heroId,function ()
|
||||
this:Refresh(false,false)
|
||||
end)--英雄变更:1增加、2卸下
|
||||
end
|
||||
end)
|
||||
else
|
||||
go:SetActive(false)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function this:SetHeroList(isTop,isAni)
|
||||
local heroList = RecruitManager.GetCurHeroList(self.curSelect)
|
||||
self.scrollView:SetData(heroList, function (index, item)
|
||||
this:ShowSingleHero(item, heroList[index],index)
|
||||
end,not isTop,not isAni)
|
||||
end
|
||||
|
||||
function this:ShowSingleHero(go,data,index)
|
||||
local heroData = heroConfig[data.Reward[1]]
|
||||
self.itemList[self.curSelect][index] = go
|
||||
Util.GetGameObject(go, "frame"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.Quality,heroData.Star))
|
||||
Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetResourcePath(heroData.Icon))
|
||||
Util.GetGameObject(go, "proIcon"):GetComponent("Image").sprite = self.spLoader:LoadSprite(GetProStrImageByProNum(heroData.PropertyName))
|
||||
Util.GetGameObject(go, "name"):GetComponent("Text").text = heroData.ReadingName
|
||||
local starGrid = Util.GetGameObject(go, "star")
|
||||
SetHeroStars(self.spLoader,starGrid, heroData.Star)
|
||||
|
||||
self.maskList[self.curSelect][index] = Util.GetGameObject(go, "choosed")
|
||||
self.maskList[self.curSelect][index]:SetActive(false)
|
||||
Util.SetGray(self.itemList[self.curSelect][index],false)
|
||||
|
||||
local value = RecruitManager.CheckCurHeroState(data.Reward[1])
|
||||
if value == 0 then--上方存在相同阵营
|
||||
Util.SetGray(self.itemList[self.curSelect][index],true)
|
||||
Util.AddOnceClick(go,function ()
|
||||
PopupTipPanel.ShowTip("同系神将只可选择一位~")
|
||||
end)
|
||||
elseif value == 2 then--上方选满
|
||||
Util.SetGray(self.itemList[self.curSelect][index],true)
|
||||
Util.AddOnceClick(go,function ()
|
||||
PopupTipPanel.ShowTip("心愿神将已满~")
|
||||
end)
|
||||
elseif value == 1 then--上方存在自己
|
||||
self.maskList[self.curSelect][index]:SetActive(true)
|
||||
Util.AddOnceClick(go,function ()
|
||||
RecruitManager.ChangeHero(2,data.Reward[1],function ()
|
||||
this:Refresh(false,false)
|
||||
end)--英雄变更:1增加、2卸下
|
||||
end)
|
||||
elseif value == 4 then--上方存在自己,但已经出过该英雄了
|
||||
self.maskList[self.curSelect][index]:SetActive(true)
|
||||
Util.AddOnceClick(go,function ()
|
||||
PopupTipPanel.ShowTip("同系神将每日只可选择一位获取一次概率提升~")
|
||||
end)
|
||||
elseif value == 3 then--可选
|
||||
Util.AddOnceClick(go,function ()
|
||||
RecruitManager.ChangeHero(1,data.Reward[1],function ()
|
||||
this:Refresh(false,false)
|
||||
end)--英雄变更:1增加、2卸下
|
||||
end)
|
||||
end
|
||||
Util.AddLongPressClick(go,function ()
|
||||
UIManager.OpenPanel(UIName.RoleGetInfoPopup, false, data.Reward[1], 5)
|
||||
end,0.5)
|
||||
end
|
||||
|
||||
function this:OnClose()
|
||||
end
|
||||
|
||||
function this:OnDestroy()
|
||||
self.itemList = {}
|
||||
self.maskList = {}
|
||||
self.wishListObj = {}
|
||||
self.spLoader:Destroy()
|
||||
end
|
||||
|
||||
return this
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: d9826a3c8e661cb48a6a3c5b75991e49
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -186,7 +186,7 @@ function this.SingleMialDataShow(_go,_mailData)
|
|||
Util.GetGameObject(_go.transform, "sendText"):GetComponent("Text").text = GetTimeStrBySeconds(_mailData.sendTime)--Language[11168].._mailData.sendName
|
||||
local mialBtn = Util.GetGameObject(_go.transform, "Imagebg")
|
||||
local isTopImg = Util.GetGameObject(_go.transform, "isTopImg")
|
||||
if _mailData.isTop == 0 then--不置顶
|
||||
if not _mailData.isTop or _mailData.isTop == 0 then--不置顶
|
||||
mialBtn:GetComponent("Image").sprite = this.spLoader:LoadSprite("r_renwu_tiao_004")
|
||||
isTopImg:SetActive(false)
|
||||
elseif _mailData.isTop == 1 then--置顶
|
||||
|
|
|
|||
|
|
@ -134,6 +134,8 @@ function this.RegisterMessage(network)
|
|||
socket:RegistNetMessage(MessageTypeProto_pb.PurpleMansionSealIndication, this.PracticeImprintData)
|
||||
-- Vip等级奖励信息推送
|
||||
socket:RegistNetMessage(MessageTypeProto_pb.VIP_LEVEL_STATE_RESPONSE, this.RefreshLevleRewardDatas)
|
||||
-- --心愿抽卡信息推送
|
||||
socket:RegistNetMessage(MessageTypeProto_pb.wishDrawCardIndication, this.WishDrawCardInfoIndication)
|
||||
|
||||
end
|
||||
|
||||
|
|
@ -950,4 +952,12 @@ function this.RefreshLevleRewardDatas(buffer)
|
|||
VipManager.InitLevleRewardDatas(msg)
|
||||
end
|
||||
|
||||
--心愿抽卡信息推送
|
||||
function this.WishDrawCardInfoIndication(buffer)
|
||||
local data = buffer:DataByte()
|
||||
local msg = HeroInfoProto_pb.wishDrawCardIndication()
|
||||
msg:ParseFromString(data)
|
||||
RecruitManager.GetWishCardData(msg)
|
||||
end
|
||||
|
||||
return this
|
||||
|
|
@ -111,7 +111,7 @@ function this.PlayerInfoRequest(func)
|
|||
PlayerManager.curMapId = msg.player.curMapId
|
||||
MapManager.Mapping = false --PlayerManager.curMapId ~= 0 and PlayerManager.curMapId > 100
|
||||
PlayerManager.maxForce = msg.player.maxForce
|
||||
-- RecruitManager.randCount = msg.randCount % 100 --钻石抽卡已招募次数 用不上了 协议没删
|
||||
RecruitManager.SetAllDrawTimes(msg.drawTimes) --所有抽卡已招募次数
|
||||
RecruitManager.isTenRecruit = msg.firstTenth --首次十连
|
||||
PlayerManager.userCreateTime = msg.userCreateTime
|
||||
PatFaceManager.SetisFirstLogVal(msg.isDayFirst)
|
||||
|
|
@ -625,7 +625,7 @@ function this.RecruitRequest(type, func)
|
|||
local data = buffer:DataByte()
|
||||
local msg = HeroInfoProto_pb.HeroRandResponse()
|
||||
msg:ParseFromString(data)
|
||||
|
||||
RecruitManager.SetAllDrawTimes(msg.drawTimes)
|
||||
for i = 1, #msg.drop.Hero do
|
||||
local singHeroData = msg.drop.Hero[i]
|
||||
HeroManager.UpdateHeroDatas(singHeroData)
|
||||
|
|
@ -5265,5 +5265,27 @@ function NetManager.ChoiceDrawCardRequest(actID,_type,func)
|
|||
end)
|
||||
end
|
||||
|
||||
--心愿抽卡神将选择请求(无data为请求心愿抽卡信息)
|
||||
function NetManager.ChoiceWishHeroRequest(_data,func)
|
||||
local data = HeroInfoProto_pb.choiceWishHeroRequest()
|
||||
if _data then
|
||||
for i = 1, #_data do
|
||||
local info = data.infoList:add()
|
||||
info.id = _data[i].id
|
||||
info.heroTid = _data[i].heroTid
|
||||
end
|
||||
end
|
||||
local msg = data:SerializeToString()
|
||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.choiceWishHeroRequest, MessageTypeProto_pb.choiceWishHeroResponse, msg, function(buffer)
|
||||
local data = buffer:DataByte()
|
||||
local msg = HeroInfoProto_pb.choiceWishHeroResponse()
|
||||
msg:ParseFromString(data)
|
||||
RecruitManager.GetWishCardData(msg.infoList)
|
||||
if func then
|
||||
func(msg)
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
|
||||
return this
|
||||
|
|
@ -119,14 +119,14 @@ function this.RequestPay(context)
|
|||
params.serverID = PlayerManager.serverInfo.server_id
|
||||
params.serverName = PlayerManager.serverInfo.name
|
||||
-- 角色相关
|
||||
params.roleID = tostring(PlayerManager.uid).."_"..tostring(context.Id).."_"..PackageManager.GetCCCode()
|
||||
params.roleID = tostring(PlayerManager.uid).."_"..tostring(context.Id).."_"..PackageManager.GetCCCode().."_"..AppConst.Platform
|
||||
params.roleName = PlayerManager.nickName
|
||||
params.roleLevel = PlayerManager.level
|
||||
params.vip = tostring(VipManager.GetVipLevel())
|
||||
params.guildID = PlayerManager.familyId
|
||||
-- 其他
|
||||
params.payNotifyUrl = ""
|
||||
params.extension = tostring(PlayerManager.uid).."_"..tostring(context.Id).."_"..PackageManager.GetCCCode()
|
||||
params.extension = tostring(PlayerManager.uid).."_"..tostring(context.Id).."_"..PackageManager.GetCCCode().."_"..AppConst.Platform
|
||||
SDKMgr:Pay(params)
|
||||
|
||||
--
|
||||
|
|
|
|||
|
|
@ -231,6 +231,10 @@ function this.RefreshPlayerInfo(data)
|
|||
-- sortingorder = this.sortingOrder
|
||||
-- end
|
||||
LogError("title=="..title)
|
||||
if titleLive then
|
||||
SubUIManager.Close(titleLive)
|
||||
titleLive = nil
|
||||
end
|
||||
if not titleLive then
|
||||
titleLive = SubUIManager.Open(SubUIConfig.PlayerTitle, this.titlePar.transform)
|
||||
titleLive:SetShow(title, Vector3.New(0,0,0), 0.5, 0.03*20, this.sortingOrder)
|
||||
|
|
@ -464,6 +468,10 @@ end
|
|||
--界面关闭时调用(用于子类重写)
|
||||
function PlayerInfoPopup:OnClose()
|
||||
this.imprintObj:SetActive(false)
|
||||
if titleLive then
|
||||
SubUIManager.Close(titleLive)
|
||||
titleLive = nil
|
||||
end
|
||||
end
|
||||
|
||||
--界面销毁时调用(用于子类重写)
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ local this = RecruitManager
|
|||
local lotterySetting = ConfigManager.GetConfig(ConfigName.LotterySetting)
|
||||
local lotteryRewardConfig = ConfigManager.GetConfig(ConfigName.LotteryRewardConfig)
|
||||
local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||
local heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig)
|
||||
local dailyRewardConfig = ConfigManager.GetConfig(ConfigName.DialRewardConfig)
|
||||
|
||||
--活动抽卡类型(动态的数据)
|
||||
|
|
@ -22,11 +23,12 @@ function this.GetRecruit3MustCount()
|
|||
return this.recruit3MustCount
|
||||
end
|
||||
function this.Initialize()
|
||||
this.randCount = 0 --英雄抽卡已招募次数
|
||||
this.drawTimes = {} --英雄抽卡已招募次数
|
||||
this.isCanOpenBox = false
|
||||
this.boxReward = {}
|
||||
this.recruitFreeUseTime = 0 --现在只剩下秘盒招募在用了
|
||||
this.isTenRecruit = 0 --首次十连
|
||||
this.WishCardData = {}
|
||||
|
||||
this.isFirstEnterElementScroll=true
|
||||
this.isFirstEnterHeroScroll=true
|
||||
|
|
@ -69,6 +71,16 @@ function this.RecruitRequest(recruitType, func, privilegeId,_itemId,_itemNum)
|
|||
end
|
||||
end
|
||||
|
||||
--记录所有抽卡类型的抽卡次数
|
||||
function this.SetAllDrawTimes(_allData)
|
||||
for i = 1, #_allData do
|
||||
if not this.drawTimes[_allData[i].type] then
|
||||
this.drawTimes[_allData[i].type] = {}
|
||||
end
|
||||
this.drawTimes[_allData[i].type] = _allData[i].num > 0 and _allData[i].num or 0
|
||||
end
|
||||
end
|
||||
|
||||
--5点刷新数据
|
||||
function this.RefreshFreeTime()
|
||||
this.freeUseTimeList[38] = PrivilegeManager.GetPrivilegeRemainValue(38)
|
||||
|
|
@ -421,4 +433,106 @@ function this.GetRecruitBtnRedpoint(recruitType,privilegeId)--privilegeId 单
|
|||
end
|
||||
|
||||
|
||||
--===================心愿抽卡界面逻辑===================
|
||||
function this.GetWishCardData(infoList)
|
||||
this.WishCardData = {}
|
||||
for i = 1, #infoList do
|
||||
this.WishCardData[i] = {}
|
||||
this.WishCardData[i].id = infoList[i].id
|
||||
this.WishCardData[i].heroTid = infoList[i].heroTid
|
||||
this.WishCardData[i].status = infoList[i].status
|
||||
-- LogPink("Id:"..tostring(infoList[i].id).." heroIid:"..tostring(infoList[i].heroTid).." status:"..tostring(infoList[i].status))
|
||||
this.WishCardData[i].PropertyName = infoList[i].heroTid > 0 and heroConfig[infoList[i].heroTid].PropertyName or nil
|
||||
end
|
||||
end
|
||||
|
||||
function this.GetCurHeroList(curIndex)
|
||||
local heroList = {}
|
||||
for index, v in ipairs(RecruitManager.GetRewardPreviewData(PRE_REWARD_POOL_TYPE.RECRUIT)) do
|
||||
if heroConfig[v.Reward[1]].Star == 5 and heroConfig[v.Reward[1]].PropertyName == curIndex then
|
||||
table.insert(heroList,v)
|
||||
end
|
||||
end
|
||||
return heroList
|
||||
end
|
||||
|
||||
--检测当前英雄状态
|
||||
function this.CheckCurHeroState(_heroTid)
|
||||
for i = 1, #this.WishCardData do
|
||||
if this.WishCardData[i].heroTid == _heroTid then
|
||||
--如果上方存在自己就✔
|
||||
if this.WishCardData[i].status == 0 then
|
||||
return 1
|
||||
elseif this.WishCardData[i].status == 1 then
|
||||
return 4
|
||||
end
|
||||
end
|
||||
end
|
||||
for i = 1, #this.WishCardData do
|
||||
if this.WishCardData[i].heroTid > 0 and this.WishCardData[i].PropertyName == heroConfig[_heroTid].PropertyName then
|
||||
--如果上方存在和当前英雄相同阵营的就置灰
|
||||
return 0
|
||||
end
|
||||
end
|
||||
|
||||
local num = 0
|
||||
for i = 1, #this.WishCardData do
|
||||
if this.WishCardData[i].heroTid > 0 then
|
||||
num = num + 1
|
||||
end
|
||||
end
|
||||
if num == 3 then
|
||||
--如果上方神将满则其他全部置灰
|
||||
return 2
|
||||
end
|
||||
--都没有就亮着
|
||||
return 3
|
||||
end
|
||||
|
||||
--添加和卸下神将
|
||||
function this.ChangeHero(type,_heroTid,func)
|
||||
if type == 1 then --增加神将
|
||||
for i = 1, #this.WishCardData do
|
||||
if this.WishCardData[i].heroTid == 0 then
|
||||
this.WishCardData[i].heroTid = _heroTid
|
||||
break
|
||||
end
|
||||
end
|
||||
elseif type == 2 then --卸下神将
|
||||
for i = 1, #this.WishCardData do
|
||||
if this.WishCardData[i].heroTid == _heroTid then
|
||||
this.WishCardData[i].heroTid = 0
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
NetManager.ChoiceWishHeroRequest(this.WishCardData,function ()
|
||||
if func then
|
||||
func()
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
--检查该跳转的页签
|
||||
function this.CheckIndex()
|
||||
local num = 0
|
||||
for i = 1, #this.WishCardData do
|
||||
if this.WishCardData[i].heroTid > 0 then
|
||||
num = num + 1
|
||||
end
|
||||
end
|
||||
if num == 3 then
|
||||
return 1
|
||||
end
|
||||
local num2 = {1,2,3,4}
|
||||
for i = 4, 1,-1 do
|
||||
for j = 1, #this.WishCardData do
|
||||
if this.WishCardData[j].PropertyName == num2[i] then
|
||||
table.remove(num2,i)
|
||||
end
|
||||
end
|
||||
end
|
||||
return num2[1]
|
||||
end
|
||||
|
||||
return this
|
||||
|
|
@ -10,6 +10,7 @@ local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
|
|||
local artResourcesConfig =ConfigManager.GetConfig(ConfigName.ArtResourcesConfig)
|
||||
local lotterySetting=ConfigManager.GetConfig(ConfigName.LotterySetting)
|
||||
local privilegeConfig=ConfigManager.GetConfig(ConfigName.PrivilegeTypeConfig)
|
||||
local specialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig)
|
||||
local orginLayer = 0
|
||||
|
||||
--抽卡类型
|
||||
|
|
@ -73,6 +74,10 @@ function RecruitPanel:InitComponent()
|
|||
|
||||
this.boxBtn=Util.GetGameObject(this.gameObject,"rewardBox/content/boxIcon/Btn")
|
||||
this.upper=Util.GetGameObject(this.gameObject,"Upper/Num"):GetComponent("Text")--召唤上限
|
||||
|
||||
this.wishBtn = Util.GetGameObject(this.gameObject,"wishBtn")
|
||||
this.helpBtn = Util.GetGameObject(this.gameObject, "helpBtn")
|
||||
this.helpPosition = this.helpBtn:GetComponent("RectTransform").localPosition
|
||||
end
|
||||
|
||||
function RecruitPanel:BindEvent()
|
||||
|
|
@ -80,6 +85,10 @@ function RecruitPanel:BindEvent()
|
|||
self:ClosePanel()
|
||||
PlaySoundWithoutClick(SoundConfig.Sound_UICancel)
|
||||
end)
|
||||
--帮助按钮
|
||||
Util.AddClick(this.helpBtn, function()
|
||||
UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.WishCard,this.helpPosition.x,this.helpPosition.y)
|
||||
end)
|
||||
--宝箱按钮
|
||||
Util.AddClick(this.boxBtn,function()
|
||||
UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitBox)
|
||||
|
|
@ -89,6 +98,19 @@ function RecruitPanel:BindEvent()
|
|||
--奖池预览按钮
|
||||
Util.AddClick(this.previewBtn, function()
|
||||
UIManager.OpenPanel(UIName.HeroPreviewPanel,true)
|
||||
end)
|
||||
--心愿抽卡界面
|
||||
Util.AddClick(this.wishBtn, function()
|
||||
local data = tonumber(specialConfig[119].Value)
|
||||
if RecruitManager.drawTimes[1] then
|
||||
if RecruitManager.drawTimes[1] >= data then
|
||||
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.WishDraw)
|
||||
else
|
||||
PopupTipPanel.ShowTip(string.format("%s次神将召唤后,开启心愿抽卡!",data - RecruitManager.drawTimes[1]))
|
||||
end
|
||||
else
|
||||
PopupTipPanel.ShowTip(string.format("%s次神将召唤后,开启心愿抽卡!",data))
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue