From 6aa71414cfd4b487815591b19905ecbe6bc6fbaf Mon Sep 17 00:00:00 2001 From: swrring Date: Tue, 20 Oct 2026 15:02:00 +0900 Subject: [PATCH] =?UTF-8?q?WL=20#948-4=20=EB=A7=88=EB=B2=95=EA=B2=80=20PD?= =?UTF-8?q?=20=EC=9E=AC=EC=A7=80=EC=A0=81=203=EA=B1=B4=20=E2=80=94=20?= =?UTF-8?q?=E2=91=A0=20=EB=AA=85=EC=A4=91=20=EC=82=AC=EB=B3=B8=20WL=5FHit?= =?UTF-8?q?=5FStaff=20=EB=8A=98=EB=A6=BC=20=EC=B8=B5=202=EA=B0=9C(sparks?= =?UTF-8?q?=20=C2=B7=20flares)=20=EB=A0=8C=EB=8D=94=EB=9F=AC=20=EB=81=94(A?= =?UTF-8?q?/B=20=EC=BA=A1=EC=B2=98=EB=A1=9C=20=EB=B2=94=EC=9D=B8=20?= =?UTF-8?q?=ED=99=95=EC=A0=95=20=C2=B7=20=E3=80=8C=ED=94=BC=EA=B2=A9=20?= =?UTF-8?q?=EC=A7=81=EC=A0=84=20=EA=B8=B8=EA=B2=8C=20=EB=8A=98=EC=96=B4?= =?UTF-8?q?=EC=A7=84=20=EC=9D=B4=ED=8E=99=ED=8A=B8=E3=80=8D)=20=E2=91=A1?= =?UTF-8?q?=203=ED=83=80=20=3D=20RPG=20Character=20FREE=20Unarmed-Attack-R?= =?UTF-8?q?2=20f3~21(=EC=98=A4=EB=A5=B8=EC=86=90=20=EB=82=B4=EC=A7=80?= =?UTF-8?q?=EB=A5=B4=EA=B8=B0=20=C2=B7=20=EB=A7=88=EC=8A=A4=ED=81=AC=20?= =?UTF-8?q?=EC=97=86=EC=9D=8C=20=C2=B7=20speed=201.2=20=C2=B7=20=EB=B0=9C?= =?UTF-8?q?=EC=82=AC=200.4=20=C2=B7=20=EB=A7=A4=ED=95=91=20=EC=9E=AC?= =?UTF-8?q?=EA=B5=BD=EA=B8=B0=20=E2=86=92=20pcanim=5Fsorceress)=20?= =?UTF-8?q?=E2=91=A2=20=EC=A7=80=ED=8C=A1=EC=9D=B4=20=EB=81=9D=20=EB=B9=9B?= =?UTF-8?q?=20=3D=20Hyper=20Casual=20FX=20Marble=5F04=20=EC=82=AC=EB=B3=B8?= =?UTF-8?q?=20WL=5FFx=5FTipMarble(=EA=B5=AC=EC=8A=AC=200.14=20m=20=C2=B7?= =?UTF-8?q?=20aura=20=C3=970.4=20=C2=B7=20BowCharge=20=EC=86=8C=EC=9A=A9?= =?UTF-8?q?=EB=8F=8C=EC=9D=B4=20=EA=BC=AC=EB=A6=AC=20=ED=8F=90=EA=B8=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Fable 5.1 --- .../Animations/pcanim_sorceress.controller | 4 +- Assets/WL/Combat/CombatAnimMapping.asset | 14 +- .../Resources/WL/Impact/WL_Hit_Staff.prefab | 4 +- .../Resources/WL/Fx/WL_Fx_TipMarble.prefab | 190 ++++++++++++++++++ .../WL/Fx/WL_Fx_TipMarble.prefab.meta | 7 + .../Resources/WL/WLProjectileVisual.json | 1 + .../Weapon/Resources/WL/WLWeaponTipGlow.json | 8 +- 7 files changed, 213 insertions(+), 15 deletions(-) create mode 100644 Assets/WL/Combat/Weapon/Resources/WL/Fx/WL_Fx_TipMarble.prefab create mode 100644 Assets/WL/Combat/Weapon/Resources/WL/Fx/WL_Fx_TipMarble.prefab.meta diff --git a/Assets/Res_Addr/Animations/pcanim_sorceress.controller b/Assets/Res_Addr/Animations/pcanim_sorceress.controller index ad8769d7f..b4ee95d42 100644 --- a/Assets/Res_Addr/Animations/pcanim_sorceress.controller +++ b/Assets/Res_Addr/Animations/pcanim_sorceress.controller @@ -2303,7 +2303,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: attack3 - m_Speed: 2 + m_Speed: 1.2 m_CycleOffset: 0 m_Transitions: - {fileID: 7396964718502629461} @@ -2316,7 +2316,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 1827226128182048838, guid: d664857a783ffb645b4f451b91f99021, + m_Motion: {fileID: 3060872287085348379, guid: 8b4aea68a09b24149ab89408f7199bb1, type: 3} m_Tag: m_SpeedParameter: diff --git a/Assets/WL/Combat/CombatAnimMapping.asset b/Assets/WL/Combat/CombatAnimMapping.asset index dd55a6568..2cf63daca 100644 --- a/Assets/WL/Combat/CombatAnimMapping.asset +++ b/Assets/WL/Combat/CombatAnimMapping.asset @@ -984,16 +984,16 @@ MonoBehaviour: intParameter: 0 floatParameter: 0 - stateName: attack3 - sourceFbxPath: Assets/ExplosiveLLC/Mage Warrior Mecanim Animation Pack/Animations/Mage@RangeAttack1.FBX + sourceFbxPath: Assets/ExplosiveLLC/RPG Character Mecanim Animation Pack FREE/Animations/Unarmed/RPG-Character@Unarmed-Attack-R2.FBX subClipName: StaffCast3_S_{CID} sourceClipName: incomingExitTime: 0.85 createIfMissing: 1 - firstFrame: 12 - lastFrame: 44 - speed: 2 - maskPath: Assets/WL/Combat/Masks/WL_UpperBody.mask - bakeRootY: 0 + firstFrame: 3 + lastFrame: 21 + speed: 1.2 + maskPath: + bakeRootY: -1 events: - functionName: LookAtTarget time: 0 @@ -1005,7 +1005,7 @@ MonoBehaviour: - functionName: Projectile time: 0 useNormalized: 1 - normalizedTime: 0.5 + normalizedTime: 0.4 stringParameter: Projectile_{CID} intParameter: 0 floatParameter: 0 diff --git a/Assets/WL/Combat/Impact/Resources/WL/Impact/WL_Hit_Staff.prefab b/Assets/WL/Combat/Impact/Resources/WL/Impact/WL_Hit_Staff.prefab index 54dbe9643..e2560568b 100644 --- a/Assets/WL/Combat/Impact/Resources/WL/Impact/WL_Hit_Staff.prefab +++ b/Assets/WL/Combat/Impact/Resources/WL/Impact/WL_Hit_Staff.prefab @@ -29046,7 +29046,7 @@ ParticleSystemRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8397910373599020375} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -33925,7 +33925,7 @@ ParticleSystemRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8397910374862041504} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 diff --git a/Assets/WL/Combat/Weapon/Resources/WL/Fx/WL_Fx_TipMarble.prefab b/Assets/WL/Combat/Weapon/Resources/WL/Fx/WL_Fx_TipMarble.prefab new file mode 100644 index 000000000..ab7350ebb --- /dev/null +++ b/Assets/WL/Combat/Weapon/Resources/WL/Fx/WL_Fx_TipMarble.prefab @@ -0,0 +1,190 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &4367517686858029069 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 459848745414500885, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: m_Name + value: WL_Fx_TipMarble + objectReference: {fileID: 0} + - target: {fileID: 459848745414500886, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459848745414500886, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459848745414500886, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459848745414500886, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459848745414500886, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 459848745414500886, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459848745414500886, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459848745414500886, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459848745414500886, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459848745414500886, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459848745414500886, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 459848745414500887, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: CustomDataModule.color1.maxColor.b + value: 0.5919687 + objectReference: {fileID: 0} + - target: {fileID: 459848745414500887, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: CustomDataModule.color1.maxColor.g + value: 0.7434962 + objectReference: {fileID: 0} + - target: {fileID: 459848745414500887, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: CustomDataModule.color1.maxColor.r + value: 2.670157 + objectReference: {fileID: 0} + - target: {fileID: 459848745414500887, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: InitialModule.startColor.maxColor.b + value: 0.15294118 + objectReference: {fileID: 0} + - target: {fileID: 459848745414500887, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: InitialModule.startColor.maxColor.g + value: 0.16539182 + objectReference: {fileID: 0} + - target: {fileID: 459848745414500887, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: InitialModule.startColor.maxColor.r + value: 0.22745098 + objectReference: {fileID: 0} + - target: {fileID: 725324774407360864, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: UVModule.enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 725324774407360864, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: InitialModule.startSize.scalar + value: 0.92 + objectReference: {fileID: 0} + - target: {fileID: 725324774407360864, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: InitialModule.startSize.minScalar + value: 0.68 + objectReference: {fileID: 0} + - target: {fileID: 725324774407360864, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: ColorModule.gradient.maxGradient.key0.b + value: 0.22169809 + objectReference: {fileID: 0} + - target: {fileID: 725324774407360864, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: ColorModule.gradient.maxGradient.key0.g + value: 0.2784466 + objectReference: {fileID: 0} + - target: {fileID: 725324774407360864, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: ColorModule.gradient.maxGradient.key0.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 725324774407360864, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: ColorModule.gradient.maxGradient.key1.b + value: 0.15294118 + objectReference: {fileID: 0} + - target: {fileID: 725324774407360864, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: ColorModule.gradient.maxGradient.key1.g + value: 0.16539182 + objectReference: {fileID: 0} + - target: {fileID: 725324774407360864, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: ColorModule.gradient.maxGradient.key1.r + value: 0.22745098 + objectReference: {fileID: 0} + - target: {fileID: 725324774407360879, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: dcf41c7d8ce2ce94590c863f69996555, type: 2} + - target: {fileID: 725324775076281781, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 263fd841b12e6624494ce37527c6ced6, type: 2} + - target: {fileID: 725324775076281782, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: UVModule.tilesX + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 725324775076281782, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: UVModule.tilesY + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 725324775076281782, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: UVModule.frameOverTime.scalar + value: 0.9999 + objectReference: {fileID: 0} + - target: {fileID: 725324775076281782, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: InitialModule.startColor.maxColor.b + value: 0.3820755 + objectReference: {fileID: 0} + - target: {fileID: 725324775076281782, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: InitialModule.startColor.maxColor.g + value: 0.42576712 + objectReference: {fileID: 0} + - target: {fileID: 725324775076281782, guid: 7d5e53535bf77c340bca21a018e742a1, + type: 3} + propertyPath: InitialModule.startColor.maxColor.r + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7d5e53535bf77c340bca21a018e742a1, type: 3} diff --git a/Assets/WL/Combat/Weapon/Resources/WL/Fx/WL_Fx_TipMarble.prefab.meta b/Assets/WL/Combat/Weapon/Resources/WL/Fx/WL_Fx_TipMarble.prefab.meta new file mode 100644 index 000000000..20f997d17 --- /dev/null +++ b/Assets/WL/Combat/Weapon/Resources/WL/Fx/WL_Fx_TipMarble.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cd6cc3e65fc4cbe439d67826add38dbc +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/WL/Combat/Weapon/Resources/WL/WLProjectileVisual.json b/Assets/WL/Combat/Weapon/Resources/WL/WLProjectileVisual.json index d7967db5f..32288bcc2 100644 --- a/Assets/WL/Combat/Weapon/Resources/WL/WLProjectileVisual.json +++ b/Assets/WL/Combat/Weapon/Resources/WL/WLProjectileVisual.json @@ -21,6 +21,7 @@ "~WL_Visual/Pos/bullet/SubEmitter2" ], "_note_948b": "#948 PD 「명중 직전 길쭉한 타격 이펙트」 — 후보 2개 모두 줄임: 탄 끝에서 나오는 길쭉한 줄기 입자(bullet/SubEmitter2 · 경계 1.66×0.31 m) 숨김 + 명중 별 섬광(WL_Hit_Staff · 세로 스파이크) 0.37 → 0.28. 명중 자체는 판정 반경(공격표 aoe 1.2 m) 때문에 접촉 전에 뜬다(판정 값은 PD 결정)", + "_note_948c": "#948-4 PD 「투사체에 여전히 피격 직전 길게 늘어진 이펙트」 — Play A/B 캡처(flares 끄면 사라짐)로 범인 = 명중 사본 WL_Hit_Staff 의 늘림(Stretch) 층 2개(sparks · flares) → 프리팹 사본에서 렌더러 끔(scripts/wl/probes/948b_hitfix.cs · 값은 프리팹). 투사체 자체(bullet 불화살 · circle)는 그대로", "stageScales": [ { "stage": 3, "scale": 0.0, "hitScale": 0.0 } ], diff --git a/Assets/WL/Combat/Weapon/Resources/WL/WLWeaponTipGlow.json b/Assets/WL/Combat/Weapon/Resources/WL/WLWeaponTipGlow.json index 53081a724..41631de7a 100644 --- a/Assets/WL/Combat/Weapon/Resources/WL/WLWeaponTipGlow.json +++ b/Assets/WL/Combat/Weapon/Resources/WL/WLWeaponTipGlow.json @@ -1,13 +1,13 @@ { "enabled": 1, - "note": "#948 PD 「마법검의 지팡이 끝은 은은하게 빛나도록(마법 무기 느낌)」 — 직업 10302(마법검 1071). 2차: 끝 = 무기 축 위 끝점(둥근 면 중심) · 겉모습 = 팩 이펙트 WL_Fx_BowCharge(시전 모으기와 같은 것)를 루프로 작게 + 약한 점광원 · 끄기 = enabled 0 · 점광원만 끄기 = light 0", + "note": "#948 PD 「마법검의 지팡이 끝은 은은하게 빛나도록(마법 무기 느낌)」 — 직업 10302(마법검 1071). 2차: 끝 = 무기 축 위 끝점(둥근 면 중심) · 겉모습 = 팩 이펙트를 루프로 작게 + 약한 점광원 · 끄기 = enabled 0 · 점광원만 끄기 = light 0. 3차(#948-4 PD 「지팡이 주변에 꼬리처럼 달린 이펙트는 보이지 않았으면 · Hyper Casual FX Pack Vol.1 의 빛나는 구슬로 대체」): 겉모습 = HCFX_Marble_04 사본 WL_Fx_TipMarble(붉은 구슬 + 작은 반짝이 + 부드러운 빛무리 · 원본 구슬 지름 1 m → scale = 지름 m) · BowCharge 는 소용돌이 꼬리 때문에 폐기", "rules": [ { "classIds": [ 10302 ], "weaponNames": [], - "prefab": "WL/Fx/WL_Fx_BowCharge", - "scale": 0.06, - "pulse": 0.2, + "prefab": "WL/Fx/WL_Fx_TipMarble", + "scale": 0.14, + "pulse": 0.1, "pulseSeconds": 1.6, "light": 1, "lightColor": [ 1.0, 0.78, 0.42, 1.0 ],