fix:1、添加sdk。2、修复bug

This commit is contained in:
barry
2026-06-11 18:30:41 +08:00
parent fcf9128dd3
commit 570f4635f2
1240 changed files with 111200 additions and 39704 deletions
+277 -145
View File
@@ -160,7 +160,7 @@ namespace ChillConnect
}
ui.btn_money.visible = false;
if (GameHelper.IsGiftSwitch())
{
ui.btn_money.visible = true;
@@ -170,6 +170,9 @@ namespace ChillConnect
anim_paly.state.SetAnimation(0, "animation", true);
GameHelper.IsShowFirstReward();
GameHelper.IsShowPettyReward();
GameHelper.ShowStatementView();
CreateGoldtimeList();
@@ -244,36 +247,36 @@ namespace ChillConnect
GameHelper.SetGameday();
}
ui.btn_noads.SetClick(() =>
{
if (!SaveData.GetSaveObject().is_get_packreward && !SaveData.GetSaveObject().is_get_removead)
{
if (ui.btn_noads.GetChild("img_ad").visible)
{
PackRewardData param = new PackRewardData();
param.isAutoPop = false;
param.isNeedScroll = true;
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PackrewardUI_Open, param);
}
else
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PackrewardUI_Open);
}
}
else if (SaveData.GetSaveObject().is_get_packreward)
{
PackRewardData param = new PackRewardData();
param.isAutoPop = false;
param.isNeedScroll = true;
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PackrewardUI_Open, param);
}
else
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PackrewardUI_Open);
}
GameHelper.showGameUI = false;
});
// ui.btn_noads.SetClick(() =>
// {
// if (!SaveData.GetSaveObject().is_get_packreward && !SaveData.GetSaveObject().is_get_removead)
// {
// if (ui.btn_noads.GetChild("img_ad").visible)
// {
// PackRewardData param = new PackRewardData();
// param.isAutoPop = false;
// param.isNeedScroll = true;
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PackrewardUI_Open, param);
// }
// else
// {
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PackrewardUI_Open);
// }
//
// }
// else if (SaveData.GetSaveObject().is_get_packreward)
// {
// PackRewardData param = new PackRewardData();
// param.isAutoPop = false;
// param.isNeedScroll = true;
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PackrewardUI_Open, param);
// }
// else
// {
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PackrewardUI_Open);
// }
// GameHelper.showGameUI = false;
// });
SetLevelProgress();
(ui.btn_money as com_money).btn_ch.title = GameHelper.getDesByKey("ch_out_1");
@@ -282,76 +285,156 @@ namespace ChillConnect
void timeEvent()
{
if (SaveData.GetSaveObject().addview_off_time > GameHelper.GetNowTime() && GameHelper.IsGiftSwitch())
var saveObject = SaveData.GetSaveObject();
if (saveObject == null)
{
if (!effect_show)
ui.btn_add.type.selectedIndex = 1;
ui.btn_add.type.selectedIndex = 1;
ui.btn_add.text_offtime.text = CommonHelper.TimeFormat(SaveData.GetSaveObject().addview_off_time - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour);
Debug.LogError("[RainPlayUI UpBtnCoin] SaveData.GetSaveObject() returned null");
return;
}
else
if (saveObject._goldtime == null)
{
ui.btn_add.type.selectedIndex = 0;
Debug.LogError("[RainPlayUI UpBtnCoin] saveObject._goldtime is null");
return;
}
int time = SaveData.GetSaveObject()._goldtime[0];
if (saveObject._goldtime.Length == 0)
{
Debug.LogError("[RainPlayUI UpBtnCoin] saveObject._goldtime length is 0");
return;
}
int time = saveObject._goldtime[0];
if (ui.btn_gold == null)
{
Debug.LogError("[RainPlayUI UpBtnCoin] ui.btn_gold is null");
return;
}
com_gold btn_gold = ui.btn_gold as com_gold;
if (btn_gold == null)
{
Debug.LogError("[RainPlayUI UpBtnCoin] ui.btn_gold cast to com_gold failed");
return;
}
if (btn_gold.state == null)
{
Debug.LogError("[RainPlayUI UpBtnCoin] btn_gold.state is null");
return;
}
if (Paidcoins_list == null)
{
Debug.LogError("[RainPlayUI UpBtnCoin] Paidcoins_list is null");
return;
}
if (Paidcoins_list.Count == 0)
{
Debug.LogError("[RainPlayUI UpBtnCoin] Paidcoins_list count is 0");
return;
}
if (time + Paidcoins_list[0].receive_CD < GameHelper.GetNowTime())
{
btn_gold.state.selectedIndex = 2;
// btn_gold.red.visible = true;
}
else btn_gold.state.selectedIndex = 1;
else
{
btn_gold.state.selectedIndex = 1;
}
ui.btn_task_pass.GetChild("red").visible = SaveData.battlepassred();
// ui.btn_task.red.visible = SaveData.getRed();
if (!GameHelper.IsGiftSwitch()) return;
if (ui.btn_task_pass != null && ui.btn_task_pass.GetChild("red") != null)
{
ui.btn_task_pass.GetChild("red").visible = SaveData.battlepassred();
}
if (!GameHelper.IsGiftSwitch())
{
Debug.Log("[RainPlayUI UpBtnCoin] Gift switch is disabled, returning early");
return;
}
btn_look_ad_showtime++;
if (btn_look_ad_showtime > 15) ui.btn_look_ad.visible = false;
if ((!SaveData.GetSaveObject().is_get_packreward || !SaveData.GetSaveObject().is_get_removead) && !SaveData.GetSaveObject().is_autopack_show
&& (Time.time > (ConfigSystem.GetConfig<CommonModel>().Activetimes * 60)))
if (btn_look_ad_showtime > 15)
{
Window Popup = GRoot.inst.GetChild("Popup") as Window;
if (Popup.GetChildren().Length > 0) return;
PackRewardData param = new PackRewardData();
param.isAutoPop = true;
param.isNeedScroll = false;
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PackrewardUI_Open, param);
SaveData.GetSaveObject().is_autopack_show = true;
SaveData.GetSaveObject().is_autopack_show_day = DateTime.Now.Day;
SaveData.saveDataFunc();
if (ui.btn_look_ad != null)
{
ui.btn_look_ad.visible = false;
}
}
if (DataMgr.MakeupTaskHistory.Value.Count < 1)
if (DataMgr.MakeupTaskHistory.Value == null)
{
Debug.LogError("[RainPlayUI UpBtnCoin] DataMgr.MakeupTaskHistory.Value is null");
return;
}
if (DataMgr.MakeupTaskHistory.Value.Count < 1)
{
Debug.LogWarning("[RainPlayUI UpBtnCoin] MakeupTaskHistory count is less than 1");
return;
}
MakeupTaskData data = DataMgr.MakeupTaskHistory.Value[DataMgr.MakeupTaskHistory.Value.Count - 1];
if (data == null)
{
Debug.LogError("[RainPlayUI UpBtnCoin] MakeupTaskData is null");
return;
}
if (data.status != MakeupTaskStatus.Level)
{
(ui.btn_money as com_money).group_tips.visible = false;
var btnMoney = ui.btn_money as com_money;
if (btnMoney != null && btnMoney.group_tips != null)
{
btnMoney.group_tips.visible = false;
// Debug.Log("[RainPlayUI UpBtnCoin] Status is not Level, hide group_tips");
}
return;
}
if (data.ch_time > GameHelper.GetNowTime())
{
(ui.btn_money as com_money).text_time.text = "Only " + CommonHelper.TimeFormat((int)data.ch_time - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour);
var btnMoney = ui.btn_money as com_money;
if (btnMoney != null && btnMoney.text_time != null)
{
btnMoney.text_time.text = "Only " + CommonHelper.TimeFormat((int)data.ch_time - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour);
// Debug.Log($"[RainPlayUI UpBtnCoin] Updated text_time with remaining time");
}
}
else
{
(ui.btn_money as com_money).group_tips.visible = false;
var btnMoney = ui.btn_money as com_money;
if (btnMoney != null && btnMoney.group_tips != null)
{
btnMoney.group_tips.visible = false;
// Debug.Log("[RainPlayUI UpBtnCoin] ch_time expired, hide group_tips");
}
return;
}
time_number++;
if (time_number > 15)
var btnMoney2 = ui.btn_money as com_money;
if (btnMoney2 != null && btnMoney2.group_tips != null)
{
(ui.btn_money as com_money).group_tips.visible = true;
}
if (time_number > 20)
{
(ui.btn_money as com_money).group_tips.visible = false;
time_number = 0;
if (time_number > 15)
{
btnMoney2.group_tips.visible = true;
// Debug.Log("[RainPlayUI UpBtnCoin] time_number > 15, show group_tips");
}
if (time_number > 20)
{
btnMoney2.group_tips.visible = false;
time_number = 0;
// Debug.Log("[RainPlayUI UpBtnCoin] time_number > 20, hide group_tips and reset counter");
}
}
}
private int time_number = 0;
@@ -481,6 +564,7 @@ namespace ChillConnect
GameDispatcher.Instance.AddListener(GameMsg.ThreeDaysGiftUIClose, checkThreeGift);
GameDispatcher.Instance.AddListener(GameMsg.noads_refresh, setBtnAds);
GameDispatcher.Instance.AddListener(GameMsg.add_points, AddPoints);
// MainThreadDispatcher.Instance.AddListener(MainThreadMsg.App_Focus_True, backGame);
}
@@ -551,18 +635,18 @@ namespace ChillConnect
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SheepwindowUI_Open, 2);
});
ui.btn_failpack.SetClick(() =>
{
float complte_progress = showResurgence();
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ResurgenceUI_Open, complte_progress);
});
// ui.btn_failpack.SetClick(() =>
// {
// float complte_progress = showResurgence();
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ResurgenceUI_Open, complte_progress);
// });
ui.btn_task_pass.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PassViewUI_Open); });
ui.btn_look_ad.SetClick(LookAd);
ui.btn_three_day.SetClick(() =>
{
uiCtrlDispatcher.Dispatch(UICtrlMsg.ThreeDaysGiftUI_Open);
// uiCtrlDispatcher.Dispatch(UICtrlMsg.ThreeDaysGiftUI_Open);
});
if (ConfigSystem.GetConfig<CommonModel>().PiggyBankSwitch == 1 && GameHelper.IsGiftSwitch())
@@ -570,7 +654,22 @@ namespace ChillConnect
ui.btn_saveingpot.visible = true;
}
ui.btn_saveingpot.SetClick(() => { uiCtrlDispatcher.Dispatch(UICtrlMsg.SaveingPotUI_Open); });
ui.btn_statement.visible = GameHelper.IsGiftSwitch();
ui.btn_statement.SetClick(() =>
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.StatementViewUI_Open);
});
if (!GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig<CommonModel>().WVswitch == 0)
{
ui.btn_wv.visible = false;
}
ui.btn_wv.SetClick(() =>
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.H5UI_Open);
});
// #if !UNITY_EDITOR
// string type = SystemInfo.deviceModel.ToLower().Trim();
@@ -585,22 +684,42 @@ namespace ChillConnect
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddViewoffUI_Open); return;//zhushi
// GameHelper.ShowTips("Coming Soon!");
if (SaveData.GetSaveObject().addview_off_time > GameHelper.GetNowTime() && GameHelper.IsGiftSwitch())
if (DataMgr.NewWatchCd.Value[1] < Convert.ToInt32(GameHelper.GetNowTime()))
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddViewoffUI_Open);
}
else
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BuyslotUI_Open);
GameHelper.ShowVideoAd("reward_add_space", isSuccess =>
{
if (isSuccess)
{
SaveData.GetSaveObject().have_slot = true;
SetSlotNumber();
GameHelper.SetWatchCd(1);
}
});
}
// if (SaveData.GetSaveObject().addview_off_time > GameHelper.GetNowTime() && GameHelper.IsGiftSwitch())
// {
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddViewoffUI_Open);
// }
// else
// {
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BuyslotUI_Open);
// }
GameHelper.showGameUI = false;
});
ui.btn_petty.visible = GameHelper.IsGiftSwitch();
ui.btn_petty.SetClick(() =>
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PettyAwardUI_Open);
});
SetItemNumber();
SetSlotNumber();
SetTopCurr();
setBtnAds();
ui.btn_gold.visible = !GameHelper.IsGiftSwitch();
ui.btn_gold.SetClick(() =>
{
//uiCtrlDispatcher.Dispatch(UICtrlMsg.MainUI_Open);
@@ -663,7 +782,7 @@ namespace ChillConnect
}
RankSystemMgr.Instance.checkUsers();
ui.btn_rank.visible = GameHelper.IsGiftSwitch();
ui.btn_rank.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RankUI_Open); });
// ui.btn_rank.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.RankUI_Open); });
if (GameHelper.IsGiftSwitch())
{
var data = SaveData.GetRankData().rankRewardData;
@@ -686,6 +805,12 @@ namespace ChillConnect
// Debug.Log($"barry initView==== {SaveData.GetSaveObject().card_layer} {SaveData.GetSaveObject().all_card_numbers}");
}
private void OnClickPass()
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PassViewUI_Open);
}
private void AddPoints(object a = null)
{
@@ -727,6 +852,8 @@ namespace ChillConnect
try
{
ui.btn_task_pass.GetChild("red").visible = SaveData.battlepassred();
ui.btn_rank.GetChild("red").visible = SaveData.GetRankData().rankRewardData.Count > 0;
}
catch
@@ -813,6 +940,7 @@ namespace ChillConnect
void CreateGoldtimeList()
{
Debug.Log($"barry _goldtime======{Paidcoins_list.Count}");
// 获取保存对象
var saveObject = SaveData.GetSaveObject();
@@ -820,8 +948,10 @@ namespace ChillConnect
if (saveObject._goldtime == null || saveObject._goldtime.Length != Paidcoins_list.Count)
{
// 重置_goldtime,并创建一个新的数组,长度为Paidcoins_list.Count
saveObject._goldtime = new int[Paidcoins_list.Count];
SaveData.GetSaveObject()._goldtime = new int[Paidcoins_list.Count];
}
Debug.Log($"barry GetSaveObject._goldtime.Length======{SaveData.GetSaveObject()._goldtime.Length}");
}
void LookAd()
@@ -1033,12 +1163,14 @@ namespace ChillConnect
RefreshCardState(true);
GameHelper.SetLevelstate(3);
GameHelper.IsTemporaryEnd = false;
SaveData.GetSaveObject().have_slot = false;
SaveData.GetSaveObject().clear_number = 0;
for (int i = 0; i < SaveData.GetSaveObject().usePropsNum.Length; i++)
{
SaveData.GetSaveObject().usePropsNum[i] = 0;
}
// SetLevelProgress();
SetSlotNumber();
}
void RefreshFunc()
{
@@ -1706,38 +1838,38 @@ namespace ChillConnect
float complte_progress = showResurgence();
if (GameHelper.GetLevelstate() != 0)
{
if (SaveData.GetSaveObject().game_fail_off_number >= ConfigSystem.GetConfig<CommonModel>().AddDiscountLevel && !is_showslot && !SaveData.GetSaveObject().have_slot && GameHelper.IsGiftSwitch())
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddViewoffUI_Open);
SaveData.GetSaveObject().game_fail_off_number = 0;
if (SaveData.GetSaveObject().addview_off_time < GameHelper.GetNowTime())
{
SaveData.GetSaveObject().addview_off_time = (int)GameHelper.GetNowTime() + ConfigSystem.GetConfig<CommonModel>().AddDiscountCD;
}
is_showslot = true;
// if (SaveData.GetSaveObject().game_fail_off_number >= ConfigSystem.GetConfig<CommonModel>().AddDiscountLevel && !is_showslot && !SaveData.GetSaveObject().have_slot && GameHelper.IsGiftSwitch())
// {
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddViewoffUI_Open);
// SaveData.GetSaveObject().game_fail_off_number = 0;
// if (SaveData.GetSaveObject().addview_off_time < GameHelper.GetNowTime())
// {
// SaveData.GetSaveObject().addview_off_time = (int)GameHelper.GetNowTime() + ConfigSystem.GetConfig<CommonModel>().AddDiscountCD;
// }
// is_showslot = true;
//
// return;
// }
return;
}
// if (SaveData.GetSaveObject().game_fail_number >= ConfigSystem.GetConfig<CommonModel>().AddSpaceLevel && !is_showslot && !SaveData.GetSaveObject().have_slot)
// {
//
// if (SaveData.GetSaveObject().addview_off_time > GameHelper.GetNowTime() && GameHelper.IsGiftSwitch())
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddViewoffUI_Open);
// else
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BuyslotUI_Open);
// SaveData.GetSaveObject().game_fail_number = 0;
// is_showslot = true;
// return;
// }
if (SaveData.GetSaveObject().game_fail_number >= ConfigSystem.GetConfig<CommonModel>().AddSpaceLevel && !is_showslot && !SaveData.GetSaveObject().have_slot)
{
if (SaveData.GetSaveObject().addview_off_time > GameHelper.GetNowTime() && GameHelper.IsGiftSwitch())
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddViewoffUI_Open);
else
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BuyslotUI_Open);
SaveData.GetSaveObject().game_fail_number = 0;
is_showslot = true;
return;
}
if ((complte_progress > ((float)ConfigSystem.GetConfig<CommonModel>().FailedGiftProgress / 100)) && !is_resurgence&&GameHelper.IsGiftSwitch())
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ResurgenceUI_Open, complte_progress);
is_resurgence = true;
return;
}
// if ((complte_progress > ((float)ConfigSystem.GetConfig<CommonModel>().FailedGiftProgress / 100)) && !is_resurgence&&GameHelper.IsGiftSwitch())
// {
//
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ResurgenceUI_Open, complte_progress);
// is_resurgence = true;
// return;
// }
DOVirtual.DelayedCall(0.75f, () =>
{
@@ -1752,36 +1884,36 @@ namespace ChillConnect
}
else
{
if (SaveData.GetSaveObject().game_fail_off_number >= ConfigSystem.GetConfig<CommonModel>().AddDiscountLevel && !is_showslot && !SaveData.GetSaveObject().have_slot && GameHelper.IsGiftSwitch())
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddViewoffUI_Open);
SaveData.GetSaveObject().game_fail_off_number = 0;
if (SaveData.GetSaveObject().addview_off_time < GameHelper.GetNowTime())
{
SaveData.GetSaveObject().addview_off_time = (int)GameHelper.GetNowTime() + ConfigSystem.GetConfig<CommonModel>().AddDiscountCD;
}
is_showslot = true;
return;
}
// if (SaveData.GetSaveObject().game_fail_off_number >= ConfigSystem.GetConfig<CommonModel>().AddDiscountLevel && !is_showslot && !SaveData.GetSaveObject().have_slot && GameHelper.IsGiftSwitch())
// {
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddViewoffUI_Open);
// SaveData.GetSaveObject().game_fail_off_number = 0;
// if (SaveData.GetSaveObject().addview_off_time < GameHelper.GetNowTime())
// {
// SaveData.GetSaveObject().addview_off_time = (int)GameHelper.GetNowTime() + ConfigSystem.GetConfig<CommonModel>().AddDiscountCD;
// }
// is_showslot = true;
// return;
// }
if (SaveData.GetSaveObject().game_fail_number >= ConfigSystem.GetConfig<CommonModel>().AddSpaceLevel && !is_showslot && !SaveData.GetSaveObject().have_slot)
{
if (SaveData.GetSaveObject().addview_off_time > GameHelper.GetNowTime() && GameHelper.IsGiftSwitch())
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddViewoffUI_Open);
else
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BuyslotUI_Open);
SaveData.GetSaveObject().game_fail_number = 0;
is_showslot = true;
return;
}
if ((complte_progress > ((float)ConfigSystem.GetConfig<CommonModel>().FailedGiftProgress / 100)) && !is_resurgence&&GameHelper.IsGiftSwitch())
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ResurgenceUI_Open, complte_progress);
is_resurgence = true;
return;
}
// if (SaveData.GetSaveObject().game_fail_number >= ConfigSystem.GetConfig<CommonModel>().AddSpaceLevel && !is_showslot && !SaveData.GetSaveObject().have_slot)
// {
//
// if (SaveData.GetSaveObject().addview_off_time > GameHelper.GetNowTime() && GameHelper.IsGiftSwitch())
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddViewoffUI_Open);
// else
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.BuyslotUI_Open);
// SaveData.GetSaveObject().game_fail_number = 0;
// is_showslot = true;
// return;
// }
// if ((complte_progress > ((float)ConfigSystem.GetConfig<CommonModel>().FailedGiftProgress / 100)) && !is_resurgence&&GameHelper.IsGiftSwitch())
// {
//
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ResurgenceUI_Open, complte_progress);
// is_resurgence = true;
// return;
// }
//通关失败
float[] cash_array = GameHelper.GetRewardValue(2);