Browse Source

修复ShareSDK Bug

jet 8 years ago
parent
commit
05150cb276
56 changed files with 928 additions and 603 deletions
  1. 43 41
      Assets/AtlasUtility/ReferenceTable.txt
  2. 32 39
      Assets/AtlasUtility/Script/Editor/TestEditor.cs
  3. 10 44
      Assets/AtlasUtility/SerializeObject.prefab
  4. 0 4
      Assets/Plugins/Android/ShareSDK/libs/MobCommons-2017.0531.1145.jar.meta
  5. BIN
      Assets/Plugins/Android/ShareSDK/libs/MobCommons-2017.0808.1625.jar
  6. 8 0
      Assets/Plugins/Android/ShareSDK/libs/MobCommons-2017.0808.1625.jar.meta
  7. BIN
      Assets/Plugins/Android/ShareSDK/libs/MobTools-2017.0531.1145.jar
  8. 0 4
      Assets/Plugins/Android/ShareSDK/libs/MobTools-2017.0531.1145.jar.meta
  9. BIN
      Assets/Plugins/Android/ShareSDK/libs/MobTools-2017.0801.1522.jar
  10. 8 0
      Assets/Plugins/Android/ShareSDK/libs/MobTools-2017.0801.1522.jar.meta
  11. BIN
      Assets/Plugins/Android/ShareSDK/libs/SSDKU3D.jar
  12. 0 4
      Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Core-3.0.0.jar.meta
  13. BIN
      Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Core-3.0.1.jar
  14. 8 0
      Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Core-3.0.1.jar.meta
  15. 0 4
      Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Facebook-3.0.0.jar.meta
  16. BIN
      Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Facebook-3.0.1.jar
  17. 8 0
      Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Facebook-3.0.1.jar.meta
  18. BIN
      Assets/Plugins/Android/ShareSDK/libs/ShareSDK-QQ-3.0.0.jar
  19. 0 4
      Assets/Plugins/Android/ShareSDK/libs/ShareSDK-QQ-3.0.0.jar.meta
  20. BIN
      Assets/Plugins/Android/ShareSDK/libs/ShareSDK-QQ-3.0.1.jar
  21. 8 0
      Assets/Plugins/Android/ShareSDK/libs/ShareSDK-QQ-3.0.1.jar.meta
  22. BIN
      Assets/Plugins/Android/ShareSDK/libs/ShareSDK-QZone-3.0.0.jar
  23. 0 4
      Assets/Plugins/Android/ShareSDK/libs/ShareSDK-QZone-3.0.0.jar.meta
  24. BIN
      Assets/Plugins/Android/ShareSDK/libs/ShareSDK-QZone-3.0.1.jar
  25. 8 0
      Assets/Plugins/Android/ShareSDK/libs/ShareSDK-QZone-3.0.1.jar.meta
  26. BIN
      Assets/Plugins/Android/ShareSDK/libs/ShareSDK-SinaWeibo-3.0.0.jar
  27. 0 4
      Assets/Plugins/Android/ShareSDK/libs/ShareSDK-SinaWeibo-3.0.0.jar.meta
  28. BIN
      Assets/Plugins/Android/ShareSDK/libs/ShareSDK-SinaWeibo-3.0.1.jar
  29. 8 0
      Assets/Plugins/Android/ShareSDK/libs/ShareSDK-SinaWeibo-3.0.1.jar.meta
  30. 9 0
      Assets/Plugins/Android/ShareSDK/libs/armeabi.meta
  31. BIN
      Assets/Plugins/Android/ShareSDK/libs/armeabi/libweibosdkcore.so
  32. 8 0
      Assets/Plugins/Android/ShareSDK/libs/armeabi/libweibosdkcore.so.meta
  33. 3 3
      Assets/Plugins/ShareSDK/ShareSDKDevInfo.cs
  34. 30 30
      Assets/Resource/Prefab/Object/DebugMode.prefab
  35. 1 1
      Assets/Resource/Prefab/PrefabUI/CloseItem.prefab
  36. 392 20
      Assets/Resource/Prefab/PrefabUI/GroupA.prefab
  37. 8 8
      Assets/Resource/Prefab/PrefabUI/GroupB.prefab
  38. 41 41
      Assets/Resource/Prefab/PrefabUI/GroupC.prefab
  39. 8 8
      Assets/Resource/Prefab/PrefabUI/GroupD.prefab
  40. 2 2
      Assets/Resource/Prefab/PrefabUI/GroupE.prefab
  41. BIN
      Assets/Resource/Sprite/Garden/FlowerAtlas.png
  42. 204 78
      Assets/Resource/Sprite/Garden/FlowerAtlas.png.meta
  43. BIN
      Assets/Resource/Sprite/Garden/FlowerAtlas1.png
  44. BIN
      Assets/Resource/Sprite/Garden/FlowerAtlas2.png
  45. 0 218
      Assets/Resource/Sprite/Garden/FlowerAtlas2.png.meta
  46. BIN
      Assets/Resource/Sprite/SpriteUI/PanelAtlas1.png
  47. 35 31
      Assets/Resource/Sprite/SpriteUI/PanelAtlas1.png.meta
  48. 4 4
      Assets/Resource/Sprite/SpriteUI/大底板.png.meta
  49. 2 2
      Assets/Resource/Sprite/SpriteUI/放花框子.png.meta
  50. 1 1
      Assets/Script/Manage/Initializer.cs
  51. 1 1
      Assets/Script/Manage/ManaDebug.cs
  52. 27 0
      Assets/Script/Manage/ManaUI.cs
  53. 2 0
      Garden3.csproj.DotSettings
  54. 1 1
      ProjectSettings/ProjectSettings.asset
  55. 1 1
      ProjectSettings/QualitySettings.asset
  56. 7 1
      ToDoList.txt

+ 43 - 41
Assets/AtlasUtility/ReferenceTable.txt

@@ -10,11 +10,6 @@ fileID: 21300016, guid: 700a246d0e2b9b740a21b1304a4a8d28|fileID: 21300000, guid:
 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: 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: c9f73f372de30284b9c4158a7b6c9634|fileID: 21300000, guid: 3becf28a881ca004aac96b8626844d1a
 fileID: 21300002, guid: c9f73f372de30284b9c4158a7b6c9634|fileID: 21300000, guid: b23f84d78b2ee3443b11253a61f85f59
 fileID: 21300004, guid: c9f73f372de30284b9c4158a7b6c9634|fileID: 21300000, guid: bb70c889ccbe321409013e054676a60c
@@ -35,42 +30,6 @@ fileID: 21300032, guid: c9f73f372de30284b9c4158a7b6c9634|fileID: 21300000, guid:
 fileID: 21300034, guid: c9f73f372de30284b9c4158a7b6c9634|fileID: 21300000, guid: ebc1119f992e078458ae897199fc3b48
 fileID: 21300036, guid: c9f73f372de30284b9c4158a7b6c9634|fileID: 21300000, guid: 808053d8bb98d124fac454f652d772d8
 fileID: 21300038, guid: c9f73f372de30284b9c4158a7b6c9634|fileID: 21300000, guid: 8be90607a97ac7842867d389e30c43ea
