From b1340828209147b84211e11e71cdf6275df86c56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=97=E5=BA=86=E5=B8=85?= <9175754+miao-qingshuai@user.noreply.gitee.com> Date: Fri, 20 Jun 2025 15:49:10 +0800 Subject: [PATCH] =?UTF-8?q?feat(game):=20=E6=B7=BB=E5=8A=A0=E7=8E=A9?= =?UTF-8?q?=E5=AE=B6=E8=83=9C=E5=88=A9=E6=A0=87=E8=AF=86=E5=B9=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=B8=B8=E6=88=8F=E7=BB=93=E6=9D=9F=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - - 优化 Room 类中的游戏结束处理逻辑，包括分数保存和奖励计算 - 更新 RoomEndState 类的 enter 方法，改进玩家状态切换流程 - 在 EXPlayerBetState 中添加日志输出，便于调试- 为 EXPlayBack 类的 addResultCommand 方法添加注释，提高代码可读性 --- .../src/main/java/com/game/data/Player.java | 3 +++ .../src/main/java/com/game/data/Room.java | 17 +++++++------- .../com/game/room/state/RoomEndState.java | 22 +++++++++++++----- .../classes/com/game/data/Player$1.class | Bin 1657 -> 1657 bytes .../classes/com/game/data/Player$2.class | Bin 2050 -> 2050 bytes .../target/classes/com/game/data/Player.class | Bin 11721 -> 11765 bytes .../target/classes/com/game/data/Room.class | Bin 39414 -> 39414 bytes .../com/game/room/state/RoomEndState.class | Bin 2571 -> 2571 bytes .../src/main/java/extend/pk/EXPlayBack.java | 8 +++++++ .../pk/player/state/EXPlayerBetState.java | 5 +++- .../target/classes/extend/pk/EXPlayBack.class | Bin 2049 -> 2049 bytes .../pk/player/state/EXPlayerBetState.class | Bin 5616 -> 5814 bytes 12 files changed, 40 insertions(+), 15 deletions(-) diff --git a/libs/game_common/src/main/java/com/game/data/Player.java b/libs/game_common/src/main/java/com/game/data/Player.java index 9a21ef2..e3379b0 100644 --- a/libs/game_common/src/main/java/com/game/data/Player.java +++ b/libs/game_common/src/main/java/com/game/data/Player.java @@ -163,6 +163,9 @@ public class Player { */ public int xi_pai_total = 0; + //赢了的玩家 + public int winer_playerid = 0; + public Player(int playerid, Room table, String session_id) { this.room = table; this.playerid = playerid; diff --git a/libs/game_common/src/main/java/com/game/data/Room.java b/libs/game_common/src/main/java/com/game/data/Room.java index b479e1f..db9f37b 100644 --- a/libs/game_common/src/main/java/com/game/data/Room.java +++ b/libs/game_common/src/main/java/com/game/data/Room.java @@ -624,6 +624,7 @@ public class Room implements Runnable { this.saveMilitaryTotal(true); } else { roomResult(); +// this.saveMilitaryTotal(true); } Global.logger.info("total: "+total); for (Entry entry : this.playerMapById.entrySet()) { @@ -1056,17 +1057,17 @@ public class Room implements Runnable { pdata.putInt("accId", player.playerid); plist.addTObject(pdata); } - + // 人头制-是否需要奖励 // 以大赢家为标准 -2019.12.23 if (this.hpData != null ) { - + int type = this.hpData.containsKey("type") ? this.hpData.getInt("type") : 2; if (type == 1) { - + int lowerThanValue = 0; if(hpData.containsKey("UpperLimitReward") && hpData.getInt("UpperLimitReward") > 0) { - + if (hpData.containsKey("UpperLimit")) { lowerThanValue = hpData.getInt("UpperLimit"); roomMoney = hpData.getInt("UpperLimitReward"); @@ -1076,14 +1077,14 @@ public class Room implements Runnable { // 新浮动抽水数据 ITArray rewards_list = this.hpData.getTArray("rewards_list"); if (rewards_list.size() > 0) { - + lowerThanValue = rewards_list.getTObject(0).getInt("UpperLimit"); if(rewards_list.getTObject(0).containsKey("UpperLimitReward")) { roomMoney = rewards_list.getTObject(0).getInt("UpperLimitReward"); - } + } } } - + if(scoreDesc().size()>0 && scoreDesc().get(0).hpPumpValue() < lowerThanValue && roomMoney > 0 ) { aHeadReward = false; }else { @@ -1117,7 +1118,7 @@ public class Room implements Runnable { if (this.agent && this.groupId > 0) { Global.eventCtr.redisGroupRound(this, groupId, groupPid, hpPump ? 1 : 0); - + for (Entry entry : this.playerMapBySeat.entrySet()) { Player player = entry.getValue(); if (player.already_round == 0) diff --git a/libs/game_common/src/main/java/com/game/room/state/RoomEndState.java b/libs/game_common/src/main/java/com/game/room/state/RoomEndState.java index e9176f4..600f85c 100644 --- a/libs/game_common/src/main/java/com/game/room/state/RoomEndState.java +++ b/libs/game_common/src/main/java/com/game/room/state/RoomEndState.java @@ -13,14 +13,24 @@ import com.game.state.StateBase; public class RoomEndState extends StateBase{ + /** + * 当玩家进入房间时调用此方法，以处理进入房间后的相关操作 + * + * @param owner 房间的拥有者对象，用于访问和操作房间的相关数据 + */ @Override public void enter(Room owner) { - owner.saveSocre(); - - for (Entry entry : owner.playerMapBySeat.entrySet()) { - Player player = entry.getValue(); - player.stateMachine.changeState( Global.getState(PlayerEndState.class)); - } + // 保存房间拥有者的分数，以便在进入房间后更新分数信息 + owner.saveSocre(); + // 遍历房间中所有座位上的玩家，为每个玩家更新状态 + for (Entry entry : owner.playerMapBySeat.entrySet()) { + // 获取当前遍历到的玩家对象 + Player player = entry.getValue(); + // 为玩家切换到结束状态，表示玩家已准备好开始游戏或观战 + player.stateMachine.changeState( Global.getState(PlayerEndState.class)); + } + + } public void execute(Room owner, String cmd, int gid, Object param) { diff --git a/libs/game_common/target/classes/com/game/data/Player$1.class b/libs/game_common/target/classes/com/game/data/Player$1.class index 6c8bfb59b5a5ba9c0cabd504bd9d931103d4950e..5abfd75bddc3b6fa514cb16234afc43c0356f950 100644 GIT binary patch delta 35 rcmey#^OI+TJ1gUz$sVlp1s^cjFg#>%V0ggb%}(A6 diff --git a/libs/game_common/target/classes/com/game/data/Player$2.class b/libs/game_common/target/classes/com/game/data/Player$2.class index cd42b8f0a7344fb644b7279b27b0fbbd04342899..8fcf115ee2ca25148a16ec4bb94fec6d45bdd87b 100644 GIT binary patch delta 59 zcmZn?XcE}4h>ekd@?y5rn!*gsj3NwNjG_!ejA9J3jN%Mxj8Y7ijM5B_j4}+~jB*Tx PjPeYfj0%&dvu6VUIkgF! delta 59 zcmZn?XcE}4h>ekF@?y5rngR^WjDieYj6w`TjKU1Ej3NwbjN%NIj1mlvjFJrAjM5B+ Pj4}+JjIxubvu6VUHRB0) diff --git a/libs/game_common/target/classes/com/game/data/Player.class b/libs/game_common/target/classes/com/game/data/Player.class index 9c50001e440f59027b80b1cda87d3aef8982e75e..474924e02978a9201db5a5308d2356f1de6c953d 100644 GIT binary patch literal 11765 zcmb7K34B!5)j#LWByTc#Sr`&X2p~IQCLy9g*<{~>1dy-@sNpdgl99>GI5T0fwVSwG z>(a$wwbTt4s)8YasC6s0cC&6>(AL%})>^Ht)h;04|J?WH%}WT{Pkx@eynD|*`#tAQ zp8MpH$BAgXHqK9Xa&-aSz+(gi1%!02@o}wm#|o$uaJqnT0?rU{rhxGRCJ2});Bx{d z379Nkih!vCrU^Jpz;ppK1k4mLD}Uw)kb(bXG+V$N0dob+6EI)E0s#vJ)C*W7;A{bl z1vCg)B4DY`%ls7LY9F5??Q#K)0#^8Vr5`I+$+FctpX;abyhi7>ewt{pzfR}#{4|-* z*ZBfJH}QH|VHTjb!OvlC_H%?c3TW|jD@SGSLczF6=a|lIewxp5Kh5KWoRIYMMV!(( z?cu}R^V2zev8?^P&R_7+M}@S4FA?xXAAKzCm;C%?{)&&D_w!fz z(gN(=?xS}L`7*v-a9klrTq(V){FLUaWy>`(yi$7C%7I@KaGkL5bw6LvH^|-_1>7XV zZwNWx^z*m)+XZ|xclZHz2)IS(?+8jr@m3!_;-f=8del#Oe4CHI>*t;PJs&;cqx*cc z-^aK6=mk0O4ms;iAKxV;-0h=#WV}nxzQ@P+`uRS--^aTPAk**b{D9E@psaXEz#idr zug(w4-cH%G&(B>9><0>QGEce+-G3SPeA0r`pqX$w;crj7Q=bi_AvrR4gxu zrspKUSvUhy*MjnBdU+(4Fom3GdTu10NhLszHytst!WWNh%`{qFNW$)VNXEp<<(z$)mR3w1O{({0goT5+EnW|1pNGL`3qrPR|X0tVNGW;g?>uZXq@RXta! zX{^f2Sl)B!p~c5;(BPj4AG$Qji6{X|2jWx|`C%BuFT-5oTAGhFc>LQDkd0(-e!giInrV zMw^mm6f&?nO_@Z-jDZ3r^QN37=1+^pqnYVU!Rq=Ra#3b`vVD$O1M=c5XSGz2 zj=;h!YaUgt7Ja%o3%y0Ki14NcGig)ghasghwx+AW`AJ^rnpwKxLMUmf;#-sty@uPM zpuD7+GU4uSAGX&*Le=%M!BZ`;Ae~7h?bG17iR7$U%pR61N@lq&uU|KMT&F`mnPt|Q zL*0yv{no)IqM2=V^(%5DWVR(iY~F?xJXhx*;Vw}AJ1=XFAP&y0#b7TbiYhl1eOe+J zi>$?wjY?FC8w9Qje6ex#T;NMZ(#b?Tjbpp(rdJZ{m5B0{7-1it7KwLxkyJ|D0eX%% z&)W>Pm?l=c)M1Co&lG?NUI(f5@r?-tKHH#dTj`Y^L|)4=<|1n2%7EQqzZLl`EPAsO z`>NN<0lxIMbSi?dgYePRr2No|g!$F=^=rpKT6tkBw0X>CaF=f#AQ293XD!VO$08;; z_A5j-%X!$Z3@F|X6Z2&f7TdU7z{p9~3Qk*-O;N?^h;B~NE2Dxq53DVe2-6MU;)J?^ zbVZVUE{40=$`+}>uq9@KTZuM~CFv@>$oj%o75i41v33}NzcJCC3PM>3)O0FW>bqrF#*?dg^I*do-r5;e2%!H5vS4eonwo3?9H$ z5UyPC2E9RlGU!?Q5mS{D{t+iKk#6@oWXM0oUFa-Px7os^K`+tEOntl0tN1Bfe#SJ~ z`DB@6orT=ek7e(Ta-7aTH~1I)yurWZ7Yu%pU()$ygJ0oa>HKShf5X2u_z1tM^J@nG zj@~l(_x!p+f1~$LI^B+T{hWgpt=54f#tB(}5CFD+LeJ^^ronIVQ5d_k-ikD~bND3; zrV7S2%Y~dCUsm+@BN%J)EjxC5xcf8lox{wu#{@caBX zoj)-6?{orj)Zl;chX((XKhpVQga5_TY6Fl9xW5iLRk*JnGi1sTU8^#*fntYw$waa}X=sDA!HE8j;(D>LWwKBin4z7f z4KcK#BAQ|Rk)aLOM!2=^vJ!(!xsRcZ)JEyrXoLG})nF{#o@#1M8hn5tzcE@67n#bQ zn#^zpiI(~XpGWLzPa@m3vLk~Z6A>V$A|+BwBm`(7)^)8$NT@Zmu`*K!0L{XlN^_oU zU9a7yvY|QO#37Qp)%J2ke}fDC-p1L^rnSoyjjU%)Je63 zivJ_rtCW=n94l1^OT__0MW$rm7Zp88Q}b$TS#xBgxOui>Q;`fes3fvXp`IIU*XWG{ zLy3BQ>iMkm^@CH9SV@&k~C$l}n)n61!FCvlDV%w1d1! zZt`qoE`GA;Po9DRQMuK}5e(vCxX!TdZs1NqbJdA~GhNc`O*XERvhqcE$;U<|&VFus z?FA}l7Sk}>W0@xRH3lN>q1cd=26&&DlY!S(=3HZe%sCDXN%eOOwEHKf0jIDqD{F_! zRSA^SMr7EuAMWi{gMZHHL56@w0Ff*-k+i!qwrOZT;k<0ZOV8+=v z28+q6#PynyTLJzIsj`+kMO!_pj?XNt+zWDHQ8{q-2}!PjHNB|Ez13|NPSxsO@F}?c z(e#o;W?ow|1AiUbYY=tQ1BZY_XEisYJcZEwu%OwA1gfq$QpH}#RHa>E0++d?lKfbr z1-_YmYIEmd%8wSS&yc9f*iZ2p`m$;?9}*Y)HXWc?R)M+aWeWAAB5jGyk!+wpmCY%7 z{cYw}YoYjjQa!G~-DhvJs!V;elw?ac3dh~Dja=06MWozTKH;KD<=owzqQY^C9^c@c zFd*dtI%F)xWbXoAr1AtTagtY;eOuf5RxfhrM0R1CP4D9AElB6&h0HH^z-FWd@)SA5 zp-id&aGP zs#?^jszt@9TGThHMJa`L7X6fdrp72^Rf|ei&7+uAE$Ug-qNG*dQPrvzWu$6R;Hnli zu4+-{suq>5YEkT>9Rf)np;rN4Bhn_27ypQBgZqhtypOb?XCHZ_=M4t(_mQrkPr(A2 z_6sPKRfd2f0mTAJ1e6NsqgDrk-hI?pb;}eimv8+9^cPSepi;nqU>Q~Iqe0RiEZ{T& zL)50B(j6vXxPTD?MhX}u=toPhTEG|q!C;MW09>A6tc1r_l%+N!2jnTB^gk@ic)ZH{>hi)LA)*})J@6dyy-=p4alnX2f`qx3eBiqL-od^`!gJq5izO#|SrRZ64J(loee zJ*2k;PPqzhxeiiXkGCX|Q$LH?tenVHfrjZQzIjQjss&qk?68@;82I5}FxM`c3qzW> zrs@#QUlXjU-A@bl)53jJ527{vU*AQGa+VcPyN&?93d-JuCB2o?5{+_BA4TuL{zU$x z=r7QX2yzs3{a2-xx9L5bj#)w*z7+(k0*kqe8gfVZ)ra@UNAJ5BEO3q}u#XV7-nY@6 z1$1&~iKs;Dq$Ry0{TPz{mrMO6Hd2pnnZKxRuA!Rz96B<#CGN>ELM$olYOp zKPgYRa}>Ybv90aOqBKOfR{BUqfYT^KAFIeGGA||1Cp1H+e?f--{ts0ShQ$8v*xn3C zS!_=aR>AVt=ftlpk0((+PgbN@uBAH!=#J&#&CXH+0;Q$R{vwPnGCOelbkeX6(!IOL z>)DNSEV-!Q!_!wIRzipgH`D}H z2G$*T(LNi z-w--Xm7yiIj&&QV3*&AGtOKVoVZSijMQyUZim{*d{tEhrkQ;^T4T3$or zcrBgD>u5TkM+>-#mhpO8&0)HLn<>m26~}T>ok?ZNU?F#0ufjW?%g`6&6e%>jR9!-z z7vD;-&R;-AE0gv+YaGwhH$q) zxEDjXpQk4NQm;at;0W~$N2sQY&tfqsN2vY5GP6h$aT2LJA}U(3bz=v4_YB%WefLsw z;Ghs@a9v-ti%Qj)?Qza921tbEt3dnJh{)HF!Pg?9U57|^y+fzuDz95v3V8D<1=?|@6+A+L&FBYI zU7?=lw5@|mLV=4hTb`ZuHelp^mc$~E9TiH`MW1g71-^i8 zMK&_p2rt21g76gzd=Vc@?8z^okNnCCq4wODF*o8MeFZM2BHLFH?Lq;u-(hMt6u1=r zy+N%GhPr5bND@CQ_AZBe65kHF-2u7XNkjN91hKnm67Qnfd=D+*`>2ucCzE$mlpml= z_(8gyAEFz158cgsk(oYBk8&q|TH8l2@qYRZKkAbG5nJ{?dXfD~`;By^{4@#ei|pZ} z$7l&0{um8_&!0fD=h3;)iU6cp?Fk_^H|w!x`2>x2Pk;L2GoWE3t6}`MXkBydISpS1 zY1!99R)&(J;-0v?gFbgEY3`*fvW3f)s8B@8R_)S7SA_ys1A)Jju6dHKwY1Yi_M?z- z5zN{2UIZh*~&cN3#~Bv#=smjbpeBQO~PvyqNUTLgN?>g$esT ze(0#&xzZbfRd5UqN(3(PuJ?LDw-o2rxY_Gb<36Gnt5UNrw-3R@KjEw&DdMb(ZKzEg z<6g_=46CtA4p7y5Kd}H+h^ygnv4tFBE1n<2pAH@;KYv0ce1gjGBWs1Gxelpx4(ZPo zmQrb{9j1%+(oJB)Q#G)QzL7($a!1Wi_#svyvchtaBg!INTb3w`xKfFd<;Qy)c^z8e zAP<=J9tEpb?4m5sp$tF1+M9RUlr6F{!fyh{q)z(QLHf2AZw)tF!wwY~YXUp0;VsHn zYXaY~hPT>5_BKT0?|M){W)(3Q6%J{*d$cm@tM#K{_#t?lHh^YoRaCDHaJv5!>mio68%*2YtyJiI}75U z4ytF+C~YPMwK*>8LpBjd)n3$9%p;tH50`?Hw@+l!Nw-S0a6N};i(H6&HX`Pc|MUKH hdfBg`&ci9F^zK4C01TajR{ooBHHb;`_>KI6{{!ajdf@;7 literal 11721 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 Q`@cnYgP63CpDQf-KXaUHX#fBK diff --git a/libs/game_common/target/classes/com/game/data/Room.class b/libs/game_common/target/classes/com/game/data/Room.class index 056c76e4831933da5d78101c2bdd99164d2a29b7..0e66fd0268e9a0804fce8dc744135310ce919cff 100644 GIT binary patch delta 2839 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 diff --git a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/EXPlayBack.java b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/EXPlayBack.java index a097f99..df7c38b 100644 --- a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/EXPlayBack.java +++ b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/EXPlayBack.java @@ -39,7 +39,15 @@ public class EXPlayBack extends BasePlayBack{ addCommand("newindex", 0, cmdData); } + /** + * 添加结果命令 + * 该方法用于向特定座位的玩家添加一个结果命令，结果命令包含了一些数据，用于表示游戏结果或其他重要信息 + * + * @param seat 座位号，表示命令是为哪个座位的玩家添加的，必须是有效的座位号 + * @param cmdData 命令数据，是一个ITObject对象，包含要添加的命令的具体数据，不能为空 + */ public void addResultCommand(int seat,ITObject cmdData) { + // 调用addCommand方法，将命令类型设置为"result"，将特定座位号和命令数据作为参数传递 addCommand("result", seat, cmdData); } } diff --git a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerBetState.java b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerBetState.java index 902c90f..55ff1db 100644 --- a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerBetState.java +++ b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerBetState.java @@ -135,6 +135,9 @@ public class EXPlayerBetState extends StateBase { } + System.out.println("当前用户 ："+owner.playerid); + System.out.println("当前用户的总下注分数:"+owner.totalLostScore); + owner.totalLostScore += owner.betScore; // 扣除下注分数 owner.lostScore =owner.betScore; @@ -150,8 +153,8 @@ public class EXPlayerBetState extends StateBase { for (Entry entry : room.playerMapBySeat.entrySet()) { EXPlayer player = (EXPlayer) entry.getValue(); + System.out.println("基础分数："+player.baseScore); param.putInt("seat_" + player.seat, player.baseScore - player.totalLostScore); - } room.broadCastToClient(0, Config.GAME_EVT_RESULT, param); diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXPlayBack.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXPlayBack.class index 40dffa336e5209578063abea924b03179255c9d0..ef1de01a16dbb9dd2b4ea65752c249ae3c6ad3cd 100644 GIT binary patch delta 17 YcmZn^XcX9RhMm=zfrG(h@*wEzGB delta 17 YcmZn^XcX9RhMiTLfrCM3@cmrcT8`UnoOl+`8F=2nZZYgJu-A!pC=}y9(d;+i z7k)suD!SQRYNBz8CU?!jDc2#ZM{*KO6W(;(j%7#=u$W=bVu93cnRDqSa(x z;9F4mUEz5`W$W-Li zq^X*w>I_RY#2iUAHMx*ah)8ag+(uI^s?9}eszY^yy7ocVR#Oya6I52NCp$ZBil%6C zYpN&l^(*6>wA0i;U}GvZtu-~29%e{Eji|9T-X2@GiKZKMHt1*XqmH%qc4< zIelg85d2`EF>`u{?Dus2ER!)l49r@M~<&O5y&5C+x>Pfv6E^6vceKhr@H0z9t z?%$8n2(HYTd6`o(lBP~d>NR3Wws%%$4xvWr#^UnL1wr&c8U3XUTW+Q|ZyXQ2b*toL zjaj%)BLkU)XzQFax^RSX(B?3v1~9TRtm@T|4jRpm9&mubi^OyspOTmpb6e~I&>j}T zkj~T|P&R;*Xj7K<<5seARLIgUZ zCMIGMe=tA;LLee#V=}{3<2g;iJ)CwrPK082U`sHTobZHVr*ek6>=nelmvMt$BIU%f zF$T)0KzD`Q3iMXUb5>xy!n6t`DomH2d8?#stGH%Dr*sae&Q$`VxV_P+&-0KTBm=mM zV5=ept0c?}MK^Y};GWZ5^^?TEaR4K#%0DXPZ-Xn;70JZ}@>;IJzVtv2o&--uac50< zF3B9zmAwTol?N}hGJk3aPjvU=fk1Vsco6x4ys11dANQ~L3sr#GJYkZ@EZO)T-2n^8 z6X!?x!1%a*2(!GkI{Ws*Q-Tg751^x~w;w62@8d@gKf3tQ^BP;ec3jDH(pVJlW(7goZLRb0gylwmE- zV;$ANdTNIa)DfGgJ2qEc*?IK9!@SOR_8g2kcr>u=p2}+^Pvu(hhb6e|yEsGOq4*%1 zEl(^MI*&thSW_F}72wZA?qw|CZC03n3F9L@yiE&&_se%~lQgIn8^@E1k8wx%amV#u zaJ67P3^Idz4nF@jKHe$Wc}D=nkJ#%WII0jb{zdo?z^MNLz}vfsbB6KQqaF(gOE8zY O$yE*Izs^VOj(-4O4ar~t delta 2093 zcma)7XLM9m5dJ3F-TU_K4S@wxAT-4Q*(@Ot2m}a33&7=ubDM&SXI$pVoUDl9T#N2P(qa$X__OW{EiCMr!V#X|=2MY&92xq%fXR$`Tj zet1~SS3CK*#>69d)P=QJC&$NxJTAxeA_bl>ut6-Ibm1v%H1M>6XXIj&fz2*-$Fp+z zoM^Tf*ebkA$TkDj!h;fQy9BFIs5P+zJ54-~7euqmi5Eq^TMSd&h})@t%SA?3;9Hjp9=ZR zz(E6tq`=Qz_yS+L@D;um@{Ph_7e?Y+h3^a;5x1j8EWVcteh~7b!m+BAw1Uh!?z_TI z3dgJZM(2_31R=}v#Wb}x+15AD!&r^|sL(ixpEZ8LuY}gtaYwv0B1&ZtY$XN0QjNu8 z@f&_8G@a_3=}Rjs^%th)6c_u-hx$uO75>op6Q?x(!fC74o)oCl_#5>ax5KA#24^+S zp+XTf5k)DA)?_2QCI`ck;%hRG$*Yoh8l%+J;E$QQ!Hi^l)ogW zuyAmZrpDAnlUw|op7(FpT~jlGZGK+URa2bQP{IjOJSA9Vj+D4WO)aRUq9jeNsI|sa zYNM#FRqf~$(@rwG2!2f$W2|+|(caOXE+NEQF^%G_ROM=(OdT{OQ%6mmC`FM+Q!3_J zLsh2hkW}i`)S1$(1*%0LnYt)S*VL7`tPH{JE~JN~b5NvANm7;g^9x2!FD018K7UEU z=*iQI3pDklUW&3b^`<@wCp7h?Y)$>B|Gx$?%r~QbZc%A*xuzVsau>`hEhx%Qn=vgd zcT9(og}(BFVuD>pIZ@N4p`LW@lAf+nhM5|Z;3Fhh^|pkntwxRADr>Z7_!$0-0VfE& zAxy{dDUCTXx2J3eZDAn_{ z65IpLnYZM;qy~uqt|DBjNZ~9Ar4jEr?v7mZW_Qapv2Po~h;OiukJ#Jcj#Nc5j!@iF z?hyfr8z-IM+7(;0C6Uponr%YIHRQ z?}R;XI~>Ek?jfms7lhO6zJjIxEHO*2#ZW>mhVjE=OSIKuIAH}Y6KMotH%4aJ6YaIQ zQshxt4)0E6GF(sh=s*xziH>bBf*24)9}%w-GBBTkH=L_Ujdow{4WfzcqAj$GL%5mX zCfacqVsSS-n1kM!i(K5tFJvXJ@AMq9Zu&%;kti~~{ z;U)*9mkz#2X3@{mW^~0J3@cNqYv_Dk!z7PJCRxh;5AU|@qI?u#&wJRjh&9a+U5{Me zzcU!c`=>DHG=?DNo|#A3*wp!eRMJ5d>Ew!^CBqScnf4p yogt7QQZ5AGYyg-P0pLgAzX;d<4+LJg`5ZI~_j1>T-_O$k|Ky2(SZi^o!}$*(qLAVM