From ea717ccdb8f5a3c4b50652a24395c54557bad253 Mon Sep 17 00:00:00 2001 From: lishuo Date: Wed, 28 Jul 2021 14:00:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E6=8B=94=E5=9B=BE=E5=B0=8F=E5=A4=B4?= =?UTF-8?q?=E5=83=8F&=E6=AF=94=E8=B5=9B=E7=8A=B6=E6=80=81=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Images/Race/powerfun-1.png | Bin 0 -> 1782 bytes .../Resources/Images/Race/powerfun-1.png.meta | 104 +++++++++++ Assets/Resources/Images/Ride/Match/圆16.png | Bin 0 -> 1090 bytes .../Resources/Images/Ride/Match/圆16.png.meta | 104 +++++++++++ .../UI/Prefab/Match/CompetitonPanel.prefab | 95 ++++++++++- .../UI/Prefab/Match/FinalRankingItem.prefab | 4 +- .../UI/Prefab/Ride/OnlineHeadPanel.prefab | 161 ++++++++++-------- .../UI/Prefab/Ride/OnlineRaceInfoPanel.prefab | 4 +- Assets/Scripts/Apis/Models/MapCompetition.cs | 2 + .../CompetitionLoadingController.cs | 47 ++++- .../Ride/Scripts/OnlinePlayerController.cs | 8 +- 11 files changed, 435 insertions(+), 94 deletions(-) create mode 100644 Assets/Resources/Images/Race/powerfun-1.png create mode 100644 Assets/Resources/Images/Race/powerfun-1.png.meta create mode 100644 Assets/Resources/Images/Ride/Match/圆16.png create mode 100644 Assets/Resources/Images/Ride/Match/圆16.png.meta diff --git a/Assets/Resources/Images/Race/powerfun-1.png b/Assets/Resources/Images/Race/powerfun-1.png new file mode 100644 index 0000000000000000000000000000000000000000..50673174efa7a95772618a2868486636599d70a4 GIT binary patch literal 1782 zcmaJ?3s4hR6paI@$XBr_P;d!Sp_ptEAR${)N)jSbf+R$QB2$)RAt@#sl2yXbRuHUW z#R>{iL=B?V0g;bbWfTQ1rC{aLYKh3tI@k*GX+>%gyFs9xPU+6P+0DJ`;hlmhZ znv~Ft_!0<4ZgO!r7A^>aB&dQ68)C>>g$hR#2)=$=6)cHIFdznrlPg)ok-B;!AeXX; zTfGGofr^931}>gG68^ z1dC@8-xL)t2mv^#8Ueh?bdrSXMFAL0GL=s8@}{l_XcQ^~qk4Kq`~T1SvF-MkC=7Bu$bMgS8~3#$}Fy zi)bWjxeAk`O2EJf$Dlhf77?%XO$!RuJgrhQJ0^T!pcYnvR5HcT(p;cG@c*F-#eB2| z6Cr=s`=7)bagquFMTiF7p_bqW7wck3rGhwW1jbOc7)7_wO)*4`)*|Yz`~^8%tXdYY>D&g=gj>YWYq?%2T5XV5V_MzECY39&bUuS* zS||%*LA)5yaJ>IG?zt^oLk4qRytp$je?*CEUX6>}?q;PoerKe7uD@8TA1aIt6bn~o z9rr?`oUTU0{EplEHx4_er#>BT%QhAs+LL1<QlC6*S+Gd*JWKPC#XEm z$$cW3&P%vVkjJ(uHP|Z)-Dd1jp2$sieM)k!V2NsXz_>&4X1RyQFL&O9iWAI=22Yjq z>Z}w-k6aH_ckgLMzbVS_h+efltE(1i*qFLy^on`Oo$)p&USuXccPz@MbDeoLTw*@i zEow>jpwty?j`PhQb1Zqoj~UCHIIIJy3U(REd;Yr_#0BirWT@&dC5{T}%v zktQ#6tc)Xoz^`yE!*$M-p>iX{~dZ%>-DT^K69b8rw@3V2cU@uko13oJ`({t9jXld8UeUT)rg@cqW3b^| zSXGwO6#4Sx;l>(gUFqHE8IxZ7>W^^kSb z(!u>32Y!D`V-G^XYAE*0B=^#vmjpe2C6Ix2GDczk!!rWg;pCw-H%1SkqUFwyLTOEJ z(0x}ud#VSUJpP$G9rUwwu?!un)MMxA*s7aKI?fAB!yzBP1V#%?m)VnSn z(>>{zWbq`ulCEz}EtQu(&1!8v;bXaa+RR!{ujz2#U+>`b_*X~$1e{mR)%1?1V|&k@ zF3;yY9&;>j56;8V9>7&CMMVSg#{8?-cywp0oJ?EA=qE94_fMrYsLJ^leG^&qtx<)X z6qDgb=MUHQl$>Kca#XQbr{rF^)IAtBy6E+hvi{mD>h79~cCW&*uoIS-^}aS)i~m@4 zcuhn%E2mZ~&PX%KY=1c&G64S2`;uqsB}};Yycvz}O0ds3*naWbPp3n}Hl6sFl-sy+ f-AZBOM~fB{zOdfVd-o6o8~#N6fMD(gc69n*;pM@a literal 0 HcmV?d00001 diff --git a/Assets/Resources/Images/Race/powerfun-1.png.meta b/Assets/Resources/Images/Race/powerfun-1.png.meta new file mode 100644 index 00000000..963f1ffb --- /dev/null +++ b/Assets/Resources/Images/Race/powerfun-1.png.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: 60567ca5d2a8537479e14193fbfe3696 +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 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + 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 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 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: Standalone + 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: diff --git a/Assets/Resources/Images/Ride/Match/圆16.png b/Assets/Resources/Images/Ride/Match/圆16.png new file mode 100644 index 0000000000000000000000000000000000000000..3eea48e6e2b2db55b997ba913e712455c2d4e21c GIT binary patch literal 1090 zcmaJ=+e;Kt9G+EM&09hb)<$$3dr)e3E_-ta$JO0gbHR~iUC4(7$C;x$>0F#Swxcg; zU>EYCf1r|}qL=6~sH_Jc4D6+ciU2`b+w1Kfivg)4!`gF-M(`zGjyh@ z-d9f$L{oY|$l|@lU3FgkKk=<3;q53&ji6y;0u>|+5`Bs>4nbOzCSevz%G}IL*i8`C z9cpd_jfjJsY-j<=^$9qdiO~en9d}Ggo`MLB!%0==$*)hIlR#B?@@!b7MKcNW>cG4O zhv$cK^8Az>Q^zUJjq#Yl;NhE@+A;caj8w*=JnMcUvD5_8> z1PZ}`VNFs@EEc0^mSR~y_VC+tI+7f}Znu{i1Zc~aY9iIpfy*e38?%Tfai%*ZXyzWR zZtu1UH;i&5lVSq2TT51sG9KJSyBo^nk`|PZ zVdV^Cy4=M~-av+(H%yRBx?Sr69ik+wx_jBVjS@vJt=mY_WtbLt67vL9RpEj(%L)P= zPDP_phDjx2u}CD5VA)gx+rcnX#tMc!t3e%=vC2L+QW5J4LNjq>0b1$>sPtQg2DS_5 z)XKR8EAs7PmCCtY(QJUcTPDvC-=*Hmv;^>?M~PUo~d) /// 服务器当前时间 /// diff --git a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs index 4e2ef692..784835c4 100644 --- a/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs +++ b/Assets/Scripts/Scenes/Ride/Competiton/CompetitionLoadingController.cs @@ -14,7 +14,7 @@ namespace Assets.Scenes.Ride.Scripts private GameObject Watch { get; set; } private bool _canJoin = false; private bool _canStart = false; - + private bool _canWatch = false; private RawImage CompetitionDesc { get; set; } private RawImage SponsorLogoImage { get; set; } private Text StartTime { get; set; } @@ -71,14 +71,22 @@ namespace Assets.Scenes.Ride.Scripts //1.报名按钮 Apply.SetActive(_canJoin); //2.观看按钮 - var showWatch = !_canJoin && !_canStart && !_canCancelApply && _raceStart; - Watch.SetActive(showWatch); + Watch.SetActive(_canWatch); //3.开始按钮 rideNow.gameObject.SetActive(_canStart); //4.详情按钮 Detail.SetActive(!_canStart); //5.取消报名按钮 (比赛开始前可以取消报名) - CancelJoin.SetActive(_canCancelApply && count > 0); + CancelJoin.SetActive(_canCancelApply); + + if (_canCancelApply) + { + CompetitionStatus.text = "applied"; + } + else + { + CompetitionStatus.text = competition.StatusVlaue.ToString(); + } } #endregion } @@ -131,8 +139,9 @@ namespace Assets.Scenes.Ride.Scripts //赛事状态按钮控制 _canJoin = competition.CanJoin; _canStart = competition.CanStart; - _canCancelApply = competition.applyed;//可以取消预约 + _canCancelApply = competition.CanCancelJoin;//可以取消预约 _raceStart = competition.Status == 3; + _canWatch = competition.CanWatch; #region 赛事基本信息 //赛事名称 mapName.text = competition.Title; @@ -151,9 +160,13 @@ namespace Assets.Scenes.Ride.Scripts ShowPlayers(competition.UserList); //路书描述 mapDescText.text = competition.Dec; - //主办方logo - Utils.DisplayImage(SponsorLogoImage, competition.SponsorCoverage, true); + ReadMore.SetActive(!string.IsNullOrEmpty(competition.Dec)); + //主办方logo + if (!string.IsNullOrEmpty(competition.SponsorCoverage)) + { + Utils.DisplayImage(SponsorLogoImage, competition.SponsorCoverage, true); + } //赛事详情 //if (!string.IsNullOrEmpty(competition.ShortPreview)) //{ @@ -202,9 +215,25 @@ namespace Assets.Scenes.Ride.Scripts { Application.OpenURL(App.CurrentUser.WebHost + $"#/Mine/MatchPreview?id={cyclingController.competitionId}&Token={App.CurrentUser.cookie}"); } + protected override void StartRide(BaseEventData baseEvent) + { + UpdateCompetition(); + if (competition.Status == 4) + { + Utils.showToast(gameObject, "race close"); + return; + } + base.StartRide(baseEvent); + } //观察 protected void StartWatch(BaseEventData baseEvent) { + UpdateCompetition(); + if (competition.Status == 4) + { + Utils.showToast(gameObject, "race close"); + return; + } //隐藏当前用户 cyclingController.isWatch = true; cyclingController.player.SetActive(false); @@ -229,7 +258,9 @@ namespace Assets.Scenes.Ride.Scripts competition = result.data; _canStart = competition.CanStart; _canJoin = competition.CanJoin; - _canCancelApply = competition.applyed; + _canCancelApply = competition.CanCancelJoin; + _canWatch = competition.CanWatch; + _raceStart = competition.Status == 3; } } protected void ApplyRace(BaseEventData baseEvent) diff --git a/Assets/Scripts/Scenes/Ride/Scripts/OnlinePlayerController.cs b/Assets/Scripts/Scenes/Ride/Scripts/OnlinePlayerController.cs index 80ed923f..e60c5ba7 100644 --- a/Assets/Scripts/Scenes/Ride/Scripts/OnlinePlayerController.cs +++ b/Assets/Scripts/Scenes/Ride/Scripts/OnlinePlayerController.cs @@ -53,9 +53,9 @@ namespace Assets.Scenes.Ride.Scripts protected override void Compute() { currentlatlong = mainController.Along(totalDistance);//下一个坐标 - if (_playerController != null) + if (mainController.currentPlayer != null) { - diff = Math.Round((totalDistance - _playerController.TotalDistance) * 1000, 0); + diff = Math.Round((totalDistance - mainController.currentPlayer.TotalDistance) * 1000, 0); } else { @@ -114,7 +114,7 @@ namespace Assets.Scenes.Ride.Scripts infoName.text = nickName; //距离 var infoDistance = infoPanel.transform.Find("Distance").GetComponent(); - if (_playerController != null) + if (mainController.currentPlayer != null) { infoDistance.text = diff > 0? $"+{diff}M" : $"{diff}M"; } @@ -281,7 +281,7 @@ namespace Assets.Scenes.Ride.Scripts } if (head == null) { - head = headPanel.GetComponentInChildren(); + head = headPanel.transform.Find("Head").GetComponent(); if (!string.IsNullOrEmpty(headUrl)) { Utils.DisplayImage(head, headUrl, true);