Cute_OctopusCd 및 블라인드 추가
This commit is contained in:
parent
838e22011d
commit
c3bd34db9c
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Binary file not shown.
|
|
@ -0,0 +1,49 @@
|
||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!1 &1989413823170049497
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 1989413823170049476}
|
||||||
|
- component: {fileID: -4209610864371387936}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Effect_Blind
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &1989413823170049476
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1989413823170049497}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 0}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!114 &-4209610864371387936
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1989413823170049497}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 456d2bd1c5c2e5e4b8b948836c4975a4, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
NoUseParticleTime: 0
|
||||||
|
OffTime: 5
|
||||||
|
e_EffectLocation: 2
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5352457623949a347bc1480d3012fb0f
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -267,6 +267,7 @@ GameObject:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
m_Component:
|
m_Component:
|
||||||
- component: {fileID: 1160234427}
|
- component: {fileID: 1160234427}
|
||||||
|
- component: {fileID: 1160234428}
|
||||||
- component: {fileID: 1160234426}
|
- component: {fileID: 1160234426}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: Global Volume
|
m_Name: Global Volume
|
||||||
|
|
@ -307,6 +308,23 @@ Transform:
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!114 &1160234428
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 1160234425}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 38f50b30e61fb0341aed3733ef1b8fdd, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
go_Camera: {fileID: 1160234425}
|
||||||
|
volumes:
|
||||||
|
- {fileID: 11400000, guid: ae67e7856b8def24a96cf76c689162b0, type: 2}
|
||||||
|
- {fileID: 11400000, guid: 96e4f5994a1f2d948a293a2d5f2bd1b3, type: 2}
|
||||||
|
m_Volume: {fileID: 1160234426}
|
||||||
--- !u!1 &1671388994
|
--- !u!1 &1671388994
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -405,6 +423,8 @@ MonoBehaviour:
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
go_Camera: {fileID: 0}
|
go_Camera: {fileID: 0}
|
||||||
|
m_TotalTime: 0
|
||||||
|
WaveMakeGapTime: 0
|
||||||
--- !u!4 &2049409408
|
--- !u!4 &2049409408
|
||||||
Transform:
|
Transform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,44 @@
|
||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &-4218699122093064562
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 3
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 899c54efeace73346a0a16faa3afe726, type: 3}
|
||||||
|
m_Name: Vignette
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
active: 1
|
||||||
|
color:
|
||||||
|
m_OverrideState: 1
|
||||||
|
m_Value: {r: 0, g: 0, b: 0, a: 1}
|
||||||
|
center:
|
||||||
|
m_OverrideState: 1
|
||||||
|
m_Value: {x: 0.5, y: 0.5}
|
||||||
|
intensity:
|
||||||
|
m_OverrideState: 1
|
||||||
|
m_Value: 1
|
||||||
|
smoothness:
|
||||||
|
m_OverrideState: 1
|
||||||
|
m_Value: 1
|
||||||
|
rounded:
|
||||||
|
m_OverrideState: 1
|
||||||
|
m_Value: 1
|
||||||
|
--- !u!114 &11400000
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 0}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: d7fd9488000d3734a9e00ee676215985, type: 3}
|
||||||
|
m_Name: GlobalVolumeProfile_Blind
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
components:
|
||||||
|
- {fileID: -4218699122093064562}
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 96e4f5994a1f2d948a293a2d5f2bd1b3
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -1159,6 +1159,9 @@ public class Actor : MyCoroutine
|
||||||
curCC = eCC.SilenceCurse;
|
curCC = eCC.SilenceCurse;
|
||||||
Buff_or_Debuff(curCC, LifeTime, val2);
|
Buff_or_Debuff(curCC, LifeTime, val2);
|
||||||
break;
|
break;
|
||||||
|
case eSkillExtraType.Blind:
|
||||||
|
GlobalVolumeMgr.Ins.Set(1, LifeTime);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!dic_skillextra.ContainsKey(skillExtraData.e_SkillExtraType))
|
if (!dic_skillextra.ContainsKey(skillExtraData.e_SkillExtraType))
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,22 @@
|
||||||
|
using System.Collections;
|
||||||
|
using UnityEngine;
|
||||||
|
using UnityEngine.Rendering;
|
||||||
|
|
||||||
|
public class GlobalVolumeMgr : MonoBehaviourSingletonTemplate<GlobalVolumeMgr>
|
||||||
|
{
|
||||||
|
public VolumeProfile[] volumes; // 0 기본, 1 블라이든
|
||||||
|
public Volume m_Volume;
|
||||||
|
|
||||||
|
public void Set(int index, float lifetime = 0f)
|
||||||
|
{
|
||||||
|
m_Volume.profile = volumes[index];
|
||||||
|
if (lifetime > 0f)
|
||||||
|
StartCoroutine(Co_Off(lifetime));
|
||||||
|
}
|
||||||
|
|
||||||
|
IEnumerator Co_Off(float lifetime)
|
||||||
|
{
|
||||||
|
yield return new WaitForSeconds(lifetime);
|
||||||
|
Set(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 38f50b30e61fb0341aed3733ef1b8fdd
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -7,7 +7,7 @@ public enum eSkillType { Active, Passive, JobPassive, MobPassive }
|
||||||
public enum eSkillTarget { Enemy, Self, SelfEnemy, Team, Pet }
|
public enum eSkillTarget { Enemy, Self, SelfEnemy, Team, Pet }
|
||||||
public enum eSkillExtraType { None, Frost, Cure, Freezing, Blood, Poison, Burn, Stun, Slow, StatUp, ManaShield, SwordShield,
|
public enum eSkillExtraType { None, Frost, Cure, Freezing, Blood, Poison, Burn, Stun, Slow, StatUp, ManaShield, SwordShield,
|
||||||
SpeedUp, DefenceDecrease, Aggro, VampirHeal, Knockback, Airborne, Curse, ManaBurn, HPBurn,
|
SpeedUp, DefenceDecrease, Aggro, VampirHeal, Knockback, Airborne, Curse, ManaBurn, HPBurn,
|
||||||
SilenceCurse, Barrier, Reincarnation }
|
SilenceCurse, Barrier, Reincarnation, Blind }
|
||||||
|
|
||||||
public class SkillListTableData : TableDataBase
|
public class SkillListTableData : TableDataBase
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -299,6 +299,7 @@ public class GameUI : MonoBehaviourSingletonTemplate<GameUI>
|
||||||
//if (MessageInfo.Ins) MessageInfo.Ins.go_Small.transform.localPosition = new Vector3(436f, 139f);
|
//if (MessageInfo.Ins) MessageInfo.Ins.go_Small.transform.localPosition = new Vector3(436f, 139f);
|
||||||
go_Camera.GetComponent<UICamera>().allowMultiTouch = UICamera.first.allowMultiTouch = false;
|
go_Camera.GetComponent<UICamera>().allowMultiTouch = UICamera.first.allowMultiTouch = false;
|
||||||
if (SleepMode.IsActive) OptionInfo.Ins.m_SleepMode.Set();
|
if (SleepMode.IsActive) OptionInfo.Ins.m_SleepMode.Set();
|
||||||
|
if (GlobalVolumeMgr.isIns) GlobalVolumeMgr.Ins.Set(0);
|
||||||
break;
|
break;
|
||||||
case eGameMode.Stage:
|
case eGameMode.Stage:
|
||||||
DSUtil.InActivateGameObjects(gos_lobby);
|
DSUtil.InActivateGameObjects(gos_lobby);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue