From 92b3c810204359521eca24070f213aefbe9be6d5 Mon Sep 17 00:00:00 2001 From: Zach Vinless Date: Sun, 6 Nov 2016 23:20:50 -0800 Subject: [PATCH 1/6] Added pro skin icons and moved editor textures - Added Fungus Editor Resources folder for editor textures (these should no longer get included in builds) - Added pro skin icons in Fungus Editor Resources/Icons/Pro - All editor textures should now be accessible as properties in FungusEditorResources. If the textures change, use Tools -> Fungus -> Utilities -> UpdateEditorResourcesScript to automatically update this --- Assets/Fungus/Fungus Editor Resources.meta | 9 + .../Icons.meta | 0 .../Fungus Editor Resources/Icons/Pro.meta | 9 + .../Fungus Editor Resources/Icons/Pro/add.png | Bin 0 -> 865 bytes .../Icons/Pro/add.png.meta} | 16 +- .../Icons/Pro/add_small.png | Bin 0 -> 865 bytes .../Icons/Pro/add_small.png.meta} | 16 +- .../Icons/Pro/delete.png | Bin 0 -> 1076 bytes .../Icons/Pro/delete.png.meta} | 16 +- .../Icons/Pro/down.png | Bin 0 -> 1069 bytes .../Icons/Pro/down.png.meta | 59 ++++++ .../Icons/Pro/duplicate.png | Bin 0 -> 1106 bytes .../Icons/Pro/duplicate.png.meta | 59 ++++++ .../Fungus Editor Resources/Icons/Pro/up.png | Bin 0 -> 1025 bytes .../Icons/Pro/up.png.meta | 59 ++++++ .../Icons/add.png | Bin .../Icons/add.png.meta | 0 .../Icons/add_small.png | Bin .../Icons/add_small.png.meta | 0 .../Icons/delete.png | Bin .../Icons/delete.png.meta | 0 .../Icons/down.png | Bin .../Icons/down.png.meta | 0 .../Icons/duplicate.png | Bin .../Icons/duplicate.png.meta | 0 .../Icons/up.png | Bin .../Icons/up.png.meta | 0 .../Textures.meta | 0 .../Textures/choice_node_off.png | Bin .../Textures/choice_node_off.png.meta | 0 .../Textures/choice_node_on.png | Bin .../Textures/choice_node_on.png.meta | 0 .../Textures/command_background.png | Bin .../Textures/command_background.png.meta | 0 .../Textures/event_node_off.png | Bin .../Textures/event_node_off.png.meta | 0 .../Textures/event_node_on.png | Bin .../Textures/event_node_on.png.meta | 0 .../Textures/play_big.png | Bin .../Textures/play_big.png.meta | 0 .../Textures/play_small.png | Bin .../Textures/play_small.png.meta | 0 .../Textures/process_node_off.png | Bin .../Textures/process_node_off.png.meta | 0 .../Textures/process_node_on.png | Bin .../Textures/process_node_on.png.meta | 0 .../Fungus/Resources/Icons/ResizeHandle.png | Bin 2968 -> 0 bytes Assets/Fungus/Resources/Icons/left.png | Bin 2911 -> 0 bytes Assets/Fungus/Resources/Icons/right.png | Bin 2903 -> 0 bytes Assets/Fungus/Scripts/Editor/BlockEditor.cs | 10 +- .../Scripts/Editor/CommandListAdaptor.cs | 4 +- .../Fungus/Scripts/Editor/FlowchartEditor.cs | 2 +- .../Fungus/Scripts/Editor/FlowchartWindow.cs | 16 +- .../Scripts/Editor/FungusEditorResources.cs | 199 ++++++------------ .../Editor/FungusEditorResourcesGenerated.cs | 26 +++ .../FungusEditorResourcesGenerated.cs.meta | 12 ++ 56 files changed, 345 insertions(+), 167 deletions(-) create mode 100644 Assets/Fungus/Fungus Editor Resources.meta rename Assets/Fungus/{Resources => Fungus Editor Resources}/Icons.meta (100%) create mode 100644 Assets/Fungus/Fungus Editor Resources/Icons/Pro.meta create mode 100644 Assets/Fungus/Fungus Editor Resources/Icons/Pro/add.png rename Assets/Fungus/{Resources/Icons/right.png.meta => Fungus Editor Resources/Icons/Pro/add.png.meta} (77%) create mode 100644 Assets/Fungus/Fungus Editor Resources/Icons/Pro/add_small.png rename Assets/Fungus/{Resources/Icons/ResizeHandle.png.meta => Fungus Editor Resources/Icons/Pro/add_small.png.meta} (77%) create mode 100644 Assets/Fungus/Fungus Editor Resources/Icons/Pro/delete.png rename Assets/Fungus/{Resources/Icons/left.png.meta => Fungus Editor Resources/Icons/Pro/delete.png.meta} (77%) create mode 100644 Assets/Fungus/Fungus Editor Resources/Icons/Pro/down.png create mode 100644 Assets/Fungus/Fungus Editor Resources/Icons/Pro/down.png.meta create mode 100644 Assets/Fungus/Fungus Editor Resources/Icons/Pro/duplicate.png create mode 100644 Assets/Fungus/Fungus Editor Resources/Icons/Pro/duplicate.png.meta create mode 100644 Assets/Fungus/Fungus Editor Resources/Icons/Pro/up.png create mode 100644 Assets/Fungus/Fungus Editor Resources/Icons/Pro/up.png.meta rename Assets/Fungus/{Resources => Fungus Editor Resources}/Icons/add.png (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Icons/add.png.meta (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Icons/add_small.png (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Icons/add_small.png.meta (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Icons/delete.png (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Icons/delete.png.meta (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Icons/down.png (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Icons/down.png.meta (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Icons/duplicate.png (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Icons/duplicate.png.meta (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Icons/up.png (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Icons/up.png.meta (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Textures.meta (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Textures/choice_node_off.png (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Textures/choice_node_off.png.meta (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Textures/choice_node_on.png (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Textures/choice_node_on.png.meta (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Textures/command_background.png (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Textures/command_background.png.meta (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Textures/event_node_off.png (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Textures/event_node_off.png.meta (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Textures/event_node_on.png (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Textures/event_node_on.png.meta (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Textures/play_big.png (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Textures/play_big.png.meta (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Textures/play_small.png (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Textures/play_small.png.meta (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Textures/process_node_off.png (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Textures/process_node_off.png.meta (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Textures/process_node_on.png (100%) rename Assets/Fungus/{Resources => Fungus Editor Resources}/Textures/process_node_on.png.meta (100%) delete mode 100644 Assets/Fungus/Resources/Icons/ResizeHandle.png delete mode 100644 Assets/Fungus/Resources/Icons/left.png delete mode 100644 Assets/Fungus/Resources/Icons/right.png create mode 100644 Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs create mode 100644 Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs.meta diff --git a/Assets/Fungus/Fungus Editor Resources.meta b/Assets/Fungus/Fungus Editor Resources.meta new file mode 100644 index 00000000..81e8ab72 --- /dev/null +++ b/Assets/Fungus/Fungus Editor Resources.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 5ff164265158945c18b7d438b570ba22 +folderAsset: yes +timeCreated: 1478502248 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fungus/Resources/Icons.meta b/Assets/Fungus/Fungus Editor Resources/Icons.meta similarity index 100% rename from Assets/Fungus/Resources/Icons.meta rename to Assets/Fungus/Fungus Editor Resources/Icons.meta diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/Pro.meta b/Assets/Fungus/Fungus Editor Resources/Icons/Pro.meta new file mode 100644 index 00000000..9dab8a98 --- /dev/null +++ b/Assets/Fungus/Fungus Editor Resources/Icons/Pro.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 5e5a1319ef7f546a7affe3baabd5fba6 +folderAsset: yes +timeCreated: 1478502692 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/Pro/add.png b/Assets/Fungus/Fungus Editor Resources/Icons/Pro/add.png new file mode 100644 index 0000000000000000000000000000000000000000..23646d93077e6966bca77415871932dbb13c9752 GIT binary patch literal 865 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqBDG7;Q2`B1$5BeXNr6bM+Ea@{>~a zDsl^e@(c_%_7w$*$=RtT3Q4KynR&KK?|1K4QpilPRSGxtHSjHPPR+>ls47YguJQ{> zuF6ifOi{A8KQ26aVgjorKDK}xwt_!19`Se86_nJR{Hwo<>h+i#(Mch>H3D2mX`VkM*2oZ zx=P7{9OiaozEwNS74=qkDD%P(`OwP~; zD#PfSVCE67V%(g(RhALa+U*xFl2C2Z)X@p*X#LS6v?aLt zhXP9{*S=X#CV98m^zCL5^ya=TB4)S2u%mZt*&}-ej;5&21Z^=cGo|M_LLLIfr{C56 zzCH8i-N=G9DqE*qHDFm;a*gM#Pi0uxbsJxOi_9f+_1F&2O7+pxVOfzG&wpj*&wcSv zSH1nd-g2>_ck`~ahn!~(HXqu2=-}El3x7D=SgU#{@FDj@yI?(yKTE!Nblw*^-u))P z^6s;s6Z&t&z8zU@5p*=_kPl}+SNZZumTPO|zfQUqQB@iE^3v`N9EOKQ*B=V`a#vp{WY>MYbl24Hnl^_n@v-DR{J>Flu6&2D z%K%d^XMsm#F#`j)FbFd;%$g$s6twbmaSXBOO-_(tUEI(J1P@P4RQ}&DWBF;m#8#gx z+vdDtGkP>h;fbrXwDg*)mG7Ju9r(~SCD1^Kfgztu&_d{2*)>qk@O1TaS?83{1OQNW BPon?; literal 0 HcmV?d00001 diff --git a/Assets/Fungus/Resources/Icons/right.png.meta b/Assets/Fungus/Fungus Editor Resources/Icons/Pro/add.png.meta similarity index 77% rename from Assets/Fungus/Resources/Icons/right.png.meta rename to Assets/Fungus/Fungus Editor Resources/Icons/Pro/add.png.meta index 7c6971a5..422af796 100644 --- a/Assets/Fungus/Resources/Icons/right.png.meta +++ b/Assets/Fungus/Fungus Editor Resources/Icons/Pro/add.png.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 -guid: b3dd8b25a62664f379cb3714060d4e33 +guid: 4e43c476b4a7a49a08c37378fb01ce99 +timeCreated: 1478502692 +licenseType: Free TextureImporter: fileIDToRecycleName: {} serializedVersion: 2 @@ -15,17 +17,17 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 + cubemapConvolutionSteps: 7 cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 - maxTextureSize: 1024 + maxTextureSize: 2048 textureSettings: filterMode: -1 aniso: 1 @@ -35,18 +37,22 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 1 + spriteTessellationDetail: -1 textureType: 2 buildTargetSettings: [] spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/Pro/add_small.png b/Assets/Fungus/Fungus Editor Resources/Icons/Pro/add_small.png new file mode 100644 index 0000000000000000000000000000000000000000..cf6b201ee000847da384d4353aed81a6769252f9 GIT binary patch literal 865 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4(FKV06k1i71Ki^|4CM&(%vz$xlkv ztH>-n*TA>HIW;5GqpB!1xXLdi zxhgx^GDXSWj?1RP3TQxXYDuC(MQ%=Bu~mhw64+cTAR8pCucQE0Qj%?}6yY17;GAES zs$i;Ts%M~N$E9FXl#*r@k>g7FXt#Bv$C=6)S^`fSBQuTAW;zSx}OhpQivaGchT@w8U0PKeRZts93)$F*!pY zs3f~2zd+wJIX|yhKQSdGzBo5ACr7U!FI`C=?qJ~zj%>^YLljpPEbed zj~<~d!OcGuSUS1(&3ZD)yTzt&H;bS*_iYg|yA6gNy<5v3*(-1~MRg`!@{oH`086^E}5&xc6e5*kDd<8ip+Ta zD=UBQi+{T6?f3PTiw(V-ccne#JZrG|(B?x2*REOk!{NqS)kA>~xgXjE>uLO1^2MX` zzR2TONfl8g)b%QzUBP>ePvrcSAc%$&YSCxq<>3%6Z@sc^|c-2b-kFl z@GU1KW1cSje3N7L!$l$bcNf0?P{^0N`a&VQ?(3zyrheD7IdqASCGX(}j;bT~w|?Z7 z<4t$vJA7RRn1(qEJR*x37`TN&n2}-D90{PHiKmNWh(&L5f&^>D!6sJjfBF#{9@yKN z`b>#(+Q``Rf~jTBoCy;e7PTjdKVWrM7I0@|W@g~q!QbH)HTNVaXL!2$xvX~a zDsl^e@(c_%_7w$*$=RtT3Q4KynR&KK?|1K4QpilPRSGxtHSjHPPR+>ls47YguJQ{> zuF6ifOi{A8KQ26aVgjorKDK}xwt_!19`Se86_nJR{Hwo<>h+i#(Mch>H3D2mX`VkM*2oZ zx=P7{9OiaozEwNS74=qkDD%P(`OwP~; zD#Pf5*5ElJfY$V*q!2RTF^>Jp%r^x=L2a^RtongnD>p{1Fbu92Q01B1rI(uuphnH>e%?H4bSP;JuG(Fy8k{m~<| zCAj&A0!t^?zFAKudAHc~?Pd}5=DsZ=X1BqxqjziBBYOporl`&YZ80u0rRO<99s$bvO0Tc=z#U|CsmjpwXSWmwpC8()2k%q4U6*bdK1_0iK|S&mJ&t9mH#A@@VOU_FgLOTKt?-WNIE z{U*Tj?z5m1`ftR(9a(J=bTsOa4`)AD`SMAYYis1cPP!IRRT=p5((Vl$hKEJup3OMc z-=BCa^~=Tn>5P$q%J-ss_$N(_@O5j>^)c(5tl&L=h2=@P$&uo=YPyB`!}F#}JF&x04q70i&et|IA2NfsR$dN2hh! z9f*C$D)o!aLgb~kLIu0X`GDZw9Vh3l(Oor3K&9zHp4dUzojMz06jVh2y!-!czP<5D zrr&yAwqc>APv+caIuZ5dg2`FW$Z7t~T(5WSV=1`k+|IzaXr?&BdE5HA&wqxd$Jk3c z-4MK(oAo+Eu_e}M!7Aa3Fu%H|j3$i8nLj7*j907sy`- Qxd6)Sp00i_>zopr06;>sEC2ui literal 0 HcmV?d00001 diff --git a/Assets/Fungus/Resources/Icons/left.png.meta b/Assets/Fungus/Fungus Editor Resources/Icons/Pro/delete.png.meta similarity index 77% rename from Assets/Fungus/Resources/Icons/left.png.meta rename to Assets/Fungus/Fungus Editor Resources/Icons/Pro/delete.png.meta index 546dd74e..da792108 100644 --- a/Assets/Fungus/Resources/Icons/left.png.meta +++ b/Assets/Fungus/Fungus Editor Resources/Icons/Pro/delete.png.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 -guid: c0a7a4711d69249ab9dae1539a3247ee +guid: 29c4d29b1678042a5b3516c732ccc507 +timeCreated: 1478502692 +licenseType: Free TextureImporter: fileIDToRecycleName: {} serializedVersion: 2 @@ -15,17 +17,17 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 + cubemapConvolutionSteps: 7 cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 - maxTextureSize: 1024 + maxTextureSize: 2048 textureSettings: filterMode: -1 aniso: 1 @@ -35,18 +37,22 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 1 + spriteTessellationDetail: -1 textureType: 2 buildTargetSettings: [] spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/Pro/down.png b/Assets/Fungus/Fungus Editor Resources/Icons/Pro/down.png new file mode 100644 index 0000000000000000000000000000000000000000..b84dbd531df99f234508b6cdf6836c40959fa038 GIT binary patch literal 1069 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqBDG7;Q5{B1$5BeXNr6bM+Ea@{>~a zDsl^e@(c_%_7w$*$=RtT3Q4KynR&KK?|1K4QpilPRSGxtHSjHPPR+>ls47YguJQ{> zuF6ifOi{A8KQ26aVgjorKDK}xwt_!19`Se86_nJR{Hwo<>h+i#(Mch>H3D2mX`VkM*2oZ zx=P7{9OiaozEwNS74=qkDD%P(`OwP~; zD#PsuOO(<{hJSJDSLLm%o6pojF~J_2&!VUn5$42UA2k9Dnmo&p21 zHPhKSpg73gNx{?A+04+=%uLrv&yayZV`AyV-QLWO0`2yT7fGl#Y3k?%b+rEI5!w>m z{6m4IlWX6sCzHHeZ2ESy2zqnh77?@CVA#>Swd|3-0!LF+XM(mEmzmP@93c+@9DNGjOV|y^5?$z zr>ow6UvIhC(7Sn8+C$E>2AdCUK6G&HnuR|cZmd;36!?()pRs$e0gd21`fl+B681W9P95- zJeK<9V*hl;$Uxw$*b5=$G!ix&BD{x5PKGUus-m+c93(i-`;0azZlZ z>B7%9Ic7gx6rz83;p-2De7UPH6te5SUb<`QcTJl^m-txn9)94cI&y#OM{YUZbXUH^ z*JXgom$SelvY3H^TNs2H8D`Cq0LBulr;B5VMeozewtmcp0b5Cf~GVQvwbi<8f#Z%`bwHldtZ&CUk?BKfWQ_u6-s%i5YH*53hu6Sj7 zGMvF+v$SC3*SEX(7nL155V%?MbkUU5o6-&Cf;Yc%hL-X?*tBZZYMb-+{xZiT=6Ufv#$4&-@?uI z<%pZhv$SnFjk>!N_VP*l$$Q*0P5ACS>tN8;)>V3SyuapuWp!=MQE~Z^QwqxEp00i_ I>zopr06uWF@c;k- literal 0 HcmV?d00001 diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/Pro/down.png.meta b/Assets/Fungus/Fungus Editor Resources/Icons/Pro/down.png.meta new file mode 100644 index 00000000..9dba1d7d --- /dev/null +++ b/Assets/Fungus/Fungus Editor Resources/Icons/Pro/down.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: 5a87a7d3683164a238377d948572805f +timeCreated: 1478502692 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/Pro/duplicate.png b/Assets/Fungus/Fungus Editor Resources/Icons/Pro/duplicate.png new file mode 100644 index 0000000000000000000000000000000000000000..7a36f572a8b6eff2d19ba3f0a606ddcaf93a82f8 GIT binary patch literal 1106 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqBDG7@aahB1$5BeXNr6bM+Ea@{>~a zDsl^e@(c_%_7w$*$=RtT3Q4KynR&KK?|1K4QpilPRSGxtHSjHPPR+>ls47YguJQ{> zuF6ifOi{A8KQ26aVgjorKDK}xwt_!19`Se86_nJR{Hwo<>h+i#(Mch>H3D2mX`VkM*2oZ zx=P7{9OiaozEwNS74=qkDD%P(`OwP~; zD#Pbn?P$xKcxN!2UJOIOkdxkVr97@)88;obsr-~p4G2MmoOpts|$ z^DYI3W^1Oib3k#ByOV;atFxJ*rJ0$ok)9y~gT}J5 z(Id1axcP?yODEU9Sx+W;x7hUUW)bw}zAYkVx52QZcWc=rdj*cBsLlj!F)lNu=Q%-D`)&0Ib^XA>if;B2zr(88)Sy^(8=d4da*$x|(uHulWC6 zyLQQa&r;#2=Lodhp)>3(=ca&M`SSr1Gg{;GcwGYBLR#hRZkbk5R2ZclMMZi7znujSJ*NsFk;)1 zCC?ZpM%*m%Y_?!H{(vE*dWLBD2JSFx<%@;98W|26FC}KFcrEIcwfZsjuWjAGZR|f@ zFDg?|`Zc>ZG<5FN)Ss5$`rSW^GyG=B=2e&~a zDsl^e@(c_%_7w$*$=RtT3Q4KynR&KK?|1K4QpilPRSGxtHSjHPPR+>ls47YguJQ{> zuF6ifOi{A8KQ26aVgjorKDK}xwt_!19`Se86_nJR{Hwo<>h+i#(Mch>H3D2mX`VkM*2oZ zx=P7{9OiaozEwNS74=qkDD%P(`OwP~; zD#FD=k3$V*q!2RT9?>I$HD^x^&ia^NA7ngAH7>uo% z&dveFLGDfpp03VjhL&b#x<-123=A3*ODFF3W_A>4w_m(SLbXX#M<=MG^+%7;mf+?e z3M`#m`({0v>)6)kjZDJ+|Gu)Vo-07Vbmz_WN7BC~zKQ)(d+F0uaHS3#!}noCzMXlgnq_vf%n+{d`(LTT3G&`r}o OIoH$G&t;ucLK6U96rpnf literal 0 HcmV?d00001 diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/Pro/up.png.meta b/Assets/Fungus/Fungus Editor Resources/Icons/Pro/up.png.meta new file mode 100644 index 00000000..2371a0d0 --- /dev/null +++ b/Assets/Fungus/Fungus Editor Resources/Icons/Pro/up.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: 2a76a781db2994b33b83cd84b8835da7 +timeCreated: 1478502692 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fungus/Resources/Icons/add.png b/Assets/Fungus/Fungus Editor Resources/Icons/add.png similarity index 100% rename from Assets/Fungus/Resources/Icons/add.png rename to Assets/Fungus/Fungus Editor Resources/Icons/add.png diff --git a/Assets/Fungus/Resources/Icons/add.png.meta b/Assets/Fungus/Fungus Editor Resources/Icons/add.png.meta similarity index 100% rename from Assets/Fungus/Resources/Icons/add.png.meta rename to Assets/Fungus/Fungus Editor Resources/Icons/add.png.meta diff --git a/Assets/Fungus/Resources/Icons/add_small.png b/Assets/Fungus/Fungus Editor Resources/Icons/add_small.png similarity index 100% rename from Assets/Fungus/Resources/Icons/add_small.png rename to Assets/Fungus/Fungus Editor Resources/Icons/add_small.png diff --git a/Assets/Fungus/Resources/Icons/add_small.png.meta b/Assets/Fungus/Fungus Editor Resources/Icons/add_small.png.meta similarity index 100% rename from Assets/Fungus/Resources/Icons/add_small.png.meta rename to Assets/Fungus/Fungus Editor Resources/Icons/add_small.png.meta diff --git a/Assets/Fungus/Resources/Icons/delete.png b/Assets/Fungus/Fungus Editor Resources/Icons/delete.png similarity index 100% rename from Assets/Fungus/Resources/Icons/delete.png rename to Assets/Fungus/Fungus Editor Resources/Icons/delete.png diff --git a/Assets/Fungus/Resources/Icons/delete.png.meta b/Assets/Fungus/Fungus Editor Resources/Icons/delete.png.meta similarity index 100% rename from Assets/Fungus/Resources/Icons/delete.png.meta rename to Assets/Fungus/Fungus Editor Resources/Icons/delete.png.meta diff --git a/Assets/Fungus/Resources/Icons/down.png b/Assets/Fungus/Fungus Editor Resources/Icons/down.png similarity index 100% rename from Assets/Fungus/Resources/Icons/down.png rename to Assets/Fungus/Fungus Editor Resources/Icons/down.png diff --git a/Assets/Fungus/Resources/Icons/down.png.meta b/Assets/Fungus/Fungus Editor Resources/Icons/down.png.meta similarity index 100% rename from Assets/Fungus/Resources/Icons/down.png.meta rename to Assets/Fungus/Fungus Editor Resources/Icons/down.png.meta diff --git a/Assets/Fungus/Resources/Icons/duplicate.png b/Assets/Fungus/Fungus Editor Resources/Icons/duplicate.png similarity index 100% rename from Assets/Fungus/Resources/Icons/duplicate.png rename to Assets/Fungus/Fungus Editor Resources/Icons/duplicate.png diff --git a/Assets/Fungus/Resources/Icons/duplicate.png.meta b/Assets/Fungus/Fungus Editor Resources/Icons/duplicate.png.meta similarity index 100% rename from Assets/Fungus/Resources/Icons/duplicate.png.meta rename to Assets/Fungus/Fungus Editor Resources/Icons/duplicate.png.meta diff --git a/Assets/Fungus/Resources/Icons/up.png b/Assets/Fungus/Fungus Editor Resources/Icons/up.png similarity index 100% rename from Assets/Fungus/Resources/Icons/up.png rename to Assets/Fungus/Fungus Editor Resources/Icons/up.png diff --git a/Assets/Fungus/Resources/Icons/up.png.meta b/Assets/Fungus/Fungus Editor Resources/Icons/up.png.meta similarity index 100% rename from Assets/Fungus/Resources/Icons/up.png.meta rename to Assets/Fungus/Fungus Editor Resources/Icons/up.png.meta diff --git a/Assets/Fungus/Resources/Textures.meta b/Assets/Fungus/Fungus Editor Resources/Textures.meta similarity index 100% rename from Assets/Fungus/Resources/Textures.meta rename to Assets/Fungus/Fungus Editor Resources/Textures.meta diff --git a/Assets/Fungus/Resources/Textures/choice_node_off.png b/Assets/Fungus/Fungus Editor Resources/Textures/choice_node_off.png similarity index 100% rename from Assets/Fungus/Resources/Textures/choice_node_off.png rename to Assets/Fungus/Fungus Editor Resources/Textures/choice_node_off.png diff --git a/Assets/Fungus/Resources/Textures/choice_node_off.png.meta b/Assets/Fungus/Fungus Editor Resources/Textures/choice_node_off.png.meta similarity index 100% rename from Assets/Fungus/Resources/Textures/choice_node_off.png.meta rename to Assets/Fungus/Fungus Editor Resources/Textures/choice_node_off.png.meta diff --git a/Assets/Fungus/Resources/Textures/choice_node_on.png b/Assets/Fungus/Fungus Editor Resources/Textures/choice_node_on.png similarity index 100% rename from Assets/Fungus/Resources/Textures/choice_node_on.png rename to Assets/Fungus/Fungus Editor Resources/Textures/choice_node_on.png diff --git a/Assets/Fungus/Resources/Textures/choice_node_on.png.meta b/Assets/Fungus/Fungus Editor Resources/Textures/choice_node_on.png.meta similarity index 100% rename from Assets/Fungus/Resources/Textures/choice_node_on.png.meta rename to Assets/Fungus/Fungus Editor Resources/Textures/choice_node_on.png.meta diff --git a/Assets/Fungus/Resources/Textures/command_background.png b/Assets/Fungus/Fungus Editor Resources/Textures/command_background.png similarity index 100% rename from Assets/Fungus/Resources/Textures/command_background.png rename to Assets/Fungus/Fungus Editor Resources/Textures/command_background.png diff --git a/Assets/Fungus/Resources/Textures/command_background.png.meta b/Assets/Fungus/Fungus Editor Resources/Textures/command_background.png.meta similarity index 100% rename from Assets/Fungus/Resources/Textures/command_background.png.meta rename to Assets/Fungus/Fungus Editor Resources/Textures/command_background.png.meta diff --git a/Assets/Fungus/Resources/Textures/event_node_off.png b/Assets/Fungus/Fungus Editor Resources/Textures/event_node_off.png similarity index 100% rename from Assets/Fungus/Resources/Textures/event_node_off.png rename to Assets/Fungus/Fungus Editor Resources/Textures/event_node_off.png diff --git a/Assets/Fungus/Resources/Textures/event_node_off.png.meta b/Assets/Fungus/Fungus Editor Resources/Textures/event_node_off.png.meta similarity index 100% rename from Assets/Fungus/Resources/Textures/event_node_off.png.meta rename to Assets/Fungus/Fungus Editor Resources/Textures/event_node_off.png.meta diff --git a/Assets/Fungus/Resources/Textures/event_node_on.png b/Assets/Fungus/Fungus Editor Resources/Textures/event_node_on.png similarity index 100% rename from Assets/Fungus/Resources/Textures/event_node_on.png rename to Assets/Fungus/Fungus Editor Resources/Textures/event_node_on.png diff --git a/Assets/Fungus/Resources/Textures/event_node_on.png.meta b/Assets/Fungus/Fungus Editor Resources/Textures/event_node_on.png.meta similarity index 100% rename from Assets/Fungus/Resources/Textures/event_node_on.png.meta rename to Assets/Fungus/Fungus Editor Resources/Textures/event_node_on.png.meta diff --git a/Assets/Fungus/Resources/Textures/play_big.png b/Assets/Fungus/Fungus Editor Resources/Textures/play_big.png similarity index 100% rename from Assets/Fungus/Resources/Textures/play_big.png rename to Assets/Fungus/Fungus Editor Resources/Textures/play_big.png diff --git a/Assets/Fungus/Resources/Textures/play_big.png.meta b/Assets/Fungus/Fungus Editor Resources/Textures/play_big.png.meta similarity index 100% rename from Assets/Fungus/Resources/Textures/play_big.png.meta rename to Assets/Fungus/Fungus Editor Resources/Textures/play_big.png.meta diff --git a/Assets/Fungus/Resources/Textures/play_small.png b/Assets/Fungus/Fungus Editor Resources/Textures/play_small.png similarity index 100% rename from Assets/Fungus/Resources/Textures/play_small.png rename to Assets/Fungus/Fungus Editor Resources/Textures/play_small.png diff --git a/Assets/Fungus/Resources/Textures/play_small.png.meta b/Assets/Fungus/Fungus Editor Resources/Textures/play_small.png.meta similarity index 100% rename from Assets/Fungus/Resources/Textures/play_small.png.meta rename to Assets/Fungus/Fungus Editor Resources/Textures/play_small.png.meta diff --git a/Assets/Fungus/Resources/Textures/process_node_off.png b/Assets/Fungus/Fungus Editor Resources/Textures/process_node_off.png similarity index 100% rename from Assets/Fungus/Resources/Textures/process_node_off.png rename to Assets/Fungus/Fungus Editor Resources/Textures/process_node_off.png diff --git a/Assets/Fungus/Resources/Textures/process_node_off.png.meta b/Assets/Fungus/Fungus Editor Resources/Textures/process_node_off.png.meta similarity index 100% rename from Assets/Fungus/Resources/Textures/process_node_off.png.meta rename to Assets/Fungus/Fungus Editor Resources/Textures/process_node_off.png.meta diff --git a/Assets/Fungus/Resources/Textures/process_node_on.png b/Assets/Fungus/Fungus Editor Resources/Textures/process_node_on.png similarity index 100% rename from Assets/Fungus/Resources/Textures/process_node_on.png rename to Assets/Fungus/Fungus Editor Resources/Textures/process_node_on.png diff --git a/Assets/Fungus/Resources/Textures/process_node_on.png.meta b/Assets/Fungus/Fungus Editor Resources/Textures/process_node_on.png.meta similarity index 100% rename from Assets/Fungus/Resources/Textures/process_node_on.png.meta rename to Assets/Fungus/Fungus Editor Resources/Textures/process_node_on.png.meta diff --git a/Assets/Fungus/Resources/Icons/ResizeHandle.png b/Assets/Fungus/Resources/Icons/ResizeHandle.png deleted file mode 100644 index aedc1d2e9485e837bceb1d9c77a7de6639608747..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2968 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 1) { - offTex = FungusEditorResources.texChoiceNodeOff; - onTex = FungusEditorResources.texChoiceNodeOn; + offTex = FungusEditorResources.ChoiceNodeOff; + onTex = FungusEditorResources.ChoiceNodeOn; defaultColor = FungusConstants.DefaultChoiceBlockTint; } else { - offTex = FungusEditorResources.texProcessNodeOff; - onTex = FungusEditorResources.texProcessNodeOn; + offTex = FungusEditorResources.ProcessNodeOff; + onTex = FungusEditorResources.ProcessNodeOn; defaultColor = FungusConstants.DefaultProcessBlockTint; } } diff --git a/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs b/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs index 9c35cc05..dad69a76 100644 --- a/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs +++ b/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs @@ -1,149 +1,76 @@ // This code is part of the Fungus library (http://fungusgames.com) maintained by Chris Gregan (http://twitter.com/gofungus). // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) -using UnityEngine; +using UnityEngine; using UnityEditor; +using System.IO; using System; +using System.Linq; +using System.Collections.Generic; -namespace Fungus.EditorUtils +namespace Fungus.EditorUtils { - internal static class FungusEditorResources - { + internal static partial class FungusEditorResources + { + private static Dictionary textures = new Dictionary(); + + static FungusEditorResources() + { + LoadResourceAssets(); + } - static FungusEditorResources() { - GenerateSpecialTextures(); - LoadResourceAssets(); - } + private static void LoadResourceAssets() + { + // Get first folder named "Fungus Editor Resources" + var rootGuid = AssetDatabase.FindAssets("\"Fungus Editor Resources\"")[0]; + var root = AssetDatabase.GUIDToAssetPath(rootGuid); + var guids = AssetDatabase.FindAssets("t:Texture2D", new string[] { root }); + var paths = guids.Select(guid => AssetDatabase.GUIDToAssetPath(guid)).OrderBy(path => path.ToLower().Contains("/pro/")); - private enum ResourceName - { - command_background = 0, - choice_node_off, - choice_node_on, - process_node_off, - process_node_on, - event_node_off, - event_node_on, - play_big, - play_small - } - - private static string[] s_LightSkin = { - "command_background", - "choice_node_off", - "choice_node_on", - "process_node_off", - "process_node_on", - "event_node_off", - "event_node_on", - "play_big", - "play_small" - }; + foreach (var path in paths) + { + if (path.ToLower().Contains("/pro/") && !EditorGUIUtility.isProSkin) + { + return; + } + var texture = AssetDatabase.LoadAssetAtPath(path); + textures[texture.name] = texture; + } + } - private static string[] s_DarkSkin = { - "command_background", - "choice_node_off", - "choice_node_on", - "process_node_off", - "process_node_on", - "event_node_off", - "event_node_on", - "play_big", - "play_small" - }; + [MenuItem("Tools/Fungus/Utilities/Update Editor Resources Script")] + private static void GenerateResourcesScript() + { + var guid = AssetDatabase.FindAssets("FungusEditorResources t:MonoScript")[0]; + var relativePath = AssetDatabase.GUIDToAssetPath(guid).Replace("FungusEditorResources.cs", "FungusEditorResourcesGenerated.cs"); + var absolutePath = Application.dataPath + relativePath.Substring("Assets".Length);// + + using (var writer = new StreamWriter(absolutePath)) + { + writer.WriteLine("// This code is part of the Fungus library (http://fungusgames.com) maintained by Chris Gregan (http://twitter.com/gofungus)."); + writer.WriteLine("// It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE)"); + writer.WriteLine(""); + writer.WriteLine("using UnityEngine;"); + writer.WriteLine(""); + writer.WriteLine("namespace Fungus.EditorUtils"); + writer.WriteLine("{"); + writer.WriteLine("\tinternal static partial class FungusEditorResources"); + writer.WriteLine("\t{"); - public static Texture2D texCommandBackground - { - get { return s_Cached[(int)ResourceName.command_background]; } - } + foreach (var pair in textures) + { + var name = pair.Key; + var pascalCase = string.Join("", name.Split(new [] { '_' }, StringSplitOptions.RemoveEmptyEntries).Select( + s => s.Substring(0, 1).ToUpper() + s.Substring(1)).ToArray() + ); + writer.WriteLine("\t\tpublic static Texture2D " + pascalCase + " { get { return textures[\"" + name + "\"]; } }"); + } - public static Texture2D texEventNodeOn - { - get { return s_Cached[(int)ResourceName.event_node_on]; } - } - - public static Texture2D texEventNodeOff - { - get { return s_Cached[(int)ResourceName.event_node_off]; } - } + writer.WriteLine("\t}"); + writer.WriteLine("}"); + } - public static Texture2D texProcessNodeOn - { - get { return s_Cached[(int)ResourceName.process_node_on]; } - } - - public static Texture2D texProcessNodeOff - { - get { return s_Cached[(int)ResourceName.process_node_off]; } - } - - public static Texture2D texChoiceNodeOn - { - get { return s_Cached[(int)ResourceName.choice_node_on]; } - } - - public static Texture2D texChoiceNodeOff - { - get { return s_Cached[(int)ResourceName.choice_node_off]; } - } - - public static Texture2D texPlayBig - { - get { return s_Cached[(int)ResourceName.play_big]; } - } - - public static Texture2D texPlaySmall - { - get { return s_Cached[(int)ResourceName.play_small]; } - } - - public static Texture2D texItemSplitter { get; private set; } - - private static void GenerateSpecialTextures() - { - var splitterColor = EditorGUIUtility.isProSkin - ? new Color(1f, 1f, 1f, 0.14f) - : new Color(0.59f, 0.59f, 0.59f, 0.55f) - ; - texItemSplitter = CreatePixelTexture("(Generated) Item Splitter", splitterColor); - } - - public static Texture2D CreatePixelTexture(string name, Color color) - { - var tex = new Texture2D(1, 1, TextureFormat.ARGB32, false, true); - tex.name = name; - tex.hideFlags = HideFlags.HideAndDontSave; - tex.filterMode = FilterMode.Point; - tex.SetPixel(0, 0, color); - tex.Apply(); - return tex; - } - - private static Texture2D[] s_Cached; - - public static void LoadResourceAssets() - { - var skin = EditorGUIUtility.isProSkin ? s_DarkSkin : s_LightSkin; - s_Cached = new Texture2D[skin.Length]; - - for (int i = 0; i < s_Cached.Length; ++i) - { - s_Cached[i] = Resources.Load("Textures/" + skin[i]) as Texture2D; - } - - s_LightSkin = null; - s_DarkSkin = null; - } - - private static void GetImageSize(byte[] imageData, out int width, out int height) - { - width = ReadInt(imageData, 3 + 15); - height = ReadInt(imageData, 3 + 15 + 2 + 2); - } - - private static int ReadInt(byte[] imageData, int offset) - { - return (imageData[offset] << 8) | imageData[offset + 1]; - } - } -} \ No newline at end of file + AssetDatabase.ImportAsset(relativePath); + } + } +} diff --git a/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs b/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs new file mode 100644 index 00000000..d8f36b8b --- /dev/null +++ b/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs @@ -0,0 +1,26 @@ +// This code is part of the Fungus library (http://fungusgames.com) maintained by Chris Gregan (http://twitter.com/gofungus). +// It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) + +using UnityEngine; + +namespace Fungus.EditorUtils +{ + internal static partial class FungusEditorResources + { + public static Texture2D Add { get { return textures["add"]; } } + public static Texture2D AddSmall { get { return textures["add_small"]; } } + public static Texture2D Delete { get { return textures["delete"]; } } + public static Texture2D Down { get { return textures["down"]; } } + public static Texture2D Duplicate { get { return textures["duplicate"]; } } + public static Texture2D Up { get { return textures["up"]; } } + public static Texture2D ChoiceNodeOff { get { return textures["choice_node_off"]; } } + public static Texture2D ChoiceNodeOn { get { return textures["choice_node_on"]; } } + public static Texture2D CommandBackground { get { return textures["command_background"]; } } + public static Texture2D EventNodeOff { get { return textures["event_node_off"]; } } + public static Texture2D EventNodeOn { get { return textures["event_node_on"]; } } + public static Texture2D PlayBig { get { return textures["play_big"]; } } + public static Texture2D PlaySmall { get { return textures["play_small"]; } } + public static Texture2D ProcessNodeOff { get { return textures["process_node_off"]; } } + public static Texture2D ProcessNodeOn { get { return textures["process_node_on"]; } } + } +} diff --git a/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs.meta b/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs.meta new file mode 100644 index 00000000..6d6fd014 --- /dev/null +++ b/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: f5119f9bdde234916bed657bdc751f76 +timeCreated: 1478502142 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 248096bbfe947c1f4962b5363b5982c1e3b48998 Mon Sep 17 00:00:00 2001 From: Zach Vinless Date: Mon, 7 Nov 2016 15:06:05 -0800 Subject: [PATCH 2/6] Fixed compatibility with Unity 5.0 -Changed generic LoadAssetAtPath to non-generic version -Added GetTexture wrapper function to avoid key not found errors when moving things around --- .../Scripts/Editor/FungusEditorResources.cs | 21 +++++++++---- .../Editor/FungusEditorResourcesGenerated.cs | 30 +++++++++---------- 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs b/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs index dad69a76..7e80874e 100644 --- a/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs +++ b/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs @@ -3,8 +3,8 @@ using UnityEngine; using UnityEditor; -using System.IO; using System; +using System.IO; using System.Linq; using System.Collections.Generic; @@ -24,7 +24,7 @@ namespace Fungus.EditorUtils // Get first folder named "Fungus Editor Resources" var rootGuid = AssetDatabase.FindAssets("\"Fungus Editor Resources\"")[0]; var root = AssetDatabase.GUIDToAssetPath(rootGuid); - var guids = AssetDatabase.FindAssets("t:Texture2D", new string[] { root }); + var guids = AssetDatabase.FindAssets("t:Texture2D", new [] { root }); var paths = guids.Select(guid => AssetDatabase.GUIDToAssetPath(guid)).OrderBy(path => path.ToLower().Contains("/pro/")); foreach (var path in paths) @@ -33,7 +33,7 @@ namespace Fungus.EditorUtils { return; } - var texture = AssetDatabase.LoadAssetAtPath(path); + var texture = AssetDatabase.LoadAssetAtPath(path, typeof(Texture2D)) as Texture2D; textures[texture.name] = texture; } } @@ -43,7 +43,7 @@ namespace Fungus.EditorUtils { var guid = AssetDatabase.FindAssets("FungusEditorResources t:MonoScript")[0]; var relativePath = AssetDatabase.GUIDToAssetPath(guid).Replace("FungusEditorResources.cs", "FungusEditorResourcesGenerated.cs"); - var absolutePath = Application.dataPath + relativePath.Substring("Assets".Length);// + var absolutePath = Application.dataPath + relativePath.Substring("Assets".Length); using (var writer = new StreamWriter(absolutePath)) { @@ -63,7 +63,7 @@ namespace Fungus.EditorUtils var pascalCase = string.Join("", name.Split(new [] { '_' }, StringSplitOptions.RemoveEmptyEntries).Select( s => s.Substring(0, 1).ToUpper() + s.Substring(1)).ToArray() ); - writer.WriteLine("\t\tpublic static Texture2D " + pascalCase + " { get { return textures[\"" + name + "\"]; } }"); + writer.WriteLine("\t\tpublic static Texture2D " + pascalCase + " { get { return GetTexture(\"" + name + "\"); } }"); } writer.WriteLine("\t}"); @@ -72,5 +72,16 @@ namespace Fungus.EditorUtils AssetDatabase.ImportAsset(relativePath); } + + private static Texture2D GetTexture(string name) + { + Texture2D texture; + if (!textures.TryGetValue(name, out texture)) + { + Debug.LogWarning("Texture \"" + name + "\" not found!"); + } + + return texture; + } } } diff --git a/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs b/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs index d8f36b8b..e79da844 100644 --- a/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs +++ b/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs @@ -7,20 +7,20 @@ namespace Fungus.EditorUtils { internal static partial class FungusEditorResources { - public static Texture2D Add { get { return textures["add"]; } } - public static Texture2D AddSmall { get { return textures["add_small"]; } } - public static Texture2D Delete { get { return textures["delete"]; } } - public static Texture2D Down { get { return textures["down"]; } } - public static Texture2D Duplicate { get { return textures["duplicate"]; } } - public static Texture2D Up { get { return textures["up"]; } } - public static Texture2D ChoiceNodeOff { get { return textures["choice_node_off"]; } } - public static Texture2D ChoiceNodeOn { get { return textures["choice_node_on"]; } } - public static Texture2D CommandBackground { get { return textures["command_background"]; } } - public static Texture2D EventNodeOff { get { return textures["event_node_off"]; } } - public static Texture2D EventNodeOn { get { return textures["event_node_on"]; } } - public static Texture2D PlayBig { get { return textures["play_big"]; } } - public static Texture2D PlaySmall { get { return textures["play_small"]; } } - public static Texture2D ProcessNodeOff { get { return textures["process_node_off"]; } } - public static Texture2D ProcessNodeOn { get { return textures["process_node_on"]; } } + public static Texture2D Add { get { return GetTexture("add"); } } + public static Texture2D AddSmall { get { return GetTexture("add_small"); } } + public static Texture2D Delete { get { return GetTexture("delete"); } } + public static Texture2D Down { get { return GetTexture("down"); } } + public static Texture2D Duplicate { get { return GetTexture("duplicate"); } } + public static Texture2D Up { get { return GetTexture("up"); } } + public static Texture2D ChoiceNodeOff { get { return GetTexture("choice_node_off"); } } + public static Texture2D ChoiceNodeOn { get { return GetTexture("choice_node_on"); } } + public static Texture2D CommandBackground { get { return GetTexture("command_background"); } } + public static Texture2D EventNodeOff { get { return GetTexture("event_node_off"); } } + public static Texture2D EventNodeOn { get { return GetTexture("event_node_on"); } } + public static Texture2D PlayBig { get { return GetTexture("play_big"); } } + public static Texture2D PlaySmall { get { return GetTexture("play_small"); } } + public static Texture2D ProcessNodeOff { get { return GetTexture("process_node_off"); } } + public static Texture2D ProcessNodeOn { get { return GetTexture("process_node_on"); } } } } From 3d431cc591184700635991204468b00eedc9dd99 Mon Sep 17 00:00:00 2001 From: Zach Vinless Date: Wed, 9 Nov 2016 23:24:53 -0800 Subject: [PATCH 3/6] Added generation of texture names to load directly -Added texture names array to generated script. These files all specifically loaded rather than looping through a particular folder. -Renamed some functions for better clarity --- .../Scripts/Editor/FungusEditorResources.cs | 37 ++++++++++++++++--- .../Editor/FungusEditorResourcesGenerated.cs | 18 +++++++++ 2 files changed, 50 insertions(+), 5 deletions(-) diff --git a/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs b/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs index 7e80874e..5ce80df0 100644 --- a/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs +++ b/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs @@ -16,17 +16,32 @@ namespace Fungus.EditorUtils static FungusEditorResources() { - LoadResourceAssets(); + LoadTexturesFromNames(); } - private static void LoadResourceAssets() + private static void LoadTexturesFromNames() + { + var baseDirectories = AssetDatabase.FindAssets("\"Fungus Editor Resources\"").Select( + guid => AssetDatabase.GUIDToAssetPath(guid) + ).ToArray(); + + foreach (var name in resourceNames) + { + LoadTexturesFromGUIDs(AssetDatabase.FindAssets(name + " t:Texture2D", baseDirectories)); + } + } + + private static void LoadAllTexturesInFolder() { - // Get first folder named "Fungus Editor Resources" var rootGuid = AssetDatabase.FindAssets("\"Fungus Editor Resources\"")[0]; var root = AssetDatabase.GUIDToAssetPath(rootGuid); - var guids = AssetDatabase.FindAssets("t:Texture2D", new [] { root }); - var paths = guids.Select(guid => AssetDatabase.GUIDToAssetPath(guid)).OrderBy(path => path.ToLower().Contains("/pro/")); + LoadTexturesFromGUIDs(AssetDatabase.FindAssets("t:Texture2D", new [] { root })); + } + private static void LoadTexturesFromGUIDs(string[] guids) + { + var paths = guids.Select(guid => AssetDatabase.GUIDToAssetPath(guid)).OrderBy(path => path.ToLower().Contains("/pro/")); + foreach (var path in paths) { if (path.ToLower().Contains("/pro/") && !EditorGUIUtility.isProSkin) @@ -41,6 +56,9 @@ namespace Fungus.EditorUtils [MenuItem("Tools/Fungus/Utilities/Update Editor Resources Script")] private static void GenerateResourcesScript() { + textures.Clear(); + LoadAllTexturesInFolder(); + var guid = AssetDatabase.FindAssets("FungusEditorResources t:MonoScript")[0]; var relativePath = AssetDatabase.GUIDToAssetPath(guid).Replace("FungusEditorResources.cs", "FungusEditorResourcesGenerated.cs"); var absolutePath = Application.dataPath + relativePath.Substring("Assets".Length); @@ -56,6 +74,15 @@ namespace Fungus.EditorUtils writer.WriteLine("{"); writer.WriteLine("\tinternal static partial class FungusEditorResources"); writer.WriteLine("\t{"); + writer.WriteLine("\t\tprivate static readonly string[] resourceNames = new [] {"); + + foreach (var pair in textures) + { + writer.WriteLine("\t\t\t\"" + pair.Key + "\","); + } + + writer.WriteLine("\t\t};"); + writer.WriteLine(""); foreach (var pair in textures) { diff --git a/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs b/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs index e79da844..7dd62e34 100644 --- a/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs +++ b/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs @@ -7,6 +7,24 @@ namespace Fungus.EditorUtils { internal static partial class FungusEditorResources { + private static readonly string[] resourceNames = new [] { + "add", + "add_small", + "delete", + "down", + "duplicate", + "up", + "choice_node_off", + "choice_node_on", + "command_background", + "event_node_off", + "event_node_on", + "play_big", + "play_small", + "process_node_off", + "process_node_on", + }; + public static Texture2D Add { get { return GetTexture("add"); } } public static Texture2D AddSmall { get { return GetTexture("add_small"); } } public static Texture2D Delete { get { return GetTexture("delete"); } } From 5f677602c5540f84858b114b0cc034158d49453a Mon Sep 17 00:00:00 2001 From: Zach Vinless Date: Wed, 9 Nov 2016 23:46:10 -0800 Subject: [PATCH 4/6] Converted tabs to spaces in new files --- .../Fungus/Scripts/Editor/FlowchartWindow.cs | 2 +- .../Scripts/Editor/FungusEditorResources.cs | 182 +++++++++--------- .../Editor/FungusEditorResourcesGenerated.cs | 70 +++---- 3 files changed, 127 insertions(+), 127 deletions(-) diff --git a/Assets/Fungus/Scripts/Editor/FlowchartWindow.cs b/Assets/Fungus/Scripts/Editor/FlowchartWindow.cs index ed4e1463..c11ac1bd 100644 --- a/Assets/Fungus/Scripts/Editor/FlowchartWindow.cs +++ b/Assets/Fungus/Scripts/Editor/FlowchartWindow.cs @@ -473,7 +473,7 @@ namespace Fungus.EditorUtils GUI.color = new Color(1f, 1f, 1f, alpha); } - if (GUI.Button(rect, FungusEditorResources.PlayBig as Texture, new GUIStyle())) + if (GUI.Button(rect, FungusEditorResources.PlayBig, new GUIStyle())) { SelectBlock(flowchart, b); } diff --git a/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs b/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs index 5ce80df0..245de98a 100644 --- a/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs +++ b/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs @@ -10,105 +10,105 @@ using System.Collections.Generic; namespace Fungus.EditorUtils { - internal static partial class FungusEditorResources - { - private static Dictionary textures = new Dictionary(); - - static FungusEditorResources() - { - LoadTexturesFromNames(); - } + internal static partial class FungusEditorResources + { + private static Dictionary textures = new Dictionary(); + + static FungusEditorResources() + { + LoadTexturesFromNames(); + } - private static void LoadTexturesFromNames() - { - var baseDirectories = AssetDatabase.FindAssets("\"Fungus Editor Resources\"").Select( - guid => AssetDatabase.GUIDToAssetPath(guid) - ).ToArray(); - - foreach (var name in resourceNames) - { - LoadTexturesFromGUIDs(AssetDatabase.FindAssets(name + " t:Texture2D", baseDirectories)); - } - } + private static void LoadTexturesFromNames() + { + var baseDirectories = AssetDatabase.FindAssets("\"Fungus Editor Resources\"").Select( + guid => AssetDatabase.GUIDToAssetPath(guid) + ).ToArray(); + + foreach (var name in resourceNames) + { + LoadTexturesFromGUIDs(AssetDatabase.FindAssets(name + " t:Texture2D", baseDirectories)); + } + } - private static void LoadAllTexturesInFolder() - { - var rootGuid = AssetDatabase.FindAssets("\"Fungus Editor Resources\"")[0]; - var root = AssetDatabase.GUIDToAssetPath(rootGuid); - LoadTexturesFromGUIDs(AssetDatabase.FindAssets("t:Texture2D", new [] { root })); - } + private static void LoadAllTexturesInFolder() + { + var rootGuid = AssetDatabase.FindAssets("\"Fungus Editor Resources\"")[0]; + var root = AssetDatabase.GUIDToAssetPath(rootGuid); + LoadTexturesFromGUIDs(AssetDatabase.FindAssets("t:Texture2D", new [] { root })); + } - private static void LoadTexturesFromGUIDs(string[] guids) - { - var paths = guids.Select(guid => AssetDatabase.GUIDToAssetPath(guid)).OrderBy(path => path.ToLower().Contains("/pro/")); - - foreach (var path in paths) - { - if (path.ToLower().Contains("/pro/") && !EditorGUIUtility.isProSkin) - { - return; - } - var texture = AssetDatabase.LoadAssetAtPath(path, typeof(Texture2D)) as Texture2D; - textures[texture.name] = texture; - } - } + private static void LoadTexturesFromGUIDs(string[] guids) + { + var paths = guids.Select(guid => AssetDatabase.GUIDToAssetPath(guid)).OrderBy(path => path.ToLower().Contains("/pro/")); + + foreach (var path in paths) + { + if (path.ToLower().Contains("/pro/") && !EditorGUIUtility.isProSkin) + { + return; + } + var texture = AssetDatabase.LoadAssetAtPath(path, typeof(Texture2D)) as Texture2D; + textures[texture.name] = texture; + } + } - [MenuItem("Tools/Fungus/Utilities/Update Editor Resources Script")] - private static void GenerateResourcesScript() - { - textures.Clear(); - LoadAllTexturesInFolder(); + [MenuItem("Tools/Fungus/Utilities/Update Editor Resources Script")] + private static void GenerateResourcesScript() + { + textures.Clear(); + LoadAllTexturesInFolder(); - var guid = AssetDatabase.FindAssets("FungusEditorResources t:MonoScript")[0]; - var relativePath = AssetDatabase.GUIDToAssetPath(guid).Replace("FungusEditorResources.cs", "FungusEditorResourcesGenerated.cs"); - var absolutePath = Application.dataPath + relativePath.Substring("Assets".Length); - - using (var writer = new StreamWriter(absolutePath)) - { - writer.WriteLine("// This code is part of the Fungus library (http://fungusgames.com) maintained by Chris Gregan (http://twitter.com/gofungus)."); - writer.WriteLine("// It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE)"); - writer.WriteLine(""); - writer.WriteLine("using UnityEngine;"); - writer.WriteLine(""); - writer.WriteLine("namespace Fungus.EditorUtils"); - writer.WriteLine("{"); - writer.WriteLine("\tinternal static partial class FungusEditorResources"); - writer.WriteLine("\t{"); - writer.WriteLine("\t\tprivate static readonly string[] resourceNames = new [] {"); - - foreach (var pair in textures) - { - writer.WriteLine("\t\t\t\"" + pair.Key + "\","); - } + var guid = AssetDatabase.FindAssets("FungusEditorResources t:MonoScript")[0]; + var relativePath = AssetDatabase.GUIDToAssetPath(guid).Replace("FungusEditorResources.cs", "FungusEditorResourcesGenerated.cs"); + var absolutePath = Application.dataPath + relativePath.Substring("Assets".Length); + + using (var writer = new StreamWriter(absolutePath)) + { + writer.WriteLine("// This code is part of the Fungus library (http://fungusgames.com) maintained by Chris Gregan (http://twitter.com/gofungus)."); + writer.WriteLine("// It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE)"); + writer.WriteLine(""); + writer.WriteLine("using UnityEngine;"); + writer.WriteLine(""); + writer.WriteLine("namespace Fungus.EditorUtils"); + writer.WriteLine("{"); + writer.WriteLine(" internal static partial class FungusEditorResources"); + writer.WriteLine(" {"); + writer.WriteLine(" private static readonly string[] resourceNames = new [] {"); + + foreach (var pair in textures) + { + writer.WriteLine(" \"" + pair.Key + "\","); + } - writer.WriteLine("\t\t};"); - writer.WriteLine(""); + writer.WriteLine(" };"); + writer.WriteLine(""); - foreach (var pair in textures) - { - var name = pair.Key; - var pascalCase = string.Join("", name.Split(new [] { '_' }, StringSplitOptions.RemoveEmptyEntries).Select( - s => s.Substring(0, 1).ToUpper() + s.Substring(1)).ToArray() - ); - writer.WriteLine("\t\tpublic static Texture2D " + pascalCase + " { get { return GetTexture(\"" + name + "\"); } }"); - } + foreach (var pair in textures) + { + var name = pair.Key; + var pascalCase = string.Join("", name.Split(new [] { '_' }, StringSplitOptions.RemoveEmptyEntries).Select( + s => s.Substring(0, 1).ToUpper() + s.Substring(1)).ToArray() + ); + writer.WriteLine(" public static Texture2D " + pascalCase + " { get { return GetTexture(\"" + name + "\"); } }"); + } - writer.WriteLine("\t}"); - writer.WriteLine("}"); - } + writer.WriteLine(" }"); + writer.WriteLine("}"); + } - AssetDatabase.ImportAsset(relativePath); - } + AssetDatabase.ImportAsset(relativePath); + } - private static Texture2D GetTexture(string name) - { - Texture2D texture; - if (!textures.TryGetValue(name, out texture)) - { - Debug.LogWarning("Texture \"" + name + "\" not found!"); - } - - return texture; - } - } + private static Texture2D GetTexture(string name) + { + Texture2D texture; + if (!textures.TryGetValue(name, out texture)) + { + Debug.LogWarning("Texture \"" + name + "\" not found!"); + } + + return texture; + } + } } diff --git a/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs b/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs index 7dd62e34..e2eab920 100644 --- a/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs +++ b/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs @@ -5,40 +5,40 @@ using UnityEngine; namespace Fungus.EditorUtils { - internal static partial class FungusEditorResources - { - private static readonly string[] resourceNames = new [] { - "add", - "add_small", - "delete", - "down", - "duplicate", - "up", - "choice_node_off", - "choice_node_on", - "command_background", - "event_node_off", - "event_node_on", - "play_big", - "play_small", - "process_node_off", - "process_node_on", - }; + internal static partial class FungusEditorResources + { + private static readonly string[] resourceNames = new [] { + "add", + "add_small", + "delete", + "down", + "duplicate", + "up", + "choice_node_off", + "choice_node_on", + "command_background", + "event_node_off", + "event_node_on", + "play_big", + "play_small", + "process_node_off", + "process_node_on", + }; - public static Texture2D Add { get { return GetTexture("add"); } } - public static Texture2D AddSmall { get { return GetTexture("add_small"); } } - public static Texture2D Delete { get { return GetTexture("delete"); } } - public static Texture2D Down { get { return GetTexture("down"); } } - public static Texture2D Duplicate { get { return GetTexture("duplicate"); } } - public static Texture2D Up { get { return GetTexture("up"); } } - public static Texture2D ChoiceNodeOff { get { return GetTexture("choice_node_off"); } } - public static Texture2D ChoiceNodeOn { get { return GetTexture("choice_node_on"); } } - public static Texture2D CommandBackground { get { return GetTexture("command_background"); } } - public static Texture2D EventNodeOff { get { return GetTexture("event_node_off"); } } - public static Texture2D EventNodeOn { get { return GetTexture("event_node_on"); } } - public static Texture2D PlayBig { get { return GetTexture("play_big"); } } - public static Texture2D PlaySmall { get { return GetTexture("play_small"); } } - public static Texture2D ProcessNodeOff { get { return GetTexture("process_node_off"); } } - public static Texture2D ProcessNodeOn { get { return GetTexture("process_node_on"); } } - } + public static Texture2D Add { get { return GetTexture("add"); } } + public static Texture2D AddSmall { get { return GetTexture("add_small"); } } + public static Texture2D Delete { get { return GetTexture("delete"); } } + public static Texture2D Down { get { return GetTexture("down"); } } + public static Texture2D Duplicate { get { return GetTexture("duplicate"); } } + public static Texture2D Up { get { return GetTexture("up"); } } + public static Texture2D ChoiceNodeOff { get { return GetTexture("choice_node_off"); } } + public static Texture2D ChoiceNodeOn { get { return GetTexture("choice_node_on"); } } + public static Texture2D CommandBackground { get { return GetTexture("command_background"); } } + public static Texture2D EventNodeOff { get { return GetTexture("event_node_off"); } } + public static Texture2D EventNodeOn { get { return GetTexture("event_node_on"); } } + public static Texture2D PlayBig { get { return GetTexture("play_big"); } } + public static Texture2D PlaySmall { get { return GetTexture("play_small"); } } + public static Texture2D ProcessNodeOff { get { return GetTexture("process_node_off"); } } + public static Texture2D ProcessNodeOn { get { return GetTexture("process_node_on"); } } + } } From 7c31e789b935b6b318205cf0bf6dde8877ec7955 Mon Sep 17 00:00:00 2001 From: Christopher Date: Thu, 10 Nov 2016 15:07:07 +0000 Subject: [PATCH 5/6] Fixed nested while loops don't loop correctly #562 --- Assets/Fungus/Scripts/Commands/End.cs | 6 +- Assets/Tests/Scripting/Scripting.unity | 572 ++++++++++++++++++++++++- 2 files changed, 562 insertions(+), 16 deletions(-) diff --git a/Assets/Fungus/Scripts/Commands/End.cs b/Assets/Fungus/Scripts/Commands/End.cs index 5eb798bf..0ac0c45f 100644 --- a/Assets/Fungus/Scripts/Commands/End.cs +++ b/Assets/Fungus/Scripts/Commands/End.cs @@ -24,8 +24,10 @@ namespace Fungus { for (int i = CommandIndex - 1; i >= 0; --i) { - System.Type commandType = ParentBlock.CommandList[i].GetType(); - if (commandType == typeof(While)) + var command = ParentBlock.CommandList[i]; + + if (command.IndentLevel == IndentLevel && + command.GetType() == typeof(While)) { Continue(i); return; diff --git a/Assets/Tests/Scripting/Scripting.unity b/Assets/Tests/Scripting/Scripting.unity index af30491e..51843ead 100644 --- a/Assets/Tests/Scripting/Scripting.unity +++ b/Assets/Tests/Scripting/Scripting.unity @@ -163,6 +163,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 115525222} + waitForFrames: 1 --- !u!114 &115525222 MonoBehaviour: m_ObjectHideFlags: 2 @@ -181,6 +182,8 @@ MonoBehaviour: y: 70 width: 120 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 0 blockName: Start description: @@ -212,7 +215,7 @@ MonoBehaviour: y: -340 width: 1114 height: 859 - selectedBlock: {fileID: 115525222} + selectedBlocks: [] selectedCommands: [] variables: [] description: @@ -301,6 +304,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 169310214} + waitForFrames: 1 --- !u!114 &169310214 MonoBehaviour: m_ObjectHideFlags: 2 @@ -319,6 +323,8 @@ MonoBehaviour: y: 69 width: 120 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 0 blockName: Start description: @@ -350,7 +356,7 @@ MonoBehaviour: y: -350 width: 1126 height: 869 - selectedBlock: {fileID: 0} + selectedBlocks: [] selectedCommands: [] variables: [] description: If none of the other Flowcharts have Failed then this one will succeed @@ -404,7 +410,7 @@ MonoBehaviour: y: -340 width: 1114 height: 859 - selectedBlock: {fileID: 0} + selectedBlocks: [] selectedCommands: [] variables: - {fileID: 178675537} @@ -690,6 +696,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 265055379} + waitForFrames: 1 --- !u!114 &265055379 MonoBehaviour: m_ObjectHideFlags: 2 @@ -707,6 +714,8 @@ MonoBehaviour: y: 70 width: 120 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 1 blockName: BlockB description: The block that does the stopping @@ -733,6 +742,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 265055381} + waitForFrames: 1 --- !u!114 &265055381 MonoBehaviour: m_ObjectHideFlags: 2 @@ -751,6 +761,8 @@ MonoBehaviour: y: 70 width: 120 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 0 blockName: BlockA description: The block to be stopped @@ -782,7 +794,7 @@ MonoBehaviour: y: -350 width: 1121 height: 869 - selectedBlock: {fileID: 265055379} + selectedBlocks: [] selectedCommands: [] variables: - {fileID: 265055376} @@ -890,7 +902,7 @@ MonoBehaviour: y: -340 width: 1114 height: 892 - selectedBlock: {fileID: 396492930} + selectedBlocks: [] selectedCommands: - {fileID: 396492940} variables: @@ -967,6 +979,8 @@ MonoBehaviour: y: 111 width: 120 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 0 blockName: Start description: @@ -1035,6 +1049,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 396492930} + waitForFrames: 1 --- !u!114 &396492934 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1357,6 +1372,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 491823362} + waitForFrames: 1 --- !u!114 &491823362 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1375,6 +1391,8 @@ MonoBehaviour: y: 70 width: 120 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 0 blockName: Start description: @@ -1412,7 +1430,8 @@ MonoBehaviour: y: -340 width: 1114 height: 859 - selectedBlock: {fileID: 491823362} + selectedBlocks: + - {fileID: 491823362} selectedCommands: [] variables: - {fileID: 491823359} @@ -1523,6 +1542,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 575910004} + waitForFrames: 1 --- !u!114 &575910004 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1540,6 +1560,8 @@ MonoBehaviour: y: 75 width: 120 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 2 blockName: New Block description: @@ -1585,6 +1607,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 575910007} + waitForFrames: 1 --- !u!114 &575910007 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1603,6 +1626,8 @@ MonoBehaviour: y: 69 width: 120 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 0 blockName: Start description: @@ -1634,7 +1659,7 @@ MonoBehaviour: y: -350 width: 1126 height: 869 - selectedBlock: {fileID: 575910007} + selectedBlocks: [] selectedCommands: [] variables: [] description: Test if interupting a Say command works @@ -1763,6 +1788,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 590474778} + waitForFrames: 1 --- !u!114 &590474778 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1780,6 +1806,8 @@ MonoBehaviour: y: 75 width: 120 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 2 blockName: New Block description: @@ -1800,6 +1828,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 590474780} + waitForFrames: 1 --- !u!114 &590474780 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1818,6 +1847,8 @@ MonoBehaviour: y: 69 width: 120 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 0 blockName: Start description: @@ -1850,7 +1881,7 @@ MonoBehaviour: y: -350 width: 1126 height: 869 - selectedBlock: {fileID: 590474780} + selectedBlocks: [] selectedCommands: - {fileID: 590474773} variables: [] @@ -1933,6 +1964,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 636123607} + waitForFrames: 1 --- !u!114 &636123607 MonoBehaviour: m_ObjectHideFlags: 2 @@ -1951,6 +1983,8 @@ MonoBehaviour: y: 69 width: 120 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 0 blockName: Start description: @@ -1983,7 +2017,7 @@ MonoBehaviour: y: -350 width: 1126 height: 869 - selectedBlock: {fileID: 636123607} + selectedBlocks: [] selectedCommands: - {fileID: 636123614} variables: [] @@ -2054,6 +2088,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 636123613} + waitForFrames: 1 --- !u!114 &636123613 MonoBehaviour: m_ObjectHideFlags: 2 @@ -2071,6 +2106,8 @@ MonoBehaviour: y: 75 width: 120 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 2 blockName: New Block description: @@ -2152,7 +2189,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 61dddfdc5e0e44ca298d8f46f7f5a915, type: 3} m_Name: m_EditorClassIdentifier: - selectedFlowchart: {fileID: 178675536} + selectedFlowchart: {fileID: 675090867} --- !u!4 &646902075 Transform: m_ObjectHideFlags: 1 @@ -2166,6 +2203,455 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 +--- !u!1 &675090853 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 142980, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 675090854} + - 114: {fileID: 675090867} + - 114: {fileID: 675090866} + - 114: {fileID: 675090865} + - 114: {fileID: 675090864} + - 114: {fileID: 675090863} + - 114: {fileID: 675090862} + - 114: {fileID: 675090861} + - 114: {fileID: 675090860} + - 114: {fileID: 675090859} + - 114: {fileID: 675090858} + - 114: {fileID: 675090857} + - 114: {fileID: 675090856} + - 114: {fileID: 675090873} + - 114: {fileID: 675090872} + - 114: {fileID: 675090871} + - 114: {fileID: 675090870} + - 114: {fileID: 675090869} + - 114: {fileID: 675090868} + - 114: {fileID: 675090855} + m_Layer: 0 + m_Name: Flowchart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &675090854 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 467082, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 675090853} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: [] + m_Father: {fileID: 1220349165} + m_RootOrder: 0 +--- !u!114 &675090855 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 675090853} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4920f47cde1a84b11ad07b7317568494, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 15 + indentLevel: 0 +--- !u!114 &675090856 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 675090853} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fb77d0ce495044f6e9feb91b31798e8c, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 7 + indentLevel: 1 + variable: {fileID: 675090859} + setOperator: 0 + booleanData: + booleanRef: {fileID: 0} + booleanVal: 0 + integerData: + integerRef: {fileID: 0} + integerVal: 0 + floatData: + floatRef: {fileID: 0} + floatVal: 0 + stringData: + stringRef: {fileID: 0} + stringVal: +--- !u!114 &675090857 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 675090853} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fb77d0ce495044f6e9feb91b31798e8c, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 6 + indentLevel: 2 + variable: {fileID: 675090859} + setOperator: 2 + booleanData: + booleanRef: {fileID: 0} + booleanVal: 0 + integerData: + integerRef: {fileID: 0} + integerVal: 1 + floatData: + floatRef: {fileID: 0} + floatVal: 0 + stringData: + stringRef: {fileID: 0} + stringVal: +--- !u!114 &675090858 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 675090853} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fb77d0ce495044f6e9feb91b31798e8c, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 5 + indentLevel: 1 + variable: {fileID: 675090860} + setOperator: 2 + booleanData: + booleanRef: {fileID: 0} + booleanVal: 0 + integerData: + integerRef: {fileID: 0} + integerVal: 1 + floatData: + floatRef: {fileID: 0} + floatVal: 0 + stringData: + stringRef: {fileID: 0} + stringVal: +--- !u!114 &675090859 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 675090853} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: afb91b566ceda411bad1e9d3c3243ecc, type: 3} + m_Name: + m_EditorClassIdentifier: + scope: 0 + key: j + value: 0 +--- !u!114 &675090860 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 675090853} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: afb91b566ceda411bad1e9d3c3243ecc, type: 3} + m_Name: + m_EditorClassIdentifier: + scope: 0 + key: i + value: 0 +--- !u!114 &675090861 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 675090853} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 93cb9773f2ca04e2bbf7a68ccfc23267, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 4 + indentLevel: 0 +--- !u!114 &675090862 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 675090853} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 663c8a7831a104d16ad7078a4dc2bd10, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 3 + indentLevel: 1 + compareOperator: 2 + variable: {fileID: 675090859} + booleanData: + booleanRef: {fileID: 0} + booleanVal: 0 + integerData: + integerRef: {fileID: 0} + integerVal: 3 + floatData: + floatRef: {fileID: 0} + floatVal: 0 + stringData: + stringRef: {fileID: 0} + stringVal: +--- !u!114 &675090863 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 675090853} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 93cb9773f2ca04e2bbf7a68ccfc23267, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 2 + indentLevel: 1 +--- !u!114 &675090864 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 675090853} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 663c8a7831a104d16ad7078a4dc2bd10, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 1 + indentLevel: 0 + compareOperator: 2 + variable: {fileID: 675090860} + booleanData: + booleanRef: {fileID: 0} + booleanVal: 0 + integerData: + integerRef: {fileID: 0} + integerVal: 3 + floatData: + floatRef: {fileID: 0} + floatVal: 0 + stringData: + stringRef: {fileID: 0} + stringVal: +--- !u!114 &675090865 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 11462346, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 675090853} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2f6487d21a03404cb21b245f0242e79, type: 3} + m_Name: + m_EditorClassIdentifier: + parentBlock: {fileID: 675090866} + waitForFrames: 1 +--- !u!114 &675090866 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 11433304, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 675090853} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3d3d73aef2cfc4f51abf34ac00241f60, type: 3} + m_Name: + m_EditorClassIdentifier: + nodeRect: + serializedVersion: 2 + x: 67 + y: 70 + width: 120 + height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 + itemId: 0 + blockName: Start + description: + eventHandler: {fileID: 675090865} + commandList: + - {fileID: 675090864} + - {fileID: 675090856} + - {fileID: 675090858} + - {fileID: 675090862} + - {fileID: 675090857} + - {fileID: 675090863} + - {fileID: 675090861} + - {fileID: 675090873} + - {fileID: 675090871} + - {fileID: 675090872} + - {fileID: 675090870} + - {fileID: 675090869} + - {fileID: 675090868} + - {fileID: 675090855} +--- !u!114 &675090867 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 11430050, guid: 5e7fbc8d4eb714b279eeeef2262c1e1a, + type: 2} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 675090853} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a334fe2ffb574b3583ff3b18b4792d3, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 1 + scrollPos: {x: 0, y: 0} + variablesScrollPos: {x: 0, y: 0} + variablesExpanded: 1 + blockViewHeight: 400 + zoom: 1 + scrollViewRect: + serializedVersion: 2 + x: -343 + y: -340 + width: 1114 + height: 859 + selectedBlocks: [] + selectedCommands: [] + variables: + - {fileID: 675090860} + - {fileID: 675090859} + description: Check if nested while loops work correctly + stepPause: 0 + colorCommands: 1 + hideComponents: 1 + saveSelection: 1 + localizationId: + showLineNumbers: 0 + hideCommands: [] + luaEnvironment: {fileID: 0} + luaBindingName: flowchart +--- !u!114 &675090868 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 675090853} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 93cb9773f2ca04e2bbf7a68ccfc23267, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 14 + indentLevel: 0 +--- !u!114 &675090869 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 675090853} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2dcb71131f45b47fead560a97ef55f1c, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 13 + indentLevel: 1 + failMessage: +--- !u!114 &675090870 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 675090853} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 70c5622b8a80845c980954170295f292, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 12 + indentLevel: 0 + compareOperator: 1 + variable: {fileID: 675090859} + booleanData: + booleanRef: {fileID: 0} + booleanVal: 0 + integerData: + integerRef: {fileID: 0} + integerVal: 3 + floatData: + floatRef: {fileID: 0} + floatVal: 0 + stringData: + stringRef: {fileID: 0} + stringVal: +--- !u!114 &675090871 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 675090853} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2dcb71131f45b47fead560a97ef55f1c, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 11 + indentLevel: 1 + failMessage: +--- !u!114 &675090872 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 675090853} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 93cb9773f2ca04e2bbf7a68ccfc23267, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 10 + indentLevel: 0 +--- !u!114 &675090873 +MonoBehaviour: + m_ObjectHideFlags: 2 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 675090853} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 70c5622b8a80845c980954170295f292, type: 3} + m_Name: + m_EditorClassIdentifier: + itemId: 9 + indentLevel: 0 + compareOperator: 1 + variable: {fileID: 675090860} + booleanData: + booleanRef: {fileID: 0} + booleanVal: 0 + integerData: + integerRef: {fileID: 0} + integerVal: 3 + floatData: + floatRef: {fileID: 0} + floatVal: 0 + stringData: + stringRef: {fileID: 0} + stringVal: --- !u!1 &676156674 GameObject: m_ObjectHideFlags: 0 @@ -2613,6 +3099,57 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1141004796} +--- !u!1 &1220349163 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 4 + m_Component: + - 4: {fileID: 1220349165} + - 114: {fileID: 1220349164} + m_Layer: 0 + m_Name: NestedWhileTest + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1220349164 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1220349163} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b1dba0b27b0864740a8720e920aa88c0, type: 3} + m_Name: + m_EditorClassIdentifier: + timeout: 5 + ignored: 0 + succeedAfterAllAssertionsAreExecuted: 0 + expectException: 0 + expectedExceptionList: + succeedWhenExceptionIsThrown: 0 + includedPlatforms: -1 + platformsToIgnore: [] + dynamic: 0 + dynamicTypeName: +--- !u!4 &1220349165 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1220349163} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 675090854} + m_Father: {fileID: 0} + m_RootOrder: 12 --- !u!1 &1314799789 GameObject: m_ObjectHideFlags: 0 @@ -2628,7 +3165,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1314799790 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2892,7 +3429,7 @@ MonoBehaviour: y: -351 width: 1161 height: 873 - selectedBlock: {fileID: 1618689131} + selectedBlocks: [] selectedCommands: - {fileID: 1618689150} variables: @@ -3022,6 +3559,8 @@ MonoBehaviour: y: 69 width: 120 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 0 blockName: Test Invoke description: @@ -3050,6 +3589,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 1618689131} + waitForFrames: 1 --- !u!4 &1618689133 Transform: m_ObjectHideFlags: 0 @@ -3427,6 +3967,8 @@ MonoBehaviour: y: 68 width: 156 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 11 blockName: Test Delayed Invoke description: This block gets executed by last command in Test Invoke @@ -3664,7 +4206,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ba19c26c1ba7243d2b57ebc4329cc7c6, type: 3} m_Name: m_EditorClassIdentifier: - remoteDebugger: 0 --- !u!114 &1753646198 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4103,6 +4644,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: parentBlock: {fileID: 1982550313} + waitForFrames: 1 --- !u!114 &1982550313 MonoBehaviour: m_ObjectHideFlags: 2 @@ -4121,6 +4663,8 @@ MonoBehaviour: y: 70 width: 120 height: 40 + tint: {r: 1, g: 1, b: 1, a: 1} + useCustomTint: 0 itemId: 0 blockName: Start description: @@ -4156,7 +4700,7 @@ MonoBehaviour: y: -340 width: 1114 height: 859 - selectedBlock: {fileID: 1982550313} + selectedBlocks: [] selectedCommands: [] variables: - {fileID: 1982550310} From 344696407de0a07e54dd01a3573efe5aeabf1b8c Mon Sep 17 00:00:00 2001 From: Zach Vinless Date: Thu, 10 Nov 2016 08:38:49 -0800 Subject: [PATCH 6/6] Renamed "Fungus Editor Resources" to "EditorResources" --- ...s Editor Resources.meta => EditorResources.meta} | 0 .../Icons.meta | 0 .../Icons/Pro.meta | 0 .../Icons/Pro/add.png | Bin .../Icons/Pro/add.png.meta | 0 .../Icons/Pro/add_small.png | Bin .../Icons/Pro/add_small.png.meta | 0 .../Icons/Pro/delete.png | Bin .../Icons/Pro/delete.png.meta | 0 .../Icons/Pro/down.png | Bin .../Icons/Pro/down.png.meta | 0 .../Icons/Pro/duplicate.png | Bin .../Icons/Pro/duplicate.png.meta | 0 .../Icons/Pro/up.png | Bin .../Icons/Pro/up.png.meta | 0 .../Icons/add.png | Bin .../Icons/add.png.meta | 0 .../Icons/add_small.png | Bin .../Icons/add_small.png.meta | 0 .../Icons/delete.png | Bin .../Icons/delete.png.meta | 0 .../Icons/down.png | Bin .../Icons/down.png.meta | 0 .../Icons/duplicate.png | Bin .../Icons/duplicate.png.meta | 0 .../Icons/up.png | Bin .../Icons/up.png.meta | 0 .../Textures.meta | 0 .../Textures/choice_node_off.png | Bin .../Textures/choice_node_off.png.meta | 0 .../Textures/choice_node_on.png | Bin .../Textures/choice_node_on.png.meta | 0 .../Textures/command_background.png | Bin .../Textures/command_background.png.meta | 0 .../Textures/event_node_off.png | Bin .../Textures/event_node_off.png.meta | 0 .../Textures/event_node_on.png | Bin .../Textures/event_node_on.png.meta | 0 .../Textures/play_big.png | Bin .../Textures/play_big.png.meta | 0 .../Textures/play_small.png | Bin .../Textures/play_small.png.meta | 0 .../Textures/process_node_off.png | Bin .../Textures/process_node_off.png.meta | 0 .../Textures/process_node_on.png | Bin .../Textures/process_node_on.png.meta | 0 .../Fungus/Scripts/Editor/FungusEditorResources.cs | 5 +++-- 47 files changed, 3 insertions(+), 2 deletions(-) rename Assets/Fungus/{Fungus Editor Resources.meta => EditorResources.meta} (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons.meta (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons/Pro.meta (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons/Pro/add.png (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons/Pro/add.png.meta (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons/Pro/add_small.png (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons/Pro/add_small.png.meta (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons/Pro/delete.png (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons/Pro/delete.png.meta (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons/Pro/down.png (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons/Pro/down.png.meta (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons/Pro/duplicate.png (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons/Pro/duplicate.png.meta (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons/Pro/up.png (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons/Pro/up.png.meta (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons/add.png (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons/add.png.meta (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons/add_small.png (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons/add_small.png.meta (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons/delete.png (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons/delete.png.meta (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons/down.png (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons/down.png.meta (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons/duplicate.png (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons/duplicate.png.meta (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons/up.png (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Icons/up.png.meta (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Textures.meta (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Textures/choice_node_off.png (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Textures/choice_node_off.png.meta (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Textures/choice_node_on.png (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Textures/choice_node_on.png.meta (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Textures/command_background.png (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Textures/command_background.png.meta (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Textures/event_node_off.png (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Textures/event_node_off.png.meta (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Textures/event_node_on.png (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Textures/event_node_on.png.meta (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Textures/play_big.png (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Textures/play_big.png.meta (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Textures/play_small.png (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Textures/play_small.png.meta (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Textures/process_node_off.png (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Textures/process_node_off.png.meta (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Textures/process_node_on.png (100%) rename Assets/Fungus/{Fungus Editor Resources => EditorResources}/Textures/process_node_on.png.meta (100%) diff --git a/Assets/Fungus/Fungus Editor Resources.meta b/Assets/Fungus/EditorResources.meta similarity index 100% rename from Assets/Fungus/Fungus Editor Resources.meta rename to Assets/Fungus/EditorResources.meta diff --git a/Assets/Fungus/Fungus Editor Resources/Icons.meta b/Assets/Fungus/EditorResources/Icons.meta similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons.meta rename to Assets/Fungus/EditorResources/Icons.meta diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/Pro.meta b/Assets/Fungus/EditorResources/Icons/Pro.meta similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons/Pro.meta rename to Assets/Fungus/EditorResources/Icons/Pro.meta diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/Pro/add.png b/Assets/Fungus/EditorResources/Icons/Pro/add.png similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons/Pro/add.png rename to Assets/Fungus/EditorResources/Icons/Pro/add.png diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/Pro/add.png.meta b/Assets/Fungus/EditorResources/Icons/Pro/add.png.meta similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons/Pro/add.png.meta rename to Assets/Fungus/EditorResources/Icons/Pro/add.png.meta diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/Pro/add_small.png b/Assets/Fungus/EditorResources/Icons/Pro/add_small.png similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons/Pro/add_small.png rename to Assets/Fungus/EditorResources/Icons/Pro/add_small.png diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/Pro/add_small.png.meta b/Assets/Fungus/EditorResources/Icons/Pro/add_small.png.meta similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons/Pro/add_small.png.meta rename to Assets/Fungus/EditorResources/Icons/Pro/add_small.png.meta diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/Pro/delete.png b/Assets/Fungus/EditorResources/Icons/Pro/delete.png similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons/Pro/delete.png rename to Assets/Fungus/EditorResources/Icons/Pro/delete.png diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/Pro/delete.png.meta b/Assets/Fungus/EditorResources/Icons/Pro/delete.png.meta similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons/Pro/delete.png.meta rename to Assets/Fungus/EditorResources/Icons/Pro/delete.png.meta diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/Pro/down.png b/Assets/Fungus/EditorResources/Icons/Pro/down.png similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons/Pro/down.png rename to Assets/Fungus/EditorResources/Icons/Pro/down.png diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/Pro/down.png.meta b/Assets/Fungus/EditorResources/Icons/Pro/down.png.meta similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons/Pro/down.png.meta rename to Assets/Fungus/EditorResources/Icons/Pro/down.png.meta diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/Pro/duplicate.png b/Assets/Fungus/EditorResources/Icons/Pro/duplicate.png similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons/Pro/duplicate.png rename to Assets/Fungus/EditorResources/Icons/Pro/duplicate.png diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/Pro/duplicate.png.meta b/Assets/Fungus/EditorResources/Icons/Pro/duplicate.png.meta similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons/Pro/duplicate.png.meta rename to Assets/Fungus/EditorResources/Icons/Pro/duplicate.png.meta diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/Pro/up.png b/Assets/Fungus/EditorResources/Icons/Pro/up.png similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons/Pro/up.png rename to Assets/Fungus/EditorResources/Icons/Pro/up.png diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/Pro/up.png.meta b/Assets/Fungus/EditorResources/Icons/Pro/up.png.meta similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons/Pro/up.png.meta rename to Assets/Fungus/EditorResources/Icons/Pro/up.png.meta diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/add.png b/Assets/Fungus/EditorResources/Icons/add.png similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons/add.png rename to Assets/Fungus/EditorResources/Icons/add.png diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/add.png.meta b/Assets/Fungus/EditorResources/Icons/add.png.meta similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons/add.png.meta rename to Assets/Fungus/EditorResources/Icons/add.png.meta diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/add_small.png b/Assets/Fungus/EditorResources/Icons/add_small.png similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons/add_small.png rename to Assets/Fungus/EditorResources/Icons/add_small.png diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/add_small.png.meta b/Assets/Fungus/EditorResources/Icons/add_small.png.meta similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons/add_small.png.meta rename to Assets/Fungus/EditorResources/Icons/add_small.png.meta diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/delete.png b/Assets/Fungus/EditorResources/Icons/delete.png similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons/delete.png rename to Assets/Fungus/EditorResources/Icons/delete.png diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/delete.png.meta b/Assets/Fungus/EditorResources/Icons/delete.png.meta similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons/delete.png.meta rename to Assets/Fungus/EditorResources/Icons/delete.png.meta diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/down.png b/Assets/Fungus/EditorResources/Icons/down.png similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons/down.png rename to Assets/Fungus/EditorResources/Icons/down.png diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/down.png.meta b/Assets/Fungus/EditorResources/Icons/down.png.meta similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons/down.png.meta rename to Assets/Fungus/EditorResources/Icons/down.png.meta diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/duplicate.png b/Assets/Fungus/EditorResources/Icons/duplicate.png similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons/duplicate.png rename to Assets/Fungus/EditorResources/Icons/duplicate.png diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/duplicate.png.meta b/Assets/Fungus/EditorResources/Icons/duplicate.png.meta similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons/duplicate.png.meta rename to Assets/Fungus/EditorResources/Icons/duplicate.png.meta diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/up.png b/Assets/Fungus/EditorResources/Icons/up.png similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons/up.png rename to Assets/Fungus/EditorResources/Icons/up.png diff --git a/Assets/Fungus/Fungus Editor Resources/Icons/up.png.meta b/Assets/Fungus/EditorResources/Icons/up.png.meta similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Icons/up.png.meta rename to Assets/Fungus/EditorResources/Icons/up.png.meta diff --git a/Assets/Fungus/Fungus Editor Resources/Textures.meta b/Assets/Fungus/EditorResources/Textures.meta similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Textures.meta rename to Assets/Fungus/EditorResources/Textures.meta diff --git a/Assets/Fungus/Fungus Editor Resources/Textures/choice_node_off.png b/Assets/Fungus/EditorResources/Textures/choice_node_off.png similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Textures/choice_node_off.png rename to Assets/Fungus/EditorResources/Textures/choice_node_off.png diff --git a/Assets/Fungus/Fungus Editor Resources/Textures/choice_node_off.png.meta b/Assets/Fungus/EditorResources/Textures/choice_node_off.png.meta similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Textures/choice_node_off.png.meta rename to Assets/Fungus/EditorResources/Textures/choice_node_off.png.meta diff --git a/Assets/Fungus/Fungus Editor Resources/Textures/choice_node_on.png b/Assets/Fungus/EditorResources/Textures/choice_node_on.png similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Textures/choice_node_on.png rename to Assets/Fungus/EditorResources/Textures/choice_node_on.png diff --git a/Assets/Fungus/Fungus Editor Resources/Textures/choice_node_on.png.meta b/Assets/Fungus/EditorResources/Textures/choice_node_on.png.meta similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Textures/choice_node_on.png.meta rename to Assets/Fungus/EditorResources/Textures/choice_node_on.png.meta diff --git a/Assets/Fungus/Fungus Editor Resources/Textures/command_background.png b/Assets/Fungus/EditorResources/Textures/command_background.png similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Textures/command_background.png rename to Assets/Fungus/EditorResources/Textures/command_background.png diff --git a/Assets/Fungus/Fungus Editor Resources/Textures/command_background.png.meta b/Assets/Fungus/EditorResources/Textures/command_background.png.meta similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Textures/command_background.png.meta rename to Assets/Fungus/EditorResources/Textures/command_background.png.meta diff --git a/Assets/Fungus/Fungus Editor Resources/Textures/event_node_off.png b/Assets/Fungus/EditorResources/Textures/event_node_off.png similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Textures/event_node_off.png rename to Assets/Fungus/EditorResources/Textures/event_node_off.png diff --git a/Assets/Fungus/Fungus Editor Resources/Textures/event_node_off.png.meta b/Assets/Fungus/EditorResources/Textures/event_node_off.png.meta similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Textures/event_node_off.png.meta rename to Assets/Fungus/EditorResources/Textures/event_node_off.png.meta diff --git a/Assets/Fungus/Fungus Editor Resources/Textures/event_node_on.png b/Assets/Fungus/EditorResources/Textures/event_node_on.png similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Textures/event_node_on.png rename to Assets/Fungus/EditorResources/Textures/event_node_on.png diff --git a/Assets/Fungus/Fungus Editor Resources/Textures/event_node_on.png.meta b/Assets/Fungus/EditorResources/Textures/event_node_on.png.meta similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Textures/event_node_on.png.meta rename to Assets/Fungus/EditorResources/Textures/event_node_on.png.meta diff --git a/Assets/Fungus/Fungus Editor Resources/Textures/play_big.png b/Assets/Fungus/EditorResources/Textures/play_big.png similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Textures/play_big.png rename to Assets/Fungus/EditorResources/Textures/play_big.png diff --git a/Assets/Fungus/Fungus Editor Resources/Textures/play_big.png.meta b/Assets/Fungus/EditorResources/Textures/play_big.png.meta similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Textures/play_big.png.meta rename to Assets/Fungus/EditorResources/Textures/play_big.png.meta diff --git a/Assets/Fungus/Fungus Editor Resources/Textures/play_small.png b/Assets/Fungus/EditorResources/Textures/play_small.png similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Textures/play_small.png rename to Assets/Fungus/EditorResources/Textures/play_small.png diff --git a/Assets/Fungus/Fungus Editor Resources/Textures/play_small.png.meta b/Assets/Fungus/EditorResources/Textures/play_small.png.meta similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Textures/play_small.png.meta rename to Assets/Fungus/EditorResources/Textures/play_small.png.meta diff --git a/Assets/Fungus/Fungus Editor Resources/Textures/process_node_off.png b/Assets/Fungus/EditorResources/Textures/process_node_off.png similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Textures/process_node_off.png rename to Assets/Fungus/EditorResources/Textures/process_node_off.png diff --git a/Assets/Fungus/Fungus Editor Resources/Textures/process_node_off.png.meta b/Assets/Fungus/EditorResources/Textures/process_node_off.png.meta similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Textures/process_node_off.png.meta rename to Assets/Fungus/EditorResources/Textures/process_node_off.png.meta diff --git a/Assets/Fungus/Fungus Editor Resources/Textures/process_node_on.png b/Assets/Fungus/EditorResources/Textures/process_node_on.png similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Textures/process_node_on.png rename to Assets/Fungus/EditorResources/Textures/process_node_on.png diff --git a/Assets/Fungus/Fungus Editor Resources/Textures/process_node_on.png.meta b/Assets/Fungus/EditorResources/Textures/process_node_on.png.meta similarity index 100% rename from Assets/Fungus/Fungus Editor Resources/Textures/process_node_on.png.meta rename to Assets/Fungus/EditorResources/Textures/process_node_on.png.meta diff --git a/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs b/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs index 245de98a..a3c9f948 100644 --- a/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs +++ b/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs @@ -13,6 +13,7 @@ namespace Fungus.EditorUtils internal static partial class FungusEditorResources { private static Dictionary textures = new Dictionary(); + private static readonly string editorResourcesFolderName = "\"EditorResources\""; static FungusEditorResources() { @@ -21,7 +22,7 @@ namespace Fungus.EditorUtils private static void LoadTexturesFromNames() { - var baseDirectories = AssetDatabase.FindAssets("\"Fungus Editor Resources\"").Select( + var baseDirectories = AssetDatabase.FindAssets(editorResourcesFolderName).Select( guid => AssetDatabase.GUIDToAssetPath(guid) ).ToArray(); @@ -33,7 +34,7 @@ namespace Fungus.EditorUtils private static void LoadAllTexturesInFolder() { - var rootGuid = AssetDatabase.FindAssets("\"Fungus Editor Resources\"")[0]; + var rootGuid = AssetDatabase.FindAssets(editorResourcesFolderName)[0]; var root = AssetDatabase.GUIDToAssetPath(rootGuid); LoadTexturesFromGUIDs(AssetDatabase.FindAssets("t:Texture2D", new [] { root })); }