diff --git a/Assets/AddressableAssetsData/Android/addressables_content_state.bin b/Assets/AddressableAssetsData/Android/addressables_content_state.bin
index dcffff66d..0d586cac3 100644
Binary files a/Assets/AddressableAssetsData/Android/addressables_content_state.bin and b/Assets/AddressableAssetsData/Android/addressables_content_state.bin differ
diff --git a/Assets/AddressableAssetsData/link.xml b/Assets/AddressableAssetsData/link.xml
new file mode 100644
index 000000000..19aa5ec7f
--- /dev/null
+++ b/Assets/AddressableAssetsData/link.xml
@@ -0,0 +1,554 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Assets/AddressableAssetsData/link.xml.meta b/Assets/AddressableAssetsData/link.xml.meta
new file mode 100644
index 000000000..27fbb3d66
--- /dev/null
+++ b/Assets/AddressableAssetsData/link.xml.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: be060a2b49f67e34180f3eb1fccc4240
+TextScriptImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Ino_nerdnavis.txt b/Assets/Ino_nerdnavis.txt
index c803164d1..a16a9217d 100644
--- a/Assets/Ino_nerdnavis.txt
+++ b/Assets/Ino_nerdnavis.txt
@@ -78,6 +78,5 @@ messageinfo 엄청 느린 버그
몬스터 작업
- 보스몹
- - 엘리트몹
- - 일반몹
- -- fire pig 문의 중
\ No newline at end of file
+ - 엘리트몹 (크기 설정, stun, casting, castend)
+ - 일반몹 (크기 설정, stun, casting, castend)
\ No newline at end of file
diff --git a/Assets/Res_Addr/Map/Map_C01.prefab b/Assets/Res_Addr/Map/Map_C01.prefab
index a49e929a7..76a30e6e4 100644
--- a/Assets/Res_Addr/Map/Map_C01.prefab
+++ b/Assets/Res_Addr/Map/Map_C01.prefab
@@ -3932,7 +3932,7 @@ Terrain:
m_HeightmapMaximumLOD: 0
m_ShadowCastingMode: 0
m_DrawHeightmap: 1
- m_DrawInstanced: 1
+ m_DrawInstanced: 0
m_DrawTreesAndFoliage: 1
m_StaticShadowCaster: 0
m_IgnoreQualitySettings: 0
diff --git a/Assets/Res_Addr/Map/Map_C02.prefab b/Assets/Res_Addr/Map/Map_C02.prefab
index 382f915fd..3ade70b73 100644
--- a/Assets/Res_Addr/Map/Map_C02.prefab
+++ b/Assets/Res_Addr/Map/Map_C02.prefab
@@ -183,7 +183,7 @@ Terrain:
m_HeightmapMaximumLOD: 0
m_ShadowCastingMode: 2
m_DrawHeightmap: 1
- m_DrawInstanced: 1
+ m_DrawInstanced: 0
m_DrawTreesAndFoliage: 1
m_StaticShadowCaster: 0
m_IgnoreQualitySettings: 0
diff --git a/Assets/Script/Character/MyActor.cs b/Assets/Script/Character/MyActor.cs
index a819e916f..39d352291 100644
--- a/Assets/Script/Character/MyActor.cs
+++ b/Assets/Script/Character/MyActor.cs
@@ -233,7 +233,7 @@ public class MyActor : Actor
public override void Projectile(string s)
{
base.Projectile(s);
- if (ProjectileInfo.ProjectileInfoOn)
+ if (ProjectileInfo.ProjectileInfoOn && !string.IsNullOrEmpty(s))
{
var ccData = Get_CCData(eCC.MultiShot);
var amount = 1 + (ccData.CCTime > 0f ? ccData.CCVal : 0);
diff --git a/Assets/Script/Util/TurnOff_GO.cs b/Assets/Script/Util/TurnOff_GO.cs
index 320bd3226..1311339af 100644
--- a/Assets/Script/Util/TurnOff_GO.cs
+++ b/Assets/Script/Util/TurnOff_GO.cs
@@ -10,7 +10,14 @@ public class TurnOff_GO : MyCoroutine
Actor m_target, m_target2;
ProjectileData m_ProjectileData;
- bool followTarget;
+ bool followTarget, isPS;
+ ParticleSystem m_PS;
+
+ private void Awake()
+ {
+ m_PS = GetComponent();
+ isPS = m_PS;
+ }
public void Set() { gameObject.SetActive(false); gameObject.SetActive(true); }
public void Set(Actor target, ProjectileData pd, float LifeTime)
@@ -54,7 +61,7 @@ public class TurnOff_GO : MyCoroutine
void Set_Off()
{
- Set_Coroutine_withCancel(Off_Imm, NoUseParticleTime ? OffTime : GetComponent().main.duration);
+ Set_Coroutine_withCancel(Off_Imm, NoUseParticleTime || !isPS ? OffTime : m_PS.main.duration);
}
private void OnEnable()
diff --git a/Assets/ThirdParty/StompyRobot/SRDebugger/usr/Resources/SRDebugger/Settings.asset b/Assets/ThirdParty/StompyRobot/SRDebugger/usr/Resources/SRDebugger/Settings.asset
index c04202b41..bd7849439 100644
--- a/Assets/ThirdParty/StompyRobot/SRDebugger/usr/Resources/SRDebugger/Settings.asset
+++ b/Assets/ThirdParty/StompyRobot/SRDebugger/usr/Resources/SRDebugger/Settings.asset
@@ -55,10 +55,10 @@ MonoBehaviour:
_apiKey:
_enableBugReporter: 0
_disabledTabs:
- _profilerAlignment: 2
+ _profilerAlignment: 0
_optionsAlignment: 3
_consoleAlignment: 0
- _triggerPosition: 0
+ _triggerPosition: 2
_maximumConsoleEntries: 1500
_enableEventSystemCreation: 1
_automaticShowCursor: 0