From cbb2a27f0120c37b045dc54b289b45a3c1f01f72 Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Tue, 22 Oct 2019 21:51:19 +0800
Subject: [PATCH] itemShop

---
 _server/MotaAction.g4     | 2 +-
 _server/editor_blockly.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/_server/MotaAction.g4 b/_server/MotaAction.g4
index c5fe82ce..2e72d00d 100644
--- a/_server/MotaAction.g4
+++ b/_server/MotaAction.g4
@@ -2879,7 +2879,7 @@ ActionParser.prototype.parse = function (obj,type) {
         var text_choices = null;
         for(var ii=obj.choices.length-1,choice;choice=obj.choices[ii];ii--) {
           text_choices = MotaActionBlocks['shopItemChoices'].xmlText([
-            choice.id, choice.count, choice.money, choice.sell == null ? "" : (""+choice.sell),
+            choice.id, choice.number, choice.money, choice.sell == null ? "" : (""+choice.sell),
             text_choices
           ]);
         }
diff --git a/_server/editor_blockly.js b/_server/editor_blockly.js
index ec338257..40a5bef5 100644
--- a/_server/editor_blockly.js
+++ b/_server/editor_blockly.js
@@ -54,7 +54,7 @@ editor_blockly = function () {
         "item": true,
         "textInList": "道具商店",
         "choices": [
-          {"id": "yellowKey", "count": 10, "money": 10}
+          {"id": "yellowKey", "number": 10, "money": 10}
         ]
       },{
         "id": "keyShop1",