搭配赛补充提交

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

@@ -196,13 +196,16 @@ namespace GFGGame
         {
             TransformData transData = new TransformData();
             string[] parts = Regex.Split(strTrans, "_");
-            transData.position.x = float.Parse(parts[0]);
-            transData.position.y = float.Parse(parts[1]);
-            transData.position.z = float.Parse(parts[2]);
-            transData.rotationZ = float.Parse(parts[3]);
-            transData.scale.x = float.Parse(parts[4]);
-            transData.scale.y = float.Parse(parts[5]);
-            transData.scale.z = float.Parse(parts[6]);
+            if(parts.Length > 6)
+            {
+                transData.position.x = float.Parse(parts[0]);
+                transData.position.y = float.Parse(parts[1]);
+                transData.position.z = float.Parse(parts[2]);
+                transData.rotationZ = float.Parse(parts[3]);
+                transData.scale.x = float.Parse(parts[4]);
+                transData.scale.y = float.Parse(parts[5]);
+                transData.scale.z = float.Parse(parts[6]);
+            }
             return transData;
         }
         //存储道具信息

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

@@ -14,6 +14,7 @@ namespace ET
             MatchingCompetitionDataManager.Instance.MatchingCompetitionSeason = message.JudgingRoundOpenId;
             MatchingCompetitionDataManager.Instance.MatchingEndTimes = message.PhaseEndTime;
             MatchingCompetitionDataManager.Instance.MatchingState = message.PhaseType;
+            //await MatchingCompetitionSproxy.ReqMatchingCompetitionInfo();
             await ETTask.CompletedTask;
         }
     }

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

@@ -102,11 +102,16 @@ namespace GFGGame
         {
             long endTime = MatchingCompetitionDataManager.Instance.MatchingEndTimes;
             long curTime = TimeHelper.ServerNow();
+            if(MatchingCompetitionDataManager.Instance.MatchingState != 1)
+            {
+                Timers.inst.Remove(UpdateTime);
+                PromptController.Instance.ShowFloatTextPrompt("投稿时间已到!");
+                ViewManager.GoBackFrom(typeof(MatchingCompetitionGatheringView).FullName);
+                return;
+            }
             if (endTime < curTime + 1)
             {
                 Timers.inst.Remove(UpdateTime);
-                //PromptController.Instance.ShowFloatTextPrompt("投稿时间已到!");
-                //ViewManager.GoBackFrom(typeof(MatchingCompetitionGatheringView).FullName);
                 return;
             }
             TimeUtil.FormattingTime(curTime, endTime, out int num, out string str);

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

@@ -106,10 +106,16 @@ namespace GFGGame
                 _ui.m_select2.m_numText.visible = true;
                 _ui.m_select1.m_numText.text = string.Format("心动值{0}", MatchingTwoDataManager.Instance.LeftRoleInfo.JudgingInfo.Score.ToString());
                 _ui.m_timeText.text = string.Format("剩余次数：{0}", MatchingCompetitionDataManager.Instance.MatchingRemainingTimes);
-                _ui.m_BtnBack.touchable = false;
-                _ui.m_t0.Play(() => OnClickBtnBack());
             }
-
+            _ui.m_t0.Play(async () =>
+            {
+                bool resulst = await MatchingCompetitionSproxy.ReqGetTwoPlayers();
+                if (resulst)
+                {
+                    UpdateView();
+                    UpdatePlayer();
+                }
+            });
         }
         private async void OnClickBtnSelect2()
         {
@@ -128,9 +134,16 @@ namespace GFGGame
                 _ui.m_select2.m_numText.visible = true;
                 _ui.m_select2.m_numText.text = string.Format("心动值{0}", MatchingTwoDataManager.Instance.RightRoleInfo.JudgingInfo.Score.ToString());
                 _ui.m_timeText.text = string.Format("剩余次数：{0}", MatchingCompetitionDataManager.Instance.MatchingRemainingTimes);
-                _ui.m_BtnBack.touchable = false;
-                _ui.m_t1.Play(() => OnClickBtnBack());
             }
+            _ui.m_t1.Play(async () => 
+            {
+                bool resulst = await MatchingCompetitionSproxy.ReqGetTwoPlayers();
+                if (resulst)
+                {
+                    UpdateView();
+                    UpdatePlayer();
+                }
+            });
         }
     }
 }

GameClient/Assets/ResIn/UI/MatchingCompetition/MatchingCompetition_atlas0_2!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 473a5e7e81f0fe44fa22ecbb568a902e
+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/MatchingCompetition/MatchingCompetition_atlas0_2.png.meta

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