头像特效添加

dev_chengFeng
gaoxin 2020-09-25 21:19:01 +08:00 committed by JieLing
parent 7503616dac
commit b3d15c1945
91 changed files with 58612 additions and 146 deletions

View File

@ -0,0 +1,27 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: H_0974
m_Shader: {fileID: 10720, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: b6b0172b1c8836c4daedb255f20851b4, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats: []
m_Colors: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a09d6beefdb490d4c86a3314a3fd716d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,37 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI_Effect_TouXiang_Lanlong_mat
m_Shader: {fileID: 4800000, guid: 508f1ff17d221c748927a8db3bc7ee3f, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _Lin:
m_Texture: {fileID: 2800000, guid: 1556ba40063954e4a9376d89eb48a29e, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: c19d55a22a03e2d489c4131481d48d6e, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _InvFade: 1
- _Num: 0.3
- _Speed: 0.4
- _Stencil: 0
m_Colors:
- _MainColor: {r: 1, g: 1, b: 1, a: 0}
- _TintColor: {r: 1, g: 1, b: 1, a: 0.83137256}

View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 7b97e05845d81ce45814918bf7b16863
timeCreated: 1528724438
licenseType: Pro
NativeFormatImporter:
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,37 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI_Effect_TouXiang_QingLong_mat
m_Shader: {fileID: 4800000, guid: 508f1ff17d221c748927a8db3bc7ee3f, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _Lin:
m_Texture: {fileID: 2800000, guid: 1556ba40063954e4a9376d89eb48a29e, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 4442183a16a278342b24081e0a3c972e, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _InvFade: 1
- _Num: 0.3
- _Speed: 0.4
- _Stencil: 0
m_Colors:
- _MainColor: {r: 1, g: 1, b: 1, a: 0}
- _TintColor: {r: 1, g: 1, b: 1, a: 0.83137256}

View File

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 391642c43959522459ed411fe8854052
timeCreated: 1528724438
licenseType: Pro
NativeFormatImporter:
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: dajin_effect_09
m_Shader: {fileID: 4800000, guid: 3a92c06211adfa942b6870142815465b, type: 3}
m_Shader: {fileID: 4800000, guid: 492429f7579297341bd1ff6e4ff530d7, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
@ -48,11 +48,11 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: b6b0172b1c8836c4daedb255f20851b4, type: 3}
m_Texture: {fileID: 2800000, guid: 26704c9072d5b4c419119268d9ba7bbf, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Offset: {x: -0.15, y: 0}
- _Mask:
m_Texture: {fileID: 2800000, guid: 039df855f75d2c44482a33d33178d7f0, type: 3}
m_Texture: {fileID: 2800000, guid: 4ff74dbaba3901745abc67660b7d080a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MaskTex:
@ -72,8 +72,8 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Tex:
m_Texture: {fileID: 2800000, guid: de31f256b46f46d4d9a8d1688aff0fe2, type: 3}
m_Scale: {x: 1, y: 1}
m_Texture: {fileID: 2800000, guid: ca7408efa077f0b40a52df576684b02f, type: 3}
m_Scale: {x: 1, y: 0.5}
m_Offset: {x: 0, y: 0}
m_Floats:
- _Amount: 0.28
@ -106,14 +106,14 @@ Material:
- _StartAmount: 0.1
- _Thickness: 0
- _Tile: 1
- _U: -0.8
- _U: 0.1
- _UVSec: 0
- _V: 0
- _V: -0.5
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorAnimate: {r: 0.15, g: 0.15, b: 1, a: 1}
- _Color_wai: {r: 1, g: 0.68807596, b: 0.4292453, a: 1}
- _Color_wai: {r: 0.2509804, g: 0.2509804, b: 0.2509804, a: 0.6509804}
- _DissColor: {r: 1, g: 1, b: 1, a: 1}
- _EdgeColor: {r: 1, g: 0.8, b: 0.3, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
@ -121,4 +121,4 @@ Material:
- _Scrolls: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
- _Tiling: {r: 2, g: 2, b: 2, a: 1}
- _TintColor: {r: 0.3490566, g: 0.2682302, b: 0.14324494, a: 1}
- _TintColor: {r: 1, g: 1, b: 1, a: 1}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e44920242d1b2d6448b68b694892ca88
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,124 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: dajin_effect_12_lanlong
m_Shader: {fileID: 4800000, guid: 492429f7579297341bd1ff6e4ff530d7, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DissolveSrc:
m_Texture: {fileID: 2800000, guid: a522db3de7bf79b4687234f73dc2031a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DissolveTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 26704c9072d5b4c419119268d9ba7bbf, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: -0.15, y: 0}
- _Mask:
m_Texture: {fileID: 2800000, guid: 4ff74dbaba3901745abc67660b7d080a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MaskTex:
m_Texture: {fileID: 2800000, guid: 98fd140f121f18049925473d22f6122d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Tex:
m_Texture: {fileID: 2800000, guid: ca7408efa077f0b40a52df576684b02f, type: 3}
m_Scale: {x: 1, y: 0.5}
m_Offset: {x: 0, y: 0}
m_Floats:
- _Amount: 0.28
- _BlendMode: 0
- _BlendOp: -1
- _BumpScale: 1
- _CullMode: 0
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _Dissolve: 0
- _DissolveEdge: 0
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Illuminate: 0
- _InvFade: 0.01
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _PZWrite: 0
- _Parallax: 0.02
- _QueueOffset: 0
- _RenderMode: 0
- _ReplaySpeed: 4
- _Shininess: 0.03
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _StartAmount: 0.1
- _Thickness: 0
- _Tile: 1
- _U: 0.1
- _UVSec: 0
- _V: -0.5
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorAnimate: {r: 0.15, g: 0.15, b: 1, a: 1}
- _Color_wai: {r: 0.95033437, g: 1.4321533, b: 2.166354, a: 0.6509804}
- _DissColor: {r: 1, g: 1, b: 1, a: 1}
- _EdgeColor: {r: 1, g: 0.8, b: 0.3, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _NumTexTiles: {r: 4, g: 4, b: 0, a: 0}
- _Scrolls: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
- _Tiling: {r: 2, g: 2, b: 2, a: 1}
- _TintColor: {r: 1, g: 1, b: 1, a: 1}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 9ff74c9d8a6682443b7cbb99f667b61e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,124 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: dajin_effect_14_qinglong
m_Shader: {fileID: 4800000, guid: 492429f7579297341bd1ff6e4ff530d7, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DissolveSrc:
m_Texture: {fileID: 2800000, guid: a522db3de7bf79b4687234f73dc2031a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DissolveTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 26704c9072d5b4c419119268d9ba7bbf, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: -0.15, y: 0}
- _Mask:
m_Texture: {fileID: 2800000, guid: 4ff74dbaba3901745abc67660b7d080a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MaskTex:
m_Texture: {fileID: 2800000, guid: 98fd140f121f18049925473d22f6122d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Tex:
m_Texture: {fileID: 2800000, guid: ca7408efa077f0b40a52df576684b02f, type: 3}
m_Scale: {x: 1, y: 0.5}
m_Offset: {x: 0, y: 0}
m_Floats:
- _Amount: 0.28
- _BlendMode: 0
- _BlendOp: -1
- _BumpScale: 1
- _CullMode: 0
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _Dissolve: 0
- _DissolveEdge: 0
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Illuminate: 0
- _InvFade: 0.01
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _PZWrite: 0
- _Parallax: 0.02
- _QueueOffset: 0
- _RenderMode: 0
- _ReplaySpeed: 4
- _Shininess: 0.03
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _StartAmount: 0.1
- _Thickness: 0
- _Tile: 1
- _U: 0.1
- _UVSec: 0
- _V: -0.5
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorAnimate: {r: 0.15, g: 0.15, b: 1, a: 1}
- _Color_wai: {r: 0.3243827, g: 0.6549441, b: 0.38024977, a: 0.6509804}
- _DissColor: {r: 1, g: 1, b: 1, a: 1}
- _EdgeColor: {r: 1, g: 0.8, b: 0.3, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _NumTexTiles: {r: 4, g: 4, b: 0, a: 0}
- _Scrolls: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
- _Tiling: {r: 2, g: 2, b: 2, a: 1}
- _TintColor: {r: 1, g: 1, b: 1, a: 1}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7b5d1e2be4d64894690c993c3a5e55c1
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 89eee8b98ba259f4a9f9e5d5db3eeedc
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
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: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 4442183a16a278342b24081e0a3c972e
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
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: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: c19d55a22a03e2d489c4131481d48d6e
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
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: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 90830ec8de7a2c34fac83e267e942e15
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 688d73f0f51b45c4b8cd92d3472f929b
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: c82fbf44fac0ddb41affddbd8f2cdb31
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 63979443f9697b042a09f545a3dbcbb4
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,88 @@
fileFormatVersion: 2
guid: 2ec2f388a6870174ebe121c16870f8e1
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 9
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 4bcab7c6832c78a4bbdc4f6efd5f8cff
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0969af7b4fd0798449660f3b05740455
guid: 4a3e94a311eb106439e524b8345412af
folderAsset: yes
DefaultImporter:
externalObjects: {}

View File

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

View File

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

View File

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

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 6dd56c4439cc9054cb9cc0a2552e2309
guid: 85a819419113b0b46b9cdce8ab360891
folderAsset: yes
DefaultImporter:
externalObjects: {}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6dd56c4439cc9054cb9cc0a2552e2309
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName: lz4/prefabs/ui/dynamicactivity
assetBundleVariant: unity3d

View File

@ -31053,8 +31053,8 @@ ParticleSystemRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 1e0087545f0b9914d8b79da0d0c6c5dc, type: 2}
- {fileID: 2100000, guid: 1e0087545f0b9914d8b79da0d0c6c5dc, type: 2}
- {fileID: 2100000, guid: 8454a91adf70fec49b351148c8cda45d, type: 2}
- {fileID: 2100000, guid: 8454a91adf70fec49b351148c8cda45d, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0

View File

@ -34336,8 +34336,8 @@ ParticleSystemRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 1e0087545f0b9914d8b79da0d0c6c5dc, type: 2}
- {fileID: 2100000, guid: 1e0087545f0b9914d8b79da0d0c6c5dc, type: 2}
- {fileID: 2100000, guid: 8454a91adf70fec49b351148c8cda45d, type: 2}
- {fileID: 2100000, guid: 8454a91adf70fec49b351148c8cda45d, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0

View File

@ -24,13 +24,13 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: b096e152a3501ad4bb7014558cb7e024, type: 3}
m_Texture: {fileID: 2800000, guid: 89eee8b98ba259f4a9f9e5d5db3eeedc, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _InvFade: 1
- _Num: 0.3
- _Speed: 0.5
- _Speed: 0.4
m_Colors:
- _MainColor: {r: 1, g: 1, b: 1, a: 0}
- _TintColor: {r: 0.9811321, g: 0.7144226, b: 0.47668213, a: 0.5882353}
- _TintColor: {r: 1, g: 1, b: 1, a: 0.5882353}

View File

@ -0,0 +1,37 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UI_effect_YLMJ_SLC_KaPai_baise3
m_Shader: {fileID: 4800000, guid: 508f1ff17d221c748927a8db3bc7ee3f, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _Lin:
m_Texture: {fileID: 2800000, guid: 1556ba40063954e4a9376d89eb48a29e, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: b096e152a3501ad4bb7014558cb7e024, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _InvFade: 1
- _Num: 0.3
- _Speed: 0.4
- _Stencil: 0
m_Colors:
- _MainColor: {r: 1, g: 1, b: 1, a: 0}
- _TintColor: {r: 1, g: 1, b: 1, a: 0.5882353}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 8454a91adf70fec49b351148c8cda45d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,124 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: dajin_effect_09_mat
m_Shader: {fileID: 4800000, guid: 3a92c06211adfa942b6870142815465b, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DissolveSrc:
m_Texture: {fileID: 2800000, guid: a522db3de7bf79b4687234f73dc2031a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DissolveTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: b6b0172b1c8836c4daedb255f20851b4, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Mask:
m_Texture: {fileID: 2800000, guid: 039df855f75d2c44482a33d33178d7f0, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MaskTex:
m_Texture: {fileID: 2800000, guid: 98fd140f121f18049925473d22f6122d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Tex:
m_Texture: {fileID: 2800000, guid: de31f256b46f46d4d9a8d1688aff0fe2, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _Amount: 0.28
- _BlendMode: 0
- _BlendOp: -1
- _BumpScale: 1
- _CullMode: 0
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _Dissolve: 0
- _DissolveEdge: 0
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Illuminate: 0
- _InvFade: 0.01
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _PZWrite: 0
- _Parallax: 0.02
- _QueueOffset: 0
- _RenderMode: 0
- _ReplaySpeed: 4
- _Shininess: 0.03
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _StartAmount: 0.1
- _Thickness: 0
- _Tile: 1
- _U: -0.8
- _UVSec: 0
- _V: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorAnimate: {r: 0.15, g: 0.15, b: 1, a: 1}
- _Color_wai: {r: 1, g: 0.68807596, b: 0.4292453, a: 1}
- _DissColor: {r: 1, g: 1, b: 1, a: 1}
- _EdgeColor: {r: 1, g: 0.8, b: 0.3, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _NumTexTiles: {r: 4, g: 4, b: 0, a: 0}
- _Scrolls: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
- _Tiling: {r: 2, g: 2, b: 2, a: 1}
- _TintColor: {r: 0.3490566, g: 0.2682302, b: 0.14324494, a: 1}

View File

@ -13,6 +13,7 @@ Shader "ysj/FangdaAdd" {
_MainTex ("MainTex", 2D) = "white" {}
_Num ("Num", Float ) = 3
_Speed ("Speed", Float ) = 1
_Stencil("Stencil ID", Float) = 0
}
SubShader {
Tags {
@ -20,6 +21,11 @@ Shader "ysj/FangdaAdd" {
"Queue"="Transparent"
"RenderType"="Transparent"
}
/*Stencil {
Ref[_Stencil]
Comp equal
Pass keep
}*/
Pass {
Name "FORWARD"
Tags {

View File

@ -21,15 +21,14 @@ Category {
Cull Off Lighting Off ZWrite Off
Fog { Mode Off}
Stencil {
Ref[_Stencil]
Comp equal
Pass keep
}
SubShader {
Pass {
Stencil {
Ref [_Stencil]
Comp equal
Pass keep
}
CGPROGRAM
#pragma vertex vert
#pragma fragment frag

View File

@ -84,23 +84,12 @@ TextureImporter:
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: 65
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 1
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2

View File

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 64 KiB

View File

@ -1339,11 +1339,23 @@ end
--- 获取玩家头像框资源
function GetPlayerHeadFrameSprite(frameId)
if frameId == 0 then frameId = 80000 end
if frameId == 0 or frameId == 80000 then frameId = 80004 end
local frame = ConfigManager.GetConfigData(ConfigName.ItemConfig, frameId)
return Util.LoadSprite(GetResourcePath(frame.ResourceID))
end
--- 获取玩家头像框资源
function GetPlayerHeadFrameEffect(frameId)
if frameId == 80004 or frameId == 0 or frameId == 80000 then
return "UI_Effect_TouXiang_Lanlong", 1.1, Vector3.New(-8, -5, 0)
elseif frameId == 80005 then
return "UI_Effect_TouXiang_QingLong", 1.15, Vector3.New(-9, 5, 0)
elseif frameId == 80006 then
return "UI_Effect_TouXiang_BaiHu", 1.15, Vector3.New(-3, -8, 0)
end
end
--是否弹出快捷购买面板
function PopQuickPurchasePanel(type, needNum)
local ownNumber = BagManager.GetItemCountById(type)

View File

@ -171,7 +171,7 @@ function this.OpenView(index)
end
if logic.OnOpen then
logic:OnOpen()
logic:OnOpen(this.sortingOrder)
end
logic.gameObject:SetActive(true)

View File

@ -85,6 +85,8 @@ function this.RankNodeAdapter(node, data)
_PlayerHeadList[node]:SetScale(Vector3.one * 0.8)
_PlayerHeadList[node]:SetHead(data.attackInfo.head)
_PlayerHeadList[node]:SetFrame(data.attackInfo.headFrame)
_PlayerHeadList[node]:SetLayer(this.sortingOrder)
_PlayerHeadList[node]:SetEffectScale(0.85)
local isWin = data.fightResult == 1
local resultStr = isWin and Language[10091] or Language[10092]

View File

@ -103,6 +103,7 @@ function ArenaView:BindEvent()
end)
-- 刷新按钮
Util.AddClick(this.RefreshBtn, function()
PlaySoundWithoutClick("UI_refresh")
if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ARENA) then
PopupTipPanel.ShowTip(Language[10082])
return
@ -149,7 +150,10 @@ function ArenaView:RemoveListener()
end
--界面打开时调用(用于子类重写)
function ArenaView:OnOpen(...)
function ArenaView:OnOpen( sortingOrder )
this.sortingOrder = sortingOrder or 0
this.RefreshBaseData()
this.RefreshEnemyData()
@ -262,11 +266,14 @@ end
-- 刷新敌人列表
function this.RefreshEnemyData()
local prefab = {}
local leftTimes = ArenaManager.GetArenaChallengeTimes()
local EnemyList = ArenaManager.GetEnemyList()
table.sort(EnemyList, function(a,b) return a.personInfo.score > b.personInfo.score end)
for i, node in ipairs(this.Enemys) do
if EnemyList[i] then
node:SetActive(true)
node:SetActive(false)
if EnemyList[i] then
table.insert(prefab,node)
local lv_name = Util.GetGameObject(node, "name")
local integral = Util.GetGameObject(node, "integral")
local power = Util.GetGameObject(node, "power")
@ -302,14 +309,15 @@ function this.RefreshEnemyData()
this.HeadList[i]:SetFrame(EnemyList[i].personInfo.headFrame)
this.HeadList[i]:SetLevel(EnemyList[i].personInfo.level)
this.HeadList[i]:SetScale(Vector3.one*0.8)
this.HeadList[i]:SetLayer(this.sortingOrder)
this.HeadList[i]:SetEffectScale(0.85)
Util.AddOnceClick(bg, function()
UIManager.OpenPanel(UIName.PlayerInfoPopup, EnemyList[i].personInfo.uid, PLAYER_INFO_VIEW_TYPE.ARENA)
end)
else
node:SetActive(false)
end
end)
end
end
SecTorPlayAnim(prefab)
end
--显示上边积分奖励
@ -362,6 +370,12 @@ end
local orginLayer = 0
function ArenaView:OnSortingOrderChange(sort)
Util.AddParticleSortLayer(this.effect, sort - orginLayer)
--
for i, node in ipairs(this.Enemys) do
if this.HeadList and this.HeadList[i] then
this.HeadList[i]:SetLayer(sort)
end
end
orginLayer = sort
end

View File

@ -133,6 +133,7 @@ function this.RankNodeAdapter(node, data,myRank)
_PlayerHeadList[node]:SetHead(data.personInfo.head)
_PlayerHeadList[node]:SetFrame(data.personInfo.headFrame)
_PlayerHeadList[node]:SetLayer(this.sortingOrder)
lv_name:GetComponent("Text").text = "lv"..data.personInfo.level.." "..data.personInfo.name
integral:GetComponent("Text").text = data.personInfo.score
power:GetComponent("Text").text = Language[10090]..data.personInfo.totalForce

View File

@ -141,6 +141,8 @@ function this.RefreshData(go, itemData)
_PlayerHeadList[go][i]:SetScale(Vector3.one * 0.7)
_PlayerHeadList[go][i]:SetHead(personInfo[i].head)
_PlayerHeadList[go][i]:SetFrame(personInfo[i].headFrame)
_PlayerHeadList[go][i]:SetLayer(this.sortingOrder)
_PlayerHeadList[go][i]:SetEffectScale(0.8)
end
-- 给回放按钮添加事件

View File

@ -90,6 +90,8 @@ function this.RefreshData(go, data)
_PlayerHeadList[go]:SetScale(Vector3.one * 0.7)
_PlayerHeadList[go]:SetHead(personInfo.head)
_PlayerHeadList[go]:SetFrame(personInfo.headFrame)
_PlayerHeadList[go]:SetLayer(this.sortingOrder)
_PlayerHeadList[go]:SetEffectScale(0.8)
end

View File

@ -137,6 +137,8 @@ function this.SetHead(head, data)
headList[head]:SetHead(data.head)
headList[head]:SetFrame(data.headFrame)
headList[head]:SetLevel(data.level)
headList[head]:SetLayer(this.sortingOrder)
headList[head]:SetEffectScale(0.8)
end
--设置胜负图片

View File

@ -106,6 +106,8 @@ function this.RefreshData(go, itemData)
_PlayerHeadList[go]:SetScale(Vector3.one * 0.65)
_PlayerHeadList[go]:SetHead(personInfo.head)
_PlayerHeadList[go]:SetFrame(personInfo.headFrame)
_PlayerHeadList[go]:SetLayer(this.sortingOrder)
_PlayerHeadList[go]:SetEffectScale(0.75)
local config = FIGHT_RESULT_CONFIG[myFightResult]
result.text = config.name

View File

@ -78,6 +78,7 @@ function this.SetHead(curPre,data,isShowWinImage)
this.playerHead[curPre]:SetHead(data.head)
this.playerHead[curPre]:SetFrame(data.headFrame)
this.playerHead[curPre]:SetLevel(data.level)
this.playerHead[curPre]:SetLayer(this.sortingOrder)
name.text=data.name
Util.AddOnceClick(head,function()
UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid)

View File

@ -162,6 +162,8 @@ function this.SetHead(head, data)
headList[head]:SetHead(data.head)
headList[head]:SetFrame(data.headFrame)
headList[head]:SetLevel(data.level)
headList[head]:SetLayer(this.sortingOrder)
headList[head]:SetEffectScale(0.8)
end
--设置胜负图片

View File

@ -221,6 +221,7 @@ function this.SetItemData(...)
this.playerHead[root]:SetHead(args[2].head)
this.playerHead[root]:SetFrame(args[2].headFrame)
this.playerHead[root]:SetLevel(args[2].level)
this.playerHead[root]:SetLayer(this.sortingOrder)
info.enabled=false
name.text=args[2].name
Util.AddOnceClick(head,function()

View File

@ -549,7 +549,9 @@ function this.SetPlayerHead()
this.playerHead:SetHead(PlayerManager.head)
this.playerHead:SetFrame(PlayerManager.frame)
this.playerHead:SetScale(Vector3.one * 0.9)
this.playerHead:SetPosition(Vector3.New(-5, 0, 0))
this.playerHead:SetPosition(Vector3.New(-5, 8, 0))
this.playerHead:SetLayer(this.sortingOrder)
this.playerHead:SetEffectScale(0.85)
end
local orginLayer
@ -564,6 +566,10 @@ function BagPanel:OnSortingOrderChange()
orginLayer = this.sortingOrder
this.EffectOrginLayer = self.sortingOrder
this.BtView:SetOrderStatus({ sortOrder = self.sortingOrder })
-- 头像层级
if this.playerHead then
this.playerHead:SetLayer(self.sortingOrder)
end
end
--界面关闭时调用(用于子类重写)
function BagPanel:OnClose()

View File

@ -254,6 +254,8 @@ function this.RefreshMonsterRankInfo(item, data,myRank)
_PlayerHeadList[item]:SetFrame(data.headFrame)
_PlayerHeadList[item]:SetLevel(data.level)
_PlayerHeadList[item]:SetScale(Vector3.one*0.7)
_PlayerHeadList[item]:SetLayer(this.sortingOrder)
_PlayerHeadList[item]:SetEffectScale(0.75)
numImg.sprite = Util.LoadSprite(resPath)
numText.text = roleRank
@ -342,6 +344,8 @@ function this.RefreshRankData(item, info,userRank)
_PlayerHeadList[item]:SetFrame(info.headFrame)
_PlayerHeadList[item]:SetLevel(info.level)
_PlayerHeadList[item]:SetScale(Vector3.one*0.7)
_PlayerHeadList[item]:SetLayer(this.sortingOrder)
_PlayerHeadList[item]:SetEffectScale(0.75)
numImg.sprite = Util.LoadSprite(resPath)
numText.text = roleRank

View File

@ -201,7 +201,9 @@ function this.SetPlayerHead()
this.playerHead:SetHead(PlayerManager.head)
this.playerHead:SetFrame(PlayerManager.frame)
this.playerHead:SetScale(Vector3.one * 0.9)
this.playerHead:SetPosition(Vector3.New(-5, 0, 0))
this.playerHead:SetPosition(Vector3.New(-5, 8, 0))
this.playerHead:SetLayer(this.sortingOrder)
this.playerHead:SetEffectScale(0.85)
end
@ -228,6 +230,10 @@ function this:OnSortingOrderChange()
Util.AddParticleSortLayer(this.vipPrivilegeBtn, self.sortingOrder - orginLayer)
orginLayer = self.sortingOrder
-- 头像层级
if this.playerHead then
this.playerHead:SetLayer(self.sortingOrder)
end
end

View File

@ -442,7 +442,9 @@ function this.SetPlayerHead()
this.playerHead:SetHead(PlayerManager.head)
this.playerHead:SetFrame(PlayerManager.frame)
this.playerHead:SetScale(Vector3.one * 0.9)
this.playerHead:SetPosition(Vector3.New(-5, 0, 0))
this.playerHead:SetPosition(Vector3.New(-5, 8, 0))
this.playerHead:SetLayer(this.sortingOrder)
this.playerHead:SetEffectScale(0.85)
end
function this:OnSortingOrderChange()
@ -458,6 +460,10 @@ function this:OnSortingOrderChange()
this.BtView.gameObject:SetActive(false)
else
end
-- 头像层级
if this.playerHead then
this.playerHead:SetLayer(self.sortingOrder)
end
end
function CarbonTypePanelV2:PlayAni()

View File

@ -98,7 +98,9 @@ function this.SetPlayerHead()
this.playerHead:SetHead(PlayerManager.head)
this.playerHead:SetFrame(PlayerManager.frame)
this.playerHead:SetScale(Vector3.one * 0.9)
this.playerHead:SetPosition(Vector3.New(-5, 0, 0))
this.playerHead:SetPosition(Vector3.New(-5, 8, 0))
this.playerHead:SetLayer(this.sortingOrder)
this.playerHead:SetEffectScale(0.85)
end
@ -108,6 +110,10 @@ function this:OnSortingOrderChange()
Util.AddParticleSortLayer(this.vipPrivilegeBtn, self.sortingOrder - orginLayer)
orginLayer = self.sortingOrder
-- 头像层级
if this.playerHead then
this.playerHead:SetLayer(self.sortingOrder)
end
end
function this.PlayScaleAnim()

View File

@ -7,6 +7,10 @@ function PlayerHead:OnCreate()
self.frame = Util.GetGameObject(self.gameObject, "frame")
self.lvRoot = Util.GetGameObject(self.gameObject, "lvRoot")
self.lv = Util.GetGameObject(self.gameObject, "lvRoot/lv")
self.orderLayer = 0
self.effectScale = 1
self.effectScaleFix = 1
end
-- 对象使用时回调(会重复调用)
function PlayerHead:OnUse()
@ -29,6 +33,51 @@ end
function PlayerHead:SetFrame(frameId)
self.frame:SetActive(true)
self.frame:GetComponent("Image").sprite = GetPlayerHeadFrameSprite(frameId)
-- 检测特效
self:UnLoadFrameEffect()
self:LoadFrameEffect(frameId)
end
function PlayerHead:SetEffectScale(scale)
if self.frameEffect then
local targetScale = scale/self.effectScale
self.effectScale = scale
LogPink(targetScale)
Util.SetParticleScale(self.frameEffect, targetScale)
end
end
-- 头像框特效相关
function PlayerHead:LoadFrameEffect(frameId)
local name, scale, pos = GetPlayerHeadFrameEffect(frameId)
if name then
self.frameEffectName = name
self.frameEffect = poolManager:LoadAsset(self.frameEffectName, PoolManager.AssetType.GameObject)
self.frameEffect.transform:SetParent(self.frame.transform)
self.frameEffect.transform.localPosition = pos
self.frameEffect.transform.localScale = Vector3.one
self.effectScaleFix = scale
Util.SetParticleScale(self.frameEffect, scale) -- 还原修正大小
end
end
function PlayerHead:UnLoadFrameEffect()
if self.frameEffectName and self.frameEffect then
-- 重置层级
self:SetLayer(0)
self:SetEffectScale(1)
Util.SetParticleScale(self.frameEffect, 1/self.effectScaleFix) -- 还原修正大小
poolManager:UnLoadAsset(self.frameEffectName, self.frameEffect, PoolManager.AssetType.GameObject)
self.frameEffectName = nil
self.frameEffect = nil
end
end
function PlayerHead:SetLayer(orderLayer)
if self.frameEffect then
Util.AddParticleSortLayer(self.frameEffect, orderLayer - self.orderLayer)
self.orderLayer = orderLayer
end
end
-- 设置等级
@ -40,13 +89,19 @@ end
-- 设置等级
function PlayerHead:SetGray(isGray)
Util.SetGray(self.gameObject, isGray)
if self.frameEffect then
self.frameEffect:SetActive(not isGray)
end
end
--
function PlayerHead:Reset()
Util.SetGray(self.gameObject, false)
self.icon:SetActive(false)
self.frame:SetActive(false)
self.lvRoot:SetActive(false)
-- 卸载头像框特效
self:UnLoadFrameEffect()
end
return PlayerHead

View File

@ -131,6 +131,8 @@ function ExpertRewardSortPanel:OnShowSingleExperSort(activityRewardGo,sortData)
_PlayerHeadList[activityRewardGo]:SetFrame(sortData.headFrame)
_PlayerHeadList[activityRewardGo]:SetScale(Vector3.one * 0.63)
_PlayerHeadList[activityRewardGo]:SetLevel(sortData.level)
_PlayerHeadList[activityRewardGo]:SetLayer(this.sortingOrder)
_PlayerHeadList[activityRewardGo]:SetEffectScale(0.75)
end

View File

@ -503,7 +503,9 @@ function this.InitShow()
this.playerHead:SetHead(PlayerManager.head)
this.playerHead:SetFrame(PlayerManager.frame)
this.playerHead:SetScale(Vector3.one * 0.9)
this.playerHead:SetPosition(Vector3.New(-5, 0, 0))
this.playerHead:SetPosition(Vector3.New(-5, 8, 0))
this.playerHead:SetLayer(this.sortingOrder)
this.playerHead:SetEffectScale(0.85)
end
@ -638,6 +640,10 @@ function FightPointPassMainPanel:OnSortingOrderChange()
orginLayer = self.sortingOrder
this.BtView:SetOrderStatus({ sortOrder = self.sortingOrder })
-- 头像层级
if this.playerHead then
this.playerHead:SetLayer(self.sortingOrder)
end
end
--界面关闭时调用(用于子类重写)

View File

@ -124,6 +124,8 @@ function this.ShowInfo(root,data,rank)
this.playerScrollHead[root]:SetFrame(data.headFrame)
this.playerScrollHead[root]:SetLevel(data.level)
this.playerScrollHead[root]:SetScale(Vector3.one*0.7)
this.playerScrollHead[root]:SetLayer(this.sortingOrder)
this.playerScrollHead[root]:SetEffectScale(0.8)
--设置角色信息
local name=Util.GetGameObject(root,"Name"):GetComponent("Text")
--local level=Util.GetGameObject(root,"Level"):GetComponent("Text")

View File

@ -249,6 +249,8 @@ function this.FindFairyRecordShow(root, data)
this.playerScrollHead[root]:SetFrame(data.headFrame)
this.playerScrollHead[root]:SetLevel(data.level)
this.playerScrollHead[root]:SetScale(Vector3.one * 0.7)
this.playerScrollHead[root]:SetLayer(this.sortingOrder)
this.playerScrollHead[root]:SetEffectScale(0.8)
playerName.text = data.userName
guild.gameObject:SetActive(data.guildName ~= "")
@ -414,6 +416,8 @@ function this.CurScoreRankShow(root, data, myRank)
this.playerScrollHead[root]:SetFrame(data.headFrame)
this.playerScrollHead[root]:SetLevel(data.level)
this.playerScrollHead[root]:SetScale(Vector3.one * 0.7)
this.playerScrollHead[root]:SetLayer(this.sortingOrder)
this.playerScrollHead[root]:SetEffectScale(0.8)
name.text = data.userName
gate.text = data.rankInfo.param1
force.text = data.force

View File

@ -118,6 +118,8 @@ function RankInfoView:RefeshData(item, data)
_PlayerHeadList[item]:SetHead(data.head)
_PlayerHeadList[item]:SetFrame(data.headFrame)
_PlayerHeadList[item]:SetScale(Vector3.one * 0.9)
_PlayerHeadList[item]:SetLayer(this.sortingOrder)
_PlayerHeadList[item]:SetEffectScale(0.85)
end

View File

@ -83,6 +83,8 @@ function this.RankItemAdapter(node, data, index)
_PlayerHeadList[node]:SetHead(data.head)
_PlayerHeadList[node]:SetFrame(data.headFrame)
_PlayerHeadList[node]:SetLevel(data.level)
_PlayerHeadList[node]:SetLayer(this.sortingOrder)
_PlayerHeadList[node]:SetEffectScale(0.75)
-- 查看记录
Util.AddOnceClick(btnRecord, function()

View File

@ -203,7 +203,9 @@ function this.AttackItemAdapter(item, data)
_PlayerHeadList[item]:SetScale(Vector3.one * 0.6)
_PlayerHeadList[item]:SetHead(memData.head)
_PlayerHeadList[item]:SetFrame(memData.frame)
_PlayerHeadList[item]:SetLayer(this.sortingOrder)
_PlayerHeadList[item]:SetGray(data.starCount <= 0)
_PlayerHeadList[item]:SetEffectScale(0.75)
-- 添加点击事件
Util.AddOnceClick(bg, function()

View File

@ -133,6 +133,8 @@ function this.RankItemAdapter(node, data)
_PlayerHeadList[node]:SetScale(Vector3.one * 0.6)
_PlayerHeadList[node]:SetHead(data.head)
_PlayerHeadList[node]:SetFrame(data.headFrame)
_PlayerHeadList[node]:SetLayer(this.sortingOrder)
_PlayerHeadList[node]:SetEffectScale(0.75)
end

View File

@ -177,7 +177,8 @@ function this.RankNodeAdapter(node, data, index)
_PlayerHeadList[index]:SetScale(Vector3.one * 0.6)
_PlayerHeadList[index]:SetHead(memData.head)
_PlayerHeadList[index]:SetFrame(memData.frame)
--_PlayerHeadList[index]:SetLevel(memData.level)
_PlayerHeadList[index]:SetLayer(this.sortingOrder)
_PlayerHeadList[index]:SetEffectScale(0.75)
end

View File

@ -250,6 +250,8 @@ function this.DefendItemAdapter(item, data, index)
_PlayerHeadList[item]:SetScale(Vector3.one * 0.6)
_PlayerHeadList[item]:SetHead(memData.head)
_PlayerHeadList[item]:SetFrame(memData.frame)
_PlayerHeadList[item]:SetLayer(this.sortingOrder)
_PlayerHeadList[item]:SetEffectScale(0.75)
-- 添加点击事件
Util.AddOnceClick(bg, function()

View File

@ -318,6 +318,8 @@ function this.RankItemAdapter(node, data)
_PlayerHeadList[node]:SetScale(Vector3.one * 0.6)
_PlayerHeadList[node]:SetHead(data.head)
_PlayerHeadList[node]:SetFrame(data.headFrame)
_PlayerHeadList[node]:SetLayer(this.sortingOrder)
_PlayerHeadList[node]:SetEffectScale(0.75)
end

View File

@ -262,6 +262,8 @@ function this.RankItemAdapter(node, data)
_PlayerHeadList[node]:SetScale(Vector3.one * 0.6)
_PlayerHeadList[node]:SetHead(data.head)
_PlayerHeadList[node]:SetFrame(data.headFrame)
_PlayerHeadList[node]:SetLayer(this.sortingOrder)
_PlayerHeadList[node]:SetEffectScale(0.75)
end

View File

@ -414,10 +414,11 @@ function this.MemItemAdapter(item, data)
end
_PlayerHeadList[item]:Reset()
_PlayerHeadList[item]:SetScale(Vector3.one * 0.65)
Log(Language[10921]..data.head)
_PlayerHeadList[item]:SetHead(data.head)
_PlayerHeadList[item]:SetFrame(data.frame)
_PlayerHeadList[item]:SetLevel(data.userLevel)
_PlayerHeadList[item]:SetLayer(this.sortingOrder)
_PlayerHeadList[item]:SetEffectScale(0.75)
if data.seconds == 0 then
onlineText:SetActive(true)
@ -479,6 +480,8 @@ function this.VerifyItemAdapter(item, data)
_PlayerHeadList[item]:SetHead(data.head)
_PlayerHeadList[item]:SetFrame(data.frame)
_PlayerHeadList[item]:SetLevel(data.level)
_PlayerHeadList[item]:SetLayer(this.sortingOrder)
_PlayerHeadList[item]:SetEffectScale(0.85)
local pos = MyGuildManager.GetMyPositionInGuild()
local isAdmin = pos == GUILD_GRANT.MASTER or pos == GUILD_GRANT.ADMIN

View File

@ -332,10 +332,17 @@ function this.SetPlayerHead()
this.playerHead:SetHead(PlayerManager.head)
this.playerHead:SetFrame(PlayerManager.frame)
this.playerHead:SetScale(Vector3.one * 0.9)
this.playerHead:SetPosition(Vector3.New(-5, 0, 0))
this.playerHead:SetPosition(Vector3.New(-5, 8, 0))
this.playerHead:SetLayer(this.sortingOrder)
this.playerHead:SetEffectScale(0.85)
end
function this:OnSortingOrderChange()
if this.playerHead then
this.playerHead:SetLayer(self.sortingOrder)
end
end
function this.RefreshStageShow()
-- 关闭按钮显示
this.btnOneKeyDefend:SetActive(false)

View File

@ -195,8 +195,15 @@ function this.RefreshPlayerInfo()
_PlayerHead:SetHead(this._MemData.head)
_PlayerHead:SetFrame(this._MemData.frame)
_PlayerHead:SetLevel(this._MemData.userLevel)
_PlayerHead:SetLayer(this.sortingOrder)
_PlayerHead:SetEffectScale(0.9)
end
function this:OnSortingOrderChange()
if _PlayerHead then
_PlayerHead:SetLayer(self.sortingOrder)
end
end
-- 刷新进攻次数显示
function this.RefreshAttackCount()
this.attackCount.gameObject:SetActive(false)

View File

@ -86,6 +86,7 @@ function this.InitView(redId,id)
this.sendPlayerHead[this.panel]:Reset()
this.sendPlayerHead[this.panel]:SetHead(msg.head)
this.sendPlayerHead[this.panel]:SetFrame(msg.headFrame)
this.sendPlayerHead[this.panel]:SetLayer(this.sortingOrder)
this.playerInfo.text="<color=yellow>"..msg.sendName..Language[11065]
local data=msg.info
@ -134,6 +135,8 @@ function this.SetShow(root,data,index)
this.playerScrollHead[root]:SetHead(data.head)
this.playerScrollHead[root]:SetFrame(data.headFrame)
this.playerScrollHead[root]:SetScale(Vector3.one*0.6)
this.playerScrollHead[root]:SetLayer(this.sortingOrder)
this.playerScrollHead[root]:SetEffectScale(0.7)
--手气最佳
bestImage.enabled=index==1

View File

@ -85,6 +85,8 @@ function this:SetFirstShow(data)
this.firstHead[this.firstPre]:SetFrame(data.headFrame)
this.firstHead[this.firstPre]:SetLevel(data.level)
this.firstHead[this.firstPre]:SetScale(Vector3.one *0.9)
this.firstHead[this.firstPre]:SetLayer(this.sortingOrder)
this.firstHead[this.firstPre]:SetEffectScale(0.85)
this.firstPlayerName.text=data.userName
--查看详情按钮
@ -114,6 +116,8 @@ function this:SetShow(root,data,mydata)
this.playerScrollHead[root]:SetFrame(data.headFrame)
this.playerScrollHead[root]:SetLevel(data.level)
this.playerScrollHead[root]:SetScale(Vector3.one * 0.7)
this.playerScrollHead[root]:SetLayer(this.sortingOrder)
this.firstHead[this.firstPre]:SetEffectScale(0.75)
playerName.text = data.userName
for k, v in pairs(uidList) do

View File

@ -315,6 +315,8 @@ function this.SingleRankingInfoShow(root,rankData)
this.playerScrollHead[root]:SetFrame(rankData.headFrame)
this.playerScrollHead[root]:SetLevel(rankData.level)
this.playerScrollHead[root]:SetScale(Vector3.one*0.7)
this.playerScrollHead[root]:SetLayer(this.sortingOrder)
this.playerScrollHead[root]:SetEffectScale(0.75)
--
Util.GetGameObject(root, "name"):GetComponent("Text").text = rankData.userName
Util.GetGameObject(root, "progressbar/progress1"):GetComponent("Image").fillAmount = math.floor((rankData.rankInfo.param1/firstDamage)*100)/100

View File

@ -5,13 +5,15 @@ local this = LoginPanel
this.LoginWay = { Account = 0, WeChat = 1 }
local ServerVersion = 0
local ServerVersion = SERVER_VERSION
local IsShowNotice = false
local IsSDKLogin = AppConst.isSDK and AppConst.isSDKLogin
local IsDevelopLogin = true
local openIdkey = "openIdkey"
local openIdPw = "openIdPw"
local lastServerIndex = "lastServerIndex"
local defaultOpenIdkey = Language[11118]
local defaultOpenIdPw = ""
local LoginRoot_Url = VersionManager:GetVersionInfo("serverUrl")
@ -37,6 +39,8 @@ function this:InitComponent()
this.UserBtnText = Util.GetGameObject(this.loginPart, "userBtn/Text"):GetComponent("Text")
this.btnUser = Util.GetGameObject(this.loginPart, "btnUser")
this.btnNotice = Util.GetGameObject(this.loginPart, "btnNotice")
this.btnNotice:SetActive(IsShowNotice)
---selectServerPart
this.serverSelectPart = Util.GetGameObject(this.loginPart, "serverSelect")
@ -92,6 +96,7 @@ function this:BindEvent()
recommend = this.recommend,
callback = function(index)
local list = this.serverList[index]
PlayerPrefs.SetInt(lastServerIndex, index)
PlayerManager.serverInfo = list
LoginManager.SocketAddress = list.ip
LoginManager.SocketPort = list.port
@ -318,21 +323,24 @@ function this.OnReceiveServerList(str)
PlayerPrefs.SetString(openIdPw, pw)
end)
else
this.loginMask:SetActive(true)
Timer.New(function()
UIManager.OpenPanel(UIName.NoticePopup)
this.loginMask:SetActive(false)
end, 2.5, 1):Start()
if IsShowNotice then
this.loginMask:SetActive(true)
Timer.New(function()
UIManager.OpenPanel(UIName.NoticePopup)
this.loginMask:SetActive(false)
end, 2.5, 1):Start()
end
end
end)
end
else
this.loginMask:SetActive(true)
Timer.New(function()
UIManager.OpenPanel(UIName.NoticePopup)
this.loginMask:SetActive(false)
end, 2.5, 1):Start()
if IsShowNotice then
this.loginMask:SetActive(true)
Timer.New(function()
UIManager.OpenPanel(UIName.NoticePopup)
this.loginMask:SetActive(false)
end, 2.5, 1):Start()
end
end
end)
end
@ -341,27 +349,28 @@ end
function this.SetServerList(data)
this.CacheLoginData(data)
-- 默认选择第一个服务器
local lastIndex = 1
-- 判断要显示的服务器
local showServer
local lastIndex = PlayerPrefs.GetInt(lastServerIndex, 1)
if this.lastServer then --有最近登录显示最近登录,没有显示推荐,否则显示第一个服
showServer = this.lastServer.serverid
--for i = 1, #this.serverList do
-- if this.serverList[i].server_id == this.lastServer.serverid then
-- lastIndex = i
-- break
-- end
--end
else
if this.recommend then
showServer = this.recommend
end
end
-- 如果有要显示的服务器判断位置
if showServer then
for i = 1, #this.serverList do
if this.serverList[i].server_id == showServer then
lastIndex = i
break
for i = 1, #this.serverList do
if this.serverList[i].server_id == this.recommend then
lastIndex = i
break
end
end
end
end
if not this.serverList[lastIndex] then
lastIndex = 1
PlayerPrefs.SetInt(lastServerIndex, 1)
end
PlayerManager.serverInfo = this.serverList[lastIndex]
LoginManager.SocketAddress = this.serverList[lastIndex].ip
LoginManager.SocketPort = tonumber(this.serverList[lastIndex].port)
@ -426,67 +435,49 @@ end
--登录进主界面之前需要依次请求玩家数据,物品数据,装备数据,英雄数据,编队数据,任务数据, 异妖数据,工坊数据, 冒险数据
function this.ExecuteLoading()
local requestList = {
[1] = function() NetManager.PlayerInfoRequest(LoadingPanel.OnStep) end, -- 基础信息
[2] = function() NetManager.RequestMission(LoadingPanel.OnStep) end, -- 任务信息
[3] = function() NetManager.ItemInfoRequest(0, LoadingPanel.OnStep) end, -- 物品信息
[4] = function() NetManager.AllEquipRequest(0, LoadingPanel.OnStep) end, -- 装备
[5] = function() NetManager.AllEquipTreasureRequest(0, LoadingPanel.OnStep) end, --
[6] = function() NetManager.GetSoulPrintDataRequest(0, LoadingPanel.OnStep) end, -- 魂印
[7] = function() NetManager.DiffMonsterRequest(LoadingPanel.OnStep) end, -- 异妖
[8] = function() NetManager.HeroInfoRequest(0, LoadingPanel.OnStep) end, --
[9] = function() NetManager.TeamInfoRequest(LoadingPanel.OnStep) end, -- 编队
[10] = function() NetManager.GetAllMailData(LoadingPanel.OnStep) end, -- 邮件
[11] = function() NetManager.GetAllFightDataRequest(LoadingPanel.OnStep) end, --
[12] = function() NetManager.GetActivityAllRewardRequest(LoadingPanel.OnStep) end, -- 活动奖励
[13] = function() NetManager.RequestBaseArenaData(LoadingPanel.OnStep) end, -- 竞技场
[14] = function() ShopManager.InitData(LoadingPanel.OnStep) end, -- 商店
[15] = function() NetManager.GetWorkShopInfoRequest(LoadingPanel.OnStep) end, -- 工坊?
[16] = function() ChatManager.InitData(LoadingPanel.OnStep) end, -- 聊天
[17] = function() NetManager.GetAllFunState(LoadingPanel.OnStep) end, -- 功能开启信息
[18] = function() NetManager.RequestGetFriendInfo(1, LoadingPanel.OnStep) end, -- 好友
[19] = function() NetManager.RequestGetFriendInfo(2, LoadingPanel.OnStep) end, -- 好友申请
[20] = function() NetManager.RequestGetFriendInfo(3, LoadingPanel.OnStep) end, -- 好友搜索
[21] = function() NetManager.RequestGetFriendInfo(4, LoadingPanel.OnStep) end, -- 黑名单
[22] = function() FriendChatManager.InitData(LoadingPanel.OnStep) end, -- 好友消息
[23] = function() MyGuildManager.InitBaseData(LoadingPanel.OnStep) end, -- 公会信息
[24] = function() GuildFightManager.InitBaseData(LoadingPanel.OnStep) end, -- 公会战
[25] = function() NetManager.GetAllGuildSkillData(LoadingPanel.OnStep) end, -- 公会技能
[26] = function() NetManager.InitFightPointLevelInfo(LoadingPanel.OnStep) end, -- 关卡
[27] = function() NetManager.GetExpeditionRequest(ExpeditionManager.expeditionLeve,LoadingPanel.OnStep) end, -- 大闹天宫
[28] = function() NetManager.GuildHelpGetAllRequest(LoadingPanel.OnStep) end, -- 公会援助
[29] = function() DeathPosManager.InitData(LoadingPanel.OnStep) end, -- 十绝阵
[30] = function() NetManager.TreasureOfHeavenScoreRequest(LoadingPanel.OnStep) end, -- 天宫秘宝积分
[31] = function() NetManager.RankFirstRequest({3,22,20,4,21},{0,0,0,0,20},LoadingPanel.OnStep) end, -- 排行榜数据
[32] = function() NetManager.GetSituationInfoRequest(LoadingPanel.OnStep) end,
[33] = function() NetManager.RefreshTimeSLRequest(LoadingPanel.OnStep) end,
[34] = function() -- 登录请求最终接口,所有请求放在此接口之前
LogError("开始进入游戏")
--[[[1] = ]]function() NetManager.PlayerInfoRequest(LoadingPanel.OnStep) end, -- 基础信息
--[[[2] = ]]function() NetManager.RequestMission(LoadingPanel.OnStep) end, -- 任务信息
--[[[3] = ]]function() NetManager.ItemInfoRequest(0, LoadingPanel.OnStep) end, -- 物品信息
--[[[4] = ]]function() NetManager.AllEquipRequest(0, LoadingPanel.OnStep) end, -- 装备
--[[[5] = ]]function() NetManager.AllEquipTreasureRequest(0, LoadingPanel.OnStep) end, --
--[[[6] = ]]function() NetManager.GetSoulPrintDataRequest(0, LoadingPanel.OnStep) end, -- 魂印
--[[[7] = ]]function() NetManager.DiffMonsterRequest(LoadingPanel.OnStep) end, -- 异妖
--[[[8] = ]]function() NetManager.HeroInfoRequest(0, LoadingPanel.OnStep) end, --
--[[[9] = ]]function() NetManager.TeamInfoRequest(LoadingPanel.OnStep) end, -- 编队
--[[[10] =]] function() NetManager.GetAllMailData(LoadingPanel.OnStep) end, -- 邮件
--[[[11] =]] function() NetManager.GetAllFightDataRequest(LoadingPanel.OnStep) end, --
--[[[12] =]] function() NetManager.GetActivityAllRewardRequest(LoadingPanel.OnStep) end, -- 活动奖励
--[[[13] =]] function() NetManager.RequestBaseArenaData(LoadingPanel.OnStep) end, -- 竞技场
--[[[14] =]] function() ShopManager.InitData(LoadingPanel.OnStep) end, -- 商店
--[[[15] =]] function() NetManager.GetWorkShopInfoRequest(LoadingPanel.OnStep) end, -- 工坊?
--[[[16] =]] function() ChatManager.InitData(LoadingPanel.OnStep) end, -- 聊天
--[[[17] =]] function() NetManager.GetAllFunState(LoadingPanel.OnStep) end, -- 功能开启信息
--[[[18] =]] function() NetManager.RequestGetFriendInfo(1, LoadingPanel.OnStep) end, -- 好友
--[[[19] =]] function() NetManager.RequestGetFriendInfo(2, LoadingPanel.OnStep) end, -- 好友申请
--[[[20] =]] function() NetManager.RequestGetFriendInfo(3, LoadingPanel.OnStep) end, -- 好友搜索
--[[[21] =]] function() NetManager.RequestGetFriendInfo(4, LoadingPanel.OnStep) end, -- 黑名单
--[[[22] =]] function() FriendChatManager.InitData(LoadingPanel.OnStep) end, -- 好友消息
--[[[23] =]] function() MyGuildManager.InitBaseData(LoadingPanel.OnStep) end, -- 公会信息
--[[[24] =]] function() GuildFightManager.InitBaseData(LoadingPanel.OnStep) end, -- 公会战
--[[[25] =]] function() NetManager.GetAllGuildSkillData(LoadingPanel.OnStep) end, -- 公会技能
--[[[26] =]] function() NetManager.InitFightPointLevelInfo(LoadingPanel.OnStep) end, -- 关卡
--[[[27] =]] function() NetManager.GetExpeditionRequest(ExpeditionManager.expeditionLeve,LoadingPanel.OnStep) end, -- 大闹天宫
--[[[28] =]] function() NetManager.GuildHelpGetAllRequest(LoadingPanel.OnStep) end, -- 公会援助
--[[[29] =]] function() DeathPosManager.InitData(LoadingPanel.OnStep) end, -- 十绝阵
--[[[30] =]] function() NetManager.TreasureOfHeavenScoreRequest(LoadingPanel.OnStep) end, -- 天宫秘宝积分
--[[[31] =]] function() NetManager.RankFirstRequest({3,22,20,4,21},{0,0,0,0,20},LoadingPanel.OnStep) end, -- 排行榜数据
--[[[32] =]] function() NetManager.GetSituationInfoRequest(LoadingPanel.OnStep) end,
--[[[33] =]] function() NetManager.RefreshTimeSLRequest(LoadingPanel.OnStep) end,
--[[[34] =]] function() -- 登录请求最终接口,所有请求放在此接口之前
if AppConst.isGuide then
if GuideManager.GetCurId(GuideType.Force) == 1 and PlayerManager.nickName == tostring(PlayerManager.uid) then
LogError("开始引导")
--创号阶段先进入剧情对话,进入假战斗,然后对话起名,最后进入主界面
local exBattle = function ()
PatFaceManager.isLogin = true
-- LogError("开始加载主界面")
-- UIManager.OpenPanelAsync(UIName.MainPanel, function ()
LogError("开始打开挂机界面")
UIManager.OpenPanel(UIName.FightPointPassMainPanel)
LogError("关闭loading")
LoadingPanel.End()
LogError("成功进入游戏")
-- end)
end
StoryManager.EventTrigger(100001, exBattle)
StoryManager.EventTrigger(300001)
else
LogError("不需要引导")
PatFaceManager.isLogin = true
-- LogError("开始加载主界面")
-- UIManager.OpenPanelAsync(UIName.MainPanel, function ()
LogError("开始打开挂机界面")
UIManager.OpenPanel(UIName.FightPointPassMainPanel)
LogError("关闭loading")
LoadingPanel.End()
LogError("成功进入游戏")
-- end)
end
else
@ -524,6 +515,7 @@ end
this.isLoginClick = false
function this.OnLoginClick()
PlaySoundWithoutClick(SoundConfig.Sound_login)
if LoginManager.state == 0 or LoginManager.state == 1 then
local function reServerCallback(str)
if str == nil then

View File

@ -272,10 +272,13 @@ function GMPanel:BindEvent()
local monsterId = 10101
Util.AddClick(this.btnBattleGo, function()
if this.MonsterIdText.text == "" then
local data = {enemyData={{{camp=1,element=3,passivity={},position=1,professionId=2,property={100,100000,100000,100,0,0,0,0,0,1,0,0.2,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=5,roleId=10085,skill={1131,0.05,0,1,{230002,{1,0.6,2}}},star=5,superSkill={1132,0.8,0,1,{200212,{2,2.12,2}},{400001,{101,1}}},type=1},{camp=1,element=2,passivity={},position=2,professionId=3,property={100,100000,100000,100,0,0,0,0,0,1,0,0.2,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=5,roleId=10022,skill={1151,0.05,0,1,{220000,{1,0.44,2}}},star=5,superSkill={1152,0.05,0,1,{220000,{2,1.55,2},{3,0.45,1,1}}},type=1},{camp=1,element=2,passivity={},position=3,professionId=1,property={100,100000,100000,100,0,0,0,0,0,1,0,0.2,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=5,roleId=10010,skill={1171,0.05,0,1,{400000,{1,0.9,1}}},star=5,superSkill={1172,0.35,0,1,{210003,{2,1.55,1}},{110003,{104,0.2,1}}},type=1},{camp=1,element=2,passivity={},position=4,professionId=4,property={100,100000,100000,100,0,0,0,0,0,1,0,0.2,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=5,roleId=10089,skill={1181,0.05,0,1,{400000,{1,0.9,2}}},star=5,superSkill={1182,0.8,0,1,{230002,{2,2.12,2}},{300000,{100,1,1}}},type=1},{camp=1,element=2,passivity={},position=5,professionId=2,property={100,100000,100000,100,0,0,0,0,0,1,0,0.2,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=5,roleId=10015,skill={1201,0.05,0,1,{400000,{1,0.9,1}}},star=5,superSkill={1202,0.01,0.5,3,{400000,{1,3.15,1}},{300000,{100,1,1}}},type=1},{camp=1,element=2,passivity={},position=6,professionId=2,property={100,100000,100000,100,0,0,0,0,0,1,0,0.2,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=5,roleId=10086,skill={1261,0.05,0,1,{400000,{1,0.9,1}}},star=5,superSkill={1262,0.3,0,1,{230002,{2,2.12,1}},{400001,{101,1}}},type=1},teamPassive={},teamSkill={}}},playerData={{camp=0,element=3,passivity={},position=1,professionId=4,property={100,100000,100000,100,0,0,0,0,0,1,0,0.2,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=5,roleId=10008,skill={1021,0.05,0,1,{210003,{1,0.47,1}}},star=5,superSkill={1022,1.2,0,1,{210003,{2,1.63,1}},{100000,{100,1,1}}},type=1},{camp=0,element=3,passivity={},position=2,professionId=4,property={100,100000,100000,100,0,0,0,0,0,1,0,0.2,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=5,roleId=10006,skill={1041,0.05,0,1,{220801,{1,0.95,2}}},star=5,superSkill={1042,0.1,0.8,3,{220801,{1,3.33,2}},{300000,{100,1,1}}},type=1},{camp=0,element=3,passivity={},position=3,professionId=4,property={100,100000,100000,100,0,0,0,0,0,1,0,0.2,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=5,roleId=10018,skill={1051,0.05,0,1,{100111,{24,1,1.03}}},star=5,superSkill={1052,0.05,0,1,{100113,{24,1,1.75}}},type=1},{camp=0,element=3,passivity={},position=4,professionId=3,property={100,100000,100000,100,0,0,0,0,0,1,0,0.2,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=5,roleId=10005,skill={1071,0.05,0,1,{400000,{1,0.95,0.4}}},star=5,superSkill={1072,0.3,0,1,{210003,{2,1.63,2},{3,0.4,2,1}}},type=1},{camp=0,element=3,passivity={},position=5,professionId=3,property={100,100000,100000,100,0,0,0,0,0,1,0,0.2,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=5,roleId=10020,skill={1081,0.05,0,1,{400000,{1,0.95,1}}},star=5,superSkill={1082,0.3,0,1,{230002,{2,2.23,1},{3,0.4,1,1}}},type=1},{camp=0,element=2,passivity={},position=6,professionId=2,property={100,100000,100000,100,0,0,0,0,0,1,0,0.2,1.5,0,1,1,0,0,0,0,0,0,0,0,0},quality=5,roleId=10012,skill={1121,0.05,0,1,{400000,{1,0.95,2}}},star=5,superSkill={1122,0.05,0,1,{400000,{103,3.33,2,0.3}}},type=1},teamPassive={},teamSkill={}}}
local data =
{enemyData={{{ai={0},camp=1,element=3,monsterId=810134,passivity={{90,16,1,1},{205,0.12,2},{188,0.12,4},{90,16,2,1},{104,2},{144,1}},position=1,professionId=1,property={156,609062,609062,101778,4095,4095,1,0.312,0.312,1.312,0.0624,0.312,0.156,0.312,0,0,0,0,0,0,0,0,0,0,0},quality=2,roleId=10006,skill={1041,0.05,0,1,{220801,{1,0.95,2}}},star=0,superSkill={1042,0.1,0.8,3,{220801,{1,3.33,2}},{300000,{100,1,1}}},type=1},{ai={0},camp=1,element=3,monsterId=820134,passivity={{90,16,2,1},{107,1},{205,0.12,2},{111,1,1,1},{188,0.12,4},{243,4,0},{190,13}},position=2,professionId=1,property={156,609062,609062,101778,4095,4095,1,0.312,0.312,1.312,0.0624,0.312,0.156,0.312,0,0,0,0,0,0,0,0,0,0,0},quality=2,roleId=10020,skill={1081,0.05,0,1,{400000,{1,0.95,1}}},star=0,superSkill={1082,0.3,0,1,{230002,{2,2.23,1},{3,0.4,1,1}}},type=1},{ai={0},camp=1,element=1,monsterId=830134,passivity={{143,1,1,1,0.5},{205,0.12,2},{190,13},{188,0.12,4},{243,4,0},{90,16,2,1}},position=3,professionId=1,property={156,609062,609062,101778,4095,4095,1,0.312,0.312,1.312,0.0624,0.312,0.156,0.312,0,0,0,0,0,0,0,0,0,0,0},quality=2,roleId=10021,skill={1321,0.05,0,1,{400000,{1,0.9,1}}},star=0,superSkill={1322,2,2,1,{200000,{113,0.92,1,1,0.3,1,1}}},type=1},{ai={0},camp=1,element=2,monsterId=840134,passivity={{90,16,1,1},{205,0.12,2},{187,1},{90,16,2,1},{165,0.1,2,0.05,4}},position=4,professionId=1,property={155,598190,598190,99963,4080,4080,1,0.31,0.31,1.31,0.062,0.31,0.155,0.31,0,0,0,0,0,0,0,0,0,0,0},quality=2,roleId=10012,skill={1211,0.05,0,1,{400000,{1,0.9,1}}},star=0,superSkill={1212,0.35,0,1,{210003,{2,1.55,1}},{400000,{116,1}}},type=1},{ai={0},camp=1,element=2,monsterId=850134,passivity={{175,0.55,1},{177,0.25,0.12,1},{90,16,2,1},{205,0.12,2},{188,0.12,4},{92,1},{90,16,1,1},{112,1}},position=5,professionId=1,property={155,598190,598190,99963,4080,4080,1,0.31,0.31,1.31,0.062,0.31,0.155,0.31,0,0,0,0,0,0,0,0,0,0,0},quality=2,roleId=10015,skill={1201,0.05,0,1,{400000,{1,0.9,1}}},star=0,superSkill={1202,0.3,0.5,4,{400000,{1,3.15,1}},{300000,{100,1,1}}},type=1},{ai={0},camp=1,element=1,monsterId=860134,passivity={{90,16,1,1},{191,0.18},{205,0.12,2},{90,16,2,1},{150,1,0.5,2},{172,7,0.72,1},{146,1,0.8,2}},position=6,professionId=1,property={155,598190,598190,99963,4080,4080,1,0.31,0.31,1.31,0.062,0.31,0.155,0.31,0,0,0,0,0,0,0,0,0,0,0},quality=2,roleId=10017,skill={1331,0.05,0,1,{220801,{1,0.9,1}}},star=0,superSkill={1332,1.7,0.6,6,{220801,{1,3.15,1}},{400000,{116,1}}},type=1},firstCamp=0,outData="",teamPassive={},teamSkill={}}},playerData={{camp=0,element=2,passivity={},position=3,professionId=4,property={50,93953,93953,14294,1992,1992,0,0,0.1,1,0,0,0,0.06,1,1,0,0,0,0,0,0,0,0,0},quality=0,roleId=10089,skill={1181,0.05,0,1,{400000,{1,0.9,2}}},star=6,superSkill={1182,0.8,0,1,{230002,{2,2.12,2}},{300000,{100,1,1}}},type=1},{camp=0,element=2,passivity={{90,16,2,1},{119,1,0.1,5,7},{114,1},{107,2},{102,1}},position=1,professionId=2,property={214,1463530,1463530,303167,13807,13807,0,0.465,0.265,1.2,0.08,0.295,0.115,0.08,1,1,0,0,0,0,0,0,0,0,0},quality=0,roleId=10023,skill={1141,0.05,0,1,{230002,{1,0.6,1}}},star=10,superSkill={1142,2,0,1,{230002,{1,2.12,1}},{300000,{112,5,0.1,7,1}}},type=1},{camp=0,element=2,passivity={},position=4,professionId=1,property={1,52380,52380,7265,580,580,0,0.005,0.105,1,0,0.005,0.005,0,1,1,0,0,0,0,0,0,0,0,0},quality=0,roleId=10010,skill={1171,0.05,0,1,{400000,{1,0.9,1}}},star=5,superSkill={1172,0.35,0,1,{210003,{2,1.55,1}},{110003,{104,0.2,1}}},type=1},{camp=0,element=2,passivity={{90,16,2,1}},position=2,professionId=3,property={80,87555,87555,18096,2577,2577,0,0,0.1,1.08,0.1,0,0,0,1,1,0,0,0,0,0,0,0,0,0},quality=0,roleId=10022,skill={1151,0.05,0,1,{220000,{1,0.44,2}}},star=5,superSkill={1152,0.05,0,1,{220000,{2,1.55,2},{3,0.45,1,1}}},type=1},{camp=0,element=2,passivity={},position=5,professionId=4,property={1,27540,27540,4399,580,580,0,0,0.1,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0},quality=0,roleId=10033,skill={1191,0.05,0,1,{220801,{1,0.9,2}}},star=5,superSkill={1192,2,0,1,{220801,{103,3.15,2,0.3}}},type=1},{camp=0,element=2,passivity={},position=6,professionId=4,property={1,27540,27540,4399,580,580,0,0,0.1,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0},quality=0,roleId=10007,skill={1161,0.05,0,1,{100211,{24,1,1.03}}},star=5,superSkill={1162,2,0,1,{100000,{24,1,0.9}}},type=1},firstCamp=0,outData="",teamPassive={{}},teamSkill={}}}
local testFightData = {
fightData = data,
fightSeed = 1589533697,
fightSeed = 1600950572,
fightType = 0,
maxRound = 20
}

View File

@ -1025,6 +1025,11 @@ function this:OnSortingOrderChange()
orginLayer = self.sortingOrder
this.BtView:SetOrderStatus({ sortOrder = self.sortingOrder })
-- 头像层级
if this.playerHead then
this.playerHead:SetLayer(self.sortingOrder)
end
end
--界面打开时调用(用于子类重写)
@ -1049,7 +1054,9 @@ function this:OnShow()
this.playerHead:SetHead(PlayerManager.head)
this.playerHead:SetFrame(PlayerManager.frame)
this.playerHead:SetScale(Vector3.one * 0.9)
this.playerHead:SetPosition(Vector3.New(-5, 0, 0))
this.playerHead:SetPosition(Vector3.New(-5, 8, 0))
this.playerHead:SetLayer(this.sortingOrder)
this.playerHead:SetEffectScale(0.85)
Log(string.format("---------------------%s", BagManager.GetItemCountById(14)))

View File

@ -103,6 +103,8 @@ function this.RankAdapter(item, data, index)
_PlayerHeadList[item]:SetFrame(scoreData.headFrame)
_PlayerHeadList[item]:SetLevel(scoreData.level)
_PlayerHeadList[item]:SetScale(Vector3.one*0.6)
_PlayerHeadList[item]:SetLayer(this.sortingOrder)
_PlayerHeadList[item]:SetEffectScale(0.75)
end
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)

View File

@ -173,6 +173,14 @@ function this.RefreshPlayerInfo(data)
_PlayerHead:SetHead(data.head)
_PlayerHead:SetFrame(data.headFrame)
_PlayerHead:SetLevel(data.level)
_PlayerHead:SetLayer(this.sortingOrder)
_PlayerHead:SetEffectScale(0.9)
end
function this:OnSortingOrderChange()
if _PlayerHead then
_PlayerHead:SetLayer(self.sortingOrder)
end
end
-- 刷新功能区

View File

@ -110,6 +110,8 @@ function this.SingleRankKingListShow(index)
this.playerScrollHead[go]:SetFrame(dData.headFrame)
this.playerScrollHead[go]:SetLevel(dData.level)
this.playerScrollHead[go]:SetScale(Vector3.one*0.6)
this.playerScrollHead[go]:SetLayer(this.sortingOrder)
this.playerScrollHead[go]:SetEffectScale(0.7)
end
--膜拜
local clickBtn = Util.GetGameObject(go,"clickBtn")

View File

@ -360,9 +360,11 @@ function this.SetHeadsInfo(data,root,index,name,level)
this.playerHeadList[root]:SetFrame(data.headFrame)
this.playerHeadList[root]:SetLevel(level)
this.playerHeadList[root]:SetParent(this.heads[index])
this.playerHeadList[root]:SetLayer(this.sortingOrder)
if index==1 then
this.playerHeadList[root]:SetPosition(Vector3(0,126,0))
this.playerHeadList[root]:SetScale(Vector3.one*1.4)
this.playerScrollHead[root]:SetEffectScale(1.5)
this.name1.text=name
elseif index==2 then
this.playerHeadList[root]:SetPosition(Vector3(0,100,0))
@ -454,6 +456,8 @@ function this.SetHeadInfo(root,head,frame,level)
this.playerScrollHead[root]:SetFrame(frame)
this.playerScrollHead[root]:SetLevel(level)
this.playerScrollHead[root]:SetScale(Vector3.one*0.7)
this.playerScrollHead[root]:SetLayer(this.sortingOrder)
this.playerScrollHead[root]:SetEffectScale(0.75)
end
--设置显示信息
function this.SetShowInfo(info1,info2,str1,str2)

View File

@ -175,9 +175,11 @@ function this.SetHeadsInfo(data,root,index,name,level)
this.playerHeadList[root]:SetFrame(data.headFrame)
this.playerHeadList[root]:SetLevel(level)
this.playerHeadList[root]:SetParent(Util.GetGameObject(this.firsthead,"Head"))
this.playerHeadList[root]:SetLayer(this.sortingOrder)
if index==1 then
this.playerHeadList[root]:SetPosition(Vector3(0,0,0))
this.playerHeadList[root]:SetScale(Vector3.one*0.6)
this.playerHeadList[root]:SetEffectScale(0.8)
this.firstHeadName.text = name
this.SetInfoShow(this.firstHeadinfoGo,data,sData.rankType)
--data.sex
@ -261,6 +263,8 @@ function this.SetHeadInfo(root,head,frame,level)
this.playerScrollHead[root]:SetFrame(frame)
this.playerScrollHead[root]:SetLevel(level)
this.playerScrollHead[root]:SetScale(Vector3.one*0.7)
this.playerScrollHead[root]:SetLayer(this.sortingOrder)
this.playerScrollHead[root]:SetEffectScale(0.8)
end

View File

@ -149,6 +149,10 @@ function this:OnSortingOrderChange()
orginLayer = self.sortingOrder
this.BtView:SetOrderStatus({ sortOrder = self.sortingOrder })
-- 头像层级
if this.playerHead then
this.playerHead:SetLayer(self.sortingOrder)
end
end
--界面打开时调用(用于子类重写)
@ -203,7 +207,9 @@ function this.SetPlayerHead()
this.playerHead:SetHead(PlayerManager.head)
this.playerHead:SetFrame(PlayerManager.frame)
this.playerHead:SetScale(Vector3.one * 0.9)
this.playerHead:SetPosition(Vector3.New(-5, 0, 0))
this.playerHead:SetPosition(Vector3.New(-5, 8, 0))
this.playerHead:SetLayer(this.sortingOrder)
this.playerHead:SetEffectScale(0.85)
end

View File

@ -143,6 +143,13 @@ end
function HeadChangePopup:OnShow()
end
--
function HeadChangePopup:OnSortingOrderChange()
for _, playerHead in pairs(_PlayerHeadList) do
playerHead:SetLayer(self.sortingOrder)
end
end
-- tab节点显示自定义
function this.TabAdapter(tab, index, status)
local tabLab = Util.GetGameObject(tab, "Text")
@ -231,6 +238,8 @@ function this.HeadFrameItemAdapter(item, data, index)
name:GetComponent("Text").text = data.Name
_PlayerHeadList[item]:SetFrame(frameId)
_PlayerHeadList[item]:SetHead(PlayerManager.head)
_PlayerHeadList[item]:SetLayer(this.sortingOrder)
_PlayerHeadList[item]:SetEffectScale(1.1)
if frameId == PlayerManager.frame then
this:SetUsing(_PlayerHeadList[item].gameObject)
else
@ -250,6 +259,8 @@ function this.HeadFrameItemAdapter(item, data, index)
name:GetComponent("Text").text = data.Name
_PlayerHeadList[item]:SetHead(headId)
_PlayerHeadList[item]:SetFrame(PlayerManager.frame)
_PlayerHeadList[item]:SetLayer(this.sortingOrder)
_PlayerHeadList[item]:SetEffectScale(1.1)
if headId == PlayerManager.head then
this:SetUsing(_PlayerHeadList[item].gameObject)
else

View File

@ -1,14 +1,13 @@
local SettingInfo = quick_class("SettingInfo")
local this = SettingInfo
function SettingInfo:ctor(mainPanel, gameObject)
self.mainPanel = mainPanel
function SettingInfo:ctor(rootPanel, gameObject)
self.gameObject = gameObject
self:InitComponent(gameObject)
self:InitComponent(gameObject, rootPanel)
self:BindEvent()
end
--初始化组件(用于子类重写)
function SettingInfo:InitComponent(gameObject)
function SettingInfo:InitComponent(gameObject, rootPanel)
this.rootPanel = rootPanel
this.head = Util.GetGameObject(gameObject, "playerInfo/head")
this.headpos = Util.GetGameObject(gameObject, "playerInfo/head/pos")
this.headRedpot = Util.GetGameObject(gameObject, "playerInfo/head/redpot")
@ -124,6 +123,8 @@ function this.RefreshPlayerInfoShow()
this.playerHead:SetHead(PlayerManager.head)
this.playerHead:SetFrame(PlayerManager.frame)
this.playerHead:SetLevel(PlayerManager.level)
this.playerHead:SetLayer(this.rootPanel.sortingOrder)
this.playerHead:SetEffectScale(1.1)
this.name:GetComponent("Text").text = PlayerManager.nickName
this.exp.value = PlayerManager.exp / PlayerManager.userLevelData[PlayerManager.level].Exp
@ -135,6 +136,10 @@ function this.RefreshPlayerInfoShow()
this.serverText.text = PlayerManager.serverInfo.name
end
function SettingInfo:OnSortingOrderChange()
-- 头像层级
if this.playerHead then
this.playerHead:SetLayer(self.sortingOrder)
end
end
function SettingInfo:OnShowData()

View File

@ -106,7 +106,9 @@ function this.SetPlayerHead()
this.playerHead:SetHead(PlayerManager.head)
this.playerHead:SetFrame(PlayerManager.frame)
this.playerHead:SetScale(Vector3.one * 0.9)
this.playerHead:SetPosition(Vector3.New(-5, 0, 0))
this.playerHead:SetPosition(Vector3.New(-5, 8, 0))
this.playerHead:SetLayer(this.sortingOrder)
this.playerHead:SetEffectScale(0.85)
end
@ -168,6 +170,10 @@ end
function VipPanelV2:OnSortingOrderChange()
Util.AddParticleSortLayer(self.effect, self.sortingOrder - orginLayer)
orginLayer = self.sortingOrder
-- 头像层级
if this.playerHead then
this.playerHead:SetLayer(self.sortingOrder)
end
end
function VipPanelV2:OnShow()

View File

@ -14,6 +14,9 @@ function PlayerHeadView:InitComponent()
self.frame = Util.GetGameObject(self.gameObject, "frame")
self.lvRoot = Util.GetGameObject(self.gameObject, "lvRoot")
self.lv = Util.GetGameObject(self.gameObject, "lvRoot/lv")
self.orderLayer = 0
self.effectScale = 1
self.effectScaleFix = 1
end
--绑定事件(用于子类重写)
@ -52,6 +55,9 @@ end
function PlayerHeadView:SetFrame(frameId)
self.frame:SetActive(true)
self.frame:GetComponent("Image").sprite = GetPlayerHeadFrameSprite(frameId)
-- 检测特效
self:UnLoadFrameEffect()
self:LoadFrameEffect(frameId)
end
-- 设置等级
@ -63,6 +69,9 @@ end
-- 设置等级
function PlayerHeadView:SetGray(isGray)
Util.SetGray(self.gameObject, isGray)
if self.frameEffect then
self.frameEffect:SetActive(not isGray)
end
end
function PlayerHeadView:Reset()
@ -70,6 +79,9 @@ function PlayerHeadView:Reset()
self.icon:SetActive(false)
self.frame:SetActive(false)
self.lvRoot:SetActive(false)
-- 卸载头像框特效
self:UnLoadFrameEffect()
--
end
-- 设置节点父节点
function PlayerHeadView:SetParent(parent)
@ -98,6 +110,47 @@ function PlayerHeadView:SetScale(v3)
end
end
function PlayerHeadView:SetEffectScale(scale)
if self.frameEffect then
local targetScale = scale / self.effectScale
self.effectScale = scale
LogPink(targetScale)
Util.SetParticleScale(self.frameEffect, targetScale)
end
end
-- 头像框特效相关
function PlayerHeadView:LoadFrameEffect(frameId)
local name, scale, pos = GetPlayerHeadFrameEffect(frameId)
if name then
self.frameEffectName = name
self.frameEffect = poolManager:LoadAsset(self.frameEffectName, PoolManager.AssetType.GameObject)
self.frameEffect.transform:SetParent(self.frame.transform)
self.frameEffect.transform.localPosition = pos
self.frameEffect.transform.localScale = Vector3.one
self.effectScaleFix = scale
Util.SetParticleScale(self.frameEffect, self.effectScaleFix) -- 设置修正大小
end
end
function PlayerHeadView:UnLoadFrameEffect()
if self.frameEffectName and self.frameEffect then
self:SetLayer(0)
self:SetEffectScale(1)
Util.SetParticleScale(self.frameEffect, 1/self.effectScaleFix) -- 还原修正大小
poolManager:UnLoadAsset(self.frameEffectName, self.frameEffect, PoolManager.AssetType.GameObject)
self.frameEffectName = nil
self.frameEffect = nil
end
end
function PlayerHeadView:SetLayer(orderLayer)
if self.frameEffect then
Util.AddParticleSortLayer(self.frameEffect, orderLayer - self.orderLayer)
self.orderLayer = orderLayer
end
end
function PlayerHeadView:Recycle()
SubUIManager.Close(self)
end