Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
6f5aad16b3
Binary file not shown.
After Width: | Height: | Size: 61 KiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6658a55feee4a3f48ae0c22595e8fb4e
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 56
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 0741fd5690bc72843bf3631c395d9c1f
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: ZhiZhunJiangShiAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 3.0 MiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 03df88ca144f26340b1722bf311e3db2
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 56
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 8d64f421d822a4d43bae5ebe64b8676a
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: ZhiZhunJiangShiAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 679 KiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: fa577976a89030c4a9e5ec12d4dc05ef
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 56
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 2931f11aaca90884fbcd551cc0b759de
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: ZhiZhunJiangShiAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 222 KiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f359462576748bb4eaa9a0fbc8c262fb
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 56
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 0e9d2a3d237009841b495c19b558244b
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: ZhiZhunJiangShiAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -0,0 +1,64 @@
|
|||
%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: fx_ui_renwuzhezao_1
|
||||
m_Shader: {fileID: 4800000, guid: cd73b754ea97c04468b1349981704714, type: 3}
|
||||
m_ShaderKeywords:
|
||||
m_LightmapFlags: 0
|
||||
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}
|
||||
- _EmissionMap:
|
||||
m_Texture: {fileID: 0}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
- _MainTex:
|
||||
m_Texture: {fileID: 2800000, guid: fa577976a89030c4a9e5ec12d4dc05ef, type: 3}
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Floats:
|
||||
- _BlendOp: 0
|
||||
- _BumpScale: 1
|
||||
- _CameraFadingEnabled: 0
|
||||
- _CameraFarFadeDistance: 2
|
||||
- _CameraNearFadeDistance: 1
|
||||
- _ColorMode: 0
|
||||
- _Cull: 2
|
||||
- _Cutoff: 0.5
|
||||
- _DistortionBlend: 0.5
|
||||
- _DistortionEnabled: 0
|
||||
- _DistortionStrength: 1
|
||||
- _DistortionStrengthScaled: 0
|
||||
- _DstBlend: 0
|
||||
- _EmissionEnabled: 0
|
||||
- _FlipbookMode: 0
|
||||
- _InvFade: 1
|
||||
- _LightingEnabled: 0
|
||||
- _Mode: 0
|
||||
- _SoftParticlesEnabled: 0
|
||||
- _SoftParticlesFarFadeDistance: 1
|
||||
- _SoftParticlesNearFadeDistance: 0
|
||||
- _SrcBlend: 1
|
||||
- _ZWrite: 1
|
||||
m_Colors:
|
||||
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
|
||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
- _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
|
||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
|
||||
- _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5019608}
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 35f71110506335847b01f0f22dac521f
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
File diff suppressed because it is too large
Load Diff
|
@ -28017,6 +28017,10 @@ MonoBehaviour:
|
|||
extension: .png
|
||||
resPathIndex: 193
|
||||
resAbNameIndex: 89
|
||||
- resName: z_zhizunjaingshi_1000
|
||||
extension: .png
|
||||
resPathIndex: 194
|
||||
resAbNameIndex: 89
|
||||
- resName: z_zhizunjaingshi_200
|
||||
extension: .png
|
||||
resPathIndex: 194
|
||||
|
@ -28045,6 +28049,18 @@ MonoBehaviour:
|
|||
extension: .png
|
||||
resPathIndex: 194
|
||||
resAbNameIndex: 89
|
||||
- resName: z_zixuanpifu_ren
|
||||
extension: .png
|
||||
resPathIndex: 194
|
||||
resAbNameIndex: 89
|
||||
- resName: z_zixuanpifu_renying
|
||||
extension: .png
|
||||
resPathIndex: 194
|
||||
resAbNameIndex: 89
|
||||
- resName: z_zixuanpifu_wenzi
|
||||
extension: .png
|
||||
resPathIndex: 194
|
||||
resAbNameIndex: 89
|
||||
- resName: z_zzhl_banzi
|
||||
extension: .png
|
||||
resPathIndex: 195
|
||||
|
@ -48921,6 +48937,10 @@ MonoBehaviour:
|
|||
extension: .mat
|
||||
resPathIndex: 633
|
||||
resAbNameIndex: 2604
|
||||
- resName: fx_ui_renwuzhezao_1
|
||||
extension: .mat
|
||||
resPathIndex: 633
|
||||
resAbNameIndex: 2604
|
||||
- resName: fx_ui_waihuan
|
||||
extension: .mat
|
||||
resPathIndex: 633
|
||||
|
|
|
@ -9294,7 +9294,7 @@ local passivityList = {
|
|||
BattleUtil.FinalDamageCountShield(nil,role,caster,tv)
|
||||
end
|
||||
end
|
||||
role.Event:AddEvent(BattleEventName.BloodValueChange,onValueChange,nil,nil,role)
|
||||
role.Event:AddEvent(BattleEventName.BloodValueGetZero,onValueChange,nil,nil,role)
|
||||
end,
|
||||
--自身生命[a]次低于[b]%时,为[c]目标改变[d][e]属性[f]%的效果,持续[g]回合
|
||||
--a[int],b[flaot],c[int 查找目标系数],d[int 改变类型],e[int 属性id],f[flaot],g[int]
|
||||
|
@ -10908,6 +10908,57 @@ local passivityList = {
|
|||
end
|
||||
role.Event:AddEvent(BattleEventName.PassiveChangeDefDMGReFac,addDMGFac,nil,nil,role)
|
||||
end,
|
||||
-- 攻击时若目标[a]类型[b]效果,则当次攻击自身暴击[c]改变[d]%
|
||||
-- a[int],b[int],c[改变类型],d[float]
|
||||
[425] = function(role, args,id,judge)
|
||||
local dot = args[1]
|
||||
local pro = args[2]
|
||||
local ct = args[3]
|
||||
local f1 = args[4]
|
||||
|
||||
|
||||
local function onRoleDamageBefore(critFunc,atkRole,defRole,skill)
|
||||
if atkRole~=role then
|
||||
return
|
||||
end
|
||||
if not skill then
|
||||
return
|
||||
end
|
||||
if skill and not skill.isTriggerJudge and judge==1 then
|
||||
return
|
||||
end
|
||||
local isHave=false
|
||||
if dot==BuffName.DOT then
|
||||
if BattleLogic.BuffMgr:HasBuff(defRole, BuffName.DOT, function(buff) return buff.damageType == pro end,role,pro) then
|
||||
isHave=true
|
||||
end
|
||||
end
|
||||
if isHave then
|
||||
critFunc(f1,ct,false)
|
||||
end
|
||||
end
|
||||
BattleLogic.Event:AddEvent(BattleEventName.TemporaryChangeCrit, onRoleDamageBefore,nil,nil,role)
|
||||
end,
|
||||
--改变[a]目标[b]生命回复量[c]%
|
||||
--a[int],b[int 1:敌方],c[float]
|
||||
[426]=function(role, args,id,judge)
|
||||
local ct=args[1]
|
||||
local type=args[2]
|
||||
local pro=args[3]
|
||||
|
||||
local function onPassiveTreatFactor(func,target,skill)
|
||||
local isTrigger=false
|
||||
if type==1 and target.camp~=role.camp then
|
||||
isTrigger=true
|
||||
end
|
||||
if isTrigger then
|
||||
func(pro,ct)
|
||||
end
|
||||
end
|
||||
|
||||
BattleLogic.Event:AddEvent(BattleEventName.PassiveTreatingFactor,onPassiveTreatFactor,nil,nil,role)
|
||||
end,
|
||||
|
||||
|
||||
}
|
||||
return passivityList
|
|
@ -57,8 +57,9 @@ function Blood:CountBloodValue(damage,atkRole)
|
|||
if self.bloodValue<=0 then
|
||||
value=0
|
||||
self.bloodValue=0
|
||||
self.target.Event:DispatchEvent(BattleEventName.BloodValueGetZero,self.bloodValue/self.target:GetRoleData(RoleDataName.MaxHp),atkRole)
|
||||
end
|
||||
self.target.Event:DispatchEvent(BattleEventName.BloodValueChange,self.bloodValue/self.target:GetRoleData(RoleDataName.MaxHp),atkRole)
|
||||
self.target.Event:DispatchEvent(BattleEventName.BloodValueChange,self.bloodValue/self.target:GetRoleData(RoleDataName.MaxHp))
|
||||
return finalDamage
|
||||
end
|
||||
|
||||
|
|
|
@ -196,6 +196,7 @@ BattleEventName = {
|
|||
PassiveChangeRoleHit = indexAdd(),--被动改变角色命中
|
||||
RoleIsVanish = indexAdd(), -- 角色已经从显示层消失
|
||||
CheckDamageIsImmune = indexAdd(),--检测伤害是否免疫
|
||||
BloodValueGetZero = indexAdd(), --御甲值清零
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -1242,7 +1242,7 @@ function BattleUtil.ApplyTreat(castRole, targetRole, value, baseFactor,critDamag
|
|||
end
|
||||
castRole.Event:DispatchEvent(BattleEventName.PassiveTreatingFactor, treatFactorFunc, targetRole,skill)
|
||||
targetRole.Event:DispatchEvent(BattleEventName.PassiveBeTreatedFactor, treatFactorFunc, castRole)
|
||||
|
||||
BattleLogic.Event:DispatchEvent(BattleEventName.PassiveTreatingFactor,treatFactorFunc,targetRole,skill)
|
||||
local factor = castRole.isTeam and 1 or castRole:GetRoleData(RoleDataName.TreatFacter) --释放者为team则不计算治疗加成属性
|
||||
if factor==0 then
|
||||
factor=1
|
||||
|
|
|
@ -22,6 +22,8 @@ local idList = {
|
|||
[3] = {id = 4203,state1 = "前往充值",state2 = "领 取",state3 = "s_slbz_yilingqu_zh"},
|
||||
rotation = Vector3.New(0,0,11.7),
|
||||
position = Vector3.New(-16,-10.8,0),
|
||||
banner = "b_baolishuchu_juese1",
|
||||
mat = "Fx_mat_UI_SupremeHeroPopup_renwuchuxian",
|
||||
},
|
||||
[2] = {
|
||||
panelId = 1,
|
||||
|
@ -32,6 +34,8 @@ local idList = {
|
|||
[3] = {id = 4206,state1 = "前往充值",state2 = "领 取",state3 = "s_slbz_yilingqu_zh"},
|
||||
rotation = Vector3.New(0,0,-0.2),
|
||||
position = Vector3.New(-16,-9,0),
|
||||
banner = "b_baolishuchu_juese1",
|
||||
mat = "Fx_mat_UI_SupremeHeroPopup_renwuchuxian",
|
||||
},
|
||||
[3] = {
|
||||
panelId = 2,
|
||||
|
@ -41,7 +45,21 @@ local idList = {
|
|||
[2] = {id = 4208,state1 = "前往充值",state2 = "领 取",state3 = "s_slbz_yilingqu_zh"},
|
||||
[3] = {id = 4209,state1 = "前往充值",state2 = "点击购买",state3 = "s_slbz_yilingqu_zh"},
|
||||
rotation = Vector3.New(0,0,-16.2),
|
||||
position = Vector3.New(-16,9,0)
|
||||
position = Vector3.New(-16,9,0),
|
||||
banner = "y_yujianzuoji_zuixiacengbudi",
|
||||
mat = "",
|
||||
},
|
||||
[4] = {
|
||||
panelId = 1,
|
||||
wenziId = 4,
|
||||
btnTip = Language[10317],
|
||||
[1] = {id = 4210,state1 = "前往充值",state2 = "领 取",state3 = "s_slbz_yilingqu_zh"},
|
||||
[2] = {id = 4211,state1 = "前往充值",state2 = "领 取",state3 = "s_slbz_yilingqu_zh"},
|
||||
[3] = {id = 4212,state1 = "前往充值",state2 = "点击购买",state3 = "s_slbz_yilingqu_zh"},
|
||||
rotation = Vector3.New(0,0,-29.5),
|
||||
position = Vector3.New(-30.7,18.5,0),
|
||||
banner = "z_zixuanpifu_ren",
|
||||
mat = "Fx_mat_UI_SupremeHeroPopup_renwuchuxian_1",
|
||||
},
|
||||
}
|
||||
|
||||
|
@ -53,6 +71,7 @@ local canClose = false
|
|||
local curPage = 0
|
||||
local lastPage = 0
|
||||
local isFrist = false
|
||||
local tab = 4
|
||||
---剑影迷踪
|
||||
--初始化组件(用于子类重写)
|
||||
function SupremeHeroPopupNew:InitComponent()
|
||||
|
@ -101,10 +120,12 @@ function SupremeHeroPopupNew:InitComponent()
|
|||
this.tianjingzunzheRed = Util.GetGameObject(this.tianjingzunzhe, "red")
|
||||
this.lingxiaobaojian = Util.GetGameObject(this.btnLayer.transform, "threeTab")
|
||||
this.lingxiaobaojianRed = Util.GetGameObject(this.lingxiaobaojian, "red")
|
||||
this.fourTab = Util.GetGameObject(this.btnLayer.transform, "fourTab")
|
||||
this.fourTabRed = Util.GetGameObject(this.fourTab, "red")
|
||||
this.select = Util.GetGameObject(this.btnLayer.transform, "select")
|
||||
--1玉帝 2御剑
|
||||
this.panelist = {}
|
||||
for i = 1,3 do
|
||||
for i = 1,tab do
|
||||
if not this.panelist[i] then
|
||||
this.panelist[i] = {}
|
||||
end
|
||||
|
@ -114,10 +135,10 @@ function SupremeHeroPopupNew:InitComponent()
|
|||
this.panelist[i].jian.gameObject:SetActive(false)
|
||||
this.panelist[i].wenzi = Util.GetGameObject(self.gameObject, "Panel/wenzi"..idList[i].wenziId)
|
||||
this.panelist[i].wenzi.gameObject:SetActive(false)
|
||||
if i == 1 or i == 2 then
|
||||
if i == 1 or i == 2 or i == 4 then
|
||||
this.panelist[i].jianEffect = Util.GetGameObject(this.panelist[i].jian, "Effect_UI_SupremeHeroPopup_jian")
|
||||
this.panelist[i].Fx_mat_UI_SupremeHeroPopup_daohen = Util.GetGameObject(self.gameObject, "Fx_mat_UI_SupremeHeroPopup_daohen")
|
||||
this.panelist[i].Fx_mat_UI_SupremeHeroPopup_renwuchuxian = Util.GetGameObject(self.gameObject, "Fx_mat_UI_SupremeHeroPopup_renwuchuxian")
|
||||
this.panelist[i].Fx_mat_UI_SupremeHeroPopup_renwuchuxian = Util.GetGameObject(self.gameObject, idList[i].mat)
|
||||
this.panelist[i].Fx_mat_UI_SupremeHeroPopup_changzhu = Util.GetGameObject(this.panelist[i].Fx_mat_UI_SupremeHeroPopup_renwuchuxian, "Particle System")
|
||||
this.panelist[i].Fx_mat_UI_SupremeHeroPopup_renwuchuxian.gameObject:SetActive(true)
|
||||
elseif i == 3 then
|
||||
|
@ -203,6 +224,15 @@ function SupremeHeroPopupNew:BindEvent()
|
|||
this:SetSelect()
|
||||
this.SetMissionData()
|
||||
end)
|
||||
Util.AddClick(this.fourTab, function()
|
||||
if not canClose then return end
|
||||
curPage = 4
|
||||
if lastPage == curPage then
|
||||
return
|
||||
end
|
||||
this:SetSelect()
|
||||
this.SetMissionData()
|
||||
end)
|
||||
end
|
||||
|
||||
function SupremeHeroPopupNew:SetSelect()
|
||||
|
@ -211,8 +241,10 @@ function SupremeHeroPopupNew:SetSelect()
|
|||
parent = this.oneTab.transform
|
||||
elseif curPage == 2 then
|
||||
parent = this.tianjingzunzhe.transform
|
||||
else
|
||||
elseif curPage == 3 then
|
||||
parent = this.lingxiaobaojian.transform
|
||||
else
|
||||
parent = this.fourTab.transform
|
||||
end
|
||||
this.select.transform:SetParent(parent)
|
||||
this.select.transform.localPosition = idList[curPage].position
|
||||
|
@ -241,7 +273,8 @@ end
|
|||
function SupremeHeroPopupNew:OnShow()
|
||||
for i = 1,#this.panelist do
|
||||
for k,v in pairs(this.panelist[i]) do
|
||||
if (i == 1 or i == 2) and v.gameObject.name == "Fx_mat_UI_SupremeHeroPopup_renwuchuxian" then
|
||||
if ((i == 1 or i == 2) and v.gameObject.name == "Fx_mat_UI_SupremeHeroPopup_renwuchuxian")
|
||||
or (i == 4 and v.gameObject.name == "Fx_mat_UI_SupremeHeroPopup_renwuchuxian_1") then
|
||||
else
|
||||
v.gameObject:SetActive(false)
|
||||
end
|
||||
|
@ -249,8 +282,8 @@ function SupremeHeroPopupNew:OnShow()
|
|||
end
|
||||
this.money = VipManager.GetChargedNum()
|
||||
isFrist = true
|
||||
curPage = 3
|
||||
for i = 1 ,3 do
|
||||
curPage = tab
|
||||
for i = 1 ,tab do
|
||||
if not ActivityGiftManager.CheckSupremeMission(i,true) then
|
||||
curPage = i
|
||||
lastPage = 0
|
||||
|
@ -259,14 +292,16 @@ function SupremeHeroPopupNew:OnShow()
|
|||
end
|
||||
self:SetSelect()
|
||||
local actData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.SupremeHero)
|
||||
this.oneTab.gameObject:SetActive(true)
|
||||
this.tianjingzunzhe.gameObject:SetActive(true)
|
||||
this.lingxiaobaojian.gameObject:SetActive(true)
|
||||
this.oneTab.gameObject:SetActive(this.RefreshActive(1))
|
||||
this.tianjingzunzhe.gameObject:SetActive(this.RefreshActive(2))
|
||||
this.lingxiaobaojian.gameObject:SetActive(this.RefreshActive(3))
|
||||
this.fourTab.gameObject:SetActive(this.RefreshActive(4))
|
||||
--curPage = 2
|
||||
this.InitShowPanel()
|
||||
this.tianjingzunzheRed.gameObject:SetActive(this.RefreshRedPoint(2))
|
||||
this.lingxiaobaojianRed.gameObject:SetActive(this.RefreshRedPoint(3))
|
||||
this.oneTabRed.gameObject:SetActive(this.RefreshRedPoint(1))
|
||||
this.fourTabRed.gameObject:SetActive(this.RefreshRedPoint(4))
|
||||
end
|
||||
|
||||
function this.InitShowPanel()
|
||||
|
@ -311,10 +346,11 @@ function this.InitShow()
|
|||
end
|
||||
|
||||
function this.SetMissionData()
|
||||
this.panelist[curPage].role:GetComponent("Image").sprite = this.spLoader:LoadSprite(idList[curPage].banner)
|
||||
if lastPage > 0 then
|
||||
if idList[lastPage].panelId ~= idList[curPage].panelId then
|
||||
for k,v in pairs(this.panelist[lastPage]) do
|
||||
if idList[lastPage].panelId == 1 and v.gameObject.name == "Fx_mat_UI_SupremeHeroPopup_renwuchuxian" then
|
||||
if idList[lastPage].panelId == 1 and (v.gameObject.name == "Fx_mat_UI_SupremeHeroPopup_renwuchuxian" or v.gameObject.name == "Fx_mat_UI_SupremeHeroPopup_renwuchuxian_1") then
|
||||
else
|
||||
v.gameObject:SetActive(false)
|
||||
end
|
||||
|
@ -323,7 +359,7 @@ function this.SetMissionData()
|
|||
end
|
||||
|
||||
for k,v in pairs(this.panelist[curPage]) do
|
||||
if v.gameObject.name == "Fx_mat_UI_SupremeHeroPopup_renwuchuxian" then
|
||||
if v.gameObject.name == "Fx_mat_UI_SupremeHeroPopup_renwuchuxian" or v.gameObject.name == "Fx_mat_UI_SupremeHeroPopup_renwuchuxian_1" then
|
||||
elseif isFrist then
|
||||
if v.gameObject.name == "Particle System" then
|
||||
Timer.New(function()
|
||||
|
@ -398,15 +434,21 @@ function this.SetMissionData()
|
|||
DynamicActivityManager.Index = 6
|
||||
JumpManager.GoJump(1300)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceClear)
|
||||
elseif curPage == 4 and j == 3 then
|
||||
DynamicActivityManager.Index = 7
|
||||
JumpManager.GoJump(1300)
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.PatFace.PatFaceClear)
|
||||
else
|
||||
NetManager.GetActivityRewardRequest(idList[curPage][j].id, actData.activityId,function(drop)
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function()
|
||||
ActivityGiftManager.SetActivityInfo(actData.activityId, idList[curPage][j].id, 1)
|
||||
actData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.SupremeHero)
|
||||
this.RefreshItemData(j,idList[curPage][j].id)
|
||||
this.SetButtonState()
|
||||
this.tianjingzunzheRed.gameObject:SetActive(this.RefreshRedPoint(2))
|
||||
this.lingxiaobaojianRed.gameObject:SetActive(this.RefreshRedPoint(3))
|
||||
this.oneTabRed.gameObject:SetActive(this.RefreshRedPoint(1))
|
||||
this.fourTabRed.gameObject:SetActive(this.RefreshRedPoint(4))
|
||||
end)
|
||||
end)
|
||||
end
|
||||
|
@ -459,6 +501,17 @@ function this.RefreshRedPoint(indexType)
|
|||
return isShow
|
||||
end
|
||||
|
||||
function this.RefreshActive(indexType)
|
||||
local isShow = false
|
||||
local actData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.SupremeHero)
|
||||
for k,v in ipairs(actData.mission) do
|
||||
if activityConfig[v.missionId].Sort == indexType then
|
||||
isShow = true
|
||||
end
|
||||
end
|
||||
return isShow
|
||||
end
|
||||
|
||||
--界面关闭时调用(用于子类重写)
|
||||
function SupremeHeroPopupNew:OnClose()
|
||||
if this.timer then
|
||||
|
@ -483,7 +536,7 @@ function SupremeHeroPopupNew:OnClose()
|
|||
this.itemList = {}
|
||||
for i = 1,#this.panelist do
|
||||
for k,v in pairs(this.panelist[i]) do
|
||||
if v.gameObject.name == "Fx_mat_UI_SupremeHeroPopup_renwuchuxian" then
|
||||
if v.gameObject.name == "Fx_mat_UI_SupremeHeroPopup_renwuchuxian" or v.gameObject.name == "Fx_mat_UI_SupremeHeroPopup_renwuchuxian_1" then
|
||||
else
|
||||
v.gameObject:SetActive(false)
|
||||
end
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
#if !(UNITY_4_5 || UNITY_4_6 || UNITY_4_7 || UNITY_5_0)
|
||||
#define UNITY_5_1_PLUS
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful.Editors
|
||||
{
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
Shader "Hidden/Colorful/Editor/_DynamicLookup"
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
#if !(UNITY_4_5 || UNITY_4_6 || UNITY_4_7 || UNITY_5_0)
|
||||
#define UNITY_5_1_PLUS
|
||||
|
|
|
@ -8,7 +8,7 @@ Unity Community
|
|||
http://forum.unity3d.com/members/15388-Chman
|
||||
|
||||
Website
|
||||
http://www.thomashourdel.com/colorful/
|
||||
http://www.hx_thomas_hx_hourdel.com/colorful/
|
||||
Asset Store
|
||||
https://www.assetstore.unity3d.com/#/content/44845 (leave a review!)
|
||||
Itch.io
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
#if !(UNITY_4_5 || UNITY_4_6 || UNITY_4_7 || UNITY_5_0)
|
||||
#define UNITY_5_1_PLUS
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
#if !(UNITY_4_5 || UNITY_4_6 || UNITY_4_7 || UNITY_5_0)
|
||||
#define UNITY_5_1_PLUS
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful
|
||||
{
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful
|
||||
{
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful
|
||||
{
|
||||
using UnityEngine;
|
||||
|
||||
[HelpURL("http://www.thomashourdel.com/colorful/doc/camera-effects/analog-tv.html")]
|
||||
[HelpURL("http://www.hx_thomas_hx_hourdel.com/colorful/doc/camera-effects/analog-tv.html")]
|
||||
[ExecuteInEditMode]
|
||||
[AddComponentMenu("Colorful FX/Camera Effects/Analog TV")]
|
||||
public class AnalogTV : BaseEffect
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful
|
||||
{
|
||||
using UnityEngine;
|
||||
|
||||
[HelpURL("http://www.thomashourdel.com/colorful/doc/blur-effects/bilateral-gaussian-blur.html")]
|
||||
[HelpURL("http://www.hx_thomas_hx_hourdel.com/colorful/doc/blur-effects/bilateral-gaussian-blur.html")]
|
||||
[ExecuteInEditMode]
|
||||
[AddComponentMenu("Colorful FX/Blur Effects/Bilateral Gaussian Blur")]
|
||||
public class BilateralGaussianBlur : BaseEffect
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful
|
||||
{
|
||||
using UnityEngine;
|
||||
|
||||
[HelpURL("http://www.thomashourdel.com/colorful/doc/color-correction/bleach-bypass.html")]
|
||||
[HelpURL("http://www.hx_thomas_hx_hourdel.com/colorful/doc/color-correction/bleach-bypass.html")]
|
||||
[ExecuteInEditMode]
|
||||
[AddComponentMenu("Colorful FX/Color Correction/Bleach Bypass")]
|
||||
public class BleachBypass : BaseEffect
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful
|
||||
{
|
||||
using UnityEngine;
|
||||
|
||||
[HelpURL("http://www.thomashourdel.com/colorful/doc/other-effects/blend.html")]
|
||||
[HelpURL("http://www.hx_thomas_hx_hourdel.com/colorful/doc/other-effects/blend.html")]
|
||||
[ExecuteInEditMode]
|
||||
[AddComponentMenu("Colorful FX/Other Effects/Blend")]
|
||||
public class Blend : BaseEffect
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful
|
||||
{
|
||||
using UnityEngine;
|
||||
|
||||
[HelpURL("http://www.thomashourdel.com/colorful/doc/color-correction/brightness-contrast-gamma.html")]
|
||||
[HelpURL("http://www.hx_thomas_hx_hourdel.com/colorful/doc/color-correction/brightness-contrast-gamma.html")]
|
||||
[ExecuteInEditMode]
|
||||
[AddComponentMenu("Colorful FX/Color Correction/Brightness, Contrast, Gamma")]
|
||||
public class BrightnessContrastGamma : BaseEffect
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful
|
||||
{
|
||||
using UnityEngine;
|
||||
|
||||
[HelpURL("http://www.thomashourdel.com/colorful/doc/color-correction/channel-clamper.html")]
|
||||
[HelpURL("http://www.hx_thomas_hx_hourdel.com/colorful/doc/color-correction/channel-clamper.html")]
|
||||
[ExecuteInEditMode]
|
||||
[AddComponentMenu("Colorful FX/Color Correction/Channel Clamper")]
|
||||
public class ChannelClamper : BaseEffect
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful
|
||||
{
|
||||
using UnityEngine;
|
||||
|
||||
[HelpURL("http://www.thomashourdel.com/colorful/doc/color-correction/channel-mixer.html")]
|
||||
[HelpURL("http://www.hx_thomas_hx_hourdel.com/colorful/doc/color-correction/channel-mixer.html")]
|
||||
[ExecuteInEditMode]
|
||||
[AddComponentMenu("Colorful FX/Color Correction/Channel Mixer")]
|
||||
public class ChannelMixer : BaseEffect
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful
|
||||
{
|
||||
using UnityEngine;
|
||||
|
||||
[HelpURL("http://www.thomashourdel.com/colorful/doc/color-correction/channel-swapper.html")]
|
||||
[HelpURL("http://www.hx_thomas_hx_hourdel.com/colorful/doc/color-correction/channel-swapper.html")]
|
||||
[ExecuteInEditMode]
|
||||
[AddComponentMenu("Colorful FX/Color Correction/Channel Swapper")]
|
||||
public class ChannelSwapper : BaseEffect
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful
|
||||
{
|
||||
using UnityEngine;
|
||||
|
||||
[HelpURL("http://www.thomashourdel.com/colorful/doc/camera-effects/chromatic-aberration.html")]
|
||||
[HelpURL("http://www.hx_thomas_hx_hourdel.com/colorful/doc/camera-effects/chromatic-aberration.html")]
|
||||
[ExecuteInEditMode]
|
||||
[AddComponentMenu("Colorful FX/Camera Effects/Chromatic Aberration")]
|
||||
public class ChromaticAberration : BaseEffect
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful
|
||||
{
|
||||
using UnityEngine;
|
||||
|
||||
[HelpURL("http://www.thomashourdel.com/colorful/doc/artistic-effects/comic-book.html")]
|
||||
[HelpURL("http://www.hx_thomas_hx_hourdel.com/colorful/doc/artistic-effects/comic-book.html")]
|
||||
[ExecuteInEditMode]
|
||||
[AddComponentMenu("Colorful FX/Artistic Effects/Comic Book")]
|
||||
public class ComicBook : BaseEffect
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful
|
||||
{
|
||||
using UnityEngine;
|
||||
|
||||
[HelpURL("http://www.thomashourdel.com/colorful/doc/color-correction/contrast-gain.html")]
|
||||
[HelpURL("http://www.hx_thomas_hx_hourdel.com/colorful/doc/color-correction/contrast-gain.html")]
|
||||
[ExecuteInEditMode]
|
||||
[AddComponentMenu("Colorful FX/Color Correction/Contrast Gain")]
|
||||
public class ContrastGain : BaseEffect
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful
|
||||
{
|
||||
using UnityEngine;
|
||||
|
||||
[HelpURL("http://www.thomashourdel.com/colorful/doc/camera-effects/contrast-vignette.html")]
|
||||
[HelpURL("http://www.hx_thomas_hx_hourdel.com/colorful/doc/camera-effects/contrast-vignette.html")]
|
||||
[ExecuteInEditMode]
|
||||
[AddComponentMenu("Colorful FX/Camera Effects/Contrast Vignette")]
|
||||
public class ContrastVignette : BaseEffect
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful
|
||||
{
|
||||
using UnityEngine;
|
||||
|
||||
[HelpURL("http://www.thomashourdel.com/colorful/doc/other-effects/convolution-3x3.html")]
|
||||
[HelpURL("http://www.hx_thomas_hx_hourdel.com/colorful/doc/other-effects/convolution-3x3.html")]
|
||||
[ExecuteInEditMode]
|
||||
[AddComponentMenu("Colorful FX/Other Effects/Convolution Matrix 3x3")]
|
||||
public class Convolution3x3 : BaseEffect
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
// Colorful FX - Unity Asset
|
||||
// Copyright (c) 2015 - Thomas Hourdel
|
||||
// http://www.thomashourdel.com
|
||||
// http://www.hx_thomas_hx_hourdel.com
|
||||
|
||||
namespace Colorful
|
||||
{
|
||||
using UnityEngine;
|
||||
|
||||
[HelpURL("http://www.thomashourdel.com/colorful/doc/artistic-effects/cross-stitch.html")]
|
||||
[HelpURL("http://www.hx_thomas_hx_hourdel.com/colorful/doc/artistic-effects/cross-stitch.html")]
|
||||
[ExecuteInEditMode]
|
||||
[AddComponentMenu("Colorful FX/Artistic Effects/Cross Stitch")]
|
||||
public class CrossStitch : BaseEffect
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue