tron_wz/RedHotRoast-ios
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：1、修复bug

Browse Source
This commit is contained in:
barry
2026-05-27 09:32:33 +08:00
parent 5f68fe42c1
commit d4f6b82209
27 changed files with 388 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/ModuleUI/BuyProp/BuyPropUI.cs
+151 -151
View File
@@ -1,151 +1,151 @@
namespace RedHotRoast
{
public class BuyPropUI : BaseUI
{
private BuyPropUICtrl ctrl;
private BuyPropModel model;
private FGUI.ZM_Prop_09.com_prop ui;
private int state_ = 0;
public BuyPropUI(BuyPropUICtrl ctrl) : base(ctrl)
{
uiName = UIConst.BuyPropUI;
this.ctrl = ctrl;
}
protected override void SetUIInfo(UIInfo uiInfo)
{
uiInfo.packageName = "ZM_Prop_09";
uiInfo.assetName = "com_prop";
uiInfo.layerType = UILayerType.Popup;
uiInfo.isNeedOpenAnim = false;
uiInfo.isNeedCloseAnim = false;
uiInfo.isNeedUIMask = false;
}
#region 生命周期
protected override void OnInit()
{
//model = ModuleManager.Instance.GetModel(ModelConst.BuyPropModel) as BuyPropModel;
}
protected override void OnClose()
{
GameHelper.showGameUI = true;
}
protected override void OnBind()
{
ui = baseUI as FGUI.ZM_Prop_09.com_prop;
}
protected override void OnOpenBefore(object args)
{
state_ = (int)args;
ui.prop.selectedIndex = state_;
ui.btn_buy.GetChild("text_gold").text = GameHelper.Get101Str(ConfigSystem.GetCommonConf().Purchaseprops);
ui.btn_buy.SetClick(buyItem);
setBtnState(state_);
InitView();
}
void buyItem()
{
if (state_ == 0)
{
}
else if (state_ == 1)
{
}
else if (state_ == 2)
{
}
if (GameHelper.CheckGoldNumber(ConfigSystem.GetCommonConf().Purchaseprops))
{
GameHelper.AddGoldNumber(-ConfigSystem.GetCommonConf().Purchaseprops);
int numbers = GameHelper.GetItemNumber(state_);
numbers++;
GameHelper.SetItemNumber(state_, numbers);
GameDispatcher.Instance.Dispatch(GameMsg.Sheep_item_refresh);
GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh);
GameHelper.ShowTips("purchase_succ", true);
CtrlCloseUI();
}
else
{
GameHelper.ShowTips("no_enough_gold", true);
}
}
protected override void OnOpen(object args)
{
}
protected override void OnHide()
{
}
protected override void OnDisplay(object args)
{
}
#endregion
#region 消息
protected override void AddListener()
{
}
protected override void RemoveListener()
{
}
#endregion
//初始化页面逻辑
private void InitView()
{
ui.btn_back.SetClick(() =>
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SheepwindowUI_Close);
});
// ui.btn_buy0.SetClick(() =>
// {
// state_ = 0;
// ui.prop.selectedIndex = 0;
// setBtnState(0);
// });
// ui.btn_buy1.SetClick(() =>
// {
// state_ = 1;
// ui.prop.selectedIndex = 1;
// setBtnState(1);
// });
// ui.btn_buy2.SetClick(() =>
// {
// state_ = 2;
// ui.prop.selectedIndex = 2;
// setBtnState(2);
// });
}
private void setBtnState(int index)
{
// ui.btn_buy0.tab_choose.selectedIndex = index == 0 ? 1 : 0;
// ui.btn_buy1.tab_choose.selectedIndex = index == 1 ? 1 : 0;
// ui.btn_buy2.tab_choose.selectedIndex = index == 2 ? 1 : 0;
}
}
}
namespace RedHotRoast
{
public class BuyPropUI : BaseUI
{
private BuyPropUICtrl ctrl;
private BuyPropModel model;
private FGUI.ZM_Prop_09.com_prop ui;
private int state_ = 0;
public BuyPropUI(BuyPropUICtrl ctrl) : base(ctrl)
{
uiName = UIConst.BuyPropUI;
this.ctrl = ctrl;
}
protected override void SetUIInfo(UIInfo uiInfo)
{
uiInfo.packageName = "ZM_Prop_09";
uiInfo.assetName = "com_prop";
uiInfo.layerType = UILayerType.Popup;
uiInfo.isNeedOpenAnim = false;
uiInfo.isNeedCloseAnim = false;
uiInfo.isNeedUIMask = true;
}
#region 生命周期
protected override void OnInit()
{
//model = ModuleManager.Instance.GetModel(ModelConst.BuyPropModel) as BuyPropModel;
}
protected override void OnClose()
{
GameHelper.showGameUI = true;
}
protected override void OnBind()
{
ui = baseUI as FGUI.ZM_Prop_09.com_prop;
}
protected override void OnOpenBefore(object args)
{
state_ = (int)args;
ui.prop.selectedIndex = state_;
ui.btn_buy.GetChild("text_gold").text = GameHelper.Get101Str(ConfigSystem.GetCommonConf().Purchaseprops);
ui.btn_buy.SetClick(buyItem);
setBtnState(state_);
InitView();
}
void buyItem()
{
if (state_ == 0)
{
}
else if (state_ == 1)
{
}
else if (state_ == 2)
{
}
if (GameHelper.CheckGoldNumber(ConfigSystem.GetCommonConf().Purchaseprops))
{
GameHelper.AddGoldNumber(-ConfigSystem.GetCommonConf().Purchaseprops);
int numbers = GameHelper.GetItemNumber(state_);
numbers++;
GameHelper.SetItemNumber(state_, numbers);
GameDispatcher.Instance.Dispatch(GameMsg.Sheep_item_refresh);
GameDispatcher.Instance.Dispatch(GameMsg.Gold_refresh);
GameHelper.ShowTips("purchase_succ", true);
CtrlCloseUI();
}
else
{
GameHelper.ShowTips("no_enough_gold", true);
}
}
protected override void OnOpen(object args)
{
}
protected override void OnHide()
{
}
protected override void OnDisplay(object args)
{
}
#endregion
#region 消息
protected override void AddListener()
{
}
protected override void RemoveListener()
{
}
#endregion
//初始化页面逻辑
private void InitView()
{
ui.btn_back.SetClick(() =>
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SheepwindowUI_Close);
});
// ui.btn_buy0.SetClick(() =>
// {
// state_ = 0;
// ui.prop.selectedIndex = 0;
// setBtnState(0);
// });
// ui.btn_buy1.SetClick(() =>
// {
// state_ = 1;
// ui.prop.selectedIndex = 1;
// setBtnState(1);
// });
// ui.btn_buy2.SetClick(() =>
// {
// state_ = 2;
// ui.prop.selectedIndex = 2;
// setBtnState(2);
// });
}
private void setBtnState(int index)
{
// ui.btn_buy0.tab_choose.selectedIndex = index == 0 ? 1 : 0;
// ui.btn_buy1.tab_choose.selectedIndex = index == 1 ? 1 : 0;
// ui.btn_buy2.tab_choose.selectedIndex = index == 2 ? 1 : 0;
}
}
}
Assets/Scripts/ModuleUI/Hall/HallUI.cs
+12 -15
View File
@@ -184,10 +184,10 @@ namespace RedHotRoast
{
uiCtrlDispatcher.Dispatch(UICtrlMsg.ScAlbumLockUI_Open);
}
else if (unlocklist[random_index] == 2)
{
uiCtrlDispatcher.Dispatch(UICtrlMsg.ChatUnlockUI_Open);
}
// else if (unlocklist[random_index] == 2)
// {
// uiCtrlDispatcher.Dispatch(UICtrlMsg.ChatUnlockUI_Open);
// }
}
}
@@ -196,15 +196,15 @@ namespace RedHotRoast
Setbg();
if (GameHelper.IsGiftSwitch() && GameHelper.GetCommonModel().Assitant == 1 && GameHelper.GetLevel() >= GameHelper.GetCommonModel().AssitantPreview)
{
ui.btn_chat.visible = true;
// ui.btn_chat.visible = true;
SkeletonAnimation ske_pot = FXManager.Instance.SetFx<SkeletonAnimation>(ui.btn_chat.GetChild("ani_parent") as GGraph, Fx_Type.fx_btnchat, ref closeCallback);
ske_pot.state.SetAnimation(0, "animation", true);
ui.btn_chat.SetClick(() =>
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ChatChooseUI_Open);
Log.Info("Hall", $"{GameHelper.GetLevel()}/{GameHelper.GetCommonModel().UnlockSecret[1]}/{DataMgr.IsUnlockSecret.Value}");
});
// ui.btn_chat.SetClick(() =>
// {
//
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ChatChooseUI_Open);
// Log.Info("Hall", $"{GameHelper.GetLevel()}/{GameHelper.GetCommonModel().UnlockSecret[1]}/{DataMgr.IsUnlockSecret.Value}");
// });
}
}
@@ -522,10 +522,7 @@ namespace RedHotRoast
ui.btn_live.SetClick(() =>
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretUnlockUI_Open);
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LiveUI_Open);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LiveUI_Open);
});
ui.btn_secret.title = "LV." + GameHelper.GetCommonModel().UnlockSecret[1];
ui.btn_secret.SetClick(() =>
Assets/Scripts/ModuleUI/PassView/PassViewUI.cs
+2 -2
View File
@@ -234,7 +234,7 @@ namespace RedHotRoast {
}
void setItemUrl(GLoader loader, int urltype) {
if (urltype == 0)
loader.url = "ui://ZM_Pass_14/bbq_gold02";
loader.url = "ui://ZM_Pass_14/bbq_gold01";
else if (urltype == 4)
loader.url = "ui://ZM_Pass_14/bbq_gold02";
else if (urltype == 1)
@@ -394,7 +394,7 @@ namespace RedHotRoast {
setItemUrl(item.free_item.item_loader, 0);
}
else {
setItemUrl(item.free_item.item_loader, Passportrewards_list[index - 1].Paid_rewards_type);
setItemUrl(item.free_item.item_loader, Passportrewards_list[index - 1].Free_rewards_type);
}
if (Passportrewards_list[index - 1].Paid_rewards_type == 0) {
setItemUrl(item.pay_item.item_loader, 4);
Assets/Scripts/ModuleUI/Play/RainPlayUI.cs
+9 -9
View File
@@ -231,10 +231,10 @@ namespace RedHotRoast
{
uiCtrlDispatcher.Dispatch(UICtrlMsg.ScAlbumLockUI_Open);
}
else if (unlocklist[random_index] == 2)
{
uiCtrlDispatcher.Dispatch(UICtrlMsg.ChatUnlockUI_Open);
}
// else if (unlocklist[random_index] == 2)
// {
// uiCtrlDispatcher.Dispatch(UICtrlMsg.ChatUnlockUI_Open);
// }
}
}
@@ -246,13 +246,13 @@ namespace RedHotRoast
ui.btn_add.t0.Play();
SkeletonAnimation ske_pot = FXManager.Instance.SetFx<SkeletonAnimation>((ui.btn_chat as btn_chat).ani_parent, Fx_Type.fx_btnchat, ref closeCallback);
ske_pot.state.SetAnimation(0, "animation", true);
ui.btn_chat.SetClick(() =>
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ChatChooseUI_Open);
});
// ui.btn_chat.SetClick(() =>
// {
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ChatChooseUI_Open);
// });
if (GameHelper.IsGiftSwitch() && GameHelper.GetCommonModel().Assitant == 1 && GameHelper.GetLevel() >= GameHelper.GetCommonModel().AssitantPreview)
{
ui.btn_chat.visible = true;
// ui.btn_chat.visible = true;
}
}
private void OnBackToHall(object obj = null)
Assets/Scripts/ModuleUI/UnlockTips/UnlockTipsUI.cs
+140 -140
View File
@@ -1,141 +1,141 @@
using FGUI.ZM_Common_01;
using UnityEngine;
using FairyGUI;
using SGModule.NetKit;
namespace RedHotRoast
{
public class UnlockTipsUI : BaseUI
{
private UnlockTipsUICtrl ctrl;
private UnlockTipsModel model;
private FGUI.ZM_Toast_23.com_unclok_tips ui;
public UnlockTipsUI(UnlockTipsUICtrl ctrl) : base(ctrl)
{
uiName = UIConst.UnlockTipsUI;
this.ctrl = ctrl;
}
protected override void SetUIInfo(UIInfo uiInfo)
{
uiInfo.packageName = "ZM_Toast_23";
uiInfo.assetName = "com_unclok_tips";
uiInfo.layerType = UILayerType.Popup;
uiInfo.isNeedOpenAnim = false;
uiInfo.isNeedCloseAnim = false;
uiInfo.isNeedUIMask = true;
}
#region 生命周期
protected override void OnInit()
{
//model = ModuleManager.Instance.GetModel(ModelConst.UnlockTipsModel) as UnlockTipsModel;
}
protected override void OnClose()
{
}
protected override void OnBind()
{
ui = baseUI as FGUI.ZM_Toast_23.com_unclok_tips;
}
private int _type = 0;
protected override void OnOpenBefore(object args)
{
if (args == null)
{
return;
}
_type = (int)args;
string key = null;
if (_type == 1) key = "unlocked_secret";
else if (_type == 2) key = "unlocked_live";
else if (_type == 3) key = "unlocked_assitant";
ui.text_tips.text = Language.GetContent(key);;
if (_type == 1)
{
if (DataMgr.IsUnlockSecret.Value == 0)
{
DataMgr.IsUnlockSecret.Value = 1;
}
}
else if (_type == 2)
{
if (DataMgr.IsUnlockLive.Value == 0)
{
DataMgr.IsUnlockLive.Value = 1;
}
}
else if (_type == 3)
{
if (DataMgr.IsUnlockChat.Value == 0)
{
DataMgr.IsUnlockChat.Value = 1;
}
}
string event_type = null;
if (_type == 1) event_type = ADEventTrack.Property.secret_albums_unclock;
else if (_type == 2) event_type = ADEventTrack.Property.live_unclock;
else if (_type == 3) event_type = ADEventTrack.Property.chat_unclock;
TrackKit.SendEvent(ADEventTrack.Special, event_type);
InitView();
}
protected override void OnOpen(object args)
{
}
protected override void OnHide()
{
}
protected override void OnDisplay(object args)
{
}
#endregion
#region 消息
protected override void AddListener()
{
}
protected override void RemoveListener()
{
}
#endregion
//初始化页面逻辑
private void InitView()
{
ui.btn_go.SetClick(OnClick);
ui.btn_close.SetClick(OnClick);
}
private void OnClick()
{
if (_type == 1)
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open);
}
else if (_type == 2)
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LiveUI_Open);
}
else if (_type == 3)
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ChatChooseUI_Open);
}
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.UnlockTipsUI_Close);
}
}
using FGUI.ZM_Common_01;
using UnityEngine;
using FairyGUI;
using SGModule.NetKit;
namespace RedHotRoast
{
public class UnlockTipsUI : BaseUI
{
private UnlockTipsUICtrl ctrl;
private UnlockTipsModel model;
private FGUI.ZM_Toast_23.com_unclok_tips ui;
public UnlockTipsUI(UnlockTipsUICtrl ctrl) : base(ctrl)
{
uiName = UIConst.UnlockTipsUI;
this.ctrl = ctrl;
}
protected override void SetUIInfo(UIInfo uiInfo)
{
uiInfo.packageName = "ZM_Toast_23";
uiInfo.assetName = "com_unclok_tips";
uiInfo.layerType = UILayerType.Popup;
uiInfo.isNeedOpenAnim = false;
uiInfo.isNeedCloseAnim = false;
uiInfo.isNeedUIMask = true;
}
#region 生命周期
protected override void OnInit()
{
//model = ModuleManager.Instance.GetModel(ModelConst.UnlockTipsModel) as UnlockTipsModel;
}
protected override void OnClose()
{
}
protected override void OnBind()
{
ui = baseUI as FGUI.ZM_Toast_23.com_unclok_tips;
}
private int _type = 0;
protected override void OnOpenBefore(object args)
{
if (args == null)
{
return;
}
_type = (int)args;
string key = null;
if (_type == 1) key = "unlocked_secret";
else if (_type == 2) key = "unlocked_live";
else if (_type == 3) key = "unlocked_assitant";
ui.text_tips.text = Language.GetContent(key);;
if (_type == 1)
{
if (DataMgr.IsUnlockSecret.Value == 0)
{
DataMgr.IsUnlockSecret.Value = 1;
}
}
else if (_type == 2)
{
if (DataMgr.IsUnlockLive.Value == 0)
{
DataMgr.IsUnlockLive.Value = 1;
}
}
else if (_type == 3)
{
if (DataMgr.IsUnlockChat.Value == 0)
{
DataMgr.IsUnlockChat.Value = 1;
}
}
string event_type = null;
if (_type == 1) event_type = ADEventTrack.Property.secret_albums_unclock;
else if (_type == 2) event_type = ADEventTrack.Property.live_unclock;
else if (_type == 3) event_type = ADEventTrack.Property.chat_unclock;
TrackKit.SendEvent(ADEventTrack.Special, event_type);
InitView();
}
protected override void OnOpen(object args)
{
}
protected override void OnHide()
{
}
protected override void OnDisplay(object args)
{
}
#endregion
#region 消息
protected override void AddListener()
{
}
protected override void RemoveListener()
{
}
#endregion
//初始化页面逻辑
private void InitView()
{
ui.btn_go.SetClick(OnClick);
ui.btn_close.SetClick(OnClick);
}
private void OnClick()
{
if (_type == 1)
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.SecretAlbumsUI_Open);
}
else if (_type == 2)
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.LiveUI_Open);
}
// else if (_type == 3)
// {
// UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.ChatChooseUI_Open);
// }
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.UnlockTipsUI_Close);
}
}
}