tron_wz/MergeGangRush_unity_IOS
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交

Browse Source
This commit is contained in:
changyunjia
2026-07-17 10:36:35 +08:00
parent 019da1589d
commit 04f032203c
10 changed files with 195 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/CrazyZoo/Runtime/Logic/ModuleUI/GameHome/GameHomeUI.cs
+6 -5
View File
@@ -79,11 +79,12 @@ namespace ScrewsMaster
is_first_login_go_to_h5 = false;
GameHelper.is_first_login = loginModel.new_player;
if (GameHelper.IsGiftSwitch() && !loginModel.new_player && is_first_login_go_to_h5)
{
GotoH5();
}
else if (GameHelper.IsGiftSwitch() && loginModel.new_player)
// if (GameHelper.IsGiftSwitch() && !loginModel.new_player && is_first_login_go_to_h5)
// {
// GotoH5();
// }
// else
if (loginModel.new_player)
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.FirstRewardUI_Open);
loginModel.new_player = false;
Assets/CrazyZoo/Runtime/Logic/ModuleUI/SaveingPot/SaveingPotUI.cs
+12 -6
View File
@@ -139,13 +139,19 @@ namespace ScrewsMaster
ui.btn_cash.SetClick(() =>
{
if (UIManager.Instance.IsExistUI(UIConst.SheepPlayUI))
{
CtrlCloseUI();
}
else
{
var level = ShowScrews.Instance.gameMode == GameHome.Mode_difficult ? 1 : GameHelper.GetLevel(); ;
ShowScrews.Instance.InitLogic(level);
AudioManager.Instance.PlayBGM(AudioConst.PlayingBg);
CtrlCloseUI();
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.GameHomeUI_Close);
}
var level = ShowScrews.Instance.gameMode == GameHome.Mode_difficult ? 1 : GameHelper.GetLevel(); ;
ShowScrews.Instance.InitLogic(level);
AudioManager.Instance.PlayBGM(AudioConst.PlayingBg);
CtrlCloseUI();
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.GameHomeUI_Close);
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BuygoldUI_Open, false);
});
Assets/CrazyZoo/Runtime/Logic/System/Network/LoginSystem.cs
+3
View File
@@ -3,6 +3,8 @@ using System.Collections;
namespace ScrewsMaster
{
using DG.Tweening;
using MYp0ZVTT2QSDK;
using Newtonsoft.Json;
using UnityEngine;
public class LoginSystem : BaseSystem
@@ -103,6 +105,7 @@ namespace ScrewsMaster
private void OnLoginSuccess(LoginModel loginData)
{
Debug.Log(JsonConvert.SerializeObject(loginData));
var loginModel = GameHelper.GetLoginModel();
loginModel.cdn_url = loginData.cdn_url;
loginModel.setting = loginData.setting;
Assets/CrazyZoo/Runtime/Logic/ToolKit/NetworkKit.cs
+7 -7
View File
@@ -66,10 +66,10 @@ namespace ScrewsMaster
}
SetRequestContentType(loginRequest);
Debug.Log($"request url1======= {url1}");
// Debug.Log($"request url1======= {url1}");
yield return loginRequest.SendWebRequest();
Debug.Log($"requestData11111======={url1}=={requestJson}");
Debug.Log($"requestData22222====={url1}==={JsonConvert.SerializeObject(loginRequest)}");
// Debug.Log($"requestData11111======={url1}=={requestJson}");
// Debug.Log($"requestData22222====={url1}==={JsonConvert.SerializeObject(loginRequest)}");
if (loginRequest.result is not UnityWebRequest.Result.Success)
{
onCompleted?.Invoke(false, default);
@@ -85,7 +85,7 @@ namespace ScrewsMaster
receiveContent = Base64Kit.Decode(receiveContent);
}
#endif
Debug.Log(receiveContent);
// Debug.Log(receiveContent);
var response = SerializeUtil.ToObject<ResponseData>(receiveContent);
@@ -181,10 +181,10 @@ namespace ScrewsMaster
};
statusDic.Add(reqData.type, true);
Debug.Log($"PostFunnelLogin requestData1111========={reqData.type}");
// Debug.Log($"PostFunnelLogin requestData1111========={reqData.type}");
Post<RespLoginFunnelData>("event/funnelLogin", requestData, (isSuccess, data) =>
{
Debug.Log($"PostFunnelLogin responseData2222========={isSuccess} {reqData.type}");
// Debug.Log($"PostFunnelLogin responseData2222========={isSuccess} {reqData.type}");
});
}
public static void SendLogToServer(RespDebugData reqData)
@@ -273,7 +273,7 @@ namespace ScrewsMaster
androidPointObject.@event = eventname;
androidPointObject.property = eventproperty;
androidPointObject.n = integer;
Debug.Log("打点" + JsonConvert.SerializeObject(androidPointObject));
// Debug.Log("打点" + JsonConvert.SerializeObject(androidPointObject));
PostWithHeader<AndroidPointObject>("/event/incrN", androidPointObject, (isSuccess, obj) =>
{
});