bugfix

nitinmukesh · Jan 8, 2015 · 9f3708d · 9f3708d
1 parent 9cecf36
commit 9f3708d
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/conf/casino.conf.js b/conf/casino.conf.js
@@ -36,7 +36,7 @@ exports = module.exports = {
 				no_joker: true,
 				no_number: [],
 				ready_countdown: 10,
-				turn_countdown: 10,
+				turn_countdown: 20,
 				ante: 50,			// 锅底
 				bet_min: 50,		// 最少投注
 				bet_max: -1,		// 最大投注
@@ -56,7 +56,7 @@ exports = module.exports = {
 				no_joker: true,
 				no_number: [2,3,4,5,6],
 				ready_countdown: 10,
-				turn_countdown: 10,
+				turn_countdown: 20,
 				ante: 500,
 				bet_min: 500,
 				bet_max: -1,
@@ -76,7 +76,7 @@ exports = module.exports = {
 				no_joker: true,
 				no_number: [],
 				ready_countdown: 10,
-				turn_countdown: 10,
+				turn_countdown: 20,
 				limit_rule: 0,		// 0: limit, 1: pot limit, 2: no limit
 				limit: 100,			// big blind
 				limit_cap: 200,		// -1, means no limit
@@ -93,7 +93,7 @@ exports = module.exports = {
 				no_joker: true,
 				no_number: [],
 				ready_countdown: 10,
-				turn_countdown: 10,
+				turn_countdown: 20,
 				limit_rule: 1,		// 0: limit, 1: pot limit, 2: no limit
 				limit: 100,			// big blind
 				limit_cap: -1,		// -1, means no limit
@@ -110,7 +110,7 @@ exports = module.exports = {
 				no_joker: true,
 				no_number: [],
 				ready_countdown: 10,
-				turn_countdown: 10,
+				turn_countdown: 20,
 				limit_rule: 2,		// 0: limit, 1: pot limit, 2: no limit
 				limit: 100,			// big blind
 				limit_cap: -1,		// -1, means no limit

diff --git a/dump.rdb b/dump.rdb
diff --git a/www/index.html b/www/index.html
@@ -13,7 +13,7 @@
 </head>
 <body>
 	<div id='env'>
-		<h3 id="roomname">not in room</h3>
+		<h3 id="roomname"></h3>
 		<div id='roomdesc'></div>
 		<h3 id='sharedcards'></h3>
 		<h3 id='pot'></h3>

diff --git a/www/js/en.lang.js b/www/js/en.lang.js
@@ -34,6 +34,7 @@ hotjs.i18n.put('en', {
 	'showcard': 'Show Card',
 	'call': 'Call',
 	'raise': 'Raise',
+	'all_in': 'All In',
 	'fold': 'Fold/Give Up',
 	'check': 'Check',
 	'pk': 'PK',

diff --git a/www/js/zh.lang.js b/www/js/zh.lang.js
@@ -28,13 +28,14 @@ hotjs.i18n.put('zh', {
 	'pot': '彩池',
 	'shared cards': '公牌',
 	'private cards': '手牌',
-	'my cards': '我的牌',
+	'my cards': '我的手牌',
 	'bet': '下注',
 	'ready': '准备',
 	'seecard': '看牌',
 	'showcard': '亮牌',
 	'call': '跟注',
 	'raise': '加注',
+	'all_in': '全下',
 	'fold': '盖牌/弃牌',
 	'check': '看牌',
 	'pk': '比牌',

diff --git a/wwwsrc/js/en.lang.js b/wwwsrc/js/en.lang.js
@@ -34,6 +34,7 @@ hotjs.i18n.put('en', {
 	'showcard': 'Show Card',
 	'call': 'Call',
 	'raise': 'Raise',
+	'all_in': 'All In',
 	'fold': 'Fold/Give Up',
 	'check': 'Check',
 	'pk': 'PK',

diff --git a/wwwsrc/js/zh.lang.js b/wwwsrc/js/zh.lang.js
@@ -28,13 +28,14 @@ hotjs.i18n.put('zh', {
 	'pot': '彩池',
 	'shared cards': '公牌',
 	'private cards': '手牌',
-	'my cards': '我的牌',
+	'my cards': '我的手牌',
 	'bet': '下注',
 	'ready': '准备',
 	'seecard': '看牌',
 	'showcard': '亮牌',
 	'call': '跟注',
 	'raise': '加注',
+	'all_in': '全下',
 	'fold': '盖牌/弃牌',
 	'check': '看牌',
 	'pk': '比牌',