diff --git a/Assets/Scenes/StatTest.unity b/Assets/Scenes/StatTest.unity index 6a9465797..a845e1650 100644 --- a/Assets/Scenes/StatTest.unity +++ b/Assets/Scenes/StatTest.unity @@ -174,63 +174,6 @@ MonoBehaviour: m_EditorClassIdentifier: m_Padding: {x: -8, y: -5, z: -8, w: -5} m_Softness: {x: 0, y: 0} ---- !u!1001 &168302688 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 5043163894663193716, guid: 2d20f62727d330b45b53a44adbb375e6, type: 3} - propertyPath: m_Name - value: Tables - objectReference: {fileID: 0} - - target: {fileID: 5043163894663193739, guid: 2d20f62727d330b45b53a44adbb375e6, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5043163894663193739, guid: 2d20f62727d330b45b53a44adbb375e6, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5043163894663193739, guid: 2d20f62727d330b45b53a44adbb375e6, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5043163894663193739, guid: 2d20f62727d330b45b53a44adbb375e6, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5043163894663193739, guid: 2d20f62727d330b45b53a44adbb375e6, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5043163894663193739, guid: 2d20f62727d330b45b53a44adbb375e6, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5043163894663193739, guid: 2d20f62727d330b45b53a44adbb375e6, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5043163894663193739, guid: 2d20f62727d330b45b53a44adbb375e6, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5043163894663193739, guid: 2d20f62727d330b45b53a44adbb375e6, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5043163894663193739, guid: 2d20f62727d330b45b53a44adbb375e6, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2d20f62727d330b45b53a44adbb375e6, type: 3} --- !u!1 &345014435 GameObject: m_ObjectHideFlags: 0 @@ -291,7 +234,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: [] @@ -583,7 +527,8 @@ MonoBehaviour: m_text: 10501,P 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: [] @@ -738,7 +683,8 @@ MonoBehaviour: m_text: "\uBC29\uC5B4\uB825 \uC785\uB825" 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: [] @@ -917,7 +863,8 @@ MonoBehaviour: m_text: Option A 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: [] @@ -1275,7 +1222,8 @@ MonoBehaviour: m_text: "\uACF5\uACA9" 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: [] @@ -1483,7 +1431,8 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: a0a1ac319e77ef140b43b984d481c840, type: 3} --- !u!4 &868091180 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4724027785898422, guid: a0a1ac319e77ef140b43b984d481c840, type: 3} + m_CorrespondingSourceObject: {fileID: 4724027785898422, guid: a0a1ac319e77ef140b43b984d481c840, + type: 3} m_PrefabInstance: {fileID: 868091179} m_PrefabAsset: {fileID: 0} --- !u!1 &929585363 @@ -1593,7 +1542,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: [] @@ -1669,7 +1619,8 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!114 &1104341995 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 8226558640170742542, guid: a0a1ac319e77ef140b43b984d481c840, type: 3} + m_CorrespondingSourceObject: {fileID: 8226558640170742542, guid: a0a1ac319e77ef140b43b984d481c840, + type: 3} m_PrefabInstance: {fileID: 868091179} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -1723,7 +1674,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: go_Camera: {fileID: 0} - go_tables: {fileID: 5043163894663193716, guid: 2d20f62727d330b45b53a44adbb375e6, type: 3} + go_tables: {fileID: 5043163894663193716, guid: 2d20f62727d330b45b53a44adbb375e6, + type: 3} actors: - {fileID: 1104341995} - {fileID: 1750301521} @@ -2027,67 +1979,83 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 4525569738805394788, guid: e3c4be67fc01ba74e89bad5eeb0de437, type: 3} + - target: {fileID: 4525569738805394788, guid: e3c4be67fc01ba74e89bad5eeb0de437, + type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 4525569738805394788, guid: e3c4be67fc01ba74e89bad5eeb0de437, type: 3} + - target: {fileID: 4525569738805394788, guid: e3c4be67fc01ba74e89bad5eeb0de437, + type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4525569738805394788, guid: e3c4be67fc01ba74e89bad5eeb0de437, type: 3} + - target: {fileID: 4525569738805394788, guid: e3c4be67fc01ba74e89bad5eeb0de437, + type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4525569738805394788, guid: e3c4be67fc01ba74e89bad5eeb0de437, type: 3} + - target: {fileID: 4525569738805394788, guid: e3c4be67fc01ba74e89bad5eeb0de437, + type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4525569738805394788, guid: e3c4be67fc01ba74e89bad5eeb0de437, type: 3} + - target: {fileID: 4525569738805394788, guid: e3c4be67fc01ba74e89bad5eeb0de437, + type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4525569738805394788, guid: e3c4be67fc01ba74e89bad5eeb0de437, type: 3} + - target: {fileID: 4525569738805394788, guid: e3c4be67fc01ba74e89bad5eeb0de437, + type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4525569738805394788, guid: e3c4be67fc01ba74e89bad5eeb0de437, type: 3} + - target: {fileID: 4525569738805394788, guid: e3c4be67fc01ba74e89bad5eeb0de437, + type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4525569738805394788, guid: e3c4be67fc01ba74e89bad5eeb0de437, type: 3} + - target: {fileID: 4525569738805394788, guid: e3c4be67fc01ba74e89bad5eeb0de437, + type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4525569738805394788, guid: e3c4be67fc01ba74e89bad5eeb0de437, type: 3} + - target: {fileID: 4525569738805394788, guid: e3c4be67fc01ba74e89bad5eeb0de437, + type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4525569738805394788, guid: e3c4be67fc01ba74e89bad5eeb0de437, type: 3} + - target: {fileID: 4525569738805394788, guid: e3c4be67fc01ba74e89bad5eeb0de437, + type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4525569738805394788, guid: e3c4be67fc01ba74e89bad5eeb0de437, type: 3} + - target: {fileID: 4525569738805394788, guid: e3c4be67fc01ba74e89bad5eeb0de437, + type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4525569738805394789, guid: e3c4be67fc01ba74e89bad5eeb0de437, type: 3} + - target: {fileID: 4525569738805394789, guid: e3c4be67fc01ba74e89bad5eeb0de437, + type: 3} propertyPath: tf_PetBattleCam value: objectReference: {fileID: 0} - - target: {fileID: 4525569738805394789, guid: e3c4be67fc01ba74e89bad5eeb0de437, type: 3} + - target: {fileID: 4525569738805394789, guid: e3c4be67fc01ba74e89bad5eeb0de437, + type: 3} propertyPath: mat_SkyBox.Array.size value: 2 objectReference: {fileID: 0} - - target: {fileID: 4525569738805394789, guid: e3c4be67fc01ba74e89bad5eeb0de437, type: 3} + - target: {fileID: 4525569738805394789, guid: e3c4be67fc01ba74e89bad5eeb0de437, + type: 3} propertyPath: mat_SkyBox.Array.data[0] value: objectReference: {fileID: 2100000, guid: b94a90c9516c9cc42bf2d46a3d63a76a, type: 2} - - target: {fileID: 4525569738805394789, guid: e3c4be67fc01ba74e89bad5eeb0de437, type: 3} + - target: {fileID: 4525569738805394789, guid: e3c4be67fc01ba74e89bad5eeb0de437, + type: 3} propertyPath: mat_SkyBox.Array.data[1] value: objectReference: {fileID: 2100000, guid: 5390ccc6cbba36142a51bb2d8a8b582d, type: 2} - - target: {fileID: 4525569738805394790, guid: e3c4be67fc01ba74e89bad5eeb0de437, type: 3} + - target: {fileID: 4525569738805394790, guid: e3c4be67fc01ba74e89bad5eeb0de437, + type: 3} propertyPath: m_Name value: InGameInfo objectReference: {fileID: 0} @@ -2274,7 +2242,8 @@ MonoBehaviour: m_text: "\uBA48\uCDA4" 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: [] @@ -2573,7 +2542,8 @@ MonoBehaviour: -10\n" 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: [] @@ -2728,7 +2698,8 @@ MonoBehaviour: m_text: "\uB9C8\uBC95\uC800\uD56D\uB825 \uC785\uB825" 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: [] @@ -2971,7 +2942,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: [] @@ -3492,47 +3464,58 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1602866066306103301, guid: 35cc51d1c9df5c84cb39e0005f798da6, type: 3} + - target: {fileID: 1602866066306103301, guid: 35cc51d1c9df5c84cb39e0005f798da6, + type: 3} propertyPath: m_Name value: ActorInfo objectReference: {fileID: 0} - - target: {fileID: 4462996344097564095, guid: 35cc51d1c9df5c84cb39e0005f798da6, type: 3} + - target: {fileID: 4462996344097564095, guid: 35cc51d1c9df5c84cb39e0005f798da6, + type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4462996344097564095, guid: 35cc51d1c9df5c84cb39e0005f798da6, type: 3} + - target: {fileID: 4462996344097564095, guid: 35cc51d1c9df5c84cb39e0005f798da6, + type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4462996344097564095, guid: 35cc51d1c9df5c84cb39e0005f798da6, type: 3} + - target: {fileID: 4462996344097564095, guid: 35cc51d1c9df5c84cb39e0005f798da6, + type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4462996344097564095, guid: 35cc51d1c9df5c84cb39e0005f798da6, type: 3} + - target: {fileID: 4462996344097564095, guid: 35cc51d1c9df5c84cb39e0005f798da6, + type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4462996344097564095, guid: 35cc51d1c9df5c84cb39e0005f798da6, type: 3} + - target: {fileID: 4462996344097564095, guid: 35cc51d1c9df5c84cb39e0005f798da6, + type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4462996344097564095, guid: 35cc51d1c9df5c84cb39e0005f798da6, type: 3} + - target: {fileID: 4462996344097564095, guid: 35cc51d1c9df5c84cb39e0005f798da6, + type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4462996344097564095, guid: 35cc51d1c9df5c84cb39e0005f798da6, type: 3} + - target: {fileID: 4462996344097564095, guid: 35cc51d1c9df5c84cb39e0005f798da6, + type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4462996344097564095, guid: 35cc51d1c9df5c84cb39e0005f798da6, type: 3} + - target: {fileID: 4462996344097564095, guid: 35cc51d1c9df5c84cb39e0005f798da6, + type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4462996344097564095, guid: 35cc51d1c9df5c84cb39e0005f798da6, type: 3} + - target: {fileID: 4462996344097564095, guid: 35cc51d1c9df5c84cb39e0005f798da6, + type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4462996344097564095, guid: 35cc51d1c9df5c84cb39e0005f798da6, type: 3} + - target: {fileID: 4462996344097564095, guid: 35cc51d1c9df5c84cb39e0005f798da6, + type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} @@ -3746,47 +3729,58 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1674009201} m_Modifications: - - target: {fileID: 3725766207750886639, guid: e805f9d8dd8b3ff4a8745d5d11a49771, type: 3} + - target: {fileID: 3725766207750886639, guid: e805f9d8dd8b3ff4a8745d5d11a49771, + type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3725766207750886639, guid: e805f9d8dd8b3ff4a8745d5d11a49771, type: 3} + - target: {fileID: 3725766207750886639, guid: e805f9d8dd8b3ff4a8745d5d11a49771, + type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3725766207750886639, guid: e805f9d8dd8b3ff4a8745d5d11a49771, type: 3} + - target: {fileID: 3725766207750886639, guid: e805f9d8dd8b3ff4a8745d5d11a49771, + type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3725766207750886639, guid: e805f9d8dd8b3ff4a8745d5d11a49771, type: 3} + - target: {fileID: 3725766207750886639, guid: e805f9d8dd8b3ff4a8745d5d11a49771, + type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3725766207750886639, guid: e805f9d8dd8b3ff4a8745d5d11a49771, type: 3} + - target: {fileID: 3725766207750886639, guid: e805f9d8dd8b3ff4a8745d5d11a49771, + type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3725766207750886639, guid: e805f9d8dd8b3ff4a8745d5d11a49771, type: 3} + - target: {fileID: 3725766207750886639, guid: e805f9d8dd8b3ff4a8745d5d11a49771, + type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3725766207750886639, guid: e805f9d8dd8b3ff4a8745d5d11a49771, type: 3} + - target: {fileID: 3725766207750886639, guid: e805f9d8dd8b3ff4a8745d5d11a49771, + type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3725766207750886639, guid: e805f9d8dd8b3ff4a8745d5d11a49771, type: 3} + - target: {fileID: 3725766207750886639, guid: e805f9d8dd8b3ff4a8745d5d11a49771, + type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3725766207750886639, guid: e805f9d8dd8b3ff4a8745d5d11a49771, type: 3} + - target: {fileID: 3725766207750886639, guid: e805f9d8dd8b3ff4a8745d5d11a49771, + type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3725766207750886639, guid: e805f9d8dd8b3ff4a8745d5d11a49771, type: 3} + - target: {fileID: 3725766207750886639, guid: e805f9d8dd8b3ff4a8745d5d11a49771, + type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4107076207199456853, guid: e805f9d8dd8b3ff4a8745d5d11a49771, type: 3} + - target: {fileID: 4107076207199456853, guid: e805f9d8dd8b3ff4a8745d5d11a49771, + type: 3} propertyPath: m_Name value: Goblin_Warrior objectReference: {fileID: 0} @@ -3797,12 +3791,14 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: e805f9d8dd8b3ff4a8745d5d11a49771, type: 3} --- !u!4 &1750301516 stripped Transform: - m_CorrespondingSourceObject: {fileID: 3725766207750886639, guid: e805f9d8dd8b3ff4a8745d5d11a49771, type: 3} + m_CorrespondingSourceObject: {fileID: 3725766207750886639, guid: e805f9d8dd8b3ff4a8745d5d11a49771, + type: 3} m_PrefabInstance: {fileID: 1750301515} m_PrefabAsset: {fileID: 0} --- !u!114 &1750301521 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: -1692285124782786509, guid: e805f9d8dd8b3ff4a8745d5d11a49771, type: 3} + m_CorrespondingSourceObject: {fileID: -1692285124782786509, guid: e805f9d8dd8b3ff4a8745d5d11a49771, + type: 3} m_PrefabInstance: {fileID: 1750301515} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -4460,7 +4456,8 @@ MonoBehaviour: m_text: "\uACF5\uACA9\uD0C0\uC785 : " 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: [] @@ -4613,7 +4610,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: [] @@ -4702,4 +4700,3 @@ SceneRoots: - {fileID: 1544000319} - {fileID: 566502202} - {fileID: 1645088202} - - {fileID: 168302688} diff --git a/Assets/Script/Character/PC/PCCostumeSetting.cs b/Assets/Script/Character/PC/PCCostumeSetting.cs new file mode 100644 index 000000000..baef5a617 --- /dev/null +++ b/Assets/Script/Character/PC/PCCostumeSetting.cs @@ -0,0 +1,9 @@ +using UnityEngine; + +public class PCCostumeSetting : MonoBehaviour +{ + [Header("Root Bone, ±âº»Àº Root_M")] + public Transform Root_M; + public Transform Hair_Root; + public Transform Knee_L; +} \ No newline at end of file diff --git a/Assets/Script/Character/PC/PCUIActor.cs.meta b/Assets/Script/Character/PC/PCCostumeSetting.cs.meta similarity index 83% rename from Assets/Script/Character/PC/PCUIActor.cs.meta rename to Assets/Script/Character/PC/PCCostumeSetting.cs.meta index ff825a495..385fee2b5 100644 --- a/Assets/Script/Character/PC/PCUIActor.cs.meta +++ b/Assets/Script/Character/PC/PCCostumeSetting.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d4b49bb791ae71e448dcd9961abb784c +guid: 100b8ac30f1e90c42a6579ed6b552453 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Script/Character/PC/PCUIActor.cs b/Assets/Script/Character/PC/PCUIActor.cs deleted file mode 100644 index 5c7bdfb1a..000000000 --- a/Assets/Script/Character/PC/PCUIActor.cs +++ /dev/null @@ -1,11 +0,0 @@ -using UnityEngine; - -public class PCUIActor : MonoBehaviour -{ - public Transform tf_Head; - - public void Set(int costumeid) - { - - } -} diff --git a/Assets/Script/Character/PCActor.cs b/Assets/Script/Character/PCActor.cs index dc9024fe1..6c2913348 100644 --- a/Assets/Script/Character/PCActor.cs +++ b/Assets/Script/Character/PCActor.cs @@ -1,8 +1,7 @@ -using CodeStage.AntiCheat.ObscuredTypes; using System.Collections; +using CodeStage.AntiCheat.ObscuredTypes; using UnityEngine; using UnityEngine.AI; -using UnityEngine.Rendering.Universal; using UnityEngine.ResourceManagement.AsyncOperations; public class PCActor : MyActor diff --git a/Assets/Script/Info/InGameInfo.cs b/Assets/Script/Info/InGameInfo.cs index 03b01cff6..dff9ba348 100644 --- a/Assets/Script/Info/InGameInfo.cs +++ b/Assets/Script/Info/InGameInfo.cs @@ -73,6 +73,26 @@ public partial class InGameInfo : MyCoroutine { Set_Init(); + while (!TableChecker.Ins.CheckAllLoad()) yield return new WaitForSeconds(0.1f); + + var lst = table_effectlist.Ins.Get_DataList(1); + for (int i = 0; i < lst.Count; i++) + { + dic_str_Effect.Add(lst[i].s_EffectPrefab, new List()); + for (int j = 0; j < lst[i].n_PreLoadCount; j++) + Load_Effect(lst[i].s_EffectPrefab, effect => { effect.transform.position = Vector3.one * 100000f; }); + } + + var skilllst = table_skilllist.Ins.Get_DataList(); + for (int i = 0; i < skilllst.Count; i++) + { + if (skilllst[i].e_SkillType == eSkillType.Active && skilllst[i].e_Skill != eEffect.None) + { + for (int j = 0; j < 2; j++) + Load_Skill(skilllst[i].e_Skill, list_projectileData[0], true); + } + } + #if UNITY_EDITOR if (UnityEngine.SceneManagement.SceneManager.GetActiveScene().name == "StatTest") yield break; #endif @@ -93,24 +113,6 @@ public partial class InGameInfo : MyCoroutine } }); - var lst = table_effectlist.Ins.Get_DataList(1); - for (int i = 0; i < lst.Count; i++) - { - dic_str_Effect.Add(lst[i].s_EffectPrefab, new List()); - for (int j = 0; j < lst[i].n_PreLoadCount; j++) - Load_Effect(lst[i].s_EffectPrefab, effect => { effect.transform.position = Vector3.one * 100000f; }); - } - - var skilllst = table_skilllist.Ins.Get_DataList(); - for (int i = 0; i < skilllst.Count; i++) - { - if (skilllst[i].e_SkillType == eSkillType.Active && skilllst[i].e_Skill != eEffect.None) - { - for (int j = 0; j < 2; j++) - Load_Skill(skilllst[i].e_Skill, list_projectileData[0], true); - } - } - //var sinfo = ServerInfo.Ins; //Init_StageInfo(eGameMode.Stage, sinfo.m_ServerData.Get_Common(eCommon.TotalStage)); diff --git a/Assets/Script/Info/ProjectileInfo.cs b/Assets/Script/Info/ProjectileInfo.cs index 4858f3563..31579d0ee 100644 --- a/Assets/Script/Info/ProjectileInfo.cs +++ b/Assets/Script/Info/ProjectileInfo.cs @@ -1,4 +1,5 @@ using System; +using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -11,8 +12,10 @@ public class ProjectileInfo : MonoBehaviour Dictionary> dic_projectile = new Dictionary>(); private void Awake() { Ins = this; } - private void Start() + IEnumerator Start() { + while (!TableChecker.Ins.CheckAllLoad()) yield return new WaitForSeconds(0.1f); + var lst = table_effectlist.Ins.Get_DataList(2); for (int i = 0; i < lst.Count; i++) {