更新jar

-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>sdk_3</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.aptana.editor.php.aptanaPhpBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.aptana.ide.core.unifiedBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.aptana.projects.webnature</nature>
-		<nature>com.aptana.editor.php.phpNature</nature>
-	</natures>
-	<filteredResources>
-		<filter>
-			<id>1489975865951</id>
-			<name></name>
-			<type>26</type>
-			<matcher>
-				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-node_modules</arguments>
-			</matcher>
-		</filter>
-	</filteredResources>
-</projectDescription>

@@ -172,7 +172,6 @@
 				Core.updateMod('frame');
 				return false;
 			});	
-			
 		}
 
 		Login.prototype.cache = function(n, p) {
@@ -386,31 +385,37 @@
 			});
 
 
+//			that.$c.on('click', '[type=submit],.submit', function(e) {
+//				var passWordReg = /^[0-9a-zA-Z]+$/;
+//				e.preventDefault();
+//				if(/[A-Z]/.test(that.$c.find("input[name='username']").val())){
+//					Core.showTips("账号不能有大写字母！");
+//				}else if(/[A-Z]/.test(that.$c.find("input[name='password']").val())){
+//					Core.showTips("密码不能有大写字母！");
+//				}else if(that.$c.find("input[name='password']").val().length<6 || that.$c.find("input[name='password']").val().length>16){
+//					Core.showTips("密码长度为6-16位字符！");
+//				}else if(!that.$c.find('.checkbox-2').length>0){
+//					Core.showTips('请同意'+Core.PLATFORM_NAME+'网络协议',1);
+//				}else if(!passWordReg.test(that.$c.find("input[name='password']").val())){
+//					Core.showTips('请输入数字字母组成的密码!', true);
+//					return false;
+//				}else{
+//					//如果是游客的话则调用安卓截屏方法
+//					if (that.$c.find('[name="username"]').val() == that.$c.find('[name="old_usernmae"]').val() && window.android != undefined && window.android.screenShot != undefined ){
+//						window.android.screenShot();
+//					}	
+//					$(this).attr("disabled",true);
+//					$(this).css({"background":"#999"});
+//					$(this).parent("li").css({"background":"#999"});
+//					
+//					Core.ajax_do(that.$c.find('.ajax'), that.register_cb, that);
+//				}
+//				return false;
+//			});
+			
 			that.$c.on('click', '[type=submit],.submit', function(e) {
-				var passWordReg = /^[0-9a-zA-Z]+$/;
 				e.preventDefault();
-				if(/[A-Z]/.test(that.$c.find("input[name='username']").val())){
-					Core.showTips("账号不能有大写字母！");
-				}else if(/[A-Z]/.test(that.$c.find("input[name='password']").val())){
-					Core.showTips("密码不能有大写字母！");
-				}else if(that.$c.find("input[name='password']").val().length<6 || that.$c.find("input[name='password']").val().length>16){
-					Core.showTips("密码长度为6-16位字符！");
-				}else if(!that.$c.find('.checkbox-2').length>0){
-					Core.showTips('请同意'+Core.PLATFORM_NAME+'网络协议',1);
-				}else if(!passWordReg.test(that.$c.find("input[name='password']").val())){
-					Core.showTips('请输入数字字母组成的密码!', true);
-					return false;
-				}else{
-					//如果是游客的话则调用安卓截屏方法
-					if (that.$c.find('[name="username"]').val() == that.$c.find('[name="old_usernmae"]').val() && window.android != undefined && window.android.screenShot != undefined ){
-						window.android.screenShot();
-					}	
-					$(this).attr("disabled",true);
-					$(this).css({"background":"#999"});
-					$(this).parent("li").css({"background":"#999"});
-					
 				Core.ajax_do(that.$c.find('.ajax'), that.register_cb, that);
-				}
 				return false;
 			});
 
@@ -425,7 +430,7 @@
 		}
 		Register.prototype.set_random = function(){
 			var that = this;
-			var random_name = 'yy' + Math.random().toString(36).substr(-2) + new Date().getTime().toString(36).substr(-4)
+			var random_name = 'yy' + Math.random().toString(36).substr(-2) + new Date().getTime().toString(36).substr(-6)
 			var random_passwd = Math.random().toString(36).substr(-6)
 			that.$c.find('[name="username"]').val(random_name)
 			that.$c.find('[name="old_usernmae"]').val(random_name)
@@ -445,14 +450,19 @@
 			// 显示一个注册成功信息，并跳转到home
 			this.cache();
 			Core.showTips('成功注册，欢迎使用' +  Core.PLATFORM_NAME + '游戏平台');
-			Core.updateMod('home');
-			
-			this.$c.find("input#btn-regist").attr('disabled', null);
-			this.$c.find('.submit').css({"background":"#00beef"});
-			this.$c.find('.submit').parent("li").css({"background":"#00beef"});
+			//直接进入游戏
+			Core.finishLogin();		
+//			Core.updateMod('home');
+//			
+//			this.$c.find("input#btn-regist").attr('disabled', null);
+//			this.$c.find('.submit').css({"background":"#00beef"});
+//			this.$c.find('.submit').parent("li").css({"background":"#00beef"});
 		}
 		Register.prototype.show_after = function() {
 			this.set_random();
+			Core.hide();
+			Core.showMod("login");
+			this.$c.find("[type=submit],.submit").click();
 		}
 		Core.registerMod('register', Register);
 

@@ -948,7 +948,7 @@
 		}
 		IdentityCard.prototype.show_after = function(){
 			if(Core.Data.force_auth == 1){
-				$(".js-return-game").attr("href","javascript:Core.finishPay()");
+				$(".js-return-game").attr("href","javascript:Core.finishLogin()");
 			}
 
 		}

@@ -85,6 +85,7 @@
 			<ul class="inline-btn login-inline-btn">
 				<li>
 					<a  method="post"  class="btn btn_pri_block" href="#register">一键注册</a>
+					<!--<a  class="btn btn_pri_block" id="fastReg">一键注册</a>-->
 					
 				</li>
 				<li>

@@ -816,7 +816,8 @@ FastClick.attach(document.body);
 })();
 $(function(){
 	if (Core.isIos) {
-		$('meta[name="viewport"]').attr('content','width=800,maximum-scale=1,user-scalable=no');
+		// $('meta[name="viewport"]').attr('content','width=800,maximum-scale=1,user-scalable=no');
+		$('meta[name="viewport"]').attr('content','width=880,maximum-scale=0.6,user-scalable=no');
 	}
 });
 </script>

-20180906
\ No newline at end of file
+20180207
\ No newline at end of file