diff --git a/GGJ26/Assets/00. Scenes/GameScene.unity b/GGJ26/Assets/00. Scenes/GameScene.unity index e44f3693..82e51a78 100644 --- a/GGJ26/Assets/00. Scenes/GameScene.unity +++ b/GGJ26/Assets/00. Scenes/GameScene.unity @@ -447,22 +447,56 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f46531d753859f247b47dda185b9f879, type: 3} ---- !u!224 &104376710 stripped +--- !u!224 &104376710 RectTransform: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 7074826353625731979, guid: f46531d753859f247b47dda185b9f879, type: 3} m_PrefabInstance: {fileID: 104376709} m_PrefabAsset: {fileID: 0} ---- !u!114 &104376711 stripped + m_GameObject: {fileID: 939361513} + 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: 1118244626} + m_Father: {fileID: 1695858070} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &104376711 MonoBehaviour: + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 8326463689724516001, guid: f46531d753859f247b47dda185b9f879, type: 3} m_PrefabInstance: {fileID: 104376709} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 1118244625} 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: 0.9169811, g: 0.8665183, b: 0.78721964, 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: 3ecc6985fd3118c428791eabadcafff3, 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 &123334091 GameObject: m_ObjectHideFlags: 0 @@ -1054,23 +1088,23 @@ PrefabInstance: m_Modifications: - target: {fileID: 1955124880554604294, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1955124880554604294, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1955124880554604294, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_SizeDelta.y - value: 60 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1955124880554604294, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_AnchoredPosition.x - value: 220 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1955124880554604294, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_AnchoredPosition.y - value: -30 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2703702828674584571, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_AnchoredPosition.y @@ -1082,19 +1116,19 @@ PrefabInstance: objectReference: {fileID: 3057443541341520541, guid: 149438a78b9ddf64f985bba40623484f, type: 2} - target: {fileID: 4096111968992185922, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4096111968992185922, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4096111968992185922, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_AnchoredPosition.x - value: 60 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4096111968992185922, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_AnchoredPosition.y - value: -30 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5864320197405340098, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_Name @@ -1102,50 +1136,57 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5864320197405340098, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6424219116693791384, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6424219116693791384, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6424219116693791384, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_AnchoredPosition.y - value: -30 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7340507613085297675, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7340507613085297675, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7340507613085297675, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_SizeDelta.y - value: 60 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7340507613085297675, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_AnchoredPosition.y - value: -30 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7608743129560077454, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_text - value: "1~4 \uBC88 \uC73C \uB85C \uC0AC \uBCF4 \uD0C0 \uC9C0 \uB97C \uC120 - \uD0DD \uD55C \uB4A4, \uC88C \uD074 \uB9AD \uC73C \uB85C \uC0AC \uC6A9 - \uD558 \uC138 \uC694" + value: "1~3\uBC88\uC73C\uB85C \uC0AC\uBCF4\uD0C0\uC9C0\uB97C \uC120\uD0DD\uD55C + \uB4A4, \uC88C\uD074\uB9AD\uC73C\uB85C \uC0AC\uC6A9\uD558\uC138\uC694." objectReference: {fileID: 0} + - target: {fileID: 7608743129560077454, guid: 92614d2fb343e974096c776121c586df, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 31a935864e998ea44b18225067b123ed, type: 2} - target: {fileID: 7608743129560077454, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_sharedMaterial value: - objectReference: {fileID: 3057443541341520541, guid: 149438a78b9ddf64f985bba40623484f, type: 2} + objectReference: {fileID: -2260817174147279965, guid: 31a935864e998ea44b18225067b123ed, type: 2} - target: {fileID: 7608743129560077454, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_characterSpacing value: 20 objectReference: {fileID: 0} + - target: {fileID: 7608743129560077454, guid: 92614d2fb343e974096c776121c586df, type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8060342138376238391, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_Pivot.x value: 0 @@ -1236,35 +1277,35 @@ PrefabInstance: objectReference: {fileID: 1227170227} - target: {fileID: 8768093098050276929, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8768093098050276929, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8768093098050276929, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_AnchoredPosition.x - value: 180 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8768093098050276929, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_AnchoredPosition.y - value: -30 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8921745068998666944, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8921745068998666944, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8921745068998666944, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_AnchoredPosition.x - value: 120 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8921745068998666944, guid: 92614d2fb343e974096c776121c586df, type: 3} propertyPath: m_AnchoredPosition.y - value: -30 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -2627,6 +2668,85 @@ Transform: m_Children: [] m_Father: {fileID: 208437555} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &939361513 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 2019698660425068524, guid: f46531d753859f247b47dda185b9f879, type: 3} + m_PrefabInstance: {fileID: 104376709} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 104376710} + - component: {fileID: 939361516} + - component: {fileID: 939361515} + - component: {fileID: 939361514} + m_Layer: 0 + m_Name: DancingFrame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!95 &939361514 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 8251572424446400650, guid: f46531d753859f247b47dda185b9f879, type: 3} + m_PrefabInstance: {fileID: 104376709} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 939361513} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &939361515 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 4374140808557276853, guid: f46531d753859f247b47dda185b9f879, type: 3} + m_PrefabInstance: {fileID: 104376709} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 939361513} + 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: 0.9169811, g: 0.8665183, b: 0.78721964, 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: f773a6266d3e5c04db5f03ec9aa7dcae, 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!222 &939361516 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 37991342204714911, guid: f46531d753859f247b47dda185b9f879, type: 3} + m_PrefabInstance: {fileID: 104376709} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 939361513} + m_CullTransparentMesh: 1 --- !u!1001 &982182053 PrefabInstance: m_ObjectHideFlags: 0 @@ -2837,6 +2957,74 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d6a8601e9f0d4671827226ba42891836, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1118244625 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 6119947357152554167, guid: f46531d753859f247b47dda185b9f879, type: 3} + m_PrefabInstance: {fileID: 104376709} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1118244626} + - component: {fileID: 1118244628} + - component: {fileID: 104376711} + - component: {fileID: 1118244627} + m_Layer: 5 + m_Name: DancingSprite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1118244626 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 6308442711372850810, guid: f46531d753859f247b47dda185b9f879, type: 3} + m_PrefabInstance: {fileID: 104376709} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1118244625} + 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: 104376710} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 1} +--- !u!95 &1118244627 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 2541075803767643462, guid: f46531d753859f247b47dda185b9f879, type: 3} + m_PrefabInstance: {fileID: 104376709} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1118244625} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: bcd6e2112de6b5c4da940bb6557dbe62, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!222 &1118244628 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 6220509141481251058, guid: f46531d753859f247b47dda185b9f879, type: 3} + m_PrefabInstance: {fileID: 104376709} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1118244625} + m_CullTransparentMesh: 1 --- !u!1 &1119706801 GameObject: m_ObjectHideFlags: 0 @@ -3421,11 +3609,11 @@ PrefabInstance: - target: {fileID: 3068320819059351711, guid: 84a3ea2ba79765b4d9c27f1c4d411437, type: 3} propertyPath: m_fontAsset value: - objectReference: {fileID: 11400000, guid: 149438a78b9ddf64f985bba40623484f, type: 2} + objectReference: {fileID: 11400000, guid: d85e42e3a4a1de149945edeb913891f8, type: 2} - target: {fileID: 3068320819059351711, guid: 84a3ea2ba79765b4d9c27f1c4d411437, type: 3} propertyPath: m_sharedMaterial value: - objectReference: {fileID: 3057443541341520541, guid: 149438a78b9ddf64f985bba40623484f, type: 2} + objectReference: {fileID: 3057443541341520541, guid: d85e42e3a4a1de149945edeb913891f8, type: 2} - target: {fileID: 3068320819059351711, guid: 84a3ea2ba79765b4d9c27f1c4d411437, type: 3} propertyPath: m_hasFontAssetChanged value: 0 @@ -3437,11 +3625,11 @@ PrefabInstance: - target: {fileID: 3688759085604436148, guid: 84a3ea2ba79765b4d9c27f1c4d411437, type: 3} propertyPath: m_fontAsset value: - objectReference: {fileID: 11400000, guid: 149438a78b9ddf64f985bba40623484f, type: 2} + objectReference: {fileID: 11400000, guid: d85e42e3a4a1de149945edeb913891f8, type: 2} - target: {fileID: 3688759085604436148, guid: 84a3ea2ba79765b4d9c27f1c4d411437, type: 3} propertyPath: m_sharedMaterial value: - objectReference: {fileID: 3057443541341520541, guid: 149438a78b9ddf64f985bba40623484f, type: 2} + objectReference: {fileID: 3057443541341520541, guid: d85e42e3a4a1de149945edeb913891f8, type: 2} - target: {fileID: 3688759085604436148, guid: 84a3ea2ba79765b4d9c27f1c4d411437, type: 3} propertyPath: m_hasFontAssetChanged value: 0 @@ -3597,11 +3785,11 @@ PrefabInstance: - target: {fileID: 5833704310267826998, guid: 84a3ea2ba79765b4d9c27f1c4d411437, type: 3} propertyPath: m_fontAsset value: - objectReference: {fileID: 11400000, guid: 149438a78b9ddf64f985bba40623484f, type: 2} + objectReference: {fileID: 11400000, guid: d85e42e3a4a1de149945edeb913891f8, type: 2} - target: {fileID: 5833704310267826998, guid: 84a3ea2ba79765b4d9c27f1c4d411437, type: 3} propertyPath: m_sharedMaterial value: - objectReference: {fileID: 3057443541341520541, guid: 149438a78b9ddf64f985bba40623484f, type: 2} + objectReference: {fileID: 3057443541341520541, guid: d85e42e3a4a1de149945edeb913891f8, type: 2} - target: {fileID: 5833704310267826998, guid: 84a3ea2ba79765b4d9c27f1c4d411437, type: 3} propertyPath: m_hasFontAssetChanged value: 0 @@ -3817,11 +4005,11 @@ PrefabInstance: - target: {fileID: 7942961587618894049, guid: 84a3ea2ba79765b4d9c27f1c4d411437, type: 3} propertyPath: m_fontAsset value: - objectReference: {fileID: 11400000, guid: 149438a78b9ddf64f985bba40623484f, type: 2} + objectReference: {fileID: 11400000, guid: d85e42e3a4a1de149945edeb913891f8, type: 2} - target: {fileID: 7942961587618894049, guid: 84a3ea2ba79765b4d9c27f1c4d411437, type: 3} propertyPath: m_sharedMaterial value: - objectReference: {fileID: 3057443541341520541, guid: 149438a78b9ddf64f985bba40623484f, type: 2} + objectReference: {fileID: 3057443541341520541, guid: d85e42e3a4a1de149945edeb913891f8, type: 2} - target: {fileID: 7942961587618894049, guid: 84a3ea2ba79765b4d9c27f1c4d411437, type: 3} propertyPath: m_hasFontAssetChanged value: 0 @@ -3869,11 +4057,11 @@ PrefabInstance: - target: {fileID: 8338337903233460026, guid: 84a3ea2ba79765b4d9c27f1c4d411437, type: 3} propertyPath: m_fontAsset value: - objectReference: {fileID: 11400000, guid: 149438a78b9ddf64f985bba40623484f, type: 2} + objectReference: {fileID: 11400000, guid: d85e42e3a4a1de149945edeb913891f8, type: 2} - target: {fileID: 8338337903233460026, guid: 84a3ea2ba79765b4d9c27f1c4d411437, type: 3} propertyPath: m_sharedMaterial value: - objectReference: {fileID: 3057443541341520541, guid: 149438a78b9ddf64f985bba40623484f, type: 2} + objectReference: {fileID: 3057443541341520541, guid: d85e42e3a4a1de149945edeb913891f8, type: 2} - target: {fileID: 8338337903233460026, guid: 84a3ea2ba79765b4d9c27f1c4d411437, type: 3} propertyPath: m_hasFontAssetChanged value: 0 diff --git a/GGJ26/Assets/00. Scenes/WaitingRoom.unity b/GGJ26/Assets/00. Scenes/WaitingRoom.unity index 7f550960..9007b93c 100644 --- a/GGJ26/Assets/00. Scenes/WaitingRoom.unity +++ b/GGJ26/Assets/00. Scenes/WaitingRoom.unity @@ -279,7 +279,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Path: {fileID: 574659247} - m_PathPosition: 3.5229394 + m_PathPosition: 3.5456285 m_PositionUnits: 0 m_PathOffset: {x: 0, y: 0, z: 0} m_XDamping: 0 @@ -538,8 +538,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 371226636} serializedVersion: 2 - m_LocalRotation: {x: 0.23461814, y: 0.39889708, z: -0.10634184, w: 0.8800721} - m_LocalPosition: {x: -4.5089183, y: 4.0455256, z: -3.9520862} + m_LocalRotation: {x: 0.22454718, y: 0.40017107, z: -0.101803534, w: 0.88265383} + m_LocalPosition: {x: -4.247977, y: 4.0455256, z: -4.2428217} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -846,7 +846,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3893294197879345259, guid: 076210ecccf349c99ea75e8cb774b089, type: 3} propertyPath: m_LocalPosition.x - value: -2.4249878 + value: -2.1958594 objectReference: {fileID: 0} - target: {fileID: 3893294197879345259, guid: 076210ecccf349c99ea75e8cb774b089, type: 3} propertyPath: m_LocalPosition.y @@ -854,7 +854,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3893294197879345259, guid: 076210ecccf349c99ea75e8cb774b089, type: 3} propertyPath: m_LocalPosition.z - value: -2.8400269 + value: -3.1259441 objectReference: {fileID: 0} - target: {fileID: 3893294197879345259, guid: 076210ecccf349c99ea75e8cb774b089, type: 3} propertyPath: m_LocalRotation.w @@ -1005,8 +1005,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 496710720} serializedVersion: 2 - m_LocalRotation: {x: 0.23461817, y: 0.39889717, z: -0.10634189, w: 0.88007206} - m_LocalPosition: {x: -4.5089183, y: 4.0455256, z: -3.9520862} + m_LocalRotation: {x: 0.22454718, y: 0.4001711, z: -0.10180356, w: 0.8826538} + m_LocalPosition: {x: -4.247977, y: 4.0455256, z: -4.2428217} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2320,7 +2320,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3893294197879345259, guid: 076210ecccf349c99ea75e8cb774b089, type: 3} propertyPath: m_LocalPosition.x - value: -3.046997 + value: -2.8178687 objectReference: {fileID: 0} - target: {fileID: 3893294197879345259, guid: 076210ecccf349c99ea75e8cb774b089, type: 3} propertyPath: m_LocalPosition.y @@ -2328,7 +2328,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3893294197879345259, guid: 076210ecccf349c99ea75e8cb774b089, type: 3} propertyPath: m_LocalPosition.z - value: -2.0570548 + value: -2.3429723 objectReference: {fileID: 0} - target: {fileID: 3893294197879345259, guid: 076210ecccf349c99ea75e8cb774b089, type: 3} propertyPath: m_LocalRotation.w @@ -2437,6 +2437,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: gameScenePath: Assets/00. Scenes/GameScene.unity + deathmatchScenePath: Assets/00. Scenes/DeathMatchGameScene.unity waitingRoomScenePath: Assets/00. Scenes/WaitingRoom.unity ensureFusionVoiceClient: 1 voiceAutoConnectAndJoin: 0 @@ -2585,7 +2586,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3893294197879345259, guid: 076210ecccf349c99ea75e8cb774b089, type: 3} propertyPath: m_LocalPosition.x - value: -3.6691284 + value: -3.44 objectReference: {fileID: 0} - target: {fileID: 3893294197879345259, guid: 076210ecccf349c99ea75e8cb774b089, type: 3} propertyPath: m_LocalPosition.y @@ -2593,7 +2594,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3893294197879345259, guid: 076210ecccf349c99ea75e8cb774b089, type: 3} propertyPath: m_LocalPosition.z - value: -1.2740825 + value: -1.56 objectReference: {fileID: 0} - target: {fileID: 3893294197879345259, guid: 076210ecccf349c99ea75e8cb774b089, type: 3} propertyPath: m_LocalRotation.w @@ -3498,7 +3499,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3893294197879345259, guid: 076210ecccf349c99ea75e8cb774b089, type: 3} propertyPath: m_LocalPosition.x - value: -1.8029175 + value: -1.5737891 objectReference: {fileID: 0} - target: {fileID: 3893294197879345259, guid: 076210ecccf349c99ea75e8cb774b089, type: 3} propertyPath: m_LocalPosition.y @@ -3506,7 +3507,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3893294197879345259, guid: 076210ecccf349c99ea75e8cb774b089, type: 3} propertyPath: m_LocalPosition.z - value: -3.6229994 + value: -3.908917 objectReference: {fileID: 0} - target: {fileID: 3893294197879345259, guid: 076210ecccf349c99ea75e8cb774b089, type: 3} propertyPath: m_LocalRotation.w diff --git a/GGJ26/Assets/01. Scripts/MaskNPC/NPCController.cs b/GGJ26/Assets/01. Scripts/MaskNPC/NPCController.cs index 4886f2f2..e4962d7b 100644 --- a/GGJ26/Assets/01. Scripts/MaskNPC/NPCController.cs +++ b/GGJ26/Assets/01. Scripts/MaskNPC/NPCController.cs @@ -116,10 +116,12 @@ private bool CanUseAgent [Networked] private float NetVerticalVelocity { get; set; } [Networked] public NetworkBool IsDead { get; private set; } [Networked] private NetworkBool IsDancing { get; set; } + [Networked] private TickTimer SabotageStunTimer { get; set; } private bool snappedToGroundOnDeath; private bool hasSpawned; private float deathGroundSnapUntilTime; private float nextDeathGroundSnapTime; + private Vector3 sabotageKnockbackVelocity; private void Start() { @@ -197,6 +199,37 @@ public override void FixedUpdateNetwork() return; } + if (IsSabotageStunned()) + { + if (CanUseAgent) + { + agent.isStopped = true; + } + + moveDirection = Vector3.zero; + GroundedCheck(); + JumpAndGravity(deltaTime); + + Vector3 horizontal = sabotageKnockbackVelocity; + horizontal.y = 0f; + controller.Move((horizontal + new Vector3(0f, verticalVelocity, 0f)) * deltaTime); + sabotageKnockbackVelocity = Vector3.Lerp(sabotageKnockbackVelocity, Vector3.zero, deltaTime * 10f); + + animationBlend = horizontal.magnitude; + animator.SetFloat(animIDSpeed, animationBlend); + animator.SetFloat(animIDMotionSpeed, horizontal.sqrMagnitude > 0.0001f ? 1f : 0f); + + if (Object != null && Object.HasStateAuthority) + { + NetAnimSpeed = animationBlend; + NetAnimMotionSpeed = horizontal.sqrMagnitude > 0.0001f ? 1f : 0f; + NetAnimGrounded = Grounded; + NetVerticalVelocity = verticalVelocity; + } + + return; + } + JumpAndGravity(deltaTime); GroundedCheck(); Move(deltaTime); @@ -399,6 +432,58 @@ public bool TriggerJump() return false; } + public void RequestSabotageStun(float durationSeconds, Vector3 knockbackDirection, float knockbackSpeed) + { + if (Object == null) + { + return; + } + + if (Object.HasStateAuthority) + { + ApplySabotageStunInternal(durationSeconds, knockbackDirection, knockbackSpeed); + return; + } + + RpcRequestSabotageStun(durationSeconds, knockbackDirection, knockbackSpeed); + } + + [Rpc(RpcSources.All, RpcTargets.StateAuthority)] + private void RpcRequestSabotageStun(float durationSeconds, Vector3 knockbackDirection, float knockbackSpeed) + { + ApplySabotageStunInternal(durationSeconds, knockbackDirection, knockbackSpeed); + } + + private void ApplySabotageStunInternal(float durationSeconds, Vector3 knockbackDirection, float knockbackSpeed) + { + if (Object == null || Object.HasStateAuthority == false || Runner == null || IsDead) + { + return; + } + + float clampedDuration = Mathf.Clamp(durationSeconds, 0.05f, 2f); + SabotageStunTimer = TickTimer.CreateFromSeconds(Runner, clampedDuration); + + Vector3 dir = knockbackDirection; + dir.y = 0f; + if (dir.sqrMagnitude < 0.0001f) + { + dir = transform.forward; + } + + sabotageKnockbackVelocity = dir.normalized * Mathf.Max(0f, knockbackSpeed); + } + + private bool IsSabotageStunned() + { + if (Runner == null) + { + return false; + } + + return SabotageStunTimer.ExpiredOrNotRunning(Runner) == false; + } + public void StartDance(int danceIndex) { if (IsDead) diff --git a/GGJ26/Assets/01. Scripts/Network/Deathmatch/DeathmatchMeleeAttack.cs b/GGJ26/Assets/01. Scripts/Network/Deathmatch/DeathmatchMeleeAttack.cs index e9207b49..8ecb6882 100644 --- a/GGJ26/Assets/01. Scripts/Network/Deathmatch/DeathmatchMeleeAttack.cs +++ b/GGJ26/Assets/01. Scripts/Network/Deathmatch/DeathmatchMeleeAttack.cs @@ -58,6 +58,11 @@ private void Update() return; } + if (motor != null && motor.IsDanceLocked) + { + return; + } + if (WasAttackPressedThisFrame() == false) { return; @@ -200,6 +205,11 @@ private bool CanStartAttackNow() return false; } + if (motor != null && motor.IsDanceLocked) + { + return false; + } + if (IsGroundedNow() == false) { return false; diff --git a/GGJ26/Assets/01. Scripts/Network/FusionThirdPersonMotor.cs b/GGJ26/Assets/01. Scripts/Network/FusionThirdPersonMotor.cs index fa12588e..35bde03a 100644 --- a/GGJ26/Assets/01. Scripts/Network/FusionThirdPersonMotor.cs +++ b/GGJ26/Assets/01. Scripts/Network/FusionThirdPersonMotor.cs @@ -45,6 +45,7 @@ public class FusionThirdPersonMotor : NetworkBehaviour [Networked] private int NetDanceIndex { get; set; } [Networked] private TickTimer SabotageStunTimer { get; set; } [Networked] private TickTimer MeleeMoveLockTimer { get; set; } + [Networked] private TickTimer ForcedDanceTimer { get; set; } private CharacterController controller; private Animator animator; @@ -114,6 +115,8 @@ private void Awake() danceEventPublisher = FindFirstObjectByType(); } + + public bool IsDanceLocked => NetIsDancing || IsForcedDanceActive(); // --- FIX: Added Spawned() to initialize render position --- public override void Spawned() @@ -196,7 +199,7 @@ public override void FixedUpdateNetwork() if (GetInput(out PlayerInputData input) == false) { - if (NetIsDancing) + if (NetIsDancing && IsForcedDanceActive() == false) { NetIsDancing = false; ApplyDanceStop(); @@ -206,6 +209,7 @@ public override void FixedUpdateNetwork() return; } + bool forcedDanceActive = IsForcedDanceActive(); bool lockMovement = (GameManager.Instance != null && GameManager.Instance.IsGroupDanceActive) || IsMeleeMoveLocked(); // Seeker NPC dance command (disabled during group dance). if (lockMovement == false && input.npcDanceCommand && role != null && role.IsSeeker && Runner.SimulationTime >= NextNpcDanceCommandTime) @@ -226,7 +230,7 @@ public override void FixedUpdateNetwork() } // Hold-to-dance (edge-triggered to avoid retriggering every tick). - if (input.danceIndex != lastDanceIndex) + if (forcedDanceActive == false && input.danceIndex != lastDanceIndex) { if (input.danceIndex == -1) { @@ -239,7 +243,7 @@ public override void FixedUpdateNetwork() lastDanceIndex = input.danceIndex; } - else if (input.danceIndex == -1 && NetIsDancing) + else if (forcedDanceActive == false && input.danceIndex == -1 && NetIsDancing) { // Safety: if input says stop but state didn't update, force stop once. StopDance(); @@ -471,6 +475,53 @@ private bool IsSabotageStunned() return SabotageStunTimer.ExpiredOrNotRunning(Runner) == false; } + public void RequestForcedDance(int danceIndex, float durationSeconds) + { + if (Object == null) + { + return; + } + + if (Object.HasStateAuthority) + { + ApplyForcedDanceInternal(danceIndex, durationSeconds); + return; + } + + RpcRequestForcedDance(danceIndex, durationSeconds); + } + + [Rpc(RpcSources.All, RpcTargets.StateAuthority)] + private void RpcRequestForcedDance(int danceIndex, float durationSeconds) + { + ApplyForcedDanceInternal(danceIndex, durationSeconds); + } + + private void ApplyForcedDanceInternal(int danceIndex, float durationSeconds) + { + if (Object == null || Object.HasStateAuthority == false || Runner == null) + { + return; + } + + int resolvedDanceIndex = Mathf.Clamp(danceIndex, 0, 4); + float clampedDuration = Mathf.Clamp(durationSeconds, 0.1f, 10f); + NetDanceIndex = resolvedDanceIndex; + NetIsDancing = true; + ForcedDanceTimer = TickTimer.CreateFromSeconds(Runner, clampedDuration); + ApplyDanceStart(); + } + + private bool IsForcedDanceActive() + { + if (Runner == null) + { + return false; + } + + return ForcedDanceTimer.ExpiredOrNotRunning(Runner) == false; + } + public void RequestMeleeMovementLock(float durationSeconds) { if (Object == null) diff --git a/GGJ26/Assets/01. Scripts/Network/Sabotage/SpectatorSabotageController.cs b/GGJ26/Assets/01. Scripts/Network/Sabotage/SpectatorSabotageController.cs index 593583c0..c88c3629 100644 --- a/GGJ26/Assets/01. Scripts/Network/Sabotage/SpectatorSabotageController.cs +++ b/GGJ26/Assets/01. Scripts/Network/Sabotage/SpectatorSabotageController.cs @@ -268,48 +268,15 @@ private bool TryExecuteShoeToss(Ray ray) Quaternion rotation = Quaternion.LookRotation(ray.direction.normalized, Vector3.up); RpcSpawnShoeProjectile(spawnPosition, rotation, ray.direction.normalized, shoeProjectileSpeed, shoeProjectileLifetime); - if (TryFindSeekerHitBySphereCast(ray.origin, ray.direction, shoeHitDistance, out RaycastHit hit) == false) + if (TryFindSabotageTargetBySphereCast(ray.origin, ray.direction, shoeHitDistance, out RaycastHit hit) == false) { if (enableDebugLogs) { - Debug.Log("[Sabotage] ShoeToss fired: no seeker hit.", this); + Debug.Log("[Sabotage] ShoeToss fired: no target hit.", this); } return true; } - - var role = hit.collider.GetComponentInParent(); - if (role == null || role.IsSeeker == false) - { - if (enableDebugLogs) - { - Debug.Log("[Sabotage] ShoeToss fired: target is not seeker.", this); - } - return true; - } - - var motor = role.GetComponent(); - if (motor == null) - { - if (enableDebugLogs) - { - Debug.Log("[Sabotage] ShoeToss rejected: seeker motor missing.", this); - } - return true; - } - - Vector3 direction = (role.transform.position - transform.position); - direction.y = 0f; - if (direction.sqrMagnitude < 0.0001f) - { - direction = role.transform.forward; - } - - motor.RequestSabotageStun(shoeStunSeconds, direction.normalized, shoeKnockbackSpeed); - if (enableDebugLogs) - { - Debug.Log($"[Sabotage] ShoeToss success: seeker={role.name}", this); - } - return true; + return ApplyShoeKnockbackToTarget(hit.collider, ray.direction); } private bool TryExecuteGhostSmoke(Ray ray) @@ -346,6 +313,21 @@ private bool TryExecutePhantomDance(Ray ray) return false; } + var playerMotor = hit.collider.GetComponentInParent(); + if (playerMotor != null && playerMotor.Object != null) + { + var playerElimination = playerMotor.GetComponent(); + if (playerElimination == null || playerElimination.IsEliminated == false) + { + playerMotor.RequestForcedDance(Random.Range(0, 5), phantomDanceDuration); + if (enableDebugLogs) + { + Debug.Log($"[Sabotage] PhantomDance success: player={playerMotor.name}", this); + } + return true; + } + } + var npc = hit.collider.GetComponentInParent(); if (npc == null || npc.Object == null || npc.IsDead) { @@ -721,41 +703,68 @@ private bool TryApplyShoeHit(Vector3 from, Vector3 to, Vector3 velocity) } Vector3 dir = delta / distance; - if (TryFindSeekerHitBySphereCast(from, dir, distance, out RaycastHit hit) == false) + if (TryFindSabotageTargetBySphereCast(from, dir, distance, out RaycastHit hit) == false) { return false; } + Vector3 knockbackDir = velocity.sqrMagnitude > 0.0001f ? velocity.normalized : dir; + return ApplyShoeKnockbackToTarget(hit.collider, knockbackDir); + } - var role = hit.collider.GetComponentInParent(); - if (role == null || role.IsSeeker == false) + private bool ApplyShoeKnockbackToTarget(Collider hitCollider, Vector3 knockbackDirection) + { + if (hitCollider == null) { return false; } - var motor = role.GetComponent(); - if (motor == null) + Vector3 dir = knockbackDirection; + dir.y = 0f; + if (dir.sqrMagnitude < 0.0001f) { - return false; + dir = transform.forward; } - Vector3 knockbackDir = velocity.sqrMagnitude > 0.0001f ? velocity.normalized : dir; - knockbackDir.y = 0f; - if (knockbackDir.sqrMagnitude < 0.0001f) + var role = hitCollider.GetComponentInParent(); + if (role != null && role.Object != null) { - knockbackDir = role.transform.forward; + var eliminationTarget = role.GetComponent(); + if (eliminationTarget != null && eliminationTarget.IsEliminated) + { + return false; + } + + var motor = role.GetComponent(); + if (motor == null) + { + return false; + } + + motor.RequestSabotageStun(shoeStunSeconds, dir.normalized, shoeKnockbackSpeed); + if (enableDebugLogs) + { + Debug.Log($"[Sabotage] ShoeToss success: player={role.name}", this); + } + return true; } - motor.RequestSabotageStun(shoeStunSeconds, knockbackDir.normalized, shoeKnockbackSpeed); - if (enableDebugLogs) + var npc = hitCollider.GetComponentInParent(); + if (npc != null && npc.Object != null && npc.IsDead == false) { - Debug.Log($"[Sabotage] Shoe projectile hit seeker: {role.name}", this); + npc.RequestSabotageStun(shoeStunSeconds, dir.normalized, shoeKnockbackSpeed); + if (enableDebugLogs) + { + Debug.Log($"[Sabotage] ShoeToss success: npc={npc.name}", this); + } + return true; } - return true; + + return false; } - private bool TryFindSeekerHitBySphereCast(Vector3 origin, Vector3 direction, float distance, out RaycastHit seekerHit) + private bool TryFindSabotageTargetBySphereCast(Vector3 origin, Vector3 direction, float distance, out RaycastHit targetHit) { - seekerHit = default; + targetHit = default; if (distance <= 0f) { return false; @@ -777,13 +786,22 @@ private bool TryFindSeekerHitBySphereCast(Vector3 origin, Vector3 direction, flo } var role = hit.collider.GetComponentInParent(); - if (role == null || role.IsSeeker == false) + if (role != null && role.Object != null) { - continue; + var eliminationTarget = role.GetComponent(); + if (eliminationTarget == null || eliminationTarget.IsEliminated == false) + { + targetHit = hit; + return true; + } } - seekerHit = hit; - return true; + var npc = hit.collider.GetComponentInParent(); + if (npc != null && npc.Object != null && npc.IsDead == false) + { + targetHit = hit; + return true; + } } return false; diff --git a/GGJ26/Assets/01. Scripts/Network/StunGun.cs b/GGJ26/Assets/01. Scripts/Network/StunGun.cs index a2f2763d..cfddadd3 100644 --- a/GGJ26/Assets/01. Scripts/Network/StunGun.cs +++ b/GGJ26/Assets/01. Scripts/Network/StunGun.cs @@ -40,6 +40,7 @@ public class StunGun : NetworkBehaviour private float lastFireTime = -999f; private Camera mainCamera; private PlayerElimination elimination; + private FusionThirdPersonMotor motor; private Animator animator; private int animIDShoot; private bool rotateToCamera; @@ -57,6 +58,7 @@ private void Awake() role = GetComponent(); mainCamera = Camera.main; elimination = GetComponent(); + motor = GetComponent(); animator = GetComponent(); animIDShoot = Animator.StringToHash("Shoot"); if (shootTransform == null) @@ -118,6 +120,11 @@ private void Update() return; } + if (motor != null && motor.IsDanceLocked) + { + return; + } + if (DanceEventPublisher.IsGroupDanceActive) { return; diff --git a/GGJ26/Assets/01. Scripts/UI/UISpectatorSabotageHud.cs b/GGJ26/Assets/01. Scripts/UI/UISpectatorSabotageHud.cs index 60f4071d..03c29c99 100644 --- a/GGJ26/Assets/01. Scripts/UI/UISpectatorSabotageHud.cs +++ b/GGJ26/Assets/01. Scripts/UI/UISpectatorSabotageHud.cs @@ -80,25 +80,30 @@ private void EnsureHud() private SlotView[] CollectExistingSlots(RectTransform parent) { - var collected = new SlotView[3]; - for (int i = 0; i < parent.childCount && i < 3; i++) + return new[] { - var child = parent.GetChild(i) as RectTransform; - if (child == null) - { - continue; - } + CollectSlot(parent, "ShoeSlot"), + CollectSlot(parent, "SmokeSlot"), + CollectSlot(parent, "DanceSlot") + }; + } - collected[i] = new SlotView - { - root = child, - iconImage = child.Find("Icon")?.GetComponent(), - keyImage = child.Find("Key")?.GetComponent(), - keyText = child.Find("KeyText")?.GetComponent(), - outline = child.GetComponent() - }; + private static SlotView CollectSlot(RectTransform parent, string slotName) + { + var child = parent.Find(slotName) as RectTransform; + if (child == null) + { + return null; } - return collected; + + return new SlotView + { + root = child, + iconImage = child.Find("Icon")?.GetComponent(), + keyImage = child.Find("Key")?.GetComponent(), + keyText = child.Find("KeyText")?.GetComponent(), + outline = child.GetComponent() + }; } private TextMeshProUGUI CreateTitle(RectTransform parent) diff --git a/GGJ26/Assets/03. Prefabs/Effects.meta b/GGJ26/Assets/03. Prefabs/Effects.meta index 0dc0e97d..ac316503 100644 --- a/GGJ26/Assets/03. Prefabs/Effects.meta +++ b/GGJ26/Assets/03. Prefabs/Effects.meta @@ -1,12 +1,7 @@ fileFormatVersion: 2 -<<<<<<<< HEAD:GGJ26/Assets/03. Prefabs/UI/NextDance.prefab.meta -guid: c6763c4ae1c7c3d449979bb43d67e661 -PrefabImporter: -======== guid: 9ce0aec75c581e0429179da9c4b1a47a folderAsset: yes DefaultImporter: ->>>>>>>> bb1fea1 (뭉게안개 / 테이저건 피격 이펙트 추가):GGJ26/Assets/03. Prefabs/Effects.meta externalObjects: {} userData: assetBundleName: diff --git a/GGJ26/Assets/03. Prefabs/Lights.meta b/GGJ26/Assets/03. Prefabs/Lights.meta index 438a4369..6af42d5f 100644 --- a/GGJ26/Assets/03. Prefabs/Lights.meta +++ b/GGJ26/Assets/03. Prefabs/Lights.meta @@ -1,12 +1,7 @@ fileFormatVersion: 2 -<<<<<<<< HEAD:GGJ26/Assets/03. Prefabs/UI/NextDanceCell.prefab.meta -guid: 52e09d98944e9314694f325258a57842 -PrefabImporter: -======== guid: 6d763b428958824479f9e12a9b14b6cd folderAsset: yes DefaultImporter: ->>>>>>>> bb1fea1 (뭉게안개 / 테이저건 피격 이펙트 추가):GGJ26/Assets/03. Prefabs/Lights.meta externalObjects: {} userData: assetBundleName: diff --git a/GGJ26/Assets/03. Prefabs/UI/DancingFrame.prefab.meta b/GGJ26/Assets/03. Prefabs/UI/DancingFrame.prefab.meta index 00662066..13d96009 100644 --- a/GGJ26/Assets/03. Prefabs/UI/DancingFrame.prefab.meta +++ b/GGJ26/Assets/03. Prefabs/UI/DancingFrame.prefab.meta @@ -1,9 +1,5 @@ fileFormatVersion: 2 -<<<<<<<< HEAD:GGJ26/Assets/03. Prefabs/UI/UI Canvas.prefab.meta -guid: f46531d753859f247b47dda185b9f879 -======== guid: 4ef68a77587ca894ebf74c54d9f6bdc7 ->>>>>>>> 82c1b47 (Dancing 이미지 그린거 추가 -> Prefab/UI/DancingFrame으로 만들어 놓음):GGJ26/Assets/03. Prefabs/UI/DancingFrame.prefab.meta PrefabImporter: externalObjects: {} userData: diff --git a/GGJ26/Assets/03. Prefabs/UI/NextDance.prefab.meta b/GGJ26/Assets/03. Prefabs/UI/NextDance.prefab.meta index 8cf1484d..a94017a6 100644 --- a/GGJ26/Assets/03. Prefabs/UI/NextDance.prefab.meta +++ b/GGJ26/Assets/03. Prefabs/UI/NextDance.prefab.meta @@ -1,12 +1,6 @@ fileFormatVersion: 2 -<<<<<<<< HEAD:GGJ26/Assets/03. Prefabs/UI/NextDance.prefab.meta guid: f37ab0a194c792f4ea4aa6850d594a79 PrefabImporter: -======== -guid: 9ce0aec75c581e0429179da9c4b1a47a -folderAsset: yes -DefaultImporter: ->>>>>>>> bb1fea1 (뭉게안개 / 테이저건 피격 이펙트 추가):GGJ26/Assets/03. Prefabs/Effects.meta externalObjects: {} userData: assetBundleName: diff --git a/GGJ26/Assets/03. Prefabs/UI/NextDanceCell.prefab.meta b/GGJ26/Assets/03. Prefabs/UI/NextDanceCell.prefab.meta index cf8e04c6..4aee9fe9 100644 --- a/GGJ26/Assets/03. Prefabs/UI/NextDanceCell.prefab.meta +++ b/GGJ26/Assets/03. Prefabs/UI/NextDanceCell.prefab.meta @@ -1,12 +1,6 @@ fileFormatVersion: 2 -<<<<<<<< HEAD:GGJ26/Assets/03. Prefabs/UI/NextDanceCell.prefab.meta guid: aed485a39d4892e42889ade52c228e7b PrefabImporter: -======== -guid: 6d763b428958824479f9e12a9b14b6cd -folderAsset: yes -DefaultImporter: ->>>>>>>> bb1fea1 (뭉게안개 / 테이저건 피격 이펙트 추가):GGJ26/Assets/03. Prefabs/Lights.meta externalObjects: {} userData: assetBundleName: