From 74bd1f78d6238018f5a825df3aee52e838532846 Mon Sep 17 00:00:00 2001 From: tanghai Date: Wed, 22 Jul 2020 23:59:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0StartMachineConfig=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E5=87=A0=E4=B8=AA=E5=BC=80=E6=9C=8D=E7=9A=84=E8=A1=A8?= =?UTF-8?q?=E5=90=AB=E4=B9=89=E5=A6=82=E4=B8=8B=20StartMachineConfig=20?= =?UTF-8?q?=E8=AF=A5=E8=A1=A8=E8=A1=A8=E7=A4=BA=E7=89=A9=E7=90=86=E6=9C=BA?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=AF=8F=E5=8F=B0=E7=89=A9=E7=90=86?= =?UTF-8?q?=E6=9C=BA=E4=B8=80=E6=9D=A1=E6=95=B0=E6=8D=AE=20StartProcessCon?= =?UTF-8?q?fig=20=E8=AF=A5=E8=A1=A8=E8=A1=A8=E7=A4=BA=E8=BF=9B=E7=A8=8B?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=AF=8F=E4=B8=AA=E8=BF=9B=E7=A8=8B?= =?UTF-8?q?=E4=B8=80=E6=9D=A1=E9=85=8D=E7=BD=AE=20StartZoneConfig=20=20=20?= =?UTF-8?q?=20=E8=AF=A5=E8=A1=A8=E8=A1=A8=E7=A4=BA=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E5=8C=BA=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=AF=8F=E4=B8=AA=E5=8C=BA?= =?UTF-8?q?=E4=B8=80=E6=9D=A1=20StartSceneConfig=20=20=20=E8=AF=A5?= =?UTF-8?q?=E8=A1=A8=E8=A1=A8=E7=A4=BA=E6=B8=B8=E6=88=8F=E5=9C=BA=E6=99=AF?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=9C=BA=E6=99=AF=E5=B1=9E=E4=BA=8E?= =?UTF-8?q?=E5=93=AA=E4=B8=AA=E5=8C=BA=EF=BC=8C=E6=94=BE=E5=9C=A8=E5=93=AA?= =?UTF-8?q?=E4=B8=AA=E8=BF=9B=E7=A8=8B=E4=B8=8A=E9=9D=A2=20=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E4=BB=8E=E8=A1=A8=E7=9C=8B=E5=87=BA=EF=BC=8C=E6=B8=B8?= =?UTF-8?q?=E6=88=8F=E6=89=80=E6=9C=89=E5=8C=BA=E9=83=BD=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=9C=A8=E4=B8=80=E4=B8=AA=E8=BF=9B=E7=A8=8B?= =?UTF-8?q?=E4=B8=8A=EF=BC=8C=E6=96=B9=E4=BE=BF=E5=BC=80=E5=8F=91=EF=BC=8C?= =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E5=8F=91=E5=B8=83=E5=86=8D=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=88=B0=E4=B8=8D=E5=90=8C=E7=9A=84=E8=BF=9B=E7=A8=8B=E5=8D=B3?= =?UTF-8?q?=E5=8F=AF=EF=BC=8C=E9=9D=9E=E5=B8=B8=E6=96=B9=E4=BE=BF=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Config/StartMachineConfig.txt | 1 + Config/StartProcessConfig.txt | 4 +-- Excel/StartMachineConfig.xlsx | Bin 0 -> 9102 bytes Excel/StartProcessConfig.xlsx | Bin 9146 -> 9158 bytes Excel/StartSceneConfig.xlsx | Bin 9388 -> 9410 bytes .../Model/Demo/Config/StartMachineConfig.cs | 19 +++++++++++++++ .../Model/Demo/Config/StartProcessConfig.cs | 3 +-- .../Demo/ConfigPartial/StartProcessConfig.cs | 23 ++++++++++++++++-- .../Bundles/Config/StartMachineConfig.txt | 1 + .../Config/StartMachineConfig.txt.meta | 7 ++++++ .../Bundles/Config/StartProcessConfig.txt | 4 +-- .../Model/Base/Object/EventProxy.cs.meta | 12 --------- .../Model/Demo/Config/StartMachineConfig.cs | 19 +++++++++++++++ .../Demo/Config/StartMachineConfig.cs.meta} | 2 +- .../Model/Demo/Config/StartProcessConfig.cs | 3 +-- .../EventIdType.cs.meta => EventType.cs.meta} | 5 ++-- 16 files changed, 77 insertions(+), 26 deletions(-) create mode 100644 Config/StartMachineConfig.txt create mode 100644 Excel/StartMachineConfig.xlsx create mode 100644 Server/Model/Demo/Config/StartMachineConfig.cs create mode 100644 Unity/Assets/Bundles/Config/StartMachineConfig.txt create mode 100644 Unity/Assets/Bundles/Config/StartMachineConfig.txt.meta delete mode 100644 Unity/Assets/Model/Base/Object/EventProxy.cs.meta create mode 100644 Unity/Assets/Model/Demo/Config/StartMachineConfig.cs rename Unity/Assets/{HotfixView/Demo/UI/UILogin/InitSceneStart_CreateLoginUI.cs.meta => Model/Demo/Config/StartMachineConfig.cs.meta} (83%) rename Unity/Assets/Model/{Base/Event/EventIdType.cs.meta => EventType.cs.meta} (69%) diff --git a/Config/StartMachineConfig.txt b/Config/StartMachineConfig.txt new file mode 100644 index 00000000..3490aa09 --- /dev/null +++ b/Config/StartMachineConfig.txt @@ -0,0 +1 @@ +{"_id":1,"InnerIP":"127.0.0.1","OuterIP":"127.0.0.1"} diff --git a/Config/StartProcessConfig.txt b/Config/StartProcessConfig.txt index 50713cfc..ee4b3e22 100644 --- a/Config/StartProcessConfig.txt +++ b/Config/StartProcessConfig.txt @@ -1,2 +1,2 @@ -{"_id":1,"InnerIP":"127.0.0.1","InnerPort":"20001","OuterIP":"127.0.0.1"} -{"_id":2,"InnerIP":"127.0.0.2","InnerPort":"20002","OuterIP":"127.0.0.2"} +{"_id":1,"MachineId":1,"InnerPort":"20001"} +{"_id":2,"MachineId":1,"InnerPort":"20002"} diff --git a/Excel/StartMachineConfig.xlsx b/Excel/StartMachineConfig.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..5616411737bc27907e461a5986b9fbe5a2a35a81 GIT binary patch literal 9102 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 literal 0 HcmV?d00001 diff --git a/Excel/StartProcessConfig.xlsx b/Excel/StartProcessConfig.xlsx index 3fc095832488b7dd25deb97d98f6972ac2dc9f0b..764f0ebdc960c4af79716e71364aeb21140401d6 100644 GIT binary patch literal 9158 zcmaJ{1yo$ivK`!EfWd;h1_{Akg9j&AaF@Z|ogl#-LU0cuXmANmfZz_n-Q7MU?_J^D ze|xQ&GwV!MSNHC&>RPp1UK$D-5%Ac8<$el2KL6Vg9)1{t4dm^>Hug;N4`QH)7x2Ht zuA*SU+zBosrqpAT%(}Oq5SNFY3oiaV4oj#?nwC zPoW)4gUq-rre35W*^9br^!O4p4S!N%yyh|+1kNf5;=)dC}91fvP@qjb>1J3Aw#n}LCXY>ekV6=jC zJ2NP70p?z$$33NTj7wyOkH%dQSR&(r)H8=|`6EiS{?`3V*)}Yq@Y^=7^ZNC9O-84$ zvQ4e7W66j{v|xE|D0-wb2c`$jYW@M9;UjixuBcalSu?TT+K6mTXqL_7zC`NONu z2_PYq34=oA5|fL^_EFHC6J_Ufj%sn3Aim^NLlz zYq?}hpd(G+E%>;h2gymZJoOUh5V}D6XglN-?eCCMx0vJIK0xX904wI-Aa%5N09*aq zy-|H~?aV;HzQm3HYP~@ha9UK3E~XL(m89x~h)d3b)~nkI68-0btqPHIWU+dLaiZ1y z7`*XP!^^J$X2K-El+?FdN(ee=Je5H$!E)zwrj;~HWW2M=H5@zN@aVOo+WZTKngZ5= zmcF0YO+Ipe5G^6c3s=$($>z~xMUDv@KafNqWTsq!IPQVVj=CLdE&i0$?j7H_l*sMP z%fP;-x}(|TBLp**c#u7iQavCMw80LRm-_K+)%g-JnvJwFZ-CKz)=OBIsSgA>SLkvz za>r$U9UANwW8e*9ELxWjKO2BkQ;1Ozjb$M1;ZsKsx(Bukz+kl}R&FmB{c`kwjt5W= zXt`Maiva3x0cWtCg}tefk;BudQBb!UpcW64Sxu~aZk8z3cHldu zv^#jW0@H+|Hgw0~xfODRHzD=!5EBF#_`Q-oRJvBX1G=IppI+}*@LZ0M=%32e`vf~kH<@}rklO-KN_ONi01m9M?OAy~vDSw=TERs=Qhm;yG= zreI;u$jqWT@kHCB5S_ZeYTTaEb`|`r$#il!v9H6lm~}$hfyl*djv>FbGTtP^A;cO) zkF$0uKTm2K+GCX)vsWdR$h4+{KrCCHl#kIT*k}M-k;DY|QTQg#rb6vL8FPkO zK8jP~^F*2gT8)MP<^gMp@Xs*`t zmkfb21aX??r_y=W#K*LstQJl-F}vsHKc?`TTrI{iEFuvIEvfW(S>Y>ocu0K2EM-RZ z`l9t?(k>wk=R?f<;rDI|-lEypMKLA&wh;zM^I-)YkCX&1>K2>bUCI( znKme}%9M|>&DDk?g;jq{Ow_95YuE-y2q2pSgSj6C!O%(?_vK!Ew+ar6CHc5^M}bf! zg?#Z>6%q^0wp!bBjJvQm&gij0*_047A+0t*&*Iw?wIKXn-lQu>tsABDF?{FkZ5|Jg zAe@B+?CCLUu5KwP5h141lfVOK4w$9mfSVgan8u5%%sZCF{0b1y1zo=!b^>j;%}v|9 z3pZgv_LV;^Zu23BbsA%jzbd$xu*|}9df6SyrlOrF(kQR07_Al`bc`_j(J+^$mA6Nr z_Mlc^TEas_nJFkKahj7nC%f_7F!f!aQ?YC8^E=4L*z?cc^mw{Hc$0&vk(JSt(-l3! zh9ejj0Eof=9isja`z8F#MRwI+gYm^c&E$uK;_hH8YNuzf9E&DDA4>?qzHT?9^4qIWq#t^Um^Fw~Pj%Xa9<8pRD~oR0!4@>SAdQe^{P^nCn)^Fm!X zhq45jpROkZhfN<+yc9bf)@D0%0*SlOimU zK05=4NmtN(_lNn3I($d$tXtZ!4EmI(K7*nFL&h^bD6Ll&(4Y z#I6(1oQB*WpnTsyPc?yTzzy6u{@oN?@XR*aDSx_PT-(FE5_7NBG;V>1%ZC8hFTe*83ZDRn3_}s<0wS zb)BV0aq91}5YQ7uCDG)pUj#&9?C!~LO*$rC`APGuZlH=;$wT6{Bm88plubrHyC`Tu4UpI}Dw-l(V4=ci|B%EGn>4 zUzG~UpWUlZ8H2W}R}ZQ!YZ{(UcJ#)WtiSpEHs~5BVZ(|y;vC-a+fVG%YT@S6p?U8n zVWz&-<4=9ZipVM&92C_P?CH*xm4`%1omb|a-Hv8%U8g927O zT+UiS-7l~RW&D|RJHed3O^s`2WWF+za2S+YZLY(}i9g0&Hg4njtk_SuI#f|Z#~6vH zmQ?uC2s!Lth!?e_nX!r&r?i+Qm%fz>^|J=ImE;9-v(==a4}ipiHOng4KXWDe_t=l= zGS^T!u)|-GmLEM!yJoZC+}9NspWYjPm8=<#^L<3@MF)AzmBe=AMs|v=A~rqJJ5xSO z=8Z4Q2&(ip7UmV+zB6WN%7$t>ZH&kBI){qbt@cb1Rm+>*KlSY@a0#m$j16*^NQtSR zgOOhuxrAdJd>tL2Fow|Lyp)Id1!X2RAGkMAKN@;H*9D_R-gO%E|E znZcL8v9CD#^s=R7Jy%eYjXNDwybVOYPXg(_ny515rD~$%u4m4&GSL}P?9G1{;>F1= zD#DI+jXV2E1nUG(0fB=kk8A^{He+O*UCG*3F1E~t*4W00;0r~ES=|_Iicv*is$X26 z?mXg8U+dfo{MGMe?<6nn6?1Vr?^#t&ydc$p#pJsX#AU%S;@nCaL^yOS@_{i?S9}l= z{)L3V=QiJvMu5sTl2&&}cA57xX_coevirM4h@_*kY?6IGt%UCd&iMv1^)ge_^qaWi85Z2FP;cha z-^&`y_m;NjeeBu!5SCN}cdR{D#?kksv8Es-BdJFHl!4wyU60;0&+I;kEX}sK3d=%h zIbNKKz{OU<0Jk4M3z{(|>JI9f7>l2rD*QBvd+}Oc6WybEsDs3kq=;#<6KWIE3@&(x zb4mzbCMAx|YMR@u*eLas%lRwUfn$xEmCw7Q)%E#B7#`PfdDR$U1x&v@N= z#q>Xokrg{VZo?3^S2Nh>OoOZ?X007GGe758>;BfAsM;HAi(juI43I5*#x zrbj!Qr*gcP8By~2W;3e%o_GI3<0JDHQL_Jc(-|)IV4K|iTK`Bm@45E2jY&41Ms%`g zlQ5-kO0Z!GEeiJbkh`D^79--ySc%+ZRZQ|hcB^oFoP~vmOXE&%nY~u4^#X)E^Yr(( zS7`)VDrFw~z41S-R)i!#TjmUUE}2VQwVlSt(FVpZY42uERKuAN2@-XkZs=H2eMXL*jlO1CY$FFMCN8hX+ zmAxoik^31~3W^M{b4ipmjK`c(mU`wUq(OLy?URuAvY&_5ObbIHBo5_7cIA7(M+28p zY=UIPPANbP_r@(U>$?N>{OeAw&x!SFaxUx-*0r%UaLVML5Vh_Yooy%gtl^1oz5L1Xq~k0t8(B zQI9tF-AuCG=e0Pqon>)wC8y;w5d~Z0$6YLX&T_aDKenA@YAR&fqS}c!iy*lotvA@E z*+cH<3@`m?t<|0#&`#j1lqxV`ea74D3m%>pU$sA*Xt{AK)c7=k?^YK;n4Wd(RX2fr zK^C4%6V~}Pp#pb-!nApMH_k{Qwg^AyHMzjimq4ad0U{1#-&qtD1jJ1z#|6{hB2m0|9;J$fYEme&Oh(W;Wm1OpA5>PHp3`4E>+~v) zRyciKA7Q*pRm?vX^xnvfY7VN5zLJzRIhA7$YcAxr3I)fYjAb(9)}=hr%pl4t6$iBJ zM4lZKjIZq}qIu|p9W(?NIphD0Be2Y!P4`4fZg+3ec)?$IRU`P-#)N&O!jv8FAYO~m z;1&UQdn8IQ%!ju7h>rnPyl<*4iug=CbW=$pWGGp5+9=>N3IG`rLmUaL%JKx^~HRv8mR@aFb_ zI!EGJ8>iEA6ih47h5}c% z2p>#gTWk2;b69TMa55jRS3eCzs z$rJ<3t_S0sXej^ix%Mkz10b|EBP)xI1)2BeORE=cchaHR{mebfPnco&nO(M8ErqBd z?DTwXxU(EDTBtn66|XYjHsbOmH;A45hZDMSCKM&d6aykN=$VCJtMLp0QIJ-u|19nW z<7*8&?QT131$d+>UQ$0gkLae8o3y-!2Ns(|ya#MOH0fED z=)=H=+`3#|XfN27VHUBi^mjVY`HFbFMp%NT>7Fc&qc z)E`>?ShmM^^fbwyI56=!(i1sr&Fh1{Ak<@Zwrsayz+7z+ZHZovCR?Ci+zbL2A`8TOsE1M%z%QajSMB&fzGj8<@P%)Lm78I)Eden6K z?`*+W*I#;KUmd>}NV{EQg@G05n9}9%%JHl546HL%(8|m~XQYYprDOgG0YJ8oHf`Nd z5L(&jv5&oz!#BU#xoq#bwbvnwvI8-@BuI>ApTOFRf=y>Q8I6t*gQI38w()RY#voTR z#ZDjx)b`)qx*VP0G--`mpwb)=-9Yc@Lk@3Hk}xd?|7bg5y1(!^+SZX3@ElAG#r^}cXada}$$FDS&Wi zDke&_jSoHpUO@YuZ_gzwm8vL_OhXA-0$wTV(fLDz` ze0${>$*DPnZW4hM^RQ=b^TQxD+Wd#vW{%qpdU1MTgtrdlAH~>qc96s|==6V7JiNBN zJ0y;4K_Rn|QUre|@_r%UZsK;%0=nG{_BMeO>sQX<7KikqB%UY5sEuz3qufy~;^;$f z5Md@E8;l4HeQ=I17npgULkP_T$@+L>BRF2bROtD=!AR}#cW27r^GV^lU*yx_oma#L z_HOduTRI({-VA^1Lz~aIUBA0oI^Nv>jt7OV@PmRfLmxyIscZW>%Oa%4wl&{A#4>v+!3RXd>G+KLN@p;F;Qk7 z5(t};Q&DjRI|s<{Wpvawgia#TeKD9v=C}f>>mcD!<{O`2N>r#-mgz_lsjPu(s`?@+ zvkD^;7F(K<|9xeA9rCW@%H)P3yE3~!JZA#6pQ}NrrDP@~S}-%!K$*miLyEbL%w8LND)oFZxeG3gSNvxSwy_VpHRchGo+2|vIGU%=8!c6QtBQeZ z&d$Qc73izIQStoee>(5xF39WPY5P#2RC3l#L<{q+GiHAb*BlGc4 zg|Ro)vokVOa_1@x}?>90w()+LFh<&H6Hu!$FLddTHoZf_1B`h+xAKz1C{fshI-pJdzQWv zfWq=SokNG(*j_Nqo+apEt5}CVuOz$m9oMSCE!mQ z=*;oNS8#08ucM71ZD}#Qb_n&SzMT5yT9mOtii8|H`oB^(46;>oE3y@c_l;?Uqlt}5^60^nOPFSCs}euIYYU+pG-k#)MM^pBL2#`Ol>=R zcm+vV`Fnx`w_cnNmK@zo+{x|krn!)$%&b&ddSHx~NY3`wk^Wd+`MrbnYoM-yM8UMagV@#^ux*^17U#C`R;gxLY8VjFPykLSu&<{r&YfxN(e=`qF#K;U@pPA|{ zQ5_1+m4!3nSC_r>7>8b|2~V2j>6kU7PUiN{=g387n4KE43~vVe?wEr}qS%!6;SxWE z23MlU35K74A1`V>xo%-MHGhYih)AqQo)5Jf0MrVzBJsq-UOy&d3W^wEQW5z7OM?%k zKY)&%k>%6+xjUy*!~Mg53lBAPq(5XBA0tSs<0~;>E;G*sCi+su1B7>~-E6UO7j+Rka;r<@klg+?WF<4lx zK|4qOzI|t@;F40~=O|)Yfk{g5W>>YEZ5figwB(52QDzQY3XY7dx3xwOYgYD2a0gIk zZQoP8=;~NWaOG#yk+3^@UhMq;WBH#l>p#J{dXR;?`vBwD2RNTSJRcnVx7c6z^?%Vd zZ)ZmC-1l$vANI8U5y2v!{prh<+ zV`Q)W==!B`eR7a2prCWAruH07RwWy~a6R26qe6E zxpyy{?{6BB#px~HQHqYvkCo`0zJZW)%bhDRCXP)!%D_qrP-=65W7CAH7(Tc%XI6)6 z@hc)6FOj6>wTY~Npf5jyAQ+JGtRx#|{_X;_V>E67yEpPMHcBrlCTpOu6Y#bwGsw_o zsGYbkQ}_v~@>*k8m!yOO!xPA&m6{y3d=#w_uvFIACO3RI4E+zY1Dw{JTdMaWvO+b4 zSg=_d5vAE{kL(CM1?7T@npGkvPeuw81fL;EqbmHT`*=> zU+MpZjIBvzMSGT@z9w_gYhx)2eVRd*F0mui1r(yO1jMk7Wt{C55QH_JMvueZ%?V=j z3CTGW`mBSS?E&g*&`#k}8K{Bl?Jv0|1Bs zn8>E`&Q2a+Cl7Odhzr>L3Ac}<16>g+GHU?<8S(soxBuWCsL~&H>fyz2H`q-voueXxh|$|vRVgLgaRtUm%+p6eLYVsI82%{pGlBGmza&^WVRf*uZ^`I zJiAvG4|O|{yiv(l3@xcLjIU36@vwjl2M$M{ZNSiIS^{y~G2AjR-G2zf64>oN)%q+~ z87(c()Xx5?0{Pp*f#h(HF|s3()7I8+La;TkakA8K6zfBKMt{V$w3 zOU_6`Cim#__>xW_?ctd2k@&W&fVGw*f^#Z&DDocg;fA#1p83l&1T^;j_OYX-hu0aEW=|Aq@h7>BD1bzzRFU^3Geb-UG>z9l zU#pSk<@AoAku{CN1^cO!*+C!DUw_7tjuzE8oXI2^atB#2R{IY*&|iF`FwnCRwXFf= zxrs4A%&i={&J?mciEjM4v~q@Y83YNx@=q!cG8J3|nZN{3Msp#3!oc3jq2uAu7qoBI z5E<*QBngp9%Q!>yNDG1_6aY*l9|xX)@Wk8M%^u|JZ2wy}`xj@B5Gf6T@}Ip`>1wL? zAwv4SpHaNt*dVWI7dR@mgtPo`Ua!0IloY8-pcYu;Pd;7E^_ta8z z6w7F{<#AhA5Lww&rD6H#69=ab>4IhMc@Mqga)C=EX&jnS4Hnnbk7W|2xqeHTcm&nzIe_L(0mTI@7bStl#Md!~_;A6s4)3beS zb$)p615YB1B4l4Adqn<(UAYY89VH&sXW0#gDIF$|xr3o5pBZM^j&qx9p$g_pXzsZN zb#4v13qqXnTR{6#bTzeElxuI6wDSTU--nbum*pR|?j^{fxJ8C~H;@LmaB^l+cD0@I zs<|ve44yqlA7Eo8$_bED_8|$C`XGBuC9~Lusl&UnRweZ%YVc~~vsn0G;YA)g8wB!| zl!-+$lAB2tuV^9PN?;PNF-Z7b+?cTHb;ix;i}{0Pmn*8eVNFgf%SLRWvmouNzYVG4 zj{NG~hz^xQ+-3a54|f|d*u(vw(e?KWzJJHo@Wk%e9$sR_E0mw|K7Oh1Be3Q5gc+I) zc2PjrOX$lPNms--e)Uw~uALp1$sM8W?-J#d&vBDE=UR{>wk=6*YL5MuxH@HPMfO*S zfm{+v7PH(PStwdsYB7UJk4f&;M(8}aA?pq7TdYk0mM2MlT2zgJ@D6`_K{-`bVdr>i zjsfG*YJhWY2N;EkN$MK^JWL3nm2fKVoKQKP3|AFRdL~t*B08jabQ%njJ@CHFvk$;U zeeF0ldUgr?JJ&KZQ#5;t4ghRZ{x(7SJwkZcfE~d+zaM{p?L*^nCrV-b4$?hwd_Qf@ z#S}~OWEA!E&G)XL1+`eJa*~G8=vK3&H0ssZ?Z*W&)3BjZnQ3)A#bp3+3RyFMz&2J8 z?G%eTg~OIjr#6>t&)lIay@}R3^6boYsNH|Zsb`9wAmtQBlg5*dtT2;wWkWF^mYsVU z(Ew15n5B6x!F2IV!O8`^b#ukNg4<=he2MQD?$Y@C_ANhm&84nyhKqOcqytV?QSkirJ~|Ps6#|p@#6;!3ON2C# z4>qNzR*NjhX~mTbpbXM2Gq#k1Fnj{SGx0vqRi8Nl3+~e%?;j^v9>{V=#`+4v`(jX5 zc5)sz9g96vK4AB063}4mbmQaPyyTNQ|Ln9m2XwT5g;XXtGV#5GoM>=NGEy&sF@-SV zTtJGhPvA(XG{M~4mbGa+Ai_y+u50cf1@}lSMlctqNfbRgWK9>obTa;hYwqJ%<35+$ z9z!7=?-|)T{g~^PfrP%uNzCELa1!c3oXQ33?QWHDMKg8wXb%N4WhhPZjPPz`@WuVm zjvJ4T~1#g6E%9ktx8NV8C)Z!tefweTr#9EMF)Ov| zaWvfXx?P)G{1Ky4wd!o6`a+(sBbguumU~4G)n*-;)F)+B3{s%OC%W!=W&M5(zKMc< zo@_>&2kz6!3gj76-?A;-DVPQ7#!u4aESe-y+AdyZ%vK$|xYZ}y5LLUgp7i`#(3q?=d zIc)t%G?3~(^x91Rf#nJ#B<{Rr*HT|dmST5ABwm7VW_N-Jq(5ai3tE?3whh(SH!?18 zqH1r9nfY2H8J|+Uoats|TPtE5o3JknZ85`n6kYE-6=f;pufZSPG6!XTPGDvjp|${% zu6?E1qE&2sRt6?_(yChDy?=Nt!(6h|!~d?_f@X)UOV^$4*`axLsOh9VlF;mWSM1A& zDv_PzSjWYbCNuEVMk1bJ@dI-!YVv4ay3m5iWP?H~ zC664>hM0ES_F_rx(5(mgMnO5VQ0{40Cex-Tt8`PHQ@5?TF{${mhh8{5Gv!rBvoR0$T8C^}B}l z!@{r+4u{q&c3hU@P@iVseW*~FJ#*6&!z3bl5_(4F_>0J;jqhDh%(Z}pODtJK^O|^! z8C2WPwfEvvsbRwj8P=i_KBg z=A`0J5-SUBtkv}!mAAs;fN_voklg3=JKd;$YiY%d{ zNel+C;XivV(+E=-R``mq;%is7SN+73#A6X}h^*V@HUT|>hL@C%*;O9dO`>U z@}*guJ)mZ1td&_!kBy%=H)4pfD2;?fGcvG+{Ri7Ath=a311qJFdU{Xx=Z$x{khl`} zhj21Hy6}mqrB_}ws4Zqh2^X0TF~O-O>)7 zh!|=ML(SFJK=MXuI`!_4hqiWp=rES_aG>iqPLpN$IW&Gl&70L#<+682cL}MoH%ZYp zo(MGts6b5AEnr3?@x0^|D6j_JAogvZq8erVuBRN@7Xok!fg}aip;=x2atV}VB#;&Z zFH7z~YerBCgUQ=V+TfR2e)QZT5Ji31EgwM4a*~ z#2^bj?d(`;NRmd%onq?w9H7*y<3rj%oMAqdGCfjfGx22p&GVOqMX<d4XJG719Mo z45qqZo6Qt5Y|LeL*XeIgi4R1oVX`=!(F)B!pj=p9BBFfia)!Crtx?O=YL5IiaB;(v@`bd*K@CO?QGvf$ zRU;JdtM_U`$of$UZlmPNI|u9RHs|$QoJ#q?Asa@K&mYf-;f-r1?AO?1OFFteqB=tf z_VS}4eFILW>(qJE)3V2&WEbL8hpQ0gL0*_WE&%IE7)_Oouwlsn z<@0LXC~~ptpa&$YE|@BBFT$UyZ_)94n0cExNu)v{RU5LQZyR+460pD(EYzZ?|Y7WQjecrPKZS zh0}>Gl=}m*`fX0B75+5*y{)}0bRrZ0LcDQWdAC!;|w(2 zmk_gc@7K4o#eNRh;i!p6RCF5ddm3fuTbx$p_8|3&2XyBjyupj84$M0#kN1w28!PAa zPR|XEY$jnFx+Nl5N@RSp;E8^re(9j9FEo7o>Crj*x;4bKncdopyV}FD`$l^F&k1-j zQ#WT!NTLc0nJQy|B_L!kta5vhMR{YPPF8Xou%gmMf?~WU%OylozRGzcNwJ&FRIQ~l zvnEfWKKAjHvs$&rpy90Po?Vf-_kO~N2~vNg(FzTvZk!!Or$fY?m7eUX^K{x&LaQN26B`-4*QpU9n^N%u(9-dHhzx-@P*&=cyKibJ;9is?LqQ_?giF4nYLoXi7f4h= zgNI=2K=P3jRdMN6zxMtjb*Ef;&4>mgM-lpet3I~pNN!a+eA?y)4k!y4?&@$yV* z*O=0_d$+{^_?9kg6z)&Nue!`-vi7iEJc3w9>SemZT?bkb9p0;Ade1$CIkp+&&t{Ik(;xNJCCKa8~C4#RR2}<5MAe= zqNCo+OB}I|b}K*Zmt7K8UU(z}*2YEUh;^oKUJliyNU>=Qa$a(3=)pft@te5$GR)M! zUy!{`nPUWHBN)e2>xwpHujiPyZ`X3x*+dae5r&2kQg;^{cm^0?jw&2{Tx_^+_UL1( z3V$BZv?u^G-QuvHM)1nm;}xruX&EHisIfQwg?0x@4pChn1#*Uj%L9693IQ^I4AKJGRaF}o z4b8#BifiiE+uWt2S@=RZiGkbsKc%J~PnC7w61u0PNR$dcd{W~->?X#Thh+JsGr!>a zZv%7CxzQIzM5nGGb{52rPzPNQdXfj&O%Lqh@td%8_nMCzWa|WaR)Ec0$6LROMA2O} zIn*`OHO%{BIh+w~Xwy3S83=iXKx0g1Cb>IY&M&D!Ku(k{3m7eX9z^GIg{@SJkQ)A` zeoGT;8x?`{$OEGU-Ibhd%&UY3m)i8pu9XW<70@V|#;v zpPX{()K(u8@!_4stU*t`%SLb?rOT#cY@a1>YvpUok(lK%|E)>sMCB)krsf_=)BTTP zzEu&Up;FqDzI)lU)+Xu4g!O>PZp$)QjSA2o5qPZtb<;>1M!N4nP(vtQ1WO`3!ZisK zNJrt&9D~wpof!_icD>JC-0n!9B*8P9L3oK;7gpNP=*$rU=8!C%q7guQt$o?7^6Qbg0QG=uNM8$a16o0|9$P~F3#O0gkMOvh)*o;EGXPHzAIe+G9JMC z-S{su_FaU#3hgfhTI_%S{r{!c-UYlXc>V&UN6Z`%?{ioFybEx5uK5dK7a^b`0DjFp z@0#ANgnyZaliq!qUv=?als^{>zc3IkK>+~#rF6J!emCm>0-&b;y%GPP9B>!(&jI`w hB%)0S(0{k-pW*zGI@)h}0Dz77F(ceKknXpu{{c@jf4Kkv diff --git a/Excel/StartSceneConfig.xlsx b/Excel/StartSceneConfig.xlsx index 5179cde142213a400ae191cbdfc0da49a6696398..2a5f81dbc94096e06066470f7aa8d861a8910135 100644 GIT binary patch literal 9410 zcmaJ{1z6Ne*QdLd?(PohkY-7jlx~pj?hXm*25FR*luk)OI;8~ZPU#Qyz1J)6{oZ+= z-Tywj=bV}O&CHpz=XXG|kWdIo|cm`AYOhB=eopTC+z za!B{Jpp<>opRX&(p4>CA?0gN2V!qOAa+avTqvF%M(}$yvnh}{A@w{}(cy=&glKyz zFGY38qQ$SO%Ro8FJTY(rh-5J#I6ePn*^H^vrID}cA*i-V^D%yj0w_5(lFAnEnaje7 zy+wAdjItAQZ3hrX_o z$wl?kp>KL$(Zww-)K)#8n?4tgn)j!4flc>|rod|ol9i=eR%M%xy#ph@@Yf1KsqfMN zdDOBlFLyU}mixrkEsPJ7Xmwv4l)U&8Wp^Ln50nom10GNY{1as(TL+Uzn1f>#WxH50 zgO{N1#ri$dY8)Ly>O4W``K0QKUWolVI96jZ;!U@n)#W=d2%@^3ycbOyi&~{Fjq z?vttLCUg?;xTDf0Y3MCemd)bfs9%ALE-*4Ruy52R&s516F){;RO>5YR_`e|UccZon zuOm~J48zeH`C2q;ko$2fW1Y-LM~o5YZ8LbBaw91|M6!UL1DGK{U^FbjP;`!E8U>6F zt|q$!>P6KvidVK^MYnIE107Z-=y$C%%p*PflfKa^>}S4=|8Q_!^A?%S@Gi3XxnL_& zo}md!6S`lq=<6IJ3=}u8RBg!OCsNyaZ)|Rf>+(KDNb1xET-iDql4p8r^ z)x`7e3`38Iljh-9Rz6*uHvw)CD$tkC-P^E#LQ2zafp_}=rOyMb7=J+O?C4}`{d4ce z3@UW7qJbR%ZvwwJ8TF#gi7U{@)!?9z)}9jcDp=C_^tnI)zAf3S61zs1XhfMNTQ5$+ znXWWHYYZ|MB}Ge1*WFfz*F)v6326^ixL7c&pr`C>8`Z-64thhSeS#wm)&Gm`ZSY5+p+(Yl^PV|69h?5r05Jm&xI4Im%T za=m#quh+ts2|0VlVh3yglC^dP`Hds16*H>ZlK}0tJAu4 z#JfCo-gTDVW0){mv7`lTA}8tqMVAqU?EAYFpU+3>0{PEP3P0v8e*&$Bfgs#o@B z3-LcL!;L9pDT7TZUT_|ze!zjgfhZJ?we-vF4$r4K7Or9xeLaQYdrF^7bz>3rJ@?LL zI>LFCq#-$uNXYcq-=xi)9u<&AVR=0~tR;E@3*V0v+Z)ZE2Yo4{Kndv}*b}h10@At2tyH|` z!Qad716Ai+7nDt$3qqnoN*6;*mqNRVVoddxLaq2oog1UIarx0;V8ief9YxK>q_B|O zN-vyrgvPgtml}IZj+ej>!65oKgHj%YtNRT1E_IA?`nyBj?DX*SdSEl0Uog@Y||%q?zwvwK;} zPFc6-G4hEZQ&4g&(O07mefGC+0zTXZy05Osj;+L&ssOf8d`;1HiO#3Nvl^kw`}D!M zzeKZ{`?gb+OnH$Xt9wu}!~5p?t}H-EyvpdzQ)@G!P+@20EmRWJL((YKn4r=TY)!rg zdvu@w?hqcsg9nG;WM*P*@+3R}MA>nN!hnIr5&ZJ9e~bMT{&~vxG+x*eNMN>691%%+ z+FH}N;7d6d&wL;-8<+f`HL>a@xR~kT@`{r~VVl6>4G;2|Qa%|n{4#NaP}`HW7Y z0C&}|u)00%V@YV5kseQ@u2VtRg@=m`*m6$cKiCcSJ@KSK-m7Rt3BIkrLe zz?l-H#EOFUl&iuZJ>y1+n zqX!bnTi}zus_KH`YcKr{o(FhN7~?r0h9nD(!Bk=4qib^F0BxHek)l~uS6TkbXRFbv z!>r2C?X`XiN7>o-knB9KH>AD=V0zDme?e2>3s~hrV4+$P`H+Wg%ha$Lw(z-qtV_|{ zyD1$n|GVvg&qFRv3uc8?>bWq+Bs+*d&bBqZEkAV-#C+n$K0G^DE2>^!M(+DIjeXc6 zJ5<{k!JQp5>Q?19g|c_1w9RY$c~*hWi)eXg5>rS@XPB6lFm8d%osmSx-#cU0gY#L;ay1vP;X@Kq#yxL$=cm79Wlw)0 zCRy3f@&ffV1se6%E|^28av;j|o@d7J81AzXG7!e3(B^Oa2#P`9+XrpWI455P z$O@@#qDWZF$;z{5i_yfaN4S_l`J^UpA(gvWReKWD@-mEjq!WGw0^vT(1d*VvryS8| z(Gw=d5-x{fA^Q-ORLb?;$^DSfeo24mB#bMy0En%!8j=UU!p`tP7Hgq*zGhCBU{<2# zqswzAa?};KIgzI6R#Xbv8|Ps(T#CnlQ;a5-SXSz5bUj_Fui;B~kx^`HsxUH*%I_)g?=@ykF}Lf!AJ$pbH#5z255&FNQ2(GC za*dO;X)O?S0cZT_8}?b9Xj|FHqHn7x%i#Buiop{lBvnmr%DQQ;OxK#4BVy&AD~p~! zXLAo*c!H64uz?<#yv}hqq)9=C?>O*qc|Hp3SHr-U3uV*qhVuBgwyc|z`^!ngqEl&i zx{o3yk4?F4-X;oKbDi>btD%HXGLy`%s0wBfaXYX}7Pn`Zb4Zq?wVS7w>B@u$*w}WK z76$Wi)~5l6FeO5@%B#3O@FoZLJ5K7e)>Aui!CjG69^+?Rb6WBo=u1k@?N3RiYDMA< zk4vz3Q^Z{XcUm^{((IM684zEa30kpkRT-Rk>h=um}ARM%{3RIoxuLc?T>BxT|jiGJ8PF+^z!uFZ2PGgJATEmc10OUvwM zOvm_an0k__eMAI)XHtNYwGrOj2&=L=T&22W)p5nM_R@_4VQEgjOw5uUG^G0!Ons^8 zT4Mp~R(ifB)?DjXdgDq1MX$qrc=*J{xUjBqzgCE0o#H9Na}yVmZ{mE+8lU1)wy{@; zFL$FewR0h?rtCIvn50WHsR~XHNEp;#MEK@!Q&2_leYpI!^rfRx0dCJdhw7;h#7ndi zial_W@=$0=K4nc}9Qrj-a9qrlAb3>Zdm=O@yHAMYXexHn)^~^w+4u7q)z9QKyQG!& z#=+nbu456P$viXaOF@$JbBb;{f2YbW_WE1k7(t~~- zL~ov72o7Z%WT$5sw(=%2E_qs`+$?0ikv9bmlyw#6^zXinNU4WC(U~mg9;|Mue;1aO zQm=8w$l#}8z+hHrejh@fVP8^Y0km>{)vC z%w;j7VK+lt;Du2Uwu_Z@Z&Dh*fTw_jfmsHTair1bqN;Dbj6%(b(TgEpV3Z5<3#^6H zeScnWzyH?G-kUb0KiqajATTiGU)P(Xle?9P<6~Spsl8x3KZWH>QhD#MUnz)LO{Fve zt30T|m@e#ZLmPvHTZ!z?sK^B_b4p8J$&U$4F5Krc7LK)}&oSeKdkc{4vhG{LBlJB;Ed9~m;d^^@t+tpg~weB`&6*;ZAPFD@fbL6OT zSij=^-CAMo6e!VPgxG1moVzl8J62Go!rJG8pP*~Guhw>V-X&WYBhWy30W~17q+qPF z+V*0;%lV+4xSd<@%RxQl$FmEWF32St*U+GM2T7+64QkuygHH#^LU+j(Ho%hBP}^hwScE4QyUI4GS*dzW7I=UPnPacreLjlPlwq z{rMGw)$t`E-z&e?+NJYQzt)&a!9EV=Vm6*q9ys5Hyg8Z36w@&99p4BW% zvW7G@&9Xl@1esgU-kDgD`P$aM*GzJ5Y1LuIz)MaGZ>{|bRL3e4t?gybd69HHHr8ky zghZoQf#jRy9J}3b)j#5rW14Uj?qv$7bx@+$!I24%f|f~T8hP&$E3-!}9O%9i;NPb@ z9*&|RNk${W5)$1gA(V<&WiQ!+$h8(nya1N+j2ZI=LZMirgvL$`FT%aTFcuYHXdWpy zyOG2igbC*B&iUSS?8-(EiolY!s7@_)U^2wN4bN8nQlJI5i~bs zucKQfR)_l5%7(Beu>Bks+pDZ{CtV5_G>EJZC!()Oo*=ulcrq`Qrr_zw7m%~Tr$hcp zHzJ84R{3ntA<@t%*?R@4@jM4v>@|KFzASLLrgP}TP`Dt6)02x+6`qhCL|^ezZoKqm zNmQ}vc8Db6m)*;*Y}Rjj(08T<22)PeIf?J<+1I{kTWFMdScVGIiRpeWm{i>w_>s=A z{-&~yTraR*%l(oM2RQk1cdRr|d_vY4QRvbQW!+8xI^b|7giXdOX3$PY+PDS@t^pqU4xQaVQky;CWwe>E@EF>+aldsTNL?fMO9@8gH zl|KqAomns>D^~J`kf-;dK~Y!3i$a$qZm{`WX94XyT@usg2kwD&h{*+E!(>1Qpf6J_lFf}*UA1a=J{(;9)RR&>OZF@2SYWcqJmX2<$(N59vNZVAC2q3{n z1Q3xS0(^3JPFN-8q&-?wN~`u@riwLdOjvJj9AG7=V9Yk~8K*vUBN(SXm0{Dm$ zVeTL?=mLV(DPoO>7dv+%y7gDE16+Gu76>S_?rM4|K8lF`FhI3t@gu@A-b&roCrxHO z>1Xb;BU}DpZ6j3?gG}Z>PR4LdlwIkKzlP%3FDm*80RJ9K4QM5e_Aw=Cq8|ng zCJte@E35#jiTTjg<}MgtCR}1>p{cl<^(S zCqvr#*ErJZGt2TJnz4ACA~GK}^n0zCq$pRE;79QfKk~izbEixM3>v_2z{kIW zC-0QE0Mx5-?$ba{8-|D@@6tGXckEiA-B+{Upd(v?j;Z08(O{4~qQ8$tH5rif7PK>L zsR6XZ3%)C-CzCp1x%8lacV%^%%c5E@^}>J{xE0;jBeXb41oW!K5g0ZF^hKbTv2r9^ z1A+tSGvdX_vHN5CW`h#}c<9VVFLC;#r3F@&}h zlo}nrE4D~>>4otiR-vaS+G)Oy z&vC_Se`4ODX|nfj3h}8$~zX0M*Jpg>MP{G_KUXym(9Zw?7sa`la;jH32fL zZpkBYxGp!)Gynt0F&Q8=3DFm!yFB!C5hxVKMqpUs8=+L9HvWbaxPZI0E?>J4a?@fZ zJPg4Oev*agFafe){`m9@fH1+igqxxJB91}Ajm9O8wjqFDDU>qAeK@_GsTZQ_w6fcD z_1g9A^A=P#$McSBfM=r)4Ryk}_ucI2>CSA|I1WiO=j}nuY~ZW-rOZPZadByWb2B;x zvTtw?DK`xa)pel&qsy7ESmqq#y}kr(7v*69Hw=u z1DrTr7@tR^d1!Jmegw0%kV7!tK>N98OOrFau?4}v<;uz@Z-O(!zKcwMFN5q3!)ja( z9n5GR)&rFA4rZhvQ!>}rZ;9&)Dor58S65G(5m0<-!(KHC;4}iJ8#MEZNAl+PJL`a& zMArcyWjtTz9tz|J)O^I-JV7T2TDX#%2pxbP-+qSKWAu`CFOZAyV@}g2cWc!4&AFEI zK4hC?mUIiRTM7?17_aU{kD-P==$i0Ce7#Ux#mv2~K|OOm`}&Sc8+PrC01MO_)$yFG~yJ$-G1NB zSw^(?x$Dj6IK109l4lOio1I!h%1Q9P6h2cbqeCTYUKpIt@ZBNR&tlOF$nJwXhVH@t z%yA2GxMPq#Z z?&6rqb;o;ZWktCg?TVOg-2XXzdiM3}IWsctykJuDY5H&D-Dhl{4akfuG7hfg(b?nA z6;!b@{XUItMmqDeMF?*c(w?yz!3IVpa$=K7>+}tn_02%VoOK^7y#~e}Os0GQD7Fmq zu2X=}`3qt8hCY0diDTJ|F|roH=7AtpJ)(?$*$`J?s%X=b#-7wIm#_XhL0lt0LwsOk zlH^k8xnuR#muayRuMaZ~gBPG@)u`OopB9D^JzG$#_qWO~o2_*hzn&RwM$a8=X~jbt zrU;zgV^rM|K0~5*mfZzT8a5e0%yTDoD$6X00;gWkBJKN^s=#qm)t0AK@8{~HcQVDx z9ybAwtu^i`_LD_!ApV53G2<;h+XJK<4=>c;xobmPTg#s*>)4-^fyBilWgr-p&IKx_ zPIL>mK~u^pjS`eDy`q|@`hJi~NpI3`;q^*V%C-FEPTuGmqNvJnk`tdnf*+Ow{d~gd z?cSD!h_u{SnexowI3Kb6o$X`8$%e{%Cz}^&`bN_82{-J6xn>=QJodzl3Klp>FKET$ zB}n`RXCNr^sxv<9e6};$0;-4Hvuf)wfTJo9BF#J#g)qw+@v%yLQ=>U4(`C~fW_O_X zQDjL%llh!4?KBXn(rTeTYA{k z4+O%0WSAc%%i_MsbhD!M96XSX>#g#xSb$k47V=$rV{g9{x%&}nj5v+G))o;(#)(GQ zH>sEF=}TV5O#}<1x@?8f%>mAe0m8O@F0G1(UT*3O0l?ChNl14UyH2R42lTIl0@no+ z=9npCb-a{D*hBg0;>}05R6xRS`8g$uc%K_l1ah_5fNTbiC41fygX9H1Ez*a1Ho@5Q z1UFyW+7|B&FAJvTiGAT#(G4`s;V?Hhad@UTp=E*HqaQKyKkqdej_zVO|i`8lk-KVKA{yQTq!+Q+Qjw-~9`qAcZJ@3S2y!pTR;Z$9Vk zccbj#n(TwY{w^0Lq8I9}jTO?XpzBzea$5FdDD8-mzmwNH&Vw&P3+YoDQc+6u1nKc- zd%9RFSw0-xmLK-tpQN$h9cengdN}dO(7)2yT4J^~P9`=^dMfUACXPCfC%-IVPyvDs zGvtE0wJTqXL)p$C(m;R3fcQU-{q3D{uQ zm8ONGMJAEQDz`dq`zhJLW2vrl&TRT|8wVcc1-Y!dw%6@P<%VmDuwk>cAjookJa!=T z7FGx;Zc~k(IURqWB#e(J3s4!UD-}-krzE3Bex7x2EK9QD@Pj$8?#l2RM0|ZR2P%G& z#=6{(0Xr*ksIx5cOyI6uFPaFg6<8eSWY+oqJHm*Tv)Cz^y9HrvK@kO~_kJ6;ZH{0X z>rjV-y_ZE7C&QIpHFReK2z$fJ8%&~e-o;ysXRWbyZH&z)9VbRyH!vVsa0twwm)WoS zgQqL=u!F(C!AKw8kx9V7{$-th8TfZ1DG8`%lTm)6qUH9{8;t^{}P??)0xxf~V?F ziSpm-%MUK&xBB0-`Tv^qBX|6(Jx&@0>OV~K<8=RhN&ZBsgXkX)>ghnAda}oUexbDa zPqqK@YftSwjhcSj>Bjr_80x8or`f~b7VaLn@y96a?_A>l0_)GYlfeB{{flM$bB8?T z*?#vZ`A@aqtlQHeKaFdC8^C#>?jDBxPuTv~pdZQqU+r;)S$?hXAEf|)j{Ipcz@zT3 dRnz(}-QT4FAX(_2hZXQp4g>ojS3vrx_kRKD69xbP literal 9388 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 diff --git a/Server/Model/Demo/Config/StartMachineConfig.cs b/Server/Model/Demo/Config/StartMachineConfig.cs new file mode 100644 index 00000000..8747ca30 --- /dev/null +++ b/Server/Model/Demo/Config/StartMachineConfig.cs @@ -0,0 +1,19 @@ +namespace ET +{ + [Config] + public partial class StartMachineConfigCategory : ACategory + { + public static StartMachineConfigCategory Instance; + public StartMachineConfigCategory() + { + Instance = this; + } + } + + public partial class StartMachineConfig: IConfig + { + public long Id { get; set; } + public string InnerIP; + public string OuterIP; + } +} diff --git a/Server/Model/Demo/Config/StartProcessConfig.cs b/Server/Model/Demo/Config/StartProcessConfig.cs index a71ed3bb..f40795d2 100644 --- a/Server/Model/Demo/Config/StartProcessConfig.cs +++ b/Server/Model/Demo/Config/StartProcessConfig.cs @@ -13,8 +13,7 @@ namespace ET public partial class StartProcessConfig: IConfig { public long Id { get; set; } - public string InnerIP; + public int MachineId; public string InnerPort; - public string OuterIP; } } diff --git a/Server/Model/Demo/ConfigPartial/StartProcessConfig.cs b/Server/Model/Demo/ConfigPartial/StartProcessConfig.cs index 626b41d3..21c437da 100644 --- a/Server/Model/Demo/ConfigPartial/StartProcessConfig.cs +++ b/Server/Model/Demo/ConfigPartial/StartProcessConfig.cs @@ -11,7 +11,27 @@ namespace ET public partial class StartProcessConfig: ISupportInitialize { - public string InnerAddress; + private string innerAddress; + + public string InnerAddress + { + get + { + if (this.innerAddress == null) + { + this.innerAddress = $"{StartMachineConfigCategory.Instance.Get(this.MachineId)}:{this.InnerPort}"; + } + return this.innerAddress; + } + } + + public string OuterIP + { + get + { + return StartMachineConfigCategory.Instance.Get(this.MachineId).OuterIP; + } + } public void BeginInit() { @@ -19,7 +39,6 @@ namespace ET public void EndInit() { - this.InnerAddress = $"{this.InnerIP}:{this.InnerPort}"; } } } diff --git a/Unity/Assets/Bundles/Config/StartMachineConfig.txt b/Unity/Assets/Bundles/Config/StartMachineConfig.txt new file mode 100644 index 00000000..3490aa09 --- /dev/null +++ b/Unity/Assets/Bundles/Config/StartMachineConfig.txt @@ -0,0 +1 @@ +{"_id":1,"InnerIP":"127.0.0.1","OuterIP":"127.0.0.1"} diff --git a/Unity/Assets/Bundles/Config/StartMachineConfig.txt.meta b/Unity/Assets/Bundles/Config/StartMachineConfig.txt.meta new file mode 100644 index 00000000..f7e92eab --- /dev/null +++ b/Unity/Assets/Bundles/Config/StartMachineConfig.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7b39853d8c29e4f34855245bb82d8470 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Bundles/Config/StartProcessConfig.txt b/Unity/Assets/Bundles/Config/StartProcessConfig.txt index 50713cfc..ee4b3e22 100644 --- a/Unity/Assets/Bundles/Config/StartProcessConfig.txt +++ b/Unity/Assets/Bundles/Config/StartProcessConfig.txt @@ -1,2 +1,2 @@ -{"_id":1,"InnerIP":"127.0.0.1","InnerPort":"20001","OuterIP":"127.0.0.1"} -{"_id":2,"InnerIP":"127.0.0.2","InnerPort":"20002","OuterIP":"127.0.0.2"} +{"_id":1,"MachineId":1,"InnerPort":"20001"} +{"_id":2,"MachineId":1,"InnerPort":"20002"} diff --git a/Unity/Assets/Model/Base/Object/EventProxy.cs.meta b/Unity/Assets/Model/Base/Object/EventProxy.cs.meta deleted file mode 100644 index 7c028dd7..00000000 --- a/Unity/Assets/Model/Base/Object/EventProxy.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 22310cc42f777f5439dea1ea1ca183e1 -timeCreated: 1518145019 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity/Assets/Model/Demo/Config/StartMachineConfig.cs b/Unity/Assets/Model/Demo/Config/StartMachineConfig.cs new file mode 100644 index 00000000..8747ca30 --- /dev/null +++ b/Unity/Assets/Model/Demo/Config/StartMachineConfig.cs @@ -0,0 +1,19 @@ +namespace ET +{ + [Config] + public partial class StartMachineConfigCategory : ACategory + { + public static StartMachineConfigCategory Instance; + public StartMachineConfigCategory() + { + Instance = this; + } + } + + public partial class StartMachineConfig: IConfig + { + public long Id { get; set; } + public string InnerIP; + public string OuterIP; + } +} diff --git a/Unity/Assets/HotfixView/Demo/UI/UILogin/InitSceneStart_CreateLoginUI.cs.meta b/Unity/Assets/Model/Demo/Config/StartMachineConfig.cs.meta similarity index 83% rename from Unity/Assets/HotfixView/Demo/UI/UILogin/InitSceneStart_CreateLoginUI.cs.meta rename to Unity/Assets/Model/Demo/Config/StartMachineConfig.cs.meta index c643e57f..9fca58e4 100644 --- a/Unity/Assets/HotfixView/Demo/UI/UILogin/InitSceneStart_CreateLoginUI.cs.meta +++ b/Unity/Assets/Model/Demo/Config/StartMachineConfig.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 157b06c3e92d4ae47a49ad0e76fa88a2 +guid: a58b7dfbd1f2447968265382cf244fe9 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Unity/Assets/Model/Demo/Config/StartProcessConfig.cs b/Unity/Assets/Model/Demo/Config/StartProcessConfig.cs index a71ed3bb..f40795d2 100644 --- a/Unity/Assets/Model/Demo/Config/StartProcessConfig.cs +++ b/Unity/Assets/Model/Demo/Config/StartProcessConfig.cs @@ -13,8 +13,7 @@ namespace ET public partial class StartProcessConfig: IConfig { public long Id { get; set; } - public string InnerIP; + public int MachineId; public string InnerPort; - public string OuterIP; } } diff --git a/Unity/Assets/Model/Base/Event/EventIdType.cs.meta b/Unity/Assets/Model/EventType.cs.meta similarity index 69% rename from Unity/Assets/Model/Base/Event/EventIdType.cs.meta rename to Unity/Assets/Model/EventType.cs.meta index 34feb383..5acc546a 100644 --- a/Unity/Assets/Model/Base/Event/EventIdType.cs.meta +++ b/Unity/Assets/Model/EventType.cs.meta @@ -1,8 +1,7 @@ fileFormatVersion: 2 -guid: 50aff527fd963e44fbce24e2ef3c1287 -timeCreated: 1476421726 -licenseType: Pro +guid: e1008d46fb45b450cb0079aff105569b MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 -- GitLab