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

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

@@ -109,7 +109,16 @@ namespace GFGGame
             if (!sort) return;
             _list.Sort((long a, long b) =>
             {
-                long count = _friendDic[b].roleInfo.offlineTimeSec - _friendDic[b].roleInfo.offlineTimeSec;
+                if(_friendDic[a].roleInfo.offlineTimeSec == 0)
+                {
+                    return -1;
+                }
+                if(_friendDic[b].roleInfo.offlineTimeSec == 0)
+                {
+                    return 1;
+                }
+
+                long count = _friendDic[a].roleInfo.offlineTimeSec - _friendDic[b].roleInfo.offlineTimeSec;
                 if (count > 0)
                 {
                     return -1;

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

@@ -13,6 +13,8 @@ namespace UI.ActivityMain
         public GTextField m_activityTime;
         public GLoader m_backBtn;
         public GLoader m_viewBtn;
+        public GGraph m_bgEffect;
+        public GGraph m_btnEffect;
         public const string URL = "ui://4ht5s77uqbf4l";
         public const string PACKAGE_NAME = "ActivityMain";
         public const string RES_NAME = "ActivityZCJB";
@@ -66,6 +68,8 @@ namespace UI.ActivityMain
             m_activityTime = (GTextField)comp.GetChild("activityTime");
             m_backBtn = (GLoader)comp.GetChild("backBtn");
             m_viewBtn = (GLoader)comp.GetChild("viewBtn");
+            m_bgEffect = (GGraph)comp.GetChild("bgEffect");
+            m_btnEffect = (GGraph)comp.GetChild("btnEffect");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -75,6 +79,8 @@ namespace UI.ActivityMain
             m_activityTime = null;
             m_backBtn = null;
             m_viewBtn = null;
+            m_bgEffect = null;
+            m_btnEffect = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -1,5 +1,6 @@
 using GFGGame;
 using ET;
+using System.Collections.Generic;
 
 namespace ET
 {
@@ -24,6 +25,18 @@ namespace ET
             roleInfo.roleLv = message.RoleInfo.RoleLvl;
             roleInfo.roleName = message.RoleInfo.RoleName;
             roleInfo.offlineTimeSec = message.RoleInfo.OfflineTimeSec;
+            roleInfo.headId = message.RoleInfo.HeadItemId;
+            roleInfo.headBorderId = message.RoleInfo.HeadBorderItemId;
+            roleInfo.leagueName = message.RoleInfo.LeagueName;
+            roleInfo.itemList = new List<int>();
+            for(int i=0;i< message.RoleInfo.ItemList.Count; i++)
+            {
+                roleInfo.itemList.Add(message.RoleInfo.ItemList[i]);
+            }
+            roleInfo.suitCollect = message.RoleInfo.SuitCollect;
+            roleInfo.cardCollect = message.RoleInfo.CardCollect;
+            roleInfo.achievementTaskCollect = message.RoleInfo.AchievementTaskCollect;
+            roleInfo.roleExp = message.RoleInfo.RoleExp;
 
             FriendDataManager.Instance.ChangeFriendInfo(roleInfo);
             EventAgent.DispatchEvent(ConstMessage.FRIEND_REFRESH);

GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs

@@ -45,7 +45,7 @@ namespace GFGGame
 
             bringToFontOnClick = false;
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("qrhd_banner_yxzy");
+            //_ui.m_loaBg.url = ResPathUtil.GetBgImgPath("qrhd_banner_yxzy");
             _ui.m_DayList.itemRenderer = DayListRenderer;
             _ui.m_comTaskList.m_TaskList.itemRenderer = TaskListRenderer;
             _ui.m_tip.onClick.Add(RuleController.ShowRuleView);

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

@@ -9,9 +9,14 @@ namespace GFGGame
     public class ActivityZCJBView : BaseWindow
     {
         private UI_ActivityZCJB _ui;
+        private EffectUI _effectUI1;
+        private EffectUI _effectUI2;
         public override void Dispose()
         {
-
+            EffectUIPool.Recycle(_effectUI1);
+            _effectUI1 = null;
+            EffectUIPool.Recycle(_effectUI2);
+            _effectUI2 = null;
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -30,6 +35,9 @@ namespace GFGGame
             _ui.m_rewardBTn.onClick.Add(OnClickShowReward);
             _ui.m_backBtn.onClick.Add(this.Hide);
             _ui.m_btnChange.onClick.Add(this.Hide);
+
+            _effectUI1 = EffectUIPool.CreateEffectUI(_ui.m_bgEffect, "ui_Activity", "zcjb_All");
+            _effectUI2 = EffectUIPool.CreateEffectUI(_ui.m_btnEffect, "ui_Activity", "zcjb_icon");
         }
         protected override void OnShown()
         {

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

@@ -11,7 +11,7 @@ namespace GFGGame
     {
         private UI_MonthlyCardTipsUI _ui;
         private int rewards = 3;
-        private List<int> itemID = new List<int>() { 1000005, 1000004, 5005006 };
+        private List<int> itemID = new List<int>() { 1000005, 1000004, 5005011 };
         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>() { "x1800", "x300", "专属头像框" };
         public override void Dispose()
@@ -72,11 +72,11 @@ namespace GFGGame
             }
             if(index == rewards - 1)
             {
-                item.m_icon.url = "ui://ActivityMain/" + itemCfg.res;
+                item.m_icon.url = ResPathUtil.GetIconPath(itemCfg.res, "png");
             }
             else
             {
-                item.m_icon.url = ResPathUtil.GetCommonGameResPath(itemCfg.res);
+                item.m_icon.url = ResPathUtil.GetIconPath(itemCfg.res,"png");
             }
             item.m_txtNum.text = rewardNum[index];
             item.target.data = itemCfg;

GameClient/Assets/Game/HotUpdate/Views/Card/CardDetailView.cs

@@ -77,7 +77,7 @@ namespace GFGGame
             {
                 _startInAnim = false;
                 _ui.m_comListCard.m_listCard.scrollPane.ScrollTop();
-                _ui.m_In.Play();
+                //_ui.m_In.Play();
             }
         }
         protected override void OnHide()
@@ -105,7 +105,7 @@ namespace GFGGame
 
         private void FilterItems()
         {
-            _ui.m_Refresh.Play();
+            //_ui.m_Refresh.Play();
             _ui.m_comListCard.m_listCard.scrollPane.ScrollTop();
             UpdateCardList();
         }

GameClient/Assets/Game/HotUpdate/Views/Friend/FriendView.cs

@@ -69,7 +69,12 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _friendRoleId = this.viewData == null ? 0 : (long)this.viewData;
+
+            if (backRefresh)
+            {
+                _friendRoleId = this.viewData == null ? 0 : (long)this.viewData;
+            }
+            
             if (_sceneObject == null)
             {
                 CustomSuitData customSuit = CustomSuitDataManager.GetSuitList(CustomSuitDataManager.currentIndex);
@@ -308,12 +313,12 @@ namespace GFGGame
         {
             if (_friendRoleId == 0)
             {
-                ViewManager.Show<RoleInfoView>();
+                ViewManager.Show<RoleInfoView>(null,false,false);
             }
             else
             {
                 FriendInfoData friendInfoData = FriendDataManager.Instance.GetFriendDataById(_friendRoleId);
-                ViewManager.Show<OtherRoleInfoView>(new object[] { friendInfoData.roleInfo, friendInfoData.roleDetailInfo });
+                ViewManager.Show<OtherRoleInfoView>(new object[] { friendInfoData.roleInfo, friendInfoData.roleDetailInfo },false,false);
             }
         }
         private void OnBtnAddClick()

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -9,7 +9,7 @@ using System.Linq;
 
 namespace GFGGame
 {
-    public class LuckyBoxView : BaseView
+    public class LuckyBoxView : BaseWindow
     {
         private UI_LuckyBoxUI _ui;
         private ValueBarController _valueBarController;

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -1053,6 +1053,8 @@ namespace GFGGame
 
         private void MainUIAnimFinished()
         {
+            // 摘星特效 在未解锁的时候不显示
+            _ui.m_btnZhaiXing.m_holder1.visible = !_ui.m_btnZhaiXing.m_loaLockIcons.visible;
             _ui.m_grpLeagueTips.visible = _btnLeague.visible && LeagueDataManager.Instance.CheckLeagueMainTips() != "";
 
             if (_ui.m_grpLeagueTips.visible)

GameClient/Assets/Game/HotUpdate/Views/Notice/NoticeView.cs

@@ -38,7 +38,7 @@ namespace GFGGame
             this.viewCom.Center();
             this.modal = true;
             viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
-            isReturnView = true;
+            //isReturnView = true;
         }
 
         protected override void OnInit()

GameClient/Assets/ResIn/UI/Main/Main_atlas0_11!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 01ccfcd5e70249f4cb2bb4d66cfd5b9a
+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/Main/Main_atlas0_11.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: d45accf141beaea43a002079d45a9d95
+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: