首页 发现 帮助
注册 登录
bixel
/
snaky-particles
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

Merge remote-tracking branch 'origin/development' into models

Conflicts:
	js/controller.js
Dima Mironov 10 年之前
父节点
287fbc73dd 421c7a4f3d
当前提交
afc00bc587
共有 6 个文件被更改，包括 75 次插入 和 13 次删除
分列视图 显示文件统计
  1. 3 3
      css/style.css
  2. 37 6
      index.html
  3. 23 2
      js/controller.js
  4. 1 0
      js/models/physicist.js
  5. 10 0
      js/ng-app.js
  6. 1 2
      js/script.js

+ 3 - 3
css/style.css
查看文件 

@@ -5,12 +5,12 @@ body {
 
 }
 
 
 #demoCanvas {
 
-    margin: 0px auto;
 
+    margin: 40px auto 0px auto;
 
     padding: 0px auto;
 
     background: #1F2921;
 
 }
 
 
-.newsticker	 {
 
+/* .newsticker	 {
 
 	text-align: center;
 
 	font-size:20px;
 
 	color: #FFFFFF;
 
@@ -59,4 +59,4 @@ a:hover, a:active {
 
     background-color: #F88000;
 
 }
 
 
-
 
+*/

+ 37 - 6
index.html
查看文件 

@@ -2,6 +2,12 @@
 
 <html>
 
 <head>
 
 	<title>Snaky Particles</title>
 
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
 
+
 
+  <script src="https://code.jquery.com/jquery-2.1.4.min.js"></script>
 
+  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js"></script>
 
+
 
 	<script src="https://code.createjs.com/createjs-2015.05.21.combined.js"></script>
 
 	<script src="js/views/physicist.js"></script>
 
 	<script src="js/views/particle.js"></script>
 
@@ -10,18 +16,43 @@
 
 	<script src="js/models/particles.json.js"></script>
 
 	<script src="js/models/collectible.js"></script>
 
 	<script src="js/models/snake.js"></script>
 
-	<script src="js/controller.js"></script>
 
+  <script src="js/controller.js"></script>
 
 	<script src="js/script.js"></script>
 
+  <script src="js/ng-app.js"></script>
 
 
-	<!--script src="js/newsticker.js"></script-->
 
-	<!--script src="js/navigation.js"></script-->
 
   <link rel="stylesheet" type="text/css" href="css/style.css">
 
   <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
 
   <link rel="icon" href="img/favicon.ico" type="image/x-icon">
 
 </head>
 
 <body onload="init();">		
-<div>
 
-	<!--canvas id="navigation">alternate content</canvas-->
 
+  <nav class="navbar navbar-default navbar-fixed-top" ng-app="interface">
 
+    <div class="container" ng-controller="InterfaceController as interface">
 
+    <div class="container-fluid">
 
+      <!-- Brand and toggle get grouped for better mobile display -->
 
+      <div class="navbar-header">
 
+        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
 
+          <span class="sr-only">Toggle navigation</span>
 
+          <span class="icon-bar"></span>
 
+          <span class="icon-bar"></span>
 
+          <span class="icon-bar"></span>
 
+        </button>
 
+        <a class="navbar-brand" href="#">Snaky Particles</a>
 
+      </div>
 
+
 
+      <!-- Collect the nav links, forms, and other content for toggling -->
 
+      <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
 
+        <ul class="nav navbar-nav">
 
+          <li><a href="#" id="a-start-game">Start <span class="sr-only">(current)</span></a></li>
 
+        </ul>
 
+        <ul class="nav navbar-nav navbar-right">
 
+          <p class="navbar-text">Score: <span id="score"></span></p>
 
+        </ul>
 
+      </div><!-- /.navbar-collapse -->
 
+    </div><!-- /.container-fluid -->
 
+    </div>
 
+</nav>
 
+<!--div>
 
+	<canvas id="navigation">alternate content</canvas>
 
 
 	<article class="navbar">
 
   	<ul class="nav">
 
@@ -33,7 +64,7 @@
 
     	<li class="nav"><a href="end.html">Quit</a></li>
 
   	</ul>
 
 	</article>
 
-</div>
 
+</div-->
 
 
 <div>
 
 	<!--canvas id="newsticker">alternate content</canvas-->

+ 23 - 2
js/controller.js
查看文件 

@@ -11,6 +11,7 @@ var Controller = function(){
 
 	this.counter = 0;
 
 
 	var pos0 = {x: -1, y: -1};
 
+    this.score = 0;
 
 	
 	var pp = possible_particles();
 
 
@@ -68,6 +69,8 @@ Controller.prototype.start_game = function(){
 
 	this.time = 0;
 
 	this.score = 0;
 
 
+    this.update_interface();
 
+
 
     for(phModel in controller.snake.physicists){
 
         var model = controller.snake.physicists[phModel];
 
         var phView = new PhysicistView(model);
 
@@ -277,6 +280,24 @@ Controller.prototype.physicists_count = function(){
 
 }
 
 
 Controller.prototype.game_over = function(){
 
-	alert("Game Over!");
 
-	// ...
 
+	alert("Game Over!\nScore: " + this.score);
 
+	this.snake = new Snake(this.initial_length);
 
+	this.canTurn = true;
 
+	this.counter = 0;
 
+	createjs.Ticker.reset();
 
+	createjs.Ticker.init();
 
+	for(var view in this.views){
 
+		this.stage.removeChild(this.views[view]);
 
+    }
 
+	for(var collectible in this.collectibles){
 
+		this.stage.removeChild(this.collectibles[collectible]);
 
+    }
 
+    this.collectibles = [];
 
+	this.views = [];
 
+	this.stage.clear();
 
+	this.start_game()// ...
 
+}
 
+
 
+Controller.prototype.update_interface = function(){
 
+    $("#score").html(this.score);
 
 }

+ 1 - 0
js/models/physicist.js
查看文件 

@@ -11,4 +11,5 @@ Physicist.prototype.collect = function(collectible) {
 
 	controller.score += collectible.points;
 
 	controller.remove_collectible(collectible);
 
 	controller.counter += 1;
 
+    controller.update_interface();
 
 };

+ 10 - 0
js/ng-app.js
查看文件 

@@ -0,0 +1,10 @@
 
+/* (function(){
 
+    var app = angular.module('interface', []);
 
+
 
+    app.controller('InterfaceController', function(){
 
+        this.score = 0;
 
+        this.score = controller.score;
 
+    });
 
+}()); */
 
+
 
+

+ 1 - 2
js/script.js
查看文件 

@@ -6,7 +6,6 @@ var maximum_grid_size = 20;
 
 function init() {
 
     // Do not use this for now...
 
     // createjs.MotionGuidePlugin.install();
 
-
 
     controller = new Controller;
 
 
     resize();
 
@@ -25,7 +24,7 @@ function init() {
 
 }
 
 
 function resize() {
 
-    var height = window.innerHeight;
 
+    var height = window.innerHeight - 50;
 
     var width = window.innerWidth;
 
     if((height / minimum_cell_size) > maximum_grid_size){
 
         window.cell_size = height / maximum_grid_size;