zhaoyang 2 роки тому
батько
коміт
a2ac4aad4f

+ 0 - 0
FGUIProject/assets/DailyLogin/DailyLoginUI.xml → FGUIProject/assets/DailyLogin/SevenDayLoginUI.xml


+ 1 - 1
FGUIProject/assets/DailyLogin/package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packageDescription id="5uawdql9">
   <resources>
-    <component id="lh8v6" name="DailyLoginUI.xml" path="/" exported="true"/>
+    <component id="lh8v6" name="SevenDayLoginUI.xml" path="/" exported="true"/>
     <component id="jyml7" name="ListItem.xml" path="/components/"/>
     <image id="ox5b8" name="yzhl_yqd.png" path="/images/"/>
     <image id="ox5b9" name="yzhd_ditu.png" path="/images/"/>

+ 7 - 7
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyLogin/UI_DailyLoginUI.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyLogin/UI_SevenDayLoginUI.cs

@@ -4,19 +4,19 @@ using FairyGUI;
 
 namespace UI.DailyLogin
 {
-    public partial class UI_DailyLoginUI
+    public partial class UI_SevenDayLoginUI
     {
         public GComponent target;
         public GList m_list;
         public UI_Component1 m_comIcon;
         public const string URL = "ui://5uawdql9lh8v6";
         public const string PACKAGE_NAME = "DailyLogin";
-        public const string RES_NAME = "DailyLoginUI";
-        private static UI_DailyLoginUI _proxy;
+        public const string RES_NAME = "SevenDayLoginUI";
+        private static UI_SevenDayLoginUI _proxy;
 
-        public static UI_DailyLoginUI Create(GObject gObject = null)
+        public static UI_SevenDayLoginUI Create(GObject gObject = null)
         {
-            var ui = new UI_DailyLoginUI();
+            var ui = new UI_SevenDayLoginUI();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -25,11 +25,11 @@ namespace UI.DailyLogin
             return ui;
         }
 
-        public static UI_DailyLoginUI Proxy(GObject gObject = null)
+        public static UI_SevenDayLoginUI Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_DailyLoginUI();
+                _proxy = new UI_SevenDayLoginUI();
             }
             var ui = _proxy;
             if(gObject == null)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/DailyLogin/DailyLoginView.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyLogin/UI_SevenDayLoginUI.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7db2080df513b5f48b94131a468087d9
+guid: 20f50cd2e1c839d42a0ec994bd1f41df
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 8 - 0
GameClient/Assets/Game/HotUpdate/Views/Activity.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 467cbde49eaa3de4eaef711fe9f2b116
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 4 - 4
GameClient/Assets/Game/HotUpdate/Views/DailyLogin/DailyLoginView.cs → GameClient/Assets/Game/HotUpdate/Views/Activity/SevenDayLoginView.cs

@@ -7,9 +7,9 @@ using UnityEngine;
 
 namespace GFGGame
 {
-    public class DailyLoginView : BaseWindow
+    public class SevenDayLoginView : BaseWindow
     {
-        private UI_DailyLoginUI _ui;
+        private UI_SevenDayLoginUI _ui;
         private List<DailyLoginCfg> _cfgs;
         private DailyLoginCfg _cfg;
 
@@ -32,8 +32,8 @@ namespace GFGGame
         protected override void OnInit()
         {
             base.OnInit();
-            packageName = UI_DailyLoginUI.PACKAGE_NAME;
-            _ui = UI_DailyLoginUI.Create();
+            packageName = UI_SevenDayLoginUI.PACKAGE_NAME;
+            _ui = UI_SevenDayLoginUI.Create();
             this.viewCom = _ui.target;
             this.modal = true;
             this.viewCom.Center();

+ 1 - 1
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyLogin/UI_DailyLoginUI.cs.meta → GameClient/Assets/Game/HotUpdate/Views/Activity/SevenDayLoginView.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: acaaccfbeada33b4a994df456d4ab5f3
+guid: 6857cde1d442be54a94c3bbb52b6baf4
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 3 - 3
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -195,7 +195,7 @@ namespace GFGGame
             long lastTime = GameGlobal.lastLoginTime;// GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
             if (!TimeUtil.CheckIsSameTime(lastTime * 1000, TimeHelper.ClientNow()) && ActivityDataManager.Instance.dailyLoginBonusStatus == ConstBonusStatus.CAN_GET && GuideDataManager.currentGuideId <= 0)
             {
-                ViewManager.Show<DailyLoginView>();
+                ViewManager.Show<SevenDayLoginView>();
                 GameGlobal.lastLoginTime = GameGlobal.myNumericComponent.GetAsInt(NumericType.OnlineTimeSecs);
             }
             SetPos();
@@ -442,7 +442,7 @@ namespace GFGGame
             // ViewManager.Show<FunctionOpenView>(list);
             LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_DNEG_LU, 1);
 
-            ViewManager.Show<DailyLoginView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
+            ViewManager.Show<SevenDayLoginView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
             //     isOpen = false;
             // });
 
@@ -611,7 +611,7 @@ namespace GFGGame
             _ui.m_btnTravel.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(TravelView).Name, false);
             _ui.m_btnArena.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ArenaView).Name, false);
 
-            _ui.m_btnDailyLogin.target.visible = !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(DailyLoginView).Name, false)
+            _ui.m_btnDailyLogin.target.visible = !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false)
             || (ActivityDataManager.Instance.dailyLoginId >= 7 && ActivityDataManager.Instance.dailyLoginBonusStatus == ConstBonusStatus.GOT));
 
             _btnGongGao.visible = FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(NoticeView).Name, false);

BIN
GameClient/Assets/ResIn/UI/DailyLogin/DailyLogin_fui.bytes