增加小程序，修改游戏前端

games/games/Edit/Settings.ini

@@ -123,16 +123,16 @@ DocumentTypeKeyWordsFile1=
 DocumentTypeFunctionRegExp1=
 
 [MRUFiles]
-MRUItem1=G:\Works\YouleGames\games\games\Projects\clinet\zpy\js\gamemain.js
+MRUItem1=G:\Works\YouleGames\games\games\Projects\clinet\gamehall\js\gamemain.js
-MRUItem2=G:\Works\YouleGames\games\games\Projects\clinet\sangelaok\js\gamemain.js
+MRUItem2=G:\Works\YouleGames\games\games\Projects\clinet\zpy\js\gamemain.js
-MRUItem3=G:\Works\YouleGames\games\games\Projects\clinet\niuniu\js\gamemain.js
+MRUItem3=G:\Works\YouleGames\games\games\Projects\Project1\js\gamemain.js
-MRUItem4=G:\Works\YouleGames\games\games\Projects\clinet\guanpai-jx\js\gamemain.js
+MRUItem4=G:\Works\YouleGames\games\games\Projects\clinet\sangelaok\js\gamemain.js
-MRUItem5=G:\Works\YouleGames\games\games\Projects\Project1\js\gamemain.js
+MRUItem5=G:\Works\YouleGames\games\games\Projects\clinet\niuniu\js\gamemain.js
-MRUItem6=G:\Works\YouleGames\games\games\Projects\clinet\doudizhu\js\gamemain.js
+MRUItem6=G:\Works\YouleGames\games\games\Projects\clinet\guanpai-jx\js\gamemain.js
-MRUItem7=G:\Works\JinXianProjects\JinXianMahjong\Projects\client\js\gamemain.js
+MRUItem7=G:\Works\YouleGames\games\games\Projects\clinet\doudizhu\js\gamemain.js
-MRUItem8=G:\Works\JinXianProjects\JinXianMahjong\Projects\Project1\js\gamemain.js
+MRUItem8=G:\Works\JinXianProjects\JinXianMahjong\Projects\client\js\gamemain.js
-MRUItem9=G:\Works\JinXianProjects\JinXianMahjong\Projects\client\js\client_Event.js
+MRUItem9=G:\Works\JinXianProjects\JinXianMahjong\Projects\Project1\js\gamemain.js
-MRUItem10=G:\Works\JinXianProjects\JinXianMahjong\Projects\client\js\01_SubGame\00_SubGame_Config.js
+MRUItem10=G:\Works\JinXianProjects\JinXianMahjong\Projects\client\js\client_Event.js
 
 [MRUFindText]
 MRUItem1=ÅäÖÃ

games/games/History.txt

@@ -1,3 +1,4 @@
+G:\Works\YouleGames\games\games\Projects\clinet\gamehall\
 G:\Works\YouleGames\games\games\Projects\clinet\zpy\
 G:\Works\YouleGames\games\games\Projects\clinet\sangelaok\
 G:\Works\YouleGames\games\games\Projects\clinet\niuniu\

games/games/Projects/clinet/doudizhu/js/00_Surface/02_Const.js

@@ -78,6 +78,7 @@ RpcList.set_bankpwd = "set_bankpwd";
 RpcList.binding_phone = "binding_phone";
 
 RpcList.send_phone_checkcode = "send_phone_checkcode";
+RpcList.send_phone_code_wechat = "send_phone_code_wechat";
 
 RpcList.get_treasurelist = "get_treasurelist";
 RpcList.change_star = "change_star";
@@ -101,6 +102,11 @@ RpcList.playerBehavior = "playerBehavior";
 RpcList.setVipForbidSelect = "setVipForbidSelect";
 
 RpcList.topup_card = "topup_card";
+RpcList.query_player2 = "query_player2";
+RpcList.giveCoin = "giveCoin";
+
+RpcList.getPlayerWhiteList = "getPlayerWhiteList";
+RpcList.optWhiteList = "optWhiteList";
 
 var h5RpcList={}
 h5RpcList.joinRoom = "joinRoom";
