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

popcorn/Assets/MyGame/Resource/Material/minigame/stage/minigame_stage_background_Dither.png.meta

@@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: a72d2b5d8cb90d149be2d15cc646011d
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
-    wrapU: 1
-    wrapV: 1
-    wrapW: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/sky_c.prefab

@@ -16,7 +16,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &5813004886968788402
 Transform:
   m_ObjectHideFlags: 0
@@ -97,7 +97,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &2801136092801785394
 Transform:
   m_ObjectHideFlags: 0
@@ -178,7 +178,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &3074698269227096309
 Transform:
   m_ObjectHideFlags: 0
@@ -259,7 +259,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &3323992299850466469
 Transform:
   m_ObjectHideFlags: 0
@@ -340,7 +340,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1783557329745733052
 Transform:
   m_ObjectHideFlags: 0
@@ -421,7 +421,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1399190409401401922
 Transform:
   m_ObjectHideFlags: 0
@@ -496,37 +496,37 @@ PrefabInstance:
     - target: {fileID: 593032106522477144, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.a
-      value: 0.6313726
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 593032106522477144, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.b
-      value: 0.7236073
+      value: 0.7688679
       objectReference: {fileID: 0}
     - target: {fileID: 593032106522477144, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.g
-      value: 0.38892844
+      value: 0.7817086
       objectReference: {fileID: 0}
     - target: {fileID: 593032106522477144, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.r
-      value: 0.8679245
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1394968446248168214, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.b
-      value: 0.8679245
+      value: 0.514151
       objectReference: {fileID: 0}
     - target: {fileID: 1394968446248168214, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.g
-      value: 0.5444998
+      value: 0.5703958
       objectReference: {fileID: 0}
     - target: {fileID: 1394968446248168214, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.r
-      value: 0.6792601
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1655980775361785839, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
@@ -546,42 +546,42 @@ PrefabInstance:
     - target: {fileID: 2760666343607048754, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.a
-      value: 0.6313726
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2760666343607048754, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.b
-      value: 0.7236073
+      value: 0.7688679
       objectReference: {fileID: 0}
     - target: {fileID: 2760666343607048754, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.g
-      value: 0.38892844
+      value: 0.7817086
       objectReference: {fileID: 0}
     - target: {fileID: 2760666343607048754, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.r
-      value: 0.8679245
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2886643773304977890, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.a
-      value: 0.6313726
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2886643773304977890, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.b
-      value: 0.7236073
+      value: 0.7688679
       objectReference: {fileID: 0}
     - target: {fileID: 2886643773304977890, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.g
-      value: 0.38892844
+      value: 0.7817086
       objectReference: {fileID: 0}
     - target: {fileID: 2886643773304977890, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.r
-      value: 0.8679245
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4310680609274672819, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
@@ -596,37 +596,37 @@ PrefabInstance:
     - target: {fileID: 5929030332382823807, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.b
-      value: 0.8396226
+      value: 0.514151
       objectReference: {fileID: 0}
     - target: {fileID: 5929030332382823807, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.g
-      value: 0.51882344
+      value: 0.54549605
       objectReference: {fileID: 0}
     - target: {fileID: 5929030332382823807, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.r
-      value: 0.6524897
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5945618591104952147, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.a
-      value: 0.6313726
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5945618591104952147, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.b
-      value: 0.7236073
+      value: 0.7688679
       objectReference: {fileID: 0}
     - target: {fileID: 5945618591104952147, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.g
-      value: 0.38892844
+      value: 0.7817086
       objectReference: {fileID: 0}
     - target: {fileID: 5945618591104952147, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.r
-      value: 0.8679245
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6420613933086344021, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
@@ -646,27 +646,27 @@ PrefabInstance:
     - target: {fileID: 6652254799874175514, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.a
-      value: 0.6313726
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6652254799874175514, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.b
-      value: 0.7236073
+      value: 0.7688679
       objectReference: {fileID: 0}
     - target: {fileID: 6652254799874175514, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.g
-      value: 0.38892844
+      value: 0.7817086
       objectReference: {fileID: 0}
     - target: {fileID: 6652254799874175514, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.r
-      value: 0.8679245
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6860540293637237350, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7413912113725773461, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
@@ -726,32 +726,32 @@ PrefabInstance:
     - target: {fileID: 7773060152995744181, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.b
-      value: 0.8679245
+      value: 0.5424528
       objectReference: {fileID: 0}
     - target: {fileID: 7773060152995744181, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.g
-      value: 0.5854396
+      value: 0.60893404
       objectReference: {fileID: 0}
     - target: {fileID: 7773060152995744181, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.r
-      value: 0.7004102
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8462834776907685836, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.b
-      value: 0.8962264
+      value: 0.5613208
       objectReference: {fileID: 0}
     - target: {fileID: 8462834776907685836, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.g
-      value: 0.62144
+      value: 0.64331686
       objectReference: {fileID: 0}
     - target: {fileID: 8462834776907685836, guid: 682cb6897a7801848a19158996bbed8f,
         type: 3}
       propertyPath: m_Color.r
-      value: 0.7359343
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 682cb6897a7801848a19158996bbed8f, type: 3}

popcorn/Assets/MyGame/Scenes/MiniGame/Scripts/Player.cs

@@ -18,6 +18,9 @@ namespace MyGame.Scenes.MiniGame.Scripts
         [SerializeField] private GameObject level1;
         [SerializeField] private GameObject level2;
         [SerializeField] private GameObject level3;
+        [SerializeField] private int level1Value = 9;
+        [SerializeField] private int level2Value = 18;
+        [SerializeField] private int level3Value = 27;
         [SerializeField] private GameObject hitEffectPrefab;
         private Animator animator;
         private bool isJump;
@@ -152,9 +155,9 @@ namespace MyGame.Scenes.MiniGame.Scripts
 
         private void UpdateCount()
         {
-            level1.SetActive(count >= 5);
+            level1.SetActive(count >= level1Value);
-            level2.SetActive(count >= 10);
+            level2.SetActive(count >= level2Value);
-            level3.SetActive(count >= 15);
+            level3.SetActive(count >= level3Value);
         }
 
         public void ResetCount()