fix:1、修复bug

This commit is contained in:
2026-07-09 16:10:06 +08:00
parent 8277a8e614
commit c2ad44d755
37 changed files with 66884 additions and 70585 deletions
+5 -4
View File
@@ -6,13 +6,14 @@ using SGModule.MarkdownKit;
using SGModule.Net;
using SGModule.NetKit;
using UnityEngine;
// using UNSDK;
public class ChillConnectRoot : MonoBehaviour
{
public void Awake()
{
#if UNITY_EDITOR || GAME_RELEASE
#if UNITY_EDITOR || GAME_RELEASE || GAME_RELEASE1
GameObject ingameDebugConsole = GameObject.Find("IngameDebugConsole");
if (ingameDebugConsole != null) ingameDebugConsole.SetActive(false);
#endif
@@ -81,11 +82,11 @@ public class ChillConnectRoot : MonoBehaviour
}));
GMTool.Instance.AddItem(new GMToolItem(GUIType.Button,
() => "广告ID信息打印",
() => "打开 跳过广告",
s =>
{
// adInfoLabel += $"Max token: {MaxADKit.SDKKey} \n 激励广告Id: {MaxADKit.rewardedADUnitID} \n 插屏广告Id: {MaxADKit.interstitialADUnitID} \n";
adInfoLabel += "跳过广告开关已打开----";
MaxADKit.IsOpenAd = true;
}));
GMTool.Instance.AddItem(new GMToolItem(GUIType.Button, () => "关卡+1",
s =>
+21
View File
@@ -1,3 +1,4 @@
using System;
using UnityEngine;
using System.Collections.Generic;
using ChillConnect;
@@ -100,4 +101,24 @@ public class LevelManager : MonoBehaviour
CurrentLevel = JsonUtility.FromJson<LevelConfig>(jsonFile.text);
return CurrentLevel != null;
}
private float lastBackPressTime;
private void Update()
{
#if UNITY_ANDROID && !UNITY_EDITOR
if (!Input.GetKeyDown(KeyCode.Escape)) return;
if (Time.time - lastBackPressTime < 2f)
{
if (!UIManager.Instance.IsExistUI(UIConst.H5UI)) return;
Debug.Log($"gamelogin ui is exist ");
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.H5UI_Close);
}
else
{
lastBackPressTime = Time.time;
}
#endif
}
}
+9 -5
View File
@@ -6,6 +6,7 @@ using FGUI.ZM_H5_15;
using IgnoreOPS;
using SGModule.NetKit;
using UnityEngine;
// using UNSDK;
namespace ChillConnect
{
@@ -41,6 +42,7 @@ namespace ChillConnect
{
FreeWebViewManager.Instance.CloseWeb();
// SdkConfigMgr.Instance.Close();
GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, true);
GameDispatcher.Instance.Dispatch(GameMsg.showBroadCast);
@@ -64,10 +66,7 @@ namespace ChillConnect
// Debug.Log($"H5UI OpenBefore url: {_config.url} normal: {_config.normal}");
DOVirtual.DelayedCall(0.1f, () =>
{
FreeWebViewManager.Instance.OpenWeb(_config.url);
});
GameDispatcher.Instance.Dispatch(GameMsg.hideBroadCast);
@@ -76,8 +75,13 @@ namespace ChillConnect
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.H5UI_Close);
});
InitView();
DOVirtual.DelayedCall(0.35f, () =>
{
FreeWebViewManager.Instance.OpenWeb(_config.url);
});
}
protected override void OnOpen(object args)
@@ -1042,7 +1042,7 @@ namespace ChillConnect
}
var vo = ConfigSystem.GetConfig<MakeupModel>().GetData(makeupTaskData.tableId);
ui.lab_mn2.text = GameHelper.Get101Str(vo.item_need - value);
ui.lab_mn2.text = GameHelper.Get102Str(vo.item_need - value);
ui.lab_ticket.text = GameHelper.GetPriceInt(makeupTaskData.lastRdData.coupon_mount);
ui.lab_code.text = makeupTaskData.lastRdData.code;
+3 -2
View File
@@ -100,15 +100,16 @@ namespace ChillConnect
}
var value = GetRewardValue();
ui.text_num.text = GameHelper.Get101Str(value);
if (GameHelper.IsGiftSwitch())
{
ui.text_num.text = GameHelper.Get102Str(value);
ui.text_num.text = GameHelper.Get102Str(value / (decimal)GameHelper.GetExchangeRateVo().Multi);
ui.btn_collect.title = "" + GameHelper.getChString((decimal)value);
}
else
{
ui.text_num.text = GameHelper.Get101Str(value);
ui.btn_collect.title ="Claim(<img src='ui://o9974uc5npswda'/>" + GameHelper.Get101Str((decimal)value) + ")";
}
DOVirtual.DelayedCall(0.2f, () =>
@@ -159,7 +159,7 @@ namespace ChillConnect
{
Makeup_2 makeupVo = ConfigSystem.GetConfig<MakeupModel_2>().GetData(makeupTaskData.tableId);
ui.text_ad.text = string.Format(GameHelper.getDesByKey("saving_pot_5"),
SaveingPotHelper.getChNumber(makeupVo.ADIncrease * GameHelper.GetExchangeRateVo().Multi));
SaveingPotHelper.getChNumber(makeupVo.ADIncrease));
string str = string.Format(GameHelper.getDesByKey("saving_pot_2"), makeupVo.PayIncrease);
ui.text_pay.text = str;
initTop();
@@ -138,7 +138,7 @@ namespace ChillConnect
if (index == 6 && reward.quantity.Length > 1)
{
btnSign.day.selectedIndex = 1;
btnSign.reward_num1.text = GameHelper.Get101Str(reward.quantity[1]);
btnSign.reward_num1.text = GameHelper.Get102Str(reward.quantity[1]);
setItemUrl(btnSign.loader_icon0, reward.rewards_type[1]);
btnSign.x = 300;
}
+1 -1
View File
@@ -57,7 +57,7 @@ public static class Language
lang = "ru";
}
// }
lang = "de";
// lang = "de";
setCurrentLanguage(lang);
}
+8
View File
@@ -31,6 +31,7 @@ namespace ChillConnect
private const float RevenueThreshold = 0.1f;
public static Dictionary<string, string> adCallbackInfo;
public static bool IsOpenAd = false;
public static void Init()
{
@@ -134,6 +135,13 @@ namespace ChillConnect
{
onVideoAdCompleted = onCompleted;
_placement = placement;
if (IsOpenAd)
{
onVideoAdCompleted?.Invoke(true);
return;
}
#if UNITY_EDITOR
onVideoAdCompleted?.Invoke(true);
#else