@@ -112,7 +118,7 @@ var ClickBtn = [3,5,7,13,14,15,10,11,12,25,17,9,47,51,53,55,58,59,76,60,61,74,75
 		602,626,604,656,661,662,663,664,665,666,667,668,669,670,671,3000,3004,3007,3008,3009,3010,3011,3014,3016,3017,3018,3019,
 		3034,3035,3044,3045,3046,3047,3048,3049,3050,3051,3052,3053,3054,3055,3057,3043,3038,3039,3067,3068,3087,3088,3089,3096,3075,3076,3097,3111,3120,92,93,97, 
 		99,104,105,106,107,3133,3139,3140,3144,3145,3149,3155,3159,679,3182,3184,3175,3194,3195,3199,3214,3215,3205,3206,3210,
-		3203,3216,3217,3222,3231,3232,3233,3235,3240,3251,3253,3243,3244,3245,3255,3256,3258,3260,3264,3265,3266]; 
+		3203,3216,3217,3222,3231,3232,3233,3235,3240,3251,3253,3243,3244,3245,3255,3256,3258,3260,3264,3265,3266,3268,3269,3289,3281,3276,3274]; 
 var C_PageOne = {
 	Tag:1,
 	X:1100,
@@ -127,7 +133,7 @@ var C_PageTwo = {
 };
 var UnClickBtn = [8,50,225,227,228,229,699,161,162,164,165,370,426,427,428,429,430,431,432,433,434,435,446,447,448,449,450,451,452,453,454,455,468,469,470,471,472,473,474,475,476,477,498,499,500,501,
 502,503,504,505,506,507,81,573,574,575,629,630,631,632,633,3056,3040,3058,3041,3061,3062,3071,3072,3069,3070,3090,3091,3092,3093,3094,3095,3098,3104,3108,3115,3116,3118,3119,
-102,336,337,338,155,154,156,110,111,3127,3128,3141,3142,3146,3147,3151,3157,3099,3197,3212,3237,3246,3247,3248,3249,3250
+102,336,337,338,155,154,156,110,111,3127,3128,3141,3142,3146,3147,3151,3157,3099,3197,3212,3237,3246,3247,3248,3249,3250,3291,3280,3288,3283,3279,3292
 ];
 var exceptSrc = [115,5,253,338,339,340,21,361,362,363,364,365,366,367,368,369,370,371,372,396];
 var ConstVal=ConstVal||{};
@@ -778,6 +784,35 @@ ConstVal.vipRank = {
 	rank_w:25,
 	
 	
+};
+ConstVal.whiteList = {
+	f_spid:3272,
+	bg_spid:3277,
+	id_spid:3279,
+	del_spid:3278,
+	charm_spid:3292,
+
+	bg_tag:1,
+	id_tag:10000,
+	del_tag:20000,
+	charm_tag:30000,
+
+	clip_x:0,
+	clip_y:0,
+	clip_w:0,
+	clip_h:0,
+
+	id_x:25,
+	del_x:450,
+	charm_x:200,
+
+	id_y:12,
+	del_y:4,
+	charm_y:12,
+	
+
+	space:8,
+
 
 
 };
@@ -785,7 +820,3 @@ ConstVal.vipRank = {
 
 
 
-
-
-
-

games/games/Projects/clinet/doudizhu/js/00_Surface/04_Data.js

@@ -416,7 +416,7 @@ GameData.createMyRoomListLength = 0;
 GameData.starCount = 0;
 GameData.roomCardCount=0;
 
-GameData.loginPlayerid = true;//登录是否带上playerid 
+GameData.loginPlayerid = false;//登录是否带上playerid 
 
 GameData.matchId = null;
 
@@ -436,7 +436,7 @@ GameData.addressBook = null;
 //GameData.sysConfigName=[];
 GameData.sysConfigName=["hideEscape","charmName","hideTaskBtn","miniPro","videoConfig","ofcShortCode","ofcTips","ofcWx","ofcImg",
 "managerUrl","rebateConfig","gameNoticeShow","hallNoticeShow","ofcAutoEnter","vipFlushTime","vipWx","h5PayUrl","appShareH5",
-"vipRankLimit","behaviorList","deviceLogin","hideWxShare","hideRoomCard","hideSpid","cdKey"];
+"vipRankLimit","behaviorList","deviceLogin","hideWxShare","hideRoomCard","hideSpid","cdKey","otherShare","avatarRange","avatarUrl","whiteListManager","nnLocal"];
 GameData.sysConfig={
 	hideEscape:0,
 	charmName:"魅力",
@@ -461,6 +461,11 @@ GameData.sysConfig={
 	hideRoomCard:1,//隐藏主界面房卡 1 不隐藏 2隐藏
 	hideSpid:null,//隐藏的精灵id 
 	cdKey:1,//是否显示CDKEY  1不显示 2显示 
+	otherShare:1,//开启新分享 1 关闭2开启
+	avatarRange:[100,10000],//设备登录的头像列表
+	avatarUrl:"https://projectimage.tscce.cn/image_132/", 
+	whiteListManager:2, //是否开启在游戏中管理白名单 
+	nnLocal:2,//
 	
 };
 GameData.inputCallBack2 = null;
@@ -553,3 +558,25 @@ GameData.feedMode = 0;
 GameData.fromMiniProData = {};
 
 
+GameData.shareFriendInfo = {};
+
+
+GameData.deviceAvatarList = [];
+
+GameData.whiteList = {
+	data:[],
+	length:0,
+	breakRoom:false,
+	selectTag:0,
+	slide:false,
+	inputId:"",
+	inputCharm:"",
+	searchId:"",
+	idWidth:12,
+	delPid:"",
+}
+
+
+
+
+

games/games/Projects/clinet/doudizhu/js/00_Surface/05_Func.js

@@ -1282,7 +1282,7 @@ Func.deviceLogin = function(phone,sms){
 	//设备登录 
 	GameData.isVisitor = false;
 	GameData.isDeviceLogin = true;
-	var WxInfo = Utl.ReadData(Utl.Config.devicePlayer);
+	var WxInfo = Utl.getCookie(Utl.Config.devicePlayer);
 	if(WxInfo){
 		WxInfo = JSON.parse(WxInfo);
 		sharelogin(WxInfo.openid,WxInfo.headimgurl,WxInfo.nickname,WxInfo.sex,WxInfo.city,WxInfo.Province,WxInfo.unionid,phone,sms);
@@ -1318,6 +1318,32 @@ Func.deviceLogin = function(phone,sms){
 		
 	}
 
+}
+Func.phoneLogin = function(phone,sms){
+	//手机登录
+	GameData.isVisitor = false;
+	GameData.isDeviceLogin = true;
+	var WxInfo = Utl.getCookie(Utl.Config.devicePlayer);
+	if(WxInfo){
+		WxInfo = JSON.parse(WxInfo);
+		sharelogin(WxInfo.openid,WxInfo.headimgurl,WxInfo.nickname,WxInfo.sex,WxInfo.city,WxInfo.Province,WxInfo.unionid,phone,sms);
+	}else{
+		var unionid = "phone_"+phone;
+		
+		
+		var name2 = String(hex_md5(unionid)).slice(0,6);
+		var avatar = "";
+		if(GameData.sysConfig.avatarUrl){
+			var avatar = GameData.sysConfig.avatarUrl + min_random(GameData.sysConfig.avatarRange[0],
+			GameData.sysConfig.avatarRange[1])+".jpg";
+		}
+		var nickName = "User_"+name2;
+		sharelogin(unionid,avatar,nickName,ifast_random(2)+1,
+		"China","ShangHai",unionid,phone,sms);
+		//var ram1 = 10000+ifast_random(10000);
+		
+	}
+
 }
 Func.accreditlogin=function(type){
 	//因为游戏打包之前调用会报错，所以要使用try{}catch{}   try 里面 使用打包调用的函数 catch() 里	
@@ -1337,15 +1363,21 @@ Func.accreditlogin=function(type){
 			
 		}else{
 			var headLoginList=[
-				"http://img5.imgtn.bdimg.com/it/u=110166870,238965605&fm=27&gp=0.jpg",
+				"https://img2.baidu.com/it/u=1823726962,2692568839&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500",
-				"http://www.qqzhi.com/uploadpic/2015-01-15/200511535.jpg",
+				"https://img0.baidu.com/it/u=320875415,2231067789&fm=253&fmt=auto&app=120&f=JPEG?w=500&h=500",
-				"http://img0.imgtn.bdimg.com/it/u=2722294531,1396252661&fm=27&gp=0.jpg",
+				"https://img1.baidu.com/it/u=3407774307,2859661062&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500",
-				"http://p2.gexing.com/touxiang/20130201/1735/510b8c7c1e572_200x200_3.jpg?recache=20131108",
+				"https://img2.baidu.com/it/u=1161398577,3592656327&fm=253&fmt=auto&app=120&f=JPEG?w=500&h=500",
-				"http://www.qqzhi.com/uploadpic/2015-01-15/200512924.jpg"
+				"https://img1.baidu.com/it/u=2061657615,4194426181&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=501",
+				"https://img2.baidu.com/it/u=3081347414,2363887197&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500",
+				"https://img1.baidu.com/it/u=1364384963,3982203144&fm=253&fmt=auto&app=120&f=JPEG?w=500&h=500",
+				"https://img1.baidu.com/it/u=3041194995,2386060237&fm=253&fmt=auto&app=120&f=JPEG?w=500&h=500",
+				"https://img2.baidu.com/it/u=2904976445,2884058010&fm=253&fmt=auto&app=120&f=JPEG?w=529&h=500",
+				"https://img0.baidu.com/it/u=1801052125,1596537112&fm=253&fmt=auto&app=120&f=JPEG?w=529&h=500",
+
 			];
 			var ram = ifast_random(100000);			
-			//sharelogin("fff23"+ram,headLoginList[ifast_random(headLoginList.length)],"测试"+ram,ifast_random(2)+1,"nanchang","jiangxi","ylgame"+ram);			
+			sharelogin("fff23"+ram,headLoginList[ifast_random(headLoginList.length)],"测试"+ram,ifast_random(2)+1,"nanchang","jiangxi","ylgame"+ram);			
-			sharelogin("fff23"+ram,headLoginList[ifast_random(headLoginList.length)],"测试"+ram,ifast_random(2)+1,"nanchang","jiangxi","oLVKis6bj3_l8qspMybG60KV2GN4");
+			// sharelogin("fff23"+ram,headLoginList[ifast_random(headLoginList.length)],"测试"+ram,ifast_random(2)+1,"nanchang","jiangxi","oLVKis6bj3_l8qspMybG60KV2GN4");
 		}
 			
 	}
@@ -1354,7 +1386,7 @@ var sharelogin = function(openid,headimgurl,nickname,sex,city,Province,unionid,p
 	if(!sex){
 		sex = 1;
 	}
-//GameUI.StartLoad();	
+	
 	if(!nickname && !headimgurl){//全为空时无法登陆 
 		GameUI.OpenTips("授权失败,请重新授权！");
 	}else{
@@ -1366,21 +1398,20 @@ var sharelogin = function(openid,headimgurl,nickname,sex,city,Province,unionid,p
 	wxdata.city = city;
 	wxdata.Province = Province;
 	wxdata.unionid = unionid;
-
+	if(phone){
+		wxdata.telphone = phone;
+		C_Player.setTel(phone);
+	}
 	wxdata=JSON.stringify(wxdata);
-	if(GameData.isVisitor){
+	// if(GameData.isVisitor){
-		Utl.SaveData(Utl.Config.visitorinfo,wxdata);
+	// 	Utl.SaveData(Utl.Config.visitorinfo,wxdata);
-	}
+	// }
-	if(GameData.isDeviceLogin){
-		Utl.SaveData(Utl.Config.devicePlayer,wxdata);
-	}
-	if(!GameData.isVisitor && !GameData.isDeviceLogin){		
-		Utl.setCookie(Utl.Config.wxinfo,wxdata,Utl.Config.maxtime);
-	}
 	// if(GameData.isDeviceLogin){
 	// 	Utl.SaveData(Utl.Config.devicePlayer,wxdata);
 	// }
-
+	if(!GameData.isVisitor && !GameData.isDeviceLogin){		
+		Utl.setCookie(Utl.Config.wxinfo,wxdata,Utl.Config.maxtime);
+	}
 	
 	C_Player.SetWxInfo(openid,headimgurl,nickname,sex,city,Province,unionid);
 	var data={};
@@ -1400,9 +1431,16 @@ var sharelogin = function(openid,headimgurl,nickname,sex,city,Province,unionid,p
 		data.telphone = phone;
 	}
 	if(sms){
+		if(sms != "telphoneAuto"){
 			data.smmcode = sms;
+			data.telphoneAuto = false;
+		}else{
+			data.telphoneAuto = true;
+		}
 	}
 	Net.Send_login(data);
+
+	
 	} 
 
 }
@@ -2269,7 +2307,7 @@ Func.getphoneInfo = function(){//
 		return window.settings.getphoneInfo();
 	}catch(e){
 		var data={};
-		data.PhoneIMEI = "device"+ifast_random(10000);
+		data.PhoneIMEI = "phone_"+min_randomChar(25);
 		getphoneinfo(data);
 	}
 }
@@ -2387,7 +2425,7 @@ Func.getmarketname = function(){//
 		return window.settings.getmarketname();
 	}catch(e){
 		if(GameData.userAgent != ConstVal.userAgent.uAgent_3){
-			return 1;
+			return 4;
 		}else{
 			return app_market;
 		}
@@ -4147,5 +4185,6 @@ Func.appDownload = function(url) {
 
 
 
+
 
 

games/games/Projects/clinet/doudizhu/js/00_Surface/06_Player.js

@@ -545,6 +545,9 @@ if(typeof(Player.prototype.returnHallData) == "undefined"){
 if(typeof(Player.prototype.setTel) == "undefined"){
 	Player.prototype.setTel = function(val){
 		this.tel = val;
-		set_self(3256,43,2,0,0);
+		// set_self(3256,43,2,0,0);
+		// play_ani(0,3256,35,255,100,0,1000,0,0,0,0,0,1);
 	};
 }
+
+

games/games/Projects/clinet/doudizhu/js/00_Surface/07_Desk.js

@@ -72,10 +72,15 @@ Desk.setInfinite = function(_value){
 Desk.setRoomMode = function(_value){
 	Desk.roomMode = _value;
 }
-Desk.Create=function(){//创建牌桌
+Desk.Create=function(roomtype){//创建牌桌
 	this.PlayerList= [];
+	if(typeof Game_Modify.getMaxPlayerCount !== 'undefined'){
+		this.PlayerList.length = Game_Modify.getMaxPlayerCount(roomtype);
+	}else{
 		this.PlayerList.length = Game_Config.Max.PlayerCnt;
-	for(var i=0;i<Game_Config.Max.PlayerCnt;i++){
+	}	
+	
+	for(var i=0;i<this.PlayerList.length;i++){
 		this.PlayerList[i] = new Player(i);
 	}
 	//Desk.myInfo = new Player(-1);
@@ -207,9 +212,30 @@ Desk.getPlayerIndexByPlayerid=function(_playerid){
 Desk.login=function(_msg){//登录 
 	
 	if(_msg.data.state==0){
+		if(GameData.sysConfig.deviceLogin){
+			Utl.SaveData(Utl.Config.dLogin,1);
+			// GameData.loginPlayerid = false;
+			
+			var wxdata={};
+			wxdata.openid = _msg.data.openid;
+			wxdata.headimgurl = _msg.data.avatar;
+			wxdata.nickname = _msg.data.nickname;
+			wxdata.sex = _msg.data.sex;
+			wxdata.city = _msg.data.city;
+			wxdata.Province = _msg.data.province;
+			wxdata.unionid = _msg.data.unionid;
+			wxdata.telphone = _msg.data.tel;
+			C_Player.setTel(_msg.data.tel);
+			
+			C_Player.SetWxInfo(wxdata.openid,wxdata.headimgurl,wxdata.nickname,wxdata.sex,wxdata.city,wxdata.Province,wxdata.unionid);
+			wxdata=JSON.stringify(wxdata);
+			
+			Utl.setCookie(Utl.Config.devicePlayer,wxdata);	
+			
+		}
 		//C_Player.Init();
 		GameData.hallLogin = false;
-		GameData.loginPlayerid = true;
+		
 		GameData.sendLoginTimes = 0;
 		Logic.savePlayerId(_msg.data.playerid);
 		GameData.isLogin=true;
@@ -219,6 +245,14 @@ Desk.login=function(_msg){//登录
 		}
 		if(_msg.data.invitecode){
 			C_Player.setInvitecod(_msg.data.invitecode);
+		}else{
+			if(window["app_invitationcode"]){
+				var data = {};
+				data.agentid = GameData.AgentId;
+				data.playerid = C_Player.playerid;
+				data.invitecode = app_invitationcode;
+				Net.Send_binding_invitecode(data);
+			}
 		}
 		if(_msg.data.initCard){
 			GameData.initCard = Number(_msg.data.initCard);
@@ -414,7 +448,7 @@ Desk.login=function(_msg){//登录
 		}
 		
 	}else{
-		GameUI.OpenTips("登录失败",ConstVal.Tips.time);
+		GameUI.OpenTips(_msg.data.msg || "登录失败",ConstVal.Tips.time);
 	}
 }
 Desk.create_room=function(_msg){//创建房间 
@@ -1308,6 +1342,9 @@ Desk.binding_phone = function(msg){
 Desk.send_phone_checkcode = function(msg){
 //	console.log(msg);
 }
+Desk.send_phone_code_wechat = function(msg){
+//	console.log(msg);
+}
 Desk.setVipForbidSelect = function(msg){
 	if(!msg.data.state){
 		GameData.snrRoomList.forbidSelect = msg.data.forbidSelect;
@@ -1328,4 +1365,61 @@ Desk.setVipForbidSelect = function(msg){
 Desk.topup_card = function(_msg){
 	
 }
+Desk.query_player2 = function(_msg){
+	var avatar = _msg.data.avatar;
+	var nickname = _msg.data.nickname;
+	var pid = _msg.data.playerid;
+	GameData.wareHouse.pImg = avatar;
+	GameData.wareHouse.pNickName = nickname;
+	GameData.wareHouse.pId = pid;
+	if(nickname || avatar){
+		GameUI.updateWareHousePlayerInfo();
+	}else{
+		GameUI.OpenTips("未找到对应玩家！",ConstVal.Tips.time);
+	}
+}
+Desk.giveCoin = function(_msg){
+	console.log(_msg);
+	if(_msg.data.state==0){
+		//C_Player.update_bean2(_msg.data.star1);
+		//C_Player.setWareHouseStarCOunt(_msg.data.star2);
+		//if(_msg.data.msg){
+			//GameUI.OpenTips(_msg.data.msg,ConstVal.Tips.time);
+			//GameData.wareHouse.safeInputCount = _msg.data.count;
+			//GameUI.updateWareHouseInput();
+		//}
+		C_Player.setWareHouseStarCOunt(_msg.data.star2);
+		GameUI.closeWareHouse();
+	}
+	if(_msg.data.showerror==1){
+		GameUI.OpenTips(_msg.data.error,ConstVal.Tips.time);
+	}
+}
+Desk.optWhiteList = function(msg){
+	GameData.whiteList.data = msg.data.whiteList;
+	GameUI.openWhiteList();
+	
+	if(msg.data.message){
+		GameUI.OpenTips(msg.data.message,ConstVal.Tips.time);
+	}else{
+		if(msg.data.mode == 1){
+			GameUI.OpenTips("添加/修改成功！",ConstVal.Tips.time);
+		}else{
+			GameUI.OpenTips("删除成功！",ConstVal.Tips.time);
+		}
+	}
+}
+Desk.getPlayerWhiteList = function(msg){
+	GameData.whiteList.data = msg.data.whiteList;
+	GameUI.openWhiteList();
+	
+}
+
+
+
+
+
+
+
+
 

games/games/Projects/clinet/doudizhu/js/00_Surface/08_Utl_Output.js

@@ -87,6 +87,9 @@ Utl.Config.devicePlayer = "tsgame_devicePlayer";
 Utl.Config.pre_phoneInfo1 = "tsgame_phoneInfo1_";
 Utl.Config.phoneInfo1 = "tsgame_phoneInfo1";
 
+Utl.Config.pre_dLogin = "tsgame_dLogin_";
+Utl.Config.dLogin = "tsgame_dLogin";
+
 Utl.SetStorage=function(){
 	Utl.Config.bgm = Utl.Config.pre_bgm+GameData.GameId;
 	Utl.Config.sound = Utl.Config.pre_sound+GameData.GameId+GameData.AgentId;
@@ -113,6 +116,7 @@ Utl.SetStorage=function(){
 	//Utl.Config.phoneCode = Utl.Config.pre_phoneCode+GameData.GameId+GameData.AgentId;
 	//Utl.Config.devicePlayer = Utl.Config.pre_devicePlayer+GameData.GameId+GameData.AgentId;
 	//Utl.Config.phoneInfo1 = Utl.Config.pre_phoneInfo1+GameData.GameId+GameData.AgentId;
+
 }
 
 Utl.SaveData = function(key,data){
@@ -228,7 +232,7 @@ Utl.getNicknameBySeat=function(seat){
 	var pobj=Desk.GetPlayerBySeat(seat);
 	return pobj.nickname;
 }
-//获取房间内某个座位的玩家性别
+//获取房间内某个座位的玩家性别 2为女性，其他都认为是男性
 Utl.getSexBySeat=function(seat){
 	var pobj=Desk.GetPlayerBySeat(seat);
 	return pobj.sex;
@@ -524,7 +528,7 @@ Utl.openVideo = function(_playerList,_seat,_roomcode,roomtype){
 		set_self(154,1,174,0,0);
 		set_self(155,1,174,0,0);
 		set_self(156,1,173,0,0);
-	}else if(GameData.OS == ConstVal.OS.android){//安卓
+	}else {//安卓
 		set_self(154,1,69,0,0);
 		set_self(155,1,69,0,0);
 		set_self(156,1,70,0,0);
@@ -1019,3 +1023,5 @@ Utl.getShowShare = function(){
 
 
 
+
+

games/games/Projects/clinet/doudizhu/js/00_Surface/09_Net.js

@@ -45,7 +45,8 @@ Net._SendData = function(_app,_route,_rpc,_data){
 	}
 
 	if(Game_Config.Debugger.isDebugger){
-		console.log("发送数据："+JSON.stringify(_msg));
+		console.log("发送数据：");
+		console.log(_msg);
 	}
 	
 }
@@ -117,8 +118,8 @@ Net.create_room = function(_msg){
 //发送登录请求 
 Net.Send_login = function(_data){
 	//console.log(returnCitySN);
-	if(typeof IpAddr != "undefined" && IpAddr.ip){
+	if(typeof returnCitySN != "undefined"){
-		_data.ip = IpAddr.ip;
+		_data.ip = returnCitySN.cip;
 	}
 	if(ConstVal.isGameHall){
 		if(!GameData.hallLogin){
@@ -572,12 +573,12 @@ Net.submit_location=function(_msg){
 }
 //发送绑定
 Net.Send_binding_invitecode=function(_data){
-	GameUI.StartLoad();
+	//GameUI.StartLoad();
 	this._SendData(AppList.app,RouteList.agent,RpcList.binding_invitecode,_data);
 }
 //接收绑定
 Net.binding_invitecode=function(_msg){
-	GameUI.EndLoad();
+	//GameUI.EndLoad();
 	C_Player.binding_invitecode(_msg);
 }
 
@@ -830,6 +831,14 @@ Net.send_phone_checkcode = function(_msg){
 	//GameUI.EndLoad();
 	Desk.send_phone_checkcode(_msg);
 }
+Net.Send_send_phone_code_wechat = function(_data){
+	//GameUI.StartLoad();
+	this._SendData(AppList.app,RouteList.agent,RpcList.send_phone_code_wechat,_data);
+}
+Net.send_phone_code_wechat = function(_msg){
+	//GameUI.EndLoad();
+	Desk.send_phone_code_wechat(_msg);
+}
 
 Net.Send_setVipForbidSelect = function(_data){
 	GameUI.StartLoad();
@@ -846,4 +855,32 @@ Net.Send_topup_card = function(_data){
 Net.topup_card = function(_msg){
 	Desk.topup_card(_msg);
 }
+Net.Send_query_player2 = function(_data){
+	this._SendData(AppList.app,RouteList.agent,RpcList.query_player2,_data);
+}
+Net.query_player2 = function(_msg){
+	Desk.query_player2(_msg);
+}
+Net.Send_giveCoin = function(_data){
+	this._SendData(AppList.app,RouteList.agent,RpcList.giveCoin,_data);
+}
+Net.giveCoin = function(_msg){
+	Desk.giveCoin(_msg);
+}
+Net.Send_getPlayerWhiteList = function(_data){
+	GameUI.StartLoad();
+	this._SendData(AppList.app,RouteList.agent,RpcList.getPlayerWhiteList,_data);
+}
+Net.getPlayerWhiteList = function(_msg){
+	GameUI.EndLoad();
+	Desk.getPlayerWhiteList(_msg);
+}
+Net.Send_optWhiteList = function(_data){
+	GameUI.StartLoad();
+	this._SendData(AppList.app,RouteList.agent,RpcList.optWhiteList,_data);
+}
+Net.optWhiteList = function(_msg){
+	GameUI.EndLoad();
+	Desk.optWhiteList(_msg);
+}
 

games/games/Projects/clinet/doudizhu/js/00_Surface/11_GameUI.js

@@ -172,6 +172,9 @@ GameUI.utlmousedown = function(gameid, spid, downx, downy, no1, no2, no3, no4, n
 	case ConstVal.vipRank.f_spid:
 		GameData.vipRank.slide = false;
 		break;
+	case ConstVal.whiteList.f_spid:
+		GameData.whiteList.slide = false;
+		break;
 
 	}
 
@@ -526,6 +529,27 @@ GameUI.utlmouseup = function(gameid, spid_down, downx, downy, spid_up, upx, upy,
 			}
 		}
 	}
+	if (spid_down == ConstVal.whiteList.f_spid) {
+		var pos = get_self(spid_down, 19, 0, 0, 0);
+		var h = get_self(spid_down, 21, 0, 0, 0);
+		var s_height = get_self(spid_down, 21, 0, 0, 0);
+		if (pos > ConstVal.whiteList.clip_y) {
+			var t = pos - ConstVal.whiteList.clip_y;
+			play_ani(1, spid_down, 19, pos, ConstVal.whiteList.clip_y, 0, t, 0, 0, 0, 1, 0, 0, 0);
+
+		} else if (pos < ConstVal.whiteList.clip_y + ConstVal.whiteList.clip_h - h) {
+
+			if (ConstVal.whiteList.clip_h < s_height) {
+				var t = ConstVal.whiteList.clip_y + ConstVal.whiteList.clip_h - pos - h;
+				play_ani(1, spid_down, 19, pos, ConstVal.whiteList.clip_y + ConstVal.whiteList.clip_h - h, 0, t, 0, 0, 0, 1, 0, 0, 0);
+
+			} else {
+				var t = ConstVal.whiteList.clip_y - pos;
+				play_ani(1, spid_down, 19, pos, ConstVal.whiteList.clip_y, 0, t, 0, 0, 0, 1, 0, 0, 0);
+
+			}
+		}
+	}
 	if (spid_down == ConstVal.vipRank.f_spid) {
 		var config = ConstVal.vipRank;
 		var pos = get_self(spid_down, 19, 0, 0, 0);
@@ -569,16 +593,21 @@ GameUI.utlmouseup = function(gameid, spid_down, downx, downy, spid_up, upx, upy,
 			GameUI.showCal();
 			break;
 		case 58:
+			if(GameData.LaunchMode != ConstVal.Launch_mode.from_hall){
 				//退出登录
 				GameData.isLogin = false;
 				GameData.isBoard = true;
+				GameData.loginPlayerid = false;
 				GameData.hallLogin = true;
 				Utl.delCookie(Utl.Config.wxinfo);
-			Utl.SaveData(Utl.Config.devicePlayer,"")
+				Utl.delCookie(Utl.Config.devicePlayer);
 				GameUI.JumpWxAuth();
 				if (GameData.hallConfig.logoffCallback == 1) {
 					Func.logoffCallback();
 				}
+			}else{
+				GameUI.OpenTips("请返回游戏大厅退出登录", ConstVal.Tips.time);
+			}
 			break;
 		case 3:
 			//微信授权 
@@ -608,15 +637,7 @@ GameUI.utlmouseup = function(gameid, spid_down, downx, downy, spid_up, upx, upy,
 			break;
 		case 234:
 			if (GameData.LaunchMode == ConstVal.Launch_mode.from_hall) {
-				//var data= {};
+				
-				//if(C_Player.roomcard>-1){
-				//data.gameid = GameData.GameId;
-				//data.opt = "saveGameId";
-				//data.from = 0;
-				//Func.backgameData(JSON.stringify(data));
-				//}else{
-				//Func.backgameData("");
-				//}
 				backgameData();
 
 			} else {
@@ -866,14 +887,8 @@ GameUI.utlmouseup = function(gameid, spid_down, downx, downy, spid_up, upx, upy,
 		case 74:
 			//分享微信好友
 			{
-				//var info=Game_Modify.onShare(1);
 				
-				//
-				//if(!GameData.sysConfig.appShareH5){
 				Func.sharefinend(1, 1, Game_Config.Share.appdownload, Game_Config.Share.title, Game_Config.Share.description);
-				//}else{
-					//Func.sharefinend(1, 1, GameData.sysConfig.appShareH5, Game_Config.Share.title, Game_Config.Share.description);	
-				//}
 				
 				this.CloseShare();
 			}
@@ -882,11 +897,7 @@ GameUI.utlmouseup = function(gameid, spid_down, downx, downy, spid_up, upx, upy,
 			//分享微信朋友圈
 			{
 				if (!GameData.hallConfig.shareType) {
-					//if(!GameData.sysConfig.appShareH5){
+					
-						Func.sharefinend(2, 1, Game_Config.Share.appdownload, Game_Config.Share.title + Game_Config.Share.description);
-					//}else{
-						//Func.sharefinend(2, 1, GameData.sysConfig.appShareH5, Game_Config.Share.title + Game_Config.Share.description);
-					//}
 				} else {
 					console.log(GameData.hallConfig.shareImgUrl);
 					Func.sharefinend(2, 3, GameData.hallConfig.shareImgUrl);
@@ -1053,21 +1064,13 @@ GameUI.utlmouseup = function(gameid, spid_down, downx, downy, spid_up, upx, upy,
 		case 182:
 			//邀请好友
 		case 183:
-			//var info=Game_Modify.onShare(3);
+			
-			//if(info[0]=="" && info[1] == ""){
-			//Func.sharefinend(1,1,Game_Config.Share.appdownload,Game_Config.Share.title,Game_Modify.roomDes);
-			//}else{
-			//var vText = "";
-			//if(Desk.videoConfig){
-			//vText = "*【视频房】";
-			//}
 			if(!GameData.sysConfig.appShareH5){
 				Func.sharefinend(1, 1, Game_Config.Share.appdownload, Game_Config.Share.title + Desk.videoDes + Game_Config.Share.gameTitle + GameData.shareMsg, Game_Config.Share.gameDescription);
 			}else{
 				Func.sharefinend(1, 1, GameData.sysConfig.appShareH5, Game_Config.Share.title + Desk.videoDes + Game_Config.Share.gameTitle + GameData.shareMsg, Game_Config.Share.gameDescription);
 			}
-			//Func.sharefinend(1, 1, Game_Config.Share.appdownload, Game_Config.Share.title + Desk.videoDes + Game_Config.Share.gameTitle + GameData.shareMsg, Game_Config.Share.gameDescription);
+			
-			//}
 
 			break;
 		case 151:
@@ -1270,6 +1273,30 @@ GameUI.utlmouseup = function(gameid, spid_down, downx, downy, spid_up, upx, upy,
 				data.value = GameData.allCharm;
 				Net.Send_setAllCharm(data);
 				break;
+				//删除白名单玩家 
+			case 8:
+				this.closeCheck();
+				var data={};
+				data.agentid = GameData.AgentId;
+				data.playerid = C_Player.playerid;
+				data.gameid = GameData.GameId;
+				data.shortcode = C_Player.shortcode;
+				data.mode = 2;
+				data.userid = GameData.whiteList.delPid;
+				Net.Send_optWhiteList(data);
+				break;
+			case 9:
+				this.closeCheck();
+				var data={};
+				data.agentid = GameData.AgentId;
+				data.playerid = C_Player.playerid;
+				data.shortcode = C_Player.shortcode;
+				data.gameid = GameData.GameId;
+				data.mode = 1;
+				data.userid = GameData.whiteList.delPid;
+				data.value = GameData.whiteList.inputCharm;
+				Net.Send_optWhiteList(data);
+				break;
 			}
 
 			break;
@@ -1421,10 +1448,10 @@ GameUI.utlmouseup = function(gameid, spid_down, downx, downy, spid_up, upx, upy,
 					GameUI.closeAuth();
 					GameUI.OpenTips("认证成功！", ConstVal.Tips.time);
 				} else {
-					GameUI.OpenTips("身份证信息不合法！", ConstVal.Tips.time);
+					GameUI.OpenTips("身份证信息不正确！", ConstVal.Tips.time);
 				}
 			} else {
-				GameUI.OpenTips("姓名不合法！", ConstVal.Tips.time);
+				GameUI.OpenTips("姓名不正确！", ConstVal.Tips.time);
 			}
 			break;
 		case 494:
@@ -1843,23 +1870,16 @@ GameUI.utlmouseup = function(gameid, spid_down, downx, downy, spid_up, upx, upy,
 				if (GameUI.Mem.snrOption.videoConfig) {
 					vText = "*【视频房】";
 				}
-				//if(!GameData.sysConfig.appShareH5){
+				
 				Func.sharefinend(1, 1, Game_Config.Share.appdownload, Game_Config.Share.title + vText + "微房号:" + GameData.snrRoomList.shortcode, Game_Config.Share.description);
-				//}else{
+				
-					//Func.sharefinend(1, 1, GameData.sysConfig.appShareH5, Game_Config.Share.title + vText + "微房号:" + GameData.snrRoomList.shortcode, Game_Config.Share.description);	
-				//}
-				//Func.sharefinend(1, 1, Game_Config.Share.appdownload, Game_Config.Share.title + vText + "微房号:" + GameData.snrRoomList.shortcode, Game_Config.Share.description);
 			}
 			break;
 		case 653:
 			//分享微信朋友圈
 			{
 
-				//var vText = "";
+				
-				//if(GameUI.Mem.snrOption.videoConfig){
-				//vText = "*【视频房】";
-				//}
-				//Func.sharefinend(2,1,Game_Config.Share.appdownload,Game_Config.Share.title+vText+"微房号:"+GameData.snrRoomList.shortcode+Game_Config.Share.description);
 				var isBean = 0;
 				if (Game_Modify.getRoomMode) {
 					isBean = Game_Modify.getRoomMode(GameData.snrRoomList.roomtype);
@@ -1990,12 +2010,24 @@ GameUI.utlmouseup = function(gameid, spid_down, downx, downy, spid_up, upx, upy,
 			GameUI.updateWareHouseCheckBox();
 			break;
 		case 3096:
-			GameData.wareHouse.pId = 123456;
+			if(String(GameData.wareHouse.pInputId).length==6){
-			GameData.wareHouse.pImg = C_Player.avatar;
+				var data={};
-			GameData.wareHouse.pNickName = "afeafefa";
+				set_self(3081,1,170,0,0);
-			GameUI.updateWareHousePlayerInfo();
+				set_self(3082,7,'',0,0);
+				data.agentid = GameData.AgentId;
+				data.playerid = GameData.wareHouse.pInputId;
+				Net.Send_query_player2(data);
+			}else{
+				GameUI.OpenTips("玩家ID输入不正确",ConstVal.Tips.time);
+			}
+				//GameData.wareHouse.pId = 123456;
+				//GameData.wareHouse.pImg = C_Player.avatar;
+				//GameData.wareHouse.pNickName = "afeafefa";
+				//GameUI.updateWareHousePlayerInfo();
 			break;
 		case 3043:
+			console.log(GameData.wareHouse);
+			if(GameData.wareHouse.page == 1){
 				console.log(GameData.wareHouse.selectType);
 				switch (GameData.wareHouse.selectType) {
 				case 1:
@@ -2045,13 +2077,13 @@ GameUI.utlmouseup = function(gameid, spid_down, downx, downy, spid_up, upx, upy,
 								} else {
 	
 									if (C_Player.bean < GameData.initBean) {
-									GameUI.OpenTips("您身上必须保留"+GameData.initBean+"金币！",ConstVal.Tips.time);
+										GameUI.OpenTips("您身上必须保留"+GameData.initBean+GameData.starName+"！",ConstVal.Tips.time);
 										data.count = 0;
 										GameData.wareHouse.safeInputCount = 0;
 										GameUI.updateWareHouseInput();
 									} else {
 										if (C_Player.bean - GameData.wareHouse.safeInputCount <= GameData.initBean) {
-										GameUI.OpenTips("您身上必须保留"+GameData.initBean+"金币！",ConstVal.Tips.time);
+											GameUI.OpenTips("您身上必须保留"+GameData.initBean+GameData.starName+"！",ConstVal.Tips.time);
 											data.count = C_Player.bean - GameData.initBean;
 											GameData.wareHouse.safeInputCount = C_Player.bean - GameData.initBean;
 											GameUI.updateWareHouseInput();
@@ -2071,6 +2103,45 @@ GameUI.utlmouseup = function(gameid, spid_down, downx, downy, spid_up, upx, upy,
 	
 					break;
 				}
+			}else{
+				
+					switch (GameData.wareHouse.selectType) {
+						case 1:
+						case 2:
+							//设置初始密码
+							console.log("设置初始密码");
+							if (GameData.wareHouse.initPassWord1 == GameData.wareHouse.initPassWord2) {
+								if (GameData.wareHouse.initPassWord1 != -1 && String(GameData.wareHouse.initPassWord1).length != 0) {
+		
+									var data = {};
+									data.agentid = GameData.AgentId;
+									data.playerid = C_Player.playerid;
+									data.unionid = C_Player.unionid;
+									data.password = String(GameData.wareHouse.initPassWord1);
+									console.log("输入合法");
+									console.log(data);
+									Net.Send_set_bankpwd(data);
+								}
+							}
+							break;
+						default:
+							if(String(GameData.wareHouse.pInputId).length != 6){
+								GameUI.OpenTips("玩家ID为6位！",ConstVal.Tips.time);
+							}else{
+								var data={};
+								data.agentid = GameData.AgentId;
+								data.count = GameData.wareHouse.pInputCount;
+								data.playerid = C_Player.playerid;
+								data.password = GameData.wareHouse.pInputPassWord;
+								data.toPlayerid = GameData.wareHouse.pInputId;
+								data.gameid = GameData.GameId;
+								Net.Send_giveCoin(data);
+							}
+							break;
+					}
+				}
+					
+			
 			break;
 		case 3097:
 			Utl.openInputPanel("输入范围为 " + GameUI.Mem.snrOption.min + "~" + GameUI.Mem.snrOption.max, snrInputCallback);
@@ -2234,12 +2305,22 @@ GameUI.utlmouseup = function(gameid, spid_down, downx, downy, spid_up, upx, upy,
 			break;
 		case 3140:
 		case 3235:
+			//改成游戏内管理好友
+			if (GameData.sysConfig.whiteListManager == 1) {
+				var data = {};
+				data.agentid = GameData.AgentId;
+				data.playerid = C_Player.playerid;
+				data.gameid = GameData.GameId;
+				Net.Send_getPlayerWhiteList(data);
+			}else{
 				if (GameData.sysConfig.managerUrl) {
-				//Func.OpenurlTitleData(GameData.sysConfig.managerUrl+"?agentid="+GameData.AgentId+"&channelid="
+					Func.OpenurlTitleData(GameData.sysConfig.managerUrl+"?agentid="+GameData.AgentId+"&channelid="
-				//+GameData.ChannelId+"&__HTML_VERSION__=3",
+					+GameData.ChannelId+"&__HTML_VERSION__=3",
-				//"管理后台","");
+					"管理后台","");
 					Func.browser(GameData.sysConfig.managerUrl + "?agentid=" + GameData.AgentId + "&channelid=" + GameData.ChannelId + "&playerid=" + C_Player.playerid + "&openid=" + C_Player.openid + "&unionid=" + C_Player.unionid);
 				}
+			}
+			
 			break;
 		case 3149:
 			if (get_self(3148, 37)) {
@@ -2377,6 +2458,59 @@ GameUI.utlmouseup = function(gameid, spid_down, downx, downy, spid_up, upx, upy,
 				}
 			}
 			break;
+		case ConstVal.whiteList.f_spid:
+			//
+			var up_id = ifast_check_add(spid_up, upx, upy);
+			if (!GameData.whiteList.slide) {
+				if (up_id >= ConstVal.whiteList.del_tag) {
+					GameData.whiteList.selectTag = up_id - ConstVal.whiteList.del_tag;
+					//console.log(GameData.whiteList.data[GameData.whiteList.selectTag]);
+					var pinfo = GameData.whiteList.data[GameData.whiteList.selectTag];
+					GameData.whiteList.delPid = pinfo[0];
+					GameData.checkType = 8;
+					GameUI.openCheck("是否删除"+pinfo[0]+",当前魅力值:"+pinfo[2]);
+				}
+				if (up_id >= ConstVal.whiteList.bg_tag && up_id < ConstVal.whiteList.id_tag) {
+					GameData.whiteList.selectTag = up_id - ConstVal.whiteList.bg_tag;
+					//console.log(GameData.whiteList.data[GameData.whiteList.selectTag]);
+					GameUI.searchWhiteList(GameData.whiteList.data[GameData.whiteList.selectTag][0]);
+				}
+			}
+			break;
+		case 3281:
+			if(GameData.whiteList.inputId){
+				GameData.checkType = 8;
+				GameData.whiteList.delPid = GameData.whiteList.inputId;
+				GameUI.openCheck("是否删除"+GameData.whiteList.inputId+",当前魅力值:"+GameData.whiteList.inputCharm);
+			}else{
+				GameUI.OpenTips("请输入正确的玩家ID！",ConstVal.Tips.time);
+			}
+			break;
+		case 3276:
+			if(GameData.whiteList.inputId){
+				GameData.checkType = 9;
+				GameData.whiteList.delPid = GameData.whiteList.inputId;
+				GameUI.openCheck("是否添加/修改"+GameData.whiteList.inputId+",魅力值:"+GameData.whiteList.inputCharm);
+			}else{
+				GameUI.OpenTips("请输入正确的玩家ID！",ConstVal.Tips.time);
+			}
+			break;
+		case 3270:
+		case 3274:
+			GameUI.closeWhiteList();
+			break;
+		case 3287:
+			Utl.openInputPanel("请输入玩家ID(长度六位)",whiteInputCallBack3);
+			break;
+		case 3275:
+			Utl.openInputPanel("请输入玩家ID(长度六位)",whiteInputCallBack1);
+			break;
+		case 3282:
+			Utl.openInputPanel("请输入魅力值",whiteInputCallBack2);
+			break;
+		case 3289:
+			GameUI.searchWhiteList(GameData.whiteList.searchId);
+			break;
 		case 3217:
 			//粘贴
 			GameData.gamepastetext = "mouseup_3217";
@@ -2445,7 +2579,8 @@ GameUI.utlmouseup = function(gameid, spid_down, downx, downy, spid_up, upx, upy,
 			switch(GameData.phoneType){
 				case 1://手机号登录
 					if(GameData.phoneNumber && GameData.phoneCode){ 
-						Func.deviceLogin(GameData.phoneNumber,GameData.phoneCode);
+						// Func.deviceLogin(GameData.phoneNumber,GameData.phoneCode);
+						Func.phoneLogin(GameData.phoneNumber,GameData.phoneCode);
 						GameUI.closePhoneBind();
 					}else{
 						GameUI.OpenTips("手机号与验证码均不能为空！");
@@ -2483,7 +2618,7 @@ GameUI.utlmouseup = function(gameid, spid_down, downx, downy, spid_up, upx, upy,
 				var data = {};
 				data.agentid = GameData.AgentId;
 				data.phonenum = GameData.phoneNumber;
-				Net.Send_send_phone_checkcode(data);
+				Net.Send_send_phone_code_wechat(data);
 				Logic.savePhoneCode(GameData.phoneNumber,"");
 				GameUI.closePhoneBind();
 				GameUI.openPhoneBind();	
@@ -2529,6 +2664,19 @@ GameUI.utlmouseup = function(gameid, spid_down, downx, downy, spid_up, upx, upy,
 				Net.Send_topup_card(data);
 			}
 			break;
+		case 3268:
+			GameData.shareFriendInfo.sharetype = 3;
+			GameUI.closeSharePannel();
+			Func.sharefriend(GameData.shareFriendInfo);
+			break;
+		case 3269:
+			GameData.shareFriendInfo.sharetype = 0;
+			GameUI.closeSharePannel();
+			Func.sharefriend(GameData.shareFriendInfo);
+			break;
+		case 3267:
+			GameUI.closeSharePannel();
+			break;
 		}
 		if (spid_up >= 376 && spid_up <= 385) {
 			for (var i = 0; i < Desk.PlayerList.length; i++) {
@@ -2704,6 +2852,13 @@ GameUI.utlmousemove = function(gameid, spid, downx, downy, movex, movey, timelon
 		}
 
 		break;
+	case ConstVal.whiteList.f_spid:
+		if (ifast_abs(offmovey) > 2) {
+			set_self(spid, 19, offmovey, 1, 0);
+			GameData.whiteList.slide = true;
+		}
+
+		break;
 
 
 	}
@@ -2934,6 +3089,9 @@ GameUI.utlgamemydrawbegin = function(gameid, spid, times, timelong, no2, no3, no
 	if (spid == ConstVal.blackList.f_spid) {
 		set_clip(0, 0, ConstVal.blackList.clip_x, ConstVal.blackList.clip_y, ConstVal.blackList.clip_w, ConstVal.blackList.clip_h);
 	}
+	if (spid == ConstVal.whiteList.f_spid) {
+		set_clip(0, 0, ConstVal.whiteList.clip_x, ConstVal.whiteList.clip_y, ConstVal.whiteList.clip_w, ConstVal.whiteList.clip_h);
+	}
 	if (spid == ConstVal.vipRank.f_spid) {
 		set_clip(0, 0, ConstVal.vipRank.clip_x, ConstVal.vipRank.clip_y, ConstVal.vipRank.clip_w, ConstVal.vipRank.clip_h);
 	}
@@ -3027,6 +3185,8 @@ GameUI.JumpWxAuth = function() { //跳转微信授权
 	//preAudio();
 	//setTimeout(function(){
 	//Func.getphoneInfo();
+	//C_Player.Init();
+	
 	Logic.getPhoneInfo();
 	GameData.submitLocation = false;
 	GameUI.stopMenuSceneAnimation();
@@ -3042,20 +3202,22 @@ GameUI.JumpWxAuth = function() { //跳转微信授权
 	if (GameData.hallConfig.betaText) {
 		vText += GameData.hallConfig.betaText;
 	}
-	set_self(285, 7, "");
+	set_self(285, 7, vText);
 
 	set_group(2, 37, 1, 0, 0);
 	if(GameData.sysConfig.deviceLogin){
 		set_self(3,37,0,0,0);
 		set_self(3254,37,1,0,0);
-		set_self(3255,37,1,0,0);
+		set_self(3255,37,0,0,0);
+		set_self(3254,18,490,0,0);
+		// set_self(3255,18,660,0,0);
 	}else{
 		set_self(3,37,1,0,0);
 		set_self(3254,37,0,0,0);
 		set_self(3255,37,0,0,0);
 	}
 	var WxInfo = null;
-	if (!Game_Config.Debugger.isDebugger) {
+	//if (!Game_Config.Debugger.isDebugger) {
 		if (GameData.versionState == 0) {
 			if (GameData.h5Version == 1) {
 				WxInfo = Logic.getWxInfo();
@@ -3063,23 +3225,27 @@ GameUI.JumpWxAuth = function() { //跳转微信授权
 				if(!GameData.sysConfig.deviceLogin){
 					WxInfo = Utl.getCookie(Utl.Config.wxinfo);
 				}else{
-					WxInfo = Utl.ReadData(Utl.Config.devicePlayer);
+					WxInfo = Utl.getCookie(Utl.Config.devicePlayer);
-				}
+					if(Utl.ReadData(Utl.Config.dLogin)){
-			}
+						set_self(3254,37,1,0,0);
-		}
+						// set_self(3255,18,490,0,0);	
-	} else {
-		if (Game_Config.Debugger.AutoLogin) {
-			if (GameData.h5Version == 1) {
-				WxInfo = Logic.getWxInfo();
-			} else {
-				if(!GameData.sysConfig.deviceLogin){
-					WxInfo = Utl.getCookie(Utl.Config.wxinfo);
-				}else{
-					WxInfo = Utl.ReadData(Utl.Config.devicePlayer);
 					}
 				}
 			}
 		}
+	//} else {
+		//if (Game_Config.Debugger.AutoLogin) {
+			//if (GameData.h5Version == 1) {
+				//WxInfo = Logic.getWxInfo();
+			//} else {
+				//if(!GameData.sysConfig.deviceLogin){
+					//WxInfo = Utl.getCookie(Utl.Config.wxinfo);
+				//}else{
+					//WxInfo = Utl.ReadData(Utl.Config.devicePlayer);
+				//}
+			//}
+		//}
+	//}
 
 	if (WxInfo) {
 		WxInfo = JSON.parse(WxInfo);
@@ -3123,6 +3289,11 @@ GameUI.JumpWxAuth = function() { //跳转微信授权
 		data.version = GameData.versionCode;
 		data.channelid = GameData.ChannelId;
 		data.marketid = GameData.marketID;
+		if(GameData.sysConfig.deviceLogin){
+			C_Player.setTel(WxInfo.telphone);
+			data.telphone = WxInfo.telphone;
+			data.telphoneAuto = true;
+		}
 		Net.Send_login(data);
 		//},2000);
 		//}
@@ -3716,8 +3887,6 @@ GameUI.JumpMenuScene = function(_bTemp) {
 	if (Game_Config.sysConfig) {
 		if (!Game_Config.sysConfig.mainMenuButton) {
 			//GameUI.startMenuSceneAnimation();
-			set_self(568, 37, 0, 0, 0);
-			set_self(483, 37, 0, 0, 0);
 		} else {
 			set_self(11, 37, 0, 0, 0);
 			set_self(12, 37, 0, 0, 0);
@@ -3762,15 +3931,17 @@ GameUI.JumpMenuScene = function(_bTemp) {
 		set_self(3233,37,0,0,0);
 	}
 	if(GameData.sysConfig.deviceLogin){
-		set_self(3256,37,1,0,0);
+		set_self(3256,37,0,0,0);
 	}else{
 		set_self(3256,37,0,0,0);
 	}
-	if(C_Player.tel){
+	// if(C_Player.tel){
-		set_self(3256,43,2,0,0);
+	// 	set_self(3256,43,2,0,0);
-	}else{
+	// 	play_ani(0,3256,35,255,100,0,1000,0,0,0,0,0,1);		
-		set_self(3256,43,1,0,0);
+	// }else{
-	}
+	// 	set_self(3256,43,1,0,0);
+	// 	play_ani(1,3256,35,255,100,0,1000,0,0,0,0,0,1);
+	// }
 	if (ConstVal.isGameHall) {
 		set_self(14, 37, 0, 0, 0);
 		set_self(13, 37, 0, 0, 0);
@@ -4653,6 +4824,11 @@ GameUI.updatePlayerInfoUI = function() {
 			return;
 		}
 	}
+	if(typeof Game_Modify.updatePlayerInfoUI !== 'undefined'){
+		for(var i = 0; i < Desk.PlayerList.length; i++){
+			Game_Modify.updatePlayerInfoUI(i);
+		}
+	}else{
 		for (var i = 0; i < Desk.PlayerList.length; i++) {
 			if (Desk.PlayerList[i].playerid != -1) {
 				var ind = Logic.ChangeToStatus(C_Player.seat, i);
@@ -4694,6 +4870,7 @@ GameUI.updatePlayerInfoUI = function() {
 			}
 		}
 	}
+}
 GameUI.StartVoteCountDown = function(time) {
 	VoteTime = time;
 	set_self(2, 57, 1000, 0, 0);
@@ -4706,6 +4883,11 @@ GameUI.PlayerJoinRoom = function(seat) { //玩家加入房间显示
 			return;
 		}
 	}
+	if(typeof Game_Modify.updatePlayerInfoUI !== 'undefined'){
+		for(var i = 0; i < Desk.PlayerList.length; i++){
+			Game_Modify.updatePlayerInfoUI(i);
+		}
+	}else{
 		var ind = Logic.ChangeToStatus(C_Player.seat, seat);
 		var text = Func.subString(Desk.PlayerList[seat].nickname, Game_Config.Info.Mainnickname, true);
 		set_self(406 + ind, 7, text, 1, 0);
@@ -4739,6 +4921,7 @@ GameUI.PlayerJoinRoom = function(seat) { //玩家加入房间显示
 		Func.up_imgurl(116 + ind, Desk.PlayerList[seat].avatar);
 		set_group(43 + ind, 37, 1, 0, 0);
 	}
+}
 GameUI.PlayerLeaveRoom = function(seat) { //玩家加入房间显示
 	var ind = Logic.ChangeToStatus(C_Player.seat, seat);
 	set_self(406 + ind, 7, "", 0, 0);
@@ -4750,6 +4933,7 @@ GameUI.OpenApply = function(bTemp, time) { //打开申请解散投票界面
 	GameUI.CloseChat();
 	set_self(369, 7, "三人及以下全部同意达成解散，\n三人以上超过半数同意达成解散");
 	this.VoteList = [];
+	
 	for (var i = 0; i < Desk.agreefree.length; i++) {
 		if (Desk.agreefree[i] != null && Desk.agreefree[i] != 0) {
 			this.VoteList.push(i);
@@ -4774,7 +4958,7 @@ GameUI.OpenApply = function(bTemp, time) { //打开申请解散投票界面
 
 	set_self(191, 7, "发起投票:【" + Desk.GetPlayerBySeat(this.ApplyPlayer).nickname + "】\n\n请问是否同意？(倒计时结束未选择，则默认同意)", 0, 0);
 	set_group(29, 37, 1, 0, 0);
-	for (var i = this.VoteList.length; i < Desk.PlayerList.length - 1; i++) {
+	for (var i = this.VoteList.length; i <10; i++) {
 		set_self(264 + i, 37, 0, 0, 0);
 		set_self(166 + i, 37, 0, 0, 0);
 	}
@@ -4782,6 +4966,7 @@ GameUI.OpenApply = function(bTemp, time) { //打开申请解散投票界面
 		set_self(201, 37, 0, 0, 0);
 		set_self(202, 37, 0, 0, 0);
 	}
+	
 	set_self(223, 37, 0, 0, 0);
 	this.StartVoteCountDown(time);
 
@@ -4808,7 +4993,7 @@ GameUI.OpenApplyResult = function(bTemp, agreelist) {
 			set_self(166 + i, 7, "同意", 0, 0);
 		}
 		set_group(29, 37, 1, 0, 0);
-		for (var i = vlist.length; i < Desk.PlayerList.length - 1; i++) {
+		for (var i = vlist.length; i < 10; i++) {
 			set_self(264 + i, 37, 0, 0, 0);
 			set_self(166 + i, 37, 0, 0, 0);
 		}
@@ -4820,7 +5005,7 @@ GameUI.OpenApplyResult = function(bTemp, agreelist) {
 
 		set_self(191, 7, "投票结果：\n\n拒绝解散玩家:【" + Desk.GetPlayerBySeat(agreelist[0]).nickname + "】", 0, 0);
 		set_group(29, 37, 1, 0, 0);
-		for (var i = 0; i < Desk.PlayerList.length - 1; i++) {
+		for (var i = agreelist.length - 1; i < 10; i++) {
 			set_self(264 + i, 37, 0, 0, 0);
 			set_self(166 + i, 37, 0, 0, 0);
 		}
@@ -6334,7 +6519,7 @@ GameUI.CalInput = function(spid) {
 				set_self(373, 20, GameData.Multiple.length * 36, 0, 0);
 				set_self(373, 18, get_self(372, 18, 0, 0, 0) + get_self(372, 20, 0, 0, 0) / 2 - GameData.Multiple.length * 18, 0, 0);
 			} else {
-				GameUI.OpenTips("输入不合法！", ConstVal.Tips.time);
+				GameUI.OpenTips("输入不正确！", ConstVal.Tips.time);
 			}
 		}
 	}
@@ -6373,7 +6558,7 @@ GameUI.CalInput = function(spid) {
 			set_self(370, 20, GameData.Multiple.length * 28, 0, 0);
 			set_self(283, 20, 203 + GameData.Multiple.length * 28, 0, 0);
 		} else {
-			GameUI.OpenTips("输入不合法！", ConstVal.Tips.time);
+			GameUI.OpenTips("输入不正确！", ConstVal.Tips.time);
 		}
 	}
 }
@@ -7972,8 +8157,9 @@ GameUI.showWareHouseTable = function() {
 		set_self(3060, 37, 1, 0, 0);
 		set_self(3061, 37, 1, 0, 0);
 		set_self(3062, 37, 1, 0, 0);
-
+		set_self(3081,1,170,0,0);
-
+		set_self(3082,7,'',0,0);
+		set_self(3083,7,'',0,0);
 		break;
 	}
 	switch (GameData.wareHouse.page) {
@@ -8032,7 +8218,7 @@ GameUI.switchWareHousePage = function(page, bTemp) {
 		//set_self(3060,18,ConstVal.wareHouse.tableBgX[1],0,0);
 		//set_self(3061,18,ConstVal.wareHouse.tableTextX[0],0,0);
 		//set_self(3062,18,ConstVal.wareHouse.tableTextX[1],0,0);
-
+		GameUI.updateWareHousePlayerInfo();
 		set_self(3059, 43, 2, 0, 0);
 		set_self(3060, 43, 1, 0, 0);
 		set_self(3061, 43, 2, 0, 0);
@@ -8050,6 +8236,15 @@ GameUI.switchWareHousePage = function(page, bTemp) {
 	}
 	GameUI.updateWareHouseCheckBox();
 }
+//初始化赠送数据
+GameUI.initGiveData = function(){
+	GameData.wareHouse.pNickName = '';
+	GameData.wareHouse.pId='';
+	GameData.wareHouse.pImg='';
+	GameData.wareHouse.pInputPassWord='';
+	GameData.wareHouse.pInputCount = -1;
+	GameData.wareHouse.pInputId = -1;
+} 
 //更新输入框内容
 GameUI.updateWareHouseInput = function() {
 	//var bTemp = C_Player.bankpwd;
@@ -8063,7 +8258,7 @@ GameUI.updateWareHouseInput = function() {
 		set_group(92, 37, 0, 0, 0);
 		if (GameData.wareHouse.initPassWord1 == GameData.wareHouse.initPassWord2) {
 			if (GameData.wareHouse.initPassWord1 != -1 && String(GameData.wareHouse.initPassWord1).length != 0) {
-				set_self(3073, 7, "输入合法！");
+				set_self(3073, 7, "输入符合规则！");
 			} else {
 				set_self(3073, 7, "密码不能为空！");
 				set_self(3069, 37, 1, 0, 0);
@@ -8319,6 +8514,7 @@ GameUI.wareHouseInputNumber = function(type, _input) {
 		//id
 		switch (type) {
 		case 1:
+			
 			if (GameData.wareHouse.pInputId == -1) {
 				GameData.wareHouse.pInputId = _input;
 			} else if (String(GameData.wareHouse.pInputId).length >= 6) {
@@ -8356,9 +8552,14 @@ GameUI.wareHouseInputNumber = function(type, _input) {
 			} else {
 				var cTemp = Number(String(GameData.wareHouse.pInputCount) + _input);
 				//验证输入星星合法性
-				if (GameUI.checkWareHouseInput(cTemp, GameData.wareHouse.pInputType, 1)[0]) {
+				if(String(cTemp).length> 10){
+					GameUI.OpenTips("输入超出限制！",ConstVal.Tips.time);
+				}else{
 					GameData.wareHouse.pInputCount = cTemp;	
 				}
+				//if (GameUI.checkWareHouseInput(cTemp, GameData.wareHouse.pInputType, 1)[0]) {
+				//	GameData.wareHouse.pInputCount = cTemp;
+				//}
 			}
 			GameUI.updateWareHouseInput();
 			break;
@@ -8366,11 +8567,11 @@ GameUI.wareHouseInputNumber = function(type, _input) {
 			if (GameData.wareHouse.pInputCount == -1 || String(GameData.wareHouse.pInputCount).length == 1) {
 				GameData.wareHouse.pInputCount = -1;
 			} else {
-				//if(String(GameData.wareHouse.pInputCount).length == 1){
+				if(String(GameData.wareHouse.pInputCount).length > 10){
-				//GameData.wareHouse.pInputCount = -1;
+					GameUI.OpenTips("输入超出限制！",ConstVal.Tips.time);
-				//}else{
+				}else{
 					GameData.wareHouse.pInputCount = Number(String(GameData.wareHouse.pInputCount).substring(0, String(GameData.wareHouse.pInputCount).length - 1));
-				//}
+				}
 
 			}
 			GameUI.updateWareHouseInput();
@@ -8571,13 +8772,24 @@ GameUI.updateWareHousePlayerInfo = function() {
 		set_self(3083, 7, "", 0, 0);
 	}
 
-
+	if(GameData.wareHouse.pImg){
 		Func.up_imgurl(336, GameData.wareHouse.pImg);
+		set_self(3081,1,336,0,0);
+	}else{
+		set_self(3081,1,170,0,0);
+	}
+	
 }
 GameUI.updateCount = function() {
+	if(GameData.wareHouse.page == 1){
 		GameUI.setNumberImage(3033, C_Player.wareHouseStarCount, 27); //仓库库存数量 
 		GameUI.setNumberImage(3079, C_Player.bean, 27); //携带的星星数量 
 		GameUI.setNumberImage(3080, C_Player.roomcard, 27); //房卡数量 
+	}else{
+		GameUI.setNumberImage(3033, C_Player.wareHouseStarCount, 27); //仓库库存数量
+		GameUI.setNumberImage(3079, C_Player.wareHouseStarCount, 27); //携带的星星数量
+		GameUI.setNumberImage(3080, C_Player.roomcard, 27); //房卡数量
+	}
 }
 //开启广告倒计时 
 GameUI.startAdCountDown = function() {
@@ -9203,7 +9415,11 @@ GameUI.createVipRoomListPageTwo = function() {
 				}
 				//桌号
 				var code = ifast_addtospritefromspritecopy(ConstVal.vipRoomList2.f_spid, ConstVal.vipRoomList2.code_spid, plx + ConstVal.vipRoomList2.code_x, ply + ConstVal.vipRoomList2.code_y, ConstVal.vipRoomList2.code_tag + i);
-				set_self(code, 7, rData.roomcodes.roomlist[i], 0, 0);
+				//set_self(code, 7, rData.roomcodes.roomlist[i], 0, 0);
+				var dTag = i + 1;
+				set_self(code, 7, dTag, 0, 0);
+				set_self(code, 20, String(dTag).length * 23, 0, 0);
+				GameUI.adaptPositionSpid(code,bg);
 				//人数 
 				var count = ifast_addtospritefromspritecopy(ConstVal.vipRoomList2.f_spid, ConstVal.vipRoomList2.count_spid, plx + ConstVal.vipRoomList2.count_x, ply + ConstVal.vipRoomList2.count_y, ConstVal.vipRoomList2.count_tag + i);
 				var coTxt = 0;
@@ -9488,7 +9704,143 @@ GameUI.setCodeTime = function(time){
 	GameUI.setNumberImage(3246,codeTime,21);
 	GameUI.adaptPositionSpid(3246,3245);
 }
-
+GameUI.openSharePannel = function(){
+	set_group(107,37,1,0,0);
+}
+GameUI.closeSharePannel = function(){
+	set_group(107,37,0,0,0);
+}
+GameUI.openWhiteList = function(){
+	set_group(108,37,1,0,0);
+	GameData.whiteList.inputId = "";
+	GameUI.updatePlayerID();
+	GameData.whiteList.inputCharm = "";
+	GameUI.updateCharm();
+	GameData.whiteList.searchId = "";
+	GameUI.updateSearch();
+	//set_self(3261,7,"解散该玩家所在房间(已开战提前解散)",0,0);
+	//blackInputCallBack("");
+	
+	GameUI.createWhiteList();
+}
+GameUI.updateCharm = function(){
+	if(GameData.whiteList.inputCharm){
+		//set_self(3212,7,GameData.blackList.inputId,0,0);
+		GameUI.setTextSpid(3283,GameData.whiteList.inputCharm,GameData.whiteList.idWidth);
+	}else{
+		//set_self(3212,7,"点击输入玩家ID",0,0);
+		GameData.whiteList.inputCharm = 0;
+		GameUI.setTextSpid(3283,"0",GameData.blackList.idWidth);
+	}
+	GameUI.adaptPositionSpid(3283,3282);
+}
+GameUI.updatePlayerID = function(){
+	if(GameData.whiteList.inputId){
+		//set_self(3212,7,GameData.blackList.inputId,0,0);
+		GameUI.setTextSpid(3280,GameData.whiteList.inputId,GameData.whiteList.idWidth);
+	}else{
+		//set_self(3212,7,"点击输入玩家ID",0,0);
+		GameUI.setTextSpid(3280,"玩家ID",GameData.blackList.idWidth);
+	}
+	GameUI.adaptPositionSpid(3280,3275);
+}
+GameUI.updateSearch = function(){
+	if(GameData.whiteList.searchId){
+		//set_self(3212,7,GameData.blackList.inputId,0,0);
+		GameUI.setTextSpid(3288,GameData.whiteList.searchId,GameData.whiteList.idWidth);
+	}else{
+		//set_self(3212,7,"点击输入玩家ID",0,0);
+		GameUI.setTextSpid(3288,"玩家ID",GameData.blackList.idWidth);
+	}
+	GameUI.adaptPositionSpid(3288,3287);
+}
+GameUI.closeWhiteList = function(){
+	set_group(108,37,0,0,0);
+}
+GameUI.searchWhiteList = function(pid){
+	if(!pid){
+		GameUI.OpenTips("请输入玩家ID",ConstVal.Tips.time);
+		return;
+	}
+	var tmp = false;
+	for(var i=0;i< GameData.whiteList.data.length;i++ ){
+		if(GameData.whiteList.data[i] && GameData.whiteList.data[i][0] == pid){
+			GameData.whiteList.inputId = pid;
+			GameData.whiteList.inputCharm = GameData.whiteList.data[i][2];
+			GameUI.updatePlayerID();
+			GameUI.updateCharm();
+			tmp = true;
+			break;
+		}
+	}
+	if(!tmp){
+		GameUI.OpenTips("该玩家不在名单中",ConstVal.Tips.time);
+	}
+}
+
+var whiteInputCallBack1 = function(data){
+	if(String(data).length == 6){
+		Utl.closeInputPanel();
+		GameData.whiteList.inputId = data;
+		GameUI.updatePlayerID();
+	}else{
+		GameUI.OpenTips("玩家id长度为6位！",ConstVal.Tips.time);
+	}
+}
+var whiteInputCallBack2 = function(data){
+	Utl.closeInputPanel();
+	GameData.whiteList.inputCharm = data;
+	GameUI.updateCharm();
+}
+var whiteInputCallBack3 = function(data){
+	if(String(data).length == 6){
+		Utl.closeInputPanel();
+		GameData.whiteList.searchId = data;
+		GameUI.updateSearch();
+	}else{
+		GameUI.OpenTips("玩家id长度为6位！",ConstVal.Tips.time);
+	}
+}
+GameUI.createWhiteList = function(){
+	GameUI.removeWhiteList();
+	set_self(ConstVal.whiteList.f_spid,18,ConstVal.whiteList.clip_x,0,0);
+	set_self(ConstVal.whiteList.f_spid,19,ConstVal.whiteList.clip_y,0,0);
+	var space = get_self(ConstVal.whiteList.bg_spid,21,0,0,0) + ConstVal.whiteList.space;
+	var listLength = GameData.whiteList.data.length;
+	set_self(ConstVal.whiteList.f_spid,21,listLength*space,0,0);
+	for(var i=0;i<listLength;i++){
+		//背景
+		var bg = ifast_addtospritefromspritecopy(ConstVal.whiteList.f_spid, ConstVal.whiteList.bg_spid,
+		 0, space*i, ConstVal.whiteList.bg_tag + i);
+		//玩家id
+		var id = ifast_addtospritefromspritecopy(ConstVal.whiteList.f_spid, ConstVal.whiteList.id_spid,
+		 ConstVal.whiteList.id_x, ConstVal.whiteList.id_y+space*i, ConstVal.whiteList.id_tag + i);
+		
+		
+		set_self(id,7,"ID: "+GameData.whiteList.data[i][0],0,0);
+		
+		//玩家id
+		var cid = ifast_addtospritefromspritecopy(ConstVal.whiteList.f_spid, ConstVal.whiteList.charm_spid,
+		 ConstVal.whiteList.charm_x, ConstVal.whiteList.charm_y+space*i, ConstVal.whiteList.charm_tag + i);
+
+
+		set_self(cid,7,"魅力值: "+GameData.whiteList.data[i][2],0,0);
+		//删除
+		var id = ifast_addtospritefromspritecopy(ConstVal.whiteList.f_spid, ConstVal.whiteList.del_spid,
+		 ConstVal.whiteList.del_x, ConstVal.whiteList.del_y+space*i, ConstVal.whiteList.del_tag + i);
+
+	}
+	GameData.whiteList.length = listLength;
+}
+GameUI.removeWhiteList = function(){
+	for (var i = 0; i < GameData.whiteList.length; i++) {
+		ifast_dllpritefromspritecopy(ConstVal.whiteList.f_spid, ConstVal.whiteList.bg_tag + i);
+		ifast_dllpritefromspritecopy(ConstVal.whiteList.f_spid, ConstVal.whiteList.id_tag + i);
+		ifast_dllpritefromspritecopy(ConstVal.whiteList.f_spid, ConstVal.whiteList.del_tag + i);
+		ifast_dllpritefromspritecopy(ConstVal.whiteList.f_spid, ConstVal.whiteList.charm_tag + i);
+	}
+	GameData.whiteList.length = 0;
+}
 
 
 

games/games/Projects/clinet/doudizhu/js/00_Surface/12_Logic.js

@@ -45,6 +45,10 @@ var game_websocket = function (_id){
 					data.version = GameData.versionCode;
 					data.channelid = GameData.ChannelId;
 					data.marketid = GameData.marketID;
+					if(GameData.sysConfig.deviceLogin){						
+						data.telphone = C_Player.telphone;
+						data.telphoneAuto = true;
+					}
 					Net.Send_login(data);
 				}else{
 					var WxInfo = Utl.getCookie(Utl.Config.wxinfo);
@@ -67,6 +71,10 @@ var game_websocket = function (_id){
 						data.gameid=GameData.GameId;
 						data.channelid = GameData.ChannelId;
 						data.marketid = GameData.marketID;
+						if(GameData.sysConfig.deviceLogin){						
+							data.telphone = C_Player.telphone;
+							data.telphoneAuto = true;
+						}
 						Net.Send_login(data);
 					}
 				}
@@ -100,6 +108,10 @@ var game_websocket = function (_id){
 				data.city = C_Player.city;
 				data.channelid = GameData.ChannelId;
 				data.marketid = GameData.marketID;
+				if(GameData.sysConfig.deviceLogin){						
+					data.telphone = C_Player.telphone;
+					data.telphoneAuto = true;
+				}
 				Net.Send_login(data);
 			}
 		}
@@ -139,6 +151,10 @@ var game_websocket = function (_id){
 						data.version = GameData.versionCode;
 						data.channelid = GameData.ChannelId;
 						data.marketid = GameData.marketID;
+						if(GameData.sysConfig.deviceLogin){						
+							data.telphone = C_Player.telphone;
+							data.telphoneAuto = true;
+						}
 						Net.Send_login(data);
 					},10000);
 				}
@@ -207,12 +223,14 @@ var game_websocket = function (_id){
 		    }
 			_msg=_msg.data;
 
-			if(Game_Config.Debugger.isDebugger){
+			
-				console.log("接收数据：\n"+_msg);
-			}
 			if (typeof(_msg) == "string") {
 				_msg = JSON.parse(_msg); //转换json
 			}
+			if(Game_Config.Debugger.isDebugger){
+				console.log("接收数据：\n"+_msg);
+				console.log(_msg);
+			}
 			if(_msg.rpc == "submit_error"){
 				return;
 			}
@@ -311,6 +329,46 @@ var game_websocket = function (_id){
 var Logic=Logic||{};
 
 Logic.AppStart=function(){
+	// ============================================================================
+	// 字体优化配置
+	// ============================================================================
+	// 问题：gameabc.min.js 中使用 'lighter' 和 'Arial' 导致中文显示过细
+	// 解决：覆盖全局字体渲染函数，统一使用更粗的中文友好字体
+	
+	// 保存原始的 Canvas fillText 方法
+	var originalFillText = CanvasRenderingContext2D.prototype.fillText;
+	var originalStrokeText = CanvasRenderingContext2D.prototype.strokeText;
+	
+	// 覆盖 fillText 方法，在绘制前统一字体设置
+	CanvasRenderingContext2D.prototype.fillText = function() {
+		// 如果当前字体包含 'lighter' 或只有 'Arial'，替换为更适合中文的字体
+		if (this.font && (this.font.includes('lighter') || this.font.includes('Arial'))) {
+			// 提取字体大小
+			var sizeMatch = this.font.match(/(\d+)px/);
+			if (sizeMatch) {
+				var size = sizeMatch[1];
+				// 使用 500 字重（中等粗细）+ 中文友好字体
+				this.font = '500 ' + size + 'px "Microsoft YaHei", "PingFang SC", Arial, sans-serif';
+			}
+		}
+		return originalFillText.apply(this, arguments);
+	};
+	
+	// 同样覆盖 strokeText 方法
+	CanvasRenderingContext2D.prototype.strokeText = function() {
+		if (this.font && (this.font.includes('lighter') || this.font.includes('Arial'))) {
+			var sizeMatch = this.font.match(/(\d+)px/);
+			if (sizeMatch) {
+				var size = sizeMatch[1];
+				this.font = '500 ' + size + 'px "Microsoft YaHei", "PingFang SC", Arial, sans-serif';
+			}
+		}
+		return originalStrokeText.apply(this, arguments);
+	};
+	
+	// console.log('[字体优化] Canvas 文字渲染已优化，中英文粗细统一');
+	// ============================================================================
+	
 	if(ConstVal.isGameHall){
 		
 		//ConstVal.Notice.img_clip_x=220;
@@ -325,6 +383,11 @@ Logic.AppStart=function(){
 		Game_Config.sysConfig.mainMenuButton = true;//是否进入主菜单界面隐藏四个按钮
 		shareRoom= true;//接收到星星场是否屏蔽平台框架显示
 		gameHallImport.appStart();
+	}else{
+		if(typeof Game_Modify.appStart != "undefined"){
+			Game_Modify.appStart();
+		}
+		
 	}
 	for(var i=0;i<60;i++){
 		set_self(268,1,262+i,0,0,0);
@@ -347,6 +410,8 @@ Logic.AppStart=function(){
 		//Func.up_imgurl(21,"http://img3.imgtn.bdimg.com/it/u=3646406790,1894696303&fm=27&gp=0.jpg");
 	//}
 	
+	
+	
 	// Logic.setServerType();
 	//if(Game_Config.Debugger.serverType == 0){
 		//GameData.AjaxUrl="http://ylyxservice1.0791ts.cn:1089/index.html";//正式
@@ -396,14 +461,14 @@ Logic.AppStart=function(){
 			Logic.setAgentId();
 			//GameData.getVersionState = "AppStart";
 			GameData.versionState = Func.getVersionState(); 
-			GameData.LaunchMode = ConstVal.Launch_mode.from_hall;			
+			if(GameData.userAgent != ConstVal.userAgent.uAgent_3){
-			// if(GameData.userAgent != ConstVal.userAgent.uAgent_3){
+				GameData.LaunchMode = Number(Func.getQueryString(ConstVal.Launch_mode.name));
-				// GameData.LaunchMode = Number(Func.getQueryString(ConstVal.Launch_mode.name));
+			}else{
-			// }else{
+				GameData.LaunchMode = Number(app_Launchtype);
-				// GameData.LaunchMode = Number(app_Launchtype);
+				//GameData.LaunchMode = 1;
-			// }
+			}
 			GameData.Validator  = new IDValidator();
-			Desk.Create();
+			// Desk.Create();
 			C_Player = new Player(-1);
 			
 			
@@ -497,8 +562,8 @@ function ServerUrl_Succ(_msg,state,input_msg){
 		
 	}
 	 if(Game_Config.Debugger.serverType != 0){
-		 GameData.visitorserver = "127.0.0.1:1088";
+		 GameData.visitorserver = "127.0.0.1:3088";
-		 GameData.Server = "127.0.0.1:1088";
+		 GameData.Server = "127.0.0.1:3088";
 	 }
 	GameData.AgentId=_msg.data.agentid;
 	
@@ -627,6 +692,11 @@ Logic.GameInit = function(){
 	ConstVal.vipRank.clip_w = get_self(ConstVal.vipRank.f_spid,20,0,0,0);
 	ConstVal.vipRank.clip_h = get_self(ConstVal.vipRank.f_spid,21,0,0,0);
 	
+	ConstVal.whiteList.clip_x = get_self(ConstVal.whiteList.f_spid,18,0,0,0);
+	ConstVal.whiteList.clip_y = get_self(ConstVal.whiteList.f_spid,19,0,0,0);
+	ConstVal.whiteList.clip_w = get_self(ConstVal.whiteList.f_spid,20,0,0,0);
+	ConstVal.whiteList.clip_h = get_self(ConstVal.whiteList.f_spid,21,0,0,0);
+
 	var obj = ifast_getobj(340);
 	GameData.gzhcolor1 = obj.uidata.FontColor;
 	var obj = ifast_getobj(680);
@@ -706,10 +776,10 @@ Logic.GameInit = function(){
 	for(var i=0;i<GameUI.onstate.length;i++){
 		GameUI.onstate[i]=0;
 	}
-	GameUI.isprepare.length=Game_Config.Max.PlayerCnt;
+	// GameUI.isprepare.length=Game_Config.Max.PlayerCnt;
-	for(var i=0;i<GameUI.isprepare.length;i++){
+	// for(var i=0;i<GameUI.isprepare.length;i++){
-		GameUI.isprepare[i]=0;
+	// 	GameUI.isprepare[i]=0;
-	}
+	// }
 	if(Utl.checkKey(Utl.Config.roomlist)){
 		GameData.roomList = Logic.readRoomList();
 	}else{
@@ -1313,11 +1383,12 @@ function get_paravalue(o_config, paraname){
 
 function getConfig_Succ(_msg,state,input_msg){
 	//
-	
+	_msg=JSON.parse(_msg);
 	if(Game_Config.Debugger.isDebugger){
+		console.log("获取配置文件信息：");
 		console.log(_msg);
 	}
-	_msg=JSON.parse(_msg);
+	
 
 	GameData.serverConfig.data = _msg;
 	//console.log("服务器地址："+_msg.data.urlserver);
@@ -1372,10 +1443,10 @@ function getConfig_Succ(_msg,state,input_msg){
 	}
 	 if(Game_Config.Debugger.serverType != 0){
 	 	if(ConstVal.netType == 0){
-		 	GameData.visitorserver = "127.0.0.1:1088";
+		 	GameData.visitorserver = "127.0.0.1:3088";
-		 	GameData.Server = "127.0.0.1:1088";
+		 	GameData.Server = "127.0.0.1:3088";
 		 }else{
-		 	GameData.Server = "http://127.0.0.1:1089/index.html";
+		 	GameData.Server = "http://127.0.0.1:3089/index.html";
 		 }
 		 
 	 }
@@ -1569,7 +1640,7 @@ Logic.setConfigInfo = function(){
 	var game_config = get_paravalue(GameData.serverConfig,"game_config");
 	var matchhtml = get_paravalue(GameData.serverConfig,"url_match");
 	var agentmode = get_paravalue(GameData.serverConfig,"agentmode");
-	var rankList = get_paravalue(GameData.serverConfig,"rankList");
+	var rankList = get_paravalue(GameData.serverConfig,"rankList1");
 	var shareImage = get_paravalue(GameData.serverConfig,"game_share_image");
 	var isdebugger = get_paravalue(GameData.serverConfig,"isdebugger");
 	var payurl = get_paravalue(GameData.serverConfig,"payurl");
@@ -1585,6 +1656,7 @@ Logic.setConfigInfo = function(){
 	GameData.brNumber = get_paravalue(GameData.serverConfig,"brNumber");
 	GameData.brRebateUnit = get_paravalue(GameData.serverConfig,"brRebateUnit");
 	GameData.vipConfig = get_paravalue(GameData.serverConfig,"vipConfig");
+
 	for(var i=0;i<GameData.sysConfigName.length;i++){
 		var val = get_paravalue(GameData.serverConfig,GameData.sysConfigName[i]);
 		if(val != null){
@@ -1751,6 +1823,7 @@ Logic.setConfigInfo = function(){
 	}else{
 		GameData.matchhtml = "";
 	}
+	
 	if(GameData.sysConfig.hideSpid){
 		for(var i=0;i<GameData.sysConfig.hideSpid.length;i++){
 			set_self(GameData.sysConfig.hideSpid[i],18,1300,0,0);
@@ -1758,6 +1831,7 @@ Logic.setConfigInfo = function(){
 		}
 	}
 }
+
 Logic.saveShortCode = function(_code){
 	Utl.SaveData(Utl.Config.shortcode,_code);
 }
@@ -1972,9 +2046,13 @@ Logic.getMachineId = function(){
 //跳转商城 
 Logic.jumpToStore = function(){
 	if(GameData.hallConfig.storeUrl){
+		var pnid = 0;
+		if(C_Player.invitecode){
+			pnid = C_Player.invitecode;
+		}
 		var _urlData = "channelId="+GameData.ChannelId+"&agentId="+GameData.AgentId+"&avatar="+min_encode(C_Player.avatar)+"&nickname="+min_encode(C_Player.nickname)+
 				"&playerId="+C_Player.playerid+"&gameId="+GameData.GameId+"&openId="+C_Player.openid+"&unionId="+C_Player.unionid
-				+"&sex="+C_Player.sex+"&bean="+C_Player.bean;
+				+"&sex="+C_Player.sex+"&bean="+C_Player.bean+"&parentID="+pnid;
 	
 		Func.OpenurlTitleData(GameData.hallConfig.storeUrl+"?"+_urlData,"","");
 	}else{
@@ -2037,7 +2115,7 @@ function stringToJson(_msg){
 }
 Logic.updateMainSceneData = function(roomtype){
 	Game_Modify.onCreateDesk(roomtype);
-	Desk.Create();
+	Desk.Create(roomtype);
 }
 Logic.checkRoom = function(){
 	if(!get_self(149,37,0,0)){//不在主界面界面 
@@ -2343,3 +2421,17 @@ Logic.joinRoomFromMiniPro = function(){
 		}
 	}
 }
+Logic.getNNLocal = function(){
+	try{
+		var locRecords = JSON.parse(Utl.readGradeInfo());
+		if(locRecords.length > 0){
+			gameCombat.get_player_grade1({	data: {gradeinfo : locRecords}});
+		}
+		Game_Modify.gameView.locRecordsClick[0] = 1;
+		Game_Modify.gameView.locRecordsClick[1] = 0;
+		set_self(83,43,1,0,0);
+	}catch(e){
+		//alert(e);
+		//TODO handle the exception
+	}
+}

games/games/Projects/clinet/doudizhu/js/01_SubGame/00_SubGame_Config.js

@@ -6,9 +6,9 @@ Game_Config.Debugger={//调试配置
 	visitorLogin : true,//隐藏式游客登录 
 	visiblePay:true,//审核通过后是否显示支付按钮
 	serverType:0,//0->正式服务器 1->测试服务器 2->本地服务器 
-	gameserver:"http://testgame.youlehdyx.com/update_json/ceshi_json.txt"+"?"+ifast_random(100000)
+	gameserver:"https://tsgames.daoqi88.cn/config/update_jsonv2.txt"+"?"+ifast_random(100000)
 	//gameserver:"https://projectimage.tscce.cn/avatar/nickname1.txt"+"?"+ifast_random(100000)
-	//gameserver:"http://ylyxservice1.0791ts.cn/config/update_json.txt"+"?"+ifast_random(100000)
+	// gameserver:"https://tsgames.daoqi88.cn/config/beta_update_jsonv2.txt"+"?"+ifast_random(100000)
 }; 
 
 Game_Config.Max = {

games/games/Projects/clinet/doudizhu/js/01_SubGame/02_SubGame_Input.js

@@ -29,6 +29,9 @@ gameHallImport.up_imgurl = function(recid,photo){
 gameHallImport.getphoto = function(recid,photo){
 	console.log("getphoto");
 }
+// Game_Modify.appStart =function(){
+	
+// }
 Game_Modify.StartWar=function(_msg){//开战 
 
 }

games/games/Projects/clinet/doudizhu/version.js

@@ -1,5 +1,5 @@
-GameData.AgentId = "i33v0llvp0euhd1n9qo1fM2RV8vtog4y";
+GameData.AgentId = "veRa0qrBf0df2K1G4de2tgfmVxB2jxpv";
-GameData.ChannelId = "7N0e0z2u2098pf1M2fj0kyB1D4n4ylkA";;
+GameData.ChannelId = "FtJf073aa0d6rI1xD8J1Y42fINTm0ziK";;
 GameData.GameId = "FDtj0pGhT0Evjd3efAS5wkIlamiTh2oa";
 GameData.Version = "1.30";//真实版本号1 代理商 天盛网络 游戏
 GameData.versionCode = 30;//真实版本号 

games/games/Projects/clinet/gamehall/FilesOrd.txt

@@ -0,0 +1,23 @@
+E:\YouLeGames\client\games2\Projects\Game_Surface_1\js\gameabc.min.js
+E:\YouLeGames\client\games2\Projects\Game_Surface_1\js\gamemain.js
+E:\YouLeGames\client\games2\Projects\Game_Surface_1\js\Game_Surface_1_Event.js
+E:\YouLeGames\client\games2\Projects\Game_Surface_1\js\niuniu_surface_Event.js
+E:\YouLeGames\client\games2\Projects\Game_Surface_1\js\Surface\Const.js
+E:\YouLeGames\client\games2\Projects\Game_Surface_1\js\Surface\Data.js
+E:\YouLeGames\client\games2\Projects\Game_Surface_1\js\Surface\Desk.js
+E:\YouLeGames\client\games2\Projects\Game_Surface_1\js\Surface\Func.js
+E:\YouLeGames\client\games2\Projects\Game_Surface_1\js\Surface\Game.js
+E:\YouLeGames\client\games2\Projects\Game_Surface_1\js\Surface\GameUI.js
+E:\YouLeGames\client\games2\Projects\Game_Surface_1\js\Surface\jquery.min.js
+E:\YouLeGames\client\games2\Projects\Game_Surface_1\js\Surface\Logic.js
+E:\YouLeGames\client\games2\Projects\Game_Surface_1\js\Surface\minhttp.js
+E:\YouLeGames\client\games2\Projects\Game_Surface_1\js\Surface\Net.js
+E:\YouLeGames\client\games2\Projects\Game_Surface_1\js\Surface\niuniu_surface_Event.js
+E:\YouLeGames\client\games2\Projects\Game_Surface_1\js\Surface\Player.js
+E:\YouLeGames\client\games2\Projects\Game_Surface_1\js\Surface\Utl_Input.js
+E:\YouLeGames\client\games2\Projects\Game_Surface_1\js\Surface\Utl_Output.js
+E:\YouLeGames\client\games2\Projects\Game_Surface_1\js\Surface\youle.develop.js
+E:\YouLeGames\client\games2\Projects\Game_Surface_1\js\SubGame\banWords.js
+E:\YouLeGames\client\games2\Projects\Game_Surface_1\js\SubGame\SubGame_Config.js
+E:\YouLeGames\client\games2\Projects\Game_Surface_1\js\SubGame\SubGame_modify.js
+E:\YouLeGames\client\games2\Projects\Game_Surface_1\js\SubGame\Banwords.js

games/games/Projects/clinet/gamehall/Project.txt

@@ -0,0 +1,7 @@
+LayerStartID=102
+SpiritStartID=1001
+ImgResStartID=501
+TxtResStartID=200
+VoiResStartID=51
+GameStartFile=index.html
+OpenLayerList=4,5,29

games/games/Projects/clinet/gamehall/app_battery.js

@@ -0,0 +1 @@
+var app_getbattery=1;

games/games/Projects/clinet/gamehall/app_data.js

@@ -0,0 +1 @@
+var app_version=0;var app_gameconfig='1';var app_gamedir='1';var app_gamestart='1';var app_agent='1';var app_appversion='1';var app_market='2';var app_channel='1';var app_Launchtype=0; var app_getwifisignalLevel=1;var app_gamename=0;

games/games/Projects/clinet/gamehall/app_gamesname.js

@@ -0,0 +1 @@
+var  app_gamesname=new Array('1');

games/games/Projects/clinet/gamehall/app_network.js

@@ -0,0 +1 @@
+var app_getnetwork=1;