-fileID: 21300000, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: 68e1ed04a89dfbb4baa62245c40addb6
-fileID: 21300002, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: 36523d742a883124482c4a87e4d9a3cc
-fileID: 21300004, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: 91654037d83a8ba4ea2a85b9b1f5c0b9
-fileID: 21300006, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: 97e16cc167122074daa2690e28f8b008
-fileID: 21300008, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: fbd26fef3e54016408278f3d56082625
-fileID: 21300010, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: 5849701d971d12e488cfc7ceb6118637
-fileID: 21300012, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: 19da5f7abec13e84f8684b5eb59ea6b4
-fileID: 21300014, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: a5bc323e0f4da674691cd45825b3bff6
-fileID: 21300016, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: f33b0a6c87c4faa44b9769fda019e3a2
-fileID: 21300018, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: 85308d5010b45774e877f3fae319dac5
-fileID: 21300020, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: cb72fb32df67aa24f91a9afae97a08a6
-fileID: 21300022, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: 16e6ce922a163bb47897b95252dad38e
-fileID: 21300024, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: ca2bc3b7d6c2b8b478c6814ad5565672
-fileID: 21300026, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: 4a486aebbda05c84e8fad4a648ac95f4
-fileID: 21300028, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: 2281497cc8538ec46aa8e611d10bf5b1
-fileID: 21300030, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: 1b03544f55d1a8b41aac7beb7b7cee04
-fileID: 21300032, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: 8414a26d4c82880469245196b8d325e3
-fileID: 21300034, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: a0b39d37b068b554ba0084663dec1780
-fileID: 21300036, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: 06892e67e81ef9742a9a2846b54363ab
-fileID: 21300038, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: 350660722139e2e4caefa9d507060f69
-fileID: 21300040, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: 842e5f2a31851e346b9b551244e81398
-fileID: 21300042, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: adb700f01ab714d4aa4dd80ac0241cf5
-fileID: 21300044, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: 1e80d70ac3b7774449bd882f7961f66d
-fileID: 21300046, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: b80d85d8782bd4e459c73617eb6a81f0
-fileID: 21300048, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: efc82d3850d7f3444aa6b4490ae9a2a8
-fileID: 21300050, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: b7d083c187fd2ad47b4c8d905af6af48
-fileID: 21300052, guid: 9c73f3cb846e0d74ea3440644afa75b3|fileID: 21300000, guid: 6de60095d752d2748b50b3ac408328cb
-fileID: 21300000, guid: e3d95dbc6a535444c898a18f384300ef|fileID: 21300000, guid: 2fa154c29266e33468975bdbe6c00c0e
-fileID: 21300002, guid: e3d95dbc6a535444c898a18f384300ef|fileID: 21300000, guid: 9df78e70b9d03264985541a621bce28c
-fileID: 21300004, guid: e3d95dbc6a535444c898a18f384300ef|fileID: 21300000, guid: b5aa8d5c3ac9fe340ab0165f4a5e4f3b
-fileID: 21300006, guid: e3d95dbc6a535444c898a18f384300ef|fileID: 21300000, guid: 24a1cc7523255434b9f13ddb8bce44ef
-fileID: 21300008, guid: e3d95dbc6a535444c898a18f384300ef|fileID: 21300000, guid: c184e6f3babc63f4190f48e0cd96f54a
-fileID: 21300010, guid: e3d95dbc6a535444c898a18f384300ef|fileID: 21300000, guid: 7730260b51b8a954d9fa50bfd60e4b7a
-fileID: 21300012, guid: e3d95dbc6a535444c898a18f384300ef|fileID: 21300000, guid: 6cdf870f3aa9717498ed05a74b1948ae
-fileID: 21300014, guid: e3d95dbc6a535444c898a18f384300ef|fileID: 21300000, guid: fe4553741ca18ef4d9a0268e2d01eb12
-fileID: 21300016, guid: e3d95dbc6a535444c898a18f384300ef|fileID: 21300000, guid: 9b1e12c6b0a66cf409477d5524da10e9
 fileID: 21300000, guid: b355d692dda42ec4c9f8ebd6d9056bbf|fileID: 21300000, guid: a455128274f65a54c98757ad807d02a0
 fileID: 21300002, guid: b355d692dda42ec4c9f8ebd6d9056bbf|fileID: 21300000, guid: 360030e3073fa4c4d8f216f55be30cf0
 fileID: 21300004, guid: b355d692dda42ec4c9f8ebd6d9056bbf|fileID: 21300000, guid: defb31a82b042e34e823c5eb4d1305d6
@@ -146,3 +105,46 @@ fileID: 21300074, guid: c8ea69d236ed4014aa4113d71295370f|fileID: 21300000, guid:
 fileID: 21300076, guid: c8ea69d236ed4014aa4113d71295370f|fileID: 21300000, guid: 4e113a5fa5e312843a81d275f8e56a78
 fileID: 21300078, guid: c8ea69d236ed4014aa4113d71295370f|fileID: 21300000, guid: 6dfb31e6183701f42969b44e32a96347
 fileID: 21300080, guid: c8ea69d236ed4014aa4113d71295370f|fileID: 21300000, guid: b682b1caa02be4148a688b9521845c37
+fileID: 21300000, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: 68e1ed04a89dfbb4baa62245c40addb6
+fileID: 21300002, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: 36523d742a883124482c4a87e4d9a3cc
+fileID: 21300004, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: 91654037d83a8ba4ea2a85b9b1f5c0b9
+fileID: 21300006, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: 2fa154c29266e33468975bdbe6c00c0e
+fileID: 21300008, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: 9df78e70b9d03264985541a621bce28c
+fileID: 21300010, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: 97e16cc167122074daa2690e28f8b008
+fileID: 21300012, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: b5aa8d5c3ac9fe340ab0165f4a5e4f3b
+fileID: 21300014, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: 24a1cc7523255434b9f13ddb8bce44ef
+fileID: 21300016, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: c184e6f3babc63f4190f48e0cd96f54a
+fileID: 21300018, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: fbd26fef3e54016408278f3d56082625
+fileID: 21300020, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: 5849701d971d12e488cfc7ceb6118637
+fileID: 21300022, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: 19da5f7abec13e84f8684b5eb59ea6b4
+fileID: 21300024, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: a5bc323e0f4da674691cd45825b3bff6
+fileID: 21300026, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: f33b0a6c87c4faa44b9769fda019e3a2
+fileID: 21300028, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: 85308d5010b45774e877f3fae319dac5
+fileID: 21300030, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: cb72fb32df67aa24f91a9afae97a08a6
+fileID: 21300032, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: 16e6ce922a163bb47897b95252dad38e
+fileID: 21300034, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: 7730260b51b8a954d9fa50bfd60e4b7a
+fileID: 21300036, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: 6cdf870f3aa9717498ed05a74b1948ae
+fileID: 21300038, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: ca2bc3b7d6c2b8b478c6814ad5565672
+fileID: 21300040, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: 4a486aebbda05c84e8fad4a648ac95f4
+fileID: 21300042, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: 2281497cc8538ec46aa8e611d10bf5b1
+fileID: 21300044, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: fe4553741ca18ef4d9a0268e2d01eb12
+fileID: 21300046, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: 9b1e12c6b0a66cf409477d5524da10e9
+fileID: 21300048, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: 1b03544f55d1a8b41aac7beb7b7cee04
+fileID: 21300050, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: 8414a26d4c82880469245196b8d325e3
+fileID: 21300052, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: a0b39d37b068b554ba0084663dec1780
+fileID: 21300054, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: 06892e67e81ef9742a9a2846b54363ab
+fileID: 21300056, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: 350660722139e2e4caefa9d507060f69
+fileID: 21300058, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: 842e5f2a31851e346b9b551244e81398
+fileID: 21300060, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: adb700f01ab714d4aa4dd80ac0241cf5
+fileID: 21300062, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: 1e80d70ac3b7774449bd882f7961f66d
+fileID: 21300064, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: b80d85d8782bd4e459c73617eb6a81f0
+fileID: 21300066, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: efc82d3850d7f3444aa6b4490ae9a2a8
+fileID: 21300068, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: 6de60095d752d2748b50b3ac408328cb
+fileID: 21300070, guid: b9c1c4d92b62e3849a6503ef6531ca4a|fileID: 21300000, guid: b7d083c187fd2ad47b4c8d905af6af48
+fileID: 21300000, guid: b4753f945f61e8243ba014be4a705de7|fileID: 21300000, guid: 3f36639ac83ce4a489bd621d684ea1a5
+fileID: 21300002, guid: b4753f945f61e8243ba014be4a705de7|fileID: 21300000, guid: 8579c10a92c46534f901dc172092f4e7
+fileID: 21300004, guid: b4753f945f61e8243ba014be4a705de7|fileID: 21300000, guid: 14decf5fdd820524eb3435822116d326
+fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7|fileID: 21300000, guid: 1e0c425d384f8644282ea5d7104860e4
+fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7|fileID: 21300000, guid: d190acd69d12a114c851133dbcb7c5f7
+fileID: 21300010, guid: b4753f945f61e8243ba014be4a705de7|fileID: 21300000, guid: 4000c78c117d00d41900cdd8f4b505f4
+fileID: 21300012, guid: b4753f945f61e8243ba014be4a705de7|fileID: 21300000, guid: 0cb064f7d4758914b82bf2af17509fa3

+ 32 - 39
Assets/AtlasUtility/Script/Editor/TestEditor.cs

@@ -1,4 +1,7 @@
-namespace AtlasUtility
+using System.Security.Cryptography;
+using System.Text;
+
+namespace AtlasUtility
 {
     using LitJson;
 
@@ -32,44 +35,34 @@
 
             if (GUILayout.Button("Test"))
             {
-                string plistPath = "C:/Users/Administrator/Desktop/IOS/Info.plist";
-
-                PlistDocument plist = new PlistDocument();
-
-                plist.ReadFromFile(plistPath);
-
-
-                string projectPath = PBXProject.GetPBXProjectPath("C:/Users/Administrator/Desktop/IOS/");
-
-                PBXProject project = new PBXProject();
-
-                project.ReadFromFile(projectPath);
-
-                
-
-                //PlistElementDict urlDict = plist.root["CFBundleURLTypes"].AsArray().AddDict();
-
-                //urlDict.SetString("CFBundleURLSchemes", "MyLovelyGarden");
-
-                //foreach (var array in plist.root["CFBundleURLTypes"].AsArray().values)
-                //{
-                //    Debug.Log("URLType");
-                //    foreach (var dic in array.AsDict().values)
-                //    {
-                //        if (dic.Value.GetType() == typeof(PlistElementString))
-                //        {
-                //            Debug.Log("  " + dic.Key + " " + dic.Value.AsString());
-                //        }
-                //        else if (dic.Value.GetType() == typeof(PlistElementArray))
-                //        {
-                //            Debug.Log("    URLSchemes");
-                //            foreach (var ele in dic.Value.AsArray().values)
-                //            {
-                //                Debug.Log("      " + ele.AsString());
-                //            }
-                //        }
-                //    }
-                //}
+                MD5 md5 = new MD5CryptoServiceProvider();
+
+                byte[] bytes1 = File.ReadAllBytes(@"C:\Users\Administrator\Desktop\MD5测试1.txt");
+
+                byte[] md5Bytes1 = md5.ComputeHash(bytes1);
+
+                byte[] bytes2 = File.ReadAllBytes(@"C:\Users\Administrator\Desktop\MD5测试2.txt");
+
+                byte[] md5Bytes2 = md5.ComputeHash(bytes2);
+
+                if (md5Bytes1.Length != md5Bytes2.Length)
+                {
+                    Debug.Log("false");
+                    return;
+                }
+                else
+                {
+                    for (int i = 0; i < md5Bytes1.Length; i++)
+                    {
+                        if (md5Bytes1[i] != md5Bytes2[i])
+                        {
+                            Debug.Log("false");
+                            return;
+                        }
+                    }
+
+                    Debug.Log("true");
+                }
             }
         }
     }

+ 10 - 44
Assets/AtlasUtility/SerializeObject.prefab

@@ -56,52 +56,18 @@ MonoBehaviour:
   PackSize: 2048
   SlicePadding: 0
   PackPadding: 1
-  PackPath: Assets/Resource/Sprite/SpriteUI/Skill
+  PackPath: Assets/Resource/Sprite/SpriteUI
   SlicePath: Assets/AtlasUtility/Slice
-  PackName: SkillAtlas
+  PackName: PanelAtlas1
   Atlas: {fileID: 0}
-  Target: {fileID: 0}
+  Target: {fileID: 2800000, guid: a0be8c01c92ec4a4d9bf5da66205d15d, type: 3}
   TextureList:
-  - {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}
+  - {fileID: 2800000, guid: 3f36639ac83ce4a489bd621d684ea1a5, type: 3}
+  - {fileID: 2800000, guid: 8579c10a92c46534f901dc172092f4e7, type: 3}
+  - {fileID: 2800000, guid: 1e0c425d384f8644282ea5d7104860e4, type: 3}
+  - {fileID: 2800000, guid: d190acd69d12a114c851133dbcb7c5f7, type: 3}
+  - {fileID: 2800000, guid: 0cb064f7d4758914b82bf2af17509fa3, type: 3}
+  - {fileID: 2800000, guid: 4000c78c117d00d41900cdd8f4b505f4, type: 3}
+  - {fileID: 2800000, guid: 14decf5fdd820524eb3435822116d326, type: 3}
   VirtualTextureList: []
   ReferenceTable: {fileID: 4900000, guid: e61ffc7d134032b48a4366dfa7284499, type: 3}

+ 0 - 4
Assets/Plugins/Android/ShareSDK/libs/MobCommons-2017.0531.1145.jar.meta

@@ -1,4 +0,0 @@
-fileFormatVersion: 2
-guid: 3d175b609ca833540a128ba7c3418757
-DefaultImporter:
-  userData: 

BIN
Assets/Plugins/Android/ShareSDK/libs/MobCommons-2017.0531.1145.jar → Assets/Plugins/Android/ShareSDK/libs/MobCommons-2017.0808.1625.jar


+ 8 - 0
Assets/Plugins/Android/ShareSDK/libs/MobCommons-2017.0808.1625.jar.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 920b65b36bf241b47af4e3a7ad1aa137
+timeCreated: 1503473326
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Plugins/Android/ShareSDK/libs/MobTools-2017.0531.1145.jar


+ 0 - 4
Assets/Plugins/Android/ShareSDK/libs/MobTools-2017.0531.1145.jar.meta

@@ -1,4 +0,0 @@
-fileFormatVersion: 2
-guid: d6f20f6ecd7f1d64a903cf0d7ea6d5f1
-DefaultImporter:
-  userData: 

