From eec0f5f5805de719f4f76b3c8c0b87bf307800c0 Mon Sep 17 00:00:00 2001 From: Ino Date: Fri, 20 Dec 2024 14:43:00 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B3=84=EC=A0=95=20=EC=82=AD=EC=A0=9C=20?= =?UTF-8?q?=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A0=95,=20=EC=A0=90=ED=94=84?= =?UTF-8?q?=20=EA=B3=B5=EA=B2=A9=20=EB=8D=B0=EB=AF=B8=EC=A7=80=20=EB=AF=B8?= =?UTF-8?q?=EC=8A=A4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Ino_nerdnavis.txt | 1 - Assets/ResWork/Table/~$butler.xlsm.meta | 7 -- .../UIPrefabs/Title/SortOrder_5.prefab | 92 ++++++++++++------- Assets/Res_Addr/Skill/Skill_JumpAttack.prefab | 39 +++++--- .../Projectile/Skill/Skill_JumpAttack.cs | 7 +- Assets/Script/UI/ETC/DelAccountUI.cs | 7 +- 6 files changed, 94 insertions(+), 59 deletions(-) delete mode 100644 Assets/ResWork/Table/~$butler.xlsm.meta diff --git a/Assets/Ino_nerdnavis.txt b/Assets/Ino_nerdnavis.txt index be8ef7b4f..70cffe27d 100644 --- a/Assets/Ino_nerdnavis.txt +++ b/Assets/Ino_nerdnavis.txt @@ -49,5 +49,4 @@ classconfig 에 의해 정해짐 장비 스탯 추가 구현 - 일꾼 이속, RND_SKILL -테이블 int -> obsint (obsint _ID, obsint ID { get; set;}) diff --git a/Assets/ResWork/Table/~$butler.xlsm.meta b/Assets/ResWork/Table/~$butler.xlsm.meta deleted file mode 100644 index c02427b83..000000000 --- a/Assets/ResWork/Table/~$butler.xlsm.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 27c9f63628130e441907c584b5aaa5df -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/ResWork/UIPrefabs/Title/SortOrder_5.prefab b/Assets/ResWork/UIPrefabs/Title/SortOrder_5.prefab index 6ba7a7fbc..727c0c221 100644 --- a/Assets/ResWork/UIPrefabs/Title/SortOrder_5.prefab +++ b/Assets/ResWork/UIPrefabs/Title/SortOrder_5.prefab @@ -69,7 +69,8 @@ MonoBehaviour: m_text: "\uC54C\uB9BC(\uBC24)" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -217,7 +218,8 @@ MonoBehaviour: m_text: "\uBE5B" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -511,7 +513,8 @@ MonoBehaviour: m_text: "\uB3D9\uC758\uD569\uB2C8\uB2E4 \uB97C \uC785\uB825\uD574 \uC8FC\uC138\uC694." m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -970,7 +973,8 @@ MonoBehaviour: m_text: 000% m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1437,7 +1441,8 @@ MonoBehaviour: m_text: "\uACC4\uC815\uC0AD\uC81C" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1585,7 +1590,8 @@ MonoBehaviour: m_text: "\uC800\uC7A5" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -2391,7 +2397,8 @@ MonoBehaviour: m_text: 0.0.0 m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -2801,7 +2808,8 @@ MonoBehaviour: m_text: Button m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -3162,7 +3170,8 @@ MonoBehaviour: m_text: "\uC911" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -3385,7 +3394,8 @@ MonoBehaviour: m_text: "\uADF8\uB798\uD53D" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -3533,7 +3543,8 @@ MonoBehaviour: m_text: "\uB85C\uADF8\uC544\uC6C3" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -4928,7 +4939,8 @@ MonoBehaviour: m_text: "\uCE6D\uD638 \uC774\uB984" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -5625,7 +5637,8 @@ MonoBehaviour: m_text: "\uBB38\uC758\uD558\uAE30" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -5849,7 +5862,8 @@ MonoBehaviour: m_text: 2622485374D2E2EB m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -6205,7 +6219,8 @@ MonoBehaviour: m_text: "\uC0C1" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -6574,7 +6589,8 @@ MonoBehaviour: m_text: "\uC124\uBA85\n\uC124\uBA85\n\uC124\uBA85" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -6709,7 +6725,8 @@ MonoBehaviour: m_text: "\uCE74\uBA54\uB77C \uC801 \uC790\uB3D9 \uCD94\uC801" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -7404,7 +7421,8 @@ MonoBehaviour: New Label New Label New Label ' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -7688,7 +7706,8 @@ MonoBehaviour: \uC785\uB825\uD574\uC8FC\uC138\uC694." m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -8027,7 +8046,8 @@ MonoBehaviour: m_text: "\uD558" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -8175,7 +8195,8 @@ MonoBehaviour: m_text: "\uCE6D\uD638\n\uD68D\uB4DD" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -8622,7 +8643,8 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -9025,7 +9047,8 @@ MonoBehaviour: m_text: "\uB370\uBBF8\uC9C0 \uD14D\uC2A4\uD2B8" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -9172,7 +9195,8 @@ MonoBehaviour: m_text: "\u200B" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -9730,7 +9754,8 @@ MonoBehaviour: m_text: "\uC800\uC7A5 \uD6C4 \uC885\uB8CC" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -10359,7 +10384,8 @@ MonoBehaviour: m_text: "\uAC1C\uC778\uC815\uBCF4\uBCF4\uD638" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -10661,7 +10687,8 @@ MonoBehaviour: m_text: "ID\uBCF5\uC0AC" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -10808,7 +10835,8 @@ MonoBehaviour: m_text: 000% m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -11093,7 +11121,8 @@ MonoBehaviour: m_text: "\uCD5C\uC885\uC0AC\uC6A9\uC790 \uC0AC\uC6A9\uAD8C\uACC4\uC57D" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -11521,7 +11550,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 759142fbeffc950408496b35ae56cb60, type: 3} m_Name: m_EditorClassIdentifier: - m_DelInput: {fileID: 0} + m_DelInput: {fileID: 7143491791720879777} --- !u!1 &9127383036445495999 GameObject: m_ObjectHideFlags: 0 @@ -11627,7 +11656,8 @@ MonoBehaviour: m_text: "\uC54C\uB9BC" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2} - m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2} + m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] diff --git a/Assets/Res_Addr/Skill/Skill_JumpAttack.prefab b/Assets/Res_Addr/Skill/Skill_JumpAttack.prefab index 4598bd975..80a5d7618 100644 --- a/Assets/Res_Addr/Skill/Skill_JumpAttack.prefab +++ b/Assets/Res_Addr/Skill/Skill_JumpAttack.prefab @@ -47,6 +47,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Pierce: 1 + str_HitEffect: m_boxcollider: {fileID: 2009372462553340028} tf_size: {fileID: 42817849891820990} --- !u!65 &2009372462553340028 @@ -64,7 +65,7 @@ BoxCollider: serializedVersion: 2 m_Bits: 0 m_LayerOverridePriority: 0 - m_IsTrigger: 0 + m_IsTrigger: 1 m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 @@ -78,47 +79,58 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 400006} m_Modifications: - - target: {fileID: 1560884731958041555, guid: 02736e0cc51a28d45b76c57135951d77, type: 3} + - target: {fileID: 1560884731958041555, guid: 02736e0cc51a28d45b76c57135951d77, + type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1560884731958041555, guid: 02736e0cc51a28d45b76c57135951d77, type: 3} + - target: {fileID: 1560884731958041555, guid: 02736e0cc51a28d45b76c57135951d77, + type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1560884731958041555, guid: 02736e0cc51a28d45b76c57135951d77, type: 3} + - target: {fileID: 1560884731958041555, guid: 02736e0cc51a28d45b76c57135951d77, + type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1560884731958041555, guid: 02736e0cc51a28d45b76c57135951d77, type: 3} + - target: {fileID: 1560884731958041555, guid: 02736e0cc51a28d45b76c57135951d77, + type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 1560884731958041555, guid: 02736e0cc51a28d45b76c57135951d77, type: 3} + - target: {fileID: 1560884731958041555, guid: 02736e0cc51a28d45b76c57135951d77, + type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1560884731958041555, guid: 02736e0cc51a28d45b76c57135951d77, type: 3} + - target: {fileID: 1560884731958041555, guid: 02736e0cc51a28d45b76c57135951d77, + type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1560884731958041555, guid: 02736e0cc51a28d45b76c57135951d77, type: 3} + - target: {fileID: 1560884731958041555, guid: 02736e0cc51a28d45b76c57135951d77, + type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1560884731958041555, guid: 02736e0cc51a28d45b76c57135951d77, type: 3} + - target: {fileID: 1560884731958041555, guid: 02736e0cc51a28d45b76c57135951d77, + type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1560884731958041555, guid: 02736e0cc51a28d45b76c57135951d77, type: 3} + - target: {fileID: 1560884731958041555, guid: 02736e0cc51a28d45b76c57135951d77, + type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1560884731958041555, guid: 02736e0cc51a28d45b76c57135951d77, type: 3} + - target: {fileID: 1560884731958041555, guid: 02736e0cc51a28d45b76c57135951d77, + type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3181084675663545699, guid: 02736e0cc51a28d45b76c57135951d77, type: 3} + - target: {fileID: 3181084675663545699, guid: 02736e0cc51a28d45b76c57135951d77, + type: 3} propertyPath: m_Name value: FX_Fire_Exp objectReference: {fileID: 0} @@ -129,6 +141,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 02736e0cc51a28d45b76c57135951d77, type: 3} --- !u!4 &42817849891820990 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1560884731958041555, guid: 02736e0cc51a28d45b76c57135951d77, type: 3} + m_CorrespondingSourceObject: {fileID: 1560884731958041555, guid: 02736e0cc51a28d45b76c57135951d77, + type: 3} m_PrefabInstance: {fileID: 1527141383468060269} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Script/Character/Projectile/Skill/Skill_JumpAttack.cs b/Assets/Script/Character/Projectile/Skill/Skill_JumpAttack.cs index fc6a4f9f9..f683c49a1 100644 --- a/Assets/Script/Character/Projectile/Skill/Skill_JumpAttack.cs +++ b/Assets/Script/Character/Projectile/Skill/Skill_JumpAttack.cs @@ -1,5 +1,4 @@ using System.Collections; -using System.Collections.Generic; using UnityEngine; public class Skill_JumpAttack : ProjectileBase @@ -30,7 +29,11 @@ public class Skill_JumpAttack : ProjectileBase IEnumerator Co_Update() { - yield return new WaitForSeconds(1f); + m_boxcollider.enabled = true; + yield return null; + yield return null; + m_boxcollider.enabled = false; + yield return new WaitForSeconds(4f); Off(true); } } \ No newline at end of file diff --git a/Assets/Script/UI/ETC/DelAccountUI.cs b/Assets/Script/UI/ETC/DelAccountUI.cs index 08449689e..f83011468 100644 --- a/Assets/Script/UI/ETC/DelAccountUI.cs +++ b/Assets/Script/UI/ETC/DelAccountUI.cs @@ -1,11 +1,8 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; +using TMPro; public class DelAccountUI : BackKeyAdd { - public InputField m_DelInput; + public TMP_InputField m_DelInput; public void Submit_DelAccount() {