Bladeren bron

调试自动打包

LiuQilin 8 jaren geleden
bovenliggende
commit
f9cc431bd2

+ 27 - 26
Assets/AtlasUtility/ReferenceTable.txt

@@ -83,6 +83,28 @@ fileID: 21300016, guid: b355d692dda42ec4c9f8ebd6d9056bbf|fileID: 21300000, guid:
 fileID: 21300018, guid: b355d692dda42ec4c9f8ebd6d9056bbf|fileID: 21300000, guid: b5792498de291e44fbc1f8ad9c8448f9
 fileID: 21300000, guid: cdca0e49826eff543bbc60872b9c64e2|fileID: 21300000, guid: 94f1c0246e971a24581cf425455ec271
 fileID: 21300002, guid: cdca0e49826eff543bbc60872b9c64e2|fileID: 21300000, guid: 88be3e8d551e0594d9af93bc7427db20
+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: c8e673ebab81ff34e95ecff941a31312|fileID: 21300000, guid: 3a966c70f70c2044fbcf3c611eb7b0fa
+fileID: 21300002, guid: c8e673ebab81ff34e95ecff941a31312|fileID: 21300000, guid: b2b6e02f3768cb941af8c5519ca9506c
+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
+fileID: 21300010, guid: 8d5fb26beef3dde488c316021ca5729f|fileID: 21300000, guid: bf1c75459cdd88441a7928bb916f47ef
+fileID: 21300000, guid: 8cb55b7599a957a40906b7bf939ce8b4|fileID: 21300000, guid: 4b2aa598a8b767740afbd328b6a4f6af
+fileID: 21300002, guid: 8cb55b7599a957a40906b7bf939ce8b4|fileID: 21300000, guid: 495ae6d1453b4e545a4e879a262f799f
+fileID: 21300004, guid: 8cb55b7599a957a40906b7bf939ce8b4|fileID: 21300000, guid: 6d7a9b26c5292f24da196644249fb8b0
+fileID: 21300006, guid: 8cb55b7599a957a40906b7bf939ce8b4|fileID: 21300000, guid: 5d5a33dd53e644745bf6b450e30cbf3f
+fileID: 21300008, guid: 8cb55b7599a957a40906b7bf939ce8b4|fileID: 21300000, guid: b53e691e4c8fc5c45b3b5436708d5c4d
+fileID: 21300010, guid: 8cb55b7599a957a40906b7bf939ce8b4|fileID: 21300000, guid: b070139c782da6b4cb35cc70c7d66274
+fileID: 21300012, guid: 8cb55b7599a957a40906b7bf939ce8b4|fileID: 21300000, guid: 2304504aea964d54c8d62a15dc5067bf
+fileID: 21300014, guid: 8cb55b7599a957a40906b7bf939ce8b4|fileID: 21300000, guid: cde66b70acacf1a47b8a81614f11dcfb
+fileID: 21300016, guid: 8cb55b7599a957a40906b7bf939ce8b4|fileID: 21300000, guid: 787176d36456ad840ba878659cabcea0
 fileID: 21300000, guid: c8ea69d236ed4014aa4113d71295370f|fileID: 21300000, guid: 1bb19e193689f4049b199f274fc541f7
 fileID: 21300002, guid: c8ea69d236ed4014aa4113d71295370f|fileID: 21300000, guid: a8375c9373541f143a22b32032e3f9aa
 fileID: 21300004, guid: c8ea69d236ed4014aa4113d71295370f|fileID: 21300000, guid: e3accf445fffb7044a4d3d70109b38a9
@@ -119,29 +141,8 @@ fileID: 21300064, guid: c8ea69d236ed4014aa4113d71295370f|fileID: 21300000, guid:
 fileID: 21300066, guid: c8ea69d236ed4014aa4113d71295370f|fileID: 21300000, guid: dc7a4d60850d37d44bd3c0a518f8d2b3
 fileID: 21300068, guid: c8ea69d236ed4014aa4113d71295370f|fileID: 21300000, guid: 07cc644f7a3fd904fb64c47ce79edd76
 fileID: 21300070, guid: c8ea69d236ed4014aa4113d71295370f|fileID: 21300000, guid: 1a3f6d31018cbb744acfd13f58a87009
