diff --git a/Assets/AddressableAssetsData/Android/addressables_content_state.bin b/Assets/AddressableAssetsData/Android/addressables_content_state.bin index 1f57a97aa..c366965e7 100644 Binary files a/Assets/AddressableAssetsData/Android/addressables_content_state.bin and b/Assets/AddressableAssetsData/Android/addressables_content_state.bin differ diff --git a/Assets/Res_Addr/Effect/Effect_Hit_Fireball.prefab b/Assets/Res_Addr/Effect/Effect_Hit_Fireball.prefab index b177fb1db..db96c828a 100644 --- a/Assets/Res_Addr/Effect/Effect_Hit_Fireball.prefab +++ b/Assets/Res_Addr/Effect/Effect_Hit_Fireball.prefab @@ -45,8 +45,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 456d2bd1c5c2e5e4b8b948836c4975a4, type: 3} m_Name: m_EditorClassIdentifier: - NoUseParticleTime: 0 - OffTime: 5 + NoUseParticleTime: 1 + OffTime: 4 add_offset: {x: 0, y: 0, z: 0} e_EffectLocation: 0 tf_Target: {fileID: 0} diff --git a/Assets/Res_Addr/Effect/Effect_SwordShield.prefab b/Assets/Res_Addr/Effect/Effect_SwordShield.prefab index 678037347..dd055c095 100644 --- a/Assets/Res_Addr/Effect/Effect_SwordShield.prefab +++ b/Assets/Res_Addr/Effect/Effect_SwordShield.prefab @@ -118,7 +118,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a38a032bc645dd748bf40d9200bf783a, type: 3} m_Name: m_EditorClassIdentifier: - m_HitEffect: 0 + Off_OnlyThisObj_byHit: 0 --- !u!1 &485606289039388960 GameObject: m_ObjectHideFlags: 0 @@ -237,7 +237,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a38a032bc645dd748bf40d9200bf783a, type: 3} m_Name: m_EditorClassIdentifier: - m_HitEffect: 0 + Off_OnlyThisObj_byHit: 0 --- !u!1 &1280186986779346537 GameObject: m_ObjectHideFlags: 0 @@ -5240,9 +5240,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 456d2bd1c5c2e5e4b8b948836c4975a4, type: 3} m_Name: m_EditorClassIdentifier: - NoUseParticleTime: 0 + NoUseParticleTime: 1 OffTime: 5 add_offset: {x: 0, y: 0, z: 0} + e_EffectLocation: 0 tf_Target: {fileID: 0} --- !u!1 &5297895769709173062 GameObject: diff --git a/Assets/Res_Addr/Map/Lobby.prefab b/Assets/Res_Addr/Map/Lobby.prefab index f2d78284a..19b346efa 100644 --- a/Assets/Res_Addr/Map/Lobby.prefab +++ b/Assets/Res_Addr/Map/Lobby.prefab @@ -399,7 +399,6 @@ Transform: - {fileID: 1383236027920307383} - {fileID: 8925813686914740086} - {fileID: 4186376373373775800} - - {fileID: 7363882384067394725} - {fileID: 4933989347198246088} - {fileID: 8556623164193415573} - {fileID: 2926062986655075904} @@ -44315,184 +44314,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 7466996554271878224} m_PrefabAsset: {fileID: 0} ---- !u!1001 &7474184762975368919 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 3662896141426346532} - m_Modifications: - - target: {fileID: 110451931819756146, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_RootOrder - value: 202 - objectReference: {fileID: 0} - - target: {fileID: 110451931819756146, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_LocalScale.x - value: 1.1783 - objectReference: {fileID: 0} - - target: {fileID: 110451931819756146, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_LocalScale.y - value: 1.1783 - objectReference: {fileID: 0} - - target: {fileID: 110451931819756146, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_LocalScale.z - value: 1.1783 - objectReference: {fileID: 0} - - target: {fileID: 110451931819756146, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_LocalPosition.x - value: 1.685 - objectReference: {fileID: 0} - - target: {fileID: 110451931819756146, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.8434996 - objectReference: {fileID: 0} - - target: {fileID: 110451931819756146, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_LocalPosition.z - value: -2.6 - objectReference: {fileID: 0} - - target: {fileID: 110451931819756146, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.31770766 - objectReference: {fileID: 0} - - target: {fileID: 110451931819756146, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 110451931819756146, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.9481888 - objectReference: {fileID: 0} - - target: {fileID: 110451931819756146, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 110451931819756146, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 110451931819756146, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 142.951 - objectReference: {fileID: 0} - - target: {fileID: 110451931819756146, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 110451931819756147, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_Name - value: COMP_PROP_foodplate_interior_01 - objectReference: {fileID: 0} - - target: {fileID: 110451931819756147, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - - target: {fileID: 228509068738393219, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - - target: {fileID: 986610180372320205, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - - target: {fileID: 1814670252089672265, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - - target: {fileID: 2793131128021619960, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - - target: {fileID: 5687415022983956336, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_LocalPosition.x - value: -0.1682 - objectReference: {fileID: 0} - - target: {fileID: 5687415022983956336, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.0178 - objectReference: {fileID: 0} - - target: {fileID: 5687415022983956336, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.0713 - objectReference: {fileID: 0} - - target: {fileID: 5687415022983956336, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.99435586 - objectReference: {fileID: 0} - - target: {fileID: 5687415022983956336, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_LocalRotation.x - value: 0.012357314 - objectReference: {fileID: 0} - - target: {fileID: 5687415022983956336, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_LocalRotation.y - value: 0.10209508 - objectReference: {fileID: 0} - - target: {fileID: 5687415022983956336, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_LocalRotation.z - value: 0.02608544 - objectReference: {fileID: 0} - - target: {fileID: 5687415022983956336, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 1.103 - objectReference: {fileID: 0} - - target: {fileID: 5687415022983956336, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 11.755 - objectReference: {fileID: 0} - - target: {fileID: 5687415022983956336, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 3.1190002 - objectReference: {fileID: 0} - - target: {fileID: 8698306909376820579, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - propertyPath: m_StaticEditorFlags - value: 2147483647 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: - - {fileID: 228509068738393219, guid: 9a85c352580c65442953d3ab13dbe547, type: 3} - - {fileID: 986610180372320205, guid: 9a85c352580c65442953d3ab13dbe547, type: 3} - - {fileID: 2793131128021619960, guid: 9a85c352580c65442953d3ab13dbe547, type: 3} - - {fileID: 1814670252089672265, guid: 9a85c352580c65442953d3ab13dbe547, type: 3} - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 9a85c352580c65442953d3ab13dbe547, type: 3} ---- !u!4 &7363882384067394725 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 110451931819756146, guid: 9a85c352580c65442953d3ab13dbe547, - type: 3} - m_PrefabInstance: {fileID: 7474184762975368919} - m_PrefabAsset: {fileID: 0} --- !u!1001 &7484713861735098012 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Script/Info/InGameInfo.cs b/Assets/Script/Info/InGameInfo.cs index e81718b1f..94cd164d6 100644 --- a/Assets/Script/Info/InGameInfo.cs +++ b/Assets/Script/Info/InGameInfo.cs @@ -285,6 +285,7 @@ public partial class InGameInfo : MyCoroutine { if (handle.IsDone && handle.Status == AsyncOperationStatus.Succeeded) { + Debug.Log($"{prefab} 이펙트 로드 결과 : {handle.Result}"); var temp = DSUtil.Get_Clone(handle.Result, tf_Effects); dic_str_Effect[prefab].Add(temp); act?.Invoke(temp); diff --git a/Assets/Script/Info/InappInfo.cs b/Assets/Script/Info/InappInfo.cs index f7e8e92ea..08a9d3c75 100644 --- a/Assets/Script/Info/InappInfo.cs +++ b/Assets/Script/Info/InappInfo.cs @@ -190,7 +190,7 @@ public class InappInfo : MonoBehaviour, IDetailedStoreListener public void OnInitializeFailed(InitializationFailureReason error) { - DSUtil.Format("Inapp OnInitializeFailed : {0}", error); + //DSUtil.Format("Inapp OnInitializeFailed : {0}", error); m_storeController = null; m_success?.Invoke(); // 일단 로그인 시킴 m_success = null; @@ -220,7 +220,7 @@ public class InappInfo : MonoBehaviour, IDetailedStoreListener public void OnInitializeFailed(InitializationFailureReason error, string message) { - Popup.Ins.Set(ePopupType.One, -102, null, null, error, message); + //Popup.Ins.Set(ePopupType.One, -102, null, null, error, message); } public void OnPurchaseFailed(Product product, PurchaseFailureDescription failureDescription)