NerdNavis_AiDev
/
Project_WL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

풋내기 전사 평타

This commit is contained in:
Ino 2025-05-02 07:41:51 +09:00
parent ef468640f0
commit e1b057718f
12 changed files with 245 additions and 24945 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Assets/ResWork/Prefabs/Ingame/Main Camera.prefab
View File

@ -14,7 +14,6 @@ GameObject:
- component: {fileID: 9057010304359000041}
- component: {fileID: 8523698507435475239}
- component: {fileID: 3946835133376311610}
- component: {fileID: -1173105144567103423}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
@ -204,16 +203,3 @@ MonoBehaviour:
m_EditorClassIdentifier:
NeighborCellIncludeRadius: 1
visibilityLayer: -1
--- !u!114 &-1173105144567103423
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5448332676958061915}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8a3dd82e46df5644a9c87cd3f21db85e, type: 3}
m_Name:
m_EditorClassIdentifier:
ShakeAmount: 0

2
Assets/ResWork/Table/Export/ClassConfig.json
View File

File diff suppressed because one or more lines are too long

BIN
Assets/ResWork/Table/butler.xlsm
View File

Binary file not shown.

24838
Assets/Res_Addr/Effect/Effect_Hit_10101.prefab
View File

File diff suppressed because it is too large Load Diff

144
Assets/Res_Addr/Effect/Effect_Slash_10101.prefab Normal file
View File

