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

fix：1、UI更换（全部更换完）

Browse Source
This commit is contained in:
barry
2026-04-27 10:11:52 +08:00
parent 7c23d255e6
commit db90a6e485
141 changed files with 994 additions and 1344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/Define/Constant/AudioConst.cs
+1
View File
@@ -13,6 +13,7 @@ namespace LoveLegend
public const string MakeupDone = "makupdone";
public const string wheel_spin = "wheel_spin";
public const string game_open = "game_open";
public const string egg = "egg";
}
}
Assets/Scripts/ModuleManager/CtrlConst.cs
+1
View File
@@ -75,5 +75,6 @@ namespace LoveLegend
public const string ChatUnlockCtrl = "ChatUnlockCtrl";
public const string UnlockLevelNewCtrl = "UnlockLevelNewCtrl";
public const string BroadcastCtrl = "BroadcastCtrl";
public const string EggViewCtrl = "EggViewCtrl";
}
}
Assets/Scripts/ModuleManager/ModelConst.cs
+1
View File
@@ -73,5 +73,6 @@ namespace LoveLegend
public const string ChatUnlockModel = "ChatUnlockModel";
public const string UnlockLevelNewModel = "UnlockLevelNewModel";
public const string BroadcastModel = "BroadcastModel";
public const string EggViewModel = "EggViewModel";
}
}
Assets/Scripts/ModuleManager/ModuleManagerRegister.cs
+4
View File
@@ -66,6 +66,7 @@ namespace LoveLegend
moduleManager.AddModel(ModelConst.ChatUnlockModel, new ChatUnlockModel());
moduleManager.AddModel(ModelConst.UnlockLevelNewModel, new UnlockLevelNewModel());
moduleManager.AddModel(ModelConst.BroadcastModel, new BroadcastModel());
moduleManager.AddModel(ModelConst.EggViewModel, new EggViewModel());
}
public static void AutoRegisterUICtrl()
{
@@ -132,6 +133,7 @@ namespace LoveLegend
moduleManager.AddUICtrl(UICtrlConst.ChatUnlockUICtrl, new ChatUnlockUICtrl());
moduleManager.AddUICtrl(UICtrlConst.UnlockLevelNewUICtrl, new UnlockLevelNewUICtrl());
moduleManager.AddUICtrl(UICtrlConst.BroadcastUICtrl, new BroadcastUICtrl());
moduleManager.AddUICtrl(UICtrlConst.EggViewUICtrl, new EggViewUICtrl());
}
public static void AutoRegisterCtrl()
@@ -205,6 +207,7 @@ namespace LoveLegend
moduleManager.AddCtrl(CtrlConst.ChatUnlockCtrl, new ChatUnlockCtrl());
moduleManager.AddCtrl(CtrlConst.UnlockLevelNewCtrl, new UnlockLevelNewCtrl());
moduleManager.AddCtrl(CtrlConst.BroadcastCtrl, new BroadcastCtrl());
moduleManager.AddCtrl(CtrlConst.EggViewCtrl, new EggViewCtrl());
}
public static void AutoRegisterUIType()
@@ -275,6 +278,7 @@ namespace LoveLegend
moduleManager.AddUIType(UIConst.ChatUnlockUI, typeof(ChatUnlockUI));
moduleManager.AddUIType(UIConst.UnlockLevelNewUI, typeof(UnlockLevelNewUI));
moduleManager.AddUIType(UIConst.BroadcastUI, typeof(BroadcastUI));
moduleManager.AddUIType(UIConst.EggViewUI, typeof(EggViewUI));
}
}
}
Assets/Scripts/ModuleManager/UIConst.cs
+1
View File
@@ -72,5 +72,6 @@ namespace LoveLegend
public const string ChatUnlockUI = "ChatUnlockUI";
public const string UnlockLevelNewUI = "UnlockLevelNewUI";
public const string BroadcastUI = "BroadcastUI";
public const string EggViewUI = "EggViewUI";
}
}
Assets/Scripts/ModuleManager/UICtrlConst.cs
+1
View File
@@ -73,5 +73,6 @@ namespace LoveLegend
public const string ChatUnlockUICtrl = "ChatUnlockUICtrl";
public const string UnlockLevelNewUICtrl = "UnlockLevelNewUICtrl";
public const string BroadcastUICtrl = "BroadcastUICtrl";
public const string EggViewUICtrl = "EggViewUICtrl";
}
}
Assets/Scripts/ModuleUI/AddView/AddViewUI.cs
+6 -5
View File
@@ -129,9 +129,9 @@ namespace LoveLegend
{
var add = FXManager.Instance.SetFx<SkeletonAnimation>(ui.anim_bg, Fx_Type.fx_add_box, ref closeCallback);
add.state.SetAnimation(0, "animation", true);
// var add = FXManager.Instance.SetFx<SkeletonAnimation>(ui.anim_bg, Fx_Type.fx_add_box, ref closeCallback);
// add.state.SetAnimation(0, "animation", true);
//
ui.btn_close.SetClick(() =>
{
@@ -150,8 +150,9 @@ namespace LoveLegend
var need = AdExchangeManager.Instance.GetCeilingNeedAds(PurchasingManager.GetPaySku(PayType.buy_one));
var myAd = AdExchangeManager.Instance.GetLookRewardADNum();
ui.tips.SetVar("num", need.ToString()).FlushVars();
ui.ads.SetVar("num", myAd.ToString()).FlushVars();
ui.text_watch_ad.SetVar("needNum", need.ToString()).FlushVars();
ui.tips.SetVar("needAds", need.ToString()).FlushVars();
ui.tips.SetVar("myAds", myAd.ToString()).FlushVars();
}
}
}
Assets/Scripts/ModuleUI/EggView.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c23093e37adc66e49843e8f8461079c6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/ModuleUI/EggView/EggViewCtrl.cs
+41
View File
@@ -0,0 +1,41 @@
namespace LoveLegend
{
public class EggViewCtrl : BaseCtrl
{
public static EggViewCtrl Instance { get; private set; }
private EggViewModel model;
#region 生命周期
protected override void OnInit()
{
Instance = this;
}
protected override void OnDispose()
{
Instance = null;
}
#endregion
#region 消息
protected override void AddListener()
{
}
protected override void RemoveListener()
{
}
protected override void AddServerListener()
{
}
protected override void RemoveServerListener()
{
}
#endregion
}
}
Assets/Scripts/ModuleUI/EggView/EggViewCtrl.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: d3803112939619946876e619a76f3d54
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/ModuleUI/EggView/EggViewModel.cs
+26
View File
@@ -0,0 +1,26 @@
namespace LoveLegend
{
public class EggViewModel : BaseModel
{
#region 生命周期
protected override void OnInit()
{
}
protected override void OnDispose()
{
}
#endregion
#region 消息
protected override void AddListener()
{
}
protected override void RemoveListener()
{
}
#endregion
}
}
Assets/Scripts/ModuleUI/EggView/EggViewModel.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: fe27e3874dd51074dbc15d58f78c35c1
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/ModuleUI/EggView/EggViewUI.cs
+236
View File
@@ -0,0 +1,236 @@
using System;
using System.Collections.Generic;
using DG.Tweening;
using FairyGUI;
using FGUI.Egg_20;
using FGUI.ZM_Common_01;
using Spine.Unity;
using UnityEngine;
using Random = UnityEngine.Random;
namespace LoveLegend
{
public class EggViewUI : BaseUI
{
private EggViewUICtrl ctrl;
private FGUI.Egg_20.com_egg ui;
private Action closeCallback;
private bool isShowAnim = false;
public EggViewUI(EggViewUICtrl ctrl) : base(ctrl)
{
uiName = UIConst.EggViewUI;
this.ctrl = ctrl;
}
protected override void SetUIInfo(UIInfo uiInfo)
{
uiInfo.packageName = "Egg_20";
uiInfo.assetName = "com_egg";
uiInfo.layerType = UILayerType.Popup;
uiInfo.isNeedOpenAnim = false;
uiInfo.isNeedCloseAnim = false;
uiInfo.isNeedUIMask = true;
}
#region 生命周期
protected override void OnInit()
{
}
protected override void OnClose()
{
}
protected override void OnBind()
{
ui = baseUI as FGUI.Egg_20.com_egg;
}
private List<com_egg_item> eggList = new List<com_egg_item>();
protected override void OnOpenBefore(object args)
{
if (Screen.safeArea.y != 0)
{
ui.com_gold.y += Screen.safeArea.y;
}
eggList.Add(ui.egg_item0);
eggList.Add(ui.egg_item1);
eggList.Add(ui.egg_item2);
eggList.Add(ui.egg_item3);
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.com_gold.GetChild("text_gold").text = GameHelper.Get101Str(GameHelper.GetGoldNumber());
int start = GameHelper.GetCommonModel().eggReward[0];
int end = GameHelper.GetCommonModel().eggReward[1];
int randomNumber = Random.Range(start, end + 1);
setCliamStatus(false);
ui.btn_claim.visible = false;
ui.btn_close.SetClick(() =>
{
if (isShowAnim)
{
GetReward(randomNumber);
}
else
{
CtrlCloseUI();
}
});
ui.btn_claim.SetClick(() =>
{
if (isShowAnim)
{
DOVirtual.DelayedCall(2f, () => {
GameHelper.addInterAdnumber();
});
GetReward(randomNumber);
}
});
ui.btn_claim_mult.SetClick(() =>
{
if (isShowAnim)
{
GameHelper.ShowVideoAd("reward_lobby", isSuccess => {
if (isSuccess) {
ui.btn_claim.SetClick(() => { });
ui.btn_claim_mult.SetClick(() => { });
GetReward(randomNumber * 2);
GameDispatcher.Instance.Dispatch(GameMsg.RefreshMakeupData);
}
});
}
});
for (int i = 0; i < eggList.Count; i++)
{
int index = i;
eggList[index].egg_state.selectedIndex = 0;
eggList[index].SetClick(() =>
{
eggList[index].egg.visible = false;
setEggClickStatus(false);
if (AudioManager.Instance.IsOpenEffect)
{
AudioManager.Instance.PlayDynamicEffect(AudioConst.egg);
}
eggList[index].text_num.text = "x" + GameHelper.Get101Str(randomNumber);
var ani_node = eggList[index].GetChild("anim_bg") as GGraph;
var sk = FXManager.Instance.SetFx<SkeletonAnimation>(ani_node, Fx_Type.fx_egg_light, ref closeCallback);
sk.state.SetAnimation(0, "animation", false);
sk.state.Complete += (a) =>
{
isShowAnim = true;
var sk1 = FXManager.Instance.SetFx<SkeletonAnimation>(eggList[index].GetChild("anim_bg1") as GGraph, Fx_Type.fx_egg, ref closeCallback);
sk1.state.SetAnimation(0, "animation", true);
eggList[index].egg_state.selectedIndex = 1;
setCliamStatus(true);
};
});
}
}
void setCliamStatus(bool show)
{
ui.btn_claim_mult.visible = show;
DOVirtual.DelayedCall(1f, () =>
{
ui.btn_claim.visible = show;
});
}
void setEggClickStatus(bool isClick)
{
foreach (var item in eggList)
{
item.touchable = isClick;
}
}
private void GetReward(int awardNum)
{
isShowAnim = false;
var rewardData = new RewardData();
var start_pos = GameHelper.GetUICenterPosition(ui.btn_claim_mult);
var end = GameHelper.GetUICenterPosition(ui.com_gold);
var rewardSingleData = new RewardSingleData(101, awardNum, RewardOrigin.AdTask)
{
startPosition = start_pos,
endPosition = new Vector2(end.x, end.y)
};
rewardData.AddReward(rewardSingleData);
rewardData.displayType = RewardDisplayType.RewardFly | RewardDisplayType.ValueChange;
rewardData.AddCompleted(success =>
{
if (success)
{
var startNum = DataMgr.Coin.Value - awardNum;
DOVirtual.Float((float)startNum, (float)GameHelper.GetGoldNumber(), 1f,
value => { ui.com_gold.GetChild("text_gold").text = GameHelper.Get101Str((decimal)value); }).OnComplete(() => {
// 动画完成时确保最终值被正确设置
ui.com_gold.GetChild("text_gold").text = GameHelper.Get101Str((decimal)DataMgr.Coin.Value);
});
DOVirtual.DelayedCall(1.2f, () =>
{
CtrlCloseUI();
});
SaveData.GetSaveObject().crush_egg_time = (int)GameHelper.GetNowTime() + GameHelper.GetCommonModel().eggCD;
SaveData.SaveDataFunc();
}
});
GameDispatcher.Instance.Dispatch(GameMsg.GetReward, rewardData);
}
}
}
Assets/Scripts/ModuleUI/EggView/EggViewUI.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: f1b74d7e01fd3f241a8c8890ebbacd2b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/ModuleUI/EggView/EggViewUICtrl.cs
+90
View File
@@ -0,0 +1,90 @@
namespace LoveLegend
{
public class EggViewUICtrl : BaseUICtrl
{
private readonly uint closeUIMsg = UICtrlMsg.EggUI_Close;
private EggViewModel model;
private readonly uint openUIMsg = UICtrlMsg.EggUI_Open;
private EggViewUI ui;
private void OnSignInUI_Display(object obj)
{
if (obj != null)
{
var isShow = (bool)obj;
if (isShow)
ui?.Display();
else
ui?.Hide();
}
}
#region 生命周期
protected override void OnInit()
{
}
protected override void OnDispose()
{
}
public override void OpenUI(object args = null)
{
if (ui == null)
{
ui = new EggViewUI(this);
ui.Open(args);
}
}
public override void CloseUI(object args = null)
{
if (ui != null && !ui.isClose)
{
ui.Close();
}
ui = 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
}
}
Assets/Scripts/ModuleUI/EggView/EggViewUICtrl.cs.meta
+11
View File
@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 3554c7ca8ae3b1e4f8a1158028d732d3
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/ModuleUI/Hall/HallUI.cs
+22 -1
View File
@@ -422,6 +422,16 @@ namespace LoveLegend
}
}
int eggTime = SaveData.GetSaveObject().crush_egg_time;
if (eggTime > GameHelper.GetNowTime())
{
ui.btn_egg.GetChild("times").visible = true;
ui.btn_egg.GetChild("times").text = CommonHelper.TimeFormat(eggTime - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Minute);
}
else
{
ui.btn_egg.GetChild("times").visible = false;
}
}
@@ -475,6 +485,7 @@ namespace LoveLegend
// ui.btn_secret.SetClick(OnClickSecretAlbums);
ui.btn_vip.SetClick(onClickVip);
ui.btn_egg.SetClick(OnClickEgg);
btn_noads.SetClick(() =>
{
if (!SaveData.GetSaveObject().is_get_packreward && !SaveData.GetSaveObject().is_get_removead)
@@ -711,7 +722,7 @@ namespace LoveLegend
}
private void OnClickSetting()
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MenuUI_Open, 1);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MenuUI_Open, 0);
}
private void OnClickPass()
{
@@ -754,6 +765,16 @@ namespace LoveLegend
}
}
}
private void OnClickEgg()
{
if (ui.btn_egg.GetChild("times").visible)
{
GameHelper.ShowTips("Waiting_cd", true);
return;
}
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.EggUI_Open);
}
private void onClickVip()
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.VipClubViewUI_Open);
Assets/Scripts/ModuleUI/LuckyPack/LuckyPackUI.cs
+14 -11
View File
@@ -44,11 +44,11 @@ namespace LoveLegend
GameDispatcher.Instance.Dispatch(GameMsg.pack_close);
int three_gift_got_index = SaveData.GetSaveObject().three_gift_got_index;
if (GameHelper.isAutoPop && (three_gift_got_index <= (int)rewardState.day3))
{
uiCtrlDispatcher.Dispatch(UICtrlMsg.ThreeDaysGiftUI_Open);
GameHelper.isAutoPop = false;
}
// if (GameHelper.isAutoPop && (three_gift_got_index <= (int)rewardState.day3))
// {
// uiCtrlDispatcher.Dispatch(UICtrlMsg.ThreeDaysGiftUI_Open);
// GameHelper.isAutoPop = false;
// }
GameHelper.CallShowTurn();
}
@@ -96,12 +96,14 @@ namespace LoveLegend
//
// TextureHelper.SetImgLoader(ui.lucky_pic.picture, fileName1, null, "Background/");
var fileName = GameHelper.GetBackgroundName(1);
var task = new List<(GLoader loader, string fileName, Action<NTexture> callback, string folder, string localFolder)>();
task.Add((ui.lucky_pic.picture, fileName, null, "Background/", FolderNames.BackgroundName));
var fileName1 = GameHelper.GetBackgroundName(2);
task.Add((ui.no_ad_pic.picture, fileName1, null, "Background/", FolderNames.BackgroundName));
TextureHelper.SetImgLoaders(task);
// var fileName = GameHelper.GetBackgroundName(1);
// var task = new List<(GLoader loader, string fileName, Action<NTexture> callback, string folder, string localFolder)>();
// task.Add((ui.lucky_pic.picture, fileName, null, "Background/", FolderNames.BackgroundName));
// var fileName1 = GameHelper.GetBackgroundName(2);
// task.Add((ui.no_ad_pic.picture, fileName1, null, "Background/", FolderNames.BackgroundName));
// TextureHelper.SetImgLoaders(task);
}
protected override void OnOpen(object args)
@@ -215,6 +217,7 @@ namespace LoveLegend
ui.text_time.SetVar("time", ConfigSystem.GetCommonConf().RemoveADsPackDuration.ToString()).FlushVars();
ui.btn_close.SetClick(CtrlCloseUI);
ui.btn_luck_close.SetClick(CtrlCloseUI);
ui.text_goldnum.text = "x" + GameHelper.Get101Str(gold_num);
ui.text_backnum1.text = "x" + back_num;
ui.text_outnum.text = "x" + out_num;
Assets/Scripts/ModuleUI/Menu/MenuUI.cs
+59 -9
View File
@@ -1,12 +1,9 @@
using FGUI.ZM_Common_01;
using FGUI.ZM_Setting_07;
using SGModule.ApplePay;
using SGModule.Common.Extensions;
using SGModule.Net;
// using FGUI.G006_menu;
using UnityEngine;
namespace LoveLegend
@@ -61,7 +58,7 @@ namespace LoveLegend
if (args != null)
{
var type = (int)args;
ui.btn_back_home.visible = type == 2; //type： 1是大厅 2是游戏
ui.isHall.selectedIndex = type; //type： 0是大厅 1是游戏
}
if (Screen.safeArea.y != 0)
{
@@ -103,11 +100,15 @@ namespace LoveLegend
protected override void AddListener()
{
HallManager.Instance.AddChangeGiftSwitch(InitView);
PreferencesDispatcher<int>.Instance.AddListener(DataMsg.playerAvatarId, UpdataAvatar);
}
protected override void RemoveListener()
{
HallManager.Instance.RemoveChangeGiftSwitch(InitView);
PreferencesDispatcher<int>.Instance.RemoveListener(DataMsg.playerAvatarId, UpdataAvatar);
}
#endregion
@@ -116,12 +117,17 @@ namespace LoveLegend
{
ui.com_gold.GetChild("text_gold").text = $"{DataMgr.Coin.Value:N0}";
var namStr = GameHelper.GetUserName();
ui.edit_name.input.text = namStr;
ui.edit_name.btn_amend.SetClick(SaveName);
var headId = DataMgr.PlayerAvatarId.Value;
GameHelper.SetSelfAvatar((ui.btn_head.head as head)?.load_avatar, headId);
ui.btn_head.SetClick(() =>
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PersonViewUI_Open);
});
ui.btn_back.SetClick(OnCloseView);
ui.btn_music.SetClick(OnClickSetMusic);
ui.btn_sound.SetClick(OnClickSoundBtn);
@@ -179,7 +185,51 @@ namespace LoveLegend
});
}
private void UpdataAvatar(object obj = null)
{
var headId = DataMgr.PlayerAvatarId.Value;
if (obj != null)
{
headId = obj.As<ChangeValue<int>>().newValue;
}
var head = ui.btn_head.head as head;
if (head != null)
{
// var vipLevel = GameHelper.GetVipLevel();
// if (vipLevel > 0)
// {
// head.head.vip_loader.visible = true;
// head.vip_loader.url = $"ui://LG_Common/vip_{vipLevel}";
// }
// else
// {
// head.vip_loader.visible = false;
// }
GameHelper.SetSelfAvatar(head.load_avatar, headId);
}
}
private void SaveName()
{
var name = ui.edit_name.input.text;
if (string.IsNullOrEmpty(name) || name.IsNullOrWhiteSpace())
{
GameHelper.ShowTips("empty_input", true);
return;
}
// if (name.Equals(GameHelper.GetPlayerInviteCode()))
// {
// return;
// }
if (name.Equals(DataMgr.PlayerName.Value)) return;
GameHelper.ShowTips($"save_name",true);
DataMgr.PlayerName.Value = name;
}
private void SetVersion()
{
Assets/Scripts/ModuleUI/NewEnd/NewEndUI.cs
+17 -17
View File
@@ -163,23 +163,23 @@ namespace LoveLegend
Debug.Log(delayTime);
Debug.Log("/////////////////6");
ui.step.selectedIndex = 1;
var anim_bg = FXManager.Instance.SetFx<SkeletonAnimation>(ui.GetChild("bg_parent") as GGraph, Fx_Type.fx_end_bg, ref closeCallback);
// var anim_bg = FXManager.Instance.SetFx<SkeletonAnimation>(ui.GetChild("bg_parent") as GGraph, Fx_Type.fx_end_bg, ref closeCallback);
if (successData_.IsWin)
{
anim_bg.state.SetAnimation(0, "win", false);
anim_bg.state.Complete += (trackEntry) =>
{
anim_bg.state.SetAnimation(0, "win_stop", true);
};
// anim_bg.state.SetAnimation(0, "win", false);
// anim_bg.state.Complete += (trackEntry) =>
// {
// anim_bg.state.SetAnimation(0, "win_stop", true);
// };
var fireworks = FXManager.Instance.SetFx<SkeletonAnimation>(ui.GetChild("congra_parent") as GGraph, Fx_Type.fx_win, ref closeCallback);
fireworks.state.SetAnimation(0, "out", true);
var coin = FXManager.Instance.SetFx<SkeletonAnimation>(ui.GetChild("coin_parent") as GGraph, Fx_Type.fx_wins, ref closeCallback);
coin.state.SetAnimation(0, "animation", true);
coin.state.Complete += (trackEntry) =>
{
coin.state.SetAnimation(0, "animation2", true);
};
// var coin = FXManager.Instance.SetFx<SkeletonAnimation>(ui.GetChild("coin_parent") as GGraph, Fx_Type.fx_wins, ref closeCallback);
// coin.state.SetAnimation(0, "animation", true);
// coin.state.Complete += (trackEntry) =>
// {
// coin.state.SetAnimation(0, "animation2", true);
// };
if (SaveData.GetSaveObject().LargeRewardNum < ConfigSystem.GetCommonConf().FreeClaims)
((btn_claim3)ui.btn_mult).state.selectedIndex = 1;
@@ -217,11 +217,11 @@ namespace LoveLegend
}
else
{
anim_bg.state.SetAnimation(0, "lose", false);
anim_bg.state.Complete += (trackEntry) =>
{
anim_bg.state.SetAnimation(0, "lose_stop", true);
};
// anim_bg.state.SetAnimation(0, "lose", false);
// anim_bg.state.Complete += (trackEntry) =>
// {
// anim_bg.state.SetAnimation(0, "lose_stop", true);
// };
ui.btn_restart.SetClick(() =>
{
Assets/Scripts/ModuleUI/OpenGame/OpenGameUI.cs
+28 -28
View File
@@ -49,20 +49,20 @@ namespace LoveLegend
{
DOVirtual.DelayedCall(0.7f, () => { GameDispatcher.Instance.Dispatch(GameMsg.reset_game, args); });
InitView();
DOVirtual.DelayedCall(0.2f, () =>
{
if (GameHelper.GetLevel() - 1 < ConfigSystem.GetConfig<LevelUnlock>().Count&&GameHelper.IsGiftSwitch())
{
LevelUnlock levelUnlock_ = ConfigSystem.GetConfig<LevelUnlock>()[GameHelper.GetLevel() - 1];
if (levelUnlock_.LeveType != 0)
{
if (!DataMgr.LevelUnlockList.Value.Contains(GameHelper.GetLevel() - 1))
{
uiCtrlDispatcher.Dispatch(UICtrlMsg.UnlockLevelUI_Open, GameHelper.GetLevel() - 1);
}
}
}
});
// DOVirtual.DelayedCall(0.2f, () =>
// {
// if (GameHelper.GetLevel() - 1 < ConfigSystem.GetConfig<LevelUnlock>().Count&&GameHelper.IsGiftSwitch())
// {
// LevelUnlock levelUnlock_ = ConfigSystem.GetConfig<LevelUnlock>()[GameHelper.GetLevel() - 1];
// if (levelUnlock_.LeveType != 0)
// {
// if (!DataMgr.LevelUnlockList.Value.Contains(GameHelper.GetLevel() - 1))
// {
// uiCtrlDispatcher.Dispatch(UICtrlMsg.UnlockLevelUI_Open, GameHelper.GetLevel() - 1);
// }
// }
// }
// });
@@ -105,21 +105,21 @@ namespace LoveLegend
ui.text_level.text = stage;
DOVirtual.DelayedCall(0.2f, () =>
DOVirtual.DelayedCall(0.7f, () =>
{
ui.tips_node1.visible = true;
var open_bg = FXManager.Instance.SetFx<SkeletonAnimation>(ui.tips_node1, Fx_Type.fx_open_bg, ref closeCallback);
open_bg.state.SetAnimation(0, "animation", true);
ui.tips_node1.SetScale(1.25f, 1.25f);
ui.tips_node.visible = true;
var open_game = FXManager.Instance.SetFx<SkeletonAnimation>(ui.tips_node, Fx_Type.fx_open, ref closeCallback);
open_game.state.SetAnimation(0, "animation", false);
open_game.state.Complete += (a) =>
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.OpenGameUI_Close);
};
// ui.tips_node1.visible = true;
// var open_bg = FXManager.Instance.SetFx<SkeletonAnimation>(ui.tips_node1, Fx_Type.fx_open_bg, ref closeCallback);
// open_bg.state.SetAnimation(0, "animation", true);
// ui.tips_node1.SetScale(1.25f, 1.25f);
//
// ui.tips_node.visible = true;
// var open_game = FXManager.Instance.SetFx<SkeletonAnimation>(ui.tips_node, Fx_Type.fx_open, ref closeCallback);
// open_game.state.SetAnimation(0, "animation", false);
// open_game.state.Complete += (a) =>
// {
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.OpenGameUI_Close);
// };
});
}
}
Assets/Scripts/ModuleUI/PassView/PassViewUI.cs
+29 -36
View File
@@ -67,10 +67,7 @@ namespace LoveLegend {
HallManager.Instance.UpdateSecondEvent += upData;
InitView();
var head = ui.head as btn_head;
var headId = DataMgr.PlayerAvatarId.Value;
GameHelper.SetSelfAvatar(head.head.load_avatar, headId);
}
protected override void OnOpen(object args) {
@@ -152,7 +149,6 @@ namespace LoveLegend {
ui.close.SetClick(() => { UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.PassViewUI_Close); });
ui.btn_recive.ad_icon.visible = false;
ui.gold.GetChild("text_gold").text = $"{DataMgr.Coin.Value:N0}";
passing_list = ConfigSystem.GetConfig<PassingTask>();
@@ -232,9 +228,9 @@ namespace LoveLegend {
}
void setItemUrl(GLoader loader, int urltype) {
if (urltype == 0)
loader.url = "ui://ZM_Pass_14/mp_reward_premium";
loader.url = "ui://ZM_Pass_14/bbq_gold02";
else if (urltype == 4)
loader.url = "ui://ZM_Pass_14/mp_reward_premium";
loader.url = "ui://ZM_Pass_14/bbq_gold02";
else if (urltype == 1)
loader.url = "ui://ZM_Common_01/triple_game_dj_001";
else if (urltype == 2)
@@ -379,8 +375,8 @@ namespace LoveLegend {
item.free_item.type.selectedIndex = 0;
item.pay_item.type.selectedIndex = 1;
EnsureListHasAnimation(free_anims, index, item.free_item.anim_parent, Fx_Type.fx_pass_free);
EnsureListHasAnimation(pay_anims, index, item.pay_item.anim_parent, Fx_Type.fx_pass_premium);
// EnsureListHasAnimation(free_anims, index, item.free_item.anim_parent, Fx_Type.fx_pass_free);
// EnsureListHasAnimation(pay_anims, index, item.pay_item.anim_parent, Fx_Type.fx_pass_premium);
List<int> freelist = SaveData.GetSaveObject().battle_pass_freelist;
List<int> paylist = SaveData.GetSaveObject().battle_pass_paylist;
@@ -411,25 +407,24 @@ namespace LoveLegend {
item.free_item.state.selectedIndex = 2;
item.free_item.SetClick(() => { });
item.free_item.btn_claim.SetClick(() => { });
free_anims[index - 1].state.SetAnimation(0, "get2", true);
// free_anims[index - 1].state.SetAnimation(0, "get2", true);
}
else {
if (getRewardIndex < 0)
getRewardIndex = index;
free_anims[index - 1].state.SetAnimation(0, "appear", true);
// free_anims[index - 1].state.SetAnimation(0, "appear", true);
item.free_item.state.selectedIndex = 1;
item.free_item.btn_claim.SetClick(() => {
free_anims[index - 1].state.SetAnimation(0, "get", false);
free_anims[index - 1].state.Complete += (trackEntry) => {
free_anims[index - 1].state.SetAnimation(0, "get2", true);
};
DOVirtual.DelayedCall(0.9f, () => {
freelist.Add(index);
SaveData.SaveDataFunc();
// GameHelper.ShowTips("claim_succ", true);
seItemClick(item.free_item, Passportrewards_list[index - 1].Free_rewards_num, Passportrewards_list[index - 1].Free_rewards_type, index - 1);
});
// free_anims[index - 1].state.SetAnimation(0, "get", false);
// free_anims[index - 1].state.Complete += (trackEntry) => {
// free_anims[index - 1].state.SetAnimation(0, "get2", true);
// };
freelist.Add(index);
SaveData.SaveDataFunc();
// GameHelper.ShowTips("claim_succ", true);
seItemClick(item.free_item, Passportrewards_list[index - 1].Free_rewards_num, Passportrewards_list[index - 1].Free_rewards_type, index - 1);
});
}
@@ -438,30 +433,28 @@ namespace LoveLegend {
item.pay_item.state.selectedIndex = 2;
item.pay_item.SetClick(() => { });
item.pay_item.btn_claim.SetClick(() => { });
pay_anims[index - 1].state.SetAnimation(0, "get2", true);
// pay_anims[index - 1].state.SetAnimation(0, "get2", true);
}
else {
if (SaveData.GetSaveObject().is_get_battlepass) {
if (getRewardIndex < 0)
getRewardIndex = index;
pay_anims[index - 1].state.SetAnimation(0, "appear", true);
// pay_anims[index - 1].state.SetAnimation(0, "appear", true);
item.pay_item.state.selectedIndex = 1;
item.pay_item.btn_claim.SetClick(() => {
pay_anims[index - 1].state.SetAnimation(0, "get", false);
pay_anims[index - 1].state.Complete += (trackEntry) => {
// pay_anims[index - 1].state.SetAnimation(0, "get", false);
// pay_anims[index - 1].state.Complete += (trackEntry) => {
//
// pay_anims[index - 1].state.SetAnimation(0, "get2", true);
//
// };
pay_anims[index - 1].state.SetAnimation(0, "get2", true);
paylist.Add(index);
SaveData.SaveDataFunc();
seItemClick(item.pay_item, Passportrewards_list[index - 1].Paid_rewards_num, Passportrewards_list[index - 1].Paid_rewards_type, -1);
};
DOVirtual.DelayedCall(0.9f, () => {
paylist.Add(index);
SaveData.SaveDataFunc();
seItemClick(item.pay_item, Passportrewards_list[index - 1].Paid_rewards_num, Passportrewards_list[index - 1].Paid_rewards_type, -1);
GameHelper.ShowTips("claim_succ", true);
});
GameHelper.ShowTips("claim_succ", true);
});
}
Assets/Scripts/ModuleUI/PersonView/PersonViewUI.cs
+5 -6
View File
@@ -13,7 +13,7 @@ namespace LoveLegend
private PersonViewModel model;
private int selectIndex = -1;
private int total_item;
private int total_item = 12;
private FGUI.ZM_Setting_07.com_person ui;
public PersonViewUI(PersonViewUICtrl ctrl) : base(ctrl)
@@ -57,7 +57,6 @@ namespace LoveLegend
// {
// ui.title.y += Screen.safeArea.y;
// }
total_item = 8;
selectIndex = DataMgr.PlayerAvatarId.Value;
UnityManager.ShezhiACT(false);
InitView();
@@ -100,10 +99,10 @@ namespace LoveLegend
{
var namStr = GameHelper.GetUserName();
ui.edit_name.input.text = namStr;
// var namStr = GameHelper.GetUserName();
// ui.edit_name.input.text = namStr;
ui.btn_update.SetClick(UpdateUserInfo);
ui.edit_name.btn_amend.SetClick(SaveName);
// ui.edit_name.btn_amend.SetClick(SaveName);
ui.btn_close.SetClick(CtrlCloseUI);
ui.list.itemRenderer = UpdateItem;
@@ -139,7 +138,7 @@ namespace LoveLegend
DataMgr.PlayerAvatarId.Value = selectIndex;
}
SaveName();
// SaveName();
CtrlCloseUI();
}
Assets/Scripts/ModuleUI/Play/RainPlayUI.cs
+3 -3
View File
@@ -150,7 +150,7 @@ namespace LoveLegend
// ui.btn_game_menu.SetClickDownEffect(1.0f);
ui.btn_game_menu.SetClick(() =>
{
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MenuUI_Open, 2);
UICtrlDispatcher.Instance.Dispatch(UICtrlMsg.MenuUI_Open, 1);
// OnBackToHall();
});
upData();
@@ -422,7 +422,7 @@ namespace LoveLegend
ui.fairyBatching = true;
int level = GameHelper.GetLevel();
ui.com_stage.text_level.SetVar("lv", level.ToString()).FlushVars();
ui.com_stage.text_level.text = level.ToString();
Debug.Log(jsonstr);
if (jsonstr == null)
{
@@ -993,7 +993,7 @@ namespace LoveLegend
void SetLeveldiff()
{
int level = GameHelper.GetLevel();
ui.com_stage.text_level.SetVar("lv", level + "").FlushVars();
ui.com_stage.text_level.text = level.ToString();
// if (level > type_array.Length) level = type_array.Length;
Assets/Scripts/ModuleUI/Privacy/PrivacyUI.cs
+1 -1
View File
@@ -76,7 +76,7 @@ namespace LoveLegend
string title = BisTerm ? Language.GetContent("terms_service") : Language.GetContent("privacy");
ui.title.text = isTerm == 2 ? "View Credits" : title;
var color = new Color(255 / 255f, 232 / 255f, 217 / 255f, 1f);
var color = new Color(172 / 255f, 131 / 255f, 113 / 255f, 1f);
MarkdownKit.Instance.ShowAsRichText(ui.text_list, BisTerm ? "user" : "privacy", color, (success, state) => {
if (success) {
Debug.Log("内容加载成功！当前状态：" + state);
Assets/Scripts/ModuleUI/ShopView/BuygoldUI.cs
+46 -61
View File
@@ -47,16 +47,15 @@ namespace LoveLegend
GameHelper.showGameUI = true;
HallManager.Instance.UpdateSecondEvent -= initList;
HallManager.Instance.UpdateSecondEvent -= upWatchAdsBtn;
HallManager.Instance.UpdateSecondEvent -= RemoveAdCountDown;
GameDispatcher.Instance.Dispatch(GameMsg.pack_close);
if (Isbuysuccess)
{
GameHelper.ShowTurnOffReward();
}
else
{
GameHelper.ShowPaidPack();
}
// if (Isbuysuccess)
// {
// GameHelper.ShowTurnOffReward();
// }
// else
// {
// GameHelper.ShowPaidPack();
// }
}
private bool Isbuysuccess = false;
protected override void OnBind()
@@ -289,7 +288,6 @@ namespace LoveLegend
private SkeletonAnimation no_ad_anims = null;
private Action closeCallback = null;
private btn_get btn_remove_get = null;
// private void UpdatePack(int index, GObject obj)
// {
@@ -476,29 +474,6 @@ namespace LoveLegend
// }
// }
private void RemoveAdCountDown()
{
int cd = SaveData.GetSaveObject().remove_ad_time - Convert.ToInt32(GameHelper.GetNowTime());
if (cd > 0)
{
if (cd > 24 * 3600)
{
btn_remove_get.title = CommonHelper.TimeFormat(cd, CountDownType.Day, "D");
}
else
{
btn_remove_get.title = CommonHelper.TimeFormat(cd, CountDownType.Hour);
}
}
else
{
SaveData.GetSaveObject().is_get_removead = false;
SaveData.GetSaveObject().remove_ad_time = 0;
}
}
void setRemaintime(int index, GObject obj)
{
buygold_item item = (buygold_item)obj;
@@ -507,38 +482,35 @@ namespace LoveLegend
time = SaveData.GetSaveObject()._goldtime[index];
item.coin_text.text = GameHelper.Get101Str(list[index].Actual_coins);
item.index.selectedIndex = index > 4 ? 4 : index;
item.index.selectedIndex = index > 6 ? 6 : index;
bool is_paid = list[index].is_paid;
item.btn_buy.index.selectedIndex = 0;
item.off_text.text = list[index].Discount_rate + "%";
item.discount.visible = !GameHelper.IsAdModelOfPay() && list[index].Discount_rate > 0;
if (list[index].Discount_rate != 0) item.off_text.text = list[index].Discount_rate + "%";
if (time + list[index].receive_CD < GameHelper.GetNowTime())
// item.off_text.text = list[index].Discount_rate + "%";
// item.discount.visible = !GameHelper.IsAdModelOfPay() && list[index].Discount_rate > 0;
//
// if (list[index].Discount_rate != 0) item.off_text.text = list[index].Discount_rate + "%";
if (AdExchangeManager.Instance.GetLookRewardADNum() >= list[index].Payment_amount)
{
if (!is_paid)
if (!GameHelper.IsAdModelOfPay())
{
item.btn_buy.btn_text.text = Language.GetContent("free");
item.discount.visible = false;
//支付
decimal price = (decimal)list[index].Payment_amount2;
item.btn_buy.btn_text.text = GameHelper.getPrice(price);
item.text_ads.visible = false;
}
else
{
if (!GameHelper.IsAdModelOfPay())
{
decimal price = (decimal)list[index].Payment_amount2;
item.btn_buy.btn_text.text = GameHelper.getPrice(price);
item.text_ads.visible = false;
}
else
{
double gold_price1 = list[index].Payment_amount;
int needAds = (int)Math.Ceiling(gold_price1);
item.text_ads.SetVar("num", needAds.ToString()).FlushVars();
item.btn_buy.btn_text.text = needAds + " ADs";
}
//广告
double gold_price1 = list[index].Payment_amount;
int needAds = (int)Math.Ceiling(gold_price1);
// item.text_ads.SetVar("num", needAds.ToString()).FlushVars();
item.btn_buy.btn_text.text = needAds + " AD";
}
item.btn_buy.index.selectedIndex = 1;
item.btn_buy.can_buy.selectedIndex = 0;
item.btn_buy.SetClick(() =>
{
@@ -566,13 +538,26 @@ namespace LoveLegend
{
double gold_price1 = list[index].Payment_amount;
int needAds = (int)Math.Ceiling(gold_price1);
item.btn_buy.btn_text.text = needAds + " ADs";
item.btn_buy.btn_text.text = needAds + " AD";
}
item.btn_buy.btn_text.text = CommonHelper.TimeFormat(
time + list[index].receive_CD - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour);
item.btn_buy.SetClick(() => { });
}
if (!is_paid)
{
if(time + list[index].receive_CD < GameHelper.GetNowTime())
{
item.btn_buy.btn_text.text = Language.GetContent("free");
}
else
{
item.btn_buy.can_buy.selectedIndex = 1;
item.btn_buy.btn_text.text = CommonHelper.TimeFormat(
time + list[index].receive_CD - Convert.ToInt32(GameHelper.GetNowTime()), CountDownType.Hour);
}
}
}
private void rm_Gold(int index)
Assets/Scripts/ModuleUI/SignInView/SignInViewUI.cs
+4 -2
View File
@@ -135,7 +135,7 @@ namespace LoveLegend
btn_sign btnSign = btnSignList[index];;
btnSign.state.selectedIndex = 0;
btnSign.title = signList[index].id + "";
ui.btn_collect.state.selectedIndex = 1;
btnSign.touchable = false;
btnSign.reward_num.text = GameHelper.Get101Str(signList[index].quantity[0]);
@@ -149,6 +149,9 @@ namespace LoveLegend
var isToday = true;
if (signDays > 0)
isToday = GameHelper.InToday(DataMgr.SignState.Value[signDays - 1], 0, true);
ui.btn_collect.state.selectedIndex = index == signDays && !(signDays > 0 && isToday)? 0 : 1;
if (index < signDays)
{
btnSign.state.selectedIndex = 3;
@@ -167,7 +170,6 @@ namespace LoveLegend
btnSign.isCloseClickAnim = true;
// btnSign.status.selectedIndex = btn_sign.State_today;
ui.btn_collect.state.selectedIndex = 0;
ui.btn_collect.SetClick(() =>
{
SetBtnClick(index);
Assets/Scripts/Register/UIManagerRegister.cs
+1
View File
@@ -46,6 +46,7 @@ namespace LoveLegend
FGUI.LG_live.LG_liveBinder.BindAll();
FGUI.LG_secretAlbums.LG_secretAlbumsBinder.BindAll();
FGUI.LG_Unlock.LG_UnlockBinder.BindAll();
FGUI.Egg_20.Egg_20Binder.BindAll();
}
public static void AutoRegisterCommonPackages()
Assets/Scripts/SavaData/SaveData.cs
+2
View File
@@ -196,5 +196,7 @@ namespace LoveLegend
public int TurnOffNumbers;
public int TurnOffDay;
public long TurnOffTime;
public int crush_egg_time;
}
}