Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/HotUpdate/Data/ActivityDataManager.cs

@@ -33,6 +33,9 @@ namespace GFGGame
             }
             return 0;
         }
+        /**********************************************************活动弹窗*************************************************/
+        public bool todayActivityTips = true;
+        public bool todayMonthlyCardTips = true;
         /**********************************************************限时累充*************************************************/
         public int lastActLimitChargeId = 0;
         private int _actLimitChargeId = 0;

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ActivityMainTipsUI.cs

@@ -0,0 +1,95 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_ActivityMainTipsUI
+    {
+        public GComponent target;
+        public GLoader m_btnChange;
+        public GLoader m_icon;
+        public GTextField m_activityDesc;
+        public GLoader m_notTips;
+        public GTextField m_activityTime;
+        public GLoader m_backBtn;
+        public Transition m_t0;
+        public Transition m_t1;
+        public Transition m_t4;
+        public const string URL = "ui://4ht5s77u806n0";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "ActivityMainTipsUI";
+        private static UI_ActivityMainTipsUI _proxy;
+
+        public static UI_ActivityMainTipsUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ActivityMainTipsUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_ActivityMainTipsUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ActivityMainTipsUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_btnChange = (GLoader)comp.GetChild("btnChange");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_activityDesc = (GTextField)comp.GetChild("activityDesc");
+            m_notTips = (GLoader)comp.GetChild("notTips");
+            m_activityTime = (GTextField)comp.GetChild("activityTime");
+            m_backBtn = (GLoader)comp.GetChild("backBtn");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
+            m_t4 = comp.GetTransition("t4");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnChange = null;
+            m_icon = null;
+            m_activityDesc = null;
+            m_notTips = null;
+            m_activityTime = null;
+            m_backBtn = null;
+            m_t0 = null;
+            m_t1 = null;
+            m_t4 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_ActivityMainTipsUI.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f66d55d097cf52c4ba4a58de1aec81f5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_MonthlyCardTipsUI.cs

@@ -0,0 +1,92 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_MonthlyCardTipsUI
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GLoader m_icon;
+        public GLoader m_btnBuy;
+        public GLoader m_btnBuyTxt;
+        public GList m_rewardList;
+        public GLoader m_notTips;
+        public GLoader m_backBtn;
+        public Transition m_t0;
+        public const string URL = "ui://4ht5s77u806n7";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "MonthlyCardTipsUI";
+        private static UI_MonthlyCardTipsUI _proxy;
+
+        public static UI_MonthlyCardTipsUI Create(GObject gObject = null)
+        {
+            var ui = new UI_MonthlyCardTipsUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_MonthlyCardTipsUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_MonthlyCardTipsUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_btnBuy = (GLoader)comp.GetChild("btnBuy");
+            m_btnBuyTxt = (GLoader)comp.GetChild("btnBuyTxt");
+            m_rewardList = (GList)comp.GetChild("rewardList");
+            m_notTips = (GLoader)comp.GetChild("notTips");
+            m_backBtn = (GLoader)comp.GetChild("backBtn");
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_icon = null;
+            m_btnBuy = null;
+            m_btnBuyTxt = null;
+            m_rewardList = null;
+            m_notTips = null;
+            m_backBtn = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_MonthlyCardTipsUI.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 93ae52c227963af429b993e0157328a2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_rewardItem.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityMain
+{
+    public partial class UI_rewardItem
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GLoader m_icon;
+        public GTextField m_txtNum;
+        public const string URL = "ui://4ht5s77u806nh";
+        public const string PACKAGE_NAME = "ActivityMain";
+        public const string RES_NAME = "rewardItem";
+        private static UI_rewardItem _proxy;
+
+        public static UI_rewardItem Create(GObject gObject = null)
+        {
+            var ui = new UI_rewardItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_rewardItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_rewardItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_txtNum = (GTextField)comp.GetChild("txtNum");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_icon = null;
+            m_txtNum = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityMain/UI_rewardItem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6cc61d4f6f7ac5a47a02e1652f6de8ac
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/RoleInfo/UI_RoleInfoUI.cs

@@ -19,7 +19,7 @@ namespace UI.RoleInfo
         public GTextField m_txtRoleName;
         public GLoader m_loaChangeName;
         public GTextInput m_txtSlogan;
-        public GTextField m_txtSlogan_2;
+        public GTextField m_txtSloganLabel;
         public GGroup m_grpHead;
         public UI_ButtonCollectProgress m_btnSuitGuide;
         public UI_ButtonCollectProgress m_btnCardGuide;
@@ -90,7 +90,7 @@ namespace UI.RoleInfo
             m_txtRoleName = (GTextField)comp.GetChild("txtRoleName");
             m_loaChangeName = (GLoader)comp.GetChild("loaChangeName");
             m_txtSlogan = (GTextInput)comp.GetChild("txtSlogan");
-            m_txtSlogan_2 = (GTextField)comp.GetChild("txtSlogan");
+            m_txtSloganLabel = (GTextField)comp.GetChild("txtSloganLabel");
             m_grpHead = (GGroup)comp.GetChild("grpHead");
             m_btnSuitGuide = (UI_ButtonCollectProgress)UI_ButtonCollectProgress.Create(comp.GetChild("btnSuitGuide"));
             m_btnCardGuide = (UI_ButtonCollectProgress)UI_ButtonCollectProgress.Create(comp.GetChild("btnCardGuide"));
@@ -117,7 +117,7 @@ namespace UI.RoleInfo
             m_txtRoleName = null;
             m_loaChangeName = null;
             m_txtSlogan = null;
-            m_txtSlogan_2 = null;
+            m_txtSloganLabel = null;
             m_grpHead = null;
             m_btnSuitGuide.Dispose();
             m_btnSuitGuide = null;

GameClient/Assets/Game/HotUpdate/GameGlobal.cs

@@ -37,6 +37,8 @@ namespace GFGGame
         public static bool AutoSevenDayLoginView = true;
         public static bool AutoDailySignView = true;
         public static bool AutoSpecialOfferGiftBoxView = true;
+        public static bool AutoAcitivtyTipsLoginView = true;
+        public static bool AutoMonthlyCardView = true;
         //用于标记自动检测打开界面流程已执行完毕
         public static bool AutoShowCompleted;
 

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips.meta

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

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityMainTipsView.cs

@@ -0,0 +1,175 @@
+using FairyGUI;
+using UI.ActivityMain;
+using System.Collections;
+using System.Collections.Generic;
+using ET;
+
+namespace GFGGame
+{
+    public class ActivityMainTipsView : BaseView
+    {
+        private UI_ActivityMainTipsUI _ui;
+        private AdCfg[] activitydata;
+        private List<AdCfg> showActivity = new List<AdCfg>();
+        public override void Dispose()
+        {
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ActivityMainTipsUI.PACKAGE_NAME;
+            _ui = UI_ActivityMainTipsUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            _ui.m_icon.onClick.Add(OnBtnAdJump);
+            _ui.m_btnChange.onClick.Add(OnClickChange);
+            _ui.m_backBtn.onClick.Add(OnClickChange);
+            _ui.m_notTips.onClick.Add(OnClickTips);
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            if(activitydata == null)
+            {
+                activitydata = AdCfgArray.Instance.dataArray;
+            }
+            _ui.m_t4.Play();
+            UpdateInfo();
+        }
+        protected override void OnHide()
+        {
+            showActivity.Clear();
+            activitydata = null;
+            base.OnHide();
+        }
+        private void UpdateView()
+        {
+            long endTime = 0;
+            if (showActivity[0] != null || showActivity != null)
+            {
+                if(showActivity[0].activityId != 0)
+                {
+                    ActivityInfo activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(showActivity[0].activityId);
+                    endTime = activityInfo.EndTime;
+                }
+                else
+                {
+                    endTime = TimeUtil.DateTimeToTimestamp(showActivity[0].endTime);
+                }     
+            }
+            else
+            {
+                this.Hide();
+                return;
+            }
+            long curTime = TimeHelper.ServerNow();
+            _ui.m_activityTime.text = string.Format("剩余{0}", TimeUtil.FormattingTimeTo_DDHHmm(endTime - curTime));
+            _ui.m_icon.url = "ui://ActivityMainTips/" + showActivity[0].res;
+            // _ui.m_activityDesc.text = showActivity[0].desc;
+        }
+
+        private void UpdateInfo()
+        {
+            showActivity.Clear();
+            for (int i=0; i < activitydata.Length; i++)
+            {
+                AdCfg adCfg = activitydata[i];
+                if (adCfg.activityId > 0)
+                {
+                    if (ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId) == null) continue;
+                    ActivityInfo activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId);
+                    if (TimeHelper.ServerNow() < activityInfo.StartTime || TimeHelper.ServerNow() > activityInfo.EndTime) continue;
+                }
+                if (adCfg.NoticeTips != null || adCfg.NoticeTips != "")
+                {
+                    if(adCfg.activityId != 0)
+                    {
+                        ActivityInfo activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(adCfg.activityId);
+                        if (TimeHelper.ServerNow() < activityInfo.StartTime || TimeHelper.ServerNow() > activityInfo.EndTime)
+                        {
+                            
+                        }
+                        else
+                        {
+                            showActivity.Add(adCfg);
+                            continue;
+                        }
+                    }
+                    if (adCfg.startTime != "" && adCfg.startTime != null)
+                    {
+                        long startTime = TimeUtil.DateTimeToTimestamp(adCfg.startTime);
+                        long endTime = TimeUtil.DateTimeToTimestamp(adCfg.endTime);
+                        if (TimeHelper.ServerNow() < startTime || TimeHelper.ServerNow() > endTime)
+                        {
+                            continue;
+                        }
+                        else
+                        {
+                            showActivity.Add(adCfg);
+                        }
+                    }
+                }
+            }
+            UpdateView();
+        }
+        private void OnClickChange()
+        {
+            _ui.m_t0.Play();
+            showActivity.RemoveAt(0);
+            if (showActivity.Count == 0)
+            {
+                this.Hide();
+                return;
+            }
+            UpdateView();
+            _ui.m_t1.Play();
+
+        }
+        private void OnClickTips()
+        {
+            if(ActivityDataManager.Instance.todayActivityTips)
+            {
+                _ui.m_notTips.url = "ui://ActivityMain/jrbzts_off";
+                ActivityDataManager.Instance.todayActivityTips = false;
+            }
+            else
+            {
+                _ui.m_notTips.url = "ui://ActivityMain/ts_jrbzts";
+                ActivityDataManager.Instance.todayActivityTips = true;
+            }
+            
+        }
+        private void OnBtnAdJump()
+        {
+            AdCfg adCfg = showActivity[0];
+            object[] param = null;
+            int jumpIndex = 0;
+            if (adCfg.jumpId == nameof(LimitChargeView))
+            {
+                param = new object[] { adCfg.activityId };
+            }
+            if (adCfg.jumpId == nameof(NewLimitChargeView))
+            {
+                param = new object[] { adCfg.activityId };
+            }
+            if (adCfg.jumpId == nameof(LuckyBoxView))
+            {
+                jumpIndex = adCfg.jumpParamArr[0];
+            }
+
+            if (jumpIndex != 0)
+                ViewManager.Show($"GFGGame.{adCfg.jumpId}", jumpIndex);
+            else
+                ViewManager.Show($"GFGGame.{adCfg.jumpId}", param);
+        }
+
+
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/ActivityMainTipsView.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b9c21341324cb494a8d9161abd36717b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/MonthlyCardTipsView.cs

@@ -0,0 +1,110 @@
+using FairyGUI;
+using UI.ActivityMain;
+using UI.CommonGame;
+using System.Collections;
+using System.Collections.Generic;
+using ET;
+
+namespace GFGGame
+{
+    public class MonthlyCardTipsView : BaseView
+    {
+        private UI_MonthlyCardTipsUI _ui;
+        private int rewards = 3;
+        private List<int> itemID = new List<int>() { 1000005, 1000004, 5005006 };
+        private List<string> rarity = new List<string>() {"", "wpk_db_fp", "wpk_db_zx", "wpk_db_dc", "wpk_db_ty" };
+        private List<string> rewardNum = new List<string>() { "x1680", "x300", "专属头像框" };
+        public override void Dispose()
+        {
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_MonthlyCardTipsUI.PACKAGE_NAME;
+            _ui = UI_MonthlyCardTipsUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+            _ui.m_rewardList.itemRenderer = ListItemRender;
+            _ui.m_btnBuyTxt.onClick.Add(OnBtnAdJump);
+            _ui.m_backBtn.onClick.Add(Hide);
+            _ui.m_notTips.onClick.Add(OnClickTips);
+            _ui.m_bg.onClick.Add(Hide);
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            _ui.m_t0.Play();
+            UpdateView();
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+        private void UpdateView()
+        {
+            _ui.m_rewardList.numItems = rewards;
+        }
+        private void ListItemRender(int index, GObject obj)
+        {
+            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemID[index]);
+            UI_rewardItem item = UI_rewardItem.Proxy(obj);
+            if(itemCfg.rarity != 0)
+            {
+                item.m_bg.url = ResPathUtil.GetCommonGameResPath(rarity[itemCfg.rarity]);
+            }
+            else
+            {
+                item.m_bg.url = ResPathUtil.GetCommonGameResPath(rarity[1]);   
+            }
+            if(index == rewards - 1)
+            {
+                item.m_icon.url = "ui://ActivityMain/" + itemCfg.res;
+            }
+            else
+            {
+                item.m_icon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
+            }
+            item.m_txtNum.text = rewardNum[index];
+            item.target.data = itemCfg;
+            item.target.onClick.Add(OnClickItem);
+            UI_rewardItem.ProxyEnd();
+        }
+
+        private void OnClickTips()
+        {
+            if (ActivityDataManager.Instance.todayMonthlyCardTips)
+            {
+                _ui.m_notTips.url = "ui://ActivityMain/jrbzts_off";
+                ActivityDataManager.Instance.todayMonthlyCardTips = false;
+            }
+            else
+            {
+                _ui.m_notTips.url = "ui://ActivityMain/ts_jrbzts";
+                ActivityDataManager.Instance.todayMonthlyCardTips = true;
+            }
+
+        }
+        private void OnClickItem(EventContext param)
+        {
+            GObject comItem = (param.sender as GObject);
+            ItemCfg itemCfg = comItem.data as ItemCfg;
+            object[] sourceDatas = new object[]
+            { itemCfg.id, new object[] { typeof(BagView).FullName, this.viewData } };
+            GoodsItemTipsController.ShowItemTips(itemCfg.id, sourceDatas);
+        }
+        private void OnBtnAdJump()
+        {
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_MONTH_CARD, ConstStoreSubId.STORE_MONTH_GOLD_CARD });
+            this.Hide();
+        }
+
+
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/MonthlyCardTipsView.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 29da150ba5a54d849a8898937b07d5b2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/Game/HotUpdate/Views/CommonGame/SuitItemView.cs

@@ -9,8 +9,8 @@ namespace GFGGame
     {
         private UI_SuitItemUI _ui;
         private int suitID;
-        private int countSuitId;//当前获得的物品还有多少个相同套装的部件需要展示
-        private int count = 0;//套装当前拥有的部件数量
+        private int countSuitId;//褰撳墠鑾峰緱鐨勭墿鍝佽繕鏈夊�灏戜釜鐩稿悓濂楄�鐨勯儴浠堕渶瑕佸睍绀�
+        private int count = 0;//濂楄�褰撳墠鎷ユ湁鐨勯儴浠舵暟閲�
         private int totalCount = 1;
 
         private EffectUI _effectUI1;
@@ -63,7 +63,7 @@ namespace GFGGame
             if (suitID > 0)
             {
                 SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(suitID);
-                _ui.m_txtName.text = "套装·" + suitCfg.name;
+                _ui.m_txtName.text = "濂楄�路" + suitCfg.name;
                 _ui.m_icon.url = ResPathUtil.GetFieldGuideIconPath(suitCfg.res);
             }
             _ui.m_probar.max = totalCount;

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/NewLimitChargeView.cs

@@ -64,7 +64,7 @@ namespace GFGGame
             _rechargeCfgs = ActivityRechargeCfgArray.Instance.GetCfgsByactivityId(_activityId);
             _activityInfo = ActivityGlobalDataManager.Instance.GetActivityInfo(_activityId);
             //RefreshList();
-            //由于这个需要外部参数所以在onshown里面预加载
+            //鐢变簬杩欎釜闇€瑕佸�閮ㄥ弬鏁版墍浠ュ湪onshown閲岄潰棰勫姞杞�
             PreloadManager.Instance.PreloadSuitRes(_rechargeCfgs[0].suitId, ResType.Both, new int[] { ConstDressUpItemType.BEI_JING }, false);
             string name = SuitCfgArray.Instance.GetCfg(_rechargeCfgs[0].suitId).name;
             _ui.m_packageName.text = name;
@@ -88,7 +88,7 @@ namespace GFGGame
             _ui.m_btnRight.visible = _curSelectIndex < _rechargeCfgs.Count - 1 ? true : false;
             _ui.m_packageName.text = SuitCfgArray.Instance.GetCfg(_rechargeCfgs[_curSelectIndex].suitId).name;
             UpdateRedDot();
-            //预加载套装，对于不同suitid
+            //棰勫姞杞藉�瑁咃紝瀵逛簬涓嶅悓suitid
             for (int i = 1; i < _rechargeCfgs.Count; i++)
             {
                 if (_rechargeCfgs[i].suitId != _rechargeCfgs[i - 1].suitId)
@@ -181,25 +181,25 @@ namespace GFGGame
             bool isGet = MathUtil.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.VipGetStatus), vipCfg.id);
             long limitChargeExp = _activityInfo.CountValue;
             //item.m_btnGetGiftBag.grayed = limitChargeExp < _rechargeCfgs[index].value;
-            item.m_txtGiftBag.text = string.Format("活动期间累计获得{0}会员积分({1}/{2})", _rechargeCfgs[index].value, limitChargeExp, _rechargeCfgs[index].value);
+            item.m_txtGiftBag.text = string.Format("娲诲姩鏈熼棿绱��鑾峰緱{0}浼氬憳绉�垎({1}/{2})", _rechargeCfgs[index].value, limitChargeExp, _rechargeCfgs[index].value);
             if (limitChargeExp >= _rechargeCfgs[index].value)
             {
                 if (_activityInfo.GetRewards.IndexOf(_rechargeCfgs[index].id) >= 0)
                 {
                     item.m_btnGetGiftBag.grayed = true;
-                    item.m_btnGetGiftBag.title = "已领取";
+                    item.m_btnGetGiftBag.title = "宸查�鍙�";
                 }
                 else
                 {
                     item.m_btnGetGiftBag.grayed = false;
-                    item.m_btnGetGiftBag.title = "领取";
+                    item.m_btnGetGiftBag.title = "棰嗗彇";
                 }
 
             }
             else
             {
                 item.m_btnGetGiftBag.grayed = true;
-                item.m_btnGetGiftBag.title = "领取";
+                item.m_btnGetGiftBag.title = "棰嗗彇";
             }
         }
 

GameClient/Assets/Game/HotUpdate/Views/FieldGuide/CardGuideView.cs

@@ -14,7 +14,6 @@ namespace GFGGame
     {
         private UI_CardGuideUI _ui;
         private List<int> _cardList;
-        private bool _startInAnim;
         private int _lastClickIndex;
 
         public override void Dispose()
@@ -44,7 +43,6 @@ namespace GFGGame
             _ui.m_listRole.onClickItem.Add(OnClickRoleListItem);
             _ui.m_btnBack.onClick.Add(OnClickBtnBack);
             _ui.m_listRole.selectedIndex = 0;
-            _startInAnim = true;
         }
 
         protected override void AddEventListener()
@@ -67,19 +65,16 @@ namespace GFGGame
         {
             base.OnShown();
             UpdateCardList();
-            if (_startInAnim)
-            {
-                _startInAnim = false;
-                _ui.m_listRole.scrollPane.ScrollTop();
-                _ui.m_In.Play();
-            }
+
+            // 以下代码只在从图鉴进入时才执行
+            ResetSelectedItem();
+            _ui.m_listCard.scrollPane.ScrollTop();
+            _ui.m_In.Play();
         }
 
         protected override void OnHide()
         {
             base.OnHide();
-            _ui.m_listRole.selectedIndex = 0;
-            _lastClickIndex = 0;
         }
 
         private void RenderCardListItem(int index, GObject obj)
@@ -179,8 +174,13 @@ namespace GFGGame
 
         private void OnClickBtnBack()
         {
-            _startInAnim = true;
             Hide();
         }
+
+        private void ResetSelectedItem()
+        {
+            _ui.m_listRole.selectedIndex = 0;
+            _lastClickIndex = 0;
+        }
     }
 }

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightSingleScoreView.cs

@@ -488,7 +488,7 @@ namespace GFGGame
             if (GuideDataManager.IsGuideFinish(ConstGuideId.START_FIGHT) <= 0 && !ViewManager.isViewOpen(typeof(GuideView).FullName)) return;
             Timers.inst.Add(0.1f, 0, ComAllCirclePressTime);
 
-            _effectUI15.GetObj().GetComponent<Animator>().SetBool("player", true);  
+            
         }
         private void ComAllCirclePressTime(object param = null)
         {
@@ -511,11 +511,13 @@ namespace GFGGame
             //_ui.m_comClick.m_comAllPerfect.m_txtCount.text = allCircleScore.ToString();
             CheckNumImage(allCircleScore.ToString());
             _ui.m_comClick.m_comResult.target.visible = false;
-
+            _ui.m_comClick.m_comAllPerfect.m_t2.SetHook("animation", SetAnimation);
+            
             _time = 0;
             _score += allCircleScore;
             _ui.m_comClick.m_comAllPerfect.m_t2.Play(() =>
                 {
+                    _effectUI15.GetObj().GetComponent<Animator>().SetBool("player", false);
                     _prefectCount = 0;
                     TryShowCardSkill(null);
                 });
@@ -526,6 +528,10 @@ namespace GFGGame
                 GuideController.TryCompleteGuide(ConstGuideId.START_FIGHT, 10);
             }
         }
+        private void SetAnimation()
+        {
+            _effectUI15.GetObj().GetComponent<Animator>().SetBool("player", true);
+        }
 
         private bool SuitAddScore()
         {

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -704,7 +704,6 @@ namespace GFGGame
             {
                 _ui.m_comClick.m_comAllPerfect.m_t0.Play();
             }
-            _effectUI12.GetObj().GetComponent<Animator>().SetBool("player", true);
         }
         private void OnComAllCircleClickBegin()
         {
@@ -734,17 +733,21 @@ namespace GFGGame
             //_ui.m_comClick.m_comAllPerfect.m_txtCount.text = allCircleScore.ToString();
             CheckNumImage(allCircleScore.ToString());
             _ui.m_comClick.m_comResult.target.visible = false;
-
+            _ui.m_comClick.m_comAllPerfect.m_t2.SetHook("animation", SetAnimation);
             _time = 0;
             _score += allCircleScore;
             _targetScore += allCircleScore;
             _ui.m_comClick.m_comAllPerfect.m_t2.Play(() =>
                 {
+                    _effectUI12.GetObj().GetComponent<Animator>().SetBool("player", false);
                     _prefectCount = 0;
                     CheckAllPerfectClickSkill();
                 });
         }
-
+        private void SetAnimation()
+        {
+            _effectUI12.GetObj().GetComponent<Animator>().SetBool("player", true);
+        }
         private bool SuitAddScore()
         {
             //评分结束后，添加套装加成分数

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/OtherRoleInfoView.cs

@@ -49,9 +49,6 @@ namespace GFGGame
             _roleInfo = (this.viewData as object[])[0] as OtherRoleInfoData;
             _roleDetailInfo = (this.viewData as object[])[1] as OtherRoleInfoDetailData;
 
-            _ui.m_txtRoleName.text = _roleInfo.roleName;
-            _ui.m_txtLvl.text = _roleInfo.roleLv.ToString();
-            RoleInfoManager.Instance.UpdateHead(_ui.m_comHead, _roleInfo.headId, _roleInfo.headBorderId);
 
             _roleDetailInfo = await RoleInfoSProxy.ReqOtherRoleDetailInfo(_roleInfo.roleId);
             _roleInfo = _roleDetailInfo.roleInfo;
@@ -60,6 +57,9 @@ namespace GFGGame
                 Timers.inst.StartCoroutine(PictureStorageHelper.Download(_roleDetailInfo.showPhotoList));
             }
 
