yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
koya_15 2022-05-27 14:05:12 +09:00
parent 9352f32858 fcde9c018d
commit c9306618af
7 changed files with 353 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
popcorn/Assets/MyGame/Resources/PopcornIcons/package_greentea_milk.prefab Normal file
View File

@ -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: 6adfda82a089da4489b1b59dfb0fb733,
type: 3}
- target: {fileID: 3426746518987915701, guid: 84aaa57282766408683fbb28f556d547,
type: 3}
propertyPath: m_Name
value: package_greentea_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}

7
popcorn/Assets/MyGame/Resources/PopcornIcons/package_greentea_milk.prefab.meta Normal file
View File

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

127
popcorn/Assets/MyGame/Resources/PopcornLargeIcons/package_greentea_milk.prefab Normal file
View File

@ -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: 23838758dfc1f0840bb68cd0797fca8f,
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_greentea_milk
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7851d17bad9514d0cab3211e1e81bdda, type: 3}

7
popcorn/Assets/MyGame/Resources/PopcornLargeIcons/package_greentea_milk.prefab.meta Normal file
View File

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

77
popcorn/Assets/MyGame/Resources/Popcorns/package_greentea_milk.prefab Normal file
View File

@ -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_greentea_milk
objectReference: {fileID: 0}
- target: {fileID: 7484714086723963382, guid: d6338849f97cc4b2e80f40eecd881ae9,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 6adfda82a089da4489b1b59dfb0fb733,
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}

7
popcorn/Assets/MyGame/Resources/Popcorns/package_greentea_milk.prefab.meta Normal file
View File

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

2
popcorn/Assets/MyGame/Scripts/Const.cs
View File

@ -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 = 17;
public static readonly int MaxShopLevel = 18;
public static readonly int TankCapacity = 20;
public static readonly int SpecialShopLevel = 9999;
public static readonly int SpecialCategory = 9999;