Merge branch 'master' of https://github.com/cocos2d/cocos-docs

vinsonlou · May 22, 2014 · 74b34cb · 74b34cb
2 parents 2743a08 + 6b9f1cb
commit 74b34cb
Show file tree

Hide file tree

Showing 232 changed files with 7,011 additions and 30 deletions.
diff --git a/catalog/en.md b/catalog/en.md
@@ -100,21 +100,27 @@
 		- [Let's Build a Parkour Game](../tutorial/studio/parkour-game-with-cocostudio/chapter3/en.md)
 		- [Keep Going](../tutorial/studio/parkour-game-with-cocostudio/chapter4/en.md)
 	- Pakour Game with Javascript (Cocos2d-JS v3.0)
-		- [Setup Development Environment](../tutorial/framework/html5/parkour-game-with-javascript-v3.0/chapter1/en.md)
-		- [Hello World Cocos2d-JS](../tutorial/framework/html5/parkour-game-with-javascript-v3.0/chapter2/en.md)
-		- [Make your First Game Scene](../tutorial/framework/html5/parkour-game-with-javascript-v3.0/chapter3/en.md)
-		- [Design and Make Main Game Scene](../tutorial/framework/html5/parkour-game-with-javascript-v3.0/chapter4/en.md)
+		- [1. Setup Development Environment](../tutorial/framework/html5/parkour-game-with-javascript-v3.0/chapter1/en.md)
+		- [2. Hello World Cocos2d-JS](../tutorial/framework/html5/parkour-game-with-javascript-v3.0/chapter2/en.md)
+		- [3. Make your First Game Scene](../tutorial/framework/html5/parkour-game-with-javascript-v3.0/chapter3/en.md)
+		- [4. Design and Make Main Game Scene](../tutorial/framework/html5/parkour-game-with-javascript-v3.0/chapter4/en.md)
+		- [5. Let Player Run Animations](../tutorial/framework/html5/parkour-game-with-javascript-v3.0/chapter5/en.md)
+		- [6. Add Chipmunk Physics to Our Game](../tutorial/framework/html5/parkour-game-with-javascript-v3.0/chapter6/en.md)
+		- [7. Explorer with TiledMap and Camera](../tutorial/framework/html5/parkour-game-with-javascript-v3.0/chapter7/en.md)
+		- [8. Add Coin and Obstacles](../tutorial/framework/html5/parkour-game-with-javascript-v3.0/chapter8/en.md)
+		- [9. Add Game Over Logic And More](../tutorial/framework/html5/parkour-game-with-javascript-v3.0/chapter9/en.md)
+        - [10. Add Audio Effect into Parkour Game](../tutorial/framework/html5/parkour-game-with-javascript-v3.0/chapter10/en.md)
 	- Pakour Game with Javascript (Cocos2d-html5 v2.2.2)
-		- [Setup Development Environment](../tutorial/framework/html5/parkour-game-with-javascript/chapter1/en.md)
-		- [Hello World Cocos2d-html5](../tutorial/framework/html5/parkour-game-with-javascript/chapter2/en.md)
-		- [Make your First Game Scene](../tutorial/framework/html5/parkour-game-with-javascript/chapter3/en.md)
-		- [Design and Make Main Game Scene](../tutorial/framework/html5/parkour-game-with-javascript/chapter4/en.md)
-		- [Let Player Run Animations](../tutorial/framework/html5/parkour-game-with-javascript/chapter5/en.md)
-		- [Add Chipmunk Physics to Our Game](../tutorial/framework/html5/parkour-game-with-javascript/chapter6/en.md)
-		- [Explorer with TiledMap and Camera](../tutorial/framework/html5/parkour-game-with-javascript/chapter7/en.md)
-		- [Add Coin and Obstacles](../tutorial/framework/html5/parkour-game-with-javascript/chapter8/en.md)
-		- [Add Game Over Logic And More](../tutorial/framework/html5/parkour-game-with-javascript/chapter9/en.md)
-        - [Add Audio Effect into Parkour Game](../tutorial/framework/html5/parkour-game-with-javascript/chapter10/en.md)        
+		- [1. Setup Development Environment](../tutorial/framework/html5/parkour-game-with-javascript/chapter1/en.md)
+		- [2. Hello World Cocos2d-html5](../tutorial/framework/html5/parkour-game-with-javascript/chapter2/en.md)
+		- [3. Make your First Game Scene](../tutorial/framework/html5/parkour-game-with-javascript/chapter3/en.md)
+		- [4. Design and Make Main Game Scene](../tutorial/framework/html5/parkour-game-with-javascript/chapter4/en.md)
+		- [5. Let Player Run Animations](../tutorial/framework/html5/parkour-game-with-javascript/chapter5/en.md)
+		- [6. Add Chipmunk Physics to Our Game](../tutorial/framework/html5/parkour-game-with-javascript/chapter6/en.md)
+		- [7. Explorer with TiledMap and Camera](../tutorial/framework/html5/parkour-game-with-javascript/chapter7/en.md)
+		- [8. Add Coin and Obstacles](../tutorial/framework/html5/parkour-game-with-javascript/chapter8/en.md)
+		- [9. Add Game Over Logic And More](../tutorial/framework/html5/parkour-game-with-javascript/chapter9/en.md)
+        - [10. Add Audio Effect into Parkour Game](../tutorial/framework/html5/parkour-game-with-javascript/chapter10/en.md)        
         
 - Cocos Code IDE
     - Custom runtime

diff --git a/catalog/framework/html5/zh.md b/catalog/framework/html5/zh.md
@@ -0,0 +1,76 @@
+# Cocos2d-html5
+
+- [Cocos2d-JS v3.0a2发布说明](../../../manual/framework/html5/v2/release-notes/v3.0a2/release-note/zh.md)
+- [Cocos2d-JS v3.0a2改动列表](../../../manual/framework/html5/v2/release-notes/v3.0a2/changelog/en.md)
+- [Cocos2d-JS v3.0a2升级指南](../../../manual/framework/html5/v2/release-notes/v3.0a/upgrade-guide/zh.md)
+- 综述
+	- [关于Cocos2d-html5](../../../manual/framework/html5/zh.md)
+	- [供NPM使用的Cocos-utils](../../../manual/framework/html5/v2/cocos-utils/zh.md)
+	- [Cocos2d-html5新手入门](../../../manual/framework/html5/v2/getting-started_with-cocos2d-html5/zh.md)
+    - [如何在jsb项目中使用extension](../../../manual/framework/html5/v2/jsb/jsb-extension/zh.md)
+	- [历史发布说明](../../../manual/framework/html5/v2/release-notes/zh.md)
+- 初步了解Cocos2d-html5
+    - [如何搭建Cocos2d-html5开发调试环境](../../../manual/framework/html5/v2/setup-devenv/zh.md)
+    - [如何自定义Cocos2d-html5加载界面](../../../manual/framework/html5/v2/customize-loading-screen/zh.md)
+    - [Cocos2d-html5的屏幕适配方案](../../../manual/framework/html5/v2/resolution-policy-design/zh.md)
+    - [月亮战士——Cocos2d-html5游戏展示](../../../manual/framework/html5/v2/moonwarriors-cocos2d-html5-showcase/zh.md)
+- Cocos2d-html5 v3.0的新功能
+    - [事件管理器](../../../manual/framework/html5/v3/eventManager/zh.md)
+    - [属性风格API](../../../manual/framework/html5/v3/getter-setter-api/zh.md)
+    - [使用cocos console创建工程](../../../manual/framework/html5/v2/cocos-console/zh.md)
+    - [简化的游戏启动流程](../../../manual/framework/html5/v3/cc-game/zh.md)
+    - [对象构造与类继承](../../../manual/framework/html5/v3/inheritance/zh.md)
+    - [Cocos2d-html5模块化](../../../manual/framework/html5/v3/moduleconfig-json/zh.md)
+    - [项目配置文件](../../../manual/framework/html5/v3/project-json/zh.md)
+    - [基础数据类型重构](../../../manual/framework/html5/v3/basic-data/zh.md)
+    - [单例对象重构](../../../manual/framework/html5/v3/singleton-objs/zh.md)
+    - [统一create函数](../../../manual/framework/html5/v3/create-api/zh.md)
+    - [使用cc.loader加载资源](../../../manual/framework/html5/v3/cc-loader/zh.md)
+    - [资源路径工具cc.path](../../../manual/framework/html5/v3/cc-path/zh.md)
+    - [系统信息](../../../manual/framework/html5/v3/cc-sys/zh.md)
+    - [异步函数工具cc.async](../../../manual/framework/html5/v3/cc-async/zh.md)
+    - [cc.saxParser的改造](../../../manual/framework/html5/v3/cc-saxparser/zh.md)
+    - [cc.spriteFrameCache的改造](../../../manual/framework/html5/v3/cc-spriteframecache/zh.md)
+    - [cc.FileUtils的移除](../../../manual/framework/html5/v3/cc-fileutils/zh.md)
+    - [cc.log的改造](../../../manual/framework/html5/v3/cc-log/zh.md)
+    - [其他3.0版的API改动](../../../manual/framework/html5/v3/more-change-from-v2-to-v3/zh.md)
+    - Bake Node（进行中）
+    - 简化action的使用（进行中）
+
+### Cocos2d-JS教程
+- 怎样用Cocos2d-html5制作一款横版动作游戏
+ 	- [怎样用Cocos2d-html5制作一款横版动作游戏 (1)](../../../tutorial/framework/html5/how-to-to-make-a-acting-game-by-cocos-html5/part1/zh.md)
+ 	- [怎样用Cocos2d-html5制作一款横版动作游戏 (2)](../../../tutorial/framework/html5/how-to-to-make-a-acting-game-by-cocos-html5/part2/zh.md)
+ 	- [怎样用Cocos2d-html5制作一款横版动作游戏 (3)](../../../tutorial/framework/html5/how-to-to-make-a-acting-game-by-cocos-html5/part3/zh.md)
+- 脚本篇：用Javascript来写一个跑酷游戏(Cocos2d-JS v3.0)
+	- [建立Cocos2d-JS开发环境](../../../tutorial/framework/html5/parkour-game-with-javascript-v3.0/chapter1/zh.md)
+	- [你好Cocos2d-JS](../../../tutorial/framework/html5/parkour-game-with-javascript-v3.0/chapter2/en.md)
+	- [建立第一个游戏场景](../../../tutorial/framework/html5/parkour-game-with-javascript-v3.0/chapter3/en.md)
+	- [设计实现主场景](../../../tutorial/framework/html5/parkour-game-with-javascript-v3.0/chapter4/en.md)
+- 脚本篇：用Javascript来写一个跑酷游戏(Cocos2d-html5 v2.2.2)
+	- [建立html5开发环境](../../../tutorial/framework/html5/parkour-game-with-javascript/chapter1/zh.md)
+	- [你好Cocos2d-html5](../../../tutorial/framework/html5/parkour-game-with-javascript/chapter2/en.md)
+	- [建立第一个游戏场景](../../../tutorial/framework/html5/parkour-game-with-javascript/chapter3/en.md)
+	- [设计实现主场景](../../../tutorial/framework/html5/parkour-game-with-javascript/chapter4/en.md)
+	- [让角色运行动画](../../../tutorial/framework/html5/parkour-game-with-javascript/chapter5/en.md)
+	- [在游戏中加入Chipmunk物理引擎](../../../tutorial/framework/html5/parkour-game-with-javascript/chapter6/en.md)
+	- [使用瓦片地图和相机](../../../tutorial/framework/html5/parkour-game-with-javascript/chapter7/en.md)
+	- [增加金币和障碍物](../../../tutorial/framework/html5/parkour-game-with-javascript/chapter8/en.md)
+	- [游戏结束逻辑](../../../tutorial/framework/html5/parkour-game-with-javascript/chapter9/en.md)
+	- [对源码进行混淆](../../../tutorial/framework/html5/parkour-game-with-javascript/chapter10/en.md)
+	- 在浏览器中对Javascript代码进行调试
+	- 通过Cocos2d-x Javascript Binding以原生方式编译iOS和Android版
+
+## 开发后期和第三方集成
+### 绑定
+	- 如何实现Javascript和C++的相互调用
+	- 如何通过自动绑定把C++接口批量导到Javascript
+	- Javascript绑定的远程调试
+- 如何使用iOS游戏内付费IAP
+	- [如何使用iOS游戏内付费IAP(C++篇)](../../../tutorial/framework/html5/jsb-ios-iap/ios-storekit-integration-in-c++/zh.md)
+	- [如何使用iOS游戏内付费IAP(JSB篇)](../../../tutorial/framework//html5/jsb-ios-iap/ios-storekit-integration-in-jsb/zh.md)
+
+
+### 打包
+### 发布
+### 第三方库集成