lizhihui

更新jar

Showing 37 changed files with 48 additions and 70 deletions
1 -<?xml version="1.0" encoding="UTF-8"?>
2 -<projectDescription>
3 - <name>sdk_3</name>
4 - <comment></comment>
5 - <projects>
6 - </projects>
7 - <buildSpec>
8 - <buildCommand>
9 - <name>com.aptana.editor.php.aptanaPhpBuilder</name>
10 - <arguments>
11 - </arguments>
12 - </buildCommand>
13 - <buildCommand>
14 - <name>com.aptana.ide.core.unifiedBuilder</name>
15 - <arguments>
16 - </arguments>
17 - </buildCommand>
18 - </buildSpec>
19 - <natures>
20 - <nature>com.aptana.projects.webnature</nature>
21 - <nature>com.aptana.editor.php.phpNature</nature>
22 - </natures>
23 - <filteredResources>
24 - <filter>
25 - <id>1489975865951</id>
26 - <name></name>
27 - <type>26</type>
28 - <matcher>
29 - <id>org.eclipse.ui.ide.multiFilter</id>
30 - <arguments>1.0-name-matches-false-false-node_modules</arguments>
31 - </matcher>
32 - </filter>
33 - </filteredResources>
34 -</projectDescription>

7.05 KB | W: | H:

7.05 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

81 KB | W: | H:

81 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
...@@ -172,7 +172,6 @@ ...@@ -172,7 +172,6 @@
172 Core.updateMod('frame'); 172 Core.updateMod('frame');
173 return false; 173 return false;
174 }); 174 });
175 -
176 } 175 }
177 176
178 Login.prototype.cache = function(n, p) { 177 Login.prototype.cache = function(n, p) {
...@@ -216,9 +215,9 @@ ...@@ -216,9 +215,9 @@
216 Core.user_indexs = index_ary; 215 Core.user_indexs = index_ary;
217 Core.user_names = name_ary; 216 Core.user_names = name_ary;
218 217
219 - $("input[name='loginUserName']").val(Core.Data.username); 218 + $("input[name='loginUserName']").val(Core.Data.username);
220 $("input[name='loginPassword']").val(Core.user_names[Core.Data.username]); 219 $("input[name='loginPassword']").val(Core.user_names[Core.Data.username]);
221 - 220 +
222 } 221 }
223 Login.prototype.login_cb = function(result) { 222 Login.prototype.login_cb = function(result) {
224 Core.updateData(result.msg); 223 Core.updateData(result.msg);
...@@ -386,31 +385,37 @@ ...@@ -386,31 +385,37 @@
386 }); 385 });
387 386
388 387
388 +// that.$c.on('click', '[type=submit],.submit', function(e) {
389 +// var passWordReg = /^[0-9a-zA-Z]+$/;
390 +// e.preventDefault();
391 +// if(/[A-Z]/.test(that.$c.find("input[name='username']").val())){
392 +// Core.showTips("账号不能有大写字母!");
393 +// }else if(/[A-Z]/.test(that.$c.find("input[name='password']").val())){
394 +// Core.showTips("密码不能有大写字母!");
395 +// }else if(that.$c.find("input[name='password']").val().length<6 || that.$c.find("input[name='password']").val().length>16){
396 +// Core.showTips("密码长度为6-16位字符!");
397 +// }else if(!that.$c.find('.checkbox-2').length>0){
398 +// Core.showTips('请同意'+Core.PLATFORM_NAME+'网络协议',1);
399 +// }else if(!passWordReg.test(that.$c.find("input[name='password']").val())){
400 +// Core.showTips('请输入数字字母组成的密码!', true);
401 +// return false;
402 +// }else{
403 +// //如果是游客的话则调用安卓截屏方法
404 +// if (that.$c.find('[name="username"]').val() == that.$c.find('[name="old_usernmae"]').val() && window.android != undefined && window.android.screenShot != undefined ){
405 +// window.android.screenShot();
406 +// }
407 +// $(this).attr("disabled",true);
408 +// $(this).css({"background":"#999"});
409 +// $(this).parent("li").css({"background":"#999"});
410 +//
411 +// Core.ajax_do(that.$c.find('.ajax'), that.register_cb, that);
412 +// }
413 +// return false;
414 +// });
415 +
389 that.$c.on('click', '[type=submit],.submit', function(e) { 416 that.$c.on('click', '[type=submit],.submit', function(e) {
390 - var passWordReg = /^[0-9a-zA-Z]+$/;
391 e.preventDefault(); 417 e.preventDefault();
392 - if(/[A-Z]/.test(that.$c.find("input[name='username']").val())){ 418 + Core.ajax_do(that.$c.find('.ajax'), that.register_cb, that);
393 - Core.showTips("账号不能有大写字母!");
394 - }else if(/[A-Z]/.test(that.$c.find("input[name='password']").val())){
395 - Core.showTips("密码不能有大写字母!");
396 - }else if(that.$c.find("input[name='password']").val().length<6 || that.$c.find("input[name='password']").val().length>16){
397 - Core.showTips("密码长度为6-16位字符!");
398 - }else if(!that.$c.find('.checkbox-2').length>0){
399 - Core.showTips('请同意'+Core.PLATFORM_NAME+'网络协议',1);
400 - }else if(!passWordReg.test(that.$c.find("input[name='password']").val())){
401 - Core.showTips('请输入数字字母组成的密码!', true);
402 - return false;
403 - }else{
404 - //如果是游客的话则调用安卓截屏方法
405 - if (that.$c.find('[name="username"]').val() == that.$c.find('[name="old_usernmae"]').val() && window.android != undefined && window.android.screenShot != undefined ){
406 - window.android.screenShot();
407 - }
408 - $(this).attr("disabled",true);
409 - $(this).css({"background":"#999"});
410 - $(this).parent("li").css({"background":"#999"});
411 -
412 - Core.ajax_do(that.$c.find('.ajax'), that.register_cb, that);
413 - }
414 return false; 419 return false;
415 }); 420 });
416 421
...@@ -425,7 +430,7 @@ ...@@ -425,7 +430,7 @@
425 } 430 }
426 Register.prototype.set_random = function(){ 431 Register.prototype.set_random = function(){
427 var that = this; 432 var that = this;
428 - var random_name = 'yy' + Math.random().toString(36).substr(-2) + new Date().getTime().toString(36).substr(-4) 433 + var random_name = 'yy' + Math.random().toString(36).substr(-2) + new Date().getTime().toString(36).substr(-6)
429 var random_passwd = Math.random().toString(36).substr(-6) 434 var random_passwd = Math.random().toString(36).substr(-6)
430 that.$c.find('[name="username"]').val(random_name) 435 that.$c.find('[name="username"]').val(random_name)
431 that.$c.find('[name="old_usernmae"]').val(random_name) 436 that.$c.find('[name="old_usernmae"]').val(random_name)
...@@ -445,14 +450,19 @@ ...@@ -445,14 +450,19 @@
445 // 显示一个注册成功信息,并跳转到home 450 // 显示一个注册成功信息,并跳转到home
446 this.cache(); 451 this.cache();
447 Core.showTips('成功注册,欢迎使用' + Core.PLATFORM_NAME + '游戏平台'); 452 Core.showTips('成功注册,欢迎使用' + Core.PLATFORM_NAME + '游戏平台');
448 - Core.updateMod('home'); 453 + //直接进入游戏
449 - 454 + Core.finishLogin();
450 - this.$c.find("input#btn-regist").attr('disabled', null); 455 +// Core.updateMod('home');
451 - this.$c.find('.submit').css({"background":"#00beef"}); 456 +//
452 - this.$c.find('.submit').parent("li").css({"background":"#00beef"}); 457 +// this.$c.find("input#btn-regist").attr('disabled', null);
458 +// this.$c.find('.submit').css({"background":"#00beef"});
459 +// this.$c.find('.submit').parent("li").css({"background":"#00beef"});
453 } 460 }
454 Register.prototype.show_after = function() { 461 Register.prototype.show_after = function() {
455 this.set_random(); 462 this.set_random();
463 + Core.hide();
464 + Core.showMod("login");
465 + this.$c.find("[type=submit],.submit").click();
456 } 466 }
457 Core.registerMod('register', Register); 467 Core.registerMod('register', Register);
458 468
......
...@@ -948,7 +948,7 @@ ...@@ -948,7 +948,7 @@
948 } 948 }
949 IdentityCard.prototype.show_after = function(){ 949 IdentityCard.prototype.show_after = function(){
950 if(Core.Data.force_auth == 1){ 950 if(Core.Data.force_auth == 1){
951 - $(".js-return-game").attr("href","javascript:Core.finishPay()"); 951 + $(".js-return-game").attr("href","javascript:Core.finishLogin()");
952 } 952 }
953 953
954 } 954 }
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
36 <div class="new-sdk-container"> 36 <div class="new-sdk-container">
37 <div class="new-container-box"> 37 <div class="new-container-box">
38 <div class="SDK-titlebox"></div> 38 <div class="SDK-titlebox"></div>
39 - <form action="/sdk/login" method="post" class="ajax align-left clearfix"> 39 + <form action="/sdk/login" method="post" class="ajax align-left clearfix">
40 <div class="new-sdk-logo"><a href="#"> 40 <div class="new-sdk-logo"><a href="#">
41 <!--<img src="images/new-sdk-logo.png">--> 41 <!--<img src="images/new-sdk-logo.png">-->
42 </a></div> 42 </a></div>
...@@ -85,6 +85,7 @@ ...@@ -85,6 +85,7 @@
85 <ul class="inline-btn login-inline-btn"> 85 <ul class="inline-btn login-inline-btn">
86 <li> 86 <li>
87 <a method="post" class="btn btn_pri_block" href="#register">一键注册</a> 87 <a method="post" class="btn btn_pri_block" href="#register">一键注册</a>
88 + <!--<a class="btn btn_pri_block" id="fastReg">一键注册</a>-->
88 89
89 </li> 90 </li>
90 <li> 91 <li>
......
...@@ -816,7 +816,8 @@ FastClick.attach(document.body); ...@@ -816,7 +816,8 @@ FastClick.attach(document.body);
816 })(); 816 })();
817 $(function(){ 817 $(function(){
818 if (Core.isIos) { 818 if (Core.isIos) {
819 - $('meta[name="viewport"]').attr('content','width=800,maximum-scale=1,user-scalable=no'); 819 + // $('meta[name="viewport"]').attr('content','width=800,maximum-scale=1,user-scalable=no');
820 + $('meta[name="viewport"]').attr('content','width=880,maximum-scale=0.6,user-scalable=no');
820 } 821 }
821 }); 822 });
822 </script> 823 </script>
......
1 -20180906
...\ No newline at end of file ...\ No newline at end of file
1 +20180207
...\ No newline at end of file ...\ No newline at end of file
......
No preview for this file type