|
@@ -43,6 +43,9 @@ namespace GFGGame
|
|
private EffectUI _effectUI1;
|
|
private EffectUI _effectUI1;
|
|
private EffectUI _effectUI2;
|
|
private EffectUI _effectUI2;
|
|
private EffectUI _effectUI3;
|
|
private EffectUI _effectUI3;
|
|
|
|
+ private EffectUI _effectUI4;
|
|
|
|
+ private EffectUI _effectUI5;
|
|
|
|
+
|
|
|
|
|
|
private UI_ButtonModle1[] _btns;
|
|
private UI_ButtonModle1[] _btns;
|
|
|
|
|
|
@@ -60,6 +63,11 @@ namespace GFGGame
|
|
_effectUI2 = null;
|
|
_effectUI2 = null;
|
|
EffectUIPool.Recycle(_effectUI3);
|
|
EffectUIPool.Recycle(_effectUI3);
|
|
_effectUI3 = null;
|
|
_effectUI3 = null;
|
|
|
|
+ EffectUIPool.Recycle(_effectUI4);
|
|
|
|
+ _effectUI4 = null;
|
|
|
|
+ EffectUIPool.Recycle(_effectUI5);
|
|
|
|
+ _effectUI5 = null;
|
|
|
|
+
|
|
|
|
|
|
if (_sceneObject != null)
|
|
if (_sceneObject != null)
|
|
{
|
|
{
|
|
@@ -91,9 +99,9 @@ namespace GFGGame
|
|
|
|
|
|
_valueBarController = new ValueBarController(_ui.m_valueBar);
|
|
_valueBarController = new ValueBarController(_ui.m_valueBar);
|
|
|
|
|
|
- _btnGongGao = _ui.m_list.GetChild("btnGongGao").asButton;
|
|
|
|
|
|
+ _btnYouJian = _ui.m_btnYouJian;
|
|
|
|
+ _btnGongGao = _ui.m_btnGongGao;
|
|
_btnHaoYou = _ui.m_list.GetChild("btnHaoYou").asButton;
|
|
_btnHaoYou = _ui.m_list.GetChild("btnHaoYou").asButton;
|
|
- _btnYouJian = _ui.m_list.GetChild("btnYouJian").asButton;
|
|
|
|
_btnRenWu = _ui.m_list.GetChild("btnRenWu").asButton;
|
|
_btnRenWu = _ui.m_list.GetChild("btnRenWu").asButton;
|
|
_btnPengYouQuan = _ui.m_list.GetChild("btnPengYouQuan").asButton;
|
|
_btnPengYouQuan = _ui.m_list.GetChild("btnPengYouQuan").asButton;
|
|
_btnLeague = _ui.m_list.GetChild("btnLeague").asButton;
|
|
_btnLeague = _ui.m_list.GetChild("btnLeague").asButton;
|
|
@@ -144,7 +152,7 @@ namespace GFGGame
|
|
_ui.m_btnGiftBag1.target.onClick.Add(OnClickBtnGiftBag2);
|
|
_ui.m_btnGiftBag1.target.onClick.Add(OnClickBtnGiftBag2);
|
|
_ui.m_btnGiftBag2.target.onClick.Add(OnClickBtnGiftBag1);
|
|
_ui.m_btnGiftBag2.target.onClick.Add(OnClickBtnGiftBag1);
|
|
|
|
|
|
- _ui.m_loaRight.target.onClick.Add(MoveLeft);
|
|
|
|
|
|
+ _ui.m_btnHaiZhiShi.target.onClick.Add(MoveLeft);
|
|
_ui.m_loaLeft.onClick.Add(MoveRight);
|
|
_ui.m_loaLeft.onClick.Add(MoveRight);
|
|
|
|
|
|
_ui.m_comListAd.m_listAd.itemRenderer = RenderListAdItem;
|
|
_ui.m_comListAd.m_listAd.itemRenderer = RenderListAdItem;
|
|
@@ -260,9 +268,11 @@ namespace GFGGame
|
|
|
|
|
|
private void AddEffect()
|
|
private void AddEffect()
|
|
{
|
|
{
|
|
- _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_btnMain.m_holder, "ui_zjm", "ui_zjm_zzl_d");
|
|
|
|
- _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_btnMain.m_holder1, "ui_zjm", "ui_zjm_zzl");
|
|
|
|
- _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_loaRight.m_holder, "ui_zjm", "ui_zjm_jt");
|
|
|
|
|
|
+ _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_btnMain.m_holder, "ui_zjm", "ZJM_szl_down_3");
|
|
|
|
+ _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_btnMain.m_holder1, "ui_zjm", "ZJM_szl_top_1");
|
|
|
|
+ _effectUI3 = EffectUIPool.CreateEffectUI(_ui.m_btnHaiZhiShi.m_holder, "ui_zjm", "ZJM_hzs_down_3");
|
|
|
|
+ _effectUI4 = EffectUIPool.CreateEffectUI(_ui.m_btnHaiZhiShi.m_holder1, "ui_zjm", "ZJM_hzs_top_1");
|
|
|
|
+ _effectUI5 = EffectUIPool.CreateEffectUI(_ui.m_BottomEffectHolder, "ui_zjm", "ZJM_DiBan");
|
|
}
|
|
}
|
|
|
|
|
|
private void SetPos()
|
|
private void SetPos()
|
|
@@ -931,11 +941,11 @@ namespace GFGGame
|
|
}
|
|
}
|
|
private void CheckFunOpen()
|
|
private void CheckFunOpen()
|
|
{
|
|
{
|
|
- _ui.m_btnXiuFang.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(XiuFangView).Name, false);
|
|
|
|
- _ui.m_btnHuanZhuang.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DressUpView).Name, false);
|
|
|
|
- _ui.m_btnCiPai.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
|
|
|
|
- _ui.m_btnZhaiXing.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LuckyBoxView).Name, false);
|
|
|
|
- _ui.m_btnMain.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoryChapterListView).Name, false);
|
|
|
|
|
|
+ _ui.m_btnXiuFang.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(XiuFangView).Name, false);
|
|
|
|
+ _ui.m_btnHuanZhuang.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DressUpView).Name, false);
|
|
|
|
+ _ui.m_btnCiPai.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(CardDetailView).Name, false);
|
|
|
|
+ _ui.m_btnZhaiXing.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(LuckyBoxView).Name, false);
|
|
|
|
+ _ui.m_btnMain.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StoryChapterListView).Name, false);
|
|
_ui.m_btnStudio.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioView).Name, false);
|
|
_ui.m_btnStudio.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioView).Name, false);
|
|
_ui.m_btnField.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldView).Name, false);
|
|
_ui.m_btnField.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(FieldView).Name, false);
|
|
_ui.m_btnPoem.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemView).Name, false);
|
|
_ui.m_btnPoem.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(PoemView).Name, false);
|
|
@@ -976,22 +986,24 @@ namespace GFGGame
|
|
private void UpdateRedDot()
|
|
private void UpdateRedDot()
|
|
{
|
|
{
|
|
_valueBarController.UpRead();
|
|
_valueBarController.UpRead();
|
|
- RedDotController.Instance.SetComRedDot(_btnGongGao, RedDotDataManager.Instance.GetNoticeRed());
|
|
|
|
- RedDotController.Instance.SetComRedDot(_btnRenWu, RedDotDataManager.Instance.GetTaskRed());
|
|
|
|
|
|
+ RedDotController.Instance.SetComRedDot(_btnGongGao, RedDotDataManager.Instance.GetNoticeRed(), "", -9, 12);
|
|
|
|
+
|
|
|
|
+ RedDotController.Instance.SetComRedDot(_btnRenWu, RedDotDataManager.Instance.GetTaskRed(), "", -8);
|
|
// RedDotController.Instance.SetComRedDot(_ui.m_btnDailyLogin.target,
|
|
// RedDotController.Instance.SetComRedDot(_ui.m_btnDailyLogin.target,
|
|
// RedDotDataManager.Instance.GetDailyLoginRed());
|
|
// RedDotDataManager.Instance.GetDailyLoginRed());
|
|
- RedDotController.Instance.SetComRedDot(_btnYouJian, RedDotDataManager.Instance.GetMailRed());
|
|
|
|
- RedDotController.Instance.SetComRedDot(_btnTuJian, RedDotDataManager.Instance.GetFieldGuideRed() || RedDotDataManager.Instance.GetTravelGuideRed());
|
|
|
|
- RedDotController.Instance.SetComRedDot(_btnHaoYou, RedDotDataManager.Instance.GetFriendRed());
|
|
|
|
- RedDotController.Instance.SetComRedDot(_btnStore, RedDotDataManager.Instance.GetShopRed());
|
|
|
|
|
|
+ RedDotController.Instance.SetComRedDot(_btnYouJian, RedDotDataManager.Instance.GetMailRed(), "", -9, 12);
|
|
|
|
+ RedDotController.Instance.SetComRedDot(_btnTuJian, RedDotDataManager.Instance.GetFieldGuideRed() || RedDotDataManager.Instance.GetTravelGuideRed(), "", -8);
|
|
|
|
+ RedDotController.Instance.SetComRedDot(_btnHaoYou, RedDotDataManager.Instance.GetFriendRed(), "", -8);
|
|
|
|
+ RedDotController.Instance.SetComRedDot(_btnStore, RedDotDataManager.Instance.GetShopRed(), "", -8);
|
|
RedDotController.Instance.SetComRedDot(_ui.m_btnField.target, RedDotDataManager.Instance.GetFieldRed(), "", -36, 32);
|
|
RedDotController.Instance.SetComRedDot(_ui.m_btnField.target, RedDotDataManager.Instance.GetFieldRed(), "", -36, 32);
|
|
RedDotController.Instance.SetComRedDot(_ui.m_btnStudio.target, RedDotDataManager.Instance.GetStudioFilingRed(), "", -36, 32);
|
|
RedDotController.Instance.SetComRedDot(_ui.m_btnStudio.target, RedDotDataManager.Instance.GetStudioFilingRed(), "", -36, 32);
|
|
- RedDotController.Instance.SetComRedDot(_ui.m_headBar.target, RedDotDataManager.Instance.GetHeadRed() || RedDotDataManager.Instance.GetHeadBorderRed(), "", 5, 7);
|
|
|
|
|
|
+ RedDotController.Instance.SetComRedDot(_ui.m_headBar.target, RedDotDataManager.Instance.GetHeadRed() || RedDotDataManager.Instance.GetHeadBorderRed(), "", -26, 42);
|
|
|
|
+
|
|
RedDotController.Instance.SetComRedDot(_ui.m_btnTravel.target, RedDotDataManager.Instance.GetTravelRed(), "", -36, 32);
|
|
RedDotController.Instance.SetComRedDot(_ui.m_btnTravel.target, RedDotDataManager.Instance.GetTravelRed(), "", -36, 32);
|
|
RedDotController.Instance.SetComRedDot(_btnLeague, RedDotDataManager.Instance.GetLeagueRed());
|
|
RedDotController.Instance.SetComRedDot(_btnLeague, RedDotDataManager.Instance.GetLeagueRed());
|
|
- RedDotController.Instance.SetComRedDot(_ui.m_btnDailyWelfare.target, RedDotDataManager.Instance.GetDailyWelfareRed(), "", -10, 5);
|
|
|
|
- RedDotController.Instance.SetComRedDot(_ui.m_btnActivityLuckyBox.target, RedDotDataManager.Instance.GetMeiRiTeHuiRed() || RedDotDataManager.Instance.GetActLuckyBoxRewardRed() || RedDotDataManager.Instance.GetActLuckyBoxTaskdRed() || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -10, 5);
|
|
|
|
- RedDotController.Instance.SetComRedDot(_btnBag, RedDotDataManager.Instance.GetMainBagGiftRed());
|
|
|
|
|
|
+ RedDotController.Instance.SetComRedDot(_ui.m_btnDailyWelfare.target, RedDotDataManager.Instance.GetDailyWelfareRed(), "", 9, -1);
|
|
|
|
+ RedDotController.Instance.SetComRedDot(_ui.m_btnActivityLuckyBox.target, RedDotDataManager.Instance.GetMeiRiTeHuiRed() || RedDotDataManager.Instance.GetActLuckyBoxRewardRed() || RedDotDataManager.Instance.GetActLuckyBoxTaskdRed() || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", 9, -1);
|
|
|
|
+ RedDotController.Instance.SetComRedDot(_btnBag, RedDotDataManager.Instance.GetMainBagGiftRed(), "", -8);
|
|
RedDotController.Instance.SetComRedDot(_ui.m_btnActivityDay7.target, RedDotDataManager.Instance.GetActivityDay7Red());
|
|
RedDotController.Instance.SetComRedDot(_ui.m_btnActivityDay7.target, RedDotDataManager.Instance.GetActivityDay7Red());
|
|
|
|
|
|
RedDotController.Instance.SetComRedDot(_ui.m_btnXiuFang.target, RedDotDataManager.Instance.GetClothingFosterRed() || RedDotDataManager.Instance.GetClothingSyntheticRed(), "", -10, 20);
|
|
RedDotController.Instance.SetComRedDot(_ui.m_btnXiuFang.target, RedDotDataManager.Instance.GetClothingFosterRed() || RedDotDataManager.Instance.GetClothingSyntheticRed(), "", -10, 20);
|
|
@@ -1055,16 +1067,16 @@ namespace GFGGame
|
|
|
|
|
|
GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.SUIT_LIST_VIEW, 1,
|
|
GuideController.TryGuide(_ui.m_btnXiuFang.target, ConstGuideId.SUIT_LIST_VIEW, 1,
|
|
"获得“天衣”服饰后,可进行养护和焕新,到绣坊看看。", -1, false);
|
|
"获得“天衣”服饰后,可进行养护和焕新,到绣坊看看。", -1, false);
|
|
- GuideController.TryGuide(_ui.m_loaRight.target, ConstGuideId.ARENA_OPEN, 2, "新玩法-飞花令开启了哦", -1, false);
|
|
|
|
|
|
+ GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, ConstGuideId.ARENA_OPEN, 2, "新玩法-飞花令开启了哦", -1, false);
|
|
|
|
|
|
|
|
|
|
- bool isStudioMetalGuide = GuideController.TryGuide(_ui.m_loaRight.target, ConstGuideId.STUDIO_PORCELAIN, 2, "进入副本", -1,
|
|
|
|
|
|
+ bool isStudioMetalGuide = GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, ConstGuideId.STUDIO_PORCELAIN, 2, "进入副本", -1,
|
|
false, _ui.target.height - 700);
|
|
false, _ui.target.height - 700);
|
|
- bool isStudioFilingGuide = GuideController.TryGuide(_ui.m_loaRight.target, ConstGuideId.STUDIO_FILING, 2, "进入副本", -1,
|
|
|
|
|
|
+ bool isStudioFilingGuide = GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, ConstGuideId.STUDIO_FILING, 2, "进入副本", -1,
|
|
false, _ui.target.height - 700);
|
|
false, _ui.target.height - 700);
|
|
- bool isFieldGuide = GuideController.TryGuide(_ui.m_loaRight.target, ConstGuideId.FIELD, 1, "进入副本", -1, false, _ui.target.height - 700);
|
|
|
|
|
|
+ bool isFieldGuide = GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, ConstGuideId.FIELD, 1, "进入副本", -1, false, _ui.target.height - 700);
|
|
|
|
|
|
- bool isStudioPropertyGuide = GuideController.TryGuide(_ui.m_loaRight.target, ConstGuideId.STUDIO_PROPERTY, 1, "进入副本", -1, false, _ui.target.height - 700);
|
|
|
|
|
|
+ bool isStudioPropertyGuide = GuideController.TryGuide(_ui.m_btnHaiZhiShi.target, ConstGuideId.STUDIO_PROPERTY, 1, "进入副本", -1, false, _ui.target.height - 700);
|
|
|
|
|
|
_ui.m_loaGuidestudio.visible = false;
|
|
_ui.m_loaGuidestudio.visible = false;
|
|
// if (isStudioMetalGuide || isStudioFilingGuide || isFieldGuide || isStudioPropertyGuide)
|
|
// if (isStudioMetalGuide || isStudioFilingGuide || isFieldGuide || isStudioPropertyGuide)
|