From 7f7318fb3663226255843149c93bf2daa9396145 Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Fri, 31 Dec 2021 11:23:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=BD=AE=E6=92=ADbug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9B=E5=86=85=E5=AE=B9=E6=BB=9A=E5=8A=A8?= =?UTF-8?q?=E5=8C=80=E9=80=9F=E6=92=AD=E6=94=BE=EF=BC=9B=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E5=8F=98=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/HomeMessageController.cs | 17 +++++++--- .../Images/NewDesign/icon_heji_like.png | Bin 614 -> 1250 bytes .../Images/NewDesign/icon_heji_unlike.png | Bin 804 -> 1804 bytes Assets/Scripts/Scenes/MainController.cs | 32 +++++++++++------- ProjectSettings/ProjectSettings.asset | 4 +-- 5 files changed, 35 insertions(+), 18 deletions(-) diff --git a/Assets/HomeMessageController.cs b/Assets/HomeMessageController.cs index f04b3b13..d811ea1b 100644 --- a/Assets/HomeMessageController.cs +++ b/Assets/HomeMessageController.cs @@ -17,7 +17,13 @@ public class HomeMessageController : MonoBehaviour } float timer = 2; public float? textWidth = null; - [HideInInspector]public bool isAnimated = false; + private bool isAnimated = false; + public void Initial() + { + transform.Find("TextContainer/Content").localPosition = new Vector2(startX, transform.Find("TextContainer/Content").localPosition.y); + isAnimated = false; + } + float playtime = 0; // Update is called once per frame void Update() { @@ -30,14 +36,17 @@ public class HomeMessageController : MonoBehaviour isAnimated = true; var offset = textWidth.Value - 180; var game = transform.Find("TextContainer/Content"); - game.DOLocalMoveX(startX - offset, 0.5f).onComplete + var v = 20 / 0.3f; + playtime = offset / v; + //匀速播放 + game.DOLocalMoveX(startX - offset, playtime).onComplete = () => Invoke("returnAni", 1.5f); } - timer += 4; + timer += 3; } } void returnAni() { - transform.Find("TextContainer/Content").DOLocalMoveX(startX, 0.5f); + transform.Find("TextContainer/Content").DOLocalMoveX(startX, playtime); } } diff --git a/Assets/Resources/Images/NewDesign/icon_heji_like.png b/Assets/Resources/Images/NewDesign/icon_heji_like.png index 4c5329b93eb12b3ab9f340cb3169e11d3e175faa..a31c235441809da20ced2d2dec94f1a948358f78 100644 GIT binary patch delta 1196 zcmV;d1XKIw1mX!HiBL{Q4GJ0x0000DNk~Le0000a0000W2nGNE0S%Vw7?B}JetSfBbL z2rVrIt0H|+st+QTiqvk>YOCNDtYAg<#ownQShbtTKB?FTZJ}>c1X%?^-xNVhHtDw8 zOtw@+s>vpE{myL8>`bOH!wy zA!e$nDI*G|dR3s)qD)qbo+GfPzF}oGlbfL~VG@KDJ=Zq4y>(YCq*(I{bGn+I`YEi6 zN;+9CZYHJQiken6obqbUZI9*D!G~I^`4x-)`?PK9%BK8gEL(T72k&8>f0ND~!@FJ- zJJ)UrwOcQWPD(mHsc+=K0miK_wQJiMAC`MMX|4D4EM}+#otwoAN*Vm+M8QVDU+R!q z&E1l#;aw(HrM3S=w1gdb)HSUi*0dpR2LR{k_tf**x@w#cnFbV)T}#(#<>vw8BJOB> zOIxI$idcqFcw2Hc^IWFkf3B20*qZL`Yj>0>jH_%I7t{8O>U?`0fPQ=r=g% zhaD@A2uL5%+R~2&(TCv^<&$T1qBMI3U3+yH0FJqBY%Iytdo{HFoh%IcXid|1od3|_ zIKM`AcH`JUKt!J;e-;YIB_?#%%%&IPPUG6&V(dx*f*G_oXb%Cg!5D*YV$KaZ1$oly zRePZr`8-E}BnU%p8T`1&Of5@oohTK*59);XYa|Mx_{2=$Q&be$PFU-@fv`^`qbqkG z+SqJ1-X>%A;2cKm0*scy%rbL|;>YZT6PH=iY)ri} z{##*DFq!%bR@3?I@H+?Bc+jCA9?AX5en{f>e*8l|M0KR`V6r^>E$h9vz-G_l0y95M zG7Q3r43&%*i~?Y7F9*nktL@83|wA_f1Fd=zH7s?m=nJY12D=MB=c)x|Azhku}7DGjq!T_C>QA;i%#QO^f>$b z!wZ+Po!U~nks;>c|MT#0#qK;J$?&Rvg(L<32-VX0In0%3ME74%B=SCr@IohcBq4Dy znVDN0ckv7g_OR$iL2=RiEU{(R)6~A*cVc!;NF2@1f0>w5TAai141M3l-Y+Fh@8R0? z5-M}Umgt#KaKTzCpT}07z+Wt=@6OX-WYIpmH2ZmXpRi@1gd~)I(XE)~7wETpMHi%~ z!n~q&PslAGXzRrfl~52A2VgHM_8NZWtXNvVKCy7}%bnslhu{-GHm(JO5ML@aC|`q2=dKAUx0?dI* zF7fGPZKJ{9{ zbFcA2P6ha%qfUyB2cWTtOm`}*7j(Tu z_%>ZD@8J@9Wsr&%{$LjZfB77^#cSN*fd^OH1hP{hvlT?~R1A^Oz=( z?{%hH{?ap%!1Y#e>F55dA=7H6>UX(4jZ6a!U=a;J;GgWlF{Kc~&ZnxSRl_y5hiH<< tHeByzD6}msw;Xe3(v?rg2J5$f0Z&_;^3fLJLI3~&07*qoM6N<$0fMi1`uG3< diff --git a/Assets/Resources/Images/NewDesign/icon_heji_unlike.png b/Assets/Resources/Images/NewDesign/icon_heji_unlike.png index 94d1ab75f3f099b3b5d27799cd0de899d6188683..a7d5d82ce44525a26bdedaa5aed861c9e3f24b14 100644 GIT binary patch delta 1754 zcmV<01||8V28<3NiBL{Q4GJ0x0000DNk~Le0000a0000W2nGNE0S%Vw7?B}Jeu*}lVQo78{?>V>JpP5dle@xNdhyUDr&pF@S&h`@m?dZ`nUZibp=cbWzt*u|V zuV25e#sO=5b@gTq8z3z#EF?U3^78T=NVQrmF`G*`>?7tV(nE(jFL5ii?X0ckI|V6McPGeo9%3{r>9puA8xd(tBdkESSTy&2@^jwG%N}rhY4UGPnemh>*lAX zrf@uO<5#apD1Ui6^*sU1$56nBD+|ZWsCatD>F3e_>;6-zR6dIjz&sD-a&mHr zTCEmJOV^7g!Sthcf5avkZD=^7*6Y*UIQDvdfA8A0^(n@iO{0J?j-;ojzaR*l5D55w zwOF>l!W7UKl}gElv@}V^#Kfc@_?znMD}Q8s3IxHV3XJQh)9EC4?%bg~yhx2kL+;*n zZqjO1r+ElWXskY;pUCCu)L7xzVTfwfUAe}_<3*X7OS)#?e+QzWa~BmA5wL7BG-PLs zi*(ttWpHPzklDO3nLBy%+wheuSGjmTKA%-1A}%yG=6R7vtBePNg7aB5^6mCPlA4~5HF;FeEL6ij3xJP$EkA_Bt28icPw3$pMGCJ!1zOJtFD(Z-r?e~wQ zK^}$|kUkR2WGW=%KUh<<)hJFv zCkhA|;6GsP--TT+7bNguQ5G${sK`V-p0QtQYqz~Be=;6)Vt|+cW|d$t$oKX25t&Q| zfov6VI$foE_LQGuGLbYc5DFbWeDaz?kwJ5)Tpp5@l$6|$RF3S&05vt8ct$EsJ_`T_ zJZ7ZutiIs)`)-VnPrkKpUquh{8XMaRWirVHxm=M4!??QO0D{lwwFiR}8!VQ}zanu( zrIr?3f4N$%IS$UkdA(kG&(qU1tVha=eawp(juZ+735Ub9qT<1@eLf%6oiCuIq@)n^ ztc;8dOo@WWu#zf1HuQumS?V23_fA9#SvOTeojJ7H72t zP#uojR0{XPLx7{XEf@?Xpt?9Bq0r3QDJjWGJVccNTt=tUF3xHRpz3r>s1$_BexBpJ z1>g~r+1c5&JWW9Ve-*+1s;sP~P_0c(>Gjfl(d}DXzxK#vQWd7&fdTZi#cmHhED#7d ze|GHHl8q~hS*W`DT{R@z{VJ7GzyyKuWw9EpL5hp%8iLd5`G{=>*As7uEsoLIYCU}e z{y;*-1**%;CWUBFug?RFk@{f w61b(M{R>FU+p#7K1jY~5)|R~=$zN#yU&e-fQQ$h}0ssI207*qoM6N<$f-eM7T>t<8 delta 746 zcmV5>XU=?=cjH;j?LgA{(ZFmcq&| zS{EiJ#*GW(MiVtLRw3!8DIL0Kj4pJAkPzCYKjJU`QeC<*F-?=kM5CswCV&Cy1`?od z82+iu_#R~@plu>|F>mg<=bn4#f8I9$bQxS&cs86)|4h5xZUL^YzG*5H3W|!y;{${R zS5{uv6N!XcN}*{rKvPrKXqFw`A>hc!DG&_ag)kUgJI64Zcg<$=!@z)YoXX|0Tb;BU z<1i$Yyi+y&VT0k4HdSf312`A`n(K zo0SQ~Pp4A|w|Jeg*=%1BQV^`ioKELq%iU-=91B;g6>ezABKUk)kXjQ(pw0^c1406e`g}H+wH<}QH@3e8jb2{-rI2?|DczD6UXf$p6{oaIJ zYkB#Vm`oF=#M&e>M1#TLFBA%h z=S$$=;5Q)sn9U|kQ4}B)peTyQe7*o`wHi<=DWKOIfXQSMN~KaHe-Q8nU^MzPS*cV{ zVv)9TzYi>iN6Gv^I-Sm0EbjN4FY}AVA{Np+@u!r(S}a3ypx+lfOn}Gn4b9Bln!vwT z)a7ykvWEXPeAmF}=qS!XkMLH;do~h@Jo%2r#`g9ypw&A1UXWre%i?%z2RAV$748v| zKrHx?VVLuoOa_uIKoP?}u-RC#T;|_%+?`7jS2~Xrl7gYo+C_%ZZQ#|5Jm0)LKR>xC c#r{730KyjO>`z=pPyhe`07*qoM6N<$f~3GvB>(^b diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index 729431da..abc6cd9f 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -61,7 +61,7 @@ public class MainController : BaseScene //切换页面后 private void OnIsHomeChanged(object sender, EventArgs e) { - DOTween.KillAll(); + //DOTween.KillAll(); FinishMessage(sender); } @@ -100,6 +100,7 @@ public class MainController : BaseScene rightMessage.transform.SetParent(go); rightMessage.transform.localScale = Vector3.one; rightMessage.transform.localPosition = 1 * msgLocation; + rightMessage.alpha = 0; msgs = new List { rightMessage }; for (int i = 0; i < 5; i++) { @@ -131,7 +132,7 @@ public class MainController : BaseScene DoMessageRight(e); } #else - if (App.currentPageIsHome) + if (App.currentPageIsHome) { DoMessage6(e); } @@ -176,12 +177,14 @@ public class MainController : BaseScene if (msgIndex >= 6) // { //msgIndex = 0; + Sequence se = DOTween.Sequence(); //m.transform.DOLocalMoveY(m.transform.localPosition.y - 38, 0.5f); foreach (var item in msgs) { - item.transform.DOLocalMoveY(item.transform.localPosition.y - 38, 0.5f); + se.Join(item.transform.DOLocalMoveY(item.transform.localPosition.y - 38, 0.5f)); } - m.DOFade(0, 0.5f).onComplete = () => + se.Join(m.DOFade(0, 0.5f)); + se.Play().onComplete = () => { SetMessage(m, e); m.transform.localPosition = 1 * msgLocation; @@ -192,12 +195,14 @@ public class MainController : BaseScene { Debug.Log(191); SetMessage(m, e); + Sequence se = DOTween.Sequence(); for (int i = 0; i < msgIndex; i++) { var rect = msgs[i].GetComponent(); - rect.DOLocalMoveY(rect.localPosition.y - 38, 0.5f); + se.Join(rect.DOLocalMoveY(rect.localPosition.y - 38, 0.5f)); } - m.DOFade(1, 0.5f); + se.Join(m.DOFade(1, 0.5f)); + se.Play(); } m.transform.SetAsLastSibling(); msgIndex++; @@ -215,14 +220,17 @@ public class MainController : BaseScene FinishMessageLeft(); } #else + if (!(bool)sender) { //FinishMessage6(); - transform.Find("GameObject").SetAsFirstSibling(); + //DOTween.CompleteAll(true); + DOTween.CompleteAll(true); + transform.Find("GameObject").gameObject.SetActive(false); } else { - transform.Find("GameObject").SetSiblingIndex(1); + transform.Find("GameObject").gameObject.SetActive(true); } #endif } @@ -276,7 +284,7 @@ public class MainController : BaseScene txt.GetComponent().text = e.content; LayoutRebuilder.ForceRebuildLayoutImmediate(txt); Debug.Log(e.content + txt.sizeDelta.x); - m.GetComponent().isAnimated = false; + m.GetComponent().Initial(); m.GetComponent().textWidth = txt.sizeDelta.x; } CanvasGroup msg; @@ -434,19 +442,19 @@ public class MainController : BaseScene //速度35 if (item.Speed >= 35) { - var message = lang == "zh" ? $"骑行速度突破{Math.Round(item.Speed, 2)}KM/H！" : $"riding speed reaches {Math.Round(item.Speed, 2)}KM/H!"; + var message = lang == "zh" ? $"骑行速度突破{Math.Round(item.Speed, 2)}KM/H！" : $"riding speed reaches {Math.Round(item.Speed, 2)}KM/H!"; EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}35KM/H"); } //速度50 if (item.Speed >= 50) { - var message = lang == "zh" ? $"骑行速度突破{Math.Round(item.Speed,2)}KM/H！" : $"riding speed reaches {Math.Round(item.Speed, 2)}KM/H!"; + var message = lang == "zh" ? $"骑行速度突破{Math.Round(item.Speed,2)}KM/H！" : $"riding speed reaches {Math.Round(item.Speed, 2)}KM/H!"; EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}50KM/H"); } //功体比 if (item.WeightKg >= 3) { - var message = lang == "zh" ? $"骑行功体比突破{Math.Round(item.WeightKg, 2)}w/kg！" : $" riding w/kg reaches {Math.Round(item.WeightKg, 2)}w/kg!"; + var message = lang == "zh" ? $"骑行功体比突破{Math.Round(item.WeightKg, 2)}w/kg！" : $" riding PWR reaches {Math.Round(item.WeightKg, 2)}w/kg!"; EventQueueSystem.QueueEventOnce(new LinkedMessageEvent(item.RouteId, message, item.HeadImage, item.Name, item.RouteName), $"{item.RouteId}{item.Name}3WeightKg"); } } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index a6273bad..b8255e7e 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -256,7 +256,7 @@ PlayerSettings: clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea templatePackageId: com.unity.template.3d@4.2.8 templateDefaultScene: Assets/Scenes/SampleScene.unity - AndroidTargetArchitectures: 1 + AndroidTargetArchitectures: 3 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: '{inproject}: Assets/Plugins/Android/powerfun.keystore' @@ -868,7 +868,7 @@ PlayerSettings: platformArchitecture: iPhone: 1 scriptingBackend: - Android: 0 + Android: 1 Standalone: 0 il2cppCompilerConfiguration: Standalone: 0