RBEKg4Ysr zLN?mfwauK^U6814{gDo~fVC%Tdzi=-jOIoLNuqX;5g;?v^Vx*F_LBrIEFvM-(AwY7 zsyWCrBsH`pNI*z|x4shKtx5va*5dX%VqputsZ~YdBMB`>n QPO2gy&Dcd#7=e;lpq`jeS8Y5c8I+7g(o>5$LNm)> zK?Z9zC<&PPU@iD(qUj&7^TAp)MFCNg*6IWi1vE)oPfqNyFhpB$`c=&kZ8ayh<^%1b z_3M658TY-jM4Btu(`2%C&vGB|H1WYX_JB-jWC9zijdu_-T@BYBb7D_dBeeSGSuA@_ z8KEuV#GX?|Xr5n*W>1hkrHs=0P?819m*92}-JUU8Y7|9*8Dy+B+q!+gQ`2YB2W)tL zh1v<)N+faEX?7JRYF|?l7#|b0JzQf?**@(kC-#)>(|&ajQe&TXmlL}-leN5fj_fK= z)?B}_?ClCp){?9}2R&t)jm8ILkNgE1$yD55Owm?Q!rUD)2~O4aJIEER%~b6VN^-+C z78c DpWeA>-*|Z5bzI zgpo4L(!O*MqM4=bbC93!0?gJfa$=9d46TyyBFmm2GU(=NqaB0{u}m$86MH;mX-_F( zU0tWA09jgzOC+5@Pg`0oN&+*mrR|_gLT>&XWNGO1tUc`M hTS&@R^c zabh>=V$F*LO~w_A3kvbE7i&I7@{MS*Hj|Qo5iQmhag9C6ey**tquEp8=bE33>|R-- z?R5~+D@(N#4nkUdxpsvUyH{3d_Z@_2R%kCAg!IZvO}^Ze*`D1ktF;oB1BCR-8trul zA-%Fzdy^BpS2k#kFI!EIqDi&GC&Xmip~=pT0ob68=cFobhY8uJE$8G#K}I%dCpc-r zHJi1|lmra@OYI3IYz^&%{q&_4eud=4NDm}mYjHk`(%|9S0ubcaZcvh&?^$oxUUFi4 z*4woLSE(VoY|nbTR+5rH*KOBoQ4;XAv$e*Yd~}kHgKSOz#77cJ0o(n~);h4H=^{!7 zOSaaN6Whto)>bp(vVGbe+ICKCpLU0Kk`vpf-J!Xz(b~K2R1{$lR&}S==^Aq(^WEH? z+7DC|a1MUZ?og5ne-;*~ 2YXQaz(I&_aztA|Nh&PCZ7(55wd1#0EMk+yr#+@6-3bul z)1J`q4JEd8F4#WpDedB2B*caM{0$NQsV=~2?LI+BrXX32O>{>4=nqDU M$ zJoicVS@6^n=>h6xZ9FHN+la6MHCMD*4)QgUtJ)$5*@oo0w$4FvklfU^Gvb5aTCjxf zXot9n5R%Yc?VN* I;vhuxK$HGtZFX*m2#1k8(#CR90lj77Qa{x) zDais~RWS(epkMk-`;?=w3IZH1Lda?dX@@6a&$X>Qq4GS|OYI~jtf|SQ^-{Y_37g9= zVD_NHU!*{6gG)%T?xSQXZ1!O@{*K6{XV?hIb4u26LfXUCOMrs<4hJbo$tg}gK+Wq& zB>kp?)Sv|ZX6-RLMT7=O3hDhQnF?VQd~9PJr4OelCI4{QtxsUlTz%2S>W9&a=xLN> zxRz=HCo{OF&X*!5b14a!UJ-pY(?IM=0S41_jxvoa 9Lqaq~^}jgztSNI#J$fD|gYa{}5tx}r7ax$?Pj&f_jHM);ldoI?_)-uR z)7>2HLNtvMg_A+Je#}BrT#x4@6`PtIa2D4qQ4(0ki|gr>WI^rYBCMye7IX6Cxd`{r zs!Hgq9VEnuW)-W){zJ-`1uIJ9qJYuj^a>8L4asYIElzCnETgyM#2%dS`gu;~pyR$9 zW0lqKImkgI<@INr)P4p~vj+P46?Nqy%RUc}5o*=|sHE5D1bT~LU=b_p%{hrdG8;)1 zJ)M&sX+R5IP0!@y6P!IsHLB~2IVp+lK?Yu;e#}8G_Y!>Yh93EdWS;>sC_)4^_2!gh zK?NkF(Q51KIeD*-2<>X2 -eV&p6<+>K%VA(g*2U8N*fHc#` zQj$rnsx_wEOy5dLDs(B$eCFo5FNY&?jMNQ9&Gq)rSX~R^t2Q!(TId5PNp;0Xv-6-9 z`gTraH#@^_p p+!=C@a>e^aYD4FW&lg$!pZMR35-5#y=(LB~?xO9=>+FD=ENd8Nu z*7`RutPW>AvwWAhcHA*`cGO0<$qXdq3@Shta!uQO&3dkBtKVnkf gdAXAZa)ZgqvQLaEl H)VJQ_K+C&zs~^c)_`KFIH> z$AOGSkpc(!bl6+(XYDwLp6v+wU~0aT-$zfOBv-IEb$#?LoE*mCy!`|~U;QUaQlSGD z;xd+Wpx#g*8RQCYqh=p!hU&X0nM(I!FHtj0Kgu=4IV5i-M(B5Z4n($RqxE(oD`{&K zk!WM}OO)ga>u~NM*-y|PP?8GOX0q%j>qCQBto470(72BPAL&1Gl9Gyt8AxX6mpQ4m zpIO~Z{c%udR_Y;`w7Vj}OnpQ!AyerIOCOB(v7Saru3&HB=IBctglysF=}HL8eiasa zI>yS<2UuNy^)zumrVnxj``ye^eT4PRuXu>QAe7}ywv%M5xI%xxiM rj#kxx6P<>ys$Sgz`x4p=N`g&Na(;b8Xa*a!oTNP1oU+tp8(m{LNEFIBku? zTQ`r3 6Ea^u_tQ$`hAuTyc~-A(+}_k zj_wJw@_zG_#y69(7qB%(hS5sr&y~CNk=CdSc8wlVJ0 zw{c<{<9_`VC${Mw(eH9%Tg*|tU_q
jd$Va+|6WgzYvPfwG5 zBwE0+&C@S(k$oodR8J^Glg@V|pXwtVguG*Vp=WbqJA^Ow;0PAWwy~G`XijV!3pS2M z$hbp7x6Sq%LkuO7MYEm80!Ck(V9yb!(PgZ65Hjw=jR&0A<6biA7iQ_$<|`YUIkD%d zC?hyZ1}pE1C(##)e-R71hHDYAIkyqVNh{n|k+ZgFBaM@*xY!oMCANsMloK64vw0m! zF=IU^zv00JiB-agbhDI?;o-&`s8Nh+oCG5w>6A2D`8e8x2^ok=8$&4x9Mi@ddJ&RP z;FvbvXvK+r1Y6dq6!WU4tWlp6TT{-^i@vHUXS`dK8bK!9y@I s(x+_Ad3@f9Xzp+llP Y@j4yGWCs}4ni#EE#shr5R1`_#${Rd_94D$ zw4@|pA12pa7ktEIh=DXPhO=n-hStDH;R)FjVgq9qCuHA2Jmm()*ADU&^KEGS;2=Mv zFWAU9>LBD*ePiRkO?-T6Yhpk-R%((oc@x&m7~vq~P1rleW(Qe>7Sr6=>ma=|aOeLD zIfdE3YutBe$d k2+! @nTRh^|Nro&T;JHJsRQS-KkWm6(RSit!P5sjG3HBm2cmSEEm5B4VaT?4!H! zp@We3E8UG$2Pt?6T?Zq>LF&AZFYAn5lmy-=^)~iV!YhVvD51A;hKcguN%S$E@MyL* z^f5eDSg8piNB@0|We!3bzrP{Vlkva{&H)BF!zaru*_V+s{DB5J!?#J^dsfNYo*3V5 zo|64l;1J^oC9L{Qup&c@i XtS~0LK^MWm9&eqI`37z4{MP{Mj5VCtd%ShVmyF~)#_No1uCe!c>x{S>EFF7` zx6YW)iM_>JXKbs%c0yq>zv0_aEYW)7C>5o^5+ua-)*CliG_W^W>y1e@Y0~+}-s_D@ zwHP6Tfy~1jjH{HSKv(oL3E6D4s?9X^*6eEo>aazSZkUPdxz!keh*$`*G_vjb&WL=I zkQAti9wQ;y#(7F|!QNzjZ>+A%V%eLl93!$GBlZ?=uW^+VdyDs@F}6Nx$ZK+Yj{V74 zL=bLF?JtymG7fTLFYiAYId8F~^Bo)G8Yi}Qyx;hX6Wb*@Y`ml-1?F!RX?y%^=qgDE z7r|W|oiMgglmhR0m`icm7_Sjg3i$Bf0g~=GZOr5(6hEY4WD6&YN8mWaPCRWq $_owHiuX$ry>ilmN-Zhgb!50L0#5CE1>yw$#glMv08oog#q?LJ| zl1!L@L!X>(wlO=s%`}JbRFIIiX2)g$LcZN=XAb3LHl|E8?af`aIm*NKC8&d0=p7bq z5f^nd6;7J-%sQE`zhhne%Tu~r4f-S#dfa2NyPL~7dFMNJ?ApVe)SRT32@QGdp5}&k z8L>ZC>}BRqk_F-XElF>)S}Uvj-}sVrbSqYxkWVp@$^d=LBMwpzVP8{h%`^+}-@>%V zZxH*L@swo1Fs#Gp)$t{Q*@}_;W`5s%z%}*o?H;N5`)1!ZB%KTpu@qy;a$(l-wPk2A zZsLh(pt-0$%Z&8JO6-e4=9~@zl8$7s`5Psf(7H5xpYwrv$3e)ka gy*OLFigMmp@ zn+j3kIFk-0v7d4BAvRJyB&p`{ZnUKNEk4DJe2)+|WXaZaim6Z%*sx49n{r}rSf-gH z9E5x+GR;izbteg>z=Yn|2k1&pH|J0i_`Gh0nazp4tC?Zmpd^s}4D&J9*i-ArW?T=F zGMm}S9^zxOxr2~h=Nxl%585kCM7Et7=5mLKY&7PYM=1$pmTBJM8vCo5`KG5Q%gnCp ze6zWOkh;z{4{~CE6|=yEUi@IduGs>!Mz27_k{$j6vmGUYdMq^S^bXXF)MK%^gp#Qc zj_*`Rp+7eda#AS_Uj(9NiTRk5-Z->A#BN<`#`odNAzA!L?U$J~5ZR4J5?XGK=fwW9 zY=xOYNfwY#why+zZ{f{Fga|2c{e3pgt}=zbB%Kua6Uo<@*(y__gtg*cBx}s*eyAaz zXm+^7mi~2SQ-Y8TMzR4#>r8l`ku!Mc6|owrS&fqG^fN~?r*AU*4qzI8Fk7=WnLlyz z1HNHpn&^Q{GXY&7;>@6i5TQ^C92w0@z1hTnXI|&AXHePIgNXQg*e5&ig*A>kzqy%` zOJQS?kmbj3?y!D*j7z{{>o(qeuE8WmU>)CT)}bVmev?r?Nr0_pM@pvRCvidW3%2bJ zvj-(9t}aOCV5&RJ0bJ7n3r;jU&7oY=9tqLxG{ ?_)?p zyG)A{`;E*lb2%p>#v-k>%lwKF_~9Y$eX!8G%!8b`ampv|!!9!+iBy$!WERz=CN-tV z)&4cyV %)}Eq50cwvy 5wn6;AJzZhoi$GdMYkD18J_NRG~k}NQGvW4?6^KUOHWfpWnQXf c%6CH#Y*D`ld5 z_ZLOMXG*otqF}Ld7Q@e#>liLkN-mCqrHU8BFO+Qm(bT&_fY9tA6uxl5y9rINcQ z3RWqN*G9o=r4@#2l)Oz*uvY2)WfZJaW@5Nr$-;1h@&$$)m9H?|q`bgzvr>0w6nv>n z_TlX-Wj}^rD`zp>qLltV3cgXQVEC<414F;E9>cB5c?`c(&L4?_ZOZhcQLtS(eI^RB zmEf~cutRB%;Z9{FhTkjGG2Er>#PA1Y=ea1@t=tQ7!yct{s2g$=6T`jAbPRKq8=*co z{HWY0;D(=+8xd~Ur+6aWuwPjc<%R>wPet8uP>J-o;gE6_!^6teI5!+of=j#Ms1jVp z4abz{W!> Pb()dJfp-`al=_9DA5h) zl<-8i56&wy>$u@p ?4F{GpWk&<*#M zsu=qIRNCV0FQx5BH~g(E#PET#aI72tQPyGjP^mo54Ud!$F?_6ig5eY8lNoNvQ!Zin zRQVmlXG+zXZg{So!|;W2Zk`)nD!*e0u~p~0L5LlNp%}Yju^WP7-}>AQ!Ld^?42hkx z$qk{t*mZa-5bMX#6?+83u-J&rZYUTVw#5zMu|+VHVryb3$JYGD4TWMGVHgox^IJDW z#@4~GaBLmF8=_(-Vd##XwA~HSvF) QDNk(hB>G>9!r_Ap z6uqXUN5$e*60cHt#o_guKRv4SquK8j=mr{e!+$8z4MX}@%_h(sT7n4%-rL|`EukGg zYY6>dBn*T;c<+Y)t*c((g}(UzfiN8K9M|27k`efuT*>eO?wYNOljAD*w|r50Xq6~@ zLo{V~@7>ovZ??0@*AvT4J`_H!#<9}=8pp~!7#UsX?RfO(<7tseFcJT@hOUqF6yX1H aEvsYG_*MQw&EoTd#5uM7uVu&&h5rLn257_p delta 18980 zcmb8133v_H|NqZS7B@9R 8w )s{*tf?8@XYL}`izFKNuexJ`dXL7H8zt8`9{(YW%=E-Z`XaAhf*+!=?&yuFY zZ^4|<(-WH?&YGvm(*|aJ_C|^1feGYw0{=} 9+bX%07)BO+@3#Lu9$7Z4mXeVw&rX#k z_~A1IexdLSgI_rOiowqXzX HcqLkR_QLMjd8s|!mHNs4zj0=QxfFwyZb*Gr__;J z6zc);bK*(()Vr}HR1Wc0D+2cbRDCLkgeJ`_Ny0 t#9 zk{vf*DPN{NQ?w$GllObbv}#Y;JKs(nulS_-{zK!HD5?7KqU4|P{G_*>0+4dg=Xbn^ zU2>vQR+8*06BSLWX*Zv!9GAM-+9YLsco&E^CeEHVy12(4wNXj3Pfbz|Nwe(FCM#Ry zO>g;oPf>bGQW<;4RAmRm@l8`|NL~CJrzuo|=S`ooQwIFS45gubp{IRghEgA&FJ&n8 z%UtLQNqeE1lVsP_C@565;@-)&H$zE*7^^dsM0o7WP&UE?(tFL`HB)gz&ZlN7H~FKh z9iOSZ3fc6`ROZR$R`-(A%8eR_eWc1BZ!Y{f>OJ_Ys<*p8>>cHUQ2Fa#_LBFM4Eby? zyTbd*U1^E!nXe>CRcv#<5)Y5Q^OZ*O7rpI|=R>Yb>~;&3VG^~!S)jz1YSjk{TRId9 zTOu^NR-|`{|BnUAS_ul0y-?{0kKYz5-Jqo9^OPp`tZbzfpr5jpTxphn@*>3!=ZZvs zgO8L_&@!kq?01(aRYCCYC5rX} G6VdLH^Kh-kW#+ozCl4L zo&`G|v-P l`8U`A@< >hbkGL|{gyL2dY4)s4gtW=ar2HuB&I>at@Tq$QaKMKbC zqCNVk@(CDi>0`=ciM?qSj(zHV(e80v=^Wm07 7+-BmKP#_D)Zh4LWsp=hP{^X_IB31p-gXi!g4#cyRN})0 zdU8_f_5X-5?v&C?el*N~;uLtd@|d#s#Bis;|4hEaFUow0*q44$UYBC+lrze^WwAcI zK|}sg jvmT~H><35$?1pA;Taqqvv-$t2;EkAg)*S1lT0n^%+=|EkNV zKRWU`J^M3A4@2+hNI&TR0=MR`b5#imD^ohHD9YrEe0YAFX1BSaG%Ec+Ug`diZYcjQ zo;V2Rq@?AMV3A$H+$J?I?cF)rAvixGnPrcApbVFvjJ7X7P_C82al@kw#wgxc``kmN zVyRDHm~h;g;Z(cSBc+0Tb)a46k@B)U(`y%hti(lmtBrAVI8r8g=h!*$-h*R u51{*kg;6J{{~ zvQRZv3V-Qsu!IKocVX&u`PAFC5w3m$?=FX{DUvk6AMH}zVc<4E+s!{yRnyT~g_l(A z@P!i~UKe|1N%dVoH6qos;W>!b_)C>iJyMx~?FxG-?%g`U)}z!om==0OsqsyipJao; z+k6xW_M2fbDWPHi!=J)Dg`PGJJZ<3_jA8GHQa$pq3HGTd)hH`Zbb2<-)2n)w(6TiW zLt|@H@OteOw`$3S6a8 vHMQ1rZCTX* zdYsyzTCJ&2cpU=Xo8i$zYeL`P-)tHTmnT=$NGPy_Q|%RT>Ra`L8{bI^d-sC~*1MwQ zuS|1L2upE>UAMg2Nvh|6x4ha)g6FXpRakv5@h4VPJ4;Gn-t(@vGb^c= $E{^`H-p>MnO`YDqe0J?bHCj%d&Y!3Fv&O6GMKRgT z=^Y0kDU6V6NwXoj=d=0Hu9c|9NPF2s4x7P~Y9yZh__OqfGyYk;?fgyRjsJSnKI5O- z_xyJg)&8>lQ-<9m39O{L{a%uqTXMimXgoIY;>0@IZc#-|j;)T6x%H4~y`W1*9fu;9 z0S8~*|6UdKS4o;`kEy0sm27)iHE EH-$+q+gvwVl?Tz)-YQ^qkf~mkC z7wW4CkYZQ^^`p3d6t$?}IL%o0_6DG&_N4}D6&XC2+7K+Voxf^B6_)>*_RU7nzSJMy zSe+IkFPUxkwA6<3mf8OAsrr#DKjc6P_2*b>PKealU%R A6|M7&9NK4u8xqe%(2(KuBJ4?4Z)~Y(0J`b zLQ=h-)s@n`H$fLbpCG#P99o9x;T(UNRP|;Eq%=FMlM25Q@GA+wNcfe4Uz9(rle<{^ zvg93^RO;N3l&)TqL_&EhwdmZcDLfNqC$4tGuQdG1z%LqpG5*BWo~6+vXD-0)Z5El_ zTPCaDl*nuPW=68f7E306c-K~cEHs-638?|3gPxSdW39hTNFyMf^{#>(05S>ozi;R> z1$iA}9Rp2Q{d$&NYn$hUk1ph~Yh01Zbr=WZ^uCN_dVbesk{wRS+xlouToum}QnDB! z U%^-r=Pt!**Qs5eRfRHvaAwGQ(*SPv$bI1}wI`o3}V477t7I~q&Lq;xA zd{F8@?S1;c7GZ%3$odI{V0)zNry0p6Hx3f=S_MKf^jnMsia1MmeSonz!6MGmwIFg2 zs*$PJXCzSQIeJSVkbgP}Ur7kob&kH2M=Pqw9DTJQPCe%6n|VS-^_ZhiT8!BTsxe1j z!$_bS@9I|=2^4ys{uGIwzQgk(taDfF@Ko|uwgc6`@?`6^f=GL?s%+g3A|=4`7U`>k zh;@pP5A 9|CqzyQ|jJp>sUM+7+}NKdHV zU(l9ob;b7)OFCkGSO^oX(-Q>w8VEM{I(<7Qu7tr7*#U<9seV+DrpFv|U6A%biZwt@ z<0ZUeWo8jlc{d@S>11huRD)`4(5EbAqpyIx3AN8XPRK^R Wk%6GuqE8p(0K}RI ykblo#<^ea{Lu`U<4P z8@#Ev>8?+N2znO{XPX|sGC N|va=O6X4f|L;c zdY`^UkUrZWa&+x%OIuwsjfgI2$2onA-CkORoNPOTis|=G!$>D_jq+ebKNXjPT z8}b4j((fPvO+@h!me66n)~B5G1PvyAMDHYsDacVhO^^g2IHerZmj;mr5bL=910$WY zNz7iJ& ^Re(gLQji+Ua-0T*;pKN&>OZ(jVbndOpxooO=I422G-P_Mflvn(KJ z+i1zZ>bf9jz;4h=uIMd&4CRyVttI9be$yui;>?i0=}Q<{Oco87$rVWGs$OjaCY?@V z=gTbCA39|ui-Z8dYW$(U#t1JEI-EcBo{aE{p>h4858l9r7Dsm>>FfH`AkkAGH}&^} zhzlmATl(@K;s$bCFR>8|#M8kRy03eJ$lx~!d7vi;k$8ypNN>E64J{t63ZSQY9uuXL z8=GZ FBqV|=f;3+) zk;ag61T75&CbkS$i?6tsj-c^eM1G&d-ADu-D+u-?y37cAD2Vjdkkt8{WyX5if}|DN zgOPNy>vM@9QK{<-u8G;ir~VRjCK4a?;x6#d=tN7<%}kU|zV66tR+0|hg3;2+qhI)B zQ<66QH B+KrI{m($eI zw2vT8cSO@FFun=Nx3};1jQ0&@uP;iuN4Y)6(rtN|@kJ^B86jV-AS9OV7sSz&qj@`@ z*Oa3N83~LFjsA07X!H`(WVxh%gwz9nsnOqk3 UV~04 z;F=TtxvkWs^B74dNCq7sq$Yi3H`7FX1O!*xwP`0ooUTcsJ$AD}7#Ia9bPyN0Lct7i z@TAZ*P6&FgC-af)0^))qBKZ|Y!OQem5P1xw4sE&zvX|1yt6xau)ntj(r}=w>VnGWv zq(_1HFrigotJr9-(5ry3_Bc^Cg7#=cd;f?eixhuXBJF@QrWY9Dn#Dkx(%$<5noof= zqZb(AnukEz(yjXgn#i6KNu|aCAU? CDs5Yev!s+hD>bGwlugJjLA$+3NzyF}hK7p}lXP zr-g5oc!4eu9bOuZ{{>SjkdUBz8$*`};<&f5^nxIc4;o9Gp5d_^A2gP3V`OKD ^<5-5FB|}hWBabAcAA@eL5nD9JxWr zd^%GQXLM%KL&Jj*4#tI4yTCI;5e~g{AoGqpwGs3&NL2rpHraKr3^t4S+GZOI3 zHtl1-{*z~z@3){AEg )hJn6~u^ JEBpYc V&i8f{=gDi(7F_J@c!XI3N28jFJ!!+`GfZ%@jI9()&v)}!h&b$E{++KeCvP}N2 zEs>LS5h5V7fGmS1Iz_Ahhm*4TgiM9*_=PqR 0m~<>0u|H zqyIctJV*Hfp)YVGb)HUV(H4_gQV3ZC* MVAH< z)ZC$)8ObKUjF8DeAopnbKY1%wg`G5Rw;$2^j4UR;nsNxa4tv(eR2L|sszeT!LDD9O zbb=$XC$xu1sIrLlj80;NH#PdKXEciu?zhiF_QY7l2w&tP2{kJHg$2qan|;uXzX5U? zbsYrc2_vryg6-kzBas)3K0%~BBa;Og37RTE6yv=hQiqXMjAWAu=`v{oq=XT1n`a+U z)yEgdQAP|y=|!i^ZleMt*{=Su{Tcw#${0zEWVu#QNsyXC)8KPika~;+Os|a5hHFUN z35g72>5SzXS6DmQ#|{mnjVS`X2>pu7%xGhlAW35P7h}992nB+g7-O*@OIz|StH)R- z$WZveZ7gKwG1ds;12Tz`O@e&kl87%IP+7w-P#&P!jN~~9!SwMykXU1nAQ{lqc+web z9AYFeXU7`JclhY2e@rIpSu9JC2Tx>j6RfJ7(I$w5`M|8=jPC_nT@fY)h!$@g3?knE zsbHKI#4*oG#(hDY!I@x8|C?vO05 Km!|cxG?)lS!v~uz51BGLl6Gfb)*) zE0I@>J@>iB3z|eAjSSBNBw1vrAg>x-8R2G*p3z5*-V6msFg1oV5*WdTQNT4tGhS2U zo*>`e<;$t2M(9J#EED!lAtV{HZ)#NHgcOHrq%cxj5aJM@K?TA-YrsUQf_UH{6kSS- z{~DYvjbe{5vjW$$t33PGMoC5j3y{`Ec}B7cT2*^UxwX-Qkqpue2-d!h;TtRv9y;{^ zQ5)j{Bblxj;ED~0P+LQJjG1M)5=!&4qP9jaK~y(C-)?JUGLlYiE#r%ew#IfwGKnHK z>1~alMJzG^@_{92TjRcup}-{6*68|#)l71(cV0KX;w0k9e|TNn8+nXmy83P73AK0H zBf@Eq_J;P9r4z9frY;<=?Twb46y3_SH{N_|m-xl=zHgS$PCm@fl{y#>nF|EZrvl_7 zq3KwpSuZpljYTY-OmYAg0%M>tI~kjU$P^%*jl3X|38ag0wj0l0!f1Fn|E6(^k#tfU zcGO6E7;T ElsgFJmwx1(I{f-`mJ%B%SON?y#>BVUIflyI2oVS!8GR+s{a3 zq(DM~w<`UNu7Vtd;r#7!Li!uS8Ob1TKp`$cNrxC$g{Bo~_JStO=r8e TImBz!!vYc{ahg&qz9HFQQE{X33aPfs_lr1GArM #!YR%)>&oD}dpeCKH z|Bp_c>1s_mVK4fwO2`VR-Bj=iq?7aX5d0 z%Sl`+t~PQ6ah8E=jISBtTfy^?>RRIrBN?PX^u#(Np%|u 0WA6i#)fQuqh;a D!3WRYiSus$6LmpjHbm;J?gPer(*JboTpBQ}Cny2w}lV8q%rFL)}s z%kvk^gz;8tr;%h2xZtVVx`lY*7~@`}ry!0o{%A}V#4){}j4VMMi#cR$jIawYc xO_Xr-G*0wa7f*f z-*_d6;0E!Qk!purf(m-siz^W?UjR#PLC76rncWax)L+A6kcM^m8Sfoq8zb2StAjmy z$54v%K1M6W{`=c_!_J1tzP{{52B`|&v<|x9t}&DowpK%5aMzg4NZ?-fp0P*}XN!2x zSRshBjl5@U6l6O%Fm#dkjBSEAH<|a0P@lrP)7jeHGujB^Z0#U3K^*^i-&i4t<3H~k zn*?$E=L2J#AddfhVC?6l=tSb7k)--C`@qKbp#dKU0x2lkp*}M93xeYhw~>zwPYJGZ zM&whYw;;}j@R_kr5XZ)z8Cppm%dxRgb8JZ!R!ESUvug}9^MuIRG!`>mkvy8SX>^&X zK?KKraWh8{XWT311wkD1Rn1PNcsh=siZa&$vA-zvr1-Y5cNyeYn2XTn+-ANYsj#fV zbG6cDQWVC|AcZiqmxU>|jM+>O13s^*0;H^&D#$rFxWHKD%q@Z(hQp1QL8F<+1PKL# z>6AC`_ypPs37LQ@nx);CS>UKP!7MDziF0j{VBQhLIfhL%50!adlW1NL#L>KD7Dhj> zdCB}Mni&Cn;BgsNLof^~n;|hM$|mWsYT~4fAhkbmG)aOaLxBud ?;ao1%Hji^sbf#R} zgfAE&R=(t1Z#tSQjNpPS#cWs(HT-xP@7z+%c0j-g3#6`_`0^{o>?=fQ%*_s?C{vKf z^}v_N5|A80+PmN^p$2L`6J$z#_(EqGlHGzd0&<_lDiq{x@l8aE*-C=~!7YLGH=N^* z&%tQZ5dqm)9d7$!9hYL>5u_H7A@FrWia9WjYtCK*2g#D2EJ&?0@V+Z*76=kOM {8757m@hV$*~NXoxrD<^WqVulb@kx*hF>BbrpEDGoUGigzB1+6*+Mn zKs_@#h@g|GZ*CRjGHhum9QM3oHmHQL@});*`Kqsxxu20)KGJgwbZOPC!v$q21VQ z&q%;z8k>EC2wKdmW?B$Ii=pN TT;9oO41(79SF>TBtL8NaMto)xNKSTEI%tb*OTyno|78VgWrr1}CkW{ly z 11xHf|{9RG;}Lw*4g}xk-*IVhIyM2 z)~!Ca5qrb@=k DF%3ovitf?7nrVWdF`~hCHMa&4ykr4QHCAZi+^BRn z_XvX5E w`!=Aj{0;6f6)wGVB0kwOQe1HVFpSc)4c%ms!iY zoHbsq*;Wu|jhAb7=A>w2oNM+L8fT4{Yvv2$Eb(&9hIM$#&Jr)z>{*Aegd(EP!A&TX zXuUa>iPFh(AZUB*&3QZ;aTZzY&4juvA>yoi)|-a}aTaSE%sKUVUAx0R6Fu{0^9~~g z#95ksX|AfzCqcGg#;xa8Q)$4Hc9vaVn_C!3Cv{=R$i7W8r#IvpXOXqTZ1V~y&LS({ z+#-mx#M@=gX(Un}%I^hso8=n=!K-q|$L=u=L@@B3ub1|iX@WS@`yO-ft308ijg9$^ zAkNn0M{}_t&X(k$xss7|^1)V_wZ{>&kP(;!^8`9>cGWTIbn=#mZz)ci@stxE{L4A) zj+16BLBio98&0|kvTQ7jGw8&V=5j%9gXRt_g3g$|4W7=5YoLK~f6g4wi9!%X!w@}h zX4|9x<5}VRn7!fSZ!M&E&-{gvEb?}u%(gKP%s&~q5;5i__ iov zl8Jc+c1{n?2tm$(1IN9|L$eeki%G&|*s4Na56z}_)-6w6d217U&n>tazR<+Je#=t_ z{w-LAKVjdSYB&4SQ&(DKPlmtbGfnN~f5JX5!QP242iw0PUEj=B{(?`uZ#BdG1J1vl z71 @uNSt3MTtUN*5h|IcL2U^=Xw>=emoMdmZNw1qc zc2BG2YnVkgdF^X{?ApspXv0ZU5xck5z8xpdr;L59!Hg^>#l ( JW?1+Y8?B#-tgGOouB*U7}gO#hO z#b;St7~w+}m!`9 sAoKx_)4#^?tr$Io7J);$Xn3S&ns* ziFjtX!q2hpi)c ~B zpj%g1dw}4cu;>%CmDWin5(E-jWySa7nK@sVt+whivY6oK-22 _Rp>Eur!UqWVUt<8+^itPgOskOB~#KO-v-?+%9{#@%iA|S(nYyeTN)p7tQr{K`5 z RViFLXe*9LL?Rx-IfMKtMhc9&~#t6*g zTdnDgWV3HFDi4>)R_kL%_|?u)Xxr`9T1L`c-Qcok0i?R!+AK6ppx~(a&e|$8oq?d{ zJL`L)86-42ti3)VN*AIX))67Xe<*_q ?Gl}S}-<$UY$Fk5-#>FNs|&N5|L%!SxLS}!t^PX<626CnGn6hUktm%&u_TdxVS zB7~CzR)0paNkWcHZbPht)|3&LGI-eQ5(yh2k;B#*MzYBoxG}E* #-pH;5vK=kh4~gQ9RZ|ApZh#!P+LsRv`O;T()BES08&Sl}<@R zDfnF2jbhoaSe?`Cv5#RE?jzo;fb*&FkrMgMa)=F!F(g-uhzraZ$?w(>5o S$iJ6j8Q6tt3Vk z6Z1PhasFjB@}g!j=?0`Rq<-6KF34y>?pmD~$s#kMrQZh41MAc{j1^cOJ+WM~OFi|# zuPppx;aARI>Zw*Y%GY2?6j`cGfN+^sacLC!SgQfya%~`lE3|JQ{6v$NMUj qR0 uz#R>!0c-=d~ONFKEr%yU9hZO$Rr* zq;-ezvgU)ZP|JnzSM4^0SF~Xr-Q+jT58+kq8HB%Ul{>k~HEk4xe`xc&yUBHJ{xCPW zq3wk5rq*PvoBT%`1mP`hJcPbKwU6NOm-f*(H@U4{hVYJdd7_*At=)$3t~PFxo7~g3 zLwH}i2;l?m;=6A0P^&W6O&)1AA$+WjhwzD3X`Y)r)haD=lV@5@2ua*{2&K3k5Xx~k zmbytu+^l785*l{^!mzjl8{H(_7k3*T#p0ep=!%Qk O|>aeLHucb$v9qg(Vb#u0Hq@v$AQt8gy?&OvUq?7nxHDS^t2f~gfyHwc_ h`2RQAgIXo5{c4>WDfvsZPIwq1Pp{`s-y3;X`aje6-QNHJ diff --git a/JNFrame2/Assets/HotMain/HotMain.cs b/JNFrame2/Assets/HotMain/HotMain.cs new file mode 100644 index 00000000..971b3894 --- /dev/null +++ b/JNFrame2/Assets/HotMain/HotMain.cs @@ -0,0 +1,13 @@ +using System.Numerics; +using UnityEngine; + +namespace HotMain +{ + public class HotMain : MonoBehaviour + { + private void Awake() + { + Matrix3x2 matrix3X2 = new Matrix3x2(); + } + } +} \ No newline at end of file diff --git a/JNFrame2/Assets/HotMain/HotMain.cs.meta b/JNFrame2/Assets/HotMain/HotMain.cs.meta new file mode 100644 index 00000000..2e2386c1 --- /dev/null +++ b/JNFrame2/Assets/HotMain/HotMain.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 18461ba6893b4a8ca33cb88bbfac8765 +timeCreated: 1729095624 \ No newline at end of file diff --git a/JNFrame2/Assets/HotMain/HotMain.unity b/JNFrame2/Assets/HotMain/HotMain.unity index 1967e95a..8da01fe8 100644 --- a/JNFrame2/Assets/HotMain/HotMain.unity +++ b/JNFrame2/Assets/HotMain/HotMain.unity @@ -147,6 +147,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 67180524} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -155,7 +156,6 @@ Transform: - {fileID: 1371077986} - {fileID: 296179531} m_Father: {fileID: 0} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &67180526 MonoBehaviour: @@ -193,13 +193,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 296179530} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 67180525} - m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &296179532 MonoBehaviour: @@ -237,13 +237,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1371077985} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 67180525} - m_RootOrder: -2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1371077987 MonoBehaviour: @@ -354,13 +354,57 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1460349557} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 6.8842363, y: -5, z: 0} + m_LocalPosition: {x: 7.316754, y: -5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1739013435 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1739013437} + - component: {fileID: 1739013436} + m_Layer: 0 + m_Name: HotMain + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1739013436 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1739013435} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 18461ba6893b4a8ca33cb88bbfac8765, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1739013437 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1739013435} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1994723394 GameObject: @@ -406,11 +450,19 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1994723394} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1460349560} + - {fileID: 67180525} + - {fileID: 1994723396} + - {fileID: 1739013437} diff --git a/JNFrame2/Assets/HotMain/SHGame/Procedure/ProcedureInitPackage.cs b/JNFrame2/Assets/HotMain/SHGame/Procedure/ProcedureInitPackage.cs index 85ed8c08..02e3f346 100644 --- a/JNFrame2/Assets/HotMain/SHGame/Procedure/ProcedureInitPackage.cs +++ b/JNFrame2/Assets/HotMain/SHGame/Procedure/ProcedureInitPackage.cs @@ -25,8 +25,7 @@ namespace HotMain.SHGame.Procedure public static readonly string[] HotDllName = { "HotSamples.dll", - "GameLauncher.dll", - "GameScripts.dll", + // "GameScripts.dll", }; public static readonly string[] AotMetaAssemblyFiles = diff --git a/JNFrame2/Assets/HotResources/ResLauncher/HotLauncher.prefab b/JNFrame2/Assets/HotResources/ResLauncher/HotLauncher.prefab index f7b7d8cd..b3e62fe0 100644 --- a/JNFrame2/Assets/HotResources/ResLauncher/HotLauncher.prefab +++ b/JNFrame2/Assets/HotResources/ResLauncher/HotLauncher.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6431846330035490337} - - component: {fileID: 3619268780635689341} + - component: {fileID: -1515069072980619319} m_Layer: 0 m_Name: HotLauncher m_TagString: Untagged @@ -32,7 +32,7 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3619268780635689341 +--- !u!114 &-1515069072980619319 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/JNFrame2/Assets/HotResources/ResResource/HotGameMain.prefab b/JNFrame2/Assets/HotResources/ResResource/HotGameMain.prefab index cce31597..c3792e32 100644 --- a/JNFrame2/Assets/HotResources/ResResource/HotGameMain.prefab +++ b/JNFrame2/Assets/HotResources/ResResource/HotGameMain.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2646845557578810839} - - component: {fileID: 3370151640881118991} + - component: {fileID: 5586394961982563370} m_Layer: 0 m_Name: HotGameMain m_TagString: Untagged @@ -24,15 +24,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4950134704075743259} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &3370151640881118991 +--- !u!114 &5586394961982563370 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/JNFrame2/Assets/HotScripts/GameLauncher/HotLauncherMain.cs b/JNFrame2/Assets/HotScripts/GameLauncher/HotLauncherMain.cs index 2e7ff419..b8fe37af 100644 --- a/JNFrame2/Assets/HotScripts/GameLauncher/HotLauncherMain.cs +++ b/JNFrame2/Assets/HotScripts/GameLauncher/HotLauncherMain.cs @@ -1,21 +1,23 @@ using Cysharp.Threading.Tasks; -using HotScripts.GameLauncher.FGui.Scripts; using HotScripts.GameLauncher.FGui.Scripts.Launcher; using Launcher; using SHFrame; using UnityEngine; -public class HotLauncherMain : MonoBehaviour +namespace HotScripts.GameLauncher { - private void Start() + public class HotLauncherMain : MonoBehaviour { - //打开下载页 - RunLauncher().Forget(); - } + private void Start() + { + //打开下载页 + RunLauncher().Forget(); + } - private async UniTask RunLauncher() - { - LauncherBinder.BindAll(); - await SHFrameModule.UI.Open ("Launcher", "Launcher"); + private async UniTask RunLauncher() + { + LauncherBinder.BindAll(); + await SHFrameModule.UI.Open ("Launcher", "Launcher"); + } } } diff --git a/JNFrame2/Assets/HotScripts/GameScripts/App.cs b/JNFrame2/Assets/HotScripts/GameScripts/App.cs index 99ccbdab..770628a4 100644 --- a/JNFrame2/Assets/HotScripts/GameScripts/App.cs +++ b/JNFrame2/Assets/HotScripts/GameScripts/App.cs @@ -1,8 +1,7 @@ using HotScripts.GameScripts.FGui; using HotScripts.GameScripts.Luban; -using Plugins.JNGame.System; -using SHFrame; -using EventDispatcher = Plugins.JNGame.Util.EventDispatcher; +using JNGame.Runtime.System; +using JNGame.Util; namespace HotScripts.GameScripts { @@ -10,7 +9,7 @@ namespace HotScripts.GameScripts { //Launcher 事件 - public static SHFrame.EventDispatcher EventLauncher => EventUtil.Dispatcher; + public static SHFrame.EventDispatcher EventLauncher => SHFrame.EventUtil.Dispatcher; //App 事件 public static EventDispatcher Event = new EventDispatcher(); diff --git a/JNFrame2/Assets/HotScripts/GameScripts/FGui/FGuiManager.cs b/JNFrame2/Assets/HotScripts/GameScripts/FGui/FGuiManager.cs index cf446976..bfa153e6 100644 --- a/JNFrame2/Assets/HotScripts/GameScripts/FGui/FGuiManager.cs +++ b/JNFrame2/Assets/HotScripts/GameScripts/FGui/FGuiManager.cs @@ -3,9 +3,9 @@ using System.Threading.Tasks; using Common; using Cysharp.Threading.Tasks; using FairyGUI; -using HotScripts.GameLauncher; +// using HotScripts.GameLauncher; +using JNGame.Runtime.System; using MainUI; -using Plugins.JNGame.System; using SHFrame; namespace HotScripts.GameScripts.FGui @@ -50,7 +50,7 @@ namespace HotScripts.GameScripts.FGui { await UniTask.DelayFrame(1); Log.Debug($"UI 初始化中"); - App.EventLauncher.DispatchEvent(HotLauncherEvent.InitSystem,$"UI 初始化中"); + // App.EventLauncher.DispatchEvent(HotLauncherEvent.InitSystem,$"UI 初始化中"); BindAll(); BindUI(); diff --git a/JNFrame2/Assets/HotScripts/GameScripts/FGui/Scripts/Common.meta b/JNFrame2/Assets/HotScripts/GameScripts/FGui/Scripts/Common.meta deleted file mode 100644 index 32b53e15..00000000 --- a/JNFrame2/Assets/HotScripts/GameScripts/FGui/Scripts/Common.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 5170e578d823499481b4ab2083ea1e16 -timeCreated: 1729070950 \ No newline at end of file diff --git a/JNFrame2/Assets/HotScripts/GameScripts/HotGameMain.cs b/JNFrame2/Assets/HotScripts/GameScripts/HotGameMain.cs index 5d442363..25df4d8e 100644 --- a/JNFrame2/Assets/HotScripts/GameScripts/HotGameMain.cs +++ b/JNFrame2/Assets/HotScripts/GameScripts/HotGameMain.cs @@ -1,7 +1,8 @@ using System; -using HotScripts.GameLauncher; +// using HotScripts.GameLauncher; using HotScripts.GameScripts.FGui; using HotScripts.GameScripts.FGui.Scripts; +using JNGame.Runtime; using JNGame; using SHFrame; using UnityEngine; @@ -19,8 +20,8 @@ namespace HotScripts.GameScripts //初始化系统 await JNetGame.Instance.Init(App.AllSystem()); - //初始化成功 - App.EventLauncher.DispatchEvent(HotLauncherEvent.InitSuccess); + // //初始化成功 + // App.EventLauncher.DispatchEvent(HotLauncherEvent.InitSuccess); } @@ -32,12 +33,12 @@ namespace HotScripts.GameScripts private void AddListener() { - App.EventLauncher.AddListener(HotLauncherEvent.GoGameMain,OnGoGameMain); + // App.EventLauncher.AddListener(HotLauncherEvent.GoGameMain,OnGoGameMain); } private void RemoveListener() { - App.EventLauncher.RemoveListener(HotLauncherEvent.GoGameMain,OnGoGameMain); + // App.EventLauncher.RemoveListener(HotLauncherEvent.GoGameMain,OnGoGameMain); } private async void OnGoGameMain(EventArgs eventargs) diff --git a/JNFrame2/Assets/HotScripts/GameScripts/Luban/LubanManager.cs b/JNFrame2/Assets/HotScripts/GameScripts/Luban/LubanManager.cs index 0057080c..fba1d97d 100644 --- a/JNFrame2/Assets/HotScripts/GameScripts/Luban/LubanManager.cs +++ b/JNFrame2/Assets/HotScripts/GameScripts/Luban/LubanManager.cs @@ -1,9 +1,9 @@ using System.Threading.Tasks; using Cysharp.Threading.Tasks; using GameConfig; -using HotScripts.GameLauncher; +// using HotScripts.GameLauncher; +using JNGame.Runtime.System; using Luban; -using Plugins.JNGame.System; using SHFrame; using UnityEngine; using YooAsset; @@ -21,7 +21,7 @@ namespace HotScripts.GameScripts.Luban { await UniTask.DelayFrame(1); Log.Debug($"配置文件 初始化中"); - App.EventLauncher.DispatchEvent(HotLauncherEvent.InitSystem,$"配置文件 初始化中"); + // App.EventLauncher.DispatchEvent(HotLauncherEvent.InitSystem,$"配置文件 初始化中"); _tables = new Tables(LoadByteBuf); Log.Debug($"配置文件 初始化完成 {Tables.TbGMap.DataList[0].MapName}"); } diff --git a/JNFrame2/Assets/HotScripts/JNGame/Editor/2DPathFinding/MapConfigExporter.cs b/JNFrame2/Assets/HotScripts/JNGame/Editor/2DPathFinding/MapConfigExporter.cs index d3002075..f1e0d339 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Editor/2DPathFinding/MapConfigExporter.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Editor/2DPathFinding/MapConfigExporter.cs @@ -2,6 +2,7 @@ using System.IO; using System.Collections.Generic; using System.Linq; +using JNGame.Runtime.Util; using JNGame.Map; using Unity.AI.Navigation; using UnityEngine; diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Entitas/JNLookup.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Entitas/JNLookup.cs index b8e5ea72..2b12d8ab 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Entitas/JNLookup.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Entitas/JNLookup.cs @@ -1,5 +1,5 @@ using System; -using JNGame.Util.Types; +using JNGame.Runtime.Util.Types; namespace JNGame.Runtime.Entitas { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/JNetGame.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/JNetGame.cs index 1934e785..2cf5784f 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/JNetGame.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/JNetGame.cs @@ -1,9 +1,8 @@ -using System; -using Cysharp.Threading.Tasks; -using JNGame.Util; -using Plugins.JNGame.System; +using Cysharp.Threading.Tasks; +using JNGame.Runtime.System; +using JNGame.Runtime.Util; -namespace JNGame +namespace JNGame.Runtime { public class JNetGame : SingletonScene { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Map/2DPathFinding/NavMesh/NavMesh/TriangleGraph.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Map/2DPathFinding/NavMesh/NavMesh/TriangleGraph.cs index 2f42aa95..6b7f5e1e 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Map/2DPathFinding/NavMesh/NavMesh/TriangleGraph.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Map/2DPathFinding/NavMesh/NavMesh/TriangleGraph.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using JNGame.Math; -using Profiler = JNGame.Util.Profiler; +using Profiler = JNGame.Runtime.Util.Profiler; namespace JNGame.PathFinding { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Map/2DPathFinding/NavMesh/NavMesh/TriangleNavMesh.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Map/2DPathFinding/NavMesh/NavMesh/TriangleNavMesh.cs index fb0f166d..ebb1ae48 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Map/2DPathFinding/NavMesh/NavMesh/TriangleNavMesh.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Map/2DPathFinding/NavMesh/NavMesh/TriangleNavMesh.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using JNGame.Runtime.Util; using JNGame.Math; using JNGame.Util; diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Map/DotRecast/DotRecastRoot.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Map/DotRecast/DotRecastRoot.cs index 658991df..99c2deb4 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Map/DotRecast/DotRecastRoot.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Map/DotRecast/DotRecastRoot.cs @@ -7,8 +7,6 @@ using DotRecast.Recast.Toolset; using DotRecast.Recast.Toolset.Builder; using JNGame.Map.DotRecast.Util; using JNGame.Math; -using Newtonsoft.Json; -using UnityEngine; namespace JNGame.Map.DotRecast { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Map/DotRecast/Src/DotRecast.Core/RcAtomicInteger.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Map/DotRecast/Src/DotRecast.Core/RcAtomicInteger.cs index 2f7adb77..4a8238ca 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Map/DotRecast/Src/DotRecast.Core/RcAtomicInteger.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Map/DotRecast/Src/DotRecast.Core/RcAtomicInteger.cs @@ -3,7 +3,7 @@ //线程库类 虽然不会影响帧同步 但是显示的使用线程库 这里给它改正常 //Interlocked.Increment -using JNGame.Util.NoThread; +using JNGame.Runtime.Util.NoThread; namespace DotRecast.Core { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Map/DotRecast/Src/DotRecast.Core/RcAtomicLong.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Map/DotRecast/Src/DotRecast.Core/RcAtomicLong.cs index 6796e13a..ee492607 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Map/DotRecast/Src/DotRecast.Core/RcAtomicLong.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Map/DotRecast/Src/DotRecast.Core/RcAtomicLong.cs @@ -1,5 +1,5 @@ using System; -using JNGame.Util.NoThread; +using JNGame.Runtime.Util.NoThread; namespace DotRecast.Core { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/Action/NActionEnum.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/Action/NActionEnum.cs index 0d483c21..bb4ee7df 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/Action/NActionEnum.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/Action/NActionEnum.cs @@ -1,4 +1,4 @@ -namespace Plugins.JNGame.Network.Action +namespace JNGame.Network.Action { public enum NActionEnum : int { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/Entity/JNetParam.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/Entity/JNetParam.cs index 25ea4332..2a112485 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/Entity/JNetParam.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/Entity/JNetParam.cs @@ -1,7 +1,7 @@ using System; using Google.Protobuf; -namespace Plugins.JNGame.Network.Entity +namespace JNGame.Network.Entity { public class JNetParam { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/Group/JNClientGroup.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/Group/JNClientGroup.cs index 542bdaeb..98a97229 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/Group/JNClientGroup.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/Group/JNClientGroup.cs @@ -3,12 +3,10 @@ using System.Collections.Generic; using System.Threading.Tasks; using Cysharp.Threading.Tasks; using Google.Protobuf; -using Plugins.JNGame.Network.Entity; -using Plugins.JNGame.Network.Util; -using Plugins.JNGame.System; -using Plugins.JNGame.Util; +using JNGame.Runtime.System; +using JNGame.Util; -namespace Plugins.JNGame.Network.Group +namespace JNGame.Network.Group { public class JNClientGroup : SystemBase where T : JNClientBase { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/JNClientBase.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/JNClientBase.cs index 186dc484..6974def4 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/JNClientBase.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/JNClientBase.cs @@ -4,12 +4,12 @@ using System.Threading.Tasks; using Cysharp.Threading.Tasks; using DotRecast.Core.Collections; using Google.Protobuf; -using Plugins.JNGame.Network.Entity; -using Plugins.JNGame.Network.Util; -using Plugins.JNGame.System; -using Plugins.JNGame.Util; +using JNGame.Network.Entity; +using JNGame.Network.Util; +using JNGame.Runtime.System; +using JNGame.Util; -namespace Plugins.JNGame.Network +namespace JNGame.Network { /// /// 基础客户端网络类 diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/JNServerBase.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/JNServerBase.cs index 59f1642c..ae5e7995 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/JNServerBase.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/JNServerBase.cs @@ -1,15 +1,10 @@ using System; using System.Collections.Generic; -using System.Net.Sockets; -using System.Reflection; using DotRecast.Core.Collections; -using Google.Protobuf; -using Plugins.JNGame.Network.Entity; -using Plugins.JNGame.Network.Util; -using Plugins.JNGame.System; -using Plugins.JNGame.Util; +using JNGame.Runtime.System; +using JNGame.Util; -namespace Plugins.JNGame.Network +namespace JNGame.Network { public class JNServerParam diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/JNSocket.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/JNSocket.cs index c4de8b9b..9c7677db 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/JNSocket.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/JNSocket.cs @@ -1,12 +1,12 @@ using System.Threading.Tasks; using Cysharp.Threading.Tasks; -using Plugins.JNGame.Network.Util; +using JNGame.Network.Util; using TouchSocket.Core; using TouchSocket.Http.WebSockets; using TouchSocket.Sockets; using UnityEngine; -namespace Plugins.JNGame.Network +namespace JNGame.Network { public abstract class JNSocket : JNClientBase { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/JNTCPClient.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/JNTCPClient.cs index f86c9b43..1b50e1da 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/JNTCPClient.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/JNTCPClient.cs @@ -1,11 +1,9 @@ using System; -using System.Net; using System.Threading.Tasks; using Cysharp.Threading.Tasks; -using Plugins.JNGame.Network; -using Plugins.JNGame.Network.Action; -using Plugins.JNGame.Network.Entity; -using Plugins.JNGame.Network.Util; +using JNGame.Network.Action; +using JNGame.Network.Entity; +using JNGame.Network.Util; using TouchSocket.Core; using TouchSocket.Sockets; using UnityEngine; diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/JNTCPServer.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/JNTCPServer.cs index 69e6efeb..c4e83f75 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/JNTCPServer.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/JNTCPServer.cs @@ -1,15 +1,12 @@ using System; -using System.Net; -using System.Net.Sockets; using System.Threading.Tasks; using Cysharp.Threading.Tasks; using DotRecast.Core.Collections; using Google.Protobuf; -using Plugins.JNGame.Network; -using Plugins.JNGame.Network.Action; -using Plugins.JNGame.Network.Entity; -using Plugins.JNGame.Network.Util; +using JNGame.Network.Action; +using JNGame.Network.Entity; +using JNGame.Network.Util; using TouchSocket.Core; using TouchSocket.Sockets; using UnityEngine; diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/Util/NDataUtil.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/Util/NDataUtil.cs index eab7a235..ef33354b 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/Util/NDataUtil.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Network/Util/NDataUtil.cs @@ -1,11 +1,10 @@ using System; using System.Linq; -using System.Reflection; using Google.Protobuf; -using Plugins.JNGame.Network.Entity; -using Plugins.JNGame.Util; +using JNGame.Network.Entity; +using JNGame.Runtime.Util; -namespace Plugins.JNGame.Network.Util +namespace JNGame.Network.Util { // 网络数据工具类 [请求Id*4,处理Id*4,...参数数据*N] public static class NDataUtil diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/App/Frame/JNSyncFrameService.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/App/Frame/JNSyncFrameService.cs index 1095b962..c58c90ae 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/App/Frame/JNSyncFrameService.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/App/Frame/JNSyncFrameService.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using Cysharp.Threading.Tasks; +using JNGame.Runtime.Sync; using JNGame.Sync.Frame.Service; using JNGame.Sync.System.View; using UnityEngine; diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/App/State/JNSStateClientService.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/App/State/JNSStateClientService.cs index 7a1b792b..f521cd28 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/App/State/JNSStateClientService.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/App/State/JNSStateClientService.cs @@ -1,4 +1,5 @@ -using JNGame.Sync.Entity; +using JNGame.Runtime.Sync; +using JNGame.Sync.Entity; using JNGame.Sync.Frame; using UnityEngine; diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/App/State/JNSStateServerService.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/App/State/JNSStateServerService.cs index aa02acca..11ca0a20 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/App/State/JNSStateServerService.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/App/State/JNSStateServerService.cs @@ -1,4 +1,5 @@ using System; +using JNGame.Runtime.Sync; using JNGame.Sync.Frame; using UnityEngine; diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/Debuger/JNTileServerDebuger.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/Debuger/JNTileServerDebuger.cs index 9936e788..844ae594 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/Debuger/JNTileServerDebuger.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/Debuger/JNTileServerDebuger.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using DotRecast.Core.Collections; using JNGame.Math; +using JNGame.Runtime.Util; using JNGame.Sync.State.Tile; using UnityEngine; diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/Entity/Component/JNEntityLookup.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/Entity/Component/JNEntityLookup.cs index 156b0584..614ccdf4 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/Entity/Component/JNEntityLookup.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/Entity/Component/JNEntityLookup.cs @@ -1,8 +1,8 @@ using JNGame.Runtime.Entitas; using JNGame.Sync.Frame.Entity.Component.Components; -using JNGame.Util.Types; using System; using Entitas; +using JNGame.Runtime.Util.Types; namespace JNGame.Sync.Frame.Entity.Components { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/Entity/JNContext.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/Entity/JNContext.cs index e7639fae..9caee2fa 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/Entity/JNContext.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/Entity/JNContext.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using DotRecast.Core.Collections; using Entitas; +using JNGame.Runtime.Sync; using JNGame.Sync.Entity; using JNGame.Sync.Frame.Entity.Component.Components; using JNGame.Sync.Frame.Entity.Components; diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/Entity/JNContexts.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/Entity/JNContexts.cs index b429e770..125f9cc0 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/Entity/JNContexts.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/Entity/JNContexts.cs @@ -1,5 +1,6 @@ using System; using Entitas; +using JNGame.Runtime.Sync; using JNGame.Sync.Frame.Entity; namespace JNGame.Sync.Entity diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/JNBaseSystem.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/JNBaseSystem.cs index ac2b2df0..6294c27b 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/JNBaseSystem.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/JNBaseSystem.cs @@ -1,6 +1,6 @@ using Entitas; -namespace JNGame.Sync +namespace JNGame.Runtime.Sync { public abstract class JNBaseSystem : ISystem { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/JNSyncDefaultService.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/JNSyncDefaultService.cs index 2c112142..94d9182f 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/JNSyncDefaultService.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/JNSyncDefaultService.cs @@ -1,18 +1,14 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Threading; -using System.Threading.Tasks; using Entitas; +using JNGame.Runtime.Util; using JNGame.Sync.Entity; -using JNGame.Sync.Frame.Entity; using JNGame.Sync.Frame.Service; using JNGame.Sync.System; -using JNGame.Sync.System.View; -using JNGame.Util; using UnityEngine; -namespace JNGame.Sync.Frame +namespace JNGame.Runtime.Sync { public abstract class JNSyncDefaultService : JNSyncService { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/JNSyncService.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/JNSyncService.cs index 47a000df..61d8d3ff 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/JNSyncService.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/JNSyncService.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace JNGame.Sync +namespace JNGame.Runtime.Sync { public abstract class JNSyncService : Feature { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/Data/SStateDataSystem.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/Data/SStateDataSystem.cs index 3853aa96..a3a2a0c8 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/Data/SStateDataSystem.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/Data/SStateDataSystem.cs @@ -1,5 +1,4 @@ -using System.Collections.Concurrent; -using System.Collections.Generic; +using System.Collections.Generic; using DotRecast.Core.Collections; using UnityEngine; using NotImplementedException = System.NotImplementedException; diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/Data/STileDataSystem.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/Data/STileDataSystem.cs index d1f0fcec..c79488e0 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/Data/STileDataSystem.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/Data/STileDataSystem.cs @@ -5,7 +5,6 @@ using DotRecast.Core.Collections; using JNGame.Math; using JNGame.Sync.State.Tile; using JNGame.Sync.State.Tile.Entity; -using NotImplementedException = System.NotImplementedException; namespace JNGame.Sync.System.Data { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/Logic/JNInputSystem.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/Logic/JNInputSystem.cs index ce99877e..a0e94317 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/Logic/JNInputSystem.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/Logic/JNInputSystem.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using Google.Protobuf; -using JNGame.Util.Types; +using JNGame.Runtime.Util.Types; using Newtonsoft.Json; namespace JNGame.Sync.System.View diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/Logic/JNRandomSystem.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/Logic/JNRandomSystem.cs index 23a33855..cf6ee225 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/Logic/JNRandomSystem.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/Logic/JNRandomSystem.cs @@ -1,7 +1,7 @@ using System; +using JNGame.Runtime.Util; using JNGame.Math; using JNGame.Sync.System; -using Plugins.JNGame.Util; namespace JNGame.Sync.Frame.Service { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/SBaseSystem.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/SBaseSystem.cs index a757b9f4..37309f3b 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/SBaseSystem.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/SBaseSystem.cs @@ -1,6 +1,5 @@ -using Entitas; +using JNGame.Runtime.Sync; using JNGame.Sync.Entity; -using NotImplementedException = System.NotImplementedException; namespace JNGame.Sync.System { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/SDataSystem.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/SDataSystem.cs index 479a1885..f40a8e10 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/SDataSystem.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/SDataSystem.cs @@ -1,7 +1,6 @@ using System.Collections.Concurrent; using System.Linq; using JNGame.Sync.Frame.Service; -using NotImplementedException = System.NotImplementedException; namespace JNGame.Sync.System { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/SLogicSystem.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/SLogicSystem.cs index 0ab2e8b1..fbc0ed5e 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/SLogicSystem.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/SLogicSystem.cs @@ -1,5 +1,4 @@ using JNGame.Sync.Frame.Service; -using NotImplementedException = System.NotImplementedException; namespace JNGame.Sync.System { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/SViewSystem.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/SViewSystem.cs index e22b3a9c..f94e0729 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/SViewSystem.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/System/SViewSystem.cs @@ -1,5 +1,4 @@ using Entitas; -using NotImplementedException = System.NotImplementedException; namespace JNGame.Sync.System { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/View/ViewData.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/View/ViewData.cs index 3aa162e5..7692c315 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/View/ViewData.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Sync/View/ViewData.cs @@ -1,7 +1,4 @@ -using System; -using System.Collections.Generic; -using JNGame.Sync.Entity; -using JNGame.Sync.Frame.Entity; +using System.Collections.Generic; using JNGame.Sync.System; using UnityEngine; diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/System/JNSystemLoad.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/System/JNSystemLoad.cs index 259e6947..5dad0c74 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/System/JNSystemLoad.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/System/JNSystemLoad.cs @@ -1,7 +1,7 @@ using Cysharp.Threading.Tasks; using Entitas; -namespace Plugins.JNGame.Runtime.System +namespace JNGame.Runtime.System { public class JNSystemLoad : ISystem { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/System/SystemBase.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/System/SystemBase.cs index a671b212..60c188ac 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/System/SystemBase.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/System/SystemBase.cs @@ -1,7 +1,6 @@ -using Cysharp.Threading.Tasks; using System.Threading.Tasks; -namespace Plugins.JNGame.System +namespace JNGame.Runtime.System { public abstract class SystemBase { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/EventDispatcher.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/EventDispatcher.cs index c39dbbbd..957affa5 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/EventDispatcher.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/EventDispatcher.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using JNGame.Util; +using JNGame.Runtime.Util; using UnityEngine; -namespace Plugins.JNGame.Util +namespace JNGame.Util { /// /// 静态事件分发器 diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/JAPI.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/JAPI.cs index 2c711b65..a613c27a 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/JAPI.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/JAPI.cs @@ -2,10 +2,9 @@ using System; using System.Collections.Generic; using Cysharp.Threading.Tasks; using Newtonsoft.Json; -using UnityEngine; using UnityEngine.Networking; -namespace Plugins.JNGame.Util +namespace JNGame.Runtime.Util { public class JAPIConfig{ diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/JsonUtil.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/JsonUtil.cs index f3ea206b..a0fd8c29 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/JsonUtil.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/JsonUtil.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace JNGame.Util { +namespace JNGame.Runtime.Util { public static class JsonUtil { public static string ToJson(object obj){ return JsonConvert.SerializeObject(obj); diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/NetTool.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/NetTool.cs index b2d2fae4..f1fb9c1a 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/NetTool.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/NetTool.cs @@ -1,9 +1,8 @@ - -using System; +using System; using System.Net.Sockets; using System.Threading.Tasks; -namespace JNGame.Util +namespace JNGame.Runtime.Util { public class NetTool { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/NoThread/Interlocked.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/NoThread/Interlocked.cs index 27fc0f2f..ebd34b2c 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/NoThread/Interlocked.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/NoThread/Interlocked.cs @@ -1,4 +1,4 @@ -namespace JNGame.Util.NoThread +namespace JNGame.Runtime.Util.NoThread { public class Interlocked { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/Profiler.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/Profiler.cs index c27a01c0..68ba62d6 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/Profiler.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/Profiler.cs @@ -1,12 +1,12 @@ - using System; using UnityEngine; -namespace JNGame.Util +namespace JNGame.Runtime.Util { public class Profiler { - [System.Diagnostics.Conditional("ENABLE_TEST_SROPTIONS")] + + // [System.Diagnostics.Conditional("ENABLE_TEST_SROPTIONS")] public static void BeginSample(string tag) { #if UNITY_5_3_OR_NEWER @@ -14,7 +14,7 @@ namespace JNGame.Util #endif } - [System.Diagnostics.Conditional("ENABLE_TEST_SROPTIONS")] + // [System.Diagnostics.Conditional("ENABLE_TEST_SROPTIONS")] public static void EndSample() { #if UNITY_5_3_OR_NEWER diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/ProtoUtil.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/ProtoUtil.cs deleted file mode 100644 index 6f5af16f..00000000 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/ProtoUtil.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace Plugins.JNGame.Util -{ - - //Proto工具 - public class ProtoUtil - { - - - - } -} \ No newline at end of file diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/ProtoUtil.cs.meta b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/ProtoUtil.cs.meta deleted file mode 100644 index 2d0abaca..00000000 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/ProtoUtil.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 37c91935ad854ee1a4b199391df35004 -timeCreated: 1706006228 \ No newline at end of file diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/RandomUtil.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/RandomUtil.cs index 58e4e316..2a22d33d 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/RandomUtil.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/RandomUtil.cs @@ -1,8 +1,7 @@ using System; using JNGame.Math; -using UnityEngine; -namespace Plugins.JNGame.Util +namespace JNGame.Runtime.Util { public static class RandomUtil { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/Singleton.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/Singleton.cs index 95e08078..0e495f11 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/Singleton.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/Singleton.cs @@ -1,4 +1,4 @@ -namespace Plugins.JNGame.Util +namespace JNGame.Runtime.Util { public abstract class SingletonUtil where T : Singleton ,new() { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/SingletonScene.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/SingletonScene.cs index 54b96e71..33c18608 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/SingletonScene.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/SingletonScene.cs @@ -1,93 +1,97 @@ using System; using UnityEngine; -/// -/// Be aware this will not prevent a non singleton constructor -/// such as `T myT = new T();` -/// To prevent that, add `protected T () {}` to your singleton class. -/// -/// As a note, this is made as MonoBehaviour because we need Coroutines. -/// -public class SingletonScene: MonoBehaviour where T : MonoBehaviour + +namespace JNGame.Runtime.Util { - private static T _instance; - - private static object _lock = new object(); - - public static T Instance + /// + /// Be aware this will not prevent a non singleton constructor + /// such as `T myT = new T();` + /// To prevent that, add `protected T () {}` to your singleton class. + /// + /// As a note, this is made as MonoBehaviour because we need Coroutines. + /// + public class SingletonScene: MonoBehaviour where T : MonoBehaviour { - get + private static T _instance; + + private static object _lock = new object(); + + public static T Instance { - if (applicationIsQuitting) + get { - Debug.LogWarning("[Singleton] Instance '" + typeof(T) + - "' already destroyed on application quit." + - " Won't create again - returning null."); - return null; - } - - lock (_lock) - { - if (_instance == null) + if (applicationIsQuitting) { - try - { - _instance = (T)FindObjectOfType(typeof(T)); - - if (FindObjectsOfType(typeof(T)).Length > 1) - { - Debug.LogError("[Singleton] Something went really wrong " + - " - there should never be more than 1 singleton!" + - " Reopening the scene might fix it."); - return _instance; - } - - if (_instance == null) - { - GameObject singleton = new GameObject(); - _instance = singleton.AddComponent (); - singleton.name = "(singleton) " + typeof(T).ToString(); - - DontDestroyOnLoad(singleton); - - Debug.Log("[Singleton] An instance of " + typeof(T) + - " is needed in the scene, so '" + singleton + - "' was created with DontDestroyOnLoad."); - } - else - { - Debug.Log("[Singleton] Using instance already created: " + - _instance.gameObject.name); - } - } - catch (Exception e) - { - Debug.LogError(e.Message); - } + Debug.LogWarning("[Singleton] Instance '" + typeof(T) + + "' already destroyed on application quit." + + " Won't create again - returning null."); + return null; } - return _instance; + lock (_lock) + { + if (_instance == null) + { + try + { + _instance = (T)FindObjectOfType(typeof(T)); + + if (FindObjectsOfType(typeof(T)).Length > 1) + { + Debug.LogError("[Singleton] Something went really wrong " + + " - there should never be more than 1 singleton!" + + " Reopening the scene might fix it."); + return _instance; + } + + if (_instance == null) + { + GameObject singleton = new GameObject(); + _instance = singleton.AddComponent (); + singleton.name = "(singleton) " + typeof(T).ToString(); + + DontDestroyOnLoad(singleton); + + Debug.Log("[Singleton] An instance of " + typeof(T) + + " is needed in the scene, so '" + singleton + + "' was created with DontDestroyOnLoad."); + } + else + { + Debug.Log("[Singleton] Using instance already created: " + + _instance.gameObject.name); + } + } + catch (Exception e) + { + Debug.LogError(e.Message); + } + } + + return _instance; + } } } - } - private static bool applicationIsQuitting = false; + private static bool applicationIsQuitting = false; - /// - /// When Unity quits, it destroys objects in a random order. - /// In principle, a Singleton is only destroyed when application quits. - /// If any script calls Instance after it have been destroyed, - /// it will create a buggy ghost object that will stay on the Editor scene - /// even after stopping playing the Application. Really bad! - /// So, this was made to be sure we're not creating that buggy ghost object. - /// - public void OnDestroy() - { - applicationIsQuitting = true; - OnDispose(); - } - - protected virtual void OnDispose() - { + ///+ /// When Unity quits, it destroys objects in a random order. + /// In principle, a Singleton is only destroyed when application quits. + /// If any script calls Instance after it have been destroyed, + /// it will create a buggy ghost object that will stay on the Editor scene + /// even after stopping playing the Application. Really bad! + /// So, this was made to be sure we're not creating that buggy ghost object. + /// + public void OnDestroy() + { + applicationIsQuitting = true; + OnDispose(); + } + + protected virtual void OnDispose() + { + } } } \ No newline at end of file diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/TSingleton.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/TSingleton.cs deleted file mode 100644 index cb7c1a33..00000000 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/TSingleton.cs +++ /dev/null @@ -1,208 +0,0 @@ -using System.Collections.Generic; -using UnityEngine; - -namespace JNGame.Util -{ - ///- /// 单例接口。 - /// - public interface ISingleton - { - void Active(); - - void Release(); - } - - ///- /// 单例管理器(统一化持久和释放)。 - /// - public static class SingletonManager - { - private static List_singletonList; - private static Dictionary _gameObjects; - private static GameObject _root; - - public static GameObject Root - { - get - { - if (_root == null) - { - _root = GameObject.Find("[SingletonManager]"); - - if (_root == null) - { - _root = new GameObject("[SingletonManager]") - { - transform = - { - position = Vector3.zero - } - }; - } - UnityEngine.Object.DontDestroyOnLoad(_root); - } - return _root; - } - } - - public static void Retain(ISingleton go) - { - if (_singletonList == null) - { - _singletonList = new List (); - } - - _singletonList.Add(go); - } - - public static void Retain(GameObject go) - { - if (_gameObjects == null) - { - _gameObjects = new Dictionary (); - } - - if (!_gameObjects.ContainsKey(go.name)) - { - _gameObjects.Add(go.name, go); - if (Application.isPlaying) - { - UnityEngine.Object.DontDestroyOnLoad(go); - } - } - } - - public static void Release(GameObject go) - { - if (_gameObjects != null && _gameObjects.ContainsKey(go.name)) - { - _gameObjects.Remove(go.name); - UnityEngine.Object.Destroy(go); - } - } - - public static void Release(ISingleton go) - { - if (_singletonList != null && _singletonList.Contains(go)) - { - _singletonList.Remove(go); - } - } - - public static void Release() - { - if (_gameObjects != null) - { - foreach (var item in _gameObjects) - { - Object.Destroy(item.Value); - } - - _gameObjects.Clear(); - } - - if (_singletonList != null) - { - for (int i = 0; i < _singletonList.Count; ++i) - { - _singletonList[i].Release(); - } - - _singletonList.Clear(); - } - - Resources.UnloadUnusedAssets(); - } - - public static GameObject GetGameObject(string name) - { - GameObject go = null; - if (_gameObjects != null) - { - _gameObjects.TryGetValue(name, out go); - } - - return go; - } - - internal static bool ContainsKey(string name) - { - if (_gameObjects != null) - { - return _gameObjects.ContainsKey(name); - } - - return false; - } - - internal static ISingleton GetSingleton(string name) - { - for (int i = 0; i < _singletonList.Count; ++i) - { - if (_singletonList[i].ToString() == name) - { - return _singletonList[i]; - } - } - - return null; - } - - /// - /// 释放所有单例。 - /// - public static void ReStart() - { - Release(); - } - } - - ///- /// 全局单例对象(非线程安全)。 - /// - ///泛型T。 - public abstract class TSingleton: ISingleton where T : TSingleton , new() - { - private static T _instance; - - public static T Instance - { - get - { - if (null == _instance) - { - _instance = new T(); - _instance.Init(); - SingletonManager.Retain(_instance); - } - - return _instance; - } - } - - public static bool IsValid => _instance != null; - - protected TSingleton() - { - } - - protected virtual void Init() - { - } - - public virtual void Active() - { - } - - public virtual void Release() - { - if (_instance != null) - { - SingletonManager.Release(_instance); - _instance = null; - } - } - - } -} \ No newline at end of file diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/TSingleton.cs.meta b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/TSingleton.cs.meta deleted file mode 100644 index ac16d283..00000000 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/TSingleton.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 0f5742a6d574437b86898a1d984862fb -timeCreated: 1722414939 \ No newline at end of file diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/Timers.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/Timers.cs index 8e8f71c1..a220a62c 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/Timers.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/Timers.cs @@ -2,7 +2,7 @@ using System.Linq; using UnityEngine; -namespace JNGame.Util +namespace JNGame.Runtime.Util { public delegate void TimerCallback(); diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/ToUtil.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/ToUtil.cs index aa7afb44..23759d11 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/ToUtil.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/ToUtil.cs @@ -1,9 +1,8 @@ using System; using System.IO; -using System.Net.Sockets; using System.Runtime.Serialization.Formatters.Binary; -namespace Plugins.JNGame.Util +namespace JNGame.Runtime.Util { public class ToUtil { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/Types/KeyValue.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/Types/KeyValue.cs index 8ce251c1..f01cef8a 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/Types/KeyValue.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/Types/KeyValue.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace JNGame.Util.Types +namespace JNGame.Runtime.Util.Types { public class KeyValue { diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/UnityMainThreadDispatcher.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/UnityMainThreadDispatcher.cs index f81cca3d..dac8aabc 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/UnityMainThreadDispatcher.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/UnityMainThreadDispatcher.cs @@ -3,7 +3,7 @@ using System.Collections; using System.Collections.Generic; using System.Threading.Tasks; -namespace JNGame.Util +namespace JNGame.Runtime.Util { /// Author: Pim de Witte (pimdewitte.com) and contributors, https://github.com/PimDeWitte/UnityMainThreadDispatcher /// diff --git a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/UseUtil.cs b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/UseUtil.cs index b11db4ba..f47d9de2 100644 --- a/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/UseUtil.cs +++ b/JNFrame2/Assets/HotScripts/JNGame/Runtime/Util/UseUtil.cs @@ -1,6 +1,6 @@ using System; -namespace Game.Plugins.JNGame.Util +namespace JNGame.Runtime.Util { public class UseUtil { diff --git a/JNFrame2/Assets/HybridCLRGenerate/AOTGenericReferences.cs b/JNFrame2/Assets/HybridCLRGenerate/AOTGenericReferences.cs index 3b032614..9edffbb4 100644 --- a/JNFrame2/Assets/HybridCLRGenerate/AOTGenericReferences.cs +++ b/JNFrame2/Assets/HybridCLRGenerate/AOTGenericReferences.cs @@ -5,11 +5,8 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour // {{ AOT assemblies public static readonly IReadOnlyList PatchedAOTAssemblyList = new List { - "JNGame.dll", - "Luban.Runtime.dll", "SHFrame.dll", "UniTask.dll", - "YooAsset.dll", "mscorlib.dll", }; // }} @@ -18,222 +15,20 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour // }} // {{ AOT generic types - // Cysharp.Threading.Tasks.CompilerServices.AsyncUniTask.<>c d__1> - // Cysharp.Threading.Tasks.CompilerServices.AsyncUniTask.<>c d__6