-fileID: 21300072, guid: c8ea69d236ed4014aa4113d71295370f|fileID: 21300000, guid: 297963e10fd5cd6468d54b9d7624580b
-fileID: 21300074, guid: c8ea69d236ed4014aa4113d71295370f|fileID: 21300000, guid: 4e113a5fa5e312843a81d275f8e56a78
-fileID: 21300076, guid: c8ea69d236ed4014aa4113d71295370f|fileID: 21300000, guid: 6dfb31e6183701f42969b44e32a96347
-fileID: 21300078, guid: c8ea69d236ed4014aa4113d71295370f|fileID: 21300000, guid: b682b1caa02be4148a688b9521845c37
-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: c8e673ebab81ff34e95ecff941a31312|fileID: 21300000, guid: 3a966c70f70c2044fbcf3c611eb7b0fa
-fileID: 21300002, guid: c8e673ebab81ff34e95ecff941a31312|fileID: 21300000, guid: b2b6e02f3768cb941af8c5519ca9506c
-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
-fileID: 21300010, guid: 8d5fb26beef3dde488c316021ca5729f|fileID: 21300000, guid: bf1c75459cdd88441a7928bb916f47ef
-fileID: 21300000, guid: 8cb55b7599a957a40906b7bf939ce8b4|fileID: 21300000, guid: 4b2aa598a8b767740afbd328b6a4f6af
-fileID: 21300002, guid: 8cb55b7599a957a40906b7bf939ce8b4|fileID: 21300000, guid: 495ae6d1453b4e545a4e879a262f799f
-fileID: 21300004, guid: 8cb55b7599a957a40906b7bf939ce8b4|fileID: 21300000, guid: 6d7a9b26c5292f24da196644249fb8b0
-fileID: 21300006, guid: 8cb55b7599a957a40906b7bf939ce8b4|fileID: 21300000, guid: 5d5a33dd53e644745bf6b450e30cbf3f
-fileID: 21300008, guid: 8cb55b7599a957a40906b7bf939ce8b4|fileID: 21300000, guid: b53e691e4c8fc5c45b3b5436708d5c4d
-fileID: 21300010, guid: 8cb55b7599a957a40906b7bf939ce8b4|fileID: 21300000, guid: b070139c782da6b4cb35cc70c7d66274
-fileID: 21300012, guid: 8cb55b7599a957a40906b7bf939ce8b4|fileID: 21300000, guid: 2304504aea964d54c8d62a15dc5067bf
-fileID: 21300014, guid: 8cb55b7599a957a40906b7bf939ce8b4|fileID: 21300000, guid: cde66b70acacf1a47b8a81614f11dcfb
-fileID: 21300016, guid: 8cb55b7599a957a40906b7bf939ce8b4|fileID: 21300000, guid: 787176d36456ad840ba878659cabcea0
+fileID: 21300072, guid: c8ea69d236ed4014aa4113d71295370f|fileID: 21300000, guid: b75f0efa8cf6be94ea93b2745f43fc8c
+fileID: 21300074, guid: c8ea69d236ed4014aa4113d71295370f|fileID: 21300000, guid: 297963e10fd5cd6468d54b9d7624580b
+fileID: 21300076, guid: c8ea69d236ed4014aa4113d71295370f|fileID: 21300000, guid: 4e113a5fa5e312843a81d275f8e56a78
+fileID: 21300078, guid: c8ea69d236ed4014aa4113d71295370f|fileID: 21300000, guid: 6dfb31e6183701f42969b44e32a96347
+fileID: 21300080, guid: c8ea69d236ed4014aa4113d71295370f|fileID: 21300000, guid: b682b1caa02be4148a688b9521845c37

+ 43 - 11
Assets/AtlasUtility/SerializeObject.prefab

@@ -56,20 +56,52 @@ MonoBehaviour:
   PackSize: 2048
   SlicePadding: 0
   PackPadding: 1
-  PackPath: Assets/Resource/Sprite/SpriteUI
+  PackPath: Assets/Resource/Sprite/SpriteUI/Skill
   SlicePath: Assets/AtlasUtility/Slice
