Merge pull request #19 from soltycabbage/window-size

ゲームの画面サイズをちょっと広くするよ
soltycabbage · Dec 31, 2013 · f08c0ef · f08c0ef
2 parents 40d897b + a69dd7d
commit f08c0ef
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 22 deletions.
diff --git a/public/cocos2d.js b/public/cocos2d.js
@@ -5,7 +5,7 @@
         box2d:false,
         chipmunk:false,
         showFPS:true,
-        frameRate:60,
+        frameRate:30,
         loadExtension:false,
         renderMode:0,       //Choose of RenderMode: 0(default), 1(Canvas only), 2(WebGL only)
         tag:'gameCanvas', //the dom element to run cocos2d on

diff --git a/public/css/layout.css b/public/css/layout.css
@@ -6,9 +6,12 @@
 #bq-canvas-container {
     position: relative;
     overflow: hidden;
-    width: 800px;
-    height: 450px;
+    width: 1040px;
+    height: 680px;
     margin: 0px auto;
+    -moz-user-select: none;
+    -khtml-user-select: none;
+    -webkit-user-select: none;
 }
 
 .bq-menu {

diff --git a/public/js/src/entity/player.js b/public/js/src/entity/player.js
@@ -7,7 +7,7 @@
  * @type {*|void|Object|Function}
  */
 var Player = Entity.extend({
-    moveSpeed: 2,                // 1frameの移動量(px)
+    moveSpeed: 4,                // 1frameの移動量(px)
     animationSpeed:0.15,         // delay on animation
     direction: EntityState.Direction.bottom, // 向いている方向
     state:EntityState.Mode.stop,           // 動いてるとか止まってるとかの状態

diff --git a/public/js/src/entityManager.js b/public/js/src/entityManager.js
@@ -47,7 +47,7 @@ bq.EntityManager = cc.Class.extend({
         if (!this.otherPlayers_[moveData.userId]) {
             this.createOtherPlayer(moveData);
         } else {
-            var act = cc.MoveTo.create(0.1, cc.p(moveData.x, moveData.y));
+            var act = cc.MoveTo.create(0.2, cc.p(moveData.x, moveData.y));
             var otherPlayer = this.otherPlayers_[moveData.userId];
             otherPlayer.runAction(act);
         }

diff --git a/public/js/src/scene/login.js b/public/js/src/scene/login.js
@@ -14,11 +14,15 @@ var LoginLayer = cc.Layer.extend({
     onEnter: function() {
         this._super();
         var size = cc.Director.getInstance().getWinSize();
+        var title = bq.Label.createWithShadow('- Beam Quest -', 50);
+        title.setPosition(cc.p(size.width/2, size.height - 100));
+        this.addChild(title);
+
         var label = bq.Label.create('キャラクター名を入力してください。', 16);
         label.setPosition(cc.p(size.width/2, size.height/2 + 50));
         this.addChild(label);
 
-        var nameField = cc.TextFieldTTF.create(this.defaultPlaceHolder_, 'pixelMplus', 16);
+        var nameField = cc.TextFieldTTF.create(this.defaultPlaceHolder_, 'pixelMplus', 32);
         this.addChild(nameField);
         nameField.setPosition(cc.p(size.width / 2, size.height / 2));
         this.nameField_ = nameField;
@@ -95,20 +99,6 @@ var LoginLayer = cc.Layer.extend({
         this.addChild(failedLabel);
     },
 
-    /**
-     * 入力されたUserIDが正しいか判定する
-     * @param {string} userId
-     * @return {boolean}
-     * @private
-     */
-    isValidUserId_: function(userId) {
-        var valid = true;
-        // TODO: 条件増やす
-        valid = (userId.length > 0);
-
-        return valid;
-    },
-
     /**
      * パスワードの代わりにランダムハッシュを使う
      * @return {string}

diff --git a/public/main.js b/public/main.js
@@ -18,8 +18,8 @@ var cocos2dApp = cc.Application.extend({
         var director = cc.Director.getInstance();
 
         // cc.EGLView.getInstance()._adjustSizeToBrowser();
-        //cc.EGLView.getInstance()._resizeWithBrowserSize(true);
-        //cc.EGLView.getInstance().setDesignResolutionSize(640, 450, cc.RESOLUTION_POLICY.SHOW_ALL);
+        // cc.EGLView.getInstance()._resizeWithBrowserSize(true);
+        cc.EGLView.getInstance().setDesignResolutionSize(1040, 680, cc.RESOLUTION_POLICY.SHOW_ALL);
 
         // turn on display FPS
         director.setDisplayStats(this.config['showFPS']);