From e736b930d1438c991ef7d2fd38d086740f0f7b56 Mon Sep 17 00:00:00 2001
From: zhl <zhl010101@gmail.com>
Date: Tue, 26 Feb 2019 17:28:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=BD=BF=E7=94=A8=E7=BB=9F=E4=B8=80=E7=9A=84?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=98=BE=E7=A4=BA=E7=9A=84=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/scripts/progressBar.js   | 2 +-
 assets/scripts/scrollContent.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/assets/scripts/progressBar.js b/assets/scripts/progressBar.js
index 9e23213..d092d6f 100644
--- a/assets/scripts/progressBar.js
+++ b/assets/scripts/progressBar.js
@@ -27,7 +27,7 @@ cc.Class({
             type: cc.Node
         },
         popTitles: [],
-        currentVal: 1000,
+        currentVal: 1024,
         margin: 170,
         pointArr: [],
         cubeArr: []
diff --git a/assets/scripts/scrollContent.js b/assets/scripts/scrollContent.js
index 01dce1e..8132dc7 100644
--- a/assets/scripts/scrollContent.js
+++ b/assets/scripts/scrollContent.js
@@ -79,8 +79,9 @@ cc.Class({
     onLoad() {
         this.loginStatusLabel.node.active = false;
         var processBar = cc.instantiate(this.processBarPrefab);
-        processBar.getComponent('progressBar').currentVal = 50000;
+        // processBar.getComponent('progressBar').currentVal = 50000;
         this.part1.addChild(processBar);
+        processBar.getComponent('progressBar').updateShow(50000);
         var puzzle = cc.instantiate(this.puzzlePrefab);
         this.part2.addChild(puzzle);
         var tip = cc.instantiate(this.tipPrefab);