From 836e7651b87b9e64606a85fb5b772533292b4972 Mon Sep 17 00:00:00 2001 From: cafel176 <48304406+cafel176@users.noreply.github.com> Date: Sat, 4 Jan 2020 16:28:09 +0800 Subject: [PATCH 1/9] =?UTF-8?q?Delete=20JS=E4=BB=A3=E7=A0=81=E5=8E=8B?= =?UTF-8?q?=E7=BC=A9=E5=B7=A5=E5=85=B7.exe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 常用工具/JS代码压缩工具.exe | Bin 13824 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 常用工具/JS代码压缩工具.exe diff --git a/常用工具/JS代码压缩工具.exe b/常用工具/JS代码压缩工具.exe deleted file mode 100644 index 92a6bfa2949b06118c6372b33570a283ec4e2325..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13824 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 Weh-c<=Klfx3jaj)hvWZW1pWsRul%3@ From eb0c67fdee4fa97847b0e3cd3db68ea8ff7f31d0 Mon Sep 17 00:00:00 2001 From: cafel176 <48304406+cafel176@users.noreply.github.com> Date: Sat, 4 Jan 2020 16:28:30 +0800 Subject: [PATCH 2/9] Add files via upload --- 常用工具/JS代码压缩工具.exe | Bin 0 -> 13312 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 常用工具/JS代码压缩工具.exe diff --git a/常用工具/JS代码压缩工具.exe b/常用工具/JS代码压缩工具.exe new file mode 100644 index 0000000000000000000000000000000000000000..6926acd50b0e2336992200cff8ad00835f9d26f5 GIT binary patch literal 13312 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 literal 0 HcmV?d00001 From 7ad5ba01e86052cf0bd46e2e694deed316db6860 Mon Sep 17 00:00:00 2001 From: ckcz123 Date: Sat, 4 Jan 2020 17:21:15 +0800 Subject: [PATCH 3/9] Add useItemEvent --- _server/MotaAction.g4 | 12 ++++++++++++ _server/editor_blockly.js | 1 + _server/table/comment.js | 6 ++++++ editor-mobile.html | 1 + editor.html | 1 + libs/actions.js | 4 ++-- libs/items.js | 11 +++++++++++ 7 files changed, 34 insertions(+), 2 deletions(-) diff --git a/_server/MotaAction.g4 b/_server/MotaAction.g4 index e436f5d6..5bc7ce65 100644 --- a/_server/MotaAction.g4 +++ b/_server/MotaAction.g4 @@ -310,6 +310,18 @@ var code = '[\n'+action_0+']\n'; return code; */; +//item 事件编辑器入口之一 +item_m + : '使用道具事件' BGNL? Newline action+ BEND + + +/* item_m +tooltip : 使用道具事件 +helpUrl : https://h5mota.com/games/template/_docs/#/event +var code = '[\n'+action_0+']\n'; +return code; +*/; + //为了避免关键字冲突,全部加了_s //动作 action diff --git a/_server/editor_blockly.js b/_server/editor_blockly.js index f40b7fb9..090ba314 100644 --- a/_server/editor_blockly.js +++ b/_server/editor_blockly.js @@ -69,6 +69,7 @@ editor_blockly = function () { MotaActionBlocks['eachArrive_m'].xmlText(), MotaActionBlocks['level_m'].xmlText(), MotaActionBlocks['commonEvent_m'].xmlText(), + MotaActionBlocks['item_m'].xmlText(), ], '显示文字':[ MotaActionBlocks['text_0_s'].xmlText(), diff --git a/_server/table/comment.js b/_server/table/comment.js index 20783952..47741b22 100644 --- a/_server/table/comment.js +++ b/_server/table/comment.js @@ -74,6 +74,12 @@ var comment_c456ea59_6018_45ef_8bcc_211a24c627dc = { "_lint": true, "_data": "道具效果,仅对cls为tools或constants有效。" }, + "useItemEvent": { + "_leaf": true, + "_type": "event", + "_event": "item", + "_data": "使用本道具所执行的事件" + }, "canUseItemEffect": { "_leaf": true, "_type": "textarea", diff --git a/editor-mobile.html b/editor-mobile.html index d586ea90..6b81757f 100644 --- a/editor-mobile.html +++ b/editor-mobile.html @@ -211,6 +211,7 @@ + diff --git a/editor.html b/editor.html index 9622674b..f1d5eadd 100644 --- a/editor.html +++ b/editor.html @@ -207,6 +207,7 @@ + diff --git a/libs/actions.js b/libs/actions.js index 8ecc7460..9f63d0bd 100644 --- a/libs/actions.js +++ b/libs/actions.js @@ -595,12 +595,12 @@ actions.prototype._getClickLoc = function (x, y) { size = size * core.domStyle.scale; if (core.domStyle.isVertical) { - statusBar.x = 0; + statusBar.x = 3; statusBar.y = core.dom.statusBar.offsetHeight + 3; } else { statusBar.x = core.dom.statusBar.offsetWidth + 3; - statusBar.y = 0; + statusBar.y = 3; } var left = core.dom.gameGroup.offsetLeft + statusBar.x; diff --git a/libs/items.js b/libs/items.js index ad841add..8f964f81 100644 --- a/libs/items.js +++ b/libs/items.js @@ -13,7 +13,10 @@ items.prototype._init = function () { this.canUseItemEffect = items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a.canUseItemEffect; if (!items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a.equipCondition) items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a.equipCondition = {}; + if (!items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a.useItemEvent) + items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a.useItemEvent = {}; this.equipCondition = items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a.equipCondition; + this.useItemEvent = items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a.useItemEvent; } ////// 获得所有道具 ////// @@ -116,6 +119,14 @@ items.prototype._useItemEffect = function (itemId) { main.log(e); } } + if (this.useItemEvent[itemId]) { + try { + core.insertAction(this.useItemEvent[itemId]); + } + catch (e) { + main.log(e); + } + } } items.prototype._afterUseItem = function (itemId) { From 2b0b27a3ed4862e266a0f7e4007660dce1595e6b Mon Sep 17 00:00:00 2001 From: ckcz123 Date: Sat, 4 Jan 2020 17:44:44 +0800 Subject: [PATCH 4/9] dynamicMapEditor save --- extensions/dynamicMapEditor.js | 64 ++++++++++++++++++++++++---------- 1 file changed, 46 insertions(+), 18 deletions(-) diff --git a/extensions/dynamicMapEditor.js b/extensions/dynamicMapEditor.js index 02378560..a06e7f70 100644 --- a/extensions/dynamicMapEditor.js +++ b/extensions/dynamicMapEditor.js @@ -12,16 +12,9 @@ function dynamicMapEditor() { 'redPotion', 'bluePotion', 'yellowPotion', 'greenPotion', 'pickaxe', 'bomb', 'centerFly', 'cls:autotile', 'cls:enemys', 'cls:enemy48' ]; - this.userParams = { - hotKeys: { - openToolBox: 219, - save: 221, - undo: 220 - } - }; this.items = []; this.userChanged = []; - this.key2Function = {}; + this.savedItems = []; this.dom = null; this.canvas = null; this.mapRecord = {}; @@ -38,11 +31,6 @@ function dynamicMapEditor() { // ------ init dynamicMapEditor.prototype._init = function () { - var hotkeys = this.userParams.hotKeys; - this.key2Function[hotkeys.openToolBox] = this.openToolBox; - this.key2Function[hotkeys.save] = this.applyCurrentChange; - this.key2Function[hotkeys.undo] = this.undo; - this.dom = document.createElement("canvas"); this.dom.id = 'dynamicMapEditor'; this.dom.style.display = 'none'; @@ -56,7 +44,7 @@ dynamicMapEditor.prototype._init = function () { this.initInfos(); this.pageMax = Math.ceil(this.items.length / this.pageMaxItems); - core.registerAction('onkeyUp', 'plugin_dme_keydown', this.onKeyDown.bind(this), 200); + core.registerAction('onkeyUp', 'plugin_dme_keydown', this.onKeyUp.bind(this), 200); core.registerAction('onclick', 'plugin_dme_click', this.onMapClick.bind(this), 200); this.dom.addEventListener("click",this.onBoxClick.bind(this)); this.showInitHelp(); @@ -80,6 +68,7 @@ dynamicMapEditor.prototype.initInfos = function () { } }, this); this.items = this.items.filter(function (v) { return v && v.id && v.number >= 0; }); + this.savedItems = core.getLocalStorage('_dynamicMapEditor_savedItems', []); } // ------ bind actions @@ -88,10 +77,31 @@ dynamicMapEditor.prototype.isValid = function () { return main.mode == 'play' && core.isPlaying() && !core.isReplaying() && !core.status.lockControl; } -dynamicMapEditor.prototype.onKeyDown = function(e) { +dynamicMapEditor.prototype.onKeyUp = function(e) { if (!this.isValid()) return false; - var func = this.key2Function[e.keyCode]; - func && func.call(this); + if (e.keyCode == 219) { + this.openToolBox(); + return true; + } + if (!this.isUsingTool) return false; + + if (e.keyCode == 220) { + this.undo(); + return true; + } else if (e.keyCode == 221) { + this.applyCurrentChange(); + return true; + } else { + // 0-9 + if (e.keyCode >= 48 && e.keyCode <= 57) { + if (e.altKey) { + this.savedItem(e.keyCode - 48); + } else { + this.loadItem(e.keyCode - 48); + } + } + return true; + } return false; } @@ -286,6 +296,23 @@ dynamicMapEditor.prototype.changePage = function(delta) { this.refreshToolBox(); } +dynamicMapEditor.prototype.savedItem = function (number) { + if (!this.isUsingTool || this.selectedItem < 0) return; + this.savedItems[number] = [this.pageId, this.selectedIndex]; + core.setLocalStorage('_dynamicMapEditor_savedItems', this.savedItems); + core.drawTip("已保存此图块"); +} + +dynamicMapEditor.prototype.loadItem = function (number) { + if (!this.isUsingTool) return; + var u = this.savedItems[number]; + if (!u) return core.drawTip("没有保存的图块!"); + this.pageId = u[0]; + this.selectedIndex = u[1]; + this.selectedItem = this.items[this.pageId * this.pageMaxItems + this.selectedIndex]; + this.refreshToolBox(); +} + // ------ draw dynamicMapEditor.prototype.itemRect = function(index) { @@ -366,7 +393,8 @@ dynamicMapEditor.prototype.showHelp = function (fromButton) { if (main.mode != 'play' || (!fromButton && core.getLocalStorage('_dynamicMapEditor_help'))) return; var text = "欢迎使用黄鸡编写的运行时编辑拓展!你可以一边游戏一边编辑地图或者修改数据。\n\n"; text += "基本操作:\n - 点击图块再点地图可以放置;\n - 双击图块可以编辑数据;\n"; - text += " - [ 键将开关此模式;\n - ] 键将会把改动保存到文件;\n - \\ 键将撤销上步操作。\n\n"; + text += " - [ 键将开关此模式;\n - ] 键将会把改动保存到文件;\n - \\ 键将撤销上步操作。\n"; + text += " - Alt+0~9 保存当前图块 \n - 0~9 读取当前图块\n"; text += "最下面三行数据分别是:\n" text += "血攻防魔防;金经黄蓝红;破炸飞和debuff。"; if (!fromButton) text += "\n\n点取消将不再提示本页面。"; From 7108e3a78662eeda6e68101f8336c74b5f608d54 Mon Sep 17 00:00:00 2001 From: ckcz123 Date: Sat, 4 Jan 2020 19:39:01 +0800 Subject: [PATCH 5/9] Fix --- _server/table/comment.js | 12 ++++++------ libs/items.js | 8 ++++++++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/_server/table/comment.js b/_server/table/comment.js index 47741b22..5bac4a9b 100644 --- a/_server/table/comment.js +++ b/_server/table/comment.js @@ -67,6 +67,12 @@ var comment_c456ea59_6018_45ef_8bcc_211a24c627dc = { "_lint": true, "_data": "即捡即用类物品在获得时提示的文字,仅对cls为items有效。" }, + "useItemEvent": { + "_leaf": true, + "_type": "event", + "_event": "item", + "_data": "碰触或使用本道具所执行的事件" + }, "useItemEffect": { "_leaf": true, "_type": "textarea", @@ -74,12 +80,6 @@ var comment_c456ea59_6018_45ef_8bcc_211a24c627dc = { "_lint": true, "_data": "道具效果,仅对cls为tools或constants有效。" }, - "useItemEvent": { - "_leaf": true, - "_type": "event", - "_event": "item", - "_data": "使用本道具所执行的事件" - }, "canUseItemEffect": { "_leaf": true, "_type": "textarea", diff --git a/libs/items.js b/libs/items.js index 8f964f81..f65e8f54 100644 --- a/libs/items.js +++ b/libs/items.js @@ -90,6 +90,14 @@ items.prototype.getItemEffectTip = function (itemId) { return ""; } } + if (this.useItemEvent[itemId]) { + try { + core.insertAction(this.useItemEvent[itemId]); + } + catch (e) { + main.log(e); + } + } } return ""; } From 4bc69f5b2763b074b1e25d290c4b4493b3e89f03 Mon Sep 17 00:00:00 2001 From: ckcz123 Date: Sat, 4 Jan 2020 19:45:03 +0800 Subject: [PATCH 6/9] Fix --- libs/items.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/libs/items.js b/libs/items.js index f65e8f54..4f0fa179 100644 --- a/libs/items.js +++ b/libs/items.js @@ -70,6 +70,15 @@ items.prototype.getItemEffect = function (itemId, itemNum) { } } core.status.hero.statistics.hp += core.status.hero.hp - curr_hp; + + if (this.useItemEvent[itemId]) { + try { + core.insertAction(this.useItemEvent[itemId]); + } + catch (e) { + main.log(e); + } + } } else { core.addItem(itemId, itemNum); @@ -90,14 +99,6 @@ items.prototype.getItemEffectTip = function (itemId) { return ""; } } - if (this.useItemEvent[itemId]) { - try { - core.insertAction(this.useItemEvent[itemId]); - } - catch (e) { - main.log(e); - } - } } return ""; } From 7ba5a72a607a037c024051097ecb21ecab122a43 Mon Sep 17 00:00:00 2001 From: ckcz123 Date: Sun, 5 Jan 2020 12:29:29 +0800 Subject: [PATCH 7/9] Update progressbar --- libs/loader.js | 34 +++++++++++++++++++++++----------- libs/utils.js | 11 ++++++++--- 2 files changed, 31 insertions(+), 14 deletions(-) diff --git a/libs/loader.js b/libs/loader.js index 321a6024..1804c82f 100644 --- a/libs/loader.js +++ b/libs/loader.js @@ -50,6 +50,7 @@ loader.prototype._loadIcons = function () { } loader.prototype._loadMaterialImages = function (callback) { + this._setStartLoadTipText("正在加载资源文件..."); if (main.useCompress) { this.loadImagesFromZip('project/images/materials.zip', core.materials, core.material.images, callback); } else { @@ -64,6 +65,7 @@ loader.prototype._loadExtraImages = function (callback) { if (images.indexOf("hero.png") < 0) images.push("hero.png"); + this._setStartLoadTipText("正在加载图片文件..."); if (main.useCompress) { this.loadImagesFromZip('project/images/images.zip', images, core.material.images.images, callback); } else { @@ -86,6 +88,7 @@ loader.prototype._loadAutotiles = function (callback) { callback(); } + this._setStartLoadTipText("正在加载自动元件..."); if (main.useCompress) { this.loadImagesFromZip('project/images/autotiles.zip', keys, autotiles, _callback); } else { @@ -109,6 +112,7 @@ loader.prototype._loadTilesets = function (callback) { } callback(); } + this._setStartLoadTipText("正在加载额外素材..."); if (main.useCompress) { this.loadImagesFromZip('project/images/tilesets.zip', core.tilesets, core.material.images.tilesets, _callback); } else { @@ -125,16 +129,16 @@ loader.prototype.loadImages = function (names, toSave, callback) { for (var i = 0; i < names.length; i++) { this.loadImage(names[i], function (id, image) { core.loader._setStartLoadTipText('正在加载图片 ' + id + "..."); - if (toSave[id] !== undefined) { - if (image != null) - toSave[id] = image; - return; - } - toSave[id] = image; - items++; - core.loader._setStartProgressVal(items * (100 / names.length)); - if (items == names.length) { - if (callback) callback(); + if (toSave[id] !== undefined) { + if (image != null) + toSave[id] = image; + return; + } + toSave[id] = image; + items++; + core.loader._setStartProgressVal(items * (100 / names.length)); + if (items == names.length) { + if (callback) callback(); } }) } @@ -166,6 +170,8 @@ loader.prototype.loadImagesFromZip = function (url, names, toSave, callback) { }); cnt--; if (cnt == 0 && callback) callback(); + }, null, false, function (percentage) { + core.loader._setStartProgressVal(percentage * 100); }); } @@ -191,6 +197,7 @@ loader.prototype.loadImage = function (imgName, callback) { } loader.prototype._loadAnimates = function () { + this._setStartLoadTipText("正在加载动画文件..."); if (main.useCompress) { core.unzip('project/animates/animates.zip?v=' + main.version, function (animates) { for (var name in animates) { @@ -200,7 +207,9 @@ loader.prototype._loadAnimates = function () { core.loader._loadAnimate(t, animates[name]); } } - }, null, true); + }, null, true, function (percentage) { + core.loader._setStartProgressVal(percentage * 100); + }); } else { core.animates.forEach(function (t) { core.http('GET', 'project/animates/' + t + ".animate?v=" + main.version, null, function (content) { @@ -267,6 +276,7 @@ loader.prototype._loadMusic = function () { core.loader.loadOneMusic(t); }); + this._setStartLoadTipText("正在加载音效文件..."); if (main.useCompress && core.musicStatus.audioContext) { core.unzip('project/sounds/sounds.zip?v=' + main.version, function (data) { for (var name in data) { @@ -274,6 +284,8 @@ loader.prototype._loadMusic = function () { core.loader._loadOneSound_decodeData(name, data[name]); } } + }, null, false, function (percentage) { + core.loader._setStartProgressVal(percentage * 100); }); } else { core.sounds.forEach(function (t) { diff --git a/libs/utils.js b/libs/utils.js index 8506a8b9..ad66b4d3 100644 --- a/libs/utils.js +++ b/libs/utils.js @@ -1166,7 +1166,7 @@ utils.prototype._export = function (floorIds) { console.log(content); } -utils.prototype.unzip = function (blobOrUrl, success, error, convertToText) { +utils.prototype.unzip = function (blobOrUrl, success, error, convertToText, onprogress) { var _error = function (msg) { main.log(msg); if (error) error(msg); @@ -1179,7 +1179,7 @@ utils.prototype.unzip = function (blobOrUrl, success, error, convertToText) { if (typeof blobOrUrl == 'string') { return core.http('GET', blobOrUrl, null, function (data) { core.unzip(data, success, error, convertToText); - }, _error, 'application/zip', 'blob'); + }, _error, 'application/zip', 'blob', onprogress); } if (!(blobOrUrl instanceof Blob)) { @@ -1214,7 +1214,7 @@ utils.prototype._unzip_readEntries = function (entries, success, convertToText) }); } -utils.prototype.http = function (type, url, formData, success, error, mimeType, responseType) { +utils.prototype.http = function (type, url, formData, success, error, mimeType, responseType, onprogress) { var xhr = new XMLHttpRequest(); xhr.open(type, url, true); if (mimeType) xhr.overrideMimeType(mimeType); @@ -1227,6 +1227,11 @@ utils.prototype.http = function (type, url, formData, success, error, mimeType, if (error) error("HTTP " + xhr.status); } }; + xhr.onprogress = function (e) { + if (e.lengthComputable) { + if (onprogress) onprogress(e.loaded / e.total); + } + } xhr.onabort = function () { if (error) error("Abort"); } From 5cc7242539f22f64962fce1df0ff780d3dbfd438 Mon Sep 17 00:00:00 2001 From: cafel176 <48304406+cafel176@users.noreply.github.com> Date: Sun, 5 Jan 2020 13:01:52 +0800 Subject: [PATCH 8/9] =?UTF-8?q?Delete=20JS=E4=BB=A3=E7=A0=81=E5=8E=8B?= =?UTF-8?q?=E7=BC=A9=E5=B7=A5=E5=85=B7.exe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 常用工具/JS代码压缩工具.exe | Bin 13312 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 常用工具/JS代码压缩工具.exe diff --git a/常用工具/JS代码压缩工具.exe b/常用工具/JS代码压缩工具.exe deleted file mode 100644 index 6926acd50b0e2336992200cff8ad00835f9d26f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13312 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 From 8d1b0b6f13b03bb5cdd9548a2ccd4d2aae61ddf9 Mon Sep 17 00:00:00 2001 From: cafel176 <48304406+cafel176@users.noreply.github.com> Date: Sun, 5 Jan 2020 13:02:07 +0800 Subject: [PATCH 9/9] Add files via upload --- 常用工具/JS代码压缩工具.exe | Bin 0 -> 13312 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 常用工具/JS代码压缩工具.exe diff --git a/常用工具/JS代码压缩工具.exe b/常用工具/JS代码压缩工具.exe new file mode 100644 index 0000000000000000000000000000000000000000..5dfae15a77cc52ad624ed53a2e55c79c3e7484a5 GIT binary patch literal 13312 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
y;YMH-h@BhzJE`Q6Vafa8M9q*P>;NxYE7cD#4 z!g3x8P1?Ou!xa3aK?g4_s--f!FDi3k zgq^5dB*KLm({uRzAy))lkuUeSn3o}El#x76MGi5;s;!7xV^eA^rI-0(#fALf=;DlS zsja)Dk5U;6?RMHbkG(ju*#?Xw z&Q2!%?;kWZ-`@+0h+9RF3kVS4u zmul7T>It@OaB>wt6>|4-DfYdR+ijHDhf!Uc70RqjUdTGPoJ+Ot;{7bN&E3aEY-@93 z_si2?8Rjuu{w^~Rhr2$H`~f_Wwu{1x{mbswz*tt_kzAl`&l?Eojxwb+BfgJT60<3U|H*4 zp#N0^}VfhOYFupMHiNd1LyL6*51Vc;38 z=#F?IbvuK>)<|mv|L(s?#8Wre8VN=sk-B|#gB}m4sCYc0#${1xs5>A|7Muf~lJTO*?bqa*rX#qO-F+4ZM4ot=C9w%7Pm746(SerWVCj=RPU4aa=r zZktOh`o#6);(VY49nVfq*j@k8KAsyas{RU>m15mpa(>Hc;g0p|#?Bc{oJxr^Sxt*i zrc#19zk-zQ?xuFx!@rhg@pJg;B<;r&57%XV?ZHRZITsQ|j?@CAz%%8<0+Pl5947du zkK?!-Pv_d=#YbR#l^&&IfIDdfr9u2ccL?=Cz+Kj_b?Ir}8~B{bax7WS6Q69w#q-Xg z*eJXOGwu*_sR23Go^lX7k}0evd@Uz#H3lm09!$K6@*6=C)Qq4Lo%Q`C2Cf91cxB;L zYWf0_W&}?U&JnD?^*F`AT%yHjDcNgR8mm$UQt);vt_~M1EBc>>wJKIQ&E_Edc()o{ zj^+cPn0Uu!J+dWw^7&8s3d!%@eDxsD6lENO3F8-PZ|8|CF|rS1D#SX z&EBi8I3&;5x?hcNiV{v(aI!C2vu;_M6`D_Dbl^-$=v#_Y=uuMew-);J5>gm`BF+9Q z%CRCf3AwyyFz{W+@g~t8q4%)e2SOEio@n!Q8QVFB$Cb z^}^q!ZOgr0?(#CQjh1gxQr&CJf!wr*d5hJ-t~q)A3Wi9ZFiwB&Rep=d2N;KL}Hlg0R6!9GK!{ zzeFcqYdRGEShKZb-|UVo4p?#C%BQtzHrvr{Nyr&_Gsnl}m#EL$4$%&Mn_41|&pxwu z9T-EqArC#Z$^Az16i%3@HS-dsu5+X+xQcR+XcKwXSbRxPQv5w(YlmuD->ZxcC7;}p zzzH|pIEB+{%{EF1>ArwAj_Tbdx^L+&H~|b>x}6AZy0hCo-VY literal 0 HcmV?d00001