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 06:41:01 +09:00
parent 6e68373090
commit 3d96b00f64
17 changed files with 29702 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Ino_nerdnavis.txt
View File

@ -86,8 +86,6 @@ messageinfo 엄청 느린 버그
- 포탈, 필드보스, 부활의 성소, 챕터보스
농장 바위 부쉈는데 안 나옴
작업 내역 노션에 남겨두기

2
Assets/Ino_notion.txt
View File

@ -25,3 +25,5 @@ https://www.notion.so/devlucas/2346884289ec4fadb0aa74f7c74660c7#1e3e9deec1718023
장비
https://www.notion.so/devlucas/392510d8df864afea8f5e6c27ddc6af9#1e4e9deec171805ea774cb456c66c940
맵 리뉴얼
https://www.notion.so/devlucas/7c0cbe8e9ffc4f95a2f2c18f03fe1fbf#1e4e9deec17180f2a057c56dcaee8d7c

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

@ -14,6 +14,7 @@ GameObject:
- component: {fileID: 9057010304359000041}
- component: {fileID: 8523698507435475239}
- component: {fileID: 3946835133376311610}
- component: {fileID: -1173105144567103423}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
@ -165,7 +166,30 @@ MonoBehaviour:
m_Bits: 1
cameraHeight: 78
cameraPan: 0
rotationSpeed: 1.25
shakeCurve:
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: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!114 &3946835133376311610
MonoBehaviour:
m_ObjectHideFlags: 0
@ -180,3 +204,16 @@ 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.

29127
Assets/Res_Addr/Effect/Effect_Slash_10501.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

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

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

397
Assets/Res_Addr/MainUI/NewGameUI.prefab
View File

@ -25394,6 +25394,141 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &1814170315433396267
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8970873091476115277}
- component: {fileID: 8540191296289366615}
- component: {fileID: 8812576267676239439}
m_Layer: 0
m_Name: checkName
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8970873091476115277
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1814170315433396267}
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: 63828302199875251}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 100, y: 0}
m_SizeDelta: {x: 100, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8540191296289366615
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1814170315433396267}
m_CullTransparentMesh: 1
--- !u!114 &8812576267676239439
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1814170315433396267}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\uD3AB"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2}
m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 30
m_fontSizeBase: 30
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 15
m_fontSizeMax: 60
m_fontStyle: 0
m_HorizontalAlignment: 1
m_VerticalAlignment: 4096
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 0
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &1814171822294501198
GameObject:
m_ObjectHideFlags: 0
@ -54160,6 +54295,43 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &3742172581137630715
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 63828302199875251}
m_Layer: 0
m_Name: check_
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &63828302199875251
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3742172581137630715}
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: 1486991174713355841}
- {fileID: 8970873091476115277}
m_Father: {fileID: 5140710283611032768}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -225, y: -388}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &3742785345755231042
GameObject:
m_ObjectHideFlags: 0
@ -91508,6 +91680,7 @@ RectTransform:
m_Children:
- {fileID: 8888671814135876509}
- {fileID: 8534670524448106821}
- {fileID: 63828302199875251}
- {fileID: 1402876061955995860}
- {fileID: 2328545748799572744}
- {fileID: 4118852035281969175}
@ -91534,9 +91707,12 @@ MonoBehaviour:
- {fileID: 2189738708965043825}
- {fileID: 7990808232000889390}
- {fileID: 6455558682443836629}
- {fileID: 3742172581137630715}
m_TM_Skills: {fileID: 1671743925682952777}
m_TM_ClassChange: {fileID: 6388885253746773237}
m_TM_MonsterSet: {fileID: 1574445193081977537}
gos_other:
- {fileID: 6862955899089597592}
--- !u!1 &6533555813101496892
GameObject:
m_ObjectHideFlags: 0
@ -95803,6 +95979,81 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &6862955899089597592
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5353290400326390378}
- component: {fileID: 4402101602979170267}
- component: {fileID: 4125032274749865584}
m_Layer: 0
m_Name: check
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5353290400326390378
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6862955899089597592}
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: 1486991174713355841}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 50, y: 37}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4402101602979170267
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6862955899089597592}
m_CullTransparentMesh: 1
--- !u!114 &4125032274749865584
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6862955899089597592}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: ad5f54d7ac4473643a9aa470984c0523, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &6864371011509873426
GameObject:
m_ObjectHideFlags: 0
@ -106912,6 +107163,152 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &7667275801817704338
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1486991174713355841}
- component: {fileID: 525571535179097482}
- component: {fileID: 5772580382253904673}
- component: {fileID: 3427246565197558426}
- component: {fileID: 1077442421244365352}
m_Layer: 0
m_Name: checkbg
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1486991174713355841
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7667275801817704338}
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: 5353290400326390378}
m_Father: {fileID: 63828302199875251}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &525571535179097482
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7667275801817704338}
m_CullTransparentMesh: 1
--- !u!114 &5772580382253904673
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7667275801817704338}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 65f581562538e304cbbfe8ee3beab09c, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &3427246565197558426
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7667275801817704338}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 5772580382253904673}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 3943160308527064177}
m_TargetAssemblyTypeName: TestMapUIMgr, Assembly-CSharp
m_MethodName: OnClick_Button
m_Mode: 3
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 2
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &1077442421244365352
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7667275801817704338}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ab4e7dba3733e584abb76cd4fbc0e116, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &7671154190801520031
GameObject:
m_ObjectHideFlags: 0

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

@ -7946,13 +7946,18 @@ Animator:
m_GameObject: {fileID: 1996061924472238}
m_Enabled: 1
m_Avatar: {fileID: 9000000, guid: e5326b54f49cc50479cbf8508dc0e805, type: 3}
m_Controller: {fileID: 9100000, guid: 97b462930f9fa3d4bb4811cd31f37540, type: 2}
m_Controller: {fileID: 9100000, guid: 1c6db4fa620781947a116d69785fc547, type: 2}
m_CullingMode: 1
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_WarningMessage: "\nBinding warning: Some generic clip(s) animate transforms that
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'"
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0

3
Assets/Res_Addr/Projectile/Projectile_10501.prefab
View File

@ -49,6 +49,7 @@ MonoBehaviour:
m_Pierce: 1
str_HitEffect: Effect_Hit_10501
m_ShowTimeOverEffect: 0
ShowTarget: 1
--- !u!65 &6782093134866277011
BoxCollider:
m_ObjectHideFlags: 0
@ -68,5 +69,5 @@ BoxCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1.5, y: 3, z: 2}
m_Size: {x: 1.5, y: 3, z: 2.5}
m_Center: {x: 0, y: 0, z: 0}

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

@ -493,6 +493,8 @@ public class Actor : MyCoroutine
Check_CC_byAttack(_dinfo);
Check_Extra(eSkillExtraTiming.GetHit);
if (IsRole(eRole.Mob)) MyValue.m_RealCamera.ShakeCamera(1); // 카메라 흔들림 추가
#if UNITY_EDITOR
if (SceneManager.GetActiveScene().name == "StatTest")
{
@ -1786,10 +1788,10 @@ public class Actor : MyCoroutine
if (IsRole(eRole.PC) && !DSUtil.CheckNull(ActorInfo.Ins)) ActorInfo.Ins.All_DelTarget();
}
public virtual void Play_Attack(int _attack, float _as)
public virtual void Play_Attack(int _attack, float _as, Action actsuccess = null)
{
if (IsRole(eRole.Pet) && CurAnim == eAnim.Attack) return;
if (IsDead() || CurAnim >= eAnim.Skill) return;
//if (IsRole(eRole.Pet) && CurAnim == eAnim.Attack) return;
if (CurAnim == eAnim.Attack || IsDead() || CurAnim >= eAnim.Skill) return;
StopMove_Imm(false);
CurAnim = eAnim.Attack + _attack;
@ -1803,6 +1805,7 @@ public class Actor : MyCoroutine
if (dic_ccData.ContainsKey(eCC.ATKSPD_Down) && dic_ccData[eCC.ATKSPD_Down].CCTime > 0f)
m_animation.speed -= m_animation.speed * (float)dic_ccData[eCC.ATKSPD_Down].CCDmg;
AnimationPlay(aniname);
actsuccess?.Invoke();
if (isTarget) transform.LookAt(m_Target.transform);
if (gos_Effect != null && gos_Effect.Length > _attack)

2
Assets/Script/Character/Mob/BullRushMobActor.cs
View File

@ -12,7 +12,7 @@ public class BullRushMobActor : MobActor
base.Change_MobStatus(mobStatus);
}
public override void Play_Attack(int _attack, float _as)
public override void Play_Attack(int _attack, float _as, Action actsuccess = null)
{
AnimationPlay(MyValue.Get_AnimName(eAnim.Attack));
StartCoroutine(Co_Attack());

18
Assets/Script/Character/MyActor.cs
View File

@ -140,17 +140,17 @@ public class MyActor : Actor
// }
//}
}
public override void Play_Attack(int _attack, float _as)
{
base.Play_Attack(_attack, _as);
//if (isTarget)
//public override void Play_Attack(int _attack, float _as, Action actsuccess = null)
//{
// if (!Set_Path(m_Target.Get_position())) // 때리려는 타겟쪽으로 보게 함
// { // 적이 내비메시 위에 없다고 판단됨
// m_Target.ReCal_NaveMesh();
// }
// base.Play_Attack(_attack, _as, actsuccess);
// //if (isTarget)
// //{
// // if (!Set_Path(m_Target.Get_position())) // 때리려는 타겟쪽으로 보게 함
// // { // 적이 내비메시 위에 없다고 판단됨
// // m_Target.ReCal_NaveMesh();
// // }
// //}
//}
}
public void Check_Target(bool forcefind = false)
{
if (forcefind || m_Auto)

14
Assets/Script/Character/PCActor.cs
View File

@ -1,7 +1,6 @@
using CodeStage.AntiCheat.ObscuredTypes;
using System;
using System.Collections;
using TrailsFX;
using UnityEngine;
using UnityEngine.AI;
using UnityEngine.ResourceManagement.AsyncOperations;
@ -482,4 +481,17 @@ public class PCActor : MyActor
}
}
}
public override void Play_Attack(int _attack, float _as, Action actsuccess = null)
{
base.Play_Attack(_attack, _as, () =>
{
if (!string.IsNullOrEmpty(m_ClassData.s_SlashPrefab))
Set_Coroutine(() =>
{
InGameInfo.Ins.Show_Effect(m_ClassData.s_SlashPrefab, Get_position(), transform.eulerAngles);
}, m_ClassData.f_SlashStartDelay);
});
}
}

2
Assets/Script/Table/PC/table_classconfig.cs
View File

@ -30,6 +30,8 @@ public class ClassConfigTableData : TableDataBase
public string s_JobIcon { get; set; }
public string s_WeaponLHPrefab { get; set; }
public string s_WeaponRHPrefab { get; set; }
public string s_SlashPrefab { get; set; }
public float f_SlashStartDelay;
public eBattleType e_BattleType { get; set; }
public float f_Scale;

14
Assets/Script/UI/TestMap/TestMapUIMgr.cs
View File

@ -6,15 +6,19 @@ public class TestMapUIMgr : MonoBehaviourSingletonTemplate<TestMapUIMgr>
public TM_Skills m_TM_Skills;
public TM_ClassChange m_TM_ClassChange;
public TM_MonsterSet m_TM_MonsterSet;
public GameObject[] gos_other; // 0 펫 체크
MobActor MobActor;
Vector3 MobPos = new Vector3(15, 0, 20);
bool ShowPet = true;
private void Start() { Set_TestBtns(false); }
public void Set_TestBtns(bool active)
{
for (int i = 0; i < gos.Length; i++)
gos[i].SetActive(active);
if (active) Set_Pet();
}
public void OnClick_Button(int button)
@ -27,9 +31,19 @@ public class TestMapUIMgr : MonoBehaviourSingletonTemplate<TestMapUIMgr>
case 1: // 몬스터 설정
m_TM_MonsterSet.Set();
break;
case 2: // 펫 on/off
ShowPet = !ShowPet;
Set_Pet();
break;
}
}
void Set_Pet()
{
gos_other[0].SetActive(ShowPet);
MyValue.MyPC.Get_MyPet().gameObject.SetActive(ShowPet);
}
public void MakeMob(MonsterTableData mobData)
{
if (!DSUtil.CheckNull(MobActor))

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

@ -1,6 +1,5 @@
using System.Collections.Generic;
using UnityEngine;
using static UnityEngine.GraphicsBuffer;
public class RealCamera : MyCoroutine
{
@ -201,6 +200,12 @@ public class RealCamera : MyCoroutine
void Update_Cam()
{
if (m_shakeTimer > 0f)
{
Shaking();
return;
}
Vector3 targetOffset = target.position;
Quaternion rotation = Quaternion.Euler(cameraHeight, rotateAround, cameraPan);
Vector3 vectorMask = Vector3.one;
@ -260,4 +265,72 @@ public class RealCamera : MyCoroutine
smooth = 4f;
#endregion
}
#region 카메라 흔들림
[Header("Camera Shake")]
float m_shakeDuration = 0.3f;
float m_shakeMagnitude = 0.1f;
public AnimationCurve shakeCurve = AnimationCurve.EaseInOut(0, 1, 1, 0);
private float m_shakeTimer = 0f;
private Vector3 originalPosition;
int curShakeType;
/// <summary>
/// shaketype : 0 약하게 1 보통 2 세게
/// </summary>
public void ShakeCamera(int shaketype)
{
if (curShakeType == shaketype && m_shakeTimer > 0f)
return;
curShakeType = shaketype;
switch (shaketype)
{
default:
case 0: // 약하게
m_shakeMagnitude = 0.05f;
m_shakeDuration = 0.2f;
m_shakeTimer = 0.15f;
break;
case 1: // 보통
m_shakeMagnitude = 0.1f;
m_shakeDuration = 0.3f;
m_shakeTimer = 0.25f;
break;
case 2: // 세게
m_shakeMagnitude = 0.2f;
m_shakeDuration = 0.4f;
m_shakeTimer = 0.5f;
break;
}
originalPosition = transform.localPosition;
}
void Shaking()
{
if (m_shakeTimer > 0f)
{
float percentComplete = 1 - (m_shakeTimer / m_shakeDuration);
float damper = shakeCurve.Evaluate(percentComplete);
Vector3 shakeOffset = Random.insideUnitSphere * m_shakeMagnitude * damper;
shakeOffset.y = 0; // 수직 흔들림 제거
transform.localPosition = originalPosition + shakeOffset;
m_shakeTimer -= Time.deltaTime;
if (m_shakeTimer <= 0f)
StopShake();
}
}
public void StopShake()
{
m_shakeTimer = 0f;
transform.localPosition = originalPosition;
}
#endregion
}