From 708c478b322a0e0f9bf8888729f3ddae1fe0d88f Mon Sep 17 00:00:00 2001
From: zhangaotian <8474238@qq.com>
Date: Fri, 28 Jun 2024 12:30:19 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90AD=E3=80=91=E6=B5=8B=E8=AF=95=E5=B9=BF?=
 =?UTF-8?q?=E5=91=8A=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Forest/Assets/Config/Data/ad_adconfig.json    |   8 ++---
 .../Scripts/Gameplay/Manager/ShopManager.cs   |   2 +-
 Tool/Luban/.cache.meta                        |  30 +++++++++---------
 Tool/Luban/Datas/AD.xlsx                      | Bin 9841 -> 9832 bytes
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Forest/Assets/Config/Data/ad_adconfig.json b/Forest/Assets/Config/Data/ad_adconfig.json
index ee700c7..a4bd6c6 100644
--- a/Forest/Assets/Config/Data/ad_adconfig.json
+++ b/Forest/Assets/Config/Data/ad_adconfig.json
@@ -3,14 +3,14 @@
     "ID": 100,
     "AdType": 0,
     "AdMod_UnitId_Android": "ca-app-pub-3940256099942544/5224354917",
-    "AdMod_UnitId_iOS": "ca-app-pub-3416046585132585/9777215144",
+    "AdMod_UnitId_iOS": "ca-app-pub-3940256099942544/1712485313",
     "UnityAds_UnitId_Android": "Rewarded_Android",
     "UnityAds_UnitId_iOS": "Rewarded_iOS"
   },
   {
     "ID": 101,
     "AdType": 0,
-    "AdMod_UnitId_Android": "ca-app-pub-2457954470236566/5634049529",
+    "AdMod_UnitId_Android": "ca-app-pub-3416046585132585/8993157643",
     "AdMod_UnitId_iOS": "ca-app-pub-3416046585132585/7039371165",
     "UnityAds_UnitId_Android": "Reward_Android_101",
     "UnityAds_UnitId_iOS": "Reward_iOS_101"
@@ -18,7 +18,7 @@
   {
     "ID": 102,
     "AdType": 0,
-    "AdMod_UnitId_Android": "ca-app-pub-2457954470236566/5398902343",
+    "AdMod_UnitId_Android": "ca-app-pub-3416046585132585/9292540542",
     "AdMod_UnitId_iOS": "ca-app-pub-3416046585132585/7971456684",
     "UnityAds_UnitId_Android": "Reward_Android_102",
     "UnityAds_UnitId_iOS": "Reward_iOS_102"
@@ -26,7 +26,7 @@
   {
     "ID": 103,
     "AdType": 0,
-    "AdMod_UnitId_Android": "ca-app-pub-2457954470236566/3331319818",
+    "AdMod_UnitId_Android": "ca-app-pub-3416046585132585/9076918124",
     "AdMod_UnitId_iOS": "ca-app-pub-3416046585132585/8945966315",
     "UnityAds_UnitId_Android": "Reward_Android_103",
     "UnityAds_UnitId_iOS": "Reward_iOS_103"
diff --git a/Forest/Assets/Scripts/Gameplay/Manager/ShopManager.cs b/Forest/Assets/Scripts/Gameplay/Manager/ShopManager.cs
index 750dc82..c4a3596 100644
--- a/Forest/Assets/Scripts/Gameplay/Manager/ShopManager.cs
+++ b/Forest/Assets/Scripts/Gameplay/Manager/ShopManager.cs
@@ -52,7 +52,7 @@ namespace Gameplay.Manager
             _consumableGoods = new Dictionary<string, int>()
             {
                 { Platform + "_CoinBox_100", 100 }, { Platform + "_CoinBox_600", 600 },
-                { Platform + "_CoinBox_1200", 1600 }
+                { Platform + "_CoinBox_1600", 1600 }
             };
             _nonConsumableGoods = new Dictionary<string, int>();
         }
diff --git a/Tool/Luban/.cache.meta b/Tool/Luban/.cache.meta
index 6c6f0f3..f3cd08d 100644
--- a/Tool/Luban/.cache.meta
+++ b/Tool/Luban/.cache.meta
@@ -1,20 +1,20 @@
-/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/ad_adconfig.json,71A2B6B6709FE3FF4DE257362B4885C,1094,1719225182859
-/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/prop_propconfig.json,7C02F583533F144939CBFF8C7E18473,880,1719225182859
-/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/stringcfg_stringconfig.json,448F97FC077CE499139EFC4854438,7226,1719225182859
-/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADConfig.cs,A4C9CBC6BD55B1C14634FD73C748ACA,1928,1719225182859
-/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADType.cs,F6A7395BDA6D1E7D1EF51E344CB045,603,1719225182858
-/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/DataAD.cs,7F68864C5AB693111C5C3250967FB782,3417,1719225182859
-/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/Event.cs,9BC756F4D9E749FBCEF49BF6929557,6506,1719225182859
-/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/EventFirst.cs,72E992B782D0734B64364E4777CA3B35,2964,1719225182859
-/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/DataProp.cs,B1E5165AD7B7B28F863BF25E9581BF7B,4385,1719225182859
-/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropConfig.cs,263DA0E1E0FA37A6401A432E49E8,2040,1719225182859
-/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropType.cs,56DDB93BC3D6491F012DAE849526897,757,1719225182859
-/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/DataString.cs,1613DCE5B077AE52BB90193DD949348,2327,1719225182859
-/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/StringConfig.cs,90AC6ED26EAF4A66498B4816B635F47,2080,1719225182859
-/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Tables.cs,9F517A5B82261C51F83097C8AC1519,1963,1719225182859
+/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/ad_adconfig.json,A36B3A44ABABA2DDE095849E3626C9,1094,1719548938241
+/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/prop_propconfig.json,7C02F583533F144939CBFF8C7E18473,880,1719548938241
+/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Config/Data/stringcfg_stringconfig.json,448F97FC077CE499139EFC4854438,7226,1719548938242
+/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADConfig.cs,A4C9CBC6BD55B1C14634FD73C748ACA,1928,1719548938241
+/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/ADType.cs,F6A7395BDA6D1E7D1EF51E344CB045,603,1719548938241
+/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/AD/DataAD.cs,7F68864C5AB693111C5C3250967FB782,3417,1719548938241
+/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/Event.cs,9BC756F4D9E749FBCEF49BF6929557,6506,1719548938242
+/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/BI/EventFirst.cs,72E992B782D0734B64364E4777CA3B35,2964,1719548938241
+/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/DataProp.cs,B1E5165AD7B7B28F863BF25E9581BF7B,4385,1719548938242
+/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropConfig.cs,263DA0E1E0FA37A6401A432E49E8,2040,1719548938241
+/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Prop/PropType.cs,56DDB93BC3D6491F012DAE849526897,757,1719548938241
+/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/DataString.cs,1613DCE5B077AE52BB90193DD949348,2327,1719548938241
+/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/StringCfg/StringConfig.cs,90AC6ED26EAF4A66498B4816B635F47,2080,1719548938241
+/Users/zhangaotian/UnityProject/Forest_Client/Forest/Assets/Scripts/Gameplay/DataTable/Tables.cs,9F517A5B82261C51F83097C8AC1519,1963,1719548938241
 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__beans__.xlsx,FBF2DDFEE7FB39A727F2C3ACA7E228E,11821,1718685908733
 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__enums__.xlsx,9966F8C0BCDDD717667BB975C9862F80,12651,1718685908733
 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/__tables__.xlsx,AF34F79C23336475A93B5ACEE819B6A,10886,1718685908734
-/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/AD.xlsx,94BD1CE582A461FEF69E5F186F4FB516,9841,1719208462217
+/Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/AD.xlsx,C664BD5E7C8E22397FB8CDF12EAED4E,9832,1719548816307
 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/Prop.xlsx,518794514E27F37BF9D0B6BA712533A5,10050,1718685908733
 /Users/zhangaotian/UnityProject/Forest_Client/Tool/Luban/Datas/StringConfig.xlsx,7928FA644D565490BF62C9F31161DF,12898,1719225115683
diff --git a/Tool/Luban/Datas/AD.xlsx b/Tool/Luban/Datas/AD.xlsx
index 66f0e0913ac50b202346804d0186fe5afb191958..99c5dab3b9dfeebfe8e65395c91d2ff0f5715b3d 100644
GIT binary patch
delta 5339
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
QpV=B43m8+0@t@;=0fYKUVgLXD

delta 5308
zcmYjVbyU<%7p5Bt=@OO_kOpai1&O7*TS_`*C4Lf8(ygR)N`rLilG5w~D<IM(-Sy%7
zp7VX*{bS<Jb7#((dCr}C@22XZYE23%hPkSeaB>FfGvMA?4vY*Q`a*}JPqq&}s^V&L
zRL)-rz?3}$EsmWZjyYvCne1t{tBzg<iES`1d+V*jnUzvgLExMf5IzPMlx-5nj9u^=
z!w90&<7kc-IZi|N3D&R3RDr|AYC2ShRwk&K#)SLQko<EIoV>@dmX%Cb48|1m^{K6F
zqu3A`V34vfMOL%l`q=bcan|c-+B~yU`35;pICBN|$7YmKzE#b4<9PmY5kNc5tIv0I
z4ynQQ11GHl*}fhT&ZFYBZ>n|Sv^%Z7+j+58NB$SSK^`;uje--q(WudKqd3VjJ{&96
z=^OEg*wdDU&Mp_Qq~<5?b=|ENqYDsvP-|SSW}0qc!!$KH(;YXht4Tp9db29u<jgFW
zNY5NpK(2QGDtPa*2}tsLEZ`fpvnX8sWJE-^?SpmtGVpuAm%T|E(*7<+@!L7}Hz`I}
zuO~rq7xkp*ji?xiE^UJ3VGK54F0Me7EPP+_(;Jyiw<b+xJr3oH4`Cxpg4#}SCrVLV
z&TazH&sTfb{m(P|3U{!uuO<5JFX`LwZgTA5sd_#`9|#Yf(+w*lp-B`agqPRVn^VlS
zuVp`k*|l5J9>vbA9-nRG!U?Mvw*_r_Ln87Q6Y7cA>Q|-@Kdv=2K?m`GN;+t&PB3D7
zb=vm311R=r<k0NR)~XP9<k5j?;5Te(hN+A_zkop_rj+DpTV2MxtE@DijXkN$gs#GT
zLeIV5)bGFQaCJ!YevRVQScyj5Jl)OMh{M}^KFq%1m}JkeB>IU%U%jGP<q|heh2{K{
zUD*ZO)E=6(^}&=->_SQ-Ku;+itrgs!+9&T<hB@{|SF_G+_)$Pr)}FYs*7v4U{qJ$K
zN8kNlRN}0&9%>AIdV7K-Jvr4#t2L~_&}P!-3N{#BGCnX+ZK-m@ZD4SGHpzu=l;$$9
zjLLbX@yEk&++XyT4S9OdhU80Xy)-t$m6%jv1Lxdkvi)vn(kRTl20}%;YEHZ<BJCXI
zN^d}Q4VGQCT*EbAnTEIMvKqXU_|~a?d#8qUHW%6T)tA<0OU)$5f=s`Dh)AWpi1#Dq
zN@Jat^_!0puyF8-$%a~1Cmhpf${;PLpUYZe=OA6Ey65P<MAJ!Zc1Hq{CPCA5?-SRl
z8ZUdBZ?8$J8wg>pfXaD4iA4Ey-CWgO(@wMq#V8xZIKAO^;~>XCQ~jrUkfZ$?%_n1<
zvsNF(C^=q~@L@iVcO`o}2MH(I=?*Rc*(D2}JpX15*>wxV&;hlwG8BJXPBT0U3*|g1
zk`WLra<CV{klG40JzcLe<c*dg^8f7t35%BLfBW0<uPx9w^*BfC@V4sl<EWq*x<8;~
z&pa=|H3$2(ttV*0H23+$L`yZn{Kii>vBpsO-*)K?7}DoV+}y@c7F<sd2sBun?em2a
zaOb38^lT<w^jSe2?L7=7q3V)|O_S1etqUdtImR|ISi(S1_+e~Ez8K75%qot0UT~1I
zJRR84`~#>i8q#mL>^|PM)jhvIh7*9dsh7rkI+yIeQGp}ZspN2vR@jk3M}kULNg|_1
z+3mIBqyDAYDLSR;`|DL7l@~+T3v&azempgo6Pcj1*<9!Adxo{3dZduMzq(LvS?E=u
z@!7mHv)K*?<t13y-JmLfX+0Uz%zRHm^hHzrCy9dKrovj4tK@d5;pF4%Z2gjk(yADG
zCM868JjBdp)vZTG48NtrGq}R^+!q%6X}ND}Ug>_IWz*b!P|GPX>s!T?#a#0eYJClk
zJ{CYj^-*jO4+Uk=1O<f<1qH>=nb*r3>TK)9<LBbMV7lXmgp=RDu)Ig_vApJ+rcl=6
zMR-ySvuWnh;<2D(Im<Dsq^QM^>O~LjK0>c6Dnp`C^Ld*z<#)GI7@b)iHn|#xR;t~7
zgrrIDS<JSi$NPWrR-TCCn2ZgMtUkWW_6Poa_}Lyb+gv13EK!#wtD}z~Hxj_6FL5F~
z%RC}-rFQZ$qJi$oHoHim*K<7i$b5MP7wM`MJBo8YUJrJBOIkw}^XVvfgHQxgq_xq#
z+pM@VI!@P}owIU=WXNj0E}9q@MlO&rZ6jILw91QukTe4?B4UHs36q16w_AQ+;ef|g
zUz7cwQPUc|mU-RuzH@t%wENGq9Kv#j*4P9=I-Z(8CiDnuF)25C!_+MEvF!|en(~<>
zr^VXHH#A4^b<3Y3SBpy9qAS6Ol+(?m)g@>ZKBb<~QLL+&ndVB<3H{bQ7vc*?bCJQ|
zVLamC;oj*a7Au_Yhys7NHM6#m0nxnyjnK{)6ZhtlM?^Il?@bK1d)4m2oUB8~5DaZZ
zs@U}`X597Z&Y;5f@eO54(IS2e?@z+rn2y{$RgTC%aJw<;8b&9Uq17Sy`X=|5Ix<{H
zOF2wDZtrUnwnN0zDXvi8rITFIz@x>jddics&?boxmP6cO@fHOg7QZ?-0M&BvdlE0R
zc~V;!B83pWPC<_hoTzVVJQ|yZHd6nKAYgf^$a567Z$nBio5H-r6>U{m7i!!lIj({M
z?{PWxj#J^_>k$vBO3{LFI1{zitKYy_)x=WSXBw1ktQ?=d4E;4jaFh;NeK}I`%4Lz^
zd3-C6ioNG#f?#NS+v+$gkXPrN5^LP5zXh_AE5;OMLK~i2ex;S?QP7lZwTO#Bv$|w!
z2L|8h+b^_0z>rE7D&IKp%~9{DRwl2UVWVfuJF*sj97?@6jt1+jF|DSC<D=6!Z^P1D
z6w!k{-=B~y55d_8Ad*w`RPG?m{^q#waXGr~i>N}=LBMrz>e>~!R+@28Q&!~jbgoco
zn01>7avaZSEN@eAN*`Fje_-zys6($z5#&0bwb0#o&H5F!LPe9f5o1-OK$~$aEc%rr
z)=iZHJQnZLB(}1e_tBeXTB8*{haQJcy9`(&)!@Uw9$sheBt+xWXk3k;eQRXaaf3JD
zma-FDj`jMfksRPNaVHR2t;cy9JwNU(yu-$r&;=6Y^6a!yIP$_3Ov+Ws*h*l#cK)(X
zXU8I)&c}S&64sLD5lBcAYdrdYm{t9=If4rQ7WjWr(3fT?hF^z-N0fqi9)K1CBi;uD
zeWz0Wd%c_`WR*Y5UUmPmKmzj(KXS0qUm@nD8M|@>S^8}Ik1fsIo$8$$&$DHb;eFal
zBzL3`Lx%UM<Hfu5-4Hv`o>(~kO;idgR45@)z6YkvT27?L9`#Oj4jUwMsJWj))|qHD
zyLruDMDtQxvS`RaTvYjaoiZIp_tPgyPf1AYVR{}X%AS#Y>BpLZCIB-~$o#2^8cep8
z5Qn2}Cz!8<Pst}UtrWq(nQ7+qGk*S;gQ&*tsG+>>7aswee1vyVu|Y%m{&7Q{oP>O8
z7`J&bAyd8*C0IT|AT08?fb%PSH%AwFvMpzM4339>qp@};#)?@xtpEMm%fwU_M~XdD
z2&l%JL(SMEy|B;_h_mYM#A<y8?P({o!%N>Ec3Ef85D?ism1VE9nLksTL|$9*ZYyuU
zvY53Za+wa{_I~x4XbxZDkrmTZ(G&mJyFs`evgr&v&<n*RR25M#{>nxRTU`wh8Mkta
zt5R<^zYG}U;o!F@lcJkf#2P4>ycP6I$#$8_;gjeh+3w*1I+n$A<_<U0WH3i0n#;W@
z5viKw3N%(V(SLMXs}CTedL<_0)nVmNjjX_;{AHcefA&9qkv*@kGv(LMHdV68K(<@c
z6wrmr!5Mo`=v~UK14e}Hsf7#&O7aHDk2yx7%=lxK3o>;(tu+&DipxAw>9TS$Ox4$%
zgYh$yzMFFc3DJc-k!VEko<>uy=whH0>U&_CJ)5>JE3~2VBY#chq>JnD*n5;JuCy#d
z{Cxvj)_Ms!=TW<U%M~8EXQ}jn!8_PZ0J#Ak?k~~?0sXnn@8r_6mD*JFS}o{4M&8Lx
z&Dpo2gu);iu}3r{<IQ=Hd{RZ4=8)G>5FCyn%o$QW2qC#pCz^2x>|vsqMT;Qg{9c=8
zs`y#c*xJ;SwYA3BleJCL_;(~_^NA(*2NQo{9_89+4k}@d&s_IpNf5uj=5>BErf5F<
z6-k-=gPaaH^z?8dg4ca*#D3XMKttJZX34$$HSb}A4Re2pA9T^8QgP?RyMN;nu~pQ!
z_>yv$Nvp5OR>-YK_R*J!o7*`~V3~nu>QWeB<Ca7|Vhii_5_$-Cw7*efk3|SdWVwqD
zYKU514dF`PE8t+DW^sz<GP%^fk<W79j9Oz4U<HUH>u*AOE%4AhqHv^s>=qC|D2W-N
zjK=3Ckzi}uh-~23SGY+H_q*LsAd{W7l(te$1#=mWO4(L36D0<!%u(C`62l@DyuADq
z!Dgv;TZY~{VIYEW4o6W%g3PM{Gk)nEWol4VfO0;EM$U_DsUX_5nZ?<<<y4xkw7%l+
z0A>jGdFRzp&+5XP(HA!^N?07B12?>X!X!}8#p(g+9LZZ-C6rh~P+qml*s$2`iWjlK
ztv?HfX`I7mTi3DB<3eP7N^aPscU)4Zy12$xMTEn^cqTNYGxMv=aqhMK6Up4WE3Kyy
z1Yy*%_v9sFBC0R$oqdmf?=BB+MYxTv16zZ{sS{HorR%op_os;Zm2<h^R}BL=mY)@g
ztLKutRD+K1PR{$M;_oOX6Ax+g3l5ADP7V*}*Z~}lO%N%Fq!l>3(9v{#d(O`r%d^Kf
zA5Hv3hf^Jm<&s;{%+X4|obNR%NgfB|Z~lC|J__QV0#p(rB0Z|+cQ_1$k$wRefLr@m
zoBP>K=-@35y(QY2xN2;4J|;{57>Gj>BxIFm#}2%Zf>I?OWV}<B3r^W8c~b(s6@nhL
z4c_`s#dk$IKusUq{bhnhUXftOGxGy(nZ%y}gU0@y2pRUe`y&$T*GHSfo6ydg@vwx9
zfFM$-u>#r0`OCY1syp9av4EC=+C1D^zRTZpyHCzhR+8C?#$H@HoGscDG#xO}jIvpg
zIt?`!3Uee9#*=3Z5&P*_jE47X7)9o8dp?&ewiJ-bi|x*O$}7xZXv<V%-9cLWSx}t7
z<__^^J(&m26+;*=alw+<on=_f_uM_qc%qIf?t@_z4TC#+zf9!VUo9YMHw+$uy?tN1
zoM=J;68Xo-)GX2zRX;ziam0q=1u0jgdZhssEkk|HgmE|9zW~2RnZH94T6gqEjXciu
znC8J57pLI?T$I6Tl-AGx0U4P^&iy??($j~@)25?$_8m~81zyE#M<d2>N2}yRXR@>D
z0D5N+GOBR+X?MtB;fk&=BY*yD!bR5NJoKpbjN#H*FtCGd8;Rc8YF91Q)L}C5qj)5)
zOL6HUbQ4>n!)n1pawwmpeg!f3VIjx>A4Xms|4YjGA{F*!CI#qhGjrPArI|N2oBL9|
zWm{hdFLmCp)H{KnjmAxA3KgB=t40!B!cJkI%Pn>#CLsmW2VFjdZl|SJuz~PuwYK2e
z;3JW_#^M<DfK%o0G#QtB;I+IXSzxID&b_7zItJN8{ELGUq5fMYqAyeZB$<nb5l9(}
zo|Yko?T73Wi*I~XzgIIBFbWB+!6xxOm;AQn%g(p;&3kN{PReiGmgvKqLtKh>4p3)I
z-*1!I;a#O&RbQT9-9U?(>T>X8LGz4&s6iEnlN720U9ij+lv^e6Icf>Jh5{~540pq`
zv_}2MHTqa|wnR?~VYA)P#*gpbHv&JHaef4RF7J)mQE*I$>NV?GEjamOsZEuGKfTv(
zG6vJVq|<*{Cd*fCFt3jClF@MM=oBKgh=qf0^m^!7qY+gOr3;=*S}(Huxu4`IbBm;r
zNcodM<Kek7p1s<vHRC29j{TXGG4qQ{lXLO(bs1`lrV?$cd8wG9rl8>f@ll}UdY!+?
zC;f2EYE$v9y{r8ay0A34eqH@zra!Y<`gtyIfCkUPmmr{R))bgE4Qka1f{L(s9TUFx
zZ4))EDrm3%<#k%@P_(_^Y913^Of6iI&J1!0qmB<FCKH4(^<|JMU`F4PwDLsz$&0B_
zfo7#XN3KvYhd(_vlL-I3zX@0bjjc)0^V`<C2Y7_x+GokZaAQj?4KL^=cz%1qNJv-|
zA_bQk*JiawHN&vT;=C-HrW(f}@*p}<)}SA86=R&%@(ZPd-RcsRv(^40Khhf0_q_LN
zNx{UjAlWF3`jzckwh)0HG1-Xod1Mbznf=ULdU%)jzihz$hYl`uF?q?-bo79hTP7cI
zP;SG$<z+TiQUVrPDHzwdsJMJm2${o1q+0XZ`IQ9oRKxuXS}?L~>f6-i=u+UD^X!h+
z7YKqIMs2Mg=1nzI9GtP2vX}fJ8rLI6;5?yqOuLX|oI4gg^ZqB&mBviDUHFFt1gHii
zl?|@oFkSORnu;g~91)SC1YrOUOI0kSQFi~#3HJUmKJ7zU3QOtBVM?(Pl{cEqDg;T-
zgze<WlZH1sTIe-s@tLQlB+5yXbgOyAJ58N`l<lsW%nW(0E$?n;I+28UM-(h6JQyY5
zMLY77L;i3$foM|HcOIR!>TRqEWkU*O{;m9G?W98Q_nF?tmQBJ=+IgW>ABux71&Ul@
z_S21LaI%L`L)$B%`8|T4z){TZG86;u-QDd~68tiuzEh{Q{uhfQ2EdveM^6D5n7^$*
ztX~RUwI4R@oa!iUA%mp6P5MA{n$(5NX_hy8-gCwBqae~i%EX~yj`fQ4*>$(=Nf%yN
z+jN}g;N6ph2}y{8LP&j|(yt%4zFqWD9mw6Tz)@HT0?A?)-(UTv?G$mlKCFp$tE2hK
z*OdWL0~NaIyCC}ejt|K#N+J$vy)c6e23k8~@)#p|atw$QgM|SFC0Ub&B6%D{gQ}Fg
z14{n4fEdEukLsQbVR??4o*c}=P5X~8Kt(}u!bCy&>mmLMDhlI6OPoB&!jAX93_AIW
orHuA3S9%`c!{{g|M1Qdl@-O^(awn_#zg09wHZYbh=<m{h09|D+>Hq)$