BIN
Assets/Plugins/Android/ShareSDK/libs/MobTools-2017.0801.1522.jar


+ 8 - 0
Assets/Plugins/Android/ShareSDK/libs/MobTools-2017.0801.1522.jar.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bae7e35a2bd60d1439ade2545f085599
+timeCreated: 1503473326
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Plugins/Android/ShareSDK/libs/SSDKU3D.jar


+ 0 - 4
Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Core-3.0.0.jar.meta

@@ -1,4 +0,0 @@
-fileFormatVersion: 2
-guid: 042f59d52839d7744b1ce179fee3e387
-DefaultImporter:
-  userData: 

BIN
Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Core-3.0.0.jar → Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Core-3.0.1.jar


+ 8 - 0
Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Core-3.0.1.jar.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cf39d8c65dcaba347a925f59a18b7bfb
+timeCreated: 1503473400
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 4
Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Facebook-3.0.0.jar.meta

@@ -1,4 +0,0 @@
-fileFormatVersion: 2
-guid: 718a79f11491fd44b98e84c9e212b823
-DefaultImporter:
-  userData: 

BIN
Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Facebook-3.0.0.jar → Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Facebook-3.0.1.jar


+ 8 - 0
Assets/Plugins/Android/ShareSDK/libs/ShareSDK-Facebook-3.0.1.jar.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fc9aafd9a5913334eb503feb503aae07
+timeCreated: 1503473425
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Plugins/Android/ShareSDK/libs/ShareSDK-QQ-3.0.0.jar


+ 0 - 4
Assets/Plugins/Android/ShareSDK/libs/ShareSDK-QQ-3.0.0.jar.meta

@@ -1,4 +0,0 @@
-fileFormatVersion: 2
-guid: fd260530020799342a0444708849c5b3
-DefaultImporter:
-  userData: 

BIN
Assets/Plugins/Android/ShareSDK/libs/ShareSDK-QQ-3.0.1.jar


+ 8 - 0
Assets/Plugins/Android/ShareSDK/libs/ShareSDK-QQ-3.0.1.jar.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a921d116065053045a3b39eb195968c3
+timeCreated: 1503471815
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Plugins/Android/ShareSDK/libs/ShareSDK-QZone-3.0.0.jar


+ 0 - 4
Assets/Plugins/Android/ShareSDK/libs/ShareSDK-QZone-3.0.0.jar.meta

@@ -1,4 +0,0 @@
-fileFormatVersion: 2
-guid: 50040c3a1aad4194bae15093f9e36e48
-DefaultImporter:
-  userData: 

BIN
Assets/Plugins/Android/ShareSDK/libs/ShareSDK-QZone-3.0.1.jar


+ 8 - 0
Assets/Plugins/Android/ShareSDK/libs/ShareSDK-QZone-3.0.1.jar.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7c1a1d2ff7c246c47b34b699219cb323
+timeCreated: 1503471815
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Plugins/Android/ShareSDK/libs/ShareSDK-SinaWeibo-3.0.0.jar


+ 0 - 4
Assets/Plugins/Android/ShareSDK/libs/ShareSDK-SinaWeibo-3.0.0.jar.meta

@@ -1,4 +0,0 @@
-fileFormatVersion: 2
-guid: 437f8b1c1b85e4048a6edfd1cfc74089
-DefaultImporter:
-  userData: 

BIN
Assets/Plugins/Android/ShareSDK/libs/ShareSDK-SinaWeibo-3.0.1.jar


+ 8 - 0
Assets/Plugins/Android/ShareSDK/libs/ShareSDK-SinaWeibo-3.0.1.jar.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e53d8e94426406c4581b9d812a150b61
+timeCreated: 1503471815
+licenseType: Pro
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 9 - 0
Assets/Plugins/Android/ShareSDK/libs/armeabi.meta

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

BIN
Assets/Plugins/Android/ShareSDK/libs/armeabi/libweibosdkcore.so


+ 8 - 0
Assets/Plugins/Android/ShareSDK/libs/armeabi/libweibosdkcore.so.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2a9e90b3daaa61a4f85fe04277568df0
+timeCreated: 1502247358
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 3
Assets/Plugins/ShareSDK/ShareSDKDevInfo.cs

@@ -75,13 +75,13 @@ namespace cn.sharesdk.unity3d
 		public string SortId = "4";
 		public string AppKey = ShareSDK.SinaAppKey;
 		public string AppSecret = ShareSDK.SinaAppSecrete;
-		public string RedirectUrl = "http://www.sharesdk.cn";
-		public bool ShareByAppClient = false;
+		public string RedirectUrl = "http://www.dashgame.com/";
+        public bool ShareByAppClient = false;
 #elif UNITY_IPHONE
 		public const int type = (int) PlatformType.SinaWeibo;
 		public string app_key = ShareSDK.SinaAppKey;
 		public string app_secret = ShareSDK.SinaAppSecrete;
-		public string redirect_uri = "http://www.sharesdk.cn";
+		public string redirect_uri = "http://www.dashgame.com/";
 		public string auth_type = "both";	//can pass "both","sso",or "web"  
 #endif
     }

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

@@ -52,10 +52,10 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   UiList:
-  - {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: 21300004, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300018, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300000, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300008, guid: c8ea69d236ed4014aa4113d71295370f, 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: 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: 21300006, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300020, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300074, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300002, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300010, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300080, 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: 21300076, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300078, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300042, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300044, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
+  - {fileID: 21300046, guid: c8ea69d236ed4014aa4113d71295370f, type: 3}
   - {fileID: 21300010, guid: b355d692dda42ec4c9f8ebd6d9056bbf, type: 3}
   - {fileID: 21300000, guid: e7d6142574a077b4f8699621861308d3, type: 3}
   - {fileID: 2100000, guid: 9afe516b3d7c64a4f9c1f4f2b9419129, type: 2}

+ 1 - 1
Assets/Resource/Prefab/PrefabUI/CloseItem.prefab

@@ -324,7 +324,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

+ 392 - 20
Assets/Resource/Prefab/PrefabUI/GroupA.prefab

@@ -71,7 +71,7 @@ GameObject:
   - component: {fileID: 222523982740571090}
   - component: {fileID: 114195526475831666}
   m_Layer: 5
-  m_Name: Ea_EndLab
+  m_Name: Ea_DecreaseLab
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -662,6 +662,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1340953954338250
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224402507995036546}
+  - component: {fileID: 222390965980587064}
+  - component: {fileID: 114157204312936564}
+  m_Layer: 5
+  m_Name: Ea_EndLab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1343842509269482
 GameObject:
   m_ObjectHideFlags: 1
@@ -827,6 +844,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1407925660705012
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224117731691766184}
+  - component: {fileID: 222595013254896142}
+  - component: {fileID: 114895664324990626}
+  - component: {fileID: 114491108774020018}
+  m_Layer: 5
+  m_Name: Ea_IncreaseFR
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1415200784515662
 GameObject:
   m_ObjectHideFlags: 1
@@ -1018,6 +1053,24 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1452024009093066
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224980699272630066}
+  - component: {fileID: 222222194947044886}
+  - component: {fileID: 114125106637967006}
+  - component: {fileID: 114844058960744814}
+  m_Layer: 5
+  m_Name: Ea_End
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1453969658883076
 GameObject:
   m_ObjectHideFlags: 1
