First pass optimisation for next update.
[x] Cleared any outstanding warnings on build [x] Tested random scenes and updated (requires further investigation)pull/413/head
Simon (Darkside) Jackson
parent
2145c4671b
commit
55a7d21860
|
|
@ -1,17 +1,20 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 53265fa76b3529848a7fb47f0f4a594b
|
||||
guid: ceeaeb4352e834c459ca80dcae969757
|
||||
timeCreated: 1447969857
|
||||
licenseType: Store
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
serializedVersion: 2
|
||||
externalObjects: {}
|
||||
serializedVersion: 4
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
correctGamma: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
|
|
@ -21,23 +24,22 @@ TextureImporter:
|
|||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
cubemapConvolutionSteps: 4
|
||||
cubemapConvolutionExponent: 1.5
|
||||
seamlessCubemap: 0
|
||||
textureFormat: -1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: -1
|
||||
aniso: 0
|
||||
mipBias: -1
|
||||
wrapMode: 0
|
||||
wrapU: 0
|
||||
wrapV: 0
|
||||
wrapW: 0
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
rGBM: 0
|
||||
compressionQuality: 50
|
||||
allowsAlphaSplitting: 0
|
||||
spriteMode: 0
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
|
|
@ -45,12 +47,29 @@ TextureImporter:
|
|||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spritePixelsToUnits: 100
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
textureType: 5
|
||||
buildTargetSettings: []
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 0
|
||||
textureShape: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
spritePackingTag:
|
||||
userData:
|
||||
assetBundleName:
|
||||
|
|
|
|||
|
|
@ -1,17 +1,20 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 2b2d3cd4355b13b4699d3f1abf451cf7
|
||||
guid: 7c32e2a899332044dbe22833ca3c21b7
|
||||
timeCreated: 1447970042
|
||||
licenseType: Store
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
serializedVersion: 2
|
||||
externalObjects: {}
|
||||
serializedVersion: 4
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 1
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
correctGamma: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
|
|
@ -21,23 +24,22 @@ TextureImporter:
|
|||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
cubemapConvolutionSteps: 4
|
||||
cubemapConvolutionExponent: 1.5
|
||||
seamlessCubemap: 0
|
||||
textureFormat: -1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: -1
|
||||
aniso: 0
|
||||
mipBias: -1
|
||||
wrapMode: 0
|
||||
wrapU: 0
|
||||
wrapV: 0
|
||||
wrapW: 0
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
rGBM: 0
|
||||
compressionQuality: 50
|
||||
allowsAlphaSplitting: 0
|
||||
spriteMode: 0
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
|
|
@ -45,12 +47,29 @@ TextureImporter:
|
|||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spritePixelsToUnits: 100
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
textureType: 5
|
||||
buildTargetSettings: []
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 0
|
||||
textureShape: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
spritePackingTag:
|
||||
userData:
|
||||
assetBundleName:
|
||||
|
|
|
|||
|
|
@ -1,17 +1,20 @@
|
|||
fileFormatVersion: 2
|
||||
guid: be862b17a8fa1544da2abdb50784ccf9
|
||||
guid: cfdaf5de41bd3704fa29a6b24314293e
|
||||
timeCreated: 1447969667
|
||||
licenseType: Store
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
serializedVersion: 2
|
||||
externalObjects: {}
|
||||
serializedVersion: 4
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
correctGamma: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
|
|
@ -21,23 +24,22 @@ TextureImporter:
|
|||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
cubemapConvolutionSteps: 4
|
||||
cubemapConvolutionExponent: 1.5
|
||||
seamlessCubemap: 0
|
||||
textureFormat: -1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: -1
|
||||
aniso: 0
|
||||
mipBias: -1
|
||||
wrapMode: 0
|
||||
wrapU: 0
|
||||
wrapV: 0
|
||||
wrapW: 0
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
rGBM: 0
|
||||
compressionQuality: 50
|
||||
allowsAlphaSplitting: 0
|
||||
spriteMode: 0
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
|
|
@ -45,12 +47,29 @@ TextureImporter:
|
|||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spritePixelsToUnits: 100
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
textureType: 5
|
||||
buildTargetSettings: []
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 0
|
||||
textureShape: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
spritePackingTag:
|
||||
userData:
|
||||
assetBundleName:
|
||||
|
|
|
|||
|
|
@ -1,17 +1,20 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 85b639891c9cfa54998a58964e8ef747
|
||||
guid: 5a31d158d5e42e64096d5da4c26b6726
|
||||
timeCreated: 1447964200
|
||||
licenseType: Store
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
serializedVersion: 2
|
||||
externalObjects: {}
|
||||
serializedVersion: 4
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
correctGamma: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
|
|
@ -21,23 +24,22 @@ TextureImporter:
|
|||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
cubemapConvolutionSteps: 4
|
||||
cubemapConvolutionExponent: 1.5
|
||||
seamlessCubemap: 0
|
||||
textureFormat: -1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: -1
|
||||
aniso: 0
|
||||
mipBias: -1
|
||||
wrapMode: 0
|
||||
wrapU: 0
|
||||
wrapV: 0
|
||||
wrapW: 0
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
rGBM: 0
|
||||
compressionQuality: 50
|
||||
allowsAlphaSplitting: 0
|
||||
spriteMode: 0
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
|
|
@ -45,12 +47,29 @@ TextureImporter:
|
|||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spritePixelsToUnits: 100
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
textureType: 5
|
||||
buildTargetSettings: []
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 0
|
||||
textureShape: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
spritePackingTag:
|
||||
userData:
|
||||
assetBundleName:
|
||||
|
|
|
|||
|
|
@ -38,11 +38,11 @@ RenderSettings:
|
|||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0.37311947, g: 0.38074005, b: 0.35872722, a: 1}
|
||||
m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 9
|
||||
serializedVersion: 11
|
||||
m_GIWorkflowMode: 0
|
||||
m_GISettings:
|
||||
serializedVersion: 2
|
||||
|
|
@ -54,7 +54,7 @@ LightmapSettings:
|
|||
m_EnableBakedLightmaps: 1
|
||||
m_EnableRealtimeLightmaps: 1
|
||||
m_LightmapEditorSettings:
|
||||
serializedVersion: 8
|
||||
serializedVersion: 9
|
||||
m_Resolution: 2
|
||||
m_BakeResolution: 40
|
||||
m_TextureWidth: 1024
|
||||
|
|
@ -77,17 +77,20 @@ LightmapSettings:
|
|||
m_PVRDirectSampleCount: 32
|
||||
m_PVRSampleCount: 500
|
||||
m_PVRBounces: 2
|
||||
m_PVRFiltering: 0
|
||||
m_PVRFilterTypeDirect: 0
|
||||
m_PVRFilterTypeIndirect: 0
|
||||
m_PVRFilterTypeAO: 0
|
||||
m_PVRFilteringMode: 1
|
||||
m_PVRCulling: 1
|
||||
m_PVRFilteringGaussRadiusDirect: 1
|
||||
m_PVRFilteringGaussRadiusIndirect: 5
|
||||
m_PVRFilteringGaussRadiusAO: 2
|
||||
m_PVRFilteringAtrousColorSigma: 1
|
||||
m_PVRFilteringAtrousNormalSigma: 1
|
||||
m_PVRFilteringAtrousPositionSigma: 1
|
||||
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
|
||||
m_PVRFilteringAtrousPositionSigmaIndirect: 2
|
||||
m_PVRFilteringAtrousPositionSigmaAO: 1
|
||||
m_ShowResolutionOverlay: 1
|
||||
m_LightingDataAsset: {fileID: 0}
|
||||
m_ShadowMaskMode: 2
|
||||
m_UseShadowmask: 1
|
||||
--- !u!196 &4
|
||||
NavMeshSettings:
|
||||
serializedVersion: 2
|
||||
|
|
@ -107,6 +110,8 @@ NavMeshSettings:
|
|||
manualTileSize: 0
|
||||
tileSize: 256
|
||||
accuratePlacement: 0
|
||||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!1 &650160435
|
||||
GameObject:
|
||||
|
|
@ -224,7 +229,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 777088608}
|
||||
- component: {fileID: 777088607}
|
||||
- component: {fileID: 777088606}
|
||||
- component: {fileID: 777088605}
|
||||
- component: {fileID: 777088604}
|
||||
m_Layer: 0
|
||||
|
|
@ -242,13 +246,6 @@ AudioListener:
|
|||
m_GameObject: {fileID: 777088603}
|
||||
m_Enabled: 1
|
||||
--- !u!124 &777088605
|
||||
Behaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 777088603}
|
||||
m_Enabled: 1
|
||||
--- !u!92 &777088606
|
||||
Behaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
|
|
@ -290,7 +287,6 @@ Camera:
|
|||
m_OcclusionCulling: 1
|
||||
m_StereoConvergence: 10
|
||||
m_StereoSeparation: 0.022
|
||||
m_StereoMirrorMode: 0
|
||||
--- !u!4 &777088608
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -434,6 +430,16 @@ MonoBehaviour:
|
|||
VelocityThreshold: 0.5
|
||||
Duration: 0.3
|
||||
dataCount: 0
|
||||
OnUpdatePosition:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Extensions.ScrollPositionController+UpdatePositionEvent,
|
||||
Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
OnItemSelected:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Extensions.ScrollPositionController+ItemSelectedEvent,
|
||||
Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
--- !u!114 &1492537700
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ AnimatorStateTransition:
|
|||
m_TransitionDuration: 0.1
|
||||
m_TransitionOffset: 0
|
||||
m_ExitTime: 0.9
|
||||
m_HasExitTime: 0
|
||||
m_HasExitTime: 1
|
||||
m_HasFixedDuration: 1
|
||||
m_InterruptionSource: 0
|
||||
m_OrderedInterruption: 1
|
||||
|
|
@ -66,11 +66,13 @@ AnimatorState:
|
|||
m_SpeedParameterActive: 0
|
||||
m_MirrorParameterActive: 0
|
||||
m_CycleOffsetParameterActive: 0
|
||||
m_TimeParameterActive: 0
|
||||
m_Motion: {fileID: 7400000, guid: 9e6e4c5500df9dc439749ba892b2995c, type: 2}
|
||||
m_Tag:
|
||||
m_SpeedParameter:
|
||||
m_MirrorParameter:
|
||||
m_CycleOffsetParameter:
|
||||
m_TimeParameter:
|
||||
--- !u!1107 &1107904440216339570
|
||||
AnimatorStateMachine:
|
||||
serializedVersion: 5
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ namespace UnityEngine.UI.Extensions.Examples
|
|||
public class Example01Scene : MonoBehaviour
|
||||
{
|
||||
[SerializeField]
|
||||
Example01ScrollView scrollView;
|
||||
Example01ScrollView scrollView = null;
|
||||
|
||||
void Start()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ namespace UnityEngine.UI.Extensions.Examples
|
|||
public class Example01ScrollView : FancyScrollView<Example01CellDto>
|
||||
{
|
||||
[SerializeField]
|
||||
ScrollPositionController scrollPositionController;
|
||||
ScrollPositionController scrollPositionController = null;
|
||||
|
||||
new void Awake()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
public class Example01ScrollViewCell : FancyScrollViewCell<Example01CellDto>
|
||||
{
|
||||
[SerializeField]
|
||||
Animator animator;
|
||||
Animator animator = null;
|
||||
[SerializeField]
|
||||
Text message;
|
||||
Text message = null;
|
||||
|
||||
readonly int scrollTriggerHash = Animator.StringToHash("scroll");
|
||||
|
||||
|
|
|
|||
|
|
@ -38,11 +38,11 @@ RenderSettings:
|
|||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0.37311947, g: 0.38074005, b: 0.35872722, a: 1}
|
||||
m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 9
|
||||
serializedVersion: 11
|
||||
m_GIWorkflowMode: 0
|
||||
m_GISettings:
|
||||
serializedVersion: 2
|
||||
|
|
@ -54,7 +54,7 @@ LightmapSettings:
|
|||
m_EnableBakedLightmaps: 1
|
||||
m_EnableRealtimeLightmaps: 1
|
||||
m_LightmapEditorSettings:
|
||||
serializedVersion: 8
|
||||
serializedVersion: 9
|
||||
m_Resolution: 2
|
||||
m_BakeResolution: 40
|
||||
m_TextureWidth: 1024
|
||||
|
|
@ -77,17 +77,20 @@ LightmapSettings:
|
|||
m_PVRDirectSampleCount: 32
|
||||
m_PVRSampleCount: 500
|
||||
m_PVRBounces: 2
|
||||
m_PVRFiltering: 0
|
||||
m_PVRFilterTypeDirect: 0
|
||||
m_PVRFilterTypeIndirect: 0
|
||||
m_PVRFilterTypeAO: 0
|
||||
m_PVRFilteringMode: 1
|
||||
m_PVRCulling: 1
|
||||
m_PVRFilteringGaussRadiusDirect: 1
|
||||
m_PVRFilteringGaussRadiusIndirect: 5
|
||||
m_PVRFilteringGaussRadiusAO: 2
|
||||
m_PVRFilteringAtrousColorSigma: 1
|
||||
m_PVRFilteringAtrousNormalSigma: 1
|
||||
m_PVRFilteringAtrousPositionSigma: 1
|
||||
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
|
||||
m_PVRFilteringAtrousPositionSigmaIndirect: 2
|
||||
m_PVRFilteringAtrousPositionSigmaAO: 1
|
||||
m_ShowResolutionOverlay: 1
|
||||
m_LightingDataAsset: {fileID: 0}
|
||||
m_ShadowMaskMode: 2
|
||||
m_UseShadowmask: 1
|
||||
--- !u!196 &4
|
||||
NavMeshSettings:
|
||||
serializedVersion: 2
|
||||
|
|
@ -107,6 +110,8 @@ NavMeshSettings:
|
|||
manualTileSize: 0
|
||||
tileSize: 256
|
||||
accuratePlacement: 0
|
||||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!1 &650160435
|
||||
GameObject:
|
||||
|
|
@ -224,7 +229,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 777088608}
|
||||
- component: {fileID: 777088607}
|
||||
- component: {fileID: 777088606}
|
||||
- component: {fileID: 777088605}
|
||||
- component: {fileID: 777088604}
|
||||
m_Layer: 0
|
||||
|
|
@ -242,13 +246,6 @@ AudioListener:
|
|||
m_GameObject: {fileID: 777088603}
|
||||
m_Enabled: 1
|
||||
--- !u!124 &777088605
|
||||
Behaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 777088603}
|
||||
m_Enabled: 1
|
||||
--- !u!92 &777088606
|
||||
Behaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
|
|
@ -290,7 +287,6 @@ Camera:
|
|||
m_OcclusionCulling: 1
|
||||
m_StereoConvergence: 10
|
||||
m_StereoSeparation: 0.022
|
||||
m_StereoMirrorMode: 0
|
||||
--- !u!4 &777088608
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -492,6 +488,16 @@ MonoBehaviour:
|
|||
VelocityThreshold: 0.5
|
||||
Duration: 0.3
|
||||
dataCount: 0
|
||||
OnUpdatePosition:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Extensions.ScrollPositionController+UpdatePositionEvent,
|
||||
Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
OnItemSelected:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Extensions.ScrollPositionController+ItemSelectedEvent,
|
||||
Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
--- !u!114 &1492537701
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ namespace UnityEngine.UI.Extensions.Examples
|
|||
public class Example02Scene : MonoBehaviour
|
||||
{
|
||||
[SerializeField]
|
||||
Example02ScrollView scrollView;
|
||||
Example02ScrollView scrollView = null;
|
||||
|
||||
void Start()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ namespace UnityEngine.UI.Extensions.Examples
|
|||
public class Example02ScrollView : FancyScrollView<Example02CellDto, Example02ScrollViewContext>
|
||||
{
|
||||
[SerializeField]
|
||||
ScrollPositionController scrollPositionController;
|
||||
ScrollPositionController scrollPositionController = null;
|
||||
|
||||
new void Awake()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
: FancyScrollViewCell<Example02CellDto, Example02ScrollViewContext>
|
||||
{
|
||||
[SerializeField]
|
||||
Animator animator;
|
||||
Animator animator = null;
|
||||
[SerializeField]
|
||||
Text message;
|
||||
Text message = null;
|
||||
[SerializeField]
|
||||
Image image;
|
||||
Image image = null;
|
||||
[SerializeField]
|
||||
Button button;
|
||||
Button button = null;
|
||||
|
||||
readonly int scrollTriggerHash = Animator.StringToHash("scroll");
|
||||
Example02ScrollViewContext context;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ namespace UnityEngine.UI.Extensions.Examples
|
|||
public class Example03Scene : MonoBehaviour
|
||||
{
|
||||
[SerializeField]
|
||||
Example03ScrollView scrollView;
|
||||
Example03ScrollView scrollView = null;
|
||||
|
||||
void Start()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ namespace UnityEngine.UI.Extensions.Examples
|
|||
public class Example03ScrollView : FancyScrollView<Example03CellDto, Example03ScrollViewContext>
|
||||
{
|
||||
[SerializeField]
|
||||
ScrollPositionController scrollPositionController;
|
||||
ScrollPositionController scrollPositionController = null;
|
||||
|
||||
new void Awake()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
: FancyScrollViewCell<Example03CellDto, Example03ScrollViewContext>
|
||||
{
|
||||
[SerializeField]
|
||||
Animator animator;
|
||||
Animator animator = null;
|
||||
[SerializeField]
|
||||
Text message;
|
||||
Text message = null;
|
||||
[SerializeField]
|
||||
Image image;
|
||||
Image image = null;
|
||||
[SerializeField]
|
||||
Button button;
|
||||
Button button = null;
|
||||
|
||||
readonly int scrollTriggerHash = Animator.StringToHash("scroll");
|
||||
Example03ScrollViewContext context;
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -1,8 +1,10 @@
|
|||
fileFormatVersion: 2
|
||||
guid: cff6ddbad6d91384d9e5cc079064bcff
|
||||
guid: 3f5a96e079cd90b4dafe71a3b4c621dc
|
||||
timeCreated: 1481827080
|
||||
licenseType: Pro
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f0537c94867b99f4b975a024066f29a0
|
||||
guid: 4c340036cb65e2b4a89e357053280e45
|
||||
timeCreated: 1463936976
|
||||
licenseType: Pro
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 9dff33128ff490641b8e89a0ca210447
|
||||
guid: 4ae94fc31c10f4f49b78c938bbd7face
|
||||
timeCreated: 1481827060
|
||||
licenseType: Pro
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 76a920c191abd8a4f9351c7f17c2cdef
|
||||
guid: 5aaf226e59aa138419f7074ee5d33120
|
||||
timeCreated: 1481843068
|
||||
licenseType: Pro
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ea8b6678b91baa44eb4de7f20e6684a3
|
||||
guid: 654cac5c926088642ba0e944c553a863
|
||||
timeCreated: 1463936517
|
||||
licenseType: Pro
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 54c712c6efbe07d459d10a305f17b746
|
||||
guid: 632d4c446183fe24284e3db3e6906c36
|
||||
timeCreated: 1463946266
|
||||
licenseType: Pro
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 73d92df095c9b454eaa4b74bc3c559c2
|
||||
guid: c40f9d3dfb6a6454480bf85afc7f3da7
|
||||
timeCreated: 1464634768
|
||||
licenseType: Pro
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -1,17 +1,20 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 73f1719d5b8f9a1499c5a719ab10e675
|
||||
guid: f998567fad16b0d4bbddb4821ced21c5
|
||||
timeCreated: 1447964200
|
||||
licenseType: Store
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
serializedVersion: 2
|
||||
externalObjects: {}
|
||||
serializedVersion: 4
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
correctGamma: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
|
|
@ -21,23 +24,22 @@ TextureImporter:
|
|||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
cubemapConvolutionSteps: 4
|
||||
cubemapConvolutionExponent: 1.5
|
||||
seamlessCubemap: 0
|
||||
textureFormat: -1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: -1
|
||||
aniso: 0
|
||||
mipBias: -1
|
||||
wrapMode: 1
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 1
|
||||
lightmap: 0
|
||||
rGBM: 0
|
||||
compressionQuality: 50
|
||||
allowsAlphaSplitting: 0
|
||||
spriteMode: 0
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
|
|
@ -45,12 +47,29 @@ TextureImporter:
|
|||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spritePixelsToUnits: 100
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
textureType: 5
|
||||
buildTargetSettings: []
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 0
|
||||
textureShape: 1
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
spritePackingTag:
|
||||
userData:
|
||||
assetBundleName:
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ namespace UnityEngine.UI.Extensions.Examples
|
|||
public void ClearPoints()
|
||||
{
|
||||
LineRenderer.Points = new Vector2[0];
|
||||
LineRenderer.SetAllDirty();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,8 +1,9 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6f7b10baa6c50634a979160a8c4f142c
|
||||
guid: a9ab7a977fd7a3243b4b43f7b09a8c5a
|
||||
timeCreated: 1463340207
|
||||
licenseType: Pro
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
|
|
|
|||
|
|
@ -38,11 +38,11 @@ RenderSettings:
|
|||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0.44657868, g: 0.49641263, b: 0.57481706, a: 1}
|
||||
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 9
|
||||
serializedVersion: 11
|
||||
m_GIWorkflowMode: 0
|
||||
m_GISettings:
|
||||
serializedVersion: 2
|
||||
|
|
@ -54,7 +54,7 @@ LightmapSettings:
|
|||
m_EnableBakedLightmaps: 1
|
||||
m_EnableRealtimeLightmaps: 1
|
||||
m_LightmapEditorSettings:
|
||||
serializedVersion: 8
|
||||
serializedVersion: 9
|
||||
m_Resolution: 2
|
||||
m_BakeResolution: 40
|
||||
m_TextureWidth: 1024
|
||||
|
|
@ -77,17 +77,20 @@ LightmapSettings:
|
|||
m_PVRDirectSampleCount: 32
|
||||
m_PVRSampleCount: 500
|
||||
m_PVRBounces: 2
|
||||
m_PVRFiltering: 0
|
||||
m_PVRFilterTypeDirect: 0
|
||||
m_PVRFilterTypeIndirect: 0
|
||||
m_PVRFilterTypeAO: 0
|
||||
m_PVRFilteringMode: 1
|
||||
m_PVRCulling: 1
|
||||
m_PVRFilteringGaussRadiusDirect: 1
|
||||
m_PVRFilteringGaussRadiusIndirect: 5
|
||||
m_PVRFilteringGaussRadiusAO: 2
|
||||
m_PVRFilteringAtrousColorSigma: 1
|
||||
m_PVRFilteringAtrousNormalSigma: 1
|
||||
m_PVRFilteringAtrousPositionSigma: 1
|
||||
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
|
||||
m_PVRFilteringAtrousPositionSigmaIndirect: 2
|
||||
m_PVRFilteringAtrousPositionSigmaAO: 1
|
||||
m_ShowResolutionOverlay: 1
|
||||
m_LightingDataAsset: {fileID: 0}
|
||||
m_ShadowMaskMode: 2
|
||||
m_UseShadowmask: 1
|
||||
--- !u!196 &4
|
||||
NavMeshSettings:
|
||||
serializedVersion: 2
|
||||
|
|
@ -107,6 +110,8 @@ NavMeshSettings:
|
|||
manualTileSize: 0
|
||||
tileSize: 256
|
||||
accuratePlacement: 0
|
||||
debug:
|
||||
m_Flags: 0
|
||||
m_NavMeshData: {fileID: 0}
|
||||
--- !u!1 &23818490
|
||||
GameObject:
|
||||
|
|
@ -925,11 +930,15 @@ MonoBehaviour:
|
|||
m_improveResolution: 0
|
||||
m_Resolution: 0
|
||||
m_useNativeSize: 0
|
||||
m_fillPercent: 100
|
||||
FixedToSegments: 0
|
||||
m_fill: 1
|
||||
m_thickness: 5
|
||||
m_segments: 360
|
||||
ArcInvert: 1
|
||||
Arc: 1
|
||||
ArcSteps: 100
|
||||
ArcRotation: 0
|
||||
Progress: 0
|
||||
ProgressColor: {r: 255, g: 255, b: 255, a: 255}
|
||||
Fill: 1
|
||||
Thickness: 5
|
||||
Padding: 0
|
||||
--- !u!222 &739101452
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2009,7 +2018,6 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 1558803276}
|
||||
- component: {fileID: 1558803275}
|
||||
- component: {fileID: 1558803274}
|
||||
- component: {fileID: 1558803273}
|
||||
- component: {fileID: 1558803272}
|
||||
m_Layer: 0
|
||||
|
|
@ -2027,13 +2035,6 @@ AudioListener:
|
|||
m_GameObject: {fileID: 1558803271}
|
||||
m_Enabled: 1
|
||||
--- !u!124 &1558803273
|
||||
Behaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1558803271}
|
||||
m_Enabled: 1
|
||||
--- !u!92 &1558803274
|
||||
Behaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_PrefabParentObject: {fileID: 0}
|
||||
|
|
@ -2075,7 +2076,6 @@ Camera:
|
|||
m_OcclusionCulling: 1
|
||||
m_StereoConvergence: 10
|
||||
m_StereoSeparation: 0.022
|
||||
m_StereoMirrorMode: 0
|
||||
--- !u!4 &1558803276
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2257,7 +2257,7 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 1625078205}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6f7b10baa6c50634a979160a8c4f142c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: a9ab7a977fd7a3243b4b43f7b09a8c5a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
LineRenderer: {fileID: 1025621201}
|
||||
|
|
@ -2836,10 +2836,10 @@ MonoBehaviour:
|
|||
m_Resolution: 0
|
||||
m_useNativeSize: 0
|
||||
m_points:
|
||||
- {x: -300, y: -37.5}
|
||||
- {x: -227, y: -178.5}
|
||||
- {x: -88, y: -65.5}
|
||||
- {x: 32, y: -158.5}
|
||||
- {x: -260, y: -92.5}
|
||||
- {x: -187, y: -233.5}
|
||||
- {x: -48, y: -120.5}
|
||||
- {x: 72, y: -213.5}
|
||||
lineThickness: 7.41
|
||||
relativeSize: 0
|
||||
lineList: 0
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
fileFormatVersion: 2
|
||||
guid: b01f9e610467c714c9077cf2622eb7b2
|
||||
guid: 80f8b545237dcbc4887d579ad520c2cc
|
||||
timeCreated: 1464634788
|
||||
licenseType: Pro
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
|
|||
|
|
@ -76,9 +76,9 @@ namespace UnityEngine.UI.Extensions
|
|||
set { _id = value; }
|
||||
}
|
||||
|
||||
public Action OnSelect; //action to be called when this item is selected
|
||||
public Action OnSelect = null; //action to be called when this item is selected
|
||||
|
||||
internal Action OnUpdate; //action to be called when something changes.
|
||||
internal Action OnUpdate = null; //action to be called when something changes.
|
||||
|
||||
/// <summary>
|
||||
/// Constructor for Drop Down List panelItems
|
||||
|
|
|
|||
|
|
@ -99,9 +99,6 @@ namespace UnityEngine.UI.Extensions {
|
|||
|
||||
private Button button;
|
||||
|
||||
//Commented out as private and not used.. Yet?
|
||||
private bool selected = false;
|
||||
|
||||
private List<Vector2> positions = new List<Vector2>();
|
||||
|
||||
/**
|
||||
|
|
@ -399,8 +396,6 @@ namespace UnityEngine.UI.Extensions {
|
|||
}
|
||||
|
||||
public void OnPointerEnter(PointerEventData eventData) {
|
||||
//do your stuff when highlighted
|
||||
selected = true;
|
||||
|
||||
if (m_ImagesPool.Count >= 1) {
|
||||
foreach (Image img in m_ImagesPool) {
|
||||
|
|
@ -412,8 +407,6 @@ namespace UnityEngine.UI.Extensions {
|
|||
}
|
||||
|
||||
public void OnPointerExit(PointerEventData eventData) {
|
||||
//do your stuff when highlighted
|
||||
selected = false;
|
||||
|
||||
if (m_ImagesPool.Count >= 1) {
|
||||
foreach (Image img in m_ImagesPool) {
|
||||
|
|
@ -428,8 +421,6 @@ namespace UnityEngine.UI.Extensions {
|
|||
}
|
||||
|
||||
public void OnSelect(BaseEventData eventData) {
|
||||
//do your stuff when selected
|
||||
selected = true;
|
||||
|
||||
if (m_ImagesPool.Count >= 1) {
|
||||
foreach (Image img in m_ImagesPool) {
|
||||
|
|
@ -441,8 +432,6 @@ namespace UnityEngine.UI.Extensions {
|
|||
}
|
||||
|
||||
public void OnDeselect(BaseEventData eventData) {
|
||||
//do your stuff when selected
|
||||
selected = false;
|
||||
|
||||
if (m_ImagesPool.Count >= 1) {
|
||||
foreach (Image img in m_ImagesPool) {
|
||||
|
|
|
|||
|
|
@ -9,27 +9,21 @@ namespace UnityEngine.UI.Extensions
|
|||
public class CylinderText : BaseMeshEffect
|
||||
{
|
||||
public float radius;
|
||||
private RectTransform rectTrans;
|
||||
|
||||
|
||||
#if UNITY_EDITOR
|
||||
protected override void OnValidate()
|
||||
{
|
||||
base.OnValidate();
|
||||
if (rectTrans == null)
|
||||
rectTrans = GetComponent<RectTransform>();
|
||||
}
|
||||
#endif
|
||||
protected override void Awake()
|
||||
{
|
||||
base.Awake();
|
||||
rectTrans = GetComponent<RectTransform>();
|
||||
OnRectTransformDimensionsChange();
|
||||
}
|
||||
protected override void OnEnable()
|
||||
{
|
||||
base.OnEnable();
|
||||
rectTrans = GetComponent<RectTransform>();
|
||||
OnRectTransformDimensionsChange();
|
||||
}
|
||||
public override void ModifyMesh(VertexHelper vh)
|
||||
|
|
|
|||
|
|
@ -104,7 +104,6 @@ namespace UnityEngine.UI.Extensions
|
|||
private float totalScrollableWidth;
|
||||
private DrivenRectTransformTracker tracker;
|
||||
private bool lerp;
|
||||
private bool pointerDown;
|
||||
private float mLerpTime;
|
||||
private int _closestItem;
|
||||
private bool lerpToContentRunning;
|
||||
|
|
@ -469,12 +468,10 @@ namespace UnityEngine.UI.Extensions
|
|||
{
|
||||
startMovementEvent.Invoke();
|
||||
}
|
||||
pointerDown = true;
|
||||
}
|
||||
|
||||
public void OnEndDrag(PointerEventData ped)
|
||||
{
|
||||
pointerDown = false;
|
||||
StartCoroutine("SlideAndLerp");
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@ namespace UnityEngine.UI.Extensions
|
|||
public class FancyScrollView<TData, TContext> : MonoBehaviour where TContext : class
|
||||
{
|
||||
[SerializeField, Range(float.Epsilon, 1f)]
|
||||
float cellInterval;
|
||||
float cellInterval = 0;
|
||||
[SerializeField, Range(0f, 1f)]
|
||||
float cellOffset;
|
||||
float cellOffset = 0;
|
||||
[SerializeField]
|
||||
bool loop;
|
||||
bool loop = false;
|
||||
[SerializeField]
|
||||
GameObject cellBase;
|
||||
GameObject cellBase = null;
|
||||
|
||||
float currentPosition;
|
||||
readonly List<FancyScrollViewCell<TData, TContext>> cells =
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ namespace UnityEngine.UI.Extensions
|
|||
}
|
||||
|
||||
[SerializeField]
|
||||
RectTransform viewport;
|
||||
RectTransform viewport = null;
|
||||
[SerializeField]
|
||||
ScrollDirection directionOfRecognize = ScrollDirection.Vertical;
|
||||
[SerializeField]
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ namespace UnityEngine.UI.Extensions
|
|||
private List<Toggle> m_PaginationChildren;
|
||||
|
||||
[SerializeField]
|
||||
private ScrollSnapBase scrollSnap;
|
||||
private ScrollSnapBase scrollSnap = null;
|
||||
|
||||
private bool isAClick;
|
||||
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ namespace UnityEngine.UI.Extensions
|
|||
public bool clamp = true;
|
||||
|
||||
[SerializeField]
|
||||
ScrollRect controllingScrollRect;
|
||||
ScrollRect scrollRect;
|
||||
ScrollRect controllingScrollRect = null;
|
||||
ScrollRect scrollRect = null;
|
||||
|
||||
void Awake()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ namespace UnityEngine.UI.Extensions
|
|||
//*** ATTRIBUTES ***//
|
||||
[Header("[ Settings ]")]
|
||||
[SerializeField]
|
||||
private ScrollType scrollDirection;
|
||||
private ScrollType scrollDirection = ScrollType.BOTH;
|
||||
[SerializeField]
|
||||
private float scrollSpeed = 10f;
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ namespace UnityEngine.UI.Extensions
|
|||
public float scrollSpeed = 10f;
|
||||
|
||||
[SerializeField]
|
||||
private RectTransform layoutListGroup;
|
||||
private RectTransform layoutListGroup = null;
|
||||
|
||||
// temporary variables
|
||||
private RectTransform targetScrollObject;
|
||||
|
|
|
|||
Loading…
Reference in New Issue