From bbdd46c6df26dd56b39ce7b64dd08dc894a880b2 Mon Sep 17 00:00:00 2001 From: lq <3298408835@qq.com> Date: Wed, 18 Dec 2024 21:31:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E6=80=A5=E6=BC=94=E7=BB=83=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E8=AF=BB=E5=8F=96=E4=BB=A5=E5=8F=8A=E4=B8=89=E7=BA=A7?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/itemPrefabs/btnDutyChoose.prefab | 3 +- xiaofang/Assets/Resources/UIImage.meta | 8 ++ .../Assets/Resources/UIImage/Vocational.meta | 8 ++ .../UIImage/Vocational/icn_commander.png | Bin 0 -> 2568 bytes .../UIImage/Vocational/icn_commander.png.meta | 123 ++++++++++++++++++ .../UIImage/Vocational/icn_dedicalrescue.png | Bin 0 -> 1705 bytes .../Vocational/icn_dedicalrescue.png.meta | 123 ++++++++++++++++++ .../UIImage/Vocational/icn_doormhead.png | Bin 0 -> 1485 bytes .../UIImage/Vocational/icn_doormhead.png.meta | 123 ++++++++++++++++++ .../UIImage/Vocational/icn_guidance01.png | Bin 0 -> 1253 bytes .../Vocational/icn_guidance01.png.meta | 123 ++++++++++++++++++ .../UIImage/Vocational/icn_guidance02.png | Bin 0 -> 1479 bytes .../Vocational/icn_guidance02.png.meta | 123 ++++++++++++++++++ .../UIImage/Vocational/icn_redcue.png | Bin 0 -> 2248 bytes .../UIImage/Vocational/icn_redcue.png.meta | 123 ++++++++++++++++++ .../UIImage/Vocational/icn_search.png | Bin 0 -> 1564 bytes .../UIImage/Vocational/icn_search.png.meta | 123 ++++++++++++++++++ .../UIImage/Vocational/icn_support.png | Bin 0 -> 2691 bytes .../UIImage/Vocational/icn_support.png.meta | 123 ++++++++++++++++++ xiaofang/Assets/Script/Scheduled_03/Panel.cs | 1 + .../Script/UI/PanelUI/EvacuationPanel.cs | 12 +- .../Assets/Script/UI/PanelUI/ManagerPanel.cs | 10 +- .../Script/UI/PanelUI/PersonnelPanel.cs | 3 +- .../Assets/Script/loginScripts/LoginPanel.cs | 3 +- 24 files changed, 1022 insertions(+), 10 deletions(-) create mode 100644 xiaofang/Assets/Resources/UIImage.meta create mode 100644 xiaofang/Assets/Resources/UIImage/Vocational.meta create mode 100644 xiaofang/Assets/Resources/UIImage/Vocational/icn_commander.png create mode 100644 xiaofang/Assets/Resources/UIImage/Vocational/icn_commander.png.meta create mode 100644 xiaofang/Assets/Resources/UIImage/Vocational/icn_dedicalrescue.png create mode 100644 xiaofang/Assets/Resources/UIImage/Vocational/icn_dedicalrescue.png.meta create mode 100644 xiaofang/Assets/Resources/UIImage/Vocational/icn_doormhead.png create mode 100644 xiaofang/Assets/Resources/UIImage/Vocational/icn_doormhead.png.meta create mode 100644 xiaofang/Assets/Resources/UIImage/Vocational/icn_guidance01.png create mode 100644 xiaofang/Assets/Resources/UIImage/Vocational/icn_guidance01.png.meta create mode 100644 xiaofang/Assets/Resources/UIImage/Vocational/icn_guidance02.png create mode 100644 xiaofang/Assets/Resources/UIImage/Vocational/icn_guidance02.png.meta create mode 100644 xiaofang/Assets/Resources/UIImage/Vocational/icn_redcue.png create mode 100644 xiaofang/Assets/Resources/UIImage/Vocational/icn_redcue.png.meta create mode 100644 xiaofang/Assets/Resources/UIImage/Vocational/icn_search.png create mode 100644 xiaofang/Assets/Resources/UIImage/Vocational/icn_search.png.meta create mode 100644 xiaofang/Assets/Resources/UIImage/Vocational/icn_support.png create mode 100644 xiaofang/Assets/Resources/UIImage/Vocational/icn_support.png.meta diff --git a/xiaofang/Assets/Prefabs/itemPrefabs/btnDutyChoose.prefab b/xiaofang/Assets/Prefabs/itemPrefabs/btnDutyChoose.prefab index 67f8ee0f..3bf6a3d3 100644 --- a/xiaofang/Assets/Prefabs/itemPrefabs/btnDutyChoose.prefab +++ b/xiaofang/Assets/Prefabs/itemPrefabs/btnDutyChoose.prefab @@ -59,7 +59,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.29411766} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -268,6 +268,7 @@ MonoBehaviour: dutyNameText: {fileID: 3344224971532102837} button: {fileID: 3344224971532102794} leader: 0 + dutyId: 0 defaultColor: {r: 1, g: 1, b: 1, a: 1} addedColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} selectedColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} diff --git a/xiaofang/Assets/Resources/UIImage.meta b/xiaofang/Assets/Resources/UIImage.meta new file mode 100644 index 00000000..99f26af0 --- /dev/null +++ b/xiaofang/Assets/Resources/UIImage.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 547bef451f1f4e040977e3644ba56ec6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/xiaofang/Assets/Resources/UIImage/Vocational.meta b/xiaofang/Assets/Resources/UIImage/Vocational.meta new file mode 100644 index 00000000..76dc53b8 --- /dev/null +++ b/xiaofang/Assets/Resources/UIImage/Vocational.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 71b5184d50e0b574d89a0ede4558000f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/xiaofang/Assets/Resources/UIImage/Vocational/icn_commander.png b/xiaofang/Assets/Resources/UIImage/Vocational/icn_commander.png new file mode 100644 index 0000000000000000000000000000000000000000..85719a15f05210169841b40aee9a8b7a8a8c1221 GIT binary patch literal 2568 zcmV+j3itJiP)Px;!bwCyR9Hu?mkUr-*BQtE_p!^eZ+2M_d8v!0L8B%Slb})4+8S*;nO3Efv~ijk z1dXIYB{r!|w@o^vPSPX}#)ue2NieJ?kvLI#2tMK?f)lj@5l~=}T|{snu)BA6@4cOK z7t)BB5T|Em*(WFTl zum4q~BJ%03?w)h@4oB(f(^ZWYi$(ac^ZjUmqbKX`n|$x2*L51@qZGsFIWEXMZ+b3Y zZfSe(X!Yk?Ef!1Y$3TneZ_;N~Qj}sA$~=8AB^X0A#u3oBZ+lICQjkebr@m zu+-N|45TLoa*`$q%eq5tcu8fF~rBM{clAscRAb_H2@Pm;=UVzIz(9?J0 z=0~<}`|hGm9ba3m8AFdpvhMC((Y@H%?lRHx_&1$ZUZ3hUb=L--ZV!0szI;LrfE82P-Q6q z9}MAALn}TlKa8qF2arDJG0dGa3+azchf=4301BcA$=!U2hoh^z;Y!oxER#udX2y&e z!Qmjc09?FyB{p$f>=Tg@@*J6roiZdf8N~Smu-P0qQu`$;D=X2|bP)_ILxds{$w}jp zmNpaf=A>i7#AGNnYKS5wd4wYV81RK$PFIP?<=$Q&@|?-~4#>9vy{`VpRT1)ajEs2* zG_5AVrH7&jyZr{fJXw!J2fx7i^Ysu!3K5D3u&fLWO+yex$YgTF#g4_ipU%U~v74`=JTI9r? zJ4*A{tbXP%w*c6$JFR+?Zi(dXUFIHv^30~^)T+ce=6j16$Fv6`mud$asK+X*{|FJ z&~@Eu)f&S911>k-erpR39V`bUlS8A?fTn0LEF%S{CdWfr((l~^$_Jsgg6dg95@84^<(gY0D(l2tRqNjOfZ|VcI_G%V&cK` z07G*q-nKJ8Z@2<&_Fk)6XIMf}VSxAEEkIRu6%58`$!O$5BsQDJ36dd63W|4(pg?O^uT`xvEFrG!?{{HqK>@0d zRKpl;k_<=MMDql!Tl)eu#xV#4MRa!9Fg8986wPA5SS0NQAA2g3No{@p*MyVU}!%|cJ0VtpS$W-6E?Qpu&UKY z3BWtxLh<%3s6J8!qrn7<2G-~0;=bu===W0)LIIpOR*hF*$;0xjRe0hz8PMvC(r)bO z?!@+@_tDzY0*a!Ml43??Ru*(oiQ!#9`>|*Dj{Lmg0GC>?TUBb41mGKRp`>_=RPhoL z5|N#?9BB{DhQ~(^AfU6O8UNn+I^=Q|ZS6MXypW5B(jS9NrT|R~aCEidgQBfyZEZ#B zy{TBfVgw|Z2q^1T+r3!AB8x&2ZB{^ikaXzfceG$K2oPkbTH(vYO zpV4`(3jvOk`jK-0q5!p8jcL=SA~S0hH2OgRCWw6>@48)qbC>MaNM)3yK!EdNd*MbL zKYjvgjShi8Kr$5x&htDTxPKbfz4S6fS_>Kij@BN;&K-pa26>1?XJSA}1sYSPq#`?e zHB{QTumX&TPpu=QpzcDKRiV^M0G!{8Js)mCMP&tyMpO9WAx#QIDk6~o#v4#+#~{G* z(ux_H$M(W^apuffurhK0h3f!O^WM~-;JFnmp;E<4zcVa_{rg5x;Ou#uHA10TLJl0V zeFoePR3ABvy1IG3UgppQ;Q{{UG8q*7kKe^-9qpN5s<)92duDwLYVq?U)}ror=G*xFlg^2_6B`sN#W zJRWcy2dC2|K}wAx05n*c99oSAdYul5iSd{{J00oik0QX!;Pr;2endl3Q_A<3yz$bD zD__3lFgj56)e1wDX`@o9(eb2Y5e{NJ3J3*#XuW(9M{8@*(9|S73-P?fK!VHVa;fgC zRVw`9_ZfI_Mj9Bo4t{?Kyb#_ML?u$9TbrAmU!OabY58mJ-dh03KSf3RlHd&6S{_@Y^^ZP+Fv~)^__z)hRITNd&&qR=qKu>SKRD{Bf7>|X= zbu)PC^r?gA&R=-`!=jCygAZ?iG1;`KL>rSBw=8aK!g9GxF@V47@&a{)a(XmX&Hn zdwWO2b%*`Eri+cA78F>zz8mt5=o6;s^xB=1Cf+lhVdc_p7-}T{LtB)< zQ3&6by1F`pb#?Vyd+j&>VKfGMzwedp2VYD`uzB<5u}?movpR8H(sHdGg(Zj7Fo8 z>=L4a$Kwfg+q;k3uQ|3|ZLw8s-uz1MXoBC-1K&5;VkwhHYTeUKrr0;l6DQ2FUvs!x zuC!Zj4)lHWmSr6YJahpb6~m|%7(QE0jzz0CnU-C%_k8ie7R!}UMH`{hT?5>0z`ORq e|103|dHxIegK=P(WX=Hq0000Px*V@X6oR7gvumVb;CXL`fnW3Jnyaq1(rFup5HpiuAW{IuZK2y9;~i@aykf z8h{TOrZKlYlftZaZJRzAK;vx9AVq*F0E>Y@CI7dq_%DTF{PD}8TB~DXqJ~o_%ZX5yl@%+^)k`R4QFx^9ueXkXw*OF7Xei8xaNNrmwAhY&mW zKn=U#Yz{&JI&p0Sd39iR4r0fBpfxu@#GWS)-h}ErQl{ZLcIKY!C39Ymq0v-OQc-lB zK1k>rn$k)M^eD&J7S&Lk-IU|KZQTnR8%W2e+?<@uNP#Fk-AeCIJJ2 z$W1v`Z@yUEpFk)5l8mD3T0IE}unrxA8u%5s9)ffcExr`y(~m)=QqV<*YzE=x2SNWl z36KGU6~eo3g|%f9ps#NU5^z%)y8$h`#ZcBtN~vk6mN{)9+O!Sg^e2g0%-|~*!u;)H zkSPmsyyhEU)`By>iyhR^^_yXI7ZB}x1~f4}iiy~D zw5MHN4QM!3iZrz8ebxbO+yeUe-{67!!K*d2WneU0c}9m3;8j8E`+xkoK8djY!B=MhaeyS3Dmlkdb~qK5tLVlsTi!APmjo~17R9TTZ~Tv ztM34>UIy&h1^B_V8kBh2fR>B3fM<9b`}5HdMDI?ZBM-`?6ToHjfrlReOzkVj-$%Qj zfcf@mu=ZO<5NBNQk9)zlto?k9Hmf)7q&Jk5RKVA z-7@StSv$$JTrL;oR1kZb4C|KAk{SZW;8D=Q*FkTcfEXK3ib(GnrC{cA2$wAefA?EZ zH?INt;fzfa*M}Y~3^%I_X<^TP8W|bM6B#drHGfTQVzPC!wP-`}{1syr(0d<1{OeOl zRuEl9gx6dJk)H!NcI^9wp@G?4J4`2aHf36O&c0;!Yjotu$)b#~&vDXAvndG`>Q|(h zI>$=staXO^H{K!ymJ&iK=zXi-9KHb5ZDyJ96=ULj=w=<`o+Z~_@iHAhemq;L1Os6p z`)o@%9eOdxhWxK+1^l;b36dG^WF6IN4VGyhY`Px)heC>klM!M#N zAPfe>qv^wgNA$QyVzC&+=%h)LVg?5X%TiKOrllmS(bm?1rsn25(b3VS{{H@+v35c% z7ISK~x+N_w?YhloWBv02bAnQ-R69C5J54+w8*3q=zysh|7Fw+qb5c{#>U5&9u?ZrP z7!>7uK90UerBZ$2bUI5PErk&Xg+j5uumAoJdHDt`%G85+9ZJ0HF#c({0L$0ah>4Cy zQj!w4ySj1j-aTwAD8hn;i$P1609AtIGef{H{`CiHEMGzy&(a3a2R;dkG;E!;c~SK>LQ8)&-22Vo~T4w#W#qFi4~kA^8t>`0^oCs zVIs&(^sf9it}i9`?ug@kxT79}2yhKg)4 z$B}2j!aoA02rNGeER)Hx-y8P31cYXcn&& z^o-X~US1BRQi(l#_MoB3J_6Bs(}kNIE}% z$kM^T6ScLqFmBw06>*bMJJ5$iM~)ynI~%2?rD$xvIvNfU;1PPvlMpf~1FwgLTpkqx zM8Hn;_4T2mq5}2x^~lJ`!1nFi$@u|`#ez!>Ey&5;43f-4LxUI`xF51@%b$xvR8%yi z(lARja3^web73}{F)%P7jM&&%Bqb$b%a$z|_IlB9#R-Oq0n2*vqwPEVR`*ND#7vkv z4F?W>3y$R@+liv00_gR6tX{nu;Lr%`yC@3fpIwC1kQi9|tC+{>(qq4FRt*%=mIU%&*M}5Ut zA*=vIk+v;#%?L_V!Z29B=5_GwFcK3-u91QP0^^sCjtH@p_Kq76^9y3UP69U&Y2JY^|(5is_0M z!a4^coT$GllZY&bxHfS_snUf!17LQj00000NkvXXu0mjfciFLH literal 0 HcmV?d00001 diff --git a/xiaofang/Assets/Resources/UIImage/Vocational/icn_doormhead.png.meta b/xiaofang/Assets/Resources/UIImage/Vocational/icn_doormhead.png.meta new file mode 100644 index 00000000..19a612da --- /dev/null +++ b/xiaofang/Assets/Resources/UIImage/Vocational/icn_doormhead.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: ae080296258ddf44d99ed1e8f1e7fc99 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/xiaofang/Assets/Resources/UIImage/Vocational/icn_guidance01.png b/xiaofang/Assets/Resources/UIImage/Vocational/icn_guidance01.png new file mode 100644 index 0000000000000000000000000000000000000000..229859d8e1374d2c828943e35286bd731f8a04cf GIT binary patch literal 1253 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 literal 0 HcmV?d00001 diff --git a/xiaofang/Assets/Resources/UIImage/Vocational/icn_guidance02.png.meta b/xiaofang/Assets/Resources/UIImage/Vocational/icn_guidance02.png.meta new file mode 100644 index 00000000..c61ad018 --- /dev/null +++ b/xiaofang/Assets/Resources/UIImage/Vocational/icn_guidance02.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: f31b78939b9efc743977d924ef17f138 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/xiaofang/Assets/Resources/UIImage/Vocational/icn_redcue.png b/xiaofang/Assets/Resources/UIImage/Vocational/icn_redcue.png new file mode 100644 index 0000000000000000000000000000000000000000..1507a70cfb8e9418f945d35d0941dc9c69fccf26 GIT binary patch literal 2248 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 literal 0 HcmV?d00001 diff --git a/xiaofang/Assets/Resources/UIImage/Vocational/icn_support.png.meta b/xiaofang/Assets/Resources/UIImage/Vocational/icn_support.png.meta new file mode 100644 index 00000000..639e64cd --- /dev/null +++ b/xiaofang/Assets/Resources/UIImage/Vocational/icn_support.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 536f0c9cec77bb043becc4ccaf7d2c00 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/xiaofang/Assets/Script/Scheduled_03/Panel.cs b/xiaofang/Assets/Script/Scheduled_03/Panel.cs index 6c2e8c28..90740cae 100644 --- a/xiaofang/Assets/Script/Scheduled_03/Panel.cs +++ b/xiaofang/Assets/Script/Scheduled_03/Panel.cs @@ -186,6 +186,7 @@ public class Panel : MonoBehaviour dutyItem.dutyNameText.text = showText; dutyItem.leader = npcData.GroupLeader; dutyItem.dutyId = npcData.ID; + //dutyItem.dutyImage.sprite = Resources.Load("UIImage/Vocational/icn_commander"); peopleList.Add(item); } } diff --git a/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs b/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs index 8f21e2fb..cb6ae6cc 100644 --- a/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs +++ b/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs @@ -242,20 +242,27 @@ public class EvacuationPanel : MonoBehaviour { // 标记当前选择的区域 OnSceneItemClicked(sceneitem, Color.yellow, selectedScene); + // 如果被点击的区域已经有人员 if (personnelItem.NpcNum > 0) { - redistributeBtn.interactable=true; + redistributeBtn.interactable = true; ChangeImage(redistributeBtn.interactable); redistributeBtn.transform.GetComponent().sprite = showImage[1]; + + // 清除所有之前的监听器，确保只有最新的事件被执行 + redistributeBtn.onClick.RemoveAllListeners(); + + // 添加最新的监听器 redistributeBtn.onClick.AddListener(() => { // 清除选定区域的人员数据 RedistributeLogic(personnelItem.sceneId, personnelItem.NpcNum); - redistributeBtn.interactable = false ; + redistributeBtn.interactable = false; ChangeImage(redistributeBtn.interactable); }); } + // 清空现有场景下的所有人员UI foreach (Transform child in sceneCount) { @@ -414,7 +421,6 @@ public class EvacuationPanel : MonoBehaviour } } - //设置文字颜色 public void OnSceneItemClicked(GameObject clickedItem, Color color, GameObject select) { diff --git a/xiaofang/Assets/Script/UI/PanelUI/ManagerPanel.cs b/xiaofang/Assets/Script/UI/PanelUI/ManagerPanel.cs index 6041c1f1..68c7f086 100644 --- a/xiaofang/Assets/Script/UI/PanelUI/ManagerPanel.cs +++ b/xiaofang/Assets/Script/UI/PanelUI/ManagerPanel.cs @@ -114,16 +114,16 @@ public class ManagerPanel : MonoBehaviour public void OnClickPeopleWindows() { peopleWindowsPrefab.gameObject.SetActive(true); - foreach (Transform child in personnelPanelCount) { Destroy(child.gameObject); } + CreateFirstLable(); foreach (var sceneEntry in panelInfo.sceneDataDictionary) { GameObject managerPanelInstance = Instantiate(personnelPanel, personnelPanelCount); PersonnelPanel scenetext = managerPanelInstance.GetComponent(); - foreach(var item in panelInfo.peopleList) + //foreach(var item in panelInfo.peopleList) scenetext.personelPanelText.text = sceneEntry.Key; scenetext.personelNumText.text = sceneEntry.Value.Count.ToString(); scenetext.CreatePeopleItem(sceneEntry.Value); @@ -136,5 +136,9 @@ public class ManagerPanel : MonoBehaviour { peopleWindowsPrefab.gameObject.SetActive(false); } - + public void CreateFirstLable() + { + GameObject fistLable = Instantiate(personnelPanel, personnelPanelCount); + PersonnelInfo personnelItem = fistLable.GetComponent(); + } } \ No newline at end of file diff --git a/xiaofang/Assets/Script/UI/PanelUI/PersonnelPanel.cs b/xiaofang/Assets/Script/UI/PanelUI/PersonnelPanel.cs index 0e8626a2..7c475958 100644 --- a/xiaofang/Assets/Script/UI/PanelUI/PersonnelPanel.cs +++ b/xiaofang/Assets/Script/UI/PanelUI/PersonnelPanel.cs @@ -2,14 +2,15 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; +using static UnityEditor.Progress; public class PersonnelPanel : MonoBehaviour { public Text personelPanelText; public Text personelNumText; public Transform personelContent; - public Panel panelInfo; public GameObject personelItem; + public GameObject firstLablePrefab; // Start is called before the first frame update void Start() { diff --git a/xiaofang/Assets/Script/loginScripts/LoginPanel.cs b/xiaofang/Assets/Script/loginScripts/LoginPanel.cs index 1401ec2e..a25f4157 100644 --- a/xiaofang/Assets/Script/loginScripts/LoginPanel.cs +++ b/xiaofang/Assets/Script/loginScripts/LoginPanel.cs @@ -54,7 +54,7 @@ public class LoginPanel : MonoBehaviour Debug.Log("登陆入参"+ JsonUtility.ToJson(loginBody)); string response = await web.SendRequest(web.URL + "/auth/login", "POST", JsonUtility.ToJson(loginBody)); Debug.Log("登录" + response); - + // 解析服务器返回的数据 loginResponse serverData = JsonConvert.DeserializeObject(response); @@ -63,7 +63,6 @@ public class LoginPanel : MonoBehaviour // 打印 access_token Debug.Log(serverData.data.access_token); - // 跳转场景 SceneManager.LoadScene(1); }