Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2022-02-23 17:24:49 +08:00
commit 6abf049eb7
204 changed files with 274 additions and 269 deletions

View File

@ -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]

View File

@ -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

View File

@ -196,6 +196,7 @@ BattleEventName = {
PassiveChangeRoleHit = indexAdd(),--被动改变角色命中
RoleIsVanish = indexAdd(), -- 角色已经从显示层消失
CheckDamageIsImmune = indexAdd(),--检测伤害是否免疫
BloodValueGetZero = indexAdd(), --御甲值清零
}

View File

@ -41,6 +41,9 @@ end
function this.ReceivedEnabled(missionId)
local dailyActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.DailyRecharge)
if not dailyActInfo then
return false
end
local actRewardConfig = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig, missionId)
for i = 1,#dailyActInfo.mission do
if missionId == dailyActInfo.mission[i].missionId then

View File

@ -48,16 +48,17 @@ end
--添加事件监听(用于子类重写)
function ActivityMainPanel:AddListener()
Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityOpenOrClose, function()
this:OnOpen(this.activityType,_CurPageIndex,true)
end)
Game.GlobalEvent:AddEvent(GameEvent.Activity.OnActivityOpenOrClose, this.onActivityOpenOrClose)
end
--移除事件监听(用于子类重写)
function ActivityMainPanel:RemoveListener()
Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClose, function()
this:OnOpen(this.activityType,_CurPageIndex,true)
end)
Game.GlobalEvent:RemoveEvent(GameEvent.Activity.OnActivityOpenOrClose, this.onActivityOpenOrClose)
end
--
function ActivityMainPanel.onActivityOpenOrClose()
this:OnOpen(this.activityType,_CurPageIndex,true)
end
function ActivityMainPanel:CheckActOpen(_index)

View File

@ -78,11 +78,10 @@ function this:OnShow(_parent,_args)
parent=_parent
sortingOrder =_parent.sortingOrder
local default = 1
local UpList = ConfigManager.GetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.LimitUpHero)).UpList
if currHeroId and currHeroId ~= 0 then
for index, value in ipairs(UpList) do
for index, value in ipairs(heros) do
if value[1] == currHeroId then
default = value[5]
default = value[2]
break
end
end

View File

@ -446,7 +446,7 @@ end
--改变宝物神应等级
function this.ChangeTreeLv()
for i, v in pairs(allTreasures) do
v.treeLv = SacredTreeManager.treeLevel
v.treeLv = v.TreeLv()
end
end
--改变宝物的等级或精炼等级

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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
{

View File

@ -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"
{

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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
{

View File

@ -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
{

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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/directional-blur.html")]
[HelpURL("http://www.hx_thomas_hx_hourdel.com/colorful/doc/blur-effects/directional-blur.html")]
[ExecuteInEditMode]
[AddComponentMenu("Colorful FX/Blur Effects/Directional Blur")]
public class DirectionalBlur : BaseEffect

View File

@ -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/dithering.html")]
[HelpURL("http://www.hx_thomas_hx_hourdel.com/colorful/doc/artistic-effects/dithering.html")]
[ExecuteInEditMode]
[AddComponentMenu("Colorful FX/Artistic Effects/Dithering")]
public class Dithering : BaseEffect

View File

@ -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/double-vision.html")]
[HelpURL("http://www.hx_thomas_hx_hourdel.com/colorful/doc/camera-effects/double-vision.html")]
[ExecuteInEditMode]
[AddComponentMenu("Colorful FX/Camera Effects/Double Vision")]
public class DoubleVision : BaseEffect

View File

@ -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/dynamic-lookup.html")]
[HelpURL("http://www.hx_thomas_hx_hourdel.com/colorful/doc/color-correction/dynamic-lookup.html")]
[ExecuteInEditMode]
[AddComponentMenu("Colorful FX/Color Correction/Dynamic Lookup")]
public class DynamicLookup : BaseEffect

View File

@ -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/fast-vignette.html")]
[HelpURL("http://www.hx_thomas_hx_hourdel.com/colorful/doc/camera-effects/fast-vignette.html")]
[ExecuteInEditMode]
[AddComponentMenu("Colorful FX/Camera Effects/Fast Vignette")]
public class FastVignette : BaseEffect

View File

@ -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/frost.html")]
[HelpURL("http://www.hx_thomas_hx_hourdel.com/colorful/doc/camera-effects/frost.html")]
[ExecuteInEditMode]
[AddComponentMenu("Colorful FX/Camera Effects/Frost")]
public class Frost : BaseEffect

View File

@ -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/gaussian-blur.html")]
[HelpURL("http://www.hx_thomas_hx_hourdel.com/colorful/doc/blur-effects/gaussian-blur.html")]
[ExecuteInEditMode]
[AddComponentMenu("Colorful FX/Blur Effects/Gaussian Blur")]
public class GaussianBlur : BaseEffect

View File

@ -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
{
@ -8,7 +8,7 @@ namespace Colorful
using System;
using Random = UnityEngine.Random;
[HelpURL("http://www.thomashourdel.com/colorful/doc/camera-effects/glitch.html")]
[HelpURL("http://www.hx_thomas_hx_hourdel.com/colorful/doc/camera-effects/glitch.html")]
[ExecuteInEditMode]
[AddComponentMenu("Colorful FX/Camera Effects/Glitch")]
public class Glitch : BaseEffect

View File

@ -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/gradient-ramp.html")]
[HelpURL("http://www.hx_thomas_hx_hourdel.com/colorful/doc/color-correction/gradient-ramp.html")]
[ExecuteInEditMode]
[AddComponentMenu("Colorful FX/Color Correction/Gradient Ramp")]
public class GradientRamp : BaseEffect

View File

@ -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/gradient-ramp-dynamic.html")]
[HelpURL("http://www.hx_thomas_hx_hourdel.com/colorful/doc/color-correction/gradient-ramp-dynamic.html")]
[ExecuteInEditMode]
[AddComponentMenu("Colorful FX/Color Correction/Gradient Ramp (Dynamic)")]
public class GradientRampDynamic : BaseEffect

Some files were not shown because too many files have changed in this diff Show More