茶话会换ui

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DressUp/UI_DressUpFightUI.cs

@@ -39,6 +39,9 @@ namespace UI.DressUp
         public GTextField m_txtRecommendCount;
         public GGroup m_graContent;
         public GLoader m_loaGuide;
+        public GButton m_btnSubmission;
+        public GTextField m_txtMatch;
+        public GTextField m_txtTeaPartyName;
         public const string URL = "ui://mbo439wbqsvd2m";
         public const string PACKAGE_NAME = "DressUp";
         public const string RES_NAME = "DressUpFightUI";
@@ -118,6 +121,9 @@ namespace UI.DressUp
             m_txtRecommendCount = (GTextField)comp.GetChild("txtRecommendCount");
             m_graContent = (GGroup)comp.GetChild("graContent");
             m_loaGuide = (GLoader)comp.GetChild("loaGuide");
+            m_btnSubmission = (GButton)comp.GetChild("btnSubmission");
+            m_txtMatch = (GTextField)comp.GetChild("txtMatch");
+            m_txtTeaPartyName = (GTextField)comp.GetChild("txtTeaPartyName");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -159,6 +165,9 @@ namespace UI.DressUp
             m_txtRecommendCount = null;
             m_graContent = null;
             m_loaGuide = null;
+            m_btnSubmission = null;
+            m_txtMatch = null;
+            m_txtTeaPartyName = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -9,13 +9,15 @@ namespace UI.League
         public GComponent target;
         public GLoader m_loaBg;
         public GButton m_btnBack;
-        public GTextField m_txtTeaName;
         public UI_comTeaPartyOverItem m_TeaPartyOverItem1;
+        public UI_comTeaPartyOverItem m_TeaPartyOverItem2;
         public UI_comTeaPartyOverItem m_TeaPartyOverItem3;
         public UI_comTeaPartyOverItem m_TeaPartyOverItem4;
-        public UI_comTeaPartyOverItem m_TeaPartyOverItem2;
         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";
@@ -65,31 +67,35 @@ namespace UI.League
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
-            m_txtTeaName = (GTextField)comp.GetChild("txtTeaName");
             m_TeaPartyOverItem1 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem1"));
+            m_TeaPartyOverItem2 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem2"));
             m_TeaPartyOverItem3 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem3"));
             m_TeaPartyOverItem4 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem4"));
-            m_TeaPartyOverItem2 = (UI_comTeaPartyOverItem)UI_comTeaPartyOverItem.Create(comp.GetChild("TeaPartyOverItem2"));
             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)
         {
             m_loaBg = null;
             m_btnBack = null;
-            m_txtTeaName = null;
             m_TeaPartyOverItem1.Dispose();
             m_TeaPartyOverItem1 = null;
+            m_TeaPartyOverItem2.Dispose();
+            m_TeaPartyOverItem2 = null;
             m_TeaPartyOverItem3.Dispose();
             m_TeaPartyOverItem3 = null;
             m_TeaPartyOverItem4.Dispose();
             m_TeaPartyOverItem4 = null;
-            m_TeaPartyOverItem2.Dispose();
-            m_TeaPartyOverItem2 = null;
             m_TeaPartyOverItem5.Dispose();
             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/FairyGUI/GenCode/League/UI_comTeaPartyItem.cs

@@ -8,10 +8,10 @@ namespace UI.League
     {
         public GComponent target;
         public GLoader m_iconRole;
-        public GLoader m_btnDetail;
         public GTextField m_txtRoleName;
         public GTextField m_txtMaxValue;
         public GImage m_imgChoose;
+        public GLoader m_btnDetail;
         public const string URL = "ui://tw70qm9dchwotpl";
         public const string PACKAGE_NAME = "League";
         public const string RES_NAME = "comTeaPartyItem";
@@ -60,18 +60,18 @@ namespace UI.League
         private void Init(GComponent comp)
         {
             m_iconRole = (GLoader)comp.GetChild("iconRole");
-            m_btnDetail = (GLoader)comp.GetChild("btnDetail");
             m_txtRoleName = (GTextField)comp.GetChild("txtRoleName");
             m_txtMaxValue = (GTextField)comp.GetChild("txtMaxValue");
             m_imgChoose = (GImage)comp.GetChild("imgChoose");
+            m_btnDetail = (GLoader)comp.GetChild("btnDetail");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_iconRole = null;
-            m_btnDetail = null;
             m_txtRoleName = null;
             m_txtMaxValue = null;
             m_imgChoose = null;
+            m_btnDetail = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

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

@@ -30,9 +30,11 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zjm_2_2");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("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;
         }
 
         protected override void AddEventListener()
@@ -58,5 +60,10 @@ namespace GFGGame
         {
             ViewManager.GoBackFrom(typeof(LeagueView).FullName);
         }
+
+        private void OnBtnRewardClick()
+        {
+            ViewManager.Show<LeagueTeaPartyRewardView>();
+        }
     }
 }

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

@@ -30,11 +30,14 @@ namespace GFGGame
             this.viewCom = _ui.target;
             isfullScreen = true;
 
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("zjm_2_2");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("chahuibg");
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
             _ui.m_btnChat.onClick.Add(OnBtnChatClick);
             _ui.m_btnChallenge.onClick.Add(OnBtnChallengeClick);
             _ui.m_btnReward.onClick.Add(OnBtnRewardClick);
+            _ui.m_teaPartyItemTips.target.onClick.Add(OnTeaPartyItemTipsClick);
+            _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
+            _ui.m_btnRule.data = 300022;
 
             _ui.m_ListTeaParty.itemRenderer = ListTeaPartyItemRender;
 
@@ -48,7 +51,6 @@ namespace GFGGame
             itemObj.m_btnDetail.onClick.Add(OnBtnDetailClick);
             itemObj.m_iconRole.onClick.Add(OnBtnIconRoleClick);
             itemObj.m_txtRoleName.text = teapartyRoleCfg[index].name;
-            itemObj.target.onClick.Add(OnTeaPartyItemTipsClick);
 
             UI_comTeaPartyItem.ProxyEnd();
         }
@@ -64,8 +66,6 @@ namespace GFGGame
             GetRoleContainerInfos();
             var openCfg = TeapartyOpenCfgArray.Instance.GetCfg(1);//LeagueDataManager.Instance.TeaPartyId
             _ui.m_txtTeaName.text = openCfg.name;
-            _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
-            _ui.m_btnRule.data = 300022;
             _ui.m_teaPartyItemTips.target.visible = false;
             _ui.m_ListTeaParty.numItems = 6;
         }

GameClient/Assets/ResIn/UI/Studio/Studio_atlas0_3!a.png.meta

@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 895ffd5a0537c3b4a8688dbe83f7ec1c
-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/Studio/Studio_atlas0_3.png.meta

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