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

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

@@ -25,18 +25,28 @@ namespace GFGGame
                 else if (!MainStoryDataManager.CheckChapterUnlock(chapterCfg.id))
                 {
                     StoryChapterCfg chapterTowCfg = _chapterCfgs[Mathf.Max(0, i - 1)];
+                    StoryChapterCfg chaptersuitCfg = _chapterCfgs[Mathf.Max(0, i - 2)];
                     var list = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(chapterTowCfg.type, chapterTowCfg.subType, chapterTowCfg.id);
                     StoryLevelCfg lastLevelCfg = list[list.Count - 1];
                     //这里是当下一章没解锁，但是上一章的最后一关已经通过了
-                    if (lastLevelCfg != null && InstanceZonesDataManager.CheckLevelPass(lastLevelCfg.id))//MainStoryDataManager.CheckLevelUnlock(lastLevelCfg.id))
+                    if (lastLevelCfg != null && InstanceZonesDataManager.CheckLevelPass(lastLevelCfg.id))
+                    {
+                        ViewManager.Show<StoryChapterListView>(new object[] { 0, Mathf.Max(0, chapterCfg.order - 1) });
+                        isOpen = false;
+                        return isOpen;
+                    }
+                    if (StoryController.CheckSuitGot(chaptersuitCfg.suitId))
+                    {
+                        ViewManager.Show<StoryChapterView>(new object[] { chapterCfg.id - 1, 0 });
+                        isOpen = false;
+                        return isOpen;
+                    }
+                    else
                     {
                         ViewManager.Show<StoryChapterListView>(new object[] { 0, Mathf.Max(0, chapterCfg.order - 1) });
                         isOpen = false;
                         return isOpen;
                     }
-                    ViewManager.Show<StoryChapterView>(new object[] { chapterCfg.id - 1, 0 });
-                    isOpen = false;
-                    return isOpen;
                 }
             }
             return isOpen;

GameClient/Assets/Game/HotUpdate/DressUp/SceneController.cs

@@ -113,6 +113,7 @@ namespace GFGGame
             if (value == "0")
             {
                 SpriteHelper.RemoveSpriteFrom(spr);
+                SpriteHelper.RemoveSpriteFrom(sprFace);
             }
             else
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_ComModelRes.cs

@@ -9,6 +9,7 @@ namespace UI.LuckyBox
         public GComponent target;
         public GLoader m_loaRes;
         public GGraph m_holder;
+        public GLoader m_loaTitle;
         public const string URL = "ui://drx9d1uso4m7tf6";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "ComModelRes";
@@ -58,11 +59,13 @@ namespace UI.LuckyBox
         {
             m_loaRes = (GLoader)comp.GetChild("loaRes");
             m_holder = (GGraph)comp.GetChild("holder");
+            m_loaTitle = (GLoader)comp.GetChild("loaTitle");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaRes = null;
             m_holder = null;
+            m_loaTitle = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_StoryChapterUI.cs

@@ -29,6 +29,11 @@ namespace UI.Main
         public GLoader m_switchChapter;
         public GTextField m_ZCJBTimeText;
         public GGroup m_ActivityZCJB;
+        public GLoader m_suitBg;
+        public GTextField m_suitText;
+        public GLoader m_suitIcon;
+        public GTextField m_suitNum;
+        public GGroup m_targetSuit;
         public Transition m_t0;
         public const string URL = "ui://mfvz4q8km7n51u";
         public const string PACKAGE_NAME = "Main";
@@ -99,6 +104,11 @@ namespace UI.Main
             m_switchChapter = (GLoader)comp.GetChild("switchChapter");
             m_ZCJBTimeText = (GTextField)comp.GetChild("ZCJBTimeText");
             m_ActivityZCJB = (GGroup)comp.GetChild("ActivityZCJB");
+            m_suitBg = (GLoader)comp.GetChild("suitBg");
+            m_suitText = (GTextField)comp.GetChild("suitText");
+            m_suitIcon = (GLoader)comp.GetChild("suitIcon");
+            m_suitNum = (GTextField)comp.GetChild("suitNum");
+            m_targetSuit = (GGroup)comp.GetChild("targetSuit");
             m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
@@ -129,6 +139,11 @@ namespace UI.Main
             m_switchChapter = null;
             m_ZCJBTimeText = null;
             m_ActivityZCJB = null;
+            m_suitBg = null;
+            m_suitText = null;
+            m_suitIcon = null;
+            m_suitNum = null;
+            m_targetSuit = null;
             m_t0 = null;
             if(disposeTarget && target != null)
             {

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

@@ -125,6 +125,7 @@ namespace GFGGame
             gamey = GameObject.Find("Stage/GRoot/Window - StoryChapterUI/ContentPane/CompChapter/Container/Container");
             _ui.m_chapter.m_compChapterScroll.m_imgBegin.visible = false;
             _ui.m_chapter.m_compChapterScroll.m_nextEffect.visible = false;
+            _ui.m_targetSuit.visible = false;
 
             Timers.inst.StartCoroutine(InitChapter());
 

GameClient/Assets/Game/HotUpdate/Views/Common/Alert/AlertWindow.cs

@@ -54,7 +54,7 @@ namespace GFGGame
             this.SetTips(m_tips);
             this.SetLeftButton(m_isShowLeftButton, m_textLeft);
             this.SetRightButton(m_isShowRightButton, m_textRight);
-
+            this.SetShowCheck(false);
             updateButtonPosition();
             _ui.m_btnLeft.onClick.Add(() =>
             {

GameClient/Assets/Game/HotUpdate/Views/Common/Controller/LuckyBoxController.cs

@@ -88,10 +88,12 @@ namespace GFGGame
 
             UI_ComModelRes comRes = _comModel.m_comModelRes;
             _comModel.m_loaBg.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.bgResArr[_bgIndex]);
+
             if (_luckyBoxCfg.resArr.Length > 0)
             {
                 //comRes.m_loaRes.url = string.Format("ui://LuckyBox/{0}", _luckyBoxCfg.resArr[_modelIndex]);
                 comRes.m_loaRes.url = ResPathUtil.GetBgImgPath(_luckyBoxCfg.resArr[_modelIndex]);
+                comRes.m_loaTitle.url = "ui://LuckyBox/" + _luckyBoxCfg.resArr[_modelIndex];
                 comRes.m_loaRes.SetPosition(_luckyBoxCfg.posArr[_modelIndex][0], _luckyBoxCfg.posArr[_modelIndex][1], 1);
 
                 int direction = _luckyBoxCfg.scaleArr[_modelIndex] >= 0 ? 1 : -1;
@@ -175,6 +177,7 @@ namespace GFGGame
 
             UI_ComModel _comModel = UI_ComModel.Proxy(_com);
             _comModel.m_comModelRes.m_loaRes.url = "";
+            _comModel.m_comModelRes.m_loaTitle.url = "";
             UI_ComModel.ProxyEnd();
             Timers.inst.Remove(UpdateTime);
         }

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

@@ -122,7 +122,8 @@ namespace GFGGame
             }
             else
             {
-                if (MainStoryDataManager.CheckChapterUnlock(chapterID))
+                StoryChapterCfg previousChapterCfg = _chapterCfgs[Mathf.Max(0, index - 1)];
+                if (MainStoryDataManager.CheckChapterUnlock(chapterID) && StoryController.CheckSuitGot(previousChapterCfg.suitId))
                 {
                     //if (chapterIndex == chapterCfg.order)
                     //{
@@ -254,11 +255,12 @@ namespace GFGGame
                 int index = i - 1;
                 int chapterID = (int)listItem.target.data;
                 StoryChapterCfg chapterCfg = _chapterCfgs[index];
+                StoryChapterCfg previousChapterCfg = _chapterCfgs[Mathf.Max(0, index - 1)];
                 int starCountChapter = InstanceZonesDataManager.GetChapterStarCount(chapterCfg.id, chapterCfg.type, chapterCfg.subType);
                 listItem.m_content.m_txtCurProgress.text = starCountChapter.ToString();
                 listItem.m_content.m_txtMaxProgress.text = chapterCfg.bonusStar3.ToString();
                 _ui.m_listChapter.GetChildAt(i).visible = false;
-                if (MainStoryDataManager.CheckChapterUnlock(chapterCfg.id))
+                if (MainStoryDataManager.CheckChapterUnlock(chapterCfg.id) && StoryController.CheckSuitGot(previousChapterCfg.suitId))
                 {
                     listItem.m_content.m_imgLockBg.visible = false;
                     listItem.m_content.m_txtLockDesc.visible = false;
@@ -274,7 +276,7 @@ namespace GFGGame
                     }
                     else
                     {
-                        if (MainStoryDataManager.CheckChapterIsHard(chapterID) && !MainStoryDataManager.CheckNeedChapterPass(chapterID, out var needChapterId))
+                        if (MainStoryDataManager.CheckChapterIsHard(chapterID) && !MainStoryDataManager.CheckNeedChapterPass(chapterID, out var needChapterId) && StoryController.CheckSuitGot(needChapterId))
                         {
                             var needChapterCfg = StoryChapterCfgArray.Instance.GetCfg(needChapterId);
                             listItem.m_content.m_txtLockDesc.text = $"通关第{needChapterCfg.order}章普通剧情后开启";

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

@@ -83,6 +83,7 @@ namespace GFGGame
             _ui.m_btnHome.onClick.Add(OnClickBtnHome);
             _ui.m_switchChapter.onClick.Add(OnClickSwitchBack);
             _ui.m_chapter.m_compChapterScroll.m_imgBegin.onClick.Add(OnClickNext);
+            _ui.m_suitIcon.onClick.Add(OnClickGotoView);
             _ui.m_bonusBox1.target.onClick.Add(() =>
             {
                 OnClickBonusBox(_ui.m_bonusBox1, 0);
@@ -142,6 +143,7 @@ namespace GFGGame
             gamey = GameObject.Find("Stage/GRoot/Window - StoryChapterUI/ContentPane/CompChapter/Container/Container");
             _ui.m_chapter.m_compChapterScroll.m_imgBegin.visible = false;
             _ui.m_chapter.m_compChapterScroll.m_nextEffect.visible = false;
+            _ui.m_targetSuit.visible = false;
 
             Timers.inst.StartCoroutine(InitChapter());
 
@@ -211,6 +213,11 @@ namespace GFGGame
             Timers.inst.Remove(SetContainerY);
             ViewManager.Show<StoryChapterListView>(new object[] {Mathf.Max(0, currentDifficulty) , newIndex });
         }
+        private void OnClickGotoView()
+        {
+            StoryChapterCfg chapterSuitCfg = StoryChapterCfgArray.Instance.GetCfg(_chapterID);
+            ViewManager.Show<ClothingSyntheticView>(new object[] { chapterSuitCfg.suitId});
+        }
 
         private void OnClickBtnHome()
         {
@@ -219,7 +226,8 @@ namespace GFGGame
 
         private void OnClickNext()
         {
-            if (MainStoryDataManager.CheckChapterUnlock(_chapterID+1))
+            StoryChapterCfg chapterSuitCfg = StoryChapterCfgArray.Instance.GetCfg(_chapterID);
+            if (MainStoryDataManager.CheckChapterUnlock(_chapterID+1) && StoryController.CheckSuitGot(chapterSuitCfg.suitId))
             {
                 Timers.inst.Remove(SetContainerY);
                 ViewManager.Show<StoryChapterView>(new object[] { _chapterID+1, currentDifficulty });
@@ -233,7 +241,7 @@ namespace GFGGame
                 }
                 else
                 {
-                    PromptController.Instance.ShowFloatTextPrompt("需通关前置关卡");
+                    PromptController.Instance.ShowFloatTextPrompt("需集齐所需套装");
                 }
                 
             }
@@ -268,6 +276,21 @@ namespace GFGGame
             {
                 _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;
+                    SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(chapterCfg.suitId);
+                    _ui.m_suitIcon.url = ResPathUtil.GetIconPath(suitCfg.res, "png");
+                    _ui.m_suitText.text = suitCfg.name;
+                    int count;
+                    int totalCount;
+                    DressUpMenuSuitDataManager.GetSuitProgressBySuitId(chapterCfg.suitId, out count, out totalCount);
+                    _ui.m_suitNum.text = count + "/" + totalCount;
+                }
+                else
+                {
+                    _ui.m_targetSuit.visible = false;
+                }
             }
 
             //根据困难程度选择显示图片

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

@@ -42,10 +42,11 @@ namespace GFGGame
                     {
                         StoryChapterCfg lastChapter = StoryChapterCfgArray.Instance.GetCfg(levelCfg.chapterId);
                         ViewManager.Show<StoryChapterListView>(new object[] { index, lastChapter.order }, true);
+                        return;
                     }
                     else
                     {
-                        ViewManager.Show<StoryChapterListView>(new object[] { index , nextStoryChapterCfg.order},true);
+                        ViewManager.Show<StoryChapterListView>(new object[] { index, nextStoryChapterCfg.order }, true);
                     }
                     
                 }
@@ -61,7 +62,21 @@ namespace GFGGame
             }
         }
 
-
+        public static bool CheckSuitGot(int suitID = 0)
+        {
+            if(suitID == 0)
+            {
+                return true;
+            }
+            int count;
+            int totalCount;
+            DressUpMenuSuitDataManager.GetSuitProgressBySuitId(suitID, out count, out totalCount);
+            if(count >= totalCount)
+            {
+                return true;
+            }
+            return false;
+        }
 
         public static void ShowCardStoryDialog(CardStoryCfg cardStoryCfg, CardData cardData)
         {

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

@@ -951,7 +951,7 @@ namespace GFGGame
             if (_ui.m_btnActivityZCJB.target.visible)
             {
                 if (redPointUpdateFrame == 20)
-                    RedDotController.Instance.SetComRedDot(_ui.m_btnActivityZCJB.target, ActivityDataManager.Instance.CheckZCJBRed(), "", -20, -3);
+                    RedDotController.Instance.SetComRedDot(_ui.m_btnActivityZCJB.target, ActivityDataManager.Instance.CheckZCJBRed(), "", -12, 5);
             }
 
             redPointUpdateFrame++;

GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_4!a.png.meta → GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8!a.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0da4325dd4b1baa4a8b19dce7cfe0a5c
+guid: 1179efef6c0604a44a840ce62038780b
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0_4.png.meta → GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: eeb4d50565d3baa4ab61c4ffc5417cd3
+guid: 5af6ff1c9a762fd428df4fda4068be6f
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

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

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 9ba8b683ecd004a4d85ca067cec09927
+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_12.png.meta

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