@ -0,0 +1,144 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5164807117813024258
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1025451156603284880}
- component: {fileID: 8558499595176826072}
m_Layer: 0
m_Name: Effect_Slash_10101
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1025451156603284880
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5164807117813024258}
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:
- {fileID: 6273687935682693369}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8558499595176826072
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5164807117813024258}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 456d2bd1c5c2e5e4b8b948836c4975a4, type: 3}
m_Name:
m_EditorClassIdentifier:
NoUseParticleTime: 1
OffTime: 1
e_EffectLocation: 0
--- !u!1001 &476516945449098301
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1025451156603284880}
m_Modifications:
- target: {fileID: 1276384610587253169, guid: 4a1dc68d5e5bcae4199c381af285909c,
type: 3}
propertyPath: m_Name
value: Blue_Slash_1
objectReference: {fileID: 0}
- target: {fileID: 2990290171333669616, guid: 4a1dc68d5e5bcae4199c381af285909c,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5876195116552017092, guid: 4a1dc68d5e5bcae4199c381af285909c,
type: 3}
propertyPath: m_LocalScale.x
value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 5876195116552017092, guid: 4a1dc68d5e5bcae4199c381af285909c,
type: 3}
propertyPath: m_LocalScale.y
value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 5876195116552017092, guid: 4a1dc68d5e5bcae4199c381af285909c,
type: 3}
propertyPath: m_LocalScale.z
value: 0.3
objectReference: {fileID: 0}
- target: {fileID: 5876195116552017092, guid: 4a1dc68d5e5bcae4199c381af285909c,
type: 3}
propertyPath: m_LocalPosition.x
value: -0.000000011650843
objectReference: {fileID: 0}
- target: {fileID: 5876195116552017092, guid: 4a1dc68d5e5bcae4199c381af285909c,
type: 3}
propertyPath: m_LocalPosition.y
value: 0.8029754
objectReference: {fileID: 0}
- target: {fileID: 5876195116552017092, guid: 4a1dc68d5e5bcae4199c381af285909c,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.29510617
objectReference: {fileID: 0}
- target: {fileID: 5876195116552017092, guid: 4a1dc68d5e5bcae4199c381af285909c,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.1009045
objectReference: {fileID: 0}
- target: {fileID: 5876195116552017092, guid: 4a1dc68d5e5bcae4199c381af285909c,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.9742221
objectReference: {fileID: 0}
- target: {fileID: 5876195116552017092, guid: 4a1dc68d5e5bcae4199c381af285909c,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.20069262
objectReference: {fileID: 0}
- target: {fileID: 5876195116552017092, guid: 4a1dc68d5e5bcae4199c381af285909c,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.020786619
objectReference: {fileID: 0}
- target: {fileID: 5876195116552017092, guid: 4a1dc68d5e5bcae4199c381af285909c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 168.173
objectReference: {fileID: 0}
- target: {fileID: 5876195116552017092, guid: 4a1dc68d5e5bcae4199c381af285909c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5876195116552017092, guid: 4a1dc68d5e5bcae4199c381af285909c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: -23.281006
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4a1dc68d5e5bcae4199c381af285909c, type: 3}
--- !u!4 &6273687935682693369 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5876195116552017092, guid: 4a1dc68d5e5bcae4199c381af285909c,
type: 3}
m_PrefabInstance: {fileID: 476516945449098301}
m_PrefabAsset: {fileID: 0}

7
Assets/Res_Addr/Effect/Effect_Slash_10101.prefab.meta Normal file
View File

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

6
Assets/Res_Addr/PC/Ai01.prefab
View File

@ -7946,7 +7946,7 @@ Animator:
m_GameObject: {fileID: 1996061924472238}
m_Enabled: 1
m_Avatar: {fileID: 9000000, guid: e5326b54f49cc50479cbf8508dc0e805, type: 3}
m_Controller: {fileID: 9100000, guid: 1c6db4fa620781947a116d69785fc547, type: 2}
m_Controller: {fileID: 9100000, guid: c89759bb9b16580449abc77bc1e7272d, type: 2}
m_CullingMode: 1
m_UpdateMode: 0
m_ApplyRootMotion: 0
@ -7956,8 +7956,8 @@ Animator:
are already bound by a Humanoid avatar. These transforms can only be changed
by Humanoid clips.\n\tTransform 'Jaw_M'\n\tTransform 'Eye1_R'\n\tTransform 'Eye1_L'\n\tTransform
'Jaw_M'\n\tTransform 'Eye1_R'\n\tTransform 'Eye1_L'\n\tTransform 'Jaw_M'\n\tTransform
'Eye1_R'\n\tTransform 'Eye1_L'\n\tFrom animation clip 'CastspellC_wing'\n\tFrom
animation clip 'CastspellB_wing'"
'Eye1_R'\n\tTransform 'Eye1_L'\n\tFrom animation clip 'CastspellB_wing'\n\tFrom
animation clip 'CastspellC_wing'"
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0

1
Assets/Res_Addr/Projectile/Projectile_10101.prefab
View File

@ -49,6 +49,7 @@ MonoBehaviour:
m_Pierce: 1
str_HitEffect: Effect_Hit_10101
m_ShowTimeOverEffect: 0
ShowTarget: 1
--- !u!65 &6782093134866277011
BoxCollider:
m_ObjectHideFlags: 0

170
Assets/Res_Addr/Weapon/Elven_Sword_01.prefab
View File

@ -9,7 +9,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 424196}
- component: {fileID: 1533032344320236175}
m_Layer: 0
m_Name: Elven_Sword_01
m_TagString: Untagged
@ -33,175 +32,6 @@ Transform:
- {fileID: 435700}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1533032344320236175
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 121958}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 47f233e4c5d6f4aa6a1618016c2233f3, type: 3}
m_Name:
m_EditorClassIdentifier:
profile: {fileID: 0}
profileSync: 0
target: {fileID: 424196}
_active: 1
ignoreVisibility: 0
executeInEditMode: 0
ignoreFrames: 0
duration: 0.5
continuous: 0
smooth: 0
checkWorldPosition: 0
minDistance: 0.1
worldPositionRelativeOption: 0
worldPositionRelativeTransform: {fileID: 0}
checkScreenPosition: 1
minPixelDistance: 10
stepsBufferSize: 1023
maxStepsPerFrame: 12
checkTime: 0
timeInterval: 1
checkCollisions: 0
orientToSurface: 1
ground: 0
surfaceOffset: 0.05
collisionLayerMask:
serializedVersion: 2
m_Bits: 4294967295
mask: {fileID: 0}
renderOrder: 1
clearStencil: 1
cullMode: 2
subMeshMask: -1
colorOverTime:
serializedVersion: 2
key0: {r: 1, g: 0.12630044, b: 0.015686274, a: 1}
key1: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 65535
ctime2: 0
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime1: 65535
atime2: 0
atime3: 0
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 2
colorRamp: 0
colorRampTexture: {fileID: 0}
colorRampStart: {fileID: 0}
colorRampEnd: {fileID: 0}
fadeOut: 1
colorSequence: 0
color: {r: 1, g: 1, b: 1, a: 1}
colorCycleDuration: 3
colorCycleLoop: 1
pingPongSpeed: 1
colorStartPalette:
serializedVersion: 2
key0: {r: 1, g: 0, b: 0, a: 1}
key1: {r: 0, g: 1, b: 0, a: 1}
key2: {r: 0, g: 0, b: 1, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 32768
ctime2: 65535
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime1: 65535
atime2: 0
atime3: 0
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_ColorSpace: -1
m_NumColorKeys: 3
m_NumAlphaKeys: 2
cam: {fileID: 0}
effect: 0
customMaterial: {fileID: 0}
texture: {fileID: 0}
scale: {x: 1, y: 1, z: 1}
scaleStartRandomMin: {x: 1, y: 1, z: 1}
scaleStartRandomMax: {x: 1, y: 1, z: 1}
scaleOverTime:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
ignoreTransformScale: 0
scaleUniform: 0
parent: {fileID: 0}
localPositionRandomMin: {x: 0, y: 0, z: 0}
localPositionRandomMax: {x: 0, y: 0, z: 0}
laserBandWidth: 0.1
laserIntensity: 20
laserFlash: 0.2
trailTint: {r: 0, g: 0, b: 0.1, a: 1}
cameraDistanceFade: 0
cameraDistanceFadeNear: 0
cameraDistanceFadeFar: 1000
animationStates:
animator: {fileID: 0}
lookTarget: {fileID: 0}
lookToCamera: 1
textureCutOff: 0.25
outlineMethod: 0
rimPower: 2
normalThreshold: 0.3
useLastAnimationState: 0
maxBatches: 50
meshPoolSize: 256
interpolate: 0
--- !u!1 &137828
GameObject:
m_ObjectHideFlags: 0

5
Assets/Script/Character/Actor.cs
View File

@ -1790,8 +1790,9 @@ public class Actor : MyCoroutine
}
public virtual void Play_Attack(int _attack, float _as, Action actsuccess = null)
{
//if (IsRole(eRole.Pet) && CurAnim == eAnim.Attack) return;
if (CurAnim == eAnim.Attack || IsDead() || CurAnim >= eAnim.Skill) return;
if (IsRole(eRole.Pet) && CurAnim == eAnim.Attack) return;
if (IsRole(eRole.PC) && CurAnim == eAnim.Attack) return;
if (IsDead() || CurAnim >= eAnim.Skill) return;
StopMove_Imm(false);
CurAnim = eAnim.Attack + _attack;

1
Assets/Script/Character/Projectile/Skill/Skill_JumpAttack.cs
View File

@ -1,6 +1,5 @@
using System.Collections;
using UnityEngine;
using UnityEngine.Rendering;
public class Skill_JumpAttack : ProjectileBase
{

2
Assets/Script/Util/RealCamera.cs
View File

@ -317,7 +317,7 @@ public class RealCamera : MyCoroutine
float damper = shakeCurve.Evaluate(percentComplete);
Vector3 shakeOffset = Random.insideUnitSphere * m_shakeMagnitude * damper;
shakeOffset.y = 0; // 수직 흔들림 제거
//shakeOffset.y = 0; // 수직 흔들림 제거
transform.localPosition = originalPosition + shakeOffset;
m_shakeTimer -= Time.deltaTime;