Merge branch 'develop' of https://bitbucket.org/usaya/popcorn into develop

* 'develop' of https://bitbucket.org/usaya/popcorn:
  SE追加

popcorn/Assets/MyGame/Resources/Sounds/SE/se_Achievement.wav.meta

@@ -0,0 +1,22 @@
+fileFormatVersion: 2
+guid: 8bfb7aef7ca98d7488f24c53ae4eae5f
+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: 

popcorn/Assets/MyGame/Scenes/Main/BulkOrderAchievement.unity

@@ -414,6 +414,7 @@ GameObject:
   - component: {fileID: 390349024}
   - component: {fileID: 390349023}
   - component: {fileID: 390349022}
+  - component: {fileID: 390349025}
   m_Layer: 5
   m_Name: Button_ok
   m_TagString: Untagged
@@ -521,6 +522,22 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 390349020}
   m_CullTransparentMesh: 0
+--- !u!114 &390349025
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 390349020}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  onClickPlaySEFilename: se_ButtonTap
+  randomPlaySEFilenames: []
+  randomPlayVoiceFilenames: []
+  vibrationType: 0
 --- !u!1 &455117239
 GameObject:
   m_ObjectHideFlags: 0
@@ -2007,6 +2024,7 @@ GameObject:
   - component: {fileID: 1837634253}
   - component: {fileID: 1837634255}
   - component: {fileID: 1837634254}
+  - component: {fileID: 1837634256}
   m_Layer: 5
   m_Name: title
   m_TagString: Untagged
@@ -2071,6 +2089,24 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1837634252}
   m_CullTransparentMesh: 0
+--- !u!114 &1837634256
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1837634252}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1442ead2048664015b98b24bfb5fbac1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  seInfoArray:
+  - delay: 0
+    time: 0
+    interval: 0
+    filename: se_Achievement
+    maxCount: 0
 --- !u!1 &1953214642
 GameObject:
   m_ObjectHideFlags: 0

popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/AchievementCanvas.prefab

@@ -112,6 +112,7 @@ GameObject:
   - component: {fileID: 7864277046190771846}
   - component: {fileID: 7864277046190771841}
   - component: {fileID: 7864277046190771840}
+  - component: {fileID: 311028714931348522}
   m_Layer: 5
   m_Name: Button_ok
   m_TagString: Untagged
@@ -219,6 +220,22 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &311028714931348522
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7864277046190771842}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  onClickPlaySEFilename: se_ButtonTap
+  randomPlaySEFilenames: []
+  randomPlayVoiceFilenames: []
+  vibrationType: 0
 --- !u!1 &7864277046289359758
 GameObject:
   m_ObjectHideFlags: 0
@@ -505,6 +522,7 @@ GameObject:
   - component: {fileID: 7864277046764101800}
   - component: {fileID: 7864277046764101806}
   - component: {fileID: 7864277046764101801}
+  - component: {fileID: 4652247657525144177}
   m_Layer: 5
   m_Name: title
   m_TagString: Untagged
@@ -570,6 +588,24 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &4652247657525144177
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7864277046764101803}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1442ead2048664015b98b24bfb5fbac1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  seInfoArray:
+  - delay: 0
+    time: 0
+    interval: 0
+    filename: se_Achievement
+    maxCount: 0
 --- !u!1 &7864277046940800487
 GameObject:
   m_ObjectHideFlags: 0

popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab

@@ -3284,6 +3284,7 @@ GameObject:
   - component: {fileID: 2660639677869302027}
   - component: {fileID: 2660639677869302026}
   - component: {fileID: 2660639677869302037}
+  - component: {fileID: 7161343519928789}
   m_Layer: 5
   m_Name: Button_off
   m_TagString: Untagged
@@ -3391,6 +3392,22 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &7161343519928789
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2660639677869302039}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  onClickPlaySEFilename: se_ButtonTap
+  randomPlaySEFilenames: []
+  randomPlayVoiceFilenames: []
+  vibrationType: 0
 --- !u!1 &2660639677971123134
 GameObject:
   m_ObjectHideFlags: 0
@@ -4173,6 +4190,7 @@ GameObject:
   - component: {fileID: 2660639678931990183}
   - component: {fileID: 2660639678931990182}
   - component: {fileID: 2660639678931990177}
+  - component: {fileID: 6680472711527035254}
   m_Layer: 5
   m_Name: Button_off
   m_TagString: Untagged
@@ -4280,6 +4298,22 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!114 &6680472711527035254
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2660639678931990179}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5e732834936f04d48be0ff3fa358563d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  onClickPlaySEFilename: se_ButtonTap
+  randomPlaySEFilenames: []
+  randomPlayVoiceFilenames: []
+  vibrationType: 0
 --- !u!1 &2660639679014174934
 GameObject:
   m_ObjectHideFlags: 0