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

popcorn/Assets/MyGame/Resource/Material/shopping/ui_button_icon_Purchased_logo.png.meta

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: c7c9afad32a9e6a4d935b3469ba30dd9
+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/Cooking/Cooking.unity

@@ -18464,8 +18464,8 @@ MonoBehaviour:
     type: 3}
   spilledCornAnimationPrefab: {fileID: 7516975307168929492, guid: 33c91c454a38e410cb291f1f2e5756cc,
     type: 3}
-  cornSpawnCount: 80
-  maxFailedCornCount: 25
+  cornSpawnCount: 100
+  maxFailedCornCount: 50
   baseGrowSpeed: 1
   coldGrowSpeed: 0.1
   hotGrowSpeed: 2

popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs

@@ -1,7 +1,7 @@
 public class CornPopParameters
 {
     public static readonly float[] CornPopTimeArray = {
-	1f,
+1f,
 2.495f,
 3.99f,
 4.841f,
@@ -20,77 +20,117 @@ public class CornPopParameters
 12.864f,
 13.271f,
 13.678f,
-13.906f,
-14.134f,
-14.344f,
-14.554f,
-14.747f,
-14.94f,
-15.119f,
-15.298f,
-15.463f,
-15.628f,
-15.781f,
-15.934f,
-16.077f,
-16.219f,
-16.352f,
-16.484f,
-16.608f,
-16.732f,
-16.848f,
-16.964f,
-17.073f,
-17.182f,
-17.284f,
-17.387f,
-17.484f,
-17.581f,
-17.672f,
-17.764f,
-17.851f,
-17.938f,
-18.02f,
-18.103f,
-18.182f,
-18.261f,
-18.337f,
-18.413f,
-18.485f,
-18.558f,
-18.627f,
-18.697f,
-18.765f,
-18.832f,
-18.897f,
-18.962f,
-19.025f,
-19.088f,
-19.15f,
-19.211f,
-19.271f,
-19.33f,
-19.389f,
-19.447f,
-19.504f,
-19.561f,
-19.616f,
-19.672f,
-19.727f,
-19.782f,
-19.835f,
-19.889f,
-19.942f,
+14.044f,
+14.41f,
+14.739f,
+15.069f,
+15.366f,
+15.662f,
+15.929f,
+16.196f,
+16.436f,
+16.676f,
+16.892f,
+17.109f,
+17.303f,
+17.498f,
+17.673f,
+17.848f,
+18.006f,
+18.163f,
+18.305f,
+18.447f,
+18.575f,
+18.702f,
+18.817f,
+18.932f,
+19.035f,
+19.139f,
+19.232f,
+19.325f,
+19.409f,
+19.492f,
+19.568f,
+19.643f,
+19.711f,
+19.779f,
+19.84f,
+19.901f,
+19.956f,
+20.011f,
+20.06f,
+20.11f,
+20.154f,
+20.199f,
+20.239f,
+20.279f,
+20.315f,
+20.351f,
+20.383f,
+20.416f,
+20.445f,
+20.474f,
+20.501f,
+20.527f,
+20.551f,
+20.574f,
+20.596f,
+20.617f,
+20.636f,
+20.655f,
+20.672f,
+20.69f,
+20.705f,
+20.721f,
+20.735f,
+20.749f,
+20.761f,
+20.774f,
+20.785f,
+20.796f,
+20.807f,
+20.817f,
+20.826f,
+20.835f,
+20.843f,
+20.852f,
+20.859f,
+20.866f,
+20.873f,
+20.88f,
+20.886f,
+20.892f,
+20.897f,
     };
 
     public static readonly float[] CornBurntTimeArray = {
-        10f,
+10f,
+9f,
 8f,
+6.95f,
 5.9f,
+5.1f,
 4.3f,
+3.75f,
 3.2f,
+2.9f,
 2.6f,
+2.55f,
 2.5f,
+2.45f,
+2.4f,
+2.4f,
+2.4f,
+2.4f,
+2.4f,
+2.4f,
+2.4f,
+2.4f,
+2.4f,
+2.4f,
+2.4f,
+2.4f,
+2.4f,
 2.4f,
 2.4f,
 2.4f,

popcorn/Assets/MyGame/Scenes/shopping/Prefabs.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3d39b869e7ef364478440cdd2eee4132
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 907730abf7bed70469027e0e8aba6fd9
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/Assets/MyGame/Scenes/shopping/Purchase.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6cdf801ecd42cd543a2b68afba311048
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: