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

GameClient/Assets/Editor/Excel/CodeBuilder.cs

@@ -504,7 +504,8 @@ namespace GFGEditor
                     }
                     if (string.IsNullOrEmpty(_value))
                     {
-                        ET.Log.Error(configArrayName + "  第" + row + "行  " + _type + "   无数值!");
+                        ET.Log.Error(configArrayName + "  第" + row + "行  " + _type + "   无数值!name:" + name + ",id:" +
+                                     worksheet[row, 1].Text.ToString());
                         continue;
                     }
                     if (!_twoDimensionalDic.ContainsKey(_types[1]))

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

@@ -254,5 +254,7 @@ namespace GFGGame
         public const string NEWROLEGETSUIT = "NEWROLE_GETSUIT";
         //搭配学院升级成功
         public const string COLLEGE_UPGRADE = "COLLEGE_UPGRADE";
+        //兑换成功
+        public const string EXCHANGE_SUCCESS = "EXCHANGE_SUCCESS";
     }
 }

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

@@ -13,7 +13,7 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     ItemDataManager.InitItemExchange(response.ItemId, response.ExchangedTimes);
-                    // EventAgent.DispatchEvent(ConstMessage.SHOP_BUY);
+                    EventAgent.DispatchEvent(ConstMessage.EXCHANGE_SUCCESS);
                     return true;
                 }
             }

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

@@ -147,7 +147,6 @@ namespace GFGGame
             listItem.m_txtLv.text = data.lv + "级";
             listItem.m_txtName.text = data.itemCfg.name;
             RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.GetCardRed(data.id), "", 5, -10);
-            RedDotController.Instance.SetComRedDot(listItem.target, RedDotDataManager.Instance.CheckCardCanSynthetic(data.id), "", 5, -10);
             listItem.m_rarity.selectedIndex = data.itemCfg.rarity;
 
             if (data.itemCfg.rarity == 5)

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

@@ -126,6 +126,7 @@ namespace GFGGame
             {
                 item.m_loaIcon.url = "ui://DailyWelfare/hdbn_xslc_" + openCfg.res;
                 item.m_loaTitle.url = "ui://DailyWelfare/hdbn_wz_xslc_" + openCfg.res;
+                item.m_loaTitle.visible = false;
             }
             else if (openCfg.id == 501)
             {

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

@@ -147,7 +147,7 @@ namespace GFGGame
             _recordOpenIndex.Clear();
             _recordTurnIndex.Clear();
             _itemHasNew.Clear();
-            _ui.m_BtnPass.visible = true;
+            _ui.m_BtnPass.visible = false;
             _ui.m_touchFlipOpen.touchable = false;
             GetSuitItemController.isAuto = false;
 

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

@@ -37,7 +37,7 @@ namespace GFGGame
 
             BtnSkipVertical = _ui.transform.Find("BtnSkipVertical").GetComponent<Button>();
             BtnSkipVertical.onClick.AddListener(OnClickrectBtnSkip);
-            BtnSkipVertical.gameObject.SetActive(false);
+            BtnSkipVertical.gameObject.SetActive(true);
 
             videoPlayer = _ui.transform.Find("VideoPlayer").GetComponent<VideoPlayer>();
             videoPlayer.loopPointReached += OnVideoEnded;

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

@@ -153,7 +153,15 @@ namespace GFGGame
                 }
                 else
                 {
-
+                    StoryChapterCfg chapter = StoryChapterCfgArray.Instance.GetCfg(chapterID);
+                    if (!StoryController.CheckSuitGot(chapter.suitId))
+                    {
+                        PromptController.Instance.ShowFloatTextPrompt("需集齐所需套装");
+                    }
+                    else if (GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl) < chapterCfg.lvl)
+                    {
+                        PromptController.Instance.ShowFloatTextPrompt(string.Format("角色等级达到{0}级开启", chapterCfg.lvl));
+                    }
                 }
             }
 

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

@@ -302,10 +302,13 @@ namespace GFGGame
 
             StoryLevelCfg lastLevelCfg = list[list.Count - 1];
             StoryChapterCfg LastChapterCfg = StoryChapterCfgArray.Instance.GetCfg(_chapterID + 1);
-            if (lastLevelCfg != null && InstanceZonesDataManager.CheckLevelPass(lastLevelCfg.id) && LastChapterCfg != null)
+            if (lastLevelCfg != null && InstanceZonesDataManager.CheckLevelPass(lastLevelCfg.id))
             {
-                _ui.m_chapter.m_compChapterScroll.m_imgBegin.visible = true;
-                _ui.m_chapter.m_compChapterScroll.m_nextEffect.visible = true;
+                if(LastChapterCfg != null)
+                {
+                    _ui.m_chapter.m_compChapterScroll.m_imgBegin.visible = true;
+                    _ui.m_chapter.m_compChapterScroll.m_nextEffect.visible = true;
+                }    
                 if (chapterCfg.suitId > 0 && chapterCfg.subType == 0)
                 {
                     _ui.m_targetSuit.visible = true;

GameClient/Assets/Game/HotUpdate/Views/PopWindow/ExchangeGoodsView.cs

@@ -45,12 +45,14 @@ namespace GFGGame
         {
             base.AddEventListener();
             EventAgent.AddEventListener(ConstMessage.ITEM_CHANGED, UpdateItem);
+            EventAgent.AddEventListener(ConstMessage.EXCHANGE_SUCCESS, ShowTips);
         }
 
         protected override void RemoveEventListener()
         {
             base.RemoveEventListener();
             EventAgent.RemoveEventListener(ConstMessage.ITEM_CHANGED, UpdateItem);
+            EventAgent.RemoveEventListener(ConstMessage.EXCHANGE_SUCCESS, ShowTips);
         }
 
         protected override void OnShown()
@@ -177,5 +179,9 @@ namespace GFGGame
             _ui.m_txtHasNum.text = "ÒÑÓµÓÐ:" + hasNum;
             _ui.m_listConsume.numItems = itemCfg.param1Arr.Length;
         }
+        private void ShowTips()
+        {
+            PromptController.Instance.ShowFloatTextPrompt("¶Ò»»³É¹¦");
+        }
     }
 }

GameClient/Assets/ResIn/UUI/UILuckyBox.prefab

@@ -275,8 +275,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -217, y: -1195.1}
-  m_SizeDelta: {x: 74, y: 54}
+  m_AnchoredPosition: {x: -188, y: -1232}
+  m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6248673393164723626
 CanvasRenderer:
@@ -306,7 +306,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 2a55691c2480fc542b99763c136a6021, type: 3}
+  m_Sprite: {fileID: 21300000, guid: bb732211d265cf74fb39dbcb0300a188, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

GameClient/Assets/ResIn/UUI/bt_tiaoguo.png.meta

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