From 64b28a61096a540cf860f5a49a31ace950d268e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?johnche=28=E8=BD=A6=E9=9B=84=E7=94=9F=29?= Date: Tue, 20 Mar 2018 14:22:46 +0800 Subject: [PATCH] =?UTF-8?q?base=E4=BB=A3=E7=90=86=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E8=80=83=E8=99=91=E7=88=B6=E7=B1=BB=E6=96=B9=E6=B3=95=E6=98=AF?= =?UTF-8?q?=E6=8A=BD=E8=B1=A1=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/XLua/Src/Editor/Hotfix.cs | 2 +- Tools/XLuaHotfixInject.exe | Bin 32768 -> 32768 bytes Tools/XLuaHotfixInject.pdb | Bin 56832 -> 56832 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/XLua/Src/Editor/Hotfix.cs b/Assets/XLua/Src/Editor/Hotfix.cs index 918bacc39..446ca05de 100644 --- a/Assets/XLua/Src/Editor/Hotfix.cs +++ b/Assets/XLua/Src/Editor/Hotfix.cs @@ -618,7 +618,7 @@ static MethodDefinition findOverride(TypeDefinition type, MethodReference vmetho { foreach (var method in type.Methods) { - if (method.Name == vmethod.Name && method.IsVirtual && isSameType(method.ReturnType, vmethod.ReturnType) && method.Parameters.Count == vmethod.Parameters.Count) + if (method.Name == vmethod.Name && method.IsVirtual && !method.IsAbstract && isSameType(method.ReturnType, vmethod.ReturnType) && method.Parameters.Count == vmethod.Parameters.Count) { bool isParamsMatch = true; for (int i = 0; i < method.Parameters.Count; i++) diff --git a/Tools/XLuaHotfixInject.exe b/Tools/XLuaHotfixInject.exe index 607b908023b9c77bff6a36dfd5704d1d70988cf0..19224da3352c497849407e51b672aafa6e705766 100644 GIT binary patch delta 1078 zcmZ9LTS!zv7{~u}cGp#R)LrwgwHYi*u2|M);$_#%rg>f6%De{>N)h{zb|Gz7R>H8d z<(L&+)Q28=5R0QxkG_P0M3Lc(NGU?$gAj&GnKoy4sPu4V&iwez%r_rrK9@^yxrDpD zinGsNc=~pe@1Ey1WLP95N!2C-31XsP6l+Nm@rvEVshb^u?B zy@DeX2zGR_F8Ju0I3K%5o1=D&GBldhj&Al%6@|DDCTwkOErf+*Gb#>)~3wmn7RZce*2AcQR{Z{B{KKi(;R~l#m zp4cGAcjF<$LX2@a$H-%!$H4i?PnBlNji61XcM{IxiS#3F0}G zC{k!Ck~zhbbXo>8BNpF{Uo59`RB`#0ZBv03PBSd0N_21gfn1 m;ZwY{fcg)3dNhw`dsR{>fa3MUESl+?Wh zNK)QHPa$CFxyCMrBR{0Y-I@A)T~CP7AsNylL@zC-rBh;(mnYzFJV^|jESfAI*fJo9 zONKe49XGjFljn^GU@lVIY}}GD2eDFBcj8u!d8jT^71gdA^Rc4nA)?w%<6(4`tL+(E zSAfAfAEWi5#T`5QUXGQO5O|SZN8oTvLLT zmf}3uuxO)Y|JxtYO3N|8TdT%Kk73vid42$6j1?H?ae=84A+9y1<9Nqq)Y@njB3u+U zT8${zRbrzju+DWsu+bXmJo1(Ts1fb77G^FB$)zV@XJYdM_|5iIhhiRM>}%@b;+kW7 za^Wo3q*zGZ=;lh+R8kKvaup$$dJ*6nfQvR_l( z-|Gw}!YL)+_L)4FE&Jb=J8K?CMnW5&*O4&o>Wp`=Guk3Qoxncn?8x=96WZGcGWX@#%s2wz_# H!GpSg<`me< diff --git a/Tools/XLuaHotfixInject.pdb b/Tools/XLuaHotfixInject.pdb index 4d6308322d8af8f35b49d013ae77a5d4d5cf29a5..af3cbfcca7b7f3fc2eeb9850c754f3aa3283fadc 100644 GIT binary patch delta 2647 zcmaJ@4Nz276u#%d%1`dZ3W&H;*vc5~!a}Q}A}T{xIAuC2FCsuw2a7?(phUpk4O7to z;gph_A~K|fPT6Z}vY64bNGr>s#+-gkvnhwka7Lz|>F>LDmzuV=$8f&y-0$9V?>*W}SL;d@&A_h+y z`Sn>(JHEc0)M>6fl6#1vP3c&J$CPf+%U9^7v5{Kj`t7e@v>Y2C_MVDuTbRUi$K4fv zcSGru#*T4c#gT)n(p-rS?3EWMgxqqh2(xs=3UM#|YuuNXMX&O3S~eZ!%=Ak04DwcJ z-gh+bO097=A5Nc4mHbJ%EwM8G@73R7o_EHhQmN}V5aL>cULt)LwK#^t1$M*NfrA{!@7wZrC5&7ynQJJm1$VgD;8<6F_}x5xouG56~6u@Di-0x>#ttMuAehm!BmjMGF6L14?6tE5$0W1f`1LeX=zvRUG>@wupTIqvbSh9R@o}BX zz#gXc%BRgbxfQDc^YRCq>-fYL8<%e>#Jilk^(Ox4SU3-ESxUX|>gXjkc7E$BO6KED zH*r~0A&Pyxsg7LAFWpv1C5nBvEf@Fi+HU3P+hcHl$yS1`R%{1YEtnnmm&$kWeTv0B z5rZ7avAJMn=RjgKFWMg4-Wr1>SX%8! zLQZQQ65s`Q@L^aNpMx#ohTT>pc}KWLEu7MBgUxSu;{!a|o<+|xaVxbLZOj^0rR>zn zVKnSKK#}!nfsgLDHxoFoBZuk@Z$~##1*h!RslsU3jY$#qz@)0TVtLLp7A?Zg3#!}s z(lfV7ddr?)D3Me4>Xc|S>^(q8X3D-BHD4;vZ(qYN@4KH4vZd=r*vzg3I>z~3Z&4we z_q&jZT-YkE+3%!BxMzP6U192e0RfJ5=g~o9xI1Y~R2V)aA#T1e%&@-l?e%VSR&>?( z)u239`#^xo4^3QzwmgI;JG1Q2@(Eri`|fJL^e^o!v`r)H+(8=_B?$4Z$-goK7vIho`mLlJzxB`4BK&ho+j3*WWjtPX zYP<|se`-96>IJRzm-=4?7(&dFzz)GzUNB0CF(I^N(Aom`30`+KQi!7?>w=5gi~N>_ z$m5vngt#GumN8n0#o_*_!5cQl2$3 zhrcxAr}vUIv_M&rT4lE>>r?iSvVF>)R`$HIL&_3oerQFDgEiUEm_{?5PC$#Zd}Kv? zlUjkYWopKH%!rUPOl~ku&GpK;rd{wOl_J}liel;=nT_7&#hhfcB){SS^T%<4*;Skp zzKT67*nB4OuI>TZzDBAaDZ2mB3Ruo7$MBEdx-;$C|NOuB I@ujFg0bB5^0{{R3 delta 2649 zcmaJ@3s96*6u##NVj;I!L3u1F3XJK73n8w`tjb_xI*2lkY-9$egocU`WQ54B7`_68 zGbv#j56vlK5`V31awhXZ*+UsKbJ9|KQJUtIlQtoJ_wG_Nt8{1feBZg>z31NloPW=* z^L-!Z`#yVo1H*pLY<-M`5Zy<8F16oxU}}5FfiDLxp81O&8Tg(IY6IPmhiX&mZ*P?r!W{1b-r;x!7b)qD}m;bqk%~^HvLNKtd9I$M%G+ zM0^%}3mX%6(`-JFID%&D7ZYD4dVpO?3n-a?NV3vH`k*oXL}rdkw!ltHw$W5}C2yrA zoM;O*{%scGNTd)>oVJ8h$A;2M&K{dW+xVriTj>hc#Drgo`tNpAz`w$02G;+{OKp?r zK5n;drF5P)&PwTe**FK$X6_olfQmVJ!YS=`GzX@Prf?pgl0@0OG$oD7xFf|%t@_0j z8yV(|a0lnE_dap96jglyS~^@K>Nb?>ewd6BC?&cqVSTC!9UN=ds~7upHP6EC3quL~>&!a3%a< zJkK$VI=IrYnDX_X9g~Po=p(a3HPke9F8iZ&r=RRZ(Y7tPjIyj>cp1qq&HFQe=IBcc z*AmijW4YBx6S;m>2#;UopqXF=l&gGGrGttTs{mWA*w0|hsm=o0q5MNm2kloZ-sPZU zioFbWhOfH{s2lzuE?%8Qw-oyZERb8O2J!T&EL^Uos(?nYaZNedx#)#R-nqs>8H$C! z;Gi6^XK1_?N0Hn$(GGJS{;0Re8+`#{+<+xu?nby01k5cPKrit0l%dNj?05@e`mXgQvk z(73YGD2ra(8G)j|-f51CwFnX6+2l!t^5mY0e6iC^GxeU%hc*AE^Kw3?J~h~vMALcB zJszO}RvwQ)QC)~#=%Y5?QGnkN_6fIihn8`V5Ci+sa-r3Gp2s^?*9}6v*SF8RsJoHh z{C@H{@LnN?^rIyV5Ms9P-5;VVNQi{K1HEdqP=^@Z&rMI^@o*nCyr1G6G`#V5)viIq z`|z)(-~1$6LkpA@DN=T|vaIY5W%nz4OxZKab}M^J*+5P_VfHhlF%4k)JQOX?bkdCW zhFP>XX>-(y})708Bxz?`^zCkIny{RaEZGEfJ+gw-^hL+@3V!_;TEMOKD zCyTG+%se)Bg{PB{?W?c)2GJ{jRXxvpySEzJ3XdP4US+qV2~EhKUHN+VVn~L+dc|E0 N+W-7x{Nnq7e*k6uo`nDa