-  PackName: PanelAtlas2
+  PackName: SkillAtlas
   Atlas: {fileID: 0}
   Target: {fileID: 0}
   TextureList:
-  - {fileID: 2800000, guid: 4b2aa598a8b767740afbd328b6a4f6af, type: 3}
-  - {fileID: 2800000, guid: 495ae6d1453b4e545a4e879a262f799f, type: 3}
-  - {fileID: 2800000, guid: 6d7a9b26c5292f24da196644249fb8b0, type: 3}
-  - {fileID: 2800000, guid: b53e691e4c8fc5c45b3b5436708d5c4d, type: 3}
-  - {fileID: 2800000, guid: b070139c782da6b4cb35cc70c7d66274, type: 3}
-  - {fileID: 2800000, guid: 5d5a33dd53e644745bf6b450e30cbf3f, type: 3}
-  - {fileID: 2800000, guid: 2304504aea964d54c8d62a15dc5067bf, type: 3}
-  - {fileID: 2800000, guid: 787176d36456ad840ba878659cabcea0, type: 3}
-  - {fileID: 2800000, guid: cde66b70acacf1a47b8a81614f11dcfb, type: 3}
+  - {fileID: 2800000, guid: 1bb19e193689f4049b199f274fc541f7, type: 3}
+  - {fileID: 2800000, guid: a8375c9373541f143a22b32032e3f9aa, type: 3}
+  - {fileID: 2800000, guid: e3accf445fffb7044a4d3d70109b38a9, type: 3}
+  - {fileID: 2800000, guid: 326709b7cdc393b48a424d7c579b2d4c, type: 3}
+  - {fileID: 2800000, guid: e42bfa25f226c4a4983bf95c1b080c66, type: 3}
+  - {fileID: 2800000, guid: 53f5b57feb7b3db4b8377ff00dd5ad8f, type: 3}
+  - {fileID: 2800000, guid: f6bf044ac8f41104b960e1cf17dab266, type: 3}
+  - {fileID: 2800000, guid: 46034fb626c8f684da9887ce2bdcc24e, type: 3}
+  - {fileID: 2800000, guid: b6a60532d81cb9b40ad3a4d0d670670d, type: 3}
+  - {fileID: 2800000, guid: ea6f8b98dba80ed4da98783d4b67a05f, type: 3}
+  - {fileID: 2800000, guid: 063ea374e9043374499794044f72b8b6, type: 3}
+  - {fileID: 2800000, guid: c9429ca4c11b98b45bcc6c9d785b528f, type: 3}
+  - {fileID: 2800000, guid: 8a8eca1e9acc1da4a97c91c58979c2a5, type: 3}
+  - {fileID: 2800000, guid: bf824f5d04fde9b4788c615b68f1cfd1, type: 3}
+  - {fileID: 2800000, guid: 1cd1c7843dfab4f47845dee056dd4b0f, type: 3}
+  - {fileID: 2800000, guid: ddd4f7cd239bd0847ab18b1d6b26d14f, type: 3}
+  - {fileID: 2800000, guid: 81726f9b381c9b54186089538fbb19a4, type: 3}
+  - {fileID: 2800000, guid: 3d3428a8490fa724890de93156161f05, type: 3}
+  - {fileID: 2800000, guid: 9918124a9bd12974daca85f20d03abd9, type: 3}
+  - {fileID: 2800000, guid: 88de22291cb66ff48a87d06830c8062b, type: 3}
+  - {fileID: 2800000, guid: 2da572dc3b99c9540967065d74407a28, type: 3}
+  - {fileID: 2800000, guid: 5bba921ee5be7dc47be1d203534ce56f, type: 3}
+  - {fileID: 2800000, guid: 86da3f7f4adcbbd4792704387e938d72, type: 3}
+  - {fileID: 2800000, guid: 79b6c36436ae37b4391c2ec81661f269, type: 3}
+  - {fileID: 2800000, guid: b8f88a8792d1a344c99e6b4073031b6c, type: 3}
+  - {fileID: 2800000, guid: 8178e4bf518056e40bb19b29a0c62be3, type: 3}
+  - {fileID: 2800000, guid: 0392344aa3984d54193820e54c96fc4e, type: 3}
+  - {fileID: 2800000, guid: 838e23ac5ad7f3a439d044121287835e, type: 3}
+  - {fileID: 2800000, guid: 19d618563b7e1e141ae6b8a60c98da5f, type: 3}
+  - {fileID: 2800000, guid: fc658fa06ccb5404985d96c3674d51e4, type: 3}
+  - {fileID: 2800000, guid: 710f7bac607de0649bc6eec777aba0e0, type: 3}
+  - {fileID: 2800000, guid: 022e76b847c721744aee952b7acf3861, type: 3}
+  - {fileID: 2800000, guid: 5fd3c6b9cfc772d46bf1f2d8fcdb950b, type: 3}
+  - {fileID: 2800000, guid: dc7a4d60850d37d44bd3c0a518f8d2b3, type: 3}
+  - {fileID: 2800000, guid: 07cc644f7a3fd904fb64c47ce79edd76, type: 3}
+  - {fileID: 2800000, guid: 1a3f6d31018cbb744acfd13f58a87009, type: 3}
+  - {fileID: 2800000, guid: 297963e10fd5cd6468d54b9d7624580b, type: 3}
+  - {fileID: 2800000, guid: 4e113a5fa5e312843a81d275f8e56a78, type: 3}
+  - {fileID: 2800000, guid: 6dfb31e6183701f42969b44e32a96347, type: 3}
+  - {fileID: 2800000, guid: b682b1caa02be4148a688b9521845c37, type: 3}
+  - {fileID: 2800000, guid: b75f0efa8cf6be94ea93b2745f43fc8c, type: 3}
   VirtualTextureList: []
   ReferenceTable: {fileID: 4900000, guid: e61ffc7d134032b48a4366dfa7284499, type: 3}

