diff --git a/assets/scripts/Operation/Operation.ts b/assets/scripts/Operation/Operation.ts
index 96c92179..1e8b0446 100644
--- a/assets/scripts/Operation/Operation.ts
+++ b/assets/scripts/Operation/Operation.ts
@@ -3,10 +3,10 @@ import jcgamelog from '../jcfw/service/jcgamelog';
 const { ccclass, property } = cc._decorator;
 
 export enum OperationType {
-	LOGIN = 'login', // 登录流程
-	WALLET = 'wallet', // 钱包相关
-	UIMAIN = 'uimain', // 主界面
-	BUTTON = 'clickbtn', // 点击按钮
+	LOGIN = 'login', // 
+	WALLET = 'wallet', // 
+	UIMAIN = 'uimain', //
+	BUTTON = 'clickbtn', // 
 }
 
 @ccclass
diff --git a/assets/scripts/netBattle/battlenetmanage.js b/assets/scripts/netBattle/battlenetmanage.js
index d6a6b18b..a74bb77d 100644
--- a/assets/scripts/netBattle/battlenetmanage.js
+++ b/assets/scripts/netBattle/battlenetmanage.js
@@ -64,7 +64,7 @@ var battlrsp = function () {
 
   this.recvMsg = function (mid, msg) {
     if (mid == 101) {
-      //心跳包无视
+   
       return;
     }
     if (this.functionarr[mid]) {
@@ -120,7 +120,7 @@ var NetWorkManage = function () {
     this.online = false;
     this.joined = false;
     this.AliveCount = 0;
-    console.log("clearSocket");
+
 
     if (this.engine) {
       this.engine.disconnect();
@@ -136,10 +136,10 @@ var NetWorkManage = function () {
       this.initIng = false;
       this.clean();
       cc.director.emit("SOCKETCLOSE");
-      console.log("加入房间失败");
+   
       return;
     }
-    SDKManage.logEvent("joinroom", "加入房间");
+    SDKManage.logEvent("joinroom", "joinroom");
     this.joined = true;
     // this.uuid = res.player_id
     // this.roomid = res.room_uuid
@@ -204,7 +204,7 @@ var NetWorkManage = function () {
     this.roomid = msg.room_uuid;
     this.timeNow = new Date().getTime();
     this.server_info = msg.server_info;
-    console.log("准备进入游戏01");
+   
     this.changescene();
   };
   this.onSMGameStart = function (msg) {
@@ -240,7 +240,7 @@ var NetWorkManage = function () {
     this.engine.bindclose(this.onnetclose.bind(this));
   };
   this.onSMReconnect = function (res) {
-    console.log("服务器返回重连消息------------");
+
     this.recing = true;
     console.log(res);
     if (res.errcode != 0) {
@@ -252,7 +252,7 @@ var NetWorkManage = function () {
     this.online = false;
   };
   this.onconnectnormal = function () {
-    SDKManage.logEvent("scoket_connect", "战斗scoket连接成功");
+    SDKManage.logEvent("scoket_connect", "socket connect");
     this.online = true;
     this.joinroom();
     var self = this;
@@ -263,12 +263,10 @@ var NetWorkManage = function () {
       self.initIng = false;
       self.clean();
       cc.director.emit("SOCKETCLOSE");
-      console.log("join 无响应");
     }, 5000);
   };
 
   this.onconnectreconnect = function () {
-    console.log("网络重连成功------------");
     this.online = true;
     this.recing = false;
     this.engine.sendmsg("CMReconnect", {
@@ -348,8 +346,6 @@ var NetWorkManage = function () {
     console.log(msg);
     this.engine.sendmsg("CMJoin", msg);
     if (opt.team_uuid) {
-      //加入语音房间
-      console.log(`进入语音房间：${opt.team_uuid}---player:${opt.account_id}`);
       if (cc.sys.os == cc.sys.OS_ANDROID) {
         jsb.reflection.callStaticMethod(
           "org/cocos2dx/javascript/AppActivity",
@@ -417,9 +413,7 @@ var NetWorkManage = function () {
       self.initIng = false;
     }, 10000);
 
-    SDKManage.logEvent("reqbattle", "请求战斗");
-    console.log(opt);
-    console.log("战斗开始");
+    SDKManage.logEvent("reqbattle", "battlerequest");
 
     this.clean();
 
@@ -559,8 +553,6 @@ var NetWorkManage = function () {
   this.getVoipSign = function (gid) {
     if (cc.sys.platform == cc.sys.WECHAT_GAME) {
       var cb = function (res) {
-        console.log("wxvvvvvvvvvvvvvv");
-        console.log(res);
         if (cc.gameMgr && cc.gameMgr.uic) {
           cc.gameMgr.uic.startTeamTalk(res);
         }
diff --git a/assets/scripts/netBattle/jcmatchvs.js b/assets/scripts/netBattle/jcmatchvs.js
index ab77948e..a08f2c56 100644
--- a/assets/scripts/netBattle/jcmatchvs.js
+++ b/assets/scripts/netBattle/jcmatchvs.js
@@ -78,23 +78,6 @@ var JCMatchVS = function () {
 	};
 	this.connectNet = function () {
 	  var url = BaseNet.getGameServer(this.team_uuid);
-		// if (this.offical) {
-		// 	url = url_offical + '1' + url_offical2;
-		// 	if (this.team_uuid && this.team_uuid != '') {
-		// 		if (this.team_uuid.indexOf('_') != -1) {
-		// 			url =
-		// 				url_offical +
-		// 				this.team_uuid.split('_')[0] +
-		// 				url_offical2;
-		// 		}
-		// 	} else {
-		// 		if (cc.SDKManage.NodeId) {
-		// 			url = url_offical + cc.SDKManage.NodeId + url_offical2;
-		// 		}
-		// 	}
-		// }
-
-		console.log(url);
 		this.msgManager.connectNet(url, this._netCallback.bind(this));
 	};
 	this.disconnect = function () {
@@ -106,7 +89,7 @@ var JCMatchVS = function () {
 	};
 	this._netCallback = function (msg, err) {
 		if (msg == 'connect') {
-			console.log('connect ok');
+			
 			this.reconnectcount = 0;
 			var res = {
 				status: 0,
@@ -138,9 +121,7 @@ var JCMatchVS = function () {
 				this.chonglianing = true;
 				setTimeout(() => {
 					this.chonglianing = false;
-					console.log(
-						'reconnectingreconnectingreconnectingreconnectingreconnecting'
-					);
+					
 					this.connectNet();
 				}, 3000);
 			}
diff --git a/assets/scripts/netBattle/net/msgmanager.js b/assets/scripts/netBattle/net/msgmanager.js
index 1cb05108..3e42c584 100644
--- a/assets/scripts/netBattle/net/msgmanager.js
+++ b/assets/scripts/netBattle/net/msgmanager.js
@@ -30,21 +30,21 @@ var MsgManager = cc.Class({
         this._recvMsgQueue[msgId] = vo;
     },
     sendMsg:function(msgId, msg) {
-       // cc.log("请求信息id:" + msgId+"=="+msg);
+     
         var msgVo = this._sendMsgQueue[msgId];
-       // console.log("test"+JSON.stringify(msgVo));
+      
         var data = msg? msgVo.protoData.encode(msg).toArrayBuffer():null;
-        //cc.log("发送消息中..." + JSON.stringify(data));
+        
         var pkgdata = this._buf.buildPackMsg(msgId, data);
         if(pkgdata && this._ws){
             //console.log(Base64.arrayBufferToBase64(pkgdata));
             //console.log("[sendmsg]:"+msgId + ":" + msg);
             this._ws.send(pkgdata);
         }
-        //cc.log("发送消息成功!");
+
     },
     parseMsg:function(msgId, msgByte) {
-      //  console.log("信息回调id:" + msgId+ ":"+msgByte);
+
         var msgVo = this._recvMsgQueue[msgId];
         if(msgVo == undefined){
             console.log("[undefined msg]"+msgId);
@@ -53,11 +53,9 @@ var MsgManager = cc.Class({
         var msg = msgVo.protoData.decode(msgByte);
         if(msgVo.callBack) {
 
-            //统一处理errorcode
+    
             if(msg && msg.errorcode){
-                //TODO 统一处理errorcode
-                //1:根据errorcode获取对应的文本信息
-                //2:提示给用户
+            
                 
             }
 
@@ -70,7 +68,7 @@ var MsgManager = cc.Class({
     },
 
     connectNet: function(host, cb){
-        console.log("准备链接socket---------------");
+       
         this._netcb = cb;
         //this._ws.setHost(host);
         this._ws.url = host;
@@ -83,9 +81,7 @@ var MsgManager = cc.Class({
     },
 
     onConnect:function(){
-        console.log("onConnectonConnectonConnectonConnect")
-
-
+       
         this._isconnected = true;
         if(this._netcb){
             this._netcb("connect", 0);
@@ -93,7 +89,7 @@ var MsgManager = cc.Class({
     },
 
     onClose:function(err){
-        console.log("onCloseonCloseonCloseonCloseonClose")
+      
         this._isconnected = false;
         if(this._netcb){
             var n = err.code? err.code: 0;
@@ -102,7 +98,7 @@ var MsgManager = cc.Class({
     },
 
     onError:function(err){
-        console.log("onErroronErroronErroronErroronError")
+     
         this._isconnected = false;
         if(this._netcb){
             var n = err.code? err.code: 0;
diff --git a/assets/scripts/netBattle/net/sock.js b/assets/scripts/netBattle/net/sock.js
index b816bae3..3dbbd73a 100644
--- a/assets/scripts/netBattle/net/sock.js
+++ b/assets/scripts/netBattle/net/sock.js
@@ -75,7 +75,7 @@ var Sock = cc.Class({
             };
 
         }else if(typeof(wx) != 'undefined'){
-            //todo: weixin websocket
+          
         }
     },
 
diff --git a/assets/scripts/netBattle/nettest.js b/assets/scripts/netBattle/nettest.js
index 13ab4666..b3298dc8 100644
--- a/assets/scripts/netBattle/nettest.js
+++ b/assets/scripts/netBattle/nettest.js
@@ -112,40 +112,17 @@ cc.Class({
 
         this.pageview.node.on("page-turning", this.callback, this);
 
-        // this.spine1.changepic("tou",this.tex1)
-        // this.spine2.changepic("tou",this.tex2)
-
-        // this.spine1.setAnimation(0,"atk")
-
-        // if (CC_JSB) {
-        //     if (cc.sys.os == cc.sys.OS_ANDROID) {
-        //         // 反射调用原生的隐藏方法
-        //         jsb.reflection.callStaticMethod(
-        //             "org/cocos2dx/javascript/AppActivity",
-        //             "showtips",
-        //             "()V"
-        //         );
-        //     }
-
-        //     jsb.reflection.callStaticMethod(
-        //         "org/cocos2dx/javascript/AppActivity",
-        //         "hideSplash",
-        //         "()V"
-        //     );
-
-        // }
+        
 
         cc.battleCache.loadwave();
         cc.highmode = true;
-        SDKManage.nickName = "战斗测试";
+        SDKManage.nickName = "battletest";
         cc.game.setFrameRate(60);
         cc.macro.CLEANUP_IMAGE_CACHE = false;
         cc.dynamicAtlasManager.enabled = true;
 
         cc.mygamedelta = 0.0167;
-        // cc.view.enableAntiAlias(false)
-        // cc.dynamicAtlasManager.showDebug(true);
-        //cc.view.enableRetina(false)
+
         this.canclick = true;
         var self = this;
     },
@@ -212,18 +189,18 @@ cc.Class({
         cc.uiHelper.wssCacert = this.wssCacert;
 
         battlenet.initengine({
-            account_id: "6000_" + new Date().getTime() + "", //账号id account_id
-            player_count: 4, //玩家数(单人时为1)
-            energy_shield: 0, //能量护盾
-            baseskin: [cc.heroidx + 1, 13001, 15001, 1], //皮肤id，cc.heroidx+1
-            team_uuid: testid, //队伍唯一id (没组队时为空字符串)
-            team_mode: 0, //队伍模式 0:单人 1:多人
-            auto_fill: true, //是否自动填充玩家
+            account_id: "6000_" + new Date().getTime() + "", 
+            player_count: 4, 
+            energy_shield: 0, 
+            baseskin: [cc.heroidx + 1, 13001, 15001, 1], 
+            team_uuid: testid, 
+            team_mode: 0, 
+            auto_fill: true, 
             hero_id: heroIDArr[cc.heroidx],
             weapons: [],
             first_game: false,
             skins: [],
-            prepare_items: [], // 12809
+            prepare_items: [], // 
             prepare_items2: [
                 {
                     key: 30703,
@@ -243,15 +220,15 @@ cc.Class({
             sex: 2,
             skill_list: [
                 {
-                    key: fgarr[cc.heroidx], //翻滚位
+                    key: fgarr[cc.heroidx], 
                     value: 0,
                 },
                 {
-                    key: skarr[cc.heroidx], //必杀位
+                    key: skarr[cc.heroidx], 
                     value: 0,
                 },
                 {
-                    key: autoSkill[cc.heroidx], //被动技能
+                    key: autoSkill[cc.heroidx], 
                     value: 0,
                 },
             ],
diff --git a/assets/scripts/newbie/newbieConfig.js b/assets/scripts/newbie/newbieConfig.js
index 2d5e54e6..45b76fcc 100644
--- a/assets/scripts/newbie/newbieConfig.js
+++ b/assets/scripts/newbie/newbieConfig.js
@@ -3,8 +3,8 @@ var playerData = require("playerData")
 var SDKManage = require("SDKManage")
 var NetManage = require("NetManage")
 var Main = require("Main");
-cc.newgames = 2;  //新手引导多少场战斗后，准备阶段可以退出游戏
-cc.newequip = 11; //新手引导多少步骤后，枪械领取可以跳转枪械界面
+cc.newgames = 2;  
+cc.newequip = 11; 
 var NewbieEnum = {
     touch: 1,
     delay: 2,
@@ -37,111 +37,77 @@ var NewbieEnum = {
 }
 var toulanConfig = {
     1001: [
-            [NewbieEnum.bgOpacity,1],/////////////////////////////////////////////////////////隐藏背景
+            [NewbieEnum.bgOpacity,1],/////////////////////////////////////////////////////////
             //[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-            //[NewbieEnum.setText,"点击吃鸡模式", false],
+         
             [NewbieEnum.delay,0.2],
             [NewbieEnum.showHand],
-            [NewbieEnum.handPosAndRotation,58,-20,0],//修正手的位置
+            [NewbieEnum.handPosAndRotation,58,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/list_right/btn_solo_Fight'],
             [NewbieEnum.delay,0.2],
                     
-            //选地图
-            //[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-            //[NewbieEnum.setText,"点击选择地图",false],
+        
             [NewbieEnum.delay,0.2],
             [NewbieEnum.showHand],
-            [NewbieEnum.handPosAndRotation,58,-88,0],//修正手的位置
+            [NewbieEnum.handPosAndRotation,58,-88,0],
             [NewbieEnum.touch,'Canvas/UIMain/UIChosemap/tableview/view/content/1001/pb_map'],
             [NewbieEnum.delay,0.2],    
             
-            //组队界面
-            //[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-            //[NewbieEnum.setText,"点击开始游戏",false],
+           
             [NewbieEnum.delay,0.2],
             [NewbieEnum.showHand],
-            [NewbieEnum.handPosAndRotation,50,-20,0],//修正手的位置
+            [NewbieEnum.handPosAndRotation,50,-20,0],
        
     ]
 }
 var NewbieConfig = {
 	
-	//1.跳过新手战-战斗引导
+
     '1':{
         conditon:{
            battlecount:0,
         },
         step:[
-			//主界面
+			
 			//[NewbieEnum.waitForNotice,'niewbiejiangli'],niewbiejiangli
             [NewbieEnum.bindUI,'UIMain'],
 
             [NewbieEnum.toulan,1001],
-			// [NewbieEnum.bgOpacity,1],/////////////////////////////////////////////////////////隐藏背景
-   //          //[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-   //          //[NewbieEnum.setText,"点击吃鸡模式", false],
-   //          [NewbieEnum.delay,0.2],
-   //          [NewbieEnum.showHand],
-   //          [NewbieEnum.handPosAndRotation,58,-20,0],//修正手的位置
-   //          [NewbieEnum.touch,'Canvas/UIMain/list_right/btn_solo_Fight'],
-   //          [NewbieEnum.delay,0.2],
-					
-			// //选地图
-			// //[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-   //          //[NewbieEnum.setText,"点击选择地图",false],
-			// [NewbieEnum.delay,0.2],
-			// [NewbieEnum.showHand],
-			// [NewbieEnum.handPosAndRotation,58,-88,0],//修正手的位置
-   //          [NewbieEnum.touch,'Canvas/UIMain/UIChosemap/tableview/view/content/1001/pb_map'],
-			// [NewbieEnum.delay,0.2],	
-			
-			// //组队界面
-			// //[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-   //          //[NewbieEnum.setText,"点击开始游戏",false],
-			// [NewbieEnum.delay,0.2],
-			// [NewbieEnum.showHand],
-			// [NewbieEnum.handPosAndRotation,50,-20,0],//修正手的位置
             [NewbieEnum.touch,'Canvas/UIMain/UITeam/btn_bottom/btn_start'],
 			[NewbieEnum.delay,0.2],	
             [NewbieEnum.hideHand],
-            [NewbieEnum.notrecheck],  
-            //[NewbieEnum.serversave],            
+            [NewbieEnum.notrecheck],          
             [NewbieEnum.save],       
         ],
 	    },		
-	//2.武器抽奖，必中UZI
     '2':{
         conditon:{
-            // preId:1,
             battlecount:1,
         },
         step:[
-			//主界面-点击抽奖按钮
+		
             [NewbieEnum.bindUI,'UIMain'],
-			[NewbieEnum.bgOpacity,1],/////////////////////////////////////////////////////////隐藏背景
+			[NewbieEnum.bgOpacity,1],/////////////////////////////////////////////////////////
             [NewbieEnum.delay,0.1],
             [NewbieEnum.upz,'Canvas/UIMain/nd_up'],			
-            //[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-            //[NewbieEnum.setText,"点击抽奖", false],
+  
             [NewbieEnum.delay,0.2],
             [NewbieEnum.showHand],
-            [NewbieEnum.handPosAndRotation,50,-20,0],//修正手的位置
+            [NewbieEnum.handPosAndRotation,50,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/list_down/btn_drawbox'],
             [NewbieEnum.delay,0.2],
 			[NewbieEnum.downz,'Canvas/UIMain/nd_up'],
 			
-			//抽奖界面，点击武器十连
-			//[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-            //[NewbieEnum.setText,"点击武器十连抽",false],
+		
 			[NewbieEnum.delay,0.2],
 			[NewbieEnum.showHand],
-			[NewbieEnum.handPosAndRotation,50,-20,0],//修正手的位置
+			[NewbieEnum.handPosAndRotation,50,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/UIDrawBox/tableview/view/content/2/pb_drawbox/btn_tenfree'],
 			[NewbieEnum.delay,0.2],	
 
             [NewbieEnum.serversave],            
             [NewbieEnum.save],
-			//隐藏并延时
+			
 			[NewbieEnum.hideHand],
 			[NewbieEnum.hideTips],
 			//[NewbieEnum.bgOpacity,1],
@@ -150,30 +116,26 @@ var NewbieConfig = {
 			[NewbieEnum.showTips],
 			
 			[NewbieEnum.waitForNotice,'niewbiejiangli'],
-			//奖品展示，点击关闭
-			//[NewbieEnum.tipsPosAndRotation,-250,-128,0],
-            //[NewbieEnum.setText,"点击关闭",false],
+		
 			[NewbieEnum.delay,0.2],
 			[NewbieEnum.showHand],
-			[NewbieEnum.handPosAndRotation,50,-20,0],//修正手的位置
+			[NewbieEnum.handPosAndRotation,50,-20,0],//
             [NewbieEnum.touch,'Canvas/UIMain/nd_up/UIReward/reward/btn_share'],
 			[NewbieEnum.delay,0.2],	
             [NewbieEnum.hideHand], 
 
-			//抽奖界面，点击关闭
-			//[NewbieEnum.tipsPosAndRotation,-250,-128,0],
-            //[NewbieEnum.setText,"点击返回",false],
+	
 			[NewbieEnum.delay,0.2],
 			[NewbieEnum.showHand],
-			[NewbieEnum.handPosAndRotation,50,-20,0],//修正手的位置
+			[NewbieEnum.handPosAndRotation,50,-20,0],//
             [NewbieEnum.touch,'Canvas/UIMain/UIDrawBox/biaoti/btn_close'],
 			[NewbieEnum.delay,0.2],	
             [NewbieEnum.hideHand],
 
         ],
 	    },	
-	//3.武器强化升阶
-    '3':{//1战结束，升级武器
+	
+    '3':{
         conditon:{
             battlecount:1,
 			newbieflag:1,
@@ -190,14 +152,13 @@ var NewbieConfig = {
         },
         step:[
             [NewbieEnum.bindUI,'UIMain'],
-			[NewbieEnum.bgOpacity,1],/////////////////////////////////////////////////////////隐藏背景
+			[NewbieEnum.bgOpacity,1],////////////////////////////////////////////////////////
             [NewbieEnum.delay,0.1],
             [NewbieEnum.upz,'Canvas/UIMain/nd_up'],
-            //[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-            //[NewbieEnum.setText,"点击武器库", false],
+            
             [NewbieEnum.delay,0.2],
             [NewbieEnum.showHand],
-            [NewbieEnum.handPosAndRotation,50,-20,0],//修正手的位置
+            [NewbieEnum.handPosAndRotation,50,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/list_down/btn_gun'],
 
             [NewbieEnum.delay,0.2],
@@ -206,37 +167,32 @@ var NewbieConfig = {
 			//[NewbieEnum.alpha,0],
 			[NewbieEnum.delay,2],
 			[NewbieEnum.showHand],
-			//[NewbieEnum.bgOpacity,1],/////////////////////////////////////////////////////////恢复隐藏背景
-			//[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-            //[NewbieEnum.setText,"点击升级",false],
+		
 			[NewbieEnum.delay,0.2],
 			[NewbieEnum.showHand],
-			[NewbieEnum.handPosAndRotation,50,-20,0],//修正手的位置
+			[NewbieEnum.handPosAndRotation,50,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/UIspear/spear/ui_03/ui_0301/btn_shengji'],
 			[NewbieEnum.serversave],
 			[NewbieEnum.save],
 			
 			[NewbieEnum.delay,0.2],
-			//[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-			//[NewbieEnum.setText,"再点一次升级",false],
+	
 			[NewbieEnum.delay,0.2],
 			[NewbieEnum.showHand],
-			[NewbieEnum.handPosAndRotation,50,-20,0],//修正手的位置
+			[NewbieEnum.handPosAndRotation,50,-20,0],
 			[NewbieEnum.touch,'Canvas/UIMain/UIspear/spear/ui_03/ui_0301/btn_shengji'],
 
-			//[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-            //[NewbieEnum.setText,"点击升阶",false],
+			
 			[NewbieEnum.delay,0.2],
 			[NewbieEnum.showHand],
-			[NewbieEnum.handPosAndRotation,50,-20,0],//修正手的位置
+			[NewbieEnum.handPosAndRotation,50,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/UIspear/spear/ui_04/nd_jinjiecailiao/btn_shyengjie'],
 
             [NewbieEnum.delay,0.2],
-			//[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-            //[NewbieEnum.setText,"点击关闭",false],
+			
 			[NewbieEnum.delay,0.2],
 			[NewbieEnum.showHand],
-			[NewbieEnum.handPosAndRotation,50,-20,0],//修正手的位置
+			[NewbieEnum.handPosAndRotation,50,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/UIspear/uibg_titel3/btn_close'],
 			
             [NewbieEnum.hideHand],
@@ -245,7 +201,7 @@ var NewbieConfig = {
             [NewbieEnum.save],			
         ]	
     },		
-	//4.战斗引导
+	
     '4':{
         conditon:{
            battlecount:1,
@@ -255,32 +211,27 @@ var NewbieConfig = {
         step:[
 			//主界面
             [NewbieEnum.bindUI,'UIMain'],
-			[NewbieEnum.bgOpacity,1],/////////////////////////////////////////////////////////隐藏背景
+			[NewbieEnum.bgOpacity,1],///////////////////////////////////////////////////
             [NewbieEnum.delay,0.1],
             [NewbieEnum.upz,'Canvas/UIMain/nd_up'],			
-            //[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-            //[NewbieEnum.setText,"点击吃鸡模式", false],
+         
             [NewbieEnum.delay,0.2],
             [NewbieEnum.showHand],
-            [NewbieEnum.handPosAndRotation,58,-20,0],//修正手的位置
+            [NewbieEnum.handPosAndRotation,58,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/list_right/btn_solo_Fight'],
             [NewbieEnum.delay,0.2],
 			
-			//选地图
-			//[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-            //[NewbieEnum.setText,"点击选择地图",false],
+		
 			[NewbieEnum.delay,0.2],
 			[NewbieEnum.showHand],
-			[NewbieEnum.handPosAndRotation,58,-88,0],//修正手的位置
+			[NewbieEnum.handPosAndRotation,58,-88,0],
             [NewbieEnum.touch,'Canvas/UIMain/UIChosemap/tableview/view/content/1001/pb_map'],
 			[NewbieEnum.delay,0.2],	
 			
-			//组队界面
-			//[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-            //[NewbieEnum.setText,"点击开始游戏",false],
+			
 			[NewbieEnum.delay,0.2],
 			[NewbieEnum.showHand],
-			[NewbieEnum.handPosAndRotation,50,-20,0],//修正手的位置
+			[NewbieEnum.handPosAndRotation,50,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/UITeam/btn_bottom/btn_start'],
 			[NewbieEnum.delay,0.2],	
             [NewbieEnum.hideHand], 
@@ -290,7 +241,7 @@ var NewbieConfig = {
 			 
         ],
 	},
-	//5.时装抽奖引导
+	
     '5':{
         conditon:{
            battlecount:2,
@@ -298,33 +249,30 @@ var NewbieConfig = {
 		   newbieflag:1		   
         },
         step:[
-			//主界面-点击抽奖按钮
+			
             [NewbieEnum.bindUI,'UIMain'],
-			[NewbieEnum.bgOpacity,1],/////////////////////////////////////////////////////////隐藏背景
+			[NewbieEnum.bgOpacity,1],////////////////////////////////////////////////////
             [NewbieEnum.delay,0.1],
             [NewbieEnum.upz,'Canvas/UIMain/nd_up'],			
-            //[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-            //[NewbieEnum.setText,"点击抽奖", false],
+           
             [NewbieEnum.delay,0.2],
             [NewbieEnum.showHand],
-            [NewbieEnum.handPosAndRotation,50,-20,0],//修正手的位置
+            [NewbieEnum.handPosAndRotation,50,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/list_down/btn_drawbox'],
             [NewbieEnum.delay,0.2],
 			[NewbieEnum.downz,'Canvas/UIMain/nd_up'],
 			
-			//抽奖界面，点击时装十连
-			//[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-            //[NewbieEnum.setText,"点击时装十连抽",false],
+			
 			[NewbieEnum.delay,0.2],
 			[NewbieEnum.showHand],
-			[NewbieEnum.handPosAndRotation,50,-20,0],//修正手的位置
+			[NewbieEnum.handPosAndRotation,50,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/UIDrawBox/tableview/view/content/1/pb_drawbox/btn_tenfree'],
 			[NewbieEnum.delay,0.2],	
 
             [NewbieEnum.serversave],
             [NewbieEnum.save],
 
-			//隐藏并延时
+			
 			[NewbieEnum.hideHand],
 			[NewbieEnum.hideTips],
 			//[NewbieEnum.bgOpacity,1],
@@ -333,29 +281,25 @@ var NewbieConfig = {
 			[NewbieEnum.showTips],
 			
 			[NewbieEnum.waitForNotice,'niewbiejiangli'],
-			//奖品展示，点击关闭
-			//[NewbieEnum.tipsPosAndRotation,-250,-128,0],
-            //[NewbieEnum.setText,"点击关闭",false],
+			
 			[NewbieEnum.delay,0.2],
 			[NewbieEnum.showHand],
-			[NewbieEnum.handPosAndRotation,50,-20,0],//修正手的位置
+			[NewbieEnum.handPosAndRotation,50,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/nd_up/UIReward/reward/btn_share'],
 			[NewbieEnum.delay,0.2],	
             [NewbieEnum.hideHand], 
 			
-			//抽奖界面，点击关闭
-			//[NewbieEnum.tipsPosAndRotation,-250,-128,0],
-            //[NewbieEnum.setText,"点击返回",false],
+			
 			[NewbieEnum.delay,0.2],
 			[NewbieEnum.showHand],
-			[NewbieEnum.handPosAndRotation,50,-20,0],//修正手的位置
+			[NewbieEnum.handPosAndRotation,50,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/UIDrawBox/biaoti/btn_close'],
 			[NewbieEnum.delay,0.2],	
             [NewbieEnum.hideHand],	
 			 			
         ],
 	    },
-	//6.背包装备引导
+	
     '6':{
         conditon:{
            battlecount:2,
@@ -364,53 +308,43 @@ var NewbieConfig = {
         },
         step:[
 			
-			//主界面-点击背包按钮
+			
             [NewbieEnum.bindUI,'UIMain'],
-			[NewbieEnum.bgOpacity,1],/////////////////////////////////////////////////////////隐藏背景
+			[NewbieEnum.bgOpacity,1],//////////////////////////////////////////////
             [NewbieEnum.delay,0.1],
             [NewbieEnum.upz,'Canvas/UIMain/nd_up'],			
-            //[NewbieEnum.tipsPosAndRotation,-150,-80,0],
-            //[NewbieEnum.setText,"点击背包", false],
+            
             [NewbieEnum.delay,0.2],
             [NewbieEnum.showHand],
-            [NewbieEnum.handPosAndRotation,50,-20,0],//修正手的位置
+            [NewbieEnum.handPosAndRotation,50,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/list_down/btn_bag'],
             [NewbieEnum.delay,0.2],
 			
-			//背包界面，点击指定衣服
-			//[NewbieEnum.tipsPosAndRotation,-150,-80,0],
-            //[NewbieEnum.setText,"点击穿戴时装",false],
+			
 			[NewbieEnum.delay,0.2],
 			[NewbieEnum.showHand],
-			[NewbieEnum.handPosAndRotation,50,-20,0],//修正手的位置
+			[NewbieEnum.handPosAndRotation,50,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/UIBag/New Node/bag/bag_node/mid/tableView/view/content/New Node/pb_baglayout/13001/New Node'],
 			[NewbieEnum.delay,0.2],	
 			
-			//切换装饰页签
-			//[NewbieEnum.tipsPosAndRotation,-150,-80,0],
-            //[NewbieEnum.setText,"点击切换装饰",false],
+			
 			[NewbieEnum.delay,0.2],
 			[NewbieEnum.showHand],
-			[NewbieEnum.handPosAndRotation,50,-20,0],//修正手的位置
+			[NewbieEnum.handPosAndRotation,50,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/UIBag/New Node/bag/bag_node/Node_left/button_dress/New Node'],
 			[NewbieEnum.delay,0.2],	
             [NewbieEnum.hideHand], 
 
-			//背包界面，点击指定装饰
-			//[NewbieEnum.tipsPosAndRotation,-150,-80,0],
-            //[NewbieEnum.setText,"点击穿戴装饰",false],
 			[NewbieEnum.delay,0.2],
 			[NewbieEnum.showHand],
-			[NewbieEnum.handPosAndRotation,50,-20,0],//修正手的位置
+			[NewbieEnum.handPosAndRotation,50,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/UIBag/New Node/bag/bag_node/mid/tableView/view/content/New Node/pb_baglayout/15001/New Node'],
 			[NewbieEnum.delay,0.2],	
 
-			//背包界面，点击关闭
-			//[NewbieEnum.tipsPosAndRotation,-150,-80,0],
-            //[NewbieEnum.setText,"点击返回",false],
+		
 			[NewbieEnum.delay,0.2],
 			[NewbieEnum.showHand],
-			[NewbieEnum.handPosAndRotation,50,-20,0],//修正手的位置
+			[NewbieEnum.handPosAndRotation,50,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/UIBag/btn_back'],
 			[NewbieEnum.delay,0.2],	
             [NewbieEnum.hideHand],
@@ -421,7 +355,7 @@ var NewbieConfig = {
         ],
 		},
 		
-	//7.战斗引导-战前准备出现
+	
     '7':{
         conditon:{
            battlecount:2,
@@ -429,24 +363,21 @@ var NewbieConfig = {
 		   newbieflag:1
         },
         step:[
-			//主界面
+			
             [NewbieEnum.bindUI,'UIMain'],
-			[NewbieEnum.bgOpacity,1],/////////////////////////////////////////////////////////隐藏背景
+			[NewbieEnum.bgOpacity,1],////////////////////////////////////////////////////////
             [NewbieEnum.upz,'Canvas/UIMain/nd_up'],
-            //[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-            //[NewbieEnum.setText,"点击吃鸡模式", false],
+            
             [NewbieEnum.delay,0.2],
             [NewbieEnum.showHand],
-            [NewbieEnum.handPosAndRotation,58,-20,0],//修正手的位置
+            [NewbieEnum.handPosAndRotation,58,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/list_right/btn_solo_Fight'],
             [NewbieEnum.delay,0.2],
 			
-			//选地图
-			//[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-            //[NewbieEnum.setText,"点击选择地图",false],
+			
 			[NewbieEnum.delay,0.2],
 			[NewbieEnum.showHand],
-			[NewbieEnum.handPosAndRotation,58,-88,0],//修正手的位置
+			[NewbieEnum.handPosAndRotation,58,-88,0],
             [NewbieEnum.touch,'Canvas/UIMain/UIChosemap/tableview/view/content/1001/pb_map'],
 			[NewbieEnum.delay,0.2],	
             //[NewbieEnum.serversave],        	
@@ -454,7 +385,7 @@ var NewbieConfig = {
             [NewbieEnum.downz,'Canvas/UIMain/nd_up'],        
         ],
 	},	
-	//8.排位引导
+	
     '8':{
         conditon:{
             battlecount:3,
@@ -463,33 +394,27 @@ var NewbieConfig = {
         },
         step:[
             [NewbieEnum.bindUI,'UIMain'],
-			[NewbieEnum.bgOpacity,1],/////////////////////////////////////////////////////////隐藏背景
+			[NewbieEnum.bgOpacity,1],////////////////////////////////////////////////////////
             [NewbieEnum.delay,0.1],
             [NewbieEnum.upz,'Canvas/UIMain/nd_up'],
-			//主界面，点击手册
-            //[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-            //[NewbieEnum.setText,"赛季手册有很多限定奖励", false],			
+		
 			[NewbieEnum.delay,0.2],
             [NewbieEnum.showHand],
-            [NewbieEnum.handPosAndRotation,38,-20,0],//修正手的位置
+            [NewbieEnum.handPosAndRotation,38,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/list_down/btn_paiwei'],
 			[NewbieEnum.delay,0.2],	
 			
-			//手册界面，领取奖励
-            //[NewbieEnum.tipsPosAndRotation,0,-50,0],
-            //[NewbieEnum.setText,"点击领取基础奖励", false],			
+			
 			[NewbieEnum.delay,0.2],
             [NewbieEnum.showHand],
-            [NewbieEnum.handPosAndRotation,38,-20,0],//修正手的位置
+            [NewbieEnum.handPosAndRotation,38,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/UIpaiwei/down/paiwei/reward/tableview/view/content/1/season_reward/item1/get/btn_get'],
 			[NewbieEnum.delay,0.2],
 			
-			//手册界面，离开
-            //[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-            //[NewbieEnum.setText,"点击返回", false],			
+			
 			[NewbieEnum.delay,0.2],
             [NewbieEnum.showHand],
-            [NewbieEnum.handPosAndRotation,38,-20,0],//修正手的位置
+            [NewbieEnum.handPosAndRotation,38,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/UIpaiwei/btn_back'],
 			[NewbieEnum.delay,0.2],	
 		   
@@ -500,7 +425,7 @@ var NewbieConfig = {
             [NewbieEnum.downz,'Canvas/UIMain/nd_up'], 			
         ]				
     },	
-	//9.新图战斗引导
+	
     '9':{
         conditon:{
            battlecount:3,
@@ -508,16 +433,15 @@ var NewbieConfig = {
 		   newbieflag:1
         },
         step:[
-			//主界面
+			
             [NewbieEnum.bindUI,'UIMain'],
-			[NewbieEnum.bgOpacity,1],/////////////////////////////////////////////////////////隐藏背景
+			[NewbieEnum.bgOpacity,1],/////////////////////////////////////////////////////
 			[NewbieEnum.delay,0.1],
             [NewbieEnum.upz,'Canvas/UIMain/nd_up'],	
-            //[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-            //[NewbieEnum.setText,"点击吃鸡模式", false],
+          
             [NewbieEnum.delay,0.2],
             [NewbieEnum.showHand],
-            [NewbieEnum.handPosAndRotation,58,-20,0],//修正手的位置
+            [NewbieEnum.handPosAndRotation,58,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/list_right/btn_solo_Fight'],
             [NewbieEnum.delay,0.2],
 
@@ -526,20 +450,18 @@ var NewbieConfig = {
 			[NewbieEnum.hideHand],
 			[NewbieEnum.delay,2],
 			
-			//地图选择，新地图
-			//[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-            //[NewbieEnum.setText,"点击选择地图",false],			
+			
 			[NewbieEnum.delay,0.2],
 			[NewbieEnum.showHand],
-			[NewbieEnum.handPosAndRotation,58,-88,0],//修正手的位置
+			[NewbieEnum.handPosAndRotation,58,-88,0],
             [NewbieEnum.touch,'Canvas/UIMain/UIChosemap/tableview/view/content/1002/pb_map'],
 			[NewbieEnum.delay,0.2],
-            //[NewbieEnum.serversave],        	
+            
             [NewbieEnum.save],
 			[NewbieEnum.downz,'Canvas/UIMain/nd_up'], 
         ],
 	},
-	//10.特权引导
+	
     '10':{
         conditon:{
             battlecount:4,
@@ -548,14 +470,13 @@ var NewbieConfig = {
         },
         step:[
             [NewbieEnum.bindUI,'UIMain'],
-			[NewbieEnum.bgOpacity,1],/////////////////////////////////////////////////////////隐藏背景
+			[NewbieEnum.bgOpacity,1],///////////////////////////////////////////////////////
             [NewbieEnum.delay,0.1],
             [NewbieEnum.upz,'Canvas/UIMain/nd_up'],	
-            //[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-            //[NewbieEnum.setText,"点击特权按钮", false],			
+          	
 			[NewbieEnum.delay,0.2],
             [NewbieEnum.showHand],
-            [NewbieEnum.handPosAndRotation,38,-20,0],//修正手的位置
+            [NewbieEnum.handPosAndRotation,38,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/list_top_l/nd_top/btn_recDaily'],
 			[NewbieEnum.hideHand],
             [NewbieEnum.serversave],        	
@@ -563,7 +484,7 @@ var NewbieConfig = {
             [NewbieEnum.downz,'Canvas/UIMain/nd_up'], 						
         ]	
     },	
-	//11.挂机金币
+	
     '11':{
         conditon:{
             battlecount:4,
@@ -572,24 +493,23 @@ var NewbieConfig = {
         },
         step:[
             [NewbieEnum.bindUI,'UIMain'],
-			[NewbieEnum.nd_alpha,'Canvas/UIMain/finger',0],//////////////////////////////////////隐藏战斗按钮手指
-			[NewbieEnum.bgOpacity,1],/////////////////////////////////////////////////////////隐藏背景
+			[NewbieEnum.nd_alpha,'Canvas/UIMain/finger',0],///////////////////////////////////
+			[NewbieEnum.bgOpacity,1],///////////////////////////////////////////////////////
             [NewbieEnum.delay,0.1],
             [NewbieEnum.upz,'Canvas/UIMain/nd_up'],	
-            //[NewbieEnum.tipsPosAndRotation,0,-50,0],
-            //[NewbieEnum.setText,"点击领取金币", false],			
+           
 			[NewbieEnum.delay,0.2],
             [NewbieEnum.showHand],
-            [NewbieEnum.handPosAndRotation,38,-20,0],//修正手的位置
+            [NewbieEnum.handPosAndRotation,38,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/btn_online'],
 			[NewbieEnum.hideHand],
             [NewbieEnum.serversave],        	
             [NewbieEnum.save],			
             [NewbieEnum.downz,'Canvas/UIMain/nd_up'],
-			[NewbieEnum.nd_alpha,'Canvas/UIMain/finger',255],//////////////////////////////////////显示战斗按钮手指
+			[NewbieEnum.nd_alpha,'Canvas/UIMain/finger',255],////////////////////////////////////
         ]	
     },	
-	//12.战队引导
+	
     '12':{
         conditon:{
            battlecount:5,
@@ -598,24 +518,23 @@ var NewbieConfig = {
         },
         step:[
             [NewbieEnum.bindUI,'UIMain'],
-			[NewbieEnum.nd_alpha,'Canvas/UIMain/finger',0],//////////////////////////////////////隐藏战斗按钮手指
-			[NewbieEnum.bgOpacity,1],/////////////////////////////////////////////////////////隐藏背景
+			[NewbieEnum.nd_alpha,'Canvas/UIMain/finger',0],////////////////////////////////////
+			[NewbieEnum.bgOpacity,1],/////////////////////////////////////////////////////////
             [NewbieEnum.delay,0.1],
             [NewbieEnum.upz,'Canvas/UIMain/nd_up'],	
-            //[NewbieEnum.tipsPosAndRotation,-230,-50,0],
-            //[NewbieEnum.setText,"战队将带给你不一样的快乐", false],			
+            
 			[NewbieEnum.delay,0.2],
             [NewbieEnum.showHand],
-            [NewbieEnum.handPosAndRotation,48,-10,0],//修正手的位置
+            [NewbieEnum.handPosAndRotation,48,-10,0],
             [NewbieEnum.touch,'Canvas/UIMain/list_left/btn_guild'],
 			[NewbieEnum.hideHand],
             [NewbieEnum.serversave],        	
             [NewbieEnum.save],
             [NewbieEnum.downz,'Canvas/UIMain/nd_up'], 
-			[NewbieEnum.nd_alpha,'Canvas/UIMain/finger',255],//////////////////////////////////////显示战斗按钮手指
+			[NewbieEnum.nd_alpha,'Canvas/UIMain/finger',255],////////////////////////////////////
         ],
 	},	
-	//13.僵尸模式引导
+
     '13':{
         conditon:{
            battlecount:6,
@@ -623,16 +542,15 @@ var NewbieConfig = {
 		   newbieflag:1
         },
         step:[
-			//主界面
+			
             [NewbieEnum.bindUI,'UIMain'],
-			[NewbieEnum.bgOpacity,1],/////////////////////////////////////////////////////////隐藏背景
+			[NewbieEnum.bgOpacity,1],///////////////////////////////////////////////////////
             [NewbieEnum.delay,0.1],
             [NewbieEnum.upz,'Canvas/UIMain/nd_up'],		
-            //[NewbieEnum.tipsPosAndRotation,-310,-50,0],
-            //[NewbieEnum.setText,"点击僵尸模式", false],
+           
             [NewbieEnum.delay,0.2],
             [NewbieEnum.showHand],
-            [NewbieEnum.handPosAndRotation,58,-20,0],//修正手的位置
+            [NewbieEnum.handPosAndRotation,58,-20,0],
             [NewbieEnum.touch,'Canvas/UIMain/list_right/btn_Fight'],
             [NewbieEnum.delay,0.2],
 			[NewbieEnum.serversave],        	
diff --git a/assets/scripts/newbie/newbieManage.js b/assets/scripts/newbie/newbieManage.js
index cce0cb4a..e163f993 100644
--- a/assets/scripts/newbie/newbieManage.js
+++ b/assets/scripts/newbie/newbieManage.js
@@ -74,7 +74,7 @@ cc.Class({
 
 
         var NewbieInClude = {};
-        for (var k in NewbieConfig) { //構成反查表
+        for (var k in NewbieConfig) { 
             var step = NewbieConfig[k].step;
             for (var i = 0; i < step.length; i++) {
                 if (step[i][0] == NewbieEnum.bindUI) {
@@ -188,7 +188,7 @@ cc.Class({
         }
 
 
-        return true; //開放式引導擴展
+        return true; 
     },
     check(v) {
         //Main.config.mainConfig.openNewbie = false
@@ -199,8 +199,8 @@ cc.Class({
         if (arr == null) {
             return false;
         }
-        if (this.newbieid != 0) { //引導中
-            if (Util.contains(arr, this.newbieid)) { //該界面包含引導id
+        if (this.newbieid != 0) { 
+            if (Util.contains(arr, this.newbieid)) { 
                 return true;
             } else {
                 return false;
@@ -208,9 +208,9 @@ cc.Class({
         }
         this.scpArr = {};
         this.step = 0;
-        var newSave = playerData.newbieData; //已經完成的引導
+        var newSave = playerData.newbieData; 
         for (var i = 0; i < arr.length; i++) {
-            if (!Util.contains(newSave, arr[i]) && this.checkConditon(arr[i])) { //找到引導
+            if (!Util.contains(newSave, arr[i]) && this.checkConditon(arr[i])) { 
                 this.newbieid = arr[i];
                 return true;
             }
@@ -218,8 +218,8 @@ cc.Class({
         return false;
     },
     bindNewbie(v, isfirst) {
-        // var patt1=/<(\w+)>/;
-        // var res = patt1.exec(v.name)[1];
+        
+
         var res = v.node.name;
         var last = this.newbieid;
         if (this.check(res)) {
@@ -238,8 +238,7 @@ cc.Class({
         }
     },
     removeNewbie(v) {
-        // var patt1=/<(\w+)>/;
-        // var res = patt1.exec(v.name)[1];
+        
         var res = v.node.name;
         if (this.scpArr[res]) {
             this.scpArr[res] = null;
@@ -547,15 +546,14 @@ cc.Class({
         this.doNext();
     },
     nsave() {
-        playerData.newbieData.push(this.newbieid) //服务器通信
-        //NetManage.saveNewbie(this.newbieid)
-        //  playerData.saveNewbie(this.newbieid);
+        playerData.newbieData.push(this.newbieid) 
+        
         this.step++;
         this.doNext();
     },
 
     serversave() {
-        NetManage.saveNewbie(this.newbieid) //服务器通信
+        NetManage.saveNewbie(this.newbieid) 
         this.step++;
         this.doNext();
     },
diff --git a/assets/scripts/shaders/Fluxay.js b/assets/scripts/shaders/Fluxay.js
index 72ae954f..c0ab9cab 100644
--- a/assets/scripts/shaders/Fluxay.js
+++ b/assets/scripts/shaders/Fluxay.js
@@ -16,8 +16,8 @@ const shader = {
     start(material,params) {
          material.cusparmas = {}
          material.cusparmas._start = 0;
-         material.setParamValue('offset', params.offset||0);//偏移值         (调整该值改变流光的倾斜程度)
-         material.setParamValue('linewidth', params.linewidth||0.2);//流光的宽度范围 (调整该值改变流光的宽度)
+         material.setParamValue('offset', params.offset||0);
+         material.setParamValue('linewidth', params.linewidth||0.2);
          material.setParamValue('linecolor', cc.v3(params.linecolor.r,params.linecolor.g,params.linecolor.b));
          material.setParamValue('dtime', params.dtime||1.414);
          material.setParamValue('ymode', params.ymode||0);
diff --git a/assets/scripts/shaders/FluxaySpine.js b/assets/scripts/shaders/FluxaySpine.js
index 64f584bb..0d8a736f 100644
--- a/assets/scripts/shaders/FluxaySpine.js
+++ b/assets/scripts/shaders/FluxaySpine.js
@@ -16,8 +16,8 @@ const shader = {
     start(material,params) {
          material.cusparmas = {}
          material.cusparmas._start = 0;
-         material.setParamValue('offset', params.offset||0);//偏移值         (调整该值改变流光的倾斜程度)
-         material.setParamValue('linewidth', params.linewidth||0.2);//流光的宽度范围 (调整该值改变流光的宽度)
+         material.setParamValue('offset', params.offset||0);
+         material.setParamValue('linewidth', params.linewidth||0.2);
          material.setParamValue('linecolor', cc.v3(params.r,params.g,params.b));
          material.setParamValue('dtime', params.dtime||1.414);
          material.setParamValue('ymode', params.ymode||0);
diff --git a/assets/scripts/shaders/FluxaySuper.js b/assets/scripts/shaders/FluxaySuper.js
index 7bd7fd4b..b328d90b 100644
--- a/assets/scripts/shaders/FluxaySuper.js
+++ b/assets/scripts/shaders/FluxaySuper.js
@@ -89,7 +89,7 @@ const shader = {
     //         vec4 tex = texture2D(texture,uv0);
     //         vec3 colour = vec3(pow(abs(c), 20.0));
     //         colour = clamp(colour + vec3(0.0, 0.0, .0), 0.0, tex.a);
-    //         // 混合波光
+    //         
     //         float alpha = c*tex[3];  
 
     //         tex[0] = tex[0]*blackv + colour[0]*coloraddr*alpha; 
@@ -153,7 +153,7 @@ const shader = {
           
             vec3 colour = vec3(pow(abs(c), 20.0));
             colour = clamp(colour + vec3(0.0, 0.0, .0), 0.0, finalColor.a);
-            // 混合波光
+           
             float alpha = c*finalColor[3];  
 
             finalColor[0] = finalColor[0]*blackv + colour[0]*coloraddr*alpha; 
diff --git a/assets/scripts/shaders/UVAnimation.js b/assets/scripts/shaders/UVAnimation.js
index 9c2223e3..e03fdede 100644
--- a/assets/scripts/shaders/UVAnimation.js
+++ b/assets/scripts/shaders/UVAnimation.js
@@ -15,13 +15,7 @@ const shader = {
 
     start(material,params) {
         material.setParamValue('time', 0);
-         // material.cusparmas = {}
-         // material.cusparmas._start = 0;
-         // material.setParamValue('offset', params.offset||0);//偏移值         (调整该值改变流光的倾斜程度)
-         // material.setParamValue('linewidth', params.linewidth||0.2);//流光的宽度范围 (调整该值改变流光的宽度)
-         // material.setParamValue('linecolor', cc.v3(params.linecolor.r,params.linecolor.g,params.linecolor.b));
-         // material.setParamValue('dtime', params.dtime||1.414);
-         // material.setParamValue('ymode', params.ymode||0);
+         
     },
 
 
diff --git a/assets/scripts/shaders/Wave.js b/assets/scripts/shaders/Wave.js
index 7f6778f6..6de31515 100644
--- a/assets/scripts/shaders/Wave.js
+++ b/assets/scripts/shaders/Wave.js
@@ -12,7 +12,7 @@ const shader = {
     start(material,params) {
          material.cusparmas = {}
          material.cusparmas._start = 0;
-         material.setParamValue('u_normalMap', params.normaltexture._texture);//偏移值         (调整该值改变流光的倾斜程度)
+         material.setParamValue('u_normalMap', params.normaltexture._texture);
 
     },
 
@@ -37,8 +37,7 @@ const shader = {
         }  
          
          
-        //高光计算 参见基本光照公式
-        //参数说明：n法向量， l入射光向量， e观察向量
+
         float specular(vec3 n,vec3 l,vec3 e) {    
             return pow(max(dot(reflect(e,n),l),0.0),2.0); 
         }
@@ -53,7 +52,7 @@ const shader = {
          
             // simple calculate refraction UV offset
             vec2 p = -1.0 + 2.0 * uv0; 
-            vec3 eyePos = vec3(0.0, 0.0, 10.0);//眼睛的位置 在中心点正上方
+            vec3 eyePos = vec3(0.0, 0.0, 10.0);
          
             vec3 inVec = normalize(vec3(p, 0.0) - eyePos);
             vec3 refractVec = refract(inVec, normal, refractionFactor);
@@ -65,9 +64,9 @@ const shader = {
             vec3 normalN = waveNormal(v_texCoordN );
             vec3 color = vec3(specular(normalN,light,eyePos));
          
-            //gl_FragColor = texture2D(texture, v_texCoordN); //这样可以看到不带高光的水面，可选
-            // gl_FragColor = texture2D(u_normalMap, uv0); //这样可以只看法线图，可选
-            gl_FragColor = texture2D(texture, v_texCoordN)*1.0 + vec4(color,1); //加了高光效果的水面
+            //gl_FragColor = texture2D(texture, v_texCoordN); 
+            // gl_FragColor = texture2D(u_normalMap, uv0); 
+            gl_FragColor = texture2D(texture, v_texCoordN)*1.0 + vec4(color,1); 
         }  
 `,
 };
diff --git a/assets/scripts/shaders/XraySpine.js b/assets/scripts/shaders/XraySpine.js
index 7eb7f71b..c4152763 100644
--- a/assets/scripts/shaders/XraySpine.js
+++ b/assets/scripts/shaders/XraySpine.js
@@ -17,12 +17,7 @@ const shader = {
       
     },
 
-    // update(material,dt) {
-    //     // const now = Date.now();
-    //     // let time = ((now - material.cusparmas._start) / 1000);
-    //     material.cusparmas._start+=dt
-    //     material.setParamValue('time', material.cusparmas._start);
-    // },
+   
 
     defines:[],
 
diff --git a/assets/scripts/shaders/grass.js b/assets/scripts/shaders/grass.js
index 359b4e35..caff0701 100644
--- a/assets/scripts/shaders/grass.js
+++ b/assets/scripts/shaders/grass.js
@@ -53,8 +53,7 @@ const shader = {
 
 
         
-               // x大于等于t1=0.9时，结果为0
-               // x小于等于t2=0.8时，结果为1
+             
                 float mask = smoothstep(0.8, 0.9, dis/u_dis);
                 if(mask < u_plus){
                     mask = u_plus;
diff --git a/assets/scripts/shaders/niuqu.js b/assets/scripts/shaders/niuqu.js
index c16ba4ba..68a0bff6 100644
--- a/assets/scripts/shaders/niuqu.js
+++ b/assets/scripts/shaders/niuqu.js
@@ -42,15 +42,15 @@ const shader = {
         varying vec2 uv3;
         uniform float time;
         uniform sampler2D u_displacement;
-        uniform float u_magnitude;//波长
-        uniform vec2 u_strength;//振幅
+        uniform float u_magnitude;
+        uniform vec2 u_strength;
 
         void main() {
       
             vec2 disp = texture2D(u_displacement, uv0 + u_strength * time).xy;
-            //disp的范围是0-1，这步操作让其变成-1 到 1 乘以 参数
+           
             disp = ((disp * 2.0) - 1.0) * u_magnitude;
-                //uv坐标偏移
+               
             gl_FragColor = texture2D(texture, uv0 + disp)*vec4(0.9,0.9,1.0,0.5);
 
         }`,
diff --git a/assets/scripts/tools/tableView/tableView.js b/assets/scripts/tools/tableView/tableView.js
index df8c87b7..f3033f01 100644
--- a/assets/scripts/tools/tableView/tableView.js
+++ b/assets/scripts/tools/tableView/tableView.js
@@ -11,18 +11,18 @@ function pSub(t, e) {
 }
 
 function quickSort(arr, cb) {
-  //如果数组<=1,则直接返回
+
   if (arr.length <= 1) {
     return arr;
   }
   var pivotIndex = Math.floor(arr.length / 2);
-  //找基准
+  
   var pivot = arr[pivotIndex];
-  //定义左右数组
+ 
   var left = [];
   var right = [];
 
-  //比基准小的放在left，比基准大的放在right
+  
   for (var i = 0; i < arr.length; i++) {
     if (i !== pivotIndex) {
       if (cb) {
@@ -40,7 +40,7 @@ function quickSort(arr, cb) {
       }
     }
   }
-  //递归
+  
   return quickSort(left, cb).concat([pivot], quickSort(right, cb));
 }
 
@@ -56,31 +56,30 @@ function getChildByCellIndex(parent, index) {
 var tableView = cc.Class({
   extends: cc.ScrollView,
   properties: {
-    // 缓存的数据
+
     _data: null,
-    //cell的最小下标
+  
     _minCellIndex: 0,
-    //cell的最大下标
+  
     _maxCellIndex: 0,
     _paramCount: 0,
-    //一共有多少节点
+   
     _count: 0,
-    //scroll下有多少节点
+  
     _cellCount: 0,
-    //scroll一个屏幕能显示多少节点
+    
     _showCellCount: 0,
 
-    //GRID模式下，对cell进行分组管理
-    //每组有几个节点
+  
     _groupCellCount: null,
 
     _scrollDirection: ScrollDirection.None,
 
     _cellPool: null,
-    // _view: null,
+    
 
-    _page: 0, //当前处于那一页
-    _pageTotal: 0, //总共有多少页
+    _page: 0, 
+    _pageTotal: 0, 
 
     cell: {
       default: null,
@@ -102,7 +101,7 @@ var tableView = cc.Class({
           this.horizontalScrollBar = null;
         }
       },
-      tooltip: "横向纵向滑动",
+      tooltip: "scrolltype",
     },
     ViewType: {
       default: 0,