+            _ui.m_txtRoleName.text = _roleInfo.roleName;
+            _ui.m_txtLvl.text = _roleInfo.roleLv.ToString();
+            RoleInfoManager.Instance.UpdateHead(_ui.m_comHead, _roleInfo.headId, _roleInfo.headBorderId);
             UpdateInfo();
             UpdateView();
             UpdateCollectProgress();
@@ -91,7 +91,7 @@ namespace GFGGame
                 _ui.m_txtExp.text = "已满级";
             }
 
-            _ui.m_txtSlogan.text = _roleDetailInfo.slogan;
+            _ui.m_txtSloganLabel.text = _roleDetailInfo.slogan;
             _ui.m_photoList.numItems = _roleDetailInfo.showPhotoList.Count;
         }
 

GameClient/Assets/ResIn/UI/ActivityMain.meta

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

GameClient/Assets/ResIn/UI/Main/Main_atlas0_10!a.png.meta → GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 59c23b3e214af1f4b9e6d24d3e259e35
+guid: 9b41798b7d74a0d4fba6ea45cc1ba051
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/Main/Main_atlas0_10.png.meta → GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_1.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8b3f202348f7875488e4222a6bc61d08
+guid: fb4c77467664a9a45b4f0a6d0cc6dde3
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_2.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: dd5e693af7ccbfa419246924a62dcade
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_fui.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a3663d7d455055c459411a945e8497b6
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: