茶话会奖励，剧情，结算界面修改

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

@@ -295,43 +295,46 @@ namespace GFGGame
             return matchedValue;
         }
 
-
         //茶话会个人奖励是否可以领取
+
         public bool CheckTeaPartyPersonRewardCanGet(int targetScore)
         {
-            var roleTeapartyInfoProto = LeagueDataManager.Instance.RoleTeapartyInfoProto;
-
-            ET.Log.Debug("打印测试----------infoinfo-------" + roleTeapartyInfoProto.PerAwardStatusVs.Count);
-
-            foreach (var info in roleTeapartyInfoProto.PerAwardStatusVs) {
-
-
-                //if (targetScore) { 
-                    
+            return CheckTeaPartyPersonRewardStatu(targetScore) == 1;
+        }
 
-                    
-                //}
+        //茶话会个人奖励当前状态
+        public int CheckTeaPartyPersonRewardStatu(int targetScore)
+        {
+            var roleTeapartyInfoProto = LeagueDataManager.Instance.RoleTeapartyInfoProto;
+            var teapartyRewardRoleCfg = TeapartyRewardRoleCfgArray.Instance.dataArray;
+            for (int i = 0; i < teapartyRewardRoleCfg.Length; i++) {
+                if (teapartyRewardRoleCfg[i].targetScore == targetScore) {
+                    return roleTeapartyInfoProto.PerAwardStatusVs[i];
+                }
+            }
+            return 0;
+        }
 
+        //茶话会雅集奖励是否可以领取
 
-            }
-            return false;
+        public bool CheckTeaPartyLeagueRewardCanGet(int targetScore)
+        {
+            return CheckTeaPartyLeagueRewardStatu(targetScore) == 1;
         }
 
-        //茶话会个人奖励是否可以领取
-        public bool CheckTeaPartyRewardCanGet(int targetScore)
+        //茶话会雅集奖励是否可以领取
+        public int CheckTeaPartyLeagueRewardStatu(int targetScore)
         {
             var roleTeapartyInfoProto = LeagueDataManager.Instance.RoleTeapartyInfoProto;
-
-            foreach (var info in roleTeapartyInfoProto.LeagueAwardStatusVs)
+            var teapartyRewardLeagueCfgs = TeapartyRewardLeagueCfgArray.Instance.GetCfgsByid(LeagueDataManager.Instance.TeaPartyId); 
+            for (int i = 0; i < teapartyRewardLeagueCfgs.Count; i++)
             {
-                ET.Log.Debug("打印测试----------infoinfo-------" + info);
-                //if (targetScore) { 
-
-
-
-                //}
+                if (teapartyRewardLeagueCfgs[i].targetScore == targetScore)
+                {
+                    return roleTeapartyInfoProto.LeagueAwardStatusVs[i];
+                }
             }
-            return false;
+            return 0;
         }
     }
 }

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/League/UI_LeagueTeaPartyOverUI.cs

@@ -15,9 +15,6 @@ namespace UI.League
         public UI_comTeaPartyOverItem m_TeaPartyOverItem4;
         public UI_comTeaPartyOverItem m_TeaPartyOverItem5;
         public UI_comTeaPartyOverItem m_TeaPartyOverItem6;
-        public GButton m_btnReward;
-        public GButton m_btnRule;
-        public GTextField m_txtTeaName;
         public const string URL = "ui://tw70qm9dic4otq4";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "LeagueTeaPartyOverUI";
@@ -73,9 +70,6 @@ namespace UI.League
             m_TeaPartyOverItem4 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem4"));
             m_TeaPartyOverItem5 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem5"));
             m_TeaPartyOverItem6 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem6"));
-            m_btnReward = (GButton)comp.GetChild("btnReward");
-            m_btnRule = (GButton)comp.GetChild("btnRule");
-            m_txtTeaName = (GTextField)comp.GetChild("txtTeaName");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -93,9 +87,6 @@ namespace UI.League
             m_TeaPartyOverItem5 = null;
             m_TeaPartyOverItem6.Dispose();
             m_TeaPartyOverItem6 = null;
-            m_btnReward = null;
-            m_btnRule = null;
-            m_txtTeaName = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -304,7 +304,7 @@ namespace GFGGame
                 if (response.Error == ErrorCode.ERR_Success)
                 {
                     LeagueDataManager.Instance.Type = response.Type;
-
+                  
                     if (LeagueDataManager.Instance.Type == LeagueJoinType.Join)//1:已经加入军团
                     {
                         LeagueDataManager.Instance.LeagueData = GetLeagueData(response.LeagueDetailInfo);
@@ -314,6 +314,8 @@ namespace GFGGame
                             ReqGetApplyJoinLeagueList().Coroutine();
                             ReqLeagueJoinQuitLog().Coroutine();
                         }
+                        LeagueDataManager.Instance.TeaPartyId = response.LeagueDetailInfo.TeapartyId;
+                        LeagueDataManager.Instance.TeaPartyStatus = response.LeagueDetailInfo.Status;
                     }
                     else if (LeagueDataManager.Instance.Type == LeagueJoinType.UnJoin)//2:未加入军团
                     {
@@ -362,6 +364,8 @@ namespace GFGGame
                 {
                     LeagueDataManager.Instance.LeagueData = GetLeagueData(response.LeagueDetailInfo);
                     LeagueDataManager.Instance.Type = LeagueJoinType.Join;
+                    LeagueDataManager.Instance.TeaPartyId = response.LeagueDetailInfo.TeapartyId;
+                    LeagueDataManager.Instance.TeaPartyStatus = response.LeagueDetailInfo.Status;
                     return true;
                 }
             }
@@ -379,6 +383,8 @@ namespace GFGGame
                     if (response.Type == 2)//加入成功
                     {
                         LeagueDataManager.Instance.LeagueData = GetLeagueData(response.LeagueDetailInfo);
+                        LeagueDataManager.Instance.TeaPartyId = response.LeagueDetailInfo.TeapartyId;
+                        LeagueDataManager.Instance.TeaPartyStatus = response.LeagueDetailInfo.Status;
                     }
                     else if (response.Type == 1)//等待审核
                     {

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -1136,8 +1136,18 @@ namespace GFGGame
             // int mainValuel;
             // ItemDataManager.GetMainScore(id, out mainScore, out mainValuel);
             listItem.m_ScoreType.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + scoreType);
-            listItem.m_txtScore.text = "" + ItemDataManager.GetItemAdditionScore(id, scoreType, _fightCfg.needTagsArr);
-
+            if (!IsTeaPart)
+                listItem.m_txtScore.text = "" + ItemDataManager.GetItemAdditionScore(id, InstanceZonesDataManager.currentScoreType, _fightCfg.needTagsArr);
+            else
+            {
+                if (listItem.m_ListTag.data == null)
+                {
+                    listItem.m_ListTag.itemRenderer = ListTagItem;
+                }
+                listItem.m_ListTag.data = itemCfg;
+                listItem.m_ListTag.numItems = itemCfg.tagsArr.Length;
+            }
+           
             listItem.m_icon.url = ResPathUtil.GetIconPath(iconRes, ext);
             listItem.m_txtTitle.text = partName;
             listItem.target.data = id;

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

@@ -33,9 +33,6 @@ namespace GFGGame
 
             _ui.m_loaBg.url = ResPathUtil.GetDressUpPath("chahuibg");
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
-            _ui.m_btnReward.onClick.Add(OnBtnRewardClick);
-            _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
-            _ui.m_btnRule.data = 300022;
 
             teaPartyOverItemList.Add(_ui.m_TeaPartyOverItem1);
             teaPartyOverItemList.Add(_ui.m_TeaPartyOverItem2);
@@ -76,10 +73,11 @@ namespace GFGGame
             bool result = await LeagueSproxy.GetRoleContainerInfos(RoleDataManager.roleId);
             if (result)
             {
+                var roleContainerList = LeagueDataManager.Instance.RoleContainerList;
                 for (int index = 0; index < teaPartyOverItemList.Count; index++)
                 {
                     teaPartyOverItemList[index].m_txtRoleName.text = teapartyRoleCfg[index].name;
-                    teaPartyOverItemList[index].m_txtGuildName.text = teapartyRoleCfg[index].name;
+                    teaPartyOverItemList[index].m_txtGuildName.text = roleContainerList[index].MaxScoreRoleName;
                 }
             }
         }

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

@@ -103,10 +103,10 @@ namespace GFGGame
                 var cfg = (int[][])item.target.data;
                 var cfgID = cfg[0][0];
                 var itemCfg = ItemCfgArray.Instance.GetCfg(cfgID);
-                //var state = ActivityDay7DataManager.Instance.GetActivityDay7RewardState(cfgID);
-                //item.m_c1.selectedIndex = state ? 1 : 0;
-                //RedDotController.Instance.SetComRedDot(item.target,
-                //    ActivityDay7DataManager.Instance.CheckActivityDay7RewardCanGet(cfgID), "", -90);
+                var state = LeagueDataManager.Instance.CheckTeaPartyPersonRewardStatu(cfgID);
+                item.m_c1.selectedIndex = state;
+                RedDotController.Instance.SetComRedDot(item.target,
+                    LeagueDataManager.Instance.CheckTeaPartyPersonRewardCanGet(cfgID), "", -90);
                 UI_LinessRewardProcessItemBt.ProxyEnd();
             });
         }