@@ -1409,6 +1462,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
+--- !u!1 &1604541502126410
+GameObject:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 5
+  m_Component:
+  - component: {fileID: 224781453171961340}
+  - component: {fileID: 222609538307646320}
+  - component: {fileID: 114518600530596020}
+  m_Layer: 5
+  m_Name: Ea_IncreaseLab
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
 --- !u!1 &1622265854342096
 GameObject:
   m_ObjectHideFlags: 1
@@ -1580,7 +1650,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!1 &1689755906866872
 GameObject:
   m_ObjectHideFlags: 1
@@ -2002,7 +2072,7 @@ GameObject:
   - component: {fileID: 114201895709335672}
   - component: {fileID: 114248502498641842}
   m_Layer: 5
-  m_Name: Ea_End
+  m_Name: Ea_DecreaseFR
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2391,7 +2461,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2445,7 +2515,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2610,7 +2680,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2637,7 +2707,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2771,6 +2841,33 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6E05\u7A7A\u5B58\u6863"
+--- !u!114 &114125106637967006
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1452024009093066}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114130115711539788
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2971,6 +3068,39 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u786E\u8BA4"
+--- !u!114 &114157204312936564
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1340953954338250}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7ED3\u675F\u5C0F\u6E38\u620F"
 --- !u!114 &114163576652318194
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3328,7 +3458,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u7ED3\u675F\u5C0F\u6E38\u620F"
+  m_Text: "\u5E27\u7387-1"
 --- !u!114 &114197615394895498
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -3348,7 +3478,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300004, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3375,7 +3505,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3530,7 +3660,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3827,7 +3957,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4367,7 +4497,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4695,6 +4825,47 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114491108774020018
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1407925660705012}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 114895664324990626}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
 --- !u!114 &114500844011901492
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -4851,6 +5022,39 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
       Culture=neutral, PublicKeyToken=null
+--- !u!114 &114518600530596020
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1604541502126410}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 0e86defab91f2fb4189708f6dde11005, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5E27\u7387+1"
 --- !u!114 &114522679597640396
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -4870,7 +5074,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5473,7 +5677,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -6553,6 +6757,47 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
+--- !u!114 &114844058960744814
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1452024009093066}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 114125106637967006}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
+      Culture=neutral, PublicKeyToken=null
 --- !u!114 &114844266151606664
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -6572,7 +6817,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -6659,7 +6904,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -6700,6 +6945,33 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u663E\u793A"
+--- !u!114 &114895664324990626
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1407925660705012}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
+      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
 --- !u!114 &114900503690766950
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -7003,7 +7275,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300004, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -7299,6 +7571,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1029950091330624}
+--- !u!222 &222222194947044886
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1452024009093066}
 --- !u!222 &222228578625470900
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -7407,6 +7685,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1845848723281010}
+--- !u!222 &222390965980587064
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1340953954338250}
 --- !u!222 &222402550279404570
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -7545,6 +7829,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1376149758419292}
+--- !u!222 &222595013254896142
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1407925660705012}
 --- !u!222 &222601391139408954
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -7563,6 +7853,12 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1273281902195670}
+--- !u!222 &222609538307646320
+CanvasRenderer:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1604541502126410}
 --- !u!222 &222615705513963032
 CanvasRenderer:
   m_ObjectHideFlags: 1
@@ -8011,6 +8307,25 @@ RectTransform:
   m_AnchoredPosition: {x: 40, y: -111}
   m_SizeDelta: {x: 80, y: 74}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224117731691766184
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1407925660705012}
+  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_Children:
+  - {fileID: 224781453171961340}
+  m_Father: {fileID: 224445353531514128}
+  m_RootOrder: 9
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 115, y: -314.25}
+  m_SizeDelta: {x: 150, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224123597743654216
 RectTransform:
   m_ObjectHideFlags: 1
@@ -8582,11 +8897,11 @@ RectTransform:
   m_GameObject: {fileID: 1813179996853434}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 224611449969856780}
   m_Father: {fileID: 224445353531514128}
-  m_RootOrder: 8
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -8647,6 +8962,24 @@ RectTransform:
   m_AnchoredPosition: {x: 40, y: -259}
   m_SizeDelta: {x: 80, y: 74}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224402507995036546
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1340953954338250}
+  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_Children: []
+  m_Father: {fileID: 224980699272630066}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224408791352645432
 RectTransform:
   m_ObjectHideFlags: 1
@@ -8857,6 +9190,8 @@ RectTransform:
   - {fileID: 224190381038569366}
   - {fileID: 224352106838077854}
   - {fileID: 224895607993445272}
+  - {fileID: 224980699272630066}
+  - {fileID: 224117731691766184}
   - {fileID: 224365488563075746}
   m_Father: {fileID: 224133419404342274}
   m_RootOrder: 2
@@ -9705,6 +10040,24 @@ RectTransform:
   m_AnchoredPosition: {x: 0.056026, y: 11.01}
   m_SizeDelta: {x: 84.112, y: 18.6}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224781453171961340
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1604541502126410}
+  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_Children: []
+  m_Father: {fileID: 224117731691766184}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224784710209358430
 RectTransform:
   m_ObjectHideFlags: 1
@@ -10254,6 +10607,25 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!224 &224980699272630066
+RectTransform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1452024009093066}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
+  m_Children:
+  - {fileID: 224402507995036546}
+  m_Father: {fileID: 224445353531514128}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 115, y: -314.25}
+  m_SizeDelta: {x: 150, y: 50}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224983814714287144
 RectTransform:
   m_ObjectHideFlags: 1

+ 8 - 8
Assets/Resource/Prefab/PrefabUI/GroupB.prefab

@@ -3897,7 +3897,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4129,7 +4129,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300004, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4865,7 +4865,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300012, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5045,7 +5045,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5407,7 +5407,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -7284,7 +7284,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -7657,7 +7657,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -8129,7 +8129,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300012, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

+ 41 - 41
Assets/Resource/Prefab/PrefabUI/GroupC.prefab

@@ -843,7 +843,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300004, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -903,7 +903,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300004, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1612,7 +1612,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300012, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1679,7 +1679,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: 14decf5fdd820524eb3435822116d326, type: 3}
+  m_Sprite: {fileID: 21300004, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -1922,7 +1922,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300012, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2288,7 +2288,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300000, guid: 4000c78c117d00d41900cdd8f4b505f4, type: 3}
+  m_Sprite: {fileID: 21300010, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5276,16 +5276,16 @@ RectTransform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1974911077881048}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: -1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 224389617837171238}
-  m_RootOrder: 1
+  m_Father: {fileID: 224246231728578908}
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 114.975, y: 0}
-  m_SizeDelta: {x: -230.05, y: 0}
+  m_AnchoredPosition: {x: -25.025032, y: 101}
+  m_SizeDelta: {x: -511.05, y: -343}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224171954475290034
 RectTransform:
@@ -5296,8 +5296,7 @@ RectTransform:
   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_Children:
-  - {fileID: 224759289972707976}
+  m_Children: []
   m_Father: {fileID: 224246231728578908}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5354,10 +5353,14 @@ RectTransform:
   m_Children:
   - {fileID: 224277868790083728}
   - {fileID: 224171954475290034}
-  - {fileID: 224336385889475414}
   - {fileID: 224922880990947726}
   - {fileID: 224987185824735694}
   - {fileID: 224389617837171238}
