搭配赛修改

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MatchingCompetition/UI_Component14.cs

@@ -8,7 +8,6 @@ namespace UI.MatchingCompetition
     {
         public GComponent target;
         public GLoader m_playerImage;
-        public GGraph m_player;
         public const string URL = "ui://ri3cveycp3ft22";
         public const string PACKAGE_NAME = "MatchingCompetition";
         public const string RES_NAME = "Component14";
@@ -57,12 +56,10 @@ namespace UI.MatchingCompetition
         private void Init(GComponent comp)
         {
             m_playerImage = (GLoader)comp.GetChild("playerImage");
-            m_player = (GGraph)comp.GetChild("player");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_playerImage = null;
-            m_player = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MatchingCompetition/UI_MatchingCompetitionSelectUI.cs

@@ -14,11 +14,11 @@ namespace UI.MatchingCompetition
         public GTextField m_titleText;
         public UI_Component11 m_player1;
         public UI_Component11 m_player2;
-        public GTextField m_timeText;
         public UI_Button3 m_select1;
         public GTextField m_selectText1;
         public UI_Button3 m_select2;
         public GTextField m_selectText2;
+        public GTextField m_timeText;
         public GButton m_BtnBack;
         public Transition m_t0;
         public Transition m_t1;
@@ -76,11 +76,11 @@ namespace UI.MatchingCompetition
             m_titleText = (GTextField)comp.GetChild("titleText");
             m_player1 = (UI_Component11)UI_Component11.Create(comp.GetChild("player1"));
             m_player2 = (UI_Component11)UI_Component11.Create(comp.GetChild("player2"));
-            m_timeText = (GTextField)comp.GetChild("timeText");
             m_select1 = (UI_Button3)UI_Button3.Create(comp.GetChild("select1"));
             m_selectText1 = (GTextField)comp.GetChild("selectText1");
             m_select2 = (UI_Button3)UI_Button3.Create(comp.GetChild("select2"));
             m_selectText2 = (GTextField)comp.GetChild("selectText2");
+            m_timeText = (GTextField)comp.GetChild("timeText");
             m_BtnBack = (GButton)comp.GetChild("BtnBack");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
@@ -98,13 +98,13 @@ namespace UI.MatchingCompetition
             m_player1 = null;
             m_player2.Dispose();
             m_player2 = null;
-            m_timeText = null;
             m_select1.Dispose();
             m_select1 = null;
             m_selectText1 = null;
             m_select2.Dispose();
             m_select2 = null;
             m_selectText2 = null;
+            m_timeText = null;
             m_BtnBack = null;
             m_t0 = null;
             m_t1 = null;

GameClient/Assets/Game/HotUpdate/Views/MatchingCompetition/MatchingCompetitionGatheringView.cs

@@ -54,7 +54,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_bg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("pxs_bj");
             _ui.m_c1.selectedIndex = 1;
             JudgingRoundOpenCfg judgingCfg = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason - 1];
             SuitID = judgingCfg.ShowSuit;

GameClient/Assets/Game/HotUpdate/Views/MatchingCompetition/MatchingCompetitionRankView.cs

@@ -39,7 +39,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_bg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("pxs_bj");
             _ui.m_titleText.text = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason - 1].Name;
             UpdateView();
             UpdateHead();

GameClient/Assets/Game/HotUpdate/Views/MatchingCompetition/MatchingCompetitionSelectView.cs

@@ -53,12 +53,12 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_bg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("pxs_bj");
             _ui.m_BtnBack.touchable = true;
             _ui.m_titleText.text = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason - 1].Name;
             //isRefresh = (bool)this.viewData;       
             UpdateView();
-            UpdateDressLeft();
+            //UpdateDressLeft();
             ViewManager.Hide<ModalStatusView>();
         }
 
@@ -99,7 +99,7 @@ namespace GFGGame
             {
                 _sceneObjectLeft = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("ScenePhotograph"));
                 // 创建render texture
-                renderTexureLeft = new RenderTexture((int)_ui.target.width, (int)_ui.target.height, 24);
+                renderTexureLeft = new RenderTexture((int)_ui.m_playerShow1.target.width, (int)_ui.m_playerShow2.target.height, 24);
 
                 // 换装父节点 + 相机            
                 Camera camera = _sceneObjectLeft.transform.Find("Camera").GetComponent<Camera>();
@@ -160,7 +160,7 @@ namespace GFGGame
             {
                 _sceneObjectRight = PrefabManager.Instance.InstantiateSync(ResPathUtil.GetPrefabPath("ScenePhotograph"));
                 // 创建render texture
-                renderTexureRight = new RenderTexture((int)_ui.target.width, (int)_ui.target.height, 24);
+                renderTexureRight = new RenderTexture((int)_ui.m_playerShow1.target.width, (int)_ui.m_playerShow2.target.height, 24);
 
                 // 换装父节点 + 相机            
                 Camera camera = _sceneObjectRight.transform.Find("Camera").GetComponent<Camera>();

GameClient/Assets/Game/HotUpdate/Views/MatchingCompetition/MatchingCompetitionUpLoadView.cs

@@ -51,7 +51,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_bg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("pxs_bj");
             _ui.m_c1.selectedIndex = MatchingCompetitionDataManager.Instance.MatchingState;
             _ui.m_titleText.text = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason - 1].Name;
             isCountTime = false;

GameClient/Assets/Game/HotUpdate/Views/MatchingCompetition/MatchingCompetitionWorkListView.cs

@@ -40,7 +40,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_bg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("pxs_bj");
             _ui.m_titleText.text = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason - 1].Name;
             _seasonIndex = (int)this.viewData;
             UpdateView();

GameClient/Assets/Game/HotUpdate/Views/MatchingCompetition/MatchingCompetitionWorksView.cs

@@ -40,7 +40,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _ui.m_bg.url = ResPathUtil.GetBgImgPath("gzs_fb_bj");
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("pxs_bj");
             _ui.m_titleText.text = JudgingRoundOpenCfgArray.Instance.dataArray[MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason - 1].Name;
             UpdateView();
         }