@@ -129,7 +129,7 @@ namespace GFGGame
         //Ñż¯ÆÀÑ¡½±Àø
         private void SetLeagueScoreList()
         {
-            var teapartyRewardLeagueCfgs = TeapartyRewardLeagueCfgArray.Instance.GetCfgsByid(1);  //LeagueDataManager.Instance.TeaPartyId
+            var teapartyRewardLeagueCfgs = TeapartyRewardLeagueCfgArray.Instance.GetCfgsByid(LeagueDataManager.Instance.TeaPartyId); 
             var maxCfg = teapartyRewardLeagueCfgs[teapartyRewardLeagueCfgs.Count - 1];
             var maxCfgID = maxCfg.id;
             var maxScore = maxCfg.targetScore;
@@ -162,16 +162,16 @@ namespace GFGGame
 
         private void FreshGetLeagueStatus()
         {
-            componentsPerson.ForEach(com =>
+            componentsLeague.ForEach(com =>
             {
                 var item = UI_LinessRewardProcessItemBt.Proxy(com);
                 var cfg = (int[][])item.target.data;
                 var cfgID = cfg[0][0];
                 var itemCfg = ItemCfgArray.Instance.GetCfg(cfgID);
-                //var state = ActivityDay7DataManager.Instance.GetActivityDay7RewardState(cfgID);
-                //item.m_c1.selectedIndex = state ? 1 : 0;
-                //RedDotController.Instance.SetComRedDot(item.target,
-                //    ActivityDay7DataManager.Instance.CheckActivityDay7RewardCanGet(cfgID), "", -90);
+                var state = LeagueDataManager.Instance.CheckTeaPartyLeagueRewardStatu(cfgID);
+                item.m_c1.selectedIndex = state;
+                RedDotController.Instance.SetComRedDot(item.target,
+                    LeagueDataManager.Instance.CheckTeaPartyLeagueRewardCanGet(cfgID), "", -90);
                 UI_LinessRewardProcessItemBt.ProxyEnd();
             });
         }
@@ -181,14 +181,14 @@ namespace GFGGame
             if (!(context.sender is GObject btnGet)) return;
             int[][] stageReward = (int[][])btnGet.data;
             int id = stageReward[0][0];
-            if (!LeagueDataManager.Instance.CheckTeaPartyPersonRewardCanGet(id))
+            if (!LeagueDataManager.Instance.CheckTeaPartyLeagueRewardCanGet(id))
             {
                 GoodsItemTipsController.ShowItemTips(id);
                 return;
             }
-            var result = await LeagueSproxy.GetPerRatingAward(id);
+            var result = await LeagueSproxy.GetLeagueRatingAward(id);
             if (!result) return;
-            FreshGetStatus();
+            FreshGetLeagueStatus();
         }
     }
 }

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

@@ -137,8 +137,12 @@ namespace GFGGame
             bool result = await LeagueSproxy.TeapartyStartChallenge(RoleDataManager.roleId);
             if (result)
             {
-                string stroyStartID = "50001";
-                ViewManager.Show<StoryDialogView>(new object[] { stroyStartID, false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog), null, true }, null, true);
+                if (LeagueDataManager.Instance.RoleContainerList.Count > 0) {
+                    string stroyStartID = "50001";
+                    ViewManager.Show<StoryDialogView>(new object[] { stroyStartID, false, new OnCompleteStoryDialogCall(OnCompletePriorStoryDialog), null, true }, null, true);
+                }
+                else
+                    ViewManager.Show<LeagueTeaPartyOverView>();
             }
         }
 

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

@@ -344,6 +344,7 @@ namespace GFGGame
             UpdateMusic(storyDialogCfg.musicRes);
             UpdateBg(storyDialogCfg.bgRes);
             UpdatePic(storyDialogCfg.picRes);
+            UpdateRoleObj(storyDialogCfg.name);
             PlayEffect(storyDialogCfg.effectInfoArr);
             PlayShake(storyDialogCfg.shakeInfoArr);
             string content = storyDialogCfg.content;
@@ -624,21 +625,27 @@ namespace GFGGame
 
         private void UpdatePic(string value)
         {
-            if (value.Length > 0)
-            {
+            if (!IsTeaParty)
                 SceneController.UpdateDialogPic(value, _sceneObject);
-            }
-            else if (IsTeaParty)
-            {
-                UpdateRoleObj();
-            }
         }
 
-        private void UpdateRoleObj()
+        private void UpdateRoleObj(string value)
         {
-            ET.Log.Debug("打印测试-------asdfsdfsdaf----------");
+            var roleContainerList = LeagueDataManager.Instance.RoleContainerList;
             MyDressUpHelper.dressUpObj.setSceneObj(_sceneObject, false, false);
-            //MyDressUpHelper.dressUpObj.PutOnDefaultDressUpData(IsTeaParty);
+
+            for (int i = 0; i < roleContainerList.Count; i++) {
+                for (int j = 0; j < roleContainerList[i].EquipIds.Count; j++) {
+                    ET.Log.Debug("打印测试-----六个人物------服装数据----" + roleContainerList[i].EquipIds[j]);
+                }
+                if (value == (i+1).ToString() && roleContainerList[i].EquipIds.Count > 0)
+                {
+                    MyDressUpHelper.dressUpObj.PutOnItemList(roleContainerList[i].EquipIds);
+                    return;
+                }
+            }
+
+            MyDressUpHelper.dressUpObj.PutOnDefaultDressUpData(IsTeaParty);
         }
 
         private void UpdateMusic(string value)

GameClient/Assets/ResIn/UI/League/League_atlas0_8!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 955bc580ab20c114c872810f5ca95c46
+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/League/League_atlas0_8.png.meta

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