Skip to content

Commit

Permalink
fix ios 报错问题
Browse files Browse the repository at this point in the history
  • Loading branch information
Batrider committed Jul 27, 2018
1 parent 54cf174 commit b5df637
Show file tree
Hide file tree
Showing 10 changed files with 79 additions and 236 deletions.
136 changes: 6 additions & 130 deletions .idea/workspace.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/common/script/basic/DataFunc.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

window.dataFunc = {
// 表格加载--
arrTables: ["sampleTemplate"],
arrTables: [],
csvTables: {},
csvTableForArr: {},
tableCast: {},
Expand Down
Binary file modified assets/resources/.DS_Store
Binary file not shown.
23 changes: 0 additions & 23 deletions assets/resources/data/sampleTemplate.csv

This file was deleted.

5 changes: 0 additions & 5 deletions assets/resources/data/sampleTemplate.csv.meta

This file was deleted.

2 changes: 1 addition & 1 deletion library/imports/ae/aeb5e199-c0cc-4e22-8f5e-104791645a2f.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ cc._RF.push(module, 'aeb5eGZwMxOIo9eEEeRZFov', 'DataFunc');

window.dataFunc = {
// 表格加载--
arrTables: ["sampleTemplate"],
arrTables: [],
csvTables: {},
csvTableForArr: {},
tableCast: {},
Expand Down

Large diffs are not rendered by default.

141 changes: 68 additions & 73 deletions library/uuid-to-mtime.json
Original file line number Diff line number Diff line change
Expand Up @@ -459,11 +459,6 @@
"meta": 1532591294769,
"relativePath": "resources/data"
},
"ad3b4895-7499-46af-9eb8-af1a6ca863a9": {
"asset": 1532591294770,
"meta": 1532591294770,
"relativePath": "resources/data/sampleTemplate.csv"
},
"be28200b-9640-4775-8a9a-6ac1059edba0": {
"asset": 1532591294701,
"meta": 1532592201140,
Expand Down Expand Up @@ -1124,11 +1119,6 @@
"meta": 1532591294645,
"relativePath": "common/script/basic"
},
"aeb5e199-c0cc-4e22-8f5e-104791645a2f": {
"asset": 1532591294645,
"meta": 1532592198212,
"relativePath": "common/script/basic/DataFunc.js"
},
"27c7b7dd-9207-4432-8610-af6a62b779de": {
"asset": 1532591294646,
"meta": 1532592198238,
Expand Down Expand Up @@ -1391,187 +1381,192 @@
},
"e851e89b-faa2-4484-bea6-5c01dd9f06e2": {
"asset": 1530675298000,
"meta": 1532615123688,
"meta": 1532661584498,
"relativePath": "image/default_btn_normal.png"
},
"71561142-4c83-4933-afca-cb7a17f67053": {
"asset": 1530675298000,
"meta": 1532615123692,
"meta": 1532661584504,
"relativePath": "image/default_btn_disabled.png"
},
"d81ec8ad-247c-4e62-aa3c-d35c4193c7af": {
"asset": 1530675298000,
"meta": 1532615123720,
"meta": 1532661584552,
"relativePath": "image/default_panel.png"
},
"b43ff3c2-02bb-4874-81f7-f2dea6970f18": {
"asset": 1530675298000,
"meta": 1532615123722,
"meta": 1532661584555,
"relativePath": "image/default_btn_pressed.png"
},
"99170b0b-d210-46f1-b213-7d9e3f23098a": {
"asset": 1530675298000,
"meta": 1532615123740,
"relativePath": "image/default_progressbar_bg.png"
},
"cfef78f1-c8df-49b7-8ed0-4c953ace2621": {
"asset": 1530675298000,
"meta": 1532615123748,
"meta": 1532661584636,
"relativePath": "image/default_progressbar.png"
},
"99170b0b-d210-46f1-b213-7d9e3f23098a": {
"asset": 1530675298000,
"meta": 1532661584637,
"relativePath": "image/default_progressbar_bg.png"
},
"567dcd80-8bf4-4535-8a5a-313f1caf078a": {
"asset": 1530675298000,
"meta": 1532615123757,
"meta": 1532661584673,
"relativePath": "image/default_radio_button_off.png"
},
"9d60001f-b5f4-4726-a629-2659e3ded0b8": {
"asset": 1530675298000,
"meta": 1532615123763,
"meta": 1532661584679,
"relativePath": "image/default_radio_button_on.png"
},
"4bab67cb-18e6-4099-b840-355f0473f890": {
"asset": 1530675298000,
"meta": 1532615123776,
"meta": 1532661584698,
"relativePath": "image/default_scrollbar_bg.png"
},
"617323dd-11f4-4dd3-8eec-0caf6b3b45b9": {
"asset": 1530675298000,
"meta": 1532615123786,
"meta": 1532661584713,
"relativePath": "image/default_scrollbar_vertical_bg.png"
},
"d6d3ca85-4681-47c1-b5dd-d036a9d39ea2": {
"asset": 1530675298000,
"meta": 1532615123798,
"meta": 1532661584716,
"relativePath": "image/default_scrollbar_vertical.png"
},
"0291c134-b3da-4098-b7b5-e397edbe947f": {
"asset": 1530675298000,
"meta": 1532615123809,
"meta": 1532661584750,
"relativePath": "image/default_scrollbar.png"
},
"0275e94c-56a7-410f-bd1a-fc7483f7d14a": {
"asset": 1530675298000,
"meta": 1532615123811,
"meta": 1532661584756,
"relativePath": "image/default_sprite_splash.png"
},
"73a0903d-d80e-4e3c-aa67-f999543c08f5": {
"asset": 1530675298000,
"meta": 1532615123842,
"relativePath": "image/default_toggle_checkmark.png"
},
"6e056173-d285-473c-b206-40a7fff5386e": {
"asset": 1530675298000,
"meta": 1532615123843,
"meta": 1532661584819,
"relativePath": "image/default_sprite.png"
},
"73a0903d-d80e-4e3c-aa67-f999543c08f5": {
"asset": 1530675298000,
"meta": 1532661584825,
"relativePath": "image/default_toggle_checkmark.png"
},
"c25b9d50-c8fc-4d27-beeb-6e7c1f2e5c0f": {
"asset": 1530675298000,
"meta": 1532615123869,
"meta": 1532661584878,
"relativePath": "image/default_toggle_disabled.png"
},
"d29077ba-1627-4a72-9579-7b56a235340c": {
"asset": 1530675298000,
"meta": 1532615123871,
"meta": 1532661584881,
"relativePath": "image/default_toggle_normal.png"
},
"972b9a4d-47ee-4c74-b5c3-61d8a69bc29f": {
"asset": 1530675298000,
"meta": 1532615123879,
"meta": 1532661584894,
"relativePath": "prefab/button.prefab"
},
"b181c1e4-0a72-4a91-bfb0-ae6f36ca60bd": {
"asset": 1530675298000,
"meta": 1532615123890,
"relativePath": "image/default_toggle_pressed.png"
},
"2c937608-2562-40ea-b264-7395df6f0cea": {
"asset": 1530675298000,
"meta": 1532615123893,
"meta": 1532661584899,
"relativePath": "prefab/canvas.prefab"
},
"b181c1e4-0a72-4a91-bfb0-ae6f36ca60bd": {
"asset": 1530675298000,
"meta": 1532661584904,
"relativePath": "image/default_toggle_pressed.png"
},
"61aeb05b-3b32-452b-8eed-2b76deeed554": {
"asset": 1530675298000,
"meta": 1532615123897,
"meta": 1532661584910,
"relativePath": "prefab/editbox.prefab"
},
"27756ebb-3d33-44b0-9b96-e858fadd4dd4": {
"asset": 1530675298000,
"meta": 1532615123898,
"meta": 1532661584912,
"relativePath": "prefab/label.prefab"
},
"785a442c-3ceb-45be-a46e-7317f625f3b9": {
"asset": 1530675298000,
"meta": 1532615123907,
"meta": 1532661584963,
"relativePath": "prefab/layout.prefab"
},
"ca8401fe-ad6e-41a8-bd46-8e3e4e9945be": {
"asset": 1530675298000,
"meta": 1532615123908,
"meta": 1532661584965,
"relativePath": "prefab/pageview.prefab"
},
"5965ffac-69da-4b55-bcde-9225d0613c28": {
"asset": 1530675298000,
"meta": 1532615123917,
"relativePath": "prefab/progressBar.prefab"
},
"cd33edea-55f5-46c2-958d-357a01384a36": {
"asset": 1530675298000,
"meta": 1532615123918,
"meta": 1532661584974,
"relativePath": "prefab/particlesystem.prefab"
},
"5965ffac-69da-4b55-bcde-9225d0613c28": {
"asset": 1530675298000,
"meta": 1532661584984,
"relativePath": "prefab/progressBar.prefab"
},
"4a37dd57-78cd-4cec-aad4-f11a73d12b63": {
"asset": 1530675298000,
"meta": 1532615123923,
"meta": 1532661584998,
"relativePath": "prefab/richtext.prefab"
},
"32044bd2-481f-4cf1-a656-e2b2fb1594eb": {
"asset": 1530675298000,
"meta": 1532615123924,
"meta": 1532661585008,
"relativePath": "prefab/scrollview.prefab"
},
"0004d1cf-a0ad-47d8-ab17-34d3db9d35a3": {
"asset": 1530675298000,
"meta": 1532615123933,
"relativePath": "prefab/slider.prefab"
},
"1f55e3be-b89b-4b79-88de-47fd31018044": {
"asset": 1530675298000,
"meta": 1532615123934,
"meta": 1532661585017,
"relativePath": "prefab/sprite_splash.prefab"
},
"0004d1cf-a0ad-47d8-ab17-34d3db9d35a3": {
"asset": 1530675298000,
"meta": 1532661585019,
"relativePath": "prefab/slider.prefab"
},
"96083d03-c332-4a3f-9386-d03e2d19e8ee": {
"asset": 1530675298000,
"meta": 1532615123939,
"meta": 1532661585025,
"relativePath": "prefab/sprite.prefab"
},
"7de03a80-4457-438d-95a7-3e7cdffd6086": {
"asset": 1530675298000,
"meta": 1532615123940,
"meta": 1532661585068,
"relativePath": "prefab/tiledmap.prefab"
},
"bf0a434c-84dd-4a8e-a08a-7a36f180cc75": {
"asset": 1530675298000,
"meta": 1532615123946,
"relativePath": "prefab/toggleContainer.prefab"
},
"0d784963-d024-4ea6-a7db-03be0ad63010": {
"asset": 1530675298000,
"meta": 1532615123947,
"meta": 1532661585113,
"relativePath": "prefab/toggle.prefab"
},
"232d2782-c4bd-4bb4-9e01-909f03d6d3b9": {
"bf0a434c-84dd-4a8e-a08a-7a36f180cc75": {
"asset": 1530675298000,
"meta": 1532615123951,
"relativePath": "prefab/videoplayer.prefab"
"meta": 1532661585114,
"relativePath": "prefab/toggleContainer.prefab"
},
"d1b8be49-b0a0-435c-83b7-552bed4bbe35": {
"asset": 1530675298000,
"meta": 1532615123952,
"meta": 1532661585193,
"relativePath": "prefab/toggleGroup.prefab"
},
"232d2782-c4bd-4bb4-9e01-909f03d6d3b9": {
"asset": 1530675298000,
"meta": 1532661585194,
"relativePath": "prefab/videoplayer.prefab"
},
"8c5001fd-07ee-4a4b-a8a0-63e15195e94d": {
"asset": 1530675298000,
"meta": 1532615123955,
"meta": 1532661585218,
"relativePath": "prefab/webview.prefab"
},
"aeb5e199-c0cc-4e22-8f5e-104791645a2f": {
"asset": 1532663803987,
"meta": 1532663811784,
"relativePath": "common/script/basic/DataFunc.js"
}
}
2 changes: 1 addition & 1 deletion temp/quick-scripts/assets/common/script/basic/DataFunc.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ cc._RF.push(module, 'aeb5eGZwMxOIo9eEEeRZFov', 'DataFunc', __filename);

window.dataFunc = {
// 表格加载--
arrTables: ["sampleTemplate"],
arrTables: [],
csvTables: {},
csvTableForArr: {},
tableCast: {},
Expand Down

Large diffs are not rendered by default.

0 comments on commit b5df637

Please sign in to comment.