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

2021-07-09 15:03:55 +09:00 · 2021-07-09 15:03:55 +09:00 · c88cee8226
parent b45c469121 aa387b4a26
commit c88cee8226
10 changed files with 85 additions and 246 deletions
--- a/popcorn/Assets/MyGame/Resources/DontDestroyObject.prefab
+++ b/popcorn/Assets/MyGame/Resources/DontDestroyObject.prefab
@ -9,6 +9,8 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 3667080857874733261}
+  - component: {fileID: 7740671670896384492}
+  - component: {fileID: 3756929251745663541}
  m_Layer: 0
  m_Name: DontDestroyObject
  m_TagString: Untagged
@ -30,3 +32,37 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7740671670896384492
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3459593390050872226}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 85ce2c3363c344d92b98a939b21f1fae, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &3756929251745663541
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3459593390050872226}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 98c9d1a2074d64c48b1cf9fae5e1c210, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  defaultBGMAudioMixer: {fileID: 0}
+  defaultSEAudioMixer: {fileID: 0}
+  defaultVoiceAudioMixer: {fileID: 0}
+  bgmVolume: 1
+  seVolume: 1
+  voiceVolume: 1
+  pauseTime: 0
+  enabledBGM: 1
+  enabledSE: 1
+  enabledVoice: 1
--- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity
+++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity
@ -121,37 +121,6 @@ NavMeshSettings:
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
--- !u!1 &70623620
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 70623621}
-  m_Layer: 0
-  m_Name: Directing_com_jump
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
--- !u!4 &70623621
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 70623620}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 2.05, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 533056342}
-  m_Father: {fileID: 1448897407}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &140407426 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 3772627274706997384, guid: da466a69e7f81564eba63d910bc85f2d,
@ -772,87 +741,6 @@ SpriteRenderer:
  m_WasSpriteAssigned: 1
  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
--- !u!1 &511887193
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 511887194}
-  - component: {fileID: 511887196}
-  m_Layer: 0
-  m_Name: com
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &511887194
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 511887193}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 533056342}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &511887196
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 511887193}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 50
-  m_Sprite: {fileID: 21300000, guid: d8181329f3ae9d740b4e28e3037c674d, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 2.74, y: 2.7}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
-  m_SpriteSortPoint: 0
 --- !u!1 &515787033
 GameObject:
  m_ObjectHideFlags: 0
@ -919,58 +807,6 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 6
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &533056341
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 533056342}
-  - component: {fileID: 533056343}
-  m_Layer: 0
-  m_Name: Directing_com
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &533056342
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 533056341}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 511887194}
-  - {fileID: 842592005}
-  m_Father: {fileID: 70623621}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &533056343
-Animator:
-  serializedVersion: 3
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 533056341}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: ac662e278cb73f041bb6e82ec1ff2a67, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
 --- !u!1 &580170368
 GameObject:
  m_ObjectHideFlags: 0
@ -1700,87 +1536,6 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 439}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &842592004
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 842592005}
-  - component: {fileID: 842592006}
-  m_Layer: 0
-  m_Name: com_grain
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &842592005
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 842592004}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 533056342}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &842592006
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 842592004}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 51
-  m_Sprite: {fileID: 21300000, guid: 606fe1409855e1841b59145f6d7a51e9, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 2.74, y: 2.7}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
-  m_SpriteSortPoint: 0
 --- !u!1 &876479140
 GameObject:
  m_ObjectHideFlags: 0
@ -2986,7 +2741,6 @@ Transform:
  - {fileID: 1129457738}
  - {fileID: 162168170}
  - {fileID: 1295632043}
-  - {fileID: 70623621}
  m_Father: {fileID: 0}
  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs
+++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs
@ -119,6 +119,7 @@ public class Corn : MonoBehaviour
        spriteRenderer.sprite = cornSimpleSprite;
        rigidbody.AddForce(cornPopSpeed * new Vector2(Random.value * 2 - 1, Random.value * 2 - 1), ForceMode2D.Impulse);
        animator.SetTrigger(HashCornGrow);
+        VibrationManager.Instance.PlayVibrationOnce();
    }

    private void CornBurnt()
--- a/popcorn/Assets/ucb.meta
+++ b/popcorn/Assets/ucb.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 750bf08e3c7644451b89783a8765d055
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/popcorn/Assets/ucb/Fastfile
+++ b/popcorn/Assets/ucb/Fastfile
--- a/popcorn/Assets/ucb/Fastfile.meta
+++ b/popcorn/Assets/ucb/Fastfile.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b2f07290120da46c8bb7c1ca8c733dbc
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/popcorn/Assets/ucb/Gymfile
+++ b/popcorn/Assets/ucb/Gymfile
@ -0,0 +1,11 @@
+xcargs = ""
+# xcargs += " IDEBuildOperationMaxNumberOfConcurrentCompileTasks=16"
+xcargs += " GCC_GENERATE_DEBUGGING_SYMBOLS=NO DEBUG_INFORMATION_FORMAT=dwarf"
+xcargs += " ONLY_ACTIVE_ARCH=YES VALID_ARCHS=arm64"
+xcargs += " GCC_OPTIMIZATION_LEVEL=0"
+# xcargs += " CC=\"ccacheclang\" GCC_PRECOMPILE_PREFIX_HEADER=NO" if File.exist?("/usr/local/bin/ccacheclang")
+
+clean(true)
+include_bitcode(false)
+include_symbols(false)
+xcargs(xcargs)
--- a/popcorn/Assets/ucb/Gymfile.meta
+++ b/popcorn/Assets/ucb/Gymfile.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 815b9873d60ce40d6abba25d411aef5a
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/popcorn/Assets/ucb_xcode_fastlane.json
+++ b/popcorn/Assets/ucb_xcode_fastlane.json
@ -0,0 +1,8 @@
+{
+  "fastfile": "Assets/ucb/Fastfile",
+  "gymfile": "Assets/ucb/Gymfile",
+  "lanes": {
+    "pre_build": "",
+    "post_build": ""
+  }
+}
--- a/popcorn/Assets/ucb_xcode_fastlane.json.meta
+++ b/popcorn/Assets/ucb_xcode_fastlane.json.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a1b309d266afe45489fd34c4d887cc5d
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: