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

games/games/Edit/Settings.ini

@@ -123,16 +123,16 @@ DocumentTypeKeyWordsFile1=
 DocumentTypeFunctionRegExp1=
 
 [MRUFiles]
-MRUItem1=G:\Works\YouleGames\games\games\Projects\clinet\zpy\js\gamemain.js
-MRUItem2=G:\Works\YouleGames\games\games\Projects\clinet\sangelaok\js\gamemain.js
-MRUItem3=G:\Works\YouleGames\games\games\Projects\clinet\niuniu\js\gamemain.js
-MRUItem4=G:\Works\YouleGames\games\games\Projects\clinet\guanpai-jx\js\gamemain.js
-MRUItem5=G:\Works\YouleGames\games\games\Projects\Project1\js\gamemain.js
-MRUItem6=G:\Works\YouleGames\games\games\Projects\clinet\doudizhu\js\gamemain.js
-MRUItem7=G:\Works\JinXianProjects\JinXianMahjong\Projects\client\js\gamemain.js
-MRUItem8=G:\Works\JinXianProjects\JinXianMahjong\Projects\Project1\js\gamemain.js
-MRUItem9=G:\Works\JinXianProjects\JinXianMahjong\Projects\client\js\client_Event.js
-MRUItem10=G:\Works\JinXianProjects\JinXianMahjong\Projects\client\js\01_SubGame\00_SubGame_Config.js
+MRUItem1=G:\Works\YouleGames\games\games\Projects\clinet\gamehall\js\gamemain.js
+MRUItem2=G:\Works\YouleGames\games\games\Projects\clinet\zpy\js\gamemain.js
+MRUItem3=G:\Works\YouleGames\games\games\Projects\Project1\js\gamemain.js
+MRUItem4=G:\Works\YouleGames\games\games\Projects\clinet\sangelaok\js\gamemain.js
+MRUItem5=G:\Works\YouleGames\games\games\Projects\clinet\niuniu\js\gamemain.js
+MRUItem6=G:\Works\YouleGames\games\games\Projects\clinet\guanpai-jx\js\gamemain.js
+MRUItem7=G:\Works\YouleGames\games\games\Projects\clinet\doudizhu\js\gamemain.js
+MRUItem8=G:\Works\JinXianProjects\JinXianMahjong\Projects\client\js\gamemain.js
+MRUItem9=G:\Works\JinXianProjects\JinXianMahjong\Projects\Project1\js\gamemain.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,14 +784,39 @@ 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,
+
+
+
 };
 
 
 
 
-
-
-
-

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,7 +461,12 @@ 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",
-				"http://www.qqzhi.com/uploadpic/2015-01-15/200511535.jpg",
-				"http://img0.imgtn.bdimg.com/it/u=2722294531,1396252661&fm=27&gp=0.jpg",
-				"http://p2.gexing.com/touxiang/20130201/1735/510b8c7c1e572_200x200_3.jpg?recache=20131108",
-				"http://www.qqzhi.com/uploadpic/2015-01-15/200512924.jpg"
+				"https://img2.baidu.com/it/u=1823726962,2692568839&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500",
+				"https://img0.baidu.com/it/u=320875415,2231067789&fm=253&fmt=auto&app=120&f=JPEG?w=500&h=500",
+				"https://img1.baidu.com/it/u=3407774307,2859661062&fm=253&fmt=auto&app=138&f=JPEG?w=500&h=500",
+				"https://img2.baidu.com/it/u=1161398577,3592656327&fm=253&fmt=auto&app=120&f=JPEG?w=500&h=500",
+				"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","oLVKis6bj3_l8qspMybG60KV2GN4");
+			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");
 		}
 			
 	}
@@ -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,22 +1398,21 @@ 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){
-		Utl.SaveData(Utl.Config.visitorinfo,wxdata);
-	}
-	if(GameData.isDeviceLogin){
-		Utl.SaveData(Utl.Config.devicePlayer,wxdata);
-	}
+	// if(GameData.isVisitor){
+	// 	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);
-	//}
-
-
+	
 	C_Player.SetWxInfo(openid,headimgurl,nickname,sex,city,Province,unionid);
 	var data={};
 	data.agentid = GameData.AgentId;
@@ -1400,9 +1431,16 @@ var sharelogin = function(openid,headimgurl,nickname,sex,city,Province,unionid,p
 		data.telphone = phone;
 	}
 	if(sms){
-		data.smmcode = 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= [];
-	this.PlayerList.length = Game_Config.Max.PlayerCnt;
-	for(var i=0;i<Game_Config.Max.PlayerCnt;i++){
+	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<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){
-		_data.ip = IpAddr.ip;
+	if(typeof returnCitySN != "undefined"){
+		_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/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";//正式
@@ -395,15 +460,15 @@ Logic.AppStart=function(){
 			Logic.setGameServer();
 			Logic.setAgentId();
 			//GameData.getVersionState = "AppStart";
-			GameData.versionState = Func.getVersionState();
-			GameData.LaunchMode = ConstVal.Launch_mode.from_hall;			
-			// if(GameData.userAgent != ConstVal.userAgent.uAgent_3){
-				// GameData.LaunchMode = Number(Func.getQueryString(ConstVal.Launch_mode.name));
-			// }else{
-				// GameData.LaunchMode = Number(app_Launchtype);
-			// }
+			GameData.versionState = Func.getVersionState(); 
+			if(GameData.userAgent != ConstVal.userAgent.uAgent_3){
+				GameData.LaunchMode = Number(Func.getQueryString(ConstVal.Launch_mode.name));
+			}else{
+				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.Server = "127.0.0.1:1088";
+		 GameData.visitorserver = "127.0.0.1:3088";
+		 GameData.Server = "127.0.0.1:3088";
 	 }
 	GameData.AgentId=_msg.data.agentid;
 	
@@ -626,6 +691,11 @@ Logic.GameInit = function(){
 	ConstVal.vipRank.clip_y = get_self(ConstVal.vipRank.f_spid,19,0,0,0);
 	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;
@@ -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;
-	for(var i=0;i<GameUI.isprepare.length;i++){
-		GameUI.isprepare[i]=0;
-	}
+	// GameUI.isprepare.length=Game_Config.Max.PlayerCnt;
+	// for(var i=0;i<GameUI.isprepare.length;i++){
+	// 	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.Server = "127.0.0.1:1088";
+		 	GameData.visitorserver = "127.0.0.1:3088";
+		 	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.ChannelId = "7N0e0z2u2098pf1M2fj0kyB1D4n4ylkA";;
+GameData.AgentId = "veRa0qrBf0df2K1G4de2tgfmVxB2jxpv";
+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;