From 4cbe785c398ed2be09a02e8b87ecb96e65b21c9c Mon Sep 17 00:00:00 2001 From: Ino Date: Wed, 12 Feb 2025 16:21:10 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=8C=EB=93=9C=20=ED=9B=84=20=EC=8B=A4?= =?UTF-8?q?=ED=96=89=20=EC=8B=9C=20=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Android/addressables_content_state.bin | Bin 10246 -> 10246 bytes Assets/AddressableAssetsData/link.xml | 554 ++++++++++++++++++ Assets/AddressableAssetsData/link.xml.meta | 7 + Assets/Ino_nerdnavis.txt | 5 +- Assets/Res_Addr/Map/Map_C01.prefab | 2 +- Assets/Res_Addr/Map/Map_C02.prefab | 2 +- Assets/Script/Character/MyActor.cs | 2 +- Assets/Script/Util/TurnOff_GO.cs | 11 +- .../usr/Resources/SRDebugger/Settings.asset | 4 +- 9 files changed, 577 insertions(+), 10 deletions(-) create mode 100644 Assets/AddressableAssetsData/link.xml create mode 100644 Assets/AddressableAssetsData/link.xml.meta diff --git a/Assets/AddressableAssetsData/Android/addressables_content_state.bin b/Assets/AddressableAssetsData/Android/addressables_content_state.bin index dcffff66db666cb005b3399e149cfff89c0c54aa..0d586cac3009858618085cf108e17e9416687f02 100644 GIT binary patch delta 1561 zcmaizU5Hgx6vsQ)v8ff(9L_mwaajD;f3LItXBW>d zemTFnq~0V?m|=og<)s1(Zrn`bvKbxKe~DkZ^1##InZf)`xTh@Y8e$~G77 z*W~t)pTxM8Z@AW4$5L5l?;d>z0R#60}e-U*oHRjt6>O5$0yO~26CSjW%@NT(Sj(9S}0ZDzVCg$86{t)oov;F%)PkVvhFENSPOsRwYVHfUm$@-ayeHUdf{ zGDQXviGi_Z;X&+(qNDQ+0##8Z>ZC?+q#|m;oj}$byN-8C>sd685(kz>9({_DnTUq~ zr;L%l`F-|Kr*u{&&Md)6YpWAAxGaIQgi&*Dpjp~|uBh79OI=)ryz%h6o8Gy-mIrey zRokZB7|2iZ;XQT#uY>n??!v3UyTUk!&)v`Ct91>xy!_|mc?}WASDwK7JBS{}5#kso ztvmW*H@==1%6ek!$;l$0D?hK=_VxVA2RHMJkJSCSTis#Lk?tokj+&mpq;;7OeEZ|& zd=(LI?Qgb@5&Or8lOsgSrr&(-n09l4YT-Cb3iU)EPXzL2kU>tZQSR_ zqxJQCxT^cTBfEzRM-ny0k;K<9X?4}x@rUKShKPxc^D|?_Q)9&P5YcA28$TC+=Y{#Y zAD6%RZ`KFKh|@zvn;(y!_-!eFJzsYQU*(D3YSrevbdy0E5-8%0F%0Y=X^<#Rj3%$z&S<@Z15-19%aczp4# z*)65^NoeMEpk5K(ENDCHATsyksNF!i4d!O6yUsfi3Q2IH7qsdmCL;{ zaTIWx5$&Ago{^-fciaFZMo0|JnenNj1dE@VCPxi(ks0GS7Xcro7?*-H-%LywrBTwM zqzT|qz^f2YhG3G4#i%T4cJADbyNFYaD$A1w_08P=yD;%-90HBausv|>_18ylhn&UGXz393Y(79fNKsX0A`f*gqOHU-T=QqYVB znuMd0VjWgm)_gs^t0Cetv8r~ z7s~7Ar#*M{N`e%st+F0ObO~et0O3pwE>PuCvvl2wqUsv2>i7Ax`QPhb99#b7lYDaT z%T?E;^`E-sLO!&w9z1(&s<#QR0`CgrUVOIRg|E&ry!HO059T#QTw1*m_g_ZLVQdkH zanU)WEBiN2<%P1|yqmncDW51`t-9uQ`pwfH*-9>GQDFyFgA zzmdO0#M;^m6C=b;BgC;GqHEHZ;o!x*xW69!)gS!dJs2S#Xb~MY_7m-R~T)LiZspf}Zm#alKJn6l)vC*) U?9->4{QiM@e8=NojE-{qe@cd!bpQYW 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