워리어 - 광폭화

Assets/ResWork/EricWang/Game VFX Collection Vol 2(URP)/Materials/Plane.mat

@@ -116,7 +116,7 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.2264151, g: 0.2264151, b: 0.2264151, a: 1}
-    - _Color: {r: 0.2264151, g: 0.2264151, b: 0.2264151, a: 1}
+    - _Color: {r: 0.22641507, g: 0.22641507, b: 0.22641507, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []

Assets/Res_Addr/Animations/pcanim_twohand.controller

@@ -1,5 +1,32 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-7527269986442247231
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: twohandskill1
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: 925566720051396480}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 79116852e13080d49ae27d9b7a4d014d, type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &-7110105137057027718
 AnimatorState:
   serializedVersion: 6
@@ -2005,6 +2032,9 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: -7110105137057027718}
     m_Position: {x: 250, y: -150, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -7527269986442247231}
+    m_Position: {x: -250, y: -160, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -2140,6 +2170,28 @@ AnimatorStateTransition:
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
+--- !u!1101 &925566720051396480
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 110222392}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.91176474
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &1101000010795764586
 AnimatorStateTransition:
   m_ObjectHideFlags: 1

Assets/Res_Addr/Effect/Effect_Howling.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: cf59569b858d3a94ea7506e062ef193d
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res_Addr/Skill/Skill_Berserk.prefab

@@ -0,0 +1,46 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4247406032903477443
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8331342286022028291}
+  - component: {fileID: -7321383569496696399}
+  m_Layer: 0
+  m_Name: Skill_Berserk
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8331342286022028291
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4247406032903477443}
+  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 &-7321383569496696399
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4247406032903477443}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 110f89be94d35d94eabd9db6559b63d3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

Assets/Res_Addr/Skill/Skill_Berserk.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ad4623f40396f364884b6e20e71e8542
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Character/Actor.cs

@@ -29,7 +29,7 @@ public class Actor : MyCoroutine
     protected ActorStatInfo m_Stat;
     protected double receiveaccumulateDmg, m_Damage, m_attackCoolTime; // 내가 받은 피해, 내가 준 피해, 공격 쿨타임
     protected Transform tf_HUD_HP, tf_HUD_Dmg;
-    protected Vector3 ObjSize, Original_Scale;
+    protected Vector3 ObjSize;
     [SerializeField]
     protected Actor m_Target, m_MyPet;
     protected Dictionary<int, UseMagicInfo> dic_MagicData = new Dictionary<int, UseMagicInfo>();
@@ -1740,6 +1740,16 @@ public class Actor : MyCoroutine
         }
     }
     #endregion
+    #region 캐릭터 크기 조절
+    public void Set_ScaleControl(bool returntoOriginalScale, float targetscale = 1f, Action actComplete = null)
+    {
+        StartCoroutine(Co_ScaleControl(returntoOriginalScale, targetscale, actComplete));
+    }
+    protected virtual IEnumerator Co_ScaleControl(bool returntoOriginalScale, float targetscale, Action actComplete = null)
+    {
+        yield break;
+    }
+    #endregion
 
     public bool CanMove() { return !IsCC() && m_NavMeshAgent.isOnNavMesh && !m_NavMeshAgent.isStopped; }
     protected virtual bool IsAvoidCoolTime() { return false; }

Assets/Script/Character/PCActor.cs

@@ -1,8 +1,10 @@
 using CodeStage.AntiCheat.ObscuredTypes;
+using System;
 using System.Collections;
 using UnityEngine;
 using UnityEngine.AI;
 using UnityEngine.ResourceManagement.AsyncOperations;
+using Random = UnityEngine.Random;
 
 public class PCActor : MyActor
 {
@@ -409,4 +411,20 @@ public class PCActor : MyActor
         // 투견장 없음
         //if (InGameInfo.Ins.Get_CurStageData().Chapter == 105) IsStop = true;
     }
+
+    protected override IEnumerator Co_ScaleControl(bool returntoOriginalScale, float targetscale, Action actComplete = null)
+    {
+        if (returntoOriginalScale) targetscale = m_ClassData.f_Scale;
+        Vector3 target = Vector3.one * targetscale;
+
+        float t = 0f;
+        while (t < 1f)
+        {
+            yield return null;
+            t += Time.deltaTime;
+            transform.localScale = Vector3.Lerp(transform.localScale, target, t);
+        }
+        transform.localScale = Vector3.one * targetscale;
+        actComplete?.Invoke();
+    }
 }

Assets/Script/Character/Projectile/Skill/Skill_Berserk.cs

@@ -0,0 +1,22 @@
+using System.Collections;
+using UnityEngine;
+
+public class Skill_Berserk : ProjectileBase
+{
+    public override void Set(ProjectileData _data)
+    {
+        base.Set(_data);
+        StartCoroutine(Co_Update());
+    }
+
+    IEnumerator Co_Update()
+    {
+        // 하울링 이펙트
+        InGameInfo.Ins.Show_Effect("Effect_Howling", m_ProjectTileData.target.Get_Center_position());
+        // 커짐
+        m_ProjectTileData.target.Set_ScaleControl(false);
+        // Off & 원래대로 돌아오기
+        yield return new WaitForSeconds(m_ProjectTileData.m_SkillListTableData.f_ExtraValue1);
+        m_ProjectTileData.target.Set_ScaleControl(true);
+    }
+}

Assets/Script/Character/Projectile/Skill/Skill_Berserk.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 110f89be94d35d94eabd9db6559b63d3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Character/Projectile/Skill/Skill_BrutalSlash.cs

@@ -1,7 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.TextCore.Text;
 
 public class Skill_BrutalSlash : ProjectileBase
 {

Assets/Script/Util/MyEnum.cs

@@ -199,7 +199,7 @@ public enum eEffect
     Skill_Shield, Skill_Bead, Skill_ExplosionArea, Skill_SpiritBless, Skill_SwordShield, Skill_StraightBurst, Skill_Resurrection,
     Skill_IceBolt, Skill_Fireball, Skill_FireBolt, Skill_EnergyBall, Skill_Blizzard, Skill_Flower, Skill_Golem, Skill_EarthWorm,
     Skill_Hurricane, Skill_EatSnack, Skill_ShieldAttack, Skill_JumpAttack, Skill_ManaBurst, Skill_DaggerThrow, Skill_OneHandCombo1,
-    Skill_FatalBlow, Skill_DashSlash, Skill_EnergySlash, Skill_BrutalSlash, 
+    Skill_FatalBlow, Skill_DashSlash, Skill_EnergySlash, Skill_BrutalSlash, Skill_Berserk,
 
     Skill_Poison,