From 25cd5e388764c7b043ca687aa293c96e31f5401b Mon Sep 17 00:00:00 2001 From: koya_15 Date: Wed, 21 Jul 2021 10:14:39 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E7=B4=A0=E6=9D=90=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resource/UI/ui_marketing_icon_coin.png | Bin 0 -> 2336 bytes .../UI/ui_marketing_icon_coin.png.meta | 92 ++++ .../MyGame/Scenes/marketing/marketing.unity | 499 +++++++++++++++++- 3 files changed, 583 insertions(+), 8 deletions(-) create mode 100644 popcorn/Assets/MyGame/Resource/UI/ui_marketing_icon_coin.png create mode 100644 popcorn/Assets/MyGame/Resource/UI/ui_marketing_icon_coin.png.meta diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_marketing_icon_coin.png b/popcorn/Assets/MyGame/Resource/UI/ui_marketing_icon_coin.png new file mode 100644 index 0000000000000000000000000000000000000000..01adeb0022729410fb81240f7e670b3fd0689630 GIT binary patch literal 2336 zcmV+*3E%dKP)dMv%0rkWd;Fnuiu7H3n}%F$$9251v$pp>bB6yvvokw0p0&NPLBKB^&-l#jIp6uu_utMa zSfE(q(k{Aerna@*wJq?sO_%>xH3W zPEDid^dIrjUoYYMz!i+$9Ce@Fv;1D%vur66$$D(~%qBdvZHw%iLtZ9L@2?p!fn^F* zUGe+pF5nNZ{~8|>&|2j4JHLRf)OZ22$Z-Pw?7RWbrdihF$rq2*3^XVYZF>aW&wXn) zjfZMlslwS~VI%yRw*HlaFNBW%;3I3$v8sp%Hm!m%CS>2hHMfi(wzdFs`ZICbZEJwqR0lDcf!V0w z`d9%!etFmj`X{G<9%hKw2=IL_;A-0aK7sXmgXe$nARf3+N33xTEYfP>{mZa2c_{TU zX!j=NRgS0HdQgN7gh7kZNr-d~B2$32oZgM;5_JENiI)yvb?LE@+}(FyeX**Rok+JQ z_>=>I7wqFZmty@o9oiiM^VTio-|m%QwPj7v*R;7{MO1}BM#hcrC2*pJ*4auLu7_m^ z7&p?e3I?=E3tg*qJhrXLormZADBNZ4@rLFZS=XtfCw;u#`BVoYr3U(ij?$$8*{`o_ zm)q?1Ic9|Z^rvK#_hr&qMRFgi1$~tb&KxF}M?0XU1)kW^ig>JIfIR^N_hMAbbnpp> zSHE_bAsLN9Z(9K|l9rs*I$EUWydomB{;2{mnYSC=%Rb8@I@or=RM3_sVU^p7;H~{fVW}N->CuahSI!<@U4X2Sbq5=wQ0iNB7(( zvUzEgZpPIRwT&;GC*T5V#=^r7H_3&0Lw|^DRy~!1&pSA>{!{I!CoWp)NtCW!l@qgp z30;91BfiF|5oJo$TWhLGCZ2kq@T`*+M?LNCvnrj-i{S85q2xhebB;>Q=5siNITyJ(FQFBB-W2*JA|T_ANYspxNPDp>;8(NU(3q)?{2fl+I^tCRN!!23M@1PEPDv|p4c!rnD?cg z)c~IhcGd@8wjzofvDm781C%VkhM5YvQplE&XD|XB&l{4*b~vZq%vTn(+M_gY<`$}9 zuE8AXeP>+evl3iW+}2*E0-7g6p`uNZ4N$?6qOjlfXqUsY>HsEpH}J6;iXo`so|)y# zmI@`VW@Yltv`|~^LBvGX16Xl=FGoO`nI)rk^9p$g%aeVJiJZM_6hwIJtf6CIpb~Vd z)Os1k4eS zL$#<^aPeZ=m(Y8a=8--%?9_$9GH6FGyfr2(1=a*-XAIo9J}&8@@b0%aK(xmtNR0qQ zazZw~$2tPu*(iOl!U2S6U<^-6KP+EPqu-fLD$e}w zwl9g_y|264d7SIkP6VIY2OkwJ_q{VgWeuf_&34)2fHprKgZaTtD6}Xg#MZcvpIJAi zV0yqh34HJ0rt#Lfv`@QL_(=&%aXDDY{_IBsc>7`sMjK^t z6l2w9%9B?&%LGPhJeBn|_RIW?-_ceyO7~?fQE|R^lIpo39~JnFqRPR_{+i1CVCC$T zOgkP+qTaOgS;d^=P?5`g@&;^RZ@h5}7vG)sc?GVPxoVzwnLpP-3Ik@~zQl;i8m<(! zKfV+R-H<6FXI+X>3AgO_SgWaYNxH5-olX0+I!Adw`$5Wlj;dZG;4{h>^1)qQP3T&y zNeXnWPuNFQ{aMM^zDv^>8ZP=Y>ZP35xNAD9n$KY%r+r5czOdlKK=uav2<(Cn1Lu3( z%B46{q)P2I>!~Gg|DqnZ)^ecD8t0;w7m%IG$V$OUzP$(99BP9he^C##1Drk_W{8U{ zcgi1Vj{jeMl&STz*RHa*|GPhX{m*__oCW-U?9=VP1Q-B>k|p+X9kUAn0000 Date: Wed, 21 Jul 2021 10:24:49 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E7=82=8E=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Resource/Animation/fire_on.anim | 70 +++++++++---------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/popcorn/Assets/MyGame/Resource/Animation/fire_on.anim b/popcorn/Assets/MyGame/Resource/Animation/fire_on.anim index 0ce75671..29ff8150 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/fire_on.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/fire_on.anim @@ -28,16 +28,16 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.05 + time: 0.1 value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 2.2848005, z: 0} - outSlope: {x: 0, y: 2.2848005, z: 0} + inSlope: {x: 0, y: 1.1424003, z: 0} + outSlope: {x: 0, y: 1.1424003, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.083333336 + time: 0.16666667 value: {x: 0, y: 0.0476, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -46,7 +46,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.11666667 + time: 0.25 value: {x: 0, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -72,16 +72,16 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.05 + time: 0.1 value: {x: 1, y: 1, z: 1} - inSlope: {x: 3.073105, y: 2.5177388, z: 3.3720102} - outSlope: {x: 3.073105, y: 2.5177388, z: 3.3720102} + inSlope: {x: 1.5365525, y: 1.2588694, z: 3.3720102} + outSlope: {x: 1.5365525, y: 1.2588694, z: 3.3720102} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.10918431} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.09491957} - serializedVersion: 3 - time: 0.083333336 + time: 0.16666667 value: {x: 1.064023, y: 1.0524529, z: 1.0511323} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -90,7 +90,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.11666667 + time: 0.25 value: {x: 1, y: 1, z: 1} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -131,7 +131,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.11666667 + m_StopTime: 0.25 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -160,16 +160,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.05 + time: 0.1 value: 1 - inSlope: 3.073105 - outSlope: 3.073105 + inSlope: 1.5365525 + outSlope: 1.5365525 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 + time: 0.16666667 value: 1.064023 inSlope: 0 outSlope: 0 @@ -178,7 +178,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.25 value: 1 inSlope: 0 outSlope: 0 @@ -206,16 +206,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.05 + time: 0.1 value: 1 - inSlope: 2.5177388 - outSlope: 2.5177388 + inSlope: 1.2588694 + outSlope: 1.2588694 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 + time: 0.16666667 value: 1.0524529 inSlope: 0 outSlope: 0 @@ -224,7 +224,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.25 value: 1 inSlope: 0 outSlope: 0 @@ -252,7 +252,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.05 + time: 0.1 value: 1 inSlope: 3.3720102 outSlope: 3.3720102 @@ -261,7 +261,7 @@ AnimationClip: inWeight: 0.10918431 outWeight: 0.09491957 - serializedVersion: 3 - time: 0.083333336 + time: 0.16666667 value: 1.0511323 inSlope: 0 outSlope: 0 @@ -270,7 +270,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.25 value: 1 inSlope: 0 outSlope: 0 @@ -298,7 +298,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.05 + time: 0.1 value: 0 inSlope: 0 outSlope: 0 @@ -307,7 +307,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 + time: 0.16666667 value: 0 inSlope: 0 outSlope: 0 @@ -316,7 +316,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.25 value: 0 inSlope: 0 outSlope: 0 @@ -344,16 +344,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.05 + time: 0.1 value: 0 - inSlope: 2.2848005 - outSlope: 2.2848005 + inSlope: 1.1424003 + outSlope: 1.1424003 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 + time: 0.16666667 value: 0.0476 inSlope: 0 outSlope: 0 @@ -362,7 +362,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.25 value: 0 inSlope: 0 outSlope: 0 @@ -390,7 +390,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.05 + time: 0.1 value: 0 inSlope: 0 outSlope: 0 @@ -399,7 +399,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 + time: 0.16666667 value: 0 inSlope: 0 outSlope: 0 @@ -408,7 +408,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 + time: 0.25 value: 0 inSlope: 0 outSlope: 0