搭配赛补充提交

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

@@ -809,41 +809,81 @@ namespace GFGGame
                 MatchingCompetitionDataManager.Instance.MathingDressDate = MyDressUpHelper.dressUpObj.DressUpDataClone();
                 MatchingCompetitionDataManager.Instance.SetTransformData();
 
-                AlertUI.Show("作品已保存，是否确认上传此作品？")
-                .SetLeftButton(true, "否").SetRightButton(true, "是", async (object data) =>
+                if(MatchingCompetitionDataManager.Instance.WorksID == 0)
                 {
-                    ViewManager.Show<ModalStatusView>("上传中...");
-                    //await MatchingCompetitionSproxy.ReqMatchingCompetitionInfo();
-                    object[] rsp = await MatchingCompetitionSproxy.UpLoadMatchingCompetitionDressData();
-                    if (rsp == null) return;
-                    byte[] bytes = tex.EncodeToJPG();
-                    MatchingCompetitionDataManager.Instance.MyNtextture = new NTexture(tex);
-                    if (rsp[0] == null)
-                    {
-                        ViewManager.Hide<ModalStatusView>();
-                        PromptController.Instance.ShowFloatTextPrompt("网络异常，上传失败!");
-                        return;
-                    }
-                    bool pushResult = await PictureStorageHelper.PushToHWCloud(rsp[0].ToString(), bytes);
-                    if (!pushResult)
+                    OnUpLoad(tex);
+                }
+                else
+                {
+                    AlertUI.Show("作品已保存，是否确认上传并替换作品？")
+                    .SetLeftButton(true, "否").SetRightButton(true, "是", async (object data) =>
                     {
-                        ViewManager.Hide<ModalStatusView>();
-                        PromptController.Instance.ShowFloatTextPrompt("网络异常，上传失败!");
-                        return;
-                    }
+                        ViewManager.Show<ModalStatusView>("上传中...");
+                        //await MatchingCompetitionSproxy.ReqMatchingCompetitionInfo();
+                        object[] rsp = await MatchingCompetitionSproxy.UpLoadMatchingCompetitionDressData();
+                        if (rsp == null) return;
+                        byte[] bytes = tex.EncodeToJPG();
+                        MatchingCompetitionDataManager.Instance.MyNtextture = new NTexture(tex);
+                        if (rsp[0] == null)
+                        {
+                            ViewManager.Hide<ModalStatusView>();
+                            PromptController.Instance.ShowFloatTextPrompt("网络异常，上传失败!");
+                            return;
+                        }
+                        bool pushResult = await PictureStorageHelper.PushToHWCloud(rsp[0].ToString(), bytes);
+                        if (!pushResult)
+                        {
+                            ViewManager.Hide<ModalStatusView>();
+                            PromptController.Instance.ShowFloatTextPrompt("网络异常，上传失败!");
+                            return;
+                        }
 
-                    bool result = await MatchingCompetitionSproxy.UploadSuccess();
-                    if (result)
-                    {
+                        bool result = await MatchingCompetitionSproxy.UploadSuccess();
+                        if (result)
+                        {
+                            ViewManager.Hide<ModalStatusView>();
+                            PromptController.Instance.ShowFloatTextPrompt("上传成功!");
+                            this.Hide();
+                            EventAgent.DispatchEvent(ConstMessage.CLOSE_PHOTOGRAPHVIEW);
+                            ViewManager.GoBackFrom(typeof(DressUpView).FullName);
+                        }
                         ViewManager.Hide<ModalStatusView>();
-                        PromptController.Instance.ShowFloatTextPrompt("上传成功!");
-                        this.Hide();
-                        EventAgent.DispatchEvent(ConstMessage.CLOSE_PHOTOGRAPHVIEW);
-                        ViewManager.GoBackFrom(typeof(DressUpView).FullName);
-                    }
-                    ViewManager.Hide<ModalStatusView>();
-                });
+                    });
+                }
+
+            }
+        }
+        private async void OnUpLoad(Texture2D tex)
+        {
+            ViewManager.Show<ModalStatusView>("上传中...");
+            object[] rsp = await MatchingCompetitionSproxy.UpLoadMatchingCompetitionDressData();
+            if (rsp == null) return;
+            byte[] bytes = tex.EncodeToJPG();
+            MatchingCompetitionDataManager.Instance.MyNtextture = new NTexture(tex);
+            if (rsp[0] == null)
+            {
+                ViewManager.Hide<ModalStatusView>();
+                PromptController.Instance.ShowFloatTextPrompt("网络异常，上传失败!");
+                return;
+            }
+            bool pushResult = await PictureStorageHelper.PushToHWCloud(rsp[0].ToString(), bytes);
+            if (!pushResult)
+            {
+                ViewManager.Hide<ModalStatusView>();
+                PromptController.Instance.ShowFloatTextPrompt("网络异常，上传失败!");
+                return;
+            }
+
+            bool result = await MatchingCompetitionSproxy.UploadSuccess();
+            if (result)
+            {
+                ViewManager.Hide<ModalStatusView>();
+                PromptController.Instance.ShowFloatTextPrompt("上传成功!");
+                this.Hide();
+                EventAgent.DispatchEvent(ConstMessage.CLOSE_PHOTOGRAPHVIEW);
+                ViewManager.GoBackFrom(typeof(DressUpView).FullName);
             }
+            ViewManager.Hide<ModalStatusView>();
         }
         private void OnClickBtnBack()
         {           
@@ -855,6 +895,7 @@ namespace GFGGame
                 {
                     this.Hide();
                     EventAgent.DispatchEvent(ConstMessage.CLOSE_PHOTOGRAPHVIEW);
+                    ViewManager.GoBackFrom(typeof(PhotographView).FullName);
                 });
              }
             else