From ab8dbbd5759d040161c637871ad2174478d4bb1a Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 9 Jul 2021 13:59:58 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=B3KO=E3=82=A2?= =?UTF-8?q?=E3=83=8B=E3=83=A1=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=92?= =?UTF-8?q?Prefab=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Cooking/Prefabs/Directing_com_jump.prefab | 247 ++++++++++++++++++ .../Prefabs/Directing_com_jump.prefab.meta | 7 + 2 files changed, 254 insertions(+) create mode 100644 popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Directing_com_jump.prefab create mode 100644 popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Directing_com_jump.prefab.meta diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Directing_com_jump.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Directing_com_jump.prefab new file mode 100644 index 00000000..21b699ef --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Directing_com_jump.prefab @@ -0,0 +1,247 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2449901118440757730 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2449901118440757731} + m_Layer: 0 + m_Name: Directing_com_jump + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2449901118440757731 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2449901118440757730} + 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: 2449901118525682480} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2449901118525682483 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2449901118525682480} + - component: {fileID: 2449901118525682481} + 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 &2449901118525682480 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2449901118525682483} + 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: 2449901118546329404} + - {fileID: 2449901119278880611} + m_Father: {fileID: 2449901118440757731} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &2449901118525682481 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2449901118525682483} + 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 &2449901118546329407 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2449901118546329404} + - component: {fileID: 2449901118546329402} + m_Layer: 0 + m_Name: com + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2449901118546329404 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2449901118546329407} + 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: 2449901118525682480} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2449901118546329402 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2449901118546329407} + 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 &2449901119278880610 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2449901119278880611} + - component: {fileID: 2449901119278880608} + 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 &2449901119278880611 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2449901119278880610} + 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: 2449901118525682480} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2449901119278880608 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2449901119278880610} + 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 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Directing_com_jump.prefab.meta b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Directing_com_jump.prefab.meta new file mode 100644 index 00000000..e0dd460e --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/Directing_com_jump.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7e7fbf241bd7f461fb46363ff0c6be3e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: From 8ff099036babf4f84db35a72c16e14c82dad33f7 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 9 Jul 2021 14:00:38 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=E3=83=AB=E3=83=BC=E3=83=97=E8=A7=A3?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Resource/Animation/ComJump.anim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/popcorn/Assets/MyGame/Resource/Animation/ComJump.anim b/popcorn/Assets/MyGame/Resource/Animation/ComJump.anim index 55653ae6..90d0ea2d 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/ComJump.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/ComJump.anim @@ -338,7 +338,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 From 9d8712520aa9ed1279b764d9512e5ddb28e21f50 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 9 Jul 2021 14:02:18 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=E3=82=B3=E3=83=BC=E3=83=B3=E3=81=ABKO?= =?UTF-8?q?=E3=82=A2=E3=83=8B=E3=83=A1=E3=82=92=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab | 2 ++ popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs | 1 + 2 files changed, 3 insertions(+) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab index b4463198..4dadd602 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Prefabs/corn.prefab @@ -74,6 +74,8 @@ MonoBehaviour: effectBurnt: {fileID: 3984349228049242719, guid: 02298b5aac4434a4c81aec58ad2caa9d, type: 3} animator: {fileID: 5972257590091015193} + spilledCornAnimationPrefab: {fileID: 2449901118440757730, guid: 7e7fbf241bd7f461fb46363ff0c6be3e, + type: 3} --- !u!50 &7195010600253370228 Rigidbody2D: serializedVersion: 4 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs index 729ad60f..4d6dc563 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/Corn.cs @@ -26,6 +26,7 @@ public class Corn : MonoBehaviour [SerializeField] private Sprite cornBurntSprite; [SerializeField] private GameObject effectBurnt; [SerializeField] private Animator animator; + [SerializeField] private GameObject spilledCornAnimationPrefab; private Rigidbody2D rigidbody; private float cornPopTime; From 1fe755994555224adf786baf79ae1dd1f7cf3695 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 9 Jul 2021 14:23:14 +0900 Subject: [PATCH 4/7] =?UTF-8?q?Sound/VibeManager=20=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Resources/DontDestroyObject.prefab | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/popcorn/Assets/MyGame/Resources/DontDestroyObject.prefab b/popcorn/Assets/MyGame/Resources/DontDestroyObject.prefab index 2943433e..1769586c 100644 --- 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 From 7d72ba51233c98eee0b041d7995576f5747efd7d Mon Sep 17 00:00:00 2001 From: koya_15 Date: Fri, 9 Jul 2021 14:25:36 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=E5=8F=8E=E7=A9=AB=E3=82=B3=E3=83=BC?= =?UTF-8?q?=E3=83=B3=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CornField_Seedling_corn_harvest.png | Bin 5332 -> 6540 bytes .../MyGame/Scenes/CornField/CornField.unity | 5 +- .../CornField/Prefabs/corn_harvest.prefab | 134 ++++++++++++++++++ .../Prefabs/corn_harvest.prefab.meta | 7 + 4 files changed, 144 insertions(+), 2 deletions(-) create mode 100644 popcorn/Assets/MyGame/Scenes/CornField/Prefabs/corn_harvest.prefab create mode 100644 popcorn/Assets/MyGame/Scenes/CornField/Prefabs/corn_harvest.prefab.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_Seedling_corn_harvest.png b/popcorn/Assets/MyGame/Resource/Material/CornField/CornField_Seedling_corn_harvest.png index d3a60da274c04af51465ff9b4028306a4ca5bd19..b6bdc55d75d40d1027ce291de427011edb93fb3a 100644 GIT binary patch literal 6540 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 mScvm<>Kk%HcE0>UfB^tFaI_8Zhzw}}0000 Date: Fri, 9 Jul 2021 14:28:10 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=E3=82=AA=E3=83=96=E3=82=B8=E3=82=A7?= =?UTF-8?q?=E3=82=AF=E3=83=88=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/Cooking/Cooking.unity | 246 ------------------ 1 file changed, 246 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 81a8ff38..82e91f97 100644 --- 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} From 671744094bf1df4eb1672f6b9006c0941d54d126 Mon Sep 17 00:00:00 2001 From: kimura Date: Fri, 9 Jul 2021 14:32:07 +0900 Subject: [PATCH 7/7] =?UTF-8?q?CloudBuild=E8=A8=AD=E5=AE=9A=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/ucb.meta | 8 ++++++++ popcorn/Assets/ucb/Fastfile | 0 popcorn/Assets/ucb/Fastfile.meta | 7 +++++++ popcorn/Assets/ucb/Gymfile | 11 +++++++++++ popcorn/Assets/ucb/Gymfile.meta | 7 +++++++ 5 files changed, 33 insertions(+) create mode 100644 popcorn/Assets/ucb.meta create mode 100644 popcorn/Assets/ucb/Fastfile create mode 100644 popcorn/Assets/ucb/Fastfile.meta create mode 100644 popcorn/Assets/ucb/Gymfile create mode 100644 popcorn/Assets/ucb/Gymfile.meta diff --git a/popcorn/Assets/ucb.meta b/popcorn/Assets/ucb.meta new file mode 100644 index 00000000..d74ff153 --- /dev/null +++ b/popcorn/Assets/ucb.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 750bf08e3c7644451b89783a8765d055 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/ucb/Fastfile b/popcorn/Assets/ucb/Fastfile new file mode 100644 index 00000000..e69de29b diff --git a/popcorn/Assets/ucb/Fastfile.meta b/popcorn/Assets/ucb/Fastfile.meta new file mode 100644 index 00000000..1ee1f778 --- /dev/null +++ b/popcorn/Assets/ucb/Fastfile.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b2f07290120da46c8bb7c1ca8c733dbc +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/ucb/Gymfile b/popcorn/Assets/ucb/Gymfile new file mode 100644 index 00000000..da619772 --- /dev/null +++ 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) \ No newline at end of file diff --git a/popcorn/Assets/ucb/Gymfile.meta b/popcorn/Assets/ucb/Gymfile.meta new file mode 100644 index 00000000..a872210b --- /dev/null +++ b/popcorn/Assets/ucb/Gymfile.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 815b9873d60ce40d6abba25d411aef5a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: