From 2014058d9927b8875a8bd35b8c029982fd8ea86b Mon Sep 17 00:00:00 2001 From: UVCLimHun Date: Tue, 27 May 2025 19:07:12 +0900 Subject: [PATCH] uicomplete --- Assets/Image/UIIcons/New Folder.meta | 8 + Assets/Image/UIIcons/New Folder/Frame 50.png | Bin 0 -> 2325 bytes .../UIIcons/New Folder/Frame 50.png.meta | 130 ++ Assets/Image/UIIcons/New Folder/Frame 51.png | Bin 0 -> 383 bytes .../UIIcons/New Folder/Frame 51.png.meta | 130 ++ Assets/Image/UIIcons/New Folder/Group 23.png | Bin 0 -> 847 bytes .../UIIcons/New Folder/Group 23.png.meta | 130 ++ Assets/Image/UIIcons/New Folder/Group 24.png | Bin 0 -> 703 bytes .../UIIcons/New Folder/Group 24.png.meta | 130 ++ Assets/Image/UIIcons/New Folder/Group 26.png | Bin 0 -> 486 bytes .../UIIcons/New Folder/Group 26.png.meta | 130 ++ Assets/Image/UIIcons/New Folder/Group 27.png | Bin 0 -> 601 bytes .../UIIcons/New Folder/Group 27.png.meta | 130 ++ .../Image/UIIcons/New Folder/Group 28 (1).png | Bin 0 -> 697 bytes .../UIIcons/New Folder/Group 28 (1).png.meta | 130 ++ Assets/Image/UIIcons/New Folder/Group 28.png | Bin 0 -> 822 bytes .../UIIcons/New Folder/Group 28.png.meta | 130 ++ Assets/Image/UIIcons/New Folder/Group 29.png | Bin 0 -> 786 bytes .../UIIcons/New Folder/Group 29.png.meta | 130 ++ .../Image/UIIcons/New Folder/Layer_1 (7).png | Bin 0 -> 785 bytes .../UIIcons/New Folder/Layer_1 (7).png.meta | 130 ++ .../Image/UIIcons/New Folder/Layer_1 (8).png | Bin 0 -> 556 bytes .../UIIcons/New Folder/Layer_1 (8).png.meta | 130 ++ Assets/Image/UIIcons/New Folder/octo.png | Bin 0 -> 3053 bytes Assets/Image/UIIcons/New Folder/octo.png.meta | 130 ++ .../{(대기).png => queue(대기).png} | Bin .../{(대기).png.meta => queue(대기).png.meta} | 0 .../{queue(ë³´ê´€).png => store(ë³´ê´€).png} | Bin ...ue(ë³´ê´€).png.meta => store(ë³´ê´€).png.meta} | 0 Assets/Prefabs/LogicDataWindow.prefab | 719 ++++++++++- Assets/Prefabs/LogicPrefab.prefab | 12 +- .../UIRIghtItem/ObjectStatus_ver2.prefab | 5 +- Assets/Prefabs/UITopItem/Panel_Top.prefab | 1147 ++++++++++++++++- Assets/Scenes/Simulation_0.0.1.unity | 284 ++-- Assets/Scripts/Manager/DataManager.cs | 6 +- ...niversalRenderPipelineGlobalSettings.asset | 48 +- .../LH/LogicData/LogicDataManager.cs | 12 +- .../WorkSpace/LH/LogicData/LogicItemButton.cs | 33 +- .../LH/LogicData/Panel_PlacedObject.cs | 103 +- Assets/WorkSpace/LH/LogicInfo.cs | 2 +- Assets/WorkSpace/LH/LogicMappingDataBase.cs | 12 +- Assets/WorkSpace/LH/Manager.prefab | 14 + Assets/WorkSpace/LH/ProjectDataManager.cs | 41 + .../WorkSpace/LH/ProjectDataManager.cs.meta | 2 + Assets/WorkSpace/LH/ProjectInfo.cs | 13 + Assets/WorkSpace/LH/ProjectInfo.cs.meta | 2 + ProjectSettings/EditorBuildSettings.asset | 4 +- 47 files changed, 3781 insertions(+), 246 deletions(-) create mode 100644 Assets/Image/UIIcons/New Folder.meta create mode 100644 Assets/Image/UIIcons/New Folder/Frame 50.png create mode 100644 Assets/Image/UIIcons/New Folder/Frame 50.png.meta create mode 100644 Assets/Image/UIIcons/New Folder/Frame 51.png create mode 100644 Assets/Image/UIIcons/New Folder/Frame 51.png.meta create mode 100644 Assets/Image/UIIcons/New Folder/Group 23.png create mode 100644 Assets/Image/UIIcons/New Folder/Group 23.png.meta create mode 100644 Assets/Image/UIIcons/New Folder/Group 24.png create mode 100644 Assets/Image/UIIcons/New Folder/Group 24.png.meta create mode 100644 Assets/Image/UIIcons/New Folder/Group 26.png create mode 100644 Assets/Image/UIIcons/New Folder/Group 26.png.meta create mode 100644 Assets/Image/UIIcons/New Folder/Group 27.png create mode 100644 Assets/Image/UIIcons/New Folder/Group 27.png.meta create mode 100644 Assets/Image/UIIcons/New Folder/Group 28 (1).png create mode 100644 Assets/Image/UIIcons/New Folder/Group 28 (1).png.meta create mode 100644 Assets/Image/UIIcons/New Folder/Group 28.png create mode 100644 Assets/Image/UIIcons/New Folder/Group 28.png.meta create mode 100644 Assets/Image/UIIcons/New Folder/Group 29.png create mode 100644 Assets/Image/UIIcons/New Folder/Group 29.png.meta create mode 100644 Assets/Image/UIIcons/New Folder/Layer_1 (7).png create mode 100644 Assets/Image/UIIcons/New Folder/Layer_1 (7).png.meta create mode 100644 Assets/Image/UIIcons/New Folder/Layer_1 (8).png create mode 100644 Assets/Image/UIIcons/New Folder/Layer_1 (8).png.meta create mode 100644 Assets/Image/UIIcons/New Folder/octo.png create mode 100644 Assets/Image/UIIcons/New Folder/octo.png.meta rename Assets/Image/UIIcons/UIIconUpdate/{(대기).png => queue(대기).png} (100%) rename Assets/Image/UIIcons/UIIconUpdate/{(대기).png.meta => queue(대기).png.meta} (100%) rename Assets/Image/UIIcons/UIIconUpdate/{queue(ë³´ê´€).png => store(ë³´ê´€).png} (100%) rename Assets/Image/UIIcons/UIIconUpdate/{queue(ë³´ê´€).png.meta => store(ë³´ê´€).png.meta} (100%) create mode 100644 Assets/WorkSpace/LH/ProjectDataManager.cs create mode 100644 Assets/WorkSpace/LH/ProjectDataManager.cs.meta create mode 100644 Assets/WorkSpace/LH/ProjectInfo.cs create mode 100644 Assets/WorkSpace/LH/ProjectInfo.cs.meta diff --git a/Assets/Image/UIIcons/New Folder.meta b/Assets/Image/UIIcons/New Folder.meta new file mode 100644 index 00000000..8c0d69b4 --- /dev/null +++ b/Assets/Image/UIIcons/New Folder.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 02586872d3ad7d6468238cadbb23cf6e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Image/UIIcons/New Folder/Frame 50.png b/Assets/Image/UIIcons/New Folder/Frame 50.png new file mode 100644 index 0000000000000000000000000000000000000000..bac9b7ac2fba6238587e0569fee96a2072784090 GIT binary patch literal 2325 zcmV+w3F`KVP)^92p|~*L0H0ILL8ic?eTbKx_GZ#ujX}4^*BztZ|^6Sr@Q`F_4BL$-3HF! zi{CA;Ta&$Lz@mZcpeW2yp!IOu>1oAQ*Pe7(@^J?gkiQ`Tu?P3nh>*H;!=t#3e4o{?Ub{q=?Kzj+5Q zL$fM197$t#vDMlDMX7;oSiDF-JT`E4!riQ{uC`DEYE!DzLfgRK@F#O42YagI+TM*M z&}?mOwawDX^Png-K+|Z;%gZe^){j=L)Nm~r3813X!uIxdzPY)XZES2frRM&?Y15jc zx$x!E%0p0;n)uW1w^#6|i{=DP5t`J+#l_a);b99DrCvy;oMNMXT*jTb`}gmggM$MD zic&AsdY(3?G!5cAbLQH$YwV~fbwaYmLgxkzW_^9#%DECnsS)$w!2?)ZTXQ$A4~L@& z7B&?+rFN+GymRM{>$|x=982Ha+?)kPsTtC6;FVchF0SGz6<`4rr8X{HxL}Tsj_A^j z6~ZX>>eZ|CqfM&PB%_svy}dnW0g6&1sNI}Q;lLE!JRB%W!{DNVrGY8W!vzOwZ$VLN zh87jTx1J>p=R0?bQY(H@fe3v#?Yk*WVf>a7v%1otGzm}q5^gu9t~4lh(g?icmvF}f`Ah?7v#QjL++)d$_b@*{Z%GPu1E$g-uFK{GZgX?f+2}l+ zQa9p7HV!#TRqduUfm^5NYd)7M9TlZEsGCNkRC>!Q-Dg(Ji-;p#ic$;o_9Pk~_->nt zUr1>5OoLJ<{)L32Z*9p_Te<;LsTF?<~q zIE}(c_O$p1LS#N2t7hMdt(Zf~F6o~M1#yM5o2wLlD4d_Fhb0A@{Z^F^#syoZZ^S=AD5Hos z^D^n*YCo`Cl84NfJr=KUM++`?xE({7_GIQu2-28Q%Ie?17$gpwTlrF`U z@H3VN@85cVrpj*|S4G@1zGvD|GbxT#+GIzh?7f}!^#T*p9D5!dW>R?}(ufoCPVp7g zUqf?(%_udWT~u6MR9q}<1(wJYYm2Ll6-@%6u795t`==49PU&!~IL|>$nc2)N-9_cR9C|yV8DfuVOAEoR3 z$h6p>e0wOx?b8T#!0XgexhdTs1W%GLS+>YOM9(Efcvik_HdU7rUMZ0NBUs>umoHx) z?(gsS*VfkhH*VY*b~>Gc)8+aZ%bch@`ciajXJ@B%@7_JLw6v5JMPdABY+S}^vY57> zp!#(2obiFUDglh$-6S;S!>_?5-7(#e2ZHj!`H90w|8bghc!<+te`M$Vm#Rj_Ph}Qi z#?nrtIhMW%6Y9pN9sF=QiTklZQX;-m+;H}@3Gon#x=1|_ySTVWpEsgD92uw4?5QBx z_@D7CShz^Lk+y4NKQCM-jO**6gy&?~-e0q6NA@ZAWLUnIapONl_^nEZ+GE}mQ{2b#rt**~e-7#AluvMP%k`GzJ_ab1-@4}8MCEHsA^d5gYdody%Gz%aaIqu7T8V%t;_N5m?uY00000NkvXXu0mjfr@@K} literal 0 HcmV?d00001 diff --git a/Assets/Image/UIIcons/New Folder/Frame 50.png.meta b/Assets/Image/UIIcons/New Folder/Frame 50.png.meta new file mode 100644 index 00000000..86f7d085 --- /dev/null +++ b/Assets/Image/UIIcons/New Folder/Frame 50.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 1508699520044814b8439094595386e9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Image/UIIcons/New Folder/Frame 51.png b/Assets/Image/UIIcons/New Folder/Frame 51.png new file mode 100644 index 0000000000000000000000000000000000000000..b9fcf4452acb595e6c9aca4a8b951c0c17a77e81 GIT binary patch literal 383 zcmeAS@N?(olHy`uVBq!ia0y~yV3Yu|6*$;{@Tr8-1A_1spEUT+Ha?(lS9n zX)#N1=iSb?UK^|pWi5)^WE9&&4iu<6GEU3e^t~zet;mP1vwG~8?{0TZTW9=ut5zQK zgR1s5w`}9j{eC&|a^bG}J3WU>8O|&)+O8izf3{4$-s+FfKglr|uUfS|vFEfALz>yz zn6{5`ECWq%xRD@boN}z3 z!9-%!BMFA$)mA-?D{~pn=qQ&RKK-=j#42BgGbvf8K0n=a{{O+3?-EVzrcK<*(V*@7 n`_8YGkA06kds*~vM%w;A4=m2?{K2^k7+wsXu6{1-oD!MXJ z+CUH;iBGH>SerRy6H;q4hd6V#kWqZ)6TqIpm|u}CoWQ%GBa6&MviJt_4RFZc@5v*I z6(b56LFBF)dNgYFo9UVEd1xY{*tTtMx7#|pIW!mjVY}TPMe&h{VobozX7e50_XI?H zi}o>_&HkQDCO=N~qaAx$tyc58uHU0;qD=uPG)>Dvf9Q6*PkWOvpbLpa;+^MI)1F(c zmJ=BifHpqys&S!;u~ddh)u0TUiEa~NnsKb(?@zHRIx|$?AR0D8{!@Nm!1phhc%xpg zGZOUW&gb*OU@&k)SE>>?nVo1lllB%SlfeXd%B^%d{ZcBGGLb<4LEOb+am($IVK;Et z8eyP@h(WN@Cx(-KY!fvP`b2sh+uS;zZE{fK2oZ zOPk6VGc6!>3a=dKI!j=#*X#ZA$7CpTc=tu+XO}YT_4<+V25>W(Opc)QL1XDGIL4Je z2ggwu4#sv97dUe2a(3g%6L0DnS_z7%*pD5wGyim!l-x z0DMD@YGv)ykaGpZn{>#$H1Ac)f6$9cGGyFi5}=|(Y`%y~153mx1Ox#r Z`~iRzdvDf?^Bw>I002ovPDHLkV1lSnfIKUv1N8yh7%<05I=iP0JF*x#82!XCz#xTu!K!=gE%)JJH$8dMG!fj z*wbwrDI?93T5Y<@RnP7Ev=NDkR;%T3NKB+92HNd**D#Ea7;j6ZlCfH?zDPtwCPEUJ zI-aF+95RuJTuGeI=XolX+F*9ED@&}|QOTr46PI}SO=374R4u`^cJpLgXFhvt^w0ury zGMRi6O=!o+t?)|3k0gj}Bmq1L)_T33&tx(kq+pd<@|*$a-6M;X$T0npb+i3`|KJa3 z)2C>iPNzpG(}Ab}WL?n!Z0AkWT-0i{!gMItRM=2of)RQ zf~tk&=$VXq1`ro8vxj^Sy5o2}{uD*vcu;|UVB>>d3sWCsgDkrLe_|v|C^tZ8*7%gZ z;&OwnEvOVUO%l0_{U;CmSBYnF!dc=Dv7+3@X&lALQq`wz_^2elrM1Z)ku{*ZJ#4l`ve=Ki%YkdF!002ovPDHLkV1l)|JW~Jw literal 0 HcmV?d00001 diff --git a/Assets/Image/UIIcons/New Folder/Group 24.png.meta b/Assets/Image/UIIcons/New Folder/Group 24.png.meta new file mode 100644 index 00000000..e025abe1 --- /dev/null +++ b/Assets/Image/UIIcons/New Folder/Group 24.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: 6a4250302517a304bb7fdb373616ad22 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Image/UIIcons/New Folder/Group 26.png b/Assets/Image/UIIcons/New Folder/Group 26.png new file mode 100644 index 0000000000000000000000000000000000000000..7f490575c0d6ea221c1b854e2f1935d7126523be GIT binary patch literal 486 zcmV@P)}n&zr3%SSZTzA;5nyeTw+k|a?Vi$y0`lB7-5j3mrb9hzaK*s`pc zMoQQ95Y>*`@Jy)Sa))9LJ%s*OR5v6540qqdD;nNO>~^-At?HdXnx-E#LQSyix(|k7 zXnen3^VqiSXF5as{a(Z5-h&{B+I_sFuJS)9wME3o!r)DCmStPt_dol_B4uhKUl6KEwY-^~R#&EPbE}h23w}zNg>>@`ajz>}X;| cD8CLG-{^A4C(t#Gt^fc407*qoM6N<$f=0Q|>i_@% literal 0 HcmV?d00001 diff --git a/Assets/Image/UIIcons/New Folder/Group 26.png.meta b/Assets/Image/UIIcons/New Folder/Group 26.png.meta new file mode 100644 index 00000000..8158b72f --- /dev/null +++ b/Assets/Image/UIIcons/New Folder/Group 26.png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: d670067f40217394b8b33284a2c3a472 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Image/UIIcons/New Folder/Group 27.png b/Assets/Image/UIIcons/New Folder/Group 27.png new file mode 100644 index 0000000000000000000000000000000000000000..827e328245dc967111fb28db8a5f471fb255200b GIT binary patch literal 601 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 P00000NkvXXu0mjfI&fWu literal 0 HcmV?d00001 diff --git a/Assets/Image/UIIcons/New Folder/Layer_1 (7).png.meta b/Assets/Image/UIIcons/New Folder/Layer_1 (7).png.meta new file mode 100644 index 00000000..60293d19 --- /dev/null +++ b/Assets/Image/UIIcons/New Folder/Layer_1 (7).png.meta @@ -0,0 +1,130 @@ +fileFormatVersion: 2 +guid: a7e925534bbf92046a085afa249d3581 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Image/UIIcons/New Folder/Layer_1 (8).png b/Assets/Image/UIIcons/New Folder/Layer_1 (8).png new file mode 100644 index 0000000000000000000000000000000000000000..063daf82e9979cfae56d5d99d99b819f77ad5ed3 GIT binary patch literal 556 zcmV+{0@MA8P)fpnf#=JDtwRah!LN zBQ8)(KOB$8rPJv&zzZDwuG;N(MQDap2h-_vD5Wf2Zb->=41`9=>kF>yh5(jf?_${J zLN=RCQ)CEv?;^n4$z;+)8mb&)5jR<^<+Gbe#}d}nXdzQu%cKXG4$t!%NJoR?G}ejG zIFJrswZ_&99$BY`GE{58O<1o0cXC0mt$Dlw9|62jt+k-BHQ*M&J%DTKG1rDF)-JZ5 zg|3O_w_2@_+)(BesrW*73%E0z&DL*1Ggx$v$K!%ik4k4FE}dFX6q_2X2o$u#A@S7v znV_^|B}3OnTkm!|>t10`4F#}5J9JHgS)q9rkz73{|!kuq*fxp@H#RJ$y|8`G$y^>yrSpsYByZ3hIQ`GrEE$LcRM;{pY! uF8+?0g{|@}at5KCY6v?EpJ{Eoe~(`egcLEXta7dZ0000*`@00009a7bBm000XU z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yPpxmy4lz_MjTBv|1f)t0VF6e5grFNA=z(qws ziOX36awtXu2y!L_a*%}FnIx0UMnH~{?DOOsZL3iA$3APK){Au{^pkr<>lq0rCKM&L^FO18EUn9 z@h?eL-+WV6Ru(VSHkyh2UuffWI@b$di*IhMlT4*UM0gR+Xe{Cl2E#1n!cC^A_7twE zb~Anl91h2rz`($S8)T-_#7;&gpddG&$&XH?bEcUK_Iy&X5+RmlV7EcMvUwFD;o*qw z;SNBltT)E%x>Qb~31PR}`Fzfsyf}R(UL_^mrSiesRgM{lkm-vdzksw4*OG3ranJp6 zcLJe4US3{#$|^?Dgpg2*tT*C0ylFQkl{f8OzG$6JI-(^?q_Pt}w8h35yOjfLKB02i zM~E@!c89Ecuv(l>8=4TdN-L*!AEmvQju4fv&{spLt6C&dM>i?G(a@S&qOmiFmY9~W zq_(PxI{@9)*Mss#L6N?j>zmszFZh5kUw?GIzBp7Ws?<7i#8w6fkpu81R_HAezxT8@ zlD@WMa%Cm|rI#8!hX1Wx0&f36pb-3gr3G0 zLZ6*nyl5d(>7bkmxagra2&s{zyUfIHKT&TEWz6*We{yulc+&s1)$Pn~2dKmWHF)cl zMdfz6S7Opq{5F4vY2iZr%CvYN-{U4yK}w53oUgXiIXILnMiZwCv#}OuQ7ieqaR78ZS!TT|oQC#*ysfORLn29`C3c_17hB z-_4uZR!oP!C1$_?O#Al}oSIxmq=L(q^Tc|=Pq`V`ZRPlf2XUXuNIq2@6Cz`U)FUMs zEEDyfqKZbRZU-7$-Sf&=p(l>ucVs)!as5c$yO;fi1^lpOi^r>cqsVN#U=7PcTjRfM zt^2-s*Ed3hrQRYdf;zF-mP(I3Yp{w0hxNISKJB9DCpI%u`lpGN3{l%zFDKS3d)A?H zo}|j4t2fU^y@8~!w&4^_xEdc%P(%dV=g+UVX`Tp8V}9(FpNY51ir?yel)pBQT9=cG zl9GDal0O)AJRLoX<#XTT`6~xWU2}juv6S9W|= zVK?#X{_(ui`v@Sdi{!XI=yA5SVcR%bpEuurvv&0Yq>IL5;^BC zQnl-AQoh_ucK?CcV+WxRjHN(RNe_)dBD8_joH|=?JjJ6c@n@T^UD1o?nuNZuZUQk7H5^6;)xFtJoaI(UQETu7>v)1 zNvJDy6huYf^Y%Q#qFUp+aG8L!d8iYQ|qTr%b_Nvk@lh?Uj^-Rfr7K>8Q%d zL5^&AG8#pu0)B>azy1Z8}*tgH) zosWV>lc}hm67S{j-AB~Ccd=i(%0VpbP-(~v31aJ|BsO<=kRUmWXS9iCoXw6S=L#{C zAH^2iAFodn*z)~4!U?6Pp(p8%Bx0|grzTnsnU+${D0WijiHV6JV8ser4j$|_A)YRk z3K~VGLS)UxjfBjcDUyRM+K&TL5-6pOR|Kz_&!IO3u@60^fgNaN)U){NX?8h{xVlB7 z@@|ErPk%1OFQ=U=Q&ReBhN>N8Nl@N8FPGT{6LC0E0;MZb(qz-(WX`^8*Ag{uoW}?4 z4JK1jZ|ghD$Xfmn)UGf|RQQtSx_~pJBLf`1WNciBZuM%u+rFK_lE4U!4Cb&Uiw-kq z5%B5@bz>;%TKvJsge`pqv%`*Z?&%^@S21xSm1D=ULrD8U2%NyRxJ{8#tMqq&>n-k` zKHZ}UZ7`W-W>LZWrqZ^y23>wO5p5;Varu*dX`gs-8|})-Am`U#b5f+SQu+&?dk#-VgUR$MFpK!;$#~&$_HIdFZpVAsVrW6i)LHn7GzD+o zh00!tD=-X_&k$5rL;knlPrx|?#U%lqVzo>*Sn?eD&dfy z$wb+hF%r-laCYoSi^N1?7A>Mi`u9jKz?0E%$-I=#`&D^#eR4DoQvl1(9p|y~9D05E zJ=Oz`#=Y=oHzA5cNsWu* z%*H(;ZFh;+E|)C29*xRG+H12h2H!=|kH;}}?~cEyc$uhf=I-6@=af<-5?CY7MNwfT zifk!uX_6gUI&4^-v+|e7p-9P8 za?%Ou)Ctv|J#LerKr512)T0MZnKNvWXTR2ORA@B5ZBK?+is@Km!l>8sy;jRp4?K$L z?wce?H67vlM2h1`!TE7_~{W>!QvPnO0onZaY@#Jd*csM+U{&&X`v2F>z{{D56eB&fjv~?>r)zu`u{WjiNSz;QH z4Ul|?gi)=;Bq+omnlXbNLabIctl!+ZJo4aT}Pw<$6d zGL=m2Xqo_u892ND7>g%AOLC=nc8xb(Yb!V`iI6#5I~rz7=`F=uN}`lwLgZgJY@nl@ zl5U)kZc`*EA0Zs1iJ;iD&O>^$VCyO@E-Puy3i0n%D2gkgyu5`3d3|<`RQc@%saG65 zN~aMcZg(OTB&g-gtbDLpN)tgLv`4?*WXUme`Wtho)cd%zK*|T7TCUj>O<*8xmo84=(m84ZT;6>l^em)yAjRq!S%KSk``qNe^j?oNV`SSpdr)ax2uhu@5Z6;j2H vj#9poYbN%ZlTrSCMe2h> public bool isPlaying = false; List models = new List(); - public event Action> onModelsUpdated; + public event Action onModelsUpdated; public void AddModel(SimulationModel model) { if (models.Any(x => x == model)) @@ -15,14 +15,14 @@ public class DataManager : UnitySingleton int objCount = models.FindAll(x => x.modelName.Contains(model.modelName)).Count; model.modelName = model.modelName + "_" + objCount.ToString(); models.Add(model); - onModelsUpdated?.Invoke(models); + onModelsUpdated?.Invoke(); } public void RemoveModel(SimulationModel model) { if (models.Any(x => x == model)) return; models.Remove(model); - onModelsUpdated?.Invoke(models); + onModelsUpdated?.Invoke(); } public List GetModels() diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index b91fb8c8..d4f1fb80 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -33,28 +33,28 @@ MonoBehaviour: m_Settings: m_SettingsList: m_List: - - rid: 1324587745396130237 - - rid: 1324587745396130238 + - rid: 1324587768260329563 + - rid: 1324587768260329564 - rid: 6852985685364965378 - rid: 6852985685364965379 - rid: 6852985685364965380 - rid: 6852985685364965381 - - rid: 1324587745396130239 - - rid: 1324587745396130240 + - rid: 1324587768260329565 + - rid: 1324587768260329566 - rid: 6852985685364965384 - rid: 6852985685364965385 - - rid: 1324587745396130241 - - rid: 1324587745396130242 - - rid: 1324587745396130243 - - rid: 1324587745396130244 - - rid: 1324587745396130245 - - rid: 1324587745396130246 + - rid: 1324587768260329567 + - rid: 1324587768260329568 + - rid: 1324587768260329569 + - rid: 1324587768260329570 + - rid: 1324587768260329571 + - rid: 1324587768260329572 - rid: 6852985685364965392 - - rid: 1324587745396130247 + - rid: 1324587768260329573 - rid: 6852985685364965394 - rid: 8712630790384254976 - rid: 5092397466944798720 - - rid: 1324587745396130248 + - rid: 1324587768260329574 m_RuntimeSettings: m_List: - rid: 6852985685364965378 @@ -97,14 +97,14 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 1324587745396130237 + - rid: 1324587768260329563 type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 m_StripUnusedPostProcessingVariants: 1 m_StripUnusedVariants: 1 m_StripScreenCoordOverrideVariants: 1 - - rid: 1324587745396130238 + - rid: 1324587768260329564 type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} @@ -116,7 +116,7 @@ MonoBehaviour: m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} - - rid: 1324587745396130239 + - rid: 1324587768260329565 type: {class: Renderer2DResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 @@ -131,7 +131,7 @@ MonoBehaviour: m_DefaultLitMaterial: {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_DefaultUnlitMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} m_DefaultMaskMaterial: {fileID: 2100000, guid: 15d0c3709176029428a0da2f8cecf0b5, type: 2} - - rid: 1324587745396130240 + - rid: 1324587768260329566 type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} @@ -140,7 +140,7 @@ MonoBehaviour: m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} - - rid: 1324587745396130241 + - rid: 1324587768260329567 type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} data: m_Version: 0 @@ -153,13 +153,13 @@ MonoBehaviour: m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3} m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3} m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} - - rid: 1324587745396130242 + - rid: 1324587768260329568 type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3} m_preTaaCS: {fileID: 7200000, guid: a679dba8ec4d9ce45884a270b0e22dda, type: 3} m_taaCS: {fileID: 7200000, guid: 3923900e2b41b5e47bc25bfdcbcdc9e6, type: 3} - - rid: 1324587745396130243 + - rid: 1324587768260329569 type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -172,12 +172,12 @@ MonoBehaviour: skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} - - rid: 1324587745396130244 + - rid: 1324587768260329570 type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 m_ProbeVolumeDisableStreamingAssets: 0 - - rid: 1324587745396130245 + - rid: 1324587768260329571 type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -187,21 +187,21 @@ MonoBehaviour: probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} - - rid: 1324587745396130246 + - rid: 1324587768260329572 type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_version: 0 m_IncludeReferencedInScenes: 0 m_IncludeAssetsByLabel: 0 m_LabelToInclude: - - rid: 1324587745396130247 + - rid: 1324587768260329573 type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3} probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3} probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3} - - rid: 1324587745396130248 + - rid: 1324587768260329574 type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} diff --git a/Assets/WorkSpace/LH/LogicData/LogicDataManager.cs b/Assets/WorkSpace/LH/LogicData/LogicDataManager.cs index 2515b9e3..260a7ad3 100644 --- a/Assets/WorkSpace/LH/LogicData/LogicDataManager.cs +++ b/Assets/WorkSpace/LH/LogicData/LogicDataManager.cs @@ -17,6 +17,8 @@ namespace Octopus.Simulator [SerializeField] RectTransform LogicWindow; [SerializeField] + RectTransform LogicContent; + [SerializeField] Image linePrefab; [SerializeField] Button backGround; @@ -25,8 +27,6 @@ namespace Octopus.Simulator Dictionary dataMap = new Dictionary(); Dictionary idMap = new Dictionary(); - Vector2 padding = new Vector2(100, -100); - Panel_LogicData panelLogicData; Panel_ConnectedObject panelConnectedObject; Panel_PlacedObject panelPlacedObject; @@ -99,7 +99,7 @@ namespace Octopus.Simulator { foreach (var queue in queues) { - var logicButton = Instantiate(logicPrefab, LogicWindow); + var logicButton = Instantiate(logicPrefab, LogicContent); var item = logicButton.GetComponent(); item.Setup(queue); logicButtonDict.Add(logicButton, queue); @@ -114,7 +114,7 @@ namespace Octopus.Simulator { foreach (var resource in resources) { - var logicButton = Instantiate(logicPrefab, LogicWindow); + var logicButton = Instantiate(logicPrefab, LogicContent); var item = logicButton.GetComponent(); item.Setup(resource); logicButtonDict.Add(logicButton, resource); @@ -129,7 +129,7 @@ namespace Octopus.Simulator { foreach (var component in components) { - var logicButton = Instantiate(logicPrefab, LogicWindow); + var logicButton = Instantiate(logicPrefab, LogicContent); var item = logicButton.GetComponent(); item.Setup(component); logicButtonDict.Add(logicButton, component); @@ -144,7 +144,7 @@ namespace Octopus.Simulator { foreach(var edge in config.edges) { - var line=Instantiate(linePrefab, LogicWindow); + var line=Instantiate(linePrefab, LogicContent); line.rectTransform.anchoredPosition = (idMap[edge.source].GetComponent().anchoredPosition+ idMap[edge.target].GetComponent().anchoredPosition)/2f; Vector2 direction = idMap[edge.target].GetComponent().anchoredPosition - idMap[edge.source].GetComponent().anchoredPosition; float length = direction.magnitude; diff --git a/Assets/WorkSpace/LH/LogicData/LogicItemButton.cs b/Assets/WorkSpace/LH/LogicData/LogicItemButton.cs index 22214e3c..d4526cf1 100644 --- a/Assets/WorkSpace/LH/LogicData/LogicItemButton.cs +++ b/Assets/WorkSpace/LH/LogicData/LogicItemButton.cs @@ -12,16 +12,17 @@ public class LogicItemButton : MonoBehaviour [SerializeField] private Button button; [Header("Type Icons")] - [SerializeField] private Sprite queueIcon; [SerializeField] private Sprite resourceIcon; - [SerializeField] private Sprite componentIcon; - [SerializeField] private Sprite moveIcon; - [SerializeField] private Sprite waitingIcon; - [SerializeField] private Sprite shippingIcon; - [SerializeField] private Sprite sourceIcon; + [SerializeField] private Sprite storeIcon; + [SerializeField] private Sprite queueIcon; + [SerializeField] private Sprite productGeneratorIcon; + [SerializeField] private Sprite processorIcon; + [SerializeField] private Sprite transporterIcon; + [SerializeField] private Sprite shipmentIcon; // ŸÀÔ¡æ¾ÆÀÌÄÜ ¸ÅÇÎ private Dictionary IconMap; + private Dictionary componentMap; /// /// ¿ÜºÎ¿¡¼­ ÀÌ ¹öÆ°À» ÃʱâÈ­ÇÒ ¶§ È£Ãâ /// @@ -31,10 +32,26 @@ public class LogicItemButton : MonoBehaviour { { LogicItemType.Queue, queueIcon }, { LogicItemType.Resource, resourceIcon }, - { LogicItemType.Component, componentIcon } + {LogicItemType.Store,storeIcon } + }; + componentMap = new Dictionary() + { + { ComponentType.Product_Generator,productGeneratorIcon }, + { ComponentType.Processor,processorIcon }, + { ComponentType.Transporter,transporterIcon }, + { ComponentType.Shipment,shipmentIcon }, + { ComponentType.Conveyor,transporterIcon }, }; - iconImage.sprite = IconMap[item.ItemType]; + + if (item.ItemType != LogicItemType.Component) + { + iconImage.sprite = IconMap[item.ItemType]; + } + else + { + iconImage.sprite = componentMap[(item as ILogicComponent).Type]; + } nameText.text = item.Label; } } \ No newline at end of file diff --git a/Assets/WorkSpace/LH/LogicData/Panel_PlacedObject.cs b/Assets/WorkSpace/LH/LogicData/Panel_PlacedObject.cs index d8e938bd..ce8a1d17 100644 --- a/Assets/WorkSpace/LH/LogicData/Panel_PlacedObject.cs +++ b/Assets/WorkSpace/LH/LogicData/Panel_PlacedObject.cs @@ -17,43 +17,129 @@ namespace Octopus.Simulator [SerializeField] TMP_Dropdown dropdown; + string mappingkey=""; public Action onPlacedObjectSelected; // Start is called once before the first execution of Update after the MonoBehaviour is created void Awake() { rect = GetComponent(); - //DataManager.I.onModelsUpdated += SetButton; + DataManager.I.onModelsUpdated += SetDropdown; } public void SetDropdown(string mappingKey) { + mappingkey = mappingKey; gameObject.SetActive(true); var models = DataManager.I.GetModels(); + dropdown.onValueChanged.RemoveAllListeners(); dropdown.ClearOptions(); // 3) ¿É¼Ç µ¥ÀÌÅÍ »ý¼º - List options = new List(); + List options = new List + { + new TMP_Dropdown.OptionData("¼±ÅõÇÁö¾ÊÀ½") + }; foreach (var model in models) { options.Add(new TMP_Dropdown.OptionData(model.name)); } dropdown.AddOptions(options); + var current = LogicMappingDataBase.GetGameObject(mappingKey); + if (current != null) + { + // models ¸®½ºÆ®¿¡¼­ current¿Í °°Àº °´Ã¼ÀÇ À妽º ã±â + int modelIndex = models.FindIndex(m => m == current); + if (modelIndex >= 0) + { + // Ç÷¹À̽ºÈ¦´õ(0) ´ÙÀ½À̹ǷΠ+1 + dropdown.value = modelIndex + 1; + } + else + { + dropdown.value = 0; // Ȥ½Ã ¸®½ºÆ®¿¡ ¾øÀ¸¸é Ç÷¹À̽ºÈ¦´õ + } + } + else + { + dropdown.value = 0; // ¸ÅÇÎµÈ °Ô ¾øÀ¸¸é Ç÷¹À̽ºÈ¦´õ + } + dropdown.RefreshShownValue(); // 4) Äݹé ÃʱâÈ­ ÈÄ µî·Ï dropdown.onValueChanged.RemoveAllListeners(); dropdown.onValueChanged.AddListener(idx => { - var selectedModel = models[idx]; - LogicMappingDataBase.SetMapping(mappingKey, selectedModel); - Debug.Log(mappingKey); + if (idx == 0) + { + LogicMappingDataBase.SetMapping(mappingKey, null); + } + else + { + var selectedModel = models[idx-1]; + LogicMappingDataBase.SetMapping(mappingKey, selectedModel); + Debug.Log(mappingKey); + } onPlacedObjectSelected?.Invoke(mappingKey); }); + } - // (¼±Åà ±âº»°ª ¼³Á¤ ÇÊ¿ä ½Ã) - // dropdown.value = 0; - // dropdown.RefreshShownValue(); + public void SetDropdown() + { + gameObject.SetActive(true); + + var models = DataManager.I.GetModels(); + + dropdown.onValueChanged.RemoveAllListeners(); + dropdown.ClearOptions(); + + // 3) ¿É¼Ç µ¥ÀÌÅÍ »ý¼º + List options = new List + { + new TMP_Dropdown.OptionData("¼±ÅõÇÁö¾ÊÀ½") + }; + foreach (var model in models) + { + options.Add(new TMP_Dropdown.OptionData(model.name)); + } + dropdown.AddOptions(options); + var current = LogicMappingDataBase.GetGameObject(mappingkey); + if (current != null) + { + // models ¸®½ºÆ®¿¡¼­ current¿Í °°Àº °´Ã¼ÀÇ À妽º ã±â + int modelIndex = models.FindIndex(m => m == current); + if (modelIndex >= 0) + { + // Ç÷¹À̽ºÈ¦´õ(0) ´ÙÀ½À̹ǷΠ+1 + dropdown.value = modelIndex + 1; + } + else + { + dropdown.value = 0; // Ȥ½Ã ¸®½ºÆ®¿¡ ¾øÀ¸¸é Ç÷¹À̽ºÈ¦´õ + } + } + else + { + dropdown.value = 0; // ¸ÅÇÎµÈ °Ô ¾øÀ¸¸é Ç÷¹À̽ºÈ¦´õ + } + dropdown.RefreshShownValue(); + // 4) Äݹé ÃʱâÈ­ ÈÄ µî·Ï + dropdown.onValueChanged.RemoveAllListeners(); + dropdown.onValueChanged.AddListener(idx => + { + if (idx == 0) + { + LogicMappingDataBase.SetMapping(mappingkey, null); + } + else + { + var selectedModel = models[idx - 1]; + LogicMappingDataBase.SetMapping(mappingkey, selectedModel); + Debug.Log(mappingkey); + } + onPlacedObjectSelected?.Invoke(mappingkey); + }); } void ClearButton() @@ -73,6 +159,7 @@ namespace Octopus.Simulator public void DataDeSelected() { + mappingkey = ""; gameObject.SetActive(false); } } diff --git a/Assets/WorkSpace/LH/LogicInfo.cs b/Assets/WorkSpace/LH/LogicInfo.cs index 6446b20d..a9805809 100644 --- a/Assets/WorkSpace/LH/LogicInfo.cs +++ b/Assets/WorkSpace/LH/LogicInfo.cs @@ -196,7 +196,7 @@ namespace Octopus.Simulator public class ProductGenerator : ILogicComponent { public string name; - public int rate; + public int? rate=0; public string description; public string label; public string output_queue; diff --git a/Assets/WorkSpace/LH/LogicMappingDataBase.cs b/Assets/WorkSpace/LH/LogicMappingDataBase.cs index c510df42..3d012bae 100644 --- a/Assets/WorkSpace/LH/LogicMappingDataBase.cs +++ b/Assets/WorkSpace/LH/LogicMappingDataBase.cs @@ -9,13 +9,21 @@ public class LogicMappingDataBase : MonoBehaviour { if (mappingObjectDict.ContainsKey(name)) { - mappingObjectDict[name] = target; + if (target) + { + mappingObjectDict[name] = target; + target.nodeID = name; + } + else + { + mappingObjectDict.Remove(name); + } } else { mappingObjectDict.Add(name, target); + target.nodeID = name; } - target.nodeID = name; } public static SimulationModel GetGameObject(string name) diff --git a/Assets/WorkSpace/LH/Manager.prefab b/Assets/WorkSpace/LH/Manager.prefab index 6373732e..57a39167 100644 --- a/Assets/WorkSpace/LH/Manager.prefab +++ b/Assets/WorkSpace/LH/Manager.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 8164125700257988699} - component: {fileID: 6191105916327120908} - component: {fileID: 8343195631698366838} + - component: {fileID: 3408166986665272114} m_Layer: 0 m_Name: NetworkManager m_TagString: Untagged @@ -127,6 +128,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: edf9e532e5ff77f47bc99037340faf31, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &3408166986665272114 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1392524223077930677} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d820d4ce26788f543901a6cca300076f, type: 3} + m_Name: + m_EditorClassIdentifier: + text: {fileID: 0} --- !u!1 &2069922514250663687 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/WorkSpace/LH/ProjectDataManager.cs b/Assets/WorkSpace/LH/ProjectDataManager.cs new file mode 100644 index 00000000..4d2e0428 --- /dev/null +++ b/Assets/WorkSpace/LH/ProjectDataManager.cs @@ -0,0 +1,41 @@ +using Octopus.Simulator.Networks; +using UnityEngine; +using Newtonsoft.Json; +using UnityEngine.UI; +using TMPro; + +public class ProjectDataManager : MonoBehaviour +{ + [SerializeField] + TMP_Text text; + [SerializeField] + Button projectMenuButton; + [SerializeField] + RectTransform menuPanel; + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + FindAnyObjectByType().onParameterRecived += RequestInfo; + projectMenuButton.onClick.AddListener(SetActive); + } + void RequestInfo(SimulatorConfig config) + { + WebManager.webManager.Request_Get($"{WebManager.webManager.apiConfig.project}/{WebParameters.config.projectId}", (flag, value) => + { + if (flag) + { + var info = JsonConvert.DeserializeObject(value); + SetText(info.data.name); + } + }); + } + + void SetText(string data) + { + text.text = data; + } + void SetActive() + { + menuPanel.gameObject.SetActive(!menuPanel.gameObject.activeSelf); + } +} diff --git a/Assets/WorkSpace/LH/ProjectDataManager.cs.meta b/Assets/WorkSpace/LH/ProjectDataManager.cs.meta new file mode 100644 index 00000000..4f602476 --- /dev/null +++ b/Assets/WorkSpace/LH/ProjectDataManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: d820d4ce26788f543901a6cca300076f \ No newline at end of file diff --git a/Assets/WorkSpace/LH/ProjectInfo.cs b/Assets/WorkSpace/LH/ProjectInfo.cs new file mode 100644 index 00000000..bf7c7b4e --- /dev/null +++ b/Assets/WorkSpace/LH/ProjectInfo.cs @@ -0,0 +1,13 @@ +using UnityEngine; + +[SerializeField] +public class ProjectInfo +{ + public ProjectInfoData data; +} + +[SerializeField] +public class ProjectInfoData +{ + public string name; +} diff --git a/Assets/WorkSpace/LH/ProjectInfo.cs.meta b/Assets/WorkSpace/LH/ProjectInfo.cs.meta new file mode 100644 index 00000000..90639860 --- /dev/null +++ b/Assets/WorkSpace/LH/ProjectInfo.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: c2717f5d20f47414fa20a0fc05dfe43d \ No newline at end of file diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index c757ccbf..44cd7e60 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,8 +6,8 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/Simulation_0.0.0.unity - guid: 01c1b3957fe7a77479f2ba91dc962711 + path: Assets/Scenes/Simulation_0.0.1.unity + guid: e206b0c540710b54b878a125c69cd126 m_configObjects: com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} m_UseUCBPForAssetBundles: 0