LiuQilin 8 gadi atpakaļ
vecāks
revīzija
af8850feba

+ 0 - 134
Assets/AtlasUtility/ReferenceTable.txt

@@ -1,134 +0,0 @@
-fileID: 21300000, guid: 700a246d0e2b9b740a21b1304a4a8d28|fileID: 21300000, guid: b2e3a634a9e321c479438f39188aa8d4
-fileID: 21300002, guid: 700a246d0e2b9b740a21b1304a4a8d28|fileID: 21300000, guid: 4598a2be803928044b11b3bf209a203a
-fileID: 21300004, guid: 700a246d0e2b9b740a21b1304a4a8d28|fileID: 21300000, guid: 208285e407aecc040abae18a57915b26
-fileID: 21300006, guid: 700a246d0e2b9b740a21b1304a4a8d28|fileID: 21300000, guid: dcefcdda05dc30744be3ed53c298062b
-fileID: 21300008, guid: 700a246d0e2b9b740a21b1304a4a8d28|fileID: 21300000, guid: 0f304ae6a7e08274bb7a346d5e57d202
-fileID: 21300010, guid: 700a246d0e2b9b740a21b1304a4a8d28|fileID: 21300000, guid: 8c72fe5ef5f71ce4cbefc192b80a5a34
-fileID: 21300012, guid: 700a246d0e2b9b740a21b1304a4a8d28|fileID: 21300000, guid: 4ce180404f7f2014691901510ada5ac6
-fileID: 21300014, guid: 700a246d0e2b9b740a21b1304a4a8d28|fileID: 21300000, guid: 900ebf6ef22db7948a43e5fe1f384c83
-fileID: 21300016, guid: 700a246d0e2b9b740a21b1304a4a8d28|fileID: 21300000, guid: 46af2dea65c80ff42a16f8058d11dc1a
-fileID: 21300018, guid: 700a246d0e2b9b740a21b1304a4a8d28|fileID: 21300000, guid: 66bf632fb963b2f438e28510b73c3735
-fileID: 21300020, guid: 700a246d0e2b9b740a21b1304a4a8d28|fileID: 21300000, guid: bad292ba899474c479da729fe383f633
-fileID: 21300022, guid: 700a246d0e2b9b740a21b1304a4a8d28|fileID: 21300000, guid: 2ff363cd320cf0d4a8c7a3d0dd50087f
-fileID: 21300000, guid: b4435a6ae3b33bb47b2f94f749e43e47|fileID: 21300000, guid: 97e16cc167122074daa2690e28f8b008
-fileID: 21300002, guid: b4435a6ae3b33bb47b2f94f749e43e47|fileID: 21300000, guid: 24a1cc7523255434b9f13ddb8bce44ef
-fileID: 21300004, guid: b4435a6ae3b33bb47b2f94f749e43e47|fileID: 21300000, guid: c184e6f3babc63f4190f48e0cd96f54a
-fileID: 21300006, guid: b4435a6ae3b33bb47b2f94f749e43e47|fileID: 21300000, guid: b5aa8d5c3ac9fe340ab0165f4a5e4f3b
-fileID: 21300008, guid: b4435a6ae3b33bb47b2f94f749e43e47|fileID: 21300000, guid: 6de60095d752d2748b50b3ac408328cb
-fileID: 21300010, guid: b4435a6ae3b33bb47b2f94f749e43e47|fileID: 21300000, guid: b7d083c187fd2ad47b4c8d905af6af48
-fileID: 21300000, guid: 514a9cc3d48e0cf419b5498f1daebc9d|fileID: 21300000, guid: fbd26fef3e54016408278f3d56082625
-fileID: 21300002, guid: 514a9cc3d48e0cf419b5498f1daebc9d|fileID: 21300000, guid: 5849701d971d12e488cfc7ceb6118637
-fileID: 21300004, guid: 514a9cc3d48e0cf419b5498f1daebc9d|fileID: 21300000, guid: 19da5f7abec13e84f8684b5eb59ea6b4
-fileID: 21300006, guid: 514a9cc3d48e0cf419b5498f1daebc9d|fileID: 21300000, guid: a5bc323e0f4da674691cd45825b3bff6
-fileID: 21300008, guid: 514a9cc3d48e0cf419b5498f1daebc9d|fileID: 21300000, guid: efc82d3850d7f3444aa6b4490ae9a2a8
-fileID: 21300000, guid: 960889fe3f4c30047b0d2a7970e7e2ea|fileID: 21300000, guid: f33b0a6c87c4faa44b9769fda019e3a2
-fileID: 21300002, guid: 960889fe3f4c30047b0d2a7970e7e2ea|fileID: 21300000, guid: 85308d5010b45774e877f3fae319dac5
-fileID: 21300004, guid: 960889fe3f4c30047b0d2a7970e7e2ea|fileID: 21300000, guid: 16e6ce922a163bb47897b95252dad38e
-fileID: 21300006, guid: 960889fe3f4c30047b0d2a7970e7e2ea|fileID: 21300000, guid: cb72fb32df67aa24f91a9afae97a08a6
-fileID: 21300000, guid: ac65323e315e5804ebdf4d234d610d4f|fileID: 21300000, guid: 6cdf870f3aa9717498ed05a74b1948ae
-fileID: 21300002, guid: ac65323e315e5804ebdf4d234d610d4f|fileID: 21300000, guid: 7730260b51b8a954d9fa50bfd60e4b7a
-fileID: 21300004, guid: ac65323e315e5804ebdf4d234d610d4f|fileID: 21300000, guid: ca2bc3b7d6c2b8b478c6814ad5565672
-fileID: 21300006, guid: ac65323e315e5804ebdf4d234d610d4f|fileID: 21300000, guid: 4a486aebbda05c84e8fad4a648ac95f4
-fileID: 21300008, guid: ac65323e315e5804ebdf4d234d610d4f|fileID: 21300000, guid: 2281497cc8538ec46aa8e611d10bf5b1
-fileID: 21300010, guid: ac65323e315e5804ebdf4d234d610d4f|fileID: 21300000, guid: 1e80d70ac3b7774449bd882f7961f66d
-fileID: 21300000, guid: b3fafe21d2102d84d902f62676849a99|fileID: 21300000, guid: fe4553741ca18ef4d9a0268e2d01eb12
-fileID: 21300002, guid: b3fafe21d2102d84d902f62676849a99|fileID: 21300000, guid: 9b1e12c6b0a66cf409477d5524da10e9
-fileID: 21300004, guid: b3fafe21d2102d84d902f62676849a99|fileID: 21300000, guid: 1b03544f55d1a8b41aac7beb7b7cee04
-fileID: 21300006, guid: b3fafe21d2102d84d902f62676849a99|fileID: 21300000, guid: 8414a26d4c82880469245196b8d325e3
-fileID: 21300008, guid: b3fafe21d2102d84d902f62676849a99|fileID: 21300000, guid: 06892e67e81ef9742a9a2846b54363ab
-fileID: 21300010, guid: b3fafe21d2102d84d902f62676849a99|fileID: 21300000, guid: a0b39d37b068b554ba0084663dec1780
-fileID: 21300000, guid: 9c0c9693f6294b446b6730326e348cc4|fileID: 21300000, guid: 842e5f2a31851e346b9b551244e81398
-fileID: 21300002, guid: 9c0c9693f6294b446b6730326e348cc4|fileID: 21300000, guid: 350660722139e2e4caefa9d507060f69
-fileID: 21300004, guid: 9c0c9693f6294b446b6730326e348cc4|fileID: 21300000, guid: adb700f01ab714d4aa4dd80ac0241cf5
-fileID: 21300006, guid: 9c0c9693f6294b446b6730326e348cc4|fileID: 21300000, guid: b80d85d8782bd4e459c73617eb6a81f0
-fileID: 21300000, guid: 650e3c5dd1820674897f16f988a5f6ef|fileID: 21300000, guid: 68e1ed04a89dfbb4baa62245c40addb6
-fileID: 21300002, guid: 650e3c5dd1820674897f16f988a5f6ef|fileID: 21300000, guid: 36523d742a883124482c4a87e4d9a3cc
-fileID: 21300004, guid: 650e3c5dd1820674897f16f988a5f6ef|fileID: 21300000, guid: 91654037d83a8ba4ea2a85b9b1f5c0b9
-fileID: 21300006, guid: 650e3c5dd1820674897f16f988a5f6ef|fileID: 21300000, guid: 9df78e70b9d03264985541a621bce28c
-fileID: 21300008, guid: 650e3c5dd1820674897f16f988a5f6ef|fileID: 21300000, guid: 2fa154c29266e33468975bdbe6c00c0e
-fileID: 21300000, guid: b4435a6ae3b33bb47b2f94f749e43e47|fileID: 21300000, guid: 97e16cc167122074daa2690e28f8b008
-fileID: 21300002, guid: b4435a6ae3b33bb47b2f94f749e43e47|fileID: 21300000, guid: 24a1cc7523255434b9f13ddb8bce44ef
-fileID: 21300004, guid: b4435a6ae3b33bb47b2f94f749e43e47|fileID: 21300000, guid: c184e6f3babc63f4190f48e0cd96f54a
-fileID: 21300006, guid: b4435a6ae3b33bb47b2f94f749e43e47|fileID: 21300000, guid: b5aa8d5c3ac9fe340ab0165f4a5e4f3b
-fileID: 21300008, guid: b4435a6ae3b33bb47b2f94f749e43e47|fileID: 21300000, guid: 6de60095d752d2748b50b3ac408328cb
-fileID: 21300010, guid: b4435a6ae3b33bb47b2f94f749e43e47|fileID: 21300000, guid: b7d083c187fd2ad47b4c8d905af6af48
-fileID: 21300000, guid: 514a9cc3d48e0cf419b5498f1daebc9d|fileID: 21300000, guid: fbd26fef3e54016408278f3d56082625
-fileID: 21300002, guid: 514a9cc3d48e0cf419b5498f1daebc9d|fileID: 21300000, guid: 5849701d971d12e488cfc7ceb6118637
-fileID: 21300004, guid: 514a9cc3d48e0cf419b5498f1daebc9d|fileID: 21300000, guid: 19da5f7abec13e84f8684b5eb59ea6b4
-fileID: 21300006, guid: 514a9cc3d48e0cf419b5498f1daebc9d|fileID: 21300000, guid: a5bc323e0f4da674691cd45825b3bff6
-fileID: 21300008, guid: 514a9cc3d48e0cf419b5498f1daebc9d|fileID: 21300000, guid: efc82d3850d7f3444aa6b4490ae9a2a8
-fileID: 21300000, guid: 960889fe3f4c30047b0d2a7970e7e2ea|fileID: 21300000, guid: f33b0a6c87c4faa44b9769fda019e3a2
-fileID: 21300002, guid: 960889fe3f4c30047b0d2a7970e7e2ea|fileID: 21300000, guid: 85308d5010b45774e877f3fae319dac5
-fileID: 21300004, guid: 960889fe3f4c30047b0d2a7970e7e2ea|fileID: 21300000, guid: cb72fb32df67aa24f91a9afae97a08a6
-fileID: 21300006, guid: 960889fe3f4c30047b0d2a7970e7e2ea|fileID: 21300000, guid: 16e6ce922a163bb47897b95252dad38e
-fileID: 21300000, guid: ac65323e315e5804ebdf4d234d610d4f|fileID: 21300000, guid: 6cdf870f3aa9717498ed05a74b1948ae
-fileID: 21300002, guid: ac65323e315e5804ebdf4d234d610d4f|fileID: 21300000, guid: 7730260b51b8a954d9fa50bfd60e4b7a
-fileID: 21300004, guid: ac65323e315e5804ebdf4d234d610d4f|fileID: 21300000, guid: ca2bc3b7d6c2b8b478c6814ad5565672
-fileID: 21300006, guid: ac65323e315e5804ebdf4d234d610d4f|fileID: 21300000, guid: 4a486aebbda05c84e8fad4a648ac95f4
-fileID: 21300008, guid: ac65323e315e5804ebdf4d234d610d4f|fileID: 21300000, guid: 2281497cc8538ec46aa8e611d10bf5b1
-fileID: 21300010, guid: ac65323e315e5804ebdf4d234d610d4f|fileID: 21300000, guid: 1e80d70ac3b7774449bd882f7961f66d
-fileID: 21300000, guid: b3fafe21d2102d84d902f62676849a99|fileID: 21300000, guid: fe4553741ca18ef4d9a0268e2d01eb12
-fileID: 21300002, guid: b3fafe21d2102d84d902f62676849a99|fileID: 21300000, guid: 9b1e12c6b0a66cf409477d5524da10e9
-fileID: 21300004, guid: b3fafe21d2102d84d902f62676849a99|fileID: 21300000, guid: 1b03544f55d1a8b41aac7beb7b7cee04
-fileID: 21300006, guid: b3fafe21d2102d84d902f62676849a99|fileID: 21300000, guid: 8414a26d4c82880469245196b8d325e3
-fileID: 21300008, guid: b3fafe21d2102d84d902f62676849a99|fileID: 21300000, guid: 06892e67e81ef9742a9a2846b54363ab
-fileID: 21300010, guid: b3fafe21d2102d84d902f62676849a99|fileID: 21300000, guid: a0b39d37b068b554ba0084663dec1780
-fileID: 21300000, guid: 9c0c9693f6294b446b6730326e348cc4|fileID: 21300000, guid: 350660722139e2e4caefa9d507060f69
-fileID: 21300002, guid: 9c0c9693f6294b446b6730326e348cc4|fileID: 21300000, guid: 842e5f2a31851e346b9b551244e81398
-fileID: 21300004, guid: 9c0c9693f6294b446b6730326e348cc4|fileID: 21300000, guid: adb700f01ab714d4aa4dd80ac0241cf5
-fileID: 21300006, guid: 9c0c9693f6294b446b6730326e348cc4|fileID: 21300000, guid: b80d85d8782bd4e459c73617eb6a81f0
-fileID: 21300000, guid: dd8655d9b9a4f88488877eefef62a087|fileID: 21300000, guid: 1bb19e193689f4049b199f274fc541f7
-fileID: 21300002, guid: dd8655d9b9a4f88488877eefef62a087|fileID: 21300000, guid: a8375c9373541f143a22b32032e3f9aa
-fileID: 21300004, guid: dd8655d9b9a4f88488877eefef62a087|fileID: 21300000, guid: e3accf445fffb7044a4d3d70109b38a9
-fileID: 21300006, guid: dd8655d9b9a4f88488877eefef62a087|fileID: 21300000, guid: 326709b7cdc393b48a424d7c579b2d4c
-fileID: 21300008, guid: dd8655d9b9a4f88488877eefef62a087|fileID: 21300000, guid: e42bfa25f226c4a4983bf95c1b080c66
-fileID: 21300010, guid: dd8655d9b9a4f88488877eefef62a087|fileID: 21300000, guid: ea6f8b98dba80ed4da98783d4b67a05f
-fileID: 21300012, guid: dd8655d9b9a4f88488877eefef62a087|fileID: 21300000, guid: 063ea374e9043374499794044f72b8b6
-fileID: 21300014, guid: dd8655d9b9a4f88488877eefef62a087|fileID: 21300000, guid: 297963e10fd5cd6468d54b9d7624580b
-fileID: 21300000, guid: c7e0018986019bf43b2e95e45c71181a|fileID: 21300000, guid: c9429ca4c11b98b45bcc6c9d785b528f
-fileID: 21300002, guid: c7e0018986019bf43b2e95e45c71181a|fileID: 21300000, guid: 8a8eca1e9acc1da4a97c91c58979c2a5
-fileID: 21300004, guid: c7e0018986019bf43b2e95e45c71181a|fileID: 21300000, guid: bf824f5d04fde9b4788c615b68f1cfd1
-fileID: 21300006, guid: c7e0018986019bf43b2e95e45c71181a|fileID: 21300000, guid: 1cd1c7843dfab4f47845dee056dd4b0f
-fileID: 21300008, guid: c7e0018986019bf43b2e95e45c71181a|fileID: 21300000, guid: ddd4f7cd239bd0847ab18b1d6b26d14f
-fileID: 21300010, guid: c7e0018986019bf43b2e95e45c71181a|fileID: 21300000, guid: 81726f9b381c9b54186089538fbb19a4
-fileID: 21300012, guid: c7e0018986019bf43b2e95e45c71181a|fileID: 21300000, guid: 3d3428a8490fa724890de93156161f05
-fileID: 21300014, guid: c7e0018986019bf43b2e95e45c71181a|fileID: 21300000, guid: 9918124a9bd12974daca85f20d03abd9
-fileID: 21300016, guid: c7e0018986019bf43b2e95e45c71181a|fileID: 21300000, guid: 88de22291cb66ff48a87d06830c8062b
-fileID: 21300018, guid: c7e0018986019bf43b2e95e45c71181a|fileID: 21300000, guid: 2da572dc3b99c9540967065d74407a28
-fileID: 21300020, guid: c7e0018986019bf43b2e95e45c71181a|fileID: 21300000, guid: 5bba921ee5be7dc47be1d203534ce56f
-fileID: 21300022, guid: c7e0018986019bf43b2e95e45c71181a|fileID: 21300000, guid: 86da3f7f4adcbbd4792704387e938d72
-fileID: 21300024, guid: c7e0018986019bf43b2e95e45c71181a|fileID: 21300000, guid: 79b6c36436ae37b4391c2ec81661f269
-fileID: 21300026, guid: c7e0018986019bf43b2e95e45c71181a|fileID: 21300000, guid: b8f88a8792d1a344c99e6b4073031b6c
-fileID: 21300028, guid: c7e0018986019bf43b2e95e45c71181a|fileID: 21300000, guid: 8178e4bf518056e40bb19b29a0c62be3
-fileID: 21300030, guid: c7e0018986019bf43b2e95e45c71181a|fileID: 21300000, guid: 0392344aa3984d54193820e54c96fc4e
-fileID: 21300032, guid: c7e0018986019bf43b2e95e45c71181a|fileID: 21300000, guid: 838e23ac5ad7f3a439d044121287835e
-fileID: 21300034, guid: c7e0018986019bf43b2e95e45c71181a|fileID: 21300000, guid: 19d618563b7e1e141ae6b8a60c98da5f
-fileID: 21300036, guid: c7e0018986019bf43b2e95e45c71181a|fileID: 21300000, guid: 4e113a5fa5e312843a81d275f8e56a78
-fileID: 21300038, guid: c7e0018986019bf43b2e95e45c71181a|fileID: 21300000, guid: 6dfb31e6183701f42969b44e32a96347
-fileID: 21300000, guid: 2901f7d5f54aff04abc019a67cc75cd4|fileID: 21300000, guid: 53f5b57feb7b3db4b8377ff00dd5ad8f
-fileID: 21300002, guid: 2901f7d5f54aff04abc019a67cc75cd4|fileID: 21300000, guid: fc658fa06ccb5404985d96c3674d51e4
-fileID: 21300004, guid: 2901f7d5f54aff04abc019a67cc75cd4|fileID: 21300000, guid: 710f7bac607de0649bc6eec777aba0e0
-fileID: 21300006, guid: 2901f7d5f54aff04abc019a67cc75cd4|fileID: 21300000, guid: 022e76b847c721744aee952b7acf3861
-fileID: 21300000, guid: fcd4a4807ecb07a498ece5ab0b4bdd2c|fileID: 21300000, guid: f6bf044ac8f41104b960e1cf17dab266
-fileID: 21300002, guid: fcd4a4807ecb07a498ece5ab0b4bdd2c|fileID: 21300000, guid: 46034fb626c8f684da9887ce2bdcc24e
-fileID: 21300004, guid: fcd4a4807ecb07a498ece5ab0b4bdd2c|fileID: 21300000, guid: b6a60532d81cb9b40ad3a4d0d670670d
-fileID: 21300006, guid: fcd4a4807ecb07a498ece5ab0b4bdd2c|fileID: 21300000, guid: 5fd3c6b9cfc772d46bf1f2d8fcdb950b
-fileID: 21300008, guid: fcd4a4807ecb07a498ece5ab0b4bdd2c|fileID: 21300000, guid: dc7a4d60850d37d44bd3c0a518f8d2b3
-fileID: 21300010, guid: fcd4a4807ecb07a498ece5ab0b4bdd2c|fileID: 21300000, guid: 07cc644f7a3fd904fb64c47ce79edd76
-fileID: 21300012, guid: fcd4a4807ecb07a498ece5ab0b4bdd2c|fileID: 21300000, guid: 1a3f6d31018cbb744acfd13f58a87009
-fileID: 21300014, guid: fcd4a4807ecb07a498ece5ab0b4bdd2c|fileID: 21300000, guid: b682b1caa02be4148a688b9521845c37
-fileID: 21300000, guid: b4753f945f61e8243ba014be4a705de7|fileID: 21300000, guid: 3f36639ac83ce4a489bd621d684ea1a5
-fileID: 21300002, guid: b4753f945f61e8243ba014be4a705de7|fileID: 21300000, guid: 8579c10a92c46534f901dc172092f4e7
-fileID: 21300004, guid: b4753f945f61e8243ba014be4a705de7|fileID: 21300000, guid: 1e0c425d384f8644282ea5d7104860e4
-fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7|fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7
-fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7|fileID: 21300000, guid: 0cb064f7d4758914b82bf2af17509fa3
-fileID: 21300000, guid: 58bd33602e3d47547800c82dd95c291b|fileID: 21300000, guid: cc406256d3e6c6544af7f91fee3855cd
-fileID: 21300002, guid: 58bd33602e3d47547800c82dd95c291b|fileID: 21300000, guid: 2b7c9c874516dee428611dc70e42c56d
-fileID: 21300004, guid: 58bd33602e3d47547800c82dd95c291b|fileID: 21300000, guid: c11fa6575b949f14fab3373b1a463232
-fileID: 21300006, guid: 58bd33602e3d47547800c82dd95c291b|fileID: 21300000, guid: 20af4e62d33cc694f8754f2105934ea0
-fileID: 21300008, guid: 58bd33602e3d47547800c82dd95c291b|fileID: 21300000, guid: d2b776327fb8f9244af6766cf0f5e859
-fileID: 21300000, guid: 8d5fb26beef3dde488c316021ca5729f|fileID: 21300000, guid: c1bd930204518d34490b0a65ce52cfe2
-fileID: 21300002, guid: 8d5fb26beef3dde488c316021ca5729f|fileID: 21300000, guid: 82e315b06b317424fa171ba1079b64d3
-fileID: 21300004, guid: 8d5fb26beef3dde488c316021ca5729f|fileID: 21300000, guid: 368f403b73078e24fbc0ed5b0fea1b1c
-fileID: 21300006, guid: 8d5fb26beef3dde488c316021ca5729f|fileID: 21300000, guid: 65cd80b0cc4229943acab26732d161a6
-fileID: 21300008, guid: 8d5fb26beef3dde488c316021ca5729f|fileID: 21300000, guid: a324ee6c20ae102438570789022106a8

+ 2 - 0
Assets/AtlasUtility/Script/AtlasUtility.cs

@@ -36,6 +36,8 @@
         public string SlicePath = "Assets/AtlasUtility/Slice";
         public string PackName = "Atlas";
 
+        public Texture2D Atlas;
+
         public List<Texture2D> TextureList = new List<Texture2D>();
         public List<VirtualTexture> VirtualTextureList = new List<VirtualTexture>();
 

+ 55 - 19
Assets/AtlasUtility/Script/Editor/AtlasUtilityWindow.cs

@@ -444,7 +444,8 @@
 
         protected class Atlas
         {
-            public int Length;
+            public int Width;
+            public int Height;
 
             public List<TextureInfo> TextureInfoList;
 
@@ -452,13 +453,13 @@
             {
                 SpriteMetaData[] spriteMetaDatas = new SpriteMetaData[TextureInfoList.Count];
 
-                Color[] atlasColors = new Color[Length * Length];
+                Color[] atlasColors = new Color[Width * Height];
 
-                for (int i = 0; i < Length; i++)
+                for (int i = 0; i < Height; i++)
                 {
-                    for (int j = 0; j < Length; j++)
+                    for (int j = 0; j < Width; j++)
                     {
-                        atlasColors[i * j + j] = new Color(0, 0, 0, 0);
+                        atlasColors[i * Width + j] = new Color(0, 0, 0, 0);
                     }
                 }
 
@@ -487,7 +488,7 @@
                             int row = (int)lowerLeft.y + j;
                             int column = (int)lowerLeft.x + k;
 
-                            atlasColors[row * Length + column] = textureInfo.Colors[j * width + k];
+                            atlasColors[row * Width + column] = textureInfo.Colors[j * width + k];
                         }
                     }
                 }
