bingo b面修改
This commit is contained in:
@@ -67,15 +67,15 @@ namespace BingoBrain
|
||||
protected override void OnOpenBefore(object args)
|
||||
{
|
||||
InitView();
|
||||
if (!GameHelper.IsGiftSwitch() && (ConfigSystem.GetConfig<CommonModel>().WVswitch == 1))
|
||||
{
|
||||
ui.btn_h5.visible = true;
|
||||
ui.btn_h5.GetChild("number_text").visible=false;
|
||||
}
|
||||
ui.btn_h5.SetClick(() =>
|
||||
{
|
||||
UICtrlDispatcher.Instance.Dispatch(SkinInfo.H5UI_Open);
|
||||
});
|
||||
// if (!GameHelper.IsGiftSwitch() && (ConfigSystem.GetConfig<CommonModel>().WVswitch == 1))
|
||||
// {
|
||||
// ui.btn_h5.visible = true;
|
||||
// ui.btn_h5.GetChild("number_text").visible=false;
|
||||
// }
|
||||
// ui.btn_h5.SetClick(() =>
|
||||
// {
|
||||
// UICtrlDispatcher.Instance.Dispatch(SkinInfo.H5UI_Open);
|
||||
// });
|
||||
|
||||
}
|
||||
|
||||
@@ -109,7 +109,8 @@ namespace BingoBrain
|
||||
{
|
||||
ui.gift.selectedIndex = 1;
|
||||
(ui.btn_ballon as btn_balloon).gift.selectedIndex = 1;
|
||||
};
|
||||
}
|
||||
;
|
||||
#if !UNITY_EDITOR
|
||||
ui.btn_admin.visible=false;
|
||||
#endif
|
||||
@@ -132,7 +133,7 @@ namespace BingoBrain
|
||||
OnCardNumChange(null);
|
||||
ui.com_cardnum.cont_state.selectedIndex = model.CardBoardCountIndex;
|
||||
ui.com_cardplay.cont_text.selectedIndex = model.CardBoardCountIndex;
|
||||
|
||||
ui.type.selectedIndex = model.CardBoardCountIndex;
|
||||
ui.btn_ballon.visible = !IsBallonCD;
|
||||
ui.btn_ballon.SetClick(OnClickBalloon);
|
||||
ui.btn_ballon.sortingOrder = 100;
|
||||
@@ -152,16 +153,16 @@ namespace BingoBrain
|
||||
SetMakeup();
|
||||
ui.btn_admin.SetClick(() =>
|
||||
{
|
||||
MakeupTaskData makeupTaskData = PreferencesMgr.Instance.MakeupTaskHistory.Last();
|
||||
makeupTaskData.videoCount = 999999;
|
||||
PreferencesMgr.Instance.MakeupTaskH5Time = 99999;
|
||||
PreferencesMgr.Instance.Currency102 = 99999;
|
||||
PreferencesMgr.Instance.Currency101 = 99999999;
|
||||
GameDispatcher.Instance.Dispatch(BingoInfo.RefreshMakeupData);
|
||||
// MakeupTaskData makeupTaskData = PreferencesMgr.Instance.MakeupTaskHistory.Last();
|
||||
// makeupTaskData.videoCount = 999999;
|
||||
// PreferencesMgr.Instance.MakeupTaskH5Time = 99999;
|
||||
// PreferencesMgr.Instance.Currency102 = 99999;
|
||||
// PreferencesMgr.Instance.Currency101 = 99999999;
|
||||
// GameDispatcher.Instance.Dispatch(BingoInfo.RefreshMakeupData);
|
||||
|
||||
makeupTaskData = PreferencesMgr.Instance.CoinMakeupTaskHistory.Last();
|
||||
makeupTaskData.videoCount = 99999;
|
||||
PreferencesMgr.Instance.CoinMakeupTaskH5Time = 99999;
|
||||
// makeupTaskData = PreferencesMgr.Instance.CoinMakeupTaskHistory.Last();
|
||||
// makeupTaskData.videoCount = 99999;
|
||||
// PreferencesMgr.Instance.CoinMakeupTaskH5Time = 99999;
|
||||
|
||||
});
|
||||
ui.btn_set.SetClick(() =>
|
||||
@@ -172,7 +173,22 @@ namespace BingoBrain
|
||||
{
|
||||
UICtrlDispatcher.Instance.Dispatch(SkinInfo.FaqUIUI_Open);
|
||||
});
|
||||
|
||||
ui.btn_cashout.SetClick(() =>
|
||||
{
|
||||
var makeupTaskData = PreferencesMgr.Instance.MakeupTaskHistory.Last();
|
||||
var vo = ConfigSystem.GetConfig<MakeupModel>().GetData(makeupTaskData.tableId);
|
||||
//DataMgr.Ticket.Value=99999;
|
||||
//makeupTaskData.videoCount = 50;
|
||||
if (vo == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
UICtrlDispatcher.Instance.Dispatch(SkinInfo.MakeupConfirmUI_Open, makeupTaskData);
|
||||
});
|
||||
ui.btn_saveingpot.SetClick(() =>
|
||||
{
|
||||
UICtrlDispatcher.Instance.Dispatch(SkinInfo.SaveingPotUI_Open);
|
||||
});
|
||||
}
|
||||
|
||||
private void UpdateNextCardBoardTime()
|
||||
@@ -304,13 +320,15 @@ namespace BingoBrain
|
||||
model.CardBoardCountIndex--;
|
||||
ui.com_cardnum.cont_state.selectedIndex = model.CardBoardCountIndex;
|
||||
ui.com_cardplay.cont_text.selectedIndex = model.CardBoardCountIndex;
|
||||
var animName = model.CardBoardCountIndex switch
|
||||
{
|
||||
0 => "2_1",
|
||||
1 => "4_2",
|
||||
_ => ""
|
||||
};
|
||||
NAAVsa.PlayAnim(cardSpine, animName);
|
||||
Debug.Log(model.CardBoardCountIndex);
|
||||
ui.type.selectedIndex = model.CardBoardCountIndex;
|
||||
// var animName = model.CardBoardCountIndex switch
|
||||
// {
|
||||
// 0 => "2_1",
|
||||
// 1 => "4_2",
|
||||
// _ => ""
|
||||
// };
|
||||
// NAAVsa.PlayAnim(cardSpine, animName);
|
||||
}
|
||||
|
||||
private void OnBtnAddClick()
|
||||
@@ -318,15 +336,15 @@ namespace BingoBrain
|
||||
model.CardBoardCountIndex++;
|
||||
ui.com_cardnum.cont_state.selectedIndex = model.CardBoardCountIndex;
|
||||
ui.com_cardplay.cont_text.selectedIndex = model.CardBoardCountIndex;
|
||||
ui.type.selectedIndex = model.CardBoardCountIndex;
|
||||
// var animName = model.CardBoardCountIndex switch
|
||||
// {
|
||||
// 1 => "1_2",
|
||||
// 2 => "2_4",
|
||||
// _ => ""
|
||||
// };
|
||||
|
||||
var animName = model.CardBoardCountIndex switch
|
||||
{
|
||||
1 => "1_2",
|
||||
2 => "2_4",
|
||||
_ => ""
|
||||
};
|
||||
|
||||
NAAVsa.PlayAnim(cardSpine, animName);
|
||||
// NAAVsa.PlayAnim(cardSpine, animName);
|
||||
}
|
||||
|
||||
private void OnCardNumChange(EventContext context)
|
||||
@@ -363,26 +381,26 @@ namespace BingoBrain
|
||||
{
|
||||
return;
|
||||
}
|
||||
if (GameHelper.IsGiftSwitch())
|
||||
{
|
||||
FX.Instance.SetFx<SkeletonAnimation>(ui.gp_fx, Fx_Type.spine_choice_card_b, sk =>
|
||||
{
|
||||
cardSpine = sk;
|
||||
// if (GameHelper.IsGiftSwitch())
|
||||
// {
|
||||
// FX.Instance.SetFx<SkeletonAnimation>(ui.gp_fx, Fx_Type.spine_choice_card_b, sk =>
|
||||
// {
|
||||
// cardSpine = sk;
|
||||
|
||||
NAAVsa.AddCompleteEvent(cardSpine, OnChangeCardFinish);
|
||||
OnChangeCardFinish(null);
|
||||
}, CloseCb);
|
||||
}
|
||||
else
|
||||
{
|
||||
FX.Instance.SetFx<SkeletonAnimation>(ui.gp_fx, Fx_Type.spine_choice_card, sk =>
|
||||
{
|
||||
cardSpine = sk;
|
||||
// NAAVsa.AddCompleteEvent(cardSpine, OnChangeCardFinish);
|
||||
// OnChangeCardFinish(null);
|
||||
// }, CloseCb);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// FX.Instance.SetFx<SkeletonAnimation>(ui.gp_fx, Fx_Type.spine_choice_card, sk =>
|
||||
// {
|
||||
// cardSpine = sk;
|
||||
|
||||
NAAVsa.AddCompleteEvent(cardSpine, OnChangeCardFinish);
|
||||
OnChangeCardFinish(null);
|
||||
}, CloseCb);
|
||||
}
|
||||
// NAAVsa.AddCompleteEvent(cardSpine, OnChangeCardFinish);
|
||||
// OnChangeCardFinish(null);
|
||||
// }, CloseCb);
|
||||
// }
|
||||
|
||||
|
||||
}
|
||||
@@ -444,7 +462,7 @@ namespace BingoBrain
|
||||
}
|
||||
void SetMakeup(object a = null)
|
||||
{
|
||||
if(!GameHelper.IsGiftSwitch()) return;
|
||||
return;
|
||||
// var com_box = ui.com_box;
|
||||
// com_box.cont_white.selectedIndex =
|
||||
// GameHelper.IsGiftSwitch() ? com_box._White_none : com_box._White_white;
|
||||
@@ -469,19 +487,19 @@ namespace BingoBrain
|
||||
{
|
||||
|
||||
|
||||
var makeupTaskData = PreferencesMgr.Instance.MakeupTaskHistory.Last();
|
||||
Debug.Log(PreferencesMgr.Instance.MakeupTaskHistory.Count);
|
||||
Debug.Log(JsonConvert.SerializeObject(makeupTaskData));
|
||||
Debug.Log(ConfigSystem.GetConfig<MakeupModel>().GetCount());
|
||||
Debug.Log(JsonConvert.SerializeObject(ConfigSystem.GetConfig<MakeupModel>()));
|
||||
// var makeupTaskData = PreferencesMgr.Instance.MakeupTaskHistory.Last();
|
||||
// Debug.Log(PreferencesMgr.Instance.MakeupTaskHistory.Count);
|
||||
// Debug.Log(JsonConvert.SerializeObject(makeupTaskData));
|
||||
// Debug.Log(ConfigSystem.GetConfig<MakeupModel>().GetCount());
|
||||
// Debug.Log(JsonConvert.SerializeObject(ConfigSystem.GetConfig<MakeupModel>()));
|
||||
|
||||
makeup vo = null;
|
||||
|
||||
foreach (makeup item in ConfigSystem.GetConfig<MakeupModel>().dataList)
|
||||
{
|
||||
Debug.Log(JsonConvert.SerializeObject(item));
|
||||
if (item.id == makeupTaskData.tableId) vo = item;
|
||||
}
|
||||
// foreach (makeup item in ConfigSystem.GetConfig<MakeupModel>().dataList)
|
||||
// {
|
||||
// Debug.Log(JsonConvert.SerializeObject(item));
|
||||
// if (item.id == makeupTaskData.tableId) vo = item;
|
||||
// }
|
||||
// Debug.Log(ConfigSystem.GetConfig<MakeupModel>().GetData(0));
|
||||
// Debug.Log(ConfigSystem.GetConfig<MakeupModel>().GetData(1));
|
||||
// Debug.Log(ConfigSystem.GetConfig<MakeupModel>().GetData(2));
|
||||
@@ -501,60 +519,60 @@ namespace BingoBrain
|
||||
// pbTxt.text =
|
||||
// $"{GameHelper.Get101Str((decimal)(vo.item_need - leftCash))}/{GameHelper.Get101Str((decimal)com_box.pb_num.max)}";
|
||||
|
||||
ui.makeup.btn_cash.SetClick(() =>
|
||||
{
|
||||
Debug.Log("999999999999999");
|
||||
// if (GameHelper.CanGuide() && !GuideCtrl.Instance.IsFinishGuide(1))
|
||||
// {
|
||||
// GuideCtrl.Instance.Dispatch("ClickButton");
|
||||
// ui.com_box.finger_place.visible = false;
|
||||
// }
|
||||
// ui.makeup.btn_cash.SetClick(() =>
|
||||
// {
|
||||
// Debug.Log("999999999999999");
|
||||
// // if (GameHelper.CanGuide() && !GuideCtrl.Instance.IsFinishGuide(1))
|
||||
// // {
|
||||
// // GuideCtrl.Instance.Dispatch("ClickButton");
|
||||
// // ui.com_box.finger_place.visible = false;
|
||||
// // }
|
||||
|
||||
uiCtrlDispatcher.Dispatch(SkinInfo.MakeupConfirmUI_Open, makeupTaskData);
|
||||
});
|
||||
// uiCtrlDispatcher.Dispatch(SkinInfo.MakeupConfirmUI_Open, makeupTaskData);
|
||||
// });
|
||||
}
|
||||
|
||||
{
|
||||
if (PreferencesMgr.Instance.CoinMakeupTaskHistory.Count == 0)
|
||||
{
|
||||
// if (PreferencesMgr.Instance.CoinMakeupTaskHistory.Count == 0)
|
||||
// {
|
||||
|
||||
BingoDataSystem.CheckCoinMakeupTaskData();
|
||||
//PreferencesMgr.Instance.MakeupTaskHistory.Add(new MakeupTaskData());
|
||||
//Debug.Log(PreferencesMgr.Instance.MakeupTaskHistory.Count);
|
||||
}
|
||||
// BingoDataSystem.CheckCoinMakeupTaskData();
|
||||
// //PreferencesMgr.Instance.MakeupTaskHistory.Add(new MakeupTaskData());
|
||||
// //Debug.Log(PreferencesMgr.Instance.MakeupTaskHistory.Count);
|
||||
// }
|
||||
|
||||
var makeupTaskData = PreferencesMgr.Instance.CoinMakeupTaskHistory.Last();
|
||||
var vo = ConfigSystem.GetConfig<CardRedeemNewModel>().dataList
|
||||
.FirstOrDefault(cardNew => cardNew.id == makeupTaskData.tableId);
|
||||
Debug.Log(JsonConvert.SerializeObject(vo));
|
||||
DOVirtual.Float(0, PreferencesMgr.Instance.Currency101, 1,
|
||||
value => { ui.makeup.gold_text.text = ((int)value).ToString(); });
|
||||
ui.makeup.gold_progress_text.text = PreferencesMgr.Instance.Currency101 + "/" + vo.item_need;
|
||||
ui.makeup.gold_progress.value = ((float)PreferencesMgr.Instance.Currency101 * 100) / vo.item_need;
|
||||
Debug.Log(((float)PreferencesMgr.Instance.Currency101) / vo.item_need);
|
||||
ui.makeup.coin_cash.text = "$" + vo.redeem_num;
|
||||
ui.makeup.btn_goldout.SetClick(() =>
|
||||
{
|
||||
Debug.Log(PreferencesMgr.Instance.Currency101);
|
||||
Debug.Log(vo.item_need);
|
||||
if (makeupTaskData.status == MakeupTaskStatus.None)
|
||||
{
|
||||
if (PreferencesMgr.Instance.Currency101 >= vo.item_need)
|
||||
{
|
||||
uiCtrlDispatcher.Dispatch(SkinInfo.MakeupConfirmUI_Open, makeupTaskData);
|
||||
}
|
||||
else
|
||||
{
|
||||
GameHelper.ShowTips("Not enough", true);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
uiCtrlDispatcher.Dispatch(SkinInfo.MakeupConfirmUI_Open, makeupTaskData);
|
||||
}
|
||||
});
|
||||
// var makeupTaskData = PreferencesMgr.Instance.CoinMakeupTaskHistory.Last();
|
||||
// var vo = ConfigSystem.GetConfig<CardRedeemNewModel>().dataList
|
||||
// .FirstOrDefault(cardNew => cardNew.id == makeupTaskData.tableId);
|
||||
// Debug.Log(JsonConvert.SerializeObject(vo));
|
||||
// DOVirtual.Float(0, PreferencesMgr.Instance.Currency101, 1,
|
||||
// value => { ui.makeup.gold_text.text = ((int)value).ToString(); });
|
||||
// ui.makeup.gold_progress_text.text = PreferencesMgr.Instance.Currency101 + "/" + vo.item_need;
|
||||
// ui.makeup.gold_progress.value = ((float)PreferencesMgr.Instance.Currency101 * 100) / vo.item_need;
|
||||
// Debug.Log(((float)PreferencesMgr.Instance.Currency101) / vo.item_need);
|
||||
// ui.makeup.coin_cash.text = "$" + vo.redeem_num;
|
||||
// ui.makeup.btn_goldout.SetClick(() =>
|
||||
// {
|
||||
// Debug.Log(PreferencesMgr.Instance.Currency101);
|
||||
// Debug.Log(vo.item_need);
|
||||
// if (makeupTaskData.status == MakeupTaskStatus.None)
|
||||
// {
|
||||
// if (PreferencesMgr.Instance.Currency101 >= vo.item_need)
|
||||
// {
|
||||
// uiCtrlDispatcher.Dispatch(SkinInfo.MakeupConfirmUI_Open, makeupTaskData);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// GameHelper.ShowTips("Not enough", true);
|
||||
// }
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// uiCtrlDispatcher.Dispatch(SkinInfo.MakeupConfirmUI_Open, makeupTaskData);
|
||||
// }
|
||||
// });
|
||||
}
|
||||
(ui.btn_ballon as btn_balloon).cash_text.text = GameHelper.GetDynamicReward(102, GameHelper.GetCommonModel().ballonReward102).ToString("0.00");
|
||||
(ui.btn_ballon as btn_balloon).cash_text.text = GameHelper.GetDynamicReward(102, GameHelper.GetCommonModel().ballonReward102).ToString("0.00");
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user