From 6dd1eded9a2a7966055fea98b452a6b626722c6d Mon Sep 17 00:00:00 2001 From: notify Date: Sun, 13 Aug 2023 16:36:11 +0800 Subject: [PATCH] Changelog: v0.3.3 --- CHANGELOG.md | 6 ++++++ CMakeLists.txt | 2 +- Fk/Common/ChatBox.qml | 2 +- Fk/Logic.js | 4 ++-- Fk/Pages/Room.qml | 2 -- android/AndroidManifest.xml | 4 ++-- image/emoji/50.png | Bin 0 -> 6026 bytes image/emoji/51.png | Bin 0 -> 1743 bytes image/emoji/52.png | Bin 0 -> 1734 bytes image/emoji/53.png | Bin 0 -> 1727 bytes image/emoji/54.png | Bin 0 -> 1783 bytes image/emoji/55.png | Bin 0 -> 1802 bytes image/emoji/56.png | Bin 0 -> 1719 bytes image/emoji/57.png | Bin 0 -> 1749 bytes image/emoji/58.png | Bin 0 -> 1767 bytes lua/server/room.lua | 4 ++-- packages/standard/init.lua | 4 ++-- 17 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 image/emoji/50.png create mode 100644 image/emoji/51.png create mode 100644 image/emoji/52.png create mode 100644 image/emoji/53.png create mode 100644 image/emoji/54.png create mode 100644 image/emoji/55.png create mode 100644 image/emoji/56.png create mode 100644 image/emoji/57.png create mode 100644 image/emoji/58.png diff --git a/CHANGELOG.md b/CHANGELOG.md index ecf4f9f0..3817611c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ___ +## v0.3.3 + +修复上个版本发现的bug. + +___ + ## v0.3.2 本次更新的主要看点是废除装备栏和判定区。 diff --git a/CMakeLists.txt b/CMakeLists.txt index 08d78fdf..11e8ccc3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16) -project(FreeKill VERSION 0.3.2) +project(FreeKill VERSION 0.3.3) add_definitions(-DFK_VERSION=\"${CMAKE_PROJECT_VERSION}\") find_package(Qt6 REQUIRED COMPONENTS diff --git a/Fk/Common/ChatBox.qml b/Fk/Common/ChatBox.qml index 9f72f9b6..8985cecd 100644 --- a/Fk/Common/ChatBox.qml +++ b/Fk/Common/ChatBox.qml @@ -92,7 +92,7 @@ Rectangle { Layout.preferredHeight: 120 cellHeight: 48 cellWidth: 48 - model: 50 + model: 59 visible: false clip: true delegate: ItemDelegate { diff --git a/Fk/Logic.js b/Fk/Logic.js index 39fabeb3..b6cb6ed3 100644 --- a/Fk/Logic.js +++ b/Fk/Logic.js @@ -180,9 +180,9 @@ callbacks["Chat"] = (jsonData) => { } if (general === "") - current.addToChat(pid, data, `[${time}] ${userName}: ${msg}`); + current.addToChat(pid, data, `[${time}] ${userName}: ${msg}`); else - current.addToChat(pid, data, `[${time}] ${userName}(${general}): ${msg}`); + current.addToChat(pid, data, `[${time}] ${userName}(${general}): ${msg}`); } callbacks["ServerMessage"] = (jsonData) => { diff --git a/Fk/Pages/Room.qml b/Fk/Pages/Room.qml index 74d68abd..a24c6b11 100644 --- a/Fk/Pages/Room.qml +++ b/Fk/Pages/Room.qml @@ -288,8 +288,6 @@ Item { let ret = Backend.translate(e); if (ret.search(/特殊牌|衍生牌/) === -1) { // TODO: 这种东西最好还是变量名规范化= = ret = "" + ret + ""; - } else { - ret = '' + ret + ""; } return ret; }).join(',') diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 590eeee1..76bc5edc 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -3,8 +3,8 @@ + android:versionCode="303" + android:versionName="0.3.3"> diff --git a/image/emoji/50.png b/image/emoji/50.png new file mode 100644 index 0000000000000000000000000000000000000000..46cb9bf8d363bf2f0b8131f194aedd9d4f8c8e85 GIT binary patch literal 6026 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 literal 0 HcmV?d00001 diff --git a/image/emoji/52.png b/image/emoji/52.png new file mode 100644 index 0000000000000000000000000000000000000000..5a8689f779467e7b90b026f186ee33b8100656ac GIT binary patch literal 1734 zcmV;%208hOP)Px#32;bRa{vGf6951U699Letd0Nx0{2i%R7FQ{ObQ7K z?2j@yG%)}G00jd80ssI50s#pI000003=0c5EFb^?000000000A1p;?XBNPh*0001Z zP9$D75(NVR0s#PeP9qZw1ASQ@uzx-h3Ifl1DT`1Wzi}tnlt{ycL$7uh?UH-jN{MU#5wod=ZZ;@0X`mjj(twjI7XZxBr{@j25 z&u;(fp8m&S{mX6s%4Yx2cmL0H{@#!M!B_sfR{!0E``V%Yx=^-)NBYBT@xpV{qhkKV zX8yfo`NwnrqdWibtN-hw{?c##(|G^opa1Nr{+?w2z=!|Ze*4&${?>c{;*|f*aR0G_ z{NAkp)s^+LOZ&4;{ndp3pEv)*Z1}N9t#B^=oH_TTKiH{Y{-i|zwp;(qb^hCY{@;iG z*N^_{NlI$#CQ7Rz5L*z{<3cW@6D`gB;cPv{i;I#s6W4vUBiMj^2KnnwsZXF$NuN2{qp4en^pd*WB>p0l2IA=oI3oXRPWEC``Mb| zt5*NQQ`p0Xq+}%5l|t~VM0YwB{G&kl(tQ1^dxS^1W={!FqXaRhV%{Zd^)*dtQNPO?<0dy#N3JRCH2KQvf>pECm(~0}C8OAqh1g zN`_BGdZ7m@S~nAnXXd)!yPI8*z<^GPnw+I$yTqW7z2T|+nSh7J(dsk(@~oyencC<^ zYg0b<>G90${94%3vG4I`c=>8&OaK4^_(?=TR4C75U_bzFabW=gVR3E-48X0$B`zOW zv81G=Vs(JOIHMLbvMjT@@2@|7i;93?(a|*(KfV3bosgv!JP!Zb^}(BmmS|dnm>Qa)SEZAPN|7ZPS1>v&dfTz zd2?rlJR4Bj)$RS8xpU{vpD3VX+ZaDT$NnY6}X>68d#n7$`;KOWg#y6_u_5m?>1@^wZ=Mr%X_P%BV&QcP`Hd-2i(36;U3 z45B_(y~kFzW&uHJ>a4`cU}v=yw;y=Ei%C$FfyL5c^|!D4Qu9DyazkSsME1q91;@?B zSQr>s?XUK({Bka(p`oF%aSm9vy>P*^W5vsrK!M7}?|ya3`LmZ3ljhU`C4sVqPj;R? zU$9$-3lt?Rd`hc6mvomddt4tAQ(s%qT)1;bX?IL{r70&kMX)g{uln56)lpiyZ14X4 zdw1L`?dXbG8Yj!k22Kv_tb(4$6Bd?qb$6V&aN$Hp_r6KZOXJM=S)s{^h0{fO`KuLW z2YX7^teF#2P`F@MrK}()3p^=u@{3r+#hqM{kWdZ;yW?bxg*ZhK37LhJSK3C7sWPs= zKdzEV&QO|{l?6E;u(R*#2Us3v7u)p7B)^X2`(WaE(tMCHWmgffQ5$* c2zZd?0J}swd~cuT(f|Me07*qoM6N<$f}I6&lK=n! literal 0 HcmV?d00001 diff --git a/image/emoji/53.png b/image/emoji/53.png new file mode 100644 index 0000000000000000000000000000000000000000..183750df2862f14818e0ff8c8fc9653469067092 GIT binary patch literal 1727 zcmV;w20;0VP)Px#32;bRa{vGf6951U699Letd0Nx0{T!)R7FQ{O#7KO z000020RR#U1poj53ITg=&DOfWR)`c?w000sS0}=`XbVwd{M;mHA6m3Epzi}r+EENU< z0ck-R@uyUVP8oVf7l~CRQ!fvSP#T?E9ts5kr)4G6l1#~iJLaKOy>KV?ty{@=DWz{X z+kq>QQyVrS55|T=y=^0nU@wheE`L@kz<@w990{FT9&A1oC>IFjo>3|o2w*r8T{aTj zhcnNCG}Vzv@SjNk<9GhdaR1YL|KpPW(Rci}O#j`0{@8#0x=sAOPyWMU`p0trqB}1y zG5)(&{>Wzhv`YWqh5Wcr{-s0z|NsBIWpiv*{l8uJs6+n7X#eJm{+~HtUtmB#JTfyi zDl0Dcr9uAIdH&CI|G{hdvPt>3P5G`z`?*^Av{L=pi2k2;{>N>u>0tn|B_+U)YWcqbzWLZ_4W1lpgf9=lK0+^mY11GNlW_r`q`L1SXfxu+1b;a zQaU?9shn@FmtlZ(S<|Rhy}!exntr8`UT|4M%CdFu!)>*ua?z_~u%T~@Oc(XLYTmeV z{eH|Cw|AxKx&kVgH;rih^qI*n;@ZZHawb%)Wm2 zw|kywSO4pg>C%FfhhFZvV*Qn2A0;aMm``YEXzjjb%(;Atb4T9b<^ITA(|cA|RZir! zTUS?E(9qD5S0uTvfRa`tf`5DS&3D?|;{V)bW%=J0RA~N2pbp!4F>xk zO1~9PML{Z`ds&H)=A7yw6lZXkt54rSU4Hk(yI_a6##7AA+S}3l!i>{^TB4PtrkId8 ze`kNmfuy3uv9#})pE-{J00Q?(L_t(2&tqUf0B%tcF)@#8G3t2 zr*GN1vGdICJ$q*E-!A9gaY0+k~(c6CY(}rSF+}uRePY7F>C->$b*V9dfwhPGC!PGXY3*yEGz$ZZ z@Z7LvH*b}eKEA(tHAr^Jk_RtdZd$o=ZFaakP+E2Q(nW1;ZHr@KK$5jN_4Vyhb62fu zDNOEA1xj0}HHY~IK|oGUPQ6c5XhURdbaZ|)7e6NhJF~&^ibejuVBqhc>yrYK4FF14 z8VLbojZMC#xnfbSKM>^R`jmlW>jDA-3JTN2`GEfB;E`%+ZY=Wwf%cTf8$j9EfZ*VQ zRtZ5+pt5s|$2Aq*XiSMpNeR7?)B}_a4qmvhkWq^joFX`wc;lLiiyD%Wib8uLs|pH0 zviafK%pBkdWoP5pt4wYxzFoY2Z*1(|^#vgySsfleXmaA@*5&PpOD>E)@bmon?*~E_ z7PK<*^0UGd8z(o9q*Pk?_DdJ$&AZT(+?pmKDZq-9*4f#ZWfhdT7%OMbu4Lp=Qjlfl zV@FQt>>SceDlV=X>gpP9PAW{&9O&7Eor6_~Nl-vQkV%M@gB@Eo<7D9g0v6;91^`Hp VDu1IYA?pAD002ovPDHLkV1jKLTzvol literal 0 HcmV?d00001 diff --git a/image/emoji/54.png b/image/emoji/54.png new file mode 100644 index 0000000000000000000000000000000000000000..dd00fed0584643877743b637c694f6f58e5f4dff GIT binary patch literal 1783 zcma)*`9IW&1IC9MH}OKbw`3hTa%@{fIdhG{nD0dH43jaA$yH{YxkBz;N5c%ca!f`v zj--_mvqN@5hKMDKhLv5W=JWZi@AohGKCjpFJg?`M=ePG=52T~Cgo*?V29tJnvPT`Z z#(yn#I7Vh* zojo>j`%I0m#&n6(WX4aENqV6c3bNwDV~Ki$F*>iZ?PNU*Pk8^*7Hh5|2D@x-s^U|w zlR9RO+qUpZIwttcEv#k{6!l!GN2f#}!=tRnUh51~9#ssNVrpv{u+lnc-UOUHVC%FuUk zDjHzp!3G-vD?#u_^0zK$kYWaXEQMZ1fg5$u02X?m4?HB=+1Wu~X($)lud~@!wfyKF zeqtXVe0NL0PC8(s_qz~+=}hpU4YdRZzDmnSKGncoPU-} z_Nf<1R-Qz^)P^_vFNLRpdINhSfGsVcJ&^>sa7M;*{(RNV*eD7co~pOV$&XGZ_pP(&yshHJ zRyK2r+SUO5zXD~a#CeA_g3k6fXx+(>AZwTrQT)^?@k{#04TrFR%p|1YExK@MPm5PsC z>c)F!K283EvbWI`zgb=XfWuLh$iF%>v!E}Z?t;hbA@3DNagAeH*-abu$`MRAWUf1l zx4wSI>0&~6qgJeAfRocK1Sab6o&CuCDAN?!^_uIsiFIP>Q zgd0z5zh&LQ&XHAo3yn73_58_Ws}EQp+YQHFv#2N^#i>C2OQ~|qY|WFQ!B{Xq$2Tl+ zKA8j*tYkjL(&CViWt29pd!&7av-InBiUo6U<5dU$zJxp`%Aau^%ER!4kY=y zN7tA!Tk7iSdd*Is+P03^T+Dxrnav87Ff)!3`S}O)ox#S2hPuwq2H6`oQ^@R+hL6)G zr-DOOC{k)d{VezR<0o)fY&qdt>Y1~b`_41ZXzDzLX|ac&*Z;jgnI(yvP`ey=<9qGI zr;~FoG=i~*g_n}9;obmwZmzwSUQr~&qt;RuByYywLMV9jqwi;>dwunrS*dMwJz>P< z-%28Hmv^6&BQ7(3^MuC-FJw@pq%2%hY9F<17;PufD=mMNR`Ls)Yia4nM+6{65&|Ik z^$LuELEs+I{U%qXlYof9SaNRdPaVcoZmXHf|9xynsDWj>XTxBsGM<8OfJQ8f1l;lM( z*j5b&8uC8zjG)fd&0P}1IwHL*zDm1*@L_diO@MT0)M<;j%U$j)?r+hhZDl$Ou4lAU zg4pe!g@x(3_g0IulaiA2%(GfrSX5J=!fEvJqZB_&xcb6sud5kr+|;#i4Qo*KPPXew zf(zw$Kg%u&)A82Uag;9#=`{{rb|j}HI< literal 0 HcmV?d00001 diff --git a/image/emoji/55.png b/image/emoji/55.png new file mode 100644 index 0000000000000000000000000000000000000000..02784b8493da1fefb96cc38f889e6570668c8fa9 GIT binary patch literal 1802 zcma)7`8V5n8~svalzOYwt7C1^QnWZ7t)1AyArT>CjD1Zh5sjsYB{X)mHYCm=RWuT_?+{^W6(%mZeeZ+f_P1g4X`W~|4yz8 zta)k2A(bT@cmxUoLA5D7Oy?h1o{fY>>Ou4|(M^`QNHn$~K@g9?zYNN+dImx4`xrAT zLnP7cN3M&k3Lh^w8%zGhWnLaZem-taHr7T=R76SgD%|M8N-lDIuW(*~*x8@}Q^`nk z32lTy=C9ZJx!Il71Si7eyZmILt?z7?n%JrECt`%RQ}1!Ivq@ax^fwlFRTGdE;tE8H zNL=~hL)aZw6pE3yFw*j{(hWgNtruJ2H3ZIcRnja)<|*=}zN#HQQvEUdgV7qZ3F>9; zH+^&jC)3UHY{V=TFXNQ?dMG-F)wcPz;vGbpv0yo7q1JuL%lZm}A;@b4*CG@H-DM6AAwn4>oAYUaX zgLZf3XfQZw0b9R=zpLTyM@Jnl@cUR$YA{{yblQkL>3-M}YjoOzJ1jS3eo8s3Glyqm zPWv98HkiN_2(S=y+KN7An4UESfL;&KPdFZrbeDv{0JS~=clzexS*c!{t(>PUTa4L_ zmwvi`gz0a;3xg*^z;x(pqsRVm=*~9OH2la+iicwfSzl%QD?=Z6s-|*mWSy5IOSuH{g=h?oYD6MooKA{;O7a;pe9>s^+zpM7kj zP9|l&oZB3!8V!xjd3M(SVddaAL@TxJ?b}x+5!o^Lq$el6yMFo&TXgV$0oF-haDbo- z{3ZqnE7@^Zr$}f_$wFM*Sqy~|a~Aioun6S5+AS_juNJKH*q&>6lq*$VFLmB*QPL6? z6&=nTaZE2PEc|xn72W!?RDy@?;%zF`dhC^goPyon)@i1Zj67P}CgZ0gA>6>~e%~); zC0D0sWXy6N%xCl7_4#=vJiu|Ib7L~y1;O3vz&<2&t=o+%GJ`upbz!Yru1FWw{a!~H z+esjVX~ij|>`WMjsZBO{SAYFT6PWL0)IHvM-kgBS?}6AC_U`0Ce@{Q3x6728AR}Jd|r~d@Tqez+~zTJVfc%JuBT8N4|Q8v zSuNkPEbvxoR>>58O}ZgVWYE$;yAB|gYKQNY?@z&%L%54F}Of4N6+ za{gy&u+my$o_MdZqd`zQufRf>X5Z5m0UCS_*+egWUCf}=F$nIZrCDwix1L;)U~{`O zhwHul-8(A5o0~Te`mU#PrQaF7D?eWCD=2!&ACI-^~C4o*pt@FWFW-Cj(6%{ z$0*O;aCL@)rG8pI1vR=q^=d121Bu*SY^Z$wx>6E;NFo)C#FBhdG`MP&iAt}vH|eu2 z+sg&b&7X8XE*vk;wK#rRpLsQHtVB{$s*%mj|GX0t(7drcj5o)ReGMn=n1R9ZL3x@6 zcNBY8vbjs(o2cWPKQCMaC_Z zdYAXdp{&a1P4D&?y#gW{^0X>9RL|S^93D%GQ*d$#uaG#M z{V(3dO&|UFg#wwKTW)AayntRO$IVVw5G`+sqa;&taVDvWrl}@zS=3}U0b)%pgGgf3 cFm7yeKtn#7NzyBplHXsFi6Pp6uICi>KlNLci~s-t literal 0 HcmV?d00001 diff --git a/image/emoji/56.png b/image/emoji/56.png new file mode 100644 index 0000000000000000000000000000000000000000..98acc3c6bb0bb794e453b0be00c80645e702c2fa GIT binary patch literal 1719 zcmV;o21xmdP)Px#32;bRa{vGf6951U699Letd0Nx0`X8xR7FQ{OeGcx z0RR91000IA0tW;F1_J;C0RRUC0u&7f3IzcW2?7ZO0g_iA0001TM;%@^5(5DMc}ySz z0RRRA0C!CzfKMONf-{?08~^|SeN!nP5e5KVVcPXWBIPs)U_N`mRhC{}NLTEh}VM{sAc`7y{4?`>!y>KT}FAsfSLTEe`RWlKa zQ5$Enew^RSw zeEYIW|J8K<;D-O>lmFCt{?2y)*LeP=LjUWW{?&f|o;m;Vt^d<+|GZ}TwoCrsj{KWA z|LK?i;fnv|i1w{b{>*Xz=b8V;jQh1&|KFDX^R)iOYya1O{^Xed$Zq$nMdx5X|J{rK zr91!IhW^}t|L>^&(RuvHU--CR_@+er#ApBOq5Z*L{IZdq{;y>J-G%?qj{nY#=+Kz_%4_}3g#Prtj8!ZD;GO&0j{B!n?Za{7 z$cFgPchje3{pp~BNhb5(nDfSJ|Ilsu#BQf}NBhQcmS8UH%6<0Kho@vM?}thJyi3ea zII&ACr#&QfXHo8KLD_yg=|MPqZdUF&IPN_<^*lY|Mlj~RZ1%-v98P`!U(myHHTQA_3LiA=(k%M8vARF*uLGM>V(uGt(a+;ypcdt+tc^002sKQchC<9!D1q8vz6d3luj{zdBQ)G?ywt zhM(7fAa+e>$?5%F{#$_fX{GRNvwXY6>5=-Zm5<{B`AI}UR4C75U_byyB`r}=Eq+D@EPzu(Q+;+xdHL)fbxjQxbXk6v!>^9N zubMF<=)>`khwW@pBspwu-QE+hXI4f=Rn@HBrEzx@CD@Q;txIOD_b~Lv|*?T7Drxd4bDvODkm=O?=T^iRJA_0?Cn%Xfjam$Wf*NTDi6aCw7Oxh58 zwNRfQBFk#Lb4}T%9h;}DT2_}I=)b#r%H~NM@|v5(xxms=X&r%yTduFXbO9tCcy4`5 z*_Ex^mggp`f@HZ&7S1RtTAfl{yfP)xKfo)-+s|ilTuF0yvN_26j#k@O6ac~My1JIE zzyPo4#Xhm;+ZHWaJ6VMrWcJi)E0!)@x}+#E(ce43D|@j|ZS2CdwzjpCGl8bF38hU7 z3YZwgL|wexP)S5C;Q?Xklku zQc%sjc{zSQwIJElRK)}PK+>6>Kxqfd#+~&^r5$}|e0?I~W22(B^&Navc{hDRsERZP z1G}JjVdvHQdY|_0zICw?QClDEee&$hv3>g|B$x@aGq5oW&2KEpi;JsiUv;^A*S&*> z4!nH*{Y2&d3CTuWz({A2)}7zjygYAt(wdEvrW~p~a^&r=pL6G=Pq!E01cn;Bq+UX9 zPiq(u#0CZ3e_Z+Q>&b6(=Tu}mvw~9u3m1HlZmu91QwrK74-q*oo6$WSO|2$&HP5@HrA=)s$97F&B N002ovPDHLkV1k!cOU(cP literal 0 HcmV?d00001 diff --git a/image/emoji/57.png b/image/emoji/57.png new file mode 100644 index 0000000000000000000000000000000000000000..c56bcb90cc69f58cedcfab1b4907fc3c74ec8cc4 GIT binary patch literal 1749 zcmV;`1}gc9P)Px#32;bRa{vGf6951U699Letd0Nx0`yQ!R7FQ{OacJ_ z4GIYi3kn7V0tf{H000040ssL300sj9{F*le0swhS9&<<@TQw2wkTZKvBMJoq2?PO` zSswrZ01XEMfKML+0RR910F+f7y>>E-P#Vv9DfX&ceN!nC3If@ePH;dKjbJYFq)@+c zCk6rmC>IB1Us;Au8hS?;UtnT?a9}+#CPGP3UO5)niaMudB~vdCWjYkegFB^fINO0M z#)d=Yp;YypK8|Tfy>KVge=W&(DcXlNT3=*sKNUkP6*eLdZbu07p zNljxq6P&>7x9zN%^jJ z|K^zb#c}wzT>Q&<|GQ-T-H!gML;uKb{MN|+)q4N!oBr5${?l^)r9=F?UH|Br_`sw5 z!e0BtY{HF3|F>ZN&v*abhx)!$)TLqiu1EN%LH^){{mgRytx){Wjry{E{^i{Iw@m!F zQTnil|JHu~x_JHdzt*c?#g$RrwQTypY5lfY_q<}hl2!f4XSRh&{qgPBv26ObRR5(v z`ky=avR(b)lKR4A+%Pe|4G_^mC-bOQ`@?7c#Dn^^nE0z^|I?cD*o^+|qyE5l|NQ#= z*~;~#a?gxF!jMdnQ5V^}fZ@4xnq)Kh+1tvKM)}Wx(4SHH;+FN?l#W&@u7FCJUMKXV zVdytE`N(wh(S*~VS=1*g^38(W!GhLMHq0I&^)}Kl4PfzZPN#->>_TuB%dwbzg zILb6M?vG8c008ixRHJ)R+_-e4f?P!D#J~Um08VsLPE!Ch6c-x^1p^HM{za5lpZkJJ zP{JTMpDI3rmAdBrc4y3KrT*VtfUv~7HTpAfk?G8bkJ^mWqTBhM(dxp*S*$@?g{h@a z^I3S}gY<*v&XBMV0009JNklYHfC4QaT^(KlAmG)}_0nQM1Mcd+zqOkR3kwsE zX#ez7w?ma>c2V%IKYs3TXy~zXzY^VSEt!yIS*7OZ#^*<$Jrfpo=4?Z3ZiR&;Cz7mL zVtoFB;H*6hLc;Rn8~kH)r<6;v!=+6U z<@SWM^rYb6u&`+ViEkcPaPdN9S?f36yiL&yq&?7 z_n%F8wC&28%HWXvN&8>zj)B0Wm1?DU%7ks^qJFVZk}8c5;1Y}%-Xjv-z}Uo z&xQji?I4>STC#f5>^oaFU784#-u0k%_SU9N(|YFdi-OJ04oxaazjdT`Qq$^)fS|)o zJ8E}5jGfV)zy&m&lPB+xe@Og}8(a6JrzHghwFYG^IQC-W#>R|65df48k4!CI+uxsguel{qjE#X+DK9%VIk_X*KL`jwvZZB-d3AN|%?W{GtPHGT zbv3d6{-Hr(VF9h-VA-;=!s?z3pfnFq+G*;P`ab`Lj^2yOLE)*XrKQDdJ9{q!rCYc> zfYOf2)3WP}LpzJQR&*wZNA~4ruIMVdkdhJA!tct)z{Y4ibxK>k|M?=nbyu%tW@cVn zzs~RKN}%*yD{(dkPG+9=oSL@c{whB|zjb%lcL6ECs`)A1QE^60z)0s1)NjvOR+zhC z7Et`=_U%Aw)`p6d?gANZP@uAj=#|IhRJX0H@_X|7{i35^KYyx{txjp?GGqa#2o6!< z@|ZalH3y!4Ja}-?$;IDK9H?%L3Y2E#07oc0vyj2ugqW$*K73hp^yK2jOTH}x$_fiI zL6Z|3i;!?!c|uIik5ea>EIGAwVPgT8v=9p$JSmC@@>$0PCdABNs=PF3&gnQAK5m38 zP(QP%yuAuP*W7~B1@rh-oaGsr*^m=DJBNsbsv4iBhK44enyRP>2PaxCV&h;D7nR`V rmJk(Z;b3FH1e|QF96-RzhNKe!!;>ak@L*5y00000NkvXXu0mjfH7tar literal 0 HcmV?d00001 diff --git a/image/emoji/58.png b/image/emoji/58.png new file mode 100644 index 0000000000000000000000000000000000000000..7a240f4e07b3fb794110679ad04cbbb000b98859 GIT binary patch literal 1767 zcmVPx#32;bRa{vGf6951U699Letd0Nx0{2i%R7FQ{Oa=o0 z0001UNFFvI3m+E|ic=g31_CV`3JL`Q+nibw2?Ap|6L(D`#D6=^ibi}@E;TVPl2#tH zZYaxzJ+5dY+JrFx003o1D1B2Y$b2(8K0`JvBrGHy-HbQwkTWP32uwyn0002>s7-oK zBXn9ohEE%MM;K!|6S{9E*O5r=pG`IOd^L`JO$$fIo9W7N%-2 zJR%GBty|WYSk8hs!E-6^ku=ePFTHRl+?!Lub10T=Lp?!7Tundvxn+N3M`u??^O-u& zgE);~E+`lYjbJb3iZ5e26aVKr|Lw8==aT>Dm;a$U{^OJX>#+ant^eJC|KNrG+I;w@ zLI2iy{hT-c(suvii2luR{NIuMJI`M_xW*qr*rZ~whi`pR_wd5Yyb7R{?2Iq%4z=5Z~yS2lU_0V&Vl~2WB>N9=%QWm(17cyWc|Wn z^sh|nwO{VfmH(1+;hRkL(wN|tOWcw__}`@d*M#?>J@eR}{la|x$A|o~N}6Lak5(f7-inY~E~t=#&6G(0r$WBorfx@M|ODQvf+bR|Xjk2m=lFWT%F= z&zmQKWTZsXA&+*#Qb0F*{eZtI{Cw-gyJRHQ`jDWbm5kf=kZY=F`~3Ou_ch(*;PGDi z`t|-#=%!Gl^>`FFAN2qL10YF6K~yNuV_<*+R%sbQW))su6=qghM?nTuz#*up>gtk` zmX`Kwql1&GqBNSkgq?Hqt>3L}wab6rx~?oHz=15uZaky8EveyJX43Z7+4Wb7+Kq&e z|g)W*eC1_T5JWhS+@F3)PtJFbtAHvr03_Vo7lfaSM?5K#+gKwx`o}-zzPj7i9w0%s-(vp?>Y_T`zWS0ZLbGeeyV=e%jqh75Ak$fzmSO z1#JmOU(M{D`Etvqfb@o~aWQ>iN4`!GP}K?t@}tqRYJnl`py37vmeETM^1@; zekO56lm<{*Af@P#e?xawRe=Adq~hX3n?r%plMi>Si3rqTU|{h|DOz>*!@{#~{L}r5 zW5U8h!yoM3vw!c&)QCV`4hD9Ql%fmg7cM;iF1;8iTM`=HcVXY2{rf(Fq}dtR1=J2ox+QZ?oxYNB{!5?20ATvzDy;)ja{7}&H{x2%kB>3TmuGP_ z#Qd_uv6IUW&P|?|m~(D%uwQUplNKj~TyA4Y748Vz!ec2 z)6$YtQ;&bKT;J4mn@bp+T3Cen_)X2YdF4EbN>>z|Mjs1OSeOL$i_?b^ibW002ov JPDHLkV1jGlp&9@H literal 0 HcmV?d00001 diff --git a/lua/server/room.lua b/lua/server/room.lua index cac56746..9b21a534 100644 --- a/lua/server/room.lua +++ b/lua/server/room.lua @@ -19,7 +19,6 @@ ---@field public discard_pile integer[] @ 弃牌堆,也是卡牌id的数组 ---@field public processing_area integer[] @ 处理区,依然是卡牌id数组 ---@field public void integer[] @ 从游戏中除外区,一样的是卡牌id数组 ----@field public general_pile string[] @ 武将牌堆,这是武将名的数组 ---@field public card_place table @ 每个卡牌的id对应的区域,一张表 ---@field public owner_map table @ 每个卡牌id对应的主人,表的值是那个玩家的id,可能是nil ---@field public status_skills Skill[] @ 这个房间中含有的状态技列表 @@ -81,7 +80,6 @@ function Room:initialize(_room) self.discard_pile = {} self.processing_area = {} self.void = {} - self.general_pile = {} self.card_place = {} self.owner_map = {} self.status_skills = {} @@ -110,6 +108,7 @@ function Room:resume() -- 如果还没运行的话就先创建自己的主协程 if not self.main_co then self.main_co = coroutine.create(function() + self.tag["_general_pile"] = Fk:getAllGenerals() self:run() end) end @@ -2440,6 +2439,7 @@ function Room:handleCardEffect(event, cardEffectEvent) end end if not table.contains(players, p) then + Self = p -- for enabledAtResponse for _, s in ipairs(p.player_skills) do if s.pattern and diff --git a/packages/standard/init.lua b/packages/standard/init.lua index d94dad89..be876613 100644 --- a/packages/standard/init.lua +++ b/packages/standard/init.lua @@ -1283,8 +1283,8 @@ Fk:loadTranslationTable{ ["anjiang"] = "暗将", } -local heg_mode = require "packages.standard.hegemony" -extension:addGameMode(heg_mode) +-- local heg_mode = require "packages.standard.hegemony" +-- extension:addGameMode(heg_mode) -- load translations of this package dofile "packages/standard/i18n/init.lua"