@@ -510,9 +511,9 @@
                     AssetDatabase.Refresh();
                 }
 
-                Texture2D texture2D = new Texture2D(Length, Length, TextureFormat.RGBA32, false);
+                Texture2D texture2D = new Texture2D(Width, Height, TextureFormat.RGBA32, false);
 
-                texture2D.SetPixels(0, 0, Length, Length, atlasColors);
+                texture2D.SetPixels(0, 0, Width, Height, atlasColors);
 
                 texture2D.Apply();
 
@@ -524,7 +525,7 @@
                 TextureImporter textureImporter = (TextureImporter)AssetImporter.GetAtPath(path);
 
                 textureImporter.spritesheet = spriteMetaDatas;
-                textureImporter.maxTextureSize = Length;
+                textureImporter.maxTextureSize = Mathf.Max(Width, Height);
                 textureImporter.isReadable = true;
                 textureImporter.alphaIsTransparency = true;
                 textureImporter.textureType = TextureImporterType.Sprite;
@@ -606,6 +607,7 @@
         protected SerializedProperty SlicePath;
         protected SerializedProperty SlicePadding;
 
+        protected SerializedProperty atlas;
         protected SerializedProperty TextureList;
         protected SerializedProperty SpriteSheet;
         protected SerializedProperty VirtualTextureList;
