From 42dfdba5e5a063742da878469653280a0bea529f Mon Sep 17 00:00:00 2001 From: a16797 <167970334@qq.com> Date: Sun, 3 Nov 2024 12:23:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbug=20(#233)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix: 修复吃糖确认框不见的问题 fix: 修复不领点唱机的问题 docs: 肉鸽增加说明 --- assets/interface.json | 2 +- .../base/image/Awards/JukeboxBadge.png | Bin 3323 -> 2382 bytes assets/resource/base/pipeline/eat_candy.json | 12 ++++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/assets/interface.json b/assets/interface.json index fa9a1137..b750af2b 100644 --- a/assets/interface.json +++ b/assets/interface.json @@ -95,7 +95,7 @@ ] }, { - "name": "局外演绎:黄昏的音序", + "name": "局外演绎:黄昏的音序(勿挂资料片)", "entry": "SeriesOfDusks", "pipeline_override": { "EnterTheShow": { diff --git a/assets/resource/base/image/Awards/JukeboxBadge.png b/assets/resource/base/image/Awards/JukeboxBadge.png index 0800d9a702be96c6c1bc756d7f521717a9734aef..b245c6d4f09cb1622b63871f35e4fce781c320e5 100644 GIT binary patch literal 2382 zcmcImeNYo;9$st}tb*1;5AbWdw4+s){YpX-jYrBJb2MJ$q98I;z7b6EB0b-*&Ec;~679QBG&4nOdAA>=wYt;0XvnRoYn z_kG^y_xwKgH~V&Ka(v(u;ZHyi6quNxUnxC<vCW#EDP|gyvLqFLSqqFi=|godESOI;3{$pIp40v0Q$LvA;mL0~JZLo$>G z+~9}>+17*tCs4ONWf`YNfgS8bja_h?t{8 zVq}AGrXdxM<(&XlMyXJSP$=POO%$P`6dFw=OyYzZ!_^o;p@d4Sz_la^doM(?=48#< zmHOpgThdC0WQ(Fhi(z?rc~N;(6z{ZPghr#ma1tX)R6?LaJ}1&HloKMx81z73oK}Zu zv)A6gLOHcD2!dViBx zNY8fwY$Xu*TqgtKHUdtJ7&FE)zO#;8r)|Vjmcf7x*d>@C2_t-_9NE0c3)%ed_~G03 zdE?N=Isq;6&UBu)jU_5|j0KL3l@p_Z=Vw?smd_KOmqmHc06i@N9YW%y0wo9(r_u>h zi$`mf(F<|47RN`S2B{QSTBOGZ=2@#be>_lwL7T`4BF!-%QLjTJQBhVat5s8KHX5)L ziqlFQC6x*aRVy_bRLL+Tp$5^EnK6&(lFsXSCRdK2e15cYS)P$Nd_mIE3Nt~f8Gy1t ztw2Gvf<-f6sJ}Ccxc4^l617w6!aZqk!w~dXM4~<>U0t$m&x`!5xZrJ<8jW4l1Cg4Ra`orXSmdLC zXJWQqj(GEmKYW}yTYTg{Xf4xRXn6Ym<5_>+60$XZR_cs%$%Q-5Q6JpA+0lR0L~ok0 zb9#LJg05q?eyECldGqjOaq>0Nx=Uvc^2AR{pEF$D+FU?34myS}Zg6Lqj)JlskuY@N zt-mz~ZY{c7e&y)<9ZOw<7b=$2A9PpwyRp-o?i)+@8Uu6cE0;$ugCZS6PeX5n)z#hK zKKJ&I!`JWaEUQ*^&xt&Eenq(7m6Na3&R$r(qx)DB;^F?mdhQMlp7S4Uxjgf9f9Lv! zYoW}ttllKcP;$8ax-qo5qGb0JWy$Q`pPucUx~Kgo&tOaC;ae?53CxM}acwWDC*qyA z^>k1Ely|C{UMW?sJm$ZS3qDy}+s-}5&018`-P!a@)voT>2iAUAw14ul&=W5wykHJm zw_@soXaBOJv2$M9;oz(4yYD{u z+Wtjc+kNH5qM=vgCgtSxw*CC~f4Yv>mFrI*dlzXwGwj@dEq5Mw@Bv)h<*5o)FDX5n zSwvT#{QN*zVVTEy;`Y7Im%O&w)4F0q`#!&a4b>Oz1$V&5t9SI-PTjrfI@OvpA@kEu zg2RKhchsCw&$(3mRrS3?+ZX(McE`54CxzeYknCAG{^re>>!NBBa4`e!`I>_2rzhuj9MGo`FN3dH$Nxo>JXDJ*;5$i~|*W zjji*a`~Gn1)QM@+nbf9DI59ZaaQ%G9tgf!!&kDhvU4;+U>DiL7_j=vdw7sUO`|9e{ z{Z*GUY!Ce>WuaR|Zr~K5PY+SPH!#0-v4h()!(%@BgBruDbI-QYRs= z_0&z9vU*Kp&CDn1h>}$|R+KJ3^zDmKZDsA;lw#9k9reL$+Ir``TJ@*imM8u6Z-hkj zY;^nYdA`W__=U9_$O}J!fwDzzZ1p!4imryFb;Ap(OLzJfZ{GK&GO53B{VqS@_5GTn rw*uWQ7cYL&9i)T4$*3aQYx-{So$bYL3%}ba|M4WoCF^Tm$lCH>={bP7 literal 3323 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 D5g3p! diff --git a/assets/resource/base/pipeline/eat_candy.json b/assets/resource/base/pipeline/eat_candy.json index b01758a0..ba3fd9b0 100644 --- a/assets/resource/base/pipeline/eat_candy.json +++ b/assets/resource/base/pipeline/eat_candy.json @@ -78,6 +78,10 @@ "next": [ "SellectMiniCandyMax", "MiniCandy24HNotEnough" + ], + "interrupt": [ + "Sub_QuitEatCandyPage", + "AllIn" ] }, "EatSmallCandy24H": { @@ -93,6 +97,10 @@ "next": [ "EatCandyConfirm", "SmallCandy24HNotEnough" + ], + "interrupt": [ + "Sub_QuitEatCandyPage", + "AllIn" ] }, "EatBigCandy24H": { @@ -108,6 +116,10 @@ "next": [ "EatCandyConfirm", "BigCandy24HNotEnough" + ], + "interrupt": [ + "Sub_QuitEatCandyPage", + "AllIn" ] }, "EatCandyConfirm": {