From 5f0d9ea7035dc89c84c4714b039cee961363bd66 Mon Sep 17 00:00:00 2001 From: jyunfan <3080653339@qq.com> Date: Sun, 10 May 2015 23:03:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E4=B8=AD=E5=87=BA=E7=8E=B0Co?= =?UTF-8?q?mpareBaseObjectsInternal=20can=20only=20be=20called=20from=20th?= =?UTF-8?q?e=20main=20thread.=20Constructors=20and=20field=20initializers?= =?UTF-8?q?=20will=20be=20executed=20from=20the=20loading=20thread=20when?= =?UTF-8?q?=20loading=20a=20scene.=20Don't=20use=20this=20function=20in=20?= =?UTF-8?q?the=20constructor=20or=20field=20initializers,=20instead=20move?= =?UTF-8?q?=20initialization=20code=20to=20the=20Awake=20or=20Start=20func?= =?UTF-8?q?tion.=20=E7=9A=84=E9=94=99=E8=AF=AF=EF=BC=8C=E7=BB=8F=E8=BF=87?= =?UTF-8?q?=E5=88=86=E6=9E=90=E6=98=AF=E5=9B=A0=E4=B8=BA=E5=9C=A8=E6=9F=90?= =?UTF-8?q?=E4=B8=AA=E9=9D=9E=E4=B8=BB=E7=BA=BF=E7=A8=8B=E5=9C=B0=E6=96=B9?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E4=BA=86Unity=20API,=E5=8D=B3=E5=9C=A8?= =?UTF-8?q?=E6=9F=90=E5=A4=84=E9=9D=9E=E4=B8=BB=E7=BA=BF=E7=A8=8B=E5=AF=B9?= =?UTF-8?q?Unity=E5=86=85=E7=BD=AE=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=AE=9E?= =?UTF-8?q?=E4=BE=8B=E4=BD=BF=E7=94=A8=E4=BA=86!=3D=EF=BC=8C=E7=94=B1?= =?UTF-8?q?=E4=BA=8E=E8=BF=99=E4=B8=AA=E6=9F=90=E5=A4=84=E9=9D=9E=E5=B8=B8?= =?UTF-8?q?=E4=B8=8D=E5=A5=BD=E6=9F=A5=E6=89=BE=EF=BC=8CUnity=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=99=A8=E6=B2=A1=E6=9C=89=E7=BB=99=E5=87=BA=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=9A=84=E5=85=B7=E4=BD=93=E5=AE=9A=E4=BD=8D=EF=BC=8C?= =?UTF-8?q?=E6=89=80=E4=BB=A5=E5=AF=B9=E6=89=80=E6=9C=89Unity=E7=9A=84?= =?UTF-8?q?=E5=86=85=E7=BD=AE=E7=B1=BB=E5=9E=8B=E5=AE=9E=E4=BE=8B=E7=9A=84?= =?UTF-8?q?!=3D=E6=AF=94=E8=BE=83=EF=BC=8C=E7=BB=9F=E4=B8=80=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E4=B8=BA.Net=E8=87=AA=E5=B8=A6=E5=87=BD=E6=95=B0?= =?UTF-8?q?=E7=9A=84System.Object.ReferenceEquals=E6=9D=A5=E6=AF=94?= =?UTF-8?q?=E8=BE=83=EF=BC=8C=E7=BB=8F=E8=BF=87=E6=B5=8B=E8=AF=95=EF=BC=8C?= =?UTF-8?q?=E6=97=A0=E8=AE=BA=E5=AE=A2=E6=88=B7=E7=AB=AF=E9=87=87=E7=94=A8?= =?UTF-8?q?=E5=A4=9A=E7=BA=BF=E7=A8=8B=E8=BF=98=E6=98=AF=E5=8D=95=E7=BA=BF?= =?UTF-8?q?=E7=A8=8B=E8=BF=90=E8=A1=8C=EF=BC=8C=E9=83=BD=E4=B8=8D=E4=BC=9A?= =?UTF-8?q?=E5=86=8D=E5=87=BA=E7=8E=B0=E4=B8=8A=E8=BF=B0CompareBaseObjects?= =?UTF-8?q?Internal=E9=94=99=E8=AF=AF=E3=80=82=E8=AF=A6=E7=BB=86=E5=88=86?= =?UTF-8?q?=E6=9E=90=E8=A7=81:http://jiangyunfan2015.blog.163.com/blog/sta?= =?UTF-8?q?tic/2483780502015410103446319.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Plugins/kbengine/kbengine_unity3d_plugins | 2 +- Assets/scenes/start.unity | Bin 33500 -> 33884 bytes Assets/scripts/go/Asset.cs | Bin 10732 -> 10862 bytes Assets/scripts/go/LoadAssetsPool.cs | Bin 27070 -> 27780 bytes Assets/scripts/go/init_screen.cs | Bin 3024 -> 3226 bytes Assets/scripts/go/loader.cs | Bin 9426 -> 9694 bytes Assets/scripts/loadingbar/loadingbar.cs | Bin 8910 -> 9146 bytes .../loadingbar/loadingbar_backgroundpic.cs | Bin 4918 -> 5338 bytes Assets/scripts/login/backgroundpic.cs | Bin 2106 -> 2556 bytes Assets/scripts/selavatar/curravatar.cs | Bin 3780 -> 3972 bytes Assets/scripts/selavatar/selavatar_ui.cs | Bin 84012 -> 86192 bytes Assets/scripts/world/KBEEventProc.cs | Bin 22872 -> 23974 bytes Assets/scripts/world/Scene.cs | Bin 34178 -> 34890 bytes Assets/scripts/world/SceneEntityObject.cs | Bin 16362 -> 20576 bytes Assets/scripts/world/SceneObject.cs | Bin 4712 -> 5650 bytes Assets/scripts/world/TargetManger.cs | Bin 4258 -> 4420 bytes Assets/scripts/world/WorldManager.cs | Bin 41722 -> 46428 bytes ProjectSettings/GraphicsSettings.asset | Bin 4112 -> 4128 bytes kbengine_demos_assets | 2 +- 19 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Plugins/kbengine/kbengine_unity3d_plugins b/Assets/Plugins/kbengine/kbengine_unity3d_plugins index 4a4e280b..372eaa08 160000 --- a/Assets/Plugins/kbengine/kbengine_unity3d_plugins +++ b/Assets/Plugins/kbengine/kbengine_unity3d_plugins @@ -1 +1 @@ -Subproject commit 4a4e280b12aabb1b58455cb9ce9360fe9fce5bb5 +Subproject commit 372eaa087e3ce13796d7a250971bac67e1baff46 diff --git a/Assets/scenes/start.unity b/Assets/scenes/start.unity index 2a898e630371c8fb29dfcde4a47856ff3c4cf2a1..7c04d72274967d3e88c09789035459473b4f0f84 100644 GIT binary patch delta 1794 zcmd5--%ndr96twGDYTTry|hK^01Mc`3Jf|%w=r6%$s}XIAQ?_FxEXh@rqI&fATUPD z+#*?UzrHa(xiL))$wCIXOXR^QsL>a*Y{rK@%xn*u@M5CI7{m?zo^xArm-q*Gl5@YG z^EsdMIp6y|r?-zTW;~kBuoE)&F(DWF2_ZR%S1}TAP2;kC)d*qH44Z{E2wRNc5Naq@ z>vHZ>N`abOoV4Z|;I*P+jz{bUc-^!UXRj1h!jpC*d}7*#qx&XT2Azd#F9}d$GjnN! z?PZ*3F?;b@*6M&cb3dim?Q=MM&%Q53{%Dujy5($}+G4qr^?ykQS}e!aMMt6#)AUrA zZI_|HTHMCdIy{fKM6|${7^5XdU?uyhTD)GNLBnnl&gE*@jrem>!|jM!*_k}7!
jeEakG=?kUcHm=*FwS8BiXV&jH=Np1ZAJy~hu8Q)Eu zvx>Zl6)Jgxm++3f2l)_on|CSN*>v;lSY~@3EB>3fhiRUI-`M)M7F>S~YtsrXYyFi4 z*I)MjZ@-cC8DZJ|pNp4(?-F@XjnuZ=`dK~iMdpL1kTRYd?n6e`VwH=h)_Mnzcl22M zp%455a?H4oHm1)Fbh%4C#_V!J-i{3|M!Bpu#G{*M52E#}z)|juyqK$b%15)X68GdN z(i5d8ufyzjy^uHdFs#1MLc|7iB0YAA{o8h0pw|*%&S$>bUsCQ02G^^DAmZ6LnUwY5&RKfx8h%J zm$)aR srJPCWSrZgN>3_yzhmwQ&mTYLZ7T$?t*un{C~*wJXV_fh$x_CMv5^ zVtC&ry$vCh%Q)_C60JY;d)l4c9{G00o~HasrJt*m;+$?j>yJu(quI~__{y6usspJu z@s|Li89v9$cVSC6J63?@hggrY;k{4gL+!n`-TqrpKZS=jf85L^zn>p3`Fh34EROjA z)x4%8_o+25=PbfozmLuL#+k29k)0PM3(v^0JUdmCmU9#1{O2~3>$UGpczES|5#Hxd z^>aImlqyGxBTrpTURC;a25k*Z+5| wb z8_wH}sV!b!B+|}HeQVv!Wv^cJa%UF3oJMajKT?>F(+d1_Im*j9ES@OkGPO%Rp7`?1 z5(} IOFBeqye}P|L@VBxa7v8>l zPd6Ip#k%{v^KFrCmAq~=&WrU^)I|1iiuq2idDEa9jS|+~c3k=R1Qvw9scZYtx6gib eVNpVPP)8G`dzOmx{Bz^C&4SEFq=dOum;Vpt2N>M| delta 442 zcmYL_ze@rE9L3K(Pftxm>$<{U>7~aRhbJZ~fev937FS3#g+m+#5l)R6%~8>Fh#=_? z2#F3tLZZOI$+4j!oSSZFmQ?K8zTfvAUq0{KyElAS9~~x;k_$~C48_5rOEM@?d)SI3 zuoLA`H`k#t AELd)B?i#)Uq6 jPm!~=DJrsM%da)3}12zeQ}aM-B8 zP>oj>>dwiAY@(BGIK(FRvFWK|ce?^ZE!ZSZ1~8obkW+WE9jn%4KK5($@;5Jvzc=%8 zJY=Gm)iez90B#*3gFKN(ee*nSCb*}A(PN5A>8l 7ii1OS(jkc9vM delta 82 zcmbQF^Fn2V4%_5Q90rr8a2ieaW7pffj9r5fB(S-I^A;0ariE8$@-lY0%|CeApn_aN WjMkgE1+Rk@PiEs5*t|qIj|l+N$sA(< diff --git a/Assets/scripts/world/TargetManger.cs b/Assets/scripts/world/TargetManger.cs index 4459e24e81b86191c96fa125e6edb486844dad25..fb96defbba39bf82edae5c679e5e692321bc9c97 100644 GIT binary patch delta 132 zcmZ3actmM~11qyWgZ^ZD*1%8&22_~IkOmadU{GWTW~gK+W+-7uWyodFWAJB4V#orr zlYt_73_(Cv8W0x&aUM`CmBE#vkfD?zks$}DM`QAQR>jF_tRlQRK(q3I;yFO5Ik}%( KeDeZUCT;*nK^b2F delta 34 qcmX@2v`BG-11oDLLmGp|WJfl|$yuyglOOQ2Ot#_S+3du|#0>zkTnRS- diff --git a/Assets/scripts/world/WorldManager.cs b/Assets/scripts/world/WorldManager.cs index 57ad892a0de99ff04615e53ce76901417fcbf2b5..d339aea1a7d8abc293f2d2f5facd737718e18513 100644 GIT binary patch delta 4059 zcmcgvO-vI(6n=o3((u<-i%5iR2+-EjpTtBG1gS0ICk=(77m-pRMGz<;Xe0tH0s(4` zmUkm6dhz6eW-lH*Xri9Ha5oWd#u)J8#c*)C?NWC8!!|9=rkS1T?7a8B_szU-{(Z^* z{wsT{!I+~19o8EwhAH4a!!Srjl%Rkvn1Lyn1}BVx7Oc<@cggzz8PS4`ybY4yJ@Rvr zF()*^B;1ES7$x5*VVs$*AuGAa=qPzqD7jTkPZ)n^F{Zmsb=_RUkzN{Hz+RKW$}tZr z$Okbm*oe(X3IAp0p~PRh-lxGK(|Lso>Jol1hX#Eyerpw@)O BU&pg1A(exJ1|J0cG{0QP;udc4&9aQPxwAt8aKF9z zL j2u3vxA}lDk-l zBR7lCQR5Zk!D6k9izx-OFpHD!3fx){(bG$1ISf+%6;n? H48buf ec-)HelX{(ZK68~<-L@&5mljCiKw!sTAZu$(ol^MzksyqB> OIeiRx%jplk2Kj$-L4_#* delta 532 zcmX|;(MwZd7>C(dhtuJ7_%J(+vEm>h%ZnwaA+n3H*;Ymv2OE^)Wu$l^hn0%Eh@ltR z$_ySD)-<~a3yD!2ue=a%f{>8?0TH81FCs)DBBbp*>gD(T-uHQ5p6}aU@bBl~$5e*C zOb4ZqAUdLZzcP&g`W2l*Hq4)^ChnZd@K_crXAwRxDCYWP{xvs&b5>!Zpx|6my^Gfs z4R_sOww#tjVW*d^L7U;r?Y!<*u<63R?E_m`EpM~)NgzIyS*rBVIHhAcNiN)pAJr3# zoQ@)*7T-IBWUN(tPuP!!x{msEZ*OSu46z$Jw=({M(sal>9Nh}Y?&gETQIkzeqt>tE z_Q$;RctVxumZuD?cN*fM;7h@uP7MfZGbZ~F?(w!Lcrjy;9x!ArGTDxEGsO6;O}u9C zETMXDCbc%kl5NyqhPXc; wX`_>ajXWt+^`@Q#1El5@De2grFD=P#MPvJE ziTZljn_u`BpnLk*nrMb9^+lb=;sNeL(Ys4FC`rD$NK=o>tIDpN-dy_83RT`$drm&7 ewPvkqOVZAAp69DJ`IT!;T7=G(xVOE!eC|K~de|iZ diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index dee8929a300795bb2ba3519ebc84cfa4245ad691..b7c5e29c76dbf8f9f873afa1300ef9648874534b 100644 GIT binary patch delta 125 zcmbQBus}hYfq`)^1A~A90|NsmkOoo=3?_PJdM0Ux6Q%Vfn7{%I3?RBRuQ)S3FEvFW xGp}S~OdB(Zdf@@0CYv!Tf$2C#BSwYI6B k8(T1h_1Xi