Commit 666e1005 authored by Li Mingzhe's avatar Li Mingzhe

feat: 大小

parents a6b30496 7ef11fae
<<<<<<< HEAD
2020/09/07-14:48:47.134 6f03 Reusing MANIFEST /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/AutofillStrikeDatabase/MANIFEST-000001 2020/09/07-14:48:47.134 6f03 Reusing MANIFEST /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/AutofillStrikeDatabase/MANIFEST-000001
2020/09/07-14:48:47.134 6f03 Recovering log #3 2020/09/07-14:48:47.134 6f03 Recovering log #3
2020/09/07-14:48:47.134 6f03 Reusing old log /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/AutofillStrikeDatabase/000003.log 2020/09/07-14:48:47.134 6f03 Reusing old log /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/AutofillStrikeDatabase/000003.log
=======
2020/09/04-16:35:09.876 6b03 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/AutofillStrikeDatabase/MANIFEST-000001
2020/09/04-16:35:09.876 6b03 Recovering log #3
2020/09/04-16:35:09.876 6b03 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/AutofillStrikeDatabase/000003.log
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
<<<<<<< HEAD
2020/09/04-16:35:09.876 6b03 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/AutofillStrikeDatabase/MANIFEST-000001 2020/09/04-16:35:09.876 6b03 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/AutofillStrikeDatabase/MANIFEST-000001
2020/09/04-16:35:09.876 6b03 Recovering log #3 2020/09/04-16:35:09.876 6b03 Recovering log #3
2020/09/04-16:35:09.876 6b03 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/AutofillStrikeDatabase/000003.log 2020/09/04-16:35:09.876 6b03 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/AutofillStrikeDatabase/000003.log
=======
2020/09/04-11:02:47.698 6d03 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/AutofillStrikeDatabase/MANIFEST-000001
2020/09/04-11:02:47.699 6d03 Recovering log #3
2020/09/04-11:02:47.699 6d03 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/AutofillStrikeDatabase/000003.log
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
<<<<<<< HEAD
2020/09/07-14:48:47.130 6f03 Reusing MANIFEST /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/BudgetDatabase/MANIFEST-000001 2020/09/07-14:48:47.130 6f03 Reusing MANIFEST /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/BudgetDatabase/MANIFEST-000001
2020/09/07-14:48:47.131 6f03 Recovering log #3 2020/09/07-14:48:47.131 6f03 Recovering log #3
2020/09/07-14:48:47.131 6f03 Reusing old log /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/BudgetDatabase/000003.log 2020/09/07-14:48:47.131 6f03 Reusing old log /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/BudgetDatabase/000003.log
=======
2020/09/04-16:35:09.874 6b03 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/BudgetDatabase/MANIFEST-000001
2020/09/04-16:35:09.874 6b03 Recovering log #3
2020/09/04-16:35:09.874 6b03 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/BudgetDatabase/000003.log
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
<<<<<<< HEAD
2020/09/04-16:35:09.874 6b03 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/BudgetDatabase/MANIFEST-000001 2020/09/04-16:35:09.874 6b03 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/BudgetDatabase/MANIFEST-000001
2020/09/04-16:35:09.874 6b03 Recovering log #3 2020/09/04-16:35:09.874 6b03 Recovering log #3
2020/09/04-16:35:09.874 6b03 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/BudgetDatabase/000003.log 2020/09/04-16:35:09.874 6b03 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/BudgetDatabase/000003.log
=======
2020/09/04-11:02:47.691 6d03 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/BudgetDatabase/MANIFEST-000001
2020/09/04-11:02:47.692 6d03 Recovering log #3
2020/09/04-11:02:47.697 6d03 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/BudgetDatabase/000003.log
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
<<<<<<< HEAD
2020/09/07-14:48:42.106 14a07 Reusing MANIFEST /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Extension State/MANIFEST-000001 2020/09/07-14:48:42.106 14a07 Reusing MANIFEST /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Extension State/MANIFEST-000001
2020/09/07-14:48:42.107 14a07 Recovering log #3 2020/09/07-14:48:42.107 14a07 Recovering log #3
2020/09/07-14:48:42.107 14a07 Reusing old log /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Extension State/000003.log 2020/09/07-14:48:42.107 14a07 Reusing old log /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Extension State/000003.log
=======
2020/09/04-16:35:07.854 10d03 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Extension State/MANIFEST-000001
2020/09/04-16:35:07.854 10d03 Recovering log #3
2020/09/04-16:35:07.854 10d03 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Extension State/000003.log
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
<<<<<<< HEAD
2020/09/04-16:35:07.854 10d03 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Extension State/MANIFEST-000001 2020/09/04-16:35:07.854 10d03 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Extension State/MANIFEST-000001
2020/09/04-16:35:07.854 10d03 Recovering log #3 2020/09/04-16:35:07.854 10d03 Recovering log #3
2020/09/04-16:35:07.854 10d03 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Extension State/000003.log 2020/09/04-16:35:07.854 10d03 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Extension State/000003.log
=======
2020/09/04-11:02:39.673 10103 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Extension State/MANIFEST-000001
2020/09/04-11:02:39.673 10103 Recovering log #3
2020/09/04-11:02:39.673 10103 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Extension State/000003.log
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
<<<<<<< HEAD
2020/09/07-14:48:47.123 6f03 Reusing MANIFEST /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Feature Engagement Tracker/AvailabilityDB/MANIFEST-000001 2020/09/07-14:48:47.123 6f03 Reusing MANIFEST /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Feature Engagement Tracker/AvailabilityDB/MANIFEST-000001
2020/09/07-14:48:47.123 6f03 Recovering log #3 2020/09/07-14:48:47.123 6f03 Recovering log #3
2020/09/07-14:48:47.129 6f03 Reusing old log /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Feature Engagement Tracker/AvailabilityDB/000003.log 2020/09/07-14:48:47.129 6f03 Reusing old log /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Feature Engagement Tracker/AvailabilityDB/000003.log
=======
2020/09/04-16:35:09.871 6b03 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Feature Engagement Tracker/AvailabilityDB/MANIFEST-000001
2020/09/04-16:35:09.871 6b03 Recovering log #3
2020/09/04-16:35:09.871 6b03 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Feature Engagement Tracker/AvailabilityDB/000003.log
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
<<<<<<< HEAD
2020/09/04-16:35:09.871 6b03 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Feature Engagement Tracker/AvailabilityDB/MANIFEST-000001 2020/09/04-16:35:09.871 6b03 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Feature Engagement Tracker/AvailabilityDB/MANIFEST-000001
2020/09/04-16:35:09.871 6b03 Recovering log #3 2020/09/04-16:35:09.871 6b03 Recovering log #3
2020/09/04-16:35:09.871 6b03 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Feature Engagement Tracker/AvailabilityDB/000003.log 2020/09/04-16:35:09.871 6b03 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Feature Engagement Tracker/AvailabilityDB/000003.log
=======
2020/09/04-11:02:47.689 6d03 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Feature Engagement Tracker/AvailabilityDB/MANIFEST-000001
2020/09/04-11:02:47.690 6d03 Recovering log #3
2020/09/04-11:02:47.690 6d03 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Feature Engagement Tracker/AvailabilityDB/000003.log
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
<<<<<<< HEAD
2020/09/07-14:48:47.121 6f03 Reusing MANIFEST /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Feature Engagement Tracker/EventDB/MANIFEST-000001 2020/09/07-14:48:47.121 6f03 Reusing MANIFEST /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Feature Engagement Tracker/EventDB/MANIFEST-000001
2020/09/07-14:48:47.122 6f03 Recovering log #3 2020/09/07-14:48:47.122 6f03 Recovering log #3
2020/09/07-14:48:47.122 6f03 Reusing old log /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Feature Engagement Tracker/EventDB/000003.log 2020/09/07-14:48:47.122 6f03 Reusing old log /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Feature Engagement Tracker/EventDB/000003.log
=======
2020/09/04-16:35:09.869 6b03 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Feature Engagement Tracker/EventDB/MANIFEST-000001
2020/09/04-16:35:09.869 6b03 Recovering log #3
2020/09/04-16:35:09.869 6b03 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Feature Engagement Tracker/EventDB/000003.log
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
<<<<<<< HEAD
2020/09/04-16:35:09.869 6b03 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Feature Engagement Tracker/EventDB/MANIFEST-000001 2020/09/04-16:35:09.869 6b03 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Feature Engagement Tracker/EventDB/MANIFEST-000001
2020/09/04-16:35:09.869 6b03 Recovering log #3 2020/09/04-16:35:09.869 6b03 Recovering log #3
2020/09/04-16:35:09.869 6b03 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Feature Engagement Tracker/EventDB/000003.log 2020/09/04-16:35:09.869 6b03 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Feature Engagement Tracker/EventDB/000003.log
=======
2020/09/04-11:02:47.688 6d03 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Feature Engagement Tracker/EventDB/MANIFEST-000001
2020/09/04-11:02:47.688 6d03 Recovering log #3
2020/09/04-11:02:47.688 6d03 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Feature Engagement Tracker/EventDB/000003.log
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
<<<<<<< HEAD
2020/09/07-14:48:40.581 14a07 Reusing MANIFEST /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Local Storage/leveldb/MANIFEST-000001 2020/09/07-14:48:40.581 14a07 Reusing MANIFEST /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Local Storage/leveldb/MANIFEST-000001
2020/09/07-14:48:40.582 14a07 Recovering log #8 2020/09/07-14:48:40.582 14a07 Recovering log #8
2020/09/07-14:48:40.582 14a07 Reusing old log /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Local Storage/leveldb/000008.log 2020/09/07-14:48:40.582 14a07 Reusing old log /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Local Storage/leveldb/000008.log
=======
2020/09/04-16:35:06.409 14a03 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Local Storage/leveldb/MANIFEST-000001
2020/09/04-16:35:06.409 14a03 Recovering log #8
2020/09/04-16:35:06.409 14a03 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Local Storage/leveldb/000008.log
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
<<<<<<< HEAD
2020/09/04-16:35:06.409 14a03 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Local Storage/leveldb/MANIFEST-000001 2020/09/04-16:35:06.409 14a03 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Local Storage/leveldb/MANIFEST-000001
2020/09/04-16:35:06.409 14a03 Recovering log #8 2020/09/04-16:35:06.409 14a03 Recovering log #8
2020/09/04-16:35:06.409 14a03 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Local Storage/leveldb/000008.log 2020/09/04-16:35:06.409 14a03 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Local Storage/leveldb/000008.log
=======
2020/09/04-11:02:38.240 12503 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Local Storage/leveldb/MANIFEST-000001
2020/09/04-11:02:38.240 12503 Recovering log #8
2020/09/04-11:02:38.240 12503 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Local Storage/leveldb/000008.log
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
<<<<<<< HEAD
2020/09/07-14:48:41.040 14a07 Reusing MANIFEST /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Platform Notifications/MANIFEST-000001 2020/09/07-14:48:41.040 14a07 Reusing MANIFEST /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Platform Notifications/MANIFEST-000001
2020/09/07-14:48:41.040 14a07 Recovering log #3 2020/09/07-14:48:41.040 14a07 Recovering log #3
2020/09/07-14:48:41.040 14a07 Reusing old log /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Platform Notifications/000003.log 2020/09/07-14:48:41.040 14a07 Reusing old log /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Platform Notifications/000003.log
=======
2020/09/04-16:35:06.796 1280b Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Platform Notifications/MANIFEST-000001
2020/09/04-16:35:06.796 1280b Recovering log #3
2020/09/04-16:35:06.796 1280b Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Platform Notifications/000003.log
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
<<<<<<< HEAD
2020/09/04-16:35:06.796 1280b Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Platform Notifications/MANIFEST-000001 2020/09/04-16:35:06.796 1280b Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Platform Notifications/MANIFEST-000001
2020/09/04-16:35:06.796 1280b Recovering log #3 2020/09/04-16:35:06.796 1280b Recovering log #3
2020/09/04-16:35:06.796 1280b Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Platform Notifications/000003.log 2020/09/04-16:35:06.796 1280b Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Platform Notifications/000003.log
=======
2020/09/04-11:02:38.613 10103 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Platform Notifications/MANIFEST-000001
2020/09/04-11:02:38.614 10103 Recovering log #3
2020/09/04-11:02:38.614 10103 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Platform Notifications/000003.log
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
This source diff could not be displayed because it is too large. You can view the blob instead.
<<<<<<< HEAD
2020/09/07-14:48:40.714 10f03 Reusing MANIFEST /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Session Storage/MANIFEST-000001 2020/09/07-14:48:40.714 10f03 Reusing MANIFEST /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Session Storage/MANIFEST-000001
2020/09/07-14:48:40.715 10f03 Recovering log #3 2020/09/07-14:48:40.715 10f03 Recovering log #3
2020/09/07-14:48:40.716 10f03 Reusing old log /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Session Storage/000003.log 2020/09/07-14:48:40.716 10f03 Reusing old log /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Session Storage/000003.log
=======
2020/09/04-16:35:06.563 1280b Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Session Storage/MANIFEST-000001
2020/09/04-16:35:06.564 1280b Recovering log #3
2020/09/04-16:35:06.564 1280b Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Session Storage/000003.log
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
<<<<<<< HEAD
2020/09/04-16:35:06.563 1280b Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Session Storage/MANIFEST-000001 2020/09/04-16:35:06.563 1280b Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Session Storage/MANIFEST-000001
2020/09/04-16:35:06.564 1280b Recovering log #3 2020/09/04-16:35:06.564 1280b Recovering log #3
2020/09/04-16:35:06.564 1280b Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Session Storage/000003.log 2020/09/04-16:35:06.564 1280b Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Session Storage/000003.log
=======
2020/09/04-11:02:38.386 6903 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Session Storage/MANIFEST-000001
2020/09/04-11:02:38.387 6903 Recovering log #3
2020/09/04-11:02:38.387 6903 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Session Storage/000003.log
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
<<<<<<< HEAD
2020/09/07-14:48:40.576 b303 Reusing MANIFEST /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Site Characteristics Database/MANIFEST-000001 2020/09/07-14:48:40.576 b303 Reusing MANIFEST /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Site Characteristics Database/MANIFEST-000001
2020/09/07-14:48:40.577 b303 Recovering log #3 2020/09/07-14:48:40.577 b303 Recovering log #3
2020/09/07-14:48:40.577 b303 Reusing old log /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Site Characteristics Database/000003.log 2020/09/07-14:48:40.577 b303 Reusing old log /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Site Characteristics Database/000003.log
=======
2020/09/04-16:35:06.403 b403 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Site Characteristics Database/MANIFEST-000001
2020/09/04-16:35:06.404 b403 Recovering log #3
2020/09/04-16:35:06.404 b403 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Site Characteristics Database/000003.log
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
<<<<<<< HEAD
2020/09/04-16:35:06.403 b403 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Site Characteristics Database/MANIFEST-000001 2020/09/04-16:35:06.403 b403 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Site Characteristics Database/MANIFEST-000001
2020/09/04-16:35:06.404 b403 Recovering log #3 2020/09/04-16:35:06.404 b403 Recovering log #3
2020/09/04-16:35:06.404 b403 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Site Characteristics Database/000003.log 2020/09/04-16:35:06.404 b403 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Site Characteristics Database/000003.log
=======
2020/09/04-11:02:38.235 b203 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Site Characteristics Database/MANIFEST-000001
2020/09/04-11:02:38.236 b203 Recovering log #3
2020/09/04-11:02:38.236 b203 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Site Characteristics Database/000003.log
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
<<<<<<< HEAD
2020/09/07-14:48:40.579 b303 Reusing MANIFEST /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Sync Data/LevelDB/MANIFEST-000001 2020/09/07-14:48:40.579 b303 Reusing MANIFEST /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Sync Data/LevelDB/MANIFEST-000001
2020/09/07-14:48:40.580 b303 Recovering log #3 2020/09/07-14:48:40.580 b303 Recovering log #3
2020/09/07-14:48:40.580 b303 Reusing old log /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Sync Data/LevelDB/000003.log 2020/09/07-14:48:40.580 b303 Reusing old log /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Sync Data/LevelDB/000003.log
=======
2020/09/04-16:35:06.405 b403 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Sync Data/LevelDB/MANIFEST-000001
2020/09/04-16:35:06.406 b403 Recovering log #3
2020/09/04-16:35:06.406 b403 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Sync Data/LevelDB/000003.log
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
<<<<<<< HEAD
2020/09/04-16:35:06.405 b403 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Sync Data/LevelDB/MANIFEST-000001 2020/09/04-16:35:06.405 b403 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Sync Data/LevelDB/MANIFEST-000001
2020/09/04-16:35:06.406 b403 Recovering log #3 2020/09/04-16:35:06.406 b403 Recovering log #3
2020/09/04-16:35:06.406 b403 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Sync Data/LevelDB/000003.log 2020/09/04-16:35:06.406 b403 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Sync Data/LevelDB/000003.log
=======
2020/09/04-11:02:38.237 12503 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Sync Data/LevelDB/MANIFEST-000001
2020/09/04-11:02:38.237 12503 Recovering log #3
2020/09/04-11:02:38.238 12503 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/Sync Data/LevelDB/000003.log
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
<<<<<<< HEAD
MANIFEST-000212 MANIFEST-000212
=======
MANIFEST-000210
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
<<<<<<< HEAD
2020/09/07-14:48:47.108 6c03 Recovering log #211 2020/09/07-14:48:47.108 6c03 Recovering log #211
2020/09/07-14:48:47.170 6c03 Delete type=0 #211 2020/09/07-14:48:47.170 6c03 Delete type=0 #211
2020/09/07-14:48:47.170 6c03 Delete type=3 #210 2020/09/07-14:48:47.170 6c03 Delete type=3 #210
=======
2020/09/04-16:35:09.856 900b Recovering log #209
2020/09/04-16:35:09.906 900b Delete type=3 #208
2020/09/04-16:35:09.907 900b Delete type=0 #209
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
<<<<<<< HEAD
2020/09/04-16:35:09.856 900b Recovering log #209 2020/09/04-16:35:09.856 900b Recovering log #209
2020/09/04-16:35:09.906 900b Delete type=3 #208 2020/09/04-16:35:09.906 900b Delete type=3 #208
2020/09/04-16:35:09.907 900b Delete type=0 #209 2020/09/04-16:35:09.907 900b Delete type=0 #209
=======
2020/09/04-11:02:47.674 6a03 Recovering log #207
2020/09/04-11:02:47.733 6a03 Delete type=0 #207
2020/09/04-11:02:47.733 6a03 Delete type=3 #206
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
<<<<<<< HEAD
2020/09/07-14:48:47.135 14a07 Reusing MANIFEST /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/shared_proto_db/metadata/MANIFEST-000001 2020/09/07-14:48:47.135 14a07 Reusing MANIFEST /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/shared_proto_db/metadata/MANIFEST-000001
2020/09/07-14:48:47.136 14a07 Recovering log #3 2020/09/07-14:48:47.136 14a07 Recovering log #3
2020/09/07-14:48:47.136 14a07 Reusing old log /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/shared_proto_db/metadata/000003.log 2020/09/07-14:48:47.136 14a07 Reusing old log /Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/shared_proto_db/metadata/000003.log
=======
2020/09/04-16:35:09.878 10d03 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/shared_proto_db/metadata/MANIFEST-000001
2020/09/04-16:35:09.878 10d03 Recovering log #3
2020/09/04-16:35:09.878 10d03 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/shared_proto_db/metadata/000003.log
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
<<<<<<< HEAD
2020/09/04-16:35:09.878 10d03 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/shared_proto_db/metadata/MANIFEST-000001 2020/09/04-16:35:09.878 10d03 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/shared_proto_db/metadata/MANIFEST-000001
2020/09/04-16:35:09.878 10d03 Recovering log #3 2020/09/04-16:35:09.878 10d03 Recovering log #3
2020/09/04-16:35:09.878 10d03 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/shared_proto_db/metadata/000003.log 2020/09/04-16:35:09.878 10d03 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/shared_proto_db/metadata/000003.log
=======
2020/09/04-11:02:47.700 10103 Reusing MANIFEST /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/shared_proto_db/metadata/MANIFEST-000001
2020/09/04-11:02:47.701 10103 Recovering log #3
2020/09/04-11:02:47.701 10103 Reusing old log /Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/.vscode/chrome/Default/shared_proto_db/metadata/000003.log
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
This diff is collapsed.
...@@ -89,7 +89,9 @@ cc.Class({ ...@@ -89,7 +89,9 @@ cc.Class({
getDefaultData() { getDefaultData() {
const dataJson = '{"groupArr":[{"title":"","letter":"h","audio_url":"http://staging-teach.cdn.ireadabc.com/b39dfb2221c22175d3e8ac972923a82b.mp3","bg":"2","picArr":[{"letter":"b","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/be8ec5cee7a3074440478b00a4a84f5e.png","audio_url":"http://staging-teach.cdn.ireadabc.com/85cff126986f5cc11b05e95181da5869.mp3","text":""},{"letter":"t","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/c8abf7383d65bcbdba8f390785cece60.png","audio_url":"http://staging-teach.cdn.ireadabc.com/85cff126986f5cc11b05e95181da5869.mp3","text":""},{"letter":"h","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/f6f4bbef497409fef3c8f1d375893829.png","audio_url":"http://staging-teach.cdn.ireadabc.com/9f0aee80e252005721a445cbbf04e8b1.mp3","text":""},{"letter":"h","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/7b18a7931d64f7b9e8b7ecd25cb5e3d4.png","audio_url":"http://staging-teach.cdn.ireadabc.com/a5fa20e0c6024421b0d9a7007c303503.mp3","text":""},{"letter":"h","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/e12d13282a10f92d65ac41b4aecaad4c.png","audio_url":"http://staging-teach.cdn.ireadabc.com/32258b839eca32b6ccf94f3dd6c86e0c.mp3","text":""}]},{"title":"","letter":"B","audio_url":"http://staging-teach.cdn.ireadabc.com/253a1653c954edd8f047f79ec401065d.mp3","bg":"3","picArr":[{"letter":"g","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/94cabac22be548c6dbab64c4be326547.png","audio_url":"http://staging-teach.cdn.ireadabc.com/f51e3fedc88aa69a99f6ef579f7de047.mp3","text":""},{"letter":"j","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/3d8f631b4ce08b8850051ad9a2490322.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fbe2f23b9eb191a9330f99800e0d54d5.mp3","text":""}]}]}' const dataJson = '{"groupArr":[{"title":"","letter":"h","audio_url":"http://staging-teach.cdn.ireadabc.com/b39dfb2221c22175d3e8ac972923a82b.mp3","bg":"2","picArr":[{"letter":"b","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/be8ec5cee7a3074440478b00a4a84f5e.png","audio_url":"http://staging-teach.cdn.ireadabc.com/85cff126986f5cc11b05e95181da5869.mp3","text":""},{"letter":"t","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/c8abf7383d65bcbdba8f390785cece60.png","audio_url":"http://staging-teach.cdn.ireadabc.com/85cff126986f5cc11b05e95181da5869.mp3","text":""},{"letter":"h","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/f6f4bbef497409fef3c8f1d375893829.png","audio_url":"http://staging-teach.cdn.ireadabc.com/9f0aee80e252005721a445cbbf04e8b1.mp3","text":""},{"letter":"h","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/7b18a7931d64f7b9e8b7ecd25cb5e3d4.png","audio_url":"http://staging-teach.cdn.ireadabc.com/a5fa20e0c6024421b0d9a7007c303503.mp3","text":""},{"letter":"h","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/e12d13282a10f92d65ac41b4aecaad4c.png","audio_url":"http://staging-teach.cdn.ireadabc.com/32258b839eca32b6ccf94f3dd6c86e0c.mp3","text":""}]},{"title":"","letter":"B","audio_url":"http://staging-teach.cdn.ireadabc.com/253a1653c954edd8f047f79ec401065d.mp3","bg":"3","picArr":[{"letter":"g","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/94cabac22be548c6dbab64c4be326547.png","audio_url":"http://staging-teach.cdn.ireadabc.com/f51e3fedc88aa69a99f6ef579f7de047.mp3","text":""},{"letter":"j","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/3d8f631b4ce08b8850051ad9a2490322.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fbe2f23b9eb191a9330f99800e0d54d5.mp3","text":""}]}]}'
const data1 = JSON.parse(dataJson); const data1 = JSON.parse(dataJson);
return data1; return data1;
}, },
......
...@@ -785,7 +785,7 @@ ...@@ -785,7 +785,7 @@
"relativePath": "mz_z_06/texture/bg_gui.png" "relativePath": "mz_z_06/texture/bg_gui.png"
}, },
"335fe6b8-2b52-45a9-a9c9-cb3b54014251": { "335fe6b8-2b52-45a9-a9c9-cb3b54014251": {
"asset": 1599463163715, "asset": 1599463254376,
"meta": 1599463169739, "meta": 1599463169739,
"relativePath": "mz_z_06/script/scene.js" "relativePath": "mz_z_06/script/scene.js"
} }
......
...@@ -106,8 +106,12 @@ ...@@ -106,8 +106,12 @@
"cocos-services" "cocos-services"
] ]
}, },
<<<<<<< HEAD
"worker": {}, "worker": {},
"window-1599462647259": {} "window-1599462647259": {}
=======
"worker": {}
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
}, },
"panels": { "panels": {
"sprite-editor": { "sprite-editor": {
......
<<<<<<< HEAD
{"version":"1.0.8","stats":{"/Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/temp/quick-scripts/src/__qc_index__.js":"2020-09-07T06:46:45.296Z","/Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/temp/quick-scripts/src/assets/mz_z_06/script/scene.js":"2020-09-07T06:46:45.282Z","/Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/temp/quick-scripts/src/assets/mz_z_06/script/util.js":"2020-09-07T06:46:45.282Z"}} {"version":"1.0.8","stats":{"/Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/temp/quick-scripts/src/__qc_index__.js":"2020-09-07T06:46:45.296Z","/Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/temp/quick-scripts/src/assets/mz_z_06/script/scene.js":"2020-09-07T06:46:45.282Z","/Users/limingzhe/Documents/workspace/pro_hw/pro_cocos/Z_06/play/temp/quick-scripts/src/assets/mz_z_06/script/util.js":"2020-09-07T06:46:45.282Z"}}
=======
{"version":"1.0.8","stats":{"/Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/temp/quick-scripts/src/__qc_index__.js":"2020-09-04T08:33:44.552Z","/Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/temp/quick-scripts/src/assets/mz_z_06/script/util.js":"2020-09-04T08:33:44.532Z","/Users/edz/Documents/workspace/pro_hw/pro_cocos/Z_06/play/temp/quick-scripts/src/assets/mz_z_06/script/scene.js":"2020-09-04T08:33:44.532Z"}}
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
This source diff could not be displayed because it is too large. You can view the blob instead.
(function () { (function () {
<<<<<<< HEAD
var scripts = [{"deps":{"./assets/mz_z_06/script/util":2,"./assets/mz_z_06/script/scene":1},"path":"preview-scripts/__qc_index__.js"},{"deps":{"./util":2},"path":"preview-scripts/assets/mz_z_06/script/scene.js"},{"deps":{},"path":"preview-scripts/assets/mz_z_06/script/util.js"}]; var scripts = [{"deps":{"./assets/mz_z_06/script/util":2,"./assets/mz_z_06/script/scene":1},"path":"preview-scripts/__qc_index__.js"},{"deps":{"./util":2},"path":"preview-scripts/assets/mz_z_06/script/scene.js"},{"deps":{},"path":"preview-scripts/assets/mz_z_06/script/util.js"}];
=======
var scripts = [{"deps":{"./assets/mz_z_06/script/util":1,"./assets/mz_z_06/script/scene":2},"path":"preview-scripts/__qc_index__.js"},{"deps":{},"path":"preview-scripts/assets/mz_z_06/script/util.js"},{"deps":{"./util":1},"path":"preview-scripts/assets/mz_z_06/script/scene.js"}];
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
var entries = ["preview-scripts/__qc_index__.js"]; var entries = ["preview-scripts/__qc_index__.js"];
var bundleScript = 'preview-scripts/__qc_bundle__.js'; var bundleScript = 'preview-scripts/__qc_bundle__.js';
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -86,7 +86,11 @@ cc.Class({ ...@@ -86,7 +86,11 @@ cc.Class({
func(this.getDefaultData()); func(this.getDefaultData());
}, },
getDefaultData: function getDefaultData() { getDefaultData: function getDefaultData() {
<<<<<<< HEAD
var dataJson = '{"groupArr":[{"title":"","letter":"h","audio_url":"http://staging-teach.cdn.ireadabc.com/b39dfb2221c22175d3e8ac972923a82b.mp3","bg":"2","picArr":[{"letter":"b","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/be8ec5cee7a3074440478b00a4a84f5e.png","audio_url":"http://staging-teach.cdn.ireadabc.com/85cff126986f5cc11b05e95181da5869.mp3","text":""},{"letter":"t","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/c8abf7383d65bcbdba8f390785cece60.png","audio_url":"http://staging-teach.cdn.ireadabc.com/85cff126986f5cc11b05e95181da5869.mp3","text":""},{"letter":"h","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/f6f4bbef497409fef3c8f1d375893829.png","audio_url":"http://staging-teach.cdn.ireadabc.com/9f0aee80e252005721a445cbbf04e8b1.mp3","text":""},{"letter":"h","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/7b18a7931d64f7b9e8b7ecd25cb5e3d4.png","audio_url":"http://staging-teach.cdn.ireadabc.com/a5fa20e0c6024421b0d9a7007c303503.mp3","text":""},{"letter":"h","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/e12d13282a10f92d65ac41b4aecaad4c.png","audio_url":"http://staging-teach.cdn.ireadabc.com/32258b839eca32b6ccf94f3dd6c86e0c.mp3","text":""}]},{"title":"","letter":"B","audio_url":"http://staging-teach.cdn.ireadabc.com/253a1653c954edd8f047f79ec401065d.mp3","bg":"3","picArr":[{"letter":"g","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/94cabac22be548c6dbab64c4be326547.png","audio_url":"http://staging-teach.cdn.ireadabc.com/f51e3fedc88aa69a99f6ef579f7de047.mp3","text":""},{"letter":"j","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/3d8f631b4ce08b8850051ad9a2490322.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fbe2f23b9eb191a9330f99800e0d54d5.mp3","text":""}]}]}'; var dataJson = '{"groupArr":[{"title":"","letter":"h","audio_url":"http://staging-teach.cdn.ireadabc.com/b39dfb2221c22175d3e8ac972923a82b.mp3","bg":"2","picArr":[{"letter":"b","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/be8ec5cee7a3074440478b00a4a84f5e.png","audio_url":"http://staging-teach.cdn.ireadabc.com/85cff126986f5cc11b05e95181da5869.mp3","text":""},{"letter":"t","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/c8abf7383d65bcbdba8f390785cece60.png","audio_url":"http://staging-teach.cdn.ireadabc.com/85cff126986f5cc11b05e95181da5869.mp3","text":""},{"letter":"h","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/f6f4bbef497409fef3c8f1d375893829.png","audio_url":"http://staging-teach.cdn.ireadabc.com/9f0aee80e252005721a445cbbf04e8b1.mp3","text":""},{"letter":"h","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/7b18a7931d64f7b9e8b7ecd25cb5e3d4.png","audio_url":"http://staging-teach.cdn.ireadabc.com/a5fa20e0c6024421b0d9a7007c303503.mp3","text":""},{"letter":"h","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/e12d13282a10f92d65ac41b4aecaad4c.png","audio_url":"http://staging-teach.cdn.ireadabc.com/32258b839eca32b6ccf94f3dd6c86e0c.mp3","text":""}]},{"title":"","letter":"B","audio_url":"http://staging-teach.cdn.ireadabc.com/253a1653c954edd8f047f79ec401065d.mp3","bg":"3","picArr":[{"letter":"g","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/94cabac22be548c6dbab64c4be326547.png","audio_url":"http://staging-teach.cdn.ireadabc.com/f51e3fedc88aa69a99f6ef579f7de047.mp3","text":""},{"letter":"j","word":"","pic_url":"http://staging-teach.cdn.ireadabc.com/3d8f631b4ce08b8850051ad9a2490322.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fbe2f23b9eb191a9330f99800e0d54d5.mp3","text":""}]}]}';
=======
var dataJson = '{"groupArr":[{"title":"","letter":"A","audio_url":"http://staging-teach.cdn.ireadabc.com/22e9facddfbf087ecdf2b60dba6019ef.mp3","bg":"3","picArr":[{"letter":"A","word":"aab","pic_url":"http://staging-teach.cdn.ireadabc.com/c8abf7383d65bcbdba8f390785cece60.png","audio_url":"http://staging-teach.cdn.ireadabc.com/f51e3fedc88aa69a99f6ef579f7de047.mp3","text":""},{"letter":"d","word":"bcd","pic_url":"http://staging-teach.cdn.ireadabc.com/f6f4bbef497409fef3c8f1d375893829.png","audio_url":"http://staging-teach.cdn.ireadabc.com/fbe2f23b9eb191a9330f99800e0d54d5.mp3","text":""}]},{"title":"","letter":"Z","audio_url":"http://staging-teach.cdn.ireadabc.com/f47f1d7b5c160fe1c59500d180346240.mp3","bg":"1","picArr":[{"letter":"Z","word":"bbb","pic_url":"http://staging-teach.cdn.ireadabc.com/94cabac22be548c6dbab64c4be326547.png","audio_url":"http://staging-teach.cdn.ireadabc.com/66878465ec50d162bd60fcdaa641933b.mp3","text":""},{"letter":"b","word":"bcc","pic_url":"http://staging-teach.cdn.ireadabc.com/72f7fe7405f60ff641871f8823ed11a7.png","audio_url":"http://staging-teach.cdn.ireadabc.com/a4d27ad173a95823d4b8ec82363c5aa0.mp3","text":""},{"letter":"b","word":"bbb","pic_url":"http://staging-teach.cdn.ireadabc.com/843b9094eeada5a0c055f51655d623a5.png","audio_url":"http://staging-teach.cdn.ireadabc.com/85cff126986f5cc11b05e95181da5869.mp3","text":""}]}],"bg":"3"}';
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
var data1 = JSON.parse(dataJson); var data1 = JSON.parse(dataJson);
return data1; return data1;
}, },
...@@ -733,11 +737,18 @@ cc.Class({ ...@@ -733,11 +737,18 @@ cc.Class({
_this15._cantouch = false; _this15._cantouch = false;
e.bubbles = false; e.bubbles = false;
<<<<<<< HEAD
_this15._curShowItem = node; // this.playAudioByUrl(this.curGroup.audio_url, () => { _this15._curShowItem = node; // this.playAudioByUrl(this.curGroup.audio_url, () => {
_this15.playAudioByUrl(_this15._curShowItem.data.audio_url); // }); _this15.playAudioByUrl(_this15._curShowItem.data.audio_url); // });
=======
_this15._curShowItem = node;
_this15.playAudioByUrl(_this15._curShowItem.data.audio_url);
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
_this15.showOutline(); _this15.showOutline();
}); });
}, },
......
This source diff could not be displayed because it is too large. You can view the blob instead.
<<<<<<< HEAD
{"pid":4834} {"pid":4834}
=======
{"pid":5997}
>>>>>>> 7ef11fae58c76e59e5e4f0ffeae1b171d7fc6598
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment