From 4a4c20b6ba8ad38d7b23c4f04cc6152d60093d18 Mon Sep 17 00:00:00 2001 From: "xiaohui.wang" Date: Wed, 11 May 2022 13:38:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=8D=93finder=E6=89=93=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Plugins/Android/libs/unitybridge.jar | Bin 36844 -> 37867 bytes .../JPSDK/AndroidJPSDK/JoyPacAdverManager.cs | 22 +++++++++ .../AndroidJPSDK/JoyPacCurrentcyAdSingle.cs | 5 ++ .../Scripts/JPSettings/StaticStringsEvent.cs | 44 ++++++++++++++++++ .../Joypac/Scripts/JoypacAnalyticsManager.cs | 25 ++++++++++ .../Assets/Joypac/Scripts/JoypacManager.cs | 3 ++ .../Scenes/Cooking/Scripts/CookingResult.cs | 24 +++++++++- .../Scenes/Main/Scripts/AutoCookDialog.cs | 13 ++++++ .../MyGame/Scenes/Title/Scripts/Title.cs | 6 +++ .../Scenes/marketing/Scripts/MarketManager.cs | 17 +++++++ .../marketing/Scripts/ProductManagement.cs | 8 ++++ .../Scenes/recipe/Scripts/RecipeDetailView.cs | 3 ++ .../Scenes/shopping/Scripts/Shopping.cs | 1 + .../Assets/MyGame/Scripts/FooterManager.cs | 39 +++++++++++++++- .../Assets/MyGame/Scripts/GetRewardDialog.cs | 43 +++++++++++++---- .../ProjectSettings/GraphicsSettings.asset | 1 + 16 files changed, 241 insertions(+), 13 deletions(-) diff --git a/popcorn/Assets/Joypac/Plugins/Android/libs/unitybridge.jar b/popcorn/Assets/Joypac/Plugins/Android/libs/unitybridge.jar index 4afe4be7858bf6e41e7cab5364716ba3ba455830..85772ba60dde70a9303408cff3d4e799177d661a 100644 GIT binary patch delta 12105 zcmYkBQ*b3*w5?;?Had3Fv3G3Swv!HaZ0|T7+qTuQ?T+1XI?nA=b?QHN)tI&F8*{wO z^)##2Wgf&u8ALsZ0hkSMtS0%|-X>tiv+5Y_P52wfwjRo$$DJ(brj9`{i^@?8D-tpchTy zbH9`QciOMdsW;OJ#qecUZ5FIw`_+fuPl=>q2)r?&>}hkX2mm~HCoAB&0Y9v&MW2PO$`kZaBSMfvhc|LPtc%fs`@OG3qanF9zl4oUD%j=rB@e%@OFJ_pBa z05hz26>)x+5q`XrC+{bSpZ8jTUh_i+K<}~FF6$i+;B#h7_<36x{{@%wYjms+|0PZM zIX>x&^-fUhvM=_%e=H&PJs~L%586)wz9>Znu?V9N*usl4Rg<~T~1-9>E z%$gR!&#@7<>tVqeH}5DN?s+ZZJC{p5hP4s%_0T&1fPz-)@7>xP`(*YYkb60M3I@oD zMKO0r1F~k!lgFYQjhn<;vSy8+ItTCs&ocs=@Td2@DDkH)+_8#^UbgW7qwIX~^S7RS zLAkTQQwaczF=xWAf~h-uks4mk#C0hfU(UQA01=O=c@f{eG-sx;$;TF@Nb;R8ecmS) zXVV6rsb&7fvz=6Bk-al;KFm{Bkpa(O_|%kNKsKGVaSM=sXI>J=+_ZS~AO>J*oX3u> zHGeP#RN60%SYuNz$9CdBvZ_v&r_b90G&z8}L)J``q5%Kc+Q!A@rCDp@J{Y`_GI9Wm z3Dux=hRS;!yYB2M0brHAGd_u{qB*Fx?O?Vf*3sA;vxpFXeel#G*52a56~JRsRF;ju zJvfE}s53q!u>XU#>tN>2Psvl9ys85BsXzYBvORjf3cn|OJ}35%>4Pqy&g|g_zzJyl z004M#ydnaeOdl)(!0}V2*d5!VHgsn!Xowx>f?ez=Z%Qae?3X6^V(dEC8keJ2gP^Rf zJL@&v@=OV`7Uo^z$C_J7LbwM;PiTR?{8`WiLYV9FNk)b5Hjx(9?g1TAcu&|sXQy%g znwDfBBjsE}?J)Ml-=z+SS^}pG5ujB^;%oVAUW}7B{84XKAcHRH6UH~z-khJ>MW$Z$ z%w8JbR^uck1*%54cy`q&Ci6J4p-bhTp#A16$~BK~MxcrZ^G7EUpP;)-9z8U6oWrUn zu8&?}wwb?7wbn+jQzKNHS0W_X4_$+i$Vc#-~P*-T(*T^b>7V zS2YFpxa2)5?%u>?!^lV@u9T+p;8^-3UqT0al4;N zYWe);8U)T=>j1x^cRYb}M|94&mZD@FP30{fN>z5{7)D3F(f�T7G$$YQa1(wSZKH z{pm*rUROB+({&%ro9978d!XU~Sf!RkKMn%mu#34{S2C!aCl<9(D4o=UhkV*@p{rIj zPsNC|U`y;;S8FYV;)3AN{PN>8?ZWQeJei_tDNHEvp%Y3%%*Zlb+QGS|;n?$2+Jez> ziO-_B^3j=z|HrB~5^@6c4TJQ7d+36Z&kxlqRuJqJkU5Y(4%G+vqsXZ z;_=ni_BM4ISLf8jhagLIDo1C$AZ=BlgQv3Mc!9I#(Wm=74%?3O7ezJ4ksWH$C@Oja z?QQR`-#^zPQ^Wa2FGHHnzS+AcsPbqKkH}cM4vq{EK-|wPRAjrjnRMP6f3GaH*lmt^ znDUsfNBpoUSiKtAm;wS=a)?n@BBJYkSliMrSvLuD_6!c(d^;k%W{DhEY|6Y@BVfB4 zYNMO|X189Y-NPB8sn-nlEgeI7@|umu2s20#pnZJ83>~G2h~K+K8J{%53{-YBmV5+z zU-_A-3W~A~* z^XQ+%NGMC=JKb{w>wn>DH)5sgcGXT9CGdQQt2Ig}b|)HXAM;gXZ2pE8)d}IqSdzdj zwWfD9io(z~ObDz&{=v$iHi929|DsXFx=B^@+XL#ycmV03WnzM$o`>@kqf!4*!=`3| z%v?CsYxu}p*f)p|1ni-eZ@Sdn-i(tPN1C?V(^QlMk%$wh5eCR&Sw*^7`MoVmZ)j?N zUlU=cY10KqFEBJjQ-_cl1Pgs`R%1+za!&8}OWfjx=kKK;jt*-wVNY>m79%)k|BY4WLrKswYj653T-WmJjHQb~x z?->)HV;{*bu2Y7eZRI6{R9O~OeS z>2BOcc1)}Ey+(uiS;hUD`-9D5&$wmwdgKRLapE6fDQJrd(I5aA6mziyUJyzsCVRr& z-~m~oQ)Z(xot=!#UsP`G;i|N(tVuc`sye~A&)s5jOn_ci@}oOIOFS$g8`NRf^Jkgj za3m3w03vasB0#aFH0C+l`L5{c@fL#aw6#`os16DFXh>XmDX^hF^2Dj4sSXNje$Gey zB4Y+3?IkQh49C&;*bP^~C5*83P#6yVZQv2`@}nBb8((mrPnY8?BrgKQ4OS}r;%10A z@$5L8y}LE($!4o38OL_(N4+TuDMrhNgv1SAFcTM6{BGO80?7%N$ z)~~*w+Vh>+3RphzZOvPE5lr|#bJ_mVq_BBdzi{?fgLlaA=NZ&bOH3M-S3#6#(s%Qs zzkH|u4*?JR#U@CA_?oOTB>XtMGf0$$B%#P^1sYV8&h#}_48>vWY`oKa8}P332k|xF z%szgBe~uz`{AhLu8ykG$Pj>3E*m1WXC#}U9_75ho{-J*;!B9H$gk;J1b!u|Tye@hD zFX^=GQTS+Vp87biULSB#sr{B@=gf!>4PP_jNSx4}o8PNG_NLC! zdvH$fbF|@_H4!0&Q8{Onj61z?hP!{rp6pe#@GF?wVNE=()txpHG zrKxoLdYcm|msjGPGopXWl)jH`6U~dne;exN>|j|TSIrok1#;6wKd-Q>G`1y-d&Bw! z@?`sd2a*3APZ?g=r#<3hk0RFA@%!_1&wd7lfiSP0hf)6bEhmrI`|hEYmFY5F4x%92&BSJL7k#W1mT+w~FnFs0-+ ze;#;$CLwpFm#HcM2OvGF06{`KInw);V04 zLep6k&;>Vw9OdiK>JqyC<2xpIOfPRh_Sy4LTh!96lm-1YHQggqT@B0a>k|E6_Vh%n zjl%uESxc^++1-*}0{#)Orunrlz7t zm#q9zN=>gogMa02*Sx=AC5qg9S7k)3vz4nrnFZJTLfx6s_h&a1Kua4G@x zoa;-pK>3lCD{41#MP4z2BHL+mSp7GufNh;5DY-1Wb-qZe8>H5E5&}L{X8xTUy##p- zxsHZYwa*0@nrQYWta$JT^(m!mtVLSa9cG3@>+0h&H%IZKS0S8&FaII|aL!-Gd+HM4 zlwtM~EAnLt#jCUnJZ%~!O-w)N5U}7i)R#I>J7{YDJ0Y5!^iDP|{rImw25=!LF+z-o zW|GKZNSE!8EiHYa05k!~^(W@f`7a36)l*cH_CWR!Rvq(52McOF{04sUh7uCcQPcBB zjd^2Mg~Vi)V&*Yv78B-SR(0v{btQfuYbF9$)5%I!axA}V&C6iBk=1)4h>agmSVIsD zUp#W0D_I`NK!9}bf2}MH#ms978;e0gm+k%TEy-CPuPHv2V0)WP(XmF(v=0vfW!4;! z37kxZpSA&D>!c`4{|UxQdjBqc$!dN*wKq*1L6o#Uu^8f4=P6#=kueQl(OXO$fl_emKysApM?>e2ALC0>=p~d_0ry1cX<3U8^b797Jodpd+Iob_wA$D%h zq==X1-s&>)u8q;#BEyzi>59nplE8L6)H568%z^_(&zFlMx9n1n>ng(eC-HQ}u6SqHm6zT3#r8d!_xMbyx0k6Y(x7!Pw z0a0S?{n5(Xy*^4^M0OtP!@(5KCs=V5+SH6xlJZ#H;UbNQ2kycheTGOFE zo7b_=kZ7L~(QhPQmWokjd0txlaiG1X>*g;kP-Bb)KH||GlHgFN`4dN8h?|_L-Qhji zOS`29D4sQ;KFRu_UBY=s^BK)9qtY{gg?dlh>iT%cgz*5e8ou`FSI)aux33Qa zY}5QW-Zb{DxXyRHyYM0*CkdChTc-B#Gb_*`C6hNv=c0!cIE;Uh-duzP~Apo70&20e8KixIaX5`UF)>9P%flPAWHr z`4(4aop&_fiaPpY8LsDVa893fs8B>AQordM%vn8DYh;z=Hy&`lec(0R*r2c(IqaP= z)$!zrevt`uEI3PS1laKg1oiW>Ks!dX32h1joEkawt_N+73~s0!wYH2_GR)6MW@scO z5AjK~r1N+>dR0MI3vxlWZSdl+!Q^-bhs4}qDBq+Vgi%x#Zv@L{S*aqHh5o*eg&8&8 zCnxGra3<&Bu9VB7-@syLh)y?aS`&Su&E}wYRMA=rw@!B~7#(AHoMdi1=s#g70=!V5 zQR8ns1N8z`?-rh&E$Hki?uwY^+=I?9wNBic0TP8diirIF6t#^xY2alV@tTz){7ho} zOuvNXZf4n=7hRhd5h4d=tpj7`HJRJdD}OUP4^ciJvn~y~cmvTC2MoOlNyIwdl<$Ua z=z2deo)GnBzzG9LmF<0qvVHi@LXcn7ay0rDs$a3s{;ZDH)569j5n{>usWpKZX{oVSasR# zWjqUYni|bCr-4yA9>w*x%x&l8s<%2g1dh!=Z9~~?O)m|Nsn@f}t@`h+`!ls~?p?wK zBL7CzL-HeKIz!zH#&_gOtlElUl8WCGOEn21d)y$|2U?lH%B~^L4v=`G{~1NOV!NEn z9sY9(HRzjL+>a>zfYpE~9xqQYF~bOVHt9!%^uWU&kP)5%DHD|$Qu zWJdwAX$YAhzY!>KWrTLX&~UA_YZBPM&sx;OvxVfaAaN%VUIu3j+^O>`sA7WjY*-iY z7i6^XBEdKsq_Ttj*X2Vs<$s9s%E01MJSF!kM;JDMe;C7_p>{=KJ|zxV*Mku-M#3N# z3{Y6t%K_(%O*pmvIbaAwjdBP>kmr#+dra$T6s=@c-{e0!E;*Pi^Uel^Ubcjw+1{`! zEi(&fED5eSaENJ$qlnS8di+-)DGBot*Wr4`ELhX@Q4Yp%G9+pPAsUG%#!{69rMV!&?ps*2Fvqmd7l3e31W;^##F>JMDqJ5Ce&5>W0woU^XrkriCoB{5^~O!x19* z3Y(NbmU%Qe{;#4F?dB`^r8=~PN4I2VF*8U_x@U?_o3^!zTVQUXOhoi2h2FwzWbgT+ z`W7>41sp36#1A2V=TJXG18#&~2VhTONsCDRf&-ihK7J#;4wRu$bJ@%+a>==s=jMu@Qr-vItcsQA$xLi_NJ`s{Y8N$kX zz+1y|Om9{(Zcj0@KsxSsl0vLy1%N}NBs1(vsk8(6fR^xBpfE(OcA>gIk36m(_|1Wh zCj4#~L;fMz+m=qr#IL=adMVXGG$%bdx3J%k#@I_v3B5T2>5BSxKkYsrlf!0C%S1T? zrHV~p3l~<9uyj6&HT#(2QU%V3v%2(vOn#K|G^#$t5Uk6ZWJ`>8NZg(8vPf-Dg%25J z(GT38d?vy(P)$TBNGjDiS?Wm&$ayODPtqv(bmwlNho%!0szt2SQA^hHI%YIFaWrQv z@(Udz@bsgJ4bd_*bOu9~#KVXncVtM97v|^)hxJ{t-MOSDLvq(jgQ1C!LbLiy+~o}T z3-n7yxM({#-^fRod@E7D97sqTbn}G{){vPHon|b(7r*j+#QbRHP+OpGJX1G>Z`4SA zE_0Zi4Yj^vx}Bgz>Wa92#{}W-P@sHhgS!z$cjCydB@_RWkHMlJ8bZCG1^eNN z{t-`1ARmK-yPKPZxbyRXkCp%RDkuA#a;(Jnxzu9%&WivJAw>?9&c}lfhucC3VReBQ zP1(cvi69Y41b3rENZ$Fk?631F%gh4wGoeHvON3H#Jeg(?Nf`43-Kk{4fc6ifU-MQb z7=qx?4?Z_@xQRP4_2IptMGFjgLOFvsXBJ3#hRbj;&e3G3A0*P0m@>J{i4+YY2!!d~ zy|gD;)uCWEuB^MjaX_gbD!wfk>+(-?f7N8W8Nu-u2eKEK9Z+G*fNl%3781ODJq<$74w$^&nXuhLJU*PS7T!vVm zSluT9bLp<}w=dN4lCMy*58;RX>)-6JPHPfv!S zl+%`5V_26cRKqfoO(#oh<4a`cIK;D2*Hd#{iWG0-e&x=WyEnBnbBv@eL#1D^JFrJ` zD~90=>Y8f+QB+)(nRxW5q}#LyY-ECv5JU9k=;iCzObSXMQ}p--T;;4Hbr+0lN)W4? z+{2L59D}nlvGvL>-nebIxRWz=cheD60cmP=(zVTfw&p&h=CzdB2i85IGhiHhS) zw^R!-B!|1)1K1;-_Ie6B=ETDjp8W$RTw)o>E&KGqp|KD}xFS?mIipi!UepD~5A;|} z7+n~#QVX=HdZh66G!xd{Wbl?W^!klt_<%`gIGsjLvH;@5dWd4kr9@tWL`AX>u(P$d zlXCUwkr2C5sIg%^C{CbfnZ`Joln zz#0o6Uu)XGZWvQ*TE}sXMQ$s{gHXVfu1BqAIz=MK6C4;NPTCsX3JRa&f8AS9Pf-88&fM3?QdRUUzS%%`v1N*&m}dgRF(W`M{kLl&-4&~=e<>xi!=eeyFd`4=Ie(#}H3P)VssjGNPIePqcMMuol zsx2wy}VP zVqc{G?T8@7PT9>duYhR6z_P_Lw9BlN%5;I1thO-@t`=Uw8%x0(=~X8;2t4gz4P6*n zoN?Cn*!6shOWlgOT6>mPc7&dDjyBal5`*~ESAFg;4LH+i$6pHz(vY{8)&U@-!cBhC z6B3bO971aZPL@^_n!fgDZ3H8X{h;YcS!)>_;}AKKvyWEs&#te2+T$dc1fCb zvlo4Hgv*AnLe&lwD!xlz#P8Ua4=fj8e0!hBmeHV3S|9m&9UI;=jNr*N!Ji<$t)YEq zTskhj%H>O`;c2s}81HEk#d4s|2BkuM-FF5D;f;rRfOj=jw(+?LB@yGaEI-xWkgVLs zo~z#wPr2L8K#=T?%}vR4h+Hg!Mn8s`wfzeU_A3eYD+~PtWozEo9@r;lY#JPvG!{J- z17i|ny?XL*F*-@axVHfbRhhJcDWoy-$?>rA2WvceW(tNm3Fz;s+EKt+D(y;0mn0OZ zUz~z{VP^=@G0WPpzwRA_y8Nqw(tD(G{+zAdO3GJCk#cK!iS!D?QnCj%b6h)=GJ_?} zqv%dDo*S45;{e4*&WJIhCiO^JtYPd-*b;(a^l}905S4_2-znju;VJOE3(gr7ae+Rn zC@Hc!tVR>zt~SN3-8n$Wk0`=Dl?;fSNLW!F<6dTj%DIOsGD9YW!B&t;4Oo?8FxXKE`~>BfrfCb{Q`S|Oi9LM8E{ znhYOJfv1h)Mg!Ke0X_9n&jLNCEqDf0L9E2(_R0%?)bPU&MCfETqGGhEMe<)=5;LcvA%K1o)yoEN&aeDFH zR+YU*-JI_O_!b7@m%mArmOgDdV0~x`V0ppgO8C-d2^7x{iLeA=6^kXfWasTG&naC# zAr@qfF<`>}378D~Dr0Dmw#=$n8H7=RLl}%YQLM2R@!axj4)qsC--45QGT*#YY)CH^ zS?R1r=ZHli&bu&Vjpw)P(0Ev9IuZ^0|E+`HO$IH*zpeZXxTO&^M3 zA5A|Pjv|sQ8g7LwxFwOPCPb_Pyle8YUaS*KQ{(49#>r8Y$1>_-OGHrQhE_J)Kb7(F_Uf@iW~RPcBHP77=b-TK>( z{l!Ul51>HF>%$~Wo@UQ8cGZRtJc}mrTIGXDYI5eud65xYnp|7{$qr2B0!aq_cD$i4 zF84COagsZ&x~!KSNjCftc0vxqwzRtUB}L9C^P+$!eub8RXC_{HxowA2ftbrWmwC-X zszF$x4|!0t0O4&45)EamI0p>PqCaZ4j~W@a;mtW z;;y)#2OTbZ>2qO9g@}1#xB>VE&l>J~T61B*IOca<4rV_|Roq&e@vt@;jklab+df~% zr2x$30L0}0!sSoM$`9ts4=MFGV)eHk%cY$ap_Vo~QEe;9s}??B%dXn;C&=*X??Lz> zsyQ5KD?Qx7klVeBHW+hM%#b1_NQn*Q4e6ksg%#zE!Sw~htiEr6dSMkUtv85kVb{ZD zO~SPVBO*u26OP-2IJ<=)yG6II7l+>=61r3mE46fKudC315cb)r3c=*3`CC2#cxa);6(FwrIH+ye9$= z-mk9V=>UYDFu3n^=t1t$@FVZ}^c21`yVexGBfSR?$?Y*P=WX?y}kU|oPYYv*Wh2Fw{u%yQ$PL%4-{2Yi|ED0H3Hs1;AOQ#vA`DI0^PtN21ymV<>8kyTqqq6PySvj+_j z5j71e`LP1E&VZP!*n%O{)7m7kXvWH*`fv%uvY_uC7UB%>nRtgK(&1>*KX0w;EzINi z2*8;g7IV_(1P!dudgpo)n+HR=x7*xzH=AwVgdg;TLUVa^8S(k&@{W8q{k?ckdfzN_ z{cq2#z%GY@@24X&&}Hu#Ll;>t1a;}RFwjowHyJ=ur@?HC?vVt`pAQG<-7U~kx2-q= zv28J<{N_K=7q77(u9ICfn-h2rgnoi<9feomM=%Th6N3LnKe-4acPkCNVf%>;z~sWqN~nqXLD}c&^)}|;JiIAzWTttf1mQ6<$ zJCT7Vzjxs~lz-$yDNV^{V`$Q_^STv(=eOCQ^Jlk1z+)7jC0V+P#nYk@oN+HD6P3eT zspdADKJpM}P~F}t&XG~d)SVwUN8D)7z@Nk^WAAWb6Mfe$m8UiRo{6cSR8PK?JLd+p z*_-bBUwt7)DR5w{1Yq zs^Qnkc1vqoZ=pEgr?hG1=c{ zS=*sLXrqYUmAQ#8gXwxRe>d!ZfW-z5=Z$SCoZ*~)WokUpAT^Om?8^Yj-*Mp+>(eNi zaN=yt-ps~#*aUMt=bsrqHOVbigsPtTbJcE9-$574s{17O<%X=+eM%$u&$t||1m?Wi zgUF1lWHliEQjVqt6YMV>-lY#9_BM>rWHV^Qe`PDfaX7lw;h4zGQF}HCieyp5hdf!x zWTQof%S1)b;TvsCxF~Q#dN%(8&n9ZKb);k^d=TJ)ctEaNz%OR~h%A{_!2FDdITEEA zujAQ4?_gB;zJyEYB@TSCw@Ga(Nu5p8^lG&p{x;g>4Bo=z^-*nWoN(LKHc_KKKt4El z=rLqOY}>b|sm#trwn30q1*QVXT|uNgrW@_~NoqPh*%8uG@CvNA!&P2PsrUG+psb5F zi%YljwJ@(pn#xB%$~uVrz`= zG$9`b_S0&U!3L1yHh}Z6SC{~)+h51Zv0GYjpE(%~89DXujVHr~gsPdtg%RhGX0Np8 z#J=^9)>~67!!a8>R?uQov5GgNeqUTmq*Ej!iw;G20d<8@rq!s+?!0QNW5(KG+pA#! z+t^JEVQ>%G>)IVt_y;ze+m;az$!~A1ZEv2@x=O;ntOKC*_V)>wYR7I^p(mf+yN+}Y z0=*SCZ~j`5&dX?l{<7JeZenr2N(=DIp@7zDY2)_B_55aSJzQ*(K{p#yUw#^XeFvz3>)x`y0X^cwdNudY(Ck*J3D>R0fKF)8>rDpPTUM{R1XocD*cz~!uOX!Ug#Dk*#dQOzIT;QN?Bn0BZ5R*| z;s4uY9HLwyYL!8IQRWciD*rBe&{;e)C@-1-qFn7C(t%2&NI{S>1Q5hp|BwVE5{C>j z)Px7+gyVv2|Jge_|JkHE@SyGpT+sYK+d}_88!wg*V$bM51pY%+i~sQW9}ZdnFG@kg z*#Fm=vV#Zp#IZpDod2^3{h!{|yfY e#sLNo_J3zD@Lv!ggce8wnoYokIg0w9*8c+lv_^&i delta 11034 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 diff --git a/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacAdverManager.cs b/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacAdverManager.cs index 80e87b09..08835ef2 100644 --- a/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacAdverManager.cs +++ b/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacAdverManager.cs @@ -525,5 +525,27 @@ public class JoyPacAdverManager : MonoBehaviour onCcodeFail(json); } + void CoinPush(string json) + { + Debug.Log("unity JoyPacAdverManager Push1 msg:" + json); + JoypacAnalyticsManager.Push1 = true; + + JoypacAnalyticsManager.Instance.AppOperation(StaticStringsEvent.MainPage,"Push1","","",""); + } + void ShopSalePush(string json) + { + Debug.Log("unity JoyPacAdverManager Push2 msg:" + json); + JoypacAnalyticsManager.Push2 = true; + + JoypacAnalyticsManager.Instance.AppOperation(StaticStringsEvent.MainPage, "Push2", "", "", ""); + } + void AutoCookPush(string json) + { + Debug.Log("unity JoyPacAdverManager Push3 msg:" + json); + JoypacAnalyticsManager.Push3 = true; + + JoypacAnalyticsManager.Instance.AppOperation(StaticStringsEvent.MainPage, "Push3", "", "", ""); + } + } //#endif diff --git a/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacCurrentcyAdSingle.cs b/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacCurrentcyAdSingle.cs index 0cfdcabb..3099c22c 100644 --- a/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacCurrentcyAdSingle.cs +++ b/popcorn/Assets/Joypac/Scripts/JPSDK/AndroidJPSDK/JoyPacCurrentcyAdSingle.cs @@ -316,6 +316,11 @@ public class JoyPacCurrentcyAdSingle } + public void nofityPush(int delayTime) + { + _currentcyAdSinglePlugin.Call("nofityPush", delayTime); + } + } #endif diff --git a/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsEvent.cs b/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsEvent.cs index 97bf4589..baa755d4 100644 --- a/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsEvent.cs +++ b/popcorn/Assets/Joypac/Scripts/JPSettings/StaticStringsEvent.cs @@ -76,6 +76,50 @@ //finder + public const string PlayGame = "PlayGame"; + public const string MainPage = "MainPage"; + public const string enter = "enter"; + public const string Make = "Make"; + public const string Push = "Push"; + + public const string FertilizerRewardButton = "FertilizerRewardButton"; + + public const string FertilizerReward = "FertilizerReward"; + public const string LeafletsRewardButton = "LeafletsRewardButton"; + + public const string LeafletsReward = "LeafletsReward"; + + public const string PerfectRewardButton = "PerfectRewardButton"; + public const string PerfectReward = "PerfectReward"; + + public const string CompleteButton = "CompleteButton"; + + public const string CompleteInterstitial = "CompleteInterstitial"; + public const string Interstitial = "Interstitial"; + + public const string BackHomeButton = "BackHomeButton"; + public const string BackHomeInterstitial = "BackHomeInterstitial"; + + public const string CoinRewardButton = "CoinRewardButton"; + public const string CoinReward = "CoinReward"; + + public const string VIPRewardButton = "VIPRewardButton"; + + public const string VIPReward = "VIPReward"; + + public const string DiscountRewardButton = "DiscountRewardButton"; + public const string DiscountReward = "DiscountReward"; + + public const string AutocookRewardButton = "AutocookRewardButton"; + + public const string AutocookReward = "AutocookReward"; + + public const string Recipe1RewardButton = "Recipe1RewardButton"; + public const string Recipe1Reward = "Recipe1Reward"; + + public const string Recipe2RewardButton = "Recipe2RewardButton"; + + public const string Recipe2Reward = "Recipe2Reward"; diff --git a/popcorn/Assets/Joypac/Scripts/JoypacAnalyticsManager.cs b/popcorn/Assets/Joypac/Scripts/JoypacAnalyticsManager.cs index af8ac09c..9745c70a 100644 --- a/popcorn/Assets/Joypac/Scripts/JoypacAnalyticsManager.cs +++ b/popcorn/Assets/Joypac/Scripts/JoypacAnalyticsManager.cs @@ -54,6 +54,31 @@ public class JoypacAnalyticsManager : MonoBehaviour } + static bool push1 = false; + + public static bool Push1 + { + get { return push1; } + set { push1 = value; } + } + + static bool push2 = false; + + public static bool Push2 + { + get { return push2; } + set { push2 = value; } + } + + static bool push3 = false; + + public static bool Push3 + { + get { return push3; } + set { push3 = value; } + } + + public string aPPAdsShowCome = ""; public string aPPAdsShowAdType = ""; diff --git a/popcorn/Assets/Joypac/Scripts/JoypacManager.cs b/popcorn/Assets/Joypac/Scripts/JoypacManager.cs index 377860ba..bc5dfb55 100644 --- a/popcorn/Assets/Joypac/Scripts/JoypacManager.cs +++ b/popcorn/Assets/Joypac/Scripts/JoypacManager.cs @@ -65,6 +65,9 @@ public class JoypacManager : MonoBehaviour StartCoroutine(ShowGUIEnumerator()); #endif DontDestroyOnLoad(gameObject); + + + // JoypacAnalyticsManager.Push1 = true; } diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs index 8acbf411..7d54a067 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs +++ b/popcorn/Assets/MyGame/Scenes/Cooking/Scripts/CookingResult.cs @@ -167,6 +167,8 @@ public class CookingResult : MonoBehaviour TransitionManager.Instance.LoadScene(GameScenes.Main); JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Click, StaticStringsEvent.CookSuccess); + + JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.CompleteButton, ""); CryptoPrefs.SetInt("CookSuccess", CryptoPrefs.GetInt("CookSuccess", 0) + 1); if (CryptoPrefs.GetInt("CookSuccess", 0)==2) { @@ -180,7 +182,10 @@ public class CookingResult : MonoBehaviour CoinManager.Instance.AddCoin(refreshRewardCoin); gameData.Coin = CoinManager.Instance.OwnCoin; GameDataManager.SaveGameData(); - },true); + + JoypacAnalyticsManager.Instance.AdEvent(StaticStringsEvent.CompleteButton, "", "", StaticStringsEvent.CompleteInterstitial, StaticStringsEvent.Interstitial); + + }, true); } } , ConstStringKey.JOYPAC_SDK_INTERID, StaticStringsEvent.CookSuccess); @@ -251,8 +256,25 @@ public class CookingResult : MonoBehaviour if (cornResult != CornResult.Failure) { JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, StaticStringsEvent.CookSuccess); + JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.CompleteButton, ""); + } + if (cornResult == CornResult.Failure) + { + JoypacAnalyticsManager.Instance.AppOperation(StaticStringsEvent.PlayGame, "", StaticStringsEvent.Fail, "", ""); } + else if (cornResult == CornResult.Good) + { + JoypacAnalyticsManager.Instance.AppOperation(StaticStringsEvent.PlayGame, "", StaticStringsEvent.Complete, "", ""); + + } + else if (cornResult == CornResult.Perfect) + { + JoypacAnalyticsManager.Instance.AppOperation(StaticStringsEvent.PlayGame, StaticStringsEvent.Push, StaticStringsEvent.Perfect, "", ""); + + } + + }); } diff --git a/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookDialog.cs b/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookDialog.cs index d97b11d4..6d48fff6 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookDialog.cs +++ b/popcorn/Assets/MyGame/Scenes/Main/Scripts/AutoCookDialog.cs @@ -37,6 +37,9 @@ namespace MyGame.Scenes.Main.Scripts string position = StaticStringsEvent.AutoCook; JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position); + JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.AutocookRewardButton, ""); + + closeButton.OnClickAsObservable().Take(1).Subscribe(_ => { LocalCacheManager.Load(CloseCallbackTag, null)?.Invoke(); @@ -50,6 +53,8 @@ namespace MyGame.Scenes.Main.Scripts }).AddTo(this); movieButton.OnClickAsObservable().Take(1).Subscribe(_ => { + JoypacAnalyticsManager.Instance.AdEvent(StaticStringsEvent.AutocookRewardButton, "","", StaticStringsEvent.AutocookReward, StaticStringsEvent.Reward); + GetRewardDialog.ShowRewardVideo(GameScenes.AutomaticCookingMovie, StaticStringsEvent.AutoCook, () => { // 自動調理開始 @@ -59,6 +64,14 @@ namespace MyGame.Scenes.Main.Scripts GameDataManager.SaveGameData(); LocalCacheManager.Load(SuccessCallbackTag, null)?.Invoke(); LocalCacheManager.Remove(SuccessCallbackTag); + + #if UNITY_ANDROID&&!UNITY_EDITOR + JoyPacCurrentcyAdSingle currAdSingleTemp = new JoyPacCurrentcyAdSingle(); + + currAdSingleTemp.nofityPush(autoCookData.duration); + + #endif + }); }).AddTo(this); diff --git a/popcorn/Assets/MyGame/Scenes/Title/Scripts/Title.cs b/popcorn/Assets/MyGame/Scenes/Title/Scripts/Title.cs index 5def1f74..111f803a 100644 --- a/popcorn/Assets/MyGame/Scenes/Title/Scripts/Title.cs +++ b/popcorn/Assets/MyGame/Scenes/Title/Scripts/Title.cs @@ -15,6 +15,9 @@ public class Title : MonoBehaviour // Start is called before the first frame update void Start() { + + JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.MainPage, ""); + // 実機でアプリ初回起動時にBGMならないの回避。1フレーム遅らせると鳴る Observable.NextFrame().Subscribe(_ => SoundManager.Instance.PlayBGM("bgm_Main")); startObject.SetActive(false); @@ -34,6 +37,9 @@ public class Title : MonoBehaviour string position = StaticStringsEvent.Start; JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Basic, StaticStringsEvent.Click, position); + JoypacAnalyticsManager.Instance.AppOperation(StaticStringsEvent.PlayGame, StaticStringsEvent.MainPage, StaticStringsEvent.enter,"",""); + + this.CallWaitForSeconds(.25f, () => { TransitionManager.Instance.LoadScene(GameScenes.Main); diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs index 8e8a2cf0..8e841ab6 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/MarketManager.cs @@ -40,6 +40,23 @@ public class MarketManager : MonoBehaviour SoundManager.Instance.PlayBGM("bgm_marketing"); var gameData = GameDataManager.GameData; + int refreshRewardCoin = UnityEngine.Random.Range(10, 30); + + var isTutorial = gameData.FinishedFlags.HasFlag(TutorialFlag.FirstPlay); + if (JoypacAnalyticsManager.Push1 && isTutorial) + { + JoypacAnalyticsManager.Push1 = false; + CoinGetDialog.ShowDialog(refreshRewardCoin, () => + { + + CoinManager.Instance.AddCoin(refreshRewardCoin); + gameData.Coin = CoinManager.Instance.OwnCoin; + GameDataManager.SaveGameData(); + + + }, false); + } + if (!gameData.FinishedFlags.HasFlag(TutorialFlag.FirstPlay)) { if (TutorialManager.Instance.Index == 3) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs index b67c9b64..232683a6 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs +++ b/popcorn/Assets/MyGame/Scenes/marketing/Scripts/ProductManagement.cs @@ -34,12 +34,20 @@ public class ProductManagement : MonoBehaviour private void Start() { + + + + state.AddTo(this); state.Value = ManagementState.None; Market.Instance.IsPause.Value = true; var gameData = GameDataManager.GameData; + + + + if (!gameData.FinishedFlags.HasFlag(TutorialFlag.Management)) { TutorialManager.Instance.ShowTutorialConversation(9, () => diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs index d29f5769..a26aa336 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs +++ b/popcorn/Assets/MyGame/Scenes/recipe/Scripts/RecipeDetailView.cs @@ -66,6 +66,9 @@ public class RecipeDetailView : MonoBehaviour nextButton.OnClickAsObservable().Take(1).Subscribe(_ => { + JoypacAnalyticsManager.Instance.AppOperation(StaticStringsEvent.PlayGame,"", StaticStringsEvent.Make, "", data.id.ToString()); + + LocalCacheManager.Save(PopcornGameManager.PanDataTag, panSelector.SelectedPanData.Value); TransitionManager.Instance.LoadScene(GameScenes.Cooking); }).AddTo(this); diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs index 691f1014..d21560dc 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs +++ b/popcorn/Assets/MyGame/Scenes/shopping/Scripts/Shopping.cs @@ -15,6 +15,7 @@ public class Shopping : MonoBehaviour private Subject changeCoinSubject = new Subject(); void Start() { + changeCoinSubject.AddTo(this); SoundManager.Instance.PlayBGM("bgm_shopping"); diff --git a/popcorn/Assets/MyGame/Scripts/FooterManager.cs b/popcorn/Assets/MyGame/Scripts/FooterManager.cs index 3b0a9f80..130ea356 100644 --- a/popcorn/Assets/MyGame/Scripts/FooterManager.cs +++ b/popcorn/Assets/MyGame/Scripts/FooterManager.cs @@ -29,6 +29,39 @@ public class FooterManager : MonoBehaviour { return; } + var gameData = GameDataManager.GameData; + var isTutorial = gameData.FinishedFlags.HasFlag(TutorialFlag.FirstPlay); + + if (JoypacAnalyticsManager.Push1&& isTutorial) + { + + Debug.Log("JoypacAnalyticsManager.Push1"); + currentSceneName = GameScenes.marketing; + + TransitionManager.Instance.LoadScene(currentSceneName); + + + } + else if(JoypacAnalyticsManager.Push2&& isTutorial) + { + Debug.Log("JoypacAnalyticsManager.Push2"); + currentSceneName = GameScenes.shopping; + + TransitionManager.Instance.LoadScene(currentSceneName); + + JoypacAnalyticsManager.Push2 = false; + } + else if (JoypacAnalyticsManager.Push3 && isTutorial) + { + Debug.Log("JoypacAnalyticsManager.Push3"); + currentSceneName = GameScenes.Main; + + TransitionManager.Instance.LoadScene(currentSceneName); + + JoypacAnalyticsManager.Push3 = false; + } + + kitchenButton.SetSelected(currentSceneName == GameScenes.Main); fieldButton.SetSelected(currentSceneName == GameScenes.CornField); stockButton.SetSelected(currentSceneName == GameScenes.shopping); @@ -56,11 +89,13 @@ public class FooterManager : MonoBehaviour { CoinGetDialog.ShowDialog(refreshRewardCoin, () => { - var gameData = GameDataManager.GameData; + //var gameData = GameDataManager.GameData; CoinManager.Instance.AddCoin(refreshRewardCoin); gameData.Coin = CoinManager.Instance.OwnCoin; GameDataManager.SaveGameData(); - },true); + JoypacAnalyticsManager.Instance.AdEvent(StaticStringsEvent.BackHomeButton, "", "", StaticStringsEvent.BackHomeInterstitial, StaticStringsEvent.Interstitial); + + }, true); } }, ConstStringKey.JOYPAC_SDK_INTERID, StaticStringsEvent.SwitchPage); Debug.Log("jp======Interstitial"); diff --git a/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs b/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs index 5d8ca300..e102eb0e 100644 --- a/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs +++ b/popcorn/Assets/MyGame/Scripts/GetRewardDialog.cs @@ -65,7 +65,10 @@ namespace MyGame.Scripts messageText.text = ScriptLocalization.System.CoinMainMessage; position = StaticStringsEvent.Coin; JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position); - SetButtonAction(closeButton, okButton, StaticStringsEvent.Coin);//AdManager.AD_PLACEMENT_COIN); + + + JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.CoinRewardButton, ""); + SetButtonAction(closeButton, okButton, position, StaticStringsEvent.CoinRewardButton, "", "", StaticStringsEvent.CoinReward, StaticStringsEvent.Reward);// AdManager.AD_PLACEMENT_VIP); break; case RewardType.CornField: @@ -75,7 +78,9 @@ namespace MyGame.Scripts messageText.text = ScriptLocalization.System.CornFieldMessage; position = StaticStringsEvent.Fertilizer; JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position); - SetButtonAction(closeButton, okButton, StaticStringsEvent.Fertilizer); //AdManager.AD_PLACEMENT_CORNFIELD); + JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.FertilizerRewardButton, ""); + SetButtonAction(closeButton, okButton, position, StaticStringsEvent.FertilizerRewardButton, "", "", StaticStringsEvent.FertilizerReward, StaticStringsEvent.Reward);// AdManager.AD_PLACEMENT_VIP); + break; case RewardType.IncreaseCustomer: normalWindow.SetActive(true); @@ -84,7 +89,9 @@ namespace MyGame.Scripts messageText.text = ScriptLocalization.System.IncreaseCustomerMessage; position = StaticStringsEvent.Leaflets; JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position); - SetButtonAction(closeButton, okButton, StaticStringsEvent.Leaflets);// AdManager.AD_PLACEMENT_CUSTOMER); + JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.LeafletsRewardButton, ""); + SetButtonAction(closeButton, okButton, position, StaticStringsEvent.LeafletsRewardButton, "", "", StaticStringsEvent.LeafletsReward, StaticStringsEvent.Reward);// AdManager.AD_PLACEMENT_VIP); + break; case RewardType.PerfectPopcorn: normalWindow.SetActive(true); @@ -92,7 +99,9 @@ namespace MyGame.Scripts messageText.text = ScriptLocalization.System.PerfectPopcornMessage; position = StaticStringsEvent.Perfect; JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position); - SetButtonAction(closeButton, okButton, StaticStringsEvent.Perfect); //AdManager.AD_PLACEMENT_PERFECT); + JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.PerfectRewardButton, ""); + SetButtonAction(closeButton, okButton, position, StaticStringsEvent.PerfectRewardButton, "", "", StaticStringsEvent.PerfectReward, StaticStringsEvent.Reward);// AdManager.AD_PLACEMENT_VIP); + break; case RewardType.VipCustomer: normalWindow.SetActive(true); @@ -100,7 +109,9 @@ namespace MyGame.Scripts messageText.text = ScriptLocalization.System.VipCustomerMessage; position = StaticStringsEvent.VIP; JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position); - SetButtonAction(closeButton, okButton, StaticStringsEvent.VIP);// AdManager.AD_PLACEMENT_VIP); + JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.VIPRewardButton, ""); + SetButtonAction(closeButton, okButton, position, StaticStringsEvent.VIPRewardButton, "", "", StaticStringsEvent.VIPReward, StaticStringsEvent.Reward);// AdManager.AD_PLACEMENT_VIP); + break; case RewardType.Butter: normalWindow.SetActive(true); @@ -109,7 +120,10 @@ namespace MyGame.Scripts messageText.text = "是否观看广告获得配方"; position = StaticStringsEvent.Butter; JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position); - SetButtonAction(closeButton, okButton, StaticStringsEvent.Butter);// AdManager.AD_PLACEMENT_VIP); + + JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.Recipe1RewardButton, ""); + SetButtonAction(closeButton, okButton, position, StaticStringsEvent.Recipe1RewardButton,"","", StaticStringsEvent.Recipe1Reward, StaticStringsEvent.Reward);// AdManager.AD_PLACEMENT_VIP); + break; case RewardType.StrawBerry: normalWindow.SetActive(true); @@ -118,7 +132,9 @@ namespace MyGame.Scripts messageText.text = "是否观看广告获得配方"; position = StaticStringsEvent.StrawBerry; JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position); - SetButtonAction(closeButton, okButton, StaticStringsEvent.StrawBerry);// AdManager.AD_PLACEMENT_VIP); + JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.Recipe2RewardButton, ""); + SetButtonAction(closeButton, okButton, position, StaticStringsEvent.Recipe2RewardButton, "", "", StaticStringsEvent.Recipe2Reward, StaticStringsEvent.Reward);// AdManager.AD_PLACEMENT_VIP); + break; case RewardType.Sale: normalWindow.SetActive(true); @@ -127,7 +143,9 @@ namespace MyGame.Scripts messageText.text = "市集内每日12-13,18-19点会有8折促销，是否观看广告直接获取促销？"; position = StaticStringsEvent.Sale; JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position); - SetButtonAction(closeButton, okButton, StaticStringsEvent.Sale);// AdManager.AD_PLACEMENT_VIP); + JoypacAnalyticsManager.Instance.AppFunShow(StaticStringsEvent.DiscountRewardButton, ""); + SetButtonAction(closeButton, okButton, position, StaticStringsEvent.DiscountRewardButton, "", "", StaticStringsEvent.DiscountReward, StaticStringsEvent.Reward);// AdManager.AD_PLACEMENT_VIP); + break; case RewardType.Cold: okButton.gameObject.SetActive(false); @@ -137,7 +155,7 @@ namespace MyGame.Scripts messageText.text = "金币奖励冷却中..."; //position = StaticStringsEvent.Sale; //JoypacAnalyticsManager.DesignEvent(StaticStringsEvent.Ad, StaticStringsEvent.Impression, position); - SetButtonAction(closeButton, okButton, StaticStringsEvent.Sale);// AdManager.AD_PLACEMENT_VIP); + SetButtonAction(closeButton, okButton, "","","","","","");// AdManager.AD_PLACEMENT_VIP); break; default: @@ -145,7 +163,7 @@ namespace MyGame.Scripts } } - private void SetButtonAction(Button closeButton, Button okButton, string Placement) + private void SetButtonAction(Button closeButton, Button okButton, string Placement, string name, string extras, string from, string AdsShowCome, string AdsShowAdType) { closeButton.OnClickAsObservable().Take(1).Subscribe(_ => { @@ -160,6 +178,11 @@ namespace MyGame.Scripts }).AddTo(this); okButton.OnClickAsObservable().Take(1).Subscribe(_ => { + if (!String.IsNullOrEmpty(Placement)) + { + JoypacAnalyticsManager.Instance.AdEvent(name, extras, from, AdsShowCome, AdsShowAdType); + + } ShowRewardVideo(GameScenes.WatchMovieCoin, Placement, () => { LocalCacheManager.Load(OkCallbackTag, null)?.Invoke(); diff --git a/popcorn/ProjectSettings/GraphicsSettings.asset b/popcorn/ProjectSettings/GraphicsSettings.asset index 4654e133..71c9e0f5 100644 --- a/popcorn/ProjectSettings/GraphicsSettings.asset +++ b/popcorn/ProjectSettings/GraphicsSettings.asset @@ -34,6 +34,7 @@ GraphicsSettings: - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}