+  - {fileID: 224759289972707976}
+  - {fileID: 224336385889475414}
+  - {fileID: 224250459338295236}
+  - {fileID: 224758475223130984}
+  - {fileID: 224133569805723366}
   m_Father: {fileID: 224542483638238348}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5372,17 +5375,17 @@ RectTransform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1768479316832410}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 224337794624833340}
-  m_RootOrder: 0
+  m_Father: {fileID: 224246231728578908}
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -10.5}
-  m_SizeDelta: {x: 0, y: -21.1}
+  m_AnchoredPosition: {x: 279.39996, y: 80.128006}
+  m_SizeDelta: {x: -558.8, y: -359.357}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224256965718028302
 RectTransform:
@@ -5484,11 +5487,11 @@ RectTransform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1530102579648552}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: -1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 224246231728578908}
-  m_RootOrder: 2
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -5504,8 +5507,7 @@ RectTransform:
   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_Children:
-  - {fileID: 224250459338295236}
+  m_Children: []
   m_Father: {fileID: 224922880990947726}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5541,11 +5543,9 @@ RectTransform:
   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_Children:
-  - {fileID: 224758475223130984}
-  - {fileID: 224133569805723366}
+  m_Children: []
   m_Father: {fileID: 224246231728578908}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
@@ -5755,16 +5755,16 @@ RectTransform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1467412517094164}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: -1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 224389617837171238}
-  m_RootOrder: 0
+  m_Father: {fileID: 224246231728578908}
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -80, y: 0}
-  m_SizeDelta: {x: -160, y: 0}
+  m_AnchoredPosition: {x: -220, y: 101}
+  m_SizeDelta: {x: -441, y: -343}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224759289972707976
 RectTransform:
@@ -5772,17 +5772,17 @@ RectTransform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1359675036067360}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 224171954475290034}
-  m_RootOrder: 0
+  m_Father: {fileID: 224246231728578908}
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: -3.9999986, y: -191}
+  m_SizeDelta: {x: -424, y: -316}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!224 &224768102107365078
 RectTransform:
@@ -5874,7 +5874,7 @@ RectTransform:
   - {fileID: 224068046384671572}
   - {fileID: 224068096985396674}
   m_Father: {fileID: 224246231728578908}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -5931,7 +5931,7 @@ RectTransform:
   - {fileID: 224521926426990304}
   - {fileID: 224941038813732964}
   m_Father: {fileID: 224246231728578908}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}

+ 8 - 8
Assets/Resource/Prefab/PrefabUI/GroupD.prefab

@@ -1688,7 +1688,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2251,7 +2251,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2438,7 +2438,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2674,7 +2674,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3399,7 +3399,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -3667,7 +3667,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4018,7 +4018,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -4225,7 +4225,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

+ 2 - 2
Assets/Resource/Prefab/PrefabUI/GroupE.prefab