+ 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: 

+ 30 - 30
Assets/Resource/Prefab/Object/DebugMode.prefab

@@ -52,10 +52,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   UiList:
-  - {fileID: 21300004, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300018, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300000, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300008, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300000, guid: e3accf445fffb7044a4d3d70109b38a9, type: 3}
+  - {fileID: 21300000, guid: ea6f8b98dba80ed4da98783d4b67a05f, type: 3}
+  - {fileID: 21300000, guid: 1bb19e193689f4049b199f274fc541f7, type: 3}
+  - {fileID: 21300000, guid: e42bfa25f226c4a4983bf95c1b080c66, type: 3}
   - {fileID: 1452624794413892, guid: 207b7751524785a428904038ac978d0a, type: 2}
   - {fileID: 1948781497737682, guid: 8647d80b558fa724a84d05f9e6aee9bc, type: 2}
   - {fileID: 1778995246200592, guid: e71b00d758f7c8341ac775c8694a411a, type: 2}
@@ -74,32 +74,32 @@ MonoBehaviour:
   - {fileID: 1530314730688346, guid: aefbbfee089a9964e9b377589692f48c, type: 2}
   - {fileID: 1987736408932752, guid: e94e1c2506968d14ba9792fb79e31e39, type: 2}
   - {fileID: 21300000, guid: 1258b465a9bfc8042822c22571387170, type: 3}
