From bbd64e7e6b5f3ab463701f402837eda85a46e021 Mon Sep 17 00:00:00 2001
From: liuyu <272912176@qq.com>
Date: Fri, 2 Aug 2024 16:29:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=83=8C=E5=8C=85?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=B1=BB=E5=92=8C=E5=B7=A5=E5=85=B7=E6=9D=90?=
 =?UTF-8?q?=E6=96=99=E7=AE=A1=E7=90=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/ArtRes/Excel/Config.xlsx               | Bin 18404 -> 18503 bytes
 Assets/ArtRes/Excel/~$Config.xlsx.meta        |   7 +++++++
 .../Objects/Tools/Tool_Electroprobe.prefab    |   2 +-
 .../Tools/Tool_InsulatedScrewdriver.prefab    |   2 +-
 .../UI/UI_Panel/UI_LoadingPanel.prefab        |   8 ++++----
 Assets/Scripts/Project/Manager/GameManager.cs |  14 ++++++++++++++
 .../Scripts/Project/Manager/PacksackBagMgr.cs |  10 ++++++++++
 .../Project/Manager/PacksackBagMgr.cs.meta    |  11 +++++++++++
 .../Project/Manager/ToolAndmaterialMgr.cs     |  10 ++++++++++
 .../Manager/ToolAndmaterialMgr.cs.meta        |  11 +++++++++++
 10 files changed, 69 insertions(+), 6 deletions(-)
 create mode 100644 Assets/ArtRes/Excel/~$Config.xlsx.meta
 create mode 100644 Assets/Scripts/Project/Manager/PacksackBagMgr.cs
 create mode 100644 Assets/Scripts/Project/Manager/PacksackBagMgr.cs.meta
 create mode 100644 Assets/Scripts/Project/Manager/ToolAndmaterialMgr.cs
 create mode 100644 Assets/Scripts/Project/Manager/ToolAndmaterialMgr.cs.meta

diff --git a/Assets/ArtRes/Excel/Config.xlsx b/Assets/ArtRes/Excel/Config.xlsx
index 5cc9b5d86e92f09aedc157034cd2778a343ccb7c..14c62769f324876c2241bdd1eb2c47a3dfb8f6f7 100644
GIT binary patch
delta 9128
zcmZ8{Wl$YVlQr({?(XjH?(QDkoxsHc!R6xa?r_oI?iL(^OCY%W=6QC%ee2u#acZjP
z)SQ~Gu9}|dK1cu`O$2Wk1&0Pddu~<%PJxpElvM`V(7rv&ZIa)JG~QAg)KH}soJK3i
zl|VE$|FI)X;!ARp3xHg0I12slutVh}2W`P0<kI8E=`OU9`t24%;W$+(@e=(Y_#k!c
zkVd@PaaSd&7#SFfof-~xE?%tfAB1z8b)(Q<TV=0C1ADHQ{4-?*ew{#5GnRW>V!Y)G
zfOsMLOd)k@Rl~`3`U!Ib3<a*Ej~b6A!@M23^Il8}wqysgDM&{e7L7;}oLa89@$&g;
z)IluuWi~<upMP@mk3-iY`9%h^FDuGL?hLHuB9{rKH@jmHsVI}nMW^<bQES^?@PeM}
z1U8#yr6=}`rBKzz2DVamsqn1;tQ$yGMbuQZ=hwEyn_*)Ci;pVg?kZKwY@pV~;F({m
zn4MVY95v=j0tZJSd11IvYnbZGhSj^IAKs@ZyZiW0YH^t|uJ#gjE(#KGyY$yP-jeNR
zUPv7{1VN?9ohnE$Fc~CZKO8==0TBkEJMO%}hSrUHA`16IH|CrVkqH+>TnuecaN=)6
zwT?p(RV8OQzU>q7Q$oXjLD6dZN2Xu1`qb&WW>NsIPE2e%d(>N^Z;g^~R_bWR+gl^R
zM^cE~E^{F#orz{vDe>{F%|!>fo^&{h{dY*D#?S$kwHGcF1%G2GLcVSd)N}}71v>T0
zfD}@FDYk5)Vk}G_k0mVBhI*dl;`H;nA2pK6Tre*OQAgpt#D+h$&ork=!Sh$%!sku;
za!ZJjpa{%x?(*G7(eQWEBx-KlH?sF|+>kP!nH!#V&<#^^QgM_8c1w_u?q#1F^tiB<
zA5Fe?Cowq<tf=zhlQQ*NiK9LM4?4OIlBVqoxnE;(a`L@`*Ny{mjjkPx_Rw+wx8Tr$
zq-R?K1q1^0b84duUazn`X-{(wb#f^i<Io_!@6H=~NWK_Wkq5L`I#<%#Hz)nPQK&8d
zy@cq62)Gx#v!$!9m^NLHThN1scfqldv)_lH;vqdvTM005e_A$;SQP^>#`Mm(cilYI
zoE&I_n-(UnRL7Pce!PSI;V&J*sq!OKWY`Mj4Kzw8VM(6vf#<45Tczj3ryc*xcb;Id
znLF>>hhsxtw=FUsHbI`TEy#r7YO-u{87t3tXUvo!$@D02D@%6rdAg5SVeJd@Hw4d8
zEmK#m<?1Y6k{a}fx}tW#!Tc76e@?*_q(UmnDXW;jeq{AdsI$S4O>BnoTH-mBm7SzF
zW}*Y3yC`@^Bl#=*m=h{I*}RCM?T}O}9jMv(?x>0+TNiyp7rl#pfPVG8`un>g9HaVb
zu*iIMPc0n?(~EF{+_lXW;{rJZ8;qtFm2C=H;T+7v$CZXG$@m=bSHb2Vg%0G7{9rz(
zEmg6IJiXt0>~po_MfJ1_?8ZikbV#{EJn`#GF3Q4RIV5@IYa{a>4f#l4tmngui_3Xi
z2uopvN8d-(6HYQ;==}{`<~`EeJj|`wnCer(b1VX3Btz8gt#(>`_bX)aGyJFe8n^Ab
zQ~O0xP=qE&0q?Sv;<Nbmam6I_ocEe{Ex$_I@LI>KNb(*m{pq+*kc(?kxn+fmzMPhy
z*mX<0tb)auK<UoH2PrtB5k(kcdfrn;;Fv{QAU5!!IGA}1)sMADoVr`OdeVH|KOH6N
zs>dY301|Qc?eQU19aXTZzYH4BQ@%=^S?VCLeu3p9<dXO#h>tcfO}~pdz)pT3X%C+)
zeDMoK6bPdf9wM9%@mTBb)35gmpdQ+g_$2LnVO3LvgaZDMApnlTVKzsgN<hNr#6~Bb
zK!brf0p~Hu0fsK8d}yQFy6cx{hwo@eDT>fUxng`ZEsVsq4>viX^y-)cG<J5q@A#$|
z0Xgy$Jt=#izJIo-eD}&G>o4_ByRVCsZYC$bgcV+1Pm+t$q#vh#KALv1dTcXRKe@*)
zz76Ppz_PyApP2&mf8Fer3VE3L?d)pQy?JOGlZF)t0do9s(!<^+SPOD)C}J3&41{10
zK|9y#DiaH4Ttq5iOe!orH&=R_`;?-&$&lMekt?yL42LB<c1HallOFEO4lb9YU2nuO
zPcSw2K{d?IsS8h*z~zso1GNL|pemS1A;h1{>nSm2A$-k}lj!I*Oe`iQ^`?E-*gJX2
zT$LhJ0OxLU6MWIO4JX&Gw6H<x%K-$mZ0H~BKhm`Goc0+WRunTsNTnN0NHD(_$#v^q
zElzxnkUSPAp@woj)9$t{yli3e114^9$=|$<o+Wo<%iqX~E{CtKM|g#lb$eX*Q$OYF
z*RAKCj98~HL7%xbK+<nM2jx%PwLE?=F77om07k&>iY4HvO;|N=78~o-^J*vH*&&q%
z_d^h{Pp_o+%-Q%TnHQ@2^xHbB!ftzV?=cmXu#=l)@|5zMz0JCbemsc!tGyx*)+E=+
zFYyR<7bMlZlkuxc+Jsdzp)MbR)p6s2FWnD=!EqP4B1?;3Y+l{~H7Jorbtw7%_l-zb
z0ONy1GJbrKv)Tlh#jduQg2S<AM}fTTlaMwWFFE^yCI$z&lxu(e176g4zLK^dBSqki
zqx?Vj#gT$Ai#5Uw=*{n(gpFWa2I5-bHgJIOJZmk=BqR;vX>6Gm!0&9C=0IX|j!~Lz
zcpx;-TAOkij6kp}H#_E+W@1kEXv-rg0M*-1i`&ZKR;S$|E_*{Ie3>nfG7;^zC}{Oj
zzra>p(6(qe3jwp3&w%FIRv^Wba|^2iZ+LN(M!zXyuyx!se7}KQX=K%EgC~;@gbh+I
zQ#tYpk0Nv%7?P60INzYb)EuI-ExH6TYQ;tuMBNIJpyXD;Ic0(l;+O{y2Q#|?+8kQa
ziyUP${BicE0|!y33<1{QIU`X~JQU&a%4pH*F>~WSwv$kW%#ekg0o7Jgwgar3SW6_G
z@TuRF`8dDD!0qZw{Y#@?nM;G0Fr<M?b;O*>;gSVKI!joGz$sIq7q%0&Rcpl>gwLoW
zIAxNxScj^Of1iUl*9thH0chcTpZkM>KA@>*)HdRc%B8F%RLrbVP8r^+l(^0zUS%b9
z%7pe;Pd*izf?F9rDcV5}wJOm`XJ4Azp#-x*j@A|w@4EG{_;hl#L<84e49@OmYO7mM
z)S7(iNFgNvZD1-X1%y#67ijYrf$-{5YnDN+Fc^W!^|>R5ak#ez;8+PZ(-;Xfx2k||
z2te0(KCKC19yx1b7^VcAfb0CTBQyI;%Y->&v&v7&63v49)N;mV1=#|Xhhm#J6178^
z5N}Uf7#S`27<0%8CF7IWbpdGmvqbgg&Ya%V$q7+9Wtpwz5~l)%{)iq%TTH#Fc6KLd
zUfOouyHwXec69(Q<xz_6m}4$Ps~3XaZ@Oj`)9+c_{=un)P>w2uFgPnnMf^*Tn8@}h
z!80|rngy*YAq>PJ0;5zGpac>%Yl|=zC3Filw+%9}GlysxuNn1!wgPz}X#M6n8K}&v
z&@YD7>JTrWp~cfO5`dd~X)O}ZZN}j+EEjXih0qp&0C<Jsb35DxGw{Owbi@ve7K8;i
zFxBCzSY(s1Im4>>tN8b<GX(1YxXnFGOfYLf&M0cVz<u?!$EH=FSdLaKNhR2xIHYsB
z;(8vrN*T>omXlzfmzv)(L?9b3NhL&pms(Txl)d<vQmyS@rB)Y(hRh>o@G9fy<uo|}
z{h$7zf-Jt@DeD5#fBmLW&eG<t|0ZUAv3;Dxa~e=&k11F_^}?uESmiT&O1#G%bOab0
z_Hd`~PRZZl7b5zu+xpFavZhDtS=(wYV1m&%k_8|<_{q-q<4a0?q^h6ElIf0e>4LYr
z+K+a}5A~)G_<t@0EHE%IIIu{SJ+bB+ygV2L{q71>?Z0^*Gr~W49)Op{*U2$XXCpqF
z4K1+#CqOKSwQaLFaVf%TNujo-%HQuHRDKSkY!$u>u#G=89jxOQHEuMMgHKB6jp|}&
zv8hLHk>@wW?qt!xv}2x=D}3|1vY5`z9$um^hndHo@PkvF<RM@5T*2f=G@|7KSh$k!
z0fluBhzZ?DPvP6R2Ouqkc28P?`i*%eZ46Onkbz#AX{9w?M`1sfF5Jlt6(*sG&rFuY
zNHa|yTB9LcVTYB)jfJ44?TY0`Ljm>O`qgiBAqLf$<0;v<1wOj=og^;EJcH=<_Q^QV
z{EJc;`rJ^1hQSY$TUM|fNe@;xjLFBUtq3$Av5J10O(r7e7{DH<8=RjpM*fq5N;N@C
zqiI`P@XAQ<)fjIO%k3;KRGP%kv$dQXJOKNe)~57Cn6UkjHK(^|-|z&Tuu*RSf~ZH_
zyn{WTI!aarW#Y&bI(in&4wUhJ4D(r;Jnms0&Q!D_^&<347<sdogly+1>i3*Fd>jLn
z%Q6kk{-jOg1{mpSCRFVEos{YfiIy<c=-Y=`0o5x*P&^ftw9sbHtc?xp$$Ag~fdKnO
zO}Uz8=O-A$Qmv-Blg5{_eTZxUVj|L#*;7xwY|jcG-9x`z1c%(y&ZC=)iN1zY{N*xt
z*_ZvibT5V)<tm4|i|Ghu^+A)FWn!Pz<yHr+$n`=6N<hWJd)-bcI4xc|Q1gdr&N;*#
zPQf*LZ7OODS)c#LhTvHQo7a#z(Jr5d@JN2N{t5eNWkxB9M^>~xh#kjsp%wBp!xpyI
zUl6h?(rqZXLNp%FjA#@cGImiG-GGp6yEV?Qi_vyz15fF6PHHD<DDEyY!g97i8|rYU
zKfe%A1Ax6kVGx|@+zP4sY0h9%Jo>}{W8c#0z8TUKkI7e8yq{BMvB@LjfRv!VI9EeV
zZQzzdcmB-@^$K+Yd1Gmx-{E@6_7%;zM~4vQPRgm}!QSV`5>cvQy>MdIcI3%X`BH>K
zVeOVYTy6JySRTqm?Fz~F)k{fF5aY#Y<(o<|ftl#n5boE7Ye|QM?SjiN_p`UoY_W4i
zQj0MchTg@-y>gS1)8wh&nePR|{4?Q64RAlrba6cjO@OBf2mBg5Chg%a!Kc>{+vZ3!
z`Em90-#ymeLc%J)s-~j596d<7e3CZzQ{2KJsQKscNFacLsjC5d=;;Ax{vbs%F#@Ot
zL@ZmxFh+HQBCJZal&);DV8YQYs&9x;&SyNxb6g>3B0sZvm<cGOaz!o27c@U5W~UN!
z@a^d4>!{qjgNG+`UU`p^zC<`0iToB^K%OLB&)Y~z%}r*~ciuQ#b*`uXJjqh87++vx
z+lv3~Tep;=T3h(l?{WjMZI2YDIoj#(s2>8wv}vv>f)d*A+{ouhY8dFzzK_g=d*LbE
z>jL9?`WQVJ;*yz5PH`$I4brN@dM!Jj2p@Fr&5e-Xz5|F5V6B?~%wQgp&R6^CkEj*j
zA1)?^S8k^%VYP&>&(Oc{8JTUhZS?Tob@rn)F!*oPZMEWXX)yq#w>!-#FMl3(M+lx0
zzMIj3x|0aGtc821k_1_Oc8VwzhfdN~z`5%bw}C8yp9`f6Ucae5-xeVP9=29wO|CRT
z-ga<A+gZkk<*+7obB`6jf4oiyy7xuvw+|~Ax68AXXh>x1QlxZhW;G|6?6jNq{MeKW
z%=-*&S`9#d{MH31%#C_Xr_)3#?pitVXF+bN5=)s+?H;*8{vGjKj8|PPd_8afSp&>A
zl5U@|Zmmr&=K8rlU!*6-kU0ATO#q(!r>7^fPf~;RHcVepj5LL%iiTZj3GMOXX#Vtv
zXTZY}to#k%GG$3{A6l=^&lKchs81wFHv>E5WhW3bBh)fL%nZ5NAia-z8U1zHZVUZv
zh9Dj+29Y_HiJF<kQHLOGfX!DM^1T!zlfyU1?@&2=RDQ5-UtldOcU;~w2jBZQx1wRF
z!t`9MJv6_Mu`$_r3mUClK`Va_TMrU6fo>ISDaiW<8;9U&Tfn%JDrlqmqN7TAf~9AO
z4X=>?40!{9VSbOJ6$*L?EgfJuoHoRXaH#FW#Rr+_?d%Sq!3ekR4_O*3OAeB?H?0J_
z`ItS|fzxXEem(aD3nRlNL03y>O!j6pc>H>+rS7IIFUxjE)D_lp0&<Otb4T>N*FhW?
zMsQhm9u;UbV>0O<tfeS+H8{ku1{vJHq*+zMyg316ms2@jHsWh^4(Du%on>*ziaUk%
zBVX^8_u2mZ##<o_4`7l(aJ(xqT(4X{yU)_7T(b8v)@)_%MY=gNs5Ma+k6S1!?6mEL
z*{eQuudVs1ZM^1*0C(szKGl@tl!5=88J?MxFQ0K;@a49<BiZdgmTJN}Kl24Zg$<F7
zOc0H^&A}H88zK0X=U+&ex0%cTYdc~_1~)^dTx8?C;e_X;{QN}X3>pg`U8kJA><dlD
zV%aP3B6hc{-__d!%cBhJ@`(+CbP3L5=q3xsF6x#U<q61h5OCFtr7JR(f=9G&pjl1{
zv(#IRUWOfr{27S-4k(0BlTwz%r>Aca(aTMND)24wQ9!UbuqW&XOY)(h53IIKcxk-8
zX3J_vdUms<*mEu_rp4~AO0V+QuSLr*=Von^#F7x`$m0n|lI}#~fTEWiQ>z)25n#_*
zmWiOqjYASwAjFS81~u--nKAQ?><`?vjZLI-#dz0Iq3d-f188b%89Ph#;?4Uy3G>P$
zwH_$mHC8p-KYG?}>Yh2c2RsqSyPWuEv{P&Vn{k}&@fuI^>H3V3#z?lr*vzBFk{K09
zsPdgOv;oMAjRDTv?&e<0H;`R%%ibHV_DRrdzzZTn;`*TaJ;uzi5D)v{uS~f)AqaPl
zq`GAOLDUOj02BY|M~G_T9b<fIw#yFfVZ`6K65174)nTcq<$JZnxC4~}znI<0wX6jg
zH4HZO<=;$+?-Q7|`wXLPP1#$wI`HDuW!m)!IN{MZl`$#I2+OOWNIiZ#Lc+&f(<>O`
zPL{KU`1W%}bTlBAu`8Xyal@do4l<_`^28WsB#m`M04jb)`{P(O<~*^<OUj{Ea&Hb?
zMUU$s0M+^vxC$i*42y1T3gHB?_T|DzwCKmQ*64>*d{ioxgom|UT~Y3_tj7KbL6e|+
zYsrNwrf{@o{7EUvg4JhZW#EuTL9w$<rv<)Gi{>`|4y$x<&CsOIT!4w>*G{e^cFj<w
z)-E$B08F@nw}fjXt1_G8%H&XEU+B~566Y)>6OtXsE25+uxy{t38G&YiX+$iyhQ4}6
zN3A!m?Nd&_cUz{M&duGTxMl!4kv{eARn&xT+-;!9MUKBPXzlEPTK*5<UT-dws7(F^
zmc5Qz;heO;;5Y>Oe@31?fWZ-{e2irr2<>m<)bl2xc)K9~D7|t5Za8nx!3isn(EeRC
zvx>suevU}hh@G?fWXXloASXRucsmGkxj(}Rf}R(}QJ%h~S!pI+Vb?oay0paf>1Zd*
z3nH6pj3?#W7S5W0as}y#Ktc9e<iMpw)N5$?uLGxvec6OE)L$X90JU)6w0N0T$X9;&
zPV?g#i2htdRnl$z-q-52$lkayHHspuC(wak)9+r=SkiY63Nii=j2$1ZBlx`cYk0WK
zuQ-U}#gYnPrb3zJ_?(^ZC3nqoSu^T;KKMuUQT|BC1fuG8zLswg(*Wn$3z5vXqaZ5S
zI2$@-za^1%WUP)?K+J6U@%Ge3uITGk?r$Msf-h?RKLUMBjt)!#*}2`M@KV(I7=4bp
zWG0J|0Aj$^$HC(lV8RE<d?CfuTvA)%F<0)_uRN~@sOZpn@K$o+7x^MjSSi_?U;7j#
z6@_Elo6tz5a-fvqF|IxFDb?^miEwjR7}t2};pT`@1$J^nfI&(05oW5;GII0;R61XZ
z710jC9^zuj-Cgihp^$?=lX?gVaK5WpNjaZ~YtP*o;iFJO&+u|I`M+}Bo<E*uE=Ss2
zltn%S$`0KM5g?_>dc|U3Xp|DQ&GYl#ZXMlktL2D-yvxXGSl4GDgT8*cZRX7qRH0$)
zv(D^42oY$J0|;z*w}W0z%#{W##j!2S-|o{F0h<u938cTW18?T<x@YMf`{8DgC5$Rc
zFXf=^=m|*}*+{UZ)J>-&MiXd;RIRxQNi^AtFl{N>XfM(kP?>x+4g1LE8QBSin9766
z^Qkgnm5Oxf2t`Qk28_~9uqR;R@rE2M_*g8cRfKk6fa4r=%%fF#u#73l3Hqx}bY{T6
zoCsN#KlRuR@^=bTFq?f52Dmn|A-ZHVCBF(>yn!T~+yF%O?0;#_`rkLD>eYCJ+$Zrm
z?(lIU9>8C|68*9yNjL{LC9Zae&)G5f+DyN=PrA2aLiS=_z4C|9Bv_xz+W!r~zZPzU
zKG@Co!p|Dc1-!qW>*l=d?Pxa$6y$1K@y)=lS7(m9+NdJ^5f#C@8w7AQ`>AMOd5<Fn
z6X>Ai@+dWL`X|7<)W1=srvuh-13S>?q)+$qZEjWVx%$pP(?;d{i`*+kh4RO!3|8cI
z8`$Fq?En7+(@neliUSJ<mH{N;A^~U;%A)m@Gkk_D2;)5MC};$ux@ioP)9YsDXi6At
zD2Qpa#9%r@P|g{0z+Epuf<wH`L1stl$zPc|-cMbO1IUH5YNe;@tjZN&?Oyn|-n|}e
z-*$UFnkiXJ3jW-`(hylb$`Df~&z?W}2F}tD^{Rf}Y(2)K>$^P*)#>-DW&vE8<eK((
z58Ae4C!07zn?(Euu8q_oL<Mr2UOTvslP{kklTqna-~0K~Lq)@8bKJ@3I)rXK<TZ|L
zavx=7N%@YAO!6&<&hsDXG2>q?QHdyTMJ~5*7gXP@{(PXukGri2^4BT(3-7B~yKjyM
zU1R!*>y&hC8+jzlW!`rQc>|84bu&}{z?tMzoF=A{nV1T_D;l6Bl#xWyZY?8Er=LXP
zIHi&SOGc5CAT0t6$|1W}C_?_!p1vCLK-KCj>n^T~XL#Eil*=T)CdSWeLEbQ|F`l_#
zY*tj%n<Ck(r_j<`W3aAyXx>LqDWd6<5623R5(l1$F-mMNkIU$7j{^pGIi_onwDW~m
zOuS#TPYQ{%gd=T}iNfV7Ii_fOtMj&KDiLluK_gIE^v-FD62BFywTJOM1?lC6$+v>T
ztLp1cyBH$|-}0uhI=;`f3MfH`51!D{_wrE0|H>PUM3B;Hne6n|Sx8Q&@<K{N^ju=g
zs}gIMXwvn!b;&?zng;}*(oneznYDN$FsG)VvR%%ZgxcIrItP^CnzV6sqct%5*LovI
zR^PQi54Q(qK9on}=HhJxp>Xo3ZG=oJv;mJ-Fs=EV%b9$8?w1wLK-e3Gu9c?7;4%2i
zQ6;j;Oc;MI6^h9DnB5cjJ*D|)=1IAe!WQK&qEjdzboe5XdjK71^5q~x#Wu1HhCLX>
z#KQ8g6b7YTU%tb?ndyrQI$ho0BdUWX6MDAUmBTk?MEfjpHyMRGRg;JJJ@1*hGde9u
zx%4bM5Q-=+o>al#)FE|AOJ(?So6s)5z(c(|%cq_D_lh^sW97N#;m@PNgytayBbToo
zH*MI9*Gvrne*v((+~>@A!<Vq7%H)ooLcQUhr3m^7<SsbJxP6#f{(OrIcXM*6IC#z+
z4J$rOC55GK+djT#XlMFf<~o2{LjS9eE4#M{DbJ8hVE=J8`s@2zgTIqnfc~|C0pePf
z<k9zoVmu?Ff)cfhRu(D9L0hWa!bm>5HBX#FSCn}n6-YpuUU-_^@@YC+eBy}!N0L_P
z!P4wGR64mL?GFsHg#y9Ji0H}aI2;qgmk$o@1V<*exfR593mik-pAYf}8djlt=%bvv
zl8iWx#p(WZ3VZeBnDdf~CvoG^7XwSsl_YcS$P+H+)*D4#J`-s%e9dP2B8U<RQPtx2
zW6=<s-{Szm{km}EK-+kF$wVVgGO;I(Z6QhA`2e}&c9CS&AOz+GosibHI}4)T{R_xl
zOk3|O!KjhKrg3L%yAwjc3Y)tD5r&`6-XM1fb1Tb*pYcxU${(l+Q>{+^CD=>O&0tAr
zw~P~M_<`qx%=d@TTnSgS7oK#A+t&DomgvdIBh7#fDDJr0Y~lx-8XZ%tZgWHRdYG|S
z3}-!xH6&6OIwrJg1|8lN*<yI_8wMFg>>vn6^9tiY1m>t{+s<h7vsPvtInF6eD}#bH
z%|T<Ms2P;bstI0^bw#$wa_=8C)FykwozuKy1uosRjgncyA@|ZV!KLyK>;AN1(@Bk$
z3_k$tMVIw<rE-?IP@EfK9XPd;rIZ3OVwMh;F0)v6c<3#+?BQD;*u7@Hq7eu=OK4}<
zqVU8q$yB<-5wU(0_AufD9yA<{!IrRN+DQq+52r;N9pZvE5q^hW+3Fg#SCTjV3$kM-
zn5Vi8X=IJoCysd8x-OAtzf#7FtZ_J+pD_Uu%{TCjmj;l-8Q0kmT5Sc*@sTx^PF(Gp
zo5A|^FaFpLA+-7W)3W0-P+_4cH&TB?HCy?*$yRlHq$R4lXDsqpl9ZO90adx8DdV6i
zTUq3wR#3>2FCubPgkZ;UbFnUXk+jM72qO(Kp`P)PvR_#*85oFS+>7r>I)<t8o)N$a
z1qXTSchx~mUix<Ijb)ln$E0xc;Q+P~q_lND*8)<Behz_vb0?w`f+%86+tfospWUGD
zM}}GfrNhgGuhHRC_;m&9eR*R(kD`G7<ITTzj%t7tTmIw|eCRj(2>s{%tA4XSJ{}h8
zd7JN7a>)v2ldM@)OO*%z=INYs(qe$jAPB|MQVS(Nag)fUposA!Q}leGct=sqYB=@0
z(qSZiBc^&2C^lEU+S5g5c*!GK#FKV&MICh@M=t5U0XZ<5=}+|b%s+8B(w<U*)kg9V
zJQ893`DMa5yWLQ!@VE%0859HM0Tlz)Bbu>jK&84L|1z4QnwRfIpL`r8NXPZQ5AT0%
z%9S+lcuP@OzI&`cUJLc!9zT0`I1=?)qx^p_Pif(gPA;ITAQ3>_rAQ1dsQ2Ila?PhJ
z_-~0fPHUXIGETj&JHTEC&r{QE{6d2}{q>Sp3}oa$ke`;Bdzqc-VuQc+r}?KZbY=UP
zu!V8vP_PgN`z$ZXGd@hNg9Y96O-3mNYyy#3Qug(uOL1-@s{^?S64h9$Y^wpTq=I(K
zx7bQXb+LHfs6+t%qU{8-_BSY;YUbb>4f|}He4E(g5_7x>MLwzIE4VTW2F@`rNeXgn
zf=OLN6FLqOYN2nVWt3sq!;q5=7l8_~DfGfI9TBUP#$3ZFzlc%Tt@NL$Rj-%Nvv>;k
zHGzmxGE3)_k-7elx@C>~eoWq~Ld%8;tB`GxT5*@KSJMEU;+j@LG1?d|z_-L&_8N<F
z<`DxNt2$N6dIyyE<0WysF;}QmdmlZ0(n%usw?v;t?WC_@O1s$52&m94VqrKHGjHH6
z(XO^mV)f7`dE-rq6cD8b^ffp|J}`|8EBWHyhzDQc4eaO))?EE*v0uIf7oz>9N;p;u
zJ3x{JET95LT_sQ$sA}ugp1+sQOAsun!#j1P*>!0{{kiX6xVKA54me1-G<vmJ0SR{Z
zAqWUhatrosUwY-(&3VBr-+BKn1tkP@*W&?ICv&gm5U4Q%v7=&n0^WZ|>8-TLKrWUJ
zrSp<-I}T0|{_s<sDRKMZGz)-_n6z7(AbhFr!|vgE!(u@~Az?-O5ttEqi)eZIW%pLo
z)$YpbLX|dsR5fjK{L=N|EF&}zJ7sUmjXNG#KAOMvL<;PuAOHqSKsEOX$3cNF097Q!
zAfQEni4q(T^di6^iRAz3Ffo+W0_OoXNQ!|c1Ft37Ak;;Hlv3OfzM?>OQ6iwX6dK|G
zrg4~HVE_ED|1-eB$o`@cuuzJY_CMc!U|`7qEdCw;y?#j#2IlL?>f!0<Xzc+slOO}4
zN~1s^Py$J%xgppofjZLE(ElCh!P3~^CBQUkA@FA4qO>5yHWbhe6&pw`!wOLW_wUp}
z2Ak+VT^nFvc>gW*KT1J}|B@OIp@FS34B#ffT^UBA|E&k(|6lqb#=mr7SyqT$ynm-*
ave-obDHi-+K7jOJ(zq-(OoYTg!v6(}02a#t

delta 9104
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

diff --git a/Assets/ArtRes/Excel/~$Config.xlsx.meta b/Assets/ArtRes/Excel/~$Config.xlsx.meta
new file mode 100644
index 0000000..603c152
--- /dev/null
+++ b/Assets/ArtRes/Excel/~$Config.xlsx.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: bbaeff621a49deb45b058390ad6519c5
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Resources/Prefabs/Objects/Tools/Tool_Electroprobe.prefab b/Assets/Resources/Prefabs/Objects/Tools/Tool_Electroprobe.prefab
index 66befb5..b428c5b 100644
--- a/Assets/Resources/Prefabs/Objects/Tools/Tool_Electroprobe.prefab
+++ b/Assets/Resources/Prefabs/Objects/Tools/Tool_Electroprobe.prefab
@@ -46,7 +46,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   toolId: 0
-  toolOrMaterial: 0
+  toolOrMaterial: 1
 --- !u!1001 &7874918607128331659
 PrefabInstance:
   m_ObjectHideFlags: 0
diff --git a/Assets/Resources/Prefabs/Objects/Tools/Tool_InsulatedScrewdriver.prefab b/Assets/Resources/Prefabs/Objects/Tools/Tool_InsulatedScrewdriver.prefab
index 10d25cf..d390180 100644
--- a/Assets/Resources/Prefabs/Objects/Tools/Tool_InsulatedScrewdriver.prefab
+++ b/Assets/Resources/Prefabs/Objects/Tools/Tool_InsulatedScrewdriver.prefab
@@ -46,7 +46,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   toolId: 0
-  toolOrMaterial: 0
+  toolOrMaterial: 1
 --- !u!1001 &8382786867262178121
 PrefabInstance:
   m_ObjectHideFlags: 0
diff --git a/Assets/Resources/UI/UI_Panel/UI_LoadingPanel.prefab b/Assets/Resources/UI/UI_Panel/UI_LoadingPanel.prefab
index 66dd59d..9b261b8 100644
--- a/Assets/Resources/UI/UI_Panel/UI_LoadingPanel.prefab
+++ b/Assets/Resources/UI/UI_Panel/UI_LoadingPanel.prefab
@@ -104,7 +104,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: cf802d021b1c3774c97253ee50d9710c, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -204,7 +204,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: f183d6f3c19e2fd4983977a2189b3704, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -313,7 +313,7 @@ MonoBehaviour:
   m_MinValue: 0
   m_MaxValue: 1
   m_WholeNumbers: 0
-  m_Value: 1
+  m_Value: 0.714
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -452,7 +452,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0, g: 0.33962262, b: 0.27345648, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
diff --git a/Assets/Scripts/Project/Manager/GameManager.cs b/Assets/Scripts/Project/Manager/GameManager.cs
index d5615cd..4b52171 100644
--- a/Assets/Scripts/Project/Manager/GameManager.cs
+++ b/Assets/Scripts/Project/Manager/GameManager.cs
@@ -80,7 +80,21 @@ public class GameManager : SingletonAutoMono<GameManager>
     /// </summary>
     public static HandsOnTrainingMgr HandsOnTrainingMgr { get; private set; }
 
+    /// <summary>
+    /// 学习或者练习的管理类
+    /// </summary>
     public static StudyOrPracticeMgr StudyOrPracticeMgr { get; private set; }
+
+    /// <summary>
+    /// 背包管理类
+    /// </summary>
+    public static PacksackBagMgr PacksackBagMgr { get; private set; }
+
+    /// <summary>
+    /// 工具材料管理类
+    /// </summary>
+    public static ToolAndmaterialMgr ToolAndmaterialMgr { get; private set; }
+
     #endregion
 
     /// <summary>
diff --git a/Assets/Scripts/Project/Manager/PacksackBagMgr.cs b/Assets/Scripts/Project/Manager/PacksackBagMgr.cs
new file mode 100644
index 0000000..37105e1
--- /dev/null
+++ b/Assets/Scripts/Project/Manager/PacksackBagMgr.cs
@@ -0,0 +1,10 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+/// <summary>
+/// ���𹤾߲��ϰ�����
+/// </summary>
+public class PacksackBagMgr : BaseManager<PacksackBagMgr>
+{
+    
+}
diff --git a/Assets/Scripts/Project/Manager/PacksackBagMgr.cs.meta b/Assets/Scripts/Project/Manager/PacksackBagMgr.cs.meta
new file mode 100644
index 0000000..7c59bcc
--- /dev/null
+++ b/Assets/Scripts/Project/Manager/PacksackBagMgr.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 65b74ada67aa1084f80d58b3d6f2f71d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Project/Manager/ToolAndmaterialMgr.cs b/Assets/Scripts/Project/Manager/ToolAndmaterialMgr.cs
new file mode 100644
index 0000000..55d5d0c
--- /dev/null
+++ b/Assets/Scripts/Project/Manager/ToolAndmaterialMgr.cs
@@ -0,0 +1,10 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+/// <summary>
+/// ����ʹ�õĹ���/���Ϲ�����
+/// </summary>
+public class ToolAndmaterialMgr : BaseManager<ToolAndmaterialMgr>
+{
+    
+}
diff --git a/Assets/Scripts/Project/Manager/ToolAndmaterialMgr.cs.meta b/Assets/Scripts/Project/Manager/ToolAndmaterialMgr.cs.meta
new file mode 100644
index 0000000..c74b9ab
--- /dev/null
+++ b/Assets/Scripts/Project/Manager/ToolAndmaterialMgr.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 460bb2208a770274ba767fc886198034
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

From c05176ffac9aa05135bc46dc288ec6fe71e9f55e Mon Sep 17 00:00:00 2001
From: liuyu <272912176@qq.com>
Date: Fri, 2 Aug 2024 17:55:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=B3=E4=BE=A7=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/ArtRes/Excel/Config.xlsx               | Bin 18503 -> 18530 bytes
 Assets/ArtRes/Excel/~$Config.xlsx.meta        |   7 --
 Assets/Scripts/Project/Enum/Enums.cs          |  18 ++++
 Assets/Scripts/Project/Manager/DataManager.cs |  20 ++--
 .../Scripts/Project/Manager/PacksackBagMgr.cs |   2 +-
 .../Scripts/Project/Manager/ProcessManager.cs |   3 +-
 .../Project/Manager/ToolAndmaterialMgr.cs     |   2 +-
 .../Project/UI/UI_Panel/UI_MenuPanel.cs       |  91 ++++++++++++++++++
 .../Project/UI/UI_Panel/UI_MenuPanel.cs.meta  |  11 +++
 .../UI_SelectModeOrDeviceTitlePanel.cs        |   9 +-
 .../ProjectBase/EventCenter/Enum_EventType.cs |   5 +
 11 files changed, 145 insertions(+), 23 deletions(-)
 delete mode 100644 Assets/ArtRes/Excel/~$Config.xlsx.meta
 create mode 100644 Assets/Scripts/Project/UI/UI_Panel/UI_MenuPanel.cs
 create mode 100644 Assets/Scripts/Project/UI/UI_Panel/UI_MenuPanel.cs.meta

diff --git a/Assets/ArtRes/Excel/Config.xlsx b/Assets/ArtRes/Excel/Config.xlsx
index 14c62769f324876c2241bdd1eb2c47a3dfb8f6f7..22b8b03c4f5399cdae71cbc9b2c402c1f105e8d0 100644
GIT binary patch
delta 4620
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
Xz&rX{K+s=~yMK1=pQtH;|GoVW3m=$Z

delta 4560
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

diff --git a/Assets/ArtRes/Excel/~$Config.xlsx.meta b/Assets/ArtRes/Excel/~$Config.xlsx.meta
deleted file mode 100644
index 603c152..0000000
--- a/Assets/ArtRes/Excel/~$Config.xlsx.meta
+++ /dev/null
@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: bbaeff621a49deb45b058390ad6519c5
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/Project/Enum/Enums.cs b/Assets/Scripts/Project/Enum/Enums.cs
index 8489dd2..8522d89 100644
--- a/Assets/Scripts/Project/Enum/Enums.cs
+++ b/Assets/Scripts/Project/Enum/Enums.cs
@@ -144,4 +144,22 @@ public enum E_MessageType
     /// 错误
     /// </summary>
     Error,
+}
+
+public enum E_SceneType 
+{
+    /// <summary>
+    /// 办公室
+    /// </summary>
+    Office,
+
+    /// <summary>
+    /// 工器具间
+    /// </summary>
+    TooLRoom,
+
+    /// <summary>
+    /// 现场
+    /// </summary>
+    Site,
 }
\ No newline at end of file
diff --git a/Assets/Scripts/Project/Manager/DataManager.cs b/Assets/Scripts/Project/Manager/DataManager.cs
index ccc3a82..c160435 100644
--- a/Assets/Scripts/Project/Manager/DataManager.cs
+++ b/Assets/Scripts/Project/Manager/DataManager.cs
@@ -32,7 +32,7 @@ public class DataManager : BaseManager<DataManager>
     /// <summary>
     /// 虚拟仿真系统
     /// </summary>
-    private Dictionary<int,TB_System> systemDic =new Dictionary<int, TB_System>();
+    private Dictionary<int, TB_System> systemDic = new Dictionary<int, TB_System>();
 
     /// <summary>
     /// 设备类型
@@ -52,7 +52,7 @@ public class DataManager : BaseManager<DataManager>
     /// <summary>
     /// 初始化
     /// </summary>
-    public void Init() 
+    public void Init()
     {
         schemeDic = GameManager.BinaryMgr.GetTable<TB_SchemeContainer>().dataDic;
         processDic = GameManager.BinaryMgr.GetTable<TB_ProcessContainer>().dataDic;
@@ -68,7 +68,7 @@ public class DataManager : BaseManager<DataManager>
     /// </summary>
     /// <param name="id"></param>
     /// <returns></returns>
-    public D_Scheme GetSchemeData(int id) 
+    public D_Scheme GetSchemeData(int id)
     {
         D_Scheme d_Scheme = new D_Scheme();
         //获取方案数据
@@ -86,7 +86,7 @@ public class DataManager : BaseManager<DataManager>
     /// </summary>
     /// <param name="schemeId"></param>
     /// <returns></returns>
-    private List<D_Process> GetD_Processes(int schemeId) 
+    private List<D_Process> GetD_Processes(int schemeId)
     {
         List<D_Process> d_Processes = new List<D_Process>();
         //获取方案流程数据
@@ -114,7 +114,7 @@ public class DataManager : BaseManager<DataManager>
     public List<D_SubProcess> GetD_SubProcesses(int schemeId, int processId)
     {
         List<D_SubProcess> d_SubProcesses = new List<D_SubProcess>();
-        foreach(var item in subProcessDic.Values) 
+        foreach (var item in subProcessDic.Values)
         {
             if (item.schemeId == schemeId && item.processId == processId)
             {
@@ -140,10 +140,10 @@ public class DataManager : BaseManager<DataManager>
     /// <param name="processId"></param>
     /// <param name="subProcessStepId"></param>
     /// <returns></returns>
-    private List<D_SubProcessStep> GetD_SubProcessSteps(int schemeId, int processId,int subProcessId) 
+    private List<D_SubProcessStep> GetD_SubProcessSteps(int schemeId, int processId, int subProcessId)
     {
         List<D_SubProcessStep> d_SubProcessSteps = new List<D_SubProcessStep>();
-        foreach(var step in subProcessStepDic.Values) 
+        foreach (var step in subProcessStepDic.Values)
         {
             if (step.schemeId == schemeId && step.processId == processId && step.subProcessId == subProcessId)
             {
@@ -167,20 +167,20 @@ public class DataManager : BaseManager<DataManager>
     /// </summary>
     /// <param name="systemId"></param>
     /// <returns></returns>
-    public TB_System GetSystemInfo(int systemId) 
+    public TB_System GetSystemInfo(int systemId)
     {
         if (systemDic.ContainsKey(systemId))
         {
             return systemDic[systemId];
         }
-    return null;
+        return null;
     }
 
     /// <summary>
     /// 获取报告
     /// </summary>
     /// <param name="id"></param>
-    public R_Scheme GetSchemeReport(int id) 
+    public R_Scheme GetSchemeReport(int id)
     {
         R_Scheme r_Scheme = new R_Scheme();
 
diff --git a/Assets/Scripts/Project/Manager/PacksackBagMgr.cs b/Assets/Scripts/Project/Manager/PacksackBagMgr.cs
index 37105e1..f384ad5 100644
--- a/Assets/Scripts/Project/Manager/PacksackBagMgr.cs
+++ b/Assets/Scripts/Project/Manager/PacksackBagMgr.cs
@@ -2,7 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 /// <summary>
-/// ���𹤾߲��ϰ�����
+/// 负责工具材料包管理
 /// </summary>
 public class PacksackBagMgr : BaseManager<PacksackBagMgr>
 {
diff --git a/Assets/Scripts/Project/Manager/ProcessManager.cs b/Assets/Scripts/Project/Manager/ProcessManager.cs
index 734461a..1618e2f 100644
--- a/Assets/Scripts/Project/Manager/ProcessManager.cs
+++ b/Assets/Scripts/Project/Manager/ProcessManager.cs
@@ -104,7 +104,7 @@ public class ProcessManager : BaseManager<ProcessManager>
     /// <summary>
     /// 倒计时
     /// </summary>
-    /// <param name="time"></param>
+    /// <param name="time">倒计时多久</param>
     /// <returns></returns>
     private IEnumerator CountDown(int time)
     {
@@ -118,7 +118,6 @@ public class ProcessManager : BaseManager<ProcessManager>
         }
     }
 
-
     /// <summary>
     /// 结束
     /// </summary>
diff --git a/Assets/Scripts/Project/Manager/ToolAndmaterialMgr.cs b/Assets/Scripts/Project/Manager/ToolAndmaterialMgr.cs
index 55d5d0c..1d441de 100644
--- a/Assets/Scripts/Project/Manager/ToolAndmaterialMgr.cs
+++ b/Assets/Scripts/Project/Manager/ToolAndmaterialMgr.cs
@@ -2,7 +2,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 /// <summary>
-/// ����ʹ�õĹ���/���Ϲ�����
+/// 正在使用的工具/材料管理类
 /// </summary>
 public class ToolAndmaterialMgr : BaseManager<ToolAndmaterialMgr>
 {
diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_MenuPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_MenuPanel.cs
new file mode 100644
index 0000000..fad6476
--- /dev/null
+++ b/Assets/Scripts/Project/UI/UI_Panel/UI_MenuPanel.cs
@@ -0,0 +1,91 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+/// <summary>
+/// 右侧菜单按钮
+/// </summary>
+public class UI_MenuPanel : BasePanel
+{
+
+    /// <summary>
+    /// 存储创建出来的btn
+    /// </summary>
+    private List<GameObject> itemObjs =new List<GameObject>();
+
+    /// <summary>
+    /// 初始化
+    /// </summary>
+    public void Init() 
+    {
+        CreateMenuBtn(E_SceneType.Office);
+    }
+
+    /// <summary>
+    /// 创建菜单按钮
+    /// 根据所属空间创建 对应的按钮,
+    /// 还需要根据需求设定是否激活
+    /// </summary>
+    private void CreateMenuBtn(E_SceneType type) 
+    {
+        //清空已经穿件出来的
+        ClearMenuBtn();
+        //获取所在场景中的btn数据
+        switch (type)
+        {
+            case E_SceneType.Office:
+                break;
+            case E_SceneType.TooLRoom:
+                break;
+            case E_SceneType.Site:
+                break;
+        }
+
+        //根据所在场景  创建新的btn 并记录
+    }
+
+    /// <summary>
+    /// 清空创建出来的
+    /// </summary>
+    private void ClearMenuBtn()
+    {
+        if (itemObjs.Count == 0)
+            return;
+        for (int i = 0; i < itemObjs.Count; i++)
+        {
+            Destroy(itemObjs[i]);
+        }
+        itemObjs.Clear();
+    }
+
+    /// <summary>
+    /// 显示面板
+    /// </summary>
+    public override void ShowMe()
+    {
+        GameManager.EventMgr.AddEventListener<E_SceneType>(Enum_EventType.SwitchScene, CreateMenuBtn);
+    }
+
+    /// <summary>
+    /// 隐藏面板
+    /// </summary>
+    public override void HideMe()
+    {
+        GameManager.EventMgr.RemoveEventListener<E_SceneType>(Enum_EventType.SwitchScene, CreateMenuBtn);
+    }
+
+    /// <summary>
+    /// 按钮点击
+    /// </summary>
+    /// <param name="btnName"></param>
+    protected override void OnClick(string btnName)
+    {
+        switch (btnName)
+        {
+            case "":
+
+
+                break;
+        }
+    }
+}
diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_MenuPanel.cs.meta b/Assets/Scripts/Project/UI/UI_Panel/UI_MenuPanel.cs.meta
new file mode 100644
index 0000000..7dc951f
--- /dev/null
+++ b/Assets/Scripts/Project/UI/UI_Panel/UI_MenuPanel.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3aa727d14c599074b9ab6651b6289055
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_SelectModeOrDeviceTitlePanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_SelectModeOrDeviceTitlePanel.cs
index 3e3fd97..1ded2ee 100644
--- a/Assets/Scripts/Project/UI/UI_Panel/UI_SelectModeOrDeviceTitlePanel.cs
+++ b/Assets/Scripts/Project/UI/UI_Panel/UI_SelectModeOrDeviceTitlePanel.cs
@@ -27,7 +27,6 @@ public class UI_SelectModeOrDeviceTitlePanel : BasePanel
                 break;
             case E_ModeType.Exam:
                 break;
-
         }
 
         GetControl<Text>("Text_ModeType").text = mode;
@@ -81,12 +80,18 @@ public class UI_SelectModeOrDeviceTitlePanel : BasePanel
     /// <param name="btnName"></param>
     protected override void OnClick(string btnName)
     {
-        base.OnClick(btnName);
         switch (btnName)
         {
             //TODO 退出提示框
             case "Btn_Quit":
                 print("退出应用");
+                GameManager.UIMgr.ShowPanel<UI_MessagePanel>(E_UI_Layer.System, (panel) => 
+                {
+                    panel.Init("提示", "确定退出应用吗?", E_MessageType.Warning, () => 
+                    {
+                        Application.Quit();
+                    });
+                });
                 break;
         }
     }
diff --git a/Assets/Scripts/ProjectBase/EventCenter/Enum_EventType.cs b/Assets/Scripts/ProjectBase/EventCenter/Enum_EventType.cs
index d9453f1..15d5a66 100644
--- a/Assets/Scripts/ProjectBase/EventCenter/Enum_EventType.cs
+++ b/Assets/Scripts/ProjectBase/EventCenter/Enum_EventType.cs
@@ -22,4 +22,9 @@ public enum Enum_EventType
     /// 选择/切换模式
     /// </summary>
     SwitchMode,
+
+    /// <summary>
+    /// 切换场景
+    /// </summary>
+    SwitchScene,
 }