fix:1、添加sdk。2、修复bug
This commit is contained in:
@@ -84,6 +84,7 @@ namespace ChillConnect
|
||||
ui.top_group.y += 68;
|
||||
ui.left_group.y += 68;
|
||||
ui.right_group.y += 68;
|
||||
ui.btn_money.y += 60;
|
||||
}
|
||||
|
||||
// ui.com_panel.scrollPane.ScrollRight(12,false);
|
||||
@@ -117,6 +118,9 @@ namespace ChillConnect
|
||||
// HallManager.Instance.countTimes = 0;
|
||||
// }
|
||||
GameHelper.IsShowFirstReward();
|
||||
GameHelper.IsShowPettyReward();
|
||||
GameHelper.ShowStatementView();
|
||||
|
||||
|
||||
isClosed = false;
|
||||
|
||||
@@ -187,64 +191,191 @@ namespace ChillConnect
|
||||
|
||||
void CreateGoldtimeList()
|
||||
{
|
||||
// 获取保存对象
|
||||
var saveObject = SaveData.GetSaveObject();
|
||||
|
||||
// 检查_goldtime是否为null或者长度与Paidcoins_list.Count不相等
|
||||
|
||||
if (saveObject == null)
|
||||
{
|
||||
Debug.LogError("[CreateGoldtimeList] SaveData.GetSaveObject() returned null");
|
||||
return;
|
||||
}
|
||||
|
||||
if (Paidcoins_list == null || Paidcoins_list.Count == 0)
|
||||
{
|
||||
Debug.LogError("[CreateGoldtimeList] Paidcoins_list is null or empty");
|
||||
return;
|
||||
}
|
||||
|
||||
int goldtimeLength = saveObject._goldtime != null ? saveObject._goldtime.Length : 0;
|
||||
Debug.Log($"barry Paidcoins_list======{Paidcoins_list.Count} {goldtimeLength}");
|
||||
|
||||
if (saveObject._goldtime == null || saveObject._goldtime.Length != Paidcoins_list.Count)
|
||||
{
|
||||
// 重置_goldtime,并创建一个新的数组,长度为Paidcoins_list.Count
|
||||
saveObject._goldtime = new int[Paidcoins_list.Count];
|
||||
Debug.Log($"[CreateGoldtimeList] Initialized _goldtime with length: {Paidcoins_list.Count}");
|
||||
}
|
||||
|
||||
Debug.Log($"barry GetSaveObject._goldtime.Length======{saveObject._goldtime.Length}");
|
||||
}
|
||||
|
||||
private void UpBtnCoin()
|
||||
{
|
||||
int time = SaveData.GetSaveObject()._goldtime[0];
|
||||
var saveObject = SaveData.GetSaveObject();
|
||||
if (saveObject == null)
|
||||
{
|
||||
Debug.LogError("[UpBtnCoin] SaveData.GetSaveObject() returned null");
|
||||
return;
|
||||
}
|
||||
|
||||
if (saveObject._goldtime == null)
|
||||
{
|
||||
Debug.LogError("[UpBtnCoin] saveObject._goldtime is null");
|
||||
return;
|
||||
}
|
||||
|
||||
if (saveObject._goldtime.Length == 0)
|
||||
{
|
||||
Debug.LogError("[UpBtnCoin] saveObject._goldtime length is 0");
|
||||
return;
|
||||
}
|
||||
|
||||
int time = saveObject._goldtime[0];
|
||||
// Debug.Log($"[UpBtnCoin] time value: {time}, _goldtime length: {saveObject._goldtime.Length}");
|
||||
|
||||
if (ui.btn_gold == null)
|
||||
{
|
||||
Debug.LogError("[UpBtnCoin] ui.btn_gold is null");
|
||||
return;
|
||||
}
|
||||
|
||||
com_gold btn_gold = ui.btn_gold as com_gold;
|
||||
if (btn_gold == null)
|
||||
{
|
||||
Debug.LogError("[UpBtnCoin] ui.btn_gold cast to com_gold failed");
|
||||
return;
|
||||
}
|
||||
|
||||
if (btn_gold.state == null)
|
||||
{
|
||||
Debug.LogError("[UpBtnCoin] btn_gold.state is null");
|
||||
return;
|
||||
}
|
||||
|
||||
if (Paidcoins_list == null)
|
||||
{
|
||||
Debug.LogError("[UpBtnCoin] Paidcoins_list is null");
|
||||
return;
|
||||
}
|
||||
|
||||
if (Paidcoins_list.Count == 0)
|
||||
{
|
||||
Debug.LogError("[UpBtnCoin] Paidcoins_list count is 0");
|
||||
return;
|
||||
}
|
||||
|
||||
// Debug.Log($"[UpBtnCoin] Paidcoins_list count: {Paidcoins_list.Count}, receive_CD: {Paidcoins_list[0].receive_CD}");
|
||||
|
||||
if (time + Paidcoins_list[0].receive_CD < GameHelper.GetNowTime())
|
||||
{
|
||||
btn_gold.state.selectedIndex = 2;
|
||||
ui.btn_shop.red.visible = true;
|
||||
if (ui.btn_shop != null && ui.btn_shop.red != null)
|
||||
{
|
||||
ui.btn_shop.red.visible = true;
|
||||
// Debug.Log("[UpBtnCoin] Set btn_shop.red.visible = true");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
btn_gold.state.selectedIndex = 1;
|
||||
ui.btn_shop.red.visible = false;
|
||||
if (ui.btn_shop != null && ui.btn_shop.red != null)
|
||||
{
|
||||
ui.btn_shop.red.visible = false;
|
||||
}
|
||||
}
|
||||
checkThreeGift();
|
||||
|
||||
time_count++;
|
||||
ui.btn_sign.red.visible = signRed();
|
||||
|
||||
if (ui.btn_sign != null && ui.btn_sign.red != null)
|
||||
{
|
||||
ui.btn_sign.red.visible = signRed();
|
||||
}
|
||||
|
||||
if (!GameHelper.IsGiftSwitch())
|
||||
{
|
||||
// Debug.Log("[UpBtnCoin] Gift switch is disabled, returning early");
|
||||
return;
|
||||
}
|
||||
|
||||
if (DataMgr.MakeupTaskHistory.Value == null)
|
||||
{
|
||||
// Debug.LogError("[UpBtnCoin] DataMgr.MakeupTaskHistory.Value is null");
|
||||
return;
|
||||
}
|
||||
|
||||
if (DataMgr.MakeupTaskHistory.Value.Count < 1)
|
||||
{
|
||||
// Debug.LogWarning("[UpBtnCoin] MakeupTaskHistory count is less than 1");
|
||||
return;
|
||||
}
|
||||
|
||||
MakeupTaskData data = DataMgr.MakeupTaskHistory.Value[DataMgr.MakeupTaskHistory.Value.Count - 1];
|
||||
if (data == null)
|
||||
{
|
||||
// Debug.LogError("[UpBtnCoin] MakeupTaskData is null");
|
||||
return;
|
||||
}
|
||||
|
||||
// Debug.Log($"[UpBtnCoin] MakeupTaskData status: {data.status}, ch_time: {data.ch_time}");
|
||||
|
||||
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;
|
||||
}
|
||||
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($"[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("[UpBtnCoin] ch_time expired, hide group_tips");
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
time_number++;
|
||||
if (time_number > 15)
|
||||
// Debug.Log($"[UpBtnCoin] time_number: {time_number}");
|
||||
|
||||
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("[UpBtnCoin] time_number > 15, show group_tips");
|
||||
}
|
||||
if (time_number > 20)
|
||||
{
|
||||
btnMoney2.group_tips.visible = false;
|
||||
time_number = 0;
|
||||
// Debug.Log("[UpBtnCoin] time_number > 20, hide group_tips and reset counter");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private int time_number = 0;
|
||||
|
||||
void OnRefreshMakeupData(object obj)
|
||||
@@ -324,37 +455,59 @@ namespace ChillConnect
|
||||
{
|
||||
uiCtrlDispatcher.Dispatch(UICtrlMsg.SaveingPotUI_Open);
|
||||
});
|
||||
|
||||
btn_noads.SetClick(() =>
|
||||
|
||||
ui.btn_statement.visible = GameHelper.IsGiftSwitch();
|
||||
ui.btn_statement.SetClick(() =>
|
||||
{
|
||||
if (!SaveData.GetSaveObject().is_get_packreward && !SaveData.GetSaveObject().is_get_removead)
|
||||
{
|
||||
if (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;
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.StatementViewUI_Open);
|
||||
});
|
||||
|
||||
ui.btn_petty.visible = GameHelper.IsGiftSwitch();
|
||||
ui.btn_petty.SetClick(() =>
|
||||
{
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PettyAwardUI_Open);
|
||||
});
|
||||
|
||||
if (!GameHelper.IsGiftSwitch() && ConfigSystem.GetConfig<CommonModel>().WVswitch == 0)
|
||||
{
|
||||
ui.btn_wv.visible = false;
|
||||
}
|
||||
|
||||
ui.btn_wv.SetClick(() =>
|
||||
{
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.H5UI_Open);
|
||||
});
|
||||
|
||||
// btn_noads.SetClick(() =>
|
||||
// {
|
||||
// if (!SaveData.GetSaveObject().is_get_packreward && !SaveData.GetSaveObject().is_get_removead)
|
||||
// {
|
||||
// if (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;
|
||||
// });
|
||||
|
||||
if (ConfigSystem.GetConfig<CommonModel>().PiggyBankSwitch == 1 && GameHelper.IsGiftSwitch())
|
||||
{
|
||||
@@ -385,17 +538,17 @@ namespace ChillConnect
|
||||
}
|
||||
}
|
||||
|
||||
checkThreeGift();
|
||||
ui.btn_failpack.SetClick(() =>
|
||||
{
|
||||
float progress = showResurgence();
|
||||
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ResurgenceUI_Open, progress);
|
||||
});
|
||||
// checkThreeGift();
|
||||
// ui.btn_failpack.SetClick(() =>
|
||||
// {
|
||||
// float progress = showResurgence();
|
||||
//
|
||||
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ResurgenceUI_Open, progress);
|
||||
// });
|
||||
|
||||
ui.btn_three_day.SetClick(() =>
|
||||
{
|
||||
uiCtrlDispatcher.Dispatch(UICtrlMsg.ThreeDaysGiftUI_Open);
|
||||
// uiCtrlDispatcher.Dispatch(UICtrlMsg.ThreeDaysGiftUI_Open);
|
||||
});
|
||||
|
||||
ui.btn_battle.SetClick(() =>
|
||||
@@ -405,7 +558,7 @@ namespace ChillConnect
|
||||
|
||||
ui.btn_faq.SetClick(() =>
|
||||
{
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.FAQUI_Open);
|
||||
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.FAQUI_Open);
|
||||
});
|
||||
ui.btn_rank.SetClick(() =>
|
||||
{
|
||||
@@ -432,16 +585,16 @@ namespace ChillConnect
|
||||
ui.btn_task.SetClick(() => { OnClickTask(false); });
|
||||
ui.btn_start.SetClick(() =>
|
||||
{
|
||||
if (GameHelper.IsGiftSwitch() && !SaveData.GetSaveObject().have_slot && (DateTime.Now.Day != PlayerPrefs.GetInt("off_new", 0)))
|
||||
{
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddviewnewUI_Open);
|
||||
PlayerPrefs.SetInt("off_new", DateTime.Now.Day);
|
||||
}
|
||||
else if (GameHelper.IsGiftSwitch() && !SaveData.GetSaveObject().have_slot && UnityEngine.Random.Range(0, 100) < ConfigSystem.GetConfig<CommonModel>().BonusInside)
|
||||
{
|
||||
uiCtrlDispatcher.Dispatch(UICtrlMsg.AddviewnewUI_Open);
|
||||
}
|
||||
else
|
||||
// if (GameHelper.IsGiftSwitch() && !SaveData.GetSaveObject().have_slot && (DateTime.Now.Day != PlayerPrefs.GetInt("off_new", 0)))
|
||||
// {
|
||||
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddviewnewUI_Open);
|
||||
// PlayerPrefs.SetInt("off_new", DateTime.Now.Day);
|
||||
// }
|
||||
// else if (GameHelper.IsGiftSwitch() && !SaveData.GetSaveObject().have_slot && UnityEngine.Random.Range(0, 100) < ConfigSystem.GetConfig<CommonModel>().BonusInside)
|
||||
// {
|
||||
// uiCtrlDispatcher.Dispatch(UICtrlMsg.AddviewnewUI_Open);
|
||||
// }
|
||||
// else
|
||||
OnClickPlay();
|
||||
});
|
||||
ui.btn_setting.SetClick(() =>
|
||||
@@ -481,16 +634,16 @@ namespace ChillConnect
|
||||
btn_play_list[i].state.selectedIndex = 1;
|
||||
btn_play_list[i].SetClick(() =>
|
||||
{
|
||||
if (GameHelper.IsGiftSwitch() && !SaveData.GetSaveObject().have_slot && (DateTime.Now.Day != PlayerPrefs.GetInt("off_new", 0)))
|
||||
{
|
||||
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddviewnewUI_Open);
|
||||
PlayerPrefs.SetInt("off_new", DateTime.Now.Day);
|
||||
}
|
||||
else if (GameHelper.IsGiftSwitch() && !SaveData.GetSaveObject().have_slot && UnityEngine.Random.Range(0, 100) < ConfigSystem.GetConfig<CommonModel>().BonusInside)
|
||||
{
|
||||
uiCtrlDispatcher.Dispatch(UICtrlMsg.AddviewnewUI_Open);
|
||||
}
|
||||
else
|
||||
// if (GameHelper.IsGiftSwitch() && !SaveData.GetSaveObject().have_slot && (DateTime.Now.Day != PlayerPrefs.GetInt("off_new", 0)))
|
||||
// {
|
||||
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.AddviewnewUI_Open);
|
||||
// PlayerPrefs.SetInt("off_new", DateTime.Now.Day);
|
||||
// }
|
||||
// else if (GameHelper.IsGiftSwitch() && !SaveData.GetSaveObject().have_slot && UnityEngine.Random.Range(0, 100) < ConfigSystem.GetConfig<CommonModel>().BonusInside)
|
||||
// {
|
||||
// uiCtrlDispatcher.Dispatch(UICtrlMsg.AddviewnewUI_Open);
|
||||
// }
|
||||
// else
|
||||
OnClickPlay();
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user