@@ -627,6 +629,7 @@
             SlicePath = SerializedObject.FindProperty("SlicePath");
             SlicePadding = SerializedObject.FindProperty("SlicePadding");
 
+            atlas = SerializedObject.FindProperty("Atlas");
             TextureList = SerializedObject.FindProperty("TextureList");
             SpriteSheet = SerializedObject.FindProperty("SpriteSheet");
             PackPadding = SerializedObject.FindProperty("PackPadding");
@@ -822,7 +825,14 @@
 
                 length = Mathf.Max(length, maxTextureLength);
 
-                return new Box(length, length, new Vector2(0, 0));
+                if (length* length/2f >= totalArea)
+                {
+                    return new Box(length, length/2, new Vector2(0, 0));
+                }
+                else
+                {
+                    return new Box(length, length, new Vector2(0, 0));
+                }
             }
             else
             {
@@ -891,17 +901,28 @@
                 }
                 else
                 {
-                    int newLength = ExMath.NextPOT(box.Width + 1);
-
-                    if (newLength > parameter.TextureSize)
+                    if (box.Width > box.Height)
                     {
-                        atlasList.Add(CreateAtlas(box, atlasTextureInfoList));
-
-                        return remainTexureInfoList;
+                        box = new Box(box.Height, box.Width, Vector2.zero);
                     }
-                    else
+                    else if (box.Height > box.Width)
                     {
-                        box = new Box(newLength, newLength, Vector2.zero);
+                        box = new Box(box.Height, box.Height, Vector2.zero);
+                    }
+                    else if (box.Width == box.Height)
+                    {
+                        int newLength = ExMath.NextPOT(box.Width + 1);
+
+                        if (newLength > parameter.TextureSize)
+                        {
+                            atlasList.Add(CreateAtlas(box, atlasTextureInfoList));
+
+                            return remainTexureInfoList;
+                        }
+                        else
+                        {
+                            box = new Box(newLength, newLength/2, Vector2.zero);
+                        }
                     }
                 }
             }
