diff --git a/popcorn/Assets/MyGame/Resource/Animation/WorldMap_cracker.anim b/popcorn/Assets/MyGame/Resource/Animation/WorldMap_cracker.anim index c200839a..b217d1a6 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/WorldMap_cracker.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/WorldMap_cracker.anim @@ -997,4 +997,11 @@ AnimationClip: script: {fileID: 0} m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0.2 + functionName: OnPlaySE + data: se_map_cracker + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/popcorn/Assets/MyGame/Resource/Animation/WorldMap_staging.anim b/popcorn/Assets/MyGame/Resource/Animation/WorldMap_staging.anim index c92508b0..35668e63 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/WorldMap_staging.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/WorldMap_staging.anim @@ -3744,4 +3744,11 @@ AnimationClip: script: {fileID: 0} m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0 + functionName: OnPlaySE + data: se_map_staging + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_employment_File.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_employment_File.wav new file mode 100644 index 00000000..82137fc4 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_employment_File.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_employment_File.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_employment_File.wav.meta new file mode 100644 index 00000000..0de4b028 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_employment_File.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 27f9b695409cc544b83c3bee9b03424e +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_employment_LevelUp.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_employment_LevelUp.wav new file mode 100644 index 00000000..875ab1c4 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_employment_LevelUp.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_employment_LevelUp.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_employment_LevelUp.wav.meta new file mode 100644 index 00000000..6a4791be --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_employment_LevelUp.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 9fb6b6be49bf1b54aa2d7b49256b97c0 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_map_cracker.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_map_cracker.wav new file mode 100644 index 00000000..31a42b58 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_map_cracker.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_map_cracker.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_map_cracker.wav.meta new file mode 100644 index 00000000..3483b747 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_map_cracker.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 4378a7882abf5a94985e5e0378013b3f +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_map_investment.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_map_investment.wav new file mode 100644 index 00000000..c654b2e8 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_map_investment.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_map_investment.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_map_investment.wav.meta new file mode 100644 index 00000000..72700e4c --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_map_investment.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: c872e8cb4ff695b418d3df873ee484bf +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_map_release.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_map_release.wav new file mode 100644 index 00000000..16ea974e Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_map_release.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_map_release.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_map_release.wav.meta new file mode 100644 index 00000000..dd1fcdfb --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_map_release.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: c412ccd61695f874cacba5af8c247be6 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_map_staging.wav b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_map_staging.wav new file mode 100644 index 00000000..89810890 Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_map_staging.wav differ diff --git a/popcorn/Assets/MyGame/Resources/Sounds/SE/se_map_staging.wav.meta b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_map_staging.wav.meta new file mode 100644 index 00000000..4de5bc73 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Sounds/SE/se_map_staging.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 617773bcb715d6e43800c0b98e4c840f +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/Main/EmploymentList.unity b/popcorn/Assets/MyGame/Scenes/Main/EmploymentList.unity index cfbd3569..91ab406c 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/EmploymentList.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/EmploymentList.unity @@ -342,7 +342,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} m_Name: m_EditorClassIdentifier: - onClickPlaySEFilename: se_ButtonTap + onClickPlaySEFilename: se_employment_LevelUp randomPlaySEFilenames: [] randomPlayVoiceFilenames: [] vibrationType: 0 diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/WorldMap_staging.prefab b/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/WorldMap_staging.prefab index 8c9d3f29..4444b1ea 100644 --- a/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/WorldMap_staging.prefab +++ b/popcorn/Assets/MyGame/Scenes/WorldMap/Prefabs/WorldMap_staging.prefab @@ -162,6 +162,7 @@ GameObject: m_Component: - component: {fileID: 995566939256566822} - component: {fileID: 995566939256566821} + - component: {fileID: 403855832375065950} m_Layer: 5 m_Name: WorldMap_staging m_TagString: Untagged @@ -215,6 +216,33 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &403855832375065950 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 995566939256566823} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebef95945fe4946b8ae75d2ea42c4e67, type: 3} + m_Name: + m_EditorClassIdentifier: + randomIntMin: 0 + randomIntMax: 0 + randomPlaySEFilenames: + - stringArray: [] + randomPlayVoiceFilenames: [] + onEvent1: + m_PersistentCalls: + m_Calls: [] + onEvent2: + m_PersistentCalls: + m_Calls: [] + onEvent3: + m_PersistentCalls: + m_Calls: [] + eventArray: [] --- !u!1 &995566939454212946 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMapInvestment.unity b/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMapInvestment.unity index ed176fcb..6297d74b 100644 --- a/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMapInvestment.unity +++ b/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMapInvestment.unity @@ -563,7 +563,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3} m_Name: m_EditorClassIdentifier: - onClickPlaySEFilename: se_ButtonTap + onClickPlaySEFilename: se_map_investment randomPlaySEFilenames: [] randomPlayVoiceFilenames: [] vibrationType: 0 diff --git a/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap_FoodStand.unity b/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap_FoodStand.unity index 9bbd15ca..98ac0406 100644 --- a/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap_FoodStand.unity +++ b/popcorn/Assets/MyGame/Scenes/WorldMap/WorldMap_FoodStand.unity @@ -9595,6 +9595,39 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1332667987} m_PrefabAsset: {fileID: 0} +--- !u!1 &1332667989 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7265478336224000638, guid: 7c6ee151499aea44a98660894bdb8cde, + type: 3} + m_PrefabInstance: {fileID: 1332667987} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1332667990 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1332667989} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebef95945fe4946b8ae75d2ea42c4e67, type: 3} + m_Name: + m_EditorClassIdentifier: + randomIntMin: 0 + randomIntMax: 0 + randomPlaySEFilenames: + - stringArray: [] + randomPlayVoiceFilenames: [] + onEvent1: + m_PersistentCalls: + m_Calls: [] + onEvent2: + m_PersistentCalls: + m_Calls: [] + onEvent3: + m_PersistentCalls: + m_Calls: [] + eventArray: [] --- !u!1001 &1380276397 PrefabInstance: m_ObjectHideFlags: 0 @@ -9935,25 +9968,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1589328371} m_PrefabAsset: {fileID: 0} ---- !u!114 &1628284967 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3b29d7ab09a96634a9f704e6a1f21193, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1755278145} ---- !u!212 &1755278145 stripped -SpriteRenderer: - m_CorrespondingSourceObject: {fileID: 3164292544489675909, guid: 343971e948dfe44ddab5ab4f736c3f06, - type: 3} - m_PrefabInstance: {fileID: 1002606733} - m_PrefabAsset: {fileID: 0} --- !u!1001 &1812389906 PrefabInstance: m_ObjectHideFlags: 0 @@ -10565,6 +10579,39 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7c6ee151499aea44a98660894bdb8cde, type: 3} +--- !u!1 &7265478335887242400 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7265478336224000638, guid: 7c6ee151499aea44a98660894bdb8cde, + type: 3} + m_PrefabInstance: {fileID: 7265478335887242399} + m_PrefabAsset: {fileID: 0} +--- !u!114 &7265478335887242401 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7265478335887242400} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebef95945fe4946b8ae75d2ea42c4e67, type: 3} + m_Name: + m_EditorClassIdentifier: + randomIntMin: 0 + randomIntMax: 0 + randomPlaySEFilenames: + - stringArray: [] + randomPlayVoiceFilenames: [] + onEvent1: + m_PersistentCalls: + m_Calls: [] + onEvent2: + m_PersistentCalls: + m_Calls: [] + onEvent3: + m_PersistentCalls: + m_Calls: [] + eventArray: [] --- !u!114 &8529543373135455718 MonoBehaviour: m_ObjectHideFlags: 0