Merge remote-tracking branch 'origin/main' into main_ZYT

# Conflicts:
#	Assets/_DefendNJ/Scripts/GameLocal.cs
#	ProjectSettings/EditorBuildSettings.asset
#	ProjectSettings/ProjectSettings.asset
This commit is contained in:
ZYT
2025-09-29 21:33:27 +08:00

View File

@@ -134,26 +134,19 @@ public class GameLocal : MonoBehaviour
authInfo.deviceSn = GetSn();
authInfo.startAt = ConvertTimestampToDateTime(GetTimestamp()) + "";
authInfo.shop = 0;
#if !UNITY_EDITOR && UNITY_ANDROID && PICO
authInfo.shop = (int)place;
if(GameInit.Ins.gamePlace== GamePlace.Liaoning_AnShan_Lishan_Dayuecheng)
loginInfo.shop = 1;
if(GameInit.Ins.gamePlace== GamePlace.Yangzhou_Hanjiang_TansuoZhongxin_wai)
loginInfo.shop = 5;
if(GameInit.Ins.gamePlace== GamePlace.Shandong_Jining_Shangchang_nei)
loginInfo.shop = 9;
if(GameInit.Ins.gamePlace== GamePlace.Shandong_Jinan_Huaiyin_ShengfutongShangmao_wai)
loginInfo.shop = 15;
if(GameInit.Ins.gamePlace== GamePlace.Nanjing_Qixia_Yaohuamen_Jindiguangchang_nei)
loginInfo.shop = 17;
if(GameInit.Ins.gamePlace== GamePlace.Wulanhaote_Wanda_Shangchang)
loginInfo.shop = 21;
if(GameInit.Ins.gamePlace== GamePlace.Hunan_Hengyang_Zhuhui_Dongzhoudao_nei)
loginInfo.shop = 24;
if(GameInit.Ins.gamePlace== GamePlace.Yunnan_Lincang_Linxiang_Hengji_Dixia)
loginInfo.shop = 25;
#if !UNITY_EDITOR && UNITY_ANDROID && PICO
if (place == Place.Yangzhou_Hanjiang_TansuoZhongxin_wai)
authInfo.shop = 5;
if (place == Place.Shandong_Jining_Shangchang_nei)
authInfo.shop = 9;
if (place == Place.Shandong_Jinan_Huaiyin_ShengfutongShangmao_wai)
authInfo.shop = 15;
if (place == Place.Nanjing_Qixia_Yaohuamen_Jindiguangchang_nei)
authInfo.shop = 17;
#endif
authInfo.gameId = 8;
authInfo.gameId = 8;
string authJson = JsonUtility.ToJson(authInfo);
Debug.Log("发送数据 -> " + authJson);
request.RawData = System.Text.Encoding.UTF8.GetBytes(authJson);