Merge remote-tracking branch 'remotes/origin/master' into xiaojie

GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -213,7 +213,7 @@ namespace GFGGame
         //更新查阅建档数据
         public const string STUDIO_FILING_UPDATE = "STUDIO_FILING_UPDATE";
 
-        //更新游戏界面门票数量
+        //更新游戏界面
         public const string MINI_GAME_UPDATE = "MINI_GAME_UPDATE";
 
         // 更新华容道活动界面数据

GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -237,6 +237,8 @@ namespace GFGGame
             MailSProxy.ReqMailCount().Coroutine();
             FriendSProxy.ReqAllFriendInfos().Coroutine();
             ActivityAfuGiftSProxy.GetAfuGiftInfo().Coroutine();
+            ActivityTeaSProxy.ReqGetNPCVisitInfo().Coroutine();
+            MiniGameProxy.ReqGetChallengeReward().Coroutine();
 
             PoemPhotoSProxy.ReqAllPhotoInfos().Coroutine();
             TravelSProxy.ReqTravelInfo().Coroutine();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ComReward.cs

@@ -1,77 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.ClothingFoster
-{
-    public partial class UI_ComReward
-    {
-        public GComponent target;
-        public GLoader m_loaIcon;
-        public GImage m_imgGot;
-        public GTextField m_txtNum;
-        public const string URL = "ui://uicwtr5bbd1c24";
-        public const string PACKAGE_NAME = "ClothingFoster";
-        public const string RES_NAME = "ComReward";
-        private static UI_ComReward _proxy;
-
-        public static UI_ComReward Create(GObject gObject = null)
-        {
-            var ui = new UI_ComReward();
-            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_ComReward Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_ComReward();
-            }
-            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_loaIcon = (GLoader)comp.GetChild("loaIcon");
-            m_imgGot = (GImage)comp.GetChild("imgGot");
-            m_txtNum = (GTextField)comp.GetChild("txtNum");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_loaIcon = null;
-            m_imgGot = null;
-            m_txtNum = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ComReward.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ClothingFoster/UI_ListRewardItem.cs

@@ -8,7 +8,7 @@ namespace UI.ClothingFoster
     {
         public GComponent target;
         public GTextField m_txtDiscribe;
-        public UI_ComReward m_ComReward;
+        public GComponent m_itemReward;
         public const string URL = "ui://uicwtr5bpy5gw";
         public const string PACKAGE_NAME = "ClothingFoster";
         public const string RES_NAME = "ListRewardItem";
@@ -57,13 +57,12 @@ namespace UI.ClothingFoster
         private void Init(GComponent comp)
         {
             m_txtDiscribe = (GTextField)comp.GetChild("txtDiscribe");
-            m_ComReward = (UI_ComReward)UI_ComReward.Create(comp.GetChild("ComReward"));
+            m_itemReward = (GComponent)comp.GetChild("itemReward");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_txtDiscribe = null;
-            m_ComReward.Dispose();
-            m_ComReward = null;
+            m_itemReward = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/ServerProxy/CommonSProxy.cs

@@ -63,6 +63,7 @@ namespace GFGGame
                     await ActivityGlobalSProxy.GetActivityInfo();
                     await ActivityAfuGiftSProxy.GetAfuGiftInfo();
                     await ActivityTeaSProxy.ReqGetNPCVisitInfo();
+                    await MiniGameProxy.ReqGetChallengeReward();
                     ActivityDataManager.Instance.todayActivityTips = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropYchmActivity);
                     ActivityDataManager.Instance.todayMonthlyCardTips = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsPropCzykActivity);
                     EventAgent.DispatchEvent(ConstMessage.RESET_DAILY_DATA);

GameClient/Assets/Game/HotUpdate/ServerProxy/MiniGameProxy.cs

@@ -26,7 +26,7 @@ namespace GFGGame
             return true;
         }
 
-        public static async ETTask<bool> ReqGetChallengeReward(int activityId)
+        public static async ETTask<bool> ReqGetChallengeReward(int activityId = 1)
         {
             var response = (S2C_GetActivityGameInfos)await MessageHelper.SendToServer(new C2S_GetActivityGameInfos { ActivityId = activityId });
             if (!(response is { Error: ErrorCode.ERR_Success })) return false;

GameClient/Assets/Game/HotUpdate/Views/ActivityAfternoonTea/ActivityTeaVisitView.cs

@@ -54,7 +54,7 @@ namespace GFGGame
 
 
             RoleLimitData limitData = RoleLimitDataManager.GetLimitData(ActivityVisitCfgArray.Instance.dataArray[0].limitId);
-            time = limitData.TotalPlayMax - limitData.BuyTimes;
+            time = limitData.TotalPlayMax - limitData.PlayTimes;
             _ui.m_visitNum.text = "当前拜访次数：" + time + "/" + limitData.TotalPlayMax;
 
             _ui.m_taskList.numItems = ActivityVisitCfgArray.Instance.dataArray.Length;
@@ -70,6 +70,14 @@ namespace GFGGame
             base.OnHide();
         }
 
+        protected override void AddEventListener()
+        {
+            EventAgent.AddEventListener(ConstMessage.NOTICE_LIMIT_CHANGED, UpdateVisitNum);
+        }
+        protected override void RemoveEventListener()
+        {
+            EventAgent.RemoveEventListener(ConstMessage.NOTICE_LIMIT_CHANGED, UpdateVisitNum);
+        }
 
         private void OnClickBtnBack()
         {
@@ -83,7 +91,14 @@ namespace GFGGame
 
         }
 
-        private void RenderTaskList(int index,GObject obj)
+        private void UpdateVisitNum()
+        {
+            RoleLimitData limitData = RoleLimitDataManager.GetLimitData(ActivityVisitCfgArray.Instance.dataArray[0].limitId);
+            time = limitData.TotalPlayMax - limitData.PlayTimes;
+            _ui.m_visitNum.text = "当前拜访次数：" + time + "/" + limitData.TotalPlayMax;
+        }
+
+        private void RenderTaskList(int index, GObject obj)
         {
             UI_ActivityVIsitItemUI item = UI_ActivityVIsitItemUI.Proxy(obj);
             item.m_head.m_loaIcon.url = ResPathUtil.GetNpcHeadPath(ActivityVisitCfgArray.Instance.dataArray[index].picRes);
@@ -106,9 +121,8 @@ namespace GFGGame
 
             if (item.m_visitBtn.target.visible == true)
             {
-                item.m_c1.selectedIndex = ActivityTeaDataManager.Instance.NpcInfoList[index].UnlockStatus == 1 ? 1 : 0;
-                RedDotController.Instance.SetComRedDot(item.m_visitBtn.target, (ActivityTeaDataManager.Instance.NpcInfoList[index].UnlockStatus == 1 && time > 0));
-                RedDotController.Instance.SetComRedDot(item.m_visitBtn.target, ActivityTeaDataManager.Instance.NpcInfoList[index].RewrdStatus == 1);
+                item.m_visitBtn.m_c1.selectedIndex = ActivityTeaDataManager.Instance.NpcInfoList[index].UnlockStatus == 1 ? 1 : 0;
+                RedDotController.Instance.SetComRedDot(item.m_visitBtn.target, (ActivityTeaDataManager.Instance.NpcInfoList[index].UnlockStatus == 1 && time > 0) || ActivityTeaDataManager.Instance.NpcInfoList[index].RewrdStatus == 1);
             }
             if(item.m_visitBtn.target.data == null)
             {

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingRewardView.cs

@@ -3,6 +3,8 @@ using System.Collections;
 using System.Collections.Generic;
 using FairyGUI;
 using UI.ClothingFoster;
+using UI.CommonGame;
+
 namespace GFGGame
 {
     public class ClothingRewardView : BaseWindow
@@ -55,13 +57,22 @@ namespace GFGGame
             int _index = cfgs.IndexOf(cfg);
             item.m_txtDiscribe.text = string.Format("完成套装{0}获得", SuitFosterDataManager.Instance.stepNames[_index]);
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(cfg.rewardsArr[0][0]);
-            item.m_ComReward.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
-            item.m_ComReward.m_txtNum.text = string.Format("{0}", cfg.rewardsArr[0][1]);
-            item.m_ComReward.m_imgGot.visible = SuitFosterDataManager.Instance.GetRewardState(_suitId, _index + 1);
-            if (item.m_ComReward.target.data == null)
-            {
-                item.m_ComReward.target.onClick.Add(() => { GoodsItemTipsController.ShowItemTips(cfg.rewardsArr[0][0]); });
-            }
+
+            UI_ComItem itemReward = UI_ComItem.Proxy(item.m_itemReward);
+            itemReward.m_loaIcon.url = ResPathUtil.GetIconPath(itemCfg);
+            itemReward.m_txtCount.text = string.Format("{0}", cfg.rewardsArr[0][1]);
+            if (SuitFosterDataManager.Instance.GetRewardState(_suitId, _index + 1))
+                itemReward.m_ButtonType.selectedIndex = 5;
+            else
+                itemReward.m_ButtonType.selectedIndex = 0;
+
+            itemReward.m_QualityType.selectedIndex = itemCfg.rarity - 1;
+            RarityIconController.UpdateRarityIcon(itemReward.m_loaRarity, itemCfg.id, false);
+            if (itemReward.target.data == null)
+                itemReward.target.onClick.Add(() => { GoodsItemTipsController.ShowItemTips(cfg.rewardsArr[0][0]); });
+
+            itemReward.target.data = index;
+            UI_ComItem.ProxyEnd();
             UI_ListRewardItem.ProxyEnd();
         }
     }

GameClient/Assets/Game/HotUpdate/Views/League/LeagueSkillUpView.cs

@@ -19,6 +19,7 @@ namespace GFGGame
         private List<EffectUI> _effectUIs = new List<EffectUI>();
         private int _type;
         private int saveListPageIndex = 0;
+        private bool _showEff = false;
 
         public override void Dispose()
         {
@@ -86,10 +87,13 @@ namespace GFGGame
             _type = (int)this.viewData;
             _valueBarController.OnShown();
             _valueBarController.Controller(11);
+            _showEff = false;
 
             _ui.m_comSkill.m_list.numItems = LeagueSkillCountCfgArray.Instance.GetCfg(_type).layerCount;
             _ui.m_t0.Play(() =>
             {
+                _showEff = true;
+                _ui.m_comSkill.m_list.numItems = LeagueSkillCountCfgArray.Instance.GetCfg(_type).layerCount;
                 UpdateView(false);
             });
         }
@@ -255,7 +259,7 @@ namespace GFGGame
 
             item.m_imgSuo.visible = !canActive;
 
-            if (isLock && canActive && _effectUIs.Count <= index)
+            if (_showEff && isLock && canActive && _effectUIs.Count <= index)
             {
                 EffectUI _effectUI = EffectUIPool.CreateEffectUI(item.m_holdeLight, "ui_league", "tea_nolearn");
                 _effectUIs.Add(_effectUI);

GameClient/Assets/Game/HotUpdate/Views/MiniGame/ChallengeRewardView.cs

@@ -212,6 +212,7 @@ namespace GFGGame
             }
             _ui.m_reward.m_rewardOneList.numItems = oneNumItems;
             _ui.m_reward.m_rewardTwoList.numItems = twoNumItems;
+            EventAgent.DispatchEvent(ConstMessage.MINI_GAME_UPDATE);
         }
         private void GetGameArray(int i,int j,int index)
         {

GameClient/Assets/Game/HotUpdate/Views/MiniGame/GameStartView.cs

@@ -82,12 +82,12 @@ namespace GFGGame
         protected override void AddEventListener()
         {
             base.AddEventListener();
-            EventAgent.AddEventListener(ConstMessage.MINI_GAME_UPDATE, OnNumericChange);
+            EventAgent.AddEventListener(ConstMessage.MINI_GAME_UPDATE, UpdateRed);
         }
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
-            EventAgent.AddEventListener(ConstMessage.MINI_GAME_UPDATE, OnNumericChange);
+            EventAgent.AddEventListener(ConstMessage.MINI_GAME_UPDATE, UpdateRed);
         }
         protected override void OnHide()
         {
@@ -95,6 +95,11 @@ namespace GFGGame
             ChallengeList.Clear();
             base.OnHide();
         }
+
+        private void UpdateRed()
+        {
+            RedDotController.Instance.SetComRedDot(_ui.m_rewardBtn.target, MiniGameDateManager.Instance.GetRewardRot());
+        }
         private void UpdateView()
         {
             if(ChallengeList.Count == 0)

GameClient/Assets/Game/HotUpdate/Views/OpenServerActivity/OpenServerActivityView.cs

@@ -98,6 +98,7 @@ namespace GFGGame
         private void UpdateRedDot()
         {
             RedDotController.Instance.SetComRedDot(_ui.m_btnTenShu, (RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitStlyc) || RedDotDataManager.Instance.GetGiftBagRewardRed() || RedDotDataManager.Instance.GetMeiRiTeHuiRed()), "", -100, 11);
+            RedDotController.Instance.SetComRedDot(_ui.m_btnHeaven, MiniGameDateManager.Instance.GetRewardRot());
         }
 
         private void UpdateTime(object param)
@@ -126,7 +127,6 @@ namespace GFGGame
         {
             //小游戏入口
             ViewManager.Show<GameStartView>();
-            //ViewManager.Show<ActivityThemeLuckyBoxView>(null, true);
         }
 
         private void OnClickBtnMingTong()

GameClient/Assets/ResIn/UI/ClothingFoster/ClothingFoster_atlas0_2!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 05ad904dd5a80bb4b86d09572b07148b
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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/ClothingFoster/ClothingFoster_atlas0_2.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 3ee27bbb516d0e14bbd0e292d558d9be
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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: