Merge pull request #40 from DaoCasino/h_develop

H develop
DaoCasino · Dec 4, 2017 · 675bb2e · 675bb2e
2 parents 9dc6d4b + ac44471
commit 675bb2e
Show file tree

Hide file tree

Showing 15 changed files with 287 additions and 166 deletions.
diff --git a/DApps/FindTheEthereum b/DApps/FindTheEthereum
diff --git a/DApps/dicedapp_v2/dapp_logic.js b/DApps/dicedapp_v2/dapp_logic.js
@@ -12,7 +12,7 @@ DCLib.defineDAppLogic('dicedapp_v2', function(){
 
 	var Roll = function(user_bet, user_num, random_hash){
 		// convert 1BET to 100000000
-		user_bet = DCLib.Utils.bet4dec(user_bet)
+		user_bet = DCLib.Utils.bet2dec(user_bet)
 
 		// generate random number
 		const random_num = DCLib.numFromHash(random_hash, 0, 65536)

diff --git a/DApps/dicedapp_v2/index.html b/DApps/dicedapp_v2/index.html
@@ -23,7 +23,7 @@
 
 				// Create our DApp
 				DCLib.on('ready', function(){
-					window.MyDApp = new DCLib.DApp({code :'dicedapp_v2'})
+					window.MyDApp = new DCLib.DApp({code : 'dicedapp_v2'})
 				})
 
 
@@ -43,15 +43,16 @@
 
 			function startGame(deposit){
 				MyDApp.connect({
-					bankroller : 'auto', 
-					paychannel : { deposit : deposit } 
+					bankroller : '0x146c5e3b9395738eb67feceb5e37cd5a56d63342', 
+					paychannel : { deposit : deposit } ,
+					gamedata   : {type:'uint', value: [0, 0, 0]}
 				},
 				function(connected, info){
 					console.log('connect result:', connected)
 					console.log('connect info:', info)
 					if (!connected) return 
 
-					let maxbet = DCLib.Utils.bet2dec( info.channel.player_deposit )
+					let maxbet = DCLib.Utils.dec2bet( info.channel.player_deposit )
 
 					$('#user_bet')[0].max = Math.ceil( maxbet )
 					$('#user_bet').val( (maxbet*0.1).toFixed(2) )
@@ -198,7 +199,7 @@ <h3>1. Open game-channel</h3>
 				<form>
 					<label>
 						Set game deposit:
-						<input id="user_deposit" type="number" value="1.1" min="0" max="4" step="0.1">
+						<input id="user_deposit" type="number" value="1.1" min="0" max="4" step="0.001">
 					</label>
 					<input type="submit" value="Set">
 				</form>
@@ -212,7 +213,7 @@ <h3>1. Open game-channel</h3>
 				<h3>2. Play</h3>
 				<label>
 					your bet:
-					<input id="user_bet" type="number" value="1" min="0" max="4" step="0.1">
+					<input id="user_bet" type="number" value="1" min="0" max="4" step="0.001">
 				</label>
 				<label>
 					your num:

diff --git a/DApps/dicedapp_v2/lib/DC.js b/DApps/dicedapp_v2/lib/DC.js
diff --git a/DApps/example.zip b/DApps/example.zip
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "BankRollerApp",
-	"version": "0.2.3",
+	"version": "0.2.5",
 	"description": "Dao.Casino app for bankroller",
 	"author": "Dao Casino <team@dao.casino>",
 	"repository": {

diff --git a/public/index.html b/public/index.html
@@ -16,7 +16,7 @@
 		<script src="https://cdnjs.cloudflare.com/ajax/libs/systemjs/0.20.19/system-production.js" type="text/javascript"></script>
 	</head>
 	<body>
-		<noscript>You need to enable JavaScript to run this app.</noscript>
+		<noscript>You need to enable JavaScript to run this app</noscript>
 
 		<app></app>
 

diff --git a/public/server.electron.js b/public/server.electron.js
@@ -23,7 +23,7 @@ const filetypes = {
  */
 
 // Find DApps folder for current ENV
-let dapps_path = __dirname+_config.dapps_path
+let dapps_path = __dirname + _config.dapps_path
 if (typeof app != 'undefined') {
 	dapps_path = (app.getPath('userData') + _config.dapps_path).split('//').join('/')