Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
3cf8a5d2ce
Binary file not shown.
|
After Width: | Height: | Size: 389 KiB |
|
|
@ -0,0 +1,121 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 9859e8fd4d39ca349946f4c527799eb9
|
||||
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: 0
|
||||
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
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 4
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- 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: 57
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5621e4cf5a5876944956f4131c035ca7
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName: lz4/bg/w_wybq_bg
|
||||
assetBundleVariant: unity3d
|
||||
|
|
@ -288,7 +288,7 @@ RectTransform:
|
|||
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: -67.7, y: 6}
|
||||
m_AnchoredPosition: {x: -16, y: 6}
|
||||
m_SizeDelta: {x: 146.08, y: 41.45}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &143437779582946584
|
||||
|
|
@ -368,7 +368,7 @@ RectTransform:
|
|||
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: 271, y: 4.4999924}
|
||||
m_AnchoredPosition: {x: 226, y: 4.4999924}
|
||||
m_SizeDelta: {x: 146.08, y: 41.45}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &143437780438759993
|
||||
|
|
@ -1567,7 +1567,7 @@ RectTransform:
|
|||
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: 648, y: 164}
|
||||
m_AnchoredPosition: {x: 589.7, y: 164}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &1349394205015124760
|
||||
|
|
@ -4197,7 +4197,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 206, y: 120.3}
|
||||
m_AnchoredPosition: {x: 147.70001, y: 120.3}
|
||||
m_SizeDelta: {x: 484, y: 2}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3203248339028846622
|
||||
|
|
@ -6860,8 +6860,8 @@ RectTransform:
|
|||
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: -84.60003, y: -84.8}
|
||||
m_SizeDelta: {x: 571.2, y: 64.6}
|
||||
m_AnchoredPosition: {x: -85, y: -84.8}
|
||||
m_SizeDelta: {x: 373.3, y: 64.6}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3745432775164330284
|
||||
CanvasRenderer:
|
||||
|
|
@ -7887,7 +7887,7 @@ RectTransform:
|
|||
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: -67.7, y: 6}
|
||||
m_AnchoredPosition: {x: -15.999966, y: 6}
|
||||
m_SizeDelta: {x: 146.08, y: 41.45}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1821279545886880236
|
||||
|
|
@ -8171,7 +8171,7 @@ RectTransform:
|
|||
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: 326.4, y: 118.8}
|
||||
m_AnchoredPosition: {x: 268.10004, y: 118.8}
|
||||
m_SizeDelta: {x: 166.62, y: 166.62}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6276506233630332903
|
||||
|
|
@ -8246,7 +8246,7 @@ RectTransform:
|
|||
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: 330, y: 313.10995}
|
||||
m_AnchoredPosition: {x: 271.7, y: 313.10995}
|
||||
m_SizeDelta: {x: 316.46, y: 58.79}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6276303276045344073
|
||||
|
|
@ -8408,7 +8408,7 @@ RectTransform:
|
|||
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: 151, y: 693}
|
||||
m_AnchoredPosition: {x: 92.70001, y: 693}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &6055480457879017691
|
||||
|
|
@ -8796,7 +8796,7 @@ RectTransform:
|
|||
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: 279.3, y: 83.2}
|
||||
m_AnchoredPosition: {x: 221, y: 83.2}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &6055813399759067693
|
||||
|
|
@ -8837,7 +8837,7 @@ RectTransform:
|
|||
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: 649.4, y: -32.03}
|
||||
m_AnchoredPosition: {x: 591.10004, y: -32.03}
|
||||
m_SizeDelta: {x: 299.57, y: 85.26}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6275908341821672553
|
||||
|
|
@ -9697,7 +9697,7 @@ RectTransform:
|
|||
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: 640, y: 117.9}
|
||||
m_AnchoredPosition: {x: 581.7, y: 117.9}
|
||||
m_SizeDelta: {x: 197.07, y: 47.75}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6276022582899603475
|
||||
|
|
@ -10726,7 +10726,7 @@ RectTransform:
|
|||
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: 271, y: 4.4999924}
|
||||
m_AnchoredPosition: {x: 226.00005, y: 4.4999924}
|
||||
m_SizeDelta: {x: 146.08, y: 41.45}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &829020788335941996
|
||||
|
|
@ -10988,7 +10988,7 @@ RectTransform:
|
|||
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: -173.7, y: 7}
|
||||
m_AnchoredPosition: {x: -121.99997, y: 7}
|
||||
m_SizeDelta: {x: 57, y: 62}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7162602387030792510
|
||||
|
|
@ -11216,7 +11216,7 @@ RectTransform:
|
|||
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: -67.7, y: 6}
|
||||
m_AnchoredPosition: {x: -15.999966, y: 6}
|
||||
m_SizeDelta: {x: 146.08, y: 41.45}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7162602387299366085
|
||||
|
|
@ -11371,7 +11371,7 @@ RectTransform:
|
|||
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: 659, y: 311.1}
|
||||
m_AnchoredPosition: {x: 600.7, y: 311.1}
|
||||
m_SizeDelta: {x: 316.46, y: 58.79}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7162602387482003867
|
||||
|
|
@ -11445,7 +11445,7 @@ RectTransform:
|
|||
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: 271, y: 4.4999924}
|
||||
m_AnchoredPosition: {x: 226.00005, y: 4.4999924}
|
||||
m_SizeDelta: {x: 146.08, y: 41.45}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7162602387485711532
|
||||
|
|
@ -11524,7 +11524,7 @@ RectTransform:
|
|||
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: -67.7, y: 6}
|
||||
m_AnchoredPosition: {x: -15.999966, y: 6}
|
||||
m_SizeDelta: {x: 146.08, y: 41.45}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7162602387670494093
|
||||
|
|
@ -11604,7 +11604,7 @@ RectTransform:
|
|||
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: -67.7, y: 6}
|
||||
m_AnchoredPosition: {x: -15.999966, y: 6}
|
||||
m_SizeDelta: {x: 146.08, y: 41.45}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7162602387761769325
|
||||
|
|
@ -11684,7 +11684,7 @@ RectTransform:
|
|||
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: 271, y: 4.4999924}
|
||||
m_AnchoredPosition: {x: 226.00005, y: 4.4999924}
|
||||
m_SizeDelta: {x: 146.08, y: 41.45}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7162602388145914575
|
||||
|
|
@ -11763,7 +11763,7 @@ RectTransform:
|
|||
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: -173.7, y: 7}
|
||||
m_AnchoredPosition: {x: -121.99997, y: 7}
|
||||
m_SizeDelta: {x: 57, y: 62}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7162602388254409101
|
||||
|
|
@ -11837,7 +11837,7 @@ RectTransform:
|
|||
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: 271, y: 4.4999924}
|
||||
m_AnchoredPosition: {x: 226.00005, y: 4.4999924}
|
||||
m_SizeDelta: {x: 146.08, y: 41.45}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7162602388354410949
|
||||
|
|
@ -11916,7 +11916,7 @@ RectTransform:
|
|||
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: -173.7, y: 7}
|
||||
m_AnchoredPosition: {x: -121.99997, y: 7}
|
||||
m_SizeDelta: {x: 57, y: 62}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7162602388421838052
|
||||
|
|
@ -12064,7 +12064,7 @@ RectTransform:
|
|||
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: -173.7, y: 7}
|
||||
m_AnchoredPosition: {x: -121.99997, y: 7}
|
||||
m_SizeDelta: {x: 57, y: 62}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7162602388704958474
|
||||
|
|
@ -14189,9 +14189,9 @@ RectTransform:
|
|||
m_Father: {fileID: 6274276792458260021}
|
||||
m_RootOrder: 12
|
||||
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: 442, y: -225}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -98, y: -225}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1242759744209921537
|
||||
|
|
@ -14400,7 +14400,7 @@ RectTransform:
|
|||
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: -173.7, y: 7}
|
||||
m_AnchoredPosition: {x: -121.99997, y: 7}
|
||||
m_SizeDelta: {x: 57, y: 62}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7877372573706620155
|
||||
|
|
|
|||
|
|
@ -610,8 +610,12 @@ local jumpDic = {
|
|||
end
|
||||
UIManager.OpenPanel(UIName.MainShopPanel,13)
|
||||
end,
|
||||
[JumpType.Pokemon] = function()--灵兽山(驭兽斋)
|
||||
UIManager.OpenPanel(UIName.PokemonSummonPanel)
|
||||
[JumpType.Pokemon] = function(data)--灵兽山(驭兽斋)
|
||||
if data and data[1] == 1 then
|
||||
UIManager.OpenPanel(UIName.PokemonSummonPanel)
|
||||
elseif data and data[1] == 2 then
|
||||
UIManager.OpenPanel(UIName.PokemonMainPanel)
|
||||
end
|
||||
end,
|
||||
[JumpType.HongMengZhen] = function ()
|
||||
-- body
|
||||
|
|
|
|||
|
|
@ -153,9 +153,16 @@ function PracticeImprint:SetSingleImprint(_go,_imprintId)
|
|||
|
||||
Util.AddOnceClick(maskBtn,function ()
|
||||
--未解锁的不可查看
|
||||
if not serverData then
|
||||
PopupTipPanel.ShowTip(string.format("%s解锁",configData.Unlock))
|
||||
return
|
||||
if configData.UnlockView then
|
||||
if configData.UnlockView == 0 then
|
||||
PopupTipPanel.ShowTip(string.format("暂未开放..."))
|
||||
return
|
||||
end
|
||||
else
|
||||
if not serverData then
|
||||
PopupTipPanel.ShowTip(string.format("%s解锁",configData.Unlock))
|
||||
return
|
||||
end
|
||||
end
|
||||
if serverData then--如果没有解锁 点击查看不能影响后面红点
|
||||
PlayerPrefs.SetInt(PlayerManager.uid.."Imprint"..configData.Id,1)
|
||||
|
|
|
|||
|
|
@ -87,21 +87,23 @@ local function SetPosition(self, dv2)
|
|||
end
|
||||
local fv2 = av2 + dv2
|
||||
|
||||
if not self.elastic then
|
||||
--if not self.elastic then
|
||||
if self.itemDis > 0 then
|
||||
if self.dragType == 1 then
|
||||
if fv2.y < 0 or fv2.y > self.itemDis then
|
||||
if fv2.y < (0 - self.maxOffSet) or fv2.y > (self.itemDis + self.maxOffSet) then
|
||||
fv2.y = math.clamp(fv2.y, 0, self.itemDis)
|
||||
return
|
||||
end
|
||||
elseif self.dragType == 2 then
|
||||
if fv2.x < 0 or fv2.x > self.itemDis then
|
||||
if fv2.x < (0 - self.maxOffSet) or fv2.x > (self.itemDis + self.maxOffSet) then
|
||||
fv2.x = math.clamp(-fv2.x, -self.itemDis, 0)
|
||||
return
|
||||
end
|
||||
end
|
||||
else
|
||||
fv2 = Vector2.zero
|
||||
return
|
||||
end
|
||||
end
|
||||
--end
|
||||
self.dragGOTran.anchoredPosition = fv2
|
||||
|
||||
local curIndex
|
||||
|
|
@ -304,7 +306,16 @@ function ScrollCycleView:OnOpen(itemGO, scrollBar, scrollSizeDeltaV2, dragType,
|
|||
self.dragGOTran.anchoredPosition = Vector2.New(0, 0)
|
||||
end
|
||||
|
||||
function this:SetData(dataList, updateFunc, noTop, noAnim)
|
||||
function this:SetData(dataList, updateFunc, noTop, noAnim,maxOffSet)
|
||||
if not maxOffSet then
|
||||
if not self.elastic then
|
||||
self.maxOffSet = 0
|
||||
else
|
||||
self.maxOffSet = 500
|
||||
end
|
||||
else
|
||||
self.maxOffSet = maxOffSet
|
||||
end
|
||||
self.dataList = dataList --传入的数据列表
|
||||
self.updateFunc = updateFunc --刷新回调,返回数据列表的索引和对应预设
|
||||
self.dataCount = #dataList
|
||||
|
|
|
|||
Loading…
Reference in New Issue