From f21b83697b23399dae2d9bf6d017167258fb25ad Mon Sep 17 00:00:00 2001 From: CaiYanPeng Date: Thu, 26 Aug 2021 15:08:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Editor/XCodePostProcessBuild.cs | 1 + .../Android/UnityCallWechatShare-release.aar | Bin 108921 -> 109288 bytes Assets/Plugins/iOS/WechatNativeBridge.m | 21 + Assets/Resources/Mobile.meta | 8 + .../UI/Prefab/Panel/Mobile/HomePanel.prefab | 8 +- .../Prefab/Panel/Mobile/MapListPanel.prefab | 2 +- .../Panel/Mobile/ResultListPanel.prefab | 23 +- .../Prefab/ResultList/RouteItem-Mobile.prefab | 262 +- Assets/Scenes/Login-Mobile.unity | 2657 +++++++++-------- Assets/Scenes/MainScene.unity | 203 ++ .../Scripts/Mobile/LoginControllerMobile.cs | 18 +- Assets/Scripts/Mobile/WeChatController.cs | 32 +- Assets/Scripts/Scenes/MainController.cs | 7 +- Assets/Scripts/UI/Control/PFUIDropdown.cs | 5 + Assets/Scripts/UI/Control/PFUIInputField.cs | 6 +- .../Scripts/UI/Prefab/Panel/HomeController.cs | 9 +- .../Prefab/ResultList/ResultListController.cs | 30 +- .../Scripts/UI/Prefab/ResultList/RouteItem.cs | 6 +- 18 files changed, 1912 insertions(+), 1386 deletions(-) create mode 100644 Assets/Resources/Mobile.meta diff --git a/Assets/Editor/XCodePostProcessBuild.cs b/Assets/Editor/XCodePostProcessBuild.cs index 59da6e41..311fd2ae 100644 --- a/Assets/Editor/XCodePostProcessBuild.cs +++ b/Assets/Editor/XCodePostProcessBuild.cs @@ -66,6 +66,7 @@ public static class XCodePostProcessBuild wxArray.AddString("weixin"); wxArray.AddString("wechat"); wxArray.AddString("weixinULAPI"); + wxArray.AddString("powerfun"); PlistElementDict qxLoc = plist.root.CreateDict("NSLocationWhenInUseUsageDescription"); qxLoc.SetBoolean("NSLocationWhenInUseUsageDescription", true); diff --git a/Assets/Plugins/Android/UnityCallWechatShare-release.aar b/Assets/Plugins/Android/UnityCallWechatShare-release.aar index 6a52eb099d661938838405a34f4aa1c05507e877..e209908a53534b02defa60206f8979da53a2c28a 100644 GIT binary patch delta 7954 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 e1GT6Qc$FJi&e<41YeA8Mx-ADZTSG=%vu z_xU_Z;`XLMYw7Atj&E@SSi?6zqV+DFzkF1K<)2wof9^No{}Y-dk48{&)Tl`>UDLa? z1Zte(D&3K&k{7c!eQ^f$e-^)uA-gdj>O8IObev=V^3bx=S<>o{eL-wc^Zq6?FoK*C z-CmJ?pdR@dfis-MoNR^qVr&n@mO~LI7lt-aZ(-U?Ou?ryD#2?8@Ttb>+BAi!V+a%0 z6B;7)DEAN$R4tueslMj^)3V$K_N|OXZlaS$LQyM|!6e~T8r}w|e^SV9Y%DAcaJ)c^sbe6RPb+b04Ge-F4_421=mM486 zu|Yu7sYOIj+EPm9e|EEgnGv+!AWoKxq>+&FofQvQZJU@8D~;)iIFbRp6m{K-TY_fS zmP0k(`mx%#x~EOhw4}Xx0e~gppIPYAJ?o^wq`A^tm~*U4lnQQsC8#|)1pisKoo})+*hoE z{RP0j0HOT7$e)QEx8&wbcK69+mmgw~p=D{7v`D=bFz!)xntTJUJZj;p9FzQJYe``z zK!W8-j|dDQe^;j5d{Pf?P5^@Y6={DxQ)|B)ZPTI~E81d1*GAWSYv{tuKVpHs@=zts z1<%(Le3cqq8ZR7mSI7^(*maQFlK-qa5JNu+68da=sTqIor?ok>Z416-v?Ce+IULe% zk~a0WQhU{zG@2Qu5E`S;lX0n=LZD4Jox6t_zVpn#e{wHZeBSTOM1J6D|B@$rgz!75 zip->!WA5aXlZLoUl8R|nm4u}i#P}1yL7ONZGl#o`3s!_2ZqrE)XTl@Y5om!;Stjyk zg5GTOW0@41rcsSN2`be>5=b5X~eaz7Z@#)SzLA0 zF)SXUe+IJ-rj$OYS=R3O6zBye&|d6EN=~u^>GZJQWVf8p)-$KCmC*xBGjmYT1_;L% zsiYH`7;qr6kWB9AbFnhsZ;m&KiEi!?gO5TBi{|tiS>?8fB%AP=>PSKms|!bj4B_Df5lwLqF^HSTAVPp8p9A1tS-y=q&EU_H&qP*+`xh@nrBft}8+3@X4ubv1_w ze_rWWnzTrLWj3I6ZuydQFb#!FGD8+ly(B7GuJ_y=zV#RpYyK_syj6;-EX|C7vTt?A zv2sq7%WHt=#W-e`JYQtwaLP4<$)Uxx-fIh0FOB$MS@gp>4M{o~uP(<+Yjvy@TkIANo2b&nTkxb)T1e_8U5 zXgIuAUOQ8`IP`>T4UANl;UtkGPND%PhLXh(6C(+W?Q+9=^xmtl;>j6D0*DO(e0(ai zy0pE07i2lNE7=Xa7-Fp)Kc~i34i&wFZkAi@Z+NI>Nl{*C-xML zn%&8?GQ~?+*Vy(e5Kl!eXQk(=f84#uylD~!Zus`4FzJHiEGIzG6$r~%_d*8sOQqFvxj@Ghvp-OCLENg7W zymo*D!p^r}^wOad7B_~hJf7?0()dcob^8hB_cq2#eT0%pOUcZlN8wetE{r9JU)Z*KA17vNzPQ?|e`!qHu%JBke@UR)tDel4AlWf6 zwk>!cAm;16E*ht>ow>CAs}p0d$z@`5*E7C5To-hi+78>rqLdy!TET6-r-TYhe*MXM_-8^Ep%4jR?de7XDq^1cu|dld0WNGM`= zS<+j0v@+VMmFHXMf2gH!k#+c|<=o*+%Ql1e3sGB+bi`8Lur%X#k5wiSY+aFmSRDlD4EfG97?t@%;cl<=xcoj8hhI10r(4iYhZ3>vRmtPUM4OAX~J z#bjZW=M0jye?N}+y7#DjoTj83oP`tZV`)DeSPLa~@kk}PAUqY*0HK$9p<$QpSM+4k zV)sQcw$o)Bis%94TR?()+W?j3Z6CB79JYC2(yz&@YXdjQ?_+bV4Oi@U1f_qbVNIzx zhpaX~(dP2wJs6As9N!Q7jdn*ZOnJ}=S`UxD@y%HK zX??Ul>h**Ke+b_312+E111CR}YB1bPE?iiQKE3Z+$B1)lQ?beyjk}b$gG4X=EFs)~ z=pLfAIrn8Apy<_!s?&~yr*7Xqiji|;d7aBcMu2i;>$N~l!yo8H5B}<8qO>t$dKr)u zlv^^If6qCd`5)*{rHEDIZK*6o#QWUf657{NHc$e?sG=%wymNeNGccJYM=W#VHW*Vc z5m6=oeq$@b0-hTu-}0EHT^3Xw;#MiloFlisK8CayVU4#Dy2|vK_a=?-zU{NVv#}b!?Fhf4o!8o@{7X>gX(A;MJQcLF3BCgGzFe zi;$%1ps>O@2MY6I`DeiJiZd{u?$LFH*>GXQ9XnenE8gsKrv|R(cu7{`EwcZXZQ4;| zsyunsOMYKP)|kM$gWUg(y8G!T>{8FpNx_WDxF6eUsH@o&(Q+;rc!6q$KIOUQodU(n ze-r(N3~nw{U;Tn^^XW3mZpY`Z5WM!xd0M7Zd)gFOgQB-w!0e%wH~n($ElCFJ<2DIV znwACHf}mO@)}j{k=eNBz$S{#gk98w&*gud?W$5ByVD`Zsn_|5KUi zpSJ(mYyLMlF#hAt^FNLMQ%?Ce%F+HKaRsCZK>ODuWFVKer~yd=L?D*|sR1zpX&{ppA1@YAO9ci10000600sbc0RRA9 IsQ~~00D<~~hyVZp delta 7589 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 H0RR91)pYoC diff --git a/Assets/Plugins/iOS/WechatNativeBridge.m b/Assets/Plugins/iOS/WechatNativeBridge.m index 317d980a..cfdca83f 100644 --- a/Assets/Plugins/iOS/WechatNativeBridge.m +++ b/Assets/Plugins/iOS/WechatNativeBridge.m @@ -86,4 +86,25 @@ void WechatLogin(const char* scope,const char* state) void OpenWXApp() { [WXApi openWXApp]; +} + +bool checkAPPIsExist(NSString* URLScheme) +{ + NSURL* url; + if ([URLScheme containsString:@"://"]) + { + url = [NSURL URLWithString:[NSString stringWithFormat:@"%@",URLScheme]]; + } + else + { + url = [NSURL URLWithString:[NSString stringWithFormat:@"%@://",URLScheme]]; + } + if([[UIApplication sharedApplication] canOpenURL:url]) + { + return YES; + } + else + { + return NO; + } } \ No newline at end of file diff --git a/Assets/Resources/Mobile.meta b/Assets/Resources/Mobile.meta new file mode 100644 index 00000000..a76c7270 --- /dev/null +++ b/Assets/Resources/Mobile.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f134d222725933a4a8aa79fee0ebc10c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/HomePanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/HomePanel.prefab index 7dfc0110..4405e567 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/HomePanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/HomePanel.prefab @@ -1686,7 +1686,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137258, a: 1} + m_Color: {r: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -1926,7 +1926,7 @@ MonoBehaviour: m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} m_FontSize: 10 m_FontStyle: 0 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 1 m_MaxSize: 40 m_Alignment: 4 @@ -2425,7 +2425,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137258, a: 1} + m_Color: {r: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: @@ -2983,7 +2983,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137258, a: 1} + m_Color: {r: 0.61960787, g: 0.61960787, b: 0.6784314, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab index 883a0167..aacc9232 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/MapListPanel.prefab @@ -187,7 +187,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 465239219729653178} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} m_Name: diff --git a/Assets/Resources/UI/Prefab/Panel/Mobile/ResultListPanel.prefab b/Assets/Resources/UI/Prefab/Panel/Mobile/ResultListPanel.prefab index 01e47228..9619b1ff 100644 --- a/Assets/Resources/UI/Prefab/Panel/Mobile/ResultListPanel.prefab +++ b/Assets/Resources/UI/Prefab/Panel/Mobile/ResultListPanel.prefab @@ -1258,7 +1258,6 @@ GameObject: - component: {fileID: 3143990868080801561} - component: {fileID: 3143990868080801563} - component: {fileID: 3143990868080801562} - - component: {fileID: 3143990868080801564} - component: {fileID: 3143990868080801556} m_Layer: 5 m_Name: Button @@ -1323,22 +1322,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &3143990868080801564 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3143990868080801560} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 97bc2ebab6563400c95b036136d26ea6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Inverse: 0 - m_MaskInteraction: 85 - m_UseStencil: 1 - m_RaycastFilter: 0 --- !u!114 &3143990868080801556 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2409,13 +2392,13 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 7 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -2698,7 +2681,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} m_FontSize: 20 m_FontStyle: 0 m_BestFit: 0 diff --git a/Assets/Resources/UI/Prefab/ResultList/RouteItem-Mobile.prefab b/Assets/Resources/UI/Prefab/ResultList/RouteItem-Mobile.prefab index 71a621e3..a392359f 100644 --- a/Assets/Resources/UI/Prefab/ResultList/RouteItem-Mobile.prefab +++ b/Assets/Resources/UI/Prefab/ResultList/RouteItem-Mobile.prefab @@ -36,8 +36,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -104} - m_SizeDelta: {x: 0, y: 17} + m_AnchoredPosition: {x: 0, y: -96} + m_SizeDelta: {x: 0, y: 14} m_Pivot: {x: 0, y: 1} --- !u!222 &331225470839700675 CanvasRenderer: @@ -121,7 +121,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 17} + m_SizeDelta: {x: 0, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &331225470862433147 CanvasRenderer: @@ -152,12 +152,12 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 14 + m_FontSize: 10 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -199,7 +199,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 17} + m_SizeDelta: {x: 0, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &331225471265440393 CanvasRenderer: @@ -230,12 +230,12 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 14 + m_FontSize: 10 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -277,7 +277,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 17} + m_SizeDelta: {x: 0, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &331225471740520316 CanvasRenderer: @@ -308,12 +308,12 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 14 + m_FontSize: 10 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -355,7 +355,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 17} + m_SizeDelta: {x: 0, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &331225471917455509 CanvasRenderer: @@ -386,12 +386,12 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 14 + m_FontSize: 10 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -438,7 +438,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: -81} - m_SizeDelta: {x: 0, y: 17} + m_SizeDelta: {x: 0, y: 14} m_Pivot: {x: 0, y: 1} --- !u!222 &331225472001556013 CanvasRenderer: @@ -497,6 +497,8 @@ GameObject: m_Component: - component: {fileID: 7596543225826370523} - component: {fileID: 1616657703676474664} + - component: {fileID: 5743559341209434294} + - component: {fileID: 9092179112494897981} m_Layer: 5 m_Name: RightMatch m_TagString: Untagged @@ -522,8 +524,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 482, y: 0} - m_SizeDelta: {x: -964, y: 0} + m_AnchoredPosition: {x: 278.5, y: 0} + m_SizeDelta: {x: -557, y: -55} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1616657703676474664 CanvasRenderer: @@ -533,6 +535,45 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 394191259421430988} m_CullTransparentMesh: 0 +--- !u!114 &5743559341209434294 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 394191259421430988} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &9092179112494897981 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 394191259421430988} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 5 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 --- !u!1 &3956325779266006875 GameObject: m_ObjectHideFlags: 0 @@ -565,11 +606,11 @@ RectTransform: m_Father: {fileID: 4516012623690469005} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -22} - m_SizeDelta: {x: 0, y: 44} - m_Pivot: {x: 0.5, y: 1} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 22} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3956325779266006878 CanvasRenderer: m_ObjectHideFlags: 0 @@ -599,10 +640,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 32 + m_FontSize: 16 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 3 + m_MinSize: 1 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -643,10 +684,10 @@ RectTransform: m_Father: {fileID: 4516012623690469005} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -58} - m_SizeDelta: {x: 14, y: 19} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -36} + m_SizeDelta: {x: 0, y: 14} m_Pivot: {x: 0.5, y: 1} --- !u!222 &3956325779691258937 CanvasRenderer: @@ -677,7 +718,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 14 + m_FontSize: 10 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -704,7 +745,7 @@ GameObject: - component: {fileID: 8165744897097518677} - component: {fileID: 6147895834536267412} m_Layer: 5 - m_Name: RouteItem + m_Name: RouteItem-Mobile m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -731,7 +772,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1118, y: 140} + m_SizeDelta: {x: 640, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4085630360285719622 CanvasRenderer: @@ -874,8 +915,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 240, y: 0} - m_SizeDelta: {x: 724, y: 140} + m_AnchoredPosition: {x: 152, y: 0} + m_SizeDelta: {x: 405, y: 120} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4085630360693584945 CanvasRenderer: @@ -917,11 +958,11 @@ RectTransform: m_Father: {fileID: 4516012623829342350} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 563, y: 1} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -70} + m_SizeDelta: {x: 286, y: 1} + m_Pivot: {x: 0.5, y: 1} --- !u!222 &4085630362103246103 CanvasRenderer: m_ObjectHideFlags: 0 @@ -993,8 +1034,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -15} - m_SizeDelta: {x: 0, y: 22} + m_AnchoredPosition: {x: 0, y: -10} + m_SizeDelta: {x: 0, y: 34} m_Pivot: {x: 0, y: 1} --- !u!222 &4516012621968954542 CanvasRenderer: @@ -1025,7 +1066,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 16 + m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -1033,7 +1074,7 @@ MonoBehaviour: m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 1 + m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: Challenge route from Potala Palace to Everest Base Camp @@ -1071,8 +1112,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -43} - m_SizeDelta: {x: 0, y: 17} + m_AnchoredPosition: {x: 0, y: -46} + m_SizeDelta: {x: 0, y: 14} m_Pivot: {x: 0, y: 1} --- !u!222 &4516012623390820326 CanvasRenderer: @@ -1103,7 +1144,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 12 + m_FontSize: 10 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 1 @@ -1152,8 +1193,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 603, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: 316, y: 0} + m_SizeDelta: {x: 68, y: 68} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4516012623690469007 CanvasRenderer: @@ -1230,8 +1271,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 20, y: 0} - m_SizeDelta: {x: 563, y: 140} + m_AnchoredPosition: {x: 10, y: 0} + m_SizeDelta: {x: 286, y: 120} m_Pivot: {x: 0, y: 0.5} --- !u!222 &4516012623829342351 CanvasRenderer: @@ -1276,7 +1317,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 17} + m_SizeDelta: {x: 0, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4798129127435135196 CanvasRenderer: @@ -1307,12 +1348,12 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 14 + m_FontSize: 10 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 - m_Alignment: 0 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -1329,6 +1370,8 @@ GameObject: m_Component: - component: {fileID: 5607096041038795515} - component: {fileID: 5607096041038795512} + - component: {fileID: 1385334607627503544} + - component: {fileID: 1020874047256454934} m_Layer: 5 m_Name: Right m_TagString: Untagged @@ -1355,8 +1398,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 482, y: 0} - m_SizeDelta: {x: -964, y: 0} + m_AnchoredPosition: {x: 278.5, y: 0} + m_SizeDelta: {x: -557, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5607096041038795512 CanvasRenderer: @@ -1366,6 +1409,45 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5607096041038795514} m_CullTransparentMesh: 0 +--- !u!114 &1385334607627503544 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5607096041038795514} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &1020874047256454934 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5607096041038795514} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 5 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 --- !u!1 &7437299638014193431 GameObject: m_ObjectHideFlags: 0 @@ -1401,7 +1483,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} + m_SizeDelta: {x: 68, y: 68} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7437299638014193428 CanvasRenderer: @@ -1476,7 +1558,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 240, y: 0} + m_SizeDelta: {x: 152, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!222 &8504920722886678751 CanvasRenderer: @@ -1525,7 +1607,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: r: {x: 20, y: 0, z: 0, w: 20} - rect2props: {x: 10.000015, y: 0, z: 127.27923, w: 127.27923} + rect2props: {x: 10.000008, y: -0.0000076293945, z: 89.09546, w: 89.09546} --- !u!1 &8791382824283463304 GameObject: m_ObjectHideFlags: 0 @@ -1630,7 +1712,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -1640,7 +1722,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -1650,7 +1732,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_SizeDelta.x - value: 114 + value: 43 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -1695,12 +1777,12 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 41.5 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchoredPosition.y - value: -90 + value: -35 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -1805,27 +1887,27 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_SizeDelta.x - value: 114 + value: 43 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -1875,7 +1957,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchoredPosition.y - value: -55 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -1980,27 +2062,27 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_SizeDelta.x - value: 114 + value: 43 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -2050,7 +2132,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchoredPosition.y - value: -20 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -2155,27 +2237,27 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_SizeDelta.x - value: 114 + value: 43 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -2225,7 +2307,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchoredPosition.y - value: -90 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -2330,7 +2412,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMax.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -2340,7 +2422,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchorMin.x - value: 0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -2350,7 +2432,7 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_SizeDelta.x - value: 114 + value: 43 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} @@ -2395,12 +2477,12 @@ PrefabInstance: - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 41.5 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} propertyPath: m_AnchoredPosition.y - value: -20 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3150550772099312288, guid: 6b94e789d6585a04dbdc04c8a7cf97b2, type: 3} diff --git a/Assets/Scenes/Login-Mobile.unity b/Assets/Scenes/Login-Mobile.unity index 070c87e7..287b54fb 100644 --- a/Assets/Scenes/Login-Mobile.unity +++ b/Assets/Scenes/Login-Mobile.unity @@ -153,9 +153,9 @@ RectTransform: m_Father: {fileID: 1198026530} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 177, y: -185} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 354, y: 301} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1272031 @@ -879,7 +879,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 931566019} + m_Material: {fileID: 1606771672} m_Color: {r: 0.2392157, g: 0.24313727, b: 0.3019608, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -916,7 +916,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} m_Name: m_EditorClassIdentifier: - radius: 11 + radius: 8 --- !u!1 &93849742 GameObject: m_ObjectHideFlags: 0 @@ -967,7 +967,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 770352918} + m_Material: {fileID: 1516767167} m_Color: {r: 0.15294118, g: 0.15294118, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_Maskable: 0 @@ -1005,178 +1005,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: radius: 20 ---- !u!21 &104568374 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 100, g: 39, b: 22, a: 0} ---- !u!21 &112158419 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 314, g: 39, b: 22, a: 0} --- !u!1001 &139200882 PrefabInstance: m_ObjectHideFlags: 0 @@ -1392,6 +1220,92 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 139200882} m_PrefabAsset: {fileID: 0} +--- !u!21 &179227677 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 60, g: 60, b: 240, a: 0} --- !u!1 &196424309 GameObject: m_ObjectHideFlags: 0 @@ -1653,92 +1567,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 248120061} m_CullTransparentMesh: 0 ---- !u!21 &250169716 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 240, g: 240, b: 240, a: 0} --- !u!1 &260522527 GameObject: m_ObjectHideFlags: 0 @@ -1829,92 +1657,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 260522527} m_CullTransparentMesh: 0 ---- !u!21 &316312983 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 354, g: 301, b: 60, a: 0} --- !u!1 &372638126 GameObject: m_ObjectHideFlags: 0 @@ -2476,7 +2218,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 250169716} + m_Material: {fileID: 468881519} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -2824,6 +2566,92 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 455270388} m_CullTransparentMesh: 0 +--- !u!21 &468881519 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 240, g: 240, b: 240, a: 0} --- !u!1 &485958768 GameObject: m_ObjectHideFlags: 0 @@ -2990,7 +2818,7 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 661484772} m_PrefabAsset: {fileID: 0} ---- !u!21 &537679348 +--- !u!21 &528017510 Material: serializedVersion: 6 m_ObjectHideFlags: 0 @@ -3075,7 +2903,7 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 20, g: 20, b: 22, a: 0} + - _WidthHeightRadius: {r: 354, g: 301, b: 60, a: 0} --- !u!21 &554553437 Material: serializedVersion: 6 @@ -3198,9 +3026,9 @@ RectTransform: m_Father: {fileID: 1198026530} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 708, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 354, y: 370} m_Pivot: {x: 0, y: 1} --- !u!114 &567535513 @@ -3228,7 +3056,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 714688236} + m_Material: {fileID: 2070238071} m_Color: {r: 0.15294118, g: 0.15294118, b: 0.19607845, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -3253,7 +3081,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 567535511} m_CullTransparentMesh: 0 ---- !u!21 &594065246 +--- !u!21 &604400170 Material: serializedVersion: 6 m_ObjectHideFlags: 0 @@ -3338,7 +3166,7 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 354, g: 301, b: 40, a: 0} + - _WidthHeightRadius: {r: 354, g: 301, b: 60, a: 0} --- !u!1001 &608756976 PrefabInstance: m_ObjectHideFlags: 0 @@ -4207,7 +4035,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 704704647} m_CullTransparentMesh: 0 ---- !u!21 &714688236 +--- !u!21 &712023024 Material: serializedVersion: 6 m_ObjectHideFlags: 0 @@ -4292,7 +4120,7 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 354, g: 370, b: 60, a: 0} + - _WidthHeightRadius: {r: 314, g: 39, b: 22, a: 0} --- !u!1 &756711464 GameObject: m_ObjectHideFlags: 0 @@ -4364,7 +4192,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 316312983} + m_Material: {fileID: 1999484972} m_Color: {r: 0.15294118, g: 0.15294118, b: 0.19607845, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -4389,92 +4217,84 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 756711464} m_CullTransparentMesh: 0 ---- !u!21 &770352918 -Material: - serializedVersion: 6 +--- !u!1 &791252002 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 354, g: 300, b: 40, a: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 791252003} + - component: {fileID: 791252005} + - component: {fileID: 791252004} + m_Layer: 5 + m_Name: BatteryText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &791252003 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791252002} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1245142876} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 60, y: 30} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &791252004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791252002} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} + m_FontSize: 16 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!222 &791252005 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791252002} + m_CullTransparentMesh: 0 --- !u!1 &804258766 GameObject: m_ObjectHideFlags: 0 @@ -4857,9 +4677,9 @@ RectTransform: m_Father: {fileID: 1084309180} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 106, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 106, y: 122} m_Pivot: {x: 0, y: 1} --- !u!222 &838289239 @@ -4870,6 +4690,92 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 838289237} m_CullTransparentMesh: 0 +--- !u!21 &844132471 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 280, g: 39, b: 22, a: 0} --- !u!1 &885308276 GameObject: m_ObjectHideFlags: 0 @@ -4959,6 +4865,92 @@ MonoBehaviour: m_ChildControlHeight: 0 m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 +--- !u!21 &885476346 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 354, g: 301, b: 40, a: 0} --- !u!1 &906657265 GameObject: m_ObjectHideFlags: 0 @@ -5022,7 +5014,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 537679348} + m_Material: {fileID: 1991296425} m_Color: {r: 0.2392157, g: 0.24313727, b: 0.3019608, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -5099,9 +5091,9 @@ RectTransform: m_Father: {fileID: 1198026530} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1062, y: -34.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 354, y: 301} m_Pivot: {x: 0, y: 1} --- !u!114 &913700441 @@ -5129,7 +5121,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1293820494} + m_Material: {fileID: 604400170} m_Color: {r: 0.15294118, g: 0.15294118, b: 0.19607845, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -5232,92 +5224,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 921918106} m_CullTransparentMesh: 0 ---- !u!21 &931566019 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 16, g: 16, b: 22, a: 0} --- !u!1 &938793830 GameObject: m_ObjectHideFlags: 0 @@ -5690,92 +5596,6 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 949964386} m_PrefabAsset: {fileID: 0} ---- !u!21 &951524180 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 314, g: 39, b: 22, a: 0} --- !u!1 &961346072 GameObject: m_ObjectHideFlags: 0 @@ -5850,92 +5670,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 961346072} m_CullTransparentMesh: 0 ---- !u!21 &965963155 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 354, g: 301, b: 60, a: 0} --- !u!1001 &981913432 PrefabInstance: m_ObjectHideFlags: 0 @@ -6384,6 +6118,84 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1035872848} m_PrefabAsset: {fileID: 0} +--- !u!1 &1038488566 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1038488567} + - component: {fileID: 1038488569} + - component: {fileID: 1038488568} + m_Layer: 5 + m_Name: TimeText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1038488567 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1038488566} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1245142876} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -60, y: 0} + m_SizeDelta: {x: 60, y: 30} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &1038488568 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1038488566} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} + m_FontSize: 16 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!222 &1038488569 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1038488566} + m_CullTransparentMesh: 0 --- !u!1 &1047860852 GameObject: m_ObjectHideFlags: 0 @@ -7553,92 +7365,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!21 &1148578482 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 100, g: 39, b: 22, a: 0} --- !u!1 &1163014978 GameObject: m_ObjectHideFlags: 0 @@ -8075,6 +7801,138 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1226946007} m_CullTransparentMesh: 0 +--- !u!21 &1237106753 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 314, g: 39, b: 22, a: 0} +--- !u!1 &1245142875 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1245142876} + - component: {fileID: 1245142877} + m_Layer: 5 + m_Name: MobileInfo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1245142876 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1245142875} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 791252003} + - {fileID: 1038488567} + m_Father: {fileID: 6432226912907321065} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &1245142877 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1245142875} + m_CullTransparentMesh: 0 --- !u!21 &1258602188 Material: serializedVersion: 6 @@ -8247,178 +8105,6 @@ Material: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _WidthHeightRadius: {r: 40, g: 34, b: 34, a: 0} ---- !u!21 &1293820494 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 354, g: 301, b: 60, a: 0} ---- !u!21 &1312358798 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 280, g: 39, b: 22, a: 0} --- !u!1 &1332028083 GameObject: m_ObjectHideFlags: 0 @@ -9142,9 +8828,9 @@ RectTransform: m_Father: {fileID: 1198026530} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 531, y: -185} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 354, y: 301} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1406457430 @@ -9159,7 +8845,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 965963155} + m_Material: {fileID: 528017510} m_Color: {r: 0.15294118, g: 0.15294118, b: 0.19607843, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -9367,6 +9053,92 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1417780816} m_PrefabAsset: {fileID: 0} +--- !u!21 &1432381374 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 354, g: 301, b: 60, a: 0} --- !u!1001 &1454741467 PrefabInstance: m_ObjectHideFlags: 0 @@ -9582,7 +9354,85 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1454741467} m_PrefabAsset: {fileID: 0} ---- !u!21 &1492992675 +--- !u!1 &1507594307 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1507594308} + - component: {fileID: 1507594310} + - component: {fileID: 1507594309} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1507594308 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1507594307} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1047860853} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 23, y: -2} + m_SizeDelta: {x: 127, y: 17} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1507594309 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1507594307} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137258, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} + m_FontSize: 12 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Remember me +--- !u!222 &1507594310 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1507594307} + m_CullTransparentMesh: 0 +--- !u!21 &1516767167 Material: serializedVersion: 6 m_ObjectHideFlags: 0 @@ -9667,85 +9517,7 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 100, g: 39, b: 22, a: 0} ---- !u!1 &1507594307 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1507594308} - - component: {fileID: 1507594310} - - component: {fileID: 1507594309} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1507594308 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1507594307} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1047860853} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 23, y: -2} - m_SizeDelta: {x: 127, y: 17} - m_Pivot: {x: 0, y: 1} ---- !u!114 &1507594309 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1507594307} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137258, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} - m_FontSize: 12 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Remember me ---- !u!222 &1507594310 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1507594307} - m_CullTransparentMesh: 0 + - _WidthHeightRadius: {r: 354, g: 300, b: 40, a: 0} --- !u!1001 &1560149220 PrefabInstance: m_ObjectHideFlags: 0 @@ -9926,6 +9698,178 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1560149220} m_PrefabAsset: {fileID: 0} +--- !u!21 &1562747061 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 100, g: 39, b: 22, a: 0} +--- !u!21 &1597333442 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 100, g: 39, b: 22, a: 0} --- !u!1 &1602252557 GameObject: m_ObjectHideFlags: 0 @@ -9996,7 +9940,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1714799748} + m_Material: {fileID: 1432381374} m_Color: {r: 0.15294118, g: 0.15294118, b: 0.19607845, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -10021,6 +9965,92 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1602252557} m_CullTransparentMesh: 0 +--- !u!21 &1606771672 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 16, g: 16, b: 16, a: 0} --- !u!21 &1669864889 Material: serializedVersion: 6 @@ -10259,92 +10289,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1713385733} m_CullTransparentMesh: 0 ---- !u!21 &1714799748 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: RoundedCornersTextureMaterial(Clone) - m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _ColorMask: 15 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Height: 50 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _Radius: 15 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UVSec: 0 - - _UseUIAlphaClip: 0 - - _Width: 50 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 354, g: 301, b: 60, a: 0} --- !u!1 &1746218432 GameObject: m_ObjectHideFlags: 0 @@ -10680,7 +10624,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1978163504} + m_Material: {fileID: 179227677} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -10985,7 +10929,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 594065246} + m_Material: {fileID: 1984541066} m_Color: {r: 0.15294118, g: 0.15294118, b: 0.19607845, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -11049,9 +10993,9 @@ RectTransform: m_Father: {fileID: 381190218} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 354, y: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 354, y: 316} m_Pivot: {x: 1, y: 1} --- !u!222 &1832674273 @@ -11429,7 +11373,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 184fba03113f09e4ebd04279f16da693, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -11647,9 +11591,9 @@ RectTransform: m_Father: {fileID: 381190218} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 531, y: -158} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 354, y: 316} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1934359714 @@ -11835,7 +11779,87 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1973948708} m_PrefabAsset: {fileID: 0} ---- !u!21 &1978163504 +--- !u!1 &1982416542 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1982416543} + - component: {fileID: 1982416545} + - component: {fileID: 1982416544} + m_Layer: 5 + m_Name: signText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1982416543 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1982416542} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 567535512} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -20} + m_SizeDelta: {x: 0, y: 34} + m_Pivot: {x: 0.5, y: 1} +--- !u!114 &1982416544 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1982416542} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} + m_FontSize: 24 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'SIGN UP + +' +--- !u!222 &1982416545 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1982416542} + m_CullTransparentMesh: 0 +--- !u!21 &1984541066 Material: serializedVersion: 6 m_ObjectHideFlags: 0 @@ -11920,87 +11944,179 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 60, g: 60, b: 240, a: 0} ---- !u!1 &1982416542 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} + - _WidthHeightRadius: {r: 354, g: 301, b: 40, a: 0} +--- !u!21 &1991296425 +Material: serializedVersion: 6 - m_Component: - - component: {fileID: 1982416543} - - component: {fileID: 1982416545} - - component: {fileID: 1982416544} - m_Layer: 5 - m_Name: signText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1982416543 -RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1982416542} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 567535512} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -20} - m_SizeDelta: {x: 0, y: 34} - m_Pivot: {x: 0.5, y: 1} ---- !u!114 &1982416544 -MonoBehaviour: + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 20, g: 20, b: 22, a: 0} +--- !u!21 &1999484972 +Material: + serializedVersion: 6 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1982416542} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_FontData: - m_Font: {fileID: 12800000, guid: 9428f2aab98e9c34d923a9174035a197, type: 3} - m_FontSize: 24 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 2 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: 'SIGN UP - -' ---- !u!222 &1982416545 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1982416542} - m_CullTransparentMesh: 0 + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 354, g: 301, b: 60, a: 0} --- !u!1 &2003946479 GameObject: m_ObjectHideFlags: 0 @@ -12484,7 +12600,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 20, y: -30} + m_AnchoredPosition: {x: 20, y: -25} m_SizeDelta: {x: 24, y: 24} m_Pivot: {x: 0, y: 1} --- !u!114 &2067798646 @@ -12567,7 +12683,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] ---- !u!21 &2073170755 +--- !u!21 &2070238071 Material: serializedVersion: 6 m_ObjectHideFlags: 0 @@ -12652,7 +12768,7 @@ Material: m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _WidthHeightRadius: {r: 354, g: 301, b: 40, a: 0} + - _WidthHeightRadius: {r: 354, g: 370, b: 60, a: 0} --- !u!1 &2099299218 GameObject: m_ObjectHideFlags: 0 @@ -12771,6 +12887,92 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!21 &2118592751 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: RoundedCornersTextureMaterial(Clone) + m_Shader: {fileID: 4800000, guid: 0bd2ec5d73751e34a814274a454bec41, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Height: 50 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _Radius: 15 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _Width: 50 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _WidthHeightRadius: {r: 100, g: 39, b: 22, a: 0} --- !u!1 &2123061716 GameObject: m_ObjectHideFlags: 0 @@ -13509,6 +13711,7 @@ RectTransform: - {fileID: 921918107} - {fileID: 1393559074} - {fileID: 1749352221} + - {fileID: 1245142876} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -13856,7 +14059,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2073170755} + m_Material: {fileID: 885476346} m_Color: {r: 0.15294118, g: 0.15294118, b: 0.19607845, a: 1} m_RaycastTarget: 1 m_Maskable: 1 @@ -14043,7 +14246,7 @@ PrefabInstance: - target: {fileID: 8672365918516275962, guid: 959deb2e0e03f4443a5adba7f7e626f9, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8672365918516275962, guid: 959deb2e0e03f4443a5adba7f7e626f9, type: 3} @@ -14053,7 +14256,7 @@ PrefabInstance: - target: {fileID: 8672365918516275962, guid: 959deb2e0e03f4443a5adba7f7e626f9, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8672365918516275962, guid: 959deb2e0e03f4443a5adba7f7e626f9, type: 3} diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index aac78b04..17ce1121 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -295,6 +295,7 @@ RectTransform: - {fileID: 730655536} - {fileID: 1985738406} - {fileID: 1378474436} + - {fileID: 684809390} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -324,6 +325,84 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 273807000} m_CullTransparentMesh: 0 +--- !u!1 &313551262 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 313551263} + - component: {fileID: 313551265} + - component: {fileID: 313551264} + m_Layer: 5 + m_Name: TimeText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &313551263 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 313551262} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 684809390} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -60, y: 0} + m_SizeDelta: {x: 60, y: 30} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &313551264 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 313551262} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} + m_FontSize: 16 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!222 &313551265 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 313551262} + m_CullTransparentMesh: 0 --- !u!1 &356010322 GameObject: m_ObjectHideFlags: 0 @@ -398,6 +477,52 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 356010322} m_CullTransparentMesh: 0 +--- !u!1 &684809389 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 684809390} + - component: {fileID: 684809391} + m_Layer: 5 + m_Name: MobileInfo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &684809390 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 684809389} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1726804852} + - {fileID: 313551263} + m_Father: {fileID: 273807004} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &684809391 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 684809389} + m_CullTransparentMesh: 0 --- !u!1 &724627085 GameObject: m_ObjectHideFlags: 0 @@ -755,6 +880,84 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 1600, y: 900} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1726804851 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1726804852} + - component: {fileID: 1726804854} + - component: {fileID: 1726804853} + m_Layer: 5 + m_Name: BatteryText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1726804852 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1726804851} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 684809390} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 60, y: 30} + m_Pivot: {x: 1, y: 0.5} +--- !u!114 &1726804853 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1726804851} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 1db9e217733971041be26b076fda6083, type: 3} + m_FontSize: 16 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 1 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: +--- !u!222 &1726804854 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1726804851} + m_CullTransparentMesh: 0 --- !u!1 &1962586925 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Mobile/LoginControllerMobile.cs b/Assets/Scripts/Mobile/LoginControllerMobile.cs index e3af3b41..869f2c6a 100644 --- a/Assets/Scripts/Mobile/LoginControllerMobile.cs +++ b/Assets/Scripts/Mobile/LoginControllerMobile.cs @@ -11,6 +11,9 @@ public class LoginControllerMobile : MonoBehaviour // Start is called before the first frame update ScrollRect loginScrollView; Transform thirdLoginPage; + + public WeChatController weChat { get; private set; } + void Awake() { loginScrollView = transform.Find("Panel/LoginContainer/LoginScrollView").GetComponent(); @@ -26,8 +29,19 @@ public class LoginControllerMobile : MonoBehaviour (b) => goWxLogin()); } - + private void Start() + { + transform.Find("MobileInfo/BatteryText").GetComponent().text = + $"{Math.Round(SystemInfo.batteryLevel * 100, 0)}%"; + transform.Find("MobileInfo/TimeText").GetComponent().text = + DateTime.Now.ToString("HH:mm"); + weChat = App.weChatController; + weChat.Init(App.WxAppId); + //App.weChatController.Init(App.WxAppId); + //var s = App.weChatController.isApplicationAvilible("com.gugoumainapp","powerfun").ToString(); + //Utils.showToast(null, SystemInfo.batteryLevel.ToString()); + } // Update is called once per frame void Update() { @@ -44,8 +58,6 @@ public class LoginControllerMobile : MonoBehaviour private void goWxLogin() { #if !UNITY_EDITOR && (UNITY_ANDROID || UNITY_IOS) - var weChat = App.weChatController; - weChat.Init(App.WxAppId); if (weChat.IsWeChatAppInstalled()) { weChat.WxLogin("snsapi_userinfo", ""); diff --git a/Assets/Scripts/Mobile/WeChatController.cs b/Assets/Scripts/Mobile/WeChatController.cs index 186d957a..75f0fad2 100644 --- a/Assets/Scripts/Mobile/WeChatController.cs +++ b/Assets/Scripts/Mobile/WeChatController.cs @@ -22,6 +22,8 @@ public class WeChatController [DllImport("__Internal")] private static extern void WechatLogin(string scope,string state); + [DllImport("__Internal")] + private static extern bool checkAPPIsExist(string URLScheme); #endif #endregion /// @@ -52,13 +54,12 @@ public class WeChatController public void Init(string APPID) { _APP_ID = APPID; -#if !UNITY_EDITOR && UNITY_ANDROID +#if UNITY_ANDROID mainActivityClass = new AndroidJavaClass(_className); // 第一个参数： MainActivity中的方法名 // 第二、三个参数： 分别是SendMessageToUnity需要接收的第一和第二个参数，对比上面Java的代码 mainActivityClass.CallStatic("InitWeChat", Application.identifier, _APP_ID); -#endif -#if !UNITY_EDITOR && UNITY_IOS +#elif UNITY_IOS RegisterApp(_APP_ID); #endif } @@ -77,12 +78,25 @@ public class WeChatController } /// - /// 分享链接至微信，缩略图用的是APP Icon - /// - /// 分享至什么场景, 0-对话、1-朋友圈、2-收藏 - /// 网页链接 - /// 标题 - /// 描述 + /// 判断应用是否存在 + /// + /// + /// + public bool isApplicationAvilible(string pkgName,string URLScheme) + { +#if UNITY_ANDROID + return mainActivityClass.CallStatic("isApplicationAvilible",pkgName); +#elif UNITY_IOS + return checkAPPIsExist(URLScheme); +#endif + } + /// + /// 分享链接至微信，缩略图用的是APP Icon + /// + /// 分享至什么场景, 0-对话、1-朋友圈、2-收藏 + /// 网页链接 + /// 标题 + /// 描述 public void ShareWebpageToWX(int scene, string url, string title, string description) { mainActivityClass.CallStatic("ShareWebpageToWX", scene, url, title, description); diff --git a/Assets/Scripts/Scenes/MainController.cs b/Assets/Scripts/Scenes/MainController.cs index 4f088670..5bc3ccbb 100644 --- a/Assets/Scripts/Scenes/MainController.cs +++ b/Assets/Scripts/Scenes/MainController.cs @@ -3,6 +3,7 @@ using Assets.Scripts.Devices.Ant; using Assets.Scripts.Scenes; using Assets.Scripts.UI.Prefab.Device; using Mapbox.Examples; +using System; using System.Collections; using System.Collections.Generic; using System.Threading.Tasks; @@ -24,7 +25,7 @@ public class MainController : BaseScene #if UNITY_ANDROID || UNITY_IOS transform.GetComponent().referenceResolution = new Vector2(844, 390); transform.Find("Panel").GetComponent().sizeDelta = new Vector2(844, 390); - transform.Find("ModalPanel").GetComponent().sizeDelta = new Vector2(844, 390); + //transform.Find("ModalPanel").GetComponent().sizeDelta = new Vector2(844, 390); #endif App.MainDeviceAdapter.StartScan(); } @@ -35,6 +36,10 @@ public class MainController : BaseScene UIManager.Instance.Root = root; UIManager.Instance.MainPanel = this.transform.Find("Panel").GetComponent(); UIManager.Instance.ModalsPanel = this.transform.Find("ModalPanel").GetComponent(); + transform.Find("MobileInfo/BatteryText").GetComponent().text = + $"{Math.Round(SystemInfo.batteryLevel * 100, 0)}%"; + transform.Find("MobileInfo/TimeText").GetComponent().text = + DateTime.Now.ToString("HH:mm"); #if UNITY_EDITOR if (App.CurrentUser == null) //App.CurrentUser == null { diff --git a/Assets/Scripts/UI/Control/PFUIDropdown.cs b/Assets/Scripts/UI/Control/PFUIDropdown.cs index c74cbbde..6017d28d 100644 --- a/Assets/Scripts/UI/Control/PFUIDropdown.cs +++ b/Assets/Scripts/UI/Control/PFUIDropdown.cs @@ -7,6 +7,7 @@ using UnityEngine; using UnityEngine.UI; using UnityEngine.EventSystems; using UnityEngine.Events; +using DG.Tweening; namespace Assets.Scripts.UI.Control { @@ -96,6 +97,10 @@ namespace Assets.Scripts.UI.Control public void SetValidate() { outline.enabled = true; + outline.DOFade(1, 1f).onComplete = () => + { + outline.DOFade(0, 1f); + }; } //public void SetValidate(string s) //{ diff --git a/Assets/Scripts/UI/Control/PFUIInputField.cs b/Assets/Scripts/UI/Control/PFUIInputField.cs index d64e6e29..3080fbd8 100644 --- a/Assets/Scripts/UI/Control/PFUIInputField.cs +++ b/Assets/Scripts/UI/Control/PFUIInputField.cs @@ -7,7 +7,7 @@ using UnityEngine; using UnityEngine.Events; using UnityEngine.EventSystems; using UnityEngine.UI; - +using DG.Tweening; namespace Assets.Scripts.UI.Control { public class PFUIInputField: PFUIComponentBase @@ -123,6 +123,10 @@ namespace Assets.Scripts.UI.Control if (value) { outline.enabled = true; + outline.DOFade(1, 1f).onComplete = () => + { + outline.DOFade(0, 1f); + }; outline.effectColor = Utils.HexToColorHtml("#F93086"); ColorUtility.TryParseHtmlString("#F93086", out Color color); //this.mInnerInputField.transform.Find("Text").GetComponent().color = color; diff --git a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs index 733d1295..3563e87d 100644 --- a/Assets/Scripts/UI/Prefab/Panel/HomeController.cs +++ b/Assets/Scripts/UI/Prefab/Panel/HomeController.cs @@ -129,7 +129,14 @@ public class HomeController : PFUIPanel Application.Quit(); }); #else - Application.OpenURL("powerfun://app"); + if (App.weChatController.isApplicationAvilible("com.zhixingpai.powerfun", "powerfun")) + { + Application.OpenURL("powerfun://app"); + } + else + { + Application.OpenURL("http://www.powerfun.com/Download"); + } #endif } //进入比赛 diff --git a/Assets/Scripts/UI/Prefab/ResultList/ResultListController.cs b/Assets/Scripts/UI/Prefab/ResultList/ResultListController.cs index 62fa6f25..5c39a365 100644 --- a/Assets/Scripts/UI/Prefab/ResultList/ResultListController.cs +++ b/Assets/Scripts/UI/Prefab/ResultList/ResultListController.cs @@ -29,6 +29,9 @@ public class ResultListController : PFUIPanel void Awake() { //ApiBase.SetCookie("73385F5F719B610D132C1ECF3E9143272BF15214D57ED91CD7A9DFD832407471535112AAEB8E9271F75D54FBBF2D99F18FA313C1EEA5676F5D722D7FBB07C926BEC5905591BF9AFDDC6336552DF273112C2DA1794E6FA2F465B11FECD2E82E52"); +#if UNITY_ANDROID || UNITY_IOS + routeResult = Resources.Load("UI/Prefab/ResultList/RouteItem-Mobile"); +#endif InitialColor(); scroll = transform.Find("ListPanel").Find("Scroll").GetComponent(); btnMatch = transform.Find("ListPanel").Find("BtnMatch"); @@ -283,7 +286,7 @@ public class ResultListController : PFUIPanel } scroll.transform.Find("Error").gameObject.SetActive(contents[scrollIndex].childCount == 0); } - #region 主页面滑动逻辑 +#region 主页面滑动逻辑 int scrollIndex = 0; bool startScroll = false; ScrollRect scroll; @@ -296,7 +299,6 @@ public class ResultListController : PFUIPanel var value = index * scrollValue; if (scroll != null && startScroll) { -#if (UNITY_ANDROID || UNITY_IOS) if (scroll.horizontalNormalizedPosition >= value) { scroll.horizontalNormalizedPosition -= (scrollValue / 20); @@ -317,30 +319,6 @@ public class ResultListController : PFUIPanel startScroll = false; } } -#else - //if (scroll.verticalNormalizedPosition <= 1) - //{ - // scroll.verticalNormalizedPosition =0; - // Debug.Log($"{scroll.verticalNormalizedPosition},{scrollValue/20}"); - // if (scroll.verticalNormalizedPosition <= 0) - // { - // Debug.Log(index); - // scroll.verticalNormalizedPosition = 0; - // startScroll = false; - // } - //} - //else - //{ - // scroll.verticalNormalizedPosition += (scrollValue / 20); - // Debug.Log($"反向：{scroll.verticalNormalizedPosition},{scrollValue / 20}"); - // if (scroll.verticalNormalizedPosition >= 1) - // { - // Debug.Log(index); - // scroll.verticalNormalizedPosition = 1; - // startScroll = false; - // } - //} -#endif } } #endregion diff --git a/Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs b/Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs index 03759925..b524944c 100644 --- a/Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs +++ b/Assets/Scripts/UI/Prefab/ResultList/RouteItem.cs @@ -100,12 +100,12 @@ public class RouteItem : MonoBehaviour, IPointerExitHandler, IPointerEnterHandle transform.Find("Right").gameObject.SetActive(false); } //right.gameObject.SetActive(true); +#if !(UNITY_ANDROID || UNITY_IOS) gameObject.GetComponent