diff --git a/.PhotoshopScript/JSZXPsd2Unity/PSD导出Unity.js b/.PhotoshopScript/JSZXPsd2Unity/PSD导出Unity.js index 0114b5a..52aab7b 100644 --- a/.PhotoshopScript/JSZXPsd2Unity/PSD导出Unity.js +++ b/.PhotoshopScript/JSZXPsd2Unity/PSD导出Unity.js @@ -384,9 +384,10 @@ function s2t(t) { return stringIDToTypeID(t) } } //文件名合规检测 - var reg = /^[0-9a-zA-Z\u4e00-\u9fa5"_""\-"]*$/g; + //var reg = /^[0-9a-zA-Z\u4e00-\u9fa5"_""\-"]*$/g; + var reg = /^[0-9a-zA-Z"_""\-"]*$/g; if (!reg.test(ss[0])) { - alert("\"" + layer.name + "\" 名字不合法,只能含有中文、英文、数字、-、_") + alert("\"" + layer.name + "\" 名字不合法,只能含有英文、数字、-、_") return false; } diff --git a/.psd2uguiExamples/Sample.psd b/.psd2uguiExamples/Sample.psd index d02899b..c7a4f5f 100644 Binary files a/.psd2uguiExamples/Sample.psd and b/.psd2uguiExamples/Sample.psd differ diff --git a/.psd2uguiExamples/Sample/Sample.layout.txt b/.psd2uguiExamples/Sample/Sample.layout.txt deleted file mode 100644 index 432115b..0000000 --- a/.psd2uguiExamples/Sample/Sample.layout.txt +++ /dev/null @@ -1 +0,0 @@ -{"info":{"version":"0.6.1","canvas":{"image":{"w":930,"h":2048},"size":{"w":930,"h":2048},"base":{"x":465,"y":1024}}},"root":{"type":"Root","name":"Sample","elements":[{"type":"Group","elements":[{"type":"Text","text":"神仙","font":"AdobeHeitiStd-Regular","size":35,"color":"E7E3B1","align":"center","x":605,"y":1406,"w":66,"h":33,"opacity":100,"imageName":"shenxian","name":"shenxian"},{"type":"Text","text":"修仙","font":"AdobeHeitiStd-Regular","size":48,"color":"FFFFFF","align":"center","x":151,"y":859,"w":90,"h":44,"opacity":100,"imageName":"xiuxian","name":"xiuxian"},{"type":"Button","elements":[{"type":"Image","image":"shitou1","x":94,"y":1351,"w":112,"h":121,"opacity":100,"imageName":"shitou1","name":"shitou1"},{"type":"Image","image":"shitou3","x":342,"y":1408,"w":79,"h":80,"opacity":100,"imageName":"shitou3","name":"shitou3"},{"type":"Image","image":"shitou2","x":209,"y":1393,"w":108,"h":100,"opacity":100,"imageName":"shitou2","name":"shitou2"},{"type":"Image","image":"Background_1","x":20,"y":360,"w":878,"h":353,"opacity":100,"imageName":"Background_1","name":"Background_1"}],"pivot":"top","imageName":"buttonWZZT","name":"buttonWZZT"},{"type":"Button","elements":[{"type":"Image","image":"bgJingjie","x":76,"y":834,"w":339,"h":92,"opacity":100,"imageName":"bgJingjie","name":"bgJingjie"},{"type":"Image","image":"person","x":546,"y":1299,"w":181,"h":136,"opacity":100,"imageName":"person","name":"person"},{"type":"Image","image":"person","x":437,"y":761,"w":429,"h":330,"opacity":100,"imageName":"person","name":"person"},{"type":"Image","image":"Background_2","x":20,"y":1139,"w":871,"h":354,"opacity":100,"imageName":"Background_2","name":"Background_2"},{"type":"Image","image":"Background_2","x":28,"y":749,"w":871,"h":354,"opacity":100,"imageName":"Background_2","name":"Background_2"}],"pivot":"top","imageName":"buttonXiuLian","name":"buttonXiuLian"},{"type":"Image","image":"title","x":287,"y":140,"w":363,"h":114,"opacity":100,"pivot":"top","imageName":"title","name":"title"},{"type":"Image","image":"bj_mo_2","x":0,"y":0,"w":930,"h":2048,"opacity":100,"imageName":"bj_mo_2","name":"bj_mo_2"}],"full":"True","stretchxy":"True","imageName":"panel","name":"panel"}]}} \ No newline at end of file diff --git a/.psd2uguiExamples/Sample/Sample/bj_mo_2.png b/.psd2uguiExamples/Sample/Sample/bj_mo_2.png deleted file mode 100644 index d1769b9..0000000 Binary files a/.psd2uguiExamples/Sample/Sample/bj_mo_2.png and /dev/null differ diff --git a/.psd2uguiExamples/Sample/Sample/title.png b/.psd2uguiExamples/Sample/Sample/title.png deleted file mode 100644 index 7b0cd08..0000000 Binary files a/.psd2uguiExamples/Sample/Sample/title.png and /dev/null differ diff --git a/.psd2uguiExamples/Sample_dst/Sample.layout.txt b/.psd2uguiExamples/Sample_dst/Sample.layout.txt new file mode 100644 index 0000000..ec233ea --- /dev/null +++ b/.psd2uguiExamples/Sample_dst/Sample.layout.txt @@ -0,0 +1 @@ +{"info":{"version":"0.6.1","canvas":{"image":{"w":930,"h":2048},"size":{"w":930,"h":2048},"base":{"x":465,"y":1024}}},"root":{"type":"Root","name":"Sample","elements":[{"type":"Group","elements":[{"type":"Text","text":"神仙","font":"AdobeHeitiStd-Regular","size":35,"color":"E7E3B1","align":"center","x":605,"y":1406,"w":66,"h":33,"opacity":100,"name":"shenxian"},{"type":"Text","text":"修仙","font":"AdobeHeitiStd-Regular","size":48,"color":"FFFFFF","align":"center","x":151,"y":859,"w":90,"h":44,"opacity":100,"name":"xiuxian"},{"type":"Group","elements":[{"type":"Image","image":"shitou1","x":94,"y":1351,"w":112,"h":121,"opacity":100,"imageName":"shitou1","name":"shitou1"},{"type":"Image","image":"box69","x":24,"y":1367,"w":864,"h":593,"opacity":100,"slice":"true","imageName":"box69","name":"box69"},{"type":"Image","image":"box67","x":31,"y":1541,"w":865,"h":411,"opacity":100,"slice":"true","imageName":"box67","name":"box67"},{"type":"Image","image":"shitou2","x":342,"y":1408,"w":79,"h":80,"opacity":100,"imageName":"shitou2","name":"shitou2"},{"type":"Image","image":"shitou3","x":209,"y":1393,"w":108,"h":100,"opacity":100,"imageName":"shitou3","name":"shitou3"},{"type":"Image","image":"Background_1","x":20,"y":360,"w":878,"h":353,"opacity":100,"imageName":"Background_1","name":"Background_1"}],"imageName":"buttonWZZT","name":"buttonWZZT"},{"type":"Button","elements":[{"type":"Image","image":"bgJingjie","x":76,"y":834,"w":339,"h":92,"opacity":100,"imageName":"bgJingjie","name":"bgJingjie"},{"type":"Image","image":"person","x":546,"y":1299,"w":181,"h":136,"opacity":100,"imageName":"person","name":"person"},{"type":"Image","image":"person","x":437,"y":761,"w":429,"h":330,"opacity":100,"imageName":"person","name":"person"},{"type":"Image","image":"Background_2","x":20,"y":1139,"w":871,"h":354,"opacity":100,"imageName":"Background_2","name":"Background_2"},{"type":"Image","image":"Background_2","x":28,"y":749,"w":871,"h":354,"opacity":100,"imageName":"Background_2","name":"Background_2"}],"pivot":"top","name":"buttonXiuLian"},{"type":"Image","image":"title","x":287,"y":140,"w":363,"h":114,"opacity":100,"pivot":"top","name":"title"}],"full":"True","stretchxy":"True","name":"panel"}]}} \ No newline at end of file diff --git a/.psd2uguiExamples/Sample/Sample/Background_1.png b/.psd2uguiExamples/Sample_dst/Sample/Background_1.png similarity index 99% rename from .psd2uguiExamples/Sample/Sample/Background_1.png rename to .psd2uguiExamples/Sample_dst/Sample/Background_1.png index ae18723..ca73b72 100644 Binary files a/.psd2uguiExamples/Sample/Sample/Background_1.png and b/.psd2uguiExamples/Sample_dst/Sample/Background_1.png differ diff --git a/.psd2uguiExamples/Sample/Sample/Background_2.png b/.psd2uguiExamples/Sample_dst/Sample/Background_2.png similarity index 99% rename from .psd2uguiExamples/Sample/Sample/Background_2.png rename to .psd2uguiExamples/Sample_dst/Sample/Background_2.png index 787317c..26a1fd0 100644 Binary files a/.psd2uguiExamples/Sample/Sample/Background_2.png and b/.psd2uguiExamples/Sample_dst/Sample/Background_2.png differ diff --git a/.psd2uguiExamples/ui_image/__background__.png b/.psd2uguiExamples/Sample_dst/Sample/__background__.png similarity index 76% rename from .psd2uguiExamples/ui_image/__background__.png rename to .psd2uguiExamples/Sample_dst/Sample/__background__.png index d17e8db..b2d0ef2 100644 Binary files a/.psd2uguiExamples/ui_image/__background__.png and b/.psd2uguiExamples/Sample_dst/Sample/__background__.png differ diff --git a/.psd2uguiExamples/Sample/Sample/bgJingjie.png b/.psd2uguiExamples/Sample_dst/Sample/bgJingjie.png similarity index 99% rename from .psd2uguiExamples/Sample/Sample/bgJingjie.png rename to .psd2uguiExamples/Sample_dst/Sample/bgJingjie.png index 6964fa7..f6547bf 100644 Binary files a/.psd2uguiExamples/Sample/Sample/bgJingjie.png and b/.psd2uguiExamples/Sample_dst/Sample/bgJingjie.png differ diff --git a/.psd2uguiExamples/Sample_dst/Sample/box67-slice.png b/.psd2uguiExamples/Sample_dst/Sample/box67-slice.png new file mode 100644 index 0000000..72f2f73 Binary files /dev/null and b/.psd2uguiExamples/Sample_dst/Sample/box67-slice.png differ diff --git a/.psd2uguiExamples/Sample_dst/Sample/box67.png b/.psd2uguiExamples/Sample_dst/Sample/box67.png new file mode 100644 index 0000000..9249f39 Binary files /dev/null and b/.psd2uguiExamples/Sample_dst/Sample/box67.png differ diff --git a/.psd2uguiExamples/Sample_dst/Sample/box69-slice.png b/.psd2uguiExamples/Sample_dst/Sample/box69-slice.png new file mode 100644 index 0000000..bba34d3 Binary files /dev/null and b/.psd2uguiExamples/Sample_dst/Sample/box69-slice.png differ diff --git a/.psd2uguiExamples/Sample_dst/Sample/box69.png b/.psd2uguiExamples/Sample_dst/Sample/box69.png new file mode 100644 index 0000000..cfc6353 Binary files /dev/null and b/.psd2uguiExamples/Sample_dst/Sample/box69.png differ diff --git a/.psd2uguiExamples/Sample/Sample/person.png b/.psd2uguiExamples/Sample_dst/Sample/person.png similarity index 99% rename from .psd2uguiExamples/Sample/Sample/person.png rename to .psd2uguiExamples/Sample_dst/Sample/person.png index 26f7fee..e1ad03d 100644 Binary files a/.psd2uguiExamples/Sample/Sample/person.png and b/.psd2uguiExamples/Sample_dst/Sample/person.png differ diff --git a/.psd2uguiExamples/Sample/Sample/shitou1.png b/.psd2uguiExamples/Sample_dst/Sample/shitou1.png similarity index 98% rename from .psd2uguiExamples/Sample/Sample/shitou1.png rename to .psd2uguiExamples/Sample_dst/Sample/shitou1.png index 5576153..b000044 100644 Binary files a/.psd2uguiExamples/Sample/Sample/shitou1.png and b/.psd2uguiExamples/Sample_dst/Sample/shitou1.png differ diff --git a/.psd2uguiExamples/Sample/Sample/shitou3.png b/.psd2uguiExamples/Sample_dst/Sample/shitou2.png similarity index 97% rename from .psd2uguiExamples/Sample/Sample/shitou3.png rename to .psd2uguiExamples/Sample_dst/Sample/shitou2.png index 4c3389e..559f037 100644 Binary files a/.psd2uguiExamples/Sample/Sample/shitou3.png and b/.psd2uguiExamples/Sample_dst/Sample/shitou2.png differ diff --git a/.psd2uguiExamples/Sample/Sample/shitou2.png b/.psd2uguiExamples/Sample_dst/Sample/shitou3.png similarity index 98% rename from .psd2uguiExamples/Sample/Sample/shitou2.png rename to .psd2uguiExamples/Sample_dst/Sample/shitou3.png index e79659a..aa904c6 100644 Binary files a/.psd2uguiExamples/Sample/Sample/shitou2.png and b/.psd2uguiExamples/Sample_dst/Sample/shitou3.png differ diff --git a/.psd2uguiExamples/ui_image/Background.png b/.psd2uguiExamples/Sample_dst/Sample_output/Background_1.png similarity index 99% rename from .psd2uguiExamples/ui_image/Background.png rename to .psd2uguiExamples/Sample_dst/Sample_output/Background_1.png index a8c824e..ca73b72 100644 Binary files a/.psd2uguiExamples/ui_image/Background.png and b/.psd2uguiExamples/Sample_dst/Sample_output/Background_1.png differ diff --git a/.psd2uguiExamples/Sample_dst/Sample_output/Background_2.png b/.psd2uguiExamples/Sample_dst/Sample_output/Background_2.png new file mode 100644 index 0000000..26a1fd0 Binary files /dev/null and b/.psd2uguiExamples/Sample_dst/Sample_output/Background_2.png differ diff --git a/.psd2uguiExamples/Sample/Sample/__background__.png b/.psd2uguiExamples/Sample_dst/Sample_output/__background__.png similarity index 76% rename from .psd2uguiExamples/Sample/Sample/__background__.png rename to .psd2uguiExamples/Sample_dst/Sample_output/__background__.png index d17e8db..b2d0ef2 100644 Binary files a/.psd2uguiExamples/Sample/Sample/__background__.png and b/.psd2uguiExamples/Sample_dst/Sample_output/__background__.png differ diff --git a/.psd2uguiExamples/ui_image/bgJingjie.png b/.psd2uguiExamples/Sample_dst/Sample_output/bgJingjie.png similarity index 99% rename from .psd2uguiExamples/ui_image/bgJingjie.png rename to .psd2uguiExamples/Sample_dst/Sample_output/bgJingjie.png index 7e1692c..f6547bf 100644 Binary files a/.psd2uguiExamples/ui_image/bgJingjie.png and b/.psd2uguiExamples/Sample_dst/Sample_output/bgJingjie.png differ diff --git a/.psd2uguiExamples/Sample_dst/Sample_output/box67.png b/.psd2uguiExamples/Sample_dst/Sample_output/box67.png new file mode 100644 index 0000000..72f2f73 Binary files /dev/null and b/.psd2uguiExamples/Sample_dst/Sample_output/box67.png differ diff --git a/.psd2uguiExamples/Sample_dst/Sample_output/box69.png b/.psd2uguiExamples/Sample_dst/Sample_output/box69.png new file mode 100644 index 0000000..bba34d3 Binary files /dev/null and b/.psd2uguiExamples/Sample_dst/Sample_output/box69.png differ diff --git a/.psd2uguiExamples/Sample_dst/Sample_output/person.png b/.psd2uguiExamples/Sample_dst/Sample_output/person.png new file mode 100644 index 0000000..e1ad03d Binary files /dev/null and b/.psd2uguiExamples/Sample_dst/Sample_output/person.png differ diff --git a/.psd2uguiExamples/Sample_dst/Sample_output/shitou2.png b/.psd2uguiExamples/Sample_dst/Sample_output/shitou2.png new file mode 100644 index 0000000..559f037 Binary files /dev/null and b/.psd2uguiExamples/Sample_dst/Sample_output/shitou2.png differ diff --git a/.psd2uguiExamples/ui_image/shitou2.png b/.psd2uguiExamples/Sample_dst/Sample_output/shitou3.png similarity index 98% rename from .psd2uguiExamples/ui_image/shitou2.png rename to .psd2uguiExamples/Sample_dst/Sample_output/shitou3.png index 225cbe8..aa904c6 100644 Binary files a/.psd2uguiExamples/ui_image/shitou2.png and b/.psd2uguiExamples/Sample_dst/Sample_output/shitou3.png differ diff --git a/.psd2uguiExamples/ui_image/bj_mo_2.png b/.psd2uguiExamples/ui_image/bj_mo_2.png deleted file mode 100644 index 9016667..0000000 Binary files a/.psd2uguiExamples/ui_image/bj_mo_2.png and /dev/null differ diff --git a/.psd2uguiExamples/ui_image/person.png b/.psd2uguiExamples/ui_image/person.png deleted file mode 100644 index 78ea171..0000000 Binary files a/.psd2uguiExamples/ui_image/person.png and /dev/null differ diff --git a/.psd2uguiExamples/ui_image/title.png b/.psd2uguiExamples/ui_image/title.png deleted file mode 100644 index c721aaf..0000000 Binary files a/.psd2uguiExamples/ui_image/title.png and /dev/null differ