@@ -1579,7 +1579,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300008, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300012, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -2795,7 +2795,7 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_Sprite: {fileID: 21300004, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
+  m_Sprite: {fileID: 21300006, guid: b4753f945f61e8243ba014be4a705de7, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

BIN
Assets/Resource/Sprite/Garden/FlowerAtlas.png


+ 204 - 78
Assets/Resource/Sprite/Garden/FlowerAtlas1.png.meta → Assets/Resource/Sprite/Garden/FlowerAtlas.png.meta

@@ -1,36 +1,45 @@
 fileFormatVersion: 2
-guid: 9c73f3cb846e0d74ea3440644afa75b3
-timeCreated: 1502592283
+guid: b9c1c4d92b62e3849a6503ef6531ca4a
+timeCreated: 1503459911
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
     21300000: Flower19
     21300002: Flower20
     21300004: Flower23
-    21300006: Flower27
-    21300008: Flower13
-    21300010: Flower21
-    21300012: Flower22
-    21300014: Flower14
-    21300016: Flower3
-    21300018: Flower5
-    21300020: Flower24
-    21300022: Flower8
-    21300024: Flower15
-    21300026: Flower10
-    21300028: Flower9
-    21300030: Flower16
-    21300032: Flower25
-    21300034: Flower18
-    21300036: Flower6
-    21300038: Flower4
-    21300040: Flower17
-    21300042: Flower7
-    21300044: Flower26
-    21300046: Flower12
-    21300048: Flower2
-    21300050: Flower11
-    21300052: Flower1
+    21300006: Flower31
+    21300008: Flower30
+    21300010: Flower27
+    21300012: Flower34
+    21300014: Flower32
+    21300016: Flower33
+    21300018: Flower13
+    21300020: Flower21
+    21300022: Flower22
+    21300024: Flower14
+    21300026: Flower3
+    21300028: Flower5
+    21300030: Flower24
+    21300032: Flower8
+    21300034: Flower29
+    21300036: Flower28
+    21300038: Flower15
+    21300040: Flower10
+    21300042: Flower9
+    21300044: Flower35
+    21300046: Flower36
+    21300048: Flower16
+    21300050: Flower25
+    21300052: Flower18
+    21300054: Flower6
+    21300056: Flower4
+    21300058: Flower17
+    21300060: Flower7
+    21300062: Flower26
+    21300064: Flower12
+    21300066: Flower2
+    21300068: Flower1
+    21300070: Flower11
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -78,7 +87,7 @@ TextureImporter:
   textureFormatSet: 0
   platformSettings:
   - buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 4096
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -86,7 +95,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: Standalone
-    maxTextureSize: 2048
+    maxTextureSize: 4096
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -94,7 +103,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: iPhone
-    maxTextureSize: 2048
+    maxTextureSize: 4096
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -102,7 +111,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: Android
-    maxTextureSize: 2048
+    maxTextureSize: 4096
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -152,11 +161,37 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: Flower27
+      name: Flower31
       rect:
         serializedVersion: 2
         x: 1
         y: 1030
+        width: 407
+        height: 369
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower30
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 1401
+        width: 407
+        height: 369
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower27
+      rect:
+        serializedVersion: 2
+        x: 427
+        y: 1
         width: 385
         height: 389
       alignment: 9
@@ -165,11 +200,50 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: Flower34
+      rect:
+        serializedVersion: 2
+        x: 427
+        y: 392
+        width: 385
+        height: 357
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower32
+      rect:
+        serializedVersion: 2
+        x: 427
+        y: 751
+        width: 385
+        height: 357
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower33
+      rect:
+        serializedVersion: 2
+        x: 427
+        y: 1110
+        width: 385
+        height: 357
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: Flower13
       rect:
         serializedVersion: 2
-        x: 1
-        y: 1421
+        x: 427
+        y: 1469
         width: 377
         height: 357
       alignment: 9
@@ -181,7 +255,7 @@ TextureImporter:
       name: Flower21
       rect:
         serializedVersion: 2
-        x: 427
+        x: 814
         y: 1
         width: 370
         height: 361
@@ -194,7 +268,7 @@ TextureImporter:
       name: Flower22
       rect:
         serializedVersion: 2
-        x: 427
+        x: 814
         y: 364
         width: 370
         height: 361
@@ -207,7 +281,7 @@ TextureImporter:
       name: Flower14
       rect:
         serializedVersion: 2
-        x: 427
+        x: 814
         y: 727
         width: 370
         height: 336
@@ -220,7 +294,7 @@ TextureImporter:
       name: Flower3
       rect:
         serializedVersion: 2
-        x: 427
+        x: 814
         y: 1065
         width: 368
         height: 376
@@ -233,7 +307,7 @@ TextureImporter:
       name: Flower5
       rect:
         serializedVersion: 2
-        x: 427
+        x: 814
         y: 1443
         width: 363
         height: 367
@@ -246,7 +320,7 @@ TextureImporter:
       name: Flower24
       rect:
         serializedVersion: 2
-        x: 799
+        x: 1186
         y: 1
         width: 361
         height: 359
@@ -259,7 +333,7 @@ TextureImporter:
       name: Flower8
       rect:
         serializedVersion: 2
-        x: 799
+        x: 1186
         y: 362
         width: 361
         height: 359
@@ -269,11 +343,37 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: Flower15
+      name: Flower29
       rect:
         serializedVersion: 2
-        x: 799
+        x: 1186
         y: 723
+        width: 360
+        height: 367
+      alignment: 9
+      pivot: {x: 0.5555556, y: 0.50272477}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower28
+      rect:
+        serializedVersion: 2
+        x: 1186
+        y: 1092
+        width: 360
+        height: 367
+      alignment: 9
+      pivot: {x: 0.55, y: 0.50272477}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower15
+      rect:
+        serializedVersion: 2
+        x: 1186
+        y: 1461
         width: 358
         height: 339
       alignment: 9
@@ -285,8 +385,8 @@ TextureImporter:
       name: Flower10
       rect:
         serializedVersion: 2
-        x: 799
-        y: 1064
+        x: 1549
+        y: 1
         width: 348
         height: 348
       alignment: 9
@@ -298,8 +398,8 @@ TextureImporter:
       name: Flower9
       rect:
         serializedVersion: 2
-        x: 799
-        y: 1414
+        x: 1549
+        y: 351
         width: 346
         height: 334
       alignment: 9
@@ -308,11 +408,37 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: Flower35
+      rect:
+        serializedVersion: 2
+        x: 1549
+        y: 687
+        width: 345
+        height: 351
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: Flower36
+      rect:
+        serializedVersion: 2
+        x: 1549
+        y: 1040
+        width: 345
+        height: 351
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: Flower16
       rect:
         serializedVersion: 2
-        x: 1162
-        y: 1
+        x: 1549
+        y: 1393
         width: 342
         height: 350
       alignment: 9
@@ -324,8 +450,8 @@ TextureImporter:
       name: Flower25
       rect:
         serializedVersion: 2
-        x: 1162
-        y: 353
+        x: 1899
+        y: 1
         width: 340
         height: 352
       alignment: 9
@@ -337,8 +463,8 @@ TextureImporter:
       name: Flower18
       rect:
         serializedVersion: 2
-        x: 1162
-        y: 707
+        x: 1899
+        y: 355
         width: 336
         height: 375
       alignment: 9
@@ -350,8 +476,8 @@ TextureImporter:
       name: Flower6
       rect:
         serializedVersion: 2
-        x: 1162
-        y: 1084
+        x: 1899
+        y: 732
         width: 336
         height: 376
       alignment: 9
@@ -363,8 +489,8 @@ TextureImporter:
       name: Flower4
       rect:
         serializedVersion: 2
-        x: 1162
-        y: 1462
+        x: 1899
+        y: 1110
         width: 329
         height: 393
       alignment: 9
@@ -376,8 +502,8 @@ TextureImporter:
       name: Flower17
       rect:
         serializedVersion: 2
-        x: 1506
-        y: 1
+        x: 1899
+        y: 1505
         width: 329
         height: 393
       alignment: 9
@@ -389,8 +515,8 @@ TextureImporter:
       name: Flower7
       rect:
         serializedVersion: 2
-        x: 1506
-        y: 396
+        x: 2241
+        y: 1
         width: 320
         height: 400
       alignment: 9
@@ -402,8 +528,8 @@ TextureImporter:
       name: Flower26
       rect:
         serializedVersion: 2
-        x: 1506
-        y: 798
+        x: 2241
+        y: 403
         width: 308
         height: 386
       alignment: 9
@@ -415,8 +541,8 @@ TextureImporter:
       name: Flower12
       rect:
         serializedVersion: 2
-        x: 1506
-        y: 1186
+        x: 2241
+        y: 791
         width: 308
         height: 386
       alignment: 9
@@ -428,8 +554,8 @@ TextureImporter:
       name: Flower2
       rect:
         serializedVersion: 2
-        x: 1506
-        y: 1574
+        x: 2241
+        y: 1179
         width: 256
         height: 365
       alignment: 9
@@ -438,28 +564,28 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: Flower11
+      name: Flower1
       rect:
         serializedVersion: 2
-        x: 1837
-        y: 1
-        width: 194
-        height: 356
+        x: 2241
+        y: 1546
+        width: 241
+        height: 365
       alignment: 9
-      pivot: {x: 0.5, y: 0.5126405}
+      pivot: {x: 0.58298755, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: Flower1
+      name: Flower11
       rect:
         serializedVersion: 2
-        x: 1806
-        y: 1682
-        width: 241
-        height: 365
+        x: 2563
+        y: 1
+        width: 194
+        height: 356
       alignment: 9
-      pivot: {x: 0.58298755, y: 0.5}
+      pivot: {x: 0.5, y: 0.5126405}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       tessellationDetail: -1

BIN
Assets/Resource/Sprite/Garden/FlowerAtlas1.png


BIN
Assets/Resource/Sprite/Garden/FlowerAtlas2.png


+ 0 - 218
Assets/Resource/Sprite/Garden/FlowerAtlas2.png.meta

@@ -1,218 +0,0 @@
-fileFormatVersion: 2
-guid: e3d95dbc6a535444c898a18f384300ef
-timeCreated: 1502592305
-licenseType: Pro
-TextureImporter:
-  fileIDToRecycleName:
-    21300000: Flower31
-    21300002: Flower30
-    21300004: Flower34
-    21300006: Flower32
-    21300008: Flower33
-    21300010: Flower29
-    21300012: Flower28
-    21300014: Flower35
-    21300016: Flower36
-  serializedVersion: 4
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 1
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    filterMode: -1
-    aniso: -1
-    mipBias: -1
-    wrapMode: 1
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 2
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spritePixelsToUnits: 100
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  platformSettings:
-  - buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  - buildTarget: Standalone
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  - buildTarget: iPhone
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites:
-    - serializedVersion: 2
-      name: Flower31
-      rect:
-        serializedVersion: 2
-        x: 1
-        y: 1
-        width: 407
-        height: 369
-      alignment: 9
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: Flower30
-      rect:
-        serializedVersion: 2
-        x: 1
-        y: 372
-        width: 407
-        height: 369
-      alignment: 9
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: Flower34
-      rect:
-        serializedVersion: 2
-        x: 410
-        y: 1
-        width: 385
-        height: 357
-      alignment: 9
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: Flower32
-      rect:
-        serializedVersion: 2
-        x: 410
-        y: 360
-        width: 385
-        height: 357
-      alignment: 9
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: Flower33
-      rect:
-        serializedVersion: 2
-        x: 797
-        y: 1
-        width: 385
-        height: 357
-      alignment: 9
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: Flower29
-      rect:
-        serializedVersion: 2
-        x: 797
-        y: 360
-        width: 360
-        height: 367
-      alignment: 9
-      pivot: {x: 0.5555556, y: 0.50272477}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: Flower28
-      rect:
-        serializedVersion: 2
-        x: 1184
-        y: 1
-        width: 360
-        height: 367
-      alignment: 9
-      pivot: {x: 0.55, y: 0.50272477}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: Flower35
-      rect:
-        serializedVersion: 2
-        x: 1184
-        y: 370
-        width: 345
-        height: 351
-      alignment: 9
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    - serializedVersion: 2
-      name: Flower36
-      rect:
-        serializedVersion: 2
-        x: 1546
-        y: 1
-        width: 345
-        height: 351
-      alignment: 9
-      pivot: {x: 0.5, y: 0.5}
-      border: {x: 0, y: 0, z: 0, w: 0}
-      outline: []
-      tessellationDetail: -1
-    outline: []
-  spritePackingTag: 
-  userData: 
-  assetBundleName: atlas2
-  assetBundleVariant: 

BIN
Assets/Resource/Sprite/SpriteUI/PanelAtlas1.png


+ 35 - 31
Assets/Resource/Sprite/SpriteUI/PanelAtlas1.png.meta

@@ -1,14 +1,16 @@
 fileFormatVersion: 2
 guid: b4753f945f61e8243ba014be4a705de7
-timeCreated: 1502592291
+timeCreated: 1503459396
 licenseType: Pro
 TextureImporter:
   fileIDToRecycleName:
     21300000: "\u901A\u7528\u754C\u9762"
     21300002: "\u9886\u53D6UI\u5730\u677F"
-    21300004: "\u5168\u90E8\u6536\u56DE\u6309\u94AE"
-    21300006: "\u9886\u53D6\u6309\u94AE"
-    21300008: "\u5173\u95ED\u6309\u94AE"
+    21300004: "\u6570\u636E"
+    21300006: "\u5168\u90E8\u6536\u56DE\u6309\u94AE"
+    21300008: "\u9886\u53D6\u6309\u94AE"
+    21300010: "\u5927\u5E95\u677F"
+    21300012: "\u5173\u95ED\u6309\u94AE"
   serializedVersion: 4
   mipmaps:
     mipMapMode: 0
@@ -63,30 +65,6 @@ TextureImporter:
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
-  - buildTarget: Standalone
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  - buildTarget: iPhone
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-  - buildTarget: Android
-    maxTextureSize: 2048
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
   spriteSheet:
     serializedVersion: 2
     sprites:
@@ -117,11 +95,24 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
-      name: "\u5168\u90E8\u6536\u56DE\u6309\u94AE"
+      name: "\u6570\u636E"
       rect:
         serializedVersion: 2
         x: 1
         y: 1650
+        width: 684
+        height: 86
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
+      name: "\u5168\u90E8\u6536\u56DE\u6309\u94AE"
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 1738
         width: 412
         height: 137
       alignment: 9
@@ -134,7 +125,7 @@ TextureImporter:
       rect:
         serializedVersion: 2
         x: 1
-        y: 1789
+        y: 1877
         width: 412
         height: 136
       alignment: 9
@@ -143,11 +134,24 @@ TextureImporter:
       outline: []
       tessellationDetail: -1
     - serializedVersion: 2
+      name: "\u5927\u5E95\u677F"
+      rect:
+        serializedVersion: 2
+        x: 415
+        y: 1738
+        width: 256
+        height: 84
+      alignment: 9
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      tessellationDetail: -1
+    - serializedVersion: 2
       name: "\u5173\u95ED\u6309\u94AE"
       rect:
         serializedVersion: 2
         x: 415
-        y: 1650
+        y: 1824
         width: 161
         height: 147
       alignment: 9

+ 4 - 4
Assets/Resource/Sprite/SpriteUI/大底板.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: 4000c78c117d00d41900cdd8f4b505f4
-timeCreated: 1489039905
+timeCreated: 1503459031
 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
@@ -51,7 +51,7 @@ TextureImporter:
   textureFormatSet: 0
   platformSettings:
   - buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 256
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50
@@ -59,7 +59,7 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
   - buildTarget: Standalone
-    maxTextureSize: 2048
+    maxTextureSize: 256
     textureFormat: -1
     textureCompression: 1
     compressionQuality: 50

+ 2 - 2
Assets/Resource/Sprite/SpriteUI/放花框子.png.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 guid: a0be8c01c92ec4a4d9bf5da66205d15d
-timeCreated: 1502433083
+timeCreated: 1503459031
 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/Script/Manage/Initializer.cs

@@ -39,7 +39,7 @@ public class Initializer : MonoBehaviour
             DataEyeGA.Init("ADE884FAAF61A2CB45B02431A70932B8", DataEyeGA.PlatformType.WP, "Official", "Windows");
         }
 
-        Application.targetFrameRate = 45;
+        Application.targetFrameRate = 50;
         
         DontDestroyOnLoad(gameObject);
 

+ 1 - 1
Assets/Script/Manage/ManaDebug.cs

@@ -42,7 +42,7 @@ public class ManaDebug : MonoBehaviour
 
         if (Timer >= 1)
         {
-            Log("FrameRate " + Counter);
+            Log($"当前帧率  {Counter}    目标帧率 {Application.targetFrameRate}");
 
             Timer = 0;
             Counter = 0;

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

@@ -1233,6 +1233,33 @@ public class ManaUI : Regist
 
         #endregion
 
+
+        #region Ea_IncreaseFR
+
+        ManaReso.AddButtonEvent
+        (
+            "Ea_IncreaseFR",
+            () =>
+            {
+                Application.targetFrameRate += 1;
+            }
+        );
+
+        #endregion
+
+        #region Ea_DecreaseFR
+
+        ManaReso.AddButtonEvent
+        (
+            "Ea_DecreaseFR",
+            () =>
+            {
+                Application.targetFrameRate -= 1;
+            }
+        );
+
+        #endregion
+
         #endregion
 
         #region F

+ 2 - 0
Garden3.csproj.DotSettings

@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/CSharpLanguageProject/LanguageLevel/@EntryValue">CSharp60</s:String></wpf:ResourceDictionary>

+ 1 - 1
ProjectSettings/ProjectSettings.asset

@@ -51,7 +51,7 @@ PlayerSettings:
   m_StereoRenderingPath: 0
   m_ActiveColorSpace: 0
   m_MTRendering: 1
-  m_MobileMTRendering: 1
+  m_MobileMTRendering: 0
   m_StackTraceTypes: 010000000100000001000000010000000100000001000000
   iosShowActivityIndicatorOnLoading: -1
   androidShowActivityIndicatorOnLoading: -1

+ 1 - 1
ProjectSettings/QualitySettings.asset

@@ -77,7 +77,7 @@ QualitySettings:
     softVegetation: 0
     realtimeReflectionProbes: 0
     billboardsFaceCameraPosition: 0
-    vSyncCount: 1
+    vSyncCount: 0
     lodBias: 0.7
     maximumLODLevel: 0
     particleRaycastBudget: 64

+ 7 - 1
ToDoList.txt

@@ -15,4 +15,10 @@ QQ
 
 先开启Service再打包
 
-更新版本号
+更新版本号
+
+
+图集
+{
+  UseSelectedPath自动设置PackName
+}