From 29d39427b6f94cefe2ee7d63267f1b3bbdf84dfa Mon Sep 17 00:00:00 2001 From: kimura Date: Tue, 30 Aug 2022 18:29:19 +0900 Subject: [PATCH] =?UTF-8?q?package=5Fstrawberry=5Fchocolate=20=E4=BB=AEpre?= =?UTF-8?q?fab=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../package_strawberry_chocolate.prefab | 127 ++++++++++++++++++ .../package_strawberry_chocolate.prefab.meta | 7 + .../package_strawberry_chocolate.prefab | 127 ++++++++++++++++++ .../package_strawberry_chocolate.prefab.meta | 7 + .../package_strawberry_chocolate.prefab | 77 +++++++++++ .../package_strawberry_chocolate.prefab.meta | 7 + popcorn/Assets/MyGame/Scripts/Const.cs | 2 +- 7 files changed, 353 insertions(+), 1 deletion(-) create mode 100644 popcorn/Assets/MyGame/Resources/PopcornIcons/package_strawberry_chocolate.prefab create mode 100644 popcorn/Assets/MyGame/Resources/PopcornIcons/package_strawberry_chocolate.prefab.meta create mode 100644 popcorn/Assets/MyGame/Resources/PopcornLargeIcons/package_strawberry_chocolate.prefab create mode 100644 popcorn/Assets/MyGame/Resources/PopcornLargeIcons/package_strawberry_chocolate.prefab.meta create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_strawberry_chocolate.prefab create mode 100644 popcorn/Assets/MyGame/Resources/Popcorns/package_strawberry_chocolate.prefab.meta diff --git a/popcorn/Assets/MyGame/Resources/PopcornIcons/package_strawberry_chocolate.prefab b/popcorn/Assets/MyGame/Resources/PopcornIcons/package_strawberry_chocolate.prefab new file mode 100644 index 00000000..8308e209 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/PopcornIcons/package_strawberry_chocolate.prefab @@ -0,0 +1,127 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &5350578869291485224 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 228103378089052436, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 33d0c4c6a507c554ebd9fb937561f89b, + type: 3} + - target: {fileID: 3426746518987915701, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_Name + value: package_strawberry_milk + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_SizeDelta.x + value: 92 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_SizeDelta.y + value: 136 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4359531238211889237, guid: 84aaa57282766408683fbb28f556d547, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -7.7 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 84aaa57282766408683fbb28f556d547, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/PopcornIcons/package_strawberry_chocolate.prefab.meta b/popcorn/Assets/MyGame/Resources/PopcornIcons/package_strawberry_chocolate.prefab.meta new file mode 100644 index 00000000..23043c48 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/PopcornIcons/package_strawberry_chocolate.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 05f8f0539c198441bbc68ee4674f122c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/PopcornLargeIcons/package_strawberry_chocolate.prefab b/popcorn/Assets/MyGame/Resources/PopcornLargeIcons/package_strawberry_chocolate.prefab new file mode 100644 index 00000000..da02b356 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/PopcornLargeIcons/package_strawberry_chocolate.prefab @@ -0,0 +1,127 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &856591900145408447 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3497244521747764878, guid: 7851d17bad9514d0cab3211e1e81bdda, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 941968d2406f33e4dbc690eedd663db7, + type: 3} + - target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda, + type: 3} + propertyPath: m_SizeDelta.x + value: 222 + objectReference: {fileID: 0} + - target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda, + type: 3} + propertyPath: m_SizeDelta.y + value: 325 + objectReference: {fileID: 0} + - target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5431808858934536808, guid: 7851d17bad9514d0cab3211e1e81bdda, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5741585859577866755, guid: 7851d17bad9514d0cab3211e1e81bdda, + type: 3} + propertyPath: m_Name + value: package_strawberry_milk + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7851d17bad9514d0cab3211e1e81bdda, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/PopcornLargeIcons/package_strawberry_chocolate.prefab.meta b/popcorn/Assets/MyGame/Resources/PopcornLargeIcons/package_strawberry_chocolate.prefab.meta new file mode 100644 index 00000000..b3cb3cdf --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/PopcornLargeIcons/package_strawberry_chocolate.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2bcce7b540f6a45f2b44307de7eb6518 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_strawberry_chocolate.prefab b/popcorn/Assets/MyGame/Resources/Popcorns/package_strawberry_chocolate.prefab new file mode 100644 index 00000000..6f52e2c1 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_strawberry_chocolate.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7944901940612951782 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2623509555173712927, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Name + value: package_strawberry_milk + objectReference: {fileID: 0} + - target: {fileID: 7484714086723963382, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 33d0c4c6a507c554ebd9fb937561f89b, + type: 3} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8156056226503979207, guid: d6338849f97cc4b2e80f40eecd881ae9, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d6338849f97cc4b2e80f40eecd881ae9, type: 3} diff --git a/popcorn/Assets/MyGame/Resources/Popcorns/package_strawberry_chocolate.prefab.meta b/popcorn/Assets/MyGame/Resources/Popcorns/package_strawberry_chocolate.prefab.meta new file mode 100644 index 00000000..84aaf8bc --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Popcorns/package_strawberry_chocolate.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f70b4d398e01841f0826284cc5a55463 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scripts/Const.cs b/popcorn/Assets/MyGame/Scripts/Const.cs index 7075ab9b..64fc7eaf 100644 --- a/popcorn/Assets/MyGame/Scripts/Const.cs +++ b/popcorn/Assets/MyGame/Scripts/Const.cs @@ -11,7 +11,7 @@ public static class Const { public static readonly int DefaultRecipeId = 1; public static readonly int DefaultPanId = 1; public static readonly int ShopTankId = 20; - public static readonly int MaxShopLevel = 18; + public static readonly int MaxShopLevel = 19; // Max 店舗レベル public static readonly int TankCapacity = 20; public static readonly int SpecialShopLevel = 9999; public static readonly int SpecialCategory = 9999;