@@ -965,7 +986,8 @@
         {
             Atlas atlas = new Atlas
             {
-                Length = box.Width,
+                Width = box.Width,
+                Height = box.Height,
                 TextureInfoList = textureInfoList,
             };
 
@@ -1200,6 +1222,20 @@
 
             EditorGUILayout.Separator();
 
+            EditorGUILayout.PropertyField(atlas);
+
+            if (Script.Atlas != null)
+            {
+                List<string> childPathList = ReferenceManager.GetChildPathList(AssetDatabase.GetAssetPath(Script.Atlas));
+
+                for (int i = 0; i < childPathList.Count; i++)
+                {
+                    Script.TextureList.Add(AssetDatabase.LoadAssetAtPath<Texture2D>(childPathList[i]));
+                }
+
+                Script.Atlas = null;
+            }
+
             EditorGUILayout.PropertyField(PackPadding, new GUIContent("Padding"));
             EditorGUILayout.PropertyField(TextureList, true);
 

+ 38 - 5
Assets/AtlasUtility/Script/Editor/ReferenceManager.cs

@@ -104,7 +104,7 @@
                 {
                     int index = fromReferenceList.IndexOf(sourceReference);
 
-                    Debug.LogWarning($"Repeat sprite detected    {ReferenceToPath(atlasReference)}    {ReferenceToPath(toReferenceList[index])}");
+                    Debug.LogWarning($"Repeat sprite detected    {ReferenceToFakePath(atlasReference)}    {ReferenceToFakePath(toReferenceList[index])}");
                 }
 
                 fromReferenceList.Add(sourceReference);
@@ -181,11 +181,11 @@
         }
 
 
-        public static string ReferenceToPath(string reference)
+        public static string ReferenceToFakePath(string reference)
         {
-            string guid = reference.Split(',')[1].Split(' ')[2];
-            string fileId = reference.Split(',')[0].Split(' ')[1];
-            
+            string guid = ReferenceToGUID(reference);
+            string fileId = ReferenceToFileId(reference);
+
             int spriteIndex = (int.Parse(fileId) - 21300000)/2;
             
             string atlasPath = AssetDatabase.GUIDToAssetPath(guid);
@@ -194,5 +194,38 @@
 
             return $"{atlasPath}/{textureImporter.spritesheet[spriteIndex].name}";
         }
+
+        public static string ReferenceToGUID(string reference)
+        {
+            return reference.Split(',')[1].Split(' ')[2];
+        }
+
+        public static string ReferenceToFileId(string reference)
+        {
+            return reference.Split(',')[0].Split(' ')[1];
+        }
+
+        public static List<string> GetChildPathList(string path)
+        {
+            List<string> pathList = new List<string>();
+            List<string> itemList = ReferenceTable.ReadAllLine();
+
+            string atlasGUID = AssetDatabase.AssetPathToGUID(path);
+            
+            for (int i = 0; i < itemList.Count; i++)
+            {
+                itemList[i] = itemList[i].TrimEnd((char) 13);
+
+                string atlasReference = itemList[i].Split('|')[0];
+                string sourceReference = itemList[i].Split('|')[1];
+
+                if (atlasReference.Contains(atlasGUID))
+                {
+                    pathList.Add(AssetDatabase.GUIDToAssetPath(ReferenceToGUID(sourceReference)));
+                }
+            }
+
+            return pathList;
+        }
     }
 }

+ 14 - 18
Assets/AtlasUtility/SerializeObject.prefab

@@ -9,17 +9,17 @@ Prefab:
     m_Modifications: []
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 1032427790593648}
+  m_RootGameObject: {fileID: 1170157383472358}
   m_IsPrefabParent: 1
---- !u!1 &1032427790593648
+--- !u!1 &1170157383472358
 GameObject:
   m_ObjectHideFlags: 0
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   serializedVersion: 5
   m_Component:
-  - component: {fileID: 4502767111148136}
-  - component: {fileID: 114350060436489464}
+  - component: {fileID: 4117573021518128}
+  - component: {fileID: 114982218461035774}
   m_Layer: 0
   m_Name: SerializeObject
   m_TagString: Untagged
@@ -27,12 +27,12 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &4502767111148136
+--- !u!4 &4117573021518128
 Transform:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1032427790593648}
+  m_GameObject: {fileID: 1170157383472358}
   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}
@@ -40,12 +40,12 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &114350060436489464
+--- !u!114 &114982218461035774
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1032427790593648}
+  m_GameObject: {fileID: 1170157383472358}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: b95c390c169d0c342a44bf125aefc458, type: 3}
@@ -53,16 +53,12 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   PackPlan: 1
   SpriteSheet: {fileID: 0}
-  PackSize: 2048
+  PackSize: 8192
   SlicePadding: 0
-  PackPadding: 1
-  PackPath: Assets/Resource/Sprite/SpriteUI
+  PackPadding: 0
+  PackPath: Assets/Resource/Sprite/Garden
   SlicePath: Assets/AtlasUtility/Slice
-  PackName: BtnAtlas1
-  TextureList:
-  - {fileID: 2800000, guid: 82e315b06b317424fa171ba1079b64d3, type: 3}
-  - {fileID: 2800000, guid: c1bd930204518d34490b0a65ce52cfe2, type: 3}
-  - {fileID: 2800000, guid: 368f403b73078e24fbc0ed5b0fea1b1c, type: 3}
-  - {fileID: 2800000, guid: 65cd80b0cc4229943acab26732d161a6, type: 3}
-  - {fileID: 2800000, guid: a324ee6c20ae102438570789022106a8, type: 3}
+  PackName: Atlas
+  Atlas: {fileID: 0}
+  TextureList: []
   VirtualTextureList: []

+ 1 - 1
Assets/AtlasUtility/SerializeObject.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 26b234a9acb6d09488ac93a7366e5dec
-timeCreated: 1502440495
+timeCreated: 1502506067
 licenseType: Pro
 NativeFormatImporter:
   userData: 

+ 9 - 0
Assets/Editor.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 5fcd7f3618d0f154995b49930421ea1b
+folderAsset: yes
+timeCreated: 1501174341
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 9 - 0
Assets/Plugins/metro/UWP.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: b3a793fc2ce8625488a5576817135789
+folderAsset: yes
+timeCreated: 1501174341
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 9 - 0
Assets/Plugins/metro/WindowsPhone81.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: ea89367846fcf554188c49cca742be04
+folderAsset: yes
+timeCreated: 1501174341
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 15 - 0
Assets/Resource/Logo.unity

@@ -427,6 +427,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1833966245}
   - component: {fileID: 1833966244}
+  - component: {fileID: 1833966246}
   m_Layer: 0
   m_Name: ManagerGame
   m_TagString: Untagged
@@ -460,3 +461,17 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1833966246
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1833966243}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ef3c42f14ba649d4aaf2ea3afe194ba7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Sprite: {fileID: 0}
+  Texture2D: {fileID: 0}
+  SpriteRenderer: {fileID: 0}

+ 20 - 13
Assets/Script/Manage/ManaServer.cs

@@ -122,7 +122,7 @@ public class ManaServer : Regist
                 {
                     Complete = true;
 
-                    ManaCenter.LoginCallbackInitial(new JsonData());                    
+                    ManaCenter.LoginCallbackInitial(new JsonData());
                 }
                 else
                 {
@@ -150,14 +150,14 @@ public class ManaServer : Regist
         URLRequestData urlData = new URLRequestData();
 
         URLRequest.CreateStrURLRequest
-            (
-                "https://garden.dashgame.com/xml/mail.xml",
-                urlData,
-                data =>
-                {
-                    MailXml = data;
-                }
-            );
+        (
+            "https://garden.dashgame.com/xml/mail.xml",
+            urlData,
+            data =>
+            {
+                MailXml = data;
+            }
+        );
     }
 
     public static void GetMainReward()
@@ -222,20 +222,20 @@ public class ManaServer : Regist
                     Transform mailItem = ManaReso.Get("MailItem", Folder.UI, false, ManaReso.Get("Bd_Grid"), new Vector3(), ObjType.MailItem);
 
                     float newSize = 0.6f;
-                    float newSpriteSize = closeUnit.PixelSize * newSize / closeUnit.Sprites[0].rect.width;
+                    float newSpriteSize = closeUnit.PixelSize*newSize/closeUnit.Sprites[0].rect.width;
 
                     mailItem.GetChild(1).GetComponent<Image>().sprite = closeUnit.Sprites[0];
 
                     mailItem.GetChild(1).GetComponent<Image>().Resize(true, newSpriteSize, newSpriteSize);
 
-                    mailItem.GetChild(1).transform.localPosition = new Vector2(0, closeUnit.IconOffset * newSize);
+                    mailItem.GetChild(1).transform.localPosition = new Vector2(0, closeUnit.IconOffset*newSize);
 
                     if (closeUnit.Sprites.Length > 1)
                     {
                         mailItem.GetChild(0).SetActive(true);
                         mailItem.GetChild(0).GetComponent<Image>().sprite = closeUnit.Sprites[1];
                         mailItem.GetChild(0).GetComponent<Image>().Resize(true, newSpriteSize, newSpriteSize);
-                        mailItem.GetChild(0).transform.localPosition = closeUnit.IconOffset1 * newSpriteSize + new Vector2(0, closeUnit.IconOffset * newSize);
+                        mailItem.GetChild(0).transform.localPosition = closeUnit.IconOffset1*newSpriteSize + new Vector2(0, closeUnit.IconOffset*newSize);
                     }
                     else
                     {
@@ -340,7 +340,14 @@ public class ManaServer : Regist
 
         XmlDocument xmlDoc = new XmlDocument();
 
-        xmlDoc.LoadXml(mailXml);
+        try
+        {
+            xmlDoc.LoadXml(mailXml);
+        }
+        catch (Exception)
+        {
+            return;
+        }
 
         XmlNodeList rewardNodeList = xmlDoc.SelectSingleNode("mail").SelectNodes("OneTimeReward");
 

+ 3 - 3
ProjectSettings/GraphicsSettings.asset

@@ -43,13 +43,13 @@ GraphicsSettings:
     type: 0}
   m_TierSettings_Tier1:
     renderingPath: 1
-    useCascadedShadowMaps: 0
+    useCascadedShadowMaps: 1
   m_TierSettings_Tier2:
     renderingPath: 1
-    useCascadedShadowMaps: 0
+    useCascadedShadowMaps: 1
   m_TierSettings_Tier3:
     renderingPath: 1
-    useCascadedShadowMaps: 0
+    useCascadedShadowMaps: 1
   m_DefaultRenderingPath: 1
   m_DefaultMobileRenderingPath: 1
   m_TierSettings: []