diff --git a/Assets/RedHotRoast/Define/Message/UICtrlMsg_OpenClose.cs b/Assets/RedHotRoast/Define/Message/UICtrlMsg_OpenClose.cs index 241c76d0..d9fccfd1 100644 --- a/Assets/RedHotRoast/Define/Message/UICtrlMsg_OpenClose.cs +++ b/Assets/RedHotRoast/Define/Message/UICtrlMsg_OpenClose.cs @@ -177,5 +177,7 @@ namespace RedHotRoast public static uint SaveingPotUI_Close = ++cursor_OpenClose; public static uint ArrowSettingUI_Open = ++cursor_OpenClose; public static uint ArrowSettingUI_Close = ++cursor_OpenClose; + public static uint ArrowGameResultUI_Open = ++cursor_OpenClose; + public static uint ArrowGameResultUI_Close = ++cursor_OpenClose; } } \ No newline at end of file diff --git a/Assets/RedHotRoast/FGUI/package/ZM_Common_01/btn_claim3.cs b/Assets/RedHotRoast/FGUI/package/ZM_Common_01/btn_claim3.cs index 1a532e14..b51d5dab 100644 --- a/Assets/RedHotRoast/FGUI/package/ZM_Common_01/btn_claim3.cs +++ b/Assets/RedHotRoast/FGUI/package/ZM_Common_01/btn_claim3.cs @@ -9,6 +9,7 @@ namespace FGUI.ZM_Common_01 { public Controller state; public GImage ad_icon; + public GImage img_saveingpot; public const string URL = "ui://o9974uc5s73p5m"; public static btn_claim3 CreateInstance() @@ -22,6 +23,7 @@ namespace FGUI.ZM_Common_01 state = GetControllerAt(0); ad_icon = (GImage)GetChildAt(1); + img_saveingpot = (GImage)GetChildAt(4); } } } \ No newline at end of file diff --git a/Assets/RedHotRoast/Helper/GameHelper.cs b/Assets/RedHotRoast/Helper/GameHelper.cs index 27c57f24..a211aff2 100644 --- a/Assets/RedHotRoast/Helper/GameHelper.cs +++ b/Assets/RedHotRoast/Helper/GameHelper.cs @@ -1818,14 +1818,16 @@ namespace RedHotRoast public static string getChString(decimal ch) { + var exchangeRateVo = GetExchangeRateVo(); + ch = (decimal)exchangeRateVo.Multi * ch; if (isRDExchangeMode() && IsGiftSwitch()) { string str = ""; - return str + $"$ {ch:N}"; + return str + $"{exchangeRateVo.Payicon}{ch:N}"; } else { - return $"${ch:N}"; + return $"{exchangeRateVo.Currency}{ch:N}"; } } public static string getTrackEvenName() diff --git a/Assets/RedHotRoast/Manager/HallManager.cs b/Assets/RedHotRoast/Manager/HallManager.cs index adde8fdb..f1d4a1f4 100644 --- a/Assets/RedHotRoast/Manager/HallManager.cs +++ b/Assets/RedHotRoast/Manager/HallManager.cs @@ -122,7 +122,7 @@ namespace RedHotRoast } else { - if (!DataMgr.LevelUnlockListNew.Value.Any(x => x.level_ == GameHelper.GetLevel())) + if (!GameHelper.IsGiftSwitch() && !DataMgr.LevelUnlockListNew.Value.Any(x => x.level_ == GameHelper.GetLevel())) { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.UnlockLevelNewUI_Open, true); } diff --git a/Assets/Resources/RedHotRoastAssets/FGUI/GameResult_08_fui.bytes b/Assets/Resources/RedHotRoastAssets/FGUI/GameResult_08_fui.bytes index a566a427..8106b380 100644 Binary files a/Assets/Resources/RedHotRoastAssets/FGUI/GameResult_08_fui.bytes and b/Assets/Resources/RedHotRoastAssets/FGUI/GameResult_08_fui.bytes differ diff --git a/Assets/Resources/RedHotRoastAssets/FGUI/ZM_Common_01_fui.bytes b/Assets/Resources/RedHotRoastAssets/FGUI/ZM_Common_01_fui.bytes index b9b87a37..fc1bc66a 100644 Binary files a/Assets/Resources/RedHotRoastAssets/FGUI/ZM_Common_01_fui.bytes and b/Assets/Resources/RedHotRoastAssets/FGUI/ZM_Common_01_fui.bytes differ diff --git a/Assets/Scripts/ModuleManager/CtrlConst.cs b/Assets/Scripts/ModuleManager/CtrlConst.cs index cd9df59e..6cf813e2 100644 --- a/Assets/Scripts/ModuleManager/CtrlConst.cs +++ b/Assets/Scripts/ModuleManager/CtrlConst.cs @@ -84,5 +84,6 @@ namespace RedHotRoast public const string SaveingPotCtrl = "SaveingPotCtrl"; public const string GameAgainCtrl = "GameAgainCtrl"; public const string ArrowSettingCtrl = "ArrowSettingCtrl"; + public const string ArrowGameResultCtrl = "ArrowGameResultCtrl"; } } \ No newline at end of file diff --git a/Assets/Scripts/ModuleManager/ModelConst.cs b/Assets/Scripts/ModuleManager/ModelConst.cs index a0b6c958..fd2d9ee1 100644 --- a/Assets/Scripts/ModuleManager/ModelConst.cs +++ b/Assets/Scripts/ModuleManager/ModelConst.cs @@ -82,5 +82,6 @@ namespace RedHotRoast public const string SaveingPotModel = "SaveingPotModel"; public const string GameAgainModel = "GameAgainModel"; public const string ArrowSettingModel = "ArrowSettingModel"; + public const string ArrowGameResultModel = "ArrowGameResultModel"; } } \ No newline at end of file diff --git a/Assets/Scripts/ModuleManager/ModuleManagerRegister.cs b/Assets/Scripts/ModuleManager/ModuleManagerRegister.cs index 29e333c2..eb985ed4 100644 --- a/Assets/Scripts/ModuleManager/ModuleManagerRegister.cs +++ b/Assets/Scripts/ModuleManager/ModuleManagerRegister.cs @@ -76,6 +76,7 @@ namespace RedHotRoast moduleManager.AddModel(ModelConst.MakeupConfirmModel, new MakeupConfirmModel()); moduleManager.AddModel(ModelConst.GameAgainModel, new GameAgainModel()); moduleManager.AddModel(ModelConst.ArrowSettingModel, new ArrowSettingModel()); + moduleManager.AddModel(ModelConst.ArrowGameResultModel, new ArrowGameResultModel()); } public static void AutoRegisterUICtrl() { @@ -152,6 +153,7 @@ namespace RedHotRoast moduleManager.AddUICtrl(UICtrlConst.MakeupConfirmUICtrl, new MakeupConfirmUICtrl()); moduleManager.AddUICtrl(UICtrlConst.GameAgainUICtrl, new GameAgainUICtrl()); moduleManager.AddUICtrl(UICtrlConst.ArrowSettingUICtrl, new ArrowSettingUICtrl()); + moduleManager.AddUICtrl(UICtrlConst.ArrowGameResultUICtrl, new ArrowGameResultUICtrl()); } public static void AutoRegisterCtrl() @@ -235,6 +237,7 @@ namespace RedHotRoast moduleManager.AddCtrl(CtrlConst.MakeupConfirmCtrl, new MakeupConfirmCtrl()); moduleManager.AddCtrl(CtrlConst.GameAgainCtrl, new GameAgainCtrl()); moduleManager.AddCtrl(CtrlConst.ArrowSettingCtrl, new ArrowSettingCtrl()); + moduleManager.AddCtrl(CtrlConst.ArrowGameResultCtrl, new ArrowGameResultCtrl()); } public static void AutoRegisterUIType() @@ -315,6 +318,8 @@ namespace RedHotRoast moduleManager.AddUIType(UIConst.MakeupConfirmUI, typeof(MakeupConfirmUI)); moduleManager.AddUIType(UIConst.GameAgainUI, typeof(GameAgainUI)); moduleManager.AddUIType(UIConst.ArrowSettingUI, typeof(ArrowSettingUI)); + moduleManager.AddUIType(UIConst.ArrowGameResultUI, typeof(ArrowGameResultUI)); + } } diff --git a/Assets/Scripts/ModuleManager/UIConst.cs b/Assets/Scripts/ModuleManager/UIConst.cs index 20a0cdf7..b4e54453 100644 --- a/Assets/Scripts/ModuleManager/UIConst.cs +++ b/Assets/Scripts/ModuleManager/UIConst.cs @@ -81,6 +81,7 @@ namespace RedHotRoast public const string SaveingPotUI = "SaveingPotUI"; public const string GameAgainUI = "GameAgainUI"; public const string ArrowSettingUI = "ArrowSettingUI"; + public const string ArrowGameResultUI = "ArrowGameResultUI"; } diff --git a/Assets/Scripts/ModuleManager/UICtrlConst.cs b/Assets/Scripts/ModuleManager/UICtrlConst.cs index 723a8a0a..a7271db1 100644 --- a/Assets/Scripts/ModuleManager/UICtrlConst.cs +++ b/Assets/Scripts/ModuleManager/UICtrlConst.cs @@ -82,5 +82,6 @@ namespace RedHotRoast public const string SaveingPotUICtrl = "SaveingPotUICtrl"; public const string GameAgainUICtrl = "GameAgainUICtrl"; public const string ArrowSettingUICtrl = "ArrowSettingUICtrl"; + public const string ArrowGameResultUICtrl = "ArrowGameResultUICtrl"; } } \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/ArrowGame/ArrowGameUI.cs b/Assets/Scripts/ModuleUI/ArrowGame/ArrowGameUI.cs index 7739959e..56b12327 100644 --- a/Assets/Scripts/ModuleUI/ArrowGame/ArrowGameUI.cs +++ b/Assets/Scripts/ModuleUI/ArrowGame/ArrowGameUI.cs @@ -2016,7 +2016,7 @@ namespace RedHotRoast temp.boost_array = GameHelper.GetRewardBoost(1); DOVirtual.DelayedCall(0.25f, () => { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Open, temp); + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ArrowGameResultUI_Open, temp); }); } @@ -2109,7 +2109,7 @@ namespace RedHotRoast arrow.isMoving = false; } - // uiCtrlDispatcher.Dispatch(UICtrlMsg.LevelSuccessUI_Open, isSuccess); + // uiCtrlDispatcher.Dispatch(UICtrlMsg.ArrowGameResultUI_Open, isSuccess); if (isSuccess) { @@ -2128,7 +2128,7 @@ namespace RedHotRoast temp.boost_array = GameHelper.GetRewardBoost(2); DOVirtual.DelayedCall(0.2f, () => { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Open, temp); + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ArrowGameResultUI_Open, temp); }); } else @@ -2144,7 +2144,7 @@ namespace RedHotRoast temp.boost_array = GameHelper.GetRewardBoost(2); DOVirtual.DelayedCall(0.2f, () => { - UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Open, temp); + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ArrowGameResultUI_Open, temp); }); } } diff --git a/Assets/Scripts/ModuleUI/ArrowGameResult.meta b/Assets/Scripts/ModuleUI/ArrowGameResult.meta new file mode 100644 index 00000000..4d73940f --- /dev/null +++ b/Assets/Scripts/ModuleUI/ArrowGameResult.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 5348b60a2c4a4992baa4ebc3a8350762 +timeCreated: 1783913301 \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultCtrl.cs b/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultCtrl.cs new file mode 100644 index 00000000..a70c0ae7 --- /dev/null +++ b/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultCtrl.cs @@ -0,0 +1,41 @@ +namespace RedHotRoast +{ + public class ArrowGameResultCtrl : BaseCtrl + { + public static ArrowGameResultCtrl Instance { get; private set; } + + private ArrowGameResultModel model; + + #region 生命周期 + protected override void OnInit() + { + Instance = this; + } + + protected override void OnDispose() + { + Instance = null; + } + #endregion + + #region 消息 + protected override void RemoveListener() + { + + } + + protected override void AddServerListener() + { + + } + protected override void AddListener() + { + + } + protected override void RemoveServerListener() + { + + } + #endregion + } +} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultCtrl.cs.meta b/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultCtrl.cs.meta new file mode 100644 index 00000000..ea94b681 --- /dev/null +++ b/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultCtrl.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: ce13a9e8fcfd4f0aaf2ffc52eda22e6c +timeCreated: 1783913301 \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultModel.cs b/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultModel.cs new file mode 100644 index 00000000..44a5fd6e --- /dev/null +++ b/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultModel.cs @@ -0,0 +1,43 @@ +namespace RedHotRoast +{ + public class ArrowGameResultModel : BaseModel + { + #region 生命周期 + protected override void OnInit() + { + } + + protected override void OnDispose() + { + } + + // protected override void OnReset() + // { + // } + // #endregion + + // #region 读取数据 + // protected override void OnReadData() + // { + // } + // #endregion + + // #region 本地存储 + // protected override void WriteLocalStorage() + // { + + // } + #endregion + + #region 消息 + protected override void AddListener() + { + + } + protected override void RemoveListener() + { + + } + #endregion + } +} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultModel.cs.meta b/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultModel.cs.meta new file mode 100644 index 00000000..54f5d5dc --- /dev/null +++ b/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultModel.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 543ab76f11004a6f89beae902b35f858 +timeCreated: 1783913301 \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultUI.cs b/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultUI.cs new file mode 100644 index 00000000..c5e6d7a6 --- /dev/null +++ b/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultUI.cs @@ -0,0 +1,730 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using DG.Tweening; +using IgnoreOPS; +using FairyGUI; +using FGUI.GameResult_08; +using FGUI.LG_Common; +using FGUI.ZM_Common_01; +using IgnoreOPS; +using Newtonsoft.Json; +using Spine.Unity; +using UnityEngine; +using btn_claim = FGUI.ZM_Common_01.btn_claim; +using Random = UnityEngine.Random; + +namespace RedHotRoast +{ + public class ArrowGameResultUI : BaseUI + { + private ArrowGameResultUICtrl ctrl; + private GameResultModel model; + private com_end ui; + private bool IsWin; + private bool IsLevelSuccess; + private bool IsH5Reward; + + private float AwardNum = 20; + private Action closeCallback; + + private int AwardRate = 10; + + public ArrowGameResultUI(ArrowGameResultUICtrl ctrl) : base(ctrl) + { + uiName = UIConst.ArrowGameResultUI; + this.ctrl = ctrl; + } + + protected override void SetUIInfo(UIInfo uiInfo) + { + uiInfo.packageName = "GameResult_08"; + uiInfo.assetName = "com_end"; + uiInfo.layerType = UILayerType.Popup; + uiInfo.isNeedOpenAnim = false; + uiInfo.isNeedCloseAnim = false; + uiInfo.isNeedUIMask = true; + } + + #region 生命周期 + + protected override void OnInit() + { + //model = ModuleManager.Instance.GetModel(ModelConst.GameResultModel) as GameResultModel; + } + + protected override void OnClose() + { + GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, true); + + // GameHelper.SetCloseResult(false); + closeCallback?.Invoke(); + // if (IsLevelSuccess && !GameHelper.is_first_login) + // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.OpenGameUI_Open, true); + + + + } + // + protected override void OnBind() + { + ui = baseUI as com_end; + } + private SuccessData successData_; + protected override void OnOpenBefore(object args) + { + GameDispatcher.Instance.Dispatch(GameMsg.StopArrowTouch, false); + if (Screen.safeArea.y != 0) + {//刘海屏 + ui.btn_gold.y += 68; + } + + // var anim_paly = FXManager.Instance.SetFx(ui.btn_gold.GetChild("gold_anim") as GGraph, Fx_Type.fx_coin, ref closeCallback); + // anim_paly.state.SetAnimation(0, "animation", true); + ((com_money)ui.top_money).btn_ch.title = GameHelper.getDesByKey("ch_out_1"); + if (GameHelper.IsGiftSwitch()) + ui.switchgift.selectedIndex = 1; + + ui.tips_text.text = GameHelper.getDesByKey("ww_condition_lv"); + SuccessData SuccessDatas = args as SuccessData; + AwardNum = SuccessDatas.ch_number; + AwardRate = SuccessDatas.rate; + IsWin = SuccessDatas.IsWin; + + IsLevelSuccess = SuccessDatas.IsLevelSuccess; + IsH5Reward = SuccessDatas.IsH5Reward; + + successData_ = SuccessDatas; + if (!GameHelper.IsGiftSwitch()) + { + successData_.ch_number = (int)successData_.ch_number; + successData_.rate = 2; + } + // if (IsLevelSuccess && !IsH5Reward) + // { + // UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PayloadingUI_Open); + // + // GameHelper.PlayGameTimeEvent(1, () => + // { + // GameHelper.RequestGameConfig(); + // }); + // } + // else + // { + // GameHelper.SetCloseResult(true); + // } + if (!GameHelper.IsGiftSwitch()) + { + AwardNum = 20; + AwardRate = 2; + ui.btn_claim.title = Language.GetContentParams("exchange_succ", AwardNum); + } + else ui.btn_claim.title = GameHelper.getChString((decimal)AwardNum); + if (IsWin) + { + if (PlayerPrefs.GetFloat("soundVolume", 1.0f) > 0f) + { + AudioManager.Instance.PlayDynamicEffect(AudioConst.Victoriously); + } + + } + if (IsWin) + { + ui.win_lose.selectedIndex = 1; + } + else + { + // ui.win_lose.selectedIndex = 0; + ui.win_lose.selectedIndex = 2; + ui.lab_lose_des.text = GameHelper.getDesByKey("game_resulte_1"); + } + ui.btn_restart.SetClick(() => + { + // if (!GameHelper.GetCloseResult()) + // return; + GameHelper.addInterAdnumber(); + if (!IsWin) + { + GameHelper.SetLevelstate(3); + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.OpenGameUI_Open, true); + GameDispatcher.Instance.Dispatch(GameMsg.sendLog, false); + GameDispatcher.Instance.Dispatch(GameMsg.reset_game, false); + } + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Close); + }); + + + ((btn_claim)ui.com_arrow_end.btn_watchAd).state.selectedIndex = DataMgr.ArrowResultLevel.Value == 1 ? 1 : 0; + ((btn_claim)ui.com_arrow_end.btn_watchAd).title = DataMgr.ArrowResultLevel.Value == 1 ? Language.GetContent("free_revive") : Language.GetContent("revive"); + + ui.com_arrow_end.btn_watchAd.SetClick(() => + { + if (DataMgr.ArrowResultLevel.Value == 1) + { + DataMgr.ArrowResultLevel.Value = 0; + GameDispatcher.Instance.Dispatch(GameMsg.reset_game, true); + CtrlCloseUI(); + } + else if (DataMgr.ArrowResultLevel.Value == 0) + { + GameHelper.ShowVideoAd("gameResult", success => + { + if (success) + { + GameDispatcher.Instance.Dispatch(GameMsg.reset_game, true); + CtrlCloseUI(); + } + }); + } + }); + + ui.com_arrow_end.btn_restart.SetClick(() => + { + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.GameAgainUI_Open); + CtrlCloseUI(); + }); + + ui.com_arrow_end.btn_back.SetClick(() => + { + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.GameAgainUI_Open); + CtrlCloseUI(); + }); + + + ui.btn_mult.GetChild("title").text = Language.GetContentParams(" redeem_success", AwardRate); + + if (SuccessDatas.IsH5Reward) + ui.com_ch.visible = false; + InitView(); + if (IsWin) + { + if (GameHelper.IsGiftSwitch()) + ui.text_award.text = GameHelper.Get102Str((decimal)AwardNum); + else + ui.text_award.text = ((int)AwardNum).ToString(); + + + var sk = FXManager.Instance.SetFx(ui.bg_parent, Fx_Type.fx_win, ref closeCallback); + sk.state.SetAnimation(0, "out", true); + + var sk1 = FXManager.Instance.SetFx(ui.bg_parent_title, Fx_Type.fx_winstar, ref closeCallback); + sk1.state.SetAnimation(0, "animation", false); + + } + else + { + // var sk1 = FXManager.Instance.SetFx(ui.bg_parent_fail, Fx_Type.fx_fail, ref closeCallback); + // sk1.state.SetAnimation(0, "animation", true); + + if (GameHelper.IsGiftSwitch()) + ui.text_award.text = GameHelper.Get102Str(DataMgr.Ticket.Value); + else + ui.text_award.text = DataMgr.Coin.Value.ToString(); + } + ui.com_ch.btn_cash.title = GameHelper.getDesByKey("ch_out_1"); + + if (GameHelper.IsGiftSwitch()) + { + if (SaveData.GetSaveObject().LargeRewardNum < ConfigSystem.GetCommonConf().FreeClaims) + { + ((btn_claim3)ui.btn_mult).state.selectedIndex = 1; + } + else if (ConfigSystem.GetCommonConf().PiggyBankSwitch == 1) + { + ((btn_claim3)ui.btn_mult).img_saveingpot.visible = true; + } + } + ui.btn_gold.GetChild("text_gold").text = $"{DataMgr.Coin.Value:N0}"; + ui.top_money.GetChild("text_gold").text = GameHelper.Get102Str(DataMgr.Ticket.Value); + ui.btn_mult.SetClick(() => + { + // if (!GameHelper.GetCloseResult()) + // return; + if (GameHelper.IsGiftSwitch()) + { + if (SaveData.GetSaveObject().LargeRewardNum < ConfigSystem.GetCommonConf().FreeClaims) + { + ui.com_ch.btn_cash.SetClick(() => { }); + ui.btn_claim.SetClick(() => { }); + ui.btn_mult.SetClick(() => { }); + StartScroll(); + } + else + { + GameHelper.ShowVideoAd("reward_lobby", isSuccess => + { + if (isSuccess) + { + ui.com_ch.btn_cash.SetClick(() => { }); + ui.btn_claim.SetClick(() => { }); + ui.btn_mult.SetClick(() => { }); + StartScroll(); + } + }); + } + } + else + { + + GameHelper.ShowVideoAd("reward_lobby", isSuccess => + { + if (isSuccess) + { + ui.com_ch.btn_cash.SetClick(() => { }); + ui.btn_claim.SetClick(() => { }); + ui.btn_mult.SetClick(() => { }); + GetReward(AwardNum * 2); + } + }); + + } + + }); + ui.btn_claim.SetClick(() => + { + // if (!GameHelper.GetCloseResult()) + // return; + + ui.com_ch.btn_cash.SetClick(() => { }); + ui.btn_claim.SetClick(() => { }); + ui.btn_mult.SetClick(() => { }); + GetReward(AwardNum); + DOVirtual.DelayedCall(2f, () => + { + GameHelper.addInterAdnumber(); + }); + }); + //} + } + private bool isget; + private void GetReward(float awardNum) + { + if (isget) + return; + isget = true; + var rewardData = new RewardData(); + + int curr_type = 101; + Vector2 end_ = GameHelper.GetUICenterPosition(ui.btn_gold, true); + + if (GameHelper.IsGiftSwitch()) + { + curr_type = 102; + end_ = GameHelper.GetUICenterPosition(ui.top_money, true); + awardNum *= GameHelper.GetExchangeRateVo().Multi; + } + var rewardSingleData = new RewardSingleData(curr_type, (decimal)awardNum, RewardOrigin.Play) + { + startPosition = GameHelper.GetUICenterPosition(ui.btn_mult, true), + endPosition = new Vector2(end_.x - 110, end_.y - 110), + }; + + rewardData.AddReward(rewardSingleData); + rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange; + rewardData.AddCompleted(success => + { + if (success) + { + // RefreshGold((decimal)awardNum); + + DOVirtual.DelayedCall(0.7f, () => + { + if (IsLevelSuccess) + { + GameDispatcher.Instance.Dispatch(GameMsg.reset_game, false); + } + + CtrlCloseUI(); + // if (IsLevelSuccess) UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.OpenGameUI_Open, true); + }); + } + }); + + GameDispatcher.Instance.Dispatch(GameMsg.GetReward, rewardData); + DOVirtual.DelayedCall(1, () => + { + DOVirtual.Float(0, (float)DataMgr.Ticket.Value, 1, + value => { ui.top_money.GetChild("text_gold").text = ((decimal)value).ToString("0.00"); }); + }); + } + + private void RefreshGold(decimal coin = -1) + { + if (coin < 0) + { + coin = DataMgr.Coin.Value; + } + var btnCoin = ui.btn_gold as com_gold; + + CommonHelper.ShowNumAnim(btnCoin.text_gold, coin); + } + protected override void OnOpen(object args) + { + } + + protected override void OnHide() + { + } + + protected override void OnDisplay(object args) + { + } + #endregion + + #region 消息 + protected override void AddListener() + { + HallManager.Instance.UpdateSecondEvent += timeEvent; + } + protected override void RemoveListener() + { + HallManager.Instance.UpdateSecondEvent -= timeEvent; + } + #endregion + private int time_count; + void timeEvent() + { + time_count++; + + if (time_count > 3) + { + time_count = 0; + ui.com_ch.broad.t0.Play(() => + { + var name_index = Random.Range(0, exBrPoolModel.config_name_list.Count); + var money_index = Random.Range(0, exBrPoolModel.config_money_list.Count); + + DateTime oldtime = DateTime.Now.AddSeconds(-Random.Range(1 * 3600, 2 * 3600)); + + // ui.com_ch.broad.cast_text.text = string.Format("Congratulations, [color=#dfad42]{0}[/color] withdrew [color=#90c04e]{1} [/color]dollars", exBrPoolModel.config_name_list[name_index], + // exBrPoolModel.config_money_list[money_index]); + string broad_text = String.Format(GameHelper.getDesByKey("makeup_5"), exBrPoolModel.config_name_list[name_index], + exBrPoolModel.config_money_list[money_index]); + ui.com_ch.broad.cast_text.text = broad_text; + + //, oldtime.Hour + ":" + (oldtime.Minute > 10 ? oldtime.Minute : "0" + oldtime.Minute) + ui.com_ch.broad.t1.Play(); + }); + } + } + //初始化页面逻辑 + private void InitView() + { + if (Screen.safeArea.y != 0) + {//刘海屏 + ui.top_group.y += 68; + } + closeCallback = null; + if (!GameHelper.IsGiftSwitch()) + return; + var name_index = Random.Range(0, exBrPoolModel.config_name_list.Count); + var money_index = Random.Range(0, exBrPoolModel.config_money_list.Count); + // ui.com_ch.broad.cast_text.text = string.Format("Congratulations, [color=#dfad42]{0}[/color] withdrew [color=#90c04e]{1} [/color]dollars", exBrPoolModel.config_name_list[name_index], + // exBrPoolModel.config_money_list[money_index]); + string broad_text = String.Format(GameHelper.getDesByKey("makeup_5"), exBrPoolModel.config_name_list[name_index], + exBrPoolModel.config_money_list[money_index]); + ui.com_ch.broad.cast_text.text = broad_text; + if (DataMgr.MakeupTaskHistory.Value.Count == 0) + { + return; + } + var makeupTaskData = DataMgr.MakeupTaskHistory.Value.Last(); + var vo = ConfigSystem.GetConfig().FirstOrDefault(makeup => makeup.id == makeupTaskData.tableId); + + ui.com_ch.btn_cash.SetClick(() => + { + // if (!GameHelper.GetCloseResult()) + // return; + + ui.btn_claim.SetClick(() => { }); + ui.btn_mult.SetClick(() => { }); + ui.com_ch.btn_cash.SetClick(() => { }); + ui.top_money.GetChild("btn_ch").SetClick(() => { }); + if (IsWin) + { + //ui.btn_claim.FireClick(false, true); + GetReward(AwardNum); + DOVirtual.DelayedCall(2f, () => + { + GameHelper.addInterAdnumber(); + uiCtrlDispatcher.Dispatch(UICtrlMsg.MakeupConfirmUI_Open, makeupTaskData); + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Close); + }); + + } + else + { + GameHelper.addInterAdnumber(); + if (!IsWin) + GameHelper.SetLevelstate(3); + uiCtrlDispatcher.Dispatch(UICtrlMsg.MakeupConfirmUI_Open, makeupTaskData); + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Close); + GameDispatcher.Instance.Dispatch(GameMsg.reset_game, false); + + } + // ui.btn_claim.enabled = false; + // ui.btn_mult.enabled = false; + + }); + + ui.top_money.GetChild("btn_ch").SetClick(() => + { + ui.btn_claim.SetClick(() => { }); + ui.btn_mult.SetClick(() => { }); + ui.com_ch.btn_cash.SetClick(() => { }); + ui.top_money.GetChild("btn_ch").SetClick(() => { }); + if (IsWin) + { + //ui.btn_claim.FireClick(false, true); + GetReward(AwardNum); + DOVirtual.DelayedCall(2f, () => + { + GameHelper.addInterAdnumber(); + uiCtrlDispatcher.Dispatch(UICtrlMsg.MakeupConfirmUI_Open, makeupTaskData); + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Close); + }); + + } + else + { + GameHelper.addInterAdnumber(); + if (!IsWin) + GameHelper.SetLevelstate(3); + uiCtrlDispatcher.Dispatch(UICtrlMsg.MakeupConfirmUI_Open, makeupTaskData); + UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LevelSuccessUI_Close); + } + }); + + + + + + if ((float)DataMgr.Ticket.Value < vo.item_need) + { + string str = string.Format(GameHelper.getDesByKey("makeup_2"), vo.item_need); + ui.com_ch.ch_text.text = str; + if ((float)DataMgr.Ticket.Value > vo.item_need) + { + ui.com_ch.progress.width = 656; + ui.com_ch.progress_text.text = GameHelper.Get102Str(vo.item_need) + "/" + GameHelper.Get102Str(vo.item_need); + } + else + { + ui.com_ch.progress.width = 656 * ((float)DataMgr.Ticket.Value / vo.item_need); + ui.com_ch.progress_text.text = GameHelper.Get102Str(DataMgr.Ticket.Value) + "/" + GameHelper.Get102Str(vo.item_need); + } + + Debug.Log((float)DataMgr.Ticket.Value); + } + // else if ((float)DataMgr.MakeupTaskH5Time < vo.task_need) + // { + // ui.com_ch.ch_text.text = "Cumulataive " + (vo.task_need / 60) + @" minutes in ""Game"" to cash out"; + // if ((float)DataMgr.MakeupTaskH5Time > vo.task_need) + // { + // ui.com_ch.progress.width = 656; + // ui.com_ch.progress_text.text = (vo.task_need / 60) + "/" + (vo.task_need / 60); + // } + // else + // { + // ui.com_ch.progress.width = 656 * ((float)DataMgr.MakeupTaskH5Time / vo.task_need); + // ui.com_ch.progress_text.text = Math.Round(((float)(DataMgr.MakeupTaskH5Time / 60)), 2) + "/" + (vo.task_need / 60); + // } + // + // } + else if (makeupTaskData.videoCount < vo.ad_need) + { + + string str = string.Format(GameHelper.getDesByKey("makeup_1"), vo.ad_need); + ui.com_ch.ch_text.text = str; + if (makeupTaskData.videoCount > vo.ad_need) + { + ui.com_ch.progress.width = 656; + ui.com_ch.progress_text.text = vo.ad_need + "/" + vo.ad_need; + } + else + { + ui.com_ch.progress.width = 656 * ((float)makeupTaskData.videoCount / vo.ad_need); + ui.com_ch.progress_text.text = makeupTaskData.videoCount + "/" + vo.ad_need; + } + } + else if (GameHelper.GetLevel() <= vo.levels_need) + { + string str = string.Format(GameHelper.getDesByKey("makeup_3"), vo.levels_need); + ui.com_ch.ch_text.text = str; + ui.com_ch.progress.width = 656 * (GameHelper.GetLevel() - 1) / vo.levels_need; + ui.com_ch.progress_text.text = (GameHelper.GetLevel() - 1) + "/" + vo.levels_need; + } + else + { + var vo1 = ConfigSystem.GetConfig().FirstOrDefault(makeup => makeup.id == makeupTaskData.tableId + 1); + if (vo1 == null) + vo1 = vo; + string str1 = string.Format(GameHelper.getDesByKey("makeup_2"), vo1.item_need); + ui.com_ch.ch_text.text = str1; + + if ((float)(DataMgr.Ticket.Value - vo.item_need) < vo1.item_need) + { + string str = string.Format(GameHelper.getDesByKey("makeup_2"), vo1.item_need); + ui.com_ch.ch_text.text = str; + + ui.com_ch.progress.width = 656f * ((float)(DataMgr.Ticket.Value - vo.item_need) / vo1.item_need); + ui.com_ch.progress_text.text = GameHelper.Get102Str((DataMgr.Ticket.Value - vo.item_need)) + "/" + GameHelper.Get102Str(vo1.item_need); + + + // Debug.Log((float)DataMgr.Ticket.Value); + } + else if (makeupTaskData.videoCount < vo1.ad_need) + { + + string str = string.Format(GameHelper.getDesByKey("makeup_1"), vo1.ad_need); + ui.com_ch.ch_text.text = str; + if (makeupTaskData.videoCount > vo1.ad_need) + { + ui.com_ch.progress.width = 656f; + ui.com_ch.progress_text.text = vo1.ad_need + "/" + vo1.ad_need; + } + else + { + ui.com_ch.progress.width = 656f * ((float)makeupTaskData.videoCount / vo1.ad_need); + ui.com_ch.progress_text.text = makeupTaskData.videoCount + "/" + vo1.ad_need; + } + } + else if (GameHelper.GetLevel() <= vo1.levels_need) + { + string str = string.Format(GameHelper.getDesByKey("makeup_3"), vo1.levels_need); + ui.com_ch.ch_text.text = str; + ui.com_ch.progress.width = 656f * (GameHelper.GetLevel() - 1) / vo1.levels_need; + ui.com_ch.progress_text.text = (GameHelper.GetLevel() - 1) + "/" + vo1.levels_need; + } + + else + { + + string str = string.Format(GameHelper.getDesByKey("makeup_3"), vo1.levels_need); + ui.com_ch.ch_text.text = str; + ui.com_ch.progress.width = 656f * (GameHelper.GetLevel() - 1) / vo1.levels_need; + if (GameHelper.GetLevel() > vo1.levels_need) + { + ui.com_ch.progress.width = 656f; + ui.com_ch.progress_text.text = vo1.levels_need + "/" + vo1.levels_need; + } + else + { + ui.com_ch.progress.width = 590f * (GameHelper.GetLevel() - 1) / vo1.levels_need; + ui.com_ch.progress_text.text = (GameHelper.GetLevel() - 1) + "/" + vo1.levels_need; + } + + } + + + } + if (successData_.boost_array != null && GameHelper.IsGiftSwitch()) + { + (ui.wheel.GetChild("wheel_") as wheel_).t0.Play(Scroll); + (ui.wheel.GetChild("wheel_") as wheel_).t1.Play(() => + { + rate_idnex++; + ui.btn_mult.title = "(" + GameHelper.getChString((decimal)successData_.ch_number * successData_.boost_array[rate_idnex % 5]) + ")"; + }); + ui.btn_mult.title = "(" + GameHelper.getChString((decimal)successData_.ch_number * successData_.boost_array[rate_idnex]) + ")"; + + list_1 = new List() { (ui.wheel.GetChild("wheel_") as wheel_).item_0, (ui.wheel.GetChild("wheel_") as wheel_).item_1, (ui.wheel.GetChild("wheel_") as wheel_).item_2, (ui.wheel.GetChild("wheel_") as wheel_).item_3, (ui.wheel.GetChild("wheel_") as wheel_).item_4, (ui.wheel.GetChild("wheel_") as wheel_).item_5, (ui.wheel.GetChild("wheel_") as wheel_).item_6, (ui.wheel.GetChild("wheel_") as wheel_).item_7, }; + // list_1[2].img_light.visible = true; + + for (int i = 0; i < list_1.Count; i++) + { + list_1[i].type.selectedIndex = (i + scroll_number) % 3; + list_1[i].text_rate.text = "X" + successData_.boost_array[i % successData_.boost_array.Length]; + } + } + } + List list_1; + private int rate_idnex = 3; + private int scroll_number; + List rate_list = new List(); + private int scroll_type = 1; + + private void StartScroll() + { + (ui.wheel.GetChild("wheel_") as wheel_).t0.timeScale = (ui.wheel.GetChild("wheel_") as wheel_).t0.timeScale = 5.0f; + scroll_type = 2; + } + private void Scroll() + { + if (scroll_type == 1) + { + scroll_number++; + rate_list.Clear(); + for (int i = 0; i < 8; i++) + { + rate_list.Add(successData_.boost_array[(scroll_number + i) % successData_.boost_array.Length]); + } + // Debug.Log(JsonConvert.SerializeObject(rate_list)); + for (int i = 0; i < list_1.Count; i++) + { + list_1[i].type.selectedIndex = (i + scroll_number) % 3; + list_1[i].text_rate.text = "X" + rate_list[i]; + } + + (ui.wheel.GetChild("wheel_") as wheel_).t1.Play(() => + { + rate_idnex++; + ui.btn_mult.title = "(" + GameHelper.getChString((decimal)successData_.ch_number * successData_.boost_array[rate_idnex % successData_.boost_array.Length]) + ")"; + }); + + (ui.wheel.GetChild("wheel_") as wheel_).t0.Play(Scroll); + + } + else + { + + scroll_number++; + + rate_list.Clear(); + for (int i = 0; i < 8; i++) + { + rate_list.Add(successData_.boost_array[(scroll_number + i) % successData_.boost_array.Length]); + } + + // bool need_return = false; + if (((ui.wheel.GetChild("wheel_") as wheel_).t0.timeScale < 2.2f) && (list_1[4].text_rate.text == ("X" + successData_.rate))) + { + //开始领取 + float reward = successData_.ch_number * successData_.rate; + + if (GameHelper.IsGiftSwitch()) + GetReward(reward); + else + GetReward(reward); + GameDispatcher.Instance.Dispatch(GameMsg.RefreshMakeupData); + SaveData.GetSaveObject().LargeRewardNum++; + SaveData.SaveDataFunc(); + return; + } + for (int i = 0; i < list_1.Count; i++) + { + list_1[i].type.selectedIndex = (i + scroll_number) % 3; + list_1[i].text_rate.text = "X" + rate_list[i]; + Debug.Log((ui.wheel.GetChild("wheel_") as wheel_).t0.timeScale); + } + + // if (need_return) + // { + // (ui.wheel.GetChild("wheel_") as wheel_).t0.timeScale = 0; + // return; + // } + + (ui.wheel.GetChild("wheel_") as wheel_).t1.Play(() => + { + rate_idnex++; + ui.btn_mult.title = "(" + GameHelper.getChString((decimal)successData_.ch_number * successData_.boost_array[rate_idnex % successData_.boost_array.Length]) + ")"; + }); + + (ui.wheel.GetChild("wheel_") as wheel_).t0.Play(Scroll); + (ui.wheel.GetChild("wheel_") as wheel_).t0.timeScale = (ui.wheel.GetChild("wheel_") as wheel_).t0.timeScale - 0.3f; + + } + + } + } +} diff --git a/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultUI.cs.meta b/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultUI.cs.meta new file mode 100644 index 00000000..2ab3a160 --- /dev/null +++ b/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultUI.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2558893f0b3344e3b96e35a690efc1b2 +timeCreated: 1783913301 \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultUICtrl.cs b/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultUICtrl.cs new file mode 100644 index 00000000..9e4a7d8c --- /dev/null +++ b/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultUICtrl.cs @@ -0,0 +1,83 @@ +using DG.Tweening; + +namespace RedHotRoast +{ + public class ArrowGameResultUICtrl : BaseUICtrl + { + private ArrowGameResultUI ui; + private ArrowGameResultModel model; + + private uint openUIMsg = UICtrlMsg.ArrowGameResultUI_Open; + private uint closeUIMsg = UICtrlMsg.ArrowGameResultUI_Close; + + #region 生命周期 + protected override void OnInit() + { + //model = ModuleManager.Instance.GetModel(ModelConst.GameResultModel) as GameResultModel; + } + + protected override void OnDispose() + { + } + + private object m_data = null; + public override void OpenUI(object args = null) + { + if (ui == null) + { + ui = new ArrowGameResultUI(this); + ui.Open(args); + } else { + m_data ??= args; + } + } + + public override void CloseUI(object args = null) + { + if (ui != null && !ui.isClose) + { + ui.Close(); + } + ui = null; + + if (m_data != null) { + DOVirtual.DelayedCall(0.2f, ()=>{ + OpenUI(m_data); + m_data = null; + }); + } + } + #endregion + + #region 消息 + public override uint GetOpenUIMsg(string uiName) + { + return openUIMsg; + } + public override uint GetCloseUIMsg(string uiName) + { + return closeUIMsg; + } + + protected override void AddListener() + { + uiCtrlDispatcher.AddListener(openUIMsg, OpenUI); + uiCtrlDispatcher.AddListener(closeUIMsg, CloseUI); + } + protected override void RemoveListener() + { + uiCtrlDispatcher.RemoveListener(openUIMsg, OpenUI); + uiCtrlDispatcher.RemoveListener(closeUIMsg, CloseUI); + } + + protected override void AddServerListener() + { + + } + protected override void RemoveServerListener() + { + + } + #endregion + } +} \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultUICtrl.cs.meta b/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultUICtrl.cs.meta new file mode 100644 index 00000000..c970a09d --- /dev/null +++ b/Assets/Scripts/ModuleUI/ArrowGameResult/ArrowGameResultUICtrl.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 03c465e2333d4ae0a749995b87ec8955 +timeCreated: 1783913301 \ No newline at end of file diff --git a/Assets/Scripts/ModuleUI/GameResult/GameResultUI.cs b/Assets/Scripts/ModuleUI/GameResult/GameResultUI.cs index 18554506..e3559dbe 100644 --- a/Assets/Scripts/ModuleUI/GameResult/GameResultUI.cs +++ b/Assets/Scripts/ModuleUI/GameResult/GameResultUI.cs @@ -117,9 +117,9 @@ namespace RedHotRoast { AwardNum = 20; AwardRate = 2; - ui.btn_claim.title = Language.GetContentParams("exchange_succ", AwardNum); + ui.btn_claim.title = "Claim(" + AwardNum + ")"; } - else ui.btn_claim.title = Language.GetContentParams("exchange_succ", GameHelper.getChString((decimal)AwardNum)); + else ui.btn_claim.title = "Claim(" + GameHelper.getChString((decimal)AwardNum) + ")"; if (IsWin) { if (PlayerPrefs.GetFloat("soundVolume", 1.0f) > 0f) @@ -155,7 +155,7 @@ namespace RedHotRoast ((btn_claim)ui.com_arrow_end.btn_watchAd).state.selectedIndex = DataMgr.ArrowResultLevel.Value == 1 ? 1 : 0; - ((btn_claim)ui.com_arrow_end.btn_watchAd).title = DataMgr.ArrowResultLevel.Value == 1 ? Language.GetContent("free_revive") : Language.GetContent("revive"); + ((btn_claim)ui.com_arrow_end.btn_watchAd).title = DataMgr.ArrowResultLevel.Value == 1 ? "Free Revive" : "Revive"; ui.com_arrow_end.btn_watchAd.SetClick(() => { @@ -191,7 +191,7 @@ namespace RedHotRoast }); - ui.btn_mult.GetChild("title").text = Language.GetContentParams(" redeem_success", AwardRate); + ui.btn_mult.GetChild("title").text = "Claim X" + AwardRate; if (SuccessDatas.IsH5Reward) ui.com_ch.visible = false; @@ -235,7 +235,7 @@ namespace RedHotRoast } } ui.btn_gold.GetChild("text_gold").text = $"{DataMgr.Coin.Value:N0}"; - ui.top_money.GetChild("text_gold").text = GameHelper.Get102Str(DataMgr.Ticket.Value); + ui.top_money.GetChild("text_gold").text = DataMgr.Ticket.Value.ToString(); ui.btn_mult.SetClick(() => { if (!GameHelper.GetCloseResult()) @@ -311,7 +311,7 @@ namespace RedHotRoast { curr_type = 102; end_ = GameHelper.GetUICenterPosition(ui.top_money, true); - awardNum *= GameHelper.GetExchangeRateVo().Multi; + } var rewardSingleData = new RewardSingleData(curr_type, (decimal)awardNum, RewardOrigin.Play) { diff --git a/RedHotRoast-ios.sln.DotSettings.user b/RedHotRoast-ios.sln.DotSettings.user index eae31700..469c8ec8 100644 --- a/RedHotRoast-ios.sln.DotSettings.user +++ b/RedHotRoast-ios.sln.DotSettings.user @@ -2,6 +2,7 @@ ForceIncluded ForceIncluded ForceIncluded + ForceIncluded ForceIncluded ForceIncluded ForceIncluded