From ce63dea44eff00ad0c6fbceb0a1bcdf3cb9d7914 Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Tue, 27 Aug 2024 13:24:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E4=BD=9C=E8=AF=81?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ArtRes/Excel/Config.xlsx | Bin 22274 -> 22256 bytes .../Project/Manager/LiveSceneManager.cs | 8 ++++++-- .../UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs | 3 ++- .../UI/UI_Panel/UI_ToolAndMaterialPanel.cs | 11 +++-------- .../BinaryData/TB_SubProcessStep.binary | Bin 4343 -> 4343 bytes 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Assets/ArtRes/Excel/Config.xlsx b/Assets/ArtRes/Excel/Config.xlsx index 77583ddd12d92a5bf4804b23e76474fe96d0ea5a..05e3c6660af3a5bebfdd05da26cf08ff0960f754 100644 GIT binary patch delta 3063 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 F005hM$;|)& delta 3079 zcmV+i4EXc#tpS3r0kHiB1bbOm3zGo{9e-H`<(cK!wr}Nx6=;hPh)Xc|V!>iM;Bl4HLTy0=&4>c`Wy(sq zN6X_&;Bq2ftI~{lUIN6NWlU{qP-NtBaJMYDAoC2uUSrQ#3;6o*!!|U|{v=pBIVxwd z;F2%Y6+l~Cr%&R?wuSLg3f8ANxPJ_(WeNJmbPXG?g#Sse{07T^2gCMnqhX*{&6NO> z_enIb@y$WEHw%{0=Ph*&QkD-S*OkhUkrAne2~#u)(KQVDioQ>H$PiW8t5^oB&UM?h zk#*b9c`RT6weMz%ih?NG=Y;~Q?Ogv|TGiP7lmm&4NBUpI1ckc;6oPP|C4X^1=5kC_ zYE&W%(J+{PEr63_!T+VPlGFRYzCCQG9NWRue@M|!X|bG*s1iKm%gwYaC54S$p&qH6 z4%acwrUz6dr}yF)$Vy_JD+}_ojbZ!zF;@_Z2=;^=D`CL%-QXUI@#gcb7zT3NxsrwJje(i@2SnJ#~qbvE&6FoH6FRV!TDnur>K_@rI z!&SZb!V;B+$hA8z+^6l_-;^y=@EEuK4ooUCf7A*VBF~56f(gi!mVZgufeaEW_C_aU z4$C?~M@JE&Bku=W?<4p??xN_(d+WgcT74mmx;KjY#!Py%r;SuJ2c_4i>Y9KXBGAW( zy9DbLd^FH9PY(=Q2L{d=g8}GMOedT2&sbF>lVofWI`|k!qfPvMP{GB>-x^@Gar*I9t%TvHTgT( zb~<_oU8{Sk>K-mXg9`V&cF%S@j@gQEWVUd}HhVq4WqO0i^{(-tKlCDf9rPb?u-1r+ zPwHyhs;wze6$p~nqIw+YHrmZLlZ)-djy*@}5j+lbC_C$)Z7O_%7mSQvxH)>haAW^r zG#OpE_kK8;y+n0w&PHoNK|tU3WwG`zJh%S?v%v}(84B%1RkuS5001{OlRXU?e>N_7 zZET#C+m6~W5Qgt7^&KMLlf(%L5D`}GqE)x5s;b+=wQ(Gu3 zz~eaaH~$+m8@Bg&P=1b)$3Qw zqf~pnW6XF!sCABZ#xz+FXu4y9e`sGetcEA0RDu||Rog%}ijl%?5>*g|VHya+Yt#}l zHHIO}l2f*p^dMMmT8Ls5F`!@Xc%yropkr`?sQsatP$?QfYyK(C`o&={#YFQc|$U&?5HvC1f2nZcWxABj{;Ax=Pe>1lQyr80& zNy5p%iY~DDg|Kvh*>tJwz>6IH3cG6p7TY15goz!luHR_2EI3ryM&&71=I9O1-p3dP ztEFq8Z=4 z^TO9!X#v&k<4gt1D zq<)0Q1Hh33fb9TL^~T3#{k=lNPHYF;?ZHuIs(|9F!j@P8m6O@3BR{45U>N{ zFBQR%?0-}hYVIgtJIV~A8r2XO{sP)&O5^#Z9zYtl+g5iS_y+(0|Nj600RR7_TG4Xb zHW2(3k3PT_AW9Z9vuq|#1Amqj8V^#?^4GeE<4(c-s*vK*n{C*HG9!gJXDx+y+_D;> zJhu?TG$cF+1k>i0x#ko7vS~ZE&461{ka4E3=K#-JQpD$BeM)wUdFw2%K_%#OKMIL< z3evr|LT%YS!?bcmF_bn(2Z4*OLu&Z_&x1`XxRTLTzMUhAmag-wI zpUy!FQW%!FN~DM+tbdAqvS}NkcI@sTFF7fe`D=#;n{7-3xFrQy?4&BlV<%EX9M-4g z{%PK1%P?owC(CB<*=Adz_DLuE4x{at8SN8Y?b&R!0XLKYJQM|e&j-LaYi`e4!9fZ3 z*;9;sO$eo|gpjBvxO=if?fK#Xrj@A)zszT!=t>Fp*??P0kbloklt7=&-B~N~L5buF zP~U>ueXN9;Q9^EI!BXr=_udM%=RF(Jl2d|x_IO|J*Y$O1r=S0Nef$2$@#Xj5#y^H} z&0N=_2j{lB@fx>OA`hOZgdUtbw^rhV-QfGFZW=_PU@Q~Pn~220gDGwXdtqtCJ>RMf zke8fHY{ExH_J7;!FxjOlp+DyX%f@TmQi=R|q7wS^RHcZcO56ZXgD9wE`SV02!=HOz zhH{Kke8fF?9WeiQ*W-r7qwI-^zM9y*7zCk4!E`Xpm*oyyOrmmBdgiFPcJFR zWZYFJ9htu}G$K7ahgsCWVlxFr+bh^I0cSK|ER zg>HIDK_=@`JgFw@R-6x*_nsE^~0T3FDCBpo$OJ0}r4{*Ow8M**I1)xE~8O^J>Il1&MZ z0@zfw5`P~zB|aaU22s%HJx2i&hgyeZwM#>Jwg>~{C8yD7Wce47)#f9ugLd)Nn$L(D zuW?Hyja!AJ@nDGf=27CKO0)rV(;x~ez2}rb;?T__-?9h`DygP!W`MlpR9bdQ;PI5e z^EEu+mK1bKkQ5A_67bJzT8R&9TH=W2PYEQBL=05^&P@K6+d$s#x?!8I|($k&8W%1Q`{b{Af`tWY(d62P=_N-R4i z*x+q^@?%lJEhXrbfWGGgJRg+clYPNK3Cc}3#V9CY-Nth(CUK}^=2HS;;p)Vv1TZaD z;s)mO1N;8~v#~Ac90lPjD~?RFo=P+Uf3lXK7PeA$vBF@MecXlQ)XFr5B%STQU)0uF zHg=i3Z=O6kBv~Ho%KHLs%0{Lr3<&Z-@4utRsfC&xx+PBe~-jyKkPub&v zdGAaX3I3fqRBt};KzPoD4(6BSI5mD)#|43n1&gum3~#4U@qN6tf*o;speISyv0Q15@7t3GGEyw?hg5 z05_BCR96B;E|WnG6_Z(2F9H6OiB&)WuanAEIst@}1y&~o;VLVROp`HI6#<@;M^-)o VA(MtyJpmw-#8xH-hf)9l004_#+mQeO diff --git a/Assets/Scripts/Project/Manager/LiveSceneManager.cs b/Assets/Scripts/Project/Manager/LiveSceneManager.cs index bb27c25..8251d16 100644 --- a/Assets/Scripts/Project/Manager/LiveSceneManager.cs +++ b/Assets/Scripts/Project/Manager/LiveSceneManager.cs @@ -10,7 +10,7 @@ public class LiveSceneManager : SingletonMono public GameObject currentTool; public Transform spawnToolPos; public Transform tMDTips; - + protected override void Awake() { base.Awake(); @@ -28,7 +28,11 @@ public class LiveSceneManager : SingletonMono { GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid, (p) => { - p.Init("", "ÄúºÃ£¬ÎÒÊÇxx¹©µç¹«Ë¾Ô±¹¤£¬ÕâÊÇÎҵŤ×÷Ö¤¡£ÏÖÔÚÎÒÃÇÒª¶Ô¹ó»§¸ü»»µçÄܼÆÁ¿±í", (intTemp) => { Destroy(currentTool); }); + p.Init(currentTool.name, "ÄúºÃ£¬ÎÒÊÇxx¹©µç¹«Ë¾Ô±¹¤£¬ÕâÊÇÎҵŤ×÷Ö¤¡£ÏÖÔÚÎÒÃÇÒª¶Ô¹ó»§¸ü»»µçÄܼÆÁ¿±í", (intTemp) => + { + GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(intTemp, true); + Destroy(currentTool); + }); }); tMDTips.gameObject.SetActive(false); currentTool.transform.localEulerAngles = new Vector3(90, 0, 0); diff --git a/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs b/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs index 9cd6974..d924c6c 100644 --- a/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs +++ b/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs @@ -49,7 +49,8 @@ public class UI_ToolOrMaterialsOrDeviceItem : BaseItem Destroy(gameObject); break; case "iconBtn": - if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(currentItem.toolName, true) == 0) + bool isWorkCard = currentItem.toolName.Equals("¹¤×÷Ö¤") ? false : true; + if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(currentItem.toolName, isWorkCard) == 0) { GameManager.UIMgr.HidePanel(); GameObject currentTool = Instantiate(currentItem.objPrefab); diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_ToolAndMaterialPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_ToolAndMaterialPanel.cs index aefad34..3336cdd 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_ToolAndMaterialPanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_ToolAndMaterialPanel.cs @@ -8,21 +8,16 @@ public class UI_ToolAndMaterialPanel : BasePanel public RectTransform _content; public UI_ToolOrMaterialsOrDeviceItem ui_TmdItem; - public void Init() - { - - } public override void ShowMe() { + if (GameManager.RunModelMgr.ModeType == E_ModeType.Study) + GetControl