From 1ddeb86b754f5b0dc16fa7113dd1cd3f4929f320 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Thu, 5 Aug 2021 10:23:46 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BB=95=E5=85=A5=E3=82=8C=E7=94=BB?= =?UTF-8?q?=E9=9D=A2=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui_button_icon_Purchased_logo.png | Bin 0 -> 3016 bytes .../ui_button_icon_Purchased_logo.png.meta | 92 + .../MyGame/Scenes/shopping/Prefabs.meta | 8 + .../Scenes/shopping/Prefabs/Frame.prefab | 1445 +++++++++ .../Scenes/shopping/Prefabs/Frame.prefab.meta | 7 + .../MyGame/Scenes/shopping/Purchase.unity | 2581 +++++++++++++++++ .../Scenes/shopping/Purchase.unity.meta | 7 + .../MyGame/Scenes/shopping/shopping.unity | 1327 ++++++++- 8 files changed, 5423 insertions(+), 44 deletions(-) create mode 100644 popcorn/Assets/MyGame/Resource/Material/shopping/ui_button_icon_Purchased_logo.png create mode 100644 popcorn/Assets/MyGame/Resource/Material/shopping/ui_button_icon_Purchased_logo.png.meta create mode 100644 popcorn/Assets/MyGame/Scenes/shopping/Prefabs.meta create mode 100644 popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab create mode 100644 popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab.meta create mode 100644 popcorn/Assets/MyGame/Scenes/shopping/Purchase.unity create mode 100644 popcorn/Assets/MyGame/Scenes/shopping/Purchase.unity.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/shopping/ui_button_icon_Purchased_logo.png b/popcorn/Assets/MyGame/Resource/Material/shopping/ui_button_icon_Purchased_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..eef7d96b457b520601a0ca2f9984bbaf9e05b551 GIT binary patch literal 3016 zcmV;(3pezMP)An#}&t~BLrPQia@Cx zDUDqfHfB-3Zqh6$wy0FmMdB>zrbs}u>js>EfcPH>&L%r*kkU=Pz+_PrsR&aRZ8q`i z!fc?zq>->1g}Mog;#KZvJm1&z=FQBT`<`Pt6-T;yen0Naobx@uXRfR2IsISL$aW6) z-j(+b)-RL(ZM(jBKUH7j^|eu7%kRAXPW!tksG2u;nDIP8OWy@vMj9|U6@0W-Gq`5H zyKKPC(QGFrNV;W;qCQ z$$Npd0l0D&`%=kV*YExDD_C-vQ`S2-%eujZ&|Rs7r9-q z7KHb11AuQ23D}@CU$1l4$oYZ+wuF|v$J-bN;DtiBoTZlz9jd;1`m}nsx#`~T+q<{= z>9J$g>izrf^Nd?;iGg}85521!NI^0&_u(+S!OO(aBh^11eU{@TMOVF7xHyC%Og9Dj z1@m`SvtQi5zk226QFrlo>NjU*-mKpK^=St*1h_wIO}fuBH16H8!o+w39F}ZI^T+F{dvWErYmlci@oGE<7|JL5;>i=oQ)(V~ zfe+U6#xG7*A1>YKQtlTIY{}@Wub&QL;UzRh#nPk#*%P?Q@lddOg)s!c;&D@G{e#aQ zIbrB~tXp(sY|LF!41R-U^Zwrb2i3=S@AiP?-DodYwbd{ubD&s%U0E3v`s1p# zInm)0D?WYdRCW3H3!V4-_U(1A-`l&dqr|-Dn*HthOHy9IzVgS# zu290-QCfK80^B!Fo^;<4c4Tdg(Juz`TL9%gjDfI#3=>Kl<8R9MELI|2#%P(;QzI(I zpv_ofC*kozmB#X(cxzp=v{9}mv`7RP3cuFGmS4-|T*mp!k7ENH=7@})rq4j*L92%Px{72g)Pa?#4h8_@NEV=%6l_#;A~ z)-w4{E?HLp(VuU1GHYeP1zF{V8jSf=mj}iXt^`YNfS?63AVgf_Oe%S6LX6A$6>mlV zdh+GB0T{$Y)Yjtxpie+t;o#7 zd$#&-GL-tTw21iTn+?2wO^2;xYk6YvvUI@l*;a z8uQrEqg}k=ra%76UAGRhV3j*qHoQo23mQ97LSb!a=;{<6*xy;##QKpguR2hf1T!#) z&|oH(`om~zY@*W$p>&XI=3aG&Qf{v_$&qp}Rwz6GJ#%=geTcAeoBf!_-2#p+OK|r9 z%s7-`VRmg5KLu$Xt{pt67j|HSGI@R%! z;Bk$)96+ErYpmn7?G^W{eZvHh_gsV^c>DhT1KA|8w6tMurJEJ1T<~62Su%>NZPwPd z#o$%_^F6JtUQ`t3`xMu;j4I9>3TH25Z3S6vm^}&62 z51>g&)N|)=b<=EkRMRLSL(0u_IxVwp0NauZFtk&n@X5X zK@%QZw)ERvD9I}vFg{@mn>_%gx%f`}O1a=gilI%B*p8mc&1!4^xeQ=eCJ_;At%e@KS8I1ufMOo3kor$PZ#0ONr|fC0s3r^@&xaGkL#Iet?TgPZjD0bjlMK8a>X z?841=0qnQarc#-#JB#H92WX}A0^b6tB!B~I;ewQG@f+&DFoxScY^M1?pI~e*1lXR; zunCjmyp3&{l4HjyT$?>iPylY%(OT^XkH=iCCJ9}!1i?bcE;)@L7bYuUQ9Ajc%hrm# z4_%DiJ^A!rGWJG~r}&uMF0~RJqEj!sNfKFFS_Lt2u5=9B7A@RwhHst{X@&CHlS?|Z z*l^oQ8~Ip<7D8;wkv-p(+C$aGdIp&H`!IT=3bqDG5@YV3_zaKAN@JuWzl{Js90hos zCop^%xlsLYk2={bK@Nn7OhahNgSu9dMX$v)AI(X1ot#z~#lq#XphVnsTB#VA*a_(u zm(~i7!$vJQHm1&a<%spNgHy7pkJpNAkw&}>3F2(E?H(#*swqN&hYHjsz8b5p% zdjR~LZ+IL`xQBMt{bYQO5W Date: Thu, 5 Aug 2021 11:21:21 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E8=AA=BF=E7=90=86=E3=82=B3=E3=83=BC?= =?UTF-8?q?=E3=83=B3=E3=82=92100=E7=B2=92=E3=81=AB=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/Cooking/Cooking.unity | 2 +- .../Cooking/Scripts/CornPopParameters.cs | 166 +++++++++++------- 2 files changed, 104 insertions(+), 64 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 196d33c7..0daf7892 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -13692,7 +13692,7 @@ MonoBehaviour: type: 3} spilledCornAnimationPrefab: {fileID: 7516975307168929492, guid: 33c91c454a38e410cb291f1f2e5756cc, type: 3} - cornSpawnCount: 80 + cornSpawnCount: 100 maxFailedCornCount: 25 baseGrowSpeed: 1 coldGrowSpeed: 0.1 diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs index 82e6e470..82813c26 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CornPopParameters.cs +++ b/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, From 742c9a6c6974f03198d513fdb50ed21bf9ed81c5 Mon Sep 17 00:00:00 2001 From: kimura Date: Thu, 5 Aug 2021 11:42:08 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BB=95=E5=85=A5=E3=82=8C=E3=81=AB?= =?UTF-8?q?=E3=82=B3=E3=82=A4=E3=83=B3=E8=A1=A8=E7=A4=BA=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/shopping/shopping.unity | 78 ++++++++++++++++++- 1 file changed, 76 insertions(+), 2 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity index f963e708..498d551a 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity +++ b/popcorn/Assets/MyGame/Scenes/shopping/shopping.unity @@ -942,7 +942,7 @@ MonoBehaviour: m_HandleRect: {fileID: 890139698} m_Direction: 3 m_Value: 0 - m_Size: 0 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -1099,7 +1099,7 @@ RectTransform: - {fileID: 1615189014} - {fileID: 1286971210} m_Father: {fileID: 1098091308} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1782,6 +1782,68 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 927394683} m_PrefabAsset: {fileID: 0} +--- !u!1 &980038342 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 980038345} + - component: {fileID: 980038344} + - component: {fileID: 980038343} + m_Layer: 0 + m_Name: Manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &980038343 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 980038342} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e7b7e1a23513042b0bbac3c91ccab081, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &980038344 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 980038342} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 60b7ac089a534e549c0e25a89b113261, type: 3} + m_Name: + m_EditorClassIdentifier: + coinIconTransform: {fileID: 0} + coinCountText: {fileID: 1098091309} + coinAnimator: {fileID: 0} + coinPrefab: {fileID: 0} + duration: 0.5 + rootTransform: {fileID: 0} +--- !u!4 &980038345 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 980038342} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.046375636, y: 4.2303476, z: -0.13102803} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1016485908 GameObject: m_ObjectHideFlags: 0 @@ -2245,6 +2307,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1098091307} m_PrefabAsset: {fileID: 0} +--- !u!114 &1098091309 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 3664916832512110619, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + m_PrefabInstance: {fileID: 1098091307} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 351b4ffae35e149bf81549887561d561, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1102915445 GameObject: m_ObjectHideFlags: 0 From a449b551372cc81084a90f4bcdc01beac77a1bc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B0=B4=E8=B0=B7=E5=9C=AD=E5=90=BE?= Date: Thu, 5 Aug 2021 11:51:12 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A4=B1=E6=95=97=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E3=82=92100=E7=B2=92=E7=94=A8=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity index 0daf7892..e9ea0acc 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Cooking.unity @@ -13693,7 +13693,7 @@ MonoBehaviour: spilledCornAnimationPrefab: {fileID: 7516975307168929492, guid: 33c91c454a38e410cb291f1f2e5756cc, type: 3} cornSpawnCount: 100 - maxFailedCornCount: 25 + maxFailedCornCount: 50 baseGrowSpeed: 1 coldGrowSpeed: 0.1 hotGrowSpeed: 2