-  - {fileID: 21300006, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300020, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300072, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300002, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300010, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300078, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300058, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300062, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300060, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300070, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300014, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300068, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300064, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300012, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300016, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300066, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300032, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300034, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300036, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300038, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300040, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300074, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300076, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300042, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300044, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
-  - {fileID: 21300046, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300000, guid: 326709b7cdc393b48a424d7c579b2d4c, type: 3}
+  - {fileID: 21300000, guid: 063ea374e9043374499794044f72b8b6, type: 3}
+  - {fileID: 21300000, guid: 297963e10fd5cd6468d54b9d7624580b, type: 3}
+  - {fileID: 21300000, guid: a8375c9373541f143a22b32032e3f9aa, type: 3}
+  - {fileID: 21300000, guid: 53f5b57feb7b3db4b8377ff00dd5ad8f, type: 3}
+  - {fileID: 21300000, guid: b682b1caa02be4148a688b9521845c37, type: 3}
+  - {fileID: 21300000, guid: fc658fa06ccb5404985d96c3674d51e4, type: 3}
+  - {fileID: 21300000, guid: 022e76b847c721744aee952b7acf3861, type: 3}
+  - {fileID: 21300000, guid: 710f7bac607de0649bc6eec777aba0e0, type: 3}
+  - {fileID: 21300000, guid: 1a3f6d31018cbb744acfd13f58a87009, type: 3}
+  - {fileID: 21300000, guid: 46034fb626c8f684da9887ce2bdcc24e, type: 3}
+  - {fileID: 21300000, guid: 07cc644f7a3fd904fb64c47ce79edd76, type: 3}
+  - {fileID: 21300000, guid: 5fd3c6b9cfc772d46bf1f2d8fcdb950b, type: 3}
+  - {fileID: 21300000, guid: f6bf044ac8f41104b960e1cf17dab266, type: 3}
+  - {fileID: 21300000, guid: b6a60532d81cb9b40ad3a4d0d670670d, type: 3}
+  - {fileID: 21300000, guid: dc7a4d60850d37d44bd3c0a518f8d2b3, type: 3}
+  - {fileID: 21300000, guid: 81726f9b381c9b54186089538fbb19a4, type: 3}
+  - {fileID: 21300000, guid: 3d3428a8490fa724890de93156161f05, type: 3}
+  - {fileID: 21300000, guid: 9918124a9bd12974daca85f20d03abd9, type: 3}
+  - {fileID: 21300000, guid: 88de22291cb66ff48a87d06830c8062b, type: 3}
+  - {fileID: 21300000, guid: 2da572dc3b99c9540967065d74407a28, type: 3}
+  - {fileID: 21300000, guid: 4e113a5fa5e312843a81d275f8e56a78, type: 3}
+  - {fileID: 21300000, guid: 6dfb31e6183701f42969b44e32a96347, type: 3}
+  - {fileID: 21300000, guid: 5bba921ee5be7dc47be1d203534ce56f, type: 3}
+  - {fileID: 21300000, guid: 86da3f7f4adcbbd4792704387e938d72, type: 3}
+  - {fileID: 21300000, guid: 79b6c36436ae37b4391c2ec81661f269, type: 3}
   - {fileID: 21300010, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
   - {fileID: 21300000, guid: e7d6142574a077b4f8699621861308d3, type: 3}
   - {fileID: 2100000, guid: 9afe516b3d7c64a4f9c1f4f2b9419129, type: 2}

+ 1 - 1
Assets/Resource/Sprite/Garden/游戏等级评分.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f5e88140a231f0b41856d0149f1a12fd
+guid: b5792498de291e44fbc1f8ad9c8448f9
 timeCreated: 1502511442
 licenseType: Pro
 TextureImporter:

BIN
Assets/Resource/Sprite/SpriteUI/Skill/SkillAtlas.png


+ 24 - 10
Assets/Resource/Sprite/SpriteUI/Skill/SkillAtlas.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: c8ea69d236ed4014aa4113d71295370f
-timeCreated: 1502592296
+timeCreated: 1502935848
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
@@ -40,10 +40,11 @@ TextureImporter:
     21300066: "\u84DD-\u9AD8\u7EA7\u5305"
     21300068: "\u84DD-\u514D\u8D39\u94BB"
     21300070: "\u84DD-\u4E2D\u7EA7\u5305"
-    21300072: "\u7EA2-\u6A31\u82B1\u6811"
-    21300074: "\u9EC4-\u7EA2\u8774\u8776"
-    21300076: "\u9EC4-\u84DD\u8272\u871C\u8702"
-    21300078: "\u7EFF-\u7E41\u82B1\u4F3C\u9526"
+    21300072: "\u84DD-\u4E00\u5143\u5305"
+    21300074: "\u7EA2-\u6A31\u82B1\u6811"
+    21300076: "\u9EC4-\u7EA2\u8774\u8776"
+    21300078: "\u9EC4-\u84DD\u8272\u871C\u8702"
+    21300080: "\u7EFF-\u7E41\u82B1\u4F3C\u9526"
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -594,12 +595,12 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u7EA2-\u6A31\u82B1\u6811"
+      name: "\u84DD-\u4E00\u5143\u5305"
       rect:
         serializedVersion: 2
         x: 1445
         y: 570
-        width: 187
+        width: 188
         height: 188
       alignment: 9
       pivot: {x: 0.5, y: 0.5}
@@ -607,7 +608,7 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u9EC4-\u7EA2\u8774\u8776"
+      name: "\u7EA2-\u6A31\u82B1\u6811"
       rect:
         serializedVersion: 2
         x: 1445
@@ -620,12 +621,25 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u9EC4-\u84DD\u8272\u871C\u8702"
+      name: "\u9EC4-\u7EA2\u8774\u8776"
       rect:
         serializedVersion: 2
         x: 1635
         y: 1
         width: 187
+        height: 188
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u9EC4-\u84DD\u8272\u871C\u8702"
+      rect:
+        serializedVersion: 2
+        x: 1635
+        y: 191
+        width: 187
         height: 187
       alignment: 9
       pivot: {x: 0.5, y: 0.5}
@@ -637,7 +651,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 1635
-        y: 190
+        y: 380
         width: 187
         height: 188
       alignment: 9

+ 2 - 2
Assets/Resource/Sprite/SpriteUI/Skill/蓝-一元包.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: b75f0efa8cf6be94ea93b2745f43fc8c
-timeCreated: 1502933958
+timeCreated: 1502935839
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName: {}
@@ -19,7 +19,7 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
-  isReadable: 0
+  isReadable: 1
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0

+ 1 - 1
Assets/Resource/XML/Config/pack_config.xml

@@ -10,7 +10,7 @@
   <item id="9" name="钻石2000 赠送500" class="4" class_id="8" coin_person="" person="" skill_cd="" coin="" diamond="2500" flower="" use_lv="" use_cur="3" use_amnt="68" desc="共计 [&amp;diamond&amp;]钻石" icon="蓝-小量钻石" anim="" label="超值" lock="" />
   <item id="10" name="钻石6000 赠送600" class="4" class_id="9" coin_person="" person="" skill_cd="" coin="" diamond="6600" flower="" use_lv="" use_cur="3" use_amnt="128" desc="共计 [&amp;diamond&amp;]钻石" icon="蓝-中量钻石" anim="" label="" lock="" />
   <item id="11" name="钻石10000 赠送2000" class="4" class_id="10" coin_person="" person="" skill_cd="" coin="" diamond="12000" flower="" use_lv="" use_cur="3" use_amnt="328" desc="共计 [&amp;diamond&amp;]钻石" icon="蓝-大量钻石" anim="" label="" lock="" />
-  <item id="12" name="一元畅玩包" class="4" class_id="2" coin_person="1%" person="" skill_cd="" coin="" diamond="100" flower="" use_lv="" use_cur="3" use_amnt="1" desc="获得[&amp;diamond&amp;]钻石&#xA;所有金币产出提升[&amp;coin_person&amp;],永久有效" icon="蓝-小量钻石" anim="" label="超值" lock="1" />
+  <item id="12" name="一元畅玩包" class="4" class_id="2" coin_person="1%" person="" skill_cd="" coin="" diamond="100" flower="" use_lv="" use_cur="3" use_amnt="1" desc="获得[&amp;diamond&amp;]钻石&#xA;所有金币产出提升[&amp;coin_person&amp;],永久有效" icon="蓝-一元包" anim="" label="超值" lock="1" />
   <comment>
     <id>
 id

+ 1 - 1
Assets/Resource/XML/lan/English.xml

@@ -167,7 +167,7 @@ Program 水怪
     <Pack9 desc=""><![CDATA[2000 Diamonds(gains 500 more)]]></Pack9>
     <Pack10 desc=""><![CDATA[6000 Diamonds(gains 600 more)]]></Pack10>
     <Pack11 desc=""><![CDATA[10000 Diamonds(gains 2000 more)]]></Pack11>
-    <Pack12 desc=""><![CDATA[]]></Pack12>
+    <Pack12 desc=""><![CDATA[Fresh Package]]></Pack12>
     <Ability1 desc=""><![CDATA[Garden]]></Ability1>
     <Ability2 desc=""><![CDATA[Rainbow]]></Ability2>
     <Ability3 desc=""><![CDATA[Cherry Blossoms]]></Ability3>

+ 14 - 9
Assets/Script/Editor/PostProcessor.cs

@@ -48,7 +48,7 @@ public class NewBehaviourScript
         project.AddFrameworkToProject(targetGuid, "AlipaySDK.framework", false);
         project.AddFrameworkToProject(targetGuid, "Security.framework", false);
 
-//
+
         //App名称本地化
         string plistPath = Path.Combine(buildPath, "Info.plist");
 
@@ -56,7 +56,8 @@ public class NewBehaviourScript
 
         plist.ReadFromFile(plistPath);
 
-        plist.root.SetString("Bundle display name", "${CFBundleDisplayName }");
+        //plist.root.SetString("Bundle display name", "${CFBundleDisplayName }");
+        plist.root.CreateDict("Bundle display name").SetString("Bundle display name", "${CFBundleDisplayName }");
 
         var infoDirs = Directory.GetDirectories(Application.dataPath + "/AppleDependency/");
         for (var i = 0; i < infoDirs.Length; ++i)
@@ -92,7 +93,7 @@ public class NewBehaviourScript
                 "if ([url.host isEqualToString:@\"safepay\"]) {\n" +
                 "//跳转支付宝钱包进行支付,处理支付结果\n" +
                 "[[AlipaySDK defaultService] processOrderWithPaymentResult: url standbyCallback:^ (NSDictionary * resultDic) {\n" +
-                "NSLog(@\"result 1 = % @\", resultDic);\n" +
+                "NSLog(@\"result 1 = %@\", resultDic);\n" +
                 " }];\n" +
                 "}\n"
             );
@@ -108,7 +109,7 @@ public class NewBehaviourScript
                 "//跳转支付宝钱包进行支付,处理支付结果\n" +
                 "[[AlipaySDK defaultService]\n" +
                 "processOrderWithPaymentResult:url standbyCallback:^(NSDictionary* resultDic) {\n" +
-                "NSLog(@\"result 2 = % @\", resultDic);\n" +
+                "NSLog(@\"result 2 = %@\", resultDic);\n" +
                 "}];\n" +
                 "}\n" +
                 "return YES;\n" +
@@ -126,13 +127,17 @@ public class NewBehaviourScript
 
 
         //添加URLScheme
-        PlistElementArray urlArray = plist.root.CreateArray("CFBundleURLTypes");
+        //PlistElementArray urlArray = plist.root.CreateArray("CFBundleURLTypes");
+        //PlistElementDict urlDict = urlArray.AddDict();
+        PlistElementArray urlArray = plist.root["CFBundleURLTypes"].AsArray();
         PlistElementDict urlDict = urlArray.AddDict();
 
-        urlDict.SetString("CFBundleURLName", "TestName");
-
-        PlistElementArray urlInnerArray = urlDict.CreateArray("TestScheme");
-        urlInnerArray.AddString("TestValue");
+        //urlDict.SetString("CFBundleURLName", "TestName");
+        urlDict.SetString("URL Schemes", "MyLovelyGarden");
+        urlDict.SetString("CFBundleURLSchemes", "MyLovelyGarden");
+        
+        //PlistElementArray urlInnerArray = urlDict.CreateArray("TestScheme");
+        //urlInnerArray.AddString("TestValue");
 
 
         //保存Plist

+ 2 - 0
Assets/Script/Manage/ManaUI.cs

@@ -1168,6 +1168,8 @@ public class ManaUI : Regist
             "Ea_Unlock",
             () =>
             {
+                ManaDebug.Log(ManaAudio.MusicTheme.isPlaying + " " + ManaAudio.MusicTheme.volume + " " + ManaAudio.MusicTheme.spatialBlend + " " + ManaAudio.MusicTheme.mute + " " + ManaAudio.MusicTheme.time);
+
                 ManaGarden.UnlockSlot();
             }
         );

+ 2 - 4
ToList.txt

@@ -1,12 +1,10 @@
-自动打包(本地化 URLScheme mm)
+自动打包(本地化(两个bundledisplayname) URLScheme(没有名字 把ShareSDK的URLScheme干掉了))
 
 花隐形的bug(小游戏C? 小游戏B?)
 
 苹果的本地化
 
-更新配置
-
-苹果上面没有声音
+苹果上面没有声音(3D声音太远 ManaUI中的调